diff --git a/asm/boot.s b/asm/boot.s index 12bd18612c..2bdee2ae9f 100644 --- a/asm/boot.s +++ b/asm/boot.s @@ -15,7 +15,7 @@ glabel func_A4000040 /* 50 A4000050 25080000 */ addiu $t0, $t0, %lo(D_A4700000) /* 54 A4000054 8D09000C */ lw $t1, 0xc($t0) /* 58 A4000058 152000ED */ bnez $t1, .LA4000410 -/* 5C A400005C 00000000 */ nop +/* 5C A400005C 00000000 */ nop /* 60 A4000060 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 64 A4000064 AFB30000 */ sw $s3, ($sp) /* 68 A4000068 AFB40004 */ sw $s4, 4($sp) @@ -32,20 +32,20 @@ glabel func_A4000040 /* 94 A4000094 AD090004 */ sw $t1, 4($t0) /* 98 A4000098 24112260 */ addiu $s1, $zero, 0x2260 .LA400009C: -/* 9C A400009C 00000000 */ nop +/* 9C A400009C 00000000 */ nop /* A0 A40000A0 2231FFFF */ addi $s1, $s1, -1 /* A4 A40000A4 1620FFFD */ bnez $s1, .LA400009C -/* A8 A40000A8 00000000 */ nop +/* A8 A40000A8 00000000 */ nop /* AC A40000AC AD000008 */ sw $zero, 8($t0) /* B0 A40000B0 34090014 */ ori $t1, $zero, 0x14 /* B4 A40000B4 AD09000C */ sw $t1, 0xc($t0) /* B8 A40000B8 AD000000 */ sw $zero, ($t0) /* BC A40000BC 24110004 */ addiu $s1, $zero, 4 .LA40000C0: -/* C0 A40000C0 00000000 */ nop +/* C0 A40000C0 00000000 */ nop /* C4 A40000C4 2231FFFF */ addi $s1, $s1, -1 /* C8 A40000C8 1620FFFD */ bnez $s1, .LA40000C0 -/* CC A40000CC 00000000 */ nop +/* CC A40000CC 00000000 */ nop /* D0 A40000D0 3409000E */ ori $t1, $zero, 0xe /* D4 A40000D4 AD090000 */ sw $t1, ($t0) /* D8 A40000D8 24110020 */ addiu $s1, $zero, 0x20 @@ -78,11 +78,11 @@ glabel func_A4000040 /* 140 A4000140 3C110101 */ lui $s1, 0x101 /* 144 A4000144 26310101 */ addiu $s1, $s1, 0x101 /* 148 A4000148 16110005 */ bne $s0, $s1, .LA4000160 -/* 14C A400014C 00000000 */ nop +/* 14C A400014C 00000000 */ nop /* 150 A4000150 24100200 */ addiu $s0, $zero, 0x200 /* 154 A4000154 35714000 */ ori $s1, $t3, 0x4000 /* 158 A4000158 10000003 */ b .LA4000168 -/* 15C A400015C 00000000 */ nop +/* 15C A400015C 00000000 */ nop .LA4000160: /* 160 A4000160 24100400 */ addiu $s0, $zero, 0x400 /* 164 A4000164 35718000 */ ori $s1, $t3, 0x8000 @@ -90,9 +90,9 @@ glabel func_A4000040 /* 168 A4000168 AE2E0004 */ sw $t6, 4($s1) /* 16C A400016C 25F5000C */ addiu $s5, $t7, 0xc /* 170 A4000170 0D0001DB */ jal func_A400076C -/* 174 A4000174 00000000 */ nop +/* 174 A4000174 00000000 */ nop /* 178 A4000178 10400038 */ beqz $v0, .LA400025C -/* 17C A400017C 00000000 */ nop +/* 17C A400017C 00000000 */ nop /* 180 A4000180 AFA20000 */ sw $v0, ($sp) /* 184 A4000184 24092000 */ addiu $t1, $zero, 0x2000 /* 188 A4000188 AD890000 */ sw $t1, ($t4) @@ -105,7 +105,7 @@ glabel func_A4000040 /* 1A4 A40001A4 AD890000 */ sw $t1, ($t4) /* 1A8 A40001A8 3C08B019 */ lui $t0, 0xb019 /* 1AC A40001AC 1568000C */ bne $t3, $t0, .LA40001E0 -/* 1B0 A40001B0 00000000 */ nop +/* 1B0 A40001B0 00000000 */ nop /* 1B4 A40001B4 3C080800 */ lui $t0, 0x800 /* 1B8 A40001B8 0308C020 */ add $t8, $t8, $t0 /* 1BC A40001BC 0330C820 */ add $t9, $t9, $s0 @@ -116,7 +116,7 @@ glabel func_A4000040 /* 1D0 A40001D0 00129040 */ sll $s2, $s2, 1 /* 1D4 A40001D4 22520001 */ addi $s2, $s2, 1 /* 1D8 A40001D8 10000003 */ b .LA40001E8 -/* 1DC A40001DC 00000000 */ nop +/* 1DC A40001DC 00000000 */ nop .LA40001E0: /* 1E0 A40001E0 3C080010 */ lui $t0, 0x10 /* 1E4 A40001E4 0288A020 */ add $s4, $s4, $t0 @@ -130,11 +130,11 @@ glabel func_A4000040 /* 200 A4000200 3129FFFF */ andi $t1, $t1, 0xffff /* 204 A4000204 24080500 */ addiu $t0, $zero, 0x500 /* 208 A4000208 15280009 */ bne $t1, $t0, .LA4000230 -/* 20C A400020C 00000000 */ nop +/* 20C A400020C 00000000 */ nop /* 210 A4000210 3C1B0100 */ lui $k1, 0x100 /* 214 A4000214 035BD024 */ and $k0, $k0, $k1 /* 218 A4000218 17400005 */ bnez $k0, .LA4000230 -/* 21C A400021C 00000000 */ nop +/* 21C A400021C 00000000 */ nop /* 220 A4000220 3C08101C */ lui $t0, 0x101c /* 224 A4000224 35080A04 */ ori $t0, $t0, 0xa04 /* 228 A4000228 ADE80018 */ sw $t0, 0x18($t7) @@ -151,7 +151,7 @@ glabel func_A4000040 /* 24C A400024C 25AD0001 */ addiu $t5, $t5, 1 /* 250 A4000250 2DA80008 */ sltiu $t0, $t5, 8 /* 254 A4000254 1500FFC4 */ bnez $t0, .LA4000168 -/* 258 A4000258 00000000 */ nop +/* 258 A4000258 00000000 */ nop .LA400025C: /* 25C A400025C 3C08C400 */ lui $t0, 0xc400 /* 260 A4000260 AD48000C */ sw $t0, 0xc($t2) @@ -163,14 +163,14 @@ glabel func_A4000040 /* 274 A4000274 8FA90004 */ lw $t1, 4($sp) /* 278 A4000278 3C08B009 */ lui $t0, 0xb009 /* 27C A400027C 15280016 */ bne $t1, $t0, .LA40002D8 -/* 280 A4000280 00000000 */ nop +/* 280 A4000280 00000000 */ nop /* 284 A4000284 AE380004 */ sw $t8, 4($s1) /* 288 A4000288 2735000C */ addiu $s5, $t9, 0xc /* 28C A400028C 8FA40000 */ lw $a0, ($sp) /* 290 A4000290 23BD0008 */ addi $sp, $sp, 8 /* 294 A4000294 24050001 */ addiu $a1, $zero, 1 /* 298 A4000298 0D00028D */ jal func_A4000A34 -/* 29C A400029C 00000000 */ nop +/* 29C A400029C 00000000 */ nop /* 2A0 A40002A0 8EC80000 */ lw $t0, ($s6) /* 2A4 A40002A4 3C080008 */ lui $t0, 8 /* 2A8 A40002A8 01164020 */ add $t0, $t0, $s6 @@ -192,7 +192,7 @@ glabel func_A4000040 /* 2E4 A40002E4 23BD0008 */ addi $sp, $sp, 8 /* 2E8 A40002E8 24050001 */ addiu $a1, $zero, 1 /* 2EC A40002EC 0D00028D */ jal func_A4000A34 -/* 2F0 A40002F0 00000000 */ nop +/* 2F0 A40002F0 00000000 */ nop /* 2F4 A40002F4 8CE80000 */ lw $t0, ($a3) /* 2F8 A40002F8 3C080008 */ lui $t0, 8 /* 2FC A40002FC 01074020 */ add $t0, $t0, $a3 @@ -223,7 +223,7 @@ glabel func_A4000040 /* 35C A400035C 24630001 */ addiu $v1, $v1, 1 /* 360 A4000360 006D402A */ slt $t0, $v1, $t5 /* 364 A4000364 1500FFC3 */ bnez $t0, .LA4000274 -/* 368 A4000368 00000000 */ nop +/* 368 A4000368 00000000 */ nop /* 36C A400036C 3C0AA470 */ lui $t2, %hi(D_A4700010) /* 370 A4000370 001294C0 */ sll $s2, $s2, 0x13 /* 374 A4000374 3C090006 */ lui $t1, 6 @@ -266,7 +266,7 @@ glabel func_A4000040 /* 400 A4000400 1420FFFD */ bnez $at, .LA40003F8 /* 404 A4000404 25080010 */ addiu $t0, $t0, 0x10 /* 408 A4000408 10000013 */ b .LA4000458 -/* 40C A400040C 00000000 */ nop +/* 40C A400040C 00000000 */ nop .LA4000410: /* 410 A4000410 3C088000 */ lui $t0, %hi(D_80000000) /* 414 A4000414 25080000 */ addiu $t0, $t0, %lo(D_80000000) @@ -315,8 +315,7 @@ glabel func_A4000040 /* 4B0 A40004B0 3C0C8000 */ lui $t4, %hi(D_80000000) /* 4B4 A40004B4 258C0000 */ addiu $t4, $t4, %lo(D_80000000) /* 4B8 A40004B8 01800008 */ jr $t4 -/* 4BC A40004BC 00000000 */ nop - +/* 4BC A40004BC 00000000 */ nop glabel func_A40004C0 /* 4C0 A40004C0 3C0BB000 */ lui $t3, %hi(D_B0000008) /* 4C4 A40004C4 8D690008 */ lw $t1, %lo(D_B0000008)($t3) @@ -343,23 +342,23 @@ glabel func_A40004C0 /* 514 A4000514 3C01A460 */ lui $at, %hi(D_A460000C) /* 518 A4000518 AC2A000C */ sw $t2, %lo(D_A460000C)($at) .LA400051C: -/* 51C A400051C 00000000 */ nop -/* 520 A4000520 00000000 */ nop -/* 524 A4000524 00000000 */ nop -/* 528 A4000528 00000000 */ nop -/* 52C A400052C 00000000 */ nop -/* 530 A4000530 00000000 */ nop -/* 534 A4000534 00000000 */ nop -/* 538 A4000538 00000000 */ nop -/* 53C A400053C 00000000 */ nop -/* 540 A4000540 00000000 */ nop -/* 544 A4000544 00000000 */ nop -/* 548 A4000548 00000000 */ nop +/* 51C A400051C 00000000 */ nop +/* 520 A4000520 00000000 */ nop +/* 524 A4000524 00000000 */ nop +/* 528 A4000528 00000000 */ nop +/* 52C A400052C 00000000 */ nop +/* 530 A4000530 00000000 */ nop +/* 534 A4000534 00000000 */ nop +/* 538 A4000538 00000000 */ nop +/* 53C A400053C 00000000 */ nop +/* 540 A4000540 00000000 */ nop +/* 544 A4000544 00000000 */ nop +/* 548 A4000548 00000000 */ nop /* 54C A400054C 3C0BA460 */ lui $t3, %hi(D_A4600010) /* 550 A4000550 8D6B0010 */ lw $t3, %lo(D_A4600010)($t3) /* 554 A4000554 316B0001 */ andi $t3, $t3, 1 /* 558 A4000558 1560FFF0 */ bnez $t3, .LA400051C -/* 55C A400055C 00000000 */ nop +/* 55C A400055C 00000000 */ nop /* 560 A4000560 3C0BB000 */ lui $t3, %hi(D_B0000008) /* 564 A4000564 8D640008 */ lw $a0, %lo(D_B0000008)($t3) /* 568 A4000568 3C010010 */ lui $at, 0x10 @@ -420,15 +419,15 @@ glabel func_A40004C0 /* 634 A4000634 3C0BB000 */ lui $t3, %hi(D_B0000010) /* 638 A4000638 8D680010 */ lw $t0, %lo(D_B0000010)($t3) /* 63C A400063C 14E80006 */ bne $a3, $t0, .LA4000658 -/* 640 A4000640 00000000 */ nop +/* 640 A4000640 00000000 */ nop /* 644 A4000644 8D680014 */ lw $t0, 0x14($t3) /* 648 A4000648 16080003 */ bne $s0, $t0, .LA4000658 -/* 64C A400064C 00000000 */ nop +/* 64C A400064C 00000000 */ nop /* 650 A4000650 04110003 */ bal .LA4000660 -/* 654 A4000654 00000000 */ nop +/* 654 A4000654 00000000 */ nop .LA4000658: /* 658 A4000658 0411FFFF */ bal .LA4000658 -/* 65C A400065C 00000000 */ nop +/* 65C A400065C 00000000 */ nop .LA4000660: /* 660 A4000660 3C09A408 */ lui $t1, 0xa408 /* 664 A4000664 8D290000 */ lw $t1, ($t1) @@ -500,9 +499,8 @@ glabel func_A40004C0 /* 758 A4000758 3C010010 */ lui $at, 0x10 /* 75C A400075C 01214823 */ subu $t1, $t1, $at /* 760 A4000760 01200008 */ jr $t1 -/* 764 A4000764 00000000 */ nop -/* 768 A4000768 00000000 */ nop - +/* 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) @@ -535,7 +533,7 @@ glabel func_A400076C /* 7DC A40007DC AFBF0064 */ sw $ra, 0x64($sp) .LA40007E0: /* 7E0 A40007E0 0D00021D */ jal func_A4000874 -/* 7E4 A40007E4 00000000 */ nop +/* 7E4 A40007E4 00000000 */ nop /* 7E8 A40007E8 26100001 */ addiu $s0, $s0, 1 /* 7EC A40007EC 2A090004 */ slti $t1, $s0, 4 /* 7F0 A40007F0 1520FFFB */ bnez $t1, .LA40007E0 @@ -591,7 +589,7 @@ glabel func_A4000874 /* 8AC A40008AC 00404825 */ or $t1, $v0, $zero /* 8B0 A40008B0 0000D012 */ mflo $k0 /* 8B4 A40008B4 017A5821 */ addu $t3, $t3, $k0 -/* 8B8 A40008B8 00000000 */ nop +/* 8B8 A40008B8 00000000 */ nop /* 8BC A40008BC 293A0050 */ slti $k0, $t1, 0x50 .LA40008C0: /* 8C0 A40008C0 1740FFF1 */ bnez $k0, .LA4000888 @@ -611,8 +609,7 @@ glabel func_A4000874 .LA40008F4: /* 8F4 A40008F4 27BD0020 */ addiu $sp, $sp, 0x20 /* 8F8 A40008F8 03E00008 */ jr $ra -/* 8FC A40008FC 00000000 */ nop - +/* 8FC A40008FC 00000000 */ nop glabel func_A4000900 /* 900 A4000900 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 904 A4000904 AFBF001C */ sw $ra, 0x1c($sp) @@ -645,8 +642,7 @@ glabel func_A4000900 /* 964 A4000964 8FBF001C */ lw $ra, 0x1c($sp) /* 968 A4000968 27BD0028 */ addiu $sp, $sp, 0x28 /* 96C A400096C 03E00008 */ jr $ra -/* 970 A4000970 00000000 */ nop - +/* 970 A4000970 00000000 */ nop glabel func_A4000974 /* 974 A4000974 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 978 A4000978 AFBF001C */ sw $ra, 0x1c($sp) @@ -701,8 +697,7 @@ glabel func_A4000974 /* A24 A4000A24 8FBF001C */ lw $ra, 0x1c($sp) /* A28 A4000A28 27BD0028 */ addiu $sp, $sp, 0x28 /* A2C A4000A2C 03E00008 */ jr $ra -/* A30 A4000A30 00000000 */ nop - +/* A30 A4000A30 00000000 */ nop glabel func_A4000A34 /* A34 A4000A34 27BDFFD8 */ addiu $sp, $sp, -0x28 /* A38 A4000A38 308400FF */ andi $a0, $a0, 0xff @@ -741,8 +736,7 @@ glabel func_A4000A34 /* AB4 A4000AB4 8FBF001C */ lw $ra, 0x1c($sp) /* AB8 A4000AB8 27BD0028 */ addiu $sp, $sp, 0x28 /* ABC A4000ABC 03E00008 */ jr $ra -/* AC0 A4000AC0 00000000 */ nop - +/* AC0 A4000AC0 00000000 */ nop glabel func_A4000AC4 /* AC4 A4000AC4 27BDFFD8 */ addiu $sp, $sp, -0x28 /* AC8 A4000AC8 AFBF001C */ sw $ra, 0x1c($sp) @@ -782,8 +776,8 @@ glabel func_A4000AC4 /* B50 A4000B50 8FBF001C */ lw $ra, 0x1c($sp) /* B54 A4000B54 27BD0028 */ addiu $sp, $sp, 0x28 /* B58 A4000B58 03E00008 */ jr $ra -/* B5C A4000B5C 00000000 */ nop -/* B60 A4000B60 00000000 */ nop -/* B64 A4000B64 00000000 */ nop -/* B68 A4000B68 00000000 */ nop -/* B6C A4000B6C 00000000 */ nop +/* B5C A4000B5C 00000000 */ nop +/* B60 A4000B60 00000000 */ nop +/* B64 A4000B64 00000000 */ nop +/* B68 A4000B68 00000000 */ nop +/* B6C A4000B6C 00000000 */ nop diff --git a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_8021849C_6DC23C.s b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_8021849C_6DC23C.s index 5a4c072e50..7c209804e0 100644 --- a/asm/nonmatchings/battle/area_kkj/6DBDA0/func_8021849C_6DC23C.s +++ b/asm/nonmatchings/battle/area_kkj/6DBDA0/func_8021849C_6DC23C.s @@ -45,5 +45,5 @@ glabel func_8021849C_6DC23C /* 6DC2DC 8021853C 24020002 */ addiu $v0, $zero, 2 /* 6DC2E0 80218540 03E00008 */ jr $ra /* 6DC2E4 80218544 27BD0020 */ addiu $sp, $sp, 0x20 -/* 6DC2E8 80218548 00000000 */ nop -/* 6DC2EC 8021854C 00000000 */ nop +/* 6DC2E8 80218548 00000000 */ nop +/* 6DC2EC 8021854C 00000000 */ nop diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s b/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s index b59cac9902..53553bb535 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E3E80.s @@ -5,7 +5,7 @@ glabel func_802E3E80 /* 105700 802E3E80 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 105704 802E3E84 AFBF0010 */ sw $ra, 0x10($sp) /* 105708 802E3E88 0C0B8D94 */ jal func_802E3650 -/* 10570C 802E3E8C 00000000 */ nop +/* 10570C 802E3E8C 00000000 */ nop /* 105710 802E3E90 8FBF0010 */ lw $ra, 0x10($sp) /* 105714 802E3E94 03E00008 */ jr $ra /* 105718 802E3E98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s index ba61951dcc..41bfdf02df 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s @@ -20,4 +20,4 @@ glabel func_802E3E9C .L802E3ED4: /* 105754 802E3ED4 A083000B */ sb $v1, 0xb($a0) /* 105758 802E3ED8 03E00008 */ jr $ra -/* 10575C 802E3EDC 00000000 */ nop +/* 10575C 802E3EDC 00000000 */ nop diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3EE0.s b/asm/nonmatchings/code_105700_len_2130/func_802E3EE0.s index 4bc70677cd..df0b15ed06 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E3EE0.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E3EE0.s @@ -14,4 +14,4 @@ glabel func_802E3EE0 /* 105780 802E3F00 A0620000 */ sb $v0, ($v1) .L802E3F04: /* 105784 802E3F04 03E00008 */ jr $ra -/* 105788 802E3F08 00000000 */ nop +/* 105788 802E3F08 00000000 */ nop diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s b/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s index 17c307478b..a729f5ee6d 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E3F0C.s @@ -15,9 +15,9 @@ glabel func_802E3F0C /* 1057B4 802E3F34 8E020000 */ lw $v0, ($s0) /* 1057B8 802E3F38 00521024 */ and $v0, $v0, $s2 /* 1057BC 802E3F3C 1440003A */ bnez $v0, .L802E4028 -/* 1057C0 802E3F40 00000000 */ nop +/* 1057C0 802E3F40 00000000 */ nop /* 1057C4 802E3F44 0C03951B */ jal func_800E546C -/* 1057C8 802E3F48 00000000 */ nop +/* 1057C8 802E3F48 00000000 */ nop /* 1057CC 802E3F4C 8E020000 */ lw $v0, ($s0) /* 1057D0 802E3F50 4600010D */ trunc.w.s $f4, $f0 /* 1057D4 802E3F54 44032000 */ mfc1 $v1, $f4 @@ -76,7 +76,7 @@ glabel func_802E3F0C /* 10589C 802E401C 8CE70000 */ lw $a3, ($a3) .L802E4020: /* 1058A0 802E4020 0C04C4FD */ jal make_item_entity -/* 1058A4 802E4024 00000000 */ nop +/* 1058A4 802E4024 00000000 */ nop .L802E4028: /* 1058A8 802E4028 8FBF002C */ lw $ra, 0x2c($sp) /* 1058AC 802E402C 8FB20028 */ lw $s2, 0x28($sp) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4040.s b/asm/nonmatchings/code_105700_len_2130/func_802E4040.s index a42b020585..1168e9bf4f 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4040.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4040.s @@ -5,7 +5,7 @@ glabel func_802E4040 /* 1058C0 802E4040 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1058C4 802E4044 AFBF0010 */ sw $ra, 0x10($sp) /* 1058C8 802E4048 0C04419E */ jal func_80110678 -/* 1058CC 802E404C 00000000 */ nop +/* 1058CC 802E404C 00000000 */ nop /* 1058D0 802E4050 8FBF0010 */ lw $ra, 0x10($sp) /* 1058D4 802E4054 03E00008 */ jr $ra /* 1058D8 802E4058 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E40A0.s b/asm/nonmatchings/code_105700_len_2130/func_802E40A0.s index 766278129e..4185824e66 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E40A0.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E40A0.s @@ -13,20 +13,20 @@ glabel func_802E40A0 /* 105940 802E40C0 10620003 */ beq $v1, $v0, .L802E40D0 /* 105944 802E40C4 24020014 */ addiu $v0, $zero, 0x14 /* 105948 802E40C8 14620006 */ bne $v1, $v0, .L802E40E4 -/* 10594C 802E40CC 00000000 */ nop +/* 10594C 802E40CC 00000000 */ nop .L802E40D0: /* 105950 802E40D0 86040014 */ lh $a0, 0x14($s0) /* 105954 802E40D4 3C050000 */ lui $a1, 0 /* 105958 802E40D8 24A50094 */ addiu $a1, $a1, 0x94 /* 10595C 802E40DC 080B903C */ j .L802E40F0 -/* 105960 802E40E0 00000000 */ nop +/* 105960 802E40E0 00000000 */ nop .L802E40E4: /* 105964 802E40E4 86040014 */ lh $a0, 0x14($s0) /* 105968 802E40E8 3C050000 */ lui $a1, 0 /* 10596C 802E40EC 24A50094 */ addiu $a1, $a1, 0x94 .L802E40F0: /* 105970 802E40F0 0C048052 */ jal play_model_animation -/* 105974 802E40F4 00000000 */ nop +/* 105974 802E40F4 00000000 */ nop /* 105978 802E40F8 8FBF0014 */ lw $ra, 0x14($sp) /* 10597C 802E40FC 8FB00010 */ lw $s0, 0x10($sp) /* 105980 802E4100 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4154.s b/asm/nonmatchings/code_105700_len_2130/func_802E4154.s index 43f42a183c..41d9a4445e 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4154.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4154.s @@ -10,18 +10,18 @@ glabel func_802E4154 /* 1059E8 802E4168 9483000A */ lhu $v1, 0xa($a0) /* 1059EC 802E416C 3402FFFF */ ori $v0, $zero, 0xffff /* 1059F0 802E4170 10620024 */ beq $v1, $v0, .L802E4204 -/* 1059F4 802E4174 00000000 */ nop +/* 1059F4 802E4174 00000000 */ nop /* 1059F8 802E4178 0C05152F */ jal get_global_flag /* 1059FC 802E417C 0060202D */ daddu $a0, $v1, $zero /* 105A00 802E4180 10400020 */ beqz $v0, .L802E4204 -/* 105A04 802E4184 00000000 */ nop +/* 105A04 802E4184 00000000 */ nop /* 105A08 802E4188 0C0441A9 */ jal get_entity_type /* 105A0C 802E418C 92040004 */ lbu $a0, 4($s0) /* 105A10 802E4190 3C04802F */ lui $a0, %hi(D_802EA0A0) /* 105A14 802E4194 2484A0A0 */ addiu $a0, $a0, %lo(D_802EA0A0) /* 105A18 802E4198 24030014 */ addiu $v1, $zero, 0x14 /* 105A1C 802E419C 10430003 */ beq $v0, $v1, .L802E41AC -/* 105A20 802E41A0 00000000 */ nop +/* 105A20 802E41A0 00000000 */ nop /* 105A24 802E41A4 3C04802F */ lui $a0, %hi(D_802EA07C) /* 105A28 802E41A8 2484A07C */ addiu $a0, $a0, %lo(D_802EA07C) .L802E41AC: @@ -40,13 +40,13 @@ glabel func_802E4154 /* 105A5C 802E41DC 4600320D */ trunc.w.s $f8, $f6 /* 105A60 802E41E0 44074000 */ mfc1 $a3, $f8 /* 105A64 802E41E4 0C044631 */ jal create_entity -/* 105A68 802E41E8 00000000 */ nop +/* 105A68 802E41E8 00000000 */ nop /* 105A6C 802E41EC 3C05802F */ lui $a1, %hi(D_802EA310) /* 105A70 802E41F0 24A5A310 */ addiu $a1, $a1, %lo(D_802EA310) /* 105A74 802E41F4 0C043EF0 */ jal func_8010FBC0 /* 105A78 802E41F8 0200202D */ daddu $a0, $s0, $zero /* 105A7C 802E41FC 080B9083 */ j .L802E420C -/* 105A80 802E4200 00000000 */ nop +/* 105A80 802E4200 00000000 */ nop .L802E4204: /* 105A84 802E4204 0C043F5A */ jal func_8010FD68 /* 105A88 802E4208 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E421C.s b/asm/nonmatchings/code_105700_len_2130/func_802E421C.s index e844abc03e..2cd3493c6b 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E421C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E421C.s @@ -17,7 +17,7 @@ glabel func_802E421C /* 105ACC 802E424C 10400005 */ beqz $v0, .L802E4264 /* 105AD0 802E4250 28620012 */ slti $v0, $v1, 0x12 /* 105AD4 802E4254 14400003 */ bnez $v0, .L802E4264 -/* 105AD8 802E4258 00000000 */ nop +/* 105AD8 802E4258 00000000 */ nop /* 105ADC 802E425C 3C04802F */ lui $a0, %hi(D_802EA0A0) /* 105AE0 802E4260 2484A0A0 */ addiu $a0, $a0, %lo(D_802EA0A0) .L802E4264: @@ -36,7 +36,7 @@ glabel func_802E421C /* 105B14 802E4294 4600320D */ trunc.w.s $f8, $f6 /* 105B18 802E4298 44074000 */ mfc1 $a3, $f8 /* 105B1C 802E429C 0C044631 */ jal create_entity -/* 105B20 802E42A0 00000000 */ nop +/* 105B20 802E42A0 00000000 */ nop /* 105B24 802E42A4 0040902D */ daddu $s2, $v0, $zero /* 105B28 802E42A8 0C04417A */ jal get_entity_by_index /* 105B2C 802E42AC 0240202D */ daddu $a0, $s2, $zero @@ -54,7 +54,7 @@ glabel func_802E421C /* 105B58 802E42D8 8E220000 */ lw $v0, ($s1) /* 105B5C 802E42DC 30420004 */ andi $v0, $v0, 4 /* 105B60 802E42E0 10400004 */ beqz $v0, .L802E42F4 -/* 105B64 802E42E4 00000000 */ nop +/* 105B64 802E42E4 00000000 */ nop /* 105B68 802E42E8 8E020000 */ lw $v0, ($s0) /* 105B6C 802E42EC 34420004 */ ori $v0, $v0, 4 /* 105B70 802E42F0 AE020000 */ sw $v0, ($s0) @@ -77,17 +77,17 @@ glabel func_802E421C /* 105BB0 802E4330 10620003 */ beq $v1, $v0, .L802E4340 /* 105BB4 802E4334 24020014 */ addiu $v0, $zero, 0x14 /* 105BB8 802E4338 14620005 */ bne $v1, $v0, .L802E4350 -/* 105BBC 802E433C 00000000 */ nop +/* 105BBC 802E433C 00000000 */ nop .L802E4340: /* 105BC0 802E4340 3C04802F */ lui $a0, %hi(D_802EA660) /* 105BC4 802E4344 2484A660 */ addiu $a0, $a0, %lo(D_802EA660) /* 105BC8 802E4348 080B90DA */ j .L802E4368 -/* 105BCC 802E434C 00000000 */ nop +/* 105BCC 802E434C 00000000 */ nop .L802E4350: /* 105BD0 802E4350 3C04802F */ lui $a0, %hi(D_802EA63C) /* 105BD4 802E4354 2484A63C */ addiu $a0, $a0, %lo(D_802EA63C) /* 105BD8 802E4358 12000003 */ beqz $s0, .L802E4368 -/* 105BDC 802E435C 00000000 */ nop +/* 105BDC 802E435C 00000000 */ nop /* 105BE0 802E4360 3C04802F */ lui $a0, %hi(D_802EA618) /* 105BE4 802E4364 2484A618 */ addiu $a0, $a0, %lo(D_802EA618) .L802E4368: @@ -106,7 +106,7 @@ glabel func_802E421C /* 105C18 802E4398 4600320D */ trunc.w.s $f8, $f6 /* 105C1C 802E439C 44074000 */ mfc1 $a3, $f8 /* 105C20 802E43A0 0C044631 */ jal create_entity -/* 105C24 802E43A4 00000000 */ nop +/* 105C24 802E43A4 00000000 */ nop /* 105C28 802E43A8 0C04417A */ jal get_entity_by_index /* 105C2C 802E43AC 0040202D */ daddu $a0, $v0, $zero /* 105C30 802E43B0 9223000B */ lbu $v1, 0xb($s1) @@ -127,7 +127,7 @@ glabel func_802E421C /* 105C64 802E43E4 3C030004 */ lui $v1, 4 /* 105C68 802E43E8 00431024 */ and $v0, $v0, $v1 /* 105C6C 802E43EC 10400004 */ beqz $v0, .L802E4400 -/* 105C70 802E43F0 00000000 */ nop +/* 105C70 802E43F0 00000000 */ nop /* 105C74 802E43F4 8E020000 */ lw $v0, ($s0) /* 105C78 802E43F8 00431025 */ or $v0, $v0, $v1 /* 105C7C 802E43FC AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E44F8.s b/asm/nonmatchings/code_105700_len_2130/func_802E44F8.s index 1d022533db..d19ea14c91 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E44F8.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E44F8.s @@ -5,7 +5,7 @@ glabel func_802E44F8 /* 105D78 802E44F8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 105D7C 802E44FC AFBF0010 */ sw $ra, 0x10($sp) /* 105D80 802E4500 0C03805E */ jal disable_player_input -/* 105D84 802E4504 00000000 */ nop +/* 105D84 802E4504 00000000 */ nop /* 105D88 802E4508 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 105D8C 802E450C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 105D90 802E4510 8C430000 */ lw $v1, ($v0) @@ -16,7 +16,7 @@ glabel func_802E44F8 /* 105DA4 802E4524 0C039769 */ jal set_action_state /* 105DA8 802E4528 AC430000 */ sw $v1, ($v0) /* 105DAC 802E452C 0C038C1B */ jal gravity_use_fall_parms -/* 105DB0 802E4530 00000000 */ nop +/* 105DB0 802E4530 00000000 */ nop /* 105DB4 802E4534 8FBF0010 */ lw $ra, 0x10($sp) /* 105DB8 802E4538 03E00008 */ jr $ra /* 105DBC 802E453C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4540.s b/asm/nonmatchings/code_105700_len_2130/func_802E4540.s index 4779c8fa90..fd61af9abc 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4540.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4540.s @@ -5,7 +5,7 @@ glabel func_802E4540 /* 105DC0 802E4540 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 105DC4 802E4544 AFBF0010 */ sw $ra, 0x10($sp) /* 105DC8 802E4548 0C038069 */ jal enable_player_input -/* 105DCC 802E454C 00000000 */ nop +/* 105DCC 802E454C 00000000 */ nop /* 105DD0 802E4550 8FBF0010 */ lw $ra, 0x10($sp) /* 105DD4 802E4554 03E00008 */ jr $ra /* 105DD8 802E4558 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E455C.s b/asm/nonmatchings/code_105700_len_2130/func_802E455C.s index c429a469b2..cfc43b3f29 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E455C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E455C.s @@ -8,7 +8,7 @@ glabel func_802E455C /* 105DE8 802E4568 8E10A66C */ lw $s0, %lo(gMasterGfxPos)($s0) /* 105DEC 802E456C AFBF0014 */ sw $ra, 0x14($sp) /* 105DF0 802E4570 0C04417A */ jal get_entity_by_index -/* 105DF4 802E4574 00000000 */ nop +/* 105DF4 802E4574 00000000 */ nop /* 105DF8 802E4578 3C04E300 */ lui $a0, 0xe300 /* 105DFC 802E457C 34841001 */ ori $a0, $a0, 0x1001 /* 105E00 802E4580 3C05D700 */ lui $a1, 0xd700 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s b/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s index 91ba6dfa63..6c5180bf1a 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E46BC.s @@ -22,4 +22,4 @@ glabel func_802E46BC /* 105F80 802E4700 8FB00010 */ lw $s0, 0x10($sp) /* 105F84 802E4704 03E00008 */ jr $ra /* 105F88 802E4708 27BD0018 */ addiu $sp, $sp, 0x18 -/* 105F8C 802E470C 00000000 */ nop +/* 105F8C 802E470C 00000000 */ nop diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4AEC.s b/asm/nonmatchings/code_105700_len_2130/func_802E4AEC.s index 87da9125d3..060743d457 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4AEC.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4AEC.s @@ -7,7 +7,7 @@ glabel func_802E4AEC /* 106374 802E4AF4 24A50808 */ addiu $a1, $a1, 0x808 /* 106378 802E4AF8 AFBF0010 */ sw $ra, 0x10($sp) /* 10637C 802E4AFC 0C0B91CC */ jal func_802E4730 -/* 106380 802E4B00 00000000 */ nop +/* 106380 802E4B00 00000000 */ nop /* 106384 802E4B04 8FBF0010 */ lw $ra, 0x10($sp) /* 106388 802E4B08 03E00008 */ jr $ra /* 10638C 802E4B0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s b/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s index 123c1e6530..ce0270ef7b 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4C10.s @@ -17,14 +17,14 @@ glabel func_802E4C10 /* 1064C0 802E4C40 50600009 */ beql $v1, $zero, .L802E4C68 /* 1064C4 802E4C44 AE200054 */ sw $zero, 0x54($s1) /* 1064C8 802E4C48 080B935C */ j .L802E4D70 -/* 1064CC 802E4C4C 00000000 */ nop +/* 1064CC 802E4C4C 00000000 */ nop .L802E4C50: /* 1064D0 802E4C50 10620028 */ beq $v1, $v0, .L802E4CF4 /* 1064D4 802E4C54 24020003 */ addiu $v0, $zero, 3 /* 1064D8 802E4C58 1062002B */ beq $v1, $v0, .L802E4D08 -/* 1064DC 802E4C5C 00000000 */ nop +/* 1064DC 802E4C5C 00000000 */ nop /* 1064E0 802E4C60 080B935C */ j .L802E4D70 -/* 1064E4 802E4C64 00000000 */ nop +/* 1064E4 802E4C64 00000000 */ nop .L802E4C68: /* 1064E8 802E4C68 AE200058 */ sw $zero, 0x58($s1) /* 1064EC 802E4C6C 14A00057 */ bnez $a1, .L802E4DCC @@ -46,12 +46,12 @@ glabel func_802E4C10 /* 106528 802E4CA8 E6200054 */ swc1 $f0, 0x54($s1) /* 10652C 802E4CAC 46000021 */ cvt.d.s $f0, $f0 /* 106530 802E4CB0 4620103E */ c.le.d $f2, $f0 -/* 106534 802E4CB4 00000000 */ nop +/* 106534 802E4CB4 00000000 */ nop /* 106538 802E4CB8 45000009 */ bc1f .L802E4CE0 -/* 10653C 802E4CBC 00000000 */ nop +/* 10653C 802E4CBC 00000000 */ nop /* 106540 802E4CC0 3C013F80 */ lui $at, 0x3f80 /* 106544 802E4CC4 44810000 */ mtc1 $at, $f0 -/* 106548 802E4CC8 00000000 */ nop +/* 106548 802E4CC8 00000000 */ nop /* 10654C 802E4CCC E6200054 */ swc1 $f0, 0x54($s1) /* 106550 802E4CD0 92020001 */ lbu $v0, 1($s0) /* 106554 802E4CD4 A2000002 */ sb $zero, 2($s0) @@ -73,7 +73,7 @@ glabel func_802E4C10 /* 106588 802E4D08 3C02800A */ lui $v0, %hi(D_8009A650) /* 10658C 802E4D0C 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) /* 106590 802E4D10 14400017 */ bnez $v0, .L802E4D70 -/* 106594 802E4D14 00000000 */ nop +/* 106594 802E4D14 00000000 */ nop /* 106598 802E4D18 92020002 */ lbu $v0, 2($s0) /* 10659C 802E4D1C 2442FFFF */ addiu $v0, $v0, -1 /* 1065A0 802E4D20 A2020002 */ sb $v0, 2($s0) @@ -102,11 +102,11 @@ glabel func_802E4C10 /* 1065F8 802E4D78 0C0B836C */ jal func_802E0DB0 /* 1065FC 802E4D7C 0040202D */ daddu $a0, $v0, $zero /* 106600 802E4D80 10400012 */ beqz $v0, .L802E4DCC -/* 106604 802E4D84 00000000 */ nop +/* 106604 802E4D84 00000000 */ nop /* 106608 802E4D88 0C043F5A */ jal func_8010FD68 /* 10660C 802E4D8C 0220202D */ daddu $a0, $s1, $zero /* 106610 802E4D90 0C03805E */ jal disable_player_input -/* 106614 802E4D94 00000000 */ nop +/* 106614 802E4D94 00000000 */ nop /* 106618 802E4D98 3C038011 */ lui $v1, %hi(gPlayerStatus) /* 10661C 802E4D9C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* 106620 802E4DA0 8C620004 */ lw $v0, 4($v1) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s b/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s index 8979c81900..928a552ab2 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E4E04.s @@ -21,10 +21,10 @@ glabel func_802E4E04 /* 1066C4 802E4E44 00220821 */ addu $at, $at, $v0 /* 1066C8 802E4E48 8C22B278 */ lw $v0, %lo(D_802EB278)($at) /* 1066CC 802E4E4C 00400008 */ jr $v0 -/* 1066D0 802E4E50 00000000 */ nop +/* 1066D0 802E4E50 00000000 */ nop /* 1066D4 802E4E54 3C014000 */ lui $at, 0x4000 /* 1066D8 802E4E58 44810000 */ mtc1 $at, $f0 -/* 1066DC 802E4E5C 00000000 */ nop +/* 1066DC 802E4E5C 00000000 */ nop /* 1066E0 802E4E60 E7A00010 */ swc1 $f0, 0x10($sp) /* 1066E4 802E4E64 8E250048 */ lw $a1, 0x48($s1) /* 1066E8 802E4E68 8E26004C */ lw $a2, 0x4c($s1) @@ -49,9 +49,9 @@ glabel func_802E4E04 /* 106734 802E4EB4 46020001 */ sub.s $f0, $f0, $f2 /* 106738 802E4EB8 3C014000 */ lui $at, 0x4000 /* 10673C 802E4EBC 44811000 */ mtc1 $at, $f2 -/* 106740 802E4EC0 00000000 */ nop +/* 106740 802E4EC0 00000000 */ nop /* 106744 802E4EC4 4602003E */ c.le.s $f0, $f2 -/* 106748 802E4EC8 00000000 */ nop +/* 106748 802E4EC8 00000000 */ nop /* 10674C 802E4ECC 45000106 */ bc1f .L802E52E8 /* 106750 802E4ED0 E6000014 */ swc1 $f0, 0x14($s0) /* 106754 802E4ED4 0220202D */ daddu $a0, $s1, $zero @@ -76,18 +76,18 @@ glabel func_802E4E04 /* 1067A0 802E4F20 3C0140C9 */ lui $at, 0x40c9 /* 1067A4 802E4F24 34210FD0 */ ori $at, $at, 0xfd0 /* 1067A8 802E4F28 44810000 */ mtc1 $at, $f0 -/* 1067AC 802E4F2C 00000000 */ nop +/* 1067AC 802E4F2C 00000000 */ nop /* 1067B0 802E4F30 46006302 */ mul.s $f12, $f12, $f0 -/* 1067B4 802E4F34 00000000 */ nop +/* 1067B4 802E4F34 00000000 */ nop /* 1067B8 802E4F38 3C0143B4 */ lui $at, 0x43b4 /* 1067BC 802E4F3C 4481A000 */ mtc1 $at, $f20 /* 1067C0 802E4F40 0C00A85B */ jal sin_rad /* 1067C4 802E4F44 46146303 */ div.s $f12, $f12, $f20 /* 1067C8 802E4F48 3C013F00 */ lui $at, 0x3f00 /* 1067CC 802E4F4C 44811000 */ mtc1 $at, $f2 -/* 1067D0 802E4F50 00000000 */ nop +/* 1067D0 802E4F50 00000000 */ nop /* 1067D4 802E4F54 46020002 */ mul.s $f0, $f0, $f2 -/* 1067D8 802E4F58 00000000 */ nop +/* 1067D8 802E4F58 00000000 */ nop /* 1067DC 802E4F5C C622004C */ lwc1 $f2, 0x4c($s1) /* 1067E0 802E4F60 46001080 */ add.s $f2, $f2, $f0 /* 1067E4 802E4F64 3C0141F0 */ lui $at, 0x41f0 @@ -96,9 +96,9 @@ glabel func_802E4E04 /* 1067F0 802E4F70 C6020020 */ lwc1 $f2, 0x20($s0) /* 1067F4 802E4F74 46001001 */ sub.s $f0, $f2, $f0 /* 1067F8 802E4F78 44802000 */ mtc1 $zero, $f4 -/* 1067FC 802E4F7C 00000000 */ nop +/* 1067FC 802E4F7C 00000000 */ nop /* 106800 802E4F80 4604003C */ c.lt.s $f0, $f4 -/* 106804 802E4F84 00000000 */ nop +/* 106804 802E4F84 00000000 */ nop /* 106808 802E4F88 45000003 */ bc1f .L802E4F98 /* 10680C 802E4F8C E6000020 */ swc1 $f0, 0x20($s0) /* 106810 802E4F90 46140000 */ add.s $f0, $f0, $f20 @@ -113,7 +113,7 @@ glabel func_802E4E04 /* 106830 802E4FB0 C6000054 */ lwc1 $f0, 0x54($s0) /* 106834 802E4FB4 46020000 */ add.s $f0, $f0, $f2 /* 106838 802E4FB8 4600203E */ c.le.s $f4, $f0 -/* 10683C 802E4FBC 00000000 */ nop +/* 10683C 802E4FBC 00000000 */ nop /* 106840 802E4FC0 450000AC */ bc1f .L802E5274 /* 106844 802E4FC4 E6000054 */ swc1 $f0, 0x54($s0) /* 106848 802E4FC8 92020001 */ lbu $v0, 1($s0) @@ -126,7 +126,7 @@ glabel func_802E4E04 /* 106864 802E4FE4 A2000003 */ sb $zero, 3($s0) /* 106868 802E4FE8 24420005 */ addiu $v0, $v0, 5 /* 10686C 802E4FEC 44820000 */ mtc1 $v0, $f0 -/* 106870 802E4FF0 00000000 */ nop +/* 106870 802E4FF0 00000000 */ nop /* 106874 802E4FF4 46800020 */ cvt.s.w $f0, $f0 /* 106878 802E4FF8 0C03A8B3 */ jal recover_hp /* 10687C 802E4FFC E6000004 */ swc1 $f0, 4($s0) @@ -135,7 +135,7 @@ glabel func_802E4E04 /* 106888 802E5008 0C05272D */ jal play_sound /* 10688C 802E500C 24040131 */ addiu $a0, $zero, 0x131 /* 106890 802E5010 080B949D */ j .L802E5274 -/* 106894 802E5014 00000000 */ nop +/* 106894 802E5014 00000000 */ nop /* 106898 802E5018 C600001C */ lwc1 $f0, 0x1c($s0) /* 10689C 802E501C 3C014000 */ lui $at, 0x4000 /* 1068A0 802E5020 44811800 */ mtc1 $at, $f3 @@ -146,7 +146,7 @@ glabel func_802E4E04 /* 1068B4 802E5034 44811000 */ mtc1 $at, $f2 /* 1068B8 802E5038 46200020 */ cvt.s.d $f0, $f0 /* 1068BC 802E503C 4600103E */ c.le.s $f2, $f0 -/* 1068C0 802E5040 00000000 */ nop +/* 1068C0 802E5040 00000000 */ nop /* 1068C4 802E5044 45000002 */ bc1f .L802E5050 /* 1068C8 802E5048 E600001C */ swc1 $f0, 0x1c($s0) /* 1068CC 802E504C E602001C */ swc1 $f2, 0x1c($s0) @@ -154,13 +154,13 @@ glabel func_802E4E04 /* 1068D0 802E5050 C6020018 */ lwc1 $f2, 0x18($s0) /* 1068D4 802E5054 3C014190 */ lui $at, 0x4190 /* 1068D8 802E5058 44810000 */ mtc1 $at, $f0 -/* 1068DC 802E505C 00000000 */ nop +/* 1068DC 802E505C 00000000 */ nop /* 1068E0 802E5060 46001000 */ add.s $f0, $f2, $f0 /* 1068E4 802E5064 3C0143B4 */ lui $at, 0x43b4 /* 1068E8 802E5068 4481B000 */ mtc1 $at, $f22 -/* 1068EC 802E506C 00000000 */ nop +/* 1068EC 802E506C 00000000 */ nop /* 1068F0 802E5070 4600B03E */ c.le.s $f22, $f0 -/* 1068F4 802E5074 00000000 */ nop +/* 1068F4 802E5074 00000000 */ nop /* 1068F8 802E5078 45000003 */ bc1f .L802E5088 /* 1068FC 802E507C E6000018 */ swc1 $f0, 0x18($s0) /* 106900 802E5080 46160001 */ sub.s $f0, $f0, $f22 @@ -170,17 +170,17 @@ glabel func_802E4E04 /* 10690C 802E508C 3C0140C9 */ lui $at, 0x40c9 /* 106910 802E5090 34210FD0 */ ori $at, $at, 0xfd0 /* 106914 802E5094 4481A000 */ mtc1 $at, $f20 -/* 106918 802E5098 00000000 */ nop +/* 106918 802E5098 00000000 */ nop /* 10691C 802E509C 46146302 */ mul.s $f12, $f12, $f20 -/* 106920 802E50A0 00000000 */ nop +/* 106920 802E50A0 00000000 */ nop /* 106924 802E50A4 0C00A85B */ jal sin_rad /* 106928 802E50A8 46166303 */ div.s $f12, $f12, $f22 /* 10692C 802E50AC C60C0018 */ lwc1 $f12, 0x18($s0) /* 106930 802E50B0 46146302 */ mul.s $f12, $f12, $f20 -/* 106934 802E50B4 00000000 */ nop +/* 106934 802E50B4 00000000 */ nop /* 106938 802E50B8 C602001C */ lwc1 $f2, 0x1c($s0) /* 10693C 802E50BC 46001502 */ mul.s $f20, $f2, $f0 -/* 106940 802E50C0 00000000 */ nop +/* 106940 802E50C0 00000000 */ nop /* 106944 802E50C4 0C00A874 */ jal cos_rad /* 106948 802E50C8 46166303 */ div.s $f12, $f12, $f22 /* 10694C 802E50CC C6060004 */ lwc1 $f6, 4($s0) @@ -195,7 +195,7 @@ glabel func_802E4E04 /* 106970 802E50F0 C602001C */ lwc1 $f2, 0x1c($s0) /* 106974 802E50F4 30630001 */ andi $v1, $v1, 1 /* 106978 802E50F8 46001082 */ mul.s $f2, $f2, $f0 -/* 10697C 802E50FC 00000000 */ nop +/* 10697C 802E50FC 00000000 */ nop /* 106980 802E5100 1060000F */ beqz $v1, .L802E5140 /* 106984 802E5104 A2020003 */ sb $v0, 3($s0) /* 106988 802E5108 C6400028 */ lwc1 $f0, 0x28($s2) @@ -216,11 +216,11 @@ glabel func_802E4E04 /* 1069C0 802E5140 C6000004 */ lwc1 $f0, 4($s0) /* 1069C4 802E5144 3C0141A0 */ lui $at, 0x41a0 /* 1069C8 802E5148 44811000 */ mtc1 $at, $f2 -/* 1069CC 802E514C 00000000 */ nop +/* 1069CC 802E514C 00000000 */ nop /* 1069D0 802E5150 4602003C */ c.lt.s $f0, $f2 -/* 1069D4 802E5154 00000000 */ nop +/* 1069D4 802E5154 00000000 */ nop /* 1069D8 802E5158 45000005 */ bc1f .L802E5170 -/* 1069DC 802E515C 00000000 */ nop +/* 1069DC 802E515C 00000000 */ nop /* 1069E0 802E5160 92020001 */ lbu $v0, 1($s0) /* 1069E4 802E5164 E6020004 */ swc1 $f2, 4($s0) /* 1069E8 802E5168 24420001 */ addiu $v0, $v0, 1 @@ -230,18 +230,18 @@ glabel func_802E4E04 /* 1069F4 802E5174 3C0140C9 */ lui $at, 0x40c9 /* 1069F8 802E5178 34210FD0 */ ori $at, $at, 0xfd0 /* 1069FC 802E517C 44810000 */ mtc1 $at, $f0 -/* 106A00 802E5180 00000000 */ nop +/* 106A00 802E5180 00000000 */ nop /* 106A04 802E5184 46006302 */ mul.s $f12, $f12, $f0 -/* 106A08 802E5188 00000000 */ nop +/* 106A08 802E5188 00000000 */ nop /* 106A0C 802E518C 3C0143B4 */ lui $at, 0x43b4 /* 106A10 802E5190 4481A000 */ mtc1 $at, $f20 /* 106A14 802E5194 0C00A85B */ jal sin_rad /* 106A18 802E5198 46146303 */ div.s $f12, $f12, $f20 /* 106A1C 802E519C 3C013F00 */ lui $at, 0x3f00 /* 106A20 802E51A0 44811000 */ mtc1 $at, $f2 -/* 106A24 802E51A4 00000000 */ nop +/* 106A24 802E51A4 00000000 */ nop /* 106A28 802E51A8 46020002 */ mul.s $f0, $f0, $f2 -/* 106A2C 802E51AC 00000000 */ nop +/* 106A2C 802E51AC 00000000 */ nop /* 106A30 802E51B0 C622004C */ lwc1 $f2, 0x4c($s1) /* 106A34 802E51B4 46001080 */ add.s $f2, $f2, $f0 /* 106A38 802E51B8 3C0141F0 */ lui $at, 0x41f0 @@ -250,9 +250,9 @@ glabel func_802E4E04 /* 106A44 802E51C4 C6000020 */ lwc1 $f0, 0x20($s0) /* 106A48 802E51C8 46040081 */ sub.s $f2, $f0, $f4 /* 106A4C 802E51CC 44800000 */ mtc1 $zero, $f0 -/* 106A50 802E51D0 00000000 */ nop +/* 106A50 802E51D0 00000000 */ nop /* 106A54 802E51D4 4600103C */ c.lt.s $f2, $f0 -/* 106A58 802E51D8 00000000 */ nop +/* 106A58 802E51D8 00000000 */ nop /* 106A5C 802E51DC 45000003 */ bc1f .L802E51EC /* 106A60 802E51E0 E6020020 */ swc1 $f2, 0x20($s0) /* 106A64 802E51E4 46141000 */ add.s $f0, $f2, $f20 @@ -266,7 +266,7 @@ glabel func_802E4E04 /* 106A80 802E5200 46220000 */ add.d $f0, $f0, $f2 /* 106A84 802E5204 46200020 */ cvt.s.d $f0, $f0 /* 106A88 802E5208 4600203C */ c.lt.s $f4, $f0 -/* 106A8C 802E520C 00000000 */ nop +/* 106A8C 802E520C 00000000 */ nop /* 106A90 802E5210 45000002 */ bc1f .L802E521C /* 106A94 802E5214 E6000054 */ swc1 $f0, 0x54($s0) /* 106A98 802E5218 E6040054 */ swc1 $f4, 0x54($s0) @@ -275,7 +275,7 @@ glabel func_802E4E04 /* 106AA0 802E5220 C6000054 */ lwc1 $f0, 0x54($s0) /* 106AA4 802E5224 46001000 */ add.s $f0, $f2, $f0 /* 106AA8 802E5228 4600A03E */ c.le.s $f20, $f0 -/* 106AAC 802E522C 00000000 */ nop +/* 106AAC 802E522C 00000000 */ nop /* 106AB0 802E5230 45000003 */ bc1f .L802E5240 /* 106AB4 802E5234 E6200064 */ swc1 $f0, 0x64($s1) /* 106AB8 802E5238 46140001 */ sub.s $f0, $f0, $f20 @@ -308,7 +308,7 @@ glabel func_802E4E04 /* 106B1C 802E529C 50400012 */ beql $v0, $zero, .L802E52E8 /* 106B20 802E52A0 A6000024 */ sh $zero, 0x24($s0) /* 106B24 802E52A4 080B94BA */ j .L802E52E8 -/* 106B28 802E52A8 00000000 */ nop +/* 106B28 802E52A8 00000000 */ nop /* 106B2C 802E52AC 8E420004 */ lw $v0, 4($s2) /* 106B30 802E52B0 2403FDFF */ addiu $v1, $zero, -0x201 /* 106B34 802E52B4 00431024 */ and $v0, $v0, $v1 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5308.s b/asm/nonmatchings/code_105700_len_2130/func_802E5308.s index fc8658d2c0..a435f68927 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5308.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5308.s @@ -5,7 +5,7 @@ glabel func_802E5308 /* 106B88 802E5308 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 106B8C 802E530C AFBF0010 */ sw $ra, 0x10($sp) /* 106B90 802E5310 0C0B8D94 */ jal func_802E3650 -/* 106B94 802E5314 00000000 */ nop +/* 106B94 802E5314 00000000 */ nop /* 106B98 802E5318 8FBF0010 */ lw $ra, 0x10($sp) /* 106B9C 802E531C 03E00008 */ jr $ra /* 106BA0 802E5320 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5324.s b/asm/nonmatchings/code_105700_len_2130/func_802E5324.s index 6344bfccde..8e26870b00 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5324.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5324.s @@ -15,7 +15,7 @@ glabel func_802E5324 /* 106BCC 802E534C 44802000 */ mtc1 $zero, $f4 /* 106BD0 802E5350 460000A1 */ cvt.d.s $f2, $f0 /* 106BD4 802E5354 4624103C */ c.lt.d $f2, $f4 -/* 106BD8 802E5358 00000000 */ nop +/* 106BD8 802E5358 00000000 */ nop /* 106BDC 802E535C 45010026 */ bc1t .L802E53F8 /* 106BE0 802E5360 24020001 */ addiu $v0, $zero, 1 /* 106BE4 802E5364 92030008 */ lbu $v1, 8($s0) @@ -24,14 +24,14 @@ glabel func_802E5324 /* 106BF0 802E5370 50400005 */ beql $v0, $zero, .L802E5388 /* 106BF4 802E5374 28620011 */ slti $v0, $v1, 0x11 /* 106BF8 802E5378 10600007 */ beqz $v1, .L802E5398 -/* 106BFC 802E537C 00000000 */ nop +/* 106BFC 802E537C 00000000 */ nop /* 106C00 802E5380 080B94FC */ j .L802E53F0 /* 106C04 802E5384 A2000008 */ sb $zero, 8($s0) .L802E5388: /* 106C08 802E5388 50400019 */ beql $v0, $zero, .L802E53F0 /* 106C0C 802E538C A2000008 */ sb $zero, 8($s0) /* 106C10 802E5390 080B94F9 */ j .L802E53E4 -/* 106C14 802E5394 00000000 */ nop +/* 106C14 802E5394 00000000 */ nop .L802E5398: /* 106C18 802E5398 3C01802F */ lui $at, %hi(D_802EB298) /* 106C1C 802E539C D420B298 */ ldc1 $f0, %lo(D_802EB298)($at) @@ -46,12 +46,12 @@ glabel func_802E5324 /* 106C3C 802E53BC E6200054 */ swc1 $f0, 0x54($s1) /* 106C40 802E53C0 46000021 */ cvt.d.s $f0, $f0 /* 106C44 802E53C4 4624003E */ c.le.d $f0, $f4 -/* 106C48 802E53C8 00000000 */ nop +/* 106C48 802E53C8 00000000 */ nop /* 106C4C 802E53CC 45000008 */ bc1f .L802E53F0 -/* 106C50 802E53D0 00000000 */ nop +/* 106C50 802E53D0 00000000 */ nop /* 106C54 802E53D4 3C013F80 */ lui $at, 0x3f80 /* 106C58 802E53D8 44810000 */ mtc1 $at, $f0 -/* 106C5C 802E53DC 00000000 */ nop +/* 106C5C 802E53DC 00000000 */ nop .L802E53E0: /* 106C60 802E53E0 E6200054 */ swc1 $f0, 0x54($s1) .L802E53E4: diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E540C.s b/asm/nonmatchings/code_105700_len_2130/func_802E540C.s index 02dbecf3b6..c9a7f02a25 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E540C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E540C.s @@ -5,7 +5,7 @@ glabel func_802E540C /* 106C8C 802E540C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 106C90 802E5410 AFBF0010 */ sw $ra, 0x10($sp) /* 106C94 802E5414 0C0B92C4 */ jal func_802E4B10 -/* 106C98 802E5418 00000000 */ nop +/* 106C98 802E5418 00000000 */ nop /* 106C9C 802E541C 8FBF0010 */ lw $ra, 0x10($sp) /* 106CA0 802E5420 03E00008 */ jr $ra /* 106CA4 802E5424 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E54A8.s b/asm/nonmatchings/code_105700_len_2130/func_802E54A8.s index 365d2fd110..cff23839c9 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E54A8.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E54A8.s @@ -7,7 +7,7 @@ glabel func_802E54A8 /* 106D30 802E54B0 24A5A760 */ addiu $a1, $a1, %lo(D_802EA760) /* 106D34 802E54B4 AFBF0010 */ sw $ra, 0x10($sp) /* 106D38 802E54B8 0C0442F3 */ jal func_80110BCC -/* 106D3C 802E54BC 00000000 */ nop +/* 106D3C 802E54BC 00000000 */ nop /* 106D40 802E54C0 8FBF0010 */ lw $ra, 0x10($sp) /* 106D44 802E54C4 03E00008 */ jr $ra /* 106D48 802E54C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s index 66549926ab..fa64b9dc23 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s @@ -31,7 +31,7 @@ glabel func_802E54CC /* 106DB4 802E5534 0C051514 */ jal set_global_flag /* 106DB8 802E5538 34845BE0 */ ori $a0, $a0, 0x5be0 /* 106DBC 802E553C 080B9553 */ j .L802E554C -/* 106DC0 802E5540 00000000 */ nop +/* 106DC0 802E5540 00000000 */ nop .L802E5544: /* 106DC4 802E5544 0C043F5A */ jal func_8010FD68 /* 106DC8 802E5548 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E555C.s b/asm/nonmatchings/code_105700_len_2130/func_802E555C.s index 6286d8ce26..5189c5a036 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E555C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E555C.s @@ -8,7 +8,7 @@ glabel func_802E555C /* 106DE8 802E5568 1040000C */ beqz $v0, .L802E559C /* 106DEC 802E556C AFBF0010 */ sw $ra, 0x10($sp) /* 106DF0 802E5570 0C043F5A */ jal func_8010FD68 -/* 106DF4 802E5574 00000000 */ nop +/* 106DF4 802E5574 00000000 */ nop /* 106DF8 802E5578 0C009C22 */ jal func_80027088 /* 106DFC 802E557C 0000202D */ daddu $a0, $zero, $zero /* 106E00 802E5580 3C02800A */ lui $v0, %hi(D_8009A650) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5648.s b/asm/nonmatchings/code_105700_len_2130/func_802E5648.s index ca92f3544e..fa007fbc1f 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5648.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5648.s @@ -7,8 +7,8 @@ glabel func_802E5648 /* 106ED0 802E5650 24A5A7BC */ addiu $a1, $a1, %lo(D_802EA7BC) /* 106ED4 802E5654 AFBF0010 */ sw $ra, 0x10($sp) /* 106ED8 802E5658 0C0B956A */ jal func_802E55A8 -/* 106EDC 802E565C 00000000 */ nop +/* 106EDC 802E565C 00000000 */ nop /* 106EE0 802E5660 8FBF0010 */ lw $ra, 0x10($sp) /* 106EE4 802E5664 03E00008 */ jr $ra /* 106EE8 802E5668 27BD0018 */ addiu $sp, $sp, 0x18 -/* 106EEC 802E566C 00000000 */ nop +/* 106EEC 802E566C 00000000 */ nop diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5690.s b/asm/nonmatchings/code_105700_len_2130/func_802E5690.s index a48eb50f5b..22aaf5c254 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5690.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5690.s @@ -5,13 +5,13 @@ glabel func_802E5690 /* 106F10 802E5690 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 106F14 802E5694 AFBF0010 */ sw $ra, 0x10($sp) /* 106F18 802E5698 0C04417A */ jal get_entity_by_index -/* 106F1C 802E569C 00000000 */ nop +/* 106F1C 802E569C 00000000 */ nop /* 106F20 802E56A0 8C420040 */ lw $v0, 0x40($v0) /* 106F24 802E56A4 84440012 */ lh $a0, 0x12($v0) /* 106F28 802E56A8 04800006 */ bltz $a0, .L802E56C4 -/* 106F2C 802E56AC 00000000 */ nop +/* 106F2C 802E56AC 00000000 */ nop /* 106F30 802E56B0 0C04417A */ jal get_entity_by_index -/* 106F34 802E56B4 00000000 */ nop +/* 106F34 802E56B4 00000000 */ nop /* 106F38 802E56B8 8C430040 */ lw $v1, 0x40($v0) /* 106F3C 802E56BC 24020001 */ addiu $v0, $zero, 1 /* 106F40 802E56C0 A062000A */ sb $v0, 0xa($v1) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E56D0.s b/asm/nonmatchings/code_105700_len_2130/func_802E56D0.s index 26511385c1..1beb1d1f3c 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E56D0.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E56D0.s @@ -5,7 +5,7 @@ glabel func_802E56D0 /* 106F50 802E56D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 106F54 802E56D4 AFBF0010 */ sw $ra, 0x10($sp) /* 106F58 802E56D8 0C0B8D94 */ jal func_802E3650 -/* 106F5C 802E56DC 00000000 */ nop +/* 106F5C 802E56DC 00000000 */ nop /* 106F60 802E56E0 8FBF0010 */ lw $ra, 0x10($sp) /* 106F64 802E56E4 03E00008 */ jr $ra /* 106F68 802E56E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E56EC.s b/asm/nonmatchings/code_105700_len_2130/func_802E56EC.s index 257adb96dc..bdf1994fbc 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E56EC.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E56EC.s @@ -11,7 +11,7 @@ glabel func_802E56EC /* 106F84 802E5704 9603000A */ lhu $v1, 0xa($s0) /* 106F88 802E5708 3402FFFF */ ori $v0, $zero, 0xffff /* 106F8C 802E570C 1062001A */ beq $v1, $v0, .L802E5778 -/* 106F90 802E5710 00000000 */ nop +/* 106F90 802E5710 00000000 */ nop /* 106F94 802E5714 0C05152F */ jal get_global_flag /* 106F98 802E5718 0060202D */ daddu $a0, $v1, $zero /* 106F9C 802E571C 14400016 */ bnez $v0, .L802E5778 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E578C.s b/asm/nonmatchings/code_105700_len_2130/func_802E578C.s index 149e4490ae..0a51cbb207 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E578C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E578C.s @@ -12,7 +12,7 @@ glabel func_802E578C /* 107028 802E57A8 C6000064 */ lwc1 $f0, 0x64($s0) /* 10702C 802E57AC 3C014334 */ lui $at, 0x4334 /* 107030 802E57B0 44811000 */ mtc1 $at, $f2 -/* 107034 802E57B4 00000000 */ nop +/* 107034 802E57B4 00000000 */ nop /* 107038 802E57B8 46020000 */ add.s $f0, $f0, $f2 /* 10703C 802E57BC 3402FFFF */ ori $v0, $zero, 0xffff /* 107040 802E57C0 E6000064 */ swc1 $f0, 0x64($s0) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E57E4.s b/asm/nonmatchings/code_105700_len_2130/func_802E57E4.s index 48dd2d7b38..572ad6328e 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E57E4.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E57E4.s @@ -5,7 +5,7 @@ glabel func_802E57E4 /* 107064 802E57E4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 107068 802E57E8 AFBF0010 */ sw $ra, 0x10($sp) /* 10706C 802E57EC 0C0B95E3 */ jal func_802E578C -/* 107070 802E57F0 00000000 */ nop +/* 107070 802E57F0 00000000 */ nop /* 107074 802E57F4 8FBF0010 */ lw $ra, 0x10($sp) /* 107078 802E57F8 03E00008 */ jr $ra /* 10707C 802E57FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5800.s b/asm/nonmatchings/code_105700_len_2130/func_802E5800.s index 74372bd9b6..d308b3cf3b 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5800.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5800.s @@ -5,7 +5,7 @@ glabel func_802E5800 /* 107080 802E5800 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 107084 802E5804 AFBF0010 */ sw $ra, 0x10($sp) /* 107088 802E5808 0C0B95E3 */ jal func_802E578C -/* 10708C 802E580C 00000000 */ nop +/* 10708C 802E580C 00000000 */ nop /* 107090 802E5810 8FBF0010 */ lw $ra, 0x10($sp) /* 107094 802E5814 03E00008 */ jr $ra /* 107098 802E5818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5E50.s b/asm/nonmatchings/code_105700_len_2130/func_802E5E50.s index 8dfe7e80e9..19243ca3aa 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5E50.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5E50.s @@ -36,11 +36,11 @@ glabel func_802E5E50 .L802E5EC8: /* 107748 802E5EC8 9202000A */ lbu $v0, 0xa($s0) /* 10774C 802E5ECC 1440001B */ bnez $v0, .L802E5F3C -/* 107750 802E5ED0 00000000 */ nop +/* 107750 802E5ED0 00000000 */ nop /* 107754 802E5ED4 3C02800A */ lui $v0, %hi(D_8009A650) /* 107758 802E5ED8 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) /* 10775C 802E5EDC 14400017 */ bnez $v0, .L802E5F3C -/* 107760 802E5EE0 00000000 */ nop +/* 107760 802E5EE0 00000000 */ nop /* 107764 802E5EE4 92020002 */ lbu $v0, 2($s0) /* 107768 802E5EE8 2442FFFF */ addiu $v0, $v0, -1 /* 10776C 802E5EEC A2020002 */ sb $v0, 2($s0) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s b/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s index 1398b65e75..1c73fddfd4 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E5F7C.s @@ -13,5 +13,5 @@ glabel func_802E5F7C /* 10781C 802E5F9C 2442586C */ addiu $v0, $v0, %lo(func_802E586C) /* 107820 802E5FA0 03E00008 */ jr $ra /* 107824 802E5FA4 AC82003C */ sw $v0, 0x3c($a0) -/* 107828 802E5FA8 00000000 */ nop -/* 10782C 802E5FAC 00000000 */ nop +/* 107828 802E5FA8 00000000 */ nop +/* 10782C 802E5FAC 00000000 */ nop diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s b/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s index 9e2a47cd97..f3ed004fca 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E5FB0.s @@ -11,7 +11,7 @@ glabel func_802E5FB0 /* 107848 802E5FC8 808300B4 */ lb $v1, 0xb4($a0) /* 10784C 802E5FCC 24020021 */ addiu $v0, $zero, 0x21 /* 107850 802E5FD0 10620020 */ beq $v1, $v0, .L802E6054 -/* 107854 802E5FD4 00000000 */ nop +/* 107854 802E5FD4 00000000 */ nop /* 107858 802E5FD8 92020006 */ lbu $v0, 6($s0) /* 10785C 802E5FDC 30420001 */ andi $v0, $v0, 1 /* 107860 802E5FE0 1040001C */ beqz $v0, .L802E6054 @@ -27,11 +27,11 @@ glabel func_802E5FB0 /* 107888 802E6008 3C050000 */ lui $a1, 0 /* 10788C 802E600C 24A501E4 */ addiu $a1, $a1, 0x1e4 /* 107890 802E6010 0C048052 */ jal play_model_animation -/* 107894 802E6014 00000000 */ nop +/* 107894 802E6014 00000000 */ nop /* 107898 802E6018 0C04419E */ jal func_80110678 /* 10789C 802E601C 0200202D */ daddu $a0, $s0, $zero /* 1078A0 802E6020 10400003 */ beqz $v0, .L802E6030 -/* 1078A4 802E6024 00000000 */ nop +/* 1078A4 802E6024 00000000 */ nop /* 1078A8 802E6028 0C039769 */ jal set_action_state /* 1078AC 802E602C 24040026 */ addiu $a0, $zero, 0x26 .L802E6030: diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E6064.s b/asm/nonmatchings/code_107830_len_e70/func_802E6064.s index cef8d3b286..32bb3cd52c 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E6064.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E6064.s @@ -17,7 +17,7 @@ glabel func_802E6064 /* 107914 802E6094 92020006 */ lbu $v0, 6($s0) /* 107918 802E6098 30420001 */ andi $v0, $v0, 1 /* 10791C 802E609C 10400019 */ beqz $v0, .L802E6104 -/* 107920 802E60A0 00000000 */ nop +/* 107920 802E60A0 00000000 */ nop /* 107924 802E60A4 8C820000 */ lw $v0, ($a0) /* 107928 802E60A8 28420046 */ slti $v0, $v0, 0x46 /* 10792C 802E60AC 14400002 */ bnez $v0, .L802E60B8 @@ -28,7 +28,7 @@ glabel func_802E6064 /* 10793C 802E60BC 3C050000 */ lui $a1, 0 /* 107940 802E60C0 24A501E4 */ addiu $a1, $a1, 0x1e4 /* 107944 802E60C4 0C048052 */ jal play_model_animation -/* 107948 802E60C8 00000000 */ nop +/* 107948 802E60C8 00000000 */ nop /* 10794C 802E60CC 0C04419E */ jal func_80110678 /* 107950 802E60D0 0200202D */ daddu $a0, $s0, $zero /* 107954 802E60D4 0C043F5A */ jal func_8010FD68 @@ -41,7 +41,7 @@ glabel func_802E6064 /* 107970 802E60F0 0C052757 */ jal play_sound_at_position /* 107974 802E60F4 0000282D */ daddu $a1, $zero, $zero /* 107978 802E60F8 0C03805E */ jal disable_player_input -/* 10797C 802E60FC 00000000 */ nop +/* 10797C 802E60FC 00000000 */ nop /* 107980 802E6100 AE200054 */ sw $zero, 0x54($s1) .L802E6104: /* 107984 802E6104 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E6178.s b/asm/nonmatchings/code_107830_len_e70/func_802E6178.s index 1a3f176a5f..4c4734c3f8 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E6178.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E6178.s @@ -5,7 +5,7 @@ glabel func_802E6178 /* 1079F8 802E6178 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1079FC 802E617C AFBF0010 */ sw $ra, 0x10($sp) /* 107A00 802E6180 0C038069 */ jal enable_player_input -/* 107A04 802E6184 00000000 */ nop +/* 107A04 802E6184 00000000 */ nop /* 107A08 802E6188 8FBF0010 */ lw $ra, 0x10($sp) /* 107A0C 802E618C 03E00008 */ jr $ra /* 107A10 802E6190 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s b/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s index ff1974e290..eacbfc76dd 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E61B0.s @@ -15,9 +15,9 @@ glabel func_802E61B0 /* 107A58 802E61D8 C662004C */ lwc1 $f2, 0x4c($s3) /* 107A5C 802E61DC C6800024 */ lwc1 $f0, 0x24($s4) /* 107A60 802E61E0 46001032 */ c.eq.s $f2, $f0 -/* 107A64 802E61E4 00000000 */ nop +/* 107A64 802E61E4 00000000 */ nop /* 107A68 802E61E8 45010041 */ bc1t .L802E62F0 -/* 107A6C 802E61EC 00000000 */ nop +/* 107A6C 802E61EC 00000000 */ nop /* 107A70 802E61F0 0C019D28 */ jal guMtxIdentF /* 107A74 802E61F4 27A40010 */ addiu $a0, $sp, 0x10 /* 107A78 802E61F8 27B00050 */ addiu $s0, $sp, 0x50 @@ -92,7 +92,7 @@ glabel func_802E61B0 /* 107B88 802E6308 3C04800A */ lui $a0, %hi(gMasterGfxPos) /* 107B8C 802E630C 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* 107B90 802E6310 0C0475CB */ jal func_8011D72C -/* 107B94 802E6314 00000000 */ nop +/* 107B94 802E6314 00000000 */ nop /* 107B98 802E6318 8FBF00A4 */ lw $ra, 0xa4($sp) /* 107B9C 802E631C 8FB400A0 */ lw $s4, 0xa0($sp) /* 107BA0 802E6320 8FB3009C */ lw $s3, 0x9c($sp) diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E6338.s b/asm/nonmatchings/code_107830_len_e70/func_802E6338.s index ed7fc3440b..bfdd10d1e8 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E6338.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E6338.s @@ -9,11 +9,11 @@ glabel func_802E6338 /* 107BC8 802E6348 0C03A752 */ jal is_ability_active /* 107BCC 802E634C 24040029 */ addiu $a0, $zero, 0x29 /* 107BD0 802E6350 1040000B */ beqz $v0, .L802E6380 -/* 107BD4 802E6354 00000000 */ nop +/* 107BD4 802E6354 00000000 */ nop /* 107BD8 802E6358 0C05152F */ jal get_global_flag /* 107BDC 802E635C 96040006 */ lhu $a0, 6($s0) /* 107BE0 802E6360 14400007 */ bnez $v0, .L802E6380 -/* 107BE4 802E6364 00000000 */ nop +/* 107BE4 802E6364 00000000 */ nop /* 107BE8 802E6368 3C038016 */ lui $v1, %hi(D_8015A578) /* 107BEC 802E636C 2463A578 */ addiu $v1, $v1, %lo(D_8015A578) /* 107BF0 802E6370 80620002 */ lb $v0, 2($v1) diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E63A8.s b/asm/nonmatchings/code_107830_len_e70/func_802E63A8.s index 7142649397..079ac88148 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E63A8.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E63A8.s @@ -32,7 +32,7 @@ glabel func_802E63A8 /* 107C8C 802E640C AE40000C */ sw $zero, 0xc($s2) /* 107C90 802E6410 80620000 */ lb $v0, ($v1) /* 107C94 802E6414 10400050 */ beqz $v0, .L802E6558 -/* 107C98 802E6418 00000000 */ nop +/* 107C98 802E6418 00000000 */ nop /* 107C9C 802E641C C4600008 */ lwc1 $f0, 8($v1) /* 107CA0 802E6420 C662004C */ lwc1 $f2, 0x4c($s3) /* 107CA4 802E6424 46020001 */ sub.s $f0, $f0, $f2 @@ -42,7 +42,7 @@ glabel func_802E63A8 /* 107CB4 802E6434 46000021 */ cvt.d.s $f0, $f0 /* 107CB8 802E6438 46200005 */ abs.d $f0, $f0 /* 107CBC 802E643C 4622003E */ c.le.d $f0, $f2 -/* 107CC0 802E6440 00000000 */ nop +/* 107CC0 802E6440 00000000 */ nop /* 107CC4 802E6444 45000044 */ bc1f .L802E6558 /* 107CC8 802E6448 2402000A */ addiu $v0, $zero, 0xa /* 107CCC 802E644C A2420000 */ sb $v0, ($s2) @@ -51,10 +51,10 @@ glabel func_802E63A8 /* 107CD8 802E6458 C66E0050 */ lwc1 $f14, 0x50($s3) /* 107CDC 802E645C 4600010D */ trunc.w.s $f4, $f0 /* 107CE0 802E6460 44102000 */ mfc1 $s0, $f4 -/* 107CE4 802E6464 00000000 */ nop +/* 107CE4 802E6464 00000000 */ nop /* 107CE8 802E6468 2A020065 */ slti $v0, $s0, 0x65 /* 107CEC 802E646C 1040003A */ beqz $v0, .L802E6558 -/* 107CF0 802E6470 00000000 */ nop +/* 107CF0 802E6470 00000000 */ nop /* 107CF4 802E6474 92620006 */ lbu $v0, 6($s3) /* 107CF8 802E6478 30420001 */ andi $v0, $v0, 1 /* 107CFC 802E647C 10400005 */ beqz $v0, .L802E6494 @@ -62,7 +62,7 @@ glabel func_802E63A8 /* 107D04 802E6484 3C013F00 */ lui $at, 0x3f00 /* 107D08 802E6488 44810000 */ mtc1 $at, $f0 /* 107D0C 802E648C 080B9954 */ j .L802E6550 -/* 107D10 802E6490 00000000 */ nop +/* 107D10 802E6490 00000000 */ nop .L802E6494: /* 107D14 802E6494 0C0B9ADB */ jal func_802E6B6C /* 107D18 802E6498 0260202D */ daddu $a0, $s3, $zero @@ -71,13 +71,13 @@ glabel func_802E63A8 /* 107D24 802E64A4 3C013F00 */ lui $at, 0x3f00 /* 107D28 802E64A8 44810000 */ mtc1 $at, $f0 /* 107D2C 802E64AC 080B9954 */ j .L802E6550 -/* 107D30 802E64B0 00000000 */ nop +/* 107D30 802E64B0 00000000 */ nop .L802E64B4: /* 107D34 802E64B4 0C00F475 */ jal func_8003D1D4 /* 107D38 802E64B8 92640004 */ lbu $a0, 4($s3) /* 107D3C 802E64BC 0040882D */ daddu $s1, $v0, $zero /* 107D40 802E64C0 06200016 */ bltz $s1, .L802E651C -/* 107D44 802E64C4 00000000 */ nop +/* 107D44 802E64C4 00000000 */ nop /* 107D48 802E64C8 0C00E2B7 */ jal get_npc_by_index /* 107D4C 802E64CC 0220202D */ daddu $a0, $s1, $zero /* 107D50 802E64D0 0040802D */ daddu $s0, $v0, $zero @@ -109,7 +109,7 @@ glabel func_802E63A8 /* 107DB4 802E6534 3C013F00 */ lui $at, 0x3f00 /* 107DB8 802E6538 44810000 */ mtc1 $at, $f0 /* 107DBC 802E653C 080B9954 */ j .L802E6550 -/* 107DC0 802E6540 00000000 */ nop +/* 107DC0 802E6540 00000000 */ nop .L802E6544: /* 107DC4 802E6544 3C014120 */ lui $at, 0x4120 /* 107DC8 802E6548 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E6574.s b/asm/nonmatchings/code_107830_len_e70/func_802E6574.s index ed2733e293..87ab998647 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E6574.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E6574.s @@ -21,23 +21,23 @@ glabel func_802E6574 /* 107E34 802E65B4 44811000 */ mtc1 $at, $f2 /* 107E38 802E65B8 46000106 */ mov.s $f4, $f0 /* 107E3C 802E65BC 4602203C */ c.lt.s $f4, $f2 -/* 107E40 802E65C0 00000000 */ nop +/* 107E40 802E65C0 00000000 */ nop /* 107E44 802E65C4 4501000F */ bc1t .L802E6604 -/* 107E48 802E65C8 00000000 */ nop +/* 107E48 802E65C8 00000000 */ nop /* 107E4C 802E65CC 3C014334 */ lui $at, 0x4334 /* 107E50 802E65D0 44810000 */ mtc1 $at, $f0 -/* 107E54 802E65D4 00000000 */ nop +/* 107E54 802E65D4 00000000 */ nop /* 107E58 802E65D8 4604003E */ c.le.s $f0, $f4 -/* 107E5C 802E65DC 00000000 */ nop +/* 107E5C 802E65DC 00000000 */ nop /* 107E60 802E65E0 4500000B */ bc1f .L802E6610 -/* 107E64 802E65E4 00000000 */ nop +/* 107E64 802E65E4 00000000 */ nop /* 107E68 802E65E8 3C014387 */ lui $at, 0x4387 /* 107E6C 802E65EC 44810000 */ mtc1 $at, $f0 -/* 107E70 802E65F0 00000000 */ nop +/* 107E70 802E65F0 00000000 */ nop /* 107E74 802E65F4 4600203C */ c.lt.s $f4, $f0 -/* 107E78 802E65F8 00000000 */ nop +/* 107E78 802E65F8 00000000 */ nop /* 107E7C 802E65FC 45000004 */ bc1f .L802E6610 -/* 107E80 802E6600 00000000 */ nop +/* 107E80 802E6600 00000000 */ nop .L802E6604: /* 107E84 802E6604 C6340068 */ lwc1 $f20, 0x68($s1) /* 107E88 802E6608 080B9986 */ j .L802E6618 @@ -54,7 +54,7 @@ glabel func_802E6574 /* 107EAC 802E662C 00220821 */ addu $at, $at, $v0 /* 107EB0 802E6630 8C22B2B0 */ lw $v0, %lo(D_802EB2B0)($at) /* 107EB4 802E6634 00400008 */ jr $v0 -/* 107EB8 802E6638 00000000 */ nop +/* 107EB8 802E6638 00000000 */ nop /* 107EBC 802E663C 0C05272D */ jal play_sound /* 107EC0 802E6640 240420AB */ addiu $a0, $zero, 0x20ab /* 107EC4 802E6644 24040001 */ addiu $a0, $zero, 1 @@ -69,7 +69,7 @@ glabel func_802E6574 /* 107EE8 802E6668 0C009C22 */ jal func_80027088 /* 107EEC 802E666C E6020030 */ swc1 $f2, 0x30($s0) /* 107EF0 802E6670 0C038045 */ jal disable_player_static_collisions -/* 107EF4 802E6674 00000000 */ nop +/* 107EF4 802E6674 00000000 */ nop /* 107EF8 802E6678 3C03800F */ lui $v1, %hi(gPlayerStatusPtr) /* 107EFC 802E667C 8C637B30 */ lw $v1, %lo(gPlayerStatusPtr)($v1) /* 107F00 802E6680 8C620004 */ lw $v0, 4($v1) @@ -94,7 +94,7 @@ glabel func_802E6574 /* 107F4C 802E66CC 46200020 */ cvt.s.d $f0, $f0 /* 107F50 802E66D0 44060000 */ mfc1 $a2, $f0 /* 107F54 802E66D4 0C04C6A5 */ jal make_item_entity_nodelay -/* 107F58 802E66D8 00000000 */ nop +/* 107F58 802E66D8 00000000 */ nop /* 107F5C 802E66DC AE020014 */ sw $v0, 0x14($s0) .L802E66E0: /* 107F60 802E66E0 8E220000 */ lw $v0, ($s1) @@ -106,22 +106,22 @@ glabel func_802E6574 /* 107F78 802E66F8 3C0140C9 */ lui $at, 0x40c9 /* 107F7C 802E66FC 34210FD0 */ ori $at, $at, 0xfd0 /* 107F80 802E6700 44810000 */ mtc1 $at, $f0 -/* 107F84 802E6704 00000000 */ nop +/* 107F84 802E6704 00000000 */ nop /* 107F88 802E6708 46006302 */ mul.s $f12, $f12, $f0 -/* 107F8C 802E670C 00000000 */ nop +/* 107F8C 802E670C 00000000 */ nop /* 107F90 802E6710 3C0143B4 */ lui $at, 0x43b4 /* 107F94 802E6714 4481B000 */ mtc1 $at, $f22 /* 107F98 802E6718 0C00A85B */ jal sin_rad /* 107F9C 802E671C 46166303 */ div.s $f12, $f12, $f22 /* 107FA0 802E6720 C6020028 */ lwc1 $f2, 0x28($s0) /* 107FA4 802E6724 46001082 */ mul.s $f2, $f2, $f0 -/* 107FA8 802E6728 00000000 */ nop +/* 107FA8 802E6728 00000000 */ nop /* 107FAC 802E672C C620004C */ lwc1 $f0, 0x4c($s1) /* 107FB0 802E6730 46020000 */ add.s $f0, $f0, $f2 /* 107FB4 802E6734 E620004C */ swc1 $f0, 0x4c($s1) /* 107FB8 802E6738 C6020024 */ lwc1 $f2, 0x24($s0) /* 107FBC 802E673C 4602003E */ c.le.s $f0, $f2 -/* 107FC0 802E6740 00000000 */ nop +/* 107FC0 802E6740 00000000 */ nop /* 107FC4 802E6744 45000006 */ bc1f .L802E6760 /* 107FC8 802E6748 2402000A */ addiu $v0, $zero, 0xa /* 107FCC 802E674C AE200068 */ sw $zero, 0x68($s1) @@ -133,13 +133,13 @@ glabel func_802E6574 /* 107FE0 802E6760 C600002C */ lwc1 $f0, 0x2c($s0) /* 107FE4 802E6764 3C014120 */ lui $at, 0x4120 /* 107FE8 802E6768 44811000 */ mtc1 $at, $f2 -/* 107FEC 802E676C 00000000 */ nop +/* 107FEC 802E676C 00000000 */ nop /* 107FF0 802E6770 46020000 */ add.s $f0, $f0, $f2 /* 107FF4 802E6774 3C014334 */ lui $at, 0x4334 /* 107FF8 802E6778 44811000 */ mtc1 $at, $f2 -/* 107FFC 802E677C 00000000 */ nop +/* 107FFC 802E677C 00000000 */ nop /* 108000 802E6780 4600103E */ c.le.s $f2, $f0 -/* 108004 802E6784 00000000 */ nop +/* 108004 802E6784 00000000 */ nop /* 108008 802E6788 45000007 */ bc1f .L802E67A8 /* 10800C 802E678C E600002C */ swc1 $f0, 0x2c($s0) /* 108010 802E6790 92020000 */ lbu $v0, ($s0) @@ -152,28 +152,28 @@ glabel func_802E6574 /* 108028 802E67A8 C602002C */ lwc1 $f2, 0x2c($s0) /* 10802C 802E67AC 3C0142DC */ lui $at, 0x42dc /* 108030 802E67B0 44810000 */ mtc1 $at, $f0 -/* 108034 802E67B4 00000000 */ nop +/* 108034 802E67B4 00000000 */ nop /* 108038 802E67B8 4602003C */ c.lt.s $f0, $f2 -/* 10803C 802E67BC 00000000 */ nop +/* 10803C 802E67BC 00000000 */ nop /* 108040 802E67C0 450000C4 */ bc1f .L802E6AD4 -/* 108044 802E67C4 00000000 */ nop +/* 108044 802E67C4 00000000 */ nop /* 108048 802E67C8 C6000030 */ lwc1 $f0, 0x30($s0) /* 10804C 802E67CC 4600A500 */ add.s $f20, $f20, $f0 /* 108050 802E67D0 4614B03E */ c.le.s $f22, $f20 -/* 108054 802E67D4 00000000 */ nop +/* 108054 802E67D4 00000000 */ nop /* 108058 802E67D8 450300BE */ bc1tl .L802E6AD4 /* 10805C 802E67DC 4616A501 */ sub.s $f20, $f20, $f22 /* 108060 802E67E0 080B9AB5 */ j .L802E6AD4 -/* 108064 802E67E4 00000000 */ nop +/* 108064 802E67E4 00000000 */ nop /* 108068 802E67E8 C6000030 */ lwc1 $f0, 0x30($s0) /* 10806C 802E67EC 3C014000 */ lui $at, 0x4000 /* 108070 802E67F0 44811000 */ mtc1 $at, $f2 -/* 108074 802E67F4 00000000 */ nop +/* 108074 802E67F4 00000000 */ nop /* 108078 802E67F8 46020001 */ sub.s $f0, $f0, $f2 /* 10807C 802E67FC 44801000 */ mtc1 $zero, $f2 -/* 108080 802E6800 00000000 */ nop +/* 108080 802E6800 00000000 */ nop /* 108084 802E6804 4602003E */ c.le.s $f0, $f2 -/* 108088 802E6808 00000000 */ nop +/* 108088 802E6808 00000000 */ nop /* 10808C 802E680C 45000002 */ bc1f .L802E6818 /* 108090 802E6810 E6000030 */ swc1 $f0, 0x30($s0) /* 108094 802E6814 E6020030 */ swc1 $f2, 0x30($s0) @@ -182,9 +182,9 @@ glabel func_802E6574 /* 10809C 802E681C 4600A500 */ add.s $f20, $f20, $f0 /* 1080A0 802E6820 3C0143B4 */ lui $at, 0x43b4 /* 1080A4 802E6824 44810000 */ mtc1 $at, $f0 -/* 1080A8 802E6828 00000000 */ nop +/* 1080A8 802E6828 00000000 */ nop /* 1080AC 802E682C 4614003E */ c.le.s $f0, $f20 -/* 1080B0 802E6830 00000000 */ nop +/* 1080B0 802E6830 00000000 */ nop /* 1080B4 802E6834 45030001 */ bc1tl .L802E683C /* 1080B8 802E6838 4600A501 */ sub.s $f20, $f20, $f0 .L802E683C: @@ -193,18 +193,18 @@ glabel func_802E6574 /* 1080C4 802E6844 A2020001 */ sb $v0, 1($s0) /* 1080C8 802E6848 00021600 */ sll $v0, $v0, 0x18 /* 1080CC 802E684C 1840004B */ blez $v0, .L802E697C -/* 1080D0 802E6850 00000000 */ nop +/* 1080D0 802E6850 00000000 */ nop /* 1080D4 802E6854 080B9AB5 */ j .L802E6AD4 -/* 1080D8 802E6858 00000000 */ nop +/* 1080D8 802E6858 00000000 */ nop /* 1080DC 802E685C C6000030 */ lwc1 $f0, 0x30($s0) /* 1080E0 802E6860 3C0140A0 */ lui $at, 0x40a0 /* 1080E4 802E6864 44811000 */ mtc1 $at, $f2 -/* 1080E8 802E6868 00000000 */ nop +/* 1080E8 802E6868 00000000 */ nop /* 1080EC 802E686C 46020001 */ sub.s $f0, $f0, $f2 /* 1080F0 802E6870 4480B000 */ mtc1 $zero, $f22 -/* 1080F4 802E6874 00000000 */ nop +/* 1080F4 802E6874 00000000 */ nop /* 1080F8 802E6878 4616003E */ c.le.s $f0, $f22 -/* 1080FC 802E687C 00000000 */ nop +/* 1080FC 802E687C 00000000 */ nop /* 108100 802E6880 45000002 */ bc1f .L802E688C /* 108104 802E6884 E6000030 */ swc1 $f0, 0x30($s0) /* 108108 802E6888 E6160030 */ swc1 $f22, 0x30($s0) @@ -213,9 +213,9 @@ glabel func_802E6574 /* 108110 802E6890 4600A500 */ add.s $f20, $f20, $f0 /* 108114 802E6894 3C0143B4 */ lui $at, 0x43b4 /* 108118 802E6898 44811000 */ mtc1 $at, $f2 -/* 10811C 802E689C 00000000 */ nop +/* 10811C 802E689C 00000000 */ nop /* 108120 802E68A0 4614103E */ c.le.s $f2, $f20 -/* 108124 802E68A4 00000000 */ nop +/* 108124 802E68A4 00000000 */ nop /* 108128 802E68A8 45030001 */ bc1tl .L802E68B0 /* 10812C 802E68AC 46001506 */ mov.s $f20, $f2 .L802E68B0: @@ -223,14 +223,14 @@ glabel func_802E6574 /* 108134 802E68B4 3C0140C9 */ lui $at, 0x40c9 /* 108138 802E68B8 34210FD0 */ ori $at, $at, 0xfd0 /* 10813C 802E68BC 44810000 */ mtc1 $at, $f0 -/* 108140 802E68C0 00000000 */ nop +/* 108140 802E68C0 00000000 */ nop /* 108144 802E68C4 46006302 */ mul.s $f12, $f12, $f0 -/* 108148 802E68C8 00000000 */ nop +/* 108148 802E68C8 00000000 */ nop /* 10814C 802E68CC 0C00A85B */ jal sin_rad /* 108150 802E68D0 46026303 */ div.s $f12, $f12, $f2 /* 108154 802E68D4 C6020028 */ lwc1 $f2, 0x28($s0) /* 108158 802E68D8 46001082 */ mul.s $f2, $f2, $f0 -/* 10815C 802E68DC 00000000 */ nop +/* 10815C 802E68DC 00000000 */ nop /* 108160 802E68E0 C620004C */ lwc1 $f0, 0x4c($s1) /* 108164 802E68E4 46020000 */ add.s $f0, $f0, $f2 /* 108168 802E68E8 3C014120 */ lui $at, 0x4120 @@ -240,9 +240,9 @@ glabel func_802E6574 /* 108178 802E68F8 46020000 */ add.s $f0, $f0, $f2 /* 10817C 802E68FC 3C014387 */ lui $at, 0x4387 /* 108180 802E6900 44811000 */ mtc1 $at, $f2 -/* 108184 802E6904 00000000 */ nop +/* 108184 802E6904 00000000 */ nop /* 108188 802E6908 4600103C */ c.lt.s $f2, $f0 -/* 10818C 802E690C 00000000 */ nop +/* 10818C 802E690C 00000000 */ nop /* 108190 802E6910 45000002 */ bc1f .L802E691C /* 108194 802E6914 E600002C */ swc1 $f0, 0x2c($s0) /* 108198 802E6918 E602002C */ swc1 $f2, 0x2c($s0) @@ -250,7 +250,7 @@ glabel func_802E6574 /* 10819C 802E691C C622004C */ lwc1 $f2, 0x4c($s1) /* 1081A0 802E6920 C6000024 */ lwc1 $f0, 0x24($s0) /* 1081A4 802E6924 4600103E */ c.le.s $f2, $f0 -/* 1081A8 802E6928 00000000 */ nop +/* 1081A8 802E6928 00000000 */ nop /* 1081AC 802E692C 45000069 */ bc1f .L802E6AD4 /* 1081B0 802E6930 0000202D */ daddu $a0, $zero, $zero /* 1081B4 802E6934 4600B506 */ mov.s $f20, $f22 @@ -270,7 +270,7 @@ glabel func_802E6574 /* 1081EC 802E696C 0C05272D */ jal play_sound /* 1081F0 802E6970 240420AC */ addiu $a0, $zero, 0x20ac /* 1081F4 802E6974 080B9AB5 */ j .L802E6AD4 -/* 1081F8 802E6978 00000000 */ nop +/* 1081F8 802E6978 00000000 */ nop .L802E697C: /* 1081FC 802E697C 92020000 */ lbu $v0, ($s0) /* 108200 802E6980 24420001 */ addiu $v0, $v0, 1 @@ -301,12 +301,12 @@ glabel func_802E6574 /* 108260 802E69E0 C620004C */ lwc1 $f0, 0x4c($s1) /* 108264 802E69E4 3C013F80 */ lui $at, 0x3f80 /* 108268 802E69E8 44811000 */ mtc1 $at, $f2 -/* 10826C 802E69EC 00000000 */ nop +/* 10826C 802E69EC 00000000 */ nop /* 108270 802E69F0 46020001 */ sub.s $f0, $f0, $f2 /* 108274 802E69F4 E620004C */ swc1 $f0, 0x4c($s1) /* 108278 802E69F8 C6020024 */ lwc1 $f2, 0x24($s0) /* 10827C 802E69FC 4602003E */ c.le.s $f0, $f2 -/* 108280 802E6A00 00000000 */ nop +/* 108280 802E6A00 00000000 */ nop /* 108284 802E6A04 45000033 */ bc1f .L802E6AD4 /* 108288 802E6A08 24030001 */ addiu $v1, $zero, 1 /* 10828C 802E6A0C E622004C */ swc1 $f2, 0x4c($s1) @@ -319,11 +319,11 @@ glabel func_802E6574 /* 1082A8 802E6A28 AE220000 */ sw $v0, ($s1) /* 1082AC 802E6A2C 82020002 */ lb $v0, 2($s0) /* 1082B0 802E6A30 10400028 */ beqz $v0, .L802E6AD4 -/* 1082B4 802E6A34 00000000 */ nop +/* 1082B4 802E6A34 00000000 */ nop /* 1082B8 802E6A38 0C038050 */ jal enable_player_static_collisions -/* 1082BC 802E6A3C 00000000 */ nop +/* 1082BC 802E6A3C 00000000 */ nop /* 1082C0 802E6A40 080B9AB5 */ j .L802E6AD4 -/* 1082C4 802E6A44 00000000 */ nop +/* 1082C4 802E6A44 00000000 */ nop /* 1082C8 802E6A48 92020001 */ lbu $v0, 1($s0) /* 1082CC 802E6A4C 2442FFFF */ addiu $v0, $v0, -1 /* 1082D0 802E6A50 A2020001 */ sb $v0, 1($s0) @@ -334,7 +334,7 @@ glabel func_802E6574 /* 1082E4 802E6A64 A2000000 */ sb $zero, ($s0) /* 1082E8 802E6A68 82020002 */ lb $v0, 2($s0) /* 1082EC 802E6A6C 10400009 */ beqz $v0, .L802E6A94 -/* 1082F0 802E6A70 00000000 */ nop +/* 1082F0 802E6A70 00000000 */ nop /* 1082F4 802E6A74 0C009C22 */ jal func_80027088 /* 1082F8 802E6A78 0000202D */ daddu $a0, $zero, $zero /* 1082FC 802E6A7C 3C02800F */ lui $v0, %hi(gPlayerStatusPtr) @@ -350,9 +350,9 @@ glabel func_802E6574 /* 108320 802E6AA0 AE220000 */ sw $v0, ($s1) /* 108324 802E6AA4 8E040008 */ lw $a0, 8($s0) /* 108328 802E6AA8 0480000A */ bltz $a0, .L802E6AD4 -/* 10832C 802E6AAC 00000000 */ nop +/* 10832C 802E6AAC 00000000 */ nop /* 108330 802E6AB0 0C00E2B7 */ jal get_npc_by_index -/* 108334 802E6AB4 00000000 */ nop +/* 108334 802E6AB4 00000000 */ nop /* 108338 802E6AB8 8C430000 */ lw $v1, ($v0) /* 10833C 802E6ABC 2404FDF7 */ addiu $a0, $zero, -0x209 /* 108340 802E6AC0 00641824 */ and $v1, $v1, $a0 @@ -367,9 +367,9 @@ glabel func_802E6574 .L802E6AE0: /* 108360 802E6AE0 8E040014 */ lw $a0, 0x14($s0) /* 108364 802E6AE4 04800019 */ bltz $a0, .L802E6B4C -/* 108368 802E6AE8 00000000 */ nop +/* 108368 802E6AE8 00000000 */ nop /* 10836C 802E6AEC 0C04C3D6 */ jal get_item_entity -/* 108370 802E6AF0 00000000 */ nop +/* 108370 802E6AF0 00000000 */ nop /* 108374 802E6AF4 0040182D */ daddu $v1, $v0, $zero /* 108378 802E6AF8 10600013 */ beqz $v1, .L802E6B48 /* 10837C 802E6AFC 2402FFFF */ addiu $v0, $zero, -1 diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s b/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s index 552883a65b..78ffef2996 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E6B6C.s @@ -12,7 +12,7 @@ glabel func_802E6B6C /* 108408 802E6B88 04800021 */ bltz $a0, .L802E6C10 /* 10840C 802E6B8C 0000102D */ daddu $v0, $zero, $zero /* 108410 802E6B90 0C04C3D6 */ jal get_item_entity -/* 108414 802E6B94 00000000 */ nop +/* 108414 802E6B94 00000000 */ nop /* 108418 802E6B98 5040001D */ beql $v0, $zero, .L802E6C10 /* 10841C 802E6B9C 0000102D */ daddu $v0, $zero, $zero /* 108420 802E6BA0 8C420000 */ lw $v0, ($v0) @@ -29,9 +29,9 @@ glabel func_802E6B6C /* 10844C 802E6BCC 46000021 */ cvt.d.s $f0, $f0 /* 108450 802E6BD0 46200005 */ abs.d $f0, $f0 /* 108454 802E6BD4 4624003E */ c.le.d $f0, $f4 -/* 108458 802E6BD8 00000000 */ nop +/* 108458 802E6BD8 00000000 */ nop /* 10845C 802E6BDC 4500000C */ bc1f .L802E6C10 -/* 108460 802E6BE0 00000000 */ nop +/* 108460 802E6BE0 00000000 */ nop /* 108464 802E6BE4 C6200050 */ lwc1 $f0, 0x50($s1) /* 108468 802E6BE8 C6020020 */ lwc1 $f2, 0x20($s0) /* 10846C 802E6BEC 468010A0 */ cvt.s.w $f2, $f2 @@ -39,7 +39,7 @@ glabel func_802E6B6C /* 108474 802E6BF4 46000021 */ cvt.d.s $f0, $f0 /* 108478 802E6BF8 46200005 */ abs.d $f0, $f0 /* 10847C 802E6BFC 4624003E */ c.le.d $f0, $f4 -/* 108480 802E6C00 00000000 */ nop +/* 108480 802E6C00 00000000 */ nop /* 108484 802E6C04 45010002 */ bc1t .L802E6C10 /* 108488 802E6C08 24020001 */ addiu $v0, $zero, 1 /* 10848C 802E6C0C 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s b/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s index 1ee54d3b80..02c42db880 100644 --- a/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s +++ b/asm/nonmatchings/code_107830_len_e70/func_802E6C24.s @@ -93,7 +93,7 @@ glabel func_802E6C24 /* 108600 802E6D80 92820001 */ lbu $v0, 1($s4) /* 108604 802E6D84 30420001 */ andi $v0, $v0, 1 /* 108608 802E6D88 10400009 */ beqz $v0, .L802E6DB0 -/* 10860C 802E6D8C 00000000 */ nop +/* 10860C 802E6D8C 00000000 */ nop /* 108610 802E6D90 3C100A00 */ lui $s0, 0xa00 /* 108614 802E6D94 261001B0 */ addiu $s0, $s0, 0x1b0 /* 108618 802E6D98 3C05802F */ lui $a1, %hi(D_802EAAE0) @@ -129,6 +129,6 @@ glabel func_802E6C24 /* 108688 802E6E08 D7B400B0 */ ldc1 $f20, 0xb0($sp) /* 10868C 802E6E0C 03E00008 */ jr $ra /* 108690 802E6E10 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 108694 802E6E14 00000000 */ nop -/* 108698 802E6E18 00000000 */ nop -/* 10869C 802E6E1C 00000000 */ nop +/* 108694 802E6E14 00000000 */ nop +/* 108698 802E6E18 00000000 */ nop +/* 10869C 802E6E1C 00000000 */ nop diff --git a/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s b/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s index 4c61107c79..dd55f3d273 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/entity_init_Chest.s @@ -23,5 +23,5 @@ glabel entity_init_Chest /* 10964C 802E7DCC 8FB00010 */ lw $s0, 0x10($sp) /* 109650 802E7DD0 03E00008 */ jr $ra /* 109654 802E7DD4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 109658 802E7DD8 00000000 */ nop -/* 10965C 802E7DDC 00000000 */ nop +/* 109658 802E7DD8 00000000 */ nop +/* 10965C 802E7DDC 00000000 */ nop diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s index 550dcf1d51..ff0f3c6a36 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6E20.s @@ -22,7 +22,7 @@ glabel func_802E6E20 /* 1086E0 802E6E60 2484AC40 */ addiu $a0, $a0, %lo(D_802EAC40) .L802E6E64: /* 1086E4 802E6E64 14620003 */ bne $v1, $v0, .L802E6E74 -/* 1086E8 802E6E68 00000000 */ nop +/* 1086E8 802E6E68 00000000 */ nop /* 1086EC 802E6E6C 3C04802F */ lui $a0, %hi(D_802EAC84) /* 1086F0 802E6E70 2484AC84 */ addiu $a0, $a0, %lo(D_802EAC84) .L802E6E74: diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s index fee39308f6..602c0e3700 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E6ED8.s @@ -21,7 +21,7 @@ glabel func_802E6ED8 /* 108798 802E6F18 3C063F80 */ lui $a2, 0x3f80 /* 10879C 802E6F1C 8E420040 */ lw $v0, 0x40($s2) /* 1087A0 802E6F20 44800000 */ mtc1 $zero, $f0 -/* 1087A4 802E6F24 00000000 */ nop +/* 1087A4 802E6F24 00000000 */ nop /* 1087A8 802E6F28 E7A00010 */ swc1 $f0, 0x10($sp) /* 1087AC 802E6F2C 8C450008 */ lw $a1, 8($v0) /* 1087B0 802E6F30 44070000 */ mfc1 $a3, $f0 diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7034.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7034.s index 2b3e3c4c97..1ef7058fe3 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7034.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7034.s @@ -11,7 +11,7 @@ glabel func_802E7034 /* 1088CC 802E704C 96030000 */ lhu $v1, ($s0) /* 1088D0 802E7050 3402FFFF */ ori $v0, $zero, 0xffff /* 1088D4 802E7054 10620011 */ beq $v1, $v0, .L802E709C -/* 1088D8 802E7058 00000000 */ nop +/* 1088D8 802E7058 00000000 */ nop /* 1088DC 802E705C 0C05152F */ jal get_global_flag /* 1088E0 802E7060 0060202D */ daddu $a0, $v1, $zero /* 1088E4 802E7064 1040000D */ beqz $v0, .L802E709C diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E70B0.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E70B0.s index a8bf59223f..f7266e1aa5 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E70B0.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E70B0.s @@ -31,21 +31,21 @@ glabel func_802E70B0 /* 108998 802E7118 92220006 */ lbu $v0, 6($s1) /* 10899C 802E711C 30420001 */ andi $v0, $v0, 1 /* 1089A0 802E7120 1440002B */ bnez $v0, .L802E71D0 -/* 1089A4 802E7124 00000000 */ nop +/* 1089A4 802E7124 00000000 */ nop /* 1089A8 802E7128 3C014220 */ lui $at, 0x4220 /* 1089AC 802E712C 44810000 */ mtc1 $at, $f0 -/* 1089B0 802E7130 00000000 */ nop +/* 1089B0 802E7130 00000000 */ nop /* 1089B4 802E7134 4600A03E */ c.le.s $f20, $f0 -/* 1089B8 802E7138 00000000 */ nop +/* 1089B8 802E7138 00000000 */ nop /* 1089BC 802E713C 45010008 */ bc1t .L802E7160 -/* 1089C0 802E7140 00000000 */ nop +/* 1089C0 802E7140 00000000 */ nop /* 1089C4 802E7144 3C0143A0 */ lui $at, 0x43a0 /* 1089C8 802E7148 44810000 */ mtc1 $at, $f0 -/* 1089CC 802E714C 00000000 */ nop +/* 1089CC 802E714C 00000000 */ nop /* 1089D0 802E7150 4614003E */ c.le.s $f0, $f20 -/* 1089D4 802E7154 00000000 */ nop +/* 1089D4 802E7154 00000000 */ nop /* 1089D8 802E7158 4500001D */ bc1f .L802E71D0 -/* 1089DC 802E715C 00000000 */ nop +/* 1089DC 802E715C 00000000 */ nop .L802E7160: /* 1089E0 802E7160 8E220000 */ lw $v0, ($s1) /* 1089E4 802E7164 34421000 */ ori $v0, $v0, 0x1000 @@ -53,11 +53,11 @@ glabel func_802E70B0 /* 1089EC 802E716C 8E020004 */ lw $v0, 4($s0) /* 1089F0 802E7170 30420010 */ andi $v0, $v0, 0x10 /* 1089F4 802E7174 1040001A */ beqz $v0, .L802E71E0 -/* 1089F8 802E7178 00000000 */ nop +/* 1089F8 802E7178 00000000 */ nop /* 1089FC 802E717C 92220006 */ lbu $v0, 6($s1) /* 108A00 802E7180 30420008 */ andi $v0, $v0, 8 /* 108A04 802E7184 10400016 */ beqz $v0, .L802E71E0 -/* 108A08 802E7188 00000000 */ nop +/* 108A08 802E7188 00000000 */ nop /* 108A0C 802E718C 0C043F5A */ jal func_8010FD68 /* 108A10 802E7190 0220202D */ daddu $a0, $s1, $zero /* 108A14 802E7194 8E240040 */ lw $a0, 0x40($s1) @@ -68,14 +68,14 @@ glabel func_802E70B0 /* 108A28 802E71A8 AE220000 */ sw $v0, ($s1) /* 108A2C 802E71AC 8C820010 */ lw $v0, 0x10($a0) /* 108A30 802E71B0 10400003 */ beqz $v0, .L802E71C0 -/* 108A34 802E71B4 00000000 */ nop +/* 108A34 802E71B4 00000000 */ nop /* 108A38 802E71B8 0C03805E */ jal disable_player_input -/* 108A3C 802E71BC 00000000 */ nop +/* 108A3C 802E71BC 00000000 */ nop .L802E71C0: /* 108A40 802E71C0 0C03BCF9 */ jal func_800EF3E4 -/* 108A44 802E71C4 00000000 */ nop +/* 108A44 802E71C4 00000000 */ nop /* 108A48 802E71C8 080B9C78 */ j .L802E71E0 -/* 108A4C 802E71CC 00000000 */ nop +/* 108A4C 802E71CC 00000000 */ nop .L802E71D0: /* 108A50 802E71D0 8E220000 */ lw $v0, ($s1) /* 108A54 802E71D4 2403EFFF */ addiu $v1, $zero, -0x1001 diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s index fbc856fa7f..0272adadb5 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7230.s @@ -14,7 +14,7 @@ glabel func_802E7230 /* 108AD4 802E7254 00220821 */ addu $at, $at, $v0 /* 108AD8 802E7258 8C22B2F0 */ lw $v0, %lo(D_802EB2F0)($at) /* 108ADC 802E725C 00400008 */ jr $v0 -/* 108AE0 802E7260 00000000 */ nop +/* 108AE0 802E7260 00000000 */ nop /* 108AE4 802E7264 C6020008 */ lwc1 $f2, 8($s0) /* 108AE8 802E7268 3C013F80 */ lui $at, 0x3f80 /* 108AEC 802E726C 44810000 */ mtc1 $at, $f0 @@ -25,7 +25,7 @@ glabel func_802E7230 /* 108B00 802E7280 2442FFFF */ addiu $v0, $v0, -1 /* 108B04 802E7284 A2020006 */ sb $v0, 6($s0) /* 108B08 802E7288 4600103C */ c.lt.s $f2, $f0 -/* 108B0C 802E728C 00000000 */ nop +/* 108B0C 802E728C 00000000 */ nop /* 108B10 802E7290 45000002 */ bc1f .L802E729C /* 108B14 802E7294 E6020008 */ swc1 $f2, 8($s0) /* 108B18 802E7298 E6000008 */ swc1 $f0, 8($s0) @@ -41,20 +41,20 @@ glabel func_802E7230 /* 108B3C 802E72BC A2020006 */ sb $v0, 6($s0) /* 108B40 802E72C0 00021600 */ sll $v0, $v0, 0x18 /* 108B44 802E72C4 14400055 */ bnez $v0, .L802E741C -/* 108B48 802E72C8 00000000 */ nop +/* 108B48 802E72C8 00000000 */ nop /* 108B4C 802E72CC 92020005 */ lbu $v0, 5($s0) /* 108B50 802E72D0 080B9D05 */ j .L802E7414 /* 108B54 802E72D4 AE00000C */ sw $zero, 0xc($s0) /* 108B58 802E72D8 C600000C */ lwc1 $f0, 0xc($s0) /* 108B5C 802E72DC 3C014080 */ lui $at, 0x4080 /* 108B60 802E72E0 44811000 */ mtc1 $at, $f2 -/* 108B64 802E72E4 00000000 */ nop +/* 108B64 802E72E4 00000000 */ nop /* 108B68 802E72E8 46020000 */ add.s $f0, $f0, $f2 /* 108B6C 802E72EC 3C014334 */ lui $at, 0x4334 /* 108B70 802E72F0 44811000 */ mtc1 $at, $f2 -/* 108B74 802E72F4 00000000 */ nop +/* 108B74 802E72F4 00000000 */ nop /* 108B78 802E72F8 4600103E */ c.le.s $f2, $f0 -/* 108B7C 802E72FC 00000000 */ nop +/* 108B7C 802E72FC 00000000 */ nop /* 108B80 802E7300 45000004 */ bc1f .L802E7314 /* 108B84 802E7304 E600000C */ swc1 $f0, 0xc($s0) /* 108B88 802E7308 92020005 */ lbu $v0, 5($s0) @@ -65,29 +65,29 @@ glabel func_802E7230 /* 108B98 802E7318 3C0140C9 */ lui $at, 0x40c9 /* 108B9C 802E731C 34210FD0 */ ori $at, $at, 0xfd0 /* 108BA0 802E7320 44810000 */ mtc1 $at, $f0 -/* 108BA4 802E7324 00000000 */ nop +/* 108BA4 802E7324 00000000 */ nop /* 108BA8 802E7328 46006302 */ mul.s $f12, $f12, $f0 -/* 108BAC 802E732C 00000000 */ nop +/* 108BAC 802E732C 00000000 */ nop /* 108BB0 802E7330 3C0143B4 */ lui $at, 0x43b4 /* 108BB4 802E7334 44810000 */ mtc1 $at, $f0 /* 108BB8 802E7338 0C00A85B */ jal sin_rad /* 108BBC 802E733C 46006303 */ div.s $f12, $f12, $f0 /* 108BC0 802E7340 3C014040 */ lui $at, 0x4040 /* 108BC4 802E7344 44811000 */ mtc1 $at, $f2 -/* 108BC8 802E7348 00000000 */ nop +/* 108BC8 802E7348 00000000 */ nop /* 108BCC 802E734C 46020082 */ mul.s $f2, $f0, $f2 /* 108BD0 802E7350 080B9CF3 */ j .L802E73CC -/* 108BD4 802E7354 00000000 */ nop +/* 108BD4 802E7354 00000000 */ nop /* 108BD8 802E7358 C600000C */ lwc1 $f0, 0xc($s0) /* 108BDC 802E735C 3C013F80 */ lui $at, 0x3f80 /* 108BE0 802E7360 44811000 */ mtc1 $at, $f2 -/* 108BE4 802E7364 00000000 */ nop +/* 108BE4 802E7364 00000000 */ nop /* 108BE8 802E7368 46020000 */ add.s $f0, $f0, $f2 /* 108BEC 802E736C 3C01433E */ lui $at, 0x433e /* 108BF0 802E7370 44811000 */ mtc1 $at, $f2 -/* 108BF4 802E7374 00000000 */ nop +/* 108BF4 802E7374 00000000 */ nop /* 108BF8 802E7378 4600103E */ c.le.s $f2, $f0 -/* 108BFC 802E737C 00000000 */ nop +/* 108BFC 802E737C 00000000 */ nop /* 108C00 802E7380 45000006 */ bc1f .L802E739C /* 108C04 802E7384 E600000C */ swc1 $f0, 0xc($s0) /* 108C08 802E7388 92020005 */ lbu $v0, 5($s0) @@ -100,9 +100,9 @@ glabel func_802E7230 /* 108C20 802E73A0 3C0140C9 */ lui $at, 0x40c9 /* 108C24 802E73A4 34210FD0 */ ori $at, $at, 0xfd0 /* 108C28 802E73A8 44810000 */ mtc1 $at, $f0 -/* 108C2C 802E73AC 00000000 */ nop +/* 108C2C 802E73AC 00000000 */ nop /* 108C30 802E73B0 46006302 */ mul.s $f12, $f12, $f0 -/* 108C34 802E73B4 00000000 */ nop +/* 108C34 802E73B4 00000000 */ nop /* 108C38 802E73B8 3C0143B4 */ lui $at, 0x43b4 /* 108C3C 802E73BC 44810000 */ mtc1 $at, $f0 /* 108C40 802E73C0 0C00A85B */ jal sin_rad @@ -118,14 +118,14 @@ glabel func_802E7230 /* 108C64 802E73E4 A2020006 */ sb $v0, 6($s0) /* 108C68 802E73E8 00021600 */ sll $v0, $v0, 0x18 /* 108C6C 802E73EC 1440000B */ bnez $v0, .L802E741C -/* 108C70 802E73F0 00000000 */ nop +/* 108C70 802E73F0 00000000 */ nop /* 108C74 802E73F4 82020007 */ lb $v0, 7($s0) /* 108C78 802E73F8 10400005 */ beqz $v0, .L802E7410 -/* 108C7C 802E73FC 00000000 */ nop +/* 108C7C 802E73FC 00000000 */ nop /* 108C80 802E7400 0C043F5A */ jal func_8010FD68 -/* 108C84 802E7404 00000000 */ nop +/* 108C84 802E7404 00000000 */ nop /* 108C88 802E7408 080B9D07 */ j .L802E741C -/* 108C8C 802E740C 00000000 */ nop +/* 108C8C 802E740C 00000000 */ nop .L802E7410: /* 108C90 802E7410 92020005 */ lbu $v0, 5($s0) .L802E7414: diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s index 229b6646f9..39f7c39b90 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E742C.s @@ -14,7 +14,7 @@ glabel func_802E742C /* 108CD0 802E7450 00220821 */ addu $at, $at, $v0 /* 108CD4 802E7454 8C22B308 */ lw $v0, %lo(D_802EB308)($at) /* 108CD8 802E7458 00400008 */ jr $v0 -/* 108CDC 802E745C 00000000 */ nop +/* 108CDC 802E745C 00000000 */ nop /* 108CE0 802E7460 92020004 */ lbu $v0, 4($s0) /* 108CE4 802E7464 AE00000C */ sw $zero, 0xc($s0) /* 108CE8 802E7468 24420001 */ addiu $v0, $v0, 1 @@ -22,13 +22,13 @@ glabel func_802E742C /* 108CF0 802E7470 C600000C */ lwc1 $f0, 0xc($s0) /* 108CF4 802E7474 3C0140A0 */ lui $at, 0x40a0 /* 108CF8 802E7478 44811000 */ mtc1 $at, $f2 -/* 108CFC 802E747C 00000000 */ nop +/* 108CFC 802E747C 00000000 */ nop /* 108D00 802E7480 46020000 */ add.s $f0, $f0, $f2 /* 108D04 802E7484 3C014334 */ lui $at, 0x4334 /* 108D08 802E7488 44811000 */ mtc1 $at, $f2 -/* 108D0C 802E748C 00000000 */ nop +/* 108D0C 802E748C 00000000 */ nop /* 108D10 802E7490 4600103E */ c.le.s $f2, $f0 -/* 108D14 802E7494 00000000 */ nop +/* 108D14 802E7494 00000000 */ nop /* 108D18 802E7498 45000005 */ bc1f .L802E74B0 /* 108D1C 802E749C E600000C */ swc1 $f0, 0xc($s0) /* 108D20 802E74A0 92020004 */ lbu $v0, 4($s0) @@ -40,9 +40,9 @@ glabel func_802E742C /* 108D34 802E74B4 3C0140C9 */ lui $at, 0x40c9 /* 108D38 802E74B8 34210FD0 */ ori $at, $at, 0xfd0 /* 108D3C 802E74BC 44810000 */ mtc1 $at, $f0 -/* 108D40 802E74C0 00000000 */ nop +/* 108D40 802E74C0 00000000 */ nop /* 108D44 802E74C4 46006302 */ mul.s $f12, $f12, $f0 -/* 108D48 802E74C8 00000000 */ nop +/* 108D48 802E74C8 00000000 */ nop /* 108D4C 802E74CC 3C0143B4 */ lui $at, 0x43b4 /* 108D50 802E74D0 44810000 */ mtc1 $at, $f0 /* 108D54 802E74D4 0C00A85B */ jal sin_rad @@ -50,20 +50,20 @@ glabel func_802E742C /* 108D5C 802E74DC 3C014026 */ lui $at, 0x4026 /* 108D60 802E74E0 34216666 */ ori $at, $at, 0x6666 /* 108D64 802E74E4 44811000 */ mtc1 $at, $f2 -/* 108D68 802E74E8 00000000 */ nop +/* 108D68 802E74E8 00000000 */ nop /* 108D6C 802E74EC 46020082 */ mul.s $f2, $f0, $f2 /* 108D70 802E74F0 080B9D5C */ j .L802E7570 -/* 108D74 802E74F4 00000000 */ nop +/* 108D74 802E74F4 00000000 */ nop /* 108D78 802E74F8 C600000C */ lwc1 $f0, 0xc($s0) /* 108D7C 802E74FC 3C013F80 */ lui $at, 0x3f80 /* 108D80 802E7500 44811000 */ mtc1 $at, $f2 -/* 108D84 802E7504 00000000 */ nop +/* 108D84 802E7504 00000000 */ nop /* 108D88 802E7508 46020000 */ add.s $f0, $f0, $f2 /* 108D8C 802E750C 3C014339 */ lui $at, 0x4339 /* 108D90 802E7510 44811000 */ mtc1 $at, $f2 -/* 108D94 802E7514 00000000 */ nop +/* 108D94 802E7514 00000000 */ nop /* 108D98 802E7518 4600103E */ c.le.s $f2, $f0 -/* 108D9C 802E751C 00000000 */ nop +/* 108D9C 802E751C 00000000 */ nop /* 108DA0 802E7520 45000007 */ bc1f .L802E7540 /* 108DA4 802E7524 E600000C */ swc1 $f0, 0xc($s0) /* 108DA8 802E7528 92020004 */ lbu $v0, 4($s0) @@ -77,9 +77,9 @@ glabel func_802E742C /* 108DC4 802E7544 3C0140C9 */ lui $at, 0x40c9 /* 108DC8 802E7548 34210FD0 */ ori $at, $at, 0xfd0 /* 108DCC 802E754C 44810000 */ mtc1 $at, $f0 -/* 108DD0 802E7550 00000000 */ nop +/* 108DD0 802E7550 00000000 */ nop /* 108DD4 802E7554 46006302 */ mul.s $f12, $f12, $f0 -/* 108DD8 802E7558 00000000 */ nop +/* 108DD8 802E7558 00000000 */ nop /* 108DDC 802E755C 3C0143B4 */ lui $at, 0x43b4 /* 108DE0 802E7560 44810000 */ mtc1 $at, $f0 /* 108DE4 802E7564 0C00A85B */ jal sin_rad @@ -95,7 +95,7 @@ glabel func_802E742C /* 108E08 802E7588 A2020006 */ sb $v0, 6($s0) /* 108E0C 802E758C 00021600 */ sll $v0, $v0, 0x18 /* 108E10 802E7590 14400007 */ bnez $v0, .L802E75B0 -/* 108E14 802E7594 00000000 */ nop +/* 108E14 802E7594 00000000 */ nop /* 108E18 802E7598 92020004 */ lbu $v0, 4($s0) /* 108E1C 802E759C 24420001 */ addiu $v0, $v0, 1 /* 108E20 802E75A0 A2020004 */ sb $v0, 4($s0) diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E75C0.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E75C0.s index deaa458aed..ffd13c831a 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E75C0.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E75C0.s @@ -5,10 +5,10 @@ glabel func_802E75C0 /* 108E40 802E75C0 8C820040 */ lw $v0, 0x40($a0) /* 108E44 802E75C4 8C420034 */ lw $v0, 0x34($v0) /* 108E48 802E75C8 10400004 */ beqz $v0, .L802E75DC -/* 108E4C 802E75CC 00000000 */ nop +/* 108E4C 802E75CC 00000000 */ nop /* 108E50 802E75D0 8C43000C */ lw $v1, 0xc($v0) /* 108E54 802E75D4 2402000A */ addiu $v0, $zero, 0xa /* 108E58 802E75D8 AC620014 */ sw $v0, 0x14($v1) .L802E75DC: /* 108E5C 802E75DC 03E00008 */ jr $ra -/* 108E60 802E75E0 00000000 */ nop +/* 108E60 802E75E0 00000000 */ nop diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s index 69f5c7c21a..04c14fb245 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E75E4.s @@ -18,7 +18,7 @@ glabel func_802E75E4 /* 108E98 802E7618 3C128011 */ lui $s2, %hi(gPlayerStatus) /* 108E9C 802E761C 2652EFC8 */ addiu $s2, $s2, %lo(gPlayerStatus) /* 108EA0 802E7620 10400006 */ beqz $v0, .L802E763C -/* 108EA4 802E7624 00000000 */ nop +/* 108EA4 802E7624 00000000 */ nop /* 108EA8 802E7628 8E240014 */ lw $a0, 0x14($s1) /* 108EAC 802E762C 8E250018 */ lw $a1, 0x18($s1) /* 108EB0 802E7630 8E26001C */ lw $a2, 0x1c($s1) @@ -34,23 +34,23 @@ glabel func_802E75E4 /* 108ED4 802E7654 50400005 */ beql $v0, $zero, .L802E766C /* 108ED8 802E7658 24020002 */ addiu $v0, $zero, 2 /* 108EDC 802E765C 10600009 */ beqz $v1, .L802E7684 -/* 108EE0 802E7660 00000000 */ nop +/* 108EE0 802E7660 00000000 */ nop /* 108EE4 802E7664 080B9EAE */ j .L802E7AB8 -/* 108EE8 802E7668 00000000 */ nop +/* 108EE8 802E7668 00000000 */ nop .L802E766C: /* 108EEC 802E766C 1062002C */ beq $v1, $v0, .L802E7720 /* 108EF0 802E7670 24020003 */ addiu $v0, $zero, 3 /* 108EF4 802E7674 10620107 */ beq $v1, $v0, .L802E7A94 -/* 108EF8 802E7678 00000000 */ nop +/* 108EF8 802E7678 00000000 */ nop /* 108EFC 802E767C 080B9EAE */ j .L802E7AB8 -/* 108F00 802E7680 00000000 */ nop +/* 108F00 802E7680 00000000 */ nop .L802E7684: /* 108F04 802E7684 96220002 */ lhu $v0, 2($s1) /* 108F08 802E7688 2442FFFF */ addiu $v0, $v0, -1 /* 108F0C 802E768C A6220002 */ sh $v0, 2($s1) /* 108F10 802E7690 00021400 */ sll $v0, $v0, 0x10 /* 108F14 802E7694 14400108 */ bnez $v0, .L802E7AB8 -/* 108F18 802E7698 00000000 */ nop +/* 108F18 802E7698 00000000 */ nop /* 108F1C 802E769C 92220004 */ lbu $v0, 4($s1) /* 108F20 802E76A0 3C0141A0 */ lui $at, 0x41a0 /* 108F24 802E76A4 44810000 */ mtc1 $at, $f0 @@ -89,26 +89,26 @@ glabel func_802E75E4 /* 108FA0 802E7720 C6220028 */ lwc1 $f2, 0x28($s1) /* 108FA4 802E7724 3C01430C */ lui $at, 0x430c /* 108FA8 802E7728 44810000 */ mtc1 $at, $f0 -/* 108FAC 802E772C 00000000 */ nop +/* 108FAC 802E772C 00000000 */ nop /* 108FB0 802E7730 4600103C */ c.lt.s $f2, $f0 -/* 108FB4 802E7734 00000000 */ nop +/* 108FB4 802E7734 00000000 */ nop /* 108FB8 802E7738 45000014 */ bc1f .L802E778C -/* 108FBC 802E773C 00000000 */ nop +/* 108FBC 802E773C 00000000 */ nop /* 108FC0 802E7740 3C0140C9 */ lui $at, 0x40c9 /* 108FC4 802E7744 34210FD0 */ ori $at, $at, 0xfd0 /* 108FC8 802E7748 44816000 */ mtc1 $at, $f12 -/* 108FCC 802E774C 00000000 */ nop +/* 108FCC 802E774C 00000000 */ nop /* 108FD0 802E7750 460C1302 */ mul.s $f12, $f2, $f12 -/* 108FD4 802E7754 00000000 */ nop +/* 108FD4 802E7754 00000000 */ nop /* 108FD8 802E7758 3C0143B4 */ lui $at, 0x43b4 /* 108FDC 802E775C 44810000 */ mtc1 $at, $f0 /* 108FE0 802E7760 0C00A874 */ jal cos_rad /* 108FE4 802E7764 46006303 */ div.s $f12, $f12, $f0 /* 108FE8 802E7768 3C014040 */ lui $at, 0x4040 /* 108FEC 802E776C 44811000 */ mtc1 $at, $f2 -/* 108FF0 802E7770 00000000 */ nop +/* 108FF0 802E7770 00000000 */ nop /* 108FF4 802E7774 46020002 */ mul.s $f0, $f0, $f2 -/* 108FF8 802E7778 00000000 */ nop +/* 108FF8 802E7778 00000000 */ nop /* 108FFC 802E777C C622001C */ lwc1 $f2, 0x1c($s1) /* 109000 802E7780 46001080 */ add.s $f2, $f2, $f0 /* 109004 802E7784 080B9DFC */ j .L802E77F0 @@ -119,24 +119,24 @@ glabel func_802E75E4 /* 109014 802E7794 46003001 */ sub.s $f0, $f6, $f0 /* 109018 802E7798 3C0141F0 */ lui $at, 0x41f0 /* 10901C 802E779C 44811000 */ mtc1 $at, $f2 -/* 109020 802E77A0 00000000 */ nop +/* 109020 802E77A0 00000000 */ nop /* 109024 802E77A4 46020001 */ sub.s $f0, $f0, $f2 /* 109028 802E77A8 3C013E80 */ lui $at, 0x3e80 /* 10902C 802E77AC 44811000 */ mtc1 $at, $f2 -/* 109030 802E77B0 00000000 */ nop +/* 109030 802E77B0 00000000 */ nop /* 109034 802E77B4 46020102 */ mul.s $f4, $f0, $f2 -/* 109038 802E77B8 00000000 */ nop +/* 109038 802E77B8 00000000 */ nop /* 10903C 802E77BC 3C01802F */ lui $at, %hi(D_802EB328) /* 109040 802E77C0 D422B328 */ ldc1 $f2, %lo(D_802EB328)($at) /* 109044 802E77C4 46002021 */ cvt.d.s $f0, $f4 /* 109048 802E77C8 4622003E */ c.le.d $f0, $f2 -/* 10904C 802E77CC 00000000 */ nop +/* 10904C 802E77CC 00000000 */ nop /* 109050 802E77D0 45020006 */ bc1fl .L802E77EC /* 109054 802E77D4 46043001 */ sub.s $f0, $f6, $f4 /* 109058 802E77D8 3C013ECC */ lui $at, 0x3ecc /* 10905C 802E77DC 3421CCCD */ ori $at, $at, 0xcccd /* 109060 802E77E0 44812000 */ mtc1 $at, $f4 -/* 109064 802E77E4 00000000 */ nop +/* 109064 802E77E4 00000000 */ nop /* 109068 802E77E8 46043001 */ sub.s $f0, $f6, $f4 .L802E77EC: /* 10906C 802E77EC E620001C */ swc1 $f0, 0x1c($s1) @@ -145,9 +145,9 @@ glabel func_802E75E4 /* 109074 802E77F4 3C0140C9 */ lui $at, 0x40c9 /* 109078 802E77F8 34210FD0 */ ori $at, $at, 0xfd0 /* 10907C 802E77FC 4481D000 */ mtc1 $at, $f26 -/* 109080 802E7800 00000000 */ nop +/* 109080 802E7800 00000000 */ nop /* 109084 802E7804 461A6302 */ mul.s $f12, $f12, $f26 -/* 109088 802E7808 00000000 */ nop +/* 109088 802E7808 00000000 */ nop /* 10908C 802E780C 3C0143B4 */ lui $at, 0x43b4 /* 109090 802E7810 4481E000 */ mtc1 $at, $f28 /* 109094 802E7814 0C00A85B */ jal sin_rad @@ -167,32 +167,32 @@ glabel func_802E75E4 /* 1090CC 802E784C 84430086 */ lh $v1, 0x86($v0) /* 1090D0 802E7850 24020012 */ addiu $v0, $zero, 0x12 /* 1090D4 802E7854 14620003 */ bne $v1, $v0, .L802E7864 -/* 1090D8 802E7858 00000000 */ nop +/* 1090D8 802E7858 00000000 */ nop /* 1090DC 802E785C 3C014040 */ lui $at, 0x4040 /* 1090E0 802E7860 4481B000 */ mtc1 $at, $f22 .L802E7864: /* 1090E4 802E7864 461A0502 */ mul.s $f20, $f0, $f26 -/* 1090E8 802E7868 00000000 */ nop +/* 1090E8 802E7868 00000000 */ nop /* 1090EC 802E786C 461CA503 */ div.s $f20, $f20, $f28 /* 1090F0 802E7870 0C00A85B */ jal sin_rad /* 1090F4 802E7874 4600A306 */ mov.s $f12, $f20 /* 1090F8 802E7878 4600B002 */ mul.s $f0, $f22, $f0 -/* 1090FC 802E787C 00000000 */ nop +/* 1090FC 802E787C 00000000 */ nop /* 109100 802E7880 46180002 */ mul.s $f0, $f0, $f24 -/* 109104 802E7884 00000000 */ nop +/* 109104 802E7884 00000000 */ nop /* 109108 802E7888 C6220018 */ lwc1 $f2, 0x18($s1) /* 10910C 802E788C 46001080 */ add.s $f2, $f2, $f0 /* 109110 802E7890 4600A306 */ mov.s $f12, $f20 /* 109114 802E7894 0C00A874 */ jal cos_rad /* 109118 802E7898 E6220018 */ swc1 $f2, 0x18($s1) /* 10911C 802E789C 4600B002 */ mul.s $f0, $f22, $f0 -/* 109120 802E78A0 00000000 */ nop +/* 109120 802E78A0 00000000 */ nop /* 109124 802E78A4 46180002 */ mul.s $f0, $f0, $f24 -/* 109128 802E78A8 00000000 */ nop +/* 109128 802E78A8 00000000 */ nop /* 10912C 802E78AC C6240024 */ lwc1 $f4, 0x24($s1) /* 109130 802E78B0 3C014100 */ lui $at, 0x4100 /* 109134 802E78B4 44811000 */ mtc1 $at, $f2 -/* 109138 802E78B8 00000000 */ nop +/* 109138 802E78B8 00000000 */ nop /* 10913C 802E78BC 46022100 */ add.s $f4, $f4, $f2 /* 109140 802E78C0 C6220020 */ lwc1 $f2, 0x20($s1) /* 109144 802E78C4 3C014334 */ lui $at, 0x4334 @@ -200,7 +200,7 @@ glabel func_802E75E4 /* 10914C 802E78CC 46001081 */ sub.s $f2, $f2, $f0 /* 109150 802E78D0 E6240024 */ swc1 $f4, 0x24($s1) /* 109154 802E78D4 4604A03E */ c.le.s $f20, $f4 -/* 109158 802E78D8 00000000 */ nop +/* 109158 802E78D8 00000000 */ nop /* 10915C 802E78DC 45000002 */ bc1f .L802E78E8 /* 109160 802E78E0 E6220020 */ swc1 $f2, 0x20($s1) /* 109164 802E78E4 E6340024 */ swc1 $f20, 0x24($s1) @@ -208,10 +208,10 @@ glabel func_802E75E4 /* 109168 802E78E8 C6200028 */ lwc1 $f0, 0x28($s1) /* 10916C 802E78EC 3C014150 */ lui $at, 0x4150 /* 109170 802E78F0 44811000 */ mtc1 $at, $f2 -/* 109174 802E78F4 00000000 */ nop +/* 109174 802E78F4 00000000 */ nop /* 109178 802E78F8 46020000 */ add.s $f0, $f0, $f2 /* 10917C 802E78FC 4600A03E */ c.le.s $f20, $f0 -/* 109180 802E7900 00000000 */ nop +/* 109180 802E7900 00000000 */ nop /* 109184 802E7904 4500006C */ bc1f .L802E7AB8 /* 109188 802E7908 E6200028 */ swc1 $f0, 0x28($s1) /* 10918C 802E790C 24020007 */ addiu $v0, $zero, 7 @@ -230,10 +230,10 @@ glabel func_802E75E4 /* 1091C0 802E7940 C600006C */ lwc1 $f0, 0x6c($s0) /* 1091C4 802E7944 3C0142B4 */ lui $at, 0x42b4 /* 1091C8 802E7948 44816000 */ mtc1 $at, $f12 -/* 1091CC 802E794C 00000000 */ nop +/* 1091CC 802E794C 00000000 */ nop /* 1091D0 802E7950 46006301 */ sub.s $f12, $f12, $f0 /* 1091D4 802E7954 461A6302 */ mul.s $f12, $f12, $f26 -/* 1091D8 802E7958 00000000 */ nop +/* 1091D8 802E7958 00000000 */ nop /* 1091DC 802E795C 27A50018 */ addiu $a1, $sp, 0x18 /* 1091E0 802E7960 27A6001C */ addiu $a2, $sp, 0x1c /* 1091E4 802E7964 0C00A82D */ jal sin_cos_rad @@ -241,7 +241,7 @@ glabel func_802E75E4 /* 1091EC 802E796C C60C006C */ lwc1 $f12, 0x6c($s0) /* 1091F0 802E7970 460CA301 */ sub.s $f12, $f20, $f12 /* 1091F4 802E7974 461A6302 */ mul.s $f12, $f12, $f26 -/* 1091F8 802E7978 00000000 */ nop +/* 1091F8 802E7978 00000000 */ nop /* 1091FC 802E797C 27A50020 */ addiu $a1, $sp, 0x20 /* 109200 802E7980 27A60024 */ addiu $a2, $sp, 0x24 /* 109204 802E7984 0C00A82D */ jal sin_cos_rad @@ -249,27 +249,27 @@ glabel func_802E75E4 /* 10920C 802E798C 4480B000 */ mtc1 $zero, $f22 /* 109210 802E7990 C7A60018 */ lwc1 $f6, 0x18($sp) /* 109214 802E7994 46163182 */ mul.s $f6, $f6, $f22 -/* 109218 802E7998 00000000 */ nop +/* 109218 802E7998 00000000 */ nop /* 10921C 802E799C 3C014080 */ lui $at, 0x4080 /* 109220 802E79A0 4481A000 */ mtc1 $at, $f20 /* 109224 802E79A4 C7A20020 */ lwc1 $f2, 0x20($sp) /* 109228 802E79A8 46141082 */ mul.s $f2, $f2, $f20 -/* 10922C 802E79AC 00000000 */ nop +/* 10922C 802E79AC 00000000 */ nop /* 109230 802E79B0 C620001C */ lwc1 $f0, 0x1c($s1) /* 109234 802E79B4 3C014140 */ lui $at, 0x4140 /* 109238 802E79B8 4481C000 */ mtc1 $at, $f24 -/* 10923C 802E79BC 00000000 */ nop +/* 10923C 802E79BC 00000000 */ nop /* 109240 802E79C0 46180000 */ add.s $f0, $f0, $f24 /* 109244 802E79C4 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 109248 802E79C8 46162102 */ mul.s $f4, $f4, $f22 -/* 10924C 802E79CC 00000000 */ nop +/* 10924C 802E79CC 00000000 */ nop /* 109250 802E79D0 44060000 */ mfc1 $a2, $f0 /* 109254 802E79D4 C6200018 */ lwc1 $f0, 0x18($s1) /* 109258 802E79D8 46060000 */ add.s $f0, $f0, $f6 /* 10925C 802E79DC 46020001 */ sub.s $f0, $f0, $f2 /* 109260 802E79E0 C7A80024 */ lwc1 $f8, 0x24($sp) /* 109264 802E79E4 46144202 */ mul.s $f8, $f8, $f20 -/* 109268 802E79E8 00000000 */ nop +/* 109268 802E79E8 00000000 */ nop /* 10926C 802E79EC 44050000 */ mfc1 $a1, $f0 /* 109270 802E79F0 C6200020 */ lwc1 $f0, 0x20($s1) /* 109274 802E79F4 46040001 */ sub.s $f0, $f0, $f4 @@ -284,22 +284,22 @@ glabel func_802E75E4 /* 109298 802E7A18 AFA20014 */ sw $v0, 0x14($sp) /* 10929C 802E7A1C C7A60018 */ lwc1 $f6, 0x18($sp) /* 1092A0 802E7A20 46163182 */ mul.s $f6, $f6, $f22 -/* 1092A4 802E7A24 00000000 */ nop +/* 1092A4 802E7A24 00000000 */ nop /* 1092A8 802E7A28 C7A20020 */ lwc1 $f2, 0x20($sp) /* 1092AC 802E7A2C 46141082 */ mul.s $f2, $f2, $f20 -/* 1092B0 802E7A30 00000000 */ nop +/* 1092B0 802E7A30 00000000 */ nop /* 1092B4 802E7A34 C620001C */ lwc1 $f0, 0x1c($s1) /* 1092B8 802E7A38 46180000 */ add.s $f0, $f0, $f24 /* 1092BC 802E7A3C C7A4001C */ lwc1 $f4, 0x1c($sp) /* 1092C0 802E7A40 46162102 */ mul.s $f4, $f4, $f22 -/* 1092C4 802E7A44 00000000 */ nop +/* 1092C4 802E7A44 00000000 */ nop /* 1092C8 802E7A48 44060000 */ mfc1 $a2, $f0 /* 1092CC 802E7A4C C6200018 */ lwc1 $f0, 0x18($s1) /* 1092D0 802E7A50 46060000 */ add.s $f0, $f0, $f6 /* 1092D4 802E7A54 46020001 */ sub.s $f0, $f0, $f2 /* 1092D8 802E7A58 C7A80024 */ lwc1 $f8, 0x24($sp) /* 1092DC 802E7A5C 46144202 */ mul.s $f8, $f8, $f20 -/* 1092E0 802E7A60 00000000 */ nop +/* 1092E0 802E7A60 00000000 */ nop /* 1092E4 802E7A64 44050000 */ mfc1 $a1, $f0 /* 1092E8 802E7A68 C6200020 */ lwc1 $f0, 0x20($s1) /* 1092EC 802E7A6C 46040001 */ sub.s $f0, $f0, $f4 @@ -311,14 +311,14 @@ glabel func_802E75E4 /* 109304 802E7A84 0C01C0AC */ jal func_800702B0 /* 109308 802E7A88 AFA20014 */ sw $v0, 0x14($sp) /* 10930C 802E7A8C 080B9EAE */ j .L802E7AB8 -/* 109310 802E7A90 00000000 */ nop +/* 109310 802E7A90 00000000 */ nop .L802E7A94: /* 109314 802E7A94 96220002 */ lhu $v0, 2($s1) /* 109318 802E7A98 2442FFFF */ addiu $v0, $v0, -1 /* 10931C 802E7A9C A6220002 */ sh $v0, 2($s1) /* 109320 802E7AA0 00021400 */ sll $v0, $v0, 0x10 /* 109324 802E7AA4 14400004 */ bnez $v0, .L802E7AB8 -/* 109328 802E7AA8 00000000 */ nop +/* 109328 802E7AA8 00000000 */ nop /* 10932C 802E7AAC 0C043F5A */ jal func_8010FD68 /* 109330 802E7AB0 0200202D */ daddu $a0, $s0, $zero /* 109334 802E7AB4 A2200004 */ sb $zero, 4($s1) diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s index ee532f1c87..92cd0e0cce 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s @@ -19,25 +19,25 @@ glabel func_802E7AE4 /* 10939C 802E7B1C 00220821 */ addu $at, $at, $v0 /* 1093A0 802E7B20 8C22B330 */ lw $v0, %lo(D_802EB330)($at) /* 1093A4 802E7B24 00400008 */ jr $v0 -/* 1093A8 802E7B28 00000000 */ nop +/* 1093A8 802E7B28 00000000 */ nop /* 1093AC 802E7B2C 3C018011 */ lui $at, %hi(gPlayerData) /* 1093B0 802E7B30 A020F290 */ sb $zero, %lo(gPlayerData)($at) /* 1093B4 802E7B34 080B9EE2 */ j .L802E7B88 -/* 1093B8 802E7B38 00000000 */ nop +/* 1093B8 802E7B38 00000000 */ nop /* 1093BC 802E7B3C 24020001 */ addiu $v0, $zero, 1 /* 1093C0 802E7B40 3C018011 */ lui $at, %hi(gPlayerData) /* 1093C4 802E7B44 A022F290 */ sb $v0, %lo(gPlayerData)($at) /* 1093C8 802E7B48 080B9EE2 */ j .L802E7B88 -/* 1093CC 802E7B4C 00000000 */ nop +/* 1093CC 802E7B4C 00000000 */ nop /* 1093D0 802E7B50 24020002 */ addiu $v0, $zero, 2 /* 1093D4 802E7B54 3C018011 */ lui $at, %hi(gPlayerData) /* 1093D8 802E7B58 A022F290 */ sb $v0, %lo(gPlayerData)($at) /* 1093DC 802E7B5C 080B9EE2 */ j .L802E7B88 -/* 1093E0 802E7B60 00000000 */ nop +/* 1093E0 802E7B60 00000000 */ nop /* 1093E4 802E7B64 3C018011 */ lui $at, %hi(gPlayerData+0x1) /* 1093E8 802E7B68 A020F291 */ sb $zero, %lo(gPlayerData+0x1)($at) /* 1093EC 802E7B6C 080B9EE2 */ j .L802E7B88 -/* 1093F0 802E7B70 00000000 */ nop +/* 1093F0 802E7B70 00000000 */ nop /* 1093F4 802E7B74 080B9EE0 */ j .L802E7B80 /* 1093F8 802E7B78 24020001 */ addiu $v0, $zero, 1 /* 1093FC 802E7B7C 24020002 */ addiu $v0, $zero, 2 @@ -47,14 +47,14 @@ glabel func_802E7AE4 .L802E7B88: /* 109408 802E7B88 8E020010 */ lw $v0, 0x10($s0) /* 10940C 802E7B8C 10400027 */ beqz $v0, .L802E7C2C -/* 109410 802E7B90 00000000 */ nop +/* 109410 802E7B90 00000000 */ nop /* 109414 802E7B94 C6340064 */ lwc1 $f20, 0x64($s1) /* 109418 802E7B98 3C0140C9 */ lui $at, 0x40c9 /* 10941C 802E7B9C 34210FD0 */ ori $at, $at, 0xfd0 /* 109420 802E7BA0 44810000 */ mtc1 $at, $f0 -/* 109424 802E7BA4 00000000 */ nop +/* 109424 802E7BA4 00000000 */ nop /* 109428 802E7BA8 4600A502 */ mul.s $f20, $f20, $f0 -/* 10942C 802E7BAC 00000000 */ nop +/* 10942C 802E7BAC 00000000 */ nop /* 109430 802E7BB0 3C0143B4 */ lui $at, 0x43b4 /* 109434 802E7BB4 44810000 */ mtc1 $at, $f0 /* 109438 802E7BB8 3C014120 */ lui $at, 0x4120 @@ -63,7 +63,7 @@ glabel func_802E7AE4 /* 109444 802E7BC4 0C00A85B */ jal sin_rad /* 109448 802E7BC8 4600A306 */ mov.s $f12, $f20 /* 10944C 802E7BCC 46160002 */ mul.s $f0, $f0, $f22 -/* 109450 802E7BD0 00000000 */ nop +/* 109450 802E7BD0 00000000 */ nop /* 109454 802E7BD4 C6220048 */ lwc1 $f2, 0x48($s1) /* 109458 802E7BD8 46001080 */ add.s $f2, $f2, $f0 /* 10945C 802E7BDC E6020018 */ swc1 $f2, 0x18($s0) @@ -72,7 +72,7 @@ glabel func_802E7AE4 /* 109468 802E7BE8 0C00A874 */ jal cos_rad /* 10946C 802E7BEC E600001C */ swc1 $f0, 0x1c($s0) /* 109470 802E7BF0 46160002 */ mul.s $f0, $f0, $f22 -/* 109474 802E7BF4 00000000 */ nop +/* 109474 802E7BF4 00000000 */ nop /* 109478 802E7BF8 C6220050 */ lwc1 $f2, 0x50($s1) /* 10947C 802E7BFC 46001080 */ add.s $f2, $f2, $f0 /* 109480 802E7C00 24020001 */ addiu $v0, $zero, 1 @@ -97,7 +97,7 @@ glabel func_802E7AE4 /* 1094C8 802E7C48 00822021 */ addu $a0, $a0, $v0 .L802E7C4C: /* 1094CC 802E7C4C 0C051514 */ jal set_global_flag -/* 1094D0 802E7C50 00000000 */ nop +/* 1094D0 802E7C50 00000000 */ nop /* 1094D4 802E7C54 8FBF0020 */ lw $ra, 0x20($sp) /* 1094D8 802E7C58 8FB1001C */ lw $s1, 0x1c($sp) /* 1094DC 802E7C5C 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C70.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C70.s index 4799c72fc8..a58e45b68b 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C70.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C70.s @@ -5,7 +5,7 @@ glabel func_802E7C70 /* 1094F0 802E7C70 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1094F4 802E7C74 AFBF0010 */ sw $ra, 0x10($sp) /* 1094F8 802E7C78 0C04419E */ jal func_80110678 -/* 1094FC 802E7C7C 00000000 */ nop +/* 1094FC 802E7C7C 00000000 */ nop /* 109500 802E7C80 8FBF0010 */ lw $ra, 0x10($sp) /* 109504 802E7C84 03E00008 */ jr $ra /* 109508 802E7C88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C8C.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C8C.s index 30abf8b1d2..11f8e50d8a 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C8C.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7C8C.s @@ -7,9 +7,9 @@ glabel func_802E7C8C /* 109514 802E7C94 8C820040 */ lw $v0, 0x40($a0) /* 109518 802E7C98 8C420010 */ lw $v0, 0x10($v0) /* 10951C 802E7C9C 10400003 */ beqz $v0, .L802E7CAC -/* 109520 802E7CA0 00000000 */ nop +/* 109520 802E7CA0 00000000 */ nop /* 109524 802E7CA4 0C038069 */ jal enable_player_input -/* 109528 802E7CA8 00000000 */ nop +/* 109528 802E7CA8 00000000 */ nop .L802E7CAC: /* 10952C 802E7CAC 8FBF0010 */ lw $ra, 0x10($sp) /* 109530 802E7CB0 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7CB8.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7CB8.s index f2514e682f..20a622b524 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7CB8.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7CB8.s @@ -8,25 +8,25 @@ glabel func_802E7CB8 /* 109544 802E7CC4 8C900040 */ lw $s0, 0x40($a0) /* 109548 802E7CC8 8E020010 */ lw $v0, 0x10($s0) /* 10954C 802E7CCC 10400010 */ beqz $v0, .L802E7D10 -/* 109550 802E7CD0 00000000 */ nop +/* 109550 802E7CD0 00000000 */ nop /* 109554 802E7CD4 82020030 */ lb $v0, 0x30($s0) /* 109558 802E7CD8 1040000F */ beqz $v0, .L802E7D18 -/* 10955C 802E7CDC 00000000 */ nop +/* 10955C 802E7CDC 00000000 */ nop /* 109560 802E7CE0 0C043F5A */ jal func_8010FD68 -/* 109564 802E7CE4 00000000 */ nop +/* 109564 802E7CE4 00000000 */ nop /* 109568 802E7CE8 0C04CE7F */ jal remove_item_entity_by_index /* 10956C 802E7CEC 8E040014 */ lw $a0, 0x14($s0) /* 109570 802E7CF0 3C040001 */ lui $a0, 1 /* 109574 802E7CF4 0C037FBF */ jal func_800DFEFC /* 109578 802E7CF8 34840002 */ ori $a0, $a0, 2 /* 10957C 802E7CFC 0C038069 */ jal enable_player_input -/* 109580 802E7D00 00000000 */ nop +/* 109580 802E7D00 00000000 */ nop /* 109584 802E7D04 2402FFFF */ addiu $v0, $zero, -1 /* 109588 802E7D08 080B9F46 */ j .L802E7D18 /* 10958C 802E7D0C AE020010 */ sw $v0, 0x10($s0) .L802E7D10: /* 109590 802E7D10 0C043F5A */ jal func_8010FD68 -/* 109594 802E7D14 00000000 */ nop +/* 109594 802E7D14 00000000 */ nop .L802E7D18: /* 109598 802E7D18 8FBF0014 */ lw $ra, 0x14($sp) /* 10959C 802E7D1C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s b/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s index 67e7671126..75fb22f553 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s +++ b/asm/nonmatchings/code_111f0_len_860/func_80035EEC.s @@ -14,14 +14,14 @@ glabel func_80035EEC /* 11310 80035F10 50400005 */ beql $v0, $zero, .L80035F28 /* 11314 80035F14 24020002 */ addiu $v0, $zero, 2 /* 11318 80035F18 10600007 */ beqz $v1, .L80035F38 -/* 1131C 80035F1C 00000000 */ nop +/* 1131C 80035F1C 00000000 */ nop /* 11320 80035F20 0800D83B */ j .L800360EC -/* 11324 80035F24 00000000 */ nop +/* 11324 80035F24 00000000 */ nop .L80035F28: /* 11328 80035F28 10620055 */ beq $v1, $v0, .L80036080 -/* 1132C 80035F2C 00000000 */ nop +/* 1132C 80035F2C 00000000 */ nop /* 11330 80035F30 0800D83B */ j .L800360EC -/* 11334 80035F34 00000000 */ nop +/* 11334 80035F34 00000000 */ nop .L80035F38: /* 11338 80035F38 3C04800A */ lui $a0, %hi(D_800A0946) /* 1133C 80035F3C 24840946 */ addiu $a0, $a0, %lo(D_800A0946) @@ -50,7 +50,7 @@ glabel func_80035EEC /* 11394 80035F94 8445008C */ lh $a1, 0x8c($v0) .L80035F98: /* 11398 80035F98 0C0169BD */ jal load_map_by_IDs -/* 1139C 80035F9C 00000000 */ nop +/* 1139C 80035F9C 00000000 */ nop /* 113A0 80035FA0 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 113A4 80035FA4 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 113A8 80035FA8 8E020000 */ lw $v0, ($s0) @@ -61,12 +61,12 @@ glabel func_80035EEC /* 113BC 80035FBC 8E020000 */ lw $v0, ($s0) /* 113C0 80035FC0 80420071 */ lb $v0, 0x71($v0) /* 113C4 80035FC4 14400003 */ bnez $v0, .L80035FD4 -/* 113C8 80035FC8 00000000 */ nop +/* 113C8 80035FC8 00000000 */ nop /* 113CC 80035FCC 0C03805E */ jal disable_player_input -/* 113D0 80035FD0 00000000 */ nop +/* 113D0 80035FD0 00000000 */ nop .L80035FD4: /* 113D4 80035FD4 0C00B500 */ jal update_cameras -/* 113D8 80035FD8 00000000 */ nop +/* 113D8 80035FD8 00000000 */ nop /* 113DC 80035FDC 3C02800A */ lui $v0, %hi(D_800A0944) /* 113E0 80035FE0 24420944 */ addiu $v0, $v0, %lo(D_800A0944) /* 113E4 80035FE4 94430000 */ lhu $v1, ($v0) @@ -78,13 +78,13 @@ glabel func_80035EEC /* 113FC 80035FFC A4430000 */ sh $v1, ($v0) .L80036000: /* 11400 80036000 0C00F949 */ jal func_8003E524 -/* 11404 80036004 00000000 */ nop +/* 11404 80036004 00000000 */ nop /* 11408 80036008 0C00E64C */ jal update_npcs -/* 1140C 8003600C 00000000 */ nop +/* 1140C 8003600C 00000000 */ nop /* 11410 80036010 0C037DD0 */ jal update_player -/* 11414 80036014 00000000 */ nop +/* 11414 80036014 00000000 */ nop /* 11418 80036018 0C00B500 */ jal update_cameras -/* 1141C 8003601C 00000000 */ nop +/* 1141C 8003601C 00000000 */ nop /* 11420 80036020 3C04800A */ lui $a0, %hi(D_800A0946) /* 11424 80036024 24840946 */ addiu $a0, $a0, %lo(D_800A0946) /* 11428 80036028 84820000 */ lh $v0, ($a0) @@ -100,7 +100,7 @@ glabel func_80035EEC /* 11448 80036048 0C0B1059 */ jal does_script_exist /* 1144C 8003604C 8C44006C */ lw $a0, 0x6c($v0) /* 11450 80036050 14400026 */ bnez $v0, .L800360EC -/* 11454 80036054 00000000 */ nop +/* 11454 80036054 00000000 */ nop /* 11458 80036058 3C05800A */ lui $a1, %hi(D_8009A650) /* 1145C 8003605C 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650) /* 11460 80036060 2404FFF7 */ addiu $a0, $zero, -9 @@ -113,27 +113,27 @@ glabel func_80035EEC /* 1147C 8003607C A6030000 */ sh $v1, ($s0) .L80036080: /* 11480 80036080 0C00E64C */ jal update_npcs -/* 11484 80036084 00000000 */ nop +/* 11484 80036084 00000000 */ nop /* 11488 80036088 0C037DD0 */ jal update_player -/* 1148C 8003608C 00000000 */ nop +/* 1148C 8003608C 00000000 */ nop /* 11490 80036090 0C016754 */ jal func_80059D50 -/* 11494 80036094 00000000 */ nop +/* 11494 80036094 00000000 */ nop /* 11498 80036098 0C00B500 */ jal update_cameras -/* 1149C 8003609C 00000000 */ nop +/* 1149C 8003609C 00000000 */ nop /* 114A0 800360A0 3C04800A */ lui $a0, %hi(gMapTransitionAlpha) /* 114A4 800360A4 24840940 */ addiu $a0, $a0, %lo(gMapTransitionAlpha) /* 114A8 800360A8 0C04E175 */ jal func_801385D4 -/* 114AC 800360AC 00000000 */ nop +/* 114AC 800360AC 00000000 */ nop /* 114B0 800360B0 00021400 */ sll $v0, $v0, 0x10 /* 114B4 800360B4 1040000D */ beqz $v0, .L800360EC -/* 114B8 800360B8 00000000 */ nop +/* 114B8 800360B8 00000000 */ nop /* 114BC 800360BC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 114C0 800360C0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 114C4 800360C4 80420071 */ lb $v0, 0x71($v0) /* 114C8 800360C8 14400003 */ bnez $v0, .L800360D8 -/* 114CC 800360CC 00000000 */ nop +/* 114CC 800360CC 00000000 */ nop /* 114D0 800360D0 0C038069 */ jal enable_player_input -/* 114D4 800360D4 00000000 */ nop +/* 114D4 800360D4 00000000 */ nop .L800360D8: /* 114D8 800360D8 3C05BF80 */ lui $a1, 0xbf80 /* 114DC 800360DC 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s index 0ad7f3eadf..6ca959b7dc 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_8003617C.s +++ b/asm/nonmatchings/code_111f0_len_860/func_8003617C.s @@ -15,22 +15,22 @@ glabel func_8003617C /* 115A4 800361A4 00220821 */ addu $at, $at, $v0 /* 115A8 800361A8 8C228320 */ lw $v0, %lo(D_80098320)($at) /* 115AC 800361AC 00400008 */ jr $v0 -/* 115B0 800361B0 00000000 */ nop +/* 115B0 800361B0 00000000 */ nop /* 115B4 800361B4 0C00E64C */ jal update_npcs -/* 115B8 800361B8 00000000 */ nop +/* 115B8 800361B8 00000000 */ nop /* 115BC 800361BC 0C037DD0 */ jal update_player -/* 115C0 800361C0 00000000 */ nop +/* 115C0 800361C0 00000000 */ nop /* 115C4 800361C4 0C016754 */ jal func_80059D50 -/* 115C8 800361C8 00000000 */ nop +/* 115C8 800361C8 00000000 */ nop /* 115CC 800361CC 0C00B500 */ jal update_cameras -/* 115D0 800361D0 00000000 */ nop +/* 115D0 800361D0 00000000 */ nop /* 115D4 800361D4 3C04800A */ lui $a0, %hi(gMapTransitionAlpha) /* 115D8 800361D8 24840940 */ addiu $a0, $a0, %lo(gMapTransitionAlpha) /* 115DC 800361DC 0C04E0AB */ jal func_801382AC -/* 115E0 800361E0 00000000 */ nop +/* 115E0 800361E0 00000000 */ nop /* 115E4 800361E4 00021400 */ sll $v0, $v0, 0x10 /* 115E8 800361E8 1040007F */ beqz $v0, .L800363E8 -/* 115EC 800361EC 00000000 */ nop +/* 115EC 800361EC 00000000 */ nop /* 115F0 800361F0 3C03800A */ lui $v1, %hi(D_800A0944) /* 115F4 800361F4 24630944 */ addiu $v1, $v1, %lo(D_800A0944) /* 115F8 800361F8 94620000 */ lhu $v0, ($v1) @@ -57,7 +57,7 @@ glabel func_8003617C /* 1164C 8003624C 8E020000 */ lw $v0, ($s0) /* 11650 80036250 80420071 */ lb $v0, 0x71($v0) /* 11654 80036254 10400003 */ beqz $v0, .L80036264 -/* 11658 80036258 00000000 */ nop +/* 11658 80036258 00000000 */ nop /* 1165C 8003625C 0C00CD3C */ jal set_game_mode /* 11660 80036260 24040011 */ addiu $a0, $zero, 0x11 .L80036264: @@ -82,16 +82,16 @@ glabel func_8003617C /* 116A8 800362A8 0C009C22 */ jal func_80027088 /* 116AC 800362AC 0000202D */ daddu $a0, $zero, $zero /* 116B0 800362B0 0C018030 */ jal nuContRmbForceStopEnd -/* 116B4 800362B4 00000000 */ nop +/* 116B4 800362B4 00000000 */ nop /* 116B8 800362B8 8E020000 */ lw $v0, ($s0) /* 116BC 800362BC 80420071 */ lb $v0, 0x71($v0) /* 116C0 800362C0 14400003 */ bnez $v0, .L800362D0 -/* 116C4 800362C4 00000000 */ nop +/* 116C4 800362C4 00000000 */ nop /* 116C8 800362C8 0C03805E */ jal disable_player_input -/* 116CC 800362CC 00000000 */ nop +/* 116CC 800362CC 00000000 */ nop .L800362D0: /* 116D0 800362D0 0C00B500 */ jal update_cameras -/* 116D4 800362D4 00000000 */ nop +/* 116D4 800362D4 00000000 */ nop /* 116D8 800362D8 3C02800A */ lui $v0, %hi(D_800A0944) /* 116DC 800362DC 24420944 */ addiu $v0, $v0, %lo(D_800A0944) /* 116E0 800362E0 94430000 */ lhu $v1, ($v0) @@ -101,13 +101,13 @@ glabel func_8003617C /* 116F0 800362F0 0800D8FA */ j .L800363E8 /* 116F4 800362F4 A4430000 */ sh $v1, ($v0) /* 116F8 800362F8 0C00F949 */ jal func_8003E524 -/* 116FC 800362FC 00000000 */ nop +/* 116FC 800362FC 00000000 */ nop /* 11700 80036300 0C00E64C */ jal update_npcs -/* 11704 80036304 00000000 */ nop +/* 11704 80036304 00000000 */ nop /* 11708 80036308 0C037DD0 */ jal update_player -/* 1170C 8003630C 00000000 */ nop +/* 1170C 8003630C 00000000 */ nop /* 11710 80036310 0C00B500 */ jal update_cameras -/* 11714 80036314 00000000 */ nop +/* 11714 80036314 00000000 */ nop /* 11718 80036318 3C04800A */ lui $a0, %hi(D_800A0946) /* 1171C 8003631C 24840946 */ addiu $a0, $a0, %lo(D_800A0946) /* 11720 80036320 84820000 */ lh $v0, ($a0) @@ -135,27 +135,27 @@ glabel func_8003617C /* 11774 80036374 0800D8FA */ j .L800363E8 /* 11778 80036378 A4C30000 */ sh $v1, ($a2) /* 1177C 8003637C 0C00E64C */ jal update_npcs -/* 11780 80036380 00000000 */ nop +/* 11780 80036380 00000000 */ nop /* 11784 80036384 0C037DD0 */ jal update_player -/* 11788 80036388 00000000 */ nop +/* 11788 80036388 00000000 */ nop /* 1178C 8003638C 0C016754 */ jal func_80059D50 -/* 11790 80036390 00000000 */ nop +/* 11790 80036390 00000000 */ nop /* 11794 80036394 0C00B500 */ jal update_cameras -/* 11798 80036398 00000000 */ nop +/* 11798 80036398 00000000 */ nop /* 1179C 8003639C 3C04800A */ lui $a0, %hi(gMapTransitionAlpha) /* 117A0 800363A0 24840940 */ addiu $a0, $a0, %lo(gMapTransitionAlpha) /* 117A4 800363A4 0C04E175 */ jal func_801385D4 -/* 117A8 800363A8 00000000 */ nop +/* 117A8 800363A8 00000000 */ nop /* 117AC 800363AC 00021400 */ sll $v0, $v0, 0x10 /* 117B0 800363B0 1040000D */ beqz $v0, .L800363E8 -/* 117B4 800363B4 00000000 */ nop +/* 117B4 800363B4 00000000 */ nop /* 117B8 800363B8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 117BC 800363BC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 117C0 800363C0 80420071 */ lb $v0, 0x71($v0) /* 117C4 800363C4 14400003 */ bnez $v0, .L800363D4 -/* 117C8 800363C8 00000000 */ nop +/* 117C8 800363C8 00000000 */ nop /* 117CC 800363CC 0C038069 */ jal enable_player_input -/* 117D0 800363D0 00000000 */ nop +/* 117D0 800363D0 00000000 */ nop .L800363D4: /* 117D4 800363D4 3C05BF80 */ lui $a1, 0xbf80 /* 117D8 800363D8 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/code_111f0_len_860/func_8003646C.s b/asm/nonmatchings/code_111f0_len_860/func_8003646C.s index 36a13df4c4..378c84d231 100644 --- a/asm/nonmatchings/code_111f0_len_860/func_8003646C.s +++ b/asm/nonmatchings/code_111f0_len_860/func_8003646C.s @@ -15,17 +15,17 @@ glabel func_8003646C /* 11894 80036494 10400005 */ beqz $v0, .L800364AC /* 11898 80036498 24020001 */ addiu $v0, $zero, 1 /* 1189C 8003649C 1062000A */ beq $v1, $v0, .L800364C8 -/* 118A0 800364A0 00000000 */ nop +/* 118A0 800364A0 00000000 */ nop /* 118A4 800364A4 0800D984 */ j .L80036610 -/* 118A8 800364A8 00000000 */ nop +/* 118A8 800364A8 00000000 */ nop .L800364AC: /* 118AC 800364AC 24020003 */ addiu $v0, $zero, 3 /* 118B0 800364B0 1062002A */ beq $v1, $v0, .L8003655C /* 118B4 800364B4 24020004 */ addiu $v0, $zero, 4 /* 118B8 800364B8 1062003C */ beq $v1, $v0, .L800365AC -/* 118BC 800364BC 00000000 */ nop +/* 118BC 800364BC 00000000 */ nop /* 118C0 800364C0 0800D984 */ j .L80036610 -/* 118C4 800364C4 00000000 */ nop +/* 118C4 800364C4 00000000 */ nop .L800364C8: /* 118C8 800364C8 3C03800A */ lui $v1, %hi(D_8009A650) /* 118CC 800364CC 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) @@ -61,7 +61,7 @@ glabel func_8003646C /* 1193C 8003653C 0C0169BD */ jal load_map_by_IDs /* 11940 80036540 0000302D */ daddu $a2, $zero, $zero /* 11944 80036544 0C018030 */ jal nuContRmbForceStopEnd -/* 11948 80036548 00000000 */ nop +/* 11948 80036548 00000000 */ nop /* 1194C 8003654C 96020000 */ lhu $v0, ($s0) /* 11950 80036550 24420001 */ addiu $v0, $v0, 1 .L80036554: @@ -69,15 +69,15 @@ glabel func_8003646C /* 11958 80036558 A6020000 */ sh $v0, ($s0) .L8003655C: /* 1195C 8003655C 0C00F949 */ jal func_8003E524 -/* 11960 80036560 00000000 */ nop +/* 11960 80036560 00000000 */ nop /* 11964 80036564 0C00E64C */ jal update_npcs -/* 11968 80036568 00000000 */ nop +/* 11968 80036568 00000000 */ nop /* 1196C 8003656C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 11970 80036570 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 11974 80036574 0C0B1059 */ jal does_script_exist /* 11978 80036578 8C44006C */ lw $a0, 0x6c($v0) /* 1197C 8003657C 1440002C */ bnez $v0, .L80036630 -/* 11980 80036580 00000000 */ nop +/* 11980 80036580 00000000 */ nop /* 11984 80036584 3C05800A */ lui $a1, %hi(D_8009A650) /* 11988 80036588 24A5A650 */ addiu $a1, $a1, %lo(D_8009A650) /* 1198C 8003658C 2404FFF7 */ addiu $a0, $zero, -9 @@ -108,18 +108,18 @@ glabel func_8003646C /* 119EC 800365EC 24040004 */ addiu $a0, $zero, 4 .L800365F0: /* 119F0 800365F0 0C00E64C */ jal update_npcs -/* 119F4 800365F4 00000000 */ nop +/* 119F4 800365F4 00000000 */ nop /* 119F8 800365F8 0C037DD0 */ jal update_player -/* 119FC 800365FC 00000000 */ nop +/* 119FC 800365FC 00000000 */ nop /* 11A00 80036600 0C016754 */ jal func_80059D50 -/* 11A04 80036604 00000000 */ nop +/* 11A04 80036604 00000000 */ nop /* 11A08 80036608 0C00B500 */ jal update_cameras -/* 11A0C 8003660C 00000000 */ nop +/* 11A0C 8003660C 00000000 */ nop .L80036610: /* 11A10 80036610 3C02800A */ lui $v0, %hi(gMapTransitionAlpha) /* 11A14 80036614 84420940 */ lh $v0, %lo(gMapTransitionAlpha)($v0) /* 11A18 80036618 44820000 */ mtc1 $v0, $f0 -/* 11A1C 8003661C 00000000 */ nop +/* 11A1C 8003661C 00000000 */ nop /* 11A20 80036620 46800020 */ cvt.s.w $f0, $f0 /* 11A24 80036624 44050000 */ mfc1 $a1, $f0 /* 11A28 80036628 0C04DF62 */ jal func_80137D88 diff --git a/asm/nonmatchings/code_1370_len_7d0/boot_main.s b/asm/nonmatchings/code_1370_len_7d0/boot_main.s index 690c8ceec4..85bc7b4eda 100644 --- a/asm/nonmatchings/code_1370_len_7d0/boot_main.s +++ b/asm/nonmatchings/code_1370_len_7d0/boot_main.s @@ -11,52 +11,52 @@ glabel boot_main /* 1388 80025F88 3C048009 */ lui $a0, 0x8009 /* 138C 80025F8C 24845820 */ addiu $a0, $a0, 0x5820 /* 1390 80025F90 080097EB */ j .L80025FAC -/* 1394 80025F94 00000000 */ nop +/* 1394 80025F94 00000000 */ nop .L80025F98: /* 1398 80025F98 24020002 */ addiu $v0, $zero, 2 /* 139C 80025F9C 14620009 */ bne $v1, $v0, .L80025FC4 -/* 13A0 80025FA0 00000000 */ nop +/* 13A0 80025FA0 00000000 */ nop /* 13A4 80025FA4 3C048009 */ lui $a0, 0x8009 /* 13A8 80025FA8 24845870 */ addiu $a0, $a0, 0x5870 .L80025FAC: /* 13AC 80025FAC 0C019B84 */ jal osViSetMode -/* 13B0 80025FB0 00000000 */ nop +/* 13B0 80025FB0 00000000 */ nop /* 13B4 80025FB4 0C019B98 */ jal osViSetSpecialFeatures /* 13B8 80025FB8 2404005A */ addiu $a0, $zero, 0x5a /* 13BC 80025FBC 080097F3 */ j .L80025FCC -/* 13C0 80025FC0 00000000 */ nop +/* 13C0 80025FC0 00000000 */ nop .L80025FC4: /* 13C4 80025FC4 080097F1 */ j .L80025FC4 -/* 13C8 80025FC8 00000000 */ nop +/* 13C8 80025FC8 00000000 */ nop .L80025FCC: /* 13CC 80025FCC 0C017D00 */ jal nuGfxDisplayOff -/* 13D0 80025FD0 00000000 */ nop +/* 13D0 80025FD0 00000000 */ nop /* 13D4 80025FD4 0C00B22C */ jal crash_create_monitor -/* 13D8 80025FD8 00000000 */ nop +/* 13D8 80025FD8 00000000 */ nop /* 13DC 80025FDC 0C009718 */ jal func_80025C60 -/* 13E0 80025FE0 00000000 */ nop +/* 13E0 80025FE0 00000000 */ nop /* 13E4 80025FE4 0C017D58 */ jal nuGfxInitEX2 -/* 13E8 80025FE8 00000000 */ nop +/* 13E8 80025FE8 00000000 */ nop /* 13EC 80025FEC 0C017D84 */ jal nuContInit -/* 13F0 80025FF0 00000000 */ nop +/* 13F0 80025FF0 00000000 */ nop /* 13F4 80025FF4 3C038007 */ lui $v1, %hi(gGameStatusPtr) /* 13F8 80025FF8 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) /* 13FC 80025FFC 0C00B458 */ jal func_8002D160 /* 1400 80026000 A0620073 */ sb $v0, 0x73($v1) /* 1404 80026004 0C0AC800 */ jal func_802B2000 -/* 1408 80026008 00000000 */ nop +/* 1408 80026008 00000000 */ nop /* 140C 8002600C 0C0AC80F */ jal func_802B203C -/* 1410 80026010 00000000 */ nop +/* 1410 80026010 00000000 */ nop /* 1414 80026014 3C048002 */ lui $a0, %hi(gfxRetrace_Callback) /* 1418 80026018 2484605C */ addiu $a0, $a0, %lo(gfxRetrace_Callback) /* 141C 8002601C 0C017C94 */ jal nuGfxFuncSet -/* 1420 80026020 00000000 */ nop +/* 1420 80026020 00000000 */ nop /* 1424 80026024 3C048002 */ lui $a0, %hi(gfxPreNMI_Callback) /* 1428 80026028 2484670C */ addiu $a0, $a0, %lo(gfxPreNMI_Callback) /* 142C 8002602C 0C017CA4 */ jal nuGfxPreNMIFuncSet -/* 1430 80026030 00000000 */ nop +/* 1430 80026030 00000000 */ nop /* 1434 80026034 0C019680 */ jal osGetCount -/* 1438 80026038 00000000 */ nop +/* 1438 80026038 00000000 */ nop /* 143C 8002603C 3C048007 */ lui $a0, %hi(gRandSeed) /* 1440 80026040 24844410 */ addiu $a0, $a0, %lo(gRandSeed) /* 1444 80026044 8C830000 */ lw $v1, ($a0) @@ -65,4 +65,4 @@ glabel boot_main /* 1450 80026050 AC830000 */ sw $v1, ($a0) .L80026054: /* 1454 80026054 08009815 */ j .L80026054 -/* 1458 80026058 00000000 */ nop +/* 1458 80026058 00000000 */ nop diff --git a/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s b/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s index a2c087f4a3..7e8203daa4 100644 --- a/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s +++ b/asm/nonmatchings/code_1370_len_7d0/gfxPreNMI_Callback.s @@ -8,10 +8,10 @@ glabel gfxPreNMI_Callback /* 1B18 80026718 3C018007 */ lui $at, %hi(D_80073E00) /* 1B1C 8002671C AC223E00 */ sw $v0, %lo(D_80073E00)($at) /* 1B20 80026720 0C018028 */ jal nuContRmbForceStop -/* 1B24 80026724 00000000 */ nop +/* 1B24 80026724 00000000 */ nop /* 1B28 80026728 8FBF0010 */ lw $ra, 0x10($sp) /* 1B2C 8002672C 03E00008 */ jr $ra /* 1B30 80026730 27BD0018 */ addiu $sp, $sp, 0x18 -/* 1B34 80026734 00000000 */ nop -/* 1B38 80026738 00000000 */ nop -/* 1B3C 8002673C 00000000 */ nop +/* 1B34 80026734 00000000 */ nop +/* 1B38 80026738 00000000 */ nop +/* 1B3C 8002673C 00000000 */ nop diff --git a/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s b/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s index 74c0183ce1..e9ab9db479 100644 --- a/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s +++ b/asm/nonmatchings/code_1370_len_7d0/gfxRetrace_Callback.s @@ -13,13 +13,13 @@ glabel gfxRetrace_Callback /* 147C 8002607C 0080802D */ daddu $s0, $a0, $zero /* 1480 80026080 24020001 */ addiu $v0, $zero, 1 /* 1484 80026084 14620016 */ bne $v1, $v0, .L800260E0 -/* 1488 80026088 00000000 */ nop +/* 1488 80026088 00000000 */ nop /* 148C 8002608C 0C017CB4 */ jal nuGfxTaskAllEndWait -/* 1490 80026090 00000000 */ nop +/* 1490 80026090 00000000 */ nop /* 1494 80026094 16000012 */ bnez $s0, .L800260E0 -/* 1498 80026098 00000000 */ nop +/* 1498 80026098 00000000 */ nop /* 149C 8002609C 0C019A6C */ jal osViGetCurrentFramebuffer -/* 14A0 800260A0 00000000 */ nop +/* 14A0 800260A0 00000000 */ nop /* 14A4 800260A4 3C10800A */ lui $s0, %hi(D_8009A680) /* 14A8 800260A8 2610A680 */ addiu $s0, $s0, %lo(D_8009A680) /* 14AC 800260AC 0200202D */ daddu $a0, $s0, $zero @@ -32,7 +32,7 @@ glabel gfxRetrace_Callback /* 14C8 800260C8 24050003 */ addiu $a1, $zero, 3 /* 14CC 800260CC 8E040000 */ lw $a0, ($s0) /* 14D0 800260D0 0C019C08 */ jal osViSwapBuffer -/* 14D4 800260D4 00000000 */ nop +/* 14D4 800260D4 00000000 */ nop /* 14D8 800260D8 24020002 */ addiu $v0, $zero, 2 /* 14DC 800260DC AE220000 */ sw $v0, ($s1) .L800260E0: @@ -40,11 +40,11 @@ glabel gfxRetrace_Callback /* 14E4 800260E4 8C633E00 */ lw $v1, %lo(D_80073E00)($v1) /* 14E8 800260E8 24020002 */ addiu $v0, $zero, 2 /* 14EC 800260EC 14620018 */ bne $v1, $v0, .L80026150 -/* 14F0 800260F0 00000000 */ nop +/* 14F0 800260F0 00000000 */ nop /* 14F4 800260F4 0C009859 */ jal func_80026164 -/* 14F8 800260F8 00000000 */ nop +/* 14F8 800260F8 00000000 */ nop /* 14FC 800260FC 08009854 */ j .L80026150 -/* 1500 80026100 00000000 */ nop +/* 1500 80026100 00000000 */ nop .L80026104: /* 1504 80026104 3C038007 */ lui $v1, %hi(D_80073E0A) /* 1508 80026108 24633E0A */ addiu $v1, $v1, %lo(D_80073E0A) @@ -53,18 +53,18 @@ glabel gfxRetrace_Callback /* 1514 80026114 1440000E */ bnez $v0, .L80026150 /* 1518 80026118 A4620000 */ sh $v0, ($v1) /* 151C 8002611C 0C0099D0 */ jal step_game_loop -/* 1520 80026120 00000000 */ nop +/* 1520 80026120 00000000 */ nop /* 1524 80026124 3C038007 */ lui $v1, %hi(D_80073E08) /* 1528 80026128 24633E08 */ addiu $v1, $v1, %lo(D_80073E08) /* 152C 8002612C 24020001 */ addiu $v0, $zero, 1 /* 1530 80026130 A4620000 */ sh $v0, ($v1) /* 1534 80026134 2A020003 */ slti $v0, $s0, 3 /* 1538 80026138 10400005 */ beqz $v0, .L80026150 -/* 153C 8002613C 00000000 */ nop +/* 153C 8002613C 00000000 */ nop /* 1540 80026140 0C009A7B */ jal func_800269EC /* 1544 80026144 A4600000 */ sh $zero, ($v1) /* 1548 80026148 0C009AC2 */ jal gfx_draw_frame -/* 154C 8002614C 00000000 */ nop +/* 154C 8002614C 00000000 */ nop .L80026150: /* 1550 80026150 8FBF0018 */ lw $ra, 0x18($sp) /* 1554 80026154 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/_create_npc.s b/asm/nonmatchings/code_13870_len_6980/_create_npc.s index 0914b2b1ba..1135c55eb3 100644 --- a/asm/nonmatchings/code_13870_len_6980/_create_npc.s +++ b/asm/nonmatchings/code_13870_len_6980/_create_npc.s @@ -26,10 +26,10 @@ glabel _create_npc /* 139E8 800385E8 2A220040 */ slti $v0, $s1, 0x40 .L800385EC: /* 139EC 800385EC 14400003 */ bnez $v0, .L800385FC -/* 139F0 800385F0 00000000 */ nop +/* 139F0 800385F0 00000000 */ nop .L800385F4: /* 139F4 800385F4 0800E17D */ j .L800385F4 -/* 139F8 800385F8 00000000 */ nop +/* 139F8 800385F8 00000000 */ nop .L800385FC: /* 139FC 800385FC 0C00AB39 */ jal heap_malloc /* 13A00 80038600 24040340 */ addiu $a0, $zero, 0x340 @@ -47,7 +47,7 @@ glabel _create_npc /* 13A30 80038630 A4A30000 */ sh $v1, ($a1) .L80038634: /* 13A34 80038634 0800E18D */ j .L80038634 -/* 13A38 80038638 00000000 */ nop +/* 13A38 80038638 00000000 */ nop .L8003863C: /* 13A3C 8003863C 3C030041 */ lui $v1, 0x41 /* 13A40 80038640 8E420000 */ lw $v0, ($s2) @@ -150,14 +150,14 @@ glabel _create_npc /* 13BB4 800387B4 0260282D */ daddu $a1, $s3, $zero /* 13BB8 800387B8 8E040028 */ lw $a0, 0x28($s0) /* 13BBC 800387BC 0800E1F4 */ j .L800387D0 -/* 13BC0 800387C0 00000000 */ nop +/* 13BC0 800387C0 00000000 */ nop .L800387C4: /* 13BC4 800387C4 8E020028 */ lw $v0, 0x28($s0) /* 13BC8 800387C8 3C048000 */ lui $a0, 0x8000 /* 13BCC 800387CC 00442025 */ or $a0, $v0, $a0 .L800387D0: /* 13BD0 800387D0 0C0B783B */ jal func_802DE0EC -/* 13BD4 800387D4 00000000 */ nop +/* 13BD4 800387D4 00000000 */ nop /* 13BD8 800387D8 0800E1FA */ j .L800387E8 /* 13BDC 800387DC AE020024 */ sw $v0, 0x24($s0) .L800387E0: diff --git a/asm/nonmatchings/code_13870_len_6980/appedGfx_npc_blur.s b/asm/nonmatchings/code_13870_len_6980/appedGfx_npc_blur.s index 8c826f8d93..d4fc35cdfb 100644 --- a/asm/nonmatchings/code_13870_len_6980/appedGfx_npc_blur.s +++ b/asm/nonmatchings/code_13870_len_6980/appedGfx_npc_blur.s @@ -72,9 +72,9 @@ glabel appedGfx_npc_blur /* 1633C 8003AF3C 27A40020 */ addiu $a0, $sp, 0x20 /* 16340 8003AF40 C6000048 */ lwc1 $f0, 0x48($s0) /* 16344 8003AF44 461C0032 */ c.eq.s $f0, $f28 -/* 16348 8003AF48 00000000 */ nop +/* 16348 8003AF48 00000000 */ nop /* 1634C 8003AF4C 4501000B */ bc1t .L8003AF7C -/* 16350 8003AF50 00000000 */ nop +/* 16350 8003AF50 00000000 */ nop /* 16354 8003AF54 E7BC0010 */ swc1 $f28, 0x10($sp) /* 16358 8003AF58 8E050048 */ lw $a1, 0x48($s0) /* 1635C 8003AF5C 4406E000 */ mfc1 $a2, $f28 @@ -88,9 +88,9 @@ glabel appedGfx_npc_blur .L8003AF7C: /* 1637C 8003AF7C C6000044 */ lwc1 $f0, 0x44($s0) /* 16380 8003AF80 461C0032 */ c.eq.s $f0, $f28 -/* 16384 8003AF84 00000000 */ nop +/* 16384 8003AF84 00000000 */ nop /* 16388 8003AF88 4501000B */ bc1t .L8003AFB8 -/* 1638C 8003AF8C 00000000 */ nop +/* 1638C 8003AF8C 00000000 */ nop /* 16390 8003AF90 E7BC0010 */ swc1 $f28, 0x10($sp) /* 16394 8003AF94 8E050048 */ lw $a1, 0x48($s0) /* 16398 8003AF98 4406E000 */ mfc1 $a2, $f28 @@ -104,9 +104,9 @@ glabel appedGfx_npc_blur .L8003AFB8: /* 163B8 8003AFB8 C600004C */ lwc1 $f0, 0x4c($s0) /* 163BC 8003AFBC 461C0032 */ c.eq.s $f0, $f28 -/* 163C0 8003AFC0 00000000 */ nop +/* 163C0 8003AFC0 00000000 */ nop /* 163C4 8003AFC4 4501000B */ bc1t .L8003AFF4 -/* 163C8 8003AFC8 00000000 */ nop +/* 163C8 8003AFC8 00000000 */ nop /* 163CC 8003AFCC E7BC0010 */ swc1 $f28, 0x10($sp) /* 163D0 8003AFD0 8E050048 */ lw $a1, 0x48($s0) /* 163D4 8003AFD4 4406E000 */ mfc1 $a2, $f28 @@ -121,46 +121,46 @@ glabel appedGfx_npc_blur /* 163F4 8003AFF4 C6000054 */ lwc1 $f0, 0x54($s0) /* 163F8 8003AFF8 46000021 */ cvt.d.s $f0, $f0 /* 163FC 8003AFFC 463A0002 */ mul.d $f0, $f0, $f26 -/* 16400 8003B000 00000000 */ nop +/* 16400 8003B000 00000000 */ nop /* 16404 8003B004 463E0032 */ c.eq.d $f0, $f30 -/* 16408 8003B008 00000000 */ nop +/* 16408 8003B008 00000000 */ nop /* 1640C 8003B00C 45000014 */ bc1f .L8003B060 -/* 16410 8003B010 00000000 */ nop +/* 16410 8003B010 00000000 */ nop /* 16414 8003B014 C6000058 */ lwc1 $f0, 0x58($s0) /* 16418 8003B018 C6020320 */ lwc1 $f2, 0x320($s0) /* 1641C 8003B01C 46020002 */ mul.s $f0, $f0, $f2 -/* 16420 8003B020 00000000 */ nop +/* 16420 8003B020 00000000 */ nop /* 16424 8003B024 46000021 */ cvt.d.s $f0, $f0 /* 16428 8003B028 463A0002 */ mul.d $f0, $f0, $f26 -/* 1642C 8003B02C 00000000 */ nop +/* 1642C 8003B02C 00000000 */ nop /* 16430 8003B030 463E0032 */ c.eq.d $f0, $f30 -/* 16434 8003B034 00000000 */ nop +/* 16434 8003B034 00000000 */ nop /* 16438 8003B038 45000009 */ bc1f .L8003B060 -/* 1643C 8003B03C 00000000 */ nop +/* 1643C 8003B03C 00000000 */ nop /* 16440 8003B040 C600005C */ lwc1 $f0, 0x5c($s0) /* 16444 8003B044 46000021 */ cvt.d.s $f0, $f0 /* 16448 8003B048 463A0002 */ mul.d $f0, $f0, $f26 -/* 1644C 8003B04C 00000000 */ nop +/* 1644C 8003B04C 00000000 */ nop /* 16450 8003B050 463E0032 */ c.eq.d $f0, $f30 -/* 16454 8003B054 00000000 */ nop +/* 16454 8003B054 00000000 */ nop /* 16458 8003B058 4501001C */ bc1t .L8003B0CC -/* 1645C 8003B05C 00000000 */ nop +/* 1645C 8003B05C 00000000 */ nop .L8003B060: /* 16460 8003B060 C6060054 */ lwc1 $f6, 0x54($s0) /* 16464 8003B064 460031A1 */ cvt.d.s $f6, $f6 /* 16468 8003B068 463A3182 */ mul.d $f6, $f6, $f26 -/* 1646C 8003B06C 00000000 */ nop +/* 1646C 8003B06C 00000000 */ nop /* 16470 8003B070 C604005C */ lwc1 $f4, 0x5c($s0) /* 16474 8003B074 46002121 */ cvt.d.s $f4, $f4 /* 16478 8003B078 463A2102 */ mul.d $f4, $f4, $f26 -/* 1647C 8003B07C 00000000 */ nop +/* 1647C 8003B07C 00000000 */ nop /* 16480 8003B080 C6000058 */ lwc1 $f0, 0x58($s0) /* 16484 8003B084 C6020320 */ lwc1 $f2, 0x320($s0) /* 16488 8003B088 46020002 */ mul.s $f0, $f0, $f2 -/* 1648C 8003B08C 00000000 */ nop +/* 1648C 8003B08C 00000000 */ nop /* 16490 8003B090 46000021 */ cvt.d.s $f0, $f0 /* 16494 8003B094 463A0002 */ mul.d $f0, $f0, $f26 -/* 16498 8003B098 00000000 */ nop +/* 16498 8003B098 00000000 */ nop /* 1649C 8003B09C 462031A0 */ cvt.s.d $f6, $f6 /* 164A0 8003B0A0 46202120 */ cvt.s.d $f4, $f4 /* 164A4 8003B0A4 44053000 */ mfc1 $a1, $f6 diff --git a/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s b/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s index 2ca5dab9d1..a6456a7deb 100644 --- a/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s +++ b/asm/nonmatchings/code_13870_len_6980/appendGfx_npc.s @@ -14,7 +14,7 @@ glabel appendGfx_npc /* 153F4 80039FF4 822200AB */ lb $v0, 0xab($s1) /* 153F8 80039FF8 C624003C */ lwc1 $f4, 0x3c($s1) /* 153FC 80039FFC 44821000 */ mtc1 $v0, $f2 -/* 15400 8003A000 00000000 */ nop +/* 15400 8003A000 00000000 */ nop /* 15404 8003A004 468010A0 */ cvt.s.w $f2, $f2 /* 15408 8003A008 46022100 */ add.s $f4, $f4, $f2 /* 1540C 8003A00C 8E250038 */ lw $a1, 0x38($s1) @@ -35,9 +35,9 @@ glabel appendGfx_npc .L8003A048: /* 15448 8003A048 C6200050 */ lwc1 $f0, 0x50($s1) /* 1544C 8003A04C 4480A000 */ mtc1 $zero, $f20 -/* 15450 8003A050 00000000 */ nop +/* 15450 8003A050 00000000 */ nop /* 15454 8003A054 46140032 */ c.eq.s $f0, $f20 -/* 15458 8003A058 00000000 */ nop +/* 15458 8003A058 00000000 */ nop /* 1545C 8003A05C 4501000A */ bc1t .L8003A088 /* 15460 8003A060 27B00058 */ addiu $s0, $sp, 0x58 /* 15464 8003A064 4405A000 */ mfc1 $a1, $f20 @@ -52,7 +52,7 @@ glabel appendGfx_npc .L8003A088: /* 15488 8003A088 C6200048 */ lwc1 $f0, 0x48($s1) /* 1548C 8003A08C 46140032 */ c.eq.s $f0, $f20 -/* 15490 8003A090 00000000 */ nop +/* 15490 8003A090 00000000 */ nop /* 15494 8003A094 4501000B */ bc1t .L8003A0C4 /* 15498 8003A098 27B00058 */ addiu $s0, $sp, 0x58 /* 1549C 8003A09C E7B40010 */ swc1 $f20, 0x10($sp) @@ -68,7 +68,7 @@ glabel appendGfx_npc .L8003A0C4: /* 154C4 8003A0C4 C6200044 */ lwc1 $f0, 0x44($s1) /* 154C8 8003A0C8 46140032 */ c.eq.s $f0, $f20 -/* 154CC 8003A0CC 00000000 */ nop +/* 154CC 8003A0CC 00000000 */ nop /* 154D0 8003A0D0 4501000B */ bc1t .L8003A100 /* 154D4 8003A0D4 27B00058 */ addiu $s0, $sp, 0x58 /* 154D8 8003A0D8 E7B40010 */ swc1 $f20, 0x10($sp) @@ -84,14 +84,14 @@ glabel appendGfx_npc .L8003A100: /* 15500 8003A100 C620004C */ lwc1 $f0, 0x4c($s1) /* 15504 8003A104 46140032 */ c.eq.s $f0, $f20 -/* 15508 8003A108 00000000 */ nop +/* 15508 8003A108 00000000 */ nop /* 1550C 8003A10C 4501000E */ bc1t .L8003A148 /* 15510 8003A110 27B00058 */ addiu $s0, $sp, 0x58 /* 15514 8003A114 4406A000 */ mfc1 $a2, $f20 /* 15518 8003A118 4407A000 */ mfc1 $a3, $f20 /* 1551C 8003A11C 3C013F80 */ lui $at, 0x3f80 /* 15520 8003A120 44810000 */ mtc1 $at, $f0 -/* 15524 8003A124 00000000 */ nop +/* 15524 8003A124 00000000 */ nop /* 15528 8003A128 E7A00010 */ swc1 $f0, 0x10($sp) /* 1552C 8003A12C 8E25004C */ lw $a1, 0x4c($s1) /* 15530 8003A130 0C019EC8 */ jal guRotateF @@ -103,7 +103,7 @@ glabel appendGfx_npc .L8003A148: /* 15548 8003A148 C6200050 */ lwc1 $f0, 0x50($s1) /* 1554C 8003A14C 46140032 */ c.eq.s $f0, $f20 -/* 15550 8003A150 00000000 */ nop +/* 15550 8003A150 00000000 */ nop /* 15554 8003A154 4501000B */ bc1t .L8003A184 /* 15558 8003A158 27B00058 */ addiu $s0, $sp, 0x58 /* 1555C 8003A15C 46000007 */ neg.s $f0, $f0 @@ -119,14 +119,14 @@ glabel appendGfx_npc .L8003A184: /* 15584 8003A184 C6220318 */ lwc1 $f2, 0x318($s1) /* 15588 8003A188 46141032 */ c.eq.s $f2, $f20 -/* 1558C 8003A18C 00000000 */ nop +/* 1558C 8003A18C 00000000 */ nop /* 15590 8003A190 45000006 */ bc1f .L8003A1AC -/* 15594 8003A194 00000000 */ nop +/* 15594 8003A194 00000000 */ nop /* 15598 8003A198 C620031C */ lwc1 $f0, 0x31c($s1) /* 1559C 8003A19C 46140032 */ c.eq.s $f0, $f20 -/* 155A0 8003A1A0 00000000 */ nop +/* 155A0 8003A1A0 00000000 */ nop /* 155A4 8003A1A4 4501000A */ bc1t .L8003A1D0 -/* 155A8 8003A1A8 00000000 */ nop +/* 155A8 8003A1A8 00000000 */ nop .L8003A1AC: /* 155AC 8003A1AC 44051000 */ mfc1 $a1, $f2 /* 155B0 8003A1B0 8E26031C */ lw $a2, 0x31c($s1) @@ -143,52 +143,52 @@ glabel appendGfx_npc /* 155D8 8003A1D8 D4268480 */ ldc1 $f6, %lo(D_80098480)($at) /* 155DC 8003A1DC 46000021 */ cvt.d.s $f0, $f0 /* 155E0 8003A1E0 46260002 */ mul.d $f0, $f0, $f6 -/* 155E4 8003A1E4 00000000 */ nop +/* 155E4 8003A1E4 00000000 */ nop /* 155E8 8003A1E8 3C013FF0 */ lui $at, 0x3ff0 /* 155EC 8003A1EC 44812800 */ mtc1 $at, $f5 /* 155F0 8003A1F0 44802000 */ mtc1 $zero, $f4 -/* 155F4 8003A1F4 00000000 */ nop +/* 155F4 8003A1F4 00000000 */ nop /* 155F8 8003A1F8 46240032 */ c.eq.d $f0, $f4 -/* 155FC 8003A1FC 00000000 */ nop +/* 155FC 8003A1FC 00000000 */ nop /* 15600 8003A200 45000014 */ bc1f .L8003A254 -/* 15604 8003A204 00000000 */ nop +/* 15604 8003A204 00000000 */ nop /* 15608 8003A208 C6200058 */ lwc1 $f0, 0x58($s1) /* 1560C 8003A20C C6220320 */ lwc1 $f2, 0x320($s1) /* 15610 8003A210 46020002 */ mul.s $f0, $f0, $f2 -/* 15614 8003A214 00000000 */ nop +/* 15614 8003A214 00000000 */ nop /* 15618 8003A218 46000021 */ cvt.d.s $f0, $f0 /* 1561C 8003A21C 46260002 */ mul.d $f0, $f0, $f6 -/* 15620 8003A220 00000000 */ nop +/* 15620 8003A220 00000000 */ nop /* 15624 8003A224 46240032 */ c.eq.d $f0, $f4 -/* 15628 8003A228 00000000 */ nop +/* 15628 8003A228 00000000 */ nop /* 1562C 8003A22C 45000009 */ bc1f .L8003A254 -/* 15630 8003A230 00000000 */ nop +/* 15630 8003A230 00000000 */ nop /* 15634 8003A234 C620005C */ lwc1 $f0, 0x5c($s1) /* 15638 8003A238 46000021 */ cvt.d.s $f0, $f0 /* 1563C 8003A23C 46260002 */ mul.d $f0, $f0, $f6 -/* 15640 8003A240 00000000 */ nop +/* 15640 8003A240 00000000 */ nop /* 15644 8003A244 46240032 */ c.eq.d $f0, $f4 -/* 15648 8003A248 00000000 */ nop +/* 15648 8003A248 00000000 */ nop /* 1564C 8003A24C 4501001F */ bc1t .L8003A2CC -/* 15650 8003A250 00000000 */ nop +/* 15650 8003A250 00000000 */ nop .L8003A254: /* 15654 8003A254 C6260054 */ lwc1 $f6, 0x54($s1) /* 15658 8003A258 3C01800A */ lui $at, %hi(D_80098488) /* 1565C 8003A25C D4288488 */ ldc1 $f8, %lo(D_80098488)($at) /* 15660 8003A260 460031A1 */ cvt.d.s $f6, $f6 /* 15664 8003A264 46283182 */ mul.d $f6, $f6, $f8 -/* 15668 8003A268 00000000 */ nop +/* 15668 8003A268 00000000 */ nop /* 1566C 8003A26C C622005C */ lwc1 $f2, 0x5c($s1) /* 15670 8003A270 460010A1 */ cvt.d.s $f2, $f2 /* 15674 8003A274 46281082 */ mul.d $f2, $f2, $f8 -/* 15678 8003A278 00000000 */ nop +/* 15678 8003A278 00000000 */ nop /* 1567C 8003A27C C6200058 */ lwc1 $f0, 0x58($s1) /* 15680 8003A280 C6240320 */ lwc1 $f4, 0x320($s1) /* 15684 8003A284 46040002 */ mul.s $f0, $f0, $f4 -/* 15688 8003A288 00000000 */ nop +/* 15688 8003A288 00000000 */ nop /* 1568C 8003A28C 46000021 */ cvt.d.s $f0, $f0 /* 15690 8003A290 46280002 */ mul.d $f0, $f0, $f8 -/* 15694 8003A294 00000000 */ nop +/* 15694 8003A294 00000000 */ nop /* 15698 8003A298 27B00058 */ addiu $s0, $sp, 0x58 /* 1569C 8003A29C 462031A0 */ cvt.s.d $f6, $f6 /* 156A0 8003A2A0 462010A0 */ cvt.s.d $f2, $f2 @@ -211,20 +211,20 @@ glabel appendGfx_npc /* 156E0 8003A2E0 3C020100 */ lui $v0, 0x100 /* 156E4 8003A2E4 00621024 */ and $v0, $v1, $v0 /* 156E8 8003A2E8 14400017 */ bnez $v0, .L8003A348 -/* 156EC 8003A2EC 00000000 */ nop +/* 156EC 8003A2EC 00000000 */ nop /* 156F0 8003A2F0 8E220028 */ lw $v0, 0x28($s1) /* 156F4 8003A2F4 10400014 */ beqz $v0, .L8003A348 -/* 156F8 8003A2F8 00000000 */ nop +/* 156F8 8003A2F8 00000000 */ nop /* 156FC 8003A2FC 8E220024 */ lw $v0, 0x24($s1) /* 15700 8003A300 04400011 */ bltz $v0, .L8003A348 -/* 15704 8003A304 00000000 */ nop +/* 15704 8003A304 00000000 */ nop /* 15708 8003A308 4600B28D */ trunc.w.s $f10, $f22 /* 1570C 8003A30C 44055000 */ mfc1 $a1, $f10 /* 15710 8003A310 0C00ED1F */ jal func_8003B47C /* 15714 8003A314 27A60018 */ addiu $a2, $sp, 0x18 /* 15718 8003A318 8E240024 */ lw $a0, 0x24($s1) /* 1571C 8003A31C 0C0B7972 */ jal func_802DE5C8 -/* 15720 8003A320 00000000 */ nop +/* 15720 8003A320 00000000 */ nop /* 15724 8003A324 0800E8D2 */ j .L8003A348 /* 15728 8003A328 AE22002C */ sw $v0, 0x2c($s1) .L8003A32C: @@ -240,11 +240,11 @@ glabel appendGfx_npc /* 1574C 8003A34C 3C030002 */ lui $v1, 2 /* 15750 8003A350 00431024 */ and $v0, $v0, $v1 /* 15754 8003A354 1040008E */ beqz $v0, .L8003A590 -/* 15758 8003A358 00000000 */ nop +/* 15758 8003A358 00000000 */ nop /* 1575C 8003A35C 822200AB */ lb $v0, 0xab($s1) /* 15760 8003A360 C622003C */ lwc1 $f2, 0x3c($s1) /* 15764 8003A364 44820000 */ mtc1 $v0, $f0 -/* 15768 8003A368 00000000 */ nop +/* 15768 8003A368 00000000 */ nop /* 1576C 8003A36C 46800020 */ cvt.s.w $f0, $f0 /* 15770 8003A370 46001080 */ add.s $f2, $f2, $f0 /* 15774 8003A374 C6200040 */ lwc1 $f0, 0x40($s1) @@ -267,21 +267,21 @@ glabel appendGfx_npc .L8003A3B8: /* 157B8 8003A3B8 C6200048 */ lwc1 $f0, 0x48($s1) /* 157BC 8003A3BC 44801000 */ mtc1 $zero, $f2 -/* 157C0 8003A3C0 00000000 */ nop +/* 157C0 8003A3C0 00000000 */ nop /* 157C4 8003A3C4 46020032 */ c.eq.s $f0, $f2 -/* 157C8 8003A3C8 00000000 */ nop +/* 157C8 8003A3C8 00000000 */ nop /* 157CC 8003A3CC 4500000B */ bc1f .L8003A3FC /* 157D0 8003A3D0 27B00058 */ addiu $s0, $sp, 0x58 /* 157D4 8003A3D4 C6200044 */ lwc1 $f0, 0x44($s1) /* 157D8 8003A3D8 46020032 */ c.eq.s $f0, $f2 -/* 157DC 8003A3DC 00000000 */ nop +/* 157DC 8003A3DC 00000000 */ nop /* 157E0 8003A3E0 45000006 */ bc1f .L8003A3FC -/* 157E4 8003A3E4 00000000 */ nop +/* 157E4 8003A3E4 00000000 */ nop /* 157E8 8003A3E8 C620004C */ lwc1 $f0, 0x4c($s1) /* 157EC 8003A3EC 46020032 */ c.eq.s $f0, $f2 -/* 157F0 8003A3F0 00000000 */ nop +/* 157F0 8003A3F0 00000000 */ nop /* 157F4 8003A3F4 4501000A */ bc1t .L8003A420 -/* 157F8 8003A3F8 00000000 */ nop +/* 157F8 8003A3F8 00000000 */ nop .L8003A3FC: /* 157FC 8003A3FC 8E250044 */ lw $a1, 0x44($s1) /* 15800 8003A400 8E260048 */ lw $a2, 0x48($s1) @@ -298,52 +298,52 @@ glabel appendGfx_npc /* 15828 8003A428 D4268490 */ ldc1 $f6, %lo(D_80098490)($at) /* 1582C 8003A42C 46000021 */ cvt.d.s $f0, $f0 /* 15830 8003A430 46260002 */ mul.d $f0, $f0, $f6 -/* 15834 8003A434 00000000 */ nop +/* 15834 8003A434 00000000 */ nop /* 15838 8003A438 3C013FF0 */ lui $at, 0x3ff0 /* 1583C 8003A43C 44812800 */ mtc1 $at, $f5 /* 15840 8003A440 44802000 */ mtc1 $zero, $f4 -/* 15844 8003A444 00000000 */ nop +/* 15844 8003A444 00000000 */ nop /* 15848 8003A448 46240032 */ c.eq.d $f0, $f4 -/* 1584C 8003A44C 00000000 */ nop +/* 1584C 8003A44C 00000000 */ nop /* 15850 8003A450 45000014 */ bc1f .L8003A4A4 -/* 15854 8003A454 00000000 */ nop +/* 15854 8003A454 00000000 */ nop /* 15858 8003A458 C6200058 */ lwc1 $f0, 0x58($s1) /* 1585C 8003A45C C6220320 */ lwc1 $f2, 0x320($s1) /* 15860 8003A460 46020002 */ mul.s $f0, $f0, $f2 -/* 15864 8003A464 00000000 */ nop +/* 15864 8003A464 00000000 */ nop /* 15868 8003A468 46000021 */ cvt.d.s $f0, $f0 /* 1586C 8003A46C 46260002 */ mul.d $f0, $f0, $f6 -/* 15870 8003A470 00000000 */ nop +/* 15870 8003A470 00000000 */ nop /* 15874 8003A474 46240032 */ c.eq.d $f0, $f4 -/* 15878 8003A478 00000000 */ nop +/* 15878 8003A478 00000000 */ nop /* 1587C 8003A47C 45000009 */ bc1f .L8003A4A4 -/* 15880 8003A480 00000000 */ nop +/* 15880 8003A480 00000000 */ nop /* 15884 8003A484 C620005C */ lwc1 $f0, 0x5c($s1) /* 15888 8003A488 46000021 */ cvt.d.s $f0, $f0 /* 1588C 8003A48C 46260002 */ mul.d $f0, $f0, $f6 -/* 15890 8003A490 00000000 */ nop +/* 15890 8003A490 00000000 */ nop /* 15894 8003A494 46240032 */ c.eq.d $f0, $f4 -/* 15898 8003A498 00000000 */ nop +/* 15898 8003A498 00000000 */ nop /* 1589C 8003A49C 4501001F */ bc1t .L8003A51C -/* 158A0 8003A4A0 00000000 */ nop +/* 158A0 8003A4A0 00000000 */ nop .L8003A4A4: /* 158A4 8003A4A4 C6260054 */ lwc1 $f6, 0x54($s1) /* 158A8 8003A4A8 3C01800A */ lui $at, %hi(D_80098498) /* 158AC 8003A4AC D4288498 */ ldc1 $f8, %lo(D_80098498)($at) /* 158B0 8003A4B0 460031A1 */ cvt.d.s $f6, $f6 /* 158B4 8003A4B4 46283182 */ mul.d $f6, $f6, $f8 -/* 158B8 8003A4B8 00000000 */ nop +/* 158B8 8003A4B8 00000000 */ nop /* 158BC 8003A4BC C624005C */ lwc1 $f4, 0x5c($s1) /* 158C0 8003A4C0 46002121 */ cvt.d.s $f4, $f4 /* 158C4 8003A4C4 46282102 */ mul.d $f4, $f4, $f8 -/* 158C8 8003A4C8 00000000 */ nop +/* 158C8 8003A4C8 00000000 */ nop /* 158CC 8003A4CC C6200058 */ lwc1 $f0, 0x58($s1) /* 158D0 8003A4D0 C6220320 */ lwc1 $f2, 0x320($s1) /* 158D4 8003A4D4 46020002 */ mul.s $f0, $f0, $f2 -/* 158D8 8003A4D8 00000000 */ nop +/* 158D8 8003A4D8 00000000 */ nop /* 158DC 8003A4DC 46000021 */ cvt.d.s $f0, $f0 /* 158E0 8003A4E0 46280002 */ mul.d $f0, $f0, $f8 -/* 158E4 8003A4E4 00000000 */ nop +/* 158E4 8003A4E4 00000000 */ nop /* 158E8 8003A4E8 27B00058 */ addiu $s0, $sp, 0x58 /* 158EC 8003A4EC 462031A0 */ cvt.s.d $f6, $f6 /* 158F0 8003A4F0 46202120 */ cvt.s.d $f4, $f4 @@ -366,7 +366,7 @@ glabel appendGfx_npc /* 15930 8003A530 3C020100 */ lui $v0, 0x100 /* 15934 8003A534 00621024 */ and $v0, $v1, $v0 /* 15938 8003A538 14400015 */ bnez $v0, .L8003A590 -/* 1593C 8003A53C 00000000 */ nop +/* 1593C 8003A53C 00000000 */ nop /* 15940 8003A540 8E220028 */ lw $v0, 0x28($s1) /* 15944 8003A544 10400012 */ beqz $v0, .L8003A590 /* 15948 8003A548 0000302D */ daddu $a2, $zero, $zero @@ -378,7 +378,7 @@ glabel appendGfx_npc /* 15960 8003A560 0C0B78F6 */ jal func_802DE3D8 /* 15964 8003A564 00C0382D */ daddu $a3, $a2, $zero /* 15968 8003A568 0800E964 */ j .L8003A590 -/* 1596C 8003A56C 00000000 */ nop +/* 1596C 8003A56C 00000000 */ nop .L8003A570: /* 15970 8003A570 AFA20010 */ sw $v0, 0x10($sp) /* 15974 8003A574 3C044000 */ lui $a0, 0x4000 @@ -393,11 +393,11 @@ glabel appendGfx_npc /* 15994 8003A594 3C030008 */ lui $v1, 8 /* 15998 8003A598 00431024 */ and $v0, $v0, $v1 /* 1599C 8003A59C 1040008A */ beqz $v0, .L8003A7C8 -/* 159A0 8003A5A0 00000000 */ nop +/* 159A0 8003A5A0 00000000 */ nop /* 159A4 8003A5A4 822200AB */ lb $v0, 0xab($s1) /* 159A8 8003A5A8 C622003C */ lwc1 $f2, 0x3c($s1) /* 159AC 8003A5AC 44820000 */ mtc1 $v0, $f0 -/* 159B0 8003A5B0 00000000 */ nop +/* 159B0 8003A5B0 00000000 */ nop /* 159B4 8003A5B4 46800020 */ cvt.s.w $f0, $f0 /* 159B8 8003A5B8 46001080 */ add.s $f2, $f2, $f0 /* 159BC 8003A5BC 8E250038 */ lw $a1, 0x38($s1) @@ -415,21 +415,21 @@ glabel appendGfx_npc /* 159EC 8003A5EC 00A0302D */ daddu $a2, $a1, $zero /* 159F0 8003A5F0 C6200048 */ lwc1 $f0, 0x48($s1) /* 159F4 8003A5F4 44801000 */ mtc1 $zero, $f2 -/* 159F8 8003A5F8 00000000 */ nop +/* 159F8 8003A5F8 00000000 */ nop /* 159FC 8003A5FC 46020032 */ c.eq.s $f0, $f2 -/* 15A00 8003A600 00000000 */ nop +/* 15A00 8003A600 00000000 */ nop /* 15A04 8003A604 4500000B */ bc1f .L8003A634 /* 15A08 8003A608 27B00058 */ addiu $s0, $sp, 0x58 /* 15A0C 8003A60C C6200044 */ lwc1 $f0, 0x44($s1) /* 15A10 8003A610 46020032 */ c.eq.s $f0, $f2 -/* 15A14 8003A614 00000000 */ nop +/* 15A14 8003A614 00000000 */ nop /* 15A18 8003A618 45000006 */ bc1f .L8003A634 -/* 15A1C 8003A61C 00000000 */ nop +/* 15A1C 8003A61C 00000000 */ nop /* 15A20 8003A620 C620004C */ lwc1 $f0, 0x4c($s1) /* 15A24 8003A624 46020032 */ c.eq.s $f0, $f2 -/* 15A28 8003A628 00000000 */ nop +/* 15A28 8003A628 00000000 */ nop /* 15A2C 8003A62C 4501000A */ bc1t .L8003A658 -/* 15A30 8003A630 00000000 */ nop +/* 15A30 8003A630 00000000 */ nop .L8003A634: /* 15A34 8003A634 8E250044 */ lw $a1, 0x44($s1) /* 15A38 8003A638 8E260048 */ lw $a2, 0x48($s1) @@ -446,52 +446,52 @@ glabel appendGfx_npc /* 15A60 8003A660 D42684A0 */ ldc1 $f6, %lo(D_800984A0)($at) /* 15A64 8003A664 46000021 */ cvt.d.s $f0, $f0 /* 15A68 8003A668 46260002 */ mul.d $f0, $f0, $f6 -/* 15A6C 8003A66C 00000000 */ nop +/* 15A6C 8003A66C 00000000 */ nop /* 15A70 8003A670 3C013FF0 */ lui $at, 0x3ff0 /* 15A74 8003A674 44812800 */ mtc1 $at, $f5 /* 15A78 8003A678 44802000 */ mtc1 $zero, $f4 -/* 15A7C 8003A67C 00000000 */ nop +/* 15A7C 8003A67C 00000000 */ nop /* 15A80 8003A680 46240032 */ c.eq.d $f0, $f4 -/* 15A84 8003A684 00000000 */ nop +/* 15A84 8003A684 00000000 */ nop /* 15A88 8003A688 45000014 */ bc1f .L8003A6DC -/* 15A8C 8003A68C 00000000 */ nop +/* 15A8C 8003A68C 00000000 */ nop /* 15A90 8003A690 C6200058 */ lwc1 $f0, 0x58($s1) /* 15A94 8003A694 C6220320 */ lwc1 $f2, 0x320($s1) /* 15A98 8003A698 46020002 */ mul.s $f0, $f0, $f2 -/* 15A9C 8003A69C 00000000 */ nop +/* 15A9C 8003A69C 00000000 */ nop /* 15AA0 8003A6A0 46000021 */ cvt.d.s $f0, $f0 /* 15AA4 8003A6A4 46260002 */ mul.d $f0, $f0, $f6 -/* 15AA8 8003A6A8 00000000 */ nop +/* 15AA8 8003A6A8 00000000 */ nop /* 15AAC 8003A6AC 46240032 */ c.eq.d $f0, $f4 -/* 15AB0 8003A6B0 00000000 */ nop +/* 15AB0 8003A6B0 00000000 */ nop /* 15AB4 8003A6B4 45000009 */ bc1f .L8003A6DC -/* 15AB8 8003A6B8 00000000 */ nop +/* 15AB8 8003A6B8 00000000 */ nop /* 15ABC 8003A6BC C620005C */ lwc1 $f0, 0x5c($s1) /* 15AC0 8003A6C0 46000021 */ cvt.d.s $f0, $f0 /* 15AC4 8003A6C4 46260002 */ mul.d $f0, $f0, $f6 -/* 15AC8 8003A6C8 00000000 */ nop +/* 15AC8 8003A6C8 00000000 */ nop /* 15ACC 8003A6CC 46240032 */ c.eq.d $f0, $f4 -/* 15AD0 8003A6D0 00000000 */ nop +/* 15AD0 8003A6D0 00000000 */ nop /* 15AD4 8003A6D4 4501001F */ bc1t .L8003A754 -/* 15AD8 8003A6D8 00000000 */ nop +/* 15AD8 8003A6D8 00000000 */ nop .L8003A6DC: /* 15ADC 8003A6DC C6260054 */ lwc1 $f6, 0x54($s1) /* 15AE0 8003A6E0 3C01800A */ lui $at, %hi(D_800984A8) /* 15AE4 8003A6E4 D42884A8 */ ldc1 $f8, %lo(D_800984A8)($at) /* 15AE8 8003A6E8 460031A1 */ cvt.d.s $f6, $f6 /* 15AEC 8003A6EC 46283182 */ mul.d $f6, $f6, $f8 -/* 15AF0 8003A6F0 00000000 */ nop +/* 15AF0 8003A6F0 00000000 */ nop /* 15AF4 8003A6F4 C624005C */ lwc1 $f4, 0x5c($s1) /* 15AF8 8003A6F8 46002121 */ cvt.d.s $f4, $f4 /* 15AFC 8003A6FC 46282102 */ mul.d $f4, $f4, $f8 -/* 15B00 8003A700 00000000 */ nop +/* 15B00 8003A700 00000000 */ nop /* 15B04 8003A704 C6200058 */ lwc1 $f0, 0x58($s1) /* 15B08 8003A708 C6220320 */ lwc1 $f2, 0x320($s1) /* 15B0C 8003A70C 46020002 */ mul.s $f0, $f0, $f2 -/* 15B10 8003A710 00000000 */ nop +/* 15B10 8003A710 00000000 */ nop /* 15B14 8003A714 46000021 */ cvt.d.s $f0, $f0 /* 15B18 8003A718 46280002 */ mul.d $f0, $f0, $f8 -/* 15B1C 8003A71C 00000000 */ nop +/* 15B1C 8003A71C 00000000 */ nop /* 15B20 8003A720 27B00058 */ addiu $s0, $sp, 0x58 /* 15B24 8003A724 462031A0 */ cvt.s.d $f6, $f6 /* 15B28 8003A728 46202120 */ cvt.s.d $f4, $f4 @@ -514,7 +514,7 @@ glabel appendGfx_npc /* 15B68 8003A768 3C020100 */ lui $v0, 0x100 /* 15B6C 8003A76C 00621024 */ and $v0, $v1, $v0 /* 15B70 8003A770 14400015 */ bnez $v0, .L8003A7C8 -/* 15B74 8003A774 00000000 */ nop +/* 15B74 8003A774 00000000 */ nop /* 15B78 8003A778 8E220028 */ lw $v0, 0x28($s1) /* 15B7C 8003A77C 10400012 */ beqz $v0, .L8003A7C8 /* 15B80 8003A780 0000302D */ daddu $a2, $zero, $zero @@ -526,7 +526,7 @@ glabel appendGfx_npc /* 15B98 8003A798 0C0B78F6 */ jal func_802DE3D8 /* 15B9C 8003A79C 00C0382D */ daddu $a3, $a2, $zero /* 15BA0 8003A7A0 0800E9F2 */ j .L8003A7C8 -/* 15BA4 8003A7A4 00000000 */ nop +/* 15BA4 8003A7A4 00000000 */ nop .L8003A7A8: /* 15BA8 8003A7A8 AFA20010 */ sw $v0, 0x10($sp) /* 15BAC 8003A7AC 3C044000 */ lui $a0, 0x4000 diff --git a/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s b/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s index a85912e2db..0d9a1c53b2 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_enemy_ai.s @@ -12,7 +12,7 @@ glabel bind_enemy_ai /* 19D68 8003E968 00A0882D */ daddu $s1, $a1, $zero /* 19D6C 8003E96C 8C440144 */ lw $a0, 0x144($v0) /* 19D70 8003E970 0C0B102B */ jal kill_script_by_ID -/* 19D74 8003E974 00000000 */ nop +/* 19D74 8003E974 00000000 */ nop .L8003E978: /* 19D78 8003E978 0220202D */ daddu $a0, $s1, $zero /* 19D7C 8003E97C 2405000A */ addiu $a1, $zero, 0xa diff --git a/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s b/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s index d45baac4b2..d7a790872b 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_enemy_aux.s @@ -12,7 +12,7 @@ glabel bind_enemy_aux /* 19DD0 8003E9D0 00A0882D */ daddu $s1, $a1, $zero /* 19DD4 8003E9D4 8C440144 */ lw $a0, 0x144($v0) /* 19DD8 8003E9D8 0C0B102B */ jal kill_script_by_ID -/* 19DDC 8003E9DC 00000000 */ nop +/* 19DDC 8003E9DC 00000000 */ nop .L8003E9E0: /* 19DE0 8003E9E0 0220202D */ daddu $a0, $s1, $zero /* 19DE4 8003E9E4 2405000A */ addiu $a1, $zero, 0xa diff --git a/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s b/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s index 32de84e34d..3c6819fae7 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_enemy_interact.s @@ -12,7 +12,7 @@ glabel bind_enemy_interact /* 19E38 8003EA38 00A0882D */ daddu $s1, $a1, $zero /* 19E3C 8003EA3C 8C440144 */ lw $a0, 0x144($v0) /* 19E40 8003EA40 0C0B102B */ jal kill_script_by_ID -/* 19E44 8003EA44 00000000 */ nop +/* 19E44 8003EA44 00000000 */ nop .L8003EA48: /* 19E48 8003EA48 0220202D */ daddu $a0, $s1, $zero /* 19E4C 8003EA4C 2405000A */ addiu $a1, $zero, 0xa diff --git a/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s b/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s index dfa6811cbd..205662f1f7 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_npc_ai.s @@ -28,10 +28,10 @@ glabel bind_npc_ai .L8003EADC: /* 19EDC 8003EADC 8C640004 */ lw $a0, 4($v1) /* 19EE0 8003EAE0 10800008 */ beqz $a0, .L8003EB04 -/* 19EE4 8003EAE4 00000000 */ nop +/* 19EE4 8003EAE4 00000000 */ nop /* 19EE8 8003EAE8 84820008 */ lh $v0, 8($a0) /* 19EEC 8003EAEC 14530005 */ bne $v0, $s3, .L8003EB04 -/* 19EF0 8003EAF0 00000000 */ nop +/* 19EF0 8003EAF0 00000000 */ nop /* 19EF4 8003EAF4 0C00FA53 */ jal bind_enemy_ai /* 19EF8 8003EAF8 0280282D */ daddu $a1, $s4, $zero /* 19EFC 8003EAFC 0800FAC7 */ j .L8003EB1C @@ -49,7 +49,7 @@ glabel bind_npc_ai /* 19F20 8003EB20 26100001 */ addiu $s0, $s0, 1 /* 19F24 8003EB24 0202102A */ slt $v0, $s0, $v0 /* 19F28 8003EB28 1440FFE5 */ bnez $v0, .L8003EAC0 -/* 19F2C 8003EB2C 00000000 */ nop +/* 19F2C 8003EB2C 00000000 */ nop .L8003EB30: /* 19F30 8003EB30 8FBF0024 */ lw $ra, 0x24($sp) /* 19F34 8003EB34 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s b/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s index f08920d5f9..0245a915c6 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_npc_aux.s @@ -28,10 +28,10 @@ glabel bind_npc_aux .L8003EBA8: /* 19FA8 8003EBA8 8C640004 */ lw $a0, 4($v1) /* 19FAC 8003EBAC 10800008 */ beqz $a0, .L8003EBD0 -/* 19FB0 8003EBB0 00000000 */ nop +/* 19FB0 8003EBB0 00000000 */ nop /* 19FB4 8003EBB4 84820008 */ lh $v0, 8($a0) /* 19FB8 8003EBB8 14530005 */ bne $v0, $s3, .L8003EBD0 -/* 19FBC 8003EBBC 00000000 */ nop +/* 19FBC 8003EBBC 00000000 */ nop /* 19FC0 8003EBC0 0C00FA6D */ jal bind_enemy_aux /* 19FC4 8003EBC4 0280282D */ daddu $a1, $s4, $zero /* 19FC8 8003EBC8 0800FAFA */ j .L8003EBE8 @@ -49,7 +49,7 @@ glabel bind_npc_aux /* 19FEC 8003EBEC 26100001 */ addiu $s0, $s0, 1 /* 19FF0 8003EBF0 0202102A */ slt $v0, $s0, $v0 /* 19FF4 8003EBF4 1440FFE5 */ bnez $v0, .L8003EB8C -/* 19FF8 8003EBF8 00000000 */ nop +/* 19FF8 8003EBF8 00000000 */ nop .L8003EBFC: /* 19FFC 8003EBFC 8FBF0024 */ lw $ra, 0x24($sp) /* 1A000 8003EC00 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s b/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s index b562b9df4a..e113468b00 100644 --- a/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s +++ b/asm/nonmatchings/code_13870_len_6980/bind_npc_interact.s @@ -28,10 +28,10 @@ glabel bind_npc_interact .L8003EC74: /* 1A074 8003EC74 8C640004 */ lw $a0, 4($v1) /* 1A078 8003EC78 10800008 */ beqz $a0, .L8003EC9C -/* 1A07C 8003EC7C 00000000 */ nop +/* 1A07C 8003EC7C 00000000 */ nop /* 1A080 8003EC80 84820008 */ lh $v0, 8($a0) /* 1A084 8003EC84 14530005 */ bne $v0, $s3, .L8003EC9C -/* 1A088 8003EC88 00000000 */ nop +/* 1A088 8003EC88 00000000 */ nop /* 1A08C 8003EC8C 0C00FA87 */ jal bind_enemy_interact /* 1A090 8003EC90 0280282D */ daddu $a1, $s4, $zero /* 1A094 8003EC94 0800FB2D */ j .L8003ECB4 @@ -49,7 +49,7 @@ glabel bind_npc_interact /* 1A0B8 8003ECB8 26100001 */ addiu $s0, $s0, 1 /* 1A0BC 8003ECBC 0202102A */ slt $v0, $s0, $v0 /* 1A0C0 8003ECC0 1440FFE5 */ bnez $v0, .L8003EC58 -/* 1A0C4 8003ECC4 00000000 */ nop +/* 1A0C4 8003ECC4 00000000 */ nop .L8003ECC8: /* 1A0C8 8003ECC8 8FBF0024 */ lw $ra, 0x24($sp) /* 1A0CC 8003ECCC 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/clear_npcs.s b/asm/nonmatchings/code_13870_len_6980/clear_npcs.s index bd0e13b7c2..0d3b37dcd4 100644 --- a/asm/nonmatchings/code_13870_len_6980/clear_npcs.s +++ b/asm/nonmatchings/code_13870_len_6980/clear_npcs.s @@ -6,11 +6,11 @@ glabel clear_npcs /* 138C0 800384C0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 138C4 800384C4 80420070 */ lb $v0, 0x70($v0) /* 138C8 800384C8 14400005 */ bnez $v0, .L800384E0 -/* 138CC 800384CC 00000000 */ nop +/* 138CC 800384CC 00000000 */ nop /* 138D0 800384D0 3C02800A */ lui $v0, %hi(gWorldNpcList) /* 138D4 800384D4 24420990 */ addiu $v0, $v0, %lo(gWorldNpcList) /* 138D8 800384D8 0800E13A */ j .L800384E8 -/* 138DC 800384DC 00000000 */ nop +/* 138DC 800384DC 00000000 */ nop .L800384E0: /* 138E0 800384E0 3C02800A */ lui $v0, %hi(gBattleNpcList) /* 138E4 800384E4 24420A90 */ addiu $v0, $v0, %lo(gBattleNpcList) @@ -32,4 +32,4 @@ glabel clear_npcs /* 1391C 8003851C 3C01800A */ lui $at, %hi(D_800A0B94) /* 13920 80038520 A0220B94 */ sb $v0, %lo(D_800A0B94)($at) /* 13924 80038524 03E00008 */ jr $ra -/* 13928 80038528 00000000 */ nop +/* 13928 80038528 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/disable_npc_shadow.s b/asm/nonmatchings/code_13870_len_6980/disable_npc_shadow.s index a177eee500..28a7e6a92c 100644 --- a/asm/nonmatchings/code_13870_len_6980/disable_npc_shadow.s +++ b/asm/nonmatchings/code_13870_len_6980/disable_npc_shadow.s @@ -9,7 +9,7 @@ glabel disable_npc_shadow /* 1600C 8003AC0C 8E020000 */ lw $v0, ($s0) /* 16010 8003AC10 30420010 */ andi $v0, $v0, 0x10 /* 16014 8003AC14 1040000D */ beqz $v0, .L8003AC4C -/* 16018 8003AC18 00000000 */ nop +/* 16018 8003AC18 00000000 */ nop /* 1601C 8003AC1C 0C044181 */ jal get_shadow_by_index /* 16020 8003AC20 8E040078 */ lw $a0, 0x78($s0) /* 16024 8003AC24 3C04FFFE */ lui $a0, 0xfffe diff --git a/asm/nonmatchings/code_13870_len_6980/enable_npc_blur.s b/asm/nonmatchings/code_13870_len_6980/enable_npc_blur.s index 4384bb3f08..45469264b0 100644 --- a/asm/nonmatchings/code_13870_len_6980/enable_npc_blur.s +++ b/asm/nonmatchings/code_13870_len_6980/enable_npc_blur.s @@ -18,7 +18,7 @@ glabel enable_npc_blur /* 16158 8003AD58 AE020020 */ sw $v0, 0x20($s0) .L8003AD5C: /* 1615C 8003AD5C 0800EB57 */ j .L8003AD5C -/* 16160 8003AD60 00000000 */ nop +/* 16160 8003AD60 00000000 */ nop .L8003AD64: /* 16164 8003AD64 0000202D */ daddu $a0, $zero, $zero /* 16168 8003AD68 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/enable_npc_shadow.s b/asm/nonmatchings/code_13870_len_6980/enable_npc_shadow.s index e5fa080427..b25530ee8d 100644 --- a/asm/nonmatchings/code_13870_len_6980/enable_npc_shadow.s +++ b/asm/nonmatchings/code_13870_len_6980/enable_npc_shadow.s @@ -9,7 +9,7 @@ glabel enable_npc_shadow /* 15FB0 8003ABB0 8E020000 */ lw $v0, ($s0) /* 15FB4 8003ABB4 30420010 */ andi $v0, $v0, 0x10 /* 15FB8 8003ABB8 1440000C */ bnez $v0, .L8003ABEC -/* 15FBC 8003ABBC 00000000 */ nop +/* 15FBC 8003ABBC 00000000 */ nop /* 15FC0 8003ABC0 0C044181 */ jal get_shadow_by_index /* 15FC4 8003ABC4 8E040078 */ lw $a0, 0x78($s0) /* 15FC8 8003ABC8 3C050001 */ lui $a1, 1 diff --git a/asm/nonmatchings/code_13870_len_6980/free_npc.s b/asm/nonmatchings/code_13870_len_6980/free_npc.s index 922060a2ab..bd74881d50 100644 --- a/asm/nonmatchings/code_13870_len_6980/free_npc.s +++ b/asm/nonmatchings/code_13870_len_6980/free_npc.s @@ -9,9 +9,9 @@ glabel free_npc /* 13DDC 800389DC AFB00010 */ sw $s0, 0x10($sp) /* 13DE0 800389E0 8E240020 */ lw $a0, 0x20($s1) /* 13DE4 800389E4 10800004 */ beqz $a0, .L800389F8 -/* 13DE8 800389E8 00000000 */ nop +/* 13DE8 800389E8 00000000 */ nop /* 13DEC 800389EC 0C00AB4B */ jal heap_free -/* 13DF0 800389F0 00000000 */ nop +/* 13DF0 800389F0 00000000 */ nop /* 13DF4 800389F4 AE200020 */ sw $zero, 0x20($s1) .L800389F8: /* 13DF8 800389F8 8E230000 */ lw $v1, ($s1) @@ -21,14 +21,14 @@ glabel free_npc /* 13E08 80038A08 3C020100 */ lui $v0, 0x100 /* 13E0C 80038A0C 00621024 */ and $v0, $v1, $v0 /* 13E10 80038A10 14400007 */ bnez $v0, .L80038A30 -/* 13E14 80038A14 00000000 */ nop +/* 13E14 80038A14 00000000 */ nop /* 13E18 80038A18 0C0B797A */ jal func_802DE5E8 /* 13E1C 80038A1C 8E240024 */ lw $a0, 0x24($s1) /* 13E20 80038A20 10400003 */ beqz $v0, .L80038A30 -/* 13E24 80038A24 00000000 */ nop +/* 13E24 80038A24 00000000 */ nop .L80038A28: /* 13E28 80038A28 0800E28A */ j .L80038A28 -/* 13E2C 80038A2C 00000000 */ nop +/* 13E2C 80038A2C 00000000 */ nop .L80038A30: /* 13E30 80038A30 8E240078 */ lw $a0, 0x78($s1) /* 13E34 80038A34 0C0448CA */ jal func_80112328 @@ -45,7 +45,7 @@ glabel free_npc /* 13E5C 80038A5C 3C030010 */ lui $v1, 0x10 /* 13E60 80038A60 00431024 */ and $v0, $v0, $v1 /* 13E64 80038A64 10400003 */ beqz $v0, .L80038A74 -/* 13E68 80038A68 00000000 */ nop +/* 13E68 80038A68 00000000 */ nop /* 13E6C 80038A6C 0C00EB6B */ jal disable_npc_blur /* 13E70 80038A70 0220202D */ daddu $a0, $s1, $zero .L80038A74: diff --git a/asm/nonmatchings/code_13870_len_6980/free_npc_by_index.s b/asm/nonmatchings/code_13870_len_6980/free_npc_by_index.s index bc27a09550..04a4e9108c 100644 --- a/asm/nonmatchings/code_13870_len_6980/free_npc_by_index.s +++ b/asm/nonmatchings/code_13870_len_6980/free_npc_by_index.s @@ -15,15 +15,15 @@ glabel free_npc_by_index /* 13CC8 800388C8 00431021 */ addu $v0, $v0, $v1 /* 13CCC 800388CC 8C500000 */ lw $s0, ($v0) /* 13CD0 800388D0 12000038 */ beqz $s0, .L800389B4 -/* 13CD4 800388D4 00000000 */ nop +/* 13CD4 800388D4 00000000 */ nop /* 13CD8 800388D8 8E020000 */ lw $v0, ($s0) /* 13CDC 800388DC 10400035 */ beqz $v0, .L800389B4 -/* 13CE0 800388E0 00000000 */ nop +/* 13CE0 800388E0 00000000 */ nop /* 13CE4 800388E4 8E040020 */ lw $a0, 0x20($s0) /* 13CE8 800388E8 10800004 */ beqz $a0, .L800388FC -/* 13CEC 800388EC 00000000 */ nop +/* 13CEC 800388EC 00000000 */ nop /* 13CF0 800388F0 0C00AB4B */ jal heap_free -/* 13CF4 800388F4 00000000 */ nop +/* 13CF4 800388F4 00000000 */ nop /* 13CF8 800388F8 AE000020 */ sw $zero, 0x20($s0) .L800388FC: /* 13CFC 800388FC 8E030000 */ lw $v1, ($s0) @@ -33,14 +33,14 @@ glabel free_npc_by_index /* 13D0C 8003890C 3C020100 */ lui $v0, 0x100 /* 13D10 80038910 00621024 */ and $v0, $v1, $v0 /* 13D14 80038914 14400007 */ bnez $v0, .L80038934 -/* 13D18 80038918 00000000 */ nop +/* 13D18 80038918 00000000 */ nop /* 13D1C 8003891C 0C0B797A */ jal func_802DE5E8 /* 13D20 80038920 8E040024 */ lw $a0, 0x24($s0) /* 13D24 80038924 10400003 */ beqz $v0, .L80038934 -/* 13D28 80038928 00000000 */ nop +/* 13D28 80038928 00000000 */ nop .L8003892C: /* 13D2C 8003892C 0800E24B */ j .L8003892C -/* 13D30 80038930 00000000 */ nop +/* 13D30 80038930 00000000 */ nop .L80038934: /* 13D34 80038934 8E040078 */ lw $a0, 0x78($s0) /* 13D38 80038938 0C0448CA */ jal func_80112328 @@ -57,7 +57,7 @@ glabel free_npc_by_index /* 13D60 80038960 3C030010 */ lui $v1, 0x10 /* 13D64 80038964 00431024 */ and $v0, $v0, $v1 /* 13D68 80038968 10400003 */ beqz $v0, .L80038978 -/* 13D6C 8003896C 00000000 */ nop +/* 13D6C 8003896C 00000000 */ nop /* 13D70 80038970 0C00EB6B */ jal disable_npc_blur /* 13D74 80038974 0200202D */ daddu $a0, $s0, $zero .L80038978: diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003857C.s b/asm/nonmatchings/code_13870_len_6980/func_8003857C.s index 140c88dea3..f29b9d3952 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003857C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003857C.s @@ -9,4 +9,4 @@ glabel func_8003857C /* 13988 80038588 1440FFFE */ bnez $v0, .L80038584 /* 1398C 8003858C 24630001 */ addiu $v1, $v1, 1 /* 13990 80038590 03E00008 */ jr $ra -/* 13994 80038594 00000000 */ nop +/* 13994 80038594 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/func_80039688.s b/asm/nonmatchings/code_13870_len_6980/func_80039688.s index 59fdac5f1e..f3814dbe13 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80039688.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80039688.s @@ -49,7 +49,7 @@ glabel func_80039688 /* 14B38 80039738 0C0372DF */ jal func_800DCB7C /* 14B3C 8003973C 27A70028 */ addiu $a3, $sp, 0x28 /* 14B40 80039740 0800E5E0 */ j .L80039780 -/* 14B44 80039744 00000000 */ nop +/* 14B44 80039744 00000000 */ nop .L80039748: /* 14B48 80039748 27A2002C */ addiu $v0, $sp, 0x2c /* 14B4C 8003974C AFA20010 */ sw $v0, 0x10($sp) @@ -59,7 +59,7 @@ glabel func_80039688 /* 14B5C 8003975C 860200A6 */ lh $v0, 0xa6($s0) /* 14B60 80039760 27A60024 */ addiu $a2, $sp, 0x24 /* 14B64 80039764 44820000 */ mtc1 $v0, $f0 -/* 14B68 80039768 00000000 */ nop +/* 14B68 80039768 00000000 */ nop /* 14B6C 8003976C 46800020 */ cvt.s.w $f0, $f0 /* 14B70 80039770 E7A00018 */ swc1 $f0, 0x18($sp) /* 14B74 80039774 8E040080 */ lw $a0, 0x80($s0) @@ -67,12 +67,12 @@ glabel func_80039688 /* 14B7C 8003977C 27A70028 */ addiu $a3, $sp, 0x28 .L80039780: /* 14B80 80039780 10400010 */ beqz $v0, .L800397C4 -/* 14B84 80039784 00000000 */ nop +/* 14B84 80039784 00000000 */ nop /* 14B88 80039788 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 14B8C 8003978C 4614003E */ c.le.s $f0, $f20 -/* 14B90 80039790 00000000 */ nop +/* 14B90 80039790 00000000 */ nop /* 14B94 80039794 4500000B */ bc1f .L800397C4 -/* 14B98 80039798 00000000 */ nop +/* 14B98 80039798 00000000 */ nop /* 14B9C 8003979C 8E020000 */ lw $v0, ($s0) /* 14BA0 800397A0 AE00001C */ sw $zero, 0x1c($s0) /* 14BA4 800397A4 C7A00024 */ lwc1 $f0, 0x24($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_800397E8.s b/asm/nonmatchings/code_13870_len_6980/func_800397E8.s index 1c1def311e..5002f815f5 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_800397E8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_800397E8.s @@ -46,7 +46,7 @@ glabel func_800397E8 /* 14C88 80039888 0C0372DF */ jal func_800DCB7C /* 14C8C 8003988C 27A70028 */ addiu $a3, $sp, 0x28 /* 14C90 80039890 0800E633 */ j .L800398CC -/* 14C94 80039894 00000000 */ nop +/* 14C94 80039894 00000000 */ nop .L80039898: /* 14C98 80039898 AFA20010 */ sw $v0, 0x10($sp) /* 14C9C 8003989C C600000C */ lwc1 $f0, 0xc($s0) @@ -55,7 +55,7 @@ glabel func_800397E8 /* 14CA8 800398A8 860200A6 */ lh $v0, 0xa6($s0) /* 14CAC 800398AC 27A60024 */ addiu $a2, $sp, 0x24 /* 14CB0 800398B0 44820000 */ mtc1 $v0, $f0 -/* 14CB4 800398B4 00000000 */ nop +/* 14CB4 800398B4 00000000 */ nop /* 14CB8 800398B8 46800020 */ cvt.s.w $f0, $f0 /* 14CBC 800398BC E7A00018 */ swc1 $f0, 0x18($sp) /* 14CC0 800398C0 8E040080 */ lw $a0, 0x80($s0) @@ -66,7 +66,7 @@ glabel func_800397E8 /* 14CD0 800398D0 0000102D */ daddu $v0, $zero, $zero /* 14CD4 800398D4 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 14CD8 800398D8 4614003E */ c.le.s $f0, $f20 -/* 14CDC 800398DC 00000000 */ nop +/* 14CDC 800398DC 00000000 */ nop /* 14CE0 800398E0 45000009 */ bc1f .L80039908 /* 14CE4 800398E4 24020001 */ addiu $v0, $zero, 1 /* 14CE8 800398E8 C7A00024 */ lwc1 $f0, 0x24($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s b/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s index 7bb593e1d0..66cd740741 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_80039DA4.s @@ -33,62 +33,62 @@ glabel func_80039DA4 /* 15214 80039E14 44811000 */ mtc1 $at, $f2 /* 15218 80039E18 46000306 */ mov.s $f12, $f0 /* 1521C 80039E1C 4602603C */ c.lt.s $f12, $f2 -/* 15220 80039E20 00000000 */ nop +/* 15220 80039E20 00000000 */ nop /* 15224 80039E24 4500000B */ bc1f .L80039E54 -/* 15228 80039E28 00000000 */ nop +/* 15228 80039E28 00000000 */ nop /* 1522C 80039E2C 3C01C32F */ lui $at, 0xc32f /* 15230 80039E30 44810000 */ mtc1 $at, $f0 -/* 15234 80039E34 00000000 */ nop +/* 15234 80039E34 00000000 */ nop /* 15238 80039E38 460C003C */ c.lt.s $f0, $f12 -/* 1523C 80039E3C 00000000 */ nop +/* 1523C 80039E3C 00000000 */ nop /* 15240 80039E40 45000004 */ bc1f .L80039E54 /* 15244 80039E44 0000802D */ daddu $s0, $zero, $zero /* 15248 80039E48 44806000 */ mtc1 $zero, $f12 /* 1524C 80039E4C 0800E7AC */ j .L80039EB0 -/* 15250 80039E50 00000000 */ nop +/* 15250 80039E50 00000000 */ nop .L80039E54: /* 15254 80039E54 3C0140A0 */ lui $at, 0x40a0 /* 15258 80039E58 44810000 */ mtc1 $at, $f0 -/* 1525C 80039E5C 00000000 */ nop +/* 1525C 80039E5C 00000000 */ nop /* 15260 80039E60 460C003C */ c.lt.s $f0, $f12 -/* 15264 80039E64 00000000 */ nop +/* 15264 80039E64 00000000 */ nop /* 15268 80039E68 4500000C */ bc1f .L80039E9C -/* 1526C 80039E6C 00000000 */ nop +/* 1526C 80039E6C 00000000 */ nop /* 15270 80039E70 3C01432F */ lui $at, 0x432f /* 15274 80039E74 44810000 */ mtc1 $at, $f0 -/* 15278 80039E78 00000000 */ nop +/* 15278 80039E78 00000000 */ nop /* 1527C 80039E7C 4600603C */ c.lt.s $f12, $f0 -/* 15280 80039E80 00000000 */ nop +/* 15280 80039E80 00000000 */ nop /* 15284 80039E84 45000005 */ bc1f .L80039E9C /* 15288 80039E88 24100001 */ addiu $s0, $zero, 1 /* 1528C 80039E8C 3C014334 */ lui $at, 0x4334 /* 15290 80039E90 44816000 */ mtc1 $at, $f12 /* 15294 80039E94 0800E7AC */ j .L80039EB0 -/* 15298 80039E98 00000000 */ nop +/* 15298 80039E98 00000000 */ nop .L80039E9C: /* 1529C 80039E9C 8622008A */ lh $v0, 0x8a($s1) /* 152A0 80039EA0 24100002 */ addiu $s0, $zero, 2 /* 152A4 80039EA4 44826000 */ mtc1 $v0, $f12 -/* 152A8 80039EA8 00000000 */ nop +/* 152A8 80039EA8 00000000 */ nop /* 152AC 80039EAC 46806320 */ cvt.s.w $f12, $f12 .L80039EB0: /* 152B0 80039EB0 0C00A6C9 */ jal clamp_angle -/* 152B4 80039EB4 00000000 */ nop +/* 152B4 80039EB4 00000000 */ nop /* 152B8 80039EB8 46000506 */ mov.s $f20, $f0 /* 152BC 80039EBC 4600A10D */ trunc.w.s $f4, $f20 /* 152C0 80039EC0 44022000 */ mfc1 $v0, $f4 -/* 152C4 80039EC4 00000000 */ nop +/* 152C4 80039EC4 00000000 */ nop /* 152C8 80039EC8 A622008A */ sh $v0, 0x8a($s1) /* 152CC 80039ECC 8E220000 */ lw $v0, ($s1) /* 152D0 80039ED0 3C030004 */ lui $v1, 4 /* 152D4 80039ED4 00431024 */ and $v0, $v0, $v1 /* 152D8 80039ED8 14400034 */ bnez $v0, .L80039FAC -/* 152DC 80039EDC 00000000 */ nop +/* 152DC 80039EDC 00000000 */ nop /* 152E0 80039EE0 86220088 */ lh $v0, 0x88($s1) /* 152E4 80039EE4 10500016 */ beq $v0, $s0, .L80039F40 /* 152E8 80039EE8 24020002 */ addiu $v0, $zero, 2 /* 152EC 80039EEC 12020014 */ beq $s0, $v0, .L80039F40 -/* 152F0 80039EF0 00000000 */ nop +/* 152F0 80039EF0 00000000 */ nop /* 152F4 80039EF4 12000003 */ beqz $s0, .L80039F04 /* 152F8 80039EF8 A6300088 */ sh $s0, 0x88($s1) /* 152FC 80039EFC 0800E7C2 */ j .L80039F08 @@ -104,9 +104,9 @@ glabel func_80039DA4 /* 1531C 80039F1C 44811000 */ mtc1 $at, $f2 /* 15320 80039F20 46000005 */ abs.s $f0, $f0 /* 15324 80039F24 4600103E */ c.le.s $f2, $f0 -/* 15328 80039F28 00000000 */ nop +/* 15328 80039F28 00000000 */ nop /* 1532C 80039F2C 45000004 */ bc1f .L80039F40 -/* 15330 80039F30 00000000 */ nop +/* 15330 80039F30 00000000 */ nop /* 15334 80039F34 9622008C */ lhu $v0, 0x8c($s1) /* 15338 80039F38 00021023 */ negu $v0, $v0 /* 1533C 80039F3C A622008C */ sh $v0, 0x8c($s1) @@ -132,7 +132,7 @@ glabel func_80039DA4 .L80039F80: /* 15380 80039F80 8622008C */ lh $v0, 0x8c($s1) /* 15384 80039F84 44826000 */ mtc1 $v0, $f12 -/* 15388 80039F88 00000000 */ nop +/* 15388 80039F88 00000000 */ nop /* 1538C 80039F8C 46806320 */ cvt.s.w $f12, $f12 /* 15390 80039F90 0C00A6C9 */ jal clamp_angle /* 15394 80039F94 46146300 */ add.s $f12, $f12, $f20 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s b/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s index d1723f68b4..4da1f11f75 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003AC5C.s @@ -16,12 +16,12 @@ glabel func_8003AC5C /* 16088 8003AC88 00C0902D */ daddu $s2, $a2, $zero /* 1608C 8003AC8C 8E040024 */ lw $a0, 0x24($s0) /* 16090 8003AC90 0C0B797A */ jal func_802DE5E8 -/* 16094 8003AC94 00000000 */ nop +/* 16094 8003AC94 00000000 */ nop /* 16098 8003AC98 10400003 */ beqz $v0, .L8003ACA8 -/* 1609C 8003AC9C 00000000 */ nop +/* 1609C 8003AC9C 00000000 */ nop .L8003ACA0: /* 160A0 8003ACA0 0800EB28 */ j .L8003ACA0 -/* 160A4 8003ACA4 00000000 */ nop +/* 160A4 8003ACA4 00000000 */ nop .L8003ACA8: /* 160A8 8003ACA8 8E020000 */ lw $v0, ($s0) /* 160AC 8003ACAC 3C030100 */ lui $v1, 0x100 @@ -35,7 +35,7 @@ glabel func_8003AC5C /* 160CC 8003ACCC AE020024 */ sw $v0, 0x24($s0) .L8003ACD0: /* 160D0 8003ACD0 0800EB34 */ j .L8003ACD0 -/* 160D4 8003ACD4 00000000 */ nop +/* 160D4 8003ACD4 00000000 */ nop .L8003ACD8: /* 160D8 8003ACD8 8E030000 */ lw $v1, ($s0) /* 160DC 8003ACDC 3C024000 */ lui $v0, 0x4000 @@ -45,7 +45,7 @@ glabel func_8003AC5C /* 160EC 8003ACEC 3C020100 */ lui $v0, 0x100 /* 160F0 8003ACF0 00621024 */ and $v0, $v1, $v0 /* 160F4 8003ACF4 14400005 */ bnez $v0, .L8003AD0C -/* 160F8 8003ACF8 00000000 */ nop +/* 160F8 8003ACF8 00000000 */ nop /* 160FC 8003ACFC 8E040024 */ lw $a0, 0x24($s0) /* 16100 8003AD00 8E060030 */ lw $a2, 0x30($s0) /* 16104 8003AD04 0C0B78AB */ jal func_802DE2AC diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B184.s b/asm/nonmatchings/code_13870_len_6980/func_8003B184.s index 28345016bf..ad802aebc8 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B184.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B184.s @@ -6,4 +6,4 @@ glabel func_8003B184 /* 16588 8003B188 3C01800A */ lui $at, %hi(D_800A0B94) /* 1658C 8003B18C A0220B94 */ sb $v0, %lo(D_800A0B94)($at) /* 16590 8003B190 03E00008 */ jr $ra -/* 16594 8003B194 00000000 */ nop +/* 16594 8003B194 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B198.s b/asm/nonmatchings/code_13870_len_6980/func_8003B198.s index e050644d46..b6f8473bbb 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B198.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B198.s @@ -5,4 +5,4 @@ glabel func_8003B198 /* 16598 8003B198 3C01800A */ lui $at, %hi(D_800A0B94) /* 1659C 8003B19C A0200B94 */ sb $zero, %lo(D_800A0B94)($at) /* 165A0 8003B1A0 03E00008 */ jr $ra -/* 165A4 8003B1A4 00000000 */ nop +/* 165A4 8003B1A4 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s b/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s index 90344208aa..249550b0ea 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B1B0.s @@ -42,7 +42,7 @@ glabel func_8003B1B0 /* 1663C 8003B23C 00442025 */ or $a0, $v0, $a0 .L8003B240: /* 16640 8003B240 0C0B783B */ jal func_802DE0EC -/* 16644 8003B244 00000000 */ nop +/* 16644 8003B244 00000000 */ nop /* 16648 8003B248 AE220024 */ sw $v0, 0x24($s1) /* 1664C 8003B24C 8E230000 */ lw $v1, ($s1) /* 16650 8003B250 00741024 */ and $v0, $v1, $s4 @@ -51,10 +51,10 @@ glabel func_8003B1B0 /* 16658 8003B258 26520001 */ addiu $s2, $s2, 1 /* 1665C 8003B25C 00731024 */ and $v0, $v1, $s3 /* 16660 8003B260 1440001A */ bnez $v0, .L8003B2CC -/* 16664 8003B264 00000000 */ nop +/* 16664 8003B264 00000000 */ nop /* 16668 8003B268 822200B4 */ lb $v0, 0xb4($s1) /* 1666C 8003B26C 10400017 */ beqz $v0, .L8003B2CC -/* 16670 8003B270 00000000 */ nop +/* 16670 8003B270 00000000 */ nop /* 16674 8003B274 0C0B7A90 */ jal func_802DEA40 /* 16678 8003B278 96240028 */ lhu $a0, 0x28($s1) /* 1667C 8003B27C AE2200C4 */ sw $v0, 0xc4($s1) @@ -74,7 +74,7 @@ glabel func_8003B1B0 /* 166B0 8003B2B0 00431021 */ addu $v0, $v0, $v1 /* 166B4 8003B2B4 8C420000 */ lw $v0, ($v0) /* 166B8 8003B2B8 1444FFF8 */ bne $v0, $a0, .L8003B29C -/* 166BC 8003B2BC 00000000 */ nop +/* 166BC 8003B2BC 00000000 */ nop .L8003B2C0: /* 166C0 8003B2C0 0C0B7A9B */ jal func_802DEA6C /* 166C4 8003B2C4 96240028 */ lhu $a0, 0x28($s1) @@ -102,7 +102,7 @@ glabel func_8003B1B0 .L8003B314: /* 16714 8003B314 2A420040 */ slti $v0, $s2, 0x40 /* 16718 8003B318 1440FFAF */ bnez $v0, .L8003B1D8 -/* 1671C 8003B31C 00000000 */ nop +/* 1671C 8003B31C 00000000 */ nop /* 16720 8003B320 8FBF0024 */ lw $ra, 0x24($sp) /* 16724 8003B324 8FB40020 */ lw $s4, 0x20($sp) /* 16728 8003B328 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s b/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s index 779e526106..148b934269 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B3D0.s @@ -12,4 +12,4 @@ glabel func_8003B3D0 /* 167EC 8003B3EC A08200B6 */ sb $v0, 0xb6($a0) .L8003B3F0: /* 167F0 8003B3F0 03E00008 */ jr $ra -/* 167F4 8003B3F4 00000000 */ nop +/* 167F4 8003B3F4 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B3F8.s b/asm/nonmatchings/code_13870_len_6980/func_8003B3F8.s index 4bb2bd649b..dd688b7879 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B3F8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B3F8.s @@ -12,4 +12,4 @@ glabel func_8003B3F8 /* 16814 8003B414 A08200B6 */ sb $v0, 0xb6($a0) .L8003B418: /* 16818 8003B418 03E00008 */ jr $ra -/* 1681C 8003B41C 00000000 */ nop +/* 1681C 8003B41C 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s b/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s index ad20687ff3..6a4b479453 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B47C.s @@ -13,23 +13,23 @@ glabel func_8003B47C /* 1689C 8003B49C 00220821 */ addu $at, $at, $v0 /* 168A0 8003B4A0 8C2284C8 */ lw $v0, %lo(D_800984C8)($at) /* 168A4 8003B4A4 00400008 */ jr $v0 -/* 168A8 8003B4A8 00000000 */ nop +/* 168A8 8003B4A8 00000000 */ nop /* 168AC 8003B4AC 0C00ED40 */ jal func_8003B500 /* 168B0 8003B4B0 00E0302D */ daddu $a2, $a3, $zero /* 168B4 8003B4B4 0800ED3D */ j .L8003B4F4 -/* 168B8 8003B4B8 00000000 */ nop +/* 168B8 8003B4B8 00000000 */ nop /* 168BC 8003B4BC 0C00ED6D */ jal func_8003B5B4 /* 168C0 8003B4C0 00E0302D */ daddu $a2, $a3, $zero /* 168C4 8003B4C4 0800ED3D */ j .L8003B4F4 -/* 168C8 8003B4C8 00000000 */ nop +/* 168C8 8003B4C8 00000000 */ nop /* 168CC 8003B4CC 0C00EE98 */ jal func_8003BA60 /* 168D0 8003B4D0 0000302D */ daddu $a2, $zero, $zero /* 168D4 8003B4D4 0800ED3D */ j .L8003B4F4 -/* 168D8 8003B4D8 00000000 */ nop +/* 168D8 8003B4D8 00000000 */ nop /* 168DC 8003B4DC 0C00EE98 */ jal func_8003BA60 /* 168E0 8003B4E0 24060001 */ addiu $a2, $zero, 1 /* 168E4 8003B4E4 0800ED3D */ j .L8003B4F4 -/* 168E8 8003B4E8 00000000 */ nop +/* 168E8 8003B4E8 00000000 */ nop /* 168EC 8003B4EC 0C00EFB6 */ jal func_8003BED8 /* 168F0 8003B4F0 00E0302D */ daddu $a2, $a3, $zero .L8003B4F4: diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B500.s b/asm/nonmatchings/code_13870_len_6980/func_8003B500.s index a47c2bf27a..5ad690e60b 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B500.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B500.s @@ -6,7 +6,7 @@ glabel func_8003B500 /* 16904 8003B504 AFBF0018 */ sw $ra, 0x18($sp) /* 16908 8003B508 808200B6 */ lb $v0, 0xb6($a0) /* 1690C 8003B50C 10400007 */ beqz $v0, .L8003B52C -/* 16910 8003B510 00000000 */ nop +/* 16910 8003B510 00000000 */ nop /* 16914 8003B514 3C013F80 */ lui $at, 0x3f80 /* 16918 8003B518 44810000 */ mtc1 $at, $f0 /* 1691C 8003B51C AC800318 */ sw $zero, 0x318($a0) @@ -39,7 +39,7 @@ glabel func_8003B500 /* 16984 8003B584 0C0B78F6 */ jal func_802DE3D8 /* 16988 8003B588 00442025 */ or $a0, $v0, $a0 /* 1698C 8003B58C 0800ED6A */ j .L8003B5A8 -/* 16990 8003B590 00000000 */ nop +/* 16990 8003B590 00000000 */ nop .L8003B594: /* 16994 8003B594 3C044000 */ lui $a0, 0x4000 /* 16998 8003B598 34840001 */ ori $a0, $a0, 1 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s b/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s index f95a3058e7..1fae6d921f 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003B5B4.s @@ -14,7 +14,7 @@ glabel func_8003B5B4 /* 169D8 8003B5D8 00C0882D */ daddu $s1, $a2, $zero /* 169DC 8003B5DC 96040028 */ lhu $a0, 0x28($s0) /* 169E0 8003B5E0 0C0B7A90 */ jal func_802DEA40 -/* 169E4 8003B5E4 00000000 */ nop +/* 169E4 8003B5E4 00000000 */ nop /* 169E8 8003B5E8 AE0200C4 */ sw $v0, 0xc4($s0) /* 169EC 8003B5EC 0040202D */ daddu $a0, $v0, $zero /* 169F0 8003B5F0 A20000C1 */ sb $zero, 0xc1($s0) @@ -32,7 +32,7 @@ glabel func_8003B5B4 /* 16A1C 8003B61C 00431021 */ addu $v0, $v0, $v1 /* 16A20 8003B620 8C420000 */ lw $v0, ($v0) /* 16A24 8003B624 1444FFF8 */ bne $v0, $a0, .L8003B608 -/* 16A28 8003B628 00000000 */ nop +/* 16A28 8003B628 00000000 */ nop .L8003B62C: /* 16A2C 8003B62C 0C0B7A9B */ jal func_802DEA6C /* 16A30 8003B630 96040028 */ lhu $a0, 0x28($s0) @@ -72,7 +72,7 @@ glabel func_8003B5B4 .L8003B6A8: /* 16AA8 8003B6A8 860200BC */ lh $v0, 0xbc($s0) /* 16AAC 8003B6AC 14400013 */ bnez $v0, .L8003B6FC -/* 16AB0 8003B6B0 00000000 */ nop +/* 16AB0 8003B6B0 00000000 */ nop /* 16AB4 8003B6B4 920200B7 */ lbu $v0, 0xb7($s0) /* 16AB8 8003B6B8 3C038007 */ lui $v1, %hi(D_80077BF0) /* 16ABC 8003B6BC 24637BF0 */ addiu $v1, $v1, %lo(D_80077BF0) @@ -106,14 +106,14 @@ glabel func_8003B5B4 /* 16B24 8003B724 10400005 */ beqz $v0, .L8003B73C /* 16B28 8003B728 24020002 */ addiu $v0, $zero, 2 /* 16B2C 8003B72C 10800007 */ beqz $a0, .L8003B74C -/* 16B30 8003B730 00000000 */ nop +/* 16B30 8003B730 00000000 */ nop /* 16B34 8003B734 0800EE2B */ j .L8003B8AC -/* 16B38 8003B738 00000000 */ nop +/* 16B38 8003B738 00000000 */ nop .L8003B73C: /* 16B3C 8003B73C 1082003C */ beq $a0, $v0, .L8003B830 -/* 16B40 8003B740 00000000 */ nop +/* 16B40 8003B740 00000000 */ nop /* 16B44 8003B744 0800EE2B */ j .L8003B8AC -/* 16B48 8003B748 00000000 */ nop +/* 16B48 8003B748 00000000 */ nop .L8003B74C: /* 16B4C 8003B74C 820200C0 */ lb $v0, 0xc0($s0) /* 16B50 8003B750 18400056 */ blez $v0, .L8003B8AC @@ -142,7 +142,7 @@ glabel func_8003B5B4 /* 16BA0 8003B7A0 1440FFEE */ bnez $v0, .L8003B75C /* 16BA4 8003B7A4 24E70020 */ addiu $a3, $a3, 0x20 /* 16BA8 8003B7A8 0800EE2B */ j .L8003B8AC -/* 16BAC 8003B7AC 00000000 */ nop +/* 16BAC 8003B7AC 00000000 */ nop .L8003B7B0: /* 16BB0 8003B7B0 820200C0 */ lb $v0, 0xc0($s0) /* 16BB4 8003B7B4 920300C0 */ lbu $v1, 0xc0($s0) @@ -178,7 +178,7 @@ glabel func_8003B5B4 /* 16C20 8003B820 1440FFE8 */ bnez $v0, .L8003B7C4 /* 16C24 8003B824 24E70020 */ addiu $a3, $a3, 0x20 /* 16C28 8003B828 0800EE2B */ j .L8003B8AC -/* 16C2C 8003B82C 00000000 */ nop +/* 16C2C 8003B82C 00000000 */ nop .L8003B830: /* 16C30 8003B830 820200C0 */ lb $v0, 0xc0($s0) /* 16C34 8003B834 920300C0 */ lbu $v1, 0xc0($s0) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s b/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s index 94979b58a9..5b0a730575 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003BA60.s @@ -22,7 +22,7 @@ glabel func_8003BA60 /* 16EA4 8003BAA4 3C034000 */ lui $v1, 0x4000 /* 16EA8 8003BAA8 00431024 */ and $v0, $v0, $v1 /* 16EAC 8003BAAC 14400004 */ bnez $v0, .L8003BAC0 -/* 16EB0 8003BAB0 00000000 */ nop +/* 16EB0 8003BAB0 00000000 */ nop /* 16EB4 8003BAB4 0C0B7A90 */ jal func_802DEA40 /* 16EB8 8003BAB8 96640028 */ lhu $a0, 0x28($s3) /* 16EBC 8003BABC AE6200C4 */ sw $v0, 0xc4($s3) @@ -43,7 +43,7 @@ glabel func_8003BA60 /* 16EF0 8003BAF0 00431021 */ addu $v0, $v0, $v1 /* 16EF4 8003BAF4 8C420000 */ lw $v0, ($v0) /* 16EF8 8003BAF8 1444FFF8 */ bne $v0, $a0, .L8003BADC -/* 16EFC 8003BAFC 00000000 */ nop +/* 16EFC 8003BAFC 00000000 */ nop .L8003BB00: /* 16F00 8003BB00 826300B6 */ lb $v1, 0xb6($s3) /* 16F04 8003BB04 24020001 */ addiu $v0, $zero, 1 @@ -87,7 +87,7 @@ glabel func_8003BA60 /* 16F88 8003BB88 24A50020 */ addiu $a1, $a1, 0x20 .L8003BB8C: /* 16F8C 8003BB8C 16800007 */ bnez $s4, .L8003BBAC -/* 16F90 8003BB90 00000000 */ nop +/* 16F90 8003BB90 00000000 */ nop /* 16F94 8003BB94 9662030C */ lhu $v0, 0x30c($s3) /* 16F98 8003BB98 A660030C */ sh $zero, 0x30c($s3) /* 16F9C 8003BB9C A662030E */ sh $v0, 0x30e($s3) @@ -107,7 +107,7 @@ glabel func_8003BA60 /* 16FCC 8003BBCC 1062000C */ beq $v1, $v0, .L8003BC00 /* 16FD0 8003BBD0 24020002 */ addiu $v0, $zero, 2 /* 16FD4 8003BBD4 0800EF40 */ j .L8003BD00 -/* 16FD8 8003BBD8 00000000 */ nop +/* 16FD8 8003BBD8 00000000 */ nop .L8003BBDC: /* 16FDC 8003BBDC 866200BC */ lh $v0, 0xbc($s3) /* 16FE0 8003BBE0 966300BC */ lhu $v1, 0xbc($s3) @@ -130,7 +130,7 @@ glabel func_8003BA60 /* 17018 8003BC18 14410004 */ bne $v0, $at, .L8003BC2C /* 1701C 8003BC1C 3C018000 */ lui $at, 0x8000 /* 17020 8003BC20 14610002 */ bne $v1, $at, .L8003BC2C -/* 17024 8003BC24 00000000 */ nop +/* 17024 8003BC24 00000000 */ nop /* 17028 8003BC28 0006000D */ break 6 .L8003BC2C: /* 1702C 8003BC2C 00001812 */ mflo $v1 @@ -193,9 +193,9 @@ glabel func_8003BA60 /* 17100 8003BD00 10620005 */ beq $v1, $v0, .L8003BD18 /* 17104 8003BD04 24020003 */ addiu $v0, $zero, 3 /* 17108 8003BD08 1062000A */ beq $v1, $v0, .L8003BD34 -/* 1710C 8003BD0C 00000000 */ nop +/* 1710C 8003BD0C 00000000 */ nop /* 17110 8003BD10 0800EF8B */ j .L8003BE2C -/* 17114 8003BD14 00000000 */ nop +/* 17114 8003BD14 00000000 */ nop .L8003BD18: /* 17118 8003BD18 866200BC */ lh $v0, 0xbc($s3) /* 1711C 8003BD1C 966300BC */ lhu $v1, 0xbc($s3) @@ -215,7 +215,7 @@ glabel func_8003BA60 /* 1714C 8003BD4C 14410004 */ bne $v0, $at, .L8003BD60 /* 17150 8003BD50 3C018000 */ lui $at, 0x8000 /* 17154 8003BD54 14610002 */ bne $v1, $at, .L8003BD60 -/* 17158 8003BD58 00000000 */ nop +/* 17158 8003BD58 00000000 */ nop /* 1715C 8003BD5C 0006000D */ break 6 .L8003BD60: /* 17160 8003BD60 00001812 */ mflo $v1 @@ -267,7 +267,7 @@ glabel func_8003BA60 /* 17210 8003BE10 26940002 */ addiu $s4, $s4, 2 /* 17214 8003BE14 240200FF */ addiu $v0, $zero, 0xff /* 17218 8003BE18 16A20004 */ bne $s5, $v0, .L8003BE2C -/* 1721C 8003BE1C 00000000 */ nop +/* 1721C 8003BE1C 00000000 */ nop /* 17220 8003BE20 9662030C */ lhu $v0, 0x30c($s3) /* 17224 8003BE24 A26000B7 */ sb $zero, 0xb7($s3) .L8003BE28: @@ -276,7 +276,7 @@ glabel func_8003BA60 /* 1722C 8003BE2C 826300B7 */ lb $v1, 0xb7($s3) /* 17230 8003BE30 28620004 */ slti $v0, $v1, 4 /* 17234 8003BE34 1040001D */ beqz $v0, .L8003BEAC -/* 17238 8003BE38 00000000 */ nop +/* 17238 8003BE38 00000000 */ nop /* 1723C 8003BE3C 0460001B */ bltz $v1, .L8003BEAC /* 17240 8003BE40 3C034000 */ lui $v1, 0x4000 /* 17244 8003BE44 8E620000 */ lw $v0, ($s3) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s b/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s index 62e28f6c7e..73b9fe4830 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003BED8.s @@ -21,7 +21,7 @@ glabel func_8003BED8 /* 17318 8003BF18 3C034000 */ lui $v1, 0x4000 /* 1731C 8003BF1C 00431024 */ and $v0, $v0, $v1 /* 17320 8003BF20 14400004 */ bnez $v0, .L8003BF34 -/* 17324 8003BF24 00000000 */ nop +/* 17324 8003BF24 00000000 */ nop /* 17328 8003BF28 0C0B7A90 */ jal func_802DEA40 /* 1732C 8003BF2C 96840028 */ lhu $a0, 0x28($s4) /* 17330 8003BF30 AE8200C4 */ sw $v0, 0xc4($s4) @@ -42,7 +42,7 @@ glabel func_8003BED8 /* 17364 8003BF64 00431021 */ addu $v0, $v0, $v1 /* 17368 8003BF68 8C420000 */ lw $v0, ($v0) /* 1736C 8003BF6C 1444FFF8 */ bne $v0, $a0, .L8003BF50 -/* 17370 8003BF70 00000000 */ nop +/* 17370 8003BF70 00000000 */ nop .L8003BF74: /* 17374 8003BF74 828300B6 */ lb $v1, 0xb6($s4) /* 17378 8003BF78 24020001 */ addiu $v0, $zero, 1 @@ -97,7 +97,7 @@ glabel func_8003BED8 /* 17420 8003C020 1062000C */ beq $v1, $v0, .L8003C054 /* 17424 8003C024 24020002 */ addiu $v0, $zero, 2 /* 17428 8003C028 0800F06B */ j .L8003C1AC -/* 1742C 8003C02C 00000000 */ nop +/* 1742C 8003C02C 00000000 */ nop .L8003C030: /* 17430 8003C030 868200BC */ lh $v0, 0xbc($s4) /* 17434 8003C034 968300BC */ lhu $v1, 0xbc($s4) @@ -120,7 +120,7 @@ glabel func_8003BED8 /* 1746C 8003C06C 14410004 */ bne $v0, $at, .L8003C080 /* 17470 8003C070 3C018000 */ lui $at, 0x8000 /* 17474 8003C074 14610002 */ bne $v1, $at, .L8003C080 -/* 17478 8003C078 00000000 */ nop +/* 17478 8003C078 00000000 */ nop /* 1747C 8003C07C 0006000D */ break 6 .L8003C080: /* 17480 8003C080 00001812 */ mflo $v1 @@ -206,9 +206,9 @@ glabel func_8003BED8 /* 175AC 8003C1AC 10620005 */ beq $v1, $v0, .L8003C1C4 /* 175B0 8003C1B0 24020003 */ addiu $v0, $zero, 3 /* 175B4 8003C1B4 1062000A */ beq $v1, $v0, .L8003C1E0 -/* 175B8 8003C1B8 00000000 */ nop +/* 175B8 8003C1B8 00000000 */ nop /* 175BC 8003C1BC 0800F0CD */ j .L8003C334 -/* 175C0 8003C1C0 00000000 */ nop +/* 175C0 8003C1C0 00000000 */ nop .L8003C1C4: /* 175C4 8003C1C4 868200BC */ lh $v0, 0xbc($s4) /* 175C8 8003C1C8 968300BC */ lhu $v1, 0xbc($s4) @@ -228,7 +228,7 @@ glabel func_8003BED8 /* 175F8 8003C1F8 14410004 */ bne $v0, $at, .L8003C20C /* 175FC 8003C1FC 3C018000 */ lui $at, 0x8000 /* 17600 8003C200 14610002 */ bne $v1, $at, .L8003C20C -/* 17604 8003C204 00000000 */ nop +/* 17604 8003C204 00000000 */ nop /* 17608 8003C208 0006000D */ break 6 .L8003C20C: /* 1760C 8003C20C 00001812 */ mflo $v1 @@ -304,7 +304,7 @@ glabel func_8003BED8 /* 17718 8003C318 32A300FF */ andi $v1, $s5, 0xff /* 1771C 8003C31C 240200FF */ addiu $v0, $zero, 0xff /* 17720 8003C320 14620004 */ bne $v1, $v0, .L8003C334 -/* 17724 8003C324 00000000 */ nop +/* 17724 8003C324 00000000 */ nop /* 17728 8003C328 9682030C */ lhu $v0, 0x30c($s4) /* 1772C 8003C32C A28000B7 */ sb $zero, 0xb7($s4) .L8003C330: @@ -313,7 +313,7 @@ glabel func_8003BED8 /* 17734 8003C334 828300B7 */ lb $v1, 0xb7($s4) /* 17738 8003C338 28620004 */ slti $v0, $v1, 4 /* 1773C 8003C33C 1040001B */ beqz $v0, .L8003C3AC -/* 17740 8003C340 00000000 */ nop +/* 17740 8003C340 00000000 */ nop /* 17744 8003C344 04600019 */ bltz $v1, .L8003C3AC /* 17748 8003C348 3C034000 */ lui $v1, 0x4000 /* 1774C 8003C34C 8E820000 */ lw $v0, ($s4) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C428.s b/asm/nonmatchings/code_13870_len_6980/func_8003C428.s index e94dbb8d8a..d02657e2ba 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C428.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C428.s @@ -5,7 +5,7 @@ glabel func_8003C428 /* 17828 8003C428 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 1782C 8003C42C AFBF0010 */ sw $ra, 0x10($sp) /* 17830 8003C430 0C00F14F */ jal func_8003C53C -/* 17834 8003C434 00000000 */ nop +/* 17834 8003C434 00000000 */ nop /* 17838 8003C438 8FBF0010 */ lw $ra, 0x10($sp) /* 1783C 8003C43C 03E00008 */ jr $ra /* 17840 8003C440 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C444.s b/asm/nonmatchings/code_13870_len_6980/func_8003C444.s index 2d54429c09..16567574af 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C444.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C444.s @@ -21,7 +21,7 @@ glabel func_8003C444 /* 17880 8003C480 00521021 */ addu $v0, $v0, $s2 /* 17884 8003C484 8C420000 */ lw $v0, ($v0) /* 17888 8003C488 00400008 */ jr $v0 -/* 1788C 8003C48C 00000000 */ nop +/* 1788C 8003C48C 00000000 */ nop /* 17890 8003C490 0220202D */ daddu $a0, $s1, $zero /* 17894 8003C494 0C00F196 */ jal func_8003C658 /* 17898 8003C498 0200282D */ daddu $a1, $s0, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s b/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s index be6c6d12a0..48bbc68e34 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C53C.s @@ -17,7 +17,7 @@ glabel func_8003C53C /* 1796C 8003C56C 00220821 */ addu $at, $at, $v0 /* 17970 8003C570 8C228500 */ lw $v0, %lo(D_80098500)($at) /* 17974 8003C574 00400008 */ jr $v0 -/* 17978 8003C578 00000000 */ nop +/* 17978 8003C578 00000000 */ nop /* 1797C 8003C57C 0200202D */ daddu $a0, $s0, $zero /* 17980 8003C580 0C00F198 */ jal func_8003C660 /* 17984 8003C584 0220282D */ daddu $a1, $s1, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s b/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s index be6e709890..86d9007db3 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C61C.s @@ -11,9 +11,9 @@ glabel func_8003C61C /* 17A34 8003C634 14400005 */ bnez $v0, .L8003C64C /* 17A38 8003C638 24020006 */ addiu $v0, $zero, 6 /* 17A3C 8003C63C 14620003 */ bne $v1, $v0, .L8003C64C -/* 17A40 8003C640 00000000 */ nop +/* 17A40 8003C640 00000000 */ nop /* 17A44 8003C644 0C00F3EA */ jal func_8003CFA8 -/* 17A48 8003C648 00000000 */ nop +/* 17A48 8003C648 00000000 */ nop .L8003C64C: /* 17A4C 8003C64C 8FBF0010 */ lw $ra, 0x10($sp) /* 17A50 8003C650 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C668.s b/asm/nonmatchings/code_13870_len_6980/func_8003C668.s index 857b023ecf..3b8eda4374 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C668.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C668.s @@ -16,7 +16,7 @@ glabel func_8003C668 /* 17A94 8003C694 10620012 */ beq $v1, $v0, .L8003C6E0 /* 17A98 8003C698 00111080 */ sll $v0, $s1, 2 /* 17A9C 8003C69C 0800F1DD */ j .L8003C774 -/* 17AA0 8003C6A0 00000000 */ nop +/* 17AA0 8003C6A0 00000000 */ nop .L8003C6A4: /* 17AA4 8003C6A4 00111080 */ sll $v0, $s1, 2 /* 17AA8 8003C6A8 24420324 */ addiu $v0, $v0, 0x324 @@ -46,27 +46,27 @@ glabel func_8003C668 /* 17B04 8003C704 860200A6 */ lh $v0, 0xa6($s0) /* 17B08 8003C708 C6000054 */ lwc1 $f0, 0x54($s0) /* 17B0C 8003C70C 44821000 */ mtc1 $v0, $f2 -/* 17B10 8003C710 00000000 */ nop +/* 17B10 8003C710 00000000 */ nop /* 17B14 8003C714 468010A0 */ cvt.s.w $f2, $f2 /* 17B18 8003C718 46020002 */ mul.s $f0, $f0, $f2 -/* 17B1C 8003C71C 00000000 */ nop +/* 17B1C 8003C71C 00000000 */ nop /* 17B20 8003C720 3C01800A */ lui $at, %hi(D_80098520) /* 17B24 8003C724 D4248520 */ ldc1 $f4, %lo(D_80098520)($at) /* 17B28 8003C728 46000021 */ cvt.d.s $f0, $f0 /* 17B2C 8003C72C 46240002 */ mul.d $f0, $f0, $f4 -/* 17B30 8003C730 00000000 */ nop +/* 17B30 8003C730 00000000 */ nop /* 17B34 8003C734 46200020 */ cvt.s.d $f0, $f0 /* 17B38 8003C738 E460001C */ swc1 $f0, 0x1c($v1) /* 17B3C 8003C73C 860200A8 */ lh $v0, 0xa8($s0) /* 17B40 8003C740 C6000058 */ lwc1 $f0, 0x58($s0) /* 17B44 8003C744 44821000 */ mtc1 $v0, $f2 -/* 17B48 8003C748 00000000 */ nop +/* 17B48 8003C748 00000000 */ nop /* 17B4C 8003C74C 468010A0 */ cvt.s.w $f2, $f2 /* 17B50 8003C750 46020002 */ mul.s $f0, $f0, $f2 -/* 17B54 8003C754 00000000 */ nop +/* 17B54 8003C754 00000000 */ nop /* 17B58 8003C758 46000021 */ cvt.d.s $f0, $f0 /* 17B5C 8003C75C 46240002 */ mul.d $f0, $f0, $f4 -/* 17B60 8003C760 00000000 */ nop +/* 17B60 8003C760 00000000 */ nop /* 17B64 8003C764 46200020 */ cvt.s.d $f0, $f0 /* 17B68 8003C768 E4600020 */ swc1 $f0, 0x20($v1) /* 17B6C 8003C76C C6000034 */ lwc1 $f0, 0x34($s0) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s b/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s index 92831094ab..999ac52c4e 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C7A8.s @@ -15,7 +15,7 @@ glabel func_8003C7A8 /* 17BD0 8003C7D0 10620029 */ beq $v1, $v0, .L8003C878 /* 17BD4 8003C7D4 00111040 */ sll $v0, $s1, 1 /* 17BD8 8003C7D8 0800F226 */ j .L8003C898 -/* 17BDC 8003C7DC 00000000 */ nop +/* 17BDC 8003C7DC 00000000 */ nop .L8003C7E0: /* 17BE0 8003C7E0 8602008A */ lh $v0, 0x8a($s0) /* 17BE4 8003C7E4 2842005B */ slti $v0, $v0, 0x5b @@ -39,7 +39,7 @@ glabel func_8003C7A8 /* 17C28 8003C828 AFA20018 */ sw $v0, 0x18($sp) .L8003C82C: /* 17C2C 8003C82C 44830000 */ mtc1 $v1, $f0 -/* 17C30 8003C830 00000000 */ nop +/* 17C30 8003C830 00000000 */ nop /* 17C34 8003C834 46800020 */ cvt.s.w $f0, $f0 /* 17C38 8003C838 46003180 */ add.s $f6, $f6, $f0 /* 17C3C 8003C83C E7A20010 */ swc1 $f2, 0x10($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s b/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s index 40cac0e441..0e43ef10a3 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C8B4.s @@ -12,7 +12,7 @@ glabel func_8003C8B4 /* 17CD0 8003C8D0 1062001A */ beq $v1, $v0, .L8003C93C /* 17CD4 8003C8D4 00051080 */ sll $v0, $a1, 2 /* 17CD8 8003C8D8 0800F25D */ j .L8003C974 -/* 17CDC 8003C8DC 00000000 */ nop +/* 17CDC 8003C8DC 00000000 */ nop .L8003C8E0: /* 17CE0 8003C8E0 848300A8 */ lh $v1, 0xa8($a0) /* 17CE4 8003C8E4 C482003C */ lwc1 $f2, 0x3c($a0) @@ -26,7 +26,7 @@ glabel func_8003C8B4 /* 17D04 8003C904 AFA20018 */ sw $v0, 0x18($sp) /* 17D08 8003C908 E7A00010 */ swc1 $f0, 0x10($sp) /* 17D0C 8003C90C 44830000 */ mtc1 $v1, $f0 -/* 17D10 8003C910 00000000 */ nop +/* 17D10 8003C910 00000000 */ nop /* 17D14 8003C914 46800020 */ cvt.s.w $f0, $f0 /* 17D18 8003C918 46001080 */ add.s $f2, $f2, $f0 /* 17D1C 8003C91C 8C850038 */ lw $a1, 0x38($a0) @@ -46,7 +46,7 @@ glabel func_8003C8B4 /* 17D50 8003C950 848200A8 */ lh $v0, 0xa8($a0) /* 17D54 8003C954 C480003C */ lwc1 $f0, 0x3c($a0) /* 17D58 8003C958 44821000 */ mtc1 $v0, $f2 -/* 17D5C 8003C95C 00000000 */ nop +/* 17D5C 8003C95C 00000000 */ nop /* 17D60 8003C960 468010A0 */ cvt.s.w $f2, $f2 /* 17D64 8003C964 46020000 */ add.s $f0, $f0, $f2 /* 17D68 8003C968 E4600008 */ swc1 $f0, 8($v1) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s b/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s index 811558ed3a..bcdc6cc6c1 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003C9A8.s @@ -16,23 +16,23 @@ glabel func_8003C9A8 /* 17DD4 8003C9D4 10620028 */ beq $v1, $v0, .L8003CA78 /* 17DD8 8003C9D8 00111080 */ sll $v0, $s1, 2 /* 17DDC 8003C9DC 0800F2C2 */ j .L8003CB08 -/* 17DE0 8003C9E0 00000000 */ nop +/* 17DE0 8003C9E0 00000000 */ nop .L8003C9E4: /* 17DE4 8003C9E4 860200A8 */ lh $v0, 0xa8($s0) /* 17DE8 8003C9E8 3C013FE0 */ lui $at, 0x3fe0 /* 17DEC 8003C9EC 44810800 */ mtc1 $at, $f1 /* 17DF0 8003C9F0 44800000 */ mtc1 $zero, $f0 /* 17DF4 8003C9F4 44822000 */ mtc1 $v0, $f4 -/* 17DF8 8003C9F8 00000000 */ nop +/* 17DF8 8003C9F8 00000000 */ nop /* 17DFC 8003C9FC 46802121 */ cvt.d.w $f4, $f4 /* 17E00 8003CA00 46202102 */ mul.d $f4, $f4, $f0 -/* 17E04 8003CA04 00000000 */ nop +/* 17E04 8003CA04 00000000 */ nop /* 17E08 8003CA08 C6000054 */ lwc1 $f0, 0x54($s0) /* 17E0C 8003CA0C 3C01800A */ lui $at, %hi(D_80098528) /* 17E10 8003CA10 D4228528 */ ldc1 $f2, %lo(D_80098528)($at) /* 17E14 8003CA14 46000021 */ cvt.d.s $f0, $f0 /* 17E18 8003CA18 46220002 */ mul.d $f0, $f0, $f2 -/* 17E1C 8003CA1C 00000000 */ nop +/* 17E1C 8003CA1C 00000000 */ nop /* 17E20 8003CA20 3C01800A */ lui $at, %hi(D_80098530) /* 17E24 8003CA24 D4228530 */ ldc1 $f2, %lo(D_80098530)($at) /* 17E28 8003CA28 46220000 */ add.d $f0, $f0, $f2 @@ -66,14 +66,14 @@ glabel func_8003C9A8 /* 17E94 8003CA94 44810800 */ mtc1 $at, $f1 /* 17E98 8003CA98 44800000 */ mtc1 $zero, $f0 /* 17E9C 8003CA9C 44821000 */ mtc1 $v0, $f2 -/* 17EA0 8003CAA0 00000000 */ nop +/* 17EA0 8003CAA0 00000000 */ nop /* 17EA4 8003CAA4 468010A1 */ cvt.d.w $f2, $f2 /* 17EA8 8003CAA8 46201082 */ mul.d $f2, $f2, $f0 -/* 17EAC 8003CAAC 00000000 */ nop +/* 17EAC 8003CAAC 00000000 */ nop /* 17EB0 8003CAB0 C6000054 */ lwc1 $f0, 0x54($s0) /* 17EB4 8003CAB4 46000021 */ cvt.d.s $f0, $f0 /* 17EB8 8003CAB8 46201082 */ mul.d $f2, $f2, $f0 -/* 17EBC 8003CABC 00000000 */ nop +/* 17EBC 8003CABC 00000000 */ nop /* 17EC0 8003CAC0 C600003C */ lwc1 $f0, 0x3c($s0) /* 17EC4 8003CAC4 46000021 */ cvt.d.s $f0, $f0 /* 17EC8 8003CAC8 46220000 */ add.d $f0, $f0, $f2 @@ -86,7 +86,7 @@ glabel func_8003C9A8 /* 17EE4 8003CAE4 D4228538 */ ldc1 $f2, %lo(D_80098538)($at) /* 17EE8 8003CAE8 46000021 */ cvt.d.s $f0, $f0 /* 17EEC 8003CAEC 46220002 */ mul.d $f0, $f0, $f2 -/* 17EF0 8003CAF0 00000000 */ nop +/* 17EF0 8003CAF0 00000000 */ nop /* 17EF4 8003CAF4 3C01800A */ lui $at, %hi(D_80098540) /* 17EF8 8003CAF8 D4228540 */ ldc1 $f2, %lo(D_80098540)($at) /* 17EFC 8003CAFC 46220000 */ add.d $f0, $f0, $f2 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s b/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s index 6d529a74b7..4ac28d0fec 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003CB44.s @@ -16,17 +16,17 @@ glabel func_8003CB44 /* 17F70 8003CB70 10620023 */ beq $v1, $v0, .L8003CC00 /* 17F74 8003CB74 00111080 */ sll $v0, $s1, 2 /* 17F78 8003CB78 0800F31D */ j .L8003CC74 -/* 17F7C 8003CB7C 00000000 */ nop +/* 17F7C 8003CB7C 00000000 */ nop .L8003CB80: /* 17F80 8003CB80 860200A8 */ lh $v0, 0xa8($s0) /* 17F84 8003CB84 3C013FE0 */ lui $at, 0x3fe0 /* 17F88 8003CB88 44810800 */ mtc1 $at, $f1 /* 17F8C 8003CB8C 44800000 */ mtc1 $zero, $f0 /* 17F90 8003CB90 44821000 */ mtc1 $v0, $f2 -/* 17F94 8003CB94 00000000 */ nop +/* 17F94 8003CB94 00000000 */ nop /* 17F98 8003CB98 468010A1 */ cvt.d.w $f2, $f2 /* 17F9C 8003CB9C 46201082 */ mul.d $f2, $f2, $f0 -/* 17FA0 8003CBA0 00000000 */ nop +/* 17FA0 8003CBA0 00000000 */ nop /* 17FA4 8003CBA4 C6060040 */ lwc1 $f6, 0x40($s0) /* 17FA8 8003CBA8 3C013F80 */ lui $at, 0x3f80 /* 17FAC 8003CBAC 44812000 */ mtc1 $at, $f4 @@ -61,10 +61,10 @@ glabel func_8003CB44 /* 1801C 8003CC1C 44810800 */ mtc1 $at, $f1 /* 18020 8003CC20 44800000 */ mtc1 $zero, $f0 /* 18024 8003CC24 44821000 */ mtc1 $v0, $f2 -/* 18028 8003CC28 00000000 */ nop +/* 18028 8003CC28 00000000 */ nop /* 1802C 8003CC2C 468010A1 */ cvt.d.w $f2, $f2 /* 18030 8003CC30 46201082 */ mul.d $f2, $f2, $f0 -/* 18034 8003CC34 00000000 */ nop +/* 18034 8003CC34 00000000 */ nop /* 18038 8003CC38 C600003C */ lwc1 $f0, 0x3c($s0) /* 1803C 8003CC3C 46000021 */ cvt.d.s $f0, $f0 /* 18040 8003CC40 46220000 */ add.d $f0, $f0, $f2 @@ -73,11 +73,11 @@ glabel func_8003CB44 /* 1804C 8003CC4C C6020040 */ lwc1 $f2, 0x40($s0) /* 18050 8003CC50 3C0140A0 */ lui $at, 0x40a0 /* 18054 8003CC54 44810000 */ mtc1 $at, $f0 -/* 18058 8003CC58 00000000 */ nop +/* 18058 8003CC58 00000000 */ nop /* 1805C 8003CC5C 46001081 */ sub.s $f2, $f2, $f0 /* 18060 8003CC60 3C013F80 */ lui $at, 0x3f80 /* 18064 8003CC64 44810000 */ mtc1 $at, $f0 -/* 18068 8003CC68 00000000 */ nop +/* 18068 8003CC68 00000000 */ nop /* 1806C 8003CC6C E4600030 */ swc1 $f0, 0x30($v1) /* 18070 8003CC70 E462000C */ swc1 $f2, 0xc($v1) .L8003CC74: diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s b/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s index 32ab830373..d5a9ed6eac 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003CCB0.s @@ -81,10 +81,10 @@ glabel func_8003CCB0 /* 181D4 8003CDD4 46000021 */ cvt.d.s $f0, $f0 /* 181D8 8003CDD8 46380000 */ add.d $f0, $f0, $f24 /* 181DC 8003CDDC 46360002 */ mul.d $f0, $f0, $f22 -/* 181E0 8003CDE0 00000000 */ nop +/* 181E0 8003CDE0 00000000 */ nop /* 181E4 8003CDE4 27A20020 */ addiu $v0, $sp, 0x20 /* 181E8 8003CDE8 4620A03E */ c.le.d $f20, $f0 -/* 181EC 8003CDEC 00000000 */ nop +/* 181EC 8003CDEC 00000000 */ nop /* 181F0 8003CDF0 45010005 */ bc1t .L8003CE08 /* 181F4 8003CDF4 00501021 */ addu $v0, $v0, $s0 /* 181F8 8003CDF8 4620008D */ trunc.w.d $f2, $f0 @@ -95,7 +95,7 @@ glabel func_8003CCB0 /* 18208 8003CE08 46340001 */ sub.d $f0, $f0, $f20 /* 1820C 8003CE0C 4620008D */ trunc.w.d $f2, $f0 /* 18210 8003CE10 44031000 */ mfc1 $v1, $f2 -/* 18214 8003CE14 00000000 */ nop +/* 18214 8003CE14 00000000 */ nop /* 18218 8003CE18 00731825 */ or $v1, $v1, $s3 /* 1821C 8003CE1C A0430000 */ sb $v1, ($v0) .L8003CE20: @@ -108,10 +108,10 @@ glabel func_8003CCB0 /* 18238 8003CE38 46000021 */ cvt.d.s $f0, $f0 /* 1823C 8003CE3C 46380000 */ add.d $f0, $f0, $f24 /* 18240 8003CE40 46360002 */ mul.d $f0, $f0, $f22 -/* 18244 8003CE44 00000000 */ nop +/* 18244 8003CE44 00000000 */ nop /* 18248 8003CE48 27A20038 */ addiu $v0, $sp, 0x38 /* 1824C 8003CE4C 4620A03E */ c.le.d $f20, $f0 -/* 18250 8003CE50 00000000 */ nop +/* 18250 8003CE50 00000000 */ nop /* 18254 8003CE54 45010005 */ bc1t .L8003CE6C /* 18258 8003CE58 00501021 */ addu $v0, $v0, $s0 /* 1825C 8003CE5C 4620008D */ trunc.w.d $f2, $f0 @@ -122,7 +122,7 @@ glabel func_8003CCB0 /* 1826C 8003CE6C 46340001 */ sub.d $f0, $f0, $f20 /* 18270 8003CE70 4620008D */ trunc.w.d $f2, $f0 /* 18274 8003CE74 44031000 */ mfc1 $v1, $f2 -/* 18278 8003CE78 00000000 */ nop +/* 18278 8003CE78 00000000 */ nop /* 1827C 8003CE7C 00731825 */ or $v1, $v1, $s3 /* 18280 8003CE80 A0430000 */ sb $v1, ($v0) .L8003CE84: @@ -135,10 +135,10 @@ glabel func_8003CCB0 /* 1829C 8003CE9C 46000021 */ cvt.d.s $f0, $f0 /* 182A0 8003CEA0 46380000 */ add.d $f0, $f0, $f24 /* 182A4 8003CEA4 46360002 */ mul.d $f0, $f0, $f22 -/* 182A8 8003CEA8 00000000 */ nop +/* 182A8 8003CEA8 00000000 */ nop /* 182AC 8003CEAC 27A20050 */ addiu $v0, $sp, 0x50 /* 182B0 8003CEB0 4620A03E */ c.le.d $f20, $f0 -/* 182B4 8003CEB4 00000000 */ nop +/* 182B4 8003CEB4 00000000 */ nop /* 182B8 8003CEB8 45010005 */ bc1t .L8003CED0 /* 182BC 8003CEBC 00501021 */ addu $v0, $v0, $s0 /* 182C0 8003CEC0 4620008D */ trunc.w.d $f2, $f0 @@ -149,7 +149,7 @@ glabel func_8003CCB0 /* 182D0 8003CED0 46340001 */ sub.d $f0, $f0, $f20 /* 182D4 8003CED4 4620008D */ trunc.w.d $f2, $f0 /* 182D8 8003CED8 44031000 */ mfc1 $v1, $f2 -/* 182DC 8003CEDC 00000000 */ nop +/* 182DC 8003CEDC 00000000 */ nop /* 182E0 8003CEE0 00731825 */ or $v1, $v1, $s3 /* 182E4 8003CEE4 A0430000 */ sb $v1, ($v0) .L8003CEE8: diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003CFB4.s b/asm/nonmatchings/code_13870_len_6980/func_8003CFB4.s index 8397396474..ed90a84458 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003CFB4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003CFB4.s @@ -44,16 +44,16 @@ glabel func_8003CFB4 /* 1844C 8003D04C 4406C000 */ mfc1 $a2, $f24 /* 18450 8003D050 4407D000 */ mfc1 $a3, $f26 /* 18454 8003D054 0C00A7B5 */ jal dist2D -/* 18458 8003D058 00000000 */ nop +/* 18458 8003D058 00000000 */ nop /* 1845C 8003D05C 46000005 */ abs.s $f0, $f0 /* 18460 8003D060 4616003E */ c.le.s $f0, $f22 -/* 18464 8003D064 00000000 */ nop +/* 18464 8003D064 00000000 */ nop /* 18468 8003D068 45000007 */ bc1f .L8003D088 /* 1846C 8003D06C 26310001 */ addiu $s1, $s1, 1 /* 18470 8003D070 4614003C */ c.lt.s $f0, $f20 -/* 18474 8003D074 00000000 */ nop +/* 18474 8003D074 00000000 */ nop /* 18478 8003D078 45000003 */ bc1f .L8003D088 -/* 1847C 8003D07C 00000000 */ nop +/* 1847C 8003D07C 00000000 */ nop /* 18480 8003D080 46000506 */ mov.s $f20, $f0 /* 18484 8003D084 0200902D */ daddu $s2, $s0, $zero .L8003D088: diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D0C4.s b/asm/nonmatchings/code_13870_len_6980/func_8003D0C4.s index 020e6562c0..60adde59ab 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D0C4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D0C4.s @@ -44,16 +44,16 @@ glabel func_8003D0C4 /* 1855C 8003D15C 4406C000 */ mfc1 $a2, $f24 /* 18560 8003D160 4407D000 */ mfc1 $a3, $f26 /* 18564 8003D164 0C00A7B5 */ jal dist2D -/* 18568 8003D168 00000000 */ nop +/* 18568 8003D168 00000000 */ nop /* 1856C 8003D16C 46000005 */ abs.s $f0, $f0 /* 18570 8003D170 4616003E */ c.le.s $f0, $f22 -/* 18574 8003D174 00000000 */ nop +/* 18574 8003D174 00000000 */ nop /* 18578 8003D178 45000007 */ bc1f .L8003D198 /* 1857C 8003D17C 26310001 */ addiu $s1, $s1, 1 /* 18580 8003D180 4614003C */ c.lt.s $f0, $f20 -/* 18584 8003D184 00000000 */ nop +/* 18584 8003D184 00000000 */ nop /* 18588 8003D188 45000003 */ bc1f .L8003D198 -/* 1858C 8003D18C 00000000 */ nop +/* 1858C 8003D18C 00000000 */ nop /* 18590 8003D190 46000506 */ mov.s $f20, $f0 /* 18594 8003D194 0200902D */ daddu $s2, $s0, $zero .L8003D198: diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s b/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s index d1d04122ec..fb5ee05750 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D1D4.s @@ -39,22 +39,22 @@ glabel func_8003D1D4 /* 18658 8003D258 26310001 */ addiu $s1, $s1, 1 /* 1865C 8003D25C C602003C */ lwc1 $f2, 0x3c($s0) /* 18660 8003D260 44930000 */ mtc1 $s3, $f0 -/* 18664 8003D264 00000000 */ nop +/* 18664 8003D264 00000000 */ nop /* 18668 8003D268 46800020 */ cvt.s.w $f0, $f0 /* 1866C 8003D26C 4600103C */ c.lt.s $f2, $f0 -/* 18670 8003D270 00000000 */ nop +/* 18670 8003D270 00000000 */ nop /* 18674 8003D274 45030014 */ bc1tl .L8003D2C8 /* 18678 8003D278 26310001 */ addiu $s1, $s1, 1 /* 1867C 8003D27C 30628008 */ andi $v0, $v1, 0x8008 /* 18680 8003D280 10400008 */ beqz $v0, .L8003D2A4 -/* 18684 8003D284 00000000 */ nop +/* 18684 8003D284 00000000 */ nop /* 18688 8003D288 0C00F4BE */ jal func_8003D2F8 /* 1868C 8003D28C 0200202D */ daddu $a0, $s0, $zero /* 18690 8003D290 0040182D */ daddu $v1, $v0, $zero /* 18694 8003D294 5060000C */ beql $v1, $zero, .L8003D2C8 /* 18698 8003D298 26310001 */ addiu $s1, $s1, 1 /* 1869C 8003D29C 0800F4AE */ j .L8003D2B8 -/* 186A0 8003D2A0 00000000 */ nop +/* 186A0 8003D2A0 00000000 */ nop .L8003D2A4: /* 186A4 8003D2A4 96020084 */ lhu $v0, 0x84($s0) /* 186A8 8003D2A8 86030084 */ lh $v1, 0x84($s0) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s b/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s index 6cee1157c9..e1fe5001e2 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D2F8.s @@ -11,7 +11,7 @@ glabel func_8003D2F8 /* 18710 8003D310 3C030400 */ lui $v1, 0x400 /* 18714 8003D314 00431024 */ and $v0, $v0, $v1 /* 18718 8003D318 10400005 */ beqz $v0, .L8003D330 -/* 1871C 8003D31C 00000000 */ nop +/* 1871C 8003D31C 00000000 */ nop /* 18720 8003D320 0C044181 */ jal get_shadow_by_index /* 18724 8003D324 8E040078 */ lw $a0, 0x78($s0) /* 18728 8003D328 0800F4CD */ j .L8003D334 @@ -21,7 +21,7 @@ glabel func_8003D2F8 .L8003D334: /* 18734 8003D334 3C014150 */ lui $at, 0x4150 /* 18738 8003D338 44811000 */ mtc1 $at, $f2 -/* 1873C 8003D33C 00000000 */ nop +/* 1873C 8003D33C 00000000 */ nop /* 18740 8003D340 46020000 */ add.s $f0, $f0, $f2 /* 18744 8003D344 E7A0001C */ swc1 $f0, 0x1c($sp) /* 18748 8003D348 3C040003 */ lui $a0, 3 @@ -43,9 +43,9 @@ glabel func_8003D2F8 /* 18788 8003D388 0000102D */ daddu $v0, $zero, $zero /* 1878C 8003D38C C7A00024 */ lwc1 $f0, 0x24($sp) /* 18790 8003D390 4614003E */ c.le.s $f0, $f20 -/* 18794 8003D394 00000000 */ nop +/* 18794 8003D394 00000000 */ nop /* 18798 8003D398 45000003 */ bc1f .L8003D3A8 -/* 1879C 8003D39C 00000000 */ nop +/* 1879C 8003D39C 00000000 */ nop /* 187A0 8003D3A0 3C028011 */ lui $v0, %hi(D_8010C978) /* 187A4 8003D3A4 8C42C978 */ lw $v0, %lo(D_8010C978)($v0) .L8003D3A8: diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s b/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s index 8341853a0c..5ea9ad56da 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D3BC.s @@ -33,7 +33,7 @@ glabel func_8003D3BC /* 1882C 8003D42C 00220821 */ addu $at, $at, $v0 /* 18830 8003D430 8C228548 */ lw $v0, %lo(D_80098548)($at) /* 18834 8003D434 00400008 */ jr $v0 -/* 18838 8003D438 00000000 */ nop +/* 18838 8003D438 00000000 */ nop /* 1883C 8003D43C 0000282D */ daddu $a1, $zero, $zero /* 18840 8003D440 00A0302D */ daddu $a2, $a1, $zero /* 18844 8003D444 2402000D */ addiu $v0, $zero, 0xd @@ -147,7 +147,7 @@ glabel func_8003D3BC /* 189F0 8003D5F0 02A0382D */ daddu $a3, $s5, $zero .L8003D5F4: /* 189F4 8003D5F4 0C0B7A25 */ jal func_802DE894 -/* 189F8 8003D5F8 00000000 */ nop +/* 189F8 8003D5F8 00000000 */ nop .L8003D5FC: /* 189FC 8003D5FC 8FBF003C */ lw $ra, 0x3c($sp) /* 18A00 8003D600 8FB60038 */ lw $s6, 0x38($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D660.s b/asm/nonmatchings/code_13870_len_6980/func_8003D660.s index 2ad518524a..f771f5ea3a 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D660.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D660.s @@ -19,11 +19,11 @@ glabel func_8003D660 /* 18A98 8003D698 00A0882D */ daddu $s1, $a1, $zero /* 18A9C 8003D69C C6020018 */ lwc1 $f2, 0x18($s0) /* 18AA0 8003D6A0 44800000 */ mtc1 $zero, $f0 -/* 18AA4 8003D6A4 00000000 */ nop +/* 18AA4 8003D6A4 00000000 */ nop /* 18AA8 8003D6A8 46001032 */ c.eq.s $f2, $f0 -/* 18AAC 8003D6AC 00000000 */ nop +/* 18AAC 8003D6AC 00000000 */ nop /* 18AB0 8003D6B0 4501002F */ bc1t .L8003D770 -/* 18AB4 8003D6B4 00000000 */ nop +/* 18AB4 8003D6B4 00000000 */ nop /* 18AB8 8003D6B8 0C016F6A */ jal get_collider_type_by_id /* 18ABC 8003D6BC 96040084 */ lhu $a0, 0x84($s0) /* 18AC0 8003D6C0 304200FF */ andi $v0, $v0, 0xff @@ -35,39 +35,39 @@ glabel func_8003D660 /* 18AD8 8003D6D8 00220821 */ addu $at, $at, $v0 /* 18ADC 8003D6DC 8C228590 */ lw $v0, %lo(D_80098590)($at) /* 18AE0 8003D6E0 00400008 */ jr $v0 -/* 18AE4 8003D6E4 00000000 */ nop +/* 18AE4 8003D6E4 00000000 */ nop /* 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 +/* 18AF8 8003D6F8 00000000 */ nop /* 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 +/* 18B0C 8003D70C 00000000 */ nop /* 18B10 8003D710 82420000 */ lb $v0, ($s2) /* 18B14 8003D714 10400004 */ beqz $v0, .L8003D728 /* 18B18 8003D718 24020008 */ addiu $v0, $zero, 8 /* 18B1C 8003D71C 82430003 */ lb $v1, 3($s2) /* 18B20 8003D720 10620013 */ beq $v1, $v0, .L8003D770 -/* 18B24 8003D724 00000000 */ nop +/* 18B24 8003D724 00000000 */ nop .L8003D728: /* 18B28 8003D728 0200202D */ daddu $a0, $s0, $zero /* 18B2C 8003D72C 0C00F7E8 */ jal func_8003DFA0 /* 18B30 8003D730 0220282D */ daddu $a1, $s1, $zero /* 18B34 8003D734 0800F5DC */ j .L8003D770 -/* 18B38 8003D738 00000000 */ nop +/* 18B38 8003D738 00000000 */ nop /* 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 +/* 18B4C 8003D74C 00000000 */ nop /* 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 +/* 18B60 8003D760 00000000 */ nop .L8003D764: /* 18B64 8003D764 0200202D */ daddu $a0, $s0, $zero /* 18B68 8003D768 0C00F5E2 */ jal func_8003D788 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003D788.s b/asm/nonmatchings/code_13870_len_6980/func_8003D788.s index 9daa9141df..e1ba6c840c 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003D788.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003D788.s @@ -19,7 +19,7 @@ glabel func_8003D788 .L8003D7C0: /* 18BC0 8003D7C0 24020002 */ addiu $v0, $zero, 2 /* 18BC4 8003D7C4 14A20026 */ bne $a1, $v0, .L8003D860 -/* 18BC8 8003D7C8 00000000 */ nop +/* 18BC8 8003D7C8 00000000 */ nop /* 18BCC 8003D7CC C602003C */ lwc1 $f2, 0x3c($s0) /* 18BD0 8003D7D0 44800000 */ mtc1 $zero, $f0 /* 18BD4 8003D7D4 C6040040 */ lwc1 $f4, 0x40($s0) @@ -60,7 +60,7 @@ glabel func_8003D788 /* 18C5C 8003D85C E7A00010 */ swc1 $f0, 0x10($sp) .L8003D860: /* 18C60 8003D860 10A00070 */ beqz $a1, .L8003DA24 -/* 18C64 8003D864 00000000 */ nop +/* 18C64 8003D864 00000000 */ nop /* 18C68 8003D868 3C048007 */ lui $a0, %hi(D_80077C14) /* 18C6C 8003D86C 24847C14 */ addiu $a0, $a0, %lo(D_80077C14) /* 18C70 8003D870 94820000 */ lhu $v0, ($a0) @@ -78,9 +78,9 @@ glabel func_8003D788 /* 18CA0 8003D8A0 3C0140C9 */ lui $at, 0x40c9 /* 18CA4 8003D8A4 34210FD0 */ ori $at, $at, 0xfd0 /* 18CA8 8003D8A8 44811000 */ mtc1 $at, $f2 -/* 18CAC 8003D8AC 00000000 */ nop +/* 18CAC 8003D8AC 00000000 */ nop /* 18CB0 8003D8B0 46020002 */ mul.s $f0, $f0, $f2 -/* 18CB4 8003D8B4 00000000 */ nop +/* 18CB4 8003D8B4 00000000 */ nop /* 18CB8 8003D8B8 27A50028 */ addiu $a1, $sp, 0x28 /* 18CBC 8003D8BC 3C0143B4 */ lui $at, 0x43b4 /* 18CC0 8003D8C0 44816000 */ mtc1 $at, $f12 @@ -90,25 +90,25 @@ glabel func_8003D788 /* 18CD0 8003D8D0 860200A6 */ lh $v0, 0xa6($s0) /* 18CD4 8003D8D4 C7AA0028 */ lwc1 $f10, 0x28($sp) /* 18CD8 8003D8D8 44821000 */ mtc1 $v0, $f2 -/* 18CDC 8003D8DC 00000000 */ nop +/* 18CDC 8003D8DC 00000000 */ nop /* 18CE0 8003D8E0 468010A0 */ cvt.s.w $f2, $f2 /* 18CE4 8003D8E4 460A1182 */ mul.s $f6, $f2, $f10 -/* 18CE8 8003D8E8 00000000 */ nop +/* 18CE8 8003D8E8 00000000 */ nop /* 18CEC 8003D8EC C7A8002C */ lwc1 $f8, 0x2c($sp) /* 18CF0 8003D8F0 46081082 */ mul.s $f2, $f2, $f8 -/* 18CF4 8003D8F4 00000000 */ nop +/* 18CF4 8003D8F4 00000000 */ nop /* 18CF8 8003D8F8 3C013E4C */ lui $at, 0x3e4c /* 18CFC 8003D8FC 3421CCCD */ ori $at, $at, 0xcccd /* 18D00 8003D900 44810000 */ mtc1 $at, $f0 -/* 18D04 8003D904 00000000 */ nop +/* 18D04 8003D904 00000000 */ nop /* 18D08 8003D908 46003182 */ mul.s $f6, $f6, $f0 -/* 18D0C 8003D90C 00000000 */ nop +/* 18D0C 8003D90C 00000000 */ nop /* 18D10 8003D910 46001082 */ mul.s $f2, $f2, $f0 -/* 18D14 8003D914 00000000 */ nop +/* 18D14 8003D914 00000000 */ nop /* 18D18 8003D918 C604003C */ lwc1 $f4, 0x3c($s0) /* 18D1C 8003D91C 3C013FC0 */ lui $at, 0x3fc0 /* 18D20 8003D920 44810000 */ mtc1 $at, $f0 -/* 18D24 8003D924 00000000 */ nop +/* 18D24 8003D924 00000000 */ nop /* 18D28 8003D928 46002100 */ add.s $f4, $f4, $f0 /* 18D2C 8003D92C C6000038 */ lwc1 $f0, 0x38($s0) /* 18D30 8003D930 46060000 */ add.s $f0, $f0, $f6 @@ -122,16 +122,16 @@ glabel func_8003D788 /* 18D50 8003D950 0C01BECC */ jal fx_walk_normal /* 18D54 8003D954 E7A80014 */ swc1 $f8, 0x14($sp) /* 18D58 8003D958 0800F689 */ j .L8003DA24 -/* 18D5C 8003D95C 00000000 */ nop +/* 18D5C 8003D95C 00000000 */ nop .L8003D960: /* 18D60 8003D960 0C00A6C9 */ jal clamp_angle /* 18D64 8003D964 C60C000C */ lwc1 $f12, 0xc($s0) /* 18D68 8003D968 3C0140C9 */ lui $at, 0x40c9 /* 18D6C 8003D96C 34210FD0 */ ori $at, $at, 0xfd0 /* 18D70 8003D970 44811000 */ mtc1 $at, $f2 -/* 18D74 8003D974 00000000 */ nop +/* 18D74 8003D974 00000000 */ nop /* 18D78 8003D978 46020002 */ mul.s $f0, $f0, $f2 -/* 18D7C 8003D97C 00000000 */ nop +/* 18D7C 8003D97C 00000000 */ nop /* 18D80 8003D980 27A50028 */ addiu $a1, $sp, 0x28 /* 18D84 8003D984 3C0143B4 */ lui $at, 0x43b4 /* 18D88 8003D988 44816000 */ mtc1 $at, $f12 @@ -145,14 +145,14 @@ glabel func_8003D788 /* 18DA8 8003D9A8 46001080 */ add.s $f2, $f2, $f0 /* 18DAC 8003D9AC C7A40028 */ lwc1 $f4, 0x28($sp) /* 18DB0 8003D9B0 44820000 */ mtc1 $v0, $f0 -/* 18DB4 8003D9B4 00000000 */ nop +/* 18DB4 8003D9B4 00000000 */ nop /* 18DB8 8003D9B8 46800020 */ cvt.s.w $f0, $f0 /* 18DBC 8003D9BC 46040102 */ mul.s $f4, $f0, $f4 -/* 18DC0 8003D9C0 00000000 */ nop +/* 18DC0 8003D9C0 00000000 */ nop /* 18DC4 8003D9C4 44061000 */ mfc1 $a2, $f2 /* 18DC8 8003D9C8 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 18DCC 8003D9CC 46020002 */ mul.s $f0, $f0, $f2 -/* 18DD0 8003D9D0 00000000 */ nop +/* 18DD0 8003D9D0 00000000 */ nop /* 18DD4 8003D9D4 24040003 */ addiu $a0, $zero, 3 /* 18DD8 8003D9D8 C6060038 */ lwc1 $f6, 0x38($s0) /* 18DDC 8003D9DC C6080040 */ lwc1 $f8, 0x40($s0) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s b/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s index 3a13f320c3..e868e02bda 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003DA38.s @@ -17,7 +17,7 @@ glabel func_8003DA38 /* 18E68 8003DA68 86230000 */ lh $v1, ($s1) /* 18E6C 8003DA6C 24020005 */ addiu $v0, $zero, 5 /* 18E70 8003DA70 14620013 */ bne $v1, $v0, .L8003DAC0 -/* 18E74 8003DA74 00000000 */ nop +/* 18E74 8003DA74 00000000 */ nop /* 18E78 8003DA78 C60C0038 */ lwc1 $f12, 0x38($s0) /* 18E7C 8003DA7C 8E060040 */ lw $a2, 0x40($s0) /* 18E80 8003DA80 C600003C */ lwc1 $f0, 0x3c($s0) @@ -63,12 +63,12 @@ glabel func_8003DA38 /* 18F18 8003DB18 3C0140C9 */ lui $at, 0x40c9 /* 18F1C 8003DB1C 34210FD0 */ ori $at, $at, 0xfd0 /* 18F20 8003DB20 44811000 */ mtc1 $at, $f2 -/* 18F24 8003DB24 00000000 */ nop +/* 18F24 8003DB24 00000000 */ nop /* 18F28 8003DB28 46020502 */ mul.s $f20, $f0, $f2 -/* 18F2C 8003DB2C 00000000 */ nop +/* 18F2C 8003DB2C 00000000 */ nop /* 18F30 8003DB30 3C0143B4 */ lui $at, 0x43b4 /* 18F34 8003DB34 44810000 */ mtc1 $at, $f0 -/* 18F38 8003DB38 00000000 */ nop +/* 18F38 8003DB38 00000000 */ nop /* 18F3C 8003DB3C 4600A503 */ div.s $f20, $f20, $f0 /* 18F40 8003DB40 0C00A85B */ jal sin_rad /* 18F44 8003DB44 4600A306 */ mov.s $f12, $f20 @@ -77,20 +77,20 @@ glabel func_8003DA38 /* 18F50 8003DB50 46000506 */ mov.s $f20, $f0 /* 18F54 8003DB54 860200A6 */ lh $v0, 0xa6($s0) /* 18F58 8003DB58 44821000 */ mtc1 $v0, $f2 -/* 18F5C 8003DB5C 00000000 */ nop +/* 18F5C 8003DB5C 00000000 */ nop /* 18F60 8003DB60 468010A0 */ cvt.s.w $f2, $f2 /* 18F64 8003DB64 46141502 */ mul.s $f20, $f2, $f20 -/* 18F68 8003DB68 00000000 */ nop +/* 18F68 8003DB68 00000000 */ nop /* 18F6C 8003DB6C 46001082 */ mul.s $f2, $f2, $f0 -/* 18F70 8003DB70 00000000 */ nop +/* 18F70 8003DB70 00000000 */ nop /* 18F74 8003DB74 3C01BECC */ lui $at, 0xbecc /* 18F78 8003DB78 3421CCCD */ ori $at, $at, 0xcccd /* 18F7C 8003DB7C 44810000 */ mtc1 $at, $f0 -/* 18F80 8003DB80 00000000 */ nop +/* 18F80 8003DB80 00000000 */ nop /* 18F84 8003DB84 4600A502 */ mul.s $f20, $f20, $f0 -/* 18F88 8003DB88 00000000 */ nop +/* 18F88 8003DB88 00000000 */ nop /* 18F8C 8003DB8C 46001082 */ mul.s $f2, $f2, $f0 -/* 18F90 8003DB90 00000000 */ nop +/* 18F90 8003DB90 00000000 */ nop /* 18F94 8003DB94 C6000038 */ lwc1 $f0, 0x38($s0) /* 18F98 8003DB98 46140600 */ add.s $f24, $f0, $f20 /* 18F9C 8003DB9C C6000040 */ lwc1 $f0, 0x40($s0) @@ -103,7 +103,7 @@ glabel func_8003DA38 /* 18FB8 8003DBB8 46002500 */ add.s $f20, $f4, $f0 /* 18FBC 8003DBBC 24040001 */ addiu $a0, $zero, 1 /* 18FC0 8003DBC0 44821000 */ mtc1 $v0, $f2 -/* 18FC4 8003DBC4 00000000 */ nop +/* 18FC4 8003DBC4 00000000 */ nop /* 18FC8 8003DBC8 468010A0 */ cvt.s.w $f2, $f2 /* 18FCC 8003DBCC C600000C */ lwc1 $f0, 0xc($s0) /* 18FD0 8003DBD0 3C108007 */ lui $s0, %hi(D_80077C20) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s index f650295ebe..36111c6f71 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003DC38.s @@ -20,7 +20,7 @@ glabel func_8003DC38 /* 19074 8003DC74 3C013DCC */ lui $at, 0x3dcc /* 19078 8003DC78 3421CCCD */ ori $at, $at, 0xcccd /* 1907C 8003DC7C 44811000 */ mtc1 $at, $f2 -/* 19080 8003DC80 00000000 */ nop +/* 19080 8003DC80 00000000 */ nop /* 19084 8003DC84 46020000 */ add.s $f0, $f0, $f2 /* 19088 8003DC88 E4400000 */ swc1 $f0, ($v0) /* 1908C 8003DC8C 24020002 */ addiu $v0, $zero, 2 @@ -55,21 +55,21 @@ glabel func_8003DC38 /* 190FC 8003DCFC 2404000A */ addiu $a0, $zero, 0xa /* 19100 8003DD00 2442FFFB */ addiu $v0, $v0, -5 /* 19104 8003DD04 4482B000 */ mtc1 $v0, $f22 -/* 19108 8003DD08 00000000 */ nop +/* 19108 8003DD08 00000000 */ nop /* 1910C 8003DD0C 4680B5A0 */ cvt.s.w $f22, $f22 /* 19110 8003DD10 0C00A67F */ jal rand_int /* 19114 8003DD14 2404000A */ addiu $a0, $zero, 0xa /* 19118 8003DD18 4616B082 */ mul.s $f2, $f22, $f22 -/* 1911C 8003DD1C 00000000 */ nop +/* 1911C 8003DD1C 00000000 */ nop /* 19120 8003DD20 2442FFFB */ addiu $v0, $v0, -5 /* 19124 8003DD24 4482C000 */ mtc1 $v0, $f24 -/* 19128 8003DD28 00000000 */ nop +/* 19128 8003DD28 00000000 */ nop /* 1912C 8003DD2C 4680C620 */ cvt.s.w $f24, $f24 /* 19130 8003DD30 4618C102 */ mul.s $f4, $f24, $f24 -/* 19134 8003DD34 00000000 */ nop +/* 19134 8003DD34 00000000 */ nop /* 19138 8003DD38 C62C000C */ lwc1 $f12, 0xc($s1) /* 1913C 8003DD3C 44920000 */ mtc1 $s2, $f0 -/* 19140 8003DD40 00000000 */ nop +/* 19140 8003DD40 00000000 */ nop /* 19144 8003DD44 46800020 */ cvt.s.w $f0, $f0 /* 19148 8003DD48 46006307 */ neg.s $f12, $f12 /* 1914C 8003DD4C 46006300 */ add.s $f12, $f12, $f0 @@ -86,12 +86,12 @@ glabel func_8003DC38 /* 19178 8003DD78 3C0140C9 */ lui $at, 0x40c9 /* 1917C 8003DD7C 34210FD0 */ ori $at, $at, 0xfd0 /* 19180 8003DD80 44811000 */ mtc1 $at, $f2 -/* 19184 8003DD84 00000000 */ nop +/* 19184 8003DD84 00000000 */ nop /* 19188 8003DD88 46020002 */ mul.s $f0, $f0, $f2 -/* 1918C 8003DD8C 00000000 */ nop +/* 1918C 8003DD8C 00000000 */ nop /* 19190 8003DD90 3C0143B4 */ lui $at, 0x43b4 /* 19194 8003DD94 44811000 */ mtc1 $at, $f2 -/* 19198 8003DD98 00000000 */ nop +/* 19198 8003DD98 00000000 */ nop /* 1919C 8003DD9C 46020683 */ div.s $f26, $f0, $f2 /* 191A0 8003DDA0 0C00A85B */ jal sin_rad /* 191A4 8003DDA4 4600D306 */ mov.s $f12, $f26 @@ -100,25 +100,25 @@ glabel func_8003DC38 /* 191B0 8003DDB0 4600D306 */ mov.s $f12, $f26 /* 191B4 8003DDB4 862200A6 */ lh $v0, 0xa6($s1) /* 191B8 8003DDB8 44822000 */ mtc1 $v0, $f4 -/* 191BC 8003DDBC 00000000 */ nop +/* 191BC 8003DDBC 00000000 */ nop /* 191C0 8003DDC0 46802120 */ cvt.s.w $f4, $f4 /* 191C4 8003DDC4 461C2182 */ mul.s $f6, $f4, $f28 -/* 191C8 8003DDC8 00000000 */ nop +/* 191C8 8003DDC8 00000000 */ nop /* 191CC 8003DDCC 46002102 */ mul.s $f4, $f4, $f0 -/* 191D0 8003DDD0 00000000 */ nop +/* 191D0 8003DDD0 00000000 */ nop /* 191D4 8003DDD4 3C014178 */ lui $at, 0x4178 /* 191D8 8003DDD8 44811000 */ mtc1 $at, $f2 /* 191DC 8003DDDC C620003C */ lwc1 $f0, 0x3c($s1) /* 191E0 8003DDE0 46020000 */ add.s $f0, $f0, $f2 /* 191E4 8003DDE4 46140000 */ add.s $f0, $f0, $f20 /* 191E8 8003DDE8 461E3182 */ mul.s $f6, $f6, $f30 -/* 191EC 8003DDEC 00000000 */ nop +/* 191EC 8003DDEC 00000000 */ nop /* 191F0 8003DDF0 44060000 */ mfc1 $a2, $f0 /* 191F4 8003DDF4 C6200038 */ lwc1 $f0, 0x38($s1) /* 191F8 8003DDF8 46060000 */ add.s $f0, $f0, $f6 /* 191FC 8003DDFC 46160000 */ add.s $f0, $f0, $f22 /* 19200 8003DE00 461E2102 */ mul.s $f4, $f4, $f30 -/* 19204 8003DE04 00000000 */ nop +/* 19204 8003DE04 00000000 */ nop /* 19208 8003DE08 44050000 */ mfc1 $a1, $f0 /* 1920C 8003DE0C C6200040 */ lwc1 $f0, 0x40($s1) /* 19210 8003DE10 46040000 */ add.s $f0, $f0, $f4 @@ -130,26 +130,26 @@ glabel func_8003DC38 /* 19228 8003DE28 24040001 */ addiu $a0, $zero, 1 /* 1922C 8003DE2C 2A620004 */ slti $v0, $s3, 4 /* 19230 8003DE30 1040004E */ beqz $v0, .L8003DF6C -/* 19234 8003DE34 00000000 */ nop +/* 19234 8003DE34 00000000 */ nop /* 19238 8003DE38 0800F73E */ j .L8003DCF8 -/* 1923C 8003DE3C 00000000 */ nop +/* 1923C 8003DE3C 00000000 */ nop .L8003DE40: /* 19240 8003DE40 0C00A67F */ jal rand_int /* 19244 8003DE44 2404000A */ addiu $a0, $zero, 0xa /* 19248 8003DE48 2442FFFB */ addiu $v0, $v0, -5 /* 1924C 8003DE4C 4482C000 */ mtc1 $v0, $f24 -/* 19250 8003DE50 00000000 */ nop +/* 19250 8003DE50 00000000 */ nop /* 19254 8003DE54 4680C620 */ cvt.s.w $f24, $f24 /* 19258 8003DE58 0C00A67F */ jal rand_int /* 1925C 8003DE5C 2404000A */ addiu $a0, $zero, 0xa /* 19260 8003DE60 4618C002 */ mul.s $f0, $f24, $f24 -/* 19264 8003DE64 00000000 */ nop +/* 19264 8003DE64 00000000 */ nop /* 19268 8003DE68 2442FFFB */ addiu $v0, $v0, -5 /* 1926C 8003DE6C 4482B000 */ mtc1 $v0, $f22 -/* 19270 8003DE70 00000000 */ nop +/* 19270 8003DE70 00000000 */ nop /* 19274 8003DE74 4680B5A0 */ cvt.s.w $f22, $f22 /* 19278 8003DE78 4616B082 */ mul.s $f2, $f22, $f22 -/* 1927C 8003DE7C 00000000 */ nop +/* 1927C 8003DE7C 00000000 */ nop /* 19280 8003DE80 C62C000C */ lwc1 $f12, 0xc($s1) /* 19284 8003DE84 3C01C000 */ lui $at, 0xc000 /* 19288 8003DE88 4481A000 */ mtc1 $at, $f20 @@ -165,12 +165,12 @@ glabel func_8003DC38 /* 192B0 8003DEB0 3C0140C9 */ lui $at, 0x40c9 /* 192B4 8003DEB4 34210FD0 */ ori $at, $at, 0xfd0 /* 192B8 8003DEB8 44811000 */ mtc1 $at, $f2 -/* 192BC 8003DEBC 00000000 */ nop +/* 192BC 8003DEBC 00000000 */ nop /* 192C0 8003DEC0 46020002 */ mul.s $f0, $f0, $f2 -/* 192C4 8003DEC4 00000000 */ nop +/* 192C4 8003DEC4 00000000 */ nop /* 192C8 8003DEC8 3C0143B4 */ lui $at, 0x43b4 /* 192CC 8003DECC 44811000 */ mtc1 $at, $f2 -/* 192D0 8003DED0 00000000 */ nop +/* 192D0 8003DED0 00000000 */ nop /* 192D4 8003DED4 46020683 */ div.s $f26, $f0, $f2 /* 192D8 8003DED8 0C00A85B */ jal sin_rad /* 192DC 8003DEDC 4600D306 */ mov.s $f12, $f26 @@ -179,20 +179,20 @@ glabel func_8003DC38 /* 192E8 8003DEE8 4600D306 */ mov.s $f12, $f26 /* 192EC 8003DEEC 862200A6 */ lh $v0, 0xa6($s1) /* 192F0 8003DEF0 44822000 */ mtc1 $v0, $f4 -/* 192F4 8003DEF4 00000000 */ nop +/* 192F4 8003DEF4 00000000 */ nop /* 192F8 8003DEF8 46802120 */ cvt.s.w $f4, $f4 /* 192FC 8003DEFC 461C2182 */ mul.s $f6, $f4, $f28 -/* 19300 8003DF00 00000000 */ nop +/* 19300 8003DF00 00000000 */ nop /* 19304 8003DF04 46002102 */ mul.s $f4, $f4, $f0 -/* 19308 8003DF08 00000000 */ nop +/* 19308 8003DF08 00000000 */ nop /* 1930C 8003DF0C 3C01BE99 */ lui $at, 0xbe99 /* 19310 8003DF10 3421999A */ ori $at, $at, 0x999a /* 19314 8003DF14 44810000 */ mtc1 $at, $f0 -/* 19318 8003DF18 00000000 */ nop +/* 19318 8003DF18 00000000 */ nop /* 1931C 8003DF1C 46003182 */ mul.s $f6, $f6, $f0 -/* 19320 8003DF20 00000000 */ nop +/* 19320 8003DF20 00000000 */ nop /* 19324 8003DF24 46002102 */ mul.s $f4, $f4, $f0 -/* 19328 8003DF28 00000000 */ nop +/* 19328 8003DF28 00000000 */ nop /* 1932C 8003DF2C 3C014178 */ lui $at, 0x4178 /* 19330 8003DF30 44811000 */ mtc1 $at, $f2 /* 19334 8003DF34 C620003C */ lwc1 $f0, 0x3c($s1) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s b/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s index 3a21a5df0a..c89e1b692b 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003DFA0.s @@ -24,12 +24,12 @@ glabel func_8003DFA0 /* 193EC 8003DFEC 3C0140C9 */ lui $at, 0x40c9 /* 193F0 8003DFF0 34210FD0 */ ori $at, $at, 0xfd0 /* 193F4 8003DFF4 44811000 */ mtc1 $at, $f2 -/* 193F8 8003DFF8 00000000 */ nop +/* 193F8 8003DFF8 00000000 */ nop /* 193FC 8003DFFC 46020502 */ mul.s $f20, $f0, $f2 -/* 19400 8003E000 00000000 */ nop +/* 19400 8003E000 00000000 */ nop /* 19404 8003E004 3C0143B4 */ lui $at, 0x43b4 /* 19408 8003E008 44810000 */ mtc1 $at, $f0 -/* 1940C 8003E00C 00000000 */ nop +/* 1940C 8003E00C 00000000 */ nop /* 19410 8003E010 4600A503 */ div.s $f20, $f20, $f0 /* 19414 8003E014 0C00A85B */ jal sin_rad /* 19418 8003E018 4600A306 */ mov.s $f12, $f20 @@ -38,20 +38,20 @@ glabel func_8003DFA0 /* 19424 8003E024 46000506 */ mov.s $f20, $f0 /* 19428 8003E028 862200A6 */ lh $v0, 0xa6($s1) /* 1942C 8003E02C 44821000 */ mtc1 $v0, $f2 -/* 19430 8003E030 00000000 */ nop +/* 19430 8003E030 00000000 */ nop /* 19434 8003E034 468010A0 */ cvt.s.w $f2, $f2 /* 19438 8003E038 46141502 */ mul.s $f20, $f2, $f20 -/* 1943C 8003E03C 00000000 */ nop +/* 1943C 8003E03C 00000000 */ nop /* 19440 8003E040 46001082 */ mul.s $f2, $f2, $f0 -/* 19444 8003E044 00000000 */ nop +/* 19444 8003E044 00000000 */ nop /* 19448 8003E048 3C013E4C */ lui $at, 0x3e4c /* 1944C 8003E04C 3421CCCD */ ori $at, $at, 0xcccd /* 19450 8003E050 44810000 */ mtc1 $at, $f0 -/* 19454 8003E054 00000000 */ nop +/* 19454 8003E054 00000000 */ nop /* 19458 8003E058 4600A502 */ mul.s $f20, $f20, $f0 -/* 1945C 8003E05C 00000000 */ nop +/* 1945C 8003E05C 00000000 */ nop /* 19460 8003E060 46001082 */ mul.s $f2, $f2, $f0 -/* 19464 8003E064 00000000 */ nop +/* 19464 8003E064 00000000 */ nop /* 19468 8003E068 3C013FC0 */ lui $at, 0x3fc0 /* 1946C 8003E06C 44817000 */ mtc1 $at, $f14 /* 19470 8003E070 C620003C */ lwc1 $f0, 0x3c($s1) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s b/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s index 2b98e0e66c..1a559739ea 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E0D4.s @@ -23,12 +23,12 @@ glabel func_8003E0D4 /* 1951C 8003E11C 3C0140C9 */ lui $at, 0x40c9 /* 19520 8003E120 34210FD0 */ ori $at, $at, 0xfd0 /* 19524 8003E124 44811000 */ mtc1 $at, $f2 -/* 19528 8003E128 00000000 */ nop +/* 19528 8003E128 00000000 */ nop /* 1952C 8003E12C 46020502 */ mul.s $f20, $f0, $f2 -/* 19530 8003E130 00000000 */ nop +/* 19530 8003E130 00000000 */ nop /* 19534 8003E134 3C0143B4 */ lui $at, 0x43b4 /* 19538 8003E138 44810000 */ mtc1 $at, $f0 -/* 1953C 8003E13C 00000000 */ nop +/* 1953C 8003E13C 00000000 */ nop /* 19540 8003E140 4600A503 */ div.s $f20, $f20, $f0 /* 19544 8003E144 0C00A85B */ jal sin_rad /* 19548 8003E148 4600A306 */ mov.s $f12, $f20 @@ -37,20 +37,20 @@ glabel func_8003E0D4 /* 19554 8003E154 46000506 */ mov.s $f20, $f0 /* 19558 8003E158 860200A6 */ lh $v0, 0xa6($s0) /* 1955C 8003E15C 44821000 */ mtc1 $v0, $f2 -/* 19560 8003E160 00000000 */ nop +/* 19560 8003E160 00000000 */ nop /* 19564 8003E164 468010A0 */ cvt.s.w $f2, $f2 /* 19568 8003E168 46141502 */ mul.s $f20, $f2, $f20 -/* 1956C 8003E16C 00000000 */ nop +/* 1956C 8003E16C 00000000 */ nop /* 19570 8003E170 46001082 */ mul.s $f2, $f2, $f0 -/* 19574 8003E174 00000000 */ nop +/* 19574 8003E174 00000000 */ nop /* 19578 8003E178 3C013E4C */ lui $at, 0x3e4c /* 1957C 8003E17C 3421CCCD */ ori $at, $at, 0xcccd /* 19580 8003E180 44810000 */ mtc1 $at, $f0 -/* 19584 8003E184 00000000 */ nop +/* 19584 8003E184 00000000 */ nop /* 19588 8003E188 4600A502 */ mul.s $f20, $f20, $f0 -/* 1958C 8003E18C 00000000 */ nop +/* 1958C 8003E18C 00000000 */ nop /* 19590 8003E190 46001082 */ mul.s $f2, $f2, $f0 -/* 19594 8003E194 00000000 */ nop +/* 19594 8003E194 00000000 */ nop /* 19598 8003E198 C6000038 */ lwc1 $f0, 0x38($s0) /* 1959C 8003E19C 46140000 */ add.s $f0, $f0, $f20 /* 195A0 8003E1A0 44050000 */ mfc1 $a1, $f0 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s b/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s index 612b80855b..f2689d2e1a 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E1D0.s @@ -23,12 +23,12 @@ glabel func_8003E1D0 /* 19618 8003E218 3C0140C9 */ lui $at, 0x40c9 /* 1961C 8003E21C 34210FD0 */ ori $at, $at, 0xfd0 /* 19620 8003E220 44811000 */ mtc1 $at, $f2 -/* 19624 8003E224 00000000 */ nop +/* 19624 8003E224 00000000 */ nop /* 19628 8003E228 46020502 */ mul.s $f20, $f0, $f2 -/* 1962C 8003E22C 00000000 */ nop +/* 1962C 8003E22C 00000000 */ nop /* 19630 8003E230 3C0143B4 */ lui $at, 0x43b4 /* 19634 8003E234 44810000 */ mtc1 $at, $f0 -/* 19638 8003E238 00000000 */ nop +/* 19638 8003E238 00000000 */ nop /* 1963C 8003E23C 4600A503 */ div.s $f20, $f20, $f0 /* 19640 8003E240 0C00A85B */ jal sin_rad /* 19644 8003E244 4600A306 */ mov.s $f12, $f20 @@ -37,25 +37,25 @@ glabel func_8003E1D0 /* 19650 8003E250 46000506 */ mov.s $f20, $f0 /* 19654 8003E254 860200A6 */ lh $v0, 0xa6($s0) /* 19658 8003E258 44821000 */ mtc1 $v0, $f2 -/* 1965C 8003E25C 00000000 */ nop +/* 1965C 8003E25C 00000000 */ nop /* 19660 8003E260 468010A0 */ cvt.s.w $f2, $f2 /* 19664 8003E264 46141502 */ mul.s $f20, $f2, $f20 -/* 19668 8003E268 00000000 */ nop +/* 19668 8003E268 00000000 */ nop /* 1966C 8003E26C 46001082 */ mul.s $f2, $f2, $f0 -/* 19670 8003E270 00000000 */ nop +/* 19670 8003E270 00000000 */ nop /* 19674 8003E274 3C013E4C */ lui $at, 0x3e4c /* 19678 8003E278 3421CCCD */ ori $at, $at, 0xcccd /* 1967C 8003E27C 44810000 */ mtc1 $at, $f0 -/* 19680 8003E280 00000000 */ nop +/* 19680 8003E280 00000000 */ nop /* 19684 8003E284 4600A502 */ mul.s $f20, $f20, $f0 -/* 19688 8003E288 00000000 */ nop +/* 19688 8003E288 00000000 */ nop /* 1968C 8003E28C 46001082 */ mul.s $f2, $f2, $f0 -/* 19690 8003E290 00000000 */ nop +/* 19690 8003E290 00000000 */ nop /* 19694 8003E294 C6000038 */ lwc1 $f0, 0x38($s0) /* 19698 8003E298 C606003C */ lwc1 $f6, 0x3c($s0) /* 1969C 8003E29C 46140000 */ add.s $f0, $f0, $f20 /* 196A0 8003E2A0 44802000 */ mtc1 $zero, $f4 -/* 196A4 8003E2A4 00000000 */ nop +/* 196A4 8003E2A4 00000000 */ nop /* 196A8 8003E2A8 46043180 */ add.s $f6, $f6, $f4 /* 196AC 8003E2AC 44050000 */ mfc1 $a1, $f0 /* 196B0 8003E2B0 C6000040 */ lwc1 $f0, 0x40($s0) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E338.s b/asm/nonmatchings/code_13870_len_6980/func_8003E338.s index 4ab015c052..e7b7450bb9 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E338.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E338.s @@ -46,7 +46,7 @@ glabel func_8003E338 /* 197CC 8003E3CC 04A1FFFD */ bgez $a1, .L8003E3C4 /* 197D0 8003E3D0 2442FFFE */ addiu $v0, $v0, -2 /* 197D4 8003E3D4 0C0116B0 */ jal func_80045AC0 -/* 197D8 8003E3D8 00000000 */ nop +/* 197D8 8003E3D8 00000000 */ nop /* 197DC 8003E3DC 3C058004 */ lui $a1, %hi(func_8003E670) /* 197E0 8003E3E0 24A5E670 */ addiu $a1, $a1, %lo(func_8003E670) /* 197E4 8003E3E4 3C01800A */ lui $at, %hi(gGameState) diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E514.s b/asm/nonmatchings/code_13870_len_6980/func_8003E514.s index 7749f68b28..10dab7f8e4 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E514.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E514.s @@ -5,4 +5,4 @@ glabel func_8003E514 /* 19914 8003E514 3C01800B */ lui $at, %hi(gCurrentEncounter+0x8) /* 19918 8003E518 A0240F18 */ sb $a0, %lo(gCurrentEncounter+0x8)($at) /* 1991C 8003E51C 03E00008 */ jr $ra -/* 19920 8003E520 00000000 */ nop +/* 19920 8003E520 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E524.s b/asm/nonmatchings/code_13870_len_6980/func_8003E524.s index b811c695f2..a1fe14b5e6 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E524.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E524.s @@ -13,28 +13,28 @@ glabel func_8003E524 /* 19944 8003E544 00220821 */ addu $at, $at, $v0 /* 19948 8003E548 8C2285C0 */ lw $v0, %lo(D_800985C0)($at) /* 1994C 8003E54C 00400008 */ jr $v0 -/* 19950 8003E550 00000000 */ nop +/* 19950 8003E550 00000000 */ nop /* 19954 8003E554 0C010DAC */ jal create_npcs -/* 19958 8003E558 00000000 */ nop +/* 19958 8003E558 00000000 */ nop /* 1995C 8003E55C 0800F967 */ j .L8003E59C -/* 19960 8003E560 00000000 */ nop +/* 19960 8003E560 00000000 */ nop /* 19964 8003E564 0C00FDF3 */ jal func_8003F7CC -/* 19968 8003E568 00000000 */ nop +/* 19968 8003E568 00000000 */ nop /* 1996C 8003E56C 0800F967 */ j .L8003E59C -/* 19970 8003E570 00000000 */ nop +/* 19970 8003E570 00000000 */ nop /* 19974 8003E574 0C0104D9 */ jal func_80041364 -/* 19978 8003E578 00000000 */ nop +/* 19978 8003E578 00000000 */ nop /* 1997C 8003E57C 0800F967 */ j .L8003E59C -/* 19980 8003E580 00000000 */ nop +/* 19980 8003E580 00000000 */ nop /* 19984 8003E584 0C010C27 */ jal func_8004309C -/* 19988 8003E588 00000000 */ nop +/* 19988 8003E588 00000000 */ nop /* 1998C 8003E58C 0800F967 */ j .L8003E59C -/* 19990 8003E590 00000000 */ nop +/* 19990 8003E590 00000000 */ nop /* 19994 8003E594 0C0107C4 */ jal func_80041F10 -/* 19998 8003E598 00000000 */ nop +/* 19998 8003E598 00000000 */ nop .L8003E59C: /* 1999C 8003E59C 0C0116DA */ jal func_80045B68 -/* 199A0 8003E5A0 00000000 */ nop +/* 199A0 8003E5A0 00000000 */ nop /* 199A4 8003E5A4 8FBF0010 */ lw $ra, 0x10($sp) /* 199A8 8003E5A8 03E00008 */ jr $ra /* 199AC 8003E5AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s b/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s index c34af3c6e2..5f578c2194 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E5B0.s @@ -13,28 +13,28 @@ glabel func_8003E5B0 /* 199D0 8003E5D0 00220821 */ addu $at, $at, $v0 /* 199D4 8003E5D4 8C2285D8 */ lw $v0, %lo(D_800985D8)($at) /* 199D8 8003E5D8 00400008 */ jr $v0 -/* 199DC 8003E5DC 00000000 */ nop +/* 199DC 8003E5DC 00000000 */ nop /* 199E0 8003E5E0 0C011050 */ jal func_80044140 -/* 199E4 8003E5E4 00000000 */ nop +/* 199E4 8003E5E4 00000000 */ nop /* 199E8 8003E5E8 0800F98A */ j .L8003E628 -/* 199EC 8003E5EC 00000000 */ nop +/* 199EC 8003E5EC 00000000 */ nop /* 199F0 8003E5F0 0C0104D7 */ jal func_8004135C -/* 199F4 8003E5F4 00000000 */ nop +/* 199F4 8003E5F4 00000000 */ nop /* 199F8 8003E5F8 0800F98A */ j .L8003E628 -/* 199FC 8003E5FC 00000000 */ nop +/* 199FC 8003E5FC 00000000 */ nop /* 19A00 8003E600 0C010659 */ jal func_80041964 -/* 19A04 8003E604 00000000 */ nop +/* 19A04 8003E604 00000000 */ nop /* 19A08 8003E608 0800F98A */ j .L8003E628 -/* 19A0C 8003E60C 00000000 */ nop +/* 19A0C 8003E60C 00000000 */ nop /* 19A10 8003E610 0C010C75 */ jal func_800431D4 -/* 19A14 8003E614 00000000 */ nop +/* 19A14 8003E614 00000000 */ nop /* 19A18 8003E618 0800F98A */ j .L8003E628 -/* 19A1C 8003E61C 00000000 */ nop +/* 19A1C 8003E61C 00000000 */ nop /* 19A20 8003E620 0C010C13 */ jal func_8004304C -/* 19A24 8003E624 00000000 */ nop +/* 19A24 8003E624 00000000 */ nop .L8003E628: /* 19A28 8003E628 0C01170A */ jal func_80045C28 -/* 19A2C 8003E62C 00000000 */ nop +/* 19A2C 8003E62C 00000000 */ nop /* 19A30 8003E630 8FBF0010 */ lw $ra, 0x10($sp) /* 19A34 8003E634 03E00008 */ jr $ra /* 19A38 8003E638 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s b/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s index 00e17d3eb7..208a8ef977 100644 --- a/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s +++ b/asm/nonmatchings/code_13870_len_6980/func_8003E63C.s @@ -9,9 +9,9 @@ glabel func_8003E63C /* 19A4C 8003E64C AFBF0010 */ sw $ra, 0x10($sp) /* 19A50 8003E650 24020003 */ addiu $v0, $zero, 3 /* 19A54 8003E654 14620003 */ bne $v1, $v0, .L8003E664 -/* 19A58 8003E658 00000000 */ nop +/* 19A58 8003E658 00000000 */ nop /* 19A5C 8003E65C 0C010717 */ jal show_first_strike_message -/* 19A60 8003E660 00000000 */ nop +/* 19A60 8003E660 00000000 */ nop .L8003E664: /* 19A64 8003E664 8FBF0010 */ lw $ra, 0x10($sp) /* 19A68 8003E668 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_13870_len_6980/get_enemy.s b/asm/nonmatchings/code_13870_len_6980/get_enemy.s index 73d81973f3..866f25030c 100644 --- a/asm/nonmatchings/code_13870_len_6980/get_enemy.s +++ b/asm/nonmatchings/code_13870_len_6980/get_enemy.s @@ -24,7 +24,7 @@ glabel get_enemy /* 1A12C 8003ED2C 24C60001 */ addiu $a2, $a2, 1 /* 1A130 8003ED30 84620008 */ lh $v0, 8($v1) /* 1A134 8003ED34 1044000A */ beq $v0, $a0, .L8003ED60 -/* 1A138 8003ED38 00000000 */ nop +/* 1A138 8003ED38 00000000 */ nop .L8003ED3C: /* 1A13C 8003ED3C 00C8102A */ slt $v0, $a2, $t0 /* 1A140 8003ED40 1440FFF8 */ bnez $v0, .L8003ED24 @@ -37,7 +37,7 @@ glabel get_enemy /* 1A154 8003ED54 25290004 */ addiu $t1, $t1, 4 .L8003ED58: /* 1A158 8003ED58 0800FB56 */ j .L8003ED58 -/* 1A15C 8003ED5C 00000000 */ nop +/* 1A15C 8003ED5C 00000000 */ nop .L8003ED60: /* 1A160 8003ED60 03E00008 */ jr $ra /* 1A164 8003ED64 0060102D */ daddu $v0, $v1, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s b/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s index 6fb2ecf985..dd9998eeee 100644 --- a/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s +++ b/asm/nonmatchings/code_13870_len_6980/get_enemy_safe.s @@ -41,5 +41,5 @@ glabel get_enemy_safe .L8003EDE0: /* 1A1E0 8003EDE0 03E00008 */ jr $ra /* 1A1E4 8003EDE4 0000102D */ daddu $v0, $zero, $zero -/* 1A1E8 8003EDE8 00000000 */ nop -/* 1A1EC 8003EDEC 00000000 */ nop +/* 1A1E8 8003EDE8 00000000 */ nop +/* 1A1EC 8003EDEC 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s b/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s index c8d82a13b7..7e9d97e72d 100644 --- a/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s +++ b/asm/nonmatchings/code_13870_len_6980/get_npc_safe.s @@ -27,4 +27,4 @@ glabel get_npc_safe /* 15F94 8003AB94 00A0102D */ daddu $v0, $a1, $zero .L8003AB98: /* 15F98 8003AB98 03E00008 */ jr $ra -/* 15F9C 8003AB9C 00000000 */ nop +/* 15F9C 8003AB9C 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s b/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s index 5f32619ee4..cf24742887 100644 --- a/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s +++ b/asm/nonmatchings/code_13870_len_6980/get_npc_unsafe.s @@ -23,10 +23,10 @@ glabel get_npc_unsafe /* 15F2C 8003AB2C 28A20040 */ slti $v0, $a1, 0x40 .L8003AB30: /* 15F30 8003AB30 14400003 */ bnez $v0, .L8003AB40 -/* 15F34 8003AB34 00000000 */ nop +/* 15F34 8003AB34 00000000 */ nop .L8003AB38: /* 15F38 8003AB38 0800EACE */ j .L8003AB38 -/* 15F3C 8003AB3C 00000000 */ nop +/* 15F3C 8003AB3C 00000000 */ nop .L8003AB40: /* 15F40 8003AB40 03E00008 */ jr $ra /* 15F44 8003AB44 0060102D */ daddu $v0, $v1, $zero diff --git a/asm/nonmatchings/code_13870_len_6980/init_npc_list.s b/asm/nonmatchings/code_13870_len_6980/init_npc_list.s index 2c44afcab1..ac4179496f 100644 --- a/asm/nonmatchings/code_13870_len_6980/init_npc_list.s +++ b/asm/nonmatchings/code_13870_len_6980/init_npc_list.s @@ -6,11 +6,11 @@ glabel init_npc_list /* 13930 80038530 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 13934 80038534 80420070 */ lb $v0, 0x70($v0) /* 13938 80038538 14400005 */ bnez $v0, .L80038550 -/* 1393C 8003853C 00000000 */ nop +/* 1393C 8003853C 00000000 */ nop /* 13940 80038540 3C02800A */ lui $v0, %hi(gWorldNpcList) /* 13944 80038544 24420990 */ addiu $v0, $v0, %lo(gWorldNpcList) /* 13948 80038548 0800E156 */ j .L80038558 -/* 1394C 8003854C 00000000 */ nop +/* 1394C 8003854C 00000000 */ nop .L80038550: /* 13950 80038550 3C02800A */ lui $v0, %hi(gBattleNpcList) /* 13954 80038554 24420A90 */ addiu $v0, $v0, %lo(gBattleNpcList) @@ -23,4 +23,4 @@ glabel init_npc_list /* 1396C 8003856C 3C01800A */ lui $at, %hi(D_800A0B94) /* 13970 80038570 A0220B94 */ sb $v0, %lo(D_800A0B94)($at) /* 13974 80038574 03E00008 */ jr $ra -/* 13978 80038578 00000000 */ nop +/* 13978 80038578 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/kill_encounter.s b/asm/nonmatchings/code_13870_len_6980/kill_encounter.s index 8c3fed029e..e77c713b0b 100644 --- a/asm/nonmatchings/code_13870_len_6980/kill_encounter.s +++ b/asm/nonmatchings/code_13870_len_6980/kill_encounter.s @@ -19,9 +19,9 @@ glabel kill_encounter .L8003E768: /* 19B68 8003E768 8E040004 */ lw $a0, 4($s0) /* 19B6C 8003E76C 10800004 */ beqz $a0, .L8003E780 -/* 19B70 8003E770 00000000 */ nop +/* 19B70 8003E770 00000000 */ nop /* 19B74 8003E774 0C00F9EB */ jal kill_enemy -/* 19B78 8003E778 00000000 */ nop +/* 19B78 8003E778 00000000 */ nop /* 19B7C 8003E77C AE000004 */ sw $zero, 4($s0) .L8003E780: /* 19B80 8003E780 8E420000 */ lw $v0, ($s2) diff --git a/asm/nonmatchings/code_13870_len_6980/kill_enemy.s b/asm/nonmatchings/code_13870_len_6980/kill_enemy.s index f735ff9372..f9f40f9e78 100644 --- a/asm/nonmatchings/code_13870_len_6980/kill_enemy.s +++ b/asm/nonmatchings/code_13870_len_6980/kill_enemy.s @@ -23,7 +23,7 @@ glabel kill_enemy .L8003E7F4: /* 19BF4 8003E7F4 8C620004 */ lw $v0, 4($v1) /* 19BF8 8003E7F8 10500005 */ beq $v0, $s0, .L8003E810 -/* 19BFC 8003E7FC 00000000 */ nop +/* 19BFC 8003E7FC 00000000 */ nop /* 19C00 8003E800 26310001 */ addiu $s1, $s1, 1 /* 19C04 8003E804 0224102A */ slt $v0, $s1, $a0 /* 19C08 8003E808 1440FFFA */ bnez $v0, .L8003E7F4 @@ -31,37 +31,37 @@ glabel kill_enemy .L8003E810: /* 19C10 8003E810 8E020034 */ lw $v0, 0x34($s0) /* 19C14 8003E814 10400003 */ beqz $v0, .L8003E824 -/* 19C18 8003E818 00000000 */ nop +/* 19C18 8003E818 00000000 */ nop /* 19C1C 8003E81C 0C0B102B */ jal kill_script_by_ID /* 19C20 8003E820 8E04004C */ lw $a0, 0x4c($s0) .L8003E824: /* 19C24 8003E824 8E020038 */ lw $v0, 0x38($s0) /* 19C28 8003E828 10400003 */ beqz $v0, .L8003E838 -/* 19C2C 8003E82C 00000000 */ nop +/* 19C2C 8003E82C 00000000 */ nop /* 19C30 8003E830 0C0B102B */ jal kill_script_by_ID /* 19C34 8003E834 8E040050 */ lw $a0, 0x50($s0) .L8003E838: /* 19C38 8003E838 8E02003C */ lw $v0, 0x3c($s0) /* 19C3C 8003E83C 10400003 */ beqz $v0, .L8003E84C -/* 19C40 8003E840 00000000 */ nop +/* 19C40 8003E840 00000000 */ nop /* 19C44 8003E844 0C0B102B */ jal kill_script_by_ID /* 19C48 8003E848 8E040054 */ lw $a0, 0x54($s0) .L8003E84C: /* 19C4C 8003E84C 8E020040 */ lw $v0, 0x40($s0) /* 19C50 8003E850 10400003 */ beqz $v0, .L8003E860 -/* 19C54 8003E854 00000000 */ nop +/* 19C54 8003E854 00000000 */ nop /* 19C58 8003E858 0C0B102B */ jal kill_script_by_ID /* 19C5C 8003E85C 8E040058 */ lw $a0, 0x58($s0) .L8003E860: /* 19C60 8003E860 8E020044 */ lw $v0, 0x44($s0) /* 19C64 8003E864 10400003 */ beqz $v0, .L8003E874 -/* 19C68 8003E868 00000000 */ nop +/* 19C68 8003E868 00000000 */ nop /* 19C6C 8003E86C 0C0B102B */ jal kill_script_by_ID /* 19C70 8003E870 8E04005C */ lw $a0, 0x5c($s0) .L8003E874: /* 19C74 8003E874 8E020048 */ lw $v0, 0x48($s0) /* 19C78 8003E878 10400003 */ beqz $v0, .L8003E888 -/* 19C7C 8003E87C 00000000 */ nop +/* 19C7C 8003E87C 00000000 */ nop /* 19C80 8003E880 0C0B102B */ jal kill_script_by_ID /* 19C84 8003E884 8E040060 */ lw $a0, 0x60($s0) .L8003E888: @@ -78,7 +78,7 @@ glabel kill_enemy /* 19CB0 8003E8B0 50800004 */ beql $a0, $zero, .L8003E8C4 /* 19CB4 8003E8B4 0000202D */ daddu $a0, $zero, $zero /* 19CB8 8003E8B8 0C00AB4B */ jal heap_free -/* 19CBC 8003E8BC 00000000 */ nop +/* 19CBC 8003E8BC 00000000 */ nop /* 19CC0 8003E8C0 0000202D */ daddu $a0, $zero, $zero .L8003E8C4: /* 19CC4 8003E8C4 0260182D */ daddu $v1, $s3, $zero @@ -104,7 +104,7 @@ glabel kill_enemy /* 19D08 8003E908 14400007 */ bnez $v0, .L8003E928 /* 19D0C 8003E90C 30620010 */ andi $v0, $v1, 0x10 /* 19D10 8003E910 14400005 */ bnez $v0, .L8003E928 -/* 19D14 8003E914 00000000 */ nop +/* 19D14 8003E914 00000000 */ nop /* 19D18 8003E918 86650048 */ lh $a1, 0x48($s3) /* 19D1C 8003E91C 82440020 */ lb $a0, 0x20($s2) /* 19D20 8003E920 0C00F8B8 */ jal COPY_set_defeated diff --git a/asm/nonmatchings/code_13870_len_6980/make_npcs.s b/asm/nonmatchings/code_13870_len_6980/make_npcs.s index c92eb4126a..f07841a9e2 100644 --- a/asm/nonmatchings/code_13870_len_6980/make_npcs.s +++ b/asm/nonmatchings/code_13870_len_6980/make_npcs.s @@ -11,7 +11,7 @@ glabel make_npcs /* 19A90 8003E690 AD060024 */ sw $a2, 0x24($t0) /* 19A94 8003E694 8442008A */ lh $v0, 0x8a($v0) /* 19A98 8003E698 1040001B */ beqz $v0, .L8003E708 -/* 19A9C 8003E69C 00000000 */ nop +/* 19A9C 8003E69C 00000000 */ nop /* 19AA0 8003E6A0 0000282D */ daddu $a1, $zero, $zero /* 19AA4 8003E6A4 00A0382D */ daddu $a3, $a1, $zero .L8003E6A8: @@ -32,7 +32,7 @@ glabel make_npcs /* 19ADC 8003E6DC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 19AE0 8003E6E0 8442008A */ lh $v0, 0x8a($v0) /* 19AE4 8003E6E4 10400008 */ beqz $v0, .L8003E708 -/* 19AE8 8003E6E8 00000000 */ nop +/* 19AE8 8003E6E8 00000000 */ nop /* 19AEC 8003E6EC 2403FFFF */ addiu $v1, $zero, -1 /* 19AF0 8003E6F0 24050001 */ addiu $a1, $zero, 1 /* 19AF4 8003E6F4 25020002 */ addiu $v0, $t0, 2 @@ -52,4 +52,4 @@ glabel make_npcs /* 19B24 8003E724 AC20A5D0 */ sw $zero, %lo(D_8009A5D0)($at) .L8003E728: /* 19B28 8003E728 03E00008 */ jr $ra -/* 19B2C 8003E72C 00000000 */ nop +/* 19B2C 8003E72C 00000000 */ nop diff --git a/asm/nonmatchings/code_13870_len_6980/npc_do_other_npc_collision.s b/asm/nonmatchings/code_13870_len_6980/npc_do_other_npc_collision.s index 67752b2d77..3a958d495b 100644 --- a/asm/nonmatchings/code_13870_len_6980/npc_do_other_npc_collision.s +++ b/asm/nonmatchings/code_13870_len_6980/npc_do_other_npc_collision.s @@ -32,10 +32,10 @@ glabel npc_do_other_npc_collision /* 14478 80039078 862200A6 */ lh $v0, 0xa6($s1) /* 1447C 8003907C C63C0040 */ lwc1 $f28, 0x40($s1) /* 14480 80039080 44820000 */ mtc1 $v0, $f0 -/* 14484 80039084 00000000 */ nop +/* 14484 80039084 00000000 */ nop /* 14488 80039088 46800020 */ cvt.s.w $f0, $f0 /* 1448C 8003908C 46020002 */ mul.s $f0, $f0, $f2 -/* 14490 80039090 00000000 */ nop +/* 14490 80039090 00000000 */ nop /* 14494 80039094 E7A00014 */ swc1 $f0, 0x14($sp) .L80039098: /* 14498 80039098 0C00E2B7 */ jal get_npc_by_index @@ -56,54 +56,54 @@ glabel npc_do_other_npc_collision /* 144D4 800390D4 860200A8 */ lh $v0, 0xa8($s0) /* 144D8 800390D8 C602003C */ lwc1 $f2, 0x3c($s0) /* 144DC 800390DC 44820000 */ mtc1 $v0, $f0 -/* 144E0 800390E0 00000000 */ nop +/* 144E0 800390E0 00000000 */ nop /* 144E4 800390E4 46800020 */ cvt.s.w $f0, $f0 /* 144E8 800390E8 46001000 */ add.s $f0, $f2, $f0 /* 144EC 800390EC C7A60010 */ lwc1 $f6, 0x10($sp) /* 144F0 800390F0 4606003C */ c.lt.s $f0, $f6 -/* 144F4 800390F4 00000000 */ nop +/* 144F4 800390F4 00000000 */ nop /* 144F8 800390F8 45030065 */ bc1tl .L80039290 /* 144FC 800390FC 26520001 */ addiu $s2, $s2, 1 /* 14500 80039100 862200A8 */ lh $v0, 0xa8($s1) /* 14504 80039104 44820000 */ mtc1 $v0, $f0 -/* 14508 80039108 00000000 */ nop +/* 14508 80039108 00000000 */ nop /* 1450C 8003910C 46800020 */ cvt.s.w $f0, $f0 /* 14510 80039110 46003000 */ add.s $f0, $f6, $f0 /* 14514 80039114 4602003C */ c.lt.s $f0, $f2 -/* 14518 80039118 00000000 */ nop +/* 14518 80039118 00000000 */ nop /* 1451C 8003911C 4503005C */ bc1tl .L80039290 /* 14520 80039120 26520001 */ addiu $s2, $s2, 1 /* 14524 80039124 C6140038 */ lwc1 $f20, 0x38($s0) /* 14528 80039128 461EA581 */ sub.s $f22, $f20, $f30 /* 1452C 8003912C 4616B082 */ mul.s $f2, $f22, $f22 -/* 14530 80039130 00000000 */ nop +/* 14530 80039130 00000000 */ nop /* 14534 80039134 C61A0040 */ lwc1 $f26, 0x40($s0) /* 14538 80039138 461CD101 */ sub.s $f4, $f26, $f28 /* 1453C 8003913C 46042002 */ mul.s $f0, $f4, $f4 -/* 14540 80039140 00000000 */ nop +/* 14540 80039140 00000000 */ nop /* 14544 80039144 860200A6 */ lh $v0, 0xa6($s0) /* 14548 80039148 46001300 */ add.s $f12, $f2, $f0 /* 1454C 8003914C 3C013F00 */ lui $at, 0x3f00 /* 14550 80039150 44811000 */ mtc1 $at, $f2 /* 14554 80039154 44820000 */ mtc1 $v0, $f0 -/* 14558 80039158 00000000 */ nop +/* 14558 80039158 00000000 */ nop /* 1455C 8003915C 46800020 */ cvt.s.w $f0, $f0 /* 14560 80039160 46020582 */ mul.s $f22, $f0, $f2 -/* 14564 80039164 00000000 */ nop +/* 14564 80039164 00000000 */ nop /* 14568 80039168 46006104 */ sqrt.s $f4, $f12 /* 1456C 8003916C 46042032 */ c.eq.s $f4, $f4 -/* 14570 80039170 00000000 */ nop +/* 14570 80039170 00000000 */ nop /* 14574 80039174 45010004 */ bc1t .L80039188 -/* 14578 80039178 00000000 */ nop +/* 14578 80039178 00000000 */ nop /* 1457C 8003917C 0C0187BC */ jal sqrtf -/* 14580 80039180 00000000 */ nop +/* 14580 80039180 00000000 */ nop /* 14584 80039184 46000106 */ mov.s $f4, $f0 .L80039188: /* 14588 80039188 C7A60014 */ lwc1 $f6, 0x14($sp) /* 1458C 8003918C 46163000 */ add.s $f0, $f6, $f22 /* 14590 80039190 46002606 */ mov.s $f24, $f4 /* 14594 80039194 4618003E */ c.le.s $f0, $f24 -/* 14598 80039198 00000000 */ nop +/* 14598 80039198 00000000 */ nop /* 1459C 8003919C 4503003C */ bc1tl .L80039290 /* 145A0 800391A0 26520001 */ addiu $s2, $s2, 1 /* 145A4 800391A4 8E220000 */ lw $v0, ($s1) @@ -125,7 +125,7 @@ glabel npc_do_other_npc_collision /* 145E0 800391E0 24030001 */ addiu $v1, $zero, 1 .L800391E4: /* 145E4 800391E4 10600025 */ beqz $v1, .L8003927C -/* 145E8 800391E8 00000000 */ nop +/* 145E8 800391E8 00000000 */ nop /* 145EC 800391EC 4600A306 */ mov.s $f12, $f20 /* 145F0 800391F0 4406F000 */ mfc1 $a2, $f30 /* 145F4 800391F4 4407E000 */ mfc1 $a3, $f28 @@ -134,9 +134,9 @@ glabel npc_do_other_npc_collision /* 14600 80039200 3C0140C9 */ lui $at, 0x40c9 /* 14604 80039204 34210FD0 */ ori $at, $at, 0xfd0 /* 14608 80039208 44811000 */ mtc1 $at, $f2 -/* 1460C 8003920C 00000000 */ nop +/* 1460C 8003920C 00000000 */ nop /* 14610 80039210 46020502 */ mul.s $f20, $f0, $f2 -/* 14614 80039214 00000000 */ nop +/* 14614 80039214 00000000 */ nop /* 14618 80039218 C7A60014 */ lwc1 $f6, 0x14($sp) /* 1461C 8003921C 46163000 */ add.s $f0, $f6, $f22 /* 14620 80039220 3C0143B4 */ lui $at, 0x43b4 @@ -146,20 +146,20 @@ glabel npc_do_other_npc_collision /* 14630 80039230 0C00A85B */ jal sin_rad /* 14634 80039234 4600A306 */ mov.s $f12, $f20 /* 14638 80039238 4600C582 */ mul.s $f22, $f24, $f0 -/* 1463C 8003923C 00000000 */ nop +/* 1463C 8003923C 00000000 */ nop /* 14640 80039240 0C00A874 */ jal cos_rad /* 14644 80039244 4600A306 */ mov.s $f12, $f20 /* 14648 80039248 4600C087 */ neg.s $f2, $f24 /* 1464C 8003924C 46001102 */ mul.s $f4, $f2, $f0 -/* 14650 80039250 00000000 */ nop +/* 14650 80039250 00000000 */ nop /* 14654 80039254 3C013DCC */ lui $at, 0x3dcc /* 14658 80039258 3421CCCD */ ori $at, $at, 0xcccd /* 1465C 8003925C 44813000 */ mtc1 $at, $f6 -/* 14660 80039260 00000000 */ nop +/* 14660 80039260 00000000 */ nop /* 14664 80039264 4606B002 */ mul.s $f0, $f22, $f6 -/* 14668 80039268 00000000 */ nop +/* 14668 80039268 00000000 */ nop /* 1466C 8003926C 46062082 */ mul.s $f2, $f4, $f6 -/* 14670 80039270 00000000 */ nop +/* 14670 80039270 00000000 */ nop /* 14674 80039274 4600F780 */ add.s $f30, $f30, $f0 /* 14678 80039278 4602E700 */ add.s $f28, $f28, $f2 .L8003927C: @@ -171,7 +171,7 @@ glabel npc_do_other_npc_collision .L80039290: /* 14690 80039290 2A420040 */ slti $v0, $s2, 0x40 /* 14694 80039294 1440FF80 */ bnez $v0, .L80039098 -/* 14698 80039298 00000000 */ nop +/* 14698 80039298 00000000 */ nop /* 1469C 8003929C E63E0038 */ swc1 $f30, 0x38($s1) /* 146A0 800392A0 E63C0040 */ swc1 $f28, 0x40($s1) .L800392A4: diff --git a/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s b/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s index 41070242be..3e91fe0826 100644 --- a/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s +++ b/asm/nonmatchings/code_13870_len_6980/npc_do_player_collision.s @@ -22,7 +22,7 @@ glabel npc_do_player_collision /* 1471C 8003931C 3C020400 */ lui $v0, 0x400 /* 14720 80039320 00621024 */ and $v0, $v1, $v0 /* 14724 80039324 10400003 */ beqz $v0, .L80039334 -/* 14728 80039328 00000000 */ nop +/* 14728 80039328 00000000 */ nop .L8003932C: /* 1472C 8003932C 0800E597 */ j .L8003965C /* 14730 80039330 0000102D */ daddu $v0, $zero, $zero @@ -34,21 +34,21 @@ glabel npc_do_player_collision /* 14744 80039344 860200B0 */ lh $v0, 0xb0($s0) /* 14748 80039348 C604002C */ lwc1 $f4, 0x2c($s0) /* 1474C 8003934C 44820000 */ mtc1 $v0, $f0 -/* 14750 80039350 00000000 */ nop +/* 14750 80039350 00000000 */ nop /* 14754 80039354 46800020 */ cvt.s.w $f0, $f0 /* 14758 80039358 46002000 */ add.s $f0, $f4, $f0 /* 1475C 8003935C C622003C */ lwc1 $f2, 0x3c($s1) /* 14760 80039360 4602003C */ c.lt.s $f0, $f2 -/* 14764 80039364 00000000 */ nop +/* 14764 80039364 00000000 */ nop /* 14768 80039368 450100BC */ bc1t .L8003965C /* 1476C 8003936C 0000102D */ daddu $v0, $zero, $zero /* 14770 80039370 862200A8 */ lh $v0, 0xa8($s1) /* 14774 80039374 44820000 */ mtc1 $v0, $f0 -/* 14778 80039378 00000000 */ nop +/* 14778 80039378 00000000 */ nop /* 1477C 8003937C 46800020 */ cvt.s.w $f0, $f0 /* 14780 80039380 46001000 */ add.s $f0, $f2, $f0 /* 14784 80039384 4604003C */ c.lt.s $f0, $f4 -/* 14788 80039388 00000000 */ nop +/* 14788 80039388 00000000 */ nop /* 1478C 8003938C 450100B3 */ bc1t .L8003965C /* 14790 80039390 0000102D */ daddu $v0, $zero, $zero /* 14794 80039394 C63A0038 */ lwc1 $f26, 0x38($s1) @@ -59,7 +59,7 @@ glabel npc_do_player_collision /* 147A8 800393A8 960300B2 */ lhu $v1, 0xb2($s0) /* 147AC 800393AC 00021400 */ sll $v0, $v0, 0x10 /* 147B0 800393B0 4616B082 */ mul.s $f2, $f22, $f22 -/* 147B4 800393B4 00000000 */ nop +/* 147B4 800393B4 00000000 */ nop /* 147B8 800393B8 00022403 */ sra $a0, $v0, 0x10 /* 147BC 800393BC 000217C2 */ srl $v0, $v0, 0x1f /* 147C0 800393C0 C6360040 */ lwc1 $f22, 0x40($s1) @@ -68,28 +68,28 @@ glabel npc_do_player_collision /* 147CC 800393CC 00042043 */ sra $a0, $a0, 1 /* 147D0 800393D0 00031C00 */ sll $v1, $v1, 0x10 /* 147D4 800393D4 4614A002 */ mul.s $f0, $f20, $f20 -/* 147D8 800393D8 00000000 */ nop +/* 147D8 800393D8 00000000 */ nop /* 147DC 800393DC 00031403 */ sra $v0, $v1, 0x10 /* 147E0 800393E0 00031FC2 */ srl $v1, $v1, 0x1f /* 147E4 800393E4 00431021 */ addu $v0, $v0, $v1 /* 147E8 800393E8 00021043 */ sra $v0, $v0, 1 /* 147EC 800393EC 46001300 */ add.s $f12, $f2, $f0 /* 147F0 800393F0 4484B000 */ mtc1 $a0, $f22 -/* 147F4 800393F4 00000000 */ nop +/* 147F4 800393F4 00000000 */ nop /* 147F8 800393F8 4680B5A0 */ cvt.s.w $f22, $f22 /* 147FC 800393FC 4482A000 */ mtc1 $v0, $f20 -/* 14800 80039400 00000000 */ nop +/* 14800 80039400 00000000 */ nop /* 14804 80039404 4680A520 */ cvt.s.w $f20, $f20 /* 14808 80039408 46006004 */ sqrt.s $f0, $f12 /* 1480C 8003940C 46000032 */ c.eq.s $f0, $f0 -/* 14810 80039410 00000000 */ nop +/* 14810 80039410 00000000 */ nop /* 14814 80039414 45010003 */ bc1t .L80039424 /* 14818 80039418 4614B580 */ add.s $f22, $f22, $f20 /* 1481C 8003941C 0C0187BC */ jal sqrtf -/* 14820 80039420 00000000 */ nop +/* 14820 80039420 00000000 */ nop .L80039424: /* 14824 80039424 4600B03C */ c.lt.s $f22, $f0 -/* 14828 80039428 00000000 */ nop +/* 14828 80039428 00000000 */ nop /* 1482C 8003942C 4501FFBF */ bc1t .L8003932C /* 14830 80039430 E7B60010 */ swc1 $f22, 0x10($sp) /* 14834 80039434 8E020004 */ lw $v0, 4($s0) @@ -98,19 +98,19 @@ glabel npc_do_player_collision /* 14840 80039440 C63A006C */ lwc1 $f26, 0x6c($s1) /* 14844 80039444 461AF581 */ sub.s $f22, $f30, $f26 /* 14848 80039448 4616B082 */ mul.s $f2, $f22, $f22 -/* 1484C 8003944C 00000000 */ nop +/* 1484C 8003944C 00000000 */ nop /* 14850 80039450 C6360074 */ lwc1 $f22, 0x74($s1) /* 14854 80039454 4616E501 */ sub.s $f20, $f28, $f22 /* 14858 80039458 4614A002 */ mul.s $f0, $f20, $f20 -/* 1485C 8003945C 00000000 */ nop +/* 1485C 8003945C 00000000 */ nop /* 14860 80039460 46001300 */ add.s $f12, $f2, $f0 /* 14864 80039464 46006004 */ sqrt.s $f0, $f12 /* 14868 80039468 46000032 */ c.eq.s $f0, $f0 -/* 1486C 8003946C 00000000 */ nop +/* 1486C 8003946C 00000000 */ nop /* 14870 80039470 45010004 */ bc1t .L80039484 /* 14874 80039474 46000606 */ mov.s $f24, $f0 /* 14878 80039478 0C0187BC */ jal sqrtf -/* 1487C 8003947C 00000000 */ nop +/* 1487C 8003947C 00000000 */ nop /* 14880 80039480 46000606 */ mov.s $f24, $f0 .L80039484: /* 14884 80039484 4600F306 */ mov.s $f12, $f30 @@ -123,7 +123,7 @@ glabel npc_do_player_collision /* 148A0 800394A0 4481A000 */ mtc1 $at, $f20 /* 148A4 800394A4 46000686 */ mov.s $f26, $f0 /* 148A8 800394A8 4614D502 */ mul.s $f20, $f26, $f20 -/* 148AC 800394AC 00000000 */ nop +/* 148AC 800394AC 00000000 */ nop /* 148B0 800394B0 3C0143B4 */ lui $at, 0x43b4 /* 148B4 800394B4 44810000 */ mtc1 $at, $f0 /* 148B8 800394B8 C7A80010 */ lwc1 $f8, 0x10($sp) @@ -133,14 +133,14 @@ glabel npc_do_player_collision /* 148C8 800394C8 0C00A85B */ jal sin_rad /* 148CC 800394CC 4600A306 */ mov.s $f12, $f20 /* 148D0 800394D0 4600C582 */ mul.s $f22, $f24, $f0 -/* 148D4 800394D4 00000000 */ nop +/* 148D4 800394D4 00000000 */ nop /* 148D8 800394D8 0C00A874 */ jal cos_rad /* 148DC 800394DC 4600A306 */ mov.s $f12, $f20 /* 148E0 800394E0 3C030040 */ lui $v1, 0x40 /* 148E4 800394E4 8E020004 */ lw $v0, 4($s0) /* 148E8 800394E8 4600C087 */ neg.s $f2, $f24 /* 148EC 800394EC 46001502 */ mul.s $f20, $f2, $f0 -/* 148F0 800394F0 00000000 */ nop +/* 148F0 800394F0 00000000 */ nop /* 148F4 800394F4 00431024 */ and $v0, $v0, $v1 /* 148F8 800394F8 1040002D */ beqz $v0, .L800395B0 /* 148FC 800394FC 4600D306 */ mov.s $f12, $f26 @@ -150,9 +150,9 @@ glabel npc_do_player_collision /* 1490C 8003950C 44811000 */ mtc1 $at, $f2 /* 14910 80039510 46000005 */ abs.s $f0, $f0 /* 14914 80039514 4602003C */ c.lt.s $f0, $f2 -/* 14918 80039518 00000000 */ nop +/* 14918 80039518 00000000 */ nop /* 1491C 8003951C 4500000E */ bc1f .L80039558 -/* 14920 80039520 00000000 */ nop +/* 14920 80039520 00000000 */ nop /* 14924 80039524 C6020028 */ lwc1 $f2, 0x28($s0) /* 14928 80039528 46161081 */ sub.s $f2, $f2, $f22 /* 1492C 8003952C C6000030 */ lwc1 $f0, 0x30($s0) @@ -169,11 +169,11 @@ glabel npc_do_player_collision .L80039558: /* 14958 80039558 3C013F00 */ lui $at, 0x3f00 /* 1495C 8003955C 44812000 */ mtc1 $at, $f4 -/* 14960 80039560 00000000 */ nop +/* 14960 80039560 00000000 */ nop /* 14964 80039564 4604B182 */ mul.s $f6, $f22, $f4 -/* 14968 80039568 00000000 */ nop +/* 14968 80039568 00000000 */ nop /* 1496C 8003956C 4604A102 */ mul.s $f4, $f20, $f4 -/* 14970 80039570 00000000 */ nop +/* 14970 80039570 00000000 */ nop /* 14974 80039574 C6020028 */ lwc1 $f2, 0x28($s0) /* 14978 80039578 46061081 */ sub.s $f2, $f2, $f6 /* 1497C 8003957C C6000030 */ lwc1 $f0, 0x30($s0) @@ -194,12 +194,12 @@ glabel npc_do_player_collision /* 149B0 800395B0 8E020000 */ lw $v0, ($s0) /* 149B4 800395B4 30420006 */ andi $v0, $v0, 6 /* 149B8 800395B8 10400006 */ beqz $v0, .L800395D4 -/* 149BC 800395BC 00000000 */ nop +/* 149BC 800395BC 00000000 */ nop /* 149C0 800395C0 3C013ECC */ lui $at, 0x3ecc /* 149C4 800395C4 3421CCCD */ ori $at, $at, 0xcccd /* 149C8 800395C8 44812000 */ mtc1 $at, $f4 /* 149CC 800395CC 0800E586 */ j .L80039618 -/* 149D0 800395D0 00000000 */ nop +/* 149D0 800395D0 00000000 */ nop .L800395D4: /* 149D4 800395D4 0C00A70A */ jal get_clamped_angle_diff /* 149D8 800395D8 4600E386 */ mov.s $f14, $f28 @@ -207,9 +207,9 @@ glabel npc_do_player_collision /* 149E0 800395E0 44811000 */ mtc1 $at, $f2 /* 149E4 800395E4 46000005 */ abs.s $f0, $f0 /* 149E8 800395E8 4602003C */ c.lt.s $f0, $f2 -/* 149EC 800395EC 00000000 */ nop +/* 149EC 800395EC 00000000 */ nop /* 149F0 800395F0 45000006 */ bc1f .L8003960C -/* 149F4 800395F4 00000000 */ nop +/* 149F4 800395F4 00000000 */ nop /* 149F8 800395F8 C6020028 */ lwc1 $f2, 0x28($s0) /* 149FC 800395FC 46161081 */ sub.s $f2, $f2, $f22 /* 14A00 80039600 C6000030 */ lwc1 $f0, 0x30($s0) @@ -218,12 +218,12 @@ glabel npc_do_player_collision .L8003960C: /* 14A0C 8003960C 3C013F00 */ lui $at, 0x3f00 /* 14A10 80039610 44812000 */ mtc1 $at, $f4 -/* 14A14 80039614 00000000 */ nop +/* 14A14 80039614 00000000 */ nop .L80039618: /* 14A18 80039618 4604B002 */ mul.s $f0, $f22, $f4 -/* 14A1C 8003961C 00000000 */ nop +/* 14A1C 8003961C 00000000 */ nop /* 14A20 80039620 4604A102 */ mul.s $f4, $f20, $f4 -/* 14A24 80039624 00000000 */ nop +/* 14A24 80039624 00000000 */ nop /* 14A28 80039628 C6020028 */ lwc1 $f2, 0x28($s0) /* 14A2C 8003962C 46001081 */ sub.s $f2, $f2, $f0 /* 14A30 80039630 C6000030 */ lwc1 $f0, 0x30($s0) diff --git a/asm/nonmatchings/code_13870_len_6980/npc_do_world_collision.s b/asm/nonmatchings/code_13870_len_6980/npc_do_world_collision.s index 64f420f5ce..58ff9a4834 100644 --- a/asm/nonmatchings/code_13870_len_6980/npc_do_world_collision.s +++ b/asm/nonmatchings/code_13870_len_6980/npc_do_world_collision.s @@ -16,24 +16,24 @@ glabel npc_do_world_collision /* 13F24 80038B24 C6020038 */ lwc1 $f2, 0x38($s0) /* 13F28 80038B28 C600006C */ lwc1 $f0, 0x6c($s0) /* 13F2C 80038B2C 46001032 */ c.eq.s $f2, $f0 -/* 13F30 80038B30 00000000 */ nop +/* 13F30 80038B30 00000000 */ nop /* 13F34 80038B34 45020011 */ bc1fl .L80038B7C /* 13F38 80038B38 3C03F7FF */ lui $v1, 0xf7ff /* 13F3C 80038B3C C602003C */ lwc1 $f2, 0x3c($s0) /* 13F40 80038B40 C6000070 */ lwc1 $f0, 0x70($s0) /* 13F44 80038B44 46001032 */ c.eq.s $f2, $f0 -/* 13F48 80038B48 00000000 */ nop +/* 13F48 80038B48 00000000 */ nop /* 13F4C 80038B4C 4502000B */ bc1fl .L80038B7C /* 13F50 80038B50 3C03F7FF */ lui $v1, 0xf7ff /* 13F54 80038B54 C6020040 */ lwc1 $f2, 0x40($s0) /* 13F58 80038B58 C6000074 */ lwc1 $f0, 0x74($s0) /* 13F5C 80038B5C 46001032 */ c.eq.s $f2, $f0 -/* 13F60 80038B60 00000000 */ nop +/* 13F60 80038B60 00000000 */ nop /* 13F64 80038B64 45000004 */ bc1f .L80038B78 /* 13F68 80038B68 3C020800 */ lui $v0, 0x800 /* 13F6C 80038B6C 00621024 */ and $v0, $v1, $v0 /* 13F70 80038B70 10400122 */ beqz $v0, .L80038FFC -/* 13F74 80038B74 00000000 */ nop +/* 13F74 80038B74 00000000 */ nop .L80038B78: /* 13F78 80038B78 3C03F7FF */ lui $v1, 0xf7ff .L80038B7C: @@ -58,32 +58,32 @@ glabel npc_do_world_collision /* 13FC4 80038BC4 860200A8 */ lh $v0, 0xa8($s0) /* 13FC8 80038BC8 27A50020 */ addiu $a1, $sp, 0x20 /* 13FCC 80038BCC 44820000 */ mtc1 $v0, $f0 -/* 13FD0 80038BD0 00000000 */ nop +/* 13FD0 80038BD0 00000000 */ nop /* 13FD4 80038BD4 46800020 */ cvt.s.w $f0, $f0 /* 13FD8 80038BD8 E7A00018 */ swc1 $f0, 0x18($sp) /* 13FDC 80038BDC 860200A6 */ lh $v0, 0xa6($s0) /* 13FE0 80038BE0 27A60024 */ addiu $a2, $sp, 0x24 /* 13FE4 80038BE4 44820000 */ mtc1 $v0, $f0 -/* 13FE8 80038BE8 00000000 */ nop +/* 13FE8 80038BE8 00000000 */ nop /* 13FEC 80038BEC 46800020 */ cvt.s.w $f0, $f0 /* 13FF0 80038BF0 E7A0001C */ swc1 $f0, 0x1c($sp) /* 13FF4 80038BF4 8E040080 */ lw $a0, 0x80($s0) /* 13FF8 80038BF8 0C037711 */ jal func_800DDC44 /* 13FFC 80038BFC 27A70028 */ addiu $a3, $sp, 0x28 /* 14000 80038C00 0800E312 */ j .L80038C48 -/* 14004 80038C04 00000000 */ nop +/* 14004 80038C04 00000000 */ nop .L80038C08: /* 14008 80038C08 E7A00014 */ swc1 $f0, 0x14($sp) /* 1400C 80038C0C 860200A8 */ lh $v0, 0xa8($s0) /* 14010 80038C10 27A50020 */ addiu $a1, $sp, 0x20 /* 14014 80038C14 44820000 */ mtc1 $v0, $f0 -/* 14018 80038C18 00000000 */ nop +/* 14018 80038C18 00000000 */ nop /* 1401C 80038C1C 46800020 */ cvt.s.w $f0, $f0 /* 14020 80038C20 E7A00018 */ swc1 $f0, 0x18($sp) /* 14024 80038C24 860200A6 */ lh $v0, 0xa6($s0) /* 14028 80038C28 27A60024 */ addiu $a2, $sp, 0x24 /* 1402C 80038C2C 44820000 */ mtc1 $v0, $f0 -/* 14030 80038C30 00000000 */ nop +/* 14030 80038C30 00000000 */ nop /* 14034 80038C34 46800020 */ cvt.s.w $f0, $f0 /* 14038 80038C38 E7A0001C */ swc1 $f0, 0x1c($sp) /* 1403C 80038C3C 8E040080 */ lw $a0, 0x80($s0) @@ -128,32 +128,32 @@ glabel npc_do_world_collision /* 140CC 80038CCC 860200A8 */ lh $v0, 0xa8($s0) /* 140D0 80038CD0 27A50020 */ addiu $a1, $sp, 0x20 /* 140D4 80038CD4 44820000 */ mtc1 $v0, $f0 -/* 140D8 80038CD8 00000000 */ nop +/* 140D8 80038CD8 00000000 */ nop /* 140DC 80038CDC 46800020 */ cvt.s.w $f0, $f0 /* 140E0 80038CE0 E7A00018 */ swc1 $f0, 0x18($sp) /* 140E4 80038CE4 860200A6 */ lh $v0, 0xa6($s0) /* 140E8 80038CE8 27A60024 */ addiu $a2, $sp, 0x24 /* 140EC 80038CEC 44820000 */ mtc1 $v0, $f0 -/* 140F0 80038CF0 00000000 */ nop +/* 140F0 80038CF0 00000000 */ nop /* 140F4 80038CF4 46800020 */ cvt.s.w $f0, $f0 /* 140F8 80038CF8 E7A0001C */ swc1 $f0, 0x1c($sp) /* 140FC 80038CFC 8E040080 */ lw $a0, 0x80($s0) /* 14100 80038D00 0C037711 */ jal func_800DDC44 /* 14104 80038D04 27A70028 */ addiu $a3, $sp, 0x28 /* 14108 80038D08 0800E354 */ j .L80038D50 -/* 1410C 80038D0C 00000000 */ nop +/* 1410C 80038D0C 00000000 */ nop .L80038D10: /* 14110 80038D10 E7A00014 */ swc1 $f0, 0x14($sp) /* 14114 80038D14 860200A8 */ lh $v0, 0xa8($s0) /* 14118 80038D18 27A50020 */ addiu $a1, $sp, 0x20 /* 1411C 80038D1C 44820000 */ mtc1 $v0, $f0 -/* 14120 80038D20 00000000 */ nop +/* 14120 80038D20 00000000 */ nop /* 14124 80038D24 46800020 */ cvt.s.w $f0, $f0 /* 14128 80038D28 E7A00018 */ swc1 $f0, 0x18($sp) /* 1412C 80038D2C 860200A6 */ lh $v0, 0xa6($s0) /* 14130 80038D30 27A60024 */ addiu $a2, $sp, 0x24 /* 14134 80038D34 44820000 */ mtc1 $v0, $f0 -/* 14138 80038D38 00000000 */ nop +/* 14138 80038D38 00000000 */ nop /* 1413C 80038D3C 46800020 */ cvt.s.w $f0, $f0 /* 14140 80038D40 E7A0001C */ swc1 $f0, 0x1c($sp) /* 14144 80038D44 8E040080 */ lw $a0, 0x80($s0) @@ -195,32 +195,32 @@ glabel npc_do_world_collision /* 141C8 80038DC8 860200A8 */ lh $v0, 0xa8($s0) /* 141CC 80038DCC 27A50020 */ addiu $a1, $sp, 0x20 /* 141D0 80038DD0 44820000 */ mtc1 $v0, $f0 -/* 141D4 80038DD4 00000000 */ nop +/* 141D4 80038DD4 00000000 */ nop /* 141D8 80038DD8 46800020 */ cvt.s.w $f0, $f0 /* 141DC 80038DDC E7A00018 */ swc1 $f0, 0x18($sp) /* 141E0 80038DE0 860200A6 */ lh $v0, 0xa6($s0) /* 141E4 80038DE4 27A60024 */ addiu $a2, $sp, 0x24 /* 141E8 80038DE8 44820000 */ mtc1 $v0, $f0 -/* 141EC 80038DEC 00000000 */ nop +/* 141EC 80038DEC 00000000 */ nop /* 141F0 80038DF0 46800020 */ cvt.s.w $f0, $f0 /* 141F4 80038DF4 E7A0001C */ swc1 $f0, 0x1c($sp) /* 141F8 80038DF8 8E040080 */ lw $a0, 0x80($s0) /* 141FC 80038DFC 0C037711 */ jal func_800DDC44 /* 14200 80038E00 27A70028 */ addiu $a3, $sp, 0x28 /* 14204 80038E04 0800E393 */ j .L80038E4C -/* 14208 80038E08 00000000 */ nop +/* 14208 80038E08 00000000 */ nop .L80038E0C: /* 1420C 80038E0C E7A00014 */ swc1 $f0, 0x14($sp) /* 14210 80038E10 860200A8 */ lh $v0, 0xa8($s0) /* 14214 80038E14 27A50020 */ addiu $a1, $sp, 0x20 /* 14218 80038E18 44820000 */ mtc1 $v0, $f0 -/* 1421C 80038E1C 00000000 */ nop +/* 1421C 80038E1C 00000000 */ nop /* 14220 80038E20 46800020 */ cvt.s.w $f0, $f0 /* 14224 80038E24 E7A00018 */ swc1 $f0, 0x18($sp) /* 14228 80038E28 860200A6 */ lh $v0, 0xa6($s0) /* 1422C 80038E2C 27A60024 */ addiu $a2, $sp, 0x24 /* 14230 80038E30 44820000 */ mtc1 $v0, $f0 -/* 14234 80038E34 00000000 */ nop +/* 14234 80038E34 00000000 */ nop /* 14238 80038E38 46800020 */ cvt.s.w $f0, $f0 /* 1423C 80038E3C E7A0001C */ swc1 $f0, 0x1c($sp) /* 14240 80038E40 8E040080 */ lw $a0, 0x80($s0) @@ -246,11 +246,11 @@ glabel npc_do_world_collision /* 14284 80038E84 3C030400 */ lui $v1, 0x400 /* 14288 80038E88 00431024 */ and $v0, $v0, $v1 /* 1428C 80038E8C 1040005B */ beqz $v0, .L80038FFC -/* 14290 80038E90 00000000 */ nop +/* 14290 80038E90 00000000 */ nop /* 14294 80038E94 C60C000C */ lwc1 $f12, 0xc($s0) /* 14298 80038E98 3C014234 */ lui $at, 0x4234 /* 1429C 80038E9C 44810000 */ mtc1 $at, $f0 -/* 142A0 80038EA0 00000000 */ nop +/* 142A0 80038EA0 00000000 */ nop /* 142A4 80038EA4 46006300 */ add.s $f12, $f12, $f0 /* 142A8 80038EA8 3C014334 */ lui $at, 0x4334 /* 142AC 80038EAC 44810000 */ mtc1 $at, $f0 @@ -267,13 +267,13 @@ glabel npc_do_world_collision /* 142D8 80038ED8 860200A8 */ lh $v0, 0xa8($s0) /* 142DC 80038EDC 27A50020 */ addiu $a1, $sp, 0x20 /* 142E0 80038EE0 44820000 */ mtc1 $v0, $f0 -/* 142E4 80038EE4 00000000 */ nop +/* 142E4 80038EE4 00000000 */ nop /* 142E8 80038EE8 46800020 */ cvt.s.w $f0, $f0 /* 142EC 80038EEC E7A00018 */ swc1 $f0, 0x18($sp) /* 142F0 80038EF0 860200A6 */ lh $v0, 0xa6($s0) /* 142F4 80038EF4 27A60024 */ addiu $a2, $sp, 0x24 /* 142F8 80038EF8 44820000 */ mtc1 $v0, $f0 -/* 142FC 80038EFC 00000000 */ nop +/* 142FC 80038EFC 00000000 */ nop /* 14300 80038F00 46800020 */ cvt.s.w $f0, $f0 /* 14304 80038F04 E7A0001C */ swc1 $f0, 0x1c($sp) /* 14308 80038F08 8E040080 */ lw $a0, 0x80($s0) @@ -297,7 +297,7 @@ glabel npc_do_world_collision /* 14348 80038F48 C60C000C */ lwc1 $f12, 0xc($s0) /* 1434C 80038F4C 3C014234 */ lui $at, 0x4234 /* 14350 80038F50 44810000 */ mtc1 $at, $f0 -/* 14354 80038F54 00000000 */ nop +/* 14354 80038F54 00000000 */ nop /* 14358 80038F58 46006301 */ sub.s $f12, $f12, $f0 /* 1435C 80038F5C 3C014334 */ lui $at, 0x4334 /* 14360 80038F60 44810000 */ mtc1 $at, $f0 @@ -314,13 +314,13 @@ glabel npc_do_world_collision /* 1438C 80038F8C 860200A8 */ lh $v0, 0xa8($s0) /* 14390 80038F90 27A50020 */ addiu $a1, $sp, 0x20 /* 14394 80038F94 44820000 */ mtc1 $v0, $f0 -/* 14398 80038F98 00000000 */ nop +/* 14398 80038F98 00000000 */ nop /* 1439C 80038F9C 46800020 */ cvt.s.w $f0, $f0 /* 143A0 80038FA0 E7A00018 */ swc1 $f0, 0x18($sp) /* 143A4 80038FA4 860200A6 */ lh $v0, 0xa6($s0) /* 143A8 80038FA8 27A60024 */ addiu $a2, $sp, 0x24 /* 143AC 80038FAC 44820000 */ mtc1 $v0, $f0 -/* 143B0 80038FB0 00000000 */ nop +/* 143B0 80038FB0 00000000 */ nop /* 143B4 80038FB4 46800020 */ cvt.s.w $f0, $f0 /* 143B8 80038FB8 E7A0001C */ swc1 $f0, 0x1c($sp) /* 143BC 80038FBC 8E040080 */ lw $a0, 0x80($s0) diff --git a/asm/nonmatchings/code_13870_len_6980/render_npcs.s b/asm/nonmatchings/code_13870_len_6980/render_npcs.s index ccc7ca0190..be763ac3fe 100644 --- a/asm/nonmatchings/code_13870_len_6980/render_npcs.s +++ b/asm/nonmatchings/code_13870_len_6980/render_npcs.s @@ -72,30 +72,30 @@ glabel render_npcs /* 15CF8 8003A8F8 D42084B0 */ ldc1 $f0, %lo(D_800984B0)($at) /* 15CFC 8003A8FC 460020A1 */ cvt.d.s $f2, $f4 /* 15D00 8003A900 4620103C */ c.lt.d $f2, $f0 -/* 15D04 8003A904 00000000 */ nop +/* 15D04 8003A904 00000000 */ nop /* 15D08 8003A908 45000007 */ bc1f .L8003A928 -/* 15D0C 8003A90C 00000000 */ nop +/* 15D0C 8003A90C 00000000 */ nop /* 15D10 8003A910 3C01800A */ lui $at, %hi(D_800984B8) /* 15D14 8003A914 D42084B8 */ ldc1 $f0, %lo(D_800984B8)($at) /* 15D18 8003A918 4622003C */ c.lt.d $f0, $f2 -/* 15D1C 8003A91C 00000000 */ nop +/* 15D1C 8003A91C 00000000 */ nop /* 15D20 8003A920 4503003D */ bc1tl .L8003AA18 /* 15D24 8003A924 26520001 */ addiu $s2, $s2, 1 .L8003A928: /* 15D28 8003A928 C7A00040 */ lwc1 $f0, 0x40($sp) /* 15D2C 8003A92C 461A0002 */ mul.s $f0, $f0, $f26 -/* 15D30 8003A930 00000000 */ nop +/* 15D30 8003A930 00000000 */ nop /* 15D34 8003A934 46040003 */ div.s $f0, $f0, $f4 /* 15D38 8003A938 461A0500 */ add.s $f20, $f0, $f26 /* 15D3C 8003A93C 4618A03C */ c.lt.s $f20, $f24 -/* 15D40 8003A940 00000000 */ nop +/* 15D40 8003A940 00000000 */ nop /* 15D44 8003A944 45000003 */ bc1f .L8003A954 -/* 15D48 8003A948 00000000 */ nop +/* 15D48 8003A948 00000000 */ nop /* 15D4C 8003A94C 0800EA59 */ j .L8003A964 /* 15D50 8003A950 4600C506 */ mov.s $f20, $f24 .L8003A954: /* 15D54 8003A954 4614B03C */ c.lt.s $f22, $f20 -/* 15D58 8003A958 00000000 */ nop +/* 15D58 8003A958 00000000 */ nop /* 15D5C 8003A95C 45030001 */ bc1tl .L8003A964 /* 15D60 8003A960 4600B506 */ mov.s $f20, $f22 .L8003A964: @@ -126,7 +126,7 @@ glabel render_npcs .L8003A9C0: /* 15DC0 8003A9C0 920200AD */ lbu $v0, 0xad($s0) /* 15DC4 8003A9C4 10400003 */ beqz $v0, .L8003A9D4 -/* 15DC8 8003A9C8 00000000 */ nop +/* 15DC8 8003A9C8 00000000 */ nop /* 15DCC 8003A9CC 0C047644 */ jal queue_render_task /* 15DD0 8003A9D0 0220202D */ daddu $a0, $s1, $zero .L8003A9D4: @@ -150,7 +150,7 @@ glabel render_npcs .L8003AA18: /* 15E18 8003AA18 2A420040 */ slti $v0, $s2, 0x40 /* 15E1C 8003AA1C 1440FF95 */ bnez $v0, .L8003A874 -/* 15E20 8003AA20 00000000 */ nop +/* 15E20 8003AA20 00000000 */ nop /* 15E24 8003AA24 8FBF0064 */ lw $ra, 0x64($sp) /* 15E28 8003AA28 8FB40060 */ lw $s4, 0x60($sp) /* 15E2C 8003AA2C 8FB3005C */ lw $s3, 0x5c($sp) diff --git a/asm/nonmatchings/code_13870_len_6980/update_npcs.s b/asm/nonmatchings/code_13870_len_6980/update_npcs.s index 7138f1228d..69a3896d31 100644 --- a/asm/nonmatchings/code_13870_len_6980/update_npcs.s +++ b/asm/nonmatchings/code_13870_len_6980/update_npcs.s @@ -37,7 +37,7 @@ glabel update_npcs /* 14DAC 800399AC 34420004 */ ori $v0, $v0, 4 /* 14DB0 800399B0 00621024 */ and $v0, $v1, $v0 /* 14DB4 800399B4 10400005 */ beqz $v0, .L800399CC -/* 14DB8 800399B8 00000000 */ nop +/* 14DB8 800399B8 00000000 */ nop /* 14DBC 800399BC 0C00E2BF */ jal npc_do_world_collision /* 14DC0 800399C0 0200202D */ daddu $a0, $s0, $zero /* 14DC4 800399C4 0800E75E */ j .L80039D78 @@ -82,16 +82,16 @@ glabel update_npcs /* 14E54 80039A54 3C030010 */ lui $v1, 0x10 /* 14E58 80039A58 00431024 */ and $v0, $v0, $v1 /* 14E5C 80039A5C 10400003 */ beqz $v0, .L80039A6C -/* 14E60 80039A60 00000000 */ nop +/* 14E60 80039A60 00000000 */ nop /* 14E64 80039A64 0C00EB7E */ jal update_npc_blur /* 14E68 80039A68 0200202D */ daddu $a0, $s0, $zero .L80039A6C: /* 14E6C 80039A6C C602003C */ lwc1 $f2, 0x3c($s0) /* 14E70 80039A70 3C01C4FA */ lui $at, 0xc4fa /* 14E74 80039A74 44810000 */ mtc1 $at, $f0 -/* 14E78 80039A78 00000000 */ nop +/* 14E78 80039A78 00000000 */ nop /* 14E7C 80039A7C 4600103C */ c.lt.s $f2, $f0 -/* 14E80 80039A80 00000000 */ nop +/* 14E80 80039A80 00000000 */ nop /* 14E84 80039A84 4500000D */ bc1f .L80039ABC /* 14E88 80039A88 3C030400 */ lui $v1, 0x400 /* 14E8C 80039A8C 8E020000 */ lw $v0, ($s0) @@ -114,17 +114,17 @@ glabel update_npcs /* 14ECC 80039ACC 3C020100 */ lui $v0, 0x100 /* 14ED0 80039AD0 00621024 */ and $v0, $v1, $v0 /* 14ED4 80039AD4 1440000F */ bnez $v0, .L80039B14 -/* 14ED8 80039AD8 00000000 */ nop +/* 14ED8 80039AD8 00000000 */ nop /* 14EDC 80039ADC 8E050028 */ lw $a1, 0x28($s0) /* 14EE0 80039AE0 10A0000C */ beqz $a1, .L80039B14 -/* 14EE4 80039AE4 00000000 */ nop +/* 14EE4 80039AE4 00000000 */ nop /* 14EE8 80039AE8 8E040024 */ lw $a0, 0x24($s0) /* 14EEC 80039AEC 04800009 */ bltz $a0, .L80039B14 -/* 14EF0 80039AF0 00000000 */ nop +/* 14EF0 80039AF0 00000000 */ nop /* 14EF4 80039AF4 0C0B78AB */ jal func_802DE2AC /* 14EF8 80039AF8 8E060030 */ lw $a2, 0x30($s0) /* 14EFC 80039AFC 0800E6C5 */ j .L80039B14 -/* 14F00 80039B00 00000000 */ nop +/* 14F00 80039B00 00000000 */ nop .L80039B04: /* 14F04 80039B04 8E050028 */ lw $a1, 0x28($s0) /* 14F08 80039B08 8E060030 */ lw $a2, 0x30($s0) @@ -134,7 +134,7 @@ glabel update_npcs /* 14F14 80039B14 8E020000 */ lw $v0, ($s0) /* 14F18 80039B18 30420010 */ andi $v0, $v0, 0x10 /* 14F1C 80039B1C 10400072 */ beqz $v0, .L80039CE8 -/* 14F20 80039B20 00000000 */ nop +/* 14F20 80039B20 00000000 */ nop /* 14F24 80039B24 0C044181 */ jal get_shadow_by_index /* 14F28 80039B28 8E040078 */ lw $a0, 0x78($s0) /* 14F2C 80039B2C 84440008 */ lh $a0, 8($v0) @@ -163,22 +163,22 @@ glabel update_npcs /* 14F84 80039B84 E7A60020 */ swc1 $f6, 0x20($sp) /* 14F88 80039B88 C600006C */ lwc1 $f0, 0x6c($s0) /* 14F8C 80039B8C 46001032 */ c.eq.s $f2, $f0 -/* 14F90 80039B90 00000000 */ nop +/* 14F90 80039B90 00000000 */ nop /* 14F94 80039B94 4500000E */ bc1f .L80039BD0 /* 14F98 80039B98 27A40018 */ addiu $a0, $sp, 0x18 /* 14F9C 80039B9C C6000070 */ lwc1 $f0, 0x70($s0) /* 14FA0 80039BA0 46002032 */ c.eq.s $f4, $f0 -/* 14FA4 80039BA4 00000000 */ nop +/* 14FA4 80039BA4 00000000 */ nop /* 14FA8 80039BA8 4502000A */ bc1fl .L80039BD4 /* 14FAC 80039BAC 27A5001C */ addiu $a1, $sp, 0x1c /* 14FB0 80039BB0 C6000074 */ lwc1 $f0, 0x74($s0) /* 14FB4 80039BB4 46003032 */ c.eq.s $f6, $f0 -/* 14FB8 80039BB8 00000000 */ nop +/* 14FB8 80039BB8 00000000 */ nop /* 14FBC 80039BBC 45000004 */ bc1f .L80039BD0 /* 14FC0 80039BC0 3C020001 */ lui $v0, 1 /* 14FC4 80039BC4 00621024 */ and $v0, $v1, $v0 /* 14FC8 80039BC8 10400047 */ beqz $v0, .L80039CE8 -/* 14FCC 80039BCC 00000000 */ nop +/* 14FCC 80039BCC 00000000 */ nop .L80039BD0: /* 14FD0 80039BD0 27A5001C */ addiu $a1, $sp, 0x1c .L80039BD4: @@ -194,7 +194,7 @@ glabel update_npcs /* 14FF8 80039BF8 00431021 */ addu $v0, $v0, $v1 /* 14FFC 80039BFC 00021043 */ sra $v0, $v0, 1 /* 15000 80039C00 44823000 */ mtc1 $v0, $f6 -/* 15004 80039C04 00000000 */ nop +/* 15004 80039C04 00000000 */ nop /* 15008 80039C08 468031A0 */ cvt.s.w $f6, $f6 /* 1500C 80039C0C 27A20028 */ addiu $v0, $sp, 0x28 /* 15010 80039C10 E7A00018 */ swc1 $f0, 0x18($sp) @@ -211,7 +211,7 @@ glabel update_npcs /* 1503C 80039C3C 860200A6 */ lh $v0, 0xa6($s0) /* 15040 80039C40 8FA5002C */ lw $a1, 0x2c($sp) /* 15044 80039C44 44824000 */ mtc1 $v0, $f8 -/* 15048 80039C48 00000000 */ nop +/* 15048 80039C48 00000000 */ nop /* 1504C 80039C4C 46804220 */ cvt.s.w $f8, $f8 /* 15050 80039C50 44064000 */ mfc1 $a2, $f8 /* 15054 80039C54 0C044A40 */ jal set_npc_shadow_scale @@ -231,7 +231,7 @@ glabel update_npcs /* 1508C 80039C8C E6200030 */ swc1 $f0, 0x30($s1) /* 15090 80039C90 C600007C */ lwc1 $f0, 0x7c($s0) /* 15094 80039C94 46001082 */ mul.s $f2, $f2, $f0 -/* 15098 80039C98 00000000 */ nop +/* 15098 80039C98 00000000 */ nop /* 1509C 80039C9C 3C03FFFE */ lui $v1, 0xfffe /* 150A0 80039CA0 E622001C */ swc1 $f2, 0x1c($s1) /* 150A4 80039CA4 8E020000 */ lw $v0, ($s0) @@ -242,7 +242,7 @@ glabel update_npcs .L80039CB8: /* 150B8 80039CB8 30620400 */ andi $v0, $v1, 0x400 /* 150BC 80039CBC 10400004 */ beqz $v0, .L80039CD0 -/* 150C0 80039CC0 00000000 */ nop +/* 150C0 80039CC0 00000000 */ nop /* 150C4 80039CC4 C6000038 */ lwc1 $f0, 0x38($s0) /* 150C8 80039CC8 0800E738 */ j .L80039CE0 /* 150CC 80039CCC E6200010 */ swc1 $f0, 0x10($s1) @@ -286,7 +286,7 @@ glabel update_npcs /* 15158 80039D58 AE020024 */ sw $v0, 0x24($s0) .L80039D5C: /* 1515C 80039D5C 0800E757 */ j .L80039D5C -/* 15160 80039D60 00000000 */ nop +/* 15160 80039D60 00000000 */ nop .L80039D64: /* 15164 80039D64 8E040024 */ lw $a0, 0x24($s0) /* 15168 80039D68 8E050028 */ lw $a1, 0x28($s0) @@ -297,7 +297,7 @@ glabel update_npcs .L80039D78: /* 15178 80039D78 2A420040 */ slti $v0, $s2, 0x40 /* 1517C 80039D7C 1440FF00 */ bnez $v0, .L80039980 -/* 15180 80039D80 00000000 */ nop +/* 15180 80039D80 00000000 */ nop .L80039D84: /* 15184 80039D84 8FBF0040 */ lw $ra, 0x40($sp) /* 15188 80039D88 8FB3003C */ lw $s3, 0x3c($sp) diff --git a/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s b/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s index 2bae2f6b40..6dca9dbd1c 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_cleanup.s @@ -16,12 +16,12 @@ glabel pause_badges_cleanup /* 13CAC0 80249780 26310001 */ addiu $s1, $s1, 1 /* 13CAC4 80249784 2A220016 */ slti $v0, $s1, 0x16 /* 13CAC8 80249788 1440FFFA */ bnez $v0, .L80249774 -/* 13CACC 8024978C 00000000 */ nop +/* 13CACC 8024978C 00000000 */ nop /* 13CAD0 80249790 8FBF0018 */ lw $ra, 0x18($sp) /* 13CAD4 80249794 8FB10014 */ lw $s1, 0x14($sp) /* 13CAD8 80249798 8FB00010 */ lw $s0, 0x10($sp) /* 13CADC 8024979C 03E00008 */ jr $ra /* 13CAE0 802497A0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 13CAE4 802497A4 00000000 */ nop -/* 13CAE8 802497A8 00000000 */ nop -/* 13CAEC 802497AC 00000000 */ nop +/* 13CAE4 802497A4 00000000 */ nop +/* 13CAE8 802497A8 00000000 */ nop +/* 13CAEC 802497AC 00000000 */ nop diff --git a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s index 40c329876b..e08e8bc379 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_draw_contents.s @@ -53,7 +53,7 @@ glabel pause_badges_draw_contents /* 13A904 802475C4 15210004 */ bne $t1, $at, .L802475D8 /* 13A908 802475C8 3C018000 */ lui $at, 0x8000 /* 13A90C 802475CC 14610002 */ bne $v1, $at, .L802475D8 -/* 13A910 802475D0 00000000 */ nop +/* 13A910 802475D0 00000000 */ nop /* 13A914 802475D4 0006000D */ break 6 .L802475D8: /* 13A918 802475D8 00005012 */ mflo $t2 @@ -110,7 +110,7 @@ glabel pause_badges_draw_contents /* 13A9E0 802476A0 24060001 */ addiu $a2, $zero, 1 .L802476A4: /* 13A9E4 802476A4 18E005AD */ blez $a3, .L80248D5C -/* 13A9E8 802476A8 00000000 */ nop +/* 13A9E8 802476A8 00000000 */ nop /* 13A9EC 802476AC 190005AB */ blez $t0, .L80248D5C /* 13A9F0 802476B0 2882013F */ slti $v0, $a0, 0x13f /* 13A9F4 802476B4 104005A9 */ beqz $v0, .L80248D5C @@ -127,10 +127,10 @@ glabel pause_badges_draw_contents /* 13AA18 802476D8 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 13AA1C 802476DC 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 13AA20 802476E0 44841000 */ mtc1 $a0, $f2 -/* 13AA24 802476E4 00000000 */ nop +/* 13AA24 802476E4 00000000 */ nop /* 13AA28 802476E8 468010A0 */ cvt.s.w $f2, $f2 /* 13AA2C 802476EC 44860000 */ mtc1 $a2, $f0 -/* 13AA30 802476F0 00000000 */ nop +/* 13AA30 802476F0 00000000 */ nop /* 13AA34 802476F4 46800020 */ cvt.s.w $f0, $f0 /* 13AA38 802476F8 8FAB00C4 */ lw $t3, 0xc4($sp) /* 13AA3C 802476FC 8FAA00C8 */ lw $t2, 0xc8($sp) @@ -141,45 +141,45 @@ glabel pause_badges_draw_contents /* 13AA50 80247710 AFA00054 */ sw $zero, 0x54($sp) /* 13AA54 80247714 256B0077 */ addiu $t3, $t3, 0x77 /* 13AA58 80247718 46041082 */ mul.s $f2, $f2, $f4 -/* 13AA5C 8024771C 00000000 */ nop +/* 13AA5C 8024771C 00000000 */ nop /* 13AA60 80247720 254A0011 */ addiu $t2, $t2, 0x11 /* 13AA64 80247724 AFAB007C */ sw $t3, 0x7c($sp) /* 13AA68 80247728 AFAA0080 */ sw $t2, 0x80($sp) /* 13AA6C 8024772C 8C620000 */ lw $v0, ($v1) /* 13AA70 80247730 46040002 */ mul.s $f0, $f0, $f4 -/* 13AA74 80247734 00000000 */ nop +/* 13AA74 80247734 00000000 */ nop /* 13AA78 80247738 0040282D */ daddu $a1, $v0, $zero /* 13AA7C 8024773C 24420008 */ addiu $v0, $v0, 8 /* 13AA80 80247740 AC620000 */ sw $v0, ($v1) /* 13AA84 80247744 4600118D */ trunc.w.s $f6, $f2 /* 13AA88 80247748 44023000 */ mfc1 $v0, $f6 -/* 13AA8C 8024774C 00000000 */ nop +/* 13AA8C 8024774C 00000000 */ nop /* 13AA90 80247750 30420FFF */ andi $v0, $v0, 0xfff /* 13AA94 80247754 00021300 */ sll $v0, $v0, 0xc /* 13AA98 80247758 4600018D */ trunc.w.s $f6, $f0 /* 13AA9C 8024775C 44033000 */ mfc1 $v1, $f6 /* 13AAA0 80247760 44871000 */ mtc1 $a3, $f2 -/* 13AAA4 80247764 00000000 */ nop +/* 13AAA4 80247764 00000000 */ nop /* 13AAA8 80247768 468010A0 */ cvt.s.w $f2, $f2 /* 13AAAC 8024776C 46041082 */ mul.s $f2, $f2, $f4 -/* 13AAB0 80247770 00000000 */ nop +/* 13AAB0 80247770 00000000 */ nop /* 13AAB4 80247774 30630FFF */ andi $v1, $v1, 0xfff /* 13AAB8 80247778 00641825 */ or $v1, $v1, $a0 /* 13AABC 8024777C 00431025 */ or $v0, $v0, $v1 /* 13AAC0 80247780 44880000 */ mtc1 $t0, $f0 -/* 13AAC4 80247784 00000000 */ nop +/* 13AAC4 80247784 00000000 */ nop /* 13AAC8 80247788 46800020 */ cvt.s.w $f0, $f0 /* 13AACC 8024778C 46040002 */ mul.s $f0, $f0, $f4 -/* 13AAD0 80247790 00000000 */ nop +/* 13AAD0 80247790 00000000 */ nop /* 13AAD4 80247794 ACA20000 */ sw $v0, ($a1) /* 13AAD8 80247798 4600118D */ trunc.w.s $f6, $f2 /* 13AADC 8024779C 44023000 */ mfc1 $v0, $f6 -/* 13AAE0 802477A0 00000000 */ nop +/* 13AAE0 802477A0 00000000 */ nop /* 13AAE4 802477A4 30420FFF */ andi $v0, $v0, 0xfff /* 13AAE8 802477A8 00021300 */ sll $v0, $v0, 0xc /* 13AAEC 802477AC 4600018D */ trunc.w.s $f6, $f0 /* 13AAF0 802477B0 44033000 */ mfc1 $v1, $f6 -/* 13AAF4 802477B4 00000000 */ nop +/* 13AAF4 802477B4 00000000 */ nop /* 13AAF8 802477B8 30630FFF */ andi $v1, $v1, 0xfff /* 13AAFC 802477BC 00431025 */ or $v0, $v0, $v1 /* 13AB00 802477C0 ACA20004 */ sw $v0, 4($a1) @@ -256,13 +256,13 @@ glabel pause_badges_draw_contents /* 13AC08 802478C8 3C038027 */ lui $v1, %hi(gBadgeMenuLevel) /* 13AC0C 802478CC 8C630398 */ lw $v1, %lo(gBadgeMenuLevel)($v1) /* 13AC10 802478D0 14620025 */ bne $v1, $v0, .L80247968 -/* 13AC14 802478D4 00000000 */ nop +/* 13AC14 802478D4 00000000 */ nop /* 13AC18 802478D8 8FA40050 */ lw $a0, 0x50($sp) /* 13AC1C 802478DC 0C091C76 */ jal pause_badges_get_column /* 13AC20 802478E0 03C0282D */ daddu $a1, $fp, $zero /* 13AC24 802478E4 8FAA005C */ lw $t2, 0x5c($sp) /* 13AC28 802478E8 144A001F */ bne $v0, $t2, .L80247968 -/* 13AC2C 802478EC 00000000 */ nop +/* 13AC2C 802478EC 00000000 */ nop /* 13AC30 802478F0 8FA40050 */ lw $a0, 0x50($sp) /* 13AC34 802478F4 0C091C88 */ jal pause_badges_get_row /* 13AC38 802478F8 03C0282D */ daddu $a1, $fp, $zero @@ -335,7 +335,7 @@ glabel pause_badges_draw_contents .L802479F4: /* 13AD34 802479F4 8FAB0084 */ lw $t3, 0x84($sp) /* 13AD38 802479F8 1160002A */ beqz $t3, .L80247AA4 -/* 13AD3C 802479FC 00000000 */ nop +/* 13AD3C 802479FC 00000000 */ nop /* 13AD40 80247A00 0C091CAA */ jal pause_badges_scroll_offset_x /* 13AD44 80247A04 02E0202D */ daddu $a0, $s7, $zero /* 13AD48 80247A08 8FAA007C */ lw $t2, 0x7c($sp) @@ -373,7 +373,7 @@ glabel pause_badges_draw_contents /* 13ADC8 80247A88 0C03D4B8 */ jal draw_box /* 13ADCC 80247A8C AFA20048 */ sw $v0, 0x48($sp) /* 13ADD0 80247A90 08091EAD */ j .L80247AB4 -/* 13ADD4 80247A94 00000000 */ nop +/* 13ADD4 80247A94 00000000 */ nop .L80247A98: /* 13ADD8 80247A98 240A0001 */ addiu $t2, $zero, 1 /* 13ADDC 80247A9C 08091E2D */ j .L802478B4 @@ -387,7 +387,7 @@ glabel pause_badges_draw_contents /* 13ADF4 80247AB4 0C091C9C */ jal pause_badges_is_visible /* 13ADF8 80247AB8 02C0202D */ daddu $a0, $s6, $zero /* 13ADFC 80247ABC 104001A2 */ beqz $v0, .L80248148 -/* 13AE00 80247AC0 00000000 */ nop +/* 13AE00 80247AC0 00000000 */ nop /* 13AE04 80247AC4 8FAB0054 */ lw $t3, 0x54($sp) /* 13AE08 80247AC8 15600058 */ bnez $t3, .L80247C2C /* 13AE0C 80247ACC 24020001 */ addiu $v0, $zero, 1 @@ -416,7 +416,7 @@ glabel pause_badges_draw_contents /* 13AE68 80247B28 0C04993B */ jal draw_string /* 13AE6C 80247B2C AFAA0014 */ sw $t2, 0x14($sp) /* 13AE70 80247B30 08091F09 */ j .L80247C24 -/* 13AE74 80247B34 00000000 */ nop +/* 13AE74 80247B34 00000000 */ nop .L80247B38: /* 13AE78 80247B38 000212C3 */ sra $v0, $v0, 0xb /* 13AE7C 80247B3C 3C0B8008 */ lui $t3, %hi(gItemTable) @@ -424,9 +424,9 @@ glabel pause_badges_draw_contents /* 13AE84 80247B44 004B8821 */ addu $s1, $v0, $t3 /* 13AE88 80247B48 8E220000 */ lw $v0, ($s1) /* 13AE8C 80247B4C 10400015 */ beqz $v0, .L80247BA4 -/* 13AE90 80247B50 00000000 */ nop +/* 13AE90 80247B50 00000000 */ nop /* 13AE94 80247B54 18400013 */ blez $v0, .L80247BA4 -/* 13AE98 80247B58 00000000 */ nop +/* 13AE98 80247B58 00000000 */ nop /* 13AE9C 80247B5C 0C091CAA */ jal pause_badges_scroll_offset_x /* 13AEA0 80247B60 02E0202D */ daddu $a0, $s7, $zero /* 13AEA4 80247B64 8FAA007C */ lw $t2, 0x7c($sp) @@ -497,11 +497,11 @@ glabel pause_badges_draw_contents /* 13AF9C 80247C5C 34058000 */ ori $a1, $zero, 0x8000 /* 13AFA0 80247C60 8FAA0088 */ lw $t2, 0x88($sp) /* 13AFA4 80247C64 11400005 */ beqz $t2, .L80247C7C -/* 13AFA8 80247C68 00000000 */ nop +/* 13AFA8 80247C68 00000000 */ nop /* 13AFAC 80247C6C 3C118027 */ lui $s1, %hi(D_802703FC) /* 13AFB0 80247C70 8E3103FC */ lw $s1, %lo(D_802703FC)($s1) /* 13AFB4 80247C74 08091F51 */ j .L80247D44 -/* 13AFB8 80247C78 00000000 */ nop +/* 13AFB8 80247C78 00000000 */ nop .L80247C7C: /* 13AFBC 80247C7C 12A00010 */ beqz $s5, .L80247CC0 /* 13AFC0 80247C80 0220202D */ daddu $a0, $s1, $zero @@ -575,11 +575,11 @@ glabel pause_badges_draw_contents /* 13B0BC 80247D7C 00543021 */ addu $a2, $v0, $s4 /* 13B0C0 80247D80 8FAB0058 */ lw $t3, 0x58($sp) /* 13B0C4 80247D84 15600005 */ bnez $t3, .L80247D9C -/* 13B0C8 80247D88 00000000 */ nop +/* 13B0C8 80247D88 00000000 */ nop /* 13B0CC 80247D8C 0C0511F8 */ jal draw_icon_2 /* 13B0D0 80247D90 0220202D */ daddu $a0, $s1, $zero /* 13B0D4 80247D94 08091F69 */ j .L80247DA4 -/* 13B0D8 80247D98 00000000 */ nop +/* 13B0D8 80247D98 00000000 */ nop .L80247D9C: /* 13B0DC 80247D9C 0C0511F1 */ jal draw_icon_1 /* 13B0E0 80247DA0 0220202D */ daddu $a0, $s1, $zero @@ -591,7 +591,7 @@ glabel pause_badges_draw_contents /* 13B0F0 80247DB0 8FAB0054 */ lw $t3, 0x54($sp) /* 13B0F4 80247DB4 24020002 */ addiu $v0, $zero, 2 /* 13B0F8 80247DB8 156200E3 */ bne $t3, $v0, .L80248148 -/* 13B0FC 80247DBC 00000000 */ nop +/* 13B0FC 80247DBC 00000000 */ nop /* 13B100 80247DC0 8FAA0088 */ lw $t2, 0x88($sp) /* 13B104 80247DC4 154000E0 */ bnez $t2, .L80248148 /* 13B108 80247DC8 00131400 */ sll $v0, $s3, 0x10 @@ -686,7 +686,7 @@ glabel pause_badges_draw_contents /* 13B260 80247F20 26100001 */ addiu $s0, $s0, 1 /* 13B264 80247F24 0213102A */ slt $v0, $s0, $s3 /* 13B268 80247F28 1440FFD1 */ bnez $v0, .L80247E70 -/* 13B26C 80247F2C 00000000 */ nop +/* 13B26C 80247F2C 00000000 */ nop .L80247F30: /* 13B270 80247F30 3C06E200 */ lui $a2, 0xe200 /* 13B274 80247F34 34C6001C */ ori $a2, $a2, 0x1c @@ -765,9 +765,9 @@ glabel pause_badges_draw_contents .L80248050: /* 13B390 80248050 0213102A */ slt $v0, $s0, $s3 /* 13B394 80248054 1440FFD7 */ bnez $v0, .L80247FB4 -/* 13B398 80248058 00000000 */ nop +/* 13B398 80248058 00000000 */ nop /* 13B39C 8024805C 08092052 */ j .L80248148 -/* 13B3A0 80248060 00000000 */ nop +/* 13B3A0 80248060 00000000 */ nop .L80248064: /* 13B3A4 80248064 346364FF */ ori $v1, $v1, 0x64ff /* 13B3A8 80248068 0000802D */ daddu $s0, $zero, $zero @@ -818,7 +818,7 @@ glabel pause_badges_draw_contents /* 13B454 80248114 26100001 */ addiu $s0, $s0, 1 /* 13B458 80248118 0213102A */ slt $v0, $s0, $s3 /* 13B45C 8024811C 1440FFDB */ bnez $v0, .L8024808C -/* 13B460 80248120 00000000 */ nop +/* 13B460 80248120 00000000 */ nop .L80248124: /* 13B464 80248124 3C02800A */ lui $v0, %hi(gMasterGfxPos) /* 13B468 80248128 8C42A66C */ lw $v0, %lo(gMasterGfxPos)($v0) @@ -835,7 +835,7 @@ glabel pause_badges_draw_contents /* 13B490 80248150 27DE0001 */ addiu $fp, $fp, 1 /* 13B494 80248154 03C2102A */ slt $v0, $fp, $v0 /* 13B498 80248158 1440FDB2 */ bnez $v0, .L80247824 -/* 13B49C 8024815C 00000000 */ nop +/* 13B49C 8024815C 00000000 */ nop .L80248160: /* 13B4A0 80248160 8FAB0050 */ lw $t3, 0x50($sp) /* 13B4A4 80248164 256B0001 */ addiu $t3, $t3, 1 @@ -875,7 +875,7 @@ glabel pause_badges_draw_contents /* 13B524 802481E4 24060001 */ addiu $a2, $zero, 1 .L802481E8: /* 13B528 802481E8 18E002DC */ blez $a3, .L80248D5C -/* 13B52C 802481EC 00000000 */ nop +/* 13B52C 802481EC 00000000 */ nop /* 13B530 802481F0 190002DA */ blez $t0, .L80248D5C /* 13B534 802481F4 2882013F */ slti $v0, $a0, 0x13f /* 13B538 802481F8 104002D8 */ beqz $v0, .L80248D5C @@ -892,47 +892,47 @@ glabel pause_badges_draw_contents /* 13B55C 8024821C 3C014080 */ lui $at, 0x4080 /* 13B560 80248220 44812000 */ mtc1 $at, $f4 /* 13B564 80248224 44840000 */ mtc1 $a0, $f0 -/* 13B568 80248228 00000000 */ nop +/* 13B568 80248228 00000000 */ nop /* 13B56C 8024822C 46800020 */ cvt.s.w $f0, $f0 /* 13B570 80248230 46040002 */ mul.s $f0, $f0, $f4 -/* 13B574 80248234 00000000 */ nop +/* 13B574 80248234 00000000 */ nop /* 13B578 80248238 24A20008 */ addiu $v0, $a1, 8 /* 13B57C 8024823C 44861000 */ mtc1 $a2, $f2 -/* 13B580 80248240 00000000 */ nop +/* 13B580 80248240 00000000 */ nop /* 13B584 80248244 468010A0 */ cvt.s.w $f2, $f2 /* 13B588 80248248 3C04ED00 */ lui $a0, 0xed00 /* 13B58C 8024824C 46041082 */ mul.s $f2, $f2, $f4 -/* 13B590 80248250 00000000 */ nop +/* 13B590 80248250 00000000 */ nop /* 13B594 80248254 AD220000 */ sw $v0, ($t1) /* 13B598 80248258 4600018D */ trunc.w.s $f6, $f0 /* 13B59C 8024825C 44023000 */ mfc1 $v0, $f6 -/* 13B5A0 80248260 00000000 */ nop +/* 13B5A0 80248260 00000000 */ nop /* 13B5A4 80248264 30420FFF */ andi $v0, $v0, 0xfff /* 13B5A8 80248268 00021300 */ sll $v0, $v0, 0xc /* 13B5AC 8024826C 4600118D */ trunc.w.s $f6, $f2 /* 13B5B0 80248270 44033000 */ mfc1 $v1, $f6 /* 13B5B4 80248274 44871000 */ mtc1 $a3, $f2 -/* 13B5B8 80248278 00000000 */ nop +/* 13B5B8 80248278 00000000 */ nop /* 13B5BC 8024827C 468010A0 */ cvt.s.w $f2, $f2 /* 13B5C0 80248280 46041082 */ mul.s $f2, $f2, $f4 -/* 13B5C4 80248284 00000000 */ nop +/* 13B5C4 80248284 00000000 */ nop /* 13B5C8 80248288 30630FFF */ andi $v1, $v1, 0xfff /* 13B5CC 8024828C 00641825 */ or $v1, $v1, $a0 /* 13B5D0 80248290 00431025 */ or $v0, $v0, $v1 /* 13B5D4 80248294 44880000 */ mtc1 $t0, $f0 -/* 13B5D8 80248298 00000000 */ nop +/* 13B5D8 80248298 00000000 */ nop /* 13B5DC 8024829C 46800020 */ cvt.s.w $f0, $f0 /* 13B5E0 802482A0 46040002 */ mul.s $f0, $f0, $f4 -/* 13B5E4 802482A4 00000000 */ nop +/* 13B5E4 802482A4 00000000 */ nop /* 13B5E8 802482A8 ACA20000 */ sw $v0, ($a1) /* 13B5EC 802482AC 4600118D */ trunc.w.s $f6, $f2 /* 13B5F0 802482B0 44023000 */ mfc1 $v0, $f6 -/* 13B5F4 802482B4 00000000 */ nop +/* 13B5F4 802482B4 00000000 */ nop /* 13B5F8 802482B8 30420FFF */ andi $v0, $v0, 0xfff /* 13B5FC 802482BC 00021300 */ sll $v0, $v0, 0xc /* 13B600 802482C0 4600018D */ trunc.w.s $f6, $f0 /* 13B604 802482C4 44033000 */ mfc1 $v1, $f6 -/* 13B608 802482C8 00000000 */ nop +/* 13B608 802482C8 00000000 */ nop /* 13B60C 802482CC 30630FFF */ andi $v1, $v1, 0xfff /* 13B610 802482D0 00431025 */ or $v0, $v0, $v1 /* 13B614 802482D4 3C038027 */ lui $v1, %hi(gPauseMenuCurrentTab) @@ -944,7 +944,7 @@ glabel pause_badges_draw_contents /* 13B62C 802482EC 3C038027 */ lui $v1, %hi(gBadgeMenuLevel) /* 13B630 802482F0 8C630398 */ lw $v1, %lo(gBadgeMenuLevel)($v1) /* 13B634 802482F4 14620026 */ bne $v1, $v0, .L80248390 -/* 13B638 802482F8 00000000 */ nop +/* 13B638 802482F8 00000000 */ nop /* 13B63C 802482FC 3C118027 */ lui $s1, %hi(gBadgeMenuCurrentPage) /* 13B640 80248300 26310280 */ addiu $s1, $s1, %lo(gBadgeMenuCurrentPage) /* 13B644 80248304 8E220000 */ lw $v0, ($s1) @@ -960,7 +960,7 @@ glabel pause_badges_draw_contents /* 13B66C 8024832C 2546000E */ addiu $a2, $t2, 0xe /* 13B670 80248330 8E040044 */ lw $a0, 0x44($s0) /* 13B674 80248334 0C0511F8 */ jal draw_icon_2 -/* 13B678 80248338 00000000 */ nop +/* 13B678 80248338 00000000 */ nop /* 13B67C 8024833C 8E220000 */ lw $v0, ($s1) /* 13B680 80248340 24420001 */ addiu $v0, $v0, 1 .L80248344: @@ -971,7 +971,7 @@ glabel pause_badges_draw_contents /* 13B694 80248354 00431021 */ addu $v0, $v0, $v1 /* 13B698 80248358 90420288 */ lbu $v0, %lo(gBadgeMenuPages)($v0) /* 13B69C 8024835C 1040000C */ beqz $v0, .L80248390 -/* 13B6A0 80248360 00000000 */ nop +/* 13B6A0 80248360 00000000 */ nop /* 13B6A4 80248364 3C108027 */ lui $s0, %hi(D_802703A8) /* 13B6A8 80248368 261003A8 */ addiu $s0, $s0, %lo(D_802703A8) /* 13B6AC 8024836C 8FAB00C4 */ lw $t3, 0xc4($sp) @@ -982,7 +982,7 @@ glabel pause_badges_draw_contents /* 13B6C0 80248380 25460092 */ addiu $a2, $t2, 0x92 /* 13B6C4 80248384 8E040048 */ lw $a0, 0x48($s0) /* 13B6C8 80248388 0C0511F8 */ jal draw_icon_2 -/* 13B6CC 8024838C 00000000 */ nop +/* 13B6CC 8024838C 00000000 */ nop .L80248390: /* 13B6D0 80248390 3C108027 */ lui $s0, %hi(D_802703A8) /* 13B6D4 80248394 261003A8 */ addiu $s0, $s0, %lo(D_802703A8) @@ -1192,7 +1192,7 @@ glabel pause_badges_draw_contents /* 13B9F0 802486B0 00041100 */ sll $v0, $a0, 4 /* 13B9F4 802486B4 00441023 */ subu $v0, $v0, $a0 /* 13B9F8 802486B8 44826000 */ mtc1 $v0, $f12 -/* 13B9FC 802486BC 00000000 */ nop +/* 13B9FC 802486BC 00000000 */ nop /* 13BA00 802486C0 46806320 */ cvt.s.w $f12, $f12 /* 13BA04 802486C4 0C00A8BB */ jal sin_deg /* 13BA08 802486C8 AE030000 */ sw $v1, ($s0) @@ -1209,7 +1209,7 @@ glabel pause_badges_draw_contents /* 13BA34 802486F4 D422FFB0 */ ldc1 $f2, %lo(D_8026FFB0)($at) /* 13BA38 802486F8 46000021 */ cvt.d.s $f0, $f0 /* 13BA3C 802486FC 46220002 */ mul.d $f0, $f0, $f2 -/* 13BA40 80248700 00000000 */ nop +/* 13BA40 80248700 00000000 */ nop /* 13BA44 80248704 24A50008 */ addiu $a1, $a1, 8 /* 13BA48 80248708 AE050000 */ sw $a1, ($s0) /* 13BA4C 8024870C AC440000 */ sw $a0, ($v0) @@ -1225,21 +1225,21 @@ glabel pause_badges_draw_contents /* 13BA74 80248734 44811000 */ mtc1 $at, $f2 /* 13BA78 80248738 46200020 */ cvt.s.d $f0, $f0 /* 13BA7C 8024873C 46020002 */ mul.s $f0, $f0, $f2 -/* 13BA80 80248740 00000000 */ nop +/* 13BA80 80248740 00000000 */ nop /* 13BA84 80248744 ACA20000 */ sw $v0, ($a1) /* 13BA88 80248748 00171400 */ sll $v0, $s7, 0x10 /* 13BA8C 8024874C 001E1A00 */ sll $v1, $fp, 8 /* 13BA90 80248750 00431025 */ or $v0, $v0, $v1 /* 13BA94 80248754 4600018D */ trunc.w.s $f6, $f0 /* 13BA98 80248758 44043000 */ mfc1 $a0, $f6 -/* 13BA9C 8024875C 00000000 */ nop +/* 13BA9C 8024875C 00000000 */ nop /* 13BAA0 80248760 308400FF */ andi $a0, $a0, 0xff /* 13BAA4 80248764 00441025 */ or $v0, $v0, $a0 /* 13BAA8 80248768 ACA20004 */ sw $v0, 4($a1) /* 13BAAC 8024876C 8FAB006C */ lw $t3, 0x6c($sp) /* 13BAB0 80248770 022B102A */ slt $v0, $s1, $t3 /* 13BAB4 80248774 10400046 */ beqz $v0, .L80248890 -/* 13BAB8 80248778 00000000 */ nop +/* 13BAB8 80248778 00000000 */ nop /* 13BABC 8024877C 3C106666 */ lui $s0, 0x6666 /* 13BAC0 80248780 36106667 */ ori $s0, $s0, 0x6667 /* 13BAC4 80248784 02300018 */ mult $s1, $s0 @@ -1270,7 +1270,7 @@ glabel pause_badges_draw_contents /* 13BB24 802487E4 1440FFE8 */ bnez $v0, .L80248788 /* 13BB28 802487E8 02300018 */ mult $s1, $s0 /* 13BB2C 802487EC 08092224 */ j .L80248890 -/* 13BB30 802487F0 00000000 */ nop +/* 13BB30 802487F0 00000000 */ nop .L802487F4: /* 13BB34 802487F4 ACA20000 */ sw $v0, ($a1) /* 13BB38 802487F8 3C02FA00 */ lui $v0, 0xfa00 @@ -1464,7 +1464,7 @@ glabel pause_badges_draw_contents /* 13BDF0 80248AB0 806300D4 */ lb $v1, %lo(gPauseMenuCurrentTab)($v1) /* 13BDF4 80248AB4 24020002 */ addiu $v0, $zero, 2 /* 13BDF8 80248AB8 14620050 */ bne $v1, $v0, .L80248BFC -/* 13BDFC 80248ABC 00000000 */ nop +/* 13BDFC 80248ABC 00000000 */ nop /* 13BE00 80248AC0 3C028027 */ lui $v0, %hi(gBadgeMenuLevel) /* 13BE04 80248AC4 8C420398 */ lw $v0, %lo(gBadgeMenuLevel)($v0) /* 13BE08 80248AC8 14400009 */ bnez $v0, .L80248AF0 @@ -1538,7 +1538,7 @@ glabel pause_badges_draw_contents /* 13BF0C 80248BCC 0C090AEB */ jal func_80242BAC /* 13BF10 80248BD0 01463021 */ addu $a2, $t2, $a2 /* 13BF14 80248BD4 080922FF */ j .L80248BFC -/* 13BF18 80248BD8 00000000 */ nop +/* 13BF18 80248BD8 00000000 */ nop .L80248BDC: /* 13BF1C 80248BDC 2605005D */ addiu $a1, $s0, 0x5d /* 13BF20 80248BE0 24C60017 */ addiu $a2, $a2, 0x17 @@ -1548,13 +1548,13 @@ glabel pause_badges_draw_contents /* 13BF30 80248BF0 01463021 */ addu $a2, $t2, $a2 .L80248BF4: /* 13BF34 80248BF4 0C090B41 */ jal func_80242D04 -/* 13BF38 80248BF8 00000000 */ nop +/* 13BF38 80248BF8 00000000 */ nop .L80248BFC: /* 13BF3C 80248BFC 3C108027 */ lui $s0, %hi(gBadgeMenuBShowNotEnoughBP) /* 13BF40 80248C00 261003A0 */ addiu $s0, $s0, %lo(gBadgeMenuBShowNotEnoughBP) /* 13BF44 80248C04 8E020000 */ lw $v0, ($s0) /* 13BF48 80248C08 10400054 */ beqz $v0, .L80248D5C -/* 13BF4C 80248C0C 00000000 */ nop +/* 13BF4C 80248C0C 00000000 */ nop /* 13BF50 80248C10 0C090AE8 */ jal pause_set_cursor_opacity /* 13BF54 80248C14 0000202D */ daddu $a0, $zero, $zero /* 13BF58 80248C18 8E020000 */ lw $v0, ($s0) diff --git a/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s b/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s index c737107fe1..b03c3172af 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_handle_input.s @@ -27,19 +27,19 @@ glabel pause_badges_handle_input /* 13C43C 802490FC 14410004 */ bne $v0, $at, .L80249110 /* 13C440 80249100 3C018000 */ lui $at, 0x8000 /* 13C444 80249104 15210002 */ bne $t1, $at, .L80249110 -/* 13C448 80249108 00000000 */ nop +/* 13C448 80249108 00000000 */ nop /* 13C44C 8024910C 0006000D */ break 6 .L80249110: /* 13C450 80249110 00002812 */ mflo $a1 /* 13C454 80249114 00004010 */ mfhi $t0 /* 13C458 80249118 30628000 */ andi $v0, $v1, 0x8000 /* 13C45C 8024911C 1040003F */ beqz $v0, .L8024921C -/* 13C460 80249120 00000000 */ nop +/* 13C460 80249120 00000000 */ nop /* 13C464 80249124 3C128027 */ lui $s2, %hi(gBadgeMenuBShowNotEnoughBP) /* 13C468 80249128 265203A0 */ addiu $s2, $s2, %lo(gBadgeMenuBShowNotEnoughBP) /* 13C46C 8024912C 8E420000 */ lw $v0, ($s2) /* 13C470 80249130 10400003 */ beqz $v0, .L80249140 -/* 13C474 80249134 00000000 */ nop +/* 13C474 80249134 00000000 */ nop /* 13C478 80249138 08092581 */ j .L80249604 /* 13C47C 8024913C AE400000 */ sw $zero, ($s2) .L80249140: @@ -57,13 +57,13 @@ glabel pause_badges_handle_input /* 13C4AC 8024916C 0C05272D */ jal play_sound /* 13C4B0 80249170 2404021D */ addiu $a0, $zero, 0x21d /* 13C4B4 80249174 08092581 */ j .L80249604 -/* 13C4B8 80249178 00000000 */ nop +/* 13C4B8 80249178 00000000 */ nop .L8024917C: /* 13C4BC 8024917C AC820000 */ sw $v0, ($a0) /* 13C4C0 80249180 0C05272D */ jal play_sound /* 13C4C4 80249184 240400C9 */ addiu $a0, $zero, 0xc9 /* 13C4C8 80249188 08092581 */ j .L80249604 -/* 13C4CC 8024918C 00000000 */ nop +/* 13C4CC 8024918C 00000000 */ nop .L80249190: /* 13C4D0 80249190 3C118027 */ lui $s1, %hi(gBadgeMenuItemIDs) /* 13C4D4 80249194 02228821 */ addu $s1, $s1, $v0 @@ -77,23 +77,23 @@ glabel pause_badges_handle_input /* 13C4F4 802491B4 50400005 */ beql $v0, $zero, .L802491CC /* 13C4F8 802491B8 24020002 */ addiu $v0, $zero, 2 /* 13C4FC 802491BC 12000009 */ beqz $s0, .L802491E4 -/* 13C500 802491C0 00000000 */ nop +/* 13C500 802491C0 00000000 */ nop /* 13C504 802491C4 08092581 */ j .L80249604 -/* 13C508 802491C8 00000000 */ nop +/* 13C508 802491C8 00000000 */ nop .L802491CC: /* 13C50C 802491CC 1202000B */ beq $s0, $v0, .L802491FC /* 13C510 802491D0 24020003 */ addiu $v0, $zero, 3 /* 13C514 802491D4 1202000D */ beq $s0, $v0, .L8024920C -/* 13C518 802491D8 00000000 */ nop +/* 13C518 802491D8 00000000 */ nop /* 13C51C 802491DC 08092581 */ j .L80249604 -/* 13C520 802491E0 00000000 */ nop +/* 13C520 802491E0 00000000 */ nop .L802491E4: /* 13C524 802491E4 0C05272D */ jal play_sound /* 13C528 802491E8 24040006 */ addiu $a0, $zero, 6 /* 13C52C 802491EC 0C091CAC */ jal pause_badges_try_remove /* 13C530 802491F0 0220202D */ daddu $a0, $s1, $zero /* 13C534 802491F4 08092581 */ j .L80249604 -/* 13C538 802491F8 00000000 */ nop +/* 13C538 802491F8 00000000 */ nop .L802491FC: /* 13C53C 802491FC 0C05272D */ jal play_sound /* 13C540 80249200 2404021D */ addiu $a0, $zero, 0x21d @@ -103,14 +103,14 @@ glabel pause_badges_handle_input /* 13C54C 8024920C 0C05272D */ jal play_sound /* 13C550 80249210 24040005 */ addiu $a0, $zero, 5 /* 13C554 80249214 08092581 */ j .L80249604 -/* 13C558 80249218 00000000 */ nop +/* 13C558 80249218 00000000 */ nop .L8024921C: /* 13C55C 8024921C 14600005 */ bnez $v1, .L80249234 -/* 13C560 80249220 00000000 */ nop +/* 13C560 80249220 00000000 */ nop /* 13C564 80249224 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 13C568 80249228 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 13C56C 8024922C 10400003 */ beqz $v0, .L8024923C -/* 13C570 80249230 00000000 */ nop +/* 13C570 80249230 00000000 */ nop .L80249234: /* 13C574 80249234 3C018027 */ lui $at, %hi(gBadgeMenuBShowNotEnoughBP) /* 13C578 80249238 AC2003A0 */ sw $zero, %lo(gBadgeMenuBShowNotEnoughBP)($at) @@ -118,7 +118,7 @@ glabel pause_badges_handle_input /* 13C57C 8024923C 3C028027 */ lui $v0, %hi(gBadgeMenuNumItems) /* 13C580 80249240 84420384 */ lh $v0, %lo(gBadgeMenuNumItems)($v0) /* 13C584 80249244 104000B1 */ beqz $v0, .L8024950C -/* 13C588 80249248 00000000 */ nop +/* 13C588 80249248 00000000 */ nop /* 13C58C 8024924C 3C028027 */ lui $v0, %hi(gBadgeMenuLevel) /* 13C590 80249250 8C420398 */ lw $v0, %lo(gBadgeMenuLevel)($v0) /* 13C594 80249254 14400015 */ bnez $v0, .L802492AC @@ -136,14 +136,14 @@ glabel pause_badges_handle_input .L80249284: /* 13C5C4 80249284 8E020000 */ lw $v0, ($s0) /* 13C5C8 80249288 106200A0 */ beq $v1, $v0, .L8024950C -/* 13C5CC 8024928C 00000000 */ nop +/* 13C5CC 8024928C 00000000 */ nop /* 13C5D0 80249290 0C05272D */ jal play_sound /* 13C5D4 80249294 240400C8 */ addiu $a0, $zero, 0xc8 /* 13C5D8 80249298 8E040000 */ lw $a0, ($s0) /* 13C5DC 8024929C 0C092363 */ jal pause_badges_load_badges -/* 13C5E0 802492A0 00000000 */ nop +/* 13C5E0 802492A0 00000000 */ nop /* 13C5E4 802492A4 08092543 */ j .L8024950C -/* 13C5E8 802492A8 00000000 */ nop +/* 13C5E8 802492A8 00000000 */ nop .L802492AC: /* 13C5EC 802492AC 3C038027 */ lui $v1, %hi(gPauseMenuHeldButtons) /* 13C5F0 802492B0 8C6300C0 */ lw $v1, %lo(gPauseMenuHeldButtons)($v1) @@ -197,7 +197,7 @@ glabel pause_badges_handle_input /* 13C6A0 80249360 3C020002 */ lui $v0, 2 /* 13C6A4 80249364 00621024 */ and $v0, $v1, $v0 /* 13C6A8 80249368 1040001C */ beqz $v0, .L802493DC -/* 13C6AC 8024936C 00000000 */ nop +/* 13C6AC 8024936C 00000000 */ nop /* 13C6B0 80249370 3C068027 */ lui $a2, %hi(gBadgeMenuCurrentPage) /* 13C6B4 80249374 24C60280 */ addiu $a2, $a2, %lo(gBadgeMenuCurrentPage) /* 13C6B8 80249378 8CC40000 */ lw $a0, ($a2) @@ -221,7 +221,7 @@ glabel pause_badges_handle_input /* 13C700 802493C0 ACC20000 */ sw $v0, ($a2) /* 13C704 802493C4 90620000 */ lbu $v0, ($v1) /* 13C708 802493C8 14400015 */ bnez $v0, .L80249420 -/* 13C70C 802493CC 00000000 */ nop +/* 13C70C 802493CC 00000000 */ nop /* 13C710 802493D0 ACC40000 */ sw $a0, ($a2) /* 13C714 802493D4 08092508 */ j .L80249420 /* 13C718 802493D8 24A5FFFF */ addiu $a1, $a1, -1 @@ -239,7 +239,7 @@ glabel pause_badges_handle_input /* 13C744 80249404 00441821 */ addu $v1, $v0, $a0 /* 13C748 80249408 90620000 */ lbu $v0, ($v1) /* 13C74C 8024940C 14400003 */ bnez $v0, .L8024941C -/* 13C750 80249410 00000000 */ nop +/* 13C750 80249410 00000000 */ nop /* 13C754 80249414 08092508 */ j .L80249420 /* 13C758 80249418 ACC70000 */ sw $a3, ($a2) .L8024941C: @@ -271,15 +271,15 @@ glabel pause_badges_handle_input /* 13C7BC 8024947C 0502000B */ bltzl $t0, .L802494AC /* 13C7C0 80249480 2488FFFF */ addiu $t0, $a0, -1 /* 13C7C4 80249484 0809252B */ j .L802494AC -/* 13C7C8 80249488 00000000 */ nop +/* 13C7C8 80249488 00000000 */ nop .L8024948C: /* 13C7CC 8024948C 00621024 */ and $v0, $v1, $v0 /* 13C7D0 80249490 10400006 */ beqz $v0, .L802494AC -/* 13C7D4 80249494 00000000 */ nop +/* 13C7D4 80249494 00000000 */ nop /* 13C7D8 80249498 25080001 */ addiu $t0, $t0, 1 /* 13C7DC 8024949C 0104102A */ slt $v0, $t0, $a0 /* 13C7E0 802494A0 14400002 */ bnez $v0, .L802494AC -/* 13C7E4 802494A4 00000000 */ nop +/* 13C7E4 802494A4 00000000 */ nop .L802494A8: /* 13C7E8 802494A8 0000402D */ daddu $t0, $zero, $zero .L802494AC: @@ -313,13 +313,13 @@ glabel pause_badges_handle_input /* 13C850 80249510 8C630398 */ lw $v1, %lo(gBadgeMenuLevel)($v1) /* 13C854 80249514 24020001 */ addiu $v0, $zero, 1 /* 13C858 80249518 14620014 */ bne $v1, $v0, .L8024956C -/* 13C85C 8024951C 00000000 */ nop +/* 13C85C 8024951C 00000000 */ nop /* 13C860 80249520 3C038027 */ lui $v1, %hi(gBadgeMenuSelectedItemID) /* 13C864 80249524 8C630380 */ lw $v1, %lo(gBadgeMenuSelectedItemID)($v1) /* 13C868 80249528 24628002 */ addiu $v0, $v1, -0x7ffe /* 13C86C 8024952C 2C420002 */ sltiu $v0, $v0, 2 /* 13C870 80249530 1440000A */ bnez $v0, .L8024955C -/* 13C874 80249534 00000000 */ nop +/* 13C874 80249534 00000000 */ nop /* 13C878 80249538 10600008 */ beqz $v1, .L8024955C /* 13C87C 8024953C 00031140 */ sll $v0, $v1, 5 /* 13C880 80249540 3C018008 */ lui $at, %hi(gItemTable+0x10) @@ -328,12 +328,12 @@ glabel pause_badges_handle_input /* 13C88C 8024954C 3C018027 */ lui $at, %hi(gPauseMenuCurrentDescString) /* 13C890 80249550 AC2200C8 */ sw $v0, %lo(gPauseMenuCurrentDescString)($at) /* 13C894 80249554 08092566 */ j .L80249598 -/* 13C898 80249558 00000000 */ nop +/* 13C898 80249558 00000000 */ nop .L8024955C: /* 13C89C 8024955C 3C018027 */ lui $at, %hi(gPauseMenuCurrentDescString) /* 13C8A0 80249560 AC2000C8 */ sw $zero, %lo(gPauseMenuCurrentDescString)($at) /* 13C8A4 80249564 08092564 */ j .L80249590 -/* 13C8A8 80249568 00000000 */ nop +/* 13C8A8 80249568 00000000 */ nop .L8024956C: /* 13C8AC 8024956C 3C028027 */ lui $v0, %hi(gBadgeMenuCurrentTab) /* 13C8B0 80249570 8C42039C */ lw $v0, %lo(gBadgeMenuCurrentTab)($v0) @@ -342,7 +342,7 @@ glabel pause_badges_handle_input /* 13C8BC 8024957C 2404004C */ addiu $a0, $zero, 0x4c .L80249580: /* 13C8C0 80249580 0C093BA0 */ jal pause_get_menu_string -/* 13C8C4 80249584 00000000 */ nop +/* 13C8C4 80249584 00000000 */ nop /* 13C8C8 80249588 3C018027 */ lui $at, %hi(gPauseMenuCurrentDescString) /* 13C8CC 8024958C AC2200C8 */ sw $v0, %lo(gPauseMenuCurrentDescString)($at) .L80249590: @@ -353,18 +353,18 @@ glabel pause_badges_handle_input /* 13C8DC 8024959C 8C4200C4 */ lw $v0, %lo(gPauseMenuPressedButtons)($v0) /* 13C8E0 802495A0 30424000 */ andi $v0, $v0, 0x4000 /* 13C8E4 802495A4 10400017 */ beqz $v0, .L80249604 -/* 13C8E8 802495A8 00000000 */ nop +/* 13C8E8 802495A8 00000000 */ nop /* 13C8EC 802495AC 3C108027 */ lui $s0, %hi(gBadgeMenuLevel) /* 13C8F0 802495B0 26100398 */ addiu $s0, $s0, %lo(gBadgeMenuLevel) /* 13C8F4 802495B4 8E020000 */ lw $v0, ($s0) /* 13C8F8 802495B8 14400007 */ bnez $v0, .L802495D8 -/* 13C8FC 802495BC 00000000 */ nop +/* 13C8FC 802495BC 00000000 */ nop /* 13C900 802495C0 0C05272D */ jal play_sound /* 13C904 802495C4 240400CA */ addiu $a0, $zero, 0xca /* 13C908 802495C8 3C018027 */ lui $at, %hi(gPauseMenuCurrentTab) /* 13C90C 802495CC A02000D4 */ sb $zero, %lo(gPauseMenuCurrentTab)($at) /* 13C910 802495D0 08092581 */ j .L80249604 -/* 13C914 802495D4 00000000 */ nop +/* 13C914 802495D4 00000000 */ nop .L802495D8: /* 13C918 802495D8 0C05272D */ jal play_sound /* 13C91C 802495DC 240400CA */ addiu $a0, $zero, 0xca @@ -374,7 +374,7 @@ glabel pause_badges_handle_input /* 13C92C 802495EC 8C63039C */ lw $v1, %lo(gBadgeMenuCurrentTab)($v1) /* 13C930 802495F0 24020001 */ addiu $v0, $zero, 1 /* 13C934 802495F4 14620003 */ bne $v1, $v0, .L80249604 -/* 13C938 802495F8 00000000 */ nop +/* 13C938 802495F8 00000000 */ nop /* 13C93C 802495FC 0C092363 */ jal pause_badges_load_badges /* 13C940 80249600 0040202D */ daddu $a0, $v0, $zero .L80249604: diff --git a/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s b/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s index 390af960b9..57585229d7 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_load_badges.s @@ -23,7 +23,7 @@ glabel pause_badges_load_badges /* 13C110 80248DD0 24840001 */ addiu $a0, $a0, 1 /* 13C114 80248DD4 28420155 */ slti $v0, $v0, 0x155 /* 13C118 80248DD8 10400019 */ beqz $v0, .L80248E40 -/* 13C11C 80248DDC 00000000 */ nop +/* 13C11C 80248DDC 00000000 */ nop /* 13C120 80248DE0 A4A30000 */ sh $v1, ($a1) /* 13C124 80248DE4 24A50002 */ addiu $a1, $a1, 2 /* 13C128 80248DE8 26100001 */ addiu $s0, $s0, 1 @@ -32,10 +32,10 @@ glabel pause_badges_load_badges /* 13C130 80248DF0 1440FFF4 */ bnez $v0, .L80248DC4 /* 13C134 80248DF4 24C60002 */ addiu $a2, $a2, 2 /* 13C138 80248DF8 08092390 */ j .L80248E40 -/* 13C13C 80248DFC 00000000 */ nop +/* 13C13C 80248DFC 00000000 */ nop .L80248E00: /* 13C140 80248E00 0C091C2C */ jal pause_badges_count_equipped -/* 13C144 80248E04 00000000 */ nop +/* 13C144 80248E04 00000000 */ nop /* 13C148 80248E08 26260208 */ addiu $a2, $s1, 0x208 /* 13C14C 80248E0C 0000202D */ daddu $a0, $zero, $zero /* 13C150 80248E10 3C058027 */ lui $a1, %hi(gBadgeMenuItemIDs) diff --git a/asm/nonmatchings/code_138CC0/pause_badges_try_equip.s b/asm/nonmatchings/code_138CC0/pause_badges_try_equip.s index a03c0ac79e..55560ad960 100644 --- a/asm/nonmatchings/code_138CC0/pause_badges_try_equip.s +++ b/asm/nonmatchings/code_138CC0/pause_badges_try_equip.s @@ -35,7 +35,7 @@ glabel pause_badges_try_equip /* 13A6E4 802473A4 1440FFFB */ bnez $v0, .L80247394 /* 13A6E8 802473A8 24A50002 */ addiu $a1, $a1, 2 /* 13A6EC 802473AC 0C0911FD */ jal pause_get_total_equipped_bp_cost -/* 13A6F0 802473B0 00000000 */ nop +/* 13A6F0 802473B0 00000000 */ nop /* 13A6F4 802473B4 0040202D */ daddu $a0, $v0, $zero /* 13A6F8 802473B8 00101400 */ sll $v0, $s0, 0x10 /* 13A6FC 802473BC 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s b/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s index 3a52e69974..1c9012e8d1 100644 --- a/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s +++ b/asm/nonmatchings/code_138CC0/pause_stats_draw_contents.s @@ -106,7 +106,7 @@ glabel pause_stats_draw_contents /* 138E54 80245B14 02A0302D */ daddu $a2, $s5, $zero /* 138E58 80245B18 8E240014 */ lw $a0, 0x14($s1) /* 138E5C 80245B1C 0C0511F8 */ jal draw_icon_2 -/* 138E60 80245B20 00000000 */ nop +/* 138E60 80245B20 00000000 */ nop /* 138E64 80245B24 0C093BA0 */ jal pause_get_menu_string /* 138E68 80245B28 24040034 */ addiu $a0, $zero, 0x34 /* 138E6C 80245B2C 0040202D */ daddu $a0, $v0, $zero @@ -150,7 +150,7 @@ glabel pause_stats_draw_contents /* 138F04 80245BC4 02A0282D */ daddu $a1, $s5, $zero /* 138F08 80245BC8 8E24001C */ lw $a0, 0x1c($s1) /* 138F0C 80245BCC 0C0511F8 */ jal draw_icon_2 -/* 138F10 80245BD0 00000000 */ nop +/* 138F10 80245BD0 00000000 */ nop /* 138F14 80245BD4 0C093BA0 */ jal pause_get_menu_string /* 138F18 80245BD8 24040036 */ addiu $a0, $zero, 0x36 /* 138F1C 80245BDC 0040202D */ daddu $a0, $v0, $zero @@ -560,7 +560,7 @@ glabel pause_stats_draw_contents /* 139550 80246210 0220282D */ daddu $a1, $s1, $zero /* 139554 80246214 8EC40004 */ lw $a0, 4($s6) /* 139558 80246218 0C0511F8 */ jal draw_icon_2 -/* 13955C 8024621C 00000000 */ nop +/* 13955C 8024621C 00000000 */ nop /* 139560 80246220 3C048025 */ lui $a0, %hi(D_8024F380) /* 139564 80246224 00902021 */ addu $a0, $a0, $s0 /* 139568 80246228 8C84F380 */ lw $a0, %lo(D_8024F380)($a0) @@ -634,7 +634,7 @@ glabel pause_stats_draw_contents /* 139670 80246330 02C2B021 */ addu $s6, $s6, $v0 /* 139674 80246334 02B6102A */ slt $v0, $s5, $s6 /* 139678 80246338 104000E7 */ beqz $v0, .L802466D8 -/* 13967C 8024633C 00000000 */ nop +/* 13967C 8024633C 00000000 */ nop .L80246340: /* 139680 80246340 26730001 */ addiu $s3, $s3, 1 /* 139684 80246344 00158080 */ sll $s0, $s5, 2 @@ -655,7 +655,7 @@ glabel pause_stats_draw_contents /* 1396C0 80246380 0C051261 */ jal set_icon_render_pos /* 1396C4 80246384 02052821 */ addu $a1, $s0, $a1 /* 1396C8 80246388 12800005 */ beqz $s4, .L802463A0 -/* 1396CC 8024638C 00000000 */ nop +/* 1396CC 8024638C 00000000 */ nop /* 1396D0 80246390 0C0511F8 */ jal draw_icon_2 /* 1396D4 80246394 0220202D */ daddu $a0, $s1, $zero /* 1396D8 80246398 080918EA */ j .L802463A8 @@ -686,7 +686,7 @@ glabel pause_stats_draw_contents /* 139734 802463F4 0C051261 */ jal set_icon_render_pos /* 139738 802463F8 02052821 */ addu $a1, $s0, $a1 /* 13973C 802463FC 12800005 */ beqz $s4, .L80246414 -/* 139740 80246400 00000000 */ nop +/* 139740 80246400 00000000 */ nop /* 139744 80246404 0C0511F8 */ jal draw_icon_2 /* 139748 80246408 0220202D */ daddu $a0, $s1, $zero /* 13974C 8024640C 08091907 */ j .L8024641C @@ -717,7 +717,7 @@ glabel pause_stats_draw_contents /* 1397A8 80246468 0C051261 */ jal set_icon_render_pos /* 1397AC 8024646C 02052821 */ addu $a1, $s0, $a1 /* 1397B0 80246470 12800005 */ beqz $s4, .L80246488 -/* 1397B4 80246474 00000000 */ nop +/* 1397B4 80246474 00000000 */ nop /* 1397B8 80246478 0C0511F8 */ jal draw_icon_2 /* 1397BC 8024647C 0220202D */ daddu $a0, $s1, $zero /* 1397C0 80246480 08091924 */ j .L80246490 @@ -748,7 +748,7 @@ glabel pause_stats_draw_contents /* 13981C 802464DC 0C051261 */ jal set_icon_render_pos /* 139820 802464E0 02052821 */ addu $a1, $s0, $a1 /* 139824 802464E4 12800005 */ beqz $s4, .L802464FC -/* 139828 802464E8 00000000 */ nop +/* 139828 802464E8 00000000 */ nop /* 13982C 802464EC 0C0511F8 */ jal draw_icon_2 /* 139830 802464F0 0220202D */ daddu $a0, $s1, $zero /* 139834 802464F4 08091941 */ j .L80246504 @@ -779,7 +779,7 @@ glabel pause_stats_draw_contents /* 139890 80246550 0C051261 */ jal set_icon_render_pos /* 139894 80246554 02052821 */ addu $a1, $s0, $a1 /* 139898 80246558 12800005 */ beqz $s4, .L80246570 -/* 13989C 8024655C 00000000 */ nop +/* 13989C 8024655C 00000000 */ nop /* 1398A0 80246560 0C0511F8 */ jal draw_icon_2 /* 1398A4 80246564 0220202D */ daddu $a0, $s1, $zero /* 1398A8 80246568 0809195E */ j .L80246578 @@ -810,7 +810,7 @@ glabel pause_stats_draw_contents /* 139904 802465C4 0C051261 */ jal set_icon_render_pos /* 139908 802465C8 02052821 */ addu $a1, $s0, $a1 /* 13990C 802465CC 12800005 */ beqz $s4, .L802465E4 -/* 139910 802465D0 00000000 */ nop +/* 139910 802465D0 00000000 */ nop /* 139914 802465D4 0C0511F8 */ jal draw_icon_2 /* 139918 802465D8 0220202D */ daddu $a0, $s1, $zero /* 13991C 802465DC 0809197B */ j .L802465EC @@ -841,7 +841,7 @@ glabel pause_stats_draw_contents /* 139978 80246638 0C051261 */ jal set_icon_render_pos /* 13997C 8024663C 02052821 */ addu $a1, $s0, $a1 /* 139980 80246640 12800005 */ beqz $s4, .L80246658 -/* 139984 80246644 00000000 */ nop +/* 139984 80246644 00000000 */ nop /* 139988 80246648 0C0511F8 */ jal draw_icon_2 /* 13998C 8024664C 0220202D */ daddu $a0, $s1, $zero /* 139990 80246650 08091998 */ j .L80246660 @@ -869,7 +869,7 @@ glabel pause_stats_draw_contents /* 1399E0 802466A0 0C051261 */ jal set_icon_render_pos /* 1399E4 802466A4 01102821 */ addu $a1, $t0, $s0 /* 1399E8 802466A8 12800005 */ beqz $s4, .L802466C0 -/* 1399EC 802466AC 00000000 */ nop +/* 1399EC 802466AC 00000000 */ nop /* 1399F0 802466B0 0C0511F8 */ jal draw_icon_2 /* 1399F4 802466B4 0220202D */ daddu $a0, $s1, $zero /* 1399F8 802466B8 080919B2 */ j .L802466C8 @@ -895,7 +895,7 @@ glabel pause_stats_draw_contents .L802466FC: /* 139A3C 802466FC 0276102A */ slt $v0, $s3, $s6 /* 139A40 80246700 104000D2 */ beqz $v0, .L80246A4C -/* 139A44 80246704 00000000 */ nop +/* 139A44 80246704 00000000 */ nop /* 139A48 80246708 1640001A */ bnez $s2, .L80246774 /* 139A4C 8024670C 24020001 */ addiu $v0, $zero, 1 /* 139A50 80246710 26730001 */ addiu $s3, $s3, 1 @@ -912,7 +912,7 @@ glabel pause_stats_draw_contents /* 139A7C 8024673C 0C051261 */ jal set_icon_render_pos /* 139A80 80246740 00A22821 */ addu $a1, $a1, $v0 /* 139A84 80246744 12800005 */ beqz $s4, .L8024675C -/* 139A88 80246748 00000000 */ nop +/* 139A88 80246748 00000000 */ nop /* 139A8C 8024674C 0C0511F8 */ jal draw_icon_2 /* 139A90 80246750 0220202D */ daddu $a0, $s1, $zero /* 139A94 80246754 080919D9 */ j .L80246764 @@ -941,7 +941,7 @@ glabel pause_stats_draw_contents /* 139AE4 802467A4 0C051261 */ jal set_icon_render_pos /* 139AE8 802467A8 00A22821 */ addu $a1, $a1, $v0 /* 139AEC 802467AC 12800005 */ beqz $s4, .L802467C4 -/* 139AF0 802467B0 00000000 */ nop +/* 139AF0 802467B0 00000000 */ nop /* 139AF4 802467B4 0C0511F8 */ jal draw_icon_2 /* 139AF8 802467B8 0220202D */ daddu $a0, $s1, $zero /* 139AFC 802467BC 080919F3 */ j .L802467CC @@ -970,7 +970,7 @@ glabel pause_stats_draw_contents /* 139B4C 8024680C 0C051261 */ jal set_icon_render_pos /* 139B50 80246810 00A22821 */ addu $a1, $a1, $v0 /* 139B54 80246814 12800005 */ beqz $s4, .L8024682C -/* 139B58 80246818 00000000 */ nop +/* 139B58 80246818 00000000 */ nop /* 139B5C 8024681C 0C0511F8 */ jal draw_icon_2 /* 139B60 80246820 0220202D */ daddu $a0, $s1, $zero /* 139B64 80246824 08091A0D */ j .L80246834 @@ -999,7 +999,7 @@ glabel pause_stats_draw_contents /* 139BB4 80246874 0C051261 */ jal set_icon_render_pos /* 139BB8 80246878 00A22821 */ addu $a1, $a1, $v0 /* 139BBC 8024687C 12800005 */ beqz $s4, .L80246894 -/* 139BC0 80246880 00000000 */ nop +/* 139BC0 80246880 00000000 */ nop /* 139BC4 80246884 0C0511F8 */ jal draw_icon_2 /* 139BC8 80246888 0220202D */ daddu $a0, $s1, $zero /* 139BCC 8024688C 08091A27 */ j .L8024689C @@ -1028,7 +1028,7 @@ glabel pause_stats_draw_contents /* 139C1C 802468DC 0C051261 */ jal set_icon_render_pos /* 139C20 802468E0 00A22821 */ addu $a1, $a1, $v0 /* 139C24 802468E4 12800005 */ beqz $s4, .L802468FC -/* 139C28 802468E8 00000000 */ nop +/* 139C28 802468E8 00000000 */ nop /* 139C2C 802468EC 0C0511F8 */ jal draw_icon_2 /* 139C30 802468F0 0220202D */ daddu $a0, $s1, $zero /* 139C34 802468F4 08091A41 */ j .L80246904 @@ -1057,7 +1057,7 @@ glabel pause_stats_draw_contents /* 139C84 80246944 0C051261 */ jal set_icon_render_pos /* 139C88 80246948 00A22821 */ addu $a1, $a1, $v0 /* 139C8C 8024694C 12800005 */ beqz $s4, .L80246964 -/* 139C90 80246950 00000000 */ nop +/* 139C90 80246950 00000000 */ nop /* 139C94 80246954 0C0511F8 */ jal draw_icon_2 /* 139C98 80246958 0220202D */ daddu $a0, $s1, $zero /* 139C9C 8024695C 08091A5B */ j .L8024696C @@ -1086,7 +1086,7 @@ glabel pause_stats_draw_contents /* 139CEC 802469AC 0C051261 */ jal set_icon_render_pos /* 139CF0 802469B0 00A22821 */ addu $a1, $a1, $v0 /* 139CF4 802469B4 12800005 */ beqz $s4, .L802469CC -/* 139CF8 802469B8 00000000 */ nop +/* 139CF8 802469B8 00000000 */ nop /* 139CFC 802469BC 0C0511F8 */ jal draw_icon_2 /* 139D00 802469C0 0220202D */ daddu $a0, $s1, $zero /* 139D04 802469C4 08091A75 */ j .L802469D4 @@ -1113,7 +1113,7 @@ glabel pause_stats_draw_contents /* 139D4C 80246A0C 0C051261 */ jal set_icon_render_pos /* 139D50 80246A10 01152821 */ addu $a1, $t0, $s5 /* 139D54 80246A14 12800005 */ beqz $s4, .L80246A2C -/* 139D58 80246A18 00000000 */ nop +/* 139D58 80246A18 00000000 */ nop /* 139D5C 80246A1C 0C0511F8 */ jal draw_icon_2 /* 139D60 80246A20 0220202D */ daddu $a0, $s1, $zero /* 139D64 80246A24 08091A8D */ j .L80246A34 diff --git a/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s b/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s index a0cb399859..4e9a4f3100 100644 --- a/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s +++ b/asm/nonmatchings/code_138CC0/pause_stats_handle_input.s @@ -13,7 +13,7 @@ glabel pause_stats_handle_input /* 139ED4 80246B94 92070003 */ lbu $a3, 3($s0) /* 139ED8 80246B98 00431024 */ and $v0, $v0, $v1 /* 139EDC 80246B9C 1040001C */ beqz $v0, .L80246C10 -/* 139EE0 80246BA0 00000000 */ nop +/* 139EE0 80246BA0 00000000 */ nop .L80246BA4: /* 139EE4 80246BA4 92020001 */ lbu $v0, 1($s0) /* 139EE8 80246BA8 2442FFFF */ addiu $v0, $v0, -1 @@ -27,11 +27,11 @@ glabel pause_stats_handle_input /* 139F08 80246BC8 00430018 */ mult $v0, $v1 /* 139F0C 80246BCC 00003012 */ mflo $a2 /* 139F10 80246BD0 82020006 */ lb $v0, 6($s0) -/* 139F14 80246BD4 00000000 */ nop +/* 139F14 80246BD4 00000000 */ nop /* 139F18 80246BD8 00C20018 */ mult $a2, $v0 /* 139F1C 80246BDC 00002012 */ mflo $a0 /* 139F20 80246BE0 82020002 */ lb $v0, 2($s0) -/* 139F24 80246BE4 00000000 */ nop +/* 139F24 80246BE4 00000000 */ nop /* 139F28 80246BE8 00620018 */ mult $v1, $v0 /* 139F2C 80246BEC 00001812 */ mflo $v1 /* 139F30 80246BF0 00831021 */ addu $v0, $a0, $v1 @@ -41,14 +41,14 @@ glabel pause_stats_handle_input /* 139F40 80246C00 00621821 */ addu $v1, $v1, $v0 /* 139F44 80246C04 90620000 */ lbu $v0, ($v1) /* 139F48 80246C08 1082FFE6 */ beq $a0, $v0, .L80246BA4 -/* 139F4C 80246C0C 00000000 */ nop +/* 139F4C 80246C0C 00000000 */ nop .L80246C10: /* 139F50 80246C10 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 139F54 80246C14 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 139F58 80246C18 3C030008 */ lui $v1, 8 /* 139F5C 80246C1C 00431024 */ and $v0, $v0, $v1 /* 139F60 80246C20 1040001E */ beqz $v0, .L80246C9C -/* 139F64 80246C24 00000000 */ nop +/* 139F64 80246C24 00000000 */ nop /* 139F68 80246C28 92060005 */ lbu $a2, 5($s0) /* 139F6C 80246C2C 82050005 */ lb $a1, 5($s0) .L80246C30: @@ -64,11 +64,11 @@ glabel pause_stats_handle_input /* 139F94 80246C54 00450018 */ mult $v0, $a1 /* 139F98 80246C58 00001812 */ mflo $v1 /* 139F9C 80246C5C 82020006 */ lb $v0, 6($s0) -/* 139FA0 80246C60 00000000 */ nop +/* 139FA0 80246C60 00000000 */ nop /* 139FA4 80246C64 00620018 */ mult $v1, $v0 /* 139FA8 80246C68 00001812 */ mflo $v1 /* 139FAC 80246C6C 82020002 */ lb $v0, 2($s0) -/* 139FB0 80246C70 00000000 */ nop +/* 139FB0 80246C70 00000000 */ nop /* 139FB4 80246C74 00A20018 */ mult $a1, $v0 /* 139FB8 80246C78 00004812 */ mflo $t1 /* 139FBC 80246C7C 00691021 */ addu $v0, $v1, $t1 @@ -78,14 +78,14 @@ glabel pause_stats_handle_input /* 139FCC 80246C8C 00621821 */ addu $v1, $v1, $v0 /* 139FD0 80246C90 90620000 */ lbu $v0, ($v1) /* 139FD4 80246C94 1082FFE6 */ beq $a0, $v0, .L80246C30 -/* 139FD8 80246C98 00000000 */ nop +/* 139FD8 80246C98 00000000 */ nop .L80246C9C: /* 139FDC 80246C9C 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 139FE0 80246CA0 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 139FE4 80246CA4 3C030001 */ lui $v1, 1 /* 139FE8 80246CA8 00431024 */ and $v0, $v0, $v1 /* 139FEC 80246CAC 1040001D */ beqz $v0, .L80246D24 -/* 139FF0 80246CB0 00000000 */ nop +/* 139FF0 80246CB0 00000000 */ nop .L80246CB4: /* 139FF4 80246CB4 92020002 */ lbu $v0, 2($s0) /* 139FF8 80246CB8 2442FFFF */ addiu $v0, $v0, -1 @@ -99,11 +99,11 @@ glabel pause_stats_handle_input /* 13A018 80246CD8 00430018 */ mult $v0, $v1 /* 13A01C 80246CDC 00003012 */ mflo $a2 /* 13A020 80246CE0 82020006 */ lb $v0, 6($s0) -/* 13A024 80246CE4 00000000 */ nop +/* 13A024 80246CE4 00000000 */ nop /* 13A028 80246CE8 00C20018 */ mult $a2, $v0 /* 13A02C 80246CEC 00001012 */ mflo $v0 -/* 13A030 80246CF0 00000000 */ nop -/* 13A034 80246CF4 00000000 */ nop +/* 13A030 80246CF0 00000000 */ nop +/* 13A034 80246CF4 00000000 */ nop /* 13A038 80246CF8 00640018 */ mult $v1, $a0 /* 13A03C 80246CFC 82040001 */ lb $a0, 1($s0) /* 13A040 80246D00 00001812 */ mflo $v1 @@ -114,14 +114,14 @@ glabel pause_stats_handle_input /* 13A054 80246D14 00621821 */ addu $v1, $v1, $v0 /* 13A058 80246D18 90620000 */ lbu $v0, ($v1) /* 13A05C 80246D1C 1082FFE5 */ beq $a0, $v0, .L80246CB4 -/* 13A060 80246D20 00000000 */ nop +/* 13A060 80246D20 00000000 */ nop .L80246D24: /* 13A064 80246D24 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 13A068 80246D28 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 13A06C 80246D2C 3C030002 */ lui $v1, 2 /* 13A070 80246D30 00431024 */ and $v0, $v0, $v1 /* 13A074 80246D34 10400020 */ beqz $v0, .L80246DB8 -/* 13A078 80246D38 00000000 */ nop +/* 13A078 80246D38 00000000 */ nop /* 13A07C 80246D3C 92060006 */ lbu $a2, 6($s0) /* 13A080 80246D40 82050006 */ lb $a1, 6($s0) .L80246D44: @@ -137,12 +137,12 @@ glabel pause_stats_handle_input /* 13A0A8 80246D68 82030005 */ lb $v1, 5($s0) /* 13A0AC 80246D6C 00430018 */ mult $v0, $v1 /* 13A0B0 80246D70 00004812 */ mflo $t1 -/* 13A0B4 80246D74 00000000 */ nop -/* 13A0B8 80246D78 00000000 */ nop +/* 13A0B4 80246D74 00000000 */ nop +/* 13A0B8 80246D78 00000000 */ nop /* 13A0BC 80246D7C 01250018 */ mult $t1, $a1 /* 13A0C0 80246D80 00001012 */ mflo $v0 -/* 13A0C4 80246D84 00000000 */ nop -/* 13A0C8 80246D88 00000000 */ nop +/* 13A0C4 80246D84 00000000 */ nop +/* 13A0C8 80246D88 00000000 */ nop /* 13A0CC 80246D8C 00640018 */ mult $v1, $a0 /* 13A0D0 80246D90 82040001 */ lb $a0, 1($s0) /* 13A0D4 80246D94 00001812 */ mflo $v1 @@ -153,18 +153,18 @@ glabel pause_stats_handle_input /* 13A0E8 80246DA8 00621821 */ addu $v1, $v1, $v0 /* 13A0EC 80246DAC 90620000 */ lbu $v0, ($v1) /* 13A0F0 80246DB0 1082FFE4 */ beq $a0, $v0, .L80246D44 -/* 13A0F4 80246DB4 00000000 */ nop +/* 13A0F4 80246DB4 00000000 */ nop .L80246DB8: /* 13A0F8 80246DB8 82020004 */ lb $v0, 4($s0) /* 13A0FC 80246DBC 82030005 */ lb $v1, 5($s0) /* 13A100 80246DC0 00430018 */ mult $v0, $v1 /* 13A104 80246DC4 00003012 */ mflo $a2 /* 13A108 80246DC8 82020006 */ lb $v0, 6($s0) -/* 13A10C 80246DCC 00000000 */ nop +/* 13A10C 80246DCC 00000000 */ nop /* 13A110 80246DD0 00C20018 */ mult $a2, $v0 /* 13A114 80246DD4 00002012 */ mflo $a0 /* 13A118 80246DD8 82020002 */ lb $v0, 2($s0) -/* 13A11C 80246DDC 00000000 */ nop +/* 13A11C 80246DDC 00000000 */ nop /* 13A120 80246DE0 00620018 */ mult $v1, $v0 /* 13A124 80246DE4 00001812 */ mflo $v1 /* 13A128 80246DE8 00831821 */ addu $v1, $a0, $v1 @@ -176,7 +176,7 @@ glabel pause_stats_handle_input /* 13A140 80246E00 A2020003 */ sb $v0, 3($s0) /* 13A144 80246E04 304200FF */ andi $v0, $v0, 0xff /* 13A148 80246E08 10470003 */ beq $v0, $a3, .L80246E18 -/* 13A14C 80246E0C 00000000 */ nop +/* 13A14C 80246E0C 00000000 */ nop /* 13A150 80246E10 0C05272D */ jal play_sound /* 13A154 80246E14 240400C7 */ addiu $a0, $zero, 0xc7 .L80246E18: @@ -228,7 +228,7 @@ glabel pause_stats_handle_input /* 13A1FC 80246EBC 1062000C */ beq $v1, $v0, .L80246EF0 /* 13A200 80246EC0 00051400 */ sll $v0, $a1, 0x10 /* 13A204 80246EC4 08091BCA */ j .L80246F28 -/* 13A208 80246EC8 00000000 */ nop +/* 13A208 80246EC8 00000000 */ nop .L80246ECC: /* 13A20C 80246ECC 08091B6E */ j .L80246DB8 /* 13A210 80246ED0 A2020002 */ sb $v0, 2($s0) @@ -240,14 +240,14 @@ glabel pause_stats_handle_input /* 13A220 80246EE0 5062000C */ beql $v1, $v0, .L80246F14 /* 13A224 80246EE4 0000202D */ daddu $a0, $zero, $zero /* 13A228 80246EE8 08091BCA */ j .L80246F28 -/* 13A22C 80246EEC 00000000 */ nop +/* 13A22C 80246EEC 00000000 */ nop .L80246EF0: /* 13A230 80246EF0 00021C03 */ sra $v1, $v0, 0x10 /* 13A234 80246EF4 28620002 */ slti $v0, $v1, 2 /* 13A238 80246EF8 5040000B */ beql $v0, $zero, .L80246F28 /* 13A23C 80246EFC 2471FFFF */ addiu $s1, $v1, -1 /* 13A240 80246F00 08091BCA */ j .L80246F28 -/* 13A244 80246F04 00000000 */ nop +/* 13A244 80246F04 00000000 */ nop .L80246F08: /* 13A248 80246F08 00041400 */ sll $v0, $a0, 0x10 /* 13A24C 80246F0C 08091BCA */ j .L80246F28 @@ -276,7 +276,7 @@ glabel pause_stats_handle_input /* 13A2A0 80246F60 AC2000CC */ sw $zero, %lo(gPauseMenuCurrentDescIconScript)($at) /* 13A2A4 80246F64 30634000 */ andi $v1, $v1, 0x4000 /* 13A2A8 80246F68 10600005 */ beqz $v1, .L80246F80 -/* 13A2AC 80246F6C 00000000 */ nop +/* 13A2AC 80246F6C 00000000 */ nop /* 13A2B0 80246F70 0C05272D */ jal play_sound /* 13A2B4 80246F74 240400CA */ addiu $a0, $zero, 0xca /* 13A2B8 80246F78 3C018027 */ lui $at, %hi(gPauseMenuCurrentTab) diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s b/asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s index 883935755f..ad29b7f31f 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_cleanup.s @@ -16,12 +16,12 @@ glabel pause_spirits_cleanup /* 140C40 8024D900 26310001 */ addiu $s1, $s1, 1 /* 140C44 8024D904 2A220007 */ slti $v0, $s1, 7 /* 140C48 8024D908 1440FFFA */ bnez $v0, .L8024D8F4 -/* 140C4C 8024D90C 00000000 */ nop +/* 140C4C 8024D90C 00000000 */ nop /* 140C50 8024D910 8FBF0018 */ lw $ra, 0x18($sp) /* 140C54 8024D914 8FB10014 */ lw $s1, 0x14($sp) /* 140C58 8024D918 8FB00010 */ lw $s0, 0x10($sp) /* 140C5C 8024D91C 03E00008 */ jr $ra /* 140C60 8024D920 27BD0020 */ addiu $sp, $sp, 0x20 -/* 140C64 8024D924 00000000 */ nop -/* 140C68 8024D928 00000000 */ nop -/* 140C6C 8024D92C 00000000 */ nop +/* 140C64 8024D924 00000000 */ nop +/* 140C68 8024D928 00000000 */ nop +/* 140C6C 8024D92C 00000000 */ nop diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s index 40d3a91714..910c6f3683 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_draw_contents.s @@ -243,7 +243,7 @@ glabel pause_spirits_draw_contents /* 1400F0 8024CDB0 8FB800D0 */ lw $t8, 0xd0($sp) /* 1400F4 8024CDB4 00021080 */ sll $v0, $v0, 2 /* 1400F8 8024CDB8 4482B000 */ mtc1 $v0, $f22 -/* 1400FC 8024CDBC 00000000 */ nop +/* 1400FC 8024CDBC 00000000 */ nop /* 140100 8024CDC0 4680B5A0 */ cvt.s.w $f22, $f22 /* 140104 8024CDC4 001210C0 */ sll $v0, $s2, 3 /* 140108 8024CDC8 00431021 */ addu $v0, $v0, $v1 @@ -264,27 +264,27 @@ glabel pause_spirits_draw_contents /* 140140 8024CE00 D4240050 */ ldc1 $f4, %lo(D_80270050)($at) /* 140144 8024CE04 4600B5A1 */ cvt.d.s $f22, $f22 /* 140148 8024CE08 4624B102 */ mul.d $f4, $f22, $f4 -/* 14014C 8024CE0C 00000000 */ nop +/* 14014C 8024CE0C 00000000 */ nop /* 140150 8024CE10 3C018027 */ lui $at, %hi(D_80270058) /* 140154 8024CE14 D4220058 */ ldc1 $f2, %lo(D_80270058)($at) /* 140158 8024CE18 4492A000 */ mtc1 $s2, $f20 -/* 14015C 8024CE1C 00000000 */ nop +/* 14015C 8024CE1C 00000000 */ nop /* 140160 8024CE20 4680A521 */ cvt.d.w $f20, $f20 /* 140164 8024CE24 4622A082 */ mul.d $f2, $f20, $f2 -/* 140168 8024CE28 00000000 */ nop +/* 140168 8024CE28 00000000 */ nop /* 14016C 8024CE2C 3C018027 */ lui $at, %hi(D_80270060) /* 140170 8024CE30 D4200060 */ ldc1 $f0, %lo(D_80270060)($at) /* 140174 8024CE34 46201080 */ add.d $f2, $f2, $f0 /* 140178 8024CE38 4622B082 */ mul.d $f2, $f22, $f2 -/* 14017C 8024CE3C 00000000 */ nop +/* 14017C 8024CE3C 00000000 */ nop /* 140180 8024CE40 02520018 */ mult $s2, $s2 /* 140184 8024CE44 0000C012 */ mflo $t8 -/* 140188 8024CE48 00000000 */ nop -/* 14018C 8024CE4C 00000000 */ nop +/* 140188 8024CE48 00000000 */ nop +/* 14018C 8024CE4C 00000000 */ nop /* 140190 8024CE50 03120018 */ mult $t8, $s2 /* 140194 8024CE54 0000C012 */ mflo $t8 /* 140198 8024CE58 44986000 */ mtc1 $t8, $f12 -/* 14019C 8024CE5C 00000000 */ nop +/* 14019C 8024CE5C 00000000 */ nop /* 1401A0 8024CE60 46806321 */ cvt.d.w $f12, $f12 /* 1401A4 8024CE64 46246300 */ add.d $f12, $f12, $f4 /* 1401A8 8024CE68 46226300 */ add.d $f12, $f12, $f2 @@ -293,18 +293,18 @@ glabel pause_spirits_draw_contents /* 1401B4 8024CE74 3C013FD0 */ lui $at, 0x3fd0 /* 1401B8 8024CE78 44816800 */ mtc1 $at, $f13 /* 1401BC 8024CE7C 44806000 */ mtc1 $zero, $f12 -/* 1401C0 8024CE80 00000000 */ nop +/* 1401C0 8024CE80 00000000 */ nop /* 1401C4 8024CE84 462CA302 */ mul.d $f12, $f20, $f12 -/* 1401C8 8024CE88 00000000 */ nop +/* 1401C8 8024CE88 00000000 */ nop /* 1401CC 8024CE8C 3C018027 */ lui $at, %hi(D_80270068) /* 1401D0 8024CE90 D4220068 */ ldc1 $f2, %lo(D_80270068)($at) /* 1401D4 8024CE94 4622A502 */ mul.d $f20, $f20, $f2 -/* 1401D8 8024CE98 00000000 */ nop +/* 1401D8 8024CE98 00000000 */ nop /* 1401DC 8024CE9C 3C018027 */ lui $at, %hi(D_80270070) /* 1401E0 8024CEA0 D4220070 */ ldc1 $f2, %lo(D_80270070)($at) /* 1401E4 8024CEA4 46341081 */ sub.d $f2, $f2, $f20 /* 1401E8 8024CEA8 4622B082 */ mul.d $f2, $f22, $f2 -/* 1401EC 8024CEAC 00000000 */ nop +/* 1401EC 8024CEAC 00000000 */ nop /* 1401F0 8024CEB0 46366300 */ add.d $f12, $f12, $f22 /* 1401F4 8024CEB4 46226300 */ add.d $f12, $f12, $f2 /* 1401F8 8024CEB8 46000506 */ mov.s $f20, $f0 @@ -312,13 +312,13 @@ glabel pause_spirits_draw_contents /* 140200 8024CEC0 46206320 */ cvt.s.d $f12, $f12 /* 140204 8024CEC4 3C0140A0 */ lui $at, 0x40a0 /* 140208 8024CEC8 44811000 */ mtc1 $at, $f2 -/* 14020C 8024CECC 00000000 */ nop +/* 14020C 8024CECC 00000000 */ nop /* 140210 8024CED0 4602A502 */ mul.s $f20, $f20, $f2 -/* 140214 8024CED4 00000000 */ nop +/* 140214 8024CED4 00000000 */ nop /* 140218 8024CED8 241000FF */ addiu $s0, $zero, 0xff /* 14021C 8024CEDC 0200882D */ daddu $s1, $s0, $zero /* 140220 8024CEE0 4600A502 */ mul.s $f20, $f20, $f0 -/* 140224 8024CEE4 00000000 */ nop +/* 140224 8024CEE4 00000000 */ nop .L8024CEE8: /* 140228 8024CEE8 24050008 */ addiu $a1, $zero, 8 /* 14022C 8024CEEC 3C038027 */ lui $v1, %hi(D_802706E0) @@ -339,14 +339,14 @@ glabel pause_spirits_draw_contents /* 140268 8024CF28 8FB80134 */ lw $t8, 0x134($sp) /* 14026C 8024CF2C 27020016 */ addiu $v0, $t8, 0x16 /* 140270 8024CF30 44820000 */ mtc1 $v0, $f0 -/* 140274 8024CF34 00000000 */ nop +/* 140274 8024CF34 00000000 */ nop /* 140278 8024CF38 46800020 */ cvt.s.w $f0, $f0 /* 14027C 8024CF3C 46180000 */ add.s $f0, $f0, $f24 /* 140280 8024CF40 8FB80138 */ lw $t8, 0x138($sp) /* 140284 8024CF44 2702004D */ addiu $v0, $t8, 0x4d /* 140288 8024CF48 44050000 */ mfc1 $a1, $f0 /* 14028C 8024CF4C 44820000 */ mtc1 $v0, $f0 -/* 140290 8024CF50 00000000 */ nop +/* 140290 8024CF50 00000000 */ nop /* 140294 8024CF54 46800020 */ cvt.s.w $f0, $f0 /* 140298 8024CF58 461C0000 */ add.s $f0, $f0, $f28 /* 14029C 8024CF5C 46140000 */ add.s $f0, $f0, $f20 @@ -432,7 +432,7 @@ glabel pause_spirits_draw_contents /* 1403D0 8024D090 24080001 */ addiu $t0, $zero, 1 .L8024D094: /* 1403D4 8024D094 1940006D */ blez $t2, .L8024D24C -/* 1403D8 8024D098 00000000 */ nop +/* 1403D8 8024D098 00000000 */ nop /* 1403DC 8024D09C 1960006B */ blez $t3, .L8024D24C /* 1403E0 8024D0A0 28C2013F */ slti $v0, $a2, 0x13f /* 1403E4 8024D0A4 10400069 */ beqz $v0, .L8024D24C @@ -447,53 +447,53 @@ glabel pause_spirits_draw_contents /* 140404 8024D0C4 240B00EF */ addiu $t3, $zero, 0xef .L8024D0C8: /* 140408 8024D0C8 44861000 */ mtc1 $a2, $f2 -/* 14040C 8024D0CC 00000000 */ nop +/* 14040C 8024D0CC 00000000 */ nop /* 140410 8024D0D0 468010A0 */ cvt.s.w $f2, $f2 /* 140414 8024D0D4 25220008 */ addiu $v0, $t1, 8 /* 140418 8024D0D8 3C014080 */ lui $at, 0x4080 /* 14041C 8024D0DC 44812000 */ mtc1 $at, $f4 /* 140420 8024D0E0 44880000 */ mtc1 $t0, $f0 -/* 140424 8024D0E4 00000000 */ nop +/* 140424 8024D0E4 00000000 */ nop /* 140428 8024D0E8 46800020 */ cvt.s.w $f0, $f0 /* 14042C 8024D0EC 46041082 */ mul.s $f2, $f2, $f4 -/* 140430 8024D0F0 00000000 */ nop +/* 140430 8024D0F0 00000000 */ nop /* 140434 8024D0F4 8FB80134 */ lw $t8, 0x134($sp) /* 140438 8024D0F8 3C08ED00 */ lui $t0, 0xed00 /* 14043C 8024D0FC 27060007 */ addiu $a2, $t8, 7 /* 140440 8024D100 8FB80138 */ lw $t8, 0x138($sp) /* 140444 8024D104 46040002 */ mul.s $f0, $f0, $f4 -/* 140448 8024D108 00000000 */ nop +/* 140448 8024D108 00000000 */ nop /* 14044C 8024D10C AD820000 */ sw $v0, ($t4) /* 140450 8024D110 2707000E */ addiu $a3, $t8, 0xe /* 140454 8024D114 4600118D */ trunc.w.s $f6, $f2 /* 140458 8024D118 44023000 */ mfc1 $v0, $f6 -/* 14045C 8024D11C 00000000 */ nop +/* 14045C 8024D11C 00000000 */ nop /* 140460 8024D120 30420FFF */ andi $v0, $v0, 0xfff /* 140464 8024D124 00021300 */ sll $v0, $v0, 0xc /* 140468 8024D128 4600018D */ trunc.w.s $f6, $f0 /* 14046C 8024D12C 44033000 */ mfc1 $v1, $f6 /* 140470 8024D130 448A1000 */ mtc1 $t2, $f2 -/* 140474 8024D134 00000000 */ nop +/* 140474 8024D134 00000000 */ nop /* 140478 8024D138 468010A0 */ cvt.s.w $f2, $f2 /* 14047C 8024D13C 46041082 */ mul.s $f2, $f2, $f4 -/* 140480 8024D140 00000000 */ nop +/* 140480 8024D140 00000000 */ nop /* 140484 8024D144 30630FFF */ andi $v1, $v1, 0xfff /* 140488 8024D148 00681825 */ or $v1, $v1, $t0 /* 14048C 8024D14C 00431025 */ or $v0, $v0, $v1 /* 140490 8024D150 448B0000 */ mtc1 $t3, $f0 -/* 140494 8024D154 00000000 */ nop +/* 140494 8024D154 00000000 */ nop /* 140498 8024D158 46800020 */ cvt.s.w $f0, $f0 /* 14049C 8024D15C 46040002 */ mul.s $f0, $f0, $f4 -/* 1404A0 8024D160 00000000 */ nop +/* 1404A0 8024D160 00000000 */ nop /* 1404A4 8024D164 AD220000 */ sw $v0, ($t1) /* 1404A8 8024D168 4600118D */ trunc.w.s $f6, $f2 /* 1404AC 8024D16C 44023000 */ mfc1 $v0, $f6 -/* 1404B0 8024D170 00000000 */ nop +/* 1404B0 8024D170 00000000 */ nop /* 1404B4 8024D174 30420FFF */ andi $v0, $v0, 0xfff /* 1404B8 8024D178 00021300 */ sll $v0, $v0, 0xc /* 1404BC 8024D17C 4600018D */ trunc.w.s $f6, $f0 /* 1404C0 8024D180 44033000 */ mfc1 $v1, $f6 -/* 1404C4 8024D184 00000000 */ nop +/* 1404C4 8024D184 00000000 */ nop /* 1404C8 8024D188 30630FFF */ andi $v1, $v1, 0xfff /* 1404CC 8024D18C 00431025 */ or $v0, $v0, $v1 /* 1404D0 8024D190 AD220004 */ sw $v0, 4($t1) diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s b/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s index e8b0d497f7..7d5cdbcc32 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_draw_title.s @@ -18,7 +18,7 @@ glabel pause_spirits_draw_title /* 140608 8024D2C8 806300D4 */ lb $v1, %lo(gPauseMenuCurrentTab)($v1) /* 14060C 8024D2CC 24020005 */ addiu $v0, $zero, 5 /* 140610 8024D2D0 1462001C */ bne $v1, $v0, .L8024D344 -/* 140614 8024D2D4 00000000 */ nop +/* 140614 8024D2D4 00000000 */ nop /* 140618 8024D2D8 92020003 */ lbu $v0, 3($s0) /* 14061C 8024D2DC 8083028E */ lb $v1, 0x28e($a0) /* 140620 8024D2E0 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s b/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s index bf9b41fe7a..6d6f1f6fc1 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_handle_input.s @@ -12,7 +12,7 @@ glabel pause_spirits_handle_input /* 1407A8 8024D468 92070003 */ lbu $a3, 3($s0) /* 1407AC 8024D46C 00431024 */ and $v0, $v0, $v1 /* 1407B0 8024D470 1040001C */ beqz $v0, .L8024D4E4 -/* 1407B4 8024D474 00000000 */ nop +/* 1407B4 8024D474 00000000 */ nop .L8024D478: /* 1407B8 8024D478 92020001 */ lbu $v0, 1($s0) /* 1407BC 8024D47C 2442FFFF */ addiu $v0, $v0, -1 @@ -26,11 +26,11 @@ glabel pause_spirits_handle_input /* 1407DC 8024D49C 00430018 */ mult $v0, $v1 /* 1407E0 8024D4A0 00003012 */ mflo $a2 /* 1407E4 8024D4A4 82020006 */ lb $v0, 6($s0) -/* 1407E8 8024D4A8 00000000 */ nop +/* 1407E8 8024D4A8 00000000 */ nop /* 1407EC 8024D4AC 00C20018 */ mult $a2, $v0 /* 1407F0 8024D4B0 00002012 */ mflo $a0 /* 1407F4 8024D4B4 82020002 */ lb $v0, 2($s0) -/* 1407F8 8024D4B8 00000000 */ nop +/* 1407F8 8024D4B8 00000000 */ nop /* 1407FC 8024D4BC 00620018 */ mult $v1, $v0 /* 140800 8024D4C0 00001812 */ mflo $v1 /* 140804 8024D4C4 00831021 */ addu $v0, $a0, $v1 @@ -40,14 +40,14 @@ glabel pause_spirits_handle_input /* 140814 8024D4D4 00621821 */ addu $v1, $v1, $v0 /* 140818 8024D4D8 90620000 */ lbu $v0, ($v1) /* 14081C 8024D4DC 1082FFE6 */ beq $a0, $v0, .L8024D478 -/* 140820 8024D4E0 00000000 */ nop +/* 140820 8024D4E0 00000000 */ nop .L8024D4E4: /* 140824 8024D4E4 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 140828 8024D4E8 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) /* 14082C 8024D4EC 3C030008 */ lui $v1, 8 /* 140830 8024D4F0 00431024 */ and $v0, $v0, $v1 /* 140834 8024D4F4 1040001E */ beqz $v0, .L8024D570 -/* 140838 8024D4F8 00000000 */ nop +/* 140838 8024D4F8 00000000 */ nop /* 14083C 8024D4FC 92060005 */ lbu $a2, 5($s0) /* 140840 8024D500 82050005 */ lb $a1, 5($s0) .L8024D504: @@ -63,11 +63,11 @@ glabel pause_spirits_handle_input /* 140868 8024D528 00450018 */ mult $v0, $a1 /* 14086C 8024D52C 00001812 */ mflo $v1 /* 140870 8024D530 82020006 */ lb $v0, 6($s0) -/* 140874 8024D534 00000000 */ nop +/* 140874 8024D534 00000000 */ nop /* 140878 8024D538 00620018 */ mult $v1, $v0 /* 14087C 8024D53C 00001812 */ mflo $v1 /* 140880 8024D540 82020002 */ lb $v0, 2($s0) -/* 140884 8024D544 00000000 */ nop +/* 140884 8024D544 00000000 */ nop /* 140888 8024D548 00A20018 */ mult $a1, $v0 /* 14088C 8024D54C 00004812 */ mflo $t1 /* 140890 8024D550 00691021 */ addu $v0, $v1, $t1 @@ -77,7 +77,7 @@ glabel pause_spirits_handle_input /* 1408A0 8024D560 00621821 */ addu $v1, $v1, $v0 /* 1408A4 8024D564 90620000 */ lbu $v0, ($v1) /* 1408A8 8024D568 1082FFE6 */ beq $a0, $v0, .L8024D504 -/* 1408AC 8024D56C 00000000 */ nop +/* 1408AC 8024D56C 00000000 */ nop .L8024D570: /* 1408B0 8024D570 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 1408B4 8024D574 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) @@ -113,11 +113,11 @@ glabel pause_spirits_handle_input /* 14091C 8024D5DC 00430018 */ mult $v0, $v1 /* 140920 8024D5E0 00002812 */ mflo $a1 /* 140924 8024D5E4 82020006 */ lb $v0, 6($s0) -/* 140928 8024D5E8 00000000 */ nop +/* 140928 8024D5E8 00000000 */ nop /* 14092C 8024D5EC 00A20018 */ mult $a1, $v0 /* 140930 8024D5F0 00001012 */ mflo $v0 -/* 140934 8024D5F4 00000000 */ nop -/* 140938 8024D5F8 00000000 */ nop +/* 140934 8024D5F4 00000000 */ nop +/* 140938 8024D5F8 00000000 */ nop /* 14093C 8024D5FC 00640018 */ mult $v1, $a0 /* 140940 8024D600 82040001 */ lb $a0, 1($s0) /* 140944 8024D604 00001812 */ mflo $v1 @@ -128,7 +128,7 @@ glabel pause_spirits_handle_input /* 140958 8024D618 00621821 */ addu $v1, $v1, $v0 /* 14095C 8024D61C 90620000 */ lbu $v0, ($v1) /* 140960 8024D620 1082FFE5 */ beq $a0, $v0, .L8024D5B8 -/* 140964 8024D624 00000000 */ nop +/* 140964 8024D624 00000000 */ nop .L8024D628: /* 140968 8024D628 3C028027 */ lui $v0, %hi(gPauseMenuHeldButtons) /* 14096C 8024D62C 8C4200C0 */ lw $v0, %lo(gPauseMenuHeldButtons)($v0) @@ -169,12 +169,12 @@ glabel pause_spirits_handle_input /* 1409E8 8024D6A8 82030005 */ lb $v1, 5($s0) /* 1409EC 8024D6AC 00430018 */ mult $v0, $v1 /* 1409F0 8024D6B0 00004812 */ mflo $t1 -/* 1409F4 8024D6B4 00000000 */ nop -/* 1409F8 8024D6B8 00000000 */ nop +/* 1409F4 8024D6B4 00000000 */ nop +/* 1409F8 8024D6B8 00000000 */ nop /* 1409FC 8024D6BC 01250018 */ mult $t1, $a1 /* 140A00 8024D6C0 00001012 */ mflo $v0 -/* 140A04 8024D6C4 00000000 */ nop -/* 140A08 8024D6C8 00000000 */ nop +/* 140A04 8024D6C4 00000000 */ nop +/* 140A08 8024D6C8 00000000 */ nop /* 140A0C 8024D6CC 00640018 */ mult $v1, $a0 /* 140A10 8024D6D0 82040001 */ lb $a0, 1($s0) /* 140A14 8024D6D4 00001812 */ mflo $v1 @@ -185,18 +185,18 @@ glabel pause_spirits_handle_input /* 140A28 8024D6E8 00621821 */ addu $v1, $v1, $v0 /* 140A2C 8024D6EC 90620000 */ lbu $v0, ($v1) /* 140A30 8024D6F0 1082FFE4 */ beq $a0, $v0, .L8024D684 -/* 140A34 8024D6F4 00000000 */ nop +/* 140A34 8024D6F4 00000000 */ nop .L8024D6F8: /* 140A38 8024D6F8 82020004 */ lb $v0, 4($s0) /* 140A3C 8024D6FC 82030005 */ lb $v1, 5($s0) /* 140A40 8024D700 00430018 */ mult $v0, $v1 /* 140A44 8024D704 00002812 */ mflo $a1 /* 140A48 8024D708 82020006 */ lb $v0, 6($s0) -/* 140A4C 8024D70C 00000000 */ nop +/* 140A4C 8024D70C 00000000 */ nop /* 140A50 8024D710 00A20018 */ mult $a1, $v0 /* 140A54 8024D714 00002012 */ mflo $a0 /* 140A58 8024D718 82020002 */ lb $v0, 2($s0) -/* 140A5C 8024D71C 00000000 */ nop +/* 140A5C 8024D71C 00000000 */ nop /* 140A60 8024D720 00620018 */ mult $v1, $v0 /* 140A64 8024D724 00001812 */ mflo $v1 /* 140A68 8024D728 00831821 */ addu $v1, $a0, $v1 @@ -215,7 +215,7 @@ glabel pause_spirits_handle_input .L8024D75C: /* 140A9C 8024D75C 92020003 */ lbu $v0, 3($s0) /* 140AA0 8024D760 10470003 */ beq $v0, $a3, .L8024D770 -/* 140AA4 8024D764 00000000 */ nop +/* 140AA4 8024D764 00000000 */ nop /* 140AA8 8024D768 0C05272D */ jal play_sound /* 140AAC 8024D76C 240400C7 */ addiu $a0, $zero, 0xc7 .L8024D770: @@ -223,18 +223,18 @@ glabel pause_spirits_handle_input /* 140AB4 8024D774 8C4200C4 */ lw $v0, %lo(gPauseMenuPressedButtons)($v0) /* 140AB8 8024D778 30424000 */ andi $v0, $v0, 0x4000 /* 140ABC 8024D77C 10400007 */ beqz $v0, .L8024D79C -/* 140AC0 8024D780 00000000 */ nop +/* 140AC0 8024D780 00000000 */ nop /* 140AC4 8024D784 3C018027 */ lui $at, %hi(gPauseMenuCurrentTab) /* 140AC8 8024D788 A02000D4 */ sb $zero, %lo(gPauseMenuCurrentTab)($at) /* 140ACC 8024D78C 0C05272D */ jal play_sound /* 140AD0 8024D790 240400CA */ addiu $a0, $zero, 0xca /* 140AD4 8024D794 080935FC */ j .L8024D7F0 -/* 140AD8 8024D798 00000000 */ nop +/* 140AD8 8024D798 00000000 */ nop .L8024D79C: /* 140ADC 8024D79C 3C018027 */ lui $at, %hi(gPauseMenuCurrentDescIconScript) /* 140AE0 8024D7A0 AC2000CC */ sw $zero, %lo(gPauseMenuCurrentDescIconScript)($at) /* 140AE4 8024D7A4 0C039D59 */ jal get_player_data -/* 140AE8 8024D7A8 00000000 */ nop +/* 140AE8 8024D7A8 00000000 */ nop /* 140AEC 8024D7AC 92030003 */ lbu $v1, 3($s0) /* 140AF0 8024D7B0 8042028E */ lb $v0, 0x28e($v0) /* 140AF4 8024D7B4 00031880 */ sll $v1, $v1, 2 @@ -247,7 +247,7 @@ glabel pause_spirits_handle_input /* 140B10 8024D7D0 0C093BA0 */ jal pause_get_menu_string /* 140B14 8024D7D4 24040056 */ addiu $a0, $zero, 0x56 /* 140B18 8024D7D8 080935FA */ j .L8024D7E8 -/* 140B1C 8024D7DC 00000000 */ nop +/* 140B1C 8024D7DC 00000000 */ nop .L8024D7E0: /* 140B20 8024D7E0 34420031 */ ori $v0, $v0, 0x31 /* 140B24 8024D7E4 00621021 */ addu $v0, $v1, $v0 diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_init.s b/asm/nonmatchings/code_13FD40/pause_spirits_init.s index a37a154081..e7f2b07fad 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_init.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_init.s @@ -27,7 +27,7 @@ glabel pause_spirits_init /* 1406F4 8024D3B4 AC820000 */ sw $v0, ($a0) /* 1406F8 8024D3B8 2A020007 */ slti $v0, $s0, 7 /* 1406FC 8024D3BC 1440FFF7 */ bnez $v0, .L8024D39C -/* 140700 8024D3C0 00000000 */ nop +/* 140700 8024D3C0 00000000 */ nop /* 140704 8024D3C4 0000802D */ daddu $s0, $zero, $zero /* 140708 8024D3C8 3C128027 */ lui $s2, %hi(D_802706C0) /* 14070C 8024D3CC 265206C0 */ addiu $s2, $s2, %lo(D_802706C0) diff --git a/asm/nonmatchings/code_13FD40/pause_spirits_update.s b/asm/nonmatchings/code_13FD40/pause_spirits_update.s index 2b4819748c..418a0b77c9 100644 --- a/asm/nonmatchings/code_13FD40/pause_spirits_update.s +++ b/asm/nonmatchings/code_13FD40/pause_spirits_update.s @@ -26,14 +26,14 @@ glabel pause_spirits_update /* 140B90 8024D850 8262028E */ lb $v0, 0x28e($s3) /* 140B94 8024D854 0242102A */ slt $v0, $s2, $v0 /* 140B98 8024D858 1040000B */ beqz $v0, .L8024D888 -/* 140B9C 8024D85C 00000000 */ nop +/* 140B9C 8024D85C 00000000 */ nop /* 140BA0 8024D860 3C028027 */ lui $v0, %hi(gPauseMenuCurrentTab) /* 140BA4 8024D864 804200D4 */ lb $v0, %lo(gPauseMenuCurrentTab)($v0) /* 140BA8 8024D868 14540007 */ bne $v0, $s4, .L8024D888 -/* 140BAC 8024D86C 00000000 */ nop +/* 140BAC 8024D86C 00000000 */ nop /* 140BB0 8024D870 92A20003 */ lbu $v0, 3($s5) /* 140BB4 8024D874 16420004 */ bne $s2, $v0, .L8024D888 -/* 140BB8 8024D878 00000000 */ nop +/* 140BB8 8024D878 00000000 */ nop /* 140BBC 8024D87C 8E040000 */ lw $a0, ($s0) /* 140BC0 8024D880 08093624 */ j .L8024D890 /* 140BC4 8024D884 8E250004 */ lw $a1, 4($s1) diff --git a/asm/nonmatchings/code_140C70/func_8024D930.s b/asm/nonmatchings/code_140C70/func_8024D930.s index 996a3b5a8e..b845bac659 100644 --- a/asm/nonmatchings/code_140C70/func_8024D930.s +++ b/asm/nonmatchings/code_140C70/func_8024D930.s @@ -26,7 +26,7 @@ glabel func_8024D930 /* 140CC0 8024D980 25020001 */ addiu $v0, $t0, 1 /* 140CC4 8024D984 01A20018 */ mult $t5, $v0 /* 140CC8 8024D988 00001812 */ mflo $v1 -/* 140CCC 8024D98C 00000000 */ nop +/* 140CCC 8024D98C 00000000 */ nop /* 140CD0 8024D990 14E00002 */ bnez $a3, .L8024D99C /* 140CD4 8024D994 0067001A */ div $zero, $v1, $a3 /* 140CD8 8024D998 0007000D */ break 7 @@ -35,15 +35,15 @@ glabel func_8024D930 /* 140CE0 8024D9A0 14E10004 */ bne $a3, $at, .L8024D9B4 /* 140CE4 8024D9A4 3C018000 */ lui $at, 0x8000 /* 140CE8 8024D9A8 14610002 */ bne $v1, $at, .L8024D9B4 -/* 140CEC 8024D9AC 00000000 */ nop +/* 140CEC 8024D9AC 00000000 */ nop /* 140CF0 8024D9B0 0006000D */ break 6 .L8024D9B4: /* 140CF4 8024D9B4 00002012 */ mflo $a0 -/* 140CF8 8024D9B8 00000000 */ nop -/* 140CFC 8024D9BC 00000000 */ nop +/* 140CF8 8024D9B8 00000000 */ nop +/* 140CFC 8024D9BC 00000000 */ nop /* 140D00 8024D9C0 01820018 */ mult $t4, $v0 /* 140D04 8024D9C4 00001812 */ mflo $v1 -/* 140D08 8024D9C8 00000000 */ nop +/* 140D08 8024D9C8 00000000 */ nop /* 140D0C 8024D9CC 14E00002 */ bnez $a3, .L8024D9D8 /* 140D10 8024D9D0 0067001A */ div $zero, $v1, $a3 /* 140D14 8024D9D4 0007000D */ break 7 @@ -52,7 +52,7 @@ glabel func_8024D930 /* 140D1C 8024D9DC 14E10004 */ bne $a3, $at, .L8024D9F0 /* 140D20 8024D9E0 3C018000 */ lui $at, 0x8000 /* 140D24 8024D9E4 14610002 */ bne $v1, $at, .L8024D9F0 -/* 140D28 8024D9E8 00000000 */ nop +/* 140D28 8024D9E8 00000000 */ nop /* 140D2C 8024D9EC 0006000D */ break 6 .L8024D9F0: /* 140D30 8024D9F0 00002812 */ mflo $a1 @@ -69,4 +69,4 @@ glabel func_8024D930 /* 140D5C 8024DA1C 00A0502D */ daddu $t2, $a1, $zero .L8024DA20: /* 140D60 8024DA20 03E00008 */ jr $ra -/* 140D64 8024DA24 00000000 */ nop +/* 140D64 8024DA24 00000000 */ nop diff --git a/asm/nonmatchings/code_140C70/pause_map_cleanup.s b/asm/nonmatchings/code_140C70/pause_map_cleanup.s index 1db73c7e12..73b77f9a27 100644 --- a/asm/nonmatchings/code_140C70/pause_map_cleanup.s +++ b/asm/nonmatchings/code_140C70/pause_map_cleanup.s @@ -15,12 +15,12 @@ glabel pause_map_cleanup /* 142190 8024EE50 0C05123D */ jal free_icon /* 142194 8024EE54 26310001 */ addiu $s1, $s1, 1 /* 142198 8024EE58 1A20FFFB */ blez $s1, .L8024EE48 -/* 14219C 8024EE5C 00000000 */ nop +/* 14219C 8024EE5C 00000000 */ nop /* 1421A0 8024EE60 8FBF0018 */ lw $ra, 0x18($sp) /* 1421A4 8024EE64 8FB10014 */ lw $s1, 0x14($sp) /* 1421A8 8024EE68 8FB00010 */ lw $s0, 0x10($sp) /* 1421AC 8024EE6C 03E00008 */ jr $ra /* 1421B0 8024EE70 27BD0020 */ addiu $sp, $sp, 0x20 -/* 1421B4 8024EE74 00000000 */ nop -/* 1421B8 8024EE78 00000000 */ nop -/* 1421BC 8024EE7C 00000000 */ nop +/* 1421B4 8024EE74 00000000 */ nop +/* 1421B8 8024EE78 00000000 */ nop +/* 1421BC 8024EE7C 00000000 */ nop diff --git a/asm/nonmatchings/code_140C70/pause_map_draw_contents.s b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s index 912d5c1fa7..1c36e963a6 100644 --- a/asm/nonmatchings/code_140C70/pause_map_draw_contents.s +++ b/asm/nonmatchings/code_140C70/pause_map_draw_contents.s @@ -167,7 +167,7 @@ glabel pause_map_draw_contents /* 1410D4 8024DD94 24030001 */ addiu $v1, $zero, 1 .L8024DD98: /* 1410D8 8024DD98 18C001DF */ blez $a2, .L8024E518 -/* 1410DC 8024DD9C 00000000 */ nop +/* 1410DC 8024DD9C 00000000 */ nop /* 1410E0 8024DDA0 18E001DD */ blez $a3, .L8024E518 /* 1410E4 8024DDA4 2882013F */ slti $v0, $a0, 0x13f /* 1410E8 8024DDA8 104001DB */ beqz $v0, .L8024E518 @@ -187,12 +187,12 @@ glabel pause_map_draw_contents /* 141118 8024DDD8 3C08800A */ lui $t0, %hi(gMasterGfxPos) /* 14111C 8024DDDC 2508A66C */ addiu $t0, $t0, %lo(gMasterGfxPos) /* 141120 8024DDE0 44841000 */ mtc1 $a0, $f2 -/* 141124 8024DDE4 00000000 */ nop +/* 141124 8024DDE4 00000000 */ nop /* 141128 8024DDE8 468010A0 */ cvt.s.w $f2, $f2 /* 14112C 8024DDEC 24A20010 */ addiu $v0, $a1, 0x10 /* 141130 8024DDF0 8FAF0050 */ lw $t7, 0x50($sp) /* 141134 8024DDF4 44830000 */ mtc1 $v1, $f0 -/* 141138 8024DDF8 00000000 */ nop +/* 141138 8024DDF8 00000000 */ nop /* 14113C 8024DDFC 46800020 */ cvt.s.w $f0, $f0 /* 141140 8024DE00 AFAE005C */ sw $t6, 0x5c($sp) /* 141144 8024DE04 8FAE00A4 */ lw $t6, 0xa4($sp) @@ -200,7 +200,7 @@ glabel pause_map_draw_contents /* 14114C 8024DE0C 44812000 */ mtc1 $at, $f4 /* 141150 8024DE10 01EE7821 */ addu $t7, $t7, $t6 /* 141154 8024DE14 46041082 */ mul.s $f2, $f2, $f4 -/* 141158 8024DE18 00000000 */ nop +/* 141158 8024DE18 00000000 */ nop /* 14115C 8024DE1C AFAF0060 */ sw $t7, 0x60($sp) /* 141160 8024DE20 8FAF0054 */ lw $t7, 0x54($sp) /* 141164 8024DE24 8FAE00A8 */ lw $t6, 0xa8($sp) @@ -209,38 +209,38 @@ glabel pause_map_draw_contents /* 141170 8024DE30 AFAF0064 */ sw $t7, 0x64($sp) /* 141174 8024DE34 8FAF005C */ lw $t7, 0x5c($sp) /* 141178 8024DE38 46040002 */ mul.s $f0, $f0, $f4 -/* 14117C 8024DE3C 00000000 */ nop +/* 14117C 8024DE3C 00000000 */ nop /* 141180 8024DE40 AE220000 */ sw $v0, ($s1) /* 141184 8024DE44 25FE0008 */ addiu $fp, $t7, 8 /* 141188 8024DE48 4600118D */ trunc.w.s $f6, $f2 /* 14118C 8024DE4C 44023000 */ mfc1 $v0, $f6 -/* 141190 8024DE50 00000000 */ nop +/* 141190 8024DE50 00000000 */ nop /* 141194 8024DE54 30420FFF */ andi $v0, $v0, 0xfff /* 141198 8024DE58 00021300 */ sll $v0, $v0, 0xc /* 14119C 8024DE5C 4600018D */ trunc.w.s $f6, $f0 /* 1411A0 8024DE60 44033000 */ mfc1 $v1, $f6 /* 1411A4 8024DE64 44861000 */ mtc1 $a2, $f2 -/* 1411A8 8024DE68 00000000 */ nop +/* 1411A8 8024DE68 00000000 */ nop /* 1411AC 8024DE6C 468010A0 */ cvt.s.w $f2, $f2 /* 1411B0 8024DE70 46041082 */ mul.s $f2, $f2, $f4 -/* 1411B4 8024DE74 00000000 */ nop +/* 1411B4 8024DE74 00000000 */ nop /* 1411B8 8024DE78 30630FFF */ andi $v1, $v1, 0xfff /* 1411BC 8024DE7C 00641825 */ or $v1, $v1, $a0 /* 1411C0 8024DE80 00431025 */ or $v0, $v0, $v1 /* 1411C4 8024DE84 44870000 */ mtc1 $a3, $f0 -/* 1411C8 8024DE88 00000000 */ nop +/* 1411C8 8024DE88 00000000 */ nop /* 1411CC 8024DE8C 46800020 */ cvt.s.w $f0, $f0 /* 1411D0 8024DE90 46040002 */ mul.s $f0, $f0, $f4 -/* 1411D4 8024DE94 00000000 */ nop +/* 1411D4 8024DE94 00000000 */ nop /* 1411D8 8024DE98 ACA20008 */ sw $v0, 8($a1) /* 1411DC 8024DE9C 4600118D */ trunc.w.s $f6, $f2 /* 1411E0 8024DEA0 44023000 */ mfc1 $v0, $f6 -/* 1411E4 8024DEA4 00000000 */ nop +/* 1411E4 8024DEA4 00000000 */ nop /* 1411E8 8024DEA8 30420FFF */ andi $v0, $v0, 0xfff /* 1411EC 8024DEAC 00021300 */ sll $v0, $v0, 0xc /* 1411F0 8024DEB0 4600018D */ trunc.w.s $f6, $f0 /* 1411F4 8024DEB4 44033000 */ mfc1 $v1, $f6 -/* 1411F8 8024DEB8 00000000 */ nop +/* 1411F8 8024DEB8 00000000 */ nop /* 1411FC 8024DEBC 30630FFF */ andi $v1, $v1, 0xfff /* 141200 8024DEC0 00431025 */ or $v0, $v0, $v1 /* 141204 8024DEC4 ACA2000C */ sw $v0, 0xc($a1) @@ -413,28 +413,28 @@ glabel pause_map_draw_contents /* 141488 8024E148 24C6FFF9 */ addiu $a2, $a2, -7 /* 14148C 8024E14C 8E040000 */ lw $a0, ($s0) /* 141490 8024E150 0C0511F8 */ jal draw_icon_2 -/* 141494 8024E154 00000000 */ nop +/* 141494 8024E154 00000000 */ nop /* 141498 8024E158 3C138027 */ lui $s3, %hi(gPauseMenuCurrentTab) /* 14149C 8024E15C 267300D4 */ addiu $s3, $s3, %lo(gPauseMenuCurrentTab) /* 1414A0 8024E160 82700000 */ lb $s0, ($s3) /* 1414A4 8024E164 24020006 */ addiu $v0, $zero, 6 /* 1414A8 8024E168 16020081 */ bne $s0, $v0, .L8024E370 -/* 1414AC 8024E16C 00000000 */ nop +/* 1414AC 8024E16C 00000000 */ nop /* 1414B0 8024E170 3C018027 */ lui $at, %hi(D_80270714) /* 1414B4 8024E174 C4200714 */ lwc1 $f0, %lo(D_80270714)($at) /* 1414B8 8024E178 44922000 */ mtc1 $s2, $f4 -/* 1414BC 8024E17C 00000000 */ nop +/* 1414BC 8024E17C 00000000 */ nop /* 1414C0 8024E180 46802120 */ cvt.s.w $f4, $f4 /* 1414C4 8024E184 46002100 */ add.s $f4, $f4, $f0 /* 1414C8 8024E188 3C018027 */ lui $at, %hi(D_80270718) /* 1414CC 8024E18C C4200718 */ lwc1 $f0, %lo(D_80270718)($at) /* 1414D0 8024E190 44911000 */ mtc1 $s1, $f2 -/* 1414D4 8024E194 00000000 */ nop +/* 1414D4 8024E194 00000000 */ nop /* 1414D8 8024E198 468010A0 */ cvt.s.w $f2, $f2 /* 1414DC 8024E19C 46001080 */ add.s $f2, $f2, $f0 /* 1414E0 8024E1A0 3C014100 */ lui $at, 0x4100 /* 1414E4 8024E1A4 44810000 */ mtc1 $at, $f0 -/* 1414E8 8024E1A8 00000000 */ nop +/* 1414E8 8024E1A8 00000000 */ nop /* 1414EC 8024E1AC 46002101 */ sub.s $f4, $f4, $f0 /* 1414F0 8024E1B0 4600118D */ trunc.w.s $f6, $f2 /* 1414F4 8024E1B4 44063000 */ mfc1 $a2, $f6 @@ -444,7 +444,7 @@ glabel pause_map_draw_contents /* 141504 8024E1C4 24040029 */ addiu $a0, $zero, 0x29 /* 141508 8024E1C8 82620000 */ lb $v0, ($s3) /* 14150C 8024E1CC 14500068 */ bne $v0, $s0, .L8024E370 -/* 141510 8024E1D0 00000000 */ nop +/* 141510 8024E1D0 00000000 */ nop /* 141514 8024E1D4 3C06800A */ lui $a2, %hi(gMasterGfxPos) /* 141518 8024E1D8 24C6A66C */ addiu $a2, $a2, %lo(gMasterGfxPos) /* 14151C 8024E1DC 3C05AAAA */ lui $a1, 0xaaaa @@ -500,9 +500,9 @@ glabel pause_map_draw_contents /* 1415E0 8024E2A0 C6820000 */ lwc1 $f2, ($s4) /* 1415E4 8024E2A4 3C01C2AC */ lui $at, 0xc2ac /* 1415E8 8024E2A8 44810000 */ mtc1 $at, $f0 -/* 1415EC 8024E2AC 00000000 */ nop +/* 1415EC 8024E2AC 00000000 */ nop /* 1415F0 8024E2B0 4602003C */ c.lt.s $f0, $f2 -/* 1415F4 8024E2B4 00000000 */ nop +/* 1415F4 8024E2B4 00000000 */ nop /* 1415F8 8024E2B8 45020001 */ bc1fl .L8024E2C0 /* 1415FC 8024E2BC 0000902D */ daddu $s2, $zero, $zero .L8024E2C0: @@ -518,7 +518,7 @@ glabel pause_map_draw_contents /* 141624 8024E2E4 26520708 */ addiu $s2, $s2, %lo(D_80270708) /* 141628 8024E2E8 C6400000 */ lwc1 $f0, ($s2) /* 14162C 8024E2EC 4614003C */ c.lt.s $f0, $f20 -/* 141630 8024E2F0 00000000 */ nop +/* 141630 8024E2F0 00000000 */ nop /* 141634 8024E2F4 45020001 */ bc1fl .L8024E2FC /* 141638 8024E2F8 0000982D */ daddu $s3, $zero, $zero .L8024E2FC: @@ -538,9 +538,9 @@ glabel pause_map_draw_contents /* 141670 8024E330 C6420000 */ lwc1 $f2, ($s2) /* 141674 8024E334 3C01C352 */ lui $at, 0xc352 /* 141678 8024E338 44810000 */ mtc1 $at, $f0 -/* 14167C 8024E33C 00000000 */ nop +/* 14167C 8024E33C 00000000 */ nop /* 141680 8024E340 4602003C */ c.lt.s $f0, $f2 -/* 141684 8024E344 00000000 */ nop +/* 141684 8024E344 00000000 */ nop /* 141688 8024E348 45020001 */ bc1fl .L8024E350 /* 14168C 8024E34C 0000882D */ daddu $s1, $zero, $zero .L8024E350: @@ -566,7 +566,7 @@ glabel pause_map_draw_contents /* 1416D4 8024E394 24080001 */ addiu $t0, $zero, 1 .L8024E398: /* 1416D8 8024E398 1940005F */ blez $t2, .L8024E518 -/* 1416DC 8024E39C 00000000 */ nop +/* 1416DC 8024E39C 00000000 */ nop /* 1416E0 8024E3A0 1960005D */ blez $t3, .L8024E518 /* 1416E4 8024E3A4 28E2013F */ slti $v0, $a3, 0x13f /* 1416E8 8024E3A8 1040005B */ beqz $v0, .L8024E518 @@ -583,10 +583,10 @@ glabel pause_map_draw_contents /* 14170C 8024E3CC 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 141710 8024E3D0 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 141714 8024E3D4 44871000 */ mtc1 $a3, $f2 -/* 141718 8024E3D8 00000000 */ nop +/* 141718 8024E3D8 00000000 */ nop /* 14171C 8024E3DC 468010A0 */ cvt.s.w $f2, $f2 /* 141720 8024E3E0 44880000 */ mtc1 $t0, $f0 -/* 141724 8024E3E4 00000000 */ nop +/* 141724 8024E3E4 00000000 */ nop /* 141728 8024E3E8 46800020 */ cvt.s.w $f0, $f0 /* 14172C 8024E3EC 3C08ED00 */ lui $t0, 0xed00 /* 141730 8024E3F0 8FAF00A4 */ lw $t7, 0xa4($sp) @@ -595,43 +595,43 @@ glabel pause_map_draw_contents /* 14173C 8024E3FC 44812000 */ mtc1 $at, $f4 /* 141740 8024E400 8FAE00A8 */ lw $t6, 0xa8($sp) /* 141744 8024E404 46041082 */ mul.s $f2, $f2, $f4 -/* 141748 8024E408 00000000 */ nop +/* 141748 8024E408 00000000 */ nop /* 14174C 8024E40C 25E60012 */ addiu $a2, $t7, 0x12 /* 141750 8024E410 25C7000E */ addiu $a3, $t6, 0xe /* 141754 8024E414 0040482D */ daddu $t1, $v0, $zero /* 141758 8024E418 24420008 */ addiu $v0, $v0, 8 /* 14175C 8024E41C 46040002 */ mul.s $f0, $f0, $f4 -/* 141760 8024E420 00000000 */ nop +/* 141760 8024E420 00000000 */ nop /* 141764 8024E424 AC620000 */ sw $v0, ($v1) /* 141768 8024E428 4600118D */ trunc.w.s $f6, $f2 /* 14176C 8024E42C 44023000 */ mfc1 $v0, $f6 -/* 141770 8024E430 00000000 */ nop +/* 141770 8024E430 00000000 */ nop /* 141774 8024E434 30420FFF */ andi $v0, $v0, 0xfff /* 141778 8024E438 00021300 */ sll $v0, $v0, 0xc /* 14177C 8024E43C 4600018D */ trunc.w.s $f6, $f0 /* 141780 8024E440 44033000 */ mfc1 $v1, $f6 /* 141784 8024E444 448A1000 */ mtc1 $t2, $f2 -/* 141788 8024E448 00000000 */ nop +/* 141788 8024E448 00000000 */ nop /* 14178C 8024E44C 468010A0 */ cvt.s.w $f2, $f2 /* 141790 8024E450 46041082 */ mul.s $f2, $f2, $f4 -/* 141794 8024E454 00000000 */ nop +/* 141794 8024E454 00000000 */ nop /* 141798 8024E458 30630FFF */ andi $v1, $v1, 0xfff /* 14179C 8024E45C 00681825 */ or $v1, $v1, $t0 /* 1417A0 8024E460 00431025 */ or $v0, $v0, $v1 /* 1417A4 8024E464 448B0000 */ mtc1 $t3, $f0 -/* 1417A8 8024E468 00000000 */ nop +/* 1417A8 8024E468 00000000 */ nop /* 1417AC 8024E46C 46800020 */ cvt.s.w $f0, $f0 /* 1417B0 8024E470 46040002 */ mul.s $f0, $f0, $f4 -/* 1417B4 8024E474 00000000 */ nop +/* 1417B4 8024E474 00000000 */ nop /* 1417B8 8024E478 AD220000 */ sw $v0, ($t1) /* 1417BC 8024E47C 4600118D */ trunc.w.s $f6, $f2 /* 1417C0 8024E480 44023000 */ mfc1 $v0, $f6 -/* 1417C4 8024E484 00000000 */ nop +/* 1417C4 8024E484 00000000 */ nop /* 1417C8 8024E488 30420FFF */ andi $v0, $v0, 0xfff /* 1417CC 8024E48C 00021300 */ sll $v0, $v0, 0xc /* 1417D0 8024E490 4600018D */ trunc.w.s $f6, $f0 /* 1417D4 8024E494 44033000 */ mfc1 $v1, $f6 -/* 1417D8 8024E498 00000000 */ nop +/* 1417D8 8024E498 00000000 */ nop /* 1417DC 8024E49C 30630FFF */ andi $v1, $v1, 0xfff /* 1417E0 8024E4A0 00431025 */ or $v0, $v0, $v1 /* 1417E4 8024E4A4 AD220004 */ sw $v0, 4($t1) diff --git a/asm/nonmatchings/code_140C70/pause_map_handle_input.s b/asm/nonmatchings/code_140C70/pause_map_handle_input.s index d7be451550..6fbe09c487 100644 --- a/asm/nonmatchings/code_140C70/pause_map_handle_input.s +++ b/asm/nonmatchings/code_140C70/pause_map_handle_input.s @@ -13,28 +13,28 @@ glabel pause_map_handle_input /* 141BD8 8024E898 3421CCCD */ ori $at, $at, 0xcccd /* 141BDC 8024E89C 44811000 */ mtc1 $at, $f2 /* 141BE0 8024E8A0 44820000 */ mtc1 $v0, $f0 -/* 141BE4 8024E8A4 00000000 */ nop +/* 141BE4 8024E8A4 00000000 */ nop /* 141BE8 8024E8A8 46800020 */ cvt.s.w $f0, $f0 /* 141BEC 8024E8AC 46020202 */ mul.s $f8, $f0, $f2 -/* 141BF0 8024E8B0 00000000 */ nop +/* 141BF0 8024E8B0 00000000 */ nop /* 141BF4 8024E8B4 80620044 */ lb $v0, 0x44($v1) /* 141BF8 8024E8B8 00021023 */ negu $v0, $v0 /* 141BFC 8024E8BC 44820000 */ mtc1 $v0, $f0 -/* 141C00 8024E8C0 00000000 */ nop +/* 141C00 8024E8C0 00000000 */ nop /* 141C04 8024E8C4 46800020 */ cvt.s.w $f0, $f0 /* 141C08 8024E8C8 46020182 */ mul.s $f6, $f0, $f2 -/* 141C0C 8024E8CC 00000000 */ nop +/* 141C0C 8024E8CC 00000000 */ nop /* 141C10 8024E8D0 3C018027 */ lui $at, %hi(D_80270718) /* 141C14 8024E8D4 C42A0718 */ lwc1 $f10, %lo(D_80270718)($at) /* 141C18 8024E8D8 44800000 */ mtc1 $zero, $f0 /* 141C1C 8024E8DC 3C018027 */ lui $at, %hi(D_80270714) /* 141C20 8024E8E0 C4220714 */ lwc1 $f2, %lo(D_80270714)($at) /* 141C24 8024E8E4 46004032 */ c.eq.s $f8, $f0 -/* 141C28 8024E8E8 00000000 */ nop +/* 141C28 8024E8E8 00000000 */ nop /* 141C2C 8024E8EC 45000022 */ bc1f .L8024E978 -/* 141C30 8024E8F0 00000000 */ nop +/* 141C30 8024E8F0 00000000 */ nop /* 141C34 8024E8F4 46003032 */ c.eq.s $f6, $f0 -/* 141C38 8024E8F8 00000000 */ nop +/* 141C38 8024E8F8 00000000 */ nop /* 141C3C 8024E8FC 4500001E */ bc1f .L8024E978 /* 141C40 8024E900 2402FFFF */ addiu $v0, $zero, -1 /* 141C44 8024E904 3C048027 */ lui $a0, %hi(D_8027071C) @@ -48,22 +48,22 @@ glabel pause_map_handle_input /* 141C64 8024E924 00431021 */ addu $v0, $v0, $v1 /* 141C68 8024E928 84430000 */ lh $v1, ($v0) /* 141C6C 8024E92C 44830000 */ mtc1 $v1, $f0 -/* 141C70 8024E930 00000000 */ nop +/* 141C70 8024E930 00000000 */ nop /* 141C74 8024E934 46800020 */ cvt.s.w $f0, $f0 /* 141C78 8024E938 46020201 */ sub.s $f8, $f0, $f2 /* 141C7C 8024E93C 3C018027 */ lui $at, %hi(D_80270090) /* 141C80 8024E940 D4240090 */ ldc1 $f4, %lo(D_80270090)($at) /* 141C84 8024E944 460040A1 */ cvt.d.s $f2, $f8 /* 141C88 8024E948 46241082 */ mul.d $f2, $f2, $f4 -/* 141C8C 8024E94C 00000000 */ nop +/* 141C8C 8024E94C 00000000 */ nop /* 141C90 8024E950 84420002 */ lh $v0, 2($v0) /* 141C94 8024E954 44820000 */ mtc1 $v0, $f0 -/* 141C98 8024E958 00000000 */ nop +/* 141C98 8024E958 00000000 */ nop /* 141C9C 8024E95C 46800020 */ cvt.s.w $f0, $f0 /* 141CA0 8024E960 460A0181 */ sub.s $f6, $f0, $f10 /* 141CA4 8024E964 46003021 */ cvt.d.s $f0, $f6 /* 141CA8 8024E968 46240002 */ mul.d $f0, $f0, $f4 -/* 141CAC 8024E96C 00000000 */ nop +/* 141CAC 8024E96C 00000000 */ nop /* 141CB0 8024E970 46201220 */ cvt.s.d $f8, $f2 /* 141CB4 8024E974 462001A0 */ cvt.s.d $f6, $f0 .L8024E978: @@ -77,7 +77,7 @@ glabel pause_map_handle_input /* 141CD4 8024E994 46060000 */ add.s $f0, $f0, $f6 /* 141CD8 8024E998 3C014180 */ lui $at, 0x4180 /* 141CDC 8024E99C 44812000 */ mtc1 $at, $f4 -/* 141CE0 8024E9A0 00000000 */ nop +/* 141CE0 8024E9A0 00000000 */ nop /* 141CE4 8024E9A4 4604103C */ c.lt.s $f2, $f4 /* 141CE8 8024E9A8 E4420000 */ swc1 $f2, ($v0) /* 141CEC 8024E9AC 45000002 */ bc1f .L8024E9B8 @@ -86,38 +86,38 @@ glabel pause_map_handle_input .L8024E9B8: /* 141CF8 8024E9B8 3C014100 */ lui $at, 0x4100 /* 141CFC 8024E9BC 44811000 */ mtc1 $at, $f2 -/* 141D00 8024E9C0 00000000 */ nop +/* 141D00 8024E9C0 00000000 */ nop /* 141D04 8024E9C4 4602003C */ c.lt.s $f0, $f2 -/* 141D08 8024E9C8 00000000 */ nop +/* 141D08 8024E9C8 00000000 */ nop /* 141D0C 8024E9CC 45030001 */ bc1tl .L8024E9D4 /* 141D10 8024E9D0 E4620000 */ swc1 $f2, ($v1) .L8024E9D4: /* 141D14 8024E9D4 C4420000 */ lwc1 $f2, ($v0) /* 141D18 8024E9D8 3C01439E */ lui $at, 0x439e /* 141D1C 8024E9DC 44810000 */ mtc1 $at, $f0 -/* 141D20 8024E9E0 00000000 */ nop +/* 141D20 8024E9E0 00000000 */ nop /* 141D24 8024E9E4 4602003E */ c.le.s $f0, $f2 -/* 141D28 8024E9E8 00000000 */ nop +/* 141D28 8024E9E8 00000000 */ nop /* 141D2C 8024E9EC 45000006 */ bc1f .L8024EA08 -/* 141D30 8024E9F0 00000000 */ nop +/* 141D30 8024E9F0 00000000 */ nop /* 141D34 8024E9F4 3C01439D */ lui $at, 0x439d /* 141D38 8024E9F8 34218000 */ ori $at, $at, 0x8000 /* 141D3C 8024E9FC 44810000 */ mtc1 $at, $f0 -/* 141D40 8024EA00 00000000 */ nop +/* 141D40 8024EA00 00000000 */ nop /* 141D44 8024EA04 E4400000 */ swc1 $f0, ($v0) .L8024EA08: /* 141D48 8024EA08 C4620000 */ lwc1 $f2, ($v1) /* 141D4C 8024EA0C 3C01439A */ lui $at, 0x439a /* 141D50 8024EA10 44810000 */ mtc1 $at, $f0 -/* 141D54 8024EA14 00000000 */ nop +/* 141D54 8024EA14 00000000 */ nop /* 141D58 8024EA18 4602003E */ c.le.s $f0, $f2 -/* 141D5C 8024EA1C 00000000 */ nop +/* 141D5C 8024EA1C 00000000 */ nop /* 141D60 8024EA20 45000006 */ bc1f .L8024EA3C -/* 141D64 8024EA24 00000000 */ nop +/* 141D64 8024EA24 00000000 */ nop /* 141D68 8024EA28 3C014399 */ lui $at, 0x4399 /* 141D6C 8024EA2C 34218000 */ ori $at, $at, 0x8000 /* 141D70 8024EA30 44810000 */ mtc1 $at, $f0 -/* 141D74 8024EA34 00000000 */ nop +/* 141D74 8024EA34 00000000 */ nop /* 141D78 8024EA38 E4600000 */ swc1 $f0, ($v1) .L8024EA3C: /* 141D7C 8024EA3C 3C048027 */ lui $a0, %hi(D_80270704) @@ -143,13 +143,13 @@ glabel pause_map_handle_input /* 141DCC 8024EA8C 3C018027 */ lui $at, %hi(D_802700A8) /* 141DD0 8024EA90 D42000A8 */ ldc1 $f0, %lo(D_802700A8)($at) /* 141DD4 8024EA94 44822000 */ mtc1 $v0, $f4 -/* 141DD8 8024EA98 00000000 */ nop +/* 141DD8 8024EA98 00000000 */ nop /* 141DDC 8024EA9C 46802121 */ cvt.d.w $f4, $f4 /* 141DE0 8024EAA0 4624003E */ c.le.d $f0, $f4 /* 141DE4 8024EAA4 4620130D */ trunc.w.d $f12, $f2 /* 141DE8 8024EAA8 44026000 */ mfc1 $v0, $f12 /* 141DEC 8024EAAC 45000006 */ bc1f .L8024EAC8 -/* 141DF0 8024EAB0 00000000 */ nop +/* 141DF0 8024EAB0 00000000 */ nop /* 141DF4 8024EAB4 46202081 */ sub.d $f2, $f4, $f0 /* 141DF8 8024EAB8 46003021 */ cvt.d.s $f0, $f6 /* 141DFC 8024EABC 46220001 */ sub.d $f0, $f0, $f2 @@ -159,9 +159,9 @@ glabel pause_map_handle_input /* 141E08 8024EAC8 3C018027 */ lui $at, %hi(D_802700B0) /* 141E0C 8024EACC D42000B0 */ ldc1 $f0, %lo(D_802700B0)($at) /* 141E10 8024EAD0 4620203E */ c.le.d $f4, $f0 -/* 141E14 8024EAD4 00000000 */ nop +/* 141E14 8024EAD4 00000000 */ nop /* 141E18 8024EAD8 45000009 */ bc1f .L8024EB00 -/* 141E1C 8024EADC 00000000 */ nop +/* 141E1C 8024EADC 00000000 */ nop /* 141E20 8024EAE0 3C018027 */ lui $at, %hi(D_802700B8) /* 141E24 8024EAE4 D42200B8 */ ldc1 $f2, %lo(D_802700B8)($at) /* 141E28 8024EAE8 C4800000 */ lwc1 $f0, ($a0) @@ -175,12 +175,12 @@ glabel pause_map_handle_input /* 141E44 8024EB04 44813800 */ mtc1 $at, $f7 /* 141E48 8024EB08 44803000 */ mtc1 $zero, $f6 /* 141E4C 8024EB0C 44822000 */ mtc1 $v0, $f4 -/* 141E50 8024EB10 00000000 */ nop +/* 141E50 8024EB10 00000000 */ nop /* 141E54 8024EB14 46802121 */ cvt.d.w $f4, $f4 /* 141E58 8024EB18 4624303E */ c.le.d $f6, $f4 -/* 141E5C 8024EB1C 00000000 */ nop +/* 141E5C 8024EB1C 00000000 */ nop /* 141E60 8024EB20 45000006 */ bc1f .L8024EB3C -/* 141E64 8024EB24 00000000 */ nop +/* 141E64 8024EB24 00000000 */ nop /* 141E68 8024EB28 46262081 */ sub.d $f2, $f4, $f6 /* 141E6C 8024EB2C 46004021 */ cvt.d.s $f0, $f8 /* 141E70 8024EB30 46220001 */ sub.d $f0, $f0, $f2 @@ -190,11 +190,11 @@ glabel pause_map_handle_input /* 141E7C 8024EB3C 3C01C02E */ lui $at, 0xc02e /* 141E80 8024EB40 44810800 */ mtc1 $at, $f1 /* 141E84 8024EB44 44800000 */ mtc1 $zero, $f0 -/* 141E88 8024EB48 00000000 */ nop +/* 141E88 8024EB48 00000000 */ nop /* 141E8C 8024EB4C 4620203E */ c.le.d $f4, $f0 -/* 141E90 8024EB50 00000000 */ nop +/* 141E90 8024EB50 00000000 */ nop /* 141E94 8024EB54 45000007 */ bc1f .L8024EB74 -/* 141E98 8024EB58 00000000 */ nop +/* 141E98 8024EB58 00000000 */ nop /* 141E9C 8024EB5C C4A00000 */ lwc1 $f0, ($a1) /* 141EA0 8024EB60 46262080 */ add.d $f2, $f4, $f6 /* 141EA4 8024EB64 46000021 */ cvt.d.s $f0, $f0 @@ -204,33 +204,33 @@ glabel pause_map_handle_input .L8024EB74: /* 141EB4 8024EB74 C4800000 */ lwc1 $f0, ($a0) /* 141EB8 8024EB78 44801000 */ mtc1 $zero, $f2 -/* 141EBC 8024EB7C 00000000 */ nop +/* 141EBC 8024EB7C 00000000 */ nop /* 141EC0 8024EB80 4600103C */ c.lt.s $f2, $f0 -/* 141EC4 8024EB84 00000000 */ nop +/* 141EC4 8024EB84 00000000 */ nop /* 141EC8 8024EB88 45030001 */ bc1tl .L8024EB90 /* 141ECC 8024EB8C E4820000 */ swc1 $f2, ($a0) .L8024EB90: /* 141ED0 8024EB90 C4A00000 */ lwc1 $f0, ($a1) /* 141ED4 8024EB94 4600103C */ c.lt.s $f2, $f0 -/* 141ED8 8024EB98 00000000 */ nop +/* 141ED8 8024EB98 00000000 */ nop /* 141EDC 8024EB9C 45030001 */ bc1tl .L8024EBA4 /* 141EE0 8024EBA0 E4A20000 */ swc1 $f2, ($a1) .L8024EBA4: /* 141EE4 8024EBA4 C4800000 */ lwc1 $f0, ($a0) /* 141EE8 8024EBA8 3C01C2AC */ lui $at, 0xc2ac /* 141EEC 8024EBAC 44811000 */ mtc1 $at, $f2 -/* 141EF0 8024EBB0 00000000 */ nop +/* 141EF0 8024EBB0 00000000 */ nop /* 141EF4 8024EBB4 4602003C */ c.lt.s $f0, $f2 -/* 141EF8 8024EBB8 00000000 */ nop +/* 141EF8 8024EBB8 00000000 */ nop /* 141EFC 8024EBBC 45030001 */ bc1tl .L8024EBC4 /* 141F00 8024EBC0 E4820000 */ swc1 $f2, ($a0) .L8024EBC4: /* 141F04 8024EBC4 C4A00000 */ lwc1 $f0, ($a1) /* 141F08 8024EBC8 3C01C352 */ lui $at, 0xc352 /* 141F0C 8024EBCC 44811000 */ mtc1 $at, $f2 -/* 141F10 8024EBD0 00000000 */ nop +/* 141F10 8024EBD0 00000000 */ nop /* 141F14 8024EBD4 4602003C */ c.lt.s $f0, $f2 -/* 141F18 8024EBD8 00000000 */ nop +/* 141F18 8024EBD8 00000000 */ nop /* 141F1C 8024EBDC 45030001 */ bc1tl .L8024EBE4 /* 141F20 8024EBE0 E4A20000 */ swc1 $f2, ($a1) .L8024EBE4: @@ -244,7 +244,7 @@ glabel pause_map_handle_input /* 141F40 8024EC00 3C018027 */ lui $at, %hi(gPauseMenuCurrentTab) /* 141F44 8024EC04 A02000D4 */ sb $zero, %lo(gPauseMenuCurrentTab)($at) /* 141F48 8024EC08 08093B27 */ j .L8024EC9C -/* 141F4C 8024EC0C 00000000 */ nop +/* 141F4C 8024EC0C 00000000 */ nop .L8024EC10: /* 141F50 8024EC10 3C118027 */ lui $s1, %hi(D_8027071C) /* 141F54 8024EC14 2631071C */ addiu $s1, $s1, %lo(D_8027071C) @@ -256,7 +256,7 @@ glabel pause_map_handle_input /* 141F6C 8024EC2C 3C018027 */ lui $at, %hi(gPauseMenuCurrentDescString) /* 141F70 8024EC30 AC2000C8 */ sw $zero, %lo(gPauseMenuCurrentDescString)($at) /* 141F74 8024EC34 08093B27 */ j .L8024EC9C -/* 141F78 8024EC38 00000000 */ nop +/* 141F78 8024EC38 00000000 */ nop .L8024EC3C: /* 141F7C 8024EC3C 346300F3 */ ori $v1, $v1, 0xf3 /* 141F80 8024EC40 0000202D */ daddu $a0, $zero, $zero @@ -278,7 +278,7 @@ glabel pause_map_handle_input /* 141FC0 8024EC80 8C2302C4 */ lw $v1, %lo(D_802502C4)($at) /* 141FC4 8024EC84 0043102A */ slt $v0, $v0, $v1 /* 141FC8 8024EC88 14400004 */ bnez $v0, .L8024EC9C -/* 141FCC 8024EC8C 00000000 */ nop +/* 141FCC 8024EC8C 00000000 */ nop /* 141FD0 8024EC90 8E020000 */ lw $v0, ($s0) /* 141FD4 8024EC94 24420001 */ addiu $v0, $v0, 1 /* 141FD8 8024EC98 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_140C70/pause_map_init.s b/asm/nonmatchings/code_140C70/pause_map_init.s index ade23ee51d..a12c74f6e6 100644 --- a/asm/nonmatchings/code_140C70/pause_map_init.s +++ b/asm/nonmatchings/code_140C70/pause_map_init.s @@ -75,7 +75,7 @@ glabel pause_map_init /* 141A4C 8024E70C 3C018027 */ lui $at, %hi(D_80270710) /* 141A50 8024E710 AC220710 */ sw $v0, %lo(D_80270710)($at) /* 141A54 8024E714 080939CB */ j .L8024E72C -/* 141A58 8024E718 00000000 */ nop +/* 141A58 8024E718 00000000 */ nop .L8024E71C: /* 141A5C 8024E71C 3C018027 */ lui $at, %hi(D_8027070C) /* 141A60 8024E720 AC20070C */ sw $zero, %lo(D_8027070C)($at) @@ -110,55 +110,55 @@ glabel pause_map_init /* 141AD0 8024E790 46240001 */ sub.d $f0, $f0, $f4 /* 141AD4 8024E794 4620120D */ trunc.w.d $f8, $f2 /* 141AD8 8024E798 44024000 */ mfc1 $v0, $f8 -/* 141ADC 8024E79C 00000000 */ nop +/* 141ADC 8024E79C 00000000 */ nop /* 141AE0 8024E7A0 44821000 */ mtc1 $v0, $f2 -/* 141AE4 8024E7A4 00000000 */ nop +/* 141AE4 8024E7A4 00000000 */ nop /* 141AE8 8024E7A8 468010A0 */ cvt.s.w $f2, $f2 /* 141AEC 8024E7AC 46023081 */ sub.s $f2, $f6, $f2 /* 141AF0 8024E7B0 4620020D */ trunc.w.d $f8, $f0 /* 141AF4 8024E7B4 44024000 */ mfc1 $v0, $f8 -/* 141AF8 8024E7B8 00000000 */ nop +/* 141AF8 8024E7B8 00000000 */ nop /* 141AFC 8024E7BC 44820000 */ mtc1 $v0, $f0 -/* 141B00 8024E7C0 00000000 */ nop +/* 141B00 8024E7C0 00000000 */ nop /* 141B04 8024E7C4 46800020 */ cvt.s.w $f0, $f0 /* 141B08 8024E7C8 46003001 */ sub.s $f0, $f6, $f0 /* 141B0C 8024E7CC AC800000 */ sw $zero, ($a0) /* 141B10 8024E7D0 E4620000 */ swc1 $f2, ($v1) /* 141B14 8024E7D4 4602303C */ c.lt.s $f6, $f2 -/* 141B18 8024E7D8 00000000 */ nop +/* 141B18 8024E7D8 00000000 */ nop /* 141B1C 8024E7DC 45000002 */ bc1f .L8024E7E8 /* 141B20 8024E7E0 E4800000 */ swc1 $f0, ($a0) /* 141B24 8024E7E4 E4660000 */ swc1 $f6, ($v1) .L8024E7E8: /* 141B28 8024E7E8 4600303C */ c.lt.s $f6, $f0 -/* 141B2C 8024E7EC 00000000 */ nop +/* 141B2C 8024E7EC 00000000 */ nop /* 141B30 8024E7F0 45030001 */ bc1tl .L8024E7F8 /* 141B34 8024E7F4 E4860000 */ swc1 $f6, ($a0) .L8024E7F8: /* 141B38 8024E7F8 C4620000 */ lwc1 $f2, ($v1) /* 141B3C 8024E7FC 3C01C2AC */ lui $at, 0xc2ac /* 141B40 8024E800 44810000 */ mtc1 $at, $f0 -/* 141B44 8024E804 00000000 */ nop +/* 141B44 8024E804 00000000 */ nop /* 141B48 8024E808 4600103E */ c.le.s $f2, $f0 -/* 141B4C 8024E80C 00000000 */ nop +/* 141B4C 8024E80C 00000000 */ nop /* 141B50 8024E810 45000005 */ bc1f .L8024E828 -/* 141B54 8024E814 00000000 */ nop +/* 141B54 8024E814 00000000 */ nop /* 141B58 8024E818 3C01C2AA */ lui $at, 0xc2aa /* 141B5C 8024E81C 44810000 */ mtc1 $at, $f0 -/* 141B60 8024E820 00000000 */ nop +/* 141B60 8024E820 00000000 */ nop /* 141B64 8024E824 E4600000 */ swc1 $f0, ($v1) .L8024E828: /* 141B68 8024E828 C4820000 */ lwc1 $f2, ($a0) /* 141B6C 8024E82C 3C01C352 */ lui $at, 0xc352 /* 141B70 8024E830 44810000 */ mtc1 $at, $f0 -/* 141B74 8024E834 00000000 */ nop +/* 141B74 8024E834 00000000 */ nop /* 141B78 8024E838 4600103E */ c.le.s $f2, $f0 -/* 141B7C 8024E83C 00000000 */ nop +/* 141B7C 8024E83C 00000000 */ nop /* 141B80 8024E840 45000005 */ bc1f .L8024E858 /* 141B84 8024E844 24020001 */ addiu $v0, $zero, 1 /* 141B88 8024E848 3C01C351 */ lui $at, 0xc351 /* 141B8C 8024E84C 44810000 */ mtc1 $at, $f0 -/* 141B90 8024E850 00000000 */ nop +/* 141B90 8024E850 00000000 */ nop /* 141B94 8024E854 E4800000 */ swc1 $f0, ($a0) .L8024E858: /* 141B98 8024E858 A2620000 */ sb $v0, ($s3) diff --git a/asm/nonmatchings/code_140C70/pause_map_update.s b/asm/nonmatchings/code_140C70/pause_map_update.s index 4132884c5c..e41d3f114a 100644 --- a/asm/nonmatchings/code_140C70/pause_map_update.s +++ b/asm/nonmatchings/code_140C70/pause_map_update.s @@ -43,40 +43,40 @@ glabel pause_map_update /* 142084 8024ED44 3C018027 */ lui $at, %hi(D_80270714) /* 142088 8024ED48 C4240714 */ lwc1 $f4, %lo(D_80270714)($at) /* 14208C 8024ED4C 44820000 */ mtc1 $v0, $f0 -/* 142090 8024ED50 00000000 */ nop +/* 142090 8024ED50 00000000 */ nop /* 142094 8024ED54 46800020 */ cvt.s.w $f0, $f0 /* 142098 8024ED58 46002101 */ sub.s $f4, $f4, $f0 /* 14209C 8024ED5C 46042102 */ mul.s $f4, $f4, $f4 -/* 1420A0 8024ED60 00000000 */ nop +/* 1420A0 8024ED60 00000000 */ nop /* 1420A4 8024ED64 86220002 */ lh $v0, 2($s1) /* 1420A8 8024ED68 3C018027 */ lui $at, %hi(D_80270718) /* 1420AC 8024ED6C C4200718 */ lwc1 $f0, %lo(D_80270718)($at) /* 1420B0 8024ED70 44821000 */ mtc1 $v0, $f2 -/* 1420B4 8024ED74 00000000 */ nop +/* 1420B4 8024ED74 00000000 */ nop /* 1420B8 8024ED78 468010A0 */ cvt.s.w $f2, $f2 /* 1420BC 8024ED7C 46020001 */ sub.s $f0, $f0, $f2 /* 1420C0 8024ED80 46000002 */ mul.s $f0, $f0, $f0 -/* 1420C4 8024ED84 00000000 */ nop +/* 1420C4 8024ED84 00000000 */ nop /* 1420C8 8024ED88 46002100 */ add.s $f4, $f4, $f0 /* 1420CC 8024ED8C 461A203C */ c.lt.s $f4, $f26 -/* 1420D0 8024ED90 00000000 */ nop +/* 1420D0 8024ED90 00000000 */ nop /* 1420D4 8024ED94 45000004 */ bc1f .L8024EDA8 -/* 1420D8 8024ED98 00000000 */ nop +/* 1420D8 8024ED98 00000000 */ nop /* 1420DC 8024ED9C 8E420000 */ lw $v0, ($s2) /* 1420E0 8024EDA0 24420001 */ addiu $v0, $v0, 1 /* 1420E4 8024EDA4 AE420000 */ sw $v0, ($s2) .L8024EDA8: /* 1420E8 8024EDA8 4614203C */ c.lt.s $f4, $f20 -/* 1420EC 8024EDAC 00000000 */ nop +/* 1420EC 8024EDAC 00000000 */ nop /* 1420F0 8024EDB0 4502000A */ bc1fl .L8024EDDC /* 1420F4 8024EDB4 26100001 */ addiu $s0, $s0, 1 /* 1420F8 8024EDB8 4618203C */ c.lt.s $f4, $f24 -/* 1420FC 8024EDBC 00000000 */ nop +/* 1420FC 8024EDBC 00000000 */ nop /* 142100 8024EDC0 45020006 */ bc1fl .L8024EDDC /* 142104 8024EDC4 26100001 */ addiu $s0, $s0, 1 /* 142108 8024EDC8 46002506 */ mov.s $f20, $f4 /* 14210C 8024EDCC 4490B000 */ mtc1 $s0, $f22 -/* 142110 8024EDD0 00000000 */ nop +/* 142110 8024EDD0 00000000 */ nop /* 142114 8024EDD4 4680B5A0 */ cvt.s.w $f22, $f22 /* 142118 8024EDD8 26100001 */ addiu $s0, $s0, 1 .L8024EDDC: diff --git a/asm/nonmatchings/code_165490/func_80244C30.s b/asm/nonmatchings/code_165490/func_80244C30.s index 72990c603e..fadab4cfa4 100644 --- a/asm/nonmatchings/code_165490/func_80244C30.s +++ b/asm/nonmatchings/code_165490/func_80244C30.s @@ -18,7 +18,7 @@ glabel func_80244C30 /* 1654C4 80244C64 00220821 */ addu $at, $at, $v0 /* 1654C8 80244C68 8C22BF70 */ lw $v0, %lo(D_8024BF70)($at) /* 1654CC 80244C6C 00400008 */ jr $v0 -/* 1654D0 80244C70 00000000 */ nop +/* 1654D0 80244C70 00000000 */ nop /* 1654D4 80244C74 24040001 */ addiu $a0, $zero, 1 /* 1654D8 80244C78 0809132B */ j .L80244CAC /* 1654DC 80244C7C 24110009 */ addiu $s1, $zero, 9 diff --git a/asm/nonmatchings/code_165490/func_80244CEC.s b/asm/nonmatchings/code_165490/func_80244CEC.s index 7892e1a720..1ec9c79874 100644 --- a/asm/nonmatchings/code_165490/func_80244CEC.s +++ b/asm/nonmatchings/code_165490/func_80244CEC.s @@ -18,7 +18,7 @@ glabel func_80244CEC /* 165580 80244D20 24C6000A */ addiu $a2, $a2, 0xa /* 165584 80244D24 8E040048 */ lw $a0, 0x48($s0) /* 165588 80244D28 08091352 */ j .L80244D48 -/* 16558C 80244D2C 00000000 */ nop +/* 16558C 80244D2C 00000000 */ nop .L80244D30: /* 165590 80244D30 3C108025 */ lui $s0, %hi(D_8024C0B0) /* 165594 80244D34 2610C0B0 */ addiu $s0, $s0, %lo(D_8024C0B0) @@ -28,7 +28,7 @@ glabel func_80244CEC /* 1655A4 80244D44 8E04004C */ lw $a0, 0x4c($s0) .L80244D48: /* 1655A8 80244D48 0C0511F8 */ jal draw_icon_2 -/* 1655AC 80244D4C 00000000 */ nop +/* 1655AC 80244D4C 00000000 */ nop /* 1655B0 80244D50 8FBF0014 */ lw $ra, 0x14($sp) /* 1655B4 80244D54 8FB00010 */ lw $s0, 0x10($sp) /* 1655B8 80244D58 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_165490/func_80244D60.s b/asm/nonmatchings/code_165490/func_80244D60.s index 8cf202cd0b..abdfc54c2c 100644 --- a/asm/nonmatchings/code_165490/func_80244D60.s +++ b/asm/nonmatchings/code_165490/func_80244D60.s @@ -17,7 +17,7 @@ glabel func_80244D60 /* 1655F0 80244D90 24C6000A */ addiu $a2, $a2, 0xa /* 1655F4 80244D94 8E040040 */ lw $a0, 0x40($s0) /* 1655F8 80244D98 0809136E */ j .L80244DB8 -/* 1655FC 80244D9C 00000000 */ nop +/* 1655FC 80244D9C 00000000 */ nop .L80244DA0: /* 165600 80244DA0 3C108025 */ lui $s0, %hi(D_8024C0B0) /* 165604 80244DA4 2610C0B0 */ addiu $s0, $s0, %lo(D_8024C0B0) @@ -27,7 +27,7 @@ glabel func_80244D60 /* 165614 80244DB4 8E040044 */ lw $a0, 0x44($s0) .L80244DB8: /* 165618 80244DB8 0C0511F8 */ jal draw_icon_2 -/* 16561C 80244DBC 00000000 */ nop +/* 16561C 80244DBC 00000000 */ nop /* 165620 80244DC0 8FBF0014 */ lw $ra, 0x14($sp) /* 165624 80244DC4 8FB00010 */ lw $s0, 0x10($sp) /* 165628 80244DC8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_165490/func_80244FD4.s b/asm/nonmatchings/code_165490/func_80244FD4.s index 5e50bf3843..e24c5bbe29 100644 --- a/asm/nonmatchings/code_165490/func_80244FD4.s +++ b/asm/nonmatchings/code_165490/func_80244FD4.s @@ -35,7 +35,7 @@ glabel func_80244FD4 /* 1658A8 80245048 00629021 */ addu $s2, $v1, $v0 /* 1658AC 8024504C 8E420000 */ lw $v0, ($s2) /* 1658B0 80245050 1440000F */ bnez $v0, .L80245090 -/* 1658B4 80245054 00000000 */ nop +/* 1658B4 80245054 00000000 */ nop /* 1658B8 80245058 0C0926A9 */ jal func_80249AA4 /* 1658BC 8024505C 2404000C */ addiu $a0, $zero, 0xc /* 1658C0 80245060 0040202D */ daddu $a0, $v0, $zero @@ -50,7 +50,7 @@ glabel func_80244FD4 /* 1658E0 80245080 0C09265F */ jal func_8024997C /* 1658E4 80245084 25060014 */ addiu $a2, $t0, 0x14 /* 1658E8 80245088 08091507 */ j .L8024541C -/* 1658EC 8024508C 00000000 */ nop +/* 1658EC 8024508C 00000000 */ nop .L80245090: /* 1658F0 80245090 0C0926A9 */ jal func_80249AA4 /* 1658F4 80245094 24040007 */ addiu $a0, $zero, 7 @@ -254,7 +254,7 @@ glabel func_80244FD4 /* 165C04 802453A4 91020004 */ lbu $v0, 4($t0) /* 165C08 802453A8 0282102A */ slt $v0, $s4, $v0 /* 165C0C 802453AC 10400003 */ beqz $v0, .L802453BC -/* 165C10 802453B0 00000000 */ nop +/* 165C10 802453B0 00000000 */ nop /* 165C14 802453B4 080914F3 */ j .L802453CC /* 165C18 802453B8 8EB00000 */ lw $s0, ($s5) .L802453BC: @@ -270,7 +270,7 @@ glabel func_80244FD4 /* 165C3C 802453DC 0C051261 */ jal set_icon_render_pos /* 165C40 802453E0 2506002C */ addiu $a2, $t0, 0x2c /* 165C44 802453E4 16800005 */ bnez $s4, .L802453FC -/* 165C48 802453E8 00000000 */ nop +/* 165C48 802453E8 00000000 */ nop /* 165C4C 802453EC 0C0511F8 */ jal draw_icon_2 /* 165C50 802453F0 0200202D */ daddu $a0, $s0, $zero /* 165C54 802453F4 08091502 */ j .L80245408 diff --git a/asm/nonmatchings/code_165490/func_8024544C.s b/asm/nonmatchings/code_165490/func_8024544C.s index 60a21c40a8..1b22e07d13 100644 --- a/asm/nonmatchings/code_165490/func_8024544C.s +++ b/asm/nonmatchings/code_165490/func_8024544C.s @@ -49,7 +49,7 @@ glabel func_8024544C /* 165D58 802454F8 0C049DA7 */ jal draw_number /* 165D5C 802454FC AFA20018 */ sw $v0, 0x18($sp) /* 165D60 80245500 0809155A */ j .L80245568 -/* 165D64 80245504 00000000 */ nop +/* 165D64 80245504 00000000 */ nop .L80245508: /* 165D68 80245508 26650021 */ addiu $a1, $s3, 0x21 /* 165D6C 8024550C 0240302D */ daddu $a2, $s2, $zero diff --git a/asm/nonmatchings/code_165490/func_80245808.s b/asm/nonmatchings/code_165490/func_80245808.s index 177f4483be..210dd72212 100644 --- a/asm/nonmatchings/code_165490/func_80245808.s +++ b/asm/nonmatchings/code_165490/func_80245808.s @@ -43,11 +43,11 @@ glabel func_80245808 /* 1660F8 80245898 00430018 */ mult $v0, $v1 /* 1660FC 8024589C 00003012 */ mflo $a2 /* 166100 802458A0 82620006 */ lb $v0, 6($s3) -/* 166104 802458A4 00000000 */ nop +/* 166104 802458A4 00000000 */ nop /* 166108 802458A8 00C20018 */ mult $a2, $v0 /* 16610C 802458AC 00002012 */ mflo $a0 /* 166110 802458B0 82620002 */ lb $v0, 2($s3) -/* 166114 802458B4 00000000 */ nop +/* 166114 802458B4 00000000 */ nop /* 166118 802458B8 00620018 */ mult $v1, $v0 /* 16611C 802458BC 00001812 */ mflo $v1 /* 166120 802458C0 00831821 */ addu $v1, $a0, $v1 diff --git a/asm/nonmatchings/code_165490/func_80245A40.s b/asm/nonmatchings/code_165490/func_80245A40.s index f81c071271..7da1564c0c 100644 --- a/asm/nonmatchings/code_165490/func_80245A40.s +++ b/asm/nonmatchings/code_165490/func_80245A40.s @@ -15,7 +15,7 @@ glabel func_80245A40 /* 1662C8 80245A68 92670003 */ lbu $a3, 3($s3) /* 1662CC 80245A6C 00431024 */ and $v0, $v0, $v1 /* 1662D0 80245A70 1040001C */ beqz $v0, .L80245AE4 -/* 1662D4 80245A74 00000000 */ nop +/* 1662D4 80245A74 00000000 */ nop .L80245A78: /* 1662D8 80245A78 92620001 */ lbu $v0, 1($s3) /* 1662DC 80245A7C 2442FFFF */ addiu $v0, $v0, -1 @@ -29,11 +29,11 @@ glabel func_80245A40 /* 1662FC 80245A9C 00430018 */ mult $v0, $v1 /* 166300 80245AA0 00006012 */ mflo $t4 /* 166304 80245AA4 82620006 */ lb $v0, 6($s3) -/* 166308 80245AA8 00000000 */ nop +/* 166308 80245AA8 00000000 */ nop /* 16630C 80245AAC 01820018 */ mult $t4, $v0 /* 166310 80245AB0 00002012 */ mflo $a0 /* 166314 80245AB4 82620002 */ lb $v0, 2($s3) -/* 166318 80245AB8 00000000 */ nop +/* 166318 80245AB8 00000000 */ nop /* 16631C 80245ABC 00620018 */ mult $v1, $v0 /* 166320 80245AC0 00001812 */ mflo $v1 /* 166324 80245AC4 00831021 */ addu $v0, $a0, $v1 @@ -43,14 +43,14 @@ glabel func_80245A40 /* 166334 80245AD4 00621821 */ addu $v1, $v1, $v0 /* 166338 80245AD8 90620000 */ lbu $v0, ($v1) /* 16633C 80245ADC 1082FFE6 */ beq $a0, $v0, .L80245A78 -/* 166340 80245AE0 00000000 */ nop +/* 166340 80245AE0 00000000 */ nop .L80245AE4: /* 166344 80245AE4 3C028025 */ lui $v0, %hi(D_8024C08C) /* 166348 80245AE8 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) /* 16634C 80245AEC 3C030008 */ lui $v1, 8 /* 166350 80245AF0 00431024 */ and $v0, $v0, $v1 /* 166354 80245AF4 1040001E */ beqz $v0, .L80245B70 -/* 166358 80245AF8 00000000 */ nop +/* 166358 80245AF8 00000000 */ nop /* 16635C 80245AFC 92660005 */ lbu $a2, 5($s3) /* 166360 80245B00 82650005 */ lb $a1, 5($s3) .L80245B04: @@ -66,11 +66,11 @@ glabel func_80245A40 /* 166388 80245B28 00450018 */ mult $v0, $a1 /* 16638C 80245B2C 00001812 */ mflo $v1 /* 166390 80245B30 82620006 */ lb $v0, 6($s3) -/* 166394 80245B34 00000000 */ nop +/* 166394 80245B34 00000000 */ nop /* 166398 80245B38 00620018 */ mult $v1, $v0 /* 16639C 80245B3C 00001812 */ mflo $v1 /* 1663A0 80245B40 82620002 */ lb $v0, 2($s3) -/* 1663A4 80245B44 00000000 */ nop +/* 1663A4 80245B44 00000000 */ nop /* 1663A8 80245B48 00A20018 */ mult $a1, $v0 /* 1663AC 80245B4C 00006012 */ mflo $t4 /* 1663B0 80245B50 006C1021 */ addu $v0, $v1, $t4 @@ -80,14 +80,14 @@ glabel func_80245A40 /* 1663C0 80245B60 00621821 */ addu $v1, $v1, $v0 /* 1663C4 80245B64 90620000 */ lbu $v0, ($v1) /* 1663C8 80245B68 1082FFE6 */ beq $a0, $v0, .L80245B04 -/* 1663CC 80245B6C 00000000 */ nop +/* 1663CC 80245B6C 00000000 */ nop .L80245B70: /* 1663D0 80245B70 3C028025 */ lui $v0, %hi(D_8024C08C) /* 1663D4 80245B74 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) /* 1663D8 80245B78 3C030001 */ lui $v1, 1 /* 1663DC 80245B7C 00431024 */ and $v0, $v0, $v1 /* 1663E0 80245B80 10400007 */ beqz $v0, .L80245BA0 -/* 1663E4 80245B84 00000000 */ nop +/* 1663E4 80245B84 00000000 */ nop /* 1663E8 80245B88 92620002 */ lbu $v0, 2($s3) /* 1663EC 80245B8C 2442FFFF */ addiu $v0, $v0, -1 /* 1663F0 80245B90 A2620002 */ sb $v0, 2($s3) @@ -100,7 +100,7 @@ glabel func_80245A40 /* 166408 80245BA8 3C030002 */ lui $v1, 2 /* 16640C 80245BAC 00431024 */ and $v0, $v0, $v1 /* 166410 80245BB0 1040000C */ beqz $v0, .L80245BE4 -/* 166414 80245BB4 00000000 */ nop +/* 166414 80245BB4 00000000 */ nop /* 166418 80245BB8 92620002 */ lbu $v0, 2($s3) /* 16641C 80245BBC 82630006 */ lb $v1, 6($s3) /* 166420 80245BC0 24420001 */ addiu $v0, $v0, 1 @@ -121,24 +121,24 @@ glabel func_80245A40 /* 166458 80245BF8 00220821 */ addu $at, $at, $v0 /* 16645C 80245BFC 8C22BF88 */ lw $v0, %lo(D_8024BF88)($at) /* 166460 80245C00 00400008 */ jr $v0 -/* 166464 80245C04 00000000 */ nop +/* 166464 80245C04 00000000 */ nop .L80245C08: /* 166468 80245C08 080916DC */ j .L80245B70 /* 16646C 80245C0C A2620001 */ sb $v0, 1($s3) /* 166470 80245C10 82630001 */ lb $v1, 1($s3) /* 166474 80245C14 24020001 */ addiu $v0, $zero, 1 /* 166478 80245C18 14620014 */ bne $v1, $v0, .L80245C6C -/* 16647C 80245C1C 00000000 */ nop +/* 16647C 80245C1C 00000000 */ nop /* 166480 80245C20 92620002 */ lbu $v0, 2($s3) /* 166484 80245C24 2C420002 */ sltiu $v0, $v0, 2 /* 166488 80245C28 54400010 */ bnel $v0, $zero, .L80245C6C /* 16648C 80245C2C A2600001 */ sb $zero, 1($s3) /* 166490 80245C30 0809171B */ j .L80245C6C -/* 166494 80245C34 00000000 */ nop +/* 166494 80245C34 00000000 */ nop /* 166498 80245C38 82630001 */ lb $v1, 1($s3) /* 16649C 80245C3C 24020001 */ addiu $v0, $zero, 1 /* 1664A0 80245C40 14620005 */ bne $v1, $v0, .L80245C58 -/* 1664A4 80245C44 00000000 */ nop +/* 1664A4 80245C44 00000000 */ nop /* 1664A8 80245C48 92620002 */ lbu $v0, 2($s3) /* 1664AC 80245C4C 2C420002 */ sltiu $v0, $v0, 2 /* 1664B0 80245C50 54400001 */ bnel $v0, $zero, .L80245C58 @@ -155,11 +155,11 @@ glabel func_80245A40 /* 1664D4 80245C74 00430018 */ mult $v0, $v1 /* 1664D8 80245C78 00006012 */ mflo $t4 /* 1664DC 80245C7C 82620006 */ lb $v0, 6($s3) -/* 1664E0 80245C80 00000000 */ nop +/* 1664E0 80245C80 00000000 */ nop /* 1664E4 80245C84 01820018 */ mult $t4, $v0 /* 1664E8 80245C88 00002012 */ mflo $a0 /* 1664EC 80245C8C 82620002 */ lb $v0, 2($s3) -/* 1664F0 80245C90 00000000 */ nop +/* 1664F0 80245C90 00000000 */ nop /* 1664F4 80245C94 00620018 */ mult $v1, $v0 /* 1664F8 80245C98 00001812 */ mflo $v1 /* 1664FC 80245C9C 00831821 */ addu $v1, $a0, $v1 @@ -171,13 +171,13 @@ glabel func_80245A40 /* 166514 80245CB4 A2620003 */ sb $v0, 3($s3) /* 166518 80245CB8 304200FF */ andi $v0, $v0, 0xff /* 16651C 80245CBC 10E20003 */ beq $a3, $v0, .L80245CCC -/* 166520 80245CC0 00000000 */ nop +/* 166520 80245CC0 00000000 */ nop /* 166524 80245CC4 0C05272D */ jal play_sound /* 166528 80245CC8 24042101 */ addiu $a0, $zero, 0x2101 .L80245CCC: /* 16652C 80245CCC 82620004 */ lb $v0, 4($s3) /* 166530 80245CD0 14400022 */ bnez $v0, .L80245D5C -/* 166534 80245CD4 00000000 */ nop +/* 166534 80245CD4 00000000 */ nop /* 166538 80245CD8 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 16653C 80245CDC 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 166540 80245CE0 3C058025 */ lui $a1, %hi(D_8024C084) @@ -193,37 +193,37 @@ glabel func_80245A40 /* 166564 80245D04 8CA20000 */ lw $v0, ($a1) /* 166568 80245D08 30420010 */ andi $v0, $v0, 0x10 /* 16656C 80245D0C 10400003 */ beqz $v0, .L80245D1C -/* 166570 80245D10 00000000 */ nop +/* 166570 80245D10 00000000 */ nop /* 166574 80245D14 8E020000 */ lw $v0, ($s0) /* 166578 80245D18 A04000AB */ sb $zero, 0xab($v0) .L80245D1C: /* 16657C 80245D1C 8E020000 */ lw $v0, ($s0) /* 166580 80245D20 904200AB */ lbu $v0, 0xab($v0) /* 166584 80245D24 1082000D */ beq $a0, $v0, .L80245D5C -/* 166588 80245D28 00000000 */ nop +/* 166588 80245D28 00000000 */ nop /* 16658C 80245D2C 0C05272D */ jal play_sound /* 166590 80245D30 240400C8 */ addiu $a0, $zero, 0xc8 /* 166594 80245D34 8E020000 */ lw $v0, ($s0) /* 166598 80245D38 904200AB */ lbu $v0, 0xab($v0) /* 16659C 80245D3C 10400005 */ beqz $v0, .L80245D54 -/* 1665A0 80245D40 00000000 */ nop +/* 1665A0 80245D40 00000000 */ nop /* 1665A4 80245D44 0C015857 */ jal func_8005615C -/* 1665A8 80245D48 00000000 */ nop +/* 1665A8 80245D48 00000000 */ nop /* 1665AC 80245D4C 08091757 */ j .L80245D5C -/* 1665B0 80245D50 00000000 */ nop +/* 1665B0 80245D50 00000000 */ nop .L80245D54: /* 1665B4 80245D54 0C015860 */ jal func_80056180 -/* 1665B8 80245D58 00000000 */ nop +/* 1665B8 80245D58 00000000 */ nop .L80245D5C: /* 1665BC 80245D5C 3C038025 */ lui $v1, %hi(D_8024C084) /* 1665C0 80245D60 2463C084 */ addiu $v1, $v1, %lo(D_8024C084) /* 1665C4 80245D64 8C620000 */ lw $v0, ($v1) /* 1665C8 80245D68 30421000 */ andi $v0, $v0, 0x1000 /* 1665CC 80245D6C 10400009 */ beqz $v0, .L80245D94 -/* 1665D0 80245D70 00000000 */ nop +/* 1665D0 80245D70 00000000 */ nop /* 1665D4 80245D74 82620004 */ lb $v0, 4($s3) /* 1665D8 80245D78 14400006 */ bnez $v0, .L80245D94 -/* 1665DC 80245D7C 00000000 */ nop +/* 1665DC 80245D7C 00000000 */ nop /* 1665E0 80245D80 92620003 */ lbu $v0, 3($s3) /* 1665E4 80245D84 2C420004 */ sltiu $v0, $v0, 4 /* 1665E8 80245D88 10400002 */ beqz $v0, .L80245D94 @@ -234,7 +234,7 @@ glabel func_80245A40 /* 1665F8 80245D98 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) /* 1665FC 80245D9C 30428000 */ andi $v0, $v0, 0x8000 /* 166600 80245DA0 104002D1 */ beqz $v0, .L802468E8 -/* 166604 80245DA4 00000000 */ nop +/* 166604 80245DA4 00000000 */ nop /* 166608 80245DA8 82630004 */ lb $v1, 4($s3) /* 16660C 80245DAC 2C620005 */ sltiu $v0, $v1, 5 /* 166610 80245DB0 104002CD */ beqz $v0, .L802468E8 @@ -244,11 +244,11 @@ glabel func_80245A40 /* 166620 80245DC0 00220821 */ addu $at, $at, $v0 /* 166624 80245DC4 8C22BFA0 */ lw $v0, %lo(D_8024BFA0)($at) /* 166628 80245DC8 00400008 */ jr $v0 -/* 16662C 80245DCC 00000000 */ nop +/* 16662C 80245DCC 00000000 */ nop /* 166630 80245DD0 92620003 */ lbu $v0, 3($s3) /* 166634 80245DD4 2C420004 */ sltiu $v0, $v0, 4 /* 166638 80245DD8 10400007 */ beqz $v0, .L80245DF8 -/* 16663C 80245DDC 00000000 */ nop +/* 16663C 80245DDC 00000000 */ nop /* 166640 80245DE0 92620003 */ lbu $v0, 3($s3) /* 166644 80245DE4 3C018007 */ lui $at, %hi(D_80077A24) /* 166648 80245DE8 00220821 */ addu $at, $at, $v0 @@ -369,7 +369,7 @@ glabel func_80245A40 /* 166808 80245FA8 0C00CD3C */ jal set_game_mode /* 16680C 80245FAC 2404000F */ addiu $a0, $zero, 0xf /* 166810 80245FB0 08091A3A */ j .L802468E8 -/* 166814 80245FB4 00000000 */ nop +/* 166814 80245FB4 00000000 */ nop .L80245FB8: /* 166818 80245FB8 14620005 */ bne $v1, $v0, .L80245FD0 /* 16681C 80245FBC 24020005 */ addiu $v0, $zero, 5 @@ -406,10 +406,10 @@ glabel func_80245A40 /* 166890 80246030 0C051F9F */ jal func_80147E7C /* 166894 80246034 0200282D */ daddu $a1, $s0, $zero /* 166898 80246038 08091A3A */ j .L802468E8 -/* 16689C 8024603C 00000000 */ nop +/* 16689C 8024603C 00000000 */ nop .L80246040: /* 1668A0 80246040 10400229 */ beqz $v0, .L802468E8 -/* 1668A4 80246044 00000000 */ nop +/* 1668A4 80246044 00000000 */ nop /* 1668A8 80246048 0C05272D */ jal play_sound /* 1668AC 8024604C 240400C9 */ addiu $a0, $zero, 0xc9 /* 1668B0 80246050 2404002D */ addiu $a0, $zero, 0x2d @@ -547,13 +547,13 @@ glabel func_80245A40 /* 166AB0 80246250 24060002 */ addiu $a2, $zero, 2 .L80246254: /* 166AB4 80246254 104001A4 */ beqz $v0, .L802468E8 -/* 166AB8 80246258 00000000 */ nop +/* 166AB8 80246258 00000000 */ nop /* 166ABC 8024625C 92620003 */ lbu $v0, 3($s3) /* 166AC0 80246260 3C018007 */ lui $at, %hi(D_80077A24) /* 166AC4 80246264 00220821 */ addu $at, $at, $v0 /* 166AC8 80246268 90227A24 */ lbu $v0, %lo(D_80077A24)($at) /* 166ACC 8024626C 1040007F */ beqz $v0, .L8024646C -/* 166AD0 80246270 00000000 */ nop +/* 166AD0 80246270 00000000 */ nop /* 166AD4 80246274 0C05272D */ jal play_sound /* 166AD8 80246278 240400C9 */ addiu $a0, $zero, 0xc9 /* 166ADC 8024627C 3C058024 */ lui $a1, %hi(func_80243CCC) @@ -650,13 +650,13 @@ glabel func_80245A40 /* 166C38 802463D8 24060001 */ addiu $a2, $zero, 1 .L802463DC: /* 166C3C 802463DC 10400142 */ beqz $v0, .L802468E8 -/* 166C40 802463E0 00000000 */ nop +/* 166C40 802463E0 00000000 */ nop /* 166C44 802463E4 92620003 */ lbu $v0, 3($s3) /* 166C48 802463E8 3C018007 */ lui $at, %hi(D_80077A24) /* 166C4C 802463EC 00220821 */ addu $at, $at, $v0 /* 166C50 802463F0 90227A24 */ lbu $v0, %lo(D_80077A24)($at) /* 166C54 802463F4 1040001D */ beqz $v0, .L8024646C -/* 166C58 802463F8 00000000 */ nop +/* 166C58 802463F8 00000000 */ nop /* 166C5C 802463FC 0C05272D */ jal play_sound /* 166C60 80246400 240400C9 */ addiu $a0, $zero, 0xc9 /* 166C64 80246404 92630003 */ lbu $v1, 3($s3) @@ -665,7 +665,7 @@ glabel func_80245A40 /* 166C70 80246410 3C018025 */ lui $at, %hi(D_8024C094) /* 166C74 80246414 AC23C094 */ sw $v1, %lo(D_8024C094)($at) /* 166C78 80246418 08091A3A */ j .L802468E8 -/* 166C7C 8024641C 00000000 */ nop +/* 166C7C 8024641C 00000000 */ nop /* 166C80 80246420 92630003 */ lbu $v1, 3($s3) /* 166C84 80246424 24020006 */ addiu $v0, $zero, 6 /* 166C88 80246428 14620009 */ bne $v1, $v0, .L80246450 @@ -680,17 +680,17 @@ glabel func_80245A40 /* 166CAC 8024644C 24060002 */ addiu $a2, $zero, 2 .L80246450: /* 166CB0 80246450 10400125 */ beqz $v0, .L802468E8 -/* 166CB4 80246454 00000000 */ nop +/* 166CB4 80246454 00000000 */ nop /* 166CB8 80246458 92630003 */ lbu $v1, 3($s3) /* 166CBC 8024645C 3C028025 */ lui $v0, %hi(D_8024C094) /* 166CC0 80246460 8C42C094 */ lw $v0, %lo(D_8024C094)($v0) /* 166CC4 80246464 14430005 */ bne $v0, $v1, .L8024647C -/* 166CC8 80246468 00000000 */ nop +/* 166CC8 80246468 00000000 */ nop .L8024646C: /* 166CCC 8024646C 0C05272D */ jal play_sound /* 166CD0 80246470 2404021D */ addiu $a0, $zero, 0x21d /* 166CD4 80246474 08091A3A */ j .L802468E8 -/* 166CD8 80246478 00000000 */ nop +/* 166CD8 80246478 00000000 */ nop .L8024647C: /* 166CDC 8024647C 3C018025 */ lui $at, %hi(D_8024C080) /* 166CE0 80246480 AC23C080 */ sw $v1, %lo(D_8024C080)($at) @@ -699,7 +699,7 @@ glabel func_80245A40 /* 166CEC 8024648C 00220821 */ addu $at, $at, $v0 /* 166CF0 80246490 90227A24 */ lbu $v0, %lo(D_80077A24)($at) /* 166CF4 80246494 14400066 */ bnez $v0, .L80246630 -/* 166CF8 80246498 00000000 */ nop +/* 166CF8 80246498 00000000 */ nop /* 166CFC 8024649C 0C05272D */ jal play_sound /* 166D00 802464A0 240400C9 */ addiu $a0, $zero, 0xc9 /* 166D04 802464A4 24020002 */ addiu $v0, $zero, 2 @@ -804,7 +804,7 @@ glabel func_80245A40 /* 166E80 80246620 00230821 */ addu $at, $at, $v1 /* 166E84 80246624 A0227A24 */ sb $v0, %lo(D_80077A24)($at) /* 166E88 80246628 08091A3A */ j .L802468E8 -/* 166E8C 8024662C 00000000 */ nop +/* 166E8C 8024662C 00000000 */ nop .L80246630: /* 166E90 80246630 0C05272D */ jal play_sound /* 166E94 80246634 240400C9 */ addiu $a0, $zero, 0xc9 @@ -882,10 +882,10 @@ glabel func_80245A40 /* 166FA4 80246744 0C00CD3C */ jal set_game_mode /* 166FA8 80246748 2404000D */ addiu $a0, $zero, 0xd /* 166FAC 8024674C 08091A3A */ j .L802468E8 -/* 166FB0 80246750 00000000 */ nop +/* 166FB0 80246750 00000000 */ nop .L80246754: /* 166FB4 80246754 10400064 */ beqz $v0, .L802468E8 -/* 166FB8 80246758 00000000 */ nop +/* 166FB8 80246758 00000000 */ nop /* 166FBC 8024675C 92620003 */ lbu $v0, 3($s3) /* 166FC0 80246760 3C018007 */ lui $at, %hi(D_80077A24) /* 166FC4 80246764 00220821 */ addu $at, $at, $v0 @@ -893,7 +893,7 @@ glabel func_80245A40 /* 166FCC 8024676C 3C118007 */ lui $s1, %hi(D_80077A24) /* 166FD0 80246770 26317A24 */ addiu $s1, $s1, %lo(D_80077A24) /* 166FD4 80246774 1440001B */ bnez $v0, .L802467E4 -/* 166FD8 80246778 00000000 */ nop +/* 166FD8 80246778 00000000 */ nop /* 166FDC 8024677C 0C05272D */ jal play_sound /* 166FE0 80246780 240400C9 */ addiu $a0, $zero, 0xc9 /* 166FE4 80246784 2404002C */ addiu $a0, $zero, 0x2c @@ -915,7 +915,7 @@ glabel func_80245A40 /* 167024 802467C4 24050002 */ addiu $a1, $zero, 2 /* 167028 802467C8 92640003 */ lbu $a0, 3($s3) /* 16702C 802467CC 0C00ACDD */ jal fio_save_game -/* 167030 802467D0 00000000 */ nop +/* 167030 802467D0 00000000 */ nop /* 167034 802467D4 92620003 */ lbu $v0, 3($s3) /* 167038 802467D8 00511021 */ addu $v0, $v0, $s1 /* 16703C 802467DC 08091A3A */ j .L802468E8 @@ -991,13 +991,13 @@ glabel func_80245A40 /* 16713C 802468DC A0820004 */ sb $v0, 4($a0) .L802468E0: /* 167140 802468E0 0C090B65 */ jal func_80242D94 -/* 167144 802468E4 00000000 */ nop +/* 167144 802468E4 00000000 */ nop .L802468E8: /* 167148 802468E8 3C028025 */ lui $v0, %hi(D_8024C084) /* 16714C 802468EC 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) /* 167150 802468F0 30424000 */ andi $v0, $v0, 0x4000 /* 167154 802468F4 10400086 */ beqz $v0, .L80246B10 -/* 167158 802468F8 00000000 */ nop +/* 167158 802468F8 00000000 */ nop /* 16715C 802468FC 82630004 */ lb $v1, 4($s3) /* 167160 80246900 2C620005 */ sltiu $v0, $v1, 5 /* 167164 80246904 1040000E */ beqz $v0, .L80246940 @@ -1006,7 +1006,7 @@ glabel func_80245A40 /* 167170 80246910 00220821 */ addu $at, $at, $v0 /* 167174 80246914 8C22BFB8 */ lw $v0, %lo(D_8024BFB8)($at) /* 167178 80246918 00400008 */ jr $v0 -/* 16717C 8024691C 00000000 */ nop +/* 16717C 8024691C 00000000 */ nop /* 167180 80246920 0260202D */ daddu $a0, $s3, $zero /* 167184 80246924 08091A4D */ j .L80246934 /* 167188 80246928 24050002 */ addiu $a1, $zero, 2 @@ -1024,7 +1024,7 @@ glabel func_80245A40 /* 1671B0 80246950 00220821 */ addu $at, $at, $v0 /* 1671B4 80246954 8C22BFD0 */ lw $v0, %lo(D_8024BFD0)($at) /* 1671B8 80246958 00400008 */ jr $v0 -/* 1671BC 8024695C 00000000 */ nop +/* 1671BC 8024695C 00000000 */ nop /* 1671C0 80246960 24040033 */ addiu $a0, $zero, 0x33 /* 1671C4 80246964 3C128024 */ lui $s2, %hi(func_8024368C) /* 1671C8 80246968 2652368C */ addiu $s2, $s2, %lo(func_8024368C) @@ -1088,7 +1088,7 @@ glabel func_80245A40 /* 1672B0 80246A50 0C051F9F */ jal func_80147E7C /* 1672B4 80246A54 0200282D */ daddu $a1, $s0, $zero /* 1672B8 80246A58 08091ABB */ j .L80246AEC -/* 1672BC 80246A5C 00000000 */ nop +/* 1672BC 80246A5C 00000000 */ nop /* 1672C0 80246A60 A2600004 */ sb $zero, 4($s3) /* 1672C4 80246A64 0260202D */ daddu $a0, $s3, $zero /* 1672C8 80246A68 24050001 */ addiu $a1, $zero, 1 @@ -1111,7 +1111,7 @@ glabel func_80245A40 /* 16730C 80246AAC 0C051F9F */ jal func_80147E7C /* 167310 80246AB0 0200282D */ daddu $a1, $s0, $zero /* 167314 80246AB4 08091ABB */ j .L80246AEC -/* 167318 80246AB8 00000000 */ nop +/* 167318 80246AB8 00000000 */ nop /* 16731C 80246ABC 24020003 */ addiu $v0, $zero, 3 /* 167320 80246AC0 A2620004 */ sb $v0, 4($s3) /* 167324 80246AC4 3C058025 */ lui $a1, %hi(D_8024C094) @@ -1128,13 +1128,13 @@ glabel func_80245A40 /* 16734C 80246AEC 0C05272D */ jal play_sound /* 167350 80246AF0 240400CA */ addiu $a0, $zero, 0xca /* 167354 80246AF4 08091AC4 */ j .L80246B10 -/* 167358 80246AF8 00000000 */ nop +/* 167358 80246AF8 00000000 */ nop /* 16735C 80246AFC 0C05272D */ jal play_sound /* 167360 80246B00 240400CA */ addiu $a0, $zero, 0xca /* 167364 80246B04 2404000D */ addiu $a0, $zero, 0xd .L80246B08: /* 167368 80246B08 0C00CD3C */ jal set_game_mode -/* 16736C 80246B0C 00000000 */ nop +/* 16736C 80246B0C 00000000 */ nop .L80246B10: /* 167370 80246B10 8FBF0020 */ lw $ra, 0x20($sp) /* 167374 80246B14 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_165490/func_80246B2C.s b/asm/nonmatchings/code_165490/func_80246B2C.s index 65f35d14b6..1d7ba4880c 100644 --- a/asm/nonmatchings/code_165490/func_80246B2C.s +++ b/asm/nonmatchings/code_165490/func_80246B2C.s @@ -24,14 +24,14 @@ glabel func_80246B2C /* 1673D8 80246B78 10600009 */ beqz $v1, .L80246BA0 /* 1673DC 80246B7C 24C20038 */ addiu $v0, $a2, 0x38 /* 1673E0 80246B80 08091AF9 */ j .L80246BE4 -/* 1673E4 80246B84 00000000 */ nop +/* 1673E4 80246B84 00000000 */ nop .L80246B88: /* 1673E8 80246B88 1062000E */ beq $v1, $v0, .L80246BC4 /* 1673EC 80246B8C 24020003 */ addiu $v0, $zero, 3 /* 1673F0 80246B90 10620011 */ beq $v1, $v0, .L80246BD8 /* 1673F4 80246B94 24C20038 */ addiu $v0, $a2, 0x38 /* 1673F8 80246B98 08091AF9 */ j .L80246BE4 -/* 1673FC 80246B9C 00000000 */ nop +/* 1673FC 80246B9C 00000000 */ nop .L80246BA0: /* 167400 80246BA0 ACA200E0 */ sw $v0, 0xe0($a1) /* 167404 80246BA4 24C200A8 */ addiu $v0, $a2, 0xa8 @@ -67,17 +67,17 @@ glabel func_80246B2C /* 16746C 80246C0C 50400005 */ beql $v0, $zero, .L80246C24 /* 167470 80246C10 24020002 */ addiu $v0, $zero, 2 /* 167474 80246C14 10600009 */ beqz $v1, .L80246C3C -/* 167478 80246C18 00000000 */ nop +/* 167478 80246C18 00000000 */ nop .L80246C1C: /* 16747C 80246C1C 03E00008 */ jr $ra -/* 167480 80246C20 00000000 */ nop +/* 167480 80246C20 00000000 */ nop .L80246C24: /* 167484 80246C24 10620015 */ beq $v1, $v0, .L80246C7C /* 167488 80246C28 24020003 */ addiu $v0, $zero, 3 /* 16748C 80246C2C 1062001B */ beq $v1, $v0, .L80246C9C -/* 167490 80246C30 00000000 */ nop +/* 167490 80246C30 00000000 */ nop /* 167494 80246C34 03E00008 */ jr $ra -/* 167498 80246C38 00000000 */ nop +/* 167498 80246C38 00000000 */ nop .L80246C3C: /* 16749C 80246C3C 3C038015 */ lui $v1, %hi(D_8014F150) /* 1674A0 80246C40 2463F150 */ addiu $v1, $v1, %lo(D_8014F150) diff --git a/asm/nonmatchings/code_165490/func_80246CBC.s b/asm/nonmatchings/code_165490/func_80246CBC.s index 19a02c8390..1a15e06bcd 100644 --- a/asm/nonmatchings/code_165490/func_80246CBC.s +++ b/asm/nonmatchings/code_165490/func_80246CBC.s @@ -16,11 +16,11 @@ glabel func_80246CBC /* 167544 80246CE4 26310001 */ addiu $s1, $s1, 1 /* 167548 80246CE8 2A220014 */ slti $v0, $s1, 0x14 /* 16754C 80246CEC 1440FFFA */ bnez $v0, .L80246CD8 -/* 167550 80246CF0 00000000 */ nop +/* 167550 80246CF0 00000000 */ nop /* 167554 80246CF4 8FBF0018 */ lw $ra, 0x18($sp) /* 167558 80246CF8 8FB10014 */ lw $s1, 0x14($sp) /* 16755C 80246CFC 8FB00010 */ lw $s0, 0x10($sp) /* 167560 80246D00 03E00008 */ jr $ra /* 167564 80246D04 27BD0020 */ addiu $sp, $sp, 0x20 -/* 167568 80246D08 00000000 */ nop -/* 16756C 80246D0C 00000000 */ nop +/* 167568 80246D08 00000000 */ nop +/* 16756C 80246D0C 00000000 */ nop diff --git a/asm/nonmatchings/code_168590/func_80247D30.s b/asm/nonmatchings/code_168590/func_80247D30.s index 50c190eba8..13eaa9fa87 100644 --- a/asm/nonmatchings/code_168590/func_80247D30.s +++ b/asm/nonmatchings/code_168590/func_80247D30.s @@ -19,16 +19,16 @@ glabel func_80247D30 /* 1685C8 80247D68 10400005 */ beqz $v0, .L80247D80 /* 1685CC 80247D6C 24020002 */ addiu $v0, $zero, 2 /* 1685D0 80247D70 12200009 */ beqz $s1, .L80247D98 -/* 1685D4 80247D74 00000000 */ nop +/* 1685D4 80247D74 00000000 */ nop /* 1685D8 80247D78 08091FE9 */ j .L80247FA4 -/* 1685DC 80247D7C 00000000 */ nop +/* 1685DC 80247D7C 00000000 */ nop .L80247D80: /* 1685E0 80247D80 1222001E */ beq $s1, $v0, .L80247DFC /* 1685E4 80247D84 24020003 */ addiu $v0, $zero, 3 /* 1685E8 80247D88 12220066 */ beq $s1, $v0, .L80247F24 -/* 1685EC 80247D8C 00000000 */ nop +/* 1685EC 80247D8C 00000000 */ nop /* 1685F0 80247D90 08091FE9 */ j .L80247FA4 -/* 1685F4 80247D94 00000000 */ nop +/* 1685F4 80247D94 00000000 */ nop .L80247D98: /* 1685F8 80247D98 0C0926A9 */ jal func_80249AA4 /* 1685FC 80247D9C 2404001A */ addiu $a0, $zero, 0x1a @@ -157,7 +157,7 @@ glabel func_80247D30 /* 1687DC 80247F7C 2404001F */ addiu $a0, $zero, 0x1f .L80247F80: /* 1687E0 80247F80 0C0926A9 */ jal func_80249AA4 -/* 1687E4 80247F84 00000000 */ nop +/* 1687E4 80247F84 00000000 */ nop /* 1687E8 80247F88 0040202D */ daddu $a0, $v0, $zero /* 1687EC 80247F8C 26850031 */ addiu $a1, $s4, 0x31 /* 1687F0 80247F90 0200302D */ daddu $a2, $s0, $zero diff --git a/asm/nonmatchings/code_168590/func_80248024.s b/asm/nonmatchings/code_168590/func_80248024.s index 9924d10fc2..53cdc5878d 100644 --- a/asm/nonmatchings/code_168590/func_80248024.s +++ b/asm/nonmatchings/code_168590/func_80248024.s @@ -23,13 +23,13 @@ glabel func_80248024 /* 1688CC 8024806C 10620008 */ beq $v1, $v0, .L80248090 /* 1688D0 80248070 2404002F */ addiu $a0, $zero, 0x2f /* 1688D4 80248074 08092051 */ j .L80248144 -/* 1688D8 80248078 00000000 */ nop +/* 1688D8 80248078 00000000 */ nop .L8024807C: /* 1688DC 8024807C 24020004 */ addiu $v0, $zero, 4 /* 1688E0 80248080 10620017 */ beq $v1, $v0, .L802480E0 /* 1688E4 80248084 2404002F */ addiu $a0, $zero, 0x2f /* 1688E8 80248088 08092051 */ j .L80248144 -/* 1688EC 8024808C 00000000 */ nop +/* 1688EC 8024808C 00000000 */ nop .L80248090: /* 1688F0 80248090 A2200004 */ sb $zero, 4($s1) /* 1688F4 80248094 3C058024 */ lui $a1, %hi(func_802433F4) diff --git a/asm/nonmatchings/code_168590/func_80248170.s b/asm/nonmatchings/code_168590/func_80248170.s index a72e415693..70982f0fbe 100644 --- a/asm/nonmatchings/code_168590/func_80248170.s +++ b/asm/nonmatchings/code_168590/func_80248170.s @@ -11,7 +11,7 @@ glabel func_80248170 /* 1689E8 80248188 90A3001C */ lbu $v1, 0x1c($a1) /* 1689EC 8024818C 24020008 */ addiu $v0, $zero, 8 /* 1689F0 80248190 14620006 */ bne $v1, $v0, .L802481AC -/* 1689F4 80248194 00000000 */ nop +/* 1689F4 80248194 00000000 */ nop /* 1689F8 80248198 90A20000 */ lbu $v0, ($a1) /* 1689FC 8024819C 304200F7 */ andi $v0, $v0, 0xf7 /* 168A00 802481A0 A0A20000 */ sb $v0, ($a1) diff --git a/asm/nonmatchings/code_168590/func_802481B8.s b/asm/nonmatchings/code_168590/func_802481B8.s index fc92ed9d10..22efdc7d20 100644 --- a/asm/nonmatchings/code_168590/func_802481B8.s +++ b/asm/nonmatchings/code_168590/func_802481B8.s @@ -44,7 +44,7 @@ glabel func_802481B8 /* 168AB0 80248250 0C051261 */ jal set_icon_render_pos /* 168AB4 80248254 02953021 */ addu $a2, $s4, $s5 /* 168AB8 80248258 16000006 */ bnez $s0, .L80248274 -/* 168ABC 8024825C 00000000 */ nop +/* 168ABC 8024825C 00000000 */ nop /* 168AC0 80248260 8E440004 */ lw $a0, 4($s2) /* 168AC4 80248264 0C0511F8 */ jal draw_icon_2 /* 168AC8 80248268 2631000B */ addiu $s1, $s1, 0xb @@ -81,7 +81,7 @@ glabel func_802481B8 /* 168B38 802482D8 2686002D */ addiu $a2, $s4, 0x2d /* 168B3C 802482DC 8E040000 */ lw $a0, ($s0) /* 168B40 802482E0 0C0511F1 */ jal draw_icon_1 -/* 168B44 802482E4 00000000 */ nop +/* 168B44 802482E4 00000000 */ nop .L802482E8: /* 168B48 802482E8 8FBF0038 */ lw $ra, 0x38($sp) /* 168B4C 802482EC 8FB50034 */ lw $s5, 0x34($sp) diff --git a/asm/nonmatchings/code_168590/func_8024830C.s b/asm/nonmatchings/code_168590/func_8024830C.s index 28b82d3335..04f845603b 100644 --- a/asm/nonmatchings/code_168590/func_8024830C.s +++ b/asm/nonmatchings/code_168590/func_8024830C.s @@ -27,7 +27,7 @@ glabel func_8024830C /* 168BC4 80248364 3C028025 */ lui $v0, %hi(func_80248170) /* 168BC8 80248368 24428170 */ addiu $v0, $v0, %lo(func_80248170) /* 168BCC 8024836C 1462012B */ bne $v1, $v0, .L8024881C -/* 168BD0 80248370 00000000 */ nop +/* 168BD0 80248370 00000000 */ nop /* 168BD4 80248374 9082001C */ lbu $v0, 0x1c($a0) /* 168BD8 80248378 83CB0004 */ lb $t3, 4($fp) /* 168BDC 8024837C 00021040 */ sll $v0, $v0, 1 @@ -65,11 +65,11 @@ glabel func_8024830C /* 168C50 802483F0 15000026 */ bnez $t0, .L8024848C /* 168C54 802483F4 25720004 */ addiu $s2, $t3, 4 /* 168C58 802483F8 44891000 */ mtc1 $t1, $f2 -/* 168C5C 802483FC 00000000 */ nop +/* 168C5C 802483FC 00000000 */ nop /* 168C60 80248400 468010A0 */ cvt.s.w $f2, $f2 /* 168C64 80248404 8FAB001C */ lw $t3, 0x1c($sp) /* 168C68 80248408 46141082 */ mul.s $f2, $f2, $f20 -/* 168C6C 8024840C 00000000 */ nop +/* 168C6C 8024840C 00000000 */ nop /* 168C70 80248410 AFAB0024 */ sw $t3, 0x24($sp) /* 168C74 80248414 8D420000 */ lw $v0, ($t2) /* 168C78 80248418 8FAB0090 */ lw $t3, 0x90($sp) @@ -77,23 +77,23 @@ glabel func_8024830C /* 168C80 80248420 24420008 */ addiu $v0, $v0, 8 /* 168C84 80248424 01722021 */ addu $a0, $t3, $s2 /* 168C88 80248428 44840000 */ mtc1 $a0, $f0 -/* 168C8C 8024842C 00000000 */ nop +/* 168C8C 8024842C 00000000 */ nop /* 168C90 80248430 46800020 */ cvt.s.w $f0, $f0 /* 168C94 80248434 46140002 */ mul.s $f0, $f0, $f20 -/* 168C98 80248438 00000000 */ nop +/* 168C98 80248438 00000000 */ nop /* 168C9C 8024843C AD420000 */ sw $v0, ($t2) /* 168CA0 80248440 4600118D */ trunc.w.s $f6, $f2 /* 168CA4 80248444 44033000 */ mfc1 $v1, $f6 -/* 168CA8 80248448 00000000 */ nop +/* 168CA8 80248448 00000000 */ nop /* 168CAC 8024844C 30630FFF */ andi $v1, $v1, 0xfff /* 168CB0 80248450 00031B00 */ sll $v1, $v1, 0xc /* 168CB4 80248454 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 168CB8 80248458 468010A0 */ cvt.s.w $f2, $f2 /* 168CBC 8024845C 46141082 */ mul.s $f2, $f2, $f20 -/* 168CC0 80248460 00000000 */ nop +/* 168CC0 80248460 00000000 */ nop /* 168CC4 80248464 4600018D */ trunc.w.s $f6, $f0 /* 168CC8 80248468 44023000 */ mfc1 $v0, $f6 -/* 168CCC 8024846C 00000000 */ nop +/* 168CCC 8024846C 00000000 */ nop /* 168CD0 80248470 30420FFF */ andi $v0, $v0, 0xfff /* 168CD4 80248474 3C0BED00 */ lui $t3, 0xed00 /* 168CD8 80248478 004B1025 */ or $v0, $v0, $t3 @@ -103,12 +103,12 @@ glabel func_8024830C /* 168CE8 80248488 008B2021 */ addu $a0, $a0, $t3 .L8024848C: /* 168CEC 8024848C 44891000 */ mtc1 $t1, $f2 -/* 168CF0 80248490 00000000 */ nop +/* 168CF0 80248490 00000000 */ nop /* 168CF4 80248494 468010A0 */ cvt.s.w $f2, $f2 /* 168CF8 80248498 8D430000 */ lw $v1, ($t2) /* 168CFC 8024849C 8FAB0020 */ lw $t3, 0x20($sp) /* 168D00 802484A0 46141082 */ mul.s $f2, $f2, $f20 -/* 168D04 802484A4 00000000 */ nop +/* 168D04 802484A4 00000000 */ nop /* 168D08 802484A8 AFAB0024 */ sw $t3, 0x24($sp) /* 168D0C 802484AC 8FAB0090 */ lw $t3, 0x90($sp) /* 168D10 802484B0 0060282D */ daddu $a1, $v1, $zero @@ -118,42 +118,42 @@ glabel func_8024830C /* 168D20 802484C0 AD430000 */ sw $v1, ($t2) /* 168D24 802484C4 008B1021 */ addu $v0, $a0, $t3 /* 168D28 802484C8 44820000 */ mtc1 $v0, $f0 -/* 168D2C 802484CC 00000000 */ nop +/* 168D2C 802484CC 00000000 */ nop /* 168D30 802484D0 46800020 */ cvt.s.w $f0, $f0 /* 168D34 802484D4 24840010 */ addiu $a0, $a0, 0x10 /* 168D38 802484D8 46140002 */ mul.s $f0, $f0, $f20 -/* 168D3C 802484DC 00000000 */ nop +/* 168D3C 802484DC 00000000 */ nop /* 168D40 802484E0 4600118D */ trunc.w.s $f6, $f2 /* 168D44 802484E4 44033000 */ mfc1 $v1, $f6 -/* 168D48 802484E8 00000000 */ nop +/* 168D48 802484E8 00000000 */ nop /* 168D4C 802484EC 30630FFF */ andi $v1, $v1, 0xfff /* 168D50 802484F0 00031B00 */ sll $v1, $v1, 0xc /* 168D54 802484F4 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 168D58 802484F8 468010A0 */ cvt.s.w $f2, $f2 /* 168D5C 802484FC 46141082 */ mul.s $f2, $f2, $f20 -/* 168D60 80248500 00000000 */ nop +/* 168D60 80248500 00000000 */ nop /* 168D64 80248504 4600018D */ trunc.w.s $f6, $f0 /* 168D68 80248508 44023000 */ mfc1 $v0, $f6 -/* 168D6C 8024850C 00000000 */ nop +/* 168D6C 8024850C 00000000 */ nop /* 168D70 80248510 30420FFF */ andi $v0, $v0, 0xfff /* 168D74 80248514 3C0BED00 */ lui $t3, 0xed00 /* 168D78 80248518 004B1025 */ or $v0, $v0, $t3 /* 168D7C 8024851C 00621825 */ or $v1, $v1, $v0 .L80248520: /* 168D80 80248520 44840000 */ mtc1 $a0, $f0 -/* 168D84 80248524 00000000 */ nop +/* 168D84 80248524 00000000 */ nop /* 168D88 80248528 46800020 */ cvt.s.w $f0, $f0 /* 168D8C 8024852C 46140002 */ mul.s $f0, $f0, $f20 -/* 168D90 80248530 00000000 */ nop +/* 168D90 80248530 00000000 */ nop /* 168D94 80248534 ACA30000 */ sw $v1, ($a1) /* 168D98 80248538 4600118D */ trunc.w.s $f6, $f2 /* 168D9C 8024853C 44033000 */ mfc1 $v1, $f6 -/* 168DA0 80248540 00000000 */ nop +/* 168DA0 80248540 00000000 */ nop /* 168DA4 80248544 30630FFF */ andi $v1, $v1, 0xfff /* 168DA8 80248548 00031B00 */ sll $v1, $v1, 0xc /* 168DAC 8024854C 4600018D */ trunc.w.s $f6, $f0 /* 168DB0 80248550 44023000 */ mfc1 $v0, $f6 -/* 168DB4 80248554 00000000 */ nop +/* 168DB4 80248554 00000000 */ nop /* 168DB8 80248558 30420FFF */ andi $v0, $v0, 0xfff /* 168DBC 8024855C 00621825 */ or $v1, $v1, $v0 /* 168DC0 80248560 ACA30004 */ sw $v1, 4($a1) @@ -169,11 +169,11 @@ glabel func_8024830C /* 168DE4 80248584 01630018 */ mult $t3, $v1 /* 168DE8 80248588 00006012 */ mflo $t4 /* 168DEC 8024858C 83C20006 */ lb $v0, 6($fp) -/* 168DF0 80248590 00000000 */ nop +/* 168DF0 80248590 00000000 */ nop /* 168DF4 80248594 01820018 */ mult $t4, $v0 /* 168DF8 80248598 00001012 */ mflo $v0 -/* 168DFC 8024859C 00000000 */ nop -/* 168E00 802485A0 00000000 */ nop +/* 168DFC 8024859C 00000000 */ nop +/* 168E00 802485A0 00000000 */ nop /* 168E04 802485A4 00760018 */ mult $v1, $s6 /* 168E08 802485A8 00001812 */ mflo $v1 /* 168E0C 802485AC 00431021 */ addu $v0, $v0, $v1 @@ -220,7 +220,7 @@ glabel func_8024830C /* 168EA8 80248648 3C048025 */ lui $a0, %hi(D_8024C108) /* 168EAC 8024864C 8C84C108 */ lw $a0, %lo(D_8024C108)($a0) /* 168EB0 80248650 0C0511F8 */ jal draw_icon_2 -/* 168EB4 80248654 00000000 */ nop +/* 168EB4 80248654 00000000 */ nop /* 168EB8 80248658 0000182D */ daddu $v1, $zero, $zero /* 168EBC 8024865C 8FAA0050 */ lw $t2, 0x50($sp) /* 168EC0 80248660 8FA9004C */ lw $t1, 0x4c($sp) @@ -274,7 +274,7 @@ glabel func_8024830C /* 168F5C 802486FC 25080001 */ addiu $t0, $t0, 1 /* 168F60 80248700 29020002 */ slti $v0, $t0, 2 /* 168F64 80248704 1440FF39 */ bnez $v0, .L802483EC -/* 168F68 80248708 00000000 */ nop +/* 168F68 80248708 00000000 */ nop /* 168F6C 8024870C 8FAB003C */ lw $t3, 0x3c($sp) /* 168F70 80248710 256B0011 */ addiu $t3, $t3, 0x11 /* 168F74 80248714 AFAB003C */ sw $t3, 0x3c($sp) @@ -285,61 +285,61 @@ glabel func_8024830C /* 168F88 80248728 26D60001 */ addiu $s6, $s6, 1 /* 168F8C 8024872C 02C2102A */ slt $v0, $s6, $v0 /* 168F90 80248730 1440FF29 */ bnez $v0, .L802483D8 -/* 168F94 80248734 00000000 */ nop +/* 168F94 80248734 00000000 */ nop .L80248738: /* 168F98 80248738 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 168F9C 8024873C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 168FA0 80248740 44891000 */ mtc1 $t1, $f2 -/* 168FA4 80248744 00000000 */ nop +/* 168FA4 80248744 00000000 */ nop /* 168FA8 80248748 468010A0 */ cvt.s.w $f2, $f2 /* 168FAC 8024874C 3C014080 */ lui $at, 0x4080 /* 168FB0 80248750 44812000 */ mtc1 $at, $f4 /* 168FB4 80248754 C7A00090 */ lwc1 $f0, 0x90($sp) /* 168FB8 80248758 46800020 */ cvt.s.w $f0, $f0 /* 168FBC 8024875C 46041082 */ mul.s $f2, $f2, $f4 -/* 168FC0 80248760 00000000 */ nop +/* 168FC0 80248760 00000000 */ nop /* 168FC4 80248764 8C620000 */ lw $v0, ($v1) /* 168FC8 80248768 3C05ED00 */ lui $a1, 0xed00 /* 168FCC 8024876C 0040302D */ daddu $a2, $v0, $zero /* 168FD0 80248770 24420008 */ addiu $v0, $v0, 8 /* 168FD4 80248774 46040002 */ mul.s $f0, $f0, $f4 -/* 168FD8 80248778 00000000 */ nop +/* 168FD8 80248778 00000000 */ nop /* 168FDC 8024877C AC620000 */ sw $v0, ($v1) /* 168FE0 80248780 4600118D */ trunc.w.s $f6, $f2 /* 168FE4 80248784 44043000 */ mfc1 $a0, $f6 -/* 168FE8 80248788 00000000 */ nop +/* 168FE8 80248788 00000000 */ nop /* 168FEC 8024878C 30840FFF */ andi $a0, $a0, 0xfff /* 168FF0 80248790 00042300 */ sll $a0, $a0, 0xc /* 168FF4 80248794 4600018D */ trunc.w.s $f6, $f0 /* 168FF8 80248798 44033000 */ mfc1 $v1, $f6 -/* 168FFC 8024879C 00000000 */ nop +/* 168FFC 8024879C 00000000 */ nop /* 169000 802487A0 30630FFF */ andi $v1, $v1, 0xfff /* 169004 802487A4 8FAB0094 */ lw $t3, 0x94($sp) /* 169008 802487A8 00651825 */ or $v1, $v1, $a1 /* 16900C 802487AC 012B1021 */ addu $v0, $t1, $t3 /* 169010 802487B0 44821000 */ mtc1 $v0, $f2 -/* 169014 802487B4 00000000 */ nop +/* 169014 802487B4 00000000 */ nop /* 169018 802487B8 468010A0 */ cvt.s.w $f2, $f2 /* 16901C 802487BC 46041082 */ mul.s $f2, $f2, $f4 -/* 169020 802487C0 00000000 */ nop +/* 169020 802487C0 00000000 */ nop /* 169024 802487C4 8FA20098 */ lw $v0, 0x98($sp) /* 169028 802487C8 8FAB0090 */ lw $t3, 0x90($sp) /* 16902C 802487CC 00832025 */ or $a0, $a0, $v1 /* 169030 802487D0 01621021 */ addu $v0, $t3, $v0 /* 169034 802487D4 44820000 */ mtc1 $v0, $f0 -/* 169038 802487D8 00000000 */ nop +/* 169038 802487D8 00000000 */ nop /* 16903C 802487DC 46800020 */ cvt.s.w $f0, $f0 /* 169040 802487E0 46040002 */ mul.s $f0, $f0, $f4 -/* 169044 802487E4 00000000 */ nop +/* 169044 802487E4 00000000 */ nop /* 169048 802487E8 ACC40000 */ sw $a0, ($a2) /* 16904C 802487EC 4600118D */ trunc.w.s $f6, $f2 /* 169050 802487F0 44023000 */ mfc1 $v0, $f6 -/* 169054 802487F4 00000000 */ nop +/* 169054 802487F4 00000000 */ nop /* 169058 802487F8 30420FFF */ andi $v0, $v0, 0xfff /* 16905C 802487FC 00021300 */ sll $v0, $v0, 0xc /* 169060 80248800 4600018D */ trunc.w.s $f6, $f0 /* 169064 80248804 44033000 */ mfc1 $v1, $f6 -/* 169068 80248808 00000000 */ nop +/* 169068 80248808 00000000 */ nop /* 16906C 8024880C 30630FFF */ andi $v1, $v1, 0xfff /* 169070 80248810 00431025 */ or $v0, $v0, $v1 /* 169074 80248814 08092272 */ j .L802489C8 @@ -366,8 +366,8 @@ glabel func_8024830C /* 1690BC 8024885C 00021603 */ sra $v0, $v0, 0x18 /* 1690C0 80248860 01020018 */ mult $t0, $v0 /* 1690C4 80248864 00001012 */ mflo $v0 -/* 1690C8 80248868 00000000 */ nop -/* 1690CC 8024886C 00000000 */ nop +/* 1690C8 80248868 00000000 */ nop +/* 1690CC 8024886C 00000000 */ nop /* 1690D0 80248870 00760018 */ mult $v1, $s6 /* 1690D4 80248874 00001812 */ mflo $v1 /* 1690D8 80248878 00431021 */ addu $v0, $v0, $v1 @@ -412,7 +412,7 @@ glabel func_8024830C /* 16916C 8024890C 3C048025 */ lui $a0, %hi(D_8024C108) /* 169170 80248910 8C84C108 */ lw $a0, %lo(D_8024C108)($a0) /* 169174 80248914 0C0511F8 */ jal draw_icon_2 -/* 169178 80248918 00000000 */ nop +/* 169178 80248918 00000000 */ nop /* 16917C 8024891C 0000182D */ daddu $v1, $zero, $zero /* 169180 80248920 8FA9004C */ lw $t1, 0x4c($sp) .L80248924: @@ -464,13 +464,13 @@ glabel func_8024830C /* 169218 802489B8 26940001 */ addiu $s4, $s4, 1 /* 16921C 802489BC 0282102A */ slt $v0, $s4, $v0 /* 169220 802489C0 1440FF9A */ bnez $v0, .L8024882C -/* 169224 802489C4 00000000 */ nop +/* 169224 802489C4 00000000 */ nop .L802489C8: /* 169228 802489C8 3C038025 */ lui $v1, %hi(D_8024C098) /* 16922C 802489CC 8063C098 */ lb $v1, %lo(D_8024C098)($v1) /* 169230 802489D0 24020003 */ addiu $v0, $zero, 3 /* 169234 802489D4 1462001D */ bne $v1, $v0, .L80248A4C -/* 169238 802489D8 00000000 */ nop +/* 169238 802489D8 00000000 */ nop /* 16923C 802489DC 3C028025 */ lui $v0, %hi(D_8024C08C) /* 169240 802489E0 8C42C08C */ lw $v0, %lo(D_8024C08C)($v0) /* 169244 802489E4 3C03000F */ lui $v1, 0xf diff --git a/asm/nonmatchings/code_168590/func_80248BF4.s b/asm/nonmatchings/code_168590/func_80248BF4.s index c85cfebf58..2f235bfed7 100644 --- a/asm/nonmatchings/code_168590/func_80248BF4.s +++ b/asm/nonmatchings/code_168590/func_80248BF4.s @@ -19,14 +19,14 @@ glabel func_80248BF4 /* 16948C 80248C2C A2020001 */ sb $v0, 1($s0) /* 169490 80248C30 00021600 */ sll $v0, $v0, 0x18 /* 169494 80248C34 04410026 */ bgez $v0, .L80248CD0 -/* 169498 80248C38 00000000 */ nop +/* 169498 80248C38 00000000 */ nop /* 16949C 80248C3C 92020005 */ lbu $v0, 5($s0) /* 1694A0 80248C40 08092333 */ j .L80248CCC /* 1694A4 80248C44 2442FFFF */ addiu $v0, $v0, -1 .L80248C48: /* 1694A8 80248C48 00621024 */ and $v0, $v1, $v0 /* 1694AC 80248C4C 10400020 */ beqz $v0, .L80248CD0 -/* 1694B0 80248C50 00000000 */ nop +/* 1694B0 80248C50 00000000 */ nop /* 1694B4 80248C54 92020001 */ lbu $v0, 1($s0) /* 1694B8 80248C58 82030005 */ lb $v1, 5($s0) /* 1694BC 80248C5C 24420001 */ addiu $v0, $v0, 1 @@ -41,7 +41,7 @@ glabel func_80248BF4 /* 1694DC 80248C7C 82030002 */ lb $v1, 2($s0) /* 1694E0 80248C80 2442FFFF */ addiu $v0, $v0, -1 /* 1694E4 80248C84 14620012 */ bne $v1, $v0, .L80248CD0 -/* 1694E8 80248C88 00000000 */ nop +/* 1694E8 80248C88 00000000 */ nop /* 1694EC 80248C8C 82020001 */ lb $v0, 1($s0) /* 1694F0 80248C90 92030001 */ lbu $v1, 1($s0) /* 1694F4 80248C94 2842000B */ slti $v0, $v0, 0xb @@ -73,7 +73,7 @@ glabel func_80248BF4 /* 169550 80248CF0 A2020002 */ sb $v0, 2($s0) /* 169554 80248CF4 00021600 */ sll $v0, $v0, 0x18 /* 169558 80248CF8 04410011 */ bgez $v0, .L80248D40 -/* 16955C 80248CFC 00000000 */ nop +/* 16955C 80248CFC 00000000 */ nop /* 169560 80248D00 92020006 */ lbu $v0, 6($s0) /* 169564 80248D04 2442FFFF */ addiu $v0, $v0, -1 /* 169568 80248D08 08092350 */ j .L80248D40 @@ -81,7 +81,7 @@ glabel func_80248BF4 .L80248D10: /* 169570 80248D10 00621024 */ and $v0, $v1, $v0 /* 169574 80248D14 1040000A */ beqz $v0, .L80248D40 -/* 169578 80248D18 00000000 */ nop +/* 169578 80248D18 00000000 */ nop /* 16957C 80248D1C 92020002 */ lbu $v0, 2($s0) /* 169580 80248D20 82030006 */ lb $v1, 6($s0) /* 169584 80248D24 24420001 */ addiu $v0, $v0, 1 @@ -96,7 +96,7 @@ glabel func_80248BF4 /* 1695A4 80248D44 82030002 */ lb $v1, 2($s0) /* 1695A8 80248D48 2442FFFF */ addiu $v0, $v0, -1 /* 1695AC 80248D4C 14620012 */ bne $v1, $v0, .L80248D98 -/* 1695B0 80248D50 00000000 */ nop +/* 1695B0 80248D50 00000000 */ nop /* 1695B4 80248D54 82020001 */ lb $v0, 1($s0) /* 1695B8 80248D58 92030001 */ lbu $v1, 1($s0) /* 1695BC 80248D5C 2842000B */ slti $v0, $v0, 0xb @@ -122,11 +122,11 @@ glabel func_80248BF4 /* 169600 80248DA0 00430018 */ mult $v0, $v1 /* 169604 80248DA4 00003812 */ mflo $a3 /* 169608 80248DA8 82020006 */ lb $v0, 6($s0) -/* 16960C 80248DAC 00000000 */ nop +/* 16960C 80248DAC 00000000 */ nop /* 169610 80248DB0 00E20018 */ mult $a3, $v0 /* 169614 80248DB4 00002012 */ mflo $a0 /* 169618 80248DB8 82020002 */ lb $v0, 2($s0) -/* 16961C 80248DBC 00000000 */ nop +/* 16961C 80248DBC 00000000 */ nop /* 169620 80248DC0 00620018 */ mult $v1, $v0 /* 169624 80248DC4 00001012 */ mflo $v0 /* 169628 80248DC8 00821821 */ addu $v1, $a0, $v0 @@ -138,7 +138,7 @@ glabel func_80248BF4 /* 169640 80248DE0 A2020003 */ sb $v0, 3($s0) /* 169644 80248DE4 304200FF */ andi $v0, $v0, 0xff /* 169648 80248DE8 10A20003 */ beq $a1, $v0, .L80248DF8 -/* 16964C 80248DEC 00000000 */ nop +/* 16964C 80248DEC 00000000 */ nop /* 169650 80248DF0 0C05272D */ jal play_sound /* 169654 80248DF4 24042102 */ addiu $a0, $zero, 0x2102 .L80248DF8: @@ -146,7 +146,7 @@ glabel func_80248BF4 /* 16965C 80248DFC 8C42C084 */ lw $v0, %lo(D_8024C084)($v0) /* 169660 80248E00 30428000 */ andi $v0, $v0, 0x8000 /* 169664 80248E04 1040009A */ beqz $v0, .L80249070 -/* 169668 80248E08 00000000 */ nop +/* 169668 80248E08 00000000 */ nop /* 16966C 80248E0C 92020003 */ lbu $v0, 3($s0) /* 169670 80248E10 2443FF3A */ addiu $v1, $v0, -0xc6 /* 169674 80248E14 2C620005 */ sltiu $v0, $v1, 5 @@ -156,7 +156,7 @@ glabel func_80248BF4 /* 169684 80248E24 00220821 */ addu $at, $at, $v0 /* 169688 80248E28 8C22C060 */ lw $v0, %lo(D_8024C060)($at) /* 16968C 80248E2C 00400008 */ jr $v0 -/* 169690 80248E30 00000000 */ nop +/* 169690 80248E30 00000000 */ nop /* 169694 80248E34 0C05272D */ jal play_sound /* 169698 80248E38 24042103 */ addiu $a0, $zero, 0x2103 /* 16969C 80248E3C 3C048025 */ lui $a0, %hi(D_8024C090) @@ -173,7 +173,7 @@ glabel func_80248BF4 /* 1696C4 80248E64 82020004 */ lb $v0, 4($s0) /* 1696C8 80248E68 24110001 */ addiu $s1, $zero, 1 /* 1696CC 80248E6C 10510071 */ beq $v0, $s1, .L80249034 -/* 1696D0 80248E70 00000000 */ nop +/* 1696D0 80248E70 00000000 */ nop /* 1696D4 80248E74 0C05272D */ jal play_sound /* 1696D8 80248E78 24042105 */ addiu $a0, $zero, 0x2105 /* 1696DC 80248E7C 82050001 */ lb $a1, 1($s0) @@ -183,7 +183,7 @@ glabel func_80248BF4 /* 1696EC 80248E8C A2110004 */ sb $s1, 4($s0) /* 1696F0 80248E90 82020004 */ lb $v0, 4($s0) /* 1696F4 80248E94 10400067 */ beqz $v0, .L80249034 -/* 1696F8 80248E98 00000000 */ nop +/* 1696F8 80248E98 00000000 */ nop /* 1696FC 80248E9C 0C05272D */ jal play_sound /* 169700 80248EA0 24042105 */ addiu $a0, $zero, 0x2105 /* 169704 80248EA4 82050001 */ lb $a1, 1($s0) @@ -192,13 +192,13 @@ glabel func_80248BF4 /* 169710 80248EB0 A2000004 */ sb $zero, 4($s0) .L80248EB4: /* 169714 80248EB4 0C090B65 */ jal func_80242D94 -/* 169718 80248EB8 00000000 */ nop +/* 169718 80248EB8 00000000 */ nop /* 16971C 80248EBC 3C058025 */ lui $a1, %hi(func_80248170) /* 169720 80248EC0 24A58170 */ addiu $a1, $a1, %lo(func_80248170) /* 169724 80248EC4 0C051F9F */ jal func_80147E7C /* 169728 80248EC8 24040031 */ addiu $a0, $zero, 0x31 /* 16972C 80248ECC 0809240D */ j .L80249034 -/* 169730 80248ED0 00000000 */ nop +/* 169730 80248ED0 00000000 */ nop /* 169734 80248ED4 0000182D */ daddu $v1, $zero, $zero /* 169738 80248ED8 3C058025 */ lui $a1, %hi(D_8024C110) /* 16973C 80248EDC 24A5C110 */ addiu $a1, $a1, %lo(D_8024C110) @@ -215,11 +215,11 @@ glabel func_80248BF4 /* 169764 80248F04 24020008 */ addiu $v0, $zero, 8 .L80248F08: /* 169768 80248F08 14620005 */ bne $v1, $v0, .L80248F20 -/* 16976C 80248F0C 00000000 */ nop +/* 16976C 80248F0C 00000000 */ nop /* 169770 80248F10 0C05272D */ jal play_sound /* 169774 80248F14 2404021D */ addiu $a0, $zero, 0x21d /* 169778 80248F18 0809240D */ j .L80249034 -/* 16977C 80248F1C 00000000 */ nop +/* 16977C 80248F1C 00000000 */ nop .L80248F20: /* 169780 80248F20 0C05272D */ jal play_sound /* 169784 80248F24 240400C9 */ addiu $a0, $zero, 0xc9 @@ -275,12 +275,12 @@ glabel func_80248BF4 /* 169840 80248FE0 80830000 */ lb $v1, ($a0) /* 169844 80248FE4 24050008 */ addiu $a1, $zero, 8 /* 169848 80248FE8 14650006 */ bne $v1, $a1, .L80249004 -/* 16984C 80248FEC 00000000 */ nop +/* 16984C 80248FEC 00000000 */ nop /* 169850 80248FF0 92020003 */ lbu $v0, 3($s0) /* 169854 80248FF4 3C018025 */ lui $at, %hi(D_8024C117) /* 169858 80248FF8 A022C117 */ sb $v0, %lo(D_8024C117)($at) /* 16985C 80248FFC 0809240D */ j .L80249034 -/* 169860 80249000 00000000 */ nop +/* 169860 80249000 00000000 */ nop .L80249004: /* 169864 80249004 92020003 */ lbu $v0, 3($s0) .L80249008: @@ -321,7 +321,7 @@ glabel func_80248BF4 /* 1698E8 80249088 240200C9 */ addiu $v0, $zero, 0xc9 /* 1698EC 8024908C 92030003 */ lbu $v1, 3($s0) /* 1698F0 80249090 14620048 */ bne $v1, $v0, .L802491B4 -/* 1698F4 80249094 00000000 */ nop +/* 1698F4 80249094 00000000 */ nop .L80249098: /* 1698F8 80249098 0C05272D */ jal play_sound /* 1698FC 8024909C 24042104 */ addiu $a0, $zero, 0x2104 @@ -381,11 +381,11 @@ glabel func_80248BF4 /* 1699D4 80249174 3C018025 */ lui $at, %hi(D_8024C098) /* 1699D8 80249178 A020C098 */ sb $zero, %lo(D_8024C098)($at) /* 1699DC 8024917C 080924C4 */ j .L80249310 -/* 1699E0 80249180 00000000 */ nop +/* 1699E0 80249180 00000000 */ nop .L80249184: /* 1699E4 80249184 28620008 */ slti $v0, $v1, 8 /* 1699E8 80249188 1040000A */ beqz $v0, .L802491B4 -/* 1699EC 8024918C 00000000 */ nop +/* 1699EC 8024918C 00000000 */ nop /* 1699F0 80249190 3C058025 */ lui $a1, %hi(D_8024C110) /* 1699F4 80249194 24A5C110 */ addiu $a1, $a1, %lo(D_8024C110) /* 1699F8 80249198 240400F7 */ addiu $a0, $zero, 0xf7 @@ -417,11 +417,11 @@ glabel func_80248BF4 /* 169A54 802491F4 24020008 */ addiu $v0, $zero, 8 .L802491F8: /* 169A58 802491F8 14620005 */ bne $v1, $v0, .L80249210 -/* 169A5C 802491FC 00000000 */ nop +/* 169A5C 802491FC 00000000 */ nop /* 169A60 80249200 0C05272D */ jal play_sound /* 169A64 80249204 2404021D */ addiu $a0, $zero, 0x21d /* 169A68 80249208 080924C4 */ j .L80249310 -/* 169A6C 8024920C 00000000 */ nop +/* 169A6C 8024920C 00000000 */ nop .L80249210: /* 169A70 80249210 0C05272D */ jal play_sound /* 169A74 80249214 240400C9 */ addiu $a0, $zero, 0xc9 diff --git a/asm/nonmatchings/code_168590/func_8024932C.s b/asm/nonmatchings/code_168590/func_8024932C.s index 07fb433d98..3b34bca44c 100644 --- a/asm/nonmatchings/code_168590/func_8024932C.s +++ b/asm/nonmatchings/code_168590/func_8024932C.s @@ -16,11 +16,11 @@ glabel func_8024932C /* 169BB4 80249354 26310001 */ addiu $s1, $s1, 1 /* 169BB8 80249358 2A220003 */ slti $v0, $s1, 3 /* 169BBC 8024935C 1440FFFA */ bnez $v0, .L80249348 -/* 169BC0 80249360 00000000 */ nop +/* 169BC0 80249360 00000000 */ nop /* 169BC4 80249364 8FBF0018 */ lw $ra, 0x18($sp) /* 169BC8 80249368 8FB10014 */ lw $s1, 0x14($sp) /* 169BCC 8024936C 8FB00010 */ lw $s0, 0x10($sp) /* 169BD0 80249370 03E00008 */ jr $ra /* 169BD4 80249374 27BD0020 */ addiu $sp, $sp, 0x20 -/* 169BD8 80249378 00000000 */ nop -/* 169BDC 8024937C 00000000 */ nop +/* 169BD8 80249378 00000000 */ nop +/* 169BDC 8024937C 00000000 */ nop diff --git a/asm/nonmatchings/code_16F740/begin_battle.s b/asm/nonmatchings/code_16F740/begin_battle.s index ddcae193d9..fa816ce9ed 100644 --- a/asm/nonmatchings/code_16F740/begin_battle.s +++ b/asm/nonmatchings/code_16F740/begin_battle.s @@ -27,7 +27,7 @@ glabel begin_battle /* 16FB4C 8024126C 3C04800E */ lui $a0, %hi(D_800DC064) /* 16FB50 80241270 8C84C064 */ lw $a0, %lo(D_800DC064)($a0) /* 16FB54 80241274 14800003 */ bnez $a0, .L80241284 -/* 16FB58 80241278 00000000 */ nop +/* 16FB58 80241278 00000000 */ nop /* 16FB5C 8024127C 080904A2 */ j .L80241288 /* 16FB60 80241280 8ED5000C */ lw $s5, 0xc($s6) .L80241284: @@ -43,7 +43,7 @@ glabel begin_battle /* 16FB84 802412A4 00220821 */ addu $at, $at, $v0 /* 16FB88 802412A8 8C22CA88 */ lw $v0, %lo(D_8029CA88)($at) /* 16FB8C 802412AC 00400008 */ jr $v0 -/* 16FB90 802412B0 00000000 */ nop +/* 16FB90 802412B0 00000000 */ nop /* 16FB94 802412B4 3C05BF80 */ lui $a1, 0xbf80 /* 16FB98 802412B8 8EC20004 */ lw $v0, 4($s6) /* 16FB9C 802412BC 3C01802A */ lui $at, %hi(D_8029F240) @@ -64,10 +64,10 @@ glabel begin_battle /* 16FBD8 802412F8 34028000 */ ori $v0, $zero, 0x8000 /* 16FBDC 802412FC 0043102A */ slt $v0, $v0, $v1 /* 16FBE0 80241300 10400003 */ beqz $v0, .L80241310 -/* 16FBE4 80241304 00000000 */ nop +/* 16FBE4 80241304 00000000 */ nop .L80241308: /* 16FBE8 80241308 080904C2 */ j .L80241308 -/* 16FBEC 8024130C 00000000 */ nop +/* 16FBEC 8024130C 00000000 */ nop .L80241310: /* 16FBF0 80241310 8EA40000 */ lw $a0, ($s5) /* 16FBF4 80241314 3C108021 */ lui $s0, 0x8021 @@ -82,27 +82,27 @@ glabel begin_battle .L80241338: /* 16FC18 80241338 8EA40008 */ lw $a0, 8($s5) /* 16FC1C 8024133C 0C016C68 */ jal load_stage_collision -/* 16FC20 80241340 00000000 */ nop +/* 16FC20 80241340 00000000 */ nop /* 16FC24 80241344 8EA40014 */ lw $a0, 0x14($s5) /* 16FC28 80241348 10800007 */ beqz $a0, .L80241368 -/* 16FC2C 8024134C 00000000 */ nop +/* 16FC2C 8024134C 00000000 */ nop /* 16FC30 80241350 0C05175C */ jal load_map_bg -/* 16FC34 80241354 00000000 */ nop +/* 16FC34 80241354 00000000 */ nop /* 16FC38 80241358 3C048020 */ lui $a0, %hi(gBackgroundImage) /* 16FC3C 8024135C 24840000 */ addiu $a0, $a0, %lo(gBackgroundImage) /* 16FC40 80241360 0C05178A */ jal read_background_size -/* 16FC44 80241364 00000000 */ nop +/* 16FC44 80241364 00000000 */ nop .L80241368: /* 16FC48 80241368 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 16FC4C 8024136C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 16FC50 80241370 904200AA */ lbu $v0, 0xaa($v0) /* 16FC54 80241374 30420001 */ andi $v0, $v0, 1 /* 16FC58 80241378 10400005 */ beqz $v0, .L80241390 -/* 16FC5C 8024137C 00000000 */ nop +/* 16FC5C 8024137C 00000000 */ nop /* 16FC60 80241380 3C013F80 */ lui $at, 0x3f80 /* 16FC64 80241384 44816000 */ mtc1 $at, $f12 /* 16FC68 80241388 0C00AFB7 */ jal set_curtain_scale_goal -/* 16FC6C 8024138C 00000000 */ nop +/* 16FC6C 8024138C 00000000 */ nop .L80241390: /* 16FC70 80241390 3C05800B */ lui $a1, %hi(gCameras) /* 16FC74 80241394 24A51D80 */ addiu $a1, $a1, %lo(gCameras) @@ -237,9 +237,9 @@ glabel begin_battle /* 16FE6C 8024158C AE8200C8 */ sw $v0, 0xc8($s4) /* 16FE70 80241590 8E8400C8 */ lw $a0, 0xc8($s4) /* 16FE74 80241594 0C0B1059 */ jal does_script_exist -/* 16FE78 80241598 00000000 */ nop +/* 16FE78 80241598 00000000 */ nop /* 16FE7C 8024159C 1440013A */ bnez $v0, .L80241A88 -/* 16FE80 802415A0 00000000 */ nop +/* 16FE80 802415A0 00000000 */ nop /* 16FE84 802415A4 8EA4000C */ lw $a0, 0xc($s5) /* 16FE88 802415A8 10800009 */ beqz $a0, .L802415D0 /* 16FE8C 802415AC 24110017 */ addiu $s1, $zero, 0x17 @@ -284,12 +284,12 @@ glabel begin_battle .L8024163C: /* 16FF1C 8024163C 8C830000 */ lw $v1, ($a0) /* 16FF20 80241640 10770006 */ beq $v1, $s7, .L8024165C -/* 16FF24 80241644 00000000 */ nop +/* 16FF24 80241644 00000000 */ nop /* 16FF28 80241648 92020136 */ lbu $v0, 0x136($s0) /* 16FF2C 8024164C 10430006 */ beq $v0, $v1, .L80241668 /* 16FF30 80241650 24840004 */ addiu $a0, $a0, 4 /* 16FF34 80241654 0809058F */ j .L8024163C -/* 16FF38 80241658 00000000 */ nop +/* 16FF38 80241658 00000000 */ nop .L8024165C: /* 16FF3C 8024165C 9282008E */ lbu $v0, 0x8e($s4) /* 16FF40 80241660 24420001 */ addiu $v0, $v0, 1 @@ -320,16 +320,16 @@ glabel begin_battle .L802416B8: /* 16FF98 802416B8 8EA2001C */ lw $v0, 0x1c($s5) /* 16FF9C 802416BC 1040002C */ beqz $v0, .L80241770 -/* 16FFA0 802416C0 00000000 */ nop +/* 16FFA0 802416C0 00000000 */ nop /* 16FFA4 802416C4 8EA40024 */ lw $a0, 0x24($s5) /* 16FFA8 802416C8 10800007 */ beqz $a0, .L802416E8 -/* 16FFAC 802416CC 00000000 */ nop +/* 16FFAC 802416CC 00000000 */ nop /* 16FFB0 802416D0 18800027 */ blez $a0, .L80241770 -/* 16FFB4 802416D4 00000000 */ nop +/* 16FFB4 802416D4 00000000 */ nop /* 16FFB8 802416D8 0C00A67F */ jal rand_int -/* 16FFBC 802416DC 00000000 */ nop +/* 16FFBC 802416DC 00000000 */ nop /* 16FFC0 802416E0 14400023 */ bnez $v0, .L80241770 -/* 16FFC4 802416E4 00000000 */ nop +/* 16FFC4 802416E4 00000000 */ nop .L802416E8: /* 16FFC8 802416E8 3C02802A */ lui $v0, %hi(D_8029F240) /* 16FFCC 802416EC 2442F240 */ addiu $v0, $v0, %lo(D_8029F240) @@ -370,7 +370,7 @@ glabel begin_battle /* 17004C 8024176C 2673001C */ addiu $s3, $s3, 0x1c .L80241770: /* 170050 80241770 0C099129 */ jal load_player_actor -/* 170054 80241774 00000000 */ nop +/* 170054 80241774 00000000 */ nop /* 170058 80241778 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) /* 17005C 8024177C 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) /* 170060 80241780 8E9000D8 */ lw $s0, 0xd8($s4) @@ -394,7 +394,7 @@ glabel begin_battle /* 1700A4 802417C4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1700A8 802417C8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1700AC 802417CC 080906A2 */ j .L80241A88 -/* 1700B0 802417D0 00000000 */ nop +/* 1700B0 802417D0 00000000 */ nop .L802417D4: /* 1700B4 802417D4 08090608 */ j .L80241820 /* 1700B8 802417D8 24130001 */ addiu $s3, $zero, 1 @@ -418,20 +418,20 @@ glabel begin_battle /* 1700FC 8024181C AE0001D4 */ sw $zero, 0x1d4($s0) .L80241820: /* 170100 80241820 16600099 */ bnez $s3, .L80241A88 -/* 170104 80241824 00000000 */ nop +/* 170104 80241824 00000000 */ nop /* 170108 80241828 8E9000D8 */ lw $s0, 0xd8($s4) /* 17010C 8024182C 0C0B1059 */ jal does_script_exist /* 170110 80241830 8E0401E4 */ lw $a0, 0x1e4($s0) /* 170114 80241834 14400094 */ bnez $v0, .L80241A88 -/* 170118 80241838 00000000 */ nop +/* 170118 80241838 00000000 */ nop /* 17011C 8024183C AE0001D4 */ sw $zero, 0x1d4($s0) /* 170120 80241840 8E9000DC */ lw $s0, 0xdc($s4) /* 170124 80241844 12000006 */ beqz $s0, .L80241860 -/* 170128 80241848 00000000 */ nop +/* 170128 80241848 00000000 */ nop /* 17012C 8024184C 0C0B1059 */ jal does_script_exist /* 170130 80241850 8E0401E4 */ lw $a0, 0x1e4($s0) /* 170134 80241854 1440008C */ bnez $v0, .L80241A88 -/* 170138 80241858 00000000 */ nop +/* 170138 80241858 00000000 */ nop /* 17013C 8024185C AE0001D4 */ sw $zero, 0x1d4($s0) .L80241860: /* 170140 80241860 8EC40010 */ lw $a0, 0x10($s6) @@ -470,7 +470,7 @@ glabel begin_battle /* 1701B8 802418D8 10620069 */ beq $v1, $v0, .L80241A80 /* 1701BC 802418DC 24040004 */ addiu $a0, $zero, 4 /* 1701C0 802418E0 0809063C */ j .L802418F0 -/* 1701C4 802418E4 00000000 */ nop +/* 1701C4 802418E4 00000000 */ nop .L802418E8: /* 1701C8 802418E8 080906A0 */ j .L80241A80 /* 1701CC 802418EC 24040002 */ addiu $a0, $zero, 2 @@ -480,7 +480,7 @@ glabel begin_battle /* 1701D8 802418F8 904200AA */ lbu $v0, 0xaa($v0) /* 1701DC 802418FC 30420001 */ andi $v0, $v0, 1 /* 1701E0 80241900 14400012 */ bnez $v0, .L8024194C -/* 1701E4 80241904 00000000 */ nop +/* 1701E4 80241904 00000000 */ nop /* 1701E8 80241908 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) /* 1701EC 8024190C 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) /* 1701F0 80241910 8E9000D8 */ lw $s0, 0xd8($s4) @@ -533,7 +533,7 @@ glabel begin_battle /* 17029C 802419BC 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1702A0 802419C0 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1702A4 802419C4 080906A2 */ j .L80241A88 -/* 1702A8 802419C8 00000000 */ nop +/* 1702A8 802419C8 00000000 */ nop /* 1702AC 802419CC 3C108028 */ lui $s0, %hi(D_80280A30) /* 1702B0 802419D0 26100A30 */ addiu $s0, $s0, %lo(D_80280A30) /* 1702B4 802419D4 8E020000 */ lw $v0, ($s0) @@ -542,7 +542,7 @@ glabel begin_battle /* 1702C0 802419E0 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1702C4 802419E4 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1702C8 802419E8 080906A2 */ j .L80241A88 -/* 1702CC 802419EC 00000000 */ nop +/* 1702CC 802419EC 00000000 */ nop .L802419F0: /* 1702D0 802419F0 3C02802A */ lui $v0, %hi(D_8029F248) /* 1702D4 802419F4 2442F248 */ addiu $v0, $v0, %lo(D_8029F248) @@ -551,7 +551,7 @@ glabel begin_battle /* 1702E0 80241A00 AC430000 */ sw $v1, ($v0) /* 1702E4 80241A04 2402000F */ addiu $v0, $zero, 0xf /* 1702E8 80241A08 14620003 */ bne $v1, $v0, .L80241A18 -/* 1702EC 80241A0C 00000000 */ nop +/* 1702EC 80241A0C 00000000 */ nop /* 1702F0 80241A10 0C093903 */ jal func_8024E40C /* 1702F4 80241A14 24040002 */ addiu $a0, $zero, 2 .L80241A18: @@ -560,7 +560,7 @@ glabel begin_battle /* 170300 80241A20 904200AA */ lbu $v0, 0xaa($v0) /* 170304 80241A24 30420001 */ andi $v0, $v0, 1 /* 170308 80241A28 14400004 */ bnez $v0, .L80241A3C -/* 17030C 80241A2C 00000000 */ nop +/* 17030C 80241A2C 00000000 */ nop /* 170310 80241A30 8E020000 */ lw $v0, ($s0) /* 170314 80241A34 08090691 */ j .L80241A44 /* 170318 80241A38 2442FFF6 */ addiu $v0, $v0, -0xa @@ -575,17 +575,17 @@ glabel begin_battle /* 170334 80241A54 0442000C */ bltzl $v0, .L80241A88 /* 170338 80241A58 AC600000 */ sw $zero, ($v1) /* 17033C 80241A5C 080906A2 */ j .L80241A88 -/* 170340 80241A60 00000000 */ nop +/* 170340 80241A60 00000000 */ nop /* 170344 80241A64 8282008C */ lb $v0, 0x8c($s4) /* 170348 80241A68 14400007 */ bnez $v0, .L80241A88 -/* 17034C 80241A6C 00000000 */ nop +/* 17034C 80241A6C 00000000 */ nop /* 170350 80241A70 3C05BF80 */ lui $a1, 0xbf80 /* 170354 80241A74 0C04DF62 */ jal func_80137D88 /* 170358 80241A78 240400FF */ addiu $a0, $zero, 0xff /* 17035C 80241A7C 24040005 */ addiu $a0, $zero, 5 .L80241A80: /* 170360 80241A80 0C090464 */ jal func_80241190 -/* 170364 80241A84 00000000 */ nop +/* 170364 80241A84 00000000 */ nop .L80241A88: /* 170368 80241A88 8FBF0044 */ lw $ra, 0x44($sp) /* 17036C 80241A8C 8FBE0040 */ lw $fp, 0x40($sp) diff --git a/asm/nonmatchings/code_16F740/end_battle.s b/asm/nonmatchings/code_16F740/end_battle.s index c1e8327008..a385400e1d 100644 --- a/asm/nonmatchings/code_16F740/end_battle.s +++ b/asm/nonmatchings/code_16F740/end_battle.s @@ -23,7 +23,7 @@ glabel end_battle /* 173378 80244A98 00220821 */ addu $at, $at, $v0 /* 17337C 80244A9C 8C22CAB8 */ lw $v0, %lo(D_8029CAB8)($at) /* 173380 80244AA0 00400008 */ jr $v0 -/* 173384 80244AA4 00000000 */ nop +/* 173384 80244AA4 00000000 */ nop /* 173388 80244AA8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 17338C 80244AAC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 173390 80244AB0 3C048028 */ lui $a0, %hi(D_80280A30) @@ -45,7 +45,7 @@ glabel end_battle /* 1733CC 80244AEC 14400010 */ bnez $v0, .L80244B30 /* 1733D0 80244AF0 24020001 */ addiu $v0, $zero, 1 /* 1733D4 80244AF4 0C093980 */ jal unfreeze_cam -/* 1733D8 80244AF8 00000000 */ nop +/* 1733D8 80244AF8 00000000 */ nop /* 1733DC 80244AFC 0C093903 */ jal func_8024E40C /* 1733E0 80244B00 24040001 */ addiu $a0, $zero, 1 /* 1733E4 80244B04 0000202D */ daddu $a0, $zero, $zero @@ -63,7 +63,7 @@ glabel end_battle /* 173410 80244B30 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 173414 80244B34 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 173418 80244B38 0809135D */ j .L80244D74 -/* 17341C 80244B3C 00000000 */ nop +/* 17341C 80244B3C 00000000 */ nop /* 173420 80244B40 3C048028 */ lui $a0, %hi(D_80280A30) /* 173424 80244B44 24840A30 */ addiu $a0, $a0, %lo(D_80280A30) /* 173428 80244B48 8C830000 */ lw $v1, ($a0) @@ -73,7 +73,7 @@ glabel end_battle /* 173438 80244B58 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 17343C 80244B5C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 173440 80244B60 0809135D */ j .L80244D74 -/* 173444 80244B64 00000000 */ nop +/* 173444 80244B64 00000000 */ nop .L80244B68: /* 173448 80244B68 8242008D */ lb $v0, 0x8d($s2) /* 17344C 80244B6C 00621021 */ addu $v0, $v1, $v0 @@ -82,7 +82,7 @@ glabel end_battle /* 173458 80244B78 5040007E */ beql $v0, $zero, .L80244D74 /* 17345C 80244B7C AC850000 */ sw $a1, ($a0) /* 173460 80244B80 0809135D */ j .L80244D74 -/* 173464 80244B84 00000000 */ nop +/* 173464 80244B84 00000000 */ nop /* 173468 80244B88 240200FF */ addiu $v0, $zero, 0xff /* 17346C 80244B8C 3C04800E */ lui $a0, %hi(gBattleStatus) /* 173470 80244B90 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) @@ -97,7 +97,7 @@ glabel end_battle /* 173494 80244BB4 AC820000 */ sw $v0, ($a0) /* 173498 80244BB8 8CC4000C */ lw $a0, 0xc($a2) /* 17349C 80244BBC 080912F2 */ j .L80244BC8 -/* 1734A0 80244BC0 00000000 */ nop +/* 1734A0 80244BC0 00000000 */ nop .L80244BC4: /* 1734A4 80244BC4 8CA40004 */ lw $a0, 4($a1) .L80244BC8: @@ -108,7 +108,7 @@ glabel end_battle /* 1734B8 80244BD8 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1734BC 80244BDC AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1734C0 80244BE0 0809135D */ j .L80244D74 -/* 1734C4 80244BE4 00000000 */ nop +/* 1734C4 80244BE4 00000000 */ nop .L80244BE8: /* 1734C8 80244BE8 0C0B0CF8 */ jal start_script /* 1734CC 80244BEC 0000302D */ daddu $a2, $zero, $zero @@ -121,7 +121,7 @@ glabel end_battle /* 1734E8 80244C08 AE4300C0 */ sw $v1, 0xc0($s2) /* 1734EC 80244C0C 8E4400C0 */ lw $a0, 0xc0($s2) /* 1734F0 80244C10 0C0B1059 */ jal does_script_exist -/* 1734F4 80244C14 00000000 */ nop +/* 1734F4 80244C14 00000000 */ nop /* 1734F8 80244C18 14400056 */ bnez $v0, .L80244D74 /* 1734FC 80244C1C 24020004 */ addiu $v0, $zero, 4 /* 173500 80244C20 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -134,16 +134,16 @@ glabel end_battle /* 173518 80244C38 10800003 */ beqz $a0, .L80244C48 /* 17351C 80244C3C 26310001 */ addiu $s1, $s1, 1 /* 173520 80244C40 0C0902EF */ jal delete_actor -/* 173524 80244C44 00000000 */ nop +/* 173524 80244C44 00000000 */ nop .L80244C48: /* 173528 80244C48 2A220018 */ slti $v0, $s1, 0x18 /* 17352C 80244C4C 1440FFF9 */ bnez $v0, .L80244C34 /* 173530 80244C50 26100004 */ addiu $s0, $s0, 4 /* 173534 80244C54 8E4400DC */ lw $a0, 0xdc($s2) /* 173538 80244C58 10800003 */ beqz $a0, .L80244C68 -/* 17353C 80244C5C 00000000 */ nop +/* 17353C 80244C5C 00000000 */ nop /* 173540 80244C60 0C0902EF */ jal delete_actor -/* 173544 80244C64 00000000 */ nop +/* 173544 80244C64 00000000 */ nop .L80244C68: /* 173548 80244C68 0C09035A */ jal delete_player_actor /* 17354C 80244C6C 8E4400D8 */ lw $a0, 0xd8($s2) @@ -166,15 +166,15 @@ glabel end_battle /* 17358C 80244CAC A2620013 */ sb $v0, 0x13($s3) .L80244CB0: /* 173590 80244CB0 0C016938 */ jal remove_all_effects -/* 173594 80244CB4 00000000 */ nop +/* 173594 80244CB4 00000000 */ nop /* 173598 80244CB8 0C051FB1 */ jal func_80147EC4 /* 17359C 80244CBC 0000202D */ daddu $a0, $zero, $zero /* 1735A0 80244CC0 8E020004 */ lw $v0, 4($s0) /* 1735A4 80244CC4 30420040 */ andi $v0, $v0, 0x40 /* 1735A8 80244CC8 10400003 */ beqz $v0, .L80244CD8 -/* 1735AC 80244CCC 00000000 */ nop +/* 1735AC 80244CCC 00000000 */ nop /* 1735B0 80244CD0 0C03A6CC */ jal decrement_status_menu_disabled -/* 1735B4 80244CD4 00000000 */ nop +/* 1735B4 80244CD4 00000000 */ nop .L80244CD8: /* 1735B8 80244CD8 82630009 */ lb $v1, 9($s3) /* 1735BC 80244CDC 24020001 */ addiu $v0, $zero, 1 @@ -183,7 +183,7 @@ glabel end_battle /* 1735C8 80244CE8 8E020000 */ lw $v0, ($s0) /* 1735CC 80244CEC 00431024 */ and $v0, $v0, $v1 /* 1735D0 80244CF0 14400015 */ bnez $v0, .L80244D48 -/* 1735D4 80244CF4 00000000 */ nop +/* 1735D4 80244CF4 00000000 */ nop /* 1735D8 80244CF8 0C090464 */ jal func_80241190 /* 1735DC 80244CFC 0000202D */ daddu $a0, $zero, $zero /* 1735E0 80244D00 3C04802A */ lui $a0, %hi(D_8029CAAC) @@ -216,7 +216,7 @@ glabel end_battle /* 173648 80244D68 24040009 */ addiu $a0, $zero, 9 .L80244D6C: /* 17364C 80244D6C 0C00CD3C */ jal set_game_mode -/* 173650 80244D70 00000000 */ nop +/* 173650 80244D70 00000000 */ nop .L80244D74: /* 173654 80244D74 8FBF0028 */ lw $ra, 0x28($sp) /* 173658 80244D78 8FB30024 */ lw $s3, 0x24($sp) diff --git a/asm/nonmatchings/code_16F740/func_80240E60.s b/asm/nonmatchings/code_16F740/func_80240E60.s index 2de6f1c34d..bda8d05fd1 100644 --- a/asm/nonmatchings/code_16F740/func_80240E60.s +++ b/asm/nonmatchings/code_16F740/func_80240E60.s @@ -23,13 +23,13 @@ glabel func_80240E60 /* 16F788 80240EA8 10510044 */ beq $v0, $s1, .L80240FBC /* 16F78C 80240EAC 24120004 */ addiu $s2, $zero, 4 /* 16F790 80240EB0 10520042 */ beq $v0, $s2, .L80240FBC -/* 16F794 80240EB4 00000000 */ nop +/* 16F794 80240EB4 00000000 */ nop /* 16F798 80240EB8 8202028A */ lb $v0, 0x28a($s0) /* 16F79C 80240EBC 1840003F */ blez $v0, .L80240FBC -/* 16F7A0 80240EC0 00000000 */ nop +/* 16F7A0 80240EC0 00000000 */ nop /* 16F7A4 80240EC4 8602028C */ lh $v0, 0x28c($s0) /* 16F7A8 80240EC8 1C400030 */ bgtz $v0, .L80240F8C -/* 16F7AC 80240ECC 00000000 */ nop +/* 16F7AC 80240ECC 00000000 */ nop /* 16F7B0 80240ED0 0C00A67F */ jal rand_int /* 16F7B4 80240ED4 24040064 */ addiu $a0, $zero, 0x64 /* 16F7B8 80240ED8 8E63008C */ lw $v1, 0x8c($s3) diff --git a/asm/nonmatchings/code_16F740/func_80240FDC.s b/asm/nonmatchings/code_16F740/func_80240FDC.s index 6c24989a22..2e1aed204d 100644 --- a/asm/nonmatchings/code_16F740/func_80240FDC.s +++ b/asm/nonmatchings/code_16F740/func_80240FDC.s @@ -23,13 +23,13 @@ glabel func_80240FDC /* 16F904 80241024 10510052 */ beq $v0, $s1, .L80241170 /* 16F908 80241028 24120004 */ addiu $s2, $zero, 4 /* 16F90C 8024102C 10520050 */ beq $v0, $s2, .L80241170 -/* 16F910 80241030 00000000 */ nop +/* 16F910 80241030 00000000 */ nop /* 16F914 80241034 8202028A */ lb $v0, 0x28a($s0) /* 16F918 80241038 1840004D */ blez $v0, .L80241170 -/* 16F91C 8024103C 00000000 */ nop +/* 16F91C 8024103C 00000000 */ nop /* 16F920 80241040 8602028C */ lh $v0, 0x28c($s0) /* 16F924 80241044 1C400039 */ bgtz $v0, .L8024112C -/* 16F928 80241048 00000000 */ nop +/* 16F928 80241048 00000000 */ nop /* 16F92C 8024104C 0C00A67F */ jal rand_int /* 16F930 80241050 24040064 */ addiu $a0, $zero, 0x64 /* 16F934 80241054 8E63008C */ lw $v1, 0x8c($s3) @@ -87,12 +87,12 @@ glabel func_80240FDC /* 16F9E8 80241108 10620004 */ beq $v1, $v0, .L8024111C /* 16F9EC 8024110C 24040005 */ addiu $a0, $zero, 5 /* 16F9F0 80241110 08090447 */ j .L8024111C -/* 16F9F4 80241114 00000000 */ nop +/* 16F9F4 80241114 00000000 */ nop .L80241118: /* 16F9F8 80241118 24040008 */ addiu $a0, $zero, 8 .L8024111C: /* 16F9FC 8024111C 0C00A67F */ jal rand_int -/* 16FA00 80241120 00000000 */ nop +/* 16FA00 80241120 00000000 */ nop /* 16FA04 80241124 24440005 */ addiu $a0, $v0, 5 /* 16FA08 80241128 A604028C */ sh $a0, 0x28c($s0) .L8024112C: @@ -100,7 +100,7 @@ glabel func_80240FDC /* 16FA10 80241130 2482FFFD */ addiu $v0, $a0, -3 /* 16FA14 80241134 2C420002 */ sltiu $v0, $v0, 2 /* 16FA18 80241138 1040000D */ beqz $v0, .L80241170 -/* 16FA1C 8024113C 00000000 */ nop +/* 16FA1C 8024113C 00000000 */ nop /* 16FA20 80241140 8602028C */ lh $v0, 0x28c($s0) /* 16FA24 80241144 9603028C */ lhu $v1, 0x28c($s0) /* 16FA28 80241148 28420002 */ slti $v0, $v0, 2 diff --git a/asm/nonmatchings/code_16F740/func_80241190.s b/asm/nonmatchings/code_16F740/func_80241190.s index 8983555815..250bb38b00 100644 --- a/asm/nonmatchings/code_16F740/func_80241190.s +++ b/asm/nonmatchings/code_16F740/func_80241190.s @@ -21,7 +21,7 @@ glabel func_80241190 /* 16FAB0 802411D0 5082000D */ beql $a0, $v0, .L80241208 /* 16FAB4 802411D4 24040008 */ addiu $a0, $zero, 8 /* 16FAB8 802411D8 08090482 */ j .L80241208 -/* 16FABC 802411DC 00000000 */ nop +/* 16FABC 802411DC 00000000 */ nop .L802411E0: /* 16FAC0 802411E0 2402000D */ addiu $v0, $zero, 0xd /* 16FAC4 802411E4 10820005 */ beq $a0, $v0, .L802411FC @@ -29,7 +29,7 @@ glabel func_80241190 /* 16FACC 802411EC 50820006 */ beql $a0, $v0, .L80241208 /* 16FAD0 802411F0 24040010 */ addiu $a0, $zero, 0x10 /* 16FAD4 802411F4 08090482 */ j .L80241208 -/* 16FAD8 802411F8 00000000 */ nop +/* 16FAD8 802411F8 00000000 */ nop .L802411FC: /* 16FADC 802411FC 08090482 */ j .L80241208 /* 16FAE0 80241200 2404000F */ addiu $a0, $zero, 0xf @@ -40,4 +40,4 @@ glabel func_80241190 /* 16FAEC 8024120C AC24C068 */ sw $a0, %lo(gBattleState)($at) .L80241210: /* 16FAF0 80241210 03E00008 */ jr $ra -/* 16FAF4 80241214 00000000 */ nop +/* 16FAF4 80241214 00000000 */ nop diff --git a/asm/nonmatchings/code_16F740/func_80241AB8.s b/asm/nonmatchings/code_16F740/func_80241AB8.s index 030ed5c026..3f9cbb7d67 100644 --- a/asm/nonmatchings/code_16F740/func_80241AB8.s +++ b/asm/nonmatchings/code_16F740/func_80241AB8.s @@ -13,12 +13,12 @@ glabel func_80241AB8 /* 1703B8 80241AD8 8CA50A30 */ lw $a1, %lo(D_80280A30)($a1) /* 1703BC 80241ADC 28A20100 */ slti $v0, $a1, 0x100 /* 1703C0 80241AE0 14400003 */ bnez $v0, .L80241AF0 -/* 1703C4 80241AE4 00000000 */ nop +/* 1703C4 80241AE4 00000000 */ nop /* 1703C8 80241AE8 080906C0 */ j .L80241B00 /* 1703CC 80241AEC 3C05437F */ lui $a1, 0x437f .L80241AF0: /* 1703D0 80241AF0 44850000 */ mtc1 $a1, $f0 -/* 1703D4 80241AF4 00000000 */ nop +/* 1703D4 80241AF4 00000000 */ nop /* 1703D8 80241AF8 46800020 */ cvt.s.w $f0, $f0 /* 1703DC 80241AFC 44050000 */ mfc1 $a1, $f0 .L80241B00: diff --git a/asm/nonmatchings/code_16F740/func_80241B14.s b/asm/nonmatchings/code_16F740/func_80241B14.s index 8b423414d8..dbabb29a55 100644 --- a/asm/nonmatchings/code_16F740/func_80241B14.s +++ b/asm/nonmatchings/code_16F740/func_80241B14.s @@ -103,7 +103,7 @@ glabel func_80241B14 /* 170564 80241C84 C4420138 */ lwc1 $f2, 0x138($v0) /* 170568 80241C88 C4600138 */ lwc1 $f0, 0x138($v1) /* 17056C 80241C8C 4602003C */ c.lt.s $f0, $f2 -/* 170570 80241C90 00000000 */ nop +/* 170570 80241C90 00000000 */ nop /* 170574 80241C94 4502000B */ bc1fl .L80241CC4 /* 170578 80241C98 25080001 */ addiu $t0, $t0, 1 /* 17057C 80241C9C 0809072F */ j .L80241CBC @@ -144,7 +144,7 @@ glabel func_80241B14 /* 1705F4 80241D14 82420002 */ lb $v0, 2($s2) /* 1705F8 80241D18 28420002 */ slti $v0, $v0, 2 /* 1705FC 80241D1C 1040000B */ beqz $v0, .L80241D4C -/* 170600 80241D20 00000000 */ nop +/* 170600 80241D20 00000000 */ nop /* 170604 80241D24 0C03A752 */ jal is_ability_active /* 170608 80241D28 24040014 */ addiu $a0, $zero, 0x14 /* 17060C 80241D2C 10400007 */ beqz $v0, .L80241D4C @@ -159,11 +159,11 @@ glabel func_80241B14 /* 17062C 80241D4C 82420002 */ lb $v0, 2($s2) /* 170630 80241D50 28420006 */ slti $v0, $v0, 6 /* 170634 80241D54 10400011 */ beqz $v0, .L80241D9C -/* 170638 80241D58 00000000 */ nop +/* 170638 80241D58 00000000 */ nop /* 17063C 80241D5C 0C03A752 */ jal is_ability_active /* 170640 80241D60 2404001E */ addiu $a0, $zero, 0x1e /* 170644 80241D64 1040000D */ beqz $v0, .L80241D9C -/* 170648 80241D68 00000000 */ nop +/* 170648 80241D68 00000000 */ nop /* 17064C 80241D6C 92820099 */ lbu $v0, 0x99($s4) /* 170650 80241D70 30420001 */ andi $v0, $v0, 1 /* 170654 80241D74 14400009 */ bnez $v0, .L80241D9C @@ -293,7 +293,7 @@ glabel func_80241B14 /* 170810 80241F30 26310001 */ addiu $s1, $s1, 1 /* 170814 80241F34 8E0401EC */ lw $a0, 0x1ec($s0) /* 170818 80241F38 0C0B1059 */ jal does_script_exist -/* 17081C 80241F3C 00000000 */ nop +/* 17081C 80241F3C 00000000 */ nop /* 170820 80241F40 54400001 */ bnel $v0, $zero, .L80241F48 /* 170824 80241F44 24130001 */ addiu $s3, $zero, 1 .L80241F48: @@ -303,10 +303,10 @@ glabel func_80241B14 /* 170830 80241F50 1440FFF2 */ bnez $v0, .L80241F1C /* 170834 80241F54 26520004 */ addiu $s2, $s2, 4 /* 170838 80241F58 12A00008 */ beqz $s5, .L80241F7C -/* 17083C 80241F5C 00000000 */ nop +/* 17083C 80241F5C 00000000 */ nop /* 170840 80241F60 8EA201CC */ lw $v0, 0x1cc($s5) /* 170844 80241F64 10400005 */ beqz $v0, .L80241F7C -/* 170848 80241F68 00000000 */ nop +/* 170848 80241F68 00000000 */ nop /* 17084C 80241F6C 0C0B1059 */ jal does_script_exist /* 170850 80241F70 8EA401EC */ lw $a0, 0x1ec($s5) /* 170854 80241F74 54400001 */ bnel $v0, $zero, .L80241F7C @@ -330,7 +330,7 @@ glabel func_80241B14 /* 170890 80241FB0 26310001 */ addiu $s1, $s1, 1 /* 170894 80241FB4 8E0401E8 */ lw $a0, 0x1e8($s0) /* 170898 80241FB8 0C0B1059 */ jal does_script_exist -/* 17089C 80241FBC 00000000 */ nop +/* 17089C 80241FBC 00000000 */ nop /* 1708A0 80241FC0 54400001 */ bnel $v0, $zero, .L80241FC8 /* 1708A4 80241FC4 24130001 */ addiu $s3, $zero, 1 .L80241FC8: @@ -340,15 +340,15 @@ glabel func_80241B14 /* 1708B0 80241FD0 1440FFF2 */ bnez $v0, .L80241F9C /* 1708B4 80241FD4 26520004 */ addiu $s2, $s2, 4 /* 1708B8 80241FD8 16600007 */ bnez $s3, .L80241FF8 -/* 1708BC 80241FDC 00000000 */ nop +/* 1708BC 80241FDC 00000000 */ nop .L80241FE0: /* 1708C0 80241FE0 0C098D0D */ jal func_80263434 -/* 1708C4 80241FE4 00000000 */ nop +/* 1708C4 80241FE4 00000000 */ nop /* 1708C8 80241FE8 14400003 */ bnez $v0, .L80241FF8 /* 1708CC 80241FEC 24040007 */ addiu $a0, $zero, 7 .L80241FF0: /* 1708D0 80241FF0 0C090464 */ jal func_80241190 -/* 1708D4 80241FF4 00000000 */ nop +/* 1708D4 80241FF4 00000000 */ nop .L80241FF8: /* 1708D8 80241FF8 8FBF0028 */ lw $ra, 0x28($sp) /* 1708DC 80241FFC 8FB50024 */ lw $s5, 0x24($sp) diff --git a/asm/nonmatchings/code_16F740/func_80242FE0.s b/asm/nonmatchings/code_16F740/func_80242FE0.s index d2af5b48a3..4a3910baaa 100644 --- a/asm/nonmatchings/code_16F740/func_80242FE0.s +++ b/asm/nonmatchings/code_16F740/func_80242FE0.s @@ -86,7 +86,7 @@ glabel func_80242FE0 /* 1719F0 80243110 26310001 */ addiu $s1, $s1, 1 /* 1719F4 80243114 8E0401E8 */ lw $a0, 0x1e8($s0) /* 1719F8 80243118 0C0B1059 */ jal does_script_exist -/* 1719FC 8024311C 00000000 */ nop +/* 1719FC 8024311C 00000000 */ nop /* 171A00 80243120 50400002 */ beql $v0, $zero, .L8024312C /* 171A04 80243124 AE0001D8 */ sw $zero, 0x1d8($s0) /* 171A08 80243128 24140001 */ addiu $s4, $zero, 1 @@ -97,7 +97,7 @@ glabel func_80242FE0 /* 171A14 80243134 1440FFF1 */ bnez $v0, .L802430FC /* 171A18 80243138 26730004 */ addiu $s3, $s3, 4 /* 171A1C 8024313C 16800079 */ bnez $s4, .L80243324 -/* 171A20 80243140 00000000 */ nop +/* 171A20 80243140 00000000 */ nop /* 171A24 80243144 0C098F18 */ jal func_80263C60 /* 171A28 80243148 0000882D */ daddu $s1, $zero, $zero /* 171A2C 8024314C 24130014 */ addiu $s3, $zero, 0x14 @@ -131,7 +131,7 @@ glabel func_80242FE0 /* 171A94 802431B4 A2020211 */ sb $v0, 0x211($s0) /* 171A98 802431B8 00021600 */ sll $v0, $v0, 0x18 /* 171A9C 802431BC 1C400009 */ bgtz $v0, .L802431E4 -/* 171AA0 802431C0 00000000 */ nop +/* 171AA0 802431C0 00000000 */ nop /* 171AA4 802431C4 86040436 */ lh $a0, 0x436($s0) /* 171AA8 802431C8 0C011E26 */ jal func_80047898 /* 171AAC 802431CC A2000210 */ sb $zero, 0x210($s0) @@ -143,13 +143,13 @@ glabel func_80242FE0 .L802431E4: /* 171AC4 802431E4 82020212 */ lb $v0, 0x212($s0) /* 171AC8 802431E8 1040000C */ beqz $v0, .L8024321C -/* 171ACC 802431EC 00000000 */ nop +/* 171ACC 802431EC 00000000 */ nop /* 171AD0 802431F0 92020213 */ lbu $v0, 0x213($s0) /* 171AD4 802431F4 2442FFFF */ addiu $v0, $v0, -1 /* 171AD8 802431F8 A2020213 */ sb $v0, 0x213($s0) /* 171ADC 802431FC 00021600 */ sll $v0, $v0, 0x18 /* 171AE0 80243200 1C400006 */ bgtz $v0, .L8024321C -/* 171AE4 80243204 00000000 */ nop +/* 171AE4 80243204 00000000 */ nop /* 171AE8 80243208 86040436 */ lh $a0, 0x436($s0) /* 171AEC 8024320C 0C011E68 */ jal func_800479A0 /* 171AF0 80243210 A2000212 */ sb $zero, 0x212($s0) @@ -158,13 +158,13 @@ glabel func_80242FE0 .L8024321C: /* 171AFC 8024321C 82020218 */ lb $v0, 0x218($s0) /* 171B00 80243220 1040000C */ beqz $v0, .L80243254 -/* 171B04 80243224 00000000 */ nop +/* 171B04 80243224 00000000 */ nop /* 171B08 80243228 92020219 */ lbu $v0, 0x219($s0) /* 171B0C 8024322C 2442FFFF */ addiu $v0, $v0, -1 /* 171B10 80243230 A2020219 */ sb $v0, 0x219($s0) /* 171B14 80243234 00021600 */ sll $v0, $v0, 0x18 /* 171B18 80243238 1C400006 */ bgtz $v0, .L80243254 -/* 171B1C 8024323C 00000000 */ nop +/* 171B1C 8024323C 00000000 */ nop /* 171B20 80243240 86040436 */ lh $a0, 0x436($s0) /* 171B24 80243244 0C011EAA */ jal func_80047AA8 /* 171B28 80243248 A2000218 */ sb $zero, 0x218($s0) @@ -173,13 +173,13 @@ glabel func_80242FE0 .L80243254: /* 171B34 80243254 82020214 */ lb $v0, 0x214($s0) /* 171B38 80243258 1040000A */ beqz $v0, .L80243284 -/* 171B3C 8024325C 00000000 */ nop +/* 171B3C 8024325C 00000000 */ nop /* 171B40 80243260 92020215 */ lbu $v0, 0x215($s0) /* 171B44 80243264 2442FFFF */ addiu $v0, $v0, -1 /* 171B48 80243268 A2020215 */ sb $v0, 0x215($s0) /* 171B4C 8024326C 00021600 */ sll $v0, $v0, 0x18 /* 171B50 80243270 1C400004 */ bgtz $v0, .L80243284 -/* 171B54 80243274 00000000 */ nop +/* 171B54 80243274 00000000 */ nop /* 171B58 80243278 A2000214 */ sb $zero, 0x214($s0) /* 171B5C 8024327C 3C01802A */ lui $at, %hi(D_8029F258) /* 171B60 80243280 AC33F258 */ sw $s3, %lo(D_8029F258)($at) @@ -190,7 +190,7 @@ glabel func_80242FE0 /* 171B70 80243290 00021600 */ sll $v0, $v0, 0x18 /* 171B74 80243294 00021603 */ sra $v0, $v0, 0x18 /* 171B78 80243298 18400008 */ blez $v0, .L802432BC -/* 171B7C 8024329C 00000000 */ nop +/* 171B7C 8024329C 00000000 */ nop /* 171B80 802432A0 8E030440 */ lw $v1, 0x440($s0) /* 171B84 802432A4 2402000D */ addiu $v0, $zero, 0xd /* 171B88 802432A8 A2020216 */ sb $v0, 0x216($s0) @@ -200,7 +200,7 @@ glabel func_80242FE0 /* 171B98 802432B8 AC62003C */ sw $v0, 0x3c($v1) .L802432BC: /* 171B9C 802432BC 10620005 */ beq $v1, $v0, .L802432D4 -/* 171BA0 802432C0 00000000 */ nop +/* 171BA0 802432C0 00000000 */ nop /* 171BA4 802432C4 8E020440 */ lw $v0, 0x440($s0) /* 171BA8 802432C8 A2000216 */ sb $zero, 0x216($s0) /* 171BAC 802432CC 8C42000C */ lw $v0, 0xc($v0) @@ -233,14 +233,14 @@ glabel func_80242FE0 /* 171C0C 8024332C 24020002 */ addiu $v0, $zero, 2 .L80243330: /* 171C10 80243330 14620070 */ bne $v1, $v0, .L802434F4 -/* 171C14 80243334 00000000 */ nop +/* 171C14 80243334 00000000 */ nop /* 171C18 80243338 8EA201D8 */ lw $v0, 0x1d8($s5) /* 171C1C 8024333C 10400005 */ beqz $v0, .L80243354 -/* 171C20 80243340 00000000 */ nop +/* 171C20 80243340 00000000 */ nop /* 171C24 80243344 0C0B1059 */ jal does_script_exist /* 171C28 80243348 8EA401E8 */ lw $a0, 0x1e8($s5) /* 171C2C 8024334C 14400069 */ bnez $v0, .L802434F4 -/* 171C30 80243350 00000000 */ nop +/* 171C30 80243350 00000000 */ nop .L80243354: /* 171C34 80243354 1240000A */ beqz $s2, .L80243380 /* 171C38 80243358 AEA001D8 */ sw $zero, 0x1d8($s5) @@ -249,9 +249,9 @@ glabel func_80242FE0 /* 171C44 80243364 AE4001D8 */ sw $zero, 0x1d8($s2) /* 171C48 80243368 8E4401E8 */ lw $a0, 0x1e8($s2) /* 171C4C 8024336C 0C0B1059 */ jal does_script_exist -/* 171C50 80243370 00000000 */ nop +/* 171C50 80243370 00000000 */ nop /* 171C54 80243374 1440005F */ bnez $v0, .L802434F4 -/* 171C58 80243378 00000000 */ nop +/* 171C58 80243378 00000000 */ nop /* 171C5C 8024337C AE4001D8 */ sw $zero, 0x1d8($s2) .L80243380: /* 171C60 80243380 0000A02D */ daddu $s4, $zero, $zero @@ -266,7 +266,7 @@ glabel func_80242FE0 /* 171C80 802433A0 26310001 */ addiu $s1, $s1, 1 /* 171C84 802433A4 8E0401E8 */ lw $a0, 0x1e8($s0) /* 171C88 802433A8 0C0B1059 */ jal does_script_exist -/* 171C8C 802433AC 00000000 */ nop +/* 171C8C 802433AC 00000000 */ nop /* 171C90 802433B0 50400002 */ beql $v0, $zero, .L802433BC /* 171C94 802433B4 AE0001D8 */ sw $zero, 0x1d8($s0) /* 171C98 802433B8 24140001 */ addiu $s4, $zero, 1 @@ -277,15 +277,15 @@ glabel func_80242FE0 /* 171CA4 802433C4 1440FFF1 */ bnez $v0, .L8024338C /* 171CA8 802433C8 26730004 */ addiu $s3, $s3, 4 /* 171CAC 802433CC 16800049 */ bnez $s4, .L802434F4 -/* 171CB0 802433D0 00000000 */ nop +/* 171CB0 802433D0 00000000 */ nop /* 171CB4 802433D4 0C098D19 */ jal func_80263464 -/* 171CB8 802433D8 00000000 */ nop +/* 171CB8 802433D8 00000000 */ nop /* 171CBC 802433DC 1440013F */ bnez $v0, .L802438DC -/* 171CC0 802433E0 00000000 */ nop +/* 171CC0 802433E0 00000000 */ nop /* 171CC4 802433E4 0C098D0D */ jal func_80263434 -/* 171CC8 802433E8 00000000 */ nop +/* 171CC8 802433E8 00000000 */ nop /* 171CCC 802433EC 1440013B */ bnez $v0, .L802438DC -/* 171CD0 802433F0 00000000 */ nop +/* 171CD0 802433F0 00000000 */ nop /* 171CD4 802433F4 0C093903 */ jal func_8024E40C /* 171CD8 802433F8 24040002 */ addiu $a0, $zero, 2 /* 171CDC 802433FC 12400007 */ beqz $s2, .L8024341C @@ -295,7 +295,7 @@ glabel func_80242FE0 /* 171CEC 8024340C 8C820000 */ lw $v0, ($a0) /* 171CF0 80243410 00431024 */ and $v0, $v0, $v1 /* 171CF4 80243414 14400003 */ bnez $v0, .L80243424 -/* 171CF8 80243418 00000000 */ nop +/* 171CF8 80243418 00000000 */ nop .L8024341C: /* 171CFC 8024341C 08090D3B */ j .L802434EC /* 171D00 80243420 24020004 */ addiu $v0, $zero, 4 @@ -360,10 +360,10 @@ glabel func_80242FE0 /* 171DD8 802434F8 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 171DDC 802434FC 24020003 */ addiu $v0, $zero, 3 /* 171DE0 80243500 1462006F */ bne $v1, $v0, .L802436C0 -/* 171DE4 80243504 00000000 */ nop +/* 171DE4 80243504 00000000 */ nop /* 171DE8 80243508 86420070 */ lh $v0, 0x70($s2) /* 171DEC 8024350C 10400022 */ beqz $v0, .L80243598 -/* 171DF0 80243510 00000000 */ nop +/* 171DF0 80243510 00000000 */ nop /* 171DF4 80243514 C6400018 */ lwc1 $f0, 0x18($s2) /* 171DF8 80243518 C6480144 */ lwc1 $f8, 0x144($s2) /* 171DFC 8024351C C6420020 */ lwc1 $f2, 0x20($s2) @@ -371,7 +371,7 @@ glabel func_80242FE0 /* 171E04 80243524 C644014C */ lwc1 $f4, 0x14c($s2) /* 171E08 80243528 46041081 */ sub.s $f2, $f2, $f4 /* 171E0C 8024352C 44823000 */ mtc1 $v0, $f6 -/* 171E10 80243530 00000000 */ nop +/* 171E10 80243530 00000000 */ nop /* 171E14 80243534 468031A0 */ cvt.s.w $f6, $f6 /* 171E18 80243538 46060003 */ div.s $f0, $f0, $f6 /* 171E1C 8024353C 46004200 */ add.s $f8, $f8, $f0 @@ -392,7 +392,7 @@ glabel func_80242FE0 /* 171E58 80243578 86420070 */ lh $v0, 0x70($s2) /* 171E5C 8024357C 46040001 */ sub.s $f0, $f0, $f4 /* 171E60 80243580 44821000 */ mtc1 $v0, $f2 -/* 171E64 80243584 00000000 */ nop +/* 171E64 80243584 00000000 */ nop /* 171E68 80243588 468010A0 */ cvt.s.w $f2, $f2 /* 171E6C 8024358C 46020003 */ div.s $f0, $f0, $f2 /* 171E70 80243590 46002100 */ add.s $f4, $f4, $f0 @@ -402,9 +402,9 @@ glabel func_80242FE0 /* 171E7C 8024359C 3C0140C9 */ lui $at, 0x40c9 /* 171E80 802435A0 34210FD0 */ ori $at, $at, 0xfd0 /* 171E84 802435A4 4481B000 */ mtc1 $at, $f22 -/* 171E88 802435A8 00000000 */ nop +/* 171E88 802435A8 00000000 */ nop /* 171E8C 802435AC 46166302 */ mul.s $f12, $f12, $f22 -/* 171E90 802435B0 00000000 */ nop +/* 171E90 802435B0 00000000 */ nop /* 171E94 802435B4 3C0143B4 */ lui $at, 0x43b4 /* 171E98 802435B8 4481C000 */ mtc1 $at, $f24 /* 171E9C 802435BC 3C014180 */ lui $at, 0x4180 @@ -412,7 +412,7 @@ glabel func_80242FE0 /* 171EA4 802435C4 0C00A85B */ jal sin_rad /* 171EA8 802435C8 46186303 */ div.s $f12, $f12, $f24 /* 171EAC 802435CC 46140002 */ mul.s $f0, $f0, $f20 -/* 171EB0 802435D0 00000000 */ nop +/* 171EB0 802435D0 00000000 */ nop /* 171EB4 802435D4 C642014C */ lwc1 $f2, 0x14c($s2) /* 171EB8 802435D8 46001081 */ sub.s $f2, $f2, $f0 /* 171EBC 802435DC C64C0054 */ lwc1 $f12, 0x54($s2) @@ -420,12 +420,12 @@ glabel func_80242FE0 /* 171EC4 802435E4 E642014C */ swc1 $f2, 0x14c($s2) /* 171EC8 802435E8 C64C0054 */ lwc1 $f12, 0x54($s2) /* 171ECC 802435EC 46166302 */ mul.s $f12, $f12, $f22 -/* 171ED0 802435F0 00000000 */ nop +/* 171ED0 802435F0 00000000 */ nop /* 171ED4 802435F4 E640018C */ swc1 $f0, 0x18c($s2) /* 171ED8 802435F8 0C00A85B */ jal sin_rad /* 171EDC 802435FC 46186303 */ div.s $f12, $f12, $f24 /* 171EE0 80243600 46140002 */ mul.s $f0, $f0, $f20 -/* 171EE4 80243604 00000000 */ nop +/* 171EE4 80243604 00000000 */ nop /* 171EE8 80243608 C6A2014C */ lwc1 $f2, 0x14c($s5) /* 171EEC 8024360C 46001080 */ add.s $f2, $f2, $f0 /* 171EF0 80243610 E6A2014C */ swc1 $f2, 0x14c($s5) @@ -454,7 +454,7 @@ glabel func_80242FE0 /* 171F48 80243668 E6A0014C */ swc1 $f0, 0x14c($s5) /* 171F4C 8024366C 82C2009A */ lb $v0, 0x9a($s6) /* 171F50 80243670 14400005 */ bnez $v0, .L80243688 -/* 171F54 80243674 00000000 */ nop +/* 171F54 80243674 00000000 */ nop /* 171F58 80243678 C6400144 */ lwc1 $f0, 0x144($s2) /* 171F5C 8024367C C642014C */ lwc1 $f2, 0x14c($s2) /* 171F60 80243680 E6400138 */ swc1 $f0, 0x138($s2) @@ -480,7 +480,7 @@ glabel func_80242FE0 /* 171FA8 802436C8 8E030000 */ lw $v1, ($s0) /* 171FAC 802436CC 24020004 */ addiu $v0, $zero, 4 /* 171FB0 802436D0 14620038 */ bne $v1, $v0, .L802437B4 -/* 171FB4 802436D4 00000000 */ nop +/* 171FB4 802436D4 00000000 */ nop /* 171FB8 802436D8 3C03802A */ lui $v1, %hi(D_8029F258) /* 171FBC 802436DC 2463F258 */ addiu $v1, $v1, %lo(D_8029F258) /* 171FC0 802436E0 8C620000 */ lw $v0, ($v1) @@ -550,9 +550,9 @@ glabel func_80242FE0 /* 1720B0 802437D0 AEA001D4 */ sw $zero, 0x1d4($s5) /* 1720B4 802437D4 8EA401E4 */ lw $a0, 0x1e4($s5) /* 1720B8 802437D8 0C0B1059 */ jal does_script_exist -/* 1720BC 802437DC 00000000 */ nop +/* 1720BC 802437DC 00000000 */ nop /* 1720C0 802437E0 1440001D */ bnez $v0, .L80243858 -/* 1720C4 802437E4 00000000 */ nop +/* 1720C4 802437E4 00000000 */ nop /* 1720C8 802437E8 AEA001D4 */ sw $zero, 0x1d4($s5) .L802437EC: /* 1720CC 802437EC 0000882D */ daddu $s1, $zero, $zero @@ -602,7 +602,7 @@ glabel func_80242FE0 /* 172168 80243888 26310001 */ addiu $s1, $s1, 1 /* 17216C 8024388C 8E0401EC */ lw $a0, 0x1ec($s0) /* 172170 80243890 0C0B1059 */ jal does_script_exist -/* 172174 80243894 00000000 */ nop +/* 172174 80243894 00000000 */ nop /* 172178 80243898 54400001 */ bnel $v0, $zero, .L802438A0 /* 17217C 8024389C 24140001 */ addiu $s4, $zero, 1 .L802438A0: @@ -623,7 +623,7 @@ glabel func_80242FE0 /* 1721B0 802438D0 24040014 */ addiu $a0, $zero, 0x14 .L802438D4: /* 1721B4 802438D4 0C090464 */ jal func_80241190 -/* 1721B8 802438D8 00000000 */ nop +/* 1721B8 802438D8 00000000 */ nop .L802438DC: /* 1721BC 802438DC 8FBF002C */ lw $ra, 0x2c($sp) /* 1721C0 802438E0 8FB60028 */ lw $s6, 0x28($sp) diff --git a/asm/nonmatchings/code_16F740/func_802439D8.s b/asm/nonmatchings/code_16F740/func_802439D8.s index cb6ca88feb..5213bca97a 100644 --- a/asm/nonmatchings/code_16F740/func_802439D8.s +++ b/asm/nonmatchings/code_16F740/func_802439D8.s @@ -36,7 +36,7 @@ glabel func_802439D8 /* 172330 80243A50 26310001 */ addiu $s1, $s1, 1 /* 172334 80243A54 8E0401E8 */ lw $a0, 0x1e8($s0) /* 172338 80243A58 0C0B1059 */ jal does_script_exist -/* 17233C 80243A5C 00000000 */ nop +/* 17233C 80243A5C 00000000 */ nop /* 172340 80243A60 50400002 */ beql $v0, $zero, .L80243A6C /* 172344 80243A64 AE0001D8 */ sw $zero, 0x1d8($s0) /* 172348 80243A68 24140001 */ addiu $s4, $zero, 1 @@ -47,7 +47,7 @@ glabel func_802439D8 /* 172354 80243A74 1440FFF1 */ bnez $v0, .L80243A3C /* 172358 80243A78 26520004 */ addiu $s2, $s2, 4 /* 17235C 80243A7C 1680001A */ bnez $s4, .L80243AE8 -/* 172360 80243A80 00000000 */ nop +/* 172360 80243A80 00000000 */ nop /* 172364 80243A84 0000882D */ daddu $s1, $zero, $zero /* 172368 80243A88 02C0902D */ daddu $s2, $s6, $zero .L80243A8C: @@ -59,7 +59,7 @@ glabel func_802439D8 /* 172380 80243AA0 26310001 */ addiu $s1, $s1, 1 /* 172384 80243AA4 8E0401E4 */ lw $a0, 0x1e4($s0) /* 172388 80243AA8 0C0B1059 */ jal does_script_exist -/* 17238C 80243AAC 00000000 */ nop +/* 17238C 80243AAC 00000000 */ nop /* 172390 80243AB0 50400002 */ beql $v0, $zero, .L80243ABC /* 172394 80243AB4 AE0001D4 */ sw $zero, 0x1d4($s0) /* 172398 80243AB8 24140001 */ addiu $s4, $zero, 1 @@ -70,7 +70,7 @@ glabel func_802439D8 /* 1723A4 80243AC4 1440FFF1 */ bnez $v0, .L80243A8C /* 1723A8 80243AC8 26520004 */ addiu $s2, $s2, 4 /* 1723AC 80243ACC 16800006 */ bnez $s4, .L80243AE8 -/* 1723B0 80243AD0 00000000 */ nop +/* 1723B0 80243AD0 00000000 */ nop /* 1723B4 80243AD4 0C093903 */ jal func_8024E40C /* 1723B8 80243AD8 24040002 */ addiu $a0, $zero, 2 /* 1723BC 80243ADC 24020001 */ addiu $v0, $zero, 1 @@ -82,7 +82,7 @@ glabel func_802439D8 /* 1723D0 80243AF0 8C830000 */ lw $v1, ($a0) /* 1723D4 80243AF4 24020001 */ addiu $v0, $zero, 1 /* 1723D8 80243AF8 1462002A */ bne $v1, $v0, .L80243BA4 -/* 1723DC 80243AFC 00000000 */ nop +/* 1723DC 80243AFC 00000000 */ nop /* 1723E0 80243B00 3C03800E */ lui $v1, %hi(gBattleStatus) /* 1723E4 80243B04 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 1723E8 80243B08 8C620004 */ lw $v0, 4($v1) @@ -134,7 +134,7 @@ glabel func_802439D8 /* 172494 80243BB4 2402000C */ addiu $v0, $zero, 0xc /* 172498 80243BB8 86620070 */ lh $v0, 0x70($s3) /* 17249C 80243BBC 10400022 */ beqz $v0, .L80243C48 -/* 1724A0 80243BC0 00000000 */ nop +/* 1724A0 80243BC0 00000000 */ nop /* 1724A4 80243BC4 C6600018 */ lwc1 $f0, 0x18($s3) /* 1724A8 80243BC8 C6680144 */ lwc1 $f8, 0x144($s3) /* 1724AC 80243BCC C6620020 */ lwc1 $f2, 0x20($s3) @@ -142,7 +142,7 @@ glabel func_802439D8 /* 1724B4 80243BD4 C664014C */ lwc1 $f4, 0x14c($s3) /* 1724B8 80243BD8 46041081 */ sub.s $f2, $f2, $f4 /* 1724BC 80243BDC 44823000 */ mtc1 $v0, $f6 -/* 1724C0 80243BE0 00000000 */ nop +/* 1724C0 80243BE0 00000000 */ nop /* 1724C4 80243BE4 468031A0 */ cvt.s.w $f6, $f6 /* 1724C8 80243BE8 46060003 */ div.s $f0, $f0, $f6 /* 1724CC 80243BEC 46004200 */ add.s $f8, $f8, $f0 @@ -163,7 +163,7 @@ glabel func_802439D8 /* 172508 80243C28 86620070 */ lh $v0, 0x70($s3) /* 17250C 80243C2C 46040001 */ sub.s $f0, $f0, $f4 /* 172510 80243C30 44821000 */ mtc1 $v0, $f2 -/* 172514 80243C34 00000000 */ nop +/* 172514 80243C34 00000000 */ nop /* 172518 80243C38 468010A0 */ cvt.s.w $f2, $f2 /* 17251C 80243C3C 46020003 */ div.s $f0, $f0, $f2 /* 172520 80243C40 46002100 */ add.s $f4, $f4, $f0 @@ -173,9 +173,9 @@ glabel func_802439D8 /* 17252C 80243C4C 3C0140C9 */ lui $at, 0x40c9 /* 172530 80243C50 34210FD0 */ ori $at, $at, 0xfd0 /* 172534 80243C54 4481B000 */ mtc1 $at, $f22 -/* 172538 80243C58 00000000 */ nop +/* 172538 80243C58 00000000 */ nop /* 17253C 80243C5C 46166302 */ mul.s $f12, $f12, $f22 -/* 172540 80243C60 00000000 */ nop +/* 172540 80243C60 00000000 */ nop /* 172544 80243C64 3C0143B4 */ lui $at, 0x43b4 /* 172548 80243C68 4481C000 */ mtc1 $at, $f24 /* 17254C 80243C6C 3C014180 */ lui $at, 0x4180 @@ -183,7 +183,7 @@ glabel func_802439D8 /* 172554 80243C74 0C00A85B */ jal sin_rad /* 172558 80243C78 46186303 */ div.s $f12, $f12, $f24 /* 17255C 80243C7C 46140002 */ mul.s $f0, $f0, $f20 -/* 172560 80243C80 00000000 */ nop +/* 172560 80243C80 00000000 */ nop /* 172564 80243C84 C662014C */ lwc1 $f2, 0x14c($s3) /* 172568 80243C88 46001081 */ sub.s $f2, $f2, $f0 /* 17256C 80243C8C C66C0054 */ lwc1 $f12, 0x54($s3) @@ -191,12 +191,12 @@ glabel func_802439D8 /* 172574 80243C94 E662014C */ swc1 $f2, 0x14c($s3) /* 172578 80243C98 C66C0054 */ lwc1 $f12, 0x54($s3) /* 17257C 80243C9C 46166302 */ mul.s $f12, $f12, $f22 -/* 172580 80243CA0 00000000 */ nop +/* 172580 80243CA0 00000000 */ nop /* 172584 80243CA4 E660018C */ swc1 $f0, 0x18c($s3) /* 172588 80243CA8 0C00A85B */ jal sin_rad /* 17258C 80243CAC 46186303 */ div.s $f12, $f12, $f24 /* 172590 80243CB0 46140002 */ mul.s $f0, $f0, $f20 -/* 172594 80243CB4 00000000 */ nop +/* 172594 80243CB4 00000000 */ nop /* 172598 80243CB8 C6A2014C */ lwc1 $f2, 0x14c($s5) /* 17259C 80243CBC 46001080 */ add.s $f2, $f2, $f0 /* 1725A0 80243CC0 E6A2014C */ swc1 $f2, 0x14c($s5) @@ -281,7 +281,7 @@ glabel func_802439D8 /* 1726C8 80243DE8 A260021D */ sb $zero, 0x21d($s3) .L80243DEC: /* 1726CC 80243DEC 0C098298 */ jal func_80260A60 -/* 1726D0 80243DF0 00000000 */ nop +/* 1726D0 80243DF0 00000000 */ nop /* 1726D4 80243DF4 3C04FFBF */ lui $a0, 0xffbf /* 1726D8 80243DF8 3484FFFF */ ori $a0, $a0, 0xffff /* 1726DC 80243DFC 8E030000 */ lw $v1, ($s0) @@ -363,7 +363,7 @@ glabel func_802439D8 /* 1727F0 80243F10 26310001 */ addiu $s1, $s1, 1 /* 1727F4 80243F14 8E0401EC */ lw $a0, 0x1ec($s0) /* 1727F8 80243F18 0C0B1059 */ jal does_script_exist -/* 1727FC 80243F1C 00000000 */ nop +/* 1727FC 80243F1C 00000000 */ nop /* 172800 80243F20 54400001 */ bnel $v0, $zero, .L80243F28 /* 172804 80243F24 24140001 */ addiu $s4, $zero, 1 .L80243F28: @@ -373,17 +373,17 @@ glabel func_802439D8 /* 172810 80243F30 1440FFF2 */ bnez $v0, .L80243EFC /* 172814 80243F34 26520004 */ addiu $s2, $s2, 4 /* 172818 80243F38 12600008 */ beqz $s3, .L80243F5C -/* 17281C 80243F3C 00000000 */ nop +/* 17281C 80243F3C 00000000 */ nop /* 172820 80243F40 8E6201CC */ lw $v0, 0x1cc($s3) /* 172824 80243F44 10400005 */ beqz $v0, .L80243F5C -/* 172828 80243F48 00000000 */ nop +/* 172828 80243F48 00000000 */ nop /* 17282C 80243F4C 0C0B1059 */ jal does_script_exist /* 172830 80243F50 8E6401EC */ lw $a0, 0x1ec($s3) /* 172834 80243F54 54400001 */ bnel $v0, $zero, .L80243F5C /* 172838 80243F58 24140001 */ addiu $s4, $zero, 1 .L80243F5C: /* 17283C 80243F5C 16800006 */ bnez $s4, .L80243F78 -/* 172840 80243F60 00000000 */ nop +/* 172840 80243F60 00000000 */ nop /* 172844 80243F64 0C093903 */ jal func_8024E40C /* 172848 80243F68 24040002 */ addiu $a0, $zero, 2 /* 17284C 80243F6C 24020003 */ addiu $v0, $zero, 3 @@ -397,7 +397,7 @@ glabel func_802439D8 /* 172864 80243F84 10400005 */ beqz $v0, .L80243F9C /* 172868 80243F88 28620003 */ slti $v0, $v1, 3 /* 17286C 80243F8C 14400003 */ bnez $v0, .L80243F9C -/* 172870 80243F90 00000000 */ nop +/* 172870 80243F90 00000000 */ nop /* 172874 80243F94 0C090464 */ jal func_80241190 /* 172878 80243F98 24040005 */ addiu $a0, $zero, 5 .L80243F9C: diff --git a/asm/nonmatchings/code_16F740/func_80244008.s b/asm/nonmatchings/code_16F740/func_80244008.s index e6833405bb..f68bcd5e15 100644 --- a/asm/nonmatchings/code_16F740/func_80244008.s +++ b/asm/nonmatchings/code_16F740/func_80244008.s @@ -30,7 +30,7 @@ glabel func_80244008 /* 17294C 8024406C 10620024 */ beq $v1, $v0, .L80244100 /* 172950 80244070 24020005 */ addiu $v0, $zero, 5 /* 172954 80244074 0809104B */ j .L8024412C -/* 172958 80244078 00000000 */ nop +/* 172958 80244078 00000000 */ nop .L8024407C: /* 17295C 8024407C 3C03F3FF */ lui $v1, 0xf3ff /* 172960 80244080 8E220000 */ lw $v0, ($s1) @@ -71,7 +71,7 @@ glabel func_80244008 .L80244100: /* 1729E0 80244100 8E0401EC */ lw $a0, 0x1ec($s0) /* 1729E4 80244104 0C0B1059 */ jal does_script_exist -/* 1729E8 80244108 00000000 */ nop +/* 1729E8 80244108 00000000 */ nop /* 1729EC 8024410C 14400003 */ bnez $v0, .L8024411C /* 1729F0 80244110 24020005 */ addiu $v0, $zero, 5 /* 1729F4 80244114 A260009A */ sb $zero, 0x9a($s3) @@ -86,9 +86,9 @@ glabel func_80244008 /* 172A0C 8024412C 10620005 */ beq $v1, $v0, .L80244144 /* 172A10 80244130 2402000A */ addiu $v0, $zero, 0xa /* 172A14 80244134 10620040 */ beq $v1, $v0, .L80244238 -/* 172A18 80244138 00000000 */ nop +/* 172A18 80244138 00000000 */ nop /* 172A1C 8024413C 080910A3 */ j .L8024428C -/* 172A20 80244140 00000000 */ nop +/* 172A20 80244140 00000000 */ nop .L80244144: /* 172A24 80244144 3C03F3FF */ lui $v1, 0xf3ff /* 172A28 80244148 8E220000 */ lw $v0, ($s1) @@ -120,7 +120,7 @@ glabel func_80244008 /* 172A8C 802441AC 82220216 */ lb $v0, 0x216($s1) /* 172A90 802441B0 2414000D */ addiu $s4, $zero, 0xd /* 172A94 802441B4 14540005 */ bne $v0, $s4, .L802441CC -/* 172A98 802441B8 00000000 */ nop +/* 172A98 802441B8 00000000 */ nop /* 172A9C 802441BC 0C09C596 */ jal dispatch_event_player /* 172AA0 802441C0 24040034 */ addiu $a0, $zero, 0x34 /* 172AA4 802441C4 2402000A */ addiu $v0, $zero, 0xa @@ -138,7 +138,7 @@ glabel func_80244008 /* 172AD0 802441F0 AC40003C */ sw $zero, 0x3c($v0) /* 172AD4 802441F4 82020216 */ lb $v0, 0x216($s0) /* 172AD8 802441F8 14540005 */ bne $v0, $s4, .L80244210 -/* 172ADC 802441FC 00000000 */ nop +/* 172ADC 802441FC 00000000 */ nop /* 172AE0 80244200 0C09F7A0 */ jal dispatch_event_partner /* 172AE4 80244204 24040034 */ addiu $a0, $zero, 0x34 /* 172AE8 80244208 2402000A */ addiu $v0, $zero, 0xa @@ -157,11 +157,11 @@ glabel func_80244008 .L80244238: /* 172B18 80244238 8E2201D8 */ lw $v0, 0x1d8($s1) /* 172B1C 8024423C 10400005 */ beqz $v0, .L80244254 -/* 172B20 80244240 00000000 */ nop +/* 172B20 80244240 00000000 */ nop /* 172B24 80244244 0C0B1059 */ jal does_script_exist /* 172B28 80244248 8E2401E8 */ lw $a0, 0x1e8($s1) /* 172B2C 8024424C 1440000F */ bnez $v0, .L8024428C -/* 172B30 80244250 00000000 */ nop +/* 172B30 80244250 00000000 */ nop .L80244254: /* 172B34 80244254 1200000A */ beqz $s0, .L80244280 /* 172B38 80244258 AE2001D8 */ sw $zero, 0x1d8($s1) @@ -170,9 +170,9 @@ glabel func_80244008 /* 172B44 80244264 AE0001D8 */ sw $zero, 0x1d8($s0) /* 172B48 80244268 8E0401E8 */ lw $a0, 0x1e8($s0) /* 172B4C 8024426C 0C0B1059 */ jal does_script_exist -/* 172B50 80244270 00000000 */ nop +/* 172B50 80244270 00000000 */ nop /* 172B54 80244274 14400005 */ bnez $v0, .L8024428C -/* 172B58 80244278 00000000 */ nop +/* 172B58 80244278 00000000 */ nop /* 172B5C 8024427C AE0001D8 */ sw $zero, 0x1d8($s0) .L80244280: /* 172B60 80244280 2402000B */ addiu $v0, $zero, 0xb @@ -184,7 +184,7 @@ glabel func_80244008 /* 172B74 80244294 8C830000 */ lw $v1, ($a0) /* 172B78 80244298 2402000B */ addiu $v0, $zero, 0xb /* 172B7C 8024429C 14620017 */ bne $v1, $v0, .L802442FC -/* 172B80 802442A0 00000000 */ nop +/* 172B80 802442A0 00000000 */ nop /* 172B84 802442A4 12000006 */ beqz $s0, .L802442C0 /* 172B88 802442A8 3C030010 */ lui $v1, 0x10 /* 172B8C 802442AC 3C02800E */ lui $v0, %hi(gBattleStatus) @@ -215,10 +215,10 @@ glabel func_80244008 /* 172BE4 80244304 8E430000 */ lw $v1, ($s2) /* 172BE8 80244308 2402000C */ addiu $v0, $zero, 0xc /* 172BEC 8024430C 1462006D */ bne $v1, $v0, .L802444C4 -/* 172BF0 80244310 00000000 */ nop +/* 172BF0 80244310 00000000 */ nop /* 172BF4 80244314 86020070 */ lh $v0, 0x70($s0) /* 172BF8 80244318 10400022 */ beqz $v0, .L802443A4 -/* 172BFC 8024431C 00000000 */ nop +/* 172BFC 8024431C 00000000 */ nop /* 172C00 80244320 C6000018 */ lwc1 $f0, 0x18($s0) /* 172C04 80244324 C6080144 */ lwc1 $f8, 0x144($s0) /* 172C08 80244328 C6020020 */ lwc1 $f2, 0x20($s0) @@ -226,7 +226,7 @@ glabel func_80244008 /* 172C10 80244330 C604014C */ lwc1 $f4, 0x14c($s0) /* 172C14 80244334 46041081 */ sub.s $f2, $f2, $f4 /* 172C18 80244338 44823000 */ mtc1 $v0, $f6 -/* 172C1C 8024433C 00000000 */ nop +/* 172C1C 8024433C 00000000 */ nop /* 172C20 80244340 468031A0 */ cvt.s.w $f6, $f6 /* 172C24 80244344 46060003 */ div.s $f0, $f0, $f6 /* 172C28 80244348 46004200 */ add.s $f8, $f8, $f0 @@ -247,7 +247,7 @@ glabel func_80244008 /* 172C64 80244384 86020070 */ lh $v0, 0x70($s0) /* 172C68 80244388 46040001 */ sub.s $f0, $f0, $f4 /* 172C6C 8024438C 44821000 */ mtc1 $v0, $f2 -/* 172C70 80244390 00000000 */ nop +/* 172C70 80244390 00000000 */ nop /* 172C74 80244394 468010A0 */ cvt.s.w $f2, $f2 /* 172C78 80244398 46020003 */ div.s $f0, $f0, $f2 /* 172C7C 8024439C 46002100 */ add.s $f4, $f4, $f0 @@ -257,9 +257,9 @@ glabel func_80244008 /* 172C88 802443A8 3C0140C9 */ lui $at, 0x40c9 /* 172C8C 802443AC 34210FD0 */ ori $at, $at, 0xfd0 /* 172C90 802443B0 4481B000 */ mtc1 $at, $f22 -/* 172C94 802443B4 00000000 */ nop +/* 172C94 802443B4 00000000 */ nop /* 172C98 802443B8 46166302 */ mul.s $f12, $f12, $f22 -/* 172C9C 802443BC 00000000 */ nop +/* 172C9C 802443BC 00000000 */ nop /* 172CA0 802443C0 3C0143B4 */ lui $at, 0x43b4 /* 172CA4 802443C4 4481C000 */ mtc1 $at, $f24 /* 172CA8 802443C8 3C014180 */ lui $at, 0x4180 @@ -267,7 +267,7 @@ glabel func_80244008 /* 172CB0 802443D0 0C00A85B */ jal sin_rad /* 172CB4 802443D4 46186303 */ div.s $f12, $f12, $f24 /* 172CB8 802443D8 46140002 */ mul.s $f0, $f0, $f20 -/* 172CBC 802443DC 00000000 */ nop +/* 172CBC 802443DC 00000000 */ nop /* 172CC0 802443E0 C602014C */ lwc1 $f2, 0x14c($s0) /* 172CC4 802443E4 46001080 */ add.s $f2, $f2, $f0 /* 172CC8 802443E8 C60C0054 */ lwc1 $f12, 0x54($s0) @@ -276,12 +276,12 @@ glabel func_80244008 /* 172CD4 802443F4 E602014C */ swc1 $f2, 0x14c($s0) /* 172CD8 802443F8 C60C0054 */ lwc1 $f12, 0x54($s0) /* 172CDC 802443FC 46166302 */ mul.s $f12, $f12, $f22 -/* 172CE0 80244400 00000000 */ nop +/* 172CE0 80244400 00000000 */ nop /* 172CE4 80244404 E600018C */ swc1 $f0, 0x18c($s0) /* 172CE8 80244408 0C00A85B */ jal sin_rad /* 172CEC 8024440C 46186303 */ div.s $f12, $f12, $f24 /* 172CF0 80244410 46140002 */ mul.s $f0, $f0, $f20 -/* 172CF4 80244414 00000000 */ nop +/* 172CF4 80244414 00000000 */ nop /* 172CF8 80244418 C622014C */ lwc1 $f2, 0x14c($s1) /* 172CFC 8024441C 46001081 */ sub.s $f2, $f2, $f0 /* 172D00 80244420 E622014C */ swc1 $f2, 0x14c($s1) @@ -331,13 +331,13 @@ glabel func_80244008 /* 172DA8 802444C8 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 172DAC 802444CC 24020002 */ addiu $v0, $zero, 2 /* 172DB0 802444D0 14620026 */ bne $v1, $v0, .L8024456C -/* 172DB4 802444D4 00000000 */ nop +/* 172DB4 802444D4 00000000 */ nop /* 172DB8 802444D8 0C093903 */ jal func_8024E40C /* 172DBC 802444DC 0040202D */ daddu $a0, $v0, $zero /* 172DC0 802444E0 8263008A */ lb $v1, 0x8a($s3) /* 172DC4 802444E4 24020003 */ addiu $v0, $zero, 3 /* 172DC8 802444E8 14620016 */ bne $v1, $v0, .L80244544 -/* 172DCC 802444EC 00000000 */ nop +/* 172DCC 802444EC 00000000 */ nop /* 172DD0 802444F0 82620078 */ lb $v0, 0x78($s3) /* 172DD4 802444F4 14400007 */ bnez $v0, .L80244514 /* 172DD8 802444F8 2405000A */ addiu $a1, $zero, 0xa @@ -378,7 +378,7 @@ glabel func_80244008 /* 172E54 80244574 8E500000 */ lw $s0, ($s2) /* 172E58 80244578 24020003 */ addiu $v0, $zero, 3 /* 172E5C 8024457C 16020020 */ bne $s0, $v0, .L80244600 -/* 172E60 80244580 00000000 */ nop +/* 172E60 80244580 00000000 */ nop /* 172E64 80244584 3C03802A */ lui $v1, %hi(D_8029F248) /* 172E68 80244588 2463F248 */ addiu $v1, $v1, %lo(D_8029F248) /* 172E6C 8024458C 8C620000 */ lw $v0, ($v1) @@ -392,9 +392,9 @@ glabel func_80244008 /* 172E88 802445A8 AE2001D4 */ sw $zero, 0x1d4($s1) /* 172E8C 802445AC 8E2401E4 */ lw $a0, 0x1e4($s1) /* 172E90 802445B0 0C0B1059 */ jal does_script_exist -/* 172E94 802445B4 00000000 */ nop +/* 172E94 802445B4 00000000 */ nop /* 172E98 802445B8 14400011 */ bnez $v0, .L80244600 -/* 172E9C 802445BC 00000000 */ nop +/* 172E9C 802445BC 00000000 */ nop /* 172EA0 802445C0 AE2001D4 */ sw $zero, 0x1d4($s1) .L802445C4: /* 172EA4 802445C4 8262008A */ lb $v0, 0x8a($s3) @@ -418,7 +418,7 @@ glabel func_80244008 /* 172EE4 80244604 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 172EE8 80244608 24020004 */ addiu $v0, $zero, 4 /* 172EEC 8024460C 14620031 */ bne $v1, $v0, .L802446D4 -/* 172EF0 80244610 00000000 */ nop +/* 172EF0 80244610 00000000 */ nop /* 172EF4 80244614 82620079 */ lb $v0, 0x79($s3) /* 172EF8 80244618 1C40002E */ bgtz $v0, .L802446D4 /* 172EFC 8024461C 3C020100 */ lui $v0, 0x100 @@ -472,7 +472,7 @@ glabel func_80244008 /* 172FA8 802446C8 24040021 */ addiu $a0, $zero, 0x21 .L802446CC: /* 172FAC 802446CC 0C090464 */ jal func_80241190 -/* 172FB0 802446D0 00000000 */ nop +/* 172FB0 802446D0 00000000 */ nop .L802446D4: /* 172FB4 802446D4 8FBF0034 */ lw $ra, 0x34($sp) /* 172FB8 802446D8 8FB60030 */ lw $s6, 0x30($sp) diff --git a/asm/nonmatchings/code_16F740/func_80244710.s b/asm/nonmatchings/code_16F740/func_80244710.s index f5ea1b0f28..952378ec1c 100644 --- a/asm/nonmatchings/code_16F740/func_80244710.s +++ b/asm/nonmatchings/code_16F740/func_80244710.s @@ -22,9 +22,9 @@ glabel func_80244710 /* 173034 80244754 10600005 */ beqz $v1, .L8024476C /* 173038 80244758 2402000A */ addiu $v0, $zero, 0xa /* 17303C 8024475C 1062003B */ beq $v1, $v0, .L8024484C -/* 173040 80244760 00000000 */ nop +/* 173040 80244760 00000000 */ nop /* 173044 80244764 08091228 */ j .L802448A0 -/* 173048 80244768 00000000 */ nop +/* 173048 80244768 00000000 */ nop .L8024476C: /* 17304C 8024476C 3C03F3FF */ lui $v1, 0xf3ff /* 173050 80244770 8E020000 */ lw $v0, ($s0) @@ -51,7 +51,7 @@ glabel func_80244710 /* 1730A0 802447C0 82020216 */ lb $v0, 0x216($s0) /* 1730A4 802447C4 2414000D */ addiu $s4, $zero, 0xd /* 1730A8 802447C8 14540005 */ bne $v0, $s4, .L802447E0 -/* 1730AC 802447CC 00000000 */ nop +/* 1730AC 802447CC 00000000 */ nop /* 1730B0 802447D0 0C09C596 */ jal dispatch_event_player /* 1730B4 802447D4 24040034 */ addiu $a0, $zero, 0x34 /* 1730B8 802447D8 2402000A */ addiu $v0, $zero, 0xa @@ -69,7 +69,7 @@ glabel func_80244710 /* 1730E4 80244804 AC40003C */ sw $zero, 0x3c($v0) /* 1730E8 80244808 82220216 */ lb $v0, 0x216($s1) /* 1730EC 8024480C 14540005 */ bne $v0, $s4, .L80244824 -/* 1730F0 80244810 00000000 */ nop +/* 1730F0 80244810 00000000 */ nop /* 1730F4 80244814 0C09F7A0 */ jal dispatch_event_partner /* 1730F8 80244818 24040034 */ addiu $a0, $zero, 0x34 /* 1730FC 8024481C 2402000A */ addiu $v0, $zero, 0xa @@ -88,11 +88,11 @@ glabel func_80244710 .L8024484C: /* 17312C 8024484C 8E0201D8 */ lw $v0, 0x1d8($s0) /* 173130 80244850 10400005 */ beqz $v0, .L80244868 -/* 173134 80244854 00000000 */ nop +/* 173134 80244854 00000000 */ nop /* 173138 80244858 0C0B1059 */ jal does_script_exist /* 17313C 8024485C 8E0401E8 */ lw $a0, 0x1e8($s0) /* 173140 80244860 1440000F */ bnez $v0, .L802448A0 -/* 173144 80244864 00000000 */ nop +/* 173144 80244864 00000000 */ nop .L80244868: /* 173148 80244868 1220000A */ beqz $s1, .L80244894 /* 17314C 8024486C AE0001D8 */ sw $zero, 0x1d8($s0) @@ -101,9 +101,9 @@ glabel func_80244710 /* 173158 80244878 AE2001D8 */ sw $zero, 0x1d8($s1) /* 17315C 8024487C 8E2401E8 */ lw $a0, 0x1e8($s1) /* 173160 80244880 0C0B1059 */ jal does_script_exist -/* 173164 80244884 00000000 */ nop +/* 173164 80244884 00000000 */ nop /* 173168 80244888 14400005 */ bnez $v0, .L802448A0 -/* 17316C 8024488C 00000000 */ nop +/* 17316C 8024488C 00000000 */ nop /* 173170 80244890 AE2001D8 */ sw $zero, 0x1d8($s1) .L80244894: /* 173174 80244894 2402000B */ addiu $v0, $zero, 0xb @@ -117,9 +117,9 @@ glabel func_80244710 /* 173190 802448B0 12020005 */ beq $s0, $v0, .L802448C8 /* 173194 802448B4 2402000D */ addiu $v0, $zero, 0xd /* 173198 802448B8 12020023 */ beq $s0, $v0, .L80244948 -/* 17319C 802448BC 00000000 */ nop +/* 17319C 802448BC 00000000 */ nop /* 1731A0 802448C0 08091259 */ j .L80244964 -/* 1731A4 802448C4 00000000 */ nop +/* 1731A4 802448C4 00000000 */ nop .L802448C8: /* 1731A8 802448C8 3C05800E */ lui $a1, %hi(gBattleStatus) /* 1731AC 802448CC 24A5C070 */ addiu $a1, $a1, %lo(gBattleStatus) @@ -157,9 +157,9 @@ glabel func_80244710 .L80244948: /* 173228 80244948 8E2401EC */ lw $a0, 0x1ec($s1) /* 17322C 8024494C 0C0B1059 */ jal does_script_exist -/* 173230 80244950 00000000 */ nop +/* 173230 80244950 00000000 */ nop /* 173234 80244954 14400003 */ bnez $v0, .L80244964 -/* 173238 80244958 00000000 */ nop +/* 173238 80244958 00000000 */ nop /* 17323C 8024495C A260009A */ sb $zero, 0x9a($s3) /* 173240 80244960 AE500000 */ sw $s0, ($s2) .L80244964: @@ -170,9 +170,9 @@ glabel func_80244710 /* 173254 80244974 10620005 */ beq $v1, $v0, .L8024498C /* 173258 80244978 2402000E */ addiu $v0, $zero, 0xe /* 17325C 8024497C 1062000B */ beq $v1, $v0, .L802449AC -/* 173260 80244980 00000000 */ nop +/* 173260 80244980 00000000 */ nop /* 173264 80244984 08091289 */ j .L80244A24 -/* 173268 80244988 00000000 */ nop +/* 173268 80244988 00000000 */ nop .L8024498C: /* 17326C 8024498C 0C093903 */ jal func_8024E40C /* 173270 80244990 24040002 */ addiu $a0, $zero, 2 diff --git a/asm/nonmatchings/code_16F740/func_80244D90.s b/asm/nonmatchings/code_16F740/func_80244D90.s index 596a07e0de..98c76c1ac0 100644 --- a/asm/nonmatchings/code_16F740/func_80244D90.s +++ b/asm/nonmatchings/code_16F740/func_80244D90.s @@ -42,7 +42,7 @@ glabel func_80244D90 /* 173700 80244E20 0000202D */ daddu $a0, $zero, $zero .L80244E24: /* 173704 80244E24 0C04DF62 */ jal func_80137D88 -/* 173708 80244E28 00000000 */ nop +/* 173708 80244E28 00000000 */ nop /* 17370C 80244E2C 8FBF0010 */ lw $ra, 0x10($sp) /* 173710 80244E30 03E00008 */ jr $ra /* 173714 80244E34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_16F740/func_80244E38.s b/asm/nonmatchings/code_16F740/func_80244E38.s index 3ccce91549..be07f63c64 100644 --- a/asm/nonmatchings/code_16F740/func_80244E38.s +++ b/asm/nonmatchings/code_16F740/func_80244E38.s @@ -16,9 +16,9 @@ glabel func_80244E38 /* 173744 80244E64 10600005 */ beqz $v1, .L80244E7C /* 173748 80244E68 24020001 */ addiu $v0, $zero, 1 /* 17374C 80244E6C 10620012 */ beq $v1, $v0, .L80244EB8 -/* 173750 80244E70 00000000 */ nop +/* 173750 80244E70 00000000 */ nop /* 173754 80244E74 080913B8 */ j .L80244EE0 -/* 173758 80244E78 00000000 */ nop +/* 173758 80244E78 00000000 */ nop .L80244E7C: /* 17375C 80244E7C 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) /* 173760 80244E80 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) @@ -38,12 +38,12 @@ glabel func_80244E38 .L80244EB8: /* 173798 80244EB8 8E0401E4 */ lw $a0, 0x1e4($s0) /* 17379C 80244EBC 0C0B1059 */ jal does_script_exist -/* 1737A0 80244EC0 00000000 */ nop +/* 1737A0 80244EC0 00000000 */ nop /* 1737A4 80244EC4 14400006 */ bnez $v0, .L80244EE0 -/* 1737A8 80244EC8 00000000 */ nop +/* 1737A8 80244EC8 00000000 */ nop /* 1737AC 80244ECC 8222008C */ lb $v0, 0x8c($s1) /* 1737B0 80244ED0 14400003 */ bnez $v0, .L80244EE0 -/* 1737B4 80244ED4 00000000 */ nop +/* 1737B4 80244ED4 00000000 */ nop /* 1737B8 80244ED8 0C090464 */ jal func_80241190 /* 1737BC 80244EDC 24040016 */ addiu $a0, $zero, 0x16 .L80244EE0: diff --git a/asm/nonmatchings/code_16F740/func_80245440.s b/asm/nonmatchings/code_16F740/func_80245440.s index 1118822249..cb945e63d7 100644 --- a/asm/nonmatchings/code_16F740/func_80245440.s +++ b/asm/nonmatchings/code_16F740/func_80245440.s @@ -23,12 +23,12 @@ glabel func_80245440 /* 173D68 80245488 10600007 */ beqz $v1, .L802454A8 /* 173D6C 8024548C 2404FFF7 */ addiu $a0, $zero, -9 /* 173D70 80245490 0809158F */ j .L8024563C -/* 173D74 80245494 00000000 */ nop +/* 173D74 80245494 00000000 */ nop .L80245498: /* 173D78 80245498 1062005E */ beq $v1, $v0, .L80245614 -/* 173D7C 8024549C 00000000 */ nop +/* 173D7C 8024549C 00000000 */ nop /* 173D80 802454A0 0809158F */ j .L8024563C -/* 173D84 802454A4 00000000 */ nop +/* 173D84 802454A4 00000000 */ nop .L802454A8: /* 173D88 802454A8 8E220000 */ lw $v0, ($s1) /* 173D8C 802454AC 00441024 */ and $v0, $v0, $a0 @@ -47,7 +47,7 @@ glabel func_80245440 /* 173DC0 802454E0 10600013 */ beqz $v1, .L80245530 /* 173DC4 802454E4 24020007 */ addiu $v0, $zero, 7 /* 173DC8 802454E8 14620008 */ bne $v1, $v0, .L8024550C -/* 173DCC 802454EC 00000000 */ nop +/* 173DCC 802454EC 00000000 */ nop /* 173DD0 802454F0 0C05272D */ jal play_sound /* 173DD4 802454F4 240400E7 */ addiu $a0, $zero, 0xe7 /* 173DD8 802454F8 8E030228 */ lw $v1, 0x228($s0) @@ -98,15 +98,15 @@ glabel func_80245440 /* 173E80 802455A0 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 173E84 802455A4 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 173E88 802455A8 0809158F */ j .L8024563C -/* 173E8C 802455AC 00000000 */ nop +/* 173E8C 802455AC 00000000 */ nop .L802455B0: /* 173E90 802455B0 0C0B1059 */ jal does_script_exist /* 173E94 802455B4 8E0401E4 */ lw $a0, 0x1e4($s0) /* 173E98 802455B8 14400020 */ bnez $v0, .L8024563C -/* 173E9C 802455BC 00000000 */ nop +/* 173E9C 802455BC 00000000 */ nop /* 173EA0 802455C0 8222008C */ lb $v0, 0x8c($s1) /* 173EA4 802455C4 1440001D */ bnez $v0, .L8024563C -/* 173EA8 802455C8 00000000 */ nop +/* 173EA8 802455C8 00000000 */ nop /* 173EAC 802455CC 0C039D91 */ jal find_item /* 173EB0 802455D0 24040095 */ addiu $a0, $zero, 0x95 /* 173EB4 802455D4 04400017 */ bltz $v0, .L80245634 @@ -128,12 +128,12 @@ glabel func_80245440 .L80245614: /* 173EF4 80245614 8E0401E4 */ lw $a0, 0x1e4($s0) /* 173EF8 80245618 0C0B1059 */ jal does_script_exist -/* 173EFC 8024561C 00000000 */ nop +/* 173EFC 8024561C 00000000 */ nop /* 173F00 80245620 14400006 */ bnez $v0, .L8024563C -/* 173F04 80245624 00000000 */ nop +/* 173F04 80245624 00000000 */ nop /* 173F08 80245628 8222008C */ lb $v0, 0x8c($s1) /* 173F0C 8024562C 14400003 */ bnez $v0, .L8024563C -/* 173F10 80245630 00000000 */ nop +/* 173F10 80245630 00000000 */ nop .L80245634: /* 173F14 80245634 2402000A */ addiu $v0, $zero, 0xa /* 173F18 80245638 AE620000 */ sw $v0, ($s3) diff --git a/asm/nonmatchings/code_16F740/func_80246B2C.s b/asm/nonmatchings/code_16F740/func_80246B2C.s index fca63b0631..dd1ec3c192 100644 --- a/asm/nonmatchings/code_16F740/func_80246B2C.s +++ b/asm/nonmatchings/code_16F740/func_80246B2C.s @@ -3,4 +3,4 @@ glabel func_80246B2C /* 17540C 80246B2C 03E00008 */ jr $ra -/* 175410 80246B30 00000000 */ nop +/* 175410 80246B30 00000000 */ nop diff --git a/asm/nonmatchings/code_16F740/func_8024721C.s b/asm/nonmatchings/code_16F740/func_8024721C.s index 41c33ffe94..a441f5863a 100644 --- a/asm/nonmatchings/code_16F740/func_8024721C.s +++ b/asm/nonmatchings/code_16F740/func_8024721C.s @@ -33,7 +33,7 @@ glabel func_8024721C /* 175B68 80247288 24040009 */ addiu $a0, $zero, 9 .L8024728C: /* 175B6C 8024728C 0C090464 */ jal func_80241190 -/* 175B70 80247290 00000000 */ nop +/* 175B70 80247290 00000000 */ nop .L80247294: /* 175B74 80247294 8FBF0014 */ lw $ra, 0x14($sp) /* 175B78 80247298 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_16F740/func_80247B04.s b/asm/nonmatchings/code_16F740/func_80247B04.s index 06a8507936..79b6cb7a3d 100644 --- a/asm/nonmatchings/code_16F740/func_80247B04.s +++ b/asm/nonmatchings/code_16F740/func_80247B04.s @@ -28,21 +28,21 @@ glabel func_80247B04 /* 176440 80247B60 50400005 */ beql $v0, $zero, .L80247B78 /* 176444 80247B64 24020002 */ addiu $v0, $zero, 2 /* 176448 80247B68 10600009 */ beqz $v1, .L80247B90 -/* 17644C 80247B6C 00000000 */ nop +/* 17644C 80247B6C 00000000 */ nop /* 176450 80247B70 08092032 */ j .L802480C8 -/* 176454 80247B74 00000000 */ nop +/* 176454 80247B74 00000000 */ nop .L80247B78: /* 176458 80247B78 106200A4 */ beq $v1, $v0, .L80247E0C /* 17645C 80247B7C 24020003 */ addiu $v0, $zero, 3 /* 176460 80247B80 10620131 */ beq $v1, $v0, .L80248048 /* 176464 80247B84 0000982D */ daddu $s3, $zero, $zero /* 176468 80247B88 08092032 */ j .L802480C8 -/* 17646C 80247B8C 00000000 */ nop +/* 17646C 80247B8C 00000000 */ nop .L80247B90: /* 176470 80247B90 3C01802A */ lui $at, %hi(D_8029F254) /* 176474 80247B94 AC20F254 */ sw $zero, %lo(D_8029F254)($at) /* 176478 80247B98 0C0903F7 */ jal func_80240FDC -/* 17647C 80247B9C 00000000 */ nop +/* 17647C 80247B9C 00000000 */ nop /* 176480 80247BA0 9623029C */ lhu $v1, 0x29c($s1) /* 176484 80247BA4 2C62270F */ sltiu $v0, $v1, 0x270f /* 176488 80247BA8 10400002 */ beqz $v0, .L80247BB4 @@ -60,7 +60,7 @@ glabel func_80247B04 /* 1764B4 80247BD4 82220002 */ lb $v0, 2($s1) /* 1764B8 80247BD8 28420002 */ slti $v0, $v0, 2 /* 1764BC 80247BDC 1040000B */ beqz $v0, .L80247C0C -/* 1764C0 80247BE0 00000000 */ nop +/* 1764C0 80247BE0 00000000 */ nop /* 1764C4 80247BE4 0C03A752 */ jal is_ability_active /* 1764C8 80247BE8 24040014 */ addiu $a0, $zero, 0x14 /* 1764CC 80247BEC 10400007 */ beqz $v0, .L80247C0C @@ -75,11 +75,11 @@ glabel func_80247B04 /* 1764EC 80247C0C 82220002 */ lb $v0, 2($s1) /* 1764F0 80247C10 28420006 */ slti $v0, $v0, 6 /* 1764F4 80247C14 10400011 */ beqz $v0, .L80247C5C -/* 1764F8 80247C18 00000000 */ nop +/* 1764F8 80247C18 00000000 */ nop /* 1764FC 80247C1C 0C03A752 */ jal is_ability_active /* 176500 80247C20 2404001E */ addiu $a0, $zero, 0x1e /* 176504 80247C24 1040000D */ beqz $v0, .L80247C5C -/* 176508 80247C28 00000000 */ nop +/* 176508 80247C28 00000000 */ nop /* 17650C 80247C2C 92820099 */ lbu $v0, 0x99($s4) /* 176510 80247C30 30420001 */ andi $v0, $v0, 1 /* 176514 80247C34 14400009 */ bnez $v0, .L80247C5C @@ -102,13 +102,13 @@ glabel func_80247B04 /* 176554 80247C74 50620008 */ beql $v1, $v0, .L80247C98 /* 176558 80247C78 A2800178 */ sb $zero, 0x178($s4) /* 17655C 80247C7C 08091F38 */ j .L80247CE0 -/* 176560 80247C80 00000000 */ nop +/* 176560 80247C80 00000000 */ nop .L80247C84: /* 176564 80247C84 24020006 */ addiu $v0, $zero, 6 /* 176568 80247C88 1062010D */ beq $v1, $v0, .L802480C0 /* 17656C 80247C8C 24040003 */ addiu $a0, $zero, 3 /* 176570 80247C90 08091F38 */ j .L80247CE0 -/* 176574 80247C94 00000000 */ nop +/* 176574 80247C94 00000000 */ nop .L80247C98: /* 176578 80247C98 92620006 */ lbu $v0, 6($s3) /* 17657C 80247C9C 2403001D */ addiu $v1, $zero, 0x1d @@ -153,7 +153,7 @@ glabel func_80247B04 /* 176608 80247D28 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 17660C 80247D2C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 176610 80247D30 08092032 */ j .L802480C8 -/* 176614 80247D34 00000000 */ nop +/* 176614 80247D34 00000000 */ nop .L80247D38: /* 176618 80247D38 0C09A75B */ jal get_actor /* 17661C 80247D3C 24040200 */ addiu $a0, $zero, 0x200 @@ -163,7 +163,7 @@ glabel func_80247B04 /* 17662C 80247D4C 02A0202D */ daddu $a0, $s5, $zero /* 176630 80247D50 8E0401E8 */ lw $a0, 0x1e8($s0) /* 176634 80247D54 0C0B1059 */ jal does_script_exist -/* 176638 80247D58 00000000 */ nop +/* 176638 80247D58 00000000 */ nop /* 17663C 80247D5C 144000DA */ bnez $v0, .L802480C8 /* 176640 80247D60 02A0202D */ daddu $a0, $s5, $zero /* 176644 80247D64 AE0001D8 */ sw $zero, 0x1d8($s0) @@ -191,7 +191,7 @@ glabel func_80247B04 /* 176698 80247DB8 0C09390F */ jal cam_target_actor /* 17669C 80247DBC 0000202D */ daddu $a0, $zero, $zero /* 1766A0 80247DC0 0C098F18 */ jal func_80263C60 -/* 1766A4 80247DC4 00000000 */ nop +/* 1766A4 80247DC4 00000000 */ nop /* 1766A8 80247DC8 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) /* 1766AC 80247DCC 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) /* 1766B0 80247DD0 2405000A */ addiu $a1, $zero, 0xa @@ -226,15 +226,15 @@ glabel func_80247B04 /* 176718 80247E38 3C030020 */ lui $v1, 0x20 /* 17671C 80247E3C 00431024 */ and $v0, $v0, $v1 /* 176720 80247E40 1440000A */ bnez $v0, .L80247E6C -/* 176724 80247E44 00000000 */ nop +/* 176724 80247E44 00000000 */ nop /* 176728 80247E48 8EA201D4 */ lw $v0, 0x1d4($s5) /* 17672C 80247E4C 50400007 */ beql $v0, $zero, .L80247E6C /* 176730 80247E50 AEA001D4 */ sw $zero, 0x1d4($s5) /* 176734 80247E54 8EA401E4 */ lw $a0, 0x1e4($s5) /* 176738 80247E58 0C0B1059 */ jal does_script_exist -/* 17673C 80247E5C 00000000 */ nop +/* 17673C 80247E5C 00000000 */ nop /* 176740 80247E60 14400099 */ bnez $v0, .L802480C8 -/* 176744 80247E64 00000000 */ nop +/* 176744 80247E64 00000000 */ nop /* 176748 80247E68 AEA001D4 */ sw $zero, 0x1d4($s5) .L80247E6C: /* 17674C 80247E6C 3C04800E */ lui $a0, %hi(gBattleStatus) @@ -245,11 +245,11 @@ glabel func_80247B04 /* 176760 80247E80 AC820000 */ sw $v0, ($a0) /* 176764 80247E84 8EA201D8 */ lw $v0, 0x1d8($s5) /* 176768 80247E88 10400005 */ beqz $v0, .L80247EA0 -/* 17676C 80247E8C 00000000 */ nop +/* 17676C 80247E8C 00000000 */ nop /* 176770 80247E90 0C0B1059 */ jal does_script_exist /* 176774 80247E94 8EA401E8 */ lw $a0, 0x1e8($s5) /* 176778 80247E98 1440008B */ bnez $v0, .L802480C8 -/* 17677C 80247E9C 00000000 */ nop +/* 17677C 80247E9C 00000000 */ nop .L80247EA0: /* 176780 80247EA0 1200000A */ beqz $s0, .L80247ECC /* 176784 80247EA4 AEA001D8 */ sw $zero, 0x1d8($s5) @@ -258,9 +258,9 @@ glabel func_80247B04 /* 176790 80247EB0 AE0001D8 */ sw $zero, 0x1d8($s0) /* 176794 80247EB4 8E0401E8 */ lw $a0, 0x1e8($s0) /* 176798 80247EB8 0C0B1059 */ jal does_script_exist -/* 17679C 80247EBC 00000000 */ nop +/* 17679C 80247EBC 00000000 */ nop /* 1767A0 80247EC0 14400081 */ bnez $v0, .L802480C8 -/* 1767A4 80247EC4 00000000 */ nop +/* 1767A4 80247EC4 00000000 */ nop /* 1767A8 80247EC8 AE0001D8 */ sw $zero, 0x1d8($s0) .L80247ECC: /* 1767AC 80247ECC 0000982D */ daddu $s3, $zero, $zero @@ -275,7 +275,7 @@ glabel func_80247B04 /* 1767CC 80247EEC 26310001 */ addiu $s1, $s1, 1 /* 1767D0 80247EF0 8E0401E4 */ lw $a0, 0x1e4($s0) /* 1767D4 80247EF4 0C0B1059 */ jal does_script_exist -/* 1767D8 80247EF8 00000000 */ nop +/* 1767D8 80247EF8 00000000 */ nop /* 1767DC 80247EFC 50400002 */ beql $v0, $zero, .L80247F08 /* 1767E0 80247F00 AE0001D4 */ sw $zero, 0x1d4($s0) /* 1767E4 80247F04 24130001 */ addiu $s3, $zero, 1 @@ -297,7 +297,7 @@ glabel func_80247B04 /* 176818 80247F38 26310001 */ addiu $s1, $s1, 1 /* 17681C 80247F3C 8E0401E8 */ lw $a0, 0x1e8($s0) /* 176820 80247F40 0C0B1059 */ jal does_script_exist -/* 176824 80247F44 00000000 */ nop +/* 176824 80247F44 00000000 */ nop /* 176828 80247F48 50400002 */ beql $v0, $zero, .L80247F54 /* 17682C 80247F4C AE0001D8 */ sw $zero, 0x1d8($s0) /* 176830 80247F50 24130001 */ addiu $s3, $zero, 1 @@ -325,9 +325,9 @@ glabel func_80247B04 /* 176878 80247F98 24630004 */ addiu $v1, $v1, 4 /* 17687C 80247F9C 8282008C */ lb $v0, 0x8c($s4) /* 176880 80247FA0 14400049 */ bnez $v0, .L802480C8 -/* 176884 80247FA4 00000000 */ nop +/* 176884 80247FA4 00000000 */ nop /* 176888 80247FA8 0C03A6CC */ jal decrement_status_menu_disabled -/* 17688C 80247FAC 00000000 */ nop +/* 17688C 80247FAC 00000000 */ nop /* 176890 80247FB0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 176894 80247FB4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 176898 80247FB8 904200AA */ lbu $v0, 0xaa($v0) @@ -335,13 +335,13 @@ glabel func_80247B04 /* 1768A0 80247FC0 1440003F */ bnez $v0, .L802480C0 /* 1768A4 80247FC4 24040023 */ addiu $a0, $zero, 0x23 /* 1768A8 80247FC8 0C098D19 */ jal func_80263464 -/* 1768AC 80247FCC 00000000 */ nop +/* 1768AC 80247FCC 00000000 */ nop /* 1768B0 80247FD0 1440003D */ bnez $v0, .L802480C8 -/* 1768B4 80247FD4 00000000 */ nop +/* 1768B4 80247FD4 00000000 */ nop /* 1768B8 80247FD8 0C098D0D */ jal func_80263434 -/* 1768BC 80247FDC 00000000 */ nop +/* 1768BC 80247FDC 00000000 */ nop /* 1768C0 80247FE0 14400039 */ bnez $v0, .L802480C8 -/* 1768C4 80247FE4 00000000 */ nop +/* 1768C4 80247FE4 00000000 */ nop /* 1768C8 80247FE8 0C09A75B */ jal get_actor /* 1768CC 80247FEC 86A40428 */ lh $a0, 0x428($s5) /* 1768D0 80247FF0 0040802D */ daddu $s0, $v0, $zero @@ -367,7 +367,7 @@ glabel func_80247B04 /* 176918 80248038 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 17691C 8024803C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 176920 80248040 08092032 */ j .L802480C8 -/* 176924 80248044 00000000 */ nop +/* 176924 80248044 00000000 */ nop .L80248048: /* 176928 80248048 0260882D */ daddu $s1, $s3, $zero /* 17692C 8024804C 0280902D */ daddu $s2, $s4, $zero @@ -380,7 +380,7 @@ glabel func_80247B04 /* 176944 80248064 26310001 */ addiu $s1, $s1, 1 /* 176948 80248068 8E0401E8 */ lw $a0, 0x1e8($s0) /* 17694C 8024806C 0C0B1059 */ jal does_script_exist -/* 176950 80248070 00000000 */ nop +/* 176950 80248070 00000000 */ nop /* 176954 80248074 50400002 */ beql $v0, $zero, .L80248080 /* 176958 80248078 AE0001D8 */ sw $zero, 0x1d8($s0) /* 17695C 8024807C 24130001 */ addiu $s3, $zero, 1 @@ -391,21 +391,21 @@ glabel func_80247B04 /* 176968 80248088 1440FFF1 */ bnez $v0, .L80248050 /* 17696C 8024808C 26520004 */ addiu $s2, $s2, 4 /* 176970 80248090 1660000D */ bnez $s3, .L802480C8 -/* 176974 80248094 00000000 */ nop +/* 176974 80248094 00000000 */ nop /* 176978 80248098 8EA201D4 */ lw $v0, 0x1d4($s5) /* 17697C 8024809C 50400007 */ beql $v0, $zero, .L802480BC /* 176980 802480A0 AEA001D4 */ sw $zero, 0x1d4($s5) /* 176984 802480A4 8EA401E4 */ lw $a0, 0x1e4($s5) /* 176988 802480A8 0C0B1059 */ jal does_script_exist -/* 17698C 802480AC 00000000 */ nop +/* 17698C 802480AC 00000000 */ nop /* 176990 802480B0 14400005 */ bnez $v0, .L802480C8 -/* 176994 802480B4 00000000 */ nop +/* 176994 802480B4 00000000 */ nop /* 176998 802480B8 AEA001D4 */ sw $zero, 0x1d4($s5) .L802480BC: /* 17699C 802480BC 24040005 */ addiu $a0, $zero, 5 .L802480C0: /* 1769A0 802480C0 0C090464 */ jal func_80241190 -/* 1769A4 802480C4 00000000 */ nop +/* 1769A4 802480C4 00000000 */ nop .L802480C8: /* 1769A8 802480C8 8FBF002C */ lw $ra, 0x2c($sp) /* 1769AC 802480CC 8FB60028 */ lw $s6, 0x28($sp) diff --git a/asm/nonmatchings/code_16F740/func_802480F0.s b/asm/nonmatchings/code_16F740/func_802480F0.s index a093ce22ae..94a0dcf745 100644 --- a/asm/nonmatchings/code_16F740/func_802480F0.s +++ b/asm/nonmatchings/code_16F740/func_802480F0.s @@ -11,12 +11,12 @@ glabel func_802480F0 /* 1769E8 80248108 3C02802A */ lui $v0, %hi(D_8029F254) /* 1769EC 8024810C 8C42F254 */ lw $v0, %lo(D_8029F254)($v0) /* 1769F0 80248110 1040001C */ beqz $v0, .L80248184 -/* 1769F4 80248114 00000000 */ nop +/* 1769F4 80248114 00000000 */ nop /* 1769F8 80248118 3C048028 */ lui $a0, %hi(D_80280A30) /* 1769FC 8024811C 24840A30 */ addiu $a0, $a0, %lo(D_80280A30) /* 176A00 80248120 8C830000 */ lw $v1, ($a0) /* 176A04 80248124 14600004 */ bnez $v1, .L80248138 -/* 176A08 80248128 00000000 */ nop +/* 176A08 80248128 00000000 */ nop /* 176A0C 8024812C 3C05BF80 */ lui $a1, 0xbf80 /* 176A10 80248130 0809205F */ j .L8024817C /* 176A14 80248134 240400FF */ addiu $a0, $zero, 0xff @@ -42,7 +42,7 @@ glabel func_802480F0 /* 176A58 80248178 0000202D */ daddu $a0, $zero, $zero .L8024817C: /* 176A5C 8024817C 0C04DF62 */ jal func_80137D88 -/* 176A60 80248180 00000000 */ nop +/* 176A60 80248180 00000000 */ nop .L80248184: /* 176A64 80248184 8FBF0010 */ lw $ra, 0x10($sp) /* 176A68 80248188 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16F740/func_80248190.s b/asm/nonmatchings/code_16F740/func_80248190.s index 76d58323ac..4e667e4317 100644 --- a/asm/nonmatchings/code_16F740/func_80248190.s +++ b/asm/nonmatchings/code_16F740/func_80248190.s @@ -25,14 +25,14 @@ glabel func_80248190 /* 176AC0 802481E0 10600009 */ beqz $v1, .L80248208 /* 176AC4 802481E4 24040002 */ addiu $a0, $zero, 2 /* 176AC8 802481E8 08092176 */ j .L802485D8 -/* 176ACC 802481EC 00000000 */ nop +/* 176ACC 802481EC 00000000 */ nop .L802481F0: /* 176AD0 802481F0 10620068 */ beq $v1, $v0, .L80248394 /* 176AD4 802481F4 24020003 */ addiu $v0, $zero, 3 /* 176AD8 802481F8 106200E1 */ beq $v1, $v0, .L80248580 /* 176ADC 802481FC 0000982D */ daddu $s3, $zero, $zero /* 176AE0 80248200 08092176 */ j .L802485D8 -/* 176AE4 80248204 00000000 */ nop +/* 176AE4 80248204 00000000 */ nop .L80248208: /* 176AE8 80248208 8E830008 */ lw $v1, 8($s4) /* 176AEC 8024820C 3C028011 */ lui $v0, %hi(gPlayerData) @@ -46,7 +46,7 @@ glabel func_80248190 /* 176B0C 8024822C 10A20006 */ beq $a1, $v0, .L80248248 /* 176B10 80248230 24020005 */ addiu $v0, $zero, 5 /* 176B14 80248234 0809209D */ j .L80248274 -/* 176B18 80248238 00000000 */ nop +/* 176B18 80248238 00000000 */ nop .L8024823C: /* 176B1C 8024823C 24020005 */ addiu $v0, $zero, 5 /* 176B20 80248240 08092093 */ j .L8024824C @@ -87,7 +87,7 @@ glabel func_80248190 /* 176B9C 802482BC 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 176BA0 802482C0 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 176BA4 802482C4 08092176 */ j .L802485D8 -/* 176BA8 802482C8 00000000 */ nop +/* 176BA8 802482C8 00000000 */ nop .L802482CC: /* 176BAC 802482CC 0C098C0B */ jal player_create_target_list /* 176BB0 802482D0 0280202D */ daddu $a0, $s4, $zero @@ -121,7 +121,7 @@ glabel func_80248190 /* 176C20 80248340 0C09390F */ jal cam_target_actor /* 176C24 80248344 24040100 */ addiu $a0, $zero, 0x100 /* 176C28 80248348 0C098F18 */ jal func_80263C60 -/* 176C2C 8024834C 00000000 */ nop +/* 176C2C 8024834C 00000000 */ nop /* 176C30 80248350 2405000A */ addiu $a1, $zero, 0xa /* 176C34 80248354 A2B101A7 */ sb $s1, 0x1a7($s5) /* 176C38 80248358 8E8401C4 */ lw $a0, 0x1c4($s4) @@ -153,20 +153,20 @@ glabel func_80248190 .L802483B8: /* 176C98 802483B8 8E8201D4 */ lw $v0, 0x1d4($s4) /* 176C9C 802483BC 10400005 */ beqz $v0, .L802483D4 -/* 176CA0 802483C0 00000000 */ nop +/* 176CA0 802483C0 00000000 */ nop /* 176CA4 802483C4 0C0B1059 */ jal does_script_exist /* 176CA8 802483C8 8E8401E4 */ lw $a0, 0x1e4($s4) /* 176CAC 802483CC 14400082 */ bnez $v0, .L802485D8 -/* 176CB0 802483D0 00000000 */ nop +/* 176CB0 802483D0 00000000 */ nop .L802483D4: /* 176CB4 802483D4 8E8201D8 */ lw $v0, 0x1d8($s4) /* 176CB8 802483D8 10400006 */ beqz $v0, .L802483F4 /* 176CBC 802483DC AE8001D4 */ sw $zero, 0x1d4($s4) /* 176CC0 802483E0 8E8401E8 */ lw $a0, 0x1e8($s4) /* 176CC4 802483E4 0C0B1059 */ jal does_script_exist -/* 176CC8 802483E8 00000000 */ nop +/* 176CC8 802483E8 00000000 */ nop /* 176CCC 802483EC 1440007A */ bnez $v0, .L802485D8 -/* 176CD0 802483F0 00000000 */ nop +/* 176CD0 802483F0 00000000 */ nop .L802483F4: /* 176CD4 802483F4 AE8001D8 */ sw $zero, 0x1d8($s4) /* 176CD8 802483F8 8E0201D8 */ lw $v0, 0x1d8($s0) @@ -174,9 +174,9 @@ glabel func_80248190 /* 176CE0 80248400 AE0001D8 */ sw $zero, 0x1d8($s0) /* 176CE4 80248404 8E0401E8 */ lw $a0, 0x1e8($s0) /* 176CE8 80248408 0C0B1059 */ jal does_script_exist -/* 176CEC 8024840C 00000000 */ nop +/* 176CEC 8024840C 00000000 */ nop /* 176CF0 80248410 14400071 */ bnez $v0, .L802485D8 -/* 176CF4 80248414 00000000 */ nop +/* 176CF4 80248414 00000000 */ nop /* 176CF8 80248418 AE0001D8 */ sw $zero, 0x1d8($s0) .L8024841C: /* 176CFC 8024841C 0000982D */ daddu $s3, $zero, $zero @@ -191,7 +191,7 @@ glabel func_80248190 /* 176D1C 8024843C 26310001 */ addiu $s1, $s1, 1 /* 176D20 80248440 8E0401E4 */ lw $a0, 0x1e4($s0) /* 176D24 80248444 0C0B1059 */ jal does_script_exist -/* 176D28 80248448 00000000 */ nop +/* 176D28 80248448 00000000 */ nop /* 176D2C 8024844C 50400002 */ beql $v0, $zero, .L80248458 /* 176D30 80248450 AE0001D4 */ sw $zero, 0x1d4($s0) /* 176D34 80248454 24130001 */ addiu $s3, $zero, 1 @@ -213,7 +213,7 @@ glabel func_80248190 /* 176D68 80248488 26310001 */ addiu $s1, $s1, 1 /* 176D6C 8024848C 8E0401E8 */ lw $a0, 0x1e8($s0) /* 176D70 80248490 0C0B1059 */ jal does_script_exist -/* 176D74 80248494 00000000 */ nop +/* 176D74 80248494 00000000 */ nop /* 176D78 80248498 50400002 */ beql $v0, $zero, .L802484A4 /* 176D7C 8024849C AE0001D8 */ sw $zero, 0x1d8($s0) /* 176D80 802484A0 24130001 */ addiu $s3, $zero, 1 @@ -241,17 +241,17 @@ glabel func_80248190 /* 176DC8 802484E8 24630004 */ addiu $v1, $v1, 4 /* 176DCC 802484EC 82A2008C */ lb $v0, 0x8c($s5) /* 176DD0 802484F0 14400039 */ bnez $v0, .L802485D8 -/* 176DD4 802484F4 00000000 */ nop +/* 176DD4 802484F4 00000000 */ nop /* 176DD8 802484F8 0C03A6CC */ jal decrement_status_menu_disabled -/* 176DDC 802484FC 00000000 */ nop +/* 176DDC 802484FC 00000000 */ nop /* 176DE0 80248500 0C098D19 */ jal func_80263464 -/* 176DE4 80248504 00000000 */ nop +/* 176DE4 80248504 00000000 */ nop /* 176DE8 80248508 14400033 */ bnez $v0, .L802485D8 -/* 176DEC 8024850C 00000000 */ nop +/* 176DEC 8024850C 00000000 */ nop /* 176DF0 80248510 0C098D0D */ jal func_80263434 -/* 176DF4 80248514 00000000 */ nop +/* 176DF4 80248514 00000000 */ nop /* 176DF8 80248518 1440002F */ bnez $v0, .L802485D8 -/* 176DFC 8024851C 00000000 */ nop +/* 176DFC 8024851C 00000000 */ nop /* 176E00 80248520 0C09A75B */ jal get_actor /* 176E04 80248524 86840428 */ lh $a0, 0x428($s4) /* 176E08 80248528 0040802D */ daddu $s0, $v0, $zero @@ -277,7 +277,7 @@ glabel func_80248190 /* 176E50 80248570 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 176E54 80248574 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 176E58 80248578 08092176 */ j .L802485D8 -/* 176E5C 8024857C 00000000 */ nop +/* 176E5C 8024857C 00000000 */ nop .L80248580: /* 176E60 80248580 0260882D */ daddu $s1, $s3, $zero /* 176E64 80248584 02A0902D */ daddu $s2, $s5, $zero @@ -290,7 +290,7 @@ glabel func_80248190 /* 176E7C 8024859C 26310001 */ addiu $s1, $s1, 1 /* 176E80 802485A0 8E0401E8 */ lw $a0, 0x1e8($s0) /* 176E84 802485A4 0C0B1059 */ jal does_script_exist -/* 176E88 802485A8 00000000 */ nop +/* 176E88 802485A8 00000000 */ nop /* 176E8C 802485AC 50400002 */ beql $v0, $zero, .L802485B8 /* 176E90 802485B0 AE0001D8 */ sw $zero, 0x1d8($s0) /* 176E94 802485B4 24130001 */ addiu $s3, $zero, 1 @@ -301,7 +301,7 @@ glabel func_80248190 /* 176EA0 802485C0 1440FFF1 */ bnez $v0, .L80248588 /* 176EA4 802485C4 26520004 */ addiu $s2, $s2, 4 /* 176EA8 802485C8 16600003 */ bnez $s3, .L802485D8 -/* 176EAC 802485CC 00000000 */ nop +/* 176EAC 802485CC 00000000 */ nop /* 176EB0 802485D0 0C090464 */ jal func_80241190 /* 176EB4 802485D4 24040005 */ addiu $a0, $zero, 5 .L802485D8: diff --git a/asm/nonmatchings/code_16F740/func_802485FC.s b/asm/nonmatchings/code_16F740/func_802485FC.s index 9a549afdd0..ff7ff16b78 100644 --- a/asm/nonmatchings/code_16F740/func_802485FC.s +++ b/asm/nonmatchings/code_16F740/func_802485FC.s @@ -26,7 +26,7 @@ glabel func_802485FC /* 176F28 80248648 0000202D */ daddu $a0, $zero, $zero .L8024864C: /* 176F2C 8024864C 0C04DF62 */ jal func_80137D88 -/* 176F30 80248650 00000000 */ nop +/* 176F30 80248650 00000000 */ nop .L80248654: /* 176F34 80248654 8FBF0010 */ lw $ra, 0x10($sp) /* 176F38 80248658 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16F740/func_80248660.s b/asm/nonmatchings/code_16F740/func_80248660.s index 99232d9373..f39cbbe875 100644 --- a/asm/nonmatchings/code_16F740/func_80248660.s +++ b/asm/nonmatchings/code_16F740/func_80248660.s @@ -20,9 +20,9 @@ glabel func_80248660 /* 176F7C 8024869C 10600005 */ beqz $v1, .L802486B4 /* 176F80 802486A0 24020002 */ addiu $v0, $zero, 2 /* 176F84 802486A4 1062008A */ beq $v1, $v0, .L802488D0 -/* 176F88 802486A8 00000000 */ nop +/* 176F88 802486A8 00000000 */ nop /* 176F8C 802486AC 080922A1 */ j .L80248A84 -/* 176F90 802486B0 00000000 */ nop +/* 176F90 802486B0 00000000 */ nop .L802486B4: /* 176F94 802486B4 94A2029E */ lhu $v0, 0x29e($a1) /* 176F98 802486B8 3C04F7FF */ lui $a0, 0xf7ff @@ -124,7 +124,7 @@ glabel func_80248660 /* 1770F0 80248810 02621021 */ addu $v0, $s3, $v0 /* 1770F4 80248814 8C5000E0 */ lw $s0, 0xe0($v0) /* 1770F8 80248818 12000005 */ beqz $s0, .L80248830 -/* 1770FC 8024881C 00000000 */ nop +/* 1770FC 8024881C 00000000 */ nop /* 177100 80248820 8E020000 */ lw $v0, ($s0) /* 177104 80248824 00431024 */ and $v0, $v0, $v1 /* 177108 80248828 10400008 */ beqz $v0, .L8024884C @@ -153,7 +153,7 @@ glabel func_80248660 /* 177158 80248878 A2650170 */ sb $a1, 0x170($s3) /* 17715C 8024887C 8E700174 */ lw $s0, 0x174($s3) /* 177160 80248880 0C098F18 */ jal func_80263C60 -/* 177164 80248884 00000000 */ nop +/* 177164 80248884 00000000 */ nop /* 177168 80248888 24020001 */ addiu $v0, $zero, 1 /* 17716C 8024888C 2405000A */ addiu $a1, $zero, 0xa /* 177170 80248890 A26201A7 */ sb $v0, 0x1a7($s3) @@ -191,18 +191,18 @@ glabel func_80248660 /* 1771E4 80248904 AE0001D4 */ sw $zero, 0x1d4($s0) /* 1771E8 80248908 8E0401E4 */ lw $a0, 0x1e4($s0) /* 1771EC 8024890C 0C0B1059 */ jal does_script_exist -/* 1771F0 80248910 00000000 */ nop +/* 1771F0 80248910 00000000 */ nop /* 1771F4 80248914 1440005B */ bnez $v0, .L80248A84 -/* 1771F8 80248918 00000000 */ nop +/* 1771F8 80248918 00000000 */ nop /* 1771FC 8024891C AE0001D4 */ sw $zero, 0x1d4($s0) .L80248920: /* 177200 80248920 8E4201D8 */ lw $v0, 0x1d8($s2) /* 177204 80248924 10400005 */ beqz $v0, .L8024893C -/* 177208 80248928 00000000 */ nop +/* 177208 80248928 00000000 */ nop /* 17720C 8024892C 0C0B1059 */ jal does_script_exist /* 177210 80248930 8E4401E8 */ lw $a0, 0x1e8($s2) /* 177214 80248934 14400053 */ bnez $v0, .L80248A84 -/* 177218 80248938 00000000 */ nop +/* 177218 80248938 00000000 */ nop .L8024893C: /* 17721C 8024893C 1220000A */ beqz $s1, .L80248968 /* 177220 80248940 AE4001D8 */ sw $zero, 0x1d8($s2) @@ -211,9 +211,9 @@ glabel func_80248660 /* 17722C 8024894C AE2001D8 */ sw $zero, 0x1d8($s1) /* 177230 80248950 8E2401E8 */ lw $a0, 0x1e8($s1) /* 177234 80248954 0C0B1059 */ jal does_script_exist -/* 177238 80248958 00000000 */ nop +/* 177238 80248958 00000000 */ nop /* 17723C 8024895C 14400049 */ bnez $v0, .L80248A84 -/* 177240 80248960 00000000 */ nop +/* 177240 80248960 00000000 */ nop /* 177244 80248964 AE2001D8 */ sw $zero, 0x1d8($s1) .L80248968: /* 177248 80248968 0000A02D */ daddu $s4, $zero, $zero @@ -228,7 +228,7 @@ glabel func_80248660 /* 177268 80248988 26310001 */ addiu $s1, $s1, 1 /* 17726C 8024898C 8E0401E4 */ lw $a0, 0x1e4($s0) /* 177270 80248990 0C0B1059 */ jal does_script_exist -/* 177274 80248994 00000000 */ nop +/* 177274 80248994 00000000 */ nop /* 177278 80248998 50400002 */ beql $v0, $zero, .L802489A4 /* 17727C 8024899C AE0001D4 */ sw $zero, 0x1d4($s0) /* 177280 802489A0 24140001 */ addiu $s4, $zero, 1 @@ -250,7 +250,7 @@ glabel func_80248660 /* 1772B4 802489D4 26310001 */ addiu $s1, $s1, 1 /* 1772B8 802489D8 8E0401E8 */ lw $a0, 0x1e8($s0) /* 1772BC 802489DC 0C0B1059 */ jal does_script_exist -/* 1772C0 802489E0 00000000 */ nop +/* 1772C0 802489E0 00000000 */ nop /* 1772C4 802489E4 50400002 */ beql $v0, $zero, .L802489F0 /* 1772C8 802489E8 AE0001D8 */ sw $zero, 0x1d8($s0) /* 1772CC 802489EC 24140001 */ addiu $s4, $zero, 1 @@ -284,15 +284,15 @@ glabel func_80248660 /* 17732C 80248A4C 24A50004 */ addiu $a1, $a1, 4 /* 177330 80248A50 8262008C */ lb $v0, 0x8c($s3) /* 177334 80248A54 1440000B */ bnez $v0, .L80248A84 -/* 177338 80248A58 00000000 */ nop +/* 177338 80248A58 00000000 */ nop /* 17733C 80248A5C 0C098D19 */ jal func_80263464 -/* 177340 80248A60 00000000 */ nop +/* 177340 80248A60 00000000 */ nop /* 177344 80248A64 14400007 */ bnez $v0, .L80248A84 -/* 177348 80248A68 00000000 */ nop +/* 177348 80248A68 00000000 */ nop /* 17734C 80248A6C 0C098D0D */ jal func_80263434 -/* 177350 80248A70 00000000 */ nop +/* 177350 80248A70 00000000 */ nop /* 177354 80248A74 14400003 */ bnez $v0, .L80248A84 -/* 177358 80248A78 00000000 */ nop +/* 177358 80248A78 00000000 */ nop /* 17735C 80248A7C 0C090464 */ jal func_80241190 /* 177360 80248A80 24040005 */ addiu $a0, $zero, 5 .L80248A84: diff --git a/asm/nonmatchings/code_16F740/func_80248AA4.s b/asm/nonmatchings/code_16F740/func_80248AA4.s index 2be0e65d86..b90fbbe263 100644 --- a/asm/nonmatchings/code_16F740/func_80248AA4.s +++ b/asm/nonmatchings/code_16F740/func_80248AA4.s @@ -26,7 +26,7 @@ glabel func_80248AA4 /* 1773D0 80248AF0 0000202D */ daddu $a0, $zero, $zero .L80248AF4: /* 1773D4 80248AF4 0C04DF62 */ jal func_80137D88 -/* 1773D8 80248AF8 00000000 */ nop +/* 1773D8 80248AF8 00000000 */ nop .L80248AFC: /* 1773DC 80248AFC 8FBF0010 */ lw $ra, 0x10($sp) /* 1773E0 80248B00 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_16F740/func_80248B08.s b/asm/nonmatchings/code_16F740/func_80248B08.s index e69b57da5f..3d3beb9a87 100644 --- a/asm/nonmatchings/code_16F740/func_80248B08.s +++ b/asm/nonmatchings/code_16F740/func_80248B08.s @@ -20,7 +20,7 @@ glabel func_80248B08 /* 177424 80248B44 00220821 */ addu $at, $at, $v0 /* 177428 80248B48 8C22CBE0 */ lw $v0, %lo(D_8029CBE0)($at) /* 17742C 80248B4C 00400008 */ jr $v0 -/* 177430 80248B50 00000000 */ nop +/* 177430 80248B50 00000000 */ nop /* 177434 80248B54 3C038028 */ lui $v1, %hi(D_802809F6) /* 177438 80248B58 846309F6 */ lh $v1, %lo(D_802809F6)($v1) /* 17743C 80248B5C 2402FFFF */ addiu $v0, $zero, -1 @@ -42,7 +42,7 @@ glabel func_80248B08 /* 177474 80248B94 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 177478 80248B98 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 17747C 80248B9C 08092358 */ j .L80248D60 -/* 177480 80248BA0 00000000 */ nop +/* 177480 80248BA0 00000000 */ nop /* 177484 80248BA4 3C038028 */ lui $v1, %hi(D_802809F6) /* 177488 80248BA8 846309F6 */ lh $v1, %lo(D_802809F6)($v1) /* 17748C 80248BAC 2402FFFF */ addiu $v0, $zero, -1 @@ -51,7 +51,7 @@ glabel func_80248B08 /* 177498 80248BB8 14620069 */ bne $v1, $v0, .L80248D60 /* 17749C 80248BBC 24020002 */ addiu $v0, $zero, 2 /* 1774A0 80248BC0 080922F9 */ j .L80248BE4 -/* 1774A4 80248BC4 00000000 */ nop +/* 1774A4 80248BC4 00000000 */ nop .L80248BC8: /* 1774A8 80248BC8 3C038028 */ lui $v1, %hi(D_80280A30) /* 1774AC 80248BCC 24630A30 */ addiu $v1, $v1, %lo(D_80280A30) @@ -64,14 +64,14 @@ glabel func_80248B08 /* 1774C4 80248BE4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1774C8 80248BE8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1774CC 80248BEC 08092358 */ j .L80248D60 -/* 1774D0 80248BF0 00000000 */ nop +/* 1774D0 80248BF0 00000000 */ nop .L80248BF4: /* 1774D4 80248BF4 AC620000 */ sw $v0, ($v1) /* 1774D8 80248BF8 28420100 */ slti $v0, $v0, 0x100 /* 1774DC 80248BFC 50400058 */ beql $v0, $zero, .L80248D60 /* 1774E0 80248C00 AC640000 */ sw $a0, ($v1) /* 1774E4 80248C04 08092358 */ j .L80248D60 -/* 1774E8 80248C08 00000000 */ nop +/* 1774E8 80248C08 00000000 */ nop /* 1774EC 80248C0C 240200FF */ addiu $v0, $zero, 0xff /* 1774F0 80248C10 3C04800E */ lui $a0, %hi(gBattleStatus) /* 1774F4 80248C14 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) @@ -86,7 +86,7 @@ glabel func_80248B08 /* 177518 80248C38 AC820000 */ sw $v0, ($a0) /* 17751C 80248C3C 8CC4000C */ lw $a0, 0xc($a2) /* 177520 80248C40 08092313 */ j .L80248C4C -/* 177524 80248C44 00000000 */ nop +/* 177524 80248C44 00000000 */ nop .L80248C48: /* 177528 80248C48 8CA40004 */ lw $a0, 4($a1) .L80248C4C: @@ -97,7 +97,7 @@ glabel func_80248B08 /* 17753C 80248C5C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 177540 80248C60 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 177544 80248C64 08092358 */ j .L80248D60 -/* 177548 80248C68 00000000 */ nop +/* 177548 80248C68 00000000 */ nop .L80248C6C: /* 17754C 80248C6C 0C0B0CF8 */ jal start_script /* 177550 80248C70 0000302D */ daddu $a2, $zero, $zero @@ -110,7 +110,7 @@ glabel func_80248B08 /* 17756C 80248C8C AE4300C0 */ sw $v1, 0xc0($s2) /* 177570 80248C90 8E4400C0 */ lw $a0, 0xc0($s2) /* 177574 80248C94 0C0B1059 */ jal does_script_exist -/* 177578 80248C98 00000000 */ nop +/* 177578 80248C98 00000000 */ nop /* 17757C 80248C9C 14400030 */ bnez $v0, .L80248D60 /* 177580 80248CA0 24020004 */ addiu $v0, $zero, 4 /* 177584 80248CA4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -123,30 +123,30 @@ glabel func_80248B08 /* 17759C 80248CBC 10800003 */ beqz $a0, .L80248CCC /* 1775A0 80248CC0 26310001 */ addiu $s1, $s1, 1 /* 1775A4 80248CC4 0C0902EF */ jal delete_actor -/* 1775A8 80248CC8 00000000 */ nop +/* 1775A8 80248CC8 00000000 */ nop .L80248CCC: /* 1775AC 80248CCC 2A220018 */ slti $v0, $s1, 0x18 /* 1775B0 80248CD0 1440FFF9 */ bnez $v0, .L80248CB8 /* 1775B4 80248CD4 26100004 */ addiu $s0, $s0, 4 /* 1775B8 80248CD8 8E4400DC */ lw $a0, 0xdc($s2) /* 1775BC 80248CDC 10800003 */ beqz $a0, .L80248CEC -/* 1775C0 80248CE0 00000000 */ nop +/* 1775C0 80248CE0 00000000 */ nop /* 1775C4 80248CE4 0C0902EF */ jal delete_actor -/* 1775C8 80248CE8 00000000 */ nop +/* 1775C8 80248CE8 00000000 */ nop .L80248CEC: /* 1775CC 80248CEC 0C09035A */ jal delete_player_actor /* 1775D0 80248CF0 8E4400D8 */ lw $a0, 0xd8($s2) /* 1775D4 80248CF4 0C016938 */ jal remove_all_effects -/* 1775D8 80248CF8 00000000 */ nop +/* 1775D8 80248CF8 00000000 */ nop /* 1775DC 80248CFC 0C051FB1 */ jal func_80147EC4 /* 1775E0 80248D00 0000202D */ daddu $a0, $zero, $zero /* 1775E4 80248D04 3C02800E */ lui $v0, %hi(gBattleStatus+0x4) /* 1775E8 80248D08 8C42C074 */ lw $v0, %lo(gBattleStatus+0x4)($v0) /* 1775EC 80248D0C 30420040 */ andi $v0, $v0, 0x40 /* 1775F0 80248D10 10400003 */ beqz $v0, .L80248D20 -/* 1775F4 80248D14 00000000 */ nop +/* 1775F4 80248D14 00000000 */ nop /* 1775F8 80248D18 0C03A6CC */ jal decrement_status_menu_disabled -/* 1775FC 80248D1C 00000000 */ nop +/* 1775FC 80248D1C 00000000 */ nop .L80248D20: /* 177600 80248D20 3C038028 */ lui $v1, %hi(D_802809F6) /* 177604 80248D24 846309F6 */ lh $v1, %lo(D_802809F6)($v1) diff --git a/asm/nonmatchings/code_16F740/func_80248D78.s b/asm/nonmatchings/code_16F740/func_80248D78.s index 58fefce119..bd31ea8dd0 100644 --- a/asm/nonmatchings/code_16F740/func_80248D78.s +++ b/asm/nonmatchings/code_16F740/func_80248D78.s @@ -23,5 +23,5 @@ glabel func_80248D78 /* 17769C 80248DBC 8FBF0010 */ lw $ra, 0x10($sp) /* 1776A0 80248DC0 03E00008 */ jr $ra /* 1776A4 80248DC4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 1776A8 80248DC8 00000000 */ nop -/* 1776AC 80248DCC 00000000 */ nop +/* 1776A8 80248DC8 00000000 */ nop +/* 1776AC 80248DCC 00000000 */ nop diff --git a/asm/nonmatchings/code_16F740/pause_cleanup.s b/asm/nonmatchings/code_16F740/pause_cleanup.s index ad1542f85c..0abc065352 100644 --- a/asm/nonmatchings/code_16F740/pause_cleanup.s +++ b/asm/nonmatchings/code_16F740/pause_cleanup.s @@ -3,4 +3,4 @@ glabel pause_cleanup /* 172FE8 80244708 03E00008 */ jr $ra -/* 172FEC 8024470C 00000000 */ nop +/* 172FEC 8024470C 00000000 */ nop diff --git a/asm/nonmatchings/code_16F740/switch_order.s b/asm/nonmatchings/code_16F740/switch_order.s index 40ecf4c2b6..972f66543e 100644 --- a/asm/nonmatchings/code_16F740/switch_order.s +++ b/asm/nonmatchings/code_16F740/switch_order.s @@ -43,7 +43,7 @@ glabel switch_order /* 172290 802439B0 AE300000 */ sw $s0, ($s1) .L802439B4: /* 172294 802439B4 0C090464 */ jal func_80241190 -/* 172298 802439B8 00000000 */ nop +/* 172298 802439B8 00000000 */ nop .L802439BC: /* 17229C 802439BC 8FBF0018 */ lw $ra, 0x18($sp) /* 1722A0 802439C0 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_16F740/switch_to_partner.s b/asm/nonmatchings/code_16F740/switch_to_partner.s index a38dec8490..3214bcab74 100644 --- a/asm/nonmatchings/code_16F740/switch_to_partner.s +++ b/asm/nonmatchings/code_16F740/switch_to_partner.s @@ -15,7 +15,7 @@ glabel switch_to_partner /* 171808 80242F28 14400025 */ bnez $v0, .L80242FC0 /* 17180C 80242F2C 8E1200DC */ lw $s2, 0xdc($s0) /* 171810 80242F30 0C098F18 */ jal func_80263C60 -/* 171814 80242F34 00000000 */ nop +/* 171814 80242F34 00000000 */ nop /* 171818 80242F38 0000282D */ daddu $a1, $zero, $zero /* 17181C 80242F3C 3C070008 */ lui $a3, 8 /* 171820 80242F40 3C060800 */ lui $a2, 0x800 diff --git a/asm/nonmatchings/code_16F740/update_end_player_turn.s b/asm/nonmatchings/code_16F740/update_end_player_turn.s index 27253ba525..810793f5f7 100644 --- a/asm/nonmatchings/code_16F740/update_end_player_turn.s +++ b/asm/nonmatchings/code_16F740/update_end_player_turn.s @@ -45,9 +45,9 @@ glabel update_end_player_turn /* 171524 80242C44 14620048 */ bne $v1, $v0, .L80242D68 /* 171528 80242C48 24020001 */ addiu $v0, $zero, 1 /* 17152C 80242C4C 0C093961 */ jal func_8024E584 -/* 171530 80242C50 00000000 */ nop +/* 171530 80242C50 00000000 */ nop /* 171534 80242C54 10400041 */ beqz $v0, .L80242D5C -/* 171538 80242C58 00000000 */ nop +/* 171538 80242C58 00000000 */ nop /* 17153C 80242C5C 3C13802A */ lui $s3, %hi(D_8029F258) /* 171540 80242C60 2673F258 */ addiu $s3, $s3, %lo(D_8029F258) /* 171544 80242C64 0C098F18 */ jal func_80263C60 @@ -122,17 +122,17 @@ glabel update_end_player_turn /* 171644 80242D64 24020001 */ addiu $v0, $zero, 1 .L80242D68: /* 171648 80242D68 1462001B */ bne $v1, $v0, .L80242DD8 -/* 17164C 80242D6C 00000000 */ nop +/* 17164C 80242D6C 00000000 */ nop /* 171650 80242D70 1200000A */ beqz $s0, .L80242D9C -/* 171654 80242D74 00000000 */ nop +/* 171654 80242D74 00000000 */ nop /* 171658 80242D78 8E0201D8 */ lw $v0, 0x1d8($s0) /* 17165C 80242D7C 50400007 */ beql $v0, $zero, .L80242D9C /* 171660 80242D80 AE0001D8 */ sw $zero, 0x1d8($s0) /* 171664 80242D84 8E0401E8 */ lw $a0, 0x1e8($s0) /* 171668 80242D88 0C0B1059 */ jal does_script_exist -/* 17166C 80242D8C 00000000 */ nop +/* 17166C 80242D8C 00000000 */ nop /* 171670 80242D90 14400011 */ bnez $v0, .L80242DD8 -/* 171674 80242D94 00000000 */ nop +/* 171674 80242D94 00000000 */ nop /* 171678 80242D98 AE0001D8 */ sw $zero, 0x1d8($s0) .L80242D9C: /* 17167C 80242D9C 3C02800E */ lui $v0, %hi(gBattleStatus) @@ -143,9 +143,9 @@ glabel update_end_player_turn /* 171690 80242DB0 0C098D19 */ jal func_80263464 /* 171694 80242DB4 AC430004 */ sw $v1, 4($v0) /* 171698 80242DB8 14400048 */ bnez $v0, .L80242EDC -/* 17169C 80242DBC 00000000 */ nop +/* 17169C 80242DBC 00000000 */ nop /* 1716A0 80242DC0 0C098D0D */ jal func_80263434 -/* 1716A4 80242DC4 00000000 */ nop +/* 1716A4 80242DC4 00000000 */ nop /* 1716A8 80242DC8 14400044 */ bnez $v0, .L80242EDC /* 1716AC 80242DCC 24020008 */ addiu $v0, $zero, 8 /* 1716B0 80242DD0 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) @@ -179,13 +179,13 @@ glabel update_end_player_turn /* 171718 80242E38 24020009 */ addiu $v0, $zero, 9 .L80242E3C: /* 17171C 80242E3C 1462000A */ bne $v1, $v0, .L80242E68 -/* 171720 80242E40 00000000 */ nop +/* 171720 80242E40 00000000 */ nop /* 171724 80242E44 8E0201CC */ lw $v0, 0x1cc($s0) /* 171728 80242E48 10400006 */ beqz $v0, .L80242E64 /* 17172C 80242E4C 2402000A */ addiu $v0, $zero, 0xa /* 171730 80242E50 8E0401EC */ lw $a0, 0x1ec($s0) /* 171734 80242E54 0C0B1059 */ jal does_script_exist -/* 171738 80242E58 00000000 */ nop +/* 171738 80242E58 00000000 */ nop /* 17173C 80242E5C 14400002 */ bnez $v0, .L80242E68 /* 171740 80242E60 2402000A */ addiu $v0, $zero, 0xa .L80242E64: @@ -195,7 +195,7 @@ glabel update_end_player_turn /* 17174C 80242E6C 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 171750 80242E70 2402000A */ addiu $v0, $zero, 0xa /* 171754 80242E74 14620019 */ bne $v1, $v0, .L80242EDC -/* 171758 80242E78 00000000 */ nop +/* 171758 80242E78 00000000 */ nop /* 17175C 80242E7C 3C03802A */ lui $v1, %hi(D_8029F258) /* 171760 80242E80 2463F258 */ addiu $v1, $v1, %lo(D_8029F258) /* 171764 80242E84 8C620000 */ lw $v0, ($v1) @@ -223,7 +223,7 @@ glabel update_end_player_turn /* 1717B0 80242ED0 24040009 */ addiu $a0, $zero, 9 .L80242ED4: /* 1717B4 80242ED4 0C090464 */ jal func_80241190 -/* 1717B8 80242ED8 00000000 */ nop +/* 1717B8 80242ED8 00000000 */ nop .L80242EDC: /* 1717BC 80242EDC 8FBF0020 */ lw $ra, 0x20($sp) /* 1717C0 80242EE0 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_16F740/update_enemy_action.s b/asm/nonmatchings/code_16F740/update_enemy_action.s index 9bfc6c4a4b..2aab9cb55c 100644 --- a/asm/nonmatchings/code_16F740/update_enemy_action.s +++ b/asm/nonmatchings/code_16F740/update_enemy_action.s @@ -24,7 +24,7 @@ glabel update_enemy_action /* 175E9C 802475BC 00220821 */ addu $at, $at, $v0 /* 175EA0 802475C0 8C22CB88 */ lw $v0, %lo(D_8029CB88)($at) /* 175EA4 802475C4 00400008 */ jr $v0 -/* 175EA8 802475C8 00000000 */ nop +/* 175EA8 802475C8 00000000 */ nop /* 175EAC 802475CC 3C04FFDF */ lui $a0, 0xffdf /* 175EB0 802475D0 3484FFFF */ ori $a0, $a0, 0xffff /* 175EB4 802475D4 3C05F7FF */ lui $a1, 0xf7ff @@ -89,7 +89,7 @@ glabel update_enemy_action /* 175F8C 802476AC 8E030000 */ lw $v1, ($s0) /* 175F90 802476B0 00661024 */ and $v0, $v1, $a2 /* 175F94 802476B4 14400003 */ bnez $v0, .L802476C4 -/* 175F98 802476B8 00000000 */ nop +/* 175F98 802476B8 00000000 */ nop /* 175F9C 802476BC 00651024 */ and $v0, $v1, $a1 /* 175FA0 802476C0 AE020000 */ sw $v0, ($s0) .L802476C4: @@ -118,20 +118,20 @@ glabel update_enemy_action /* 175FFC 8024771C 24020002 */ addiu $v0, $zero, 2 /* 176000 80247720 8EA201D4 */ lw $v0, 0x1d4($s5) /* 176004 80247724 10400005 */ beqz $v0, .L8024773C -/* 176008 80247728 00000000 */ nop +/* 176008 80247728 00000000 */ nop /* 17600C 8024772C 0C0B1059 */ jal does_script_exist /* 176010 80247730 8EA401E4 */ lw $a0, 0x1e4($s5) /* 176014 80247734 144000A5 */ bnez $v0, .L802479CC -/* 176018 80247738 00000000 */ nop +/* 176018 80247738 00000000 */ nop .L8024773C: /* 17601C 8024773C 8EA201D8 */ lw $v0, 0x1d8($s5) /* 176020 80247740 10400006 */ beqz $v0, .L8024775C /* 176024 80247744 AEA001D4 */ sw $zero, 0x1d4($s5) /* 176028 80247748 8EA401E8 */ lw $a0, 0x1e8($s5) /* 17602C 8024774C 0C0B1059 */ jal does_script_exist -/* 176030 80247750 00000000 */ nop +/* 176030 80247750 00000000 */ nop /* 176034 80247754 1440009D */ bnez $v0, .L802479CC -/* 176038 80247758 00000000 */ nop +/* 176038 80247758 00000000 */ nop .L8024775C: /* 17603C 8024775C 1280000A */ beqz $s4, .L80247788 /* 176040 80247760 AEA001D8 */ sw $zero, 0x1d8($s5) @@ -140,9 +140,9 @@ glabel update_enemy_action /* 17604C 8024776C AE8001D8 */ sw $zero, 0x1d8($s4) /* 176050 80247770 8E8401E8 */ lw $a0, 0x1e8($s4) /* 176054 80247774 0C0B1059 */ jal does_script_exist -/* 176058 80247778 00000000 */ nop +/* 176058 80247778 00000000 */ nop /* 17605C 8024777C 14400093 */ bnez $v0, .L802479CC -/* 176060 80247780 00000000 */ nop +/* 176060 80247780 00000000 */ nop /* 176064 80247784 AE8001D8 */ sw $zero, 0x1d8($s4) .L80247788: /* 176068 80247788 0000982D */ daddu $s3, $zero, $zero @@ -157,7 +157,7 @@ glabel update_enemy_action /* 176088 802477A8 26310001 */ addiu $s1, $s1, 1 /* 17608C 802477AC 8E0401E8 */ lw $a0, 0x1e8($s0) /* 176090 802477B0 0C0B1059 */ jal does_script_exist -/* 176094 802477B4 00000000 */ nop +/* 176094 802477B4 00000000 */ nop /* 176098 802477B8 50400002 */ beql $v0, $zero, .L802477C4 /* 17609C 802477BC AE0001D8 */ sw $zero, 0x1d8($s0) /* 1760A0 802477C0 24130001 */ addiu $s3, $zero, 1 @@ -168,9 +168,9 @@ glabel update_enemy_action /* 1760AC 802477CC 1440FFF1 */ bnez $v0, .L80247794 /* 1760B0 802477D0 26520004 */ addiu $s2, $s2, 4 /* 1760B4 802477D4 1660007D */ bnez $s3, .L802479CC -/* 1760B8 802477D8 00000000 */ nop +/* 1760B8 802477D8 00000000 */ nop /* 1760BC 802477DC 0C098D19 */ jal func_80263464 -/* 1760C0 802477E0 00000000 */ nop +/* 1760C0 802477E0 00000000 */ nop /* 1760C4 802477E4 144000BB */ bnez $v0, .L80247AD4 /* 1760C8 802477E8 0000882D */ daddu $s1, $zero, $zero /* 1760CC 802477EC 02C0902D */ daddu $s2, $s6, $zero @@ -183,7 +183,7 @@ glabel update_enemy_action /* 1760E4 80247804 26310001 */ addiu $s1, $s1, 1 /* 1760E8 80247808 8E0401E4 */ lw $a0, 0x1e4($s0) /* 1760EC 8024780C 0C0B1059 */ jal does_script_exist -/* 1760F0 80247810 00000000 */ nop +/* 1760F0 80247810 00000000 */ nop /* 1760F4 80247814 50400002 */ beql $v0, $zero, .L80247820 /* 1760F8 80247818 AE0001D4 */ sw $zero, 0x1d4($s0) /* 1760FC 8024781C 24130001 */ addiu $s3, $zero, 1 @@ -199,7 +199,7 @@ glabel update_enemy_action /* 17611C 8024783C 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 176120 80247840 00431024 */ and $v0, $v0, $v1 /* 176124 80247844 10400061 */ beqz $v0, .L802479CC -/* 176128 80247848 00000000 */ nop +/* 176128 80247848 00000000 */ nop .L8024784C: /* 17612C 8024784C 3C04800E */ lui $a0, %hi(gBattleStatus) /* 176130 80247850 2484C070 */ addiu $a0, $a0, %lo(gBattleStatus) @@ -213,23 +213,23 @@ glabel update_enemy_action /* 176150 80247870 0C098D0D */ jal func_80263434 /* 176154 80247874 AC820004 */ sw $v0, 4($a0) /* 176158 80247878 14400096 */ bnez $v0, .L80247AD4 -/* 17615C 8024787C 00000000 */ nop +/* 17615C 8024787C 00000000 */ nop /* 176160 80247880 82C2008C */ lb $v0, 0x8c($s6) /* 176164 80247884 14400051 */ bnez $v0, .L802479CC -/* 176168 80247888 00000000 */ nop +/* 176168 80247888 00000000 */ nop /* 17616C 8024788C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 176170 80247890 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 176174 80247894 904200AA */ lbu $v0, 0xaa($v0) /* 176178 80247898 30420001 */ andi $v0, $v0, 1 /* 17617C 8024789C 10400005 */ beqz $v0, .L802478B4 -/* 176180 802478A0 00000000 */ nop +/* 176180 802478A0 00000000 */ nop /* 176184 802478A4 0C090464 */ jal func_80241190 /* 176188 802478A8 24040023 */ addiu $a0, $zero, 0x23 /* 17618C 802478AC 08091E73 */ j .L802479CC -/* 176190 802478B0 00000000 */ nop +/* 176190 802478B0 00000000 */ nop .L802478B4: /* 176194 802478B4 0C099DDF */ jal func_8026777C -/* 176198 802478B8 00000000 */ nop +/* 176198 802478B8 00000000 */ nop /* 17619C 802478BC 82A2021C */ lb $v0, 0x21c($s5) /* 1761A0 802478C0 1040003F */ beqz $v0, .L802479C0 /* 1761A4 802478C4 3C030C00 */ lui $v1, 0xc00 @@ -254,7 +254,7 @@ glabel update_enemy_action /* 1761EC 8024790C 00220821 */ addu $at, $at, $v0 /* 1761F0 80247910 8C22CBC0 */ lw $v0, %lo(D_8029CBC0)($at) /* 1761F4 80247914 00400008 */ jr $v0 -/* 1761F8 80247918 00000000 */ nop +/* 1761F8 80247918 00000000 */ nop /* 1761FC 8024791C 08091E57 */ j .L8024795C /* 176200 80247920 2404000A */ addiu $a0, $zero, 0xa /* 176204 80247924 08091E57 */ j .L8024795C @@ -279,9 +279,9 @@ glabel update_enemy_action /* 176248 80247968 08091E71 */ j .L802479C4 /* 17624C 8024796C A2A0021C */ sb $zero, 0x21c($s5) /* 176250 80247970 0C093EAD */ jal is_popup_displayed -/* 176254 80247974 00000000 */ nop +/* 176254 80247974 00000000 */ nop /* 176258 80247978 14400014 */ bnez $v0, .L802479CC -/* 17625C 8024797C 00000000 */ nop +/* 17625C 8024797C 00000000 */ nop /* 176260 80247980 0C093903 */ jal func_8024E40C /* 176264 80247984 24040002 */ addiu $a0, $zero, 2 /* 176268 80247988 0C093936 */ jal move_cam_over @@ -313,15 +313,15 @@ glabel update_enemy_action /* 1762C4 802479E4 10400005 */ beqz $v0, .L802479FC /* 1762C8 802479E8 24020014 */ addiu $v0, $zero, 0x14 /* 1762CC 802479EC 10620008 */ beq $v1, $v0, .L80247A10 -/* 1762D0 802479F0 00000000 */ nop +/* 1762D0 802479F0 00000000 */ nop /* 1762D4 802479F4 08091EAE */ j .L80247AB8 -/* 1762D8 802479F8 00000000 */ nop +/* 1762D8 802479F8 00000000 */ nop .L802479FC: /* 1762DC 802479FC 24020016 */ addiu $v0, $zero, 0x16 /* 1762E0 80247A00 10620024 */ beq $v1, $v0, .L80247A94 -/* 1762E4 80247A04 00000000 */ nop +/* 1762E4 80247A04 00000000 */ nop /* 1762E8 80247A08 08091EAE */ j .L80247AB8 -/* 1762EC 80247A0C 00000000 */ nop +/* 1762EC 80247A0C 00000000 */ nop .L80247A10: /* 1762F0 80247A10 12800027 */ beqz $s4, .L80247AB0 /* 1762F4 80247A14 2402000D */ addiu $v0, $zero, 0xd @@ -345,9 +345,9 @@ glabel update_enemy_action /* 17633C 80247A5C AE110000 */ sw $s1, ($s0) .L80247A60: /* 176340 80247A60 0C093EAD */ jal is_popup_displayed -/* 176344 80247A64 00000000 */ nop +/* 176344 80247A64 00000000 */ nop /* 176348 80247A68 14400013 */ bnez $v0, .L80247AB8 -/* 17634C 80247A6C 00000000 */ nop +/* 17634C 80247A6C 00000000 */ nop /* 176350 80247A70 0C093903 */ jal func_8024E40C /* 176354 80247A74 24040002 */ addiu $a0, $zero, 2 /* 176358 80247A78 0C093936 */ jal move_cam_over @@ -374,7 +374,7 @@ glabel update_enemy_action /* 17639C 80247ABC 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 1763A0 80247AC0 2402001E */ addiu $v0, $zero, 0x1e /* 1763A4 80247AC4 14620003 */ bne $v1, $v0, .L80247AD4 -/* 1763A8 80247AC8 00000000 */ nop +/* 1763A8 80247AC8 00000000 */ nop /* 1763AC 80247ACC 0C090464 */ jal func_80241190 /* 1763B0 80247AD0 24040014 */ addiu $a0, $zero, 0x14 .L80247AD4: diff --git a/asm/nonmatchings/code_16F740/update_enemy_change_turn.s b/asm/nonmatchings/code_16F740/update_enemy_change_turn.s index 27ce536a61..185ce8cee2 100644 --- a/asm/nonmatchings/code_16F740/update_enemy_change_turn.s +++ b/asm/nonmatchings/code_16F740/update_enemy_change_turn.s @@ -17,9 +17,9 @@ glabel update_enemy_change_turn /* 175BBC 802472DC 14400005 */ bnez $v0, .L802472F4 /* 175BC0 802472E0 24020002 */ addiu $v0, $zero, 2 /* 175BC4 802472E4 10620080 */ beq $v1, $v0, .L802474E8 -/* 175BC8 802472E8 00000000 */ nop +/* 175BC8 802472E8 00000000 */ nop /* 175BCC 802472EC 08091D55 */ j .L80247554 -/* 175BD0 802472F0 00000000 */ nop +/* 175BD0 802472F0 00000000 */ nop .L802472F4: /* 175BD4 802472F4 82240170 */ lb $a0, 0x170($s1) /* 175BD8 802472F8 82220171 */ lb $v0, 0x171($s1) @@ -42,7 +42,7 @@ glabel update_enemy_change_turn /* 175C14 80247334 02221021 */ addu $v0, $s1, $v0 /* 175C18 80247338 8C5000E0 */ lw $s0, 0xe0($v0) /* 175C1C 8024733C 12000005 */ beqz $s0, .L80247354 -/* 175C20 80247340 00000000 */ nop +/* 175C20 80247340 00000000 */ nop /* 175C24 80247344 8E020000 */ lw $v0, ($s0) /* 175C28 80247348 00451024 */ and $v0, $v0, $a1 /* 175C2C 8024734C 1040000B */ beqz $v0, .L8024737C @@ -105,7 +105,7 @@ glabel update_enemy_change_turn /* 175CE8 80247408 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 175CEC 8024740C AC20C4DC */ sw $zero, %lo(gBattleStatus+0x46C)($at) /* 175CF0 80247410 08091D55 */ j .L80247554 -/* 175CF4 80247414 00000000 */ nop +/* 175CF4 80247414 00000000 */ nop .L80247418: /* 175CF8 80247418 3463FFFF */ ori $v1, $v1, 0xffff /* 175CFC 8024741C 3C04FFF7 */ lui $a0, 0xfff7 @@ -160,11 +160,11 @@ glabel update_enemy_change_turn /* 175DB8 802474D8 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 175DBC 802474DC AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 175DC0 802474E0 08091D55 */ j .L80247554 -/* 175DC4 802474E4 00000000 */ nop +/* 175DC4 802474E4 00000000 */ nop .L802474E8: /* 175DC8 802474E8 8222008C */ lb $v0, 0x8c($s1) /* 175DCC 802474EC 14400019 */ bnez $v0, .L80247554 -/* 175DD0 802474F0 00000000 */ nop +/* 175DD0 802474F0 00000000 */ nop /* 175DD4 802474F4 0C09A75B */ jal get_actor /* 175DD8 802474F8 86240172 */ lh $a0, 0x172($s1) /* 175DDC 802474FC 0040802D */ daddu $s0, $v0, $zero @@ -174,14 +174,14 @@ glabel update_enemy_change_turn /* 175DEC 8024750C 3C02802A */ lui $v0, %hi(D_8029F244) /* 175DF0 80247510 9042F244 */ lbu $v0, %lo(D_8029F244)($v0) /* 175DF4 80247514 1462000D */ bne $v1, $v0, .L8024754C -/* 175DF8 80247518 00000000 */ nop +/* 175DF8 80247518 00000000 */ nop /* 175DFC 8024751C 8E0201CC */ lw $v0, 0x1cc($s0) /* 175E00 80247520 10400005 */ beqz $v0, .L80247538 -/* 175E04 80247524 00000000 */ nop +/* 175E04 80247524 00000000 */ nop /* 175E08 80247528 0C0B1059 */ jal does_script_exist /* 175E0C 8024752C 8E0401EC */ lw $a0, 0x1ec($s0) /* 175E10 80247530 14400008 */ bnez $v0, .L80247554 -/* 175E14 80247534 00000000 */ nop +/* 175E14 80247534 00000000 */ nop .L80247538: /* 175E18 80247538 82220094 */ lb $v0, 0x94($s1) /* 175E1C 8024753C 04410003 */ bgez $v0, .L8024754C @@ -190,7 +190,7 @@ glabel update_enemy_change_turn /* 175E28 80247548 24040006 */ addiu $a0, $zero, 6 .L8024754C: /* 175E2C 8024754C 0C090464 */ jal func_80241190 -/* 175E30 80247550 00000000 */ nop +/* 175E30 80247550 00000000 */ nop .L80247554: /* 175E34 80247554 8FBF0018 */ lw $ra, 0x18($sp) /* 175E38 80247558 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_16F740/update_heroes_start_turn.s b/asm/nonmatchings/code_16F740/update_heroes_start_turn.s index 1c3fe23e1c..7e2e35dc38 100644 --- a/asm/nonmatchings/code_16F740/update_heroes_start_turn.s +++ b/asm/nonmatchings/code_16F740/update_heroes_start_turn.s @@ -37,9 +37,9 @@ glabel update_heroes_start_turn /* 170980 802420A0 10750039 */ beq $v1, $s5, .L80242188 /* 170984 802420A4 24020064 */ addiu $v0, $zero, 0x64 /* 170988 802420A8 14620041 */ bne $v1, $v0, .L802421B0 -/* 17098C 802420AC 00000000 */ nop +/* 17098C 802420AC 00000000 */ nop /* 170990 802420B0 0C093961 */ jal func_8024E584 -/* 170994 802420B4 00000000 */ nop +/* 170994 802420B4 00000000 */ nop /* 170998 802420B8 1040003D */ beqz $v0, .L802421B0 /* 17099C 802420BC 3C03FFF7 */ lui $v1, 0xfff7 /* 1709A0 802420C0 8E620000 */ lw $v0, ($s3) @@ -97,7 +97,7 @@ glabel update_heroes_start_turn .L80242188: /* 170A68 80242188 8E0401EC */ lw $a0, 0x1ec($s0) /* 170A6C 8024218C 0C0B1059 */ jal does_script_exist -/* 170A70 80242190 00000000 */ nop +/* 170A70 80242190 00000000 */ nop /* 170A74 80242194 14400006 */ bnez $v0, .L802421B0 /* 170A78 80242198 2403000A */ addiu $v1, $zero, 0xa /* 170A7C 8024219C 8E620004 */ lw $v0, 4($s3) @@ -113,10 +113,10 @@ glabel update_heroes_start_turn /* 170AA0 802421C0 10950066 */ beq $a0, $s5, .L8024235C /* 170AA4 802421C4 2402000A */ addiu $v0, $zero, 0xa /* 170AA8 802421C8 1482006A */ bne $a0, $v0, .L80242374 -/* 170AAC 802421CC 00000000 */ nop +/* 170AAC 802421CC 00000000 */ nop /* 170AB0 802421D0 8262008C */ lb $v0, 0x8c($s3) /* 170AB4 802421D4 14400067 */ bnez $v0, .L80242374 -/* 170AB8 802421D8 00000000 */ nop +/* 170AB8 802421D8 00000000 */ nop /* 170ABC 802421DC 8262009D */ lb $v0, 0x9d($s3) /* 170AC0 802421E0 9263009D */ lbu $v1, 0x9d($s3) /* 170AC4 802421E4 10400061 */ beqz $v0, .L8024236C @@ -154,7 +154,7 @@ glabel update_heroes_start_turn /* 170B44 80242264 C6220144 */ lwc1 $f2, 0x144($s1) /* 170B48 80242268 3C014120 */ lui $at, 0x4120 /* 170B4C 8024226C 44810000 */ mtc1 $at, $f0 -/* 170B50 80242270 00000000 */ nop +/* 170B50 80242270 00000000 */ nop /* 170B54 80242274 46001081 */ sub.s $f2, $f2, $f0 /* 170B58 80242278 C6200148 */ lwc1 $f0, 0x148($s1) /* 170B5C 8024227C 46160000 */ add.s $f0, $f0, $f22 @@ -173,13 +173,13 @@ glabel update_heroes_start_turn /* 170B90 802422B0 C6200144 */ lwc1 $f0, 0x144($s1) /* 170B94 802422B4 3C014170 */ lui $at, 0x4170 /* 170B98 802422B8 4481C000 */ mtc1 $at, $f24 -/* 170B9C 802422BC 00000000 */ nop +/* 170B9C 802422BC 00000000 */ nop /* 170BA0 802422C0 46180001 */ sub.s $f0, $f0, $f24 /* 170BA4 802422C4 C6220148 */ lwc1 $f2, 0x148($s1) /* 170BA8 802422C8 44050000 */ mfc1 $a1, $f0 /* 170BAC 802422CC 3C014200 */ lui $at, 0x4200 /* 170BB0 802422D0 44810000 */ mtc1 $at, $f0 -/* 170BB4 802422D4 00000000 */ nop +/* 170BB4 802422D4 00000000 */ nop /* 170BB8 802422D8 46001080 */ add.s $f2, $f2, $f0 /* 170BBC 802422DC C620014C */ lwc1 $f0, 0x14c($s1) /* 170BC0 802422E0 46160000 */ add.s $f0, $f0, $f22 @@ -195,7 +195,7 @@ glabel update_heroes_start_turn /* 170BE8 80242308 44050000 */ mfc1 $a1, $f0 /* 170BEC 8024230C 3C0141B0 */ lui $at, 0x41b0 /* 170BF0 80242310 44810000 */ mtc1 $at, $f0 -/* 170BF4 80242314 00000000 */ nop +/* 170BF4 80242314 00000000 */ nop /* 170BF8 80242318 46001080 */ add.s $f2, $f2, $f0 /* 170BFC 8024231C C620014C */ lwc1 $f0, 0x14c($s1) /* 170C00 80242320 46160000 */ add.s $f0, $f0, $f22 @@ -215,9 +215,9 @@ glabel update_heroes_start_turn /* 170C38 80242358 AE550000 */ sw $s5, ($s2) .L8024235C: /* 170C3C 8024235C 0C093EAD */ jal is_popup_displayed -/* 170C40 80242360 00000000 */ nop +/* 170C40 80242360 00000000 */ nop /* 170C44 80242364 14400003 */ bnez $v0, .L80242374 -/* 170C48 80242368 00000000 */ nop +/* 170C48 80242368 00000000 */ nop .L8024236C: /* 170C4C 8024236C 2402000B */ addiu $v0, $zero, 0xb .L80242370: @@ -232,7 +232,7 @@ glabel update_heroes_start_turn /* 170C6C 8024238C 10620019 */ beq $v1, $v0, .L802423F4 /* 170C70 80242390 2402000F */ addiu $v0, $zero, 0xf /* 170C74 80242394 08090907 */ j .L8024241C -/* 170C78 80242398 00000000 */ nop +/* 170C78 80242398 00000000 */ nop .L8024239C: /* 170C7C 8024239C 826200A4 */ lb $v0, 0xa4($s3) /* 170C80 802423A0 926300A4 */ lbu $v1, 0xa4($s3) @@ -249,7 +249,7 @@ glabel update_heroes_start_turn /* 170CAC 802423CC 2402000F */ addiu $v0, $zero, 0xf /* 170CB0 802423D0 8E6400A8 */ lw $a0, 0xa8($s3) /* 170CB4 802423D4 0C016914 */ jal remove_effect -/* 170CB8 802423D8 00000000 */ nop +/* 170CB8 802423D8 00000000 */ nop /* 170CBC 802423DC 24040029 */ addiu $a0, $zero, 0x29 /* 170CC0 802423E0 2405003C */ addiu $a1, $zero, 0x3c /* 170CC4 802423E4 0C093E58 */ jal show_battle_message @@ -258,9 +258,9 @@ glabel update_heroes_start_turn /* 170CD0 802423F0 2402000C */ addiu $v0, $zero, 0xc .L802423F4: /* 170CD4 802423F4 0C093EAD */ jal is_popup_displayed -/* 170CD8 802423F8 00000000 */ nop +/* 170CD8 802423F8 00000000 */ nop /* 170CDC 802423FC 14400003 */ bnez $v0, .L8024240C -/* 170CE0 80242400 00000000 */ nop +/* 170CE0 80242400 00000000 */ nop .L80242404: /* 170CE4 80242404 2402000F */ addiu $v0, $zero, 0xf .L80242408: @@ -274,9 +274,9 @@ glabel update_heroes_start_turn /* 170CFC 8024241C 10620005 */ beq $v1, $v0, .L80242434 /* 170D00 80242420 24020010 */ addiu $v0, $zero, 0x10 /* 170D04 80242424 10620025 */ beq $v1, $v0, .L802424BC -/* 170D08 80242428 00000000 */ nop +/* 170D08 80242428 00000000 */ nop /* 170D0C 8024242C 08090935 */ j .L802424D4 -/* 170D10 80242430 00000000 */ nop +/* 170D10 80242430 00000000 */ nop .L80242434: /* 170D14 80242434 8262009B */ lb $v0, 0x9b($s3) /* 170D18 80242438 9264009B */ lbu $a0, 0x9b($s3) @@ -316,9 +316,9 @@ glabel update_heroes_start_turn /* 170D98 802424B8 AC62003C */ sw $v0, 0x3c($v1) .L802424BC: /* 170D9C 802424BC 0C093EAD */ jal is_popup_displayed -/* 170DA0 802424C0 00000000 */ nop +/* 170DA0 802424C0 00000000 */ nop /* 170DA4 802424C4 14400003 */ bnez $v0, .L802424D4 -/* 170DA8 802424C8 00000000 */ nop +/* 170DA8 802424C8 00000000 */ nop .L802424CC: /* 170DAC 802424CC 24020015 */ addiu $v0, $zero, 0x15 .L802424D0: @@ -357,7 +357,7 @@ glabel update_heroes_start_turn /* 170E28 80242548 82C20002 */ lb $v0, 2($s6) /* 170E2C 8024254C 28420002 */ slti $v0, $v0, 2 /* 170E30 80242550 1040000B */ beqz $v0, .L80242580 -/* 170E34 80242554 00000000 */ nop +/* 170E34 80242554 00000000 */ nop /* 170E38 80242558 0C03A752 */ jal is_ability_active /* 170E3C 8024255C 24040014 */ addiu $a0, $zero, 0x14 /* 170E40 80242560 10400007 */ beqz $v0, .L80242580 @@ -400,14 +400,14 @@ glabel update_heroes_start_turn /* 170EC8 802425E8 24020016 */ addiu $v0, $zero, 0x16 .L802425EC: /* 170ECC 802425EC 146200A8 */ bne $v1, $v0, .L80242890 -/* 170ED0 802425F0 00000000 */ nop +/* 170ED0 802425F0 00000000 */ nop /* 170ED4 802425F4 8E2201D8 */ lw $v0, 0x1d8($s1) /* 170ED8 802425F8 10400005 */ beqz $v0, .L80242610 -/* 170EDC 802425FC 00000000 */ nop +/* 170EDC 802425FC 00000000 */ nop /* 170EE0 80242600 0C0B1059 */ jal does_script_exist /* 170EE4 80242604 8E2401E8 */ lw $a0, 0x1e8($s1) /* 170EE8 80242608 144000A1 */ bnez $v0, .L80242890 -/* 170EEC 8024260C 00000000 */ nop +/* 170EEC 8024260C 00000000 */ nop .L80242610: /* 170EF0 80242610 0C098D19 */ jal func_80263464 /* 170EF4 80242614 AE2001D8 */ sw $zero, 0x1d8($s1) @@ -422,7 +422,7 @@ glabel update_heroes_start_turn /* 170F18 80242638 0C03A752 */ jal is_ability_active /* 170F1C 8024263C AE220000 */ sw $v0, ($s1) /* 170F20 80242640 10400015 */ beqz $v0, .L80242698 -/* 170F24 80242644 00000000 */ nop +/* 170F24 80242644 00000000 */ nop /* 170F28 80242648 82220210 */ lb $v0, 0x210($s1) /* 170F2C 8024264C 10400002 */ beqz $v0, .L80242658 /* 170F30 80242650 24020001 */ addiu $v0, $zero, 1 @@ -450,7 +450,7 @@ glabel update_heroes_start_turn .L80242698: /* 170F78 80242698 82220214 */ lb $v0, 0x214($s1) /* 170F7C 8024269C 1040000C */ beqz $v0, .L802426D0 -/* 170F80 802426A0 00000000 */ nop +/* 170F80 802426A0 00000000 */ nop /* 170F84 802426A4 92220215 */ lbu $v0, 0x215($s1) /* 170F88 802426A8 2442FFFF */ addiu $v0, $v0, -1 /* 170F8C 802426AC A2220215 */ sb $v0, 0x215($s1) @@ -466,23 +466,23 @@ glabel update_heroes_start_turn /* 170FB0 802426D0 0C03A752 */ jal is_ability_active /* 170FB4 802426D4 24040013 */ addiu $a0, $zero, 0x13 /* 170FB8 802426D8 1440000D */ bnez $v0, .L80242710 -/* 170FBC 802426DC 00000000 */ nop +/* 170FBC 802426DC 00000000 */ nop /* 170FC0 802426E0 82220212 */ lb $v0, 0x212($s1) /* 170FC4 802426E4 1040000A */ beqz $v0, .L80242710 -/* 170FC8 802426E8 00000000 */ nop +/* 170FC8 802426E8 00000000 */ nop /* 170FCC 802426EC 92220213 */ lbu $v0, 0x213($s1) /* 170FD0 802426F0 2442FFFF */ addiu $v0, $v0, -1 /* 170FD4 802426F4 A2220213 */ sb $v0, 0x213($s1) /* 170FD8 802426F8 00021600 */ sll $v0, $v0, 0x18 /* 170FDC 802426FC 1C400004 */ bgtz $v0, .L80242710 -/* 170FE0 80242700 00000000 */ nop +/* 170FE0 80242700 00000000 */ nop /* 170FE4 80242704 86240436 */ lh $a0, 0x436($s1) /* 170FE8 80242708 0C011E68 */ jal func_800479A0 /* 170FEC 8024270C A2200212 */ sb $zero, 0x212($s1) .L80242710: /* 170FF0 80242710 82220218 */ lb $v0, 0x218($s1) /* 170FF4 80242714 10400010 */ beqz $v0, .L80242758 -/* 170FF8 80242718 00000000 */ nop +/* 170FF8 80242718 00000000 */ nop /* 170FFC 8024271C 92220219 */ lbu $v0, 0x219($s1) /* 171000 80242720 2442FFFF */ addiu $v0, $v0, -1 /* 171004 80242724 A2220219 */ sb $v0, 0x219($s1) @@ -529,7 +529,7 @@ glabel update_heroes_start_turn /* 1710A0 802427C0 AE200228 */ sw $zero, 0x228($s1) .L802427C4: /* 1710A4 802427C4 0C09C596 */ jal dispatch_event_player -/* 1710A8 802427C8 00000000 */ nop +/* 1710A8 802427C8 00000000 */ nop /* 1710AC 802427CC 86240436 */ lh $a0, 0x436($s1) /* 1710B0 802427D0 A2200210 */ sb $zero, 0x210($s1) /* 1710B4 802427D4 0C011E26 */ jal func_80047898 @@ -589,9 +589,9 @@ glabel update_heroes_start_turn /* 171174 80242894 8E52C4DC */ lw $s2, %lo(gBattleStatus+0x46C)($s2) /* 171178 80242898 24020001 */ addiu $v0, $zero, 1 /* 17117C 8024289C 16420051 */ bne $s2, $v0, .L802429E4 -/* 171180 802428A0 00000000 */ nop +/* 171180 802428A0 00000000 */ nop /* 171184 802428A4 0C098D0D */ jal func_80263434 -/* 171188 802428A8 00000000 */ nop +/* 171188 802428A8 00000000 */ nop /* 17118C 802428AC 14400077 */ bnez $v0, .L80242A8C /* 171190 802428B0 24100001 */ addiu $s0, $zero, 1 /* 171194 802428B4 826200AE */ lb $v0, 0xae($s3) @@ -679,23 +679,23 @@ glabel update_heroes_start_turn /* 1712C8 802429E8 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 1712CC 802429EC 2402001E */ addiu $v0, $zero, 0x1e /* 1712D0 802429F0 14620026 */ bne $v1, $v0, .L80242A8C -/* 1712D4 802429F4 00000000 */ nop +/* 1712D4 802429F4 00000000 */ nop /* 1712D8 802429F8 8E2201D8 */ lw $v0, 0x1d8($s1) /* 1712DC 802429FC 10400005 */ beqz $v0, .L80242A14 -/* 1712E0 80242A00 00000000 */ nop +/* 1712E0 80242A00 00000000 */ nop /* 1712E4 80242A04 0C0B1059 */ jal does_script_exist /* 1712E8 80242A08 8E2401E8 */ lw $a0, 0x1e8($s1) /* 1712EC 80242A0C 1440001F */ bnez $v0, .L80242A8C -/* 1712F0 80242A10 00000000 */ nop +/* 1712F0 80242A10 00000000 */ nop .L80242A14: /* 1712F4 80242A14 0C098D19 */ jal func_80263464 /* 1712F8 80242A18 AE2001D8 */ sw $zero, 0x1d8($s1) /* 1712FC 80242A1C 1440001B */ bnez $v0, .L80242A8C -/* 171300 80242A20 00000000 */ nop +/* 171300 80242A20 00000000 */ nop /* 171304 80242A24 0C098D0D */ jal func_80263434 -/* 171308 80242A28 00000000 */ nop +/* 171308 80242A28 00000000 */ nop /* 17130C 80242A2C 14400017 */ bnez $v0, .L80242A8C -/* 171310 80242A30 00000000 */ nop +/* 171310 80242A30 00000000 */ nop /* 171314 80242A34 3C03802A */ lui $v1, %hi(D_8029F258) /* 171318 80242A38 2463F258 */ addiu $v1, $v1, %lo(D_8029F258) /* 17131C 80242A3C 8C620000 */ lw $v0, ($v1) @@ -707,11 +707,11 @@ glabel update_heroes_start_turn /* 171330 80242A50 3C02802A */ lui $v0, %hi(D_8029F254) /* 171334 80242A54 8C42F254 */ lw $v0, %lo(D_8029F254)($v0) /* 171338 80242A58 14400005 */ bnez $v0, .L80242A70 -/* 17133C 80242A5C 00000000 */ nop +/* 17133C 80242A5C 00000000 */ nop /* 171340 80242A60 0C090464 */ jal func_80241190 /* 171344 80242A64 2404000A */ addiu $a0, $zero, 0xa /* 171348 80242A68 08090AA3 */ j .L80242A8C -/* 17134C 80242A6C 00000000 */ nop +/* 17134C 80242A6C 00000000 */ nop .L80242A70: /* 171350 80242A70 0C090464 */ jal func_80241190 /* 171354 80242A74 24040008 */ addiu $a0, $zero, 8 diff --git a/asm/nonmatchings/code_16F740/update_partner_action.s b/asm/nonmatchings/code_16F740/update_partner_action.s index 5f33b78fec..59a56d711c 100644 --- a/asm/nonmatchings/code_16F740/update_partner_action.s +++ b/asm/nonmatchings/code_16F740/update_partner_action.s @@ -23,13 +23,13 @@ glabel update_partner_action /* 17545C 80246B7C 00220821 */ addu $at, $at, $v0 /* 175460 80246B80 8C22CB30 */ lw $v0, %lo(D_8029CB30)($at) /* 175464 80246B84 00400008 */ jr $v0 -/* 175468 80246B88 00000000 */ nop +/* 175468 80246B88 00000000 */ nop /* 17546C 80246B8C 16800005 */ bnez $s4, .L80246BA4 /* 175470 80246B90 2402007F */ addiu $v0, $zero, 0x7f /* 175474 80246B94 0C090464 */ jal func_80241190 /* 175478 80246B98 24040009 */ addiu $a0, $zero, 9 /* 17547C 80246B9C 08091BFF */ j .L80246FFC -/* 175480 80246BA0 00000000 */ nop +/* 175480 80246BA0 00000000 */ nop .L80246BA4: /* 175484 80246BA4 3C10800E */ lui $s0, %hi(gBattleStatus) /* 175488 80246BA8 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) @@ -98,7 +98,7 @@ glabel update_partner_action /* 175574 80246C94 1440FFF7 */ bnez $v0, .L80246C74 /* 175578 80246C98 24630004 */ addiu $v1, $v1, 4 /* 17557C 80246C9C 0C03A6D5 */ jal increment_status_menu_disabled -/* 175580 80246CA0 00000000 */ nop +/* 175580 80246CA0 00000000 */ nop /* 175584 80246CA4 3C03800E */ lui $v1, %hi(gBattleStatus) /* 175588 80246CA8 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 17558C 80246CAC 8C620000 */ lw $v0, ($v1) @@ -126,15 +126,15 @@ glabel update_partner_action /* 1755E4 80246D04 3C030020 */ lui $v1, 0x20 /* 1755E8 80246D08 00431024 */ and $v0, $v0, $v1 /* 1755EC 80246D0C 1440000A */ bnez $v0, .L80246D38 -/* 1755F0 80246D10 00000000 */ nop +/* 1755F0 80246D10 00000000 */ nop /* 1755F4 80246D14 8E8201D4 */ lw $v0, 0x1d4($s4) /* 1755F8 80246D18 50400007 */ beql $v0, $zero, .L80246D38 /* 1755FC 80246D1C AE8001D4 */ sw $zero, 0x1d4($s4) /* 175600 80246D20 8E8401E4 */ lw $a0, 0x1e4($s4) /* 175604 80246D24 0C0B1059 */ jal does_script_exist -/* 175608 80246D28 00000000 */ nop +/* 175608 80246D28 00000000 */ nop /* 17560C 80246D2C 144000B3 */ bnez $v0, .L80246FFC -/* 175610 80246D30 00000000 */ nop +/* 175610 80246D30 00000000 */ nop /* 175614 80246D34 AE8001D4 */ sw $zero, 0x1d4($s4) .L80246D38: /* 175618 80246D38 3C04800E */ lui $a0, %hi(gBattleStatus) @@ -148,9 +148,9 @@ glabel update_partner_action /* 175638 80246D58 AE8001D8 */ sw $zero, 0x1d8($s4) /* 17563C 80246D5C 8E8401E8 */ lw $a0, 0x1e8($s4) /* 175640 80246D60 0C0B1059 */ jal does_script_exist -/* 175644 80246D64 00000000 */ nop +/* 175644 80246D64 00000000 */ nop /* 175648 80246D68 144000A4 */ bnez $v0, .L80246FFC -/* 17564C 80246D6C 00000000 */ nop +/* 17564C 80246D6C 00000000 */ nop /* 175650 80246D70 AE8001D8 */ sw $zero, 0x1d8($s4) .L80246D74: /* 175654 80246D74 8E4201D8 */ lw $v0, 0x1d8($s2) @@ -158,9 +158,9 @@ glabel update_partner_action /* 17565C 80246D7C AE4001D8 */ sw $zero, 0x1d8($s2) /* 175660 80246D80 8E4401E8 */ lw $a0, 0x1e8($s2) /* 175664 80246D84 0C0B1059 */ jal does_script_exist -/* 175668 80246D88 00000000 */ nop +/* 175668 80246D88 00000000 */ nop /* 17566C 80246D8C 1440009B */ bnez $v0, .L80246FFC -/* 175670 80246D90 00000000 */ nop +/* 175670 80246D90 00000000 */ nop /* 175674 80246D94 AE4001D8 */ sw $zero, 0x1d8($s2) .L80246D98: /* 175678 80246D98 0000982D */ daddu $s3, $zero, $zero @@ -175,7 +175,7 @@ glabel update_partner_action /* 175698 80246DB8 26310001 */ addiu $s1, $s1, 1 /* 17569C 80246DBC 8E0401E4 */ lw $a0, 0x1e4($s0) /* 1756A0 80246DC0 0C0B1059 */ jal does_script_exist -/* 1756A4 80246DC4 00000000 */ nop +/* 1756A4 80246DC4 00000000 */ nop /* 1756A8 80246DC8 50400002 */ beql $v0, $zero, .L80246DD4 /* 1756AC 80246DCC AE0001D4 */ sw $zero, 0x1d4($s0) /* 1756B0 80246DD0 24130001 */ addiu $s3, $zero, 1 @@ -197,7 +197,7 @@ glabel update_partner_action /* 1756E4 80246E04 26310001 */ addiu $s1, $s1, 1 /* 1756E8 80246E08 8E0401E8 */ lw $a0, 0x1e8($s0) /* 1756EC 80246E0C 0C0B1059 */ jal does_script_exist -/* 1756F0 80246E10 00000000 */ nop +/* 1756F0 80246E10 00000000 */ nop /* 1756F4 80246E14 50400002 */ beql $v0, $zero, .L80246E20 /* 1756F8 80246E18 AE0001D8 */ sw $zero, 0x1d8($s0) /* 1756FC 80246E1C 24130001 */ addiu $s3, $zero, 1 @@ -225,20 +225,20 @@ glabel update_partner_action /* 175744 80246E64 24630004 */ addiu $v1, $v1, 4 /* 175748 80246E68 82A2008C */ lb $v0, 0x8c($s5) /* 17574C 80246E6C 14400063 */ bnez $v0, .L80246FFC -/* 175750 80246E70 00000000 */ nop +/* 175750 80246E70 00000000 */ nop /* 175754 80246E74 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 175758 80246E78 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 17575C 80246E7C 904200AA */ lbu $v0, 0xaa($v0) /* 175760 80246E80 30420001 */ andi $v0, $v0, 1 /* 175764 80246E84 10400005 */ beqz $v0, .L80246E9C -/* 175768 80246E88 00000000 */ nop +/* 175768 80246E88 00000000 */ nop /* 17576C 80246E8C 0C090464 */ jal func_80241190 /* 175770 80246E90 24040023 */ addiu $a0, $zero, 0x23 /* 175774 80246E94 08091BFF */ j .L80246FFC -/* 175778 80246E98 00000000 */ nop +/* 175778 80246E98 00000000 */ nop .L80246E9C: /* 17577C 80246E9C 0C03A6CC */ jal decrement_status_menu_disabled -/* 175780 80246EA0 00000000 */ nop +/* 175780 80246EA0 00000000 */ nop /* 175784 80246EA4 3C028011 */ lui $v0, %hi(gPlayerData) /* 175788 80246EA8 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* 17578C 80246EAC 80430012 */ lb $v1, 0x12($v0) @@ -260,7 +260,7 @@ glabel update_partner_action /* 1757CC 80246EEC AC620000 */ sw $v0, ($v1) .L80246EF0: /* 1757D0 80246EF0 0C098D19 */ jal func_80263464 -/* 1757D4 80246EF4 00000000 */ nop +/* 1757D4 80246EF4 00000000 */ nop /* 1757D8 80246EF8 144000BD */ bnez $v0, .L802471F0 /* 1757DC 80246EFC 0000882D */ daddu $s1, $zero, $zero /* 1757E0 80246F00 3C060040 */ lui $a2, 0x40 @@ -273,7 +273,7 @@ glabel update_partner_action /* 1757F8 80246F18 8E030000 */ lw $v1, ($s0) /* 1757FC 80246F1C 00661024 */ and $v0, $v1, $a2 /* 175800 80246F20 14400003 */ bnez $v0, .L80246F30 -/* 175804 80246F24 00000000 */ nop +/* 175804 80246F24 00000000 */ nop /* 175808 80246F28 00651025 */ or $v0, $v1, $a1 /* 17580C 80246F2C AE020000 */ sw $v0, ($s0) .L80246F30: @@ -281,13 +281,13 @@ glabel update_partner_action /* 175814 80246F34 1440FFF5 */ bnez $v0, .L80246F0C /* 175818 80246F38 24840004 */ addiu $a0, $a0, 4 /* 17581C 80246F3C 0C099DDF */ jal func_8026777C -/* 175820 80246F40 00000000 */ nop +/* 175820 80246F40 00000000 */ nop /* 175824 80246F44 8283021C */ lb $v1, 0x21c($s4) /* 175828 80246F48 2402000D */ addiu $v0, $zero, 0xd /* 17582C 80246F4C 14620029 */ bne $v1, $v0, .L80246FF4 /* 175830 80246F50 24020014 */ addiu $v0, $zero, 0x14 /* 175834 80246F54 0C098CFA */ jal func_802633E8 -/* 175838 80246F58 00000000 */ nop +/* 175838 80246F58 00000000 */ nop /* 17583C 80246F5C 14400025 */ bnez $v0, .L80246FF4 /* 175840 80246F60 24020014 */ addiu $v0, $zero, 0x14 /* 175844 80246F64 0C093903 */ jal func_8024E40C @@ -306,9 +306,9 @@ glabel update_partner_action /* 175878 80246F98 08091BFF */ j .L80246FFC /* 17587C 80246F9C AE820000 */ sw $v0, ($s4) /* 175880 80246FA0 0C093EAD */ jal is_popup_displayed -/* 175884 80246FA4 00000000 */ nop +/* 175884 80246FA4 00000000 */ nop /* 175888 80246FA8 14400014 */ bnez $v0, .L80246FFC -/* 17588C 80246FAC 00000000 */ nop +/* 17588C 80246FAC 00000000 */ nop /* 175890 80246FB0 0C093903 */ jal func_8024E40C /* 175894 80246FB4 24040002 */ addiu $a0, $zero, 2 /* 175898 80246FB8 0C093936 */ jal move_cam_over @@ -342,13 +342,13 @@ glabel update_partner_action /* 1758FC 8024701C 10620008 */ beq $v1, $v0, .L80247040 /* 175900 80247020 0000982D */ daddu $s3, $zero, $zero /* 175904 80247024 08091C6C */ j .L802471B0 -/* 175908 80247028 00000000 */ nop +/* 175908 80247028 00000000 */ nop .L8024702C: /* 17590C 8024702C 24020016 */ addiu $v0, $zero, 0x16 /* 175910 80247030 10620056 */ beq $v1, $v0, .L8024718C -/* 175914 80247034 00000000 */ nop +/* 175914 80247034 00000000 */ nop /* 175918 80247038 08091C6C */ j .L802471B0 -/* 17591C 8024703C 00000000 */ nop +/* 17591C 8024703C 00000000 */ nop .L80247040: /* 175920 80247040 0260882D */ daddu $s1, $s3, $zero /* 175924 80247044 02A0182D */ daddu $v1, $s5, $zero @@ -369,7 +369,7 @@ glabel update_partner_action /* 175954 80247074 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 175958 80247078 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 17595C 8024707C 08091C6C */ j .L802471B0 -/* 175960 80247080 00000000 */ nop +/* 175960 80247080 00000000 */ nop .L80247084: /* 175964 80247084 0C093903 */ jal func_8024E40C /* 175968 80247088 24040003 */ addiu $a0, $zero, 3 @@ -384,7 +384,7 @@ glabel update_partner_action /* 17598C 802470AC 00220821 */ addu $at, $at, $v0 /* 175990 802470B0 8C22CB68 */ lw $v0, %lo(D_8029CB68)($at) /* 175994 802470B4 00400008 */ jr $v0 -/* 175998 802470B8 00000000 */ nop +/* 175998 802470B8 00000000 */ nop /* 17599C 802470BC 08091C43 */ j .L8024710C /* 1759A0 802470C0 24100012 */ addiu $s0, $zero, 0x12 /* 1759A4 802470C4 08091C43 */ j .L8024710C @@ -427,12 +427,12 @@ glabel update_partner_action /* 175A28 80247148 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 175A2C 8024714C AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 175A30 80247150 08091C6C */ j .L802471B0 -/* 175A34 80247154 00000000 */ nop +/* 175A34 80247154 00000000 */ nop .L80247158: /* 175A38 80247158 0C093EAD */ jal is_popup_displayed -/* 175A3C 8024715C 00000000 */ nop +/* 175A3C 8024715C 00000000 */ nop /* 175A40 80247160 14400013 */ bnez $v0, .L802471B0 -/* 175A44 80247164 00000000 */ nop +/* 175A44 80247164 00000000 */ nop /* 175A48 80247168 0C093903 */ jal func_8024E40C /* 175A4C 8024716C 24040002 */ addiu $a0, $zero, 2 /* 175A50 80247170 0C093936 */ jal move_cam_over @@ -459,15 +459,15 @@ glabel update_partner_action /* 175A94 802471B4 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 175A98 802471B8 2402001E */ addiu $v0, $zero, 0x1e /* 175A9C 802471BC 1462000C */ bne $v1, $v0, .L802471F0 -/* 175AA0 802471C0 00000000 */ nop +/* 175AA0 802471C0 00000000 */ nop /* 175AA4 802471C4 8E8201D4 */ lw $v0, 0x1d4($s4) /* 175AA8 802471C8 50400007 */ beql $v0, $zero, .L802471E8 /* 175AAC 802471CC AE8001D4 */ sw $zero, 0x1d4($s4) /* 175AB0 802471D0 8E8401E4 */ lw $a0, 0x1e4($s4) /* 175AB4 802471D4 0C0B1059 */ jal does_script_exist -/* 175AB8 802471D8 00000000 */ nop +/* 175AB8 802471D8 00000000 */ nop /* 175ABC 802471DC 14400004 */ bnez $v0, .L802471F0 -/* 175AC0 802471E0 00000000 */ nop +/* 175AC0 802471E0 00000000 */ nop /* 175AC4 802471E4 AE8001D4 */ sw $zero, 0x1d4($s4) .L802471E8: /* 175AC8 802471E8 0C090464 */ jal func_80241190 diff --git a/asm/nonmatchings/code_16F740/update_player_action.s b/asm/nonmatchings/code_16F740/update_player_action.s index c00a847fd1..141f569a5f 100644 --- a/asm/nonmatchings/code_16F740/update_player_action.s +++ b/asm/nonmatchings/code_16F740/update_player_action.s @@ -116,7 +116,7 @@ glabel update_player_action /* 174558 80245C78 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 17455C 80245C7C AC30C4DC */ sw $s0, %lo(gBattleStatus+0x46C)($at) /* 174560 80245C80 0809172B */ j .L80245CAC -/* 174564 80245C84 00000000 */ nop +/* 174564 80245C84 00000000 */ nop .L80245C88: /* 174568 80245C88 24020003 */ addiu $v0, $zero, 3 .L80245C8C: @@ -136,18 +136,18 @@ glabel update_player_action /* 17459C 80245CBC 10620005 */ beq $v1, $v0, .L80245CD4 /* 1745A0 80245CC0 24020002 */ addiu $v0, $zero, 2 /* 1745A4 80245CC4 10620023 */ beq $v1, $v0, .L80245D54 -/* 1745A8 80245CC8 00000000 */ nop +/* 1745A8 80245CC8 00000000 */ nop /* 1745AC 80245CCC 0809175E */ j .L80245D78 -/* 1745B0 80245CD0 00000000 */ nop +/* 1745B0 80245CD0 00000000 */ nop .L80245CD4: /* 1745B4 80245CD4 8EA201D4 */ lw $v0, 0x1d4($s5) /* 1745B8 80245CD8 50400007 */ beql $v0, $zero, .L80245CF8 /* 1745BC 80245CDC AEA001D4 */ sw $zero, 0x1d4($s5) /* 1745C0 80245CE0 8EA401E4 */ lw $a0, 0x1e4($s5) /* 1745C4 80245CE4 0C0B1059 */ jal does_script_exist -/* 1745C8 80245CE8 00000000 */ nop +/* 1745C8 80245CE8 00000000 */ nop /* 1745CC 80245CEC 14400022 */ bnez $v0, .L80245D78 -/* 1745D0 80245CF0 00000000 */ nop +/* 1745D0 80245CF0 00000000 */ nop /* 1745D4 80245CF4 AEA001D4 */ sw $zero, 0x1d4($s5) .L80245CF8: /* 1745D8 80245CF8 0C03A752 */ jal is_ability_active @@ -174,7 +174,7 @@ glabel update_player_action /* 174624 80245D44 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 174628 80245D48 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 17462C 80245D4C 0809175E */ j .L80245D78 -/* 174630 80245D50 00000000 */ nop +/* 174630 80245D50 00000000 */ nop .L80245D54: /* 174634 80245D54 3C03802A */ lui $v1, %hi(D_8029F248) /* 174638 80245D58 2463F248 */ addiu $v1, $v1, %lo(D_8029F248) @@ -198,15 +198,15 @@ glabel update_player_action /* 174678 80245D98 1062000A */ beq $v1, $v0, .L80245DC4 /* 17467C 80245D9C 24020015 */ addiu $v0, $zero, 0x15 /* 174680 80245DA0 080918A6 */ j .L80246298 -/* 174684 80245DA4 00000000 */ nop +/* 174684 80245DA4 00000000 */ nop .L80245DA8: /* 174688 80245DA8 2402000B */ addiu $v0, $zero, 0xb /* 17468C 80245DAC 10620120 */ beq $v1, $v0, .L80246230 /* 174690 80245DB0 2402000C */ addiu $v0, $zero, 0xc /* 174694 80245DB4 1062012B */ beq $v1, $v0, .L80246264 -/* 174698 80245DB8 00000000 */ nop +/* 174698 80245DB8 00000000 */ nop /* 17469C 80245DBC 080918A2 */ j .L80246288 -/* 1746A0 80245DC0 00000000 */ nop +/* 1746A0 80245DC0 00000000 */ nop .L80245DC4: /* 1746A4 80245DC4 3C04FFFE */ lui $a0, 0xfffe /* 1746A8 80245DC8 3484FFFF */ ori $a0, $a0, 0xffff @@ -250,15 +250,15 @@ glabel update_player_action /* 174738 80245E58 3C030020 */ lui $v1, 0x20 /* 17473C 80245E5C 00431024 */ and $v0, $v0, $v1 /* 174740 80245E60 1440000A */ bnez $v0, .L80245E8C -/* 174744 80245E64 00000000 */ nop +/* 174744 80245E64 00000000 */ nop /* 174748 80245E68 8EA201D4 */ lw $v0, 0x1d4($s5) /* 17474C 80245E6C 50400007 */ beql $v0, $zero, .L80245E8C /* 174750 80245E70 AEA001D4 */ sw $zero, 0x1d4($s5) /* 174754 80245E74 8EA401E4 */ lw $a0, 0x1e4($s5) /* 174758 80245E78 0C0B1059 */ jal does_script_exist -/* 17475C 80245E7C 00000000 */ nop +/* 17475C 80245E7C 00000000 */ nop /* 174760 80245E80 14400101 */ bnez $v0, .L80246288 -/* 174764 80245E84 00000000 */ nop +/* 174764 80245E84 00000000 */ nop /* 174768 80245E88 AEA001D4 */ sw $zero, 0x1d4($s5) .L80245E8C: /* 17476C 80245E8C 3C04800E */ lui $a0, %hi(gBattleStatus) @@ -269,11 +269,11 @@ glabel update_player_action /* 174780 80245EA0 AC820000 */ sw $v0, ($a0) /* 174784 80245EA4 8EA201D8 */ lw $v0, 0x1d8($s5) /* 174788 80245EA8 10400005 */ beqz $v0, .L80245EC0 -/* 17478C 80245EAC 00000000 */ nop +/* 17478C 80245EAC 00000000 */ nop /* 174790 80245EB0 0C0B1059 */ jal does_script_exist /* 174794 80245EB4 8EA401E8 */ lw $a0, 0x1e8($s5) /* 174798 80245EB8 144000F3 */ bnez $v0, .L80246288 -/* 17479C 80245EBC 00000000 */ nop +/* 17479C 80245EBC 00000000 */ nop .L80245EC0: /* 1747A0 80245EC0 1240000A */ beqz $s2, .L80245EEC /* 1747A4 80245EC4 AEA001D8 */ sw $zero, 0x1d8($s5) @@ -282,9 +282,9 @@ glabel update_player_action /* 1747B0 80245ED0 AE4001D8 */ sw $zero, 0x1d8($s2) /* 1747B4 80245ED4 8E4401E8 */ lw $a0, 0x1e8($s2) /* 1747B8 80245ED8 0C0B1059 */ jal does_script_exist -/* 1747BC 80245EDC 00000000 */ nop +/* 1747BC 80245EDC 00000000 */ nop /* 1747C0 80245EE0 144000E9 */ bnez $v0, .L80246288 -/* 1747C4 80245EE4 00000000 */ nop +/* 1747C4 80245EE4 00000000 */ nop /* 1747C8 80245EE8 AE4001D8 */ sw $zero, 0x1d8($s2) .L80245EEC: /* 1747CC 80245EEC 0000982D */ daddu $s3, $zero, $zero @@ -299,7 +299,7 @@ glabel update_player_action /* 1747EC 80245F0C 26310001 */ addiu $s1, $s1, 1 /* 1747F0 80245F10 8E0401E4 */ lw $a0, 0x1e4($s0) /* 1747F4 80245F14 0C0B1059 */ jal does_script_exist -/* 1747F8 80245F18 00000000 */ nop +/* 1747F8 80245F18 00000000 */ nop /* 1747FC 80245F1C 50400002 */ beql $v0, $zero, .L80245F28 /* 174800 80245F20 AE0001D4 */ sw $zero, 0x1d4($s0) /* 174804 80245F24 24130001 */ addiu $s3, $zero, 1 @@ -321,7 +321,7 @@ glabel update_player_action /* 174838 80245F58 26310001 */ addiu $s1, $s1, 1 /* 17483C 80245F5C 8E0401E8 */ lw $a0, 0x1e8($s0) /* 174840 80245F60 0C0B1059 */ jal does_script_exist -/* 174844 80245F64 00000000 */ nop +/* 174844 80245F64 00000000 */ nop /* 174848 80245F68 50400002 */ beql $v0, $zero, .L80245F74 /* 17484C 80245F6C AE0001D8 */ sw $zero, 0x1d8($s0) /* 174850 80245F70 24130001 */ addiu $s3, $zero, 1 @@ -349,20 +349,20 @@ glabel update_player_action /* 174898 80245FB8 24630004 */ addiu $v1, $v1, 4 /* 17489C 80245FBC 8282008C */ lb $v0, 0x8c($s4) /* 1748A0 80245FC0 144000B1 */ bnez $v0, .L80246288 -/* 1748A4 80245FC4 00000000 */ nop +/* 1748A4 80245FC4 00000000 */ nop /* 1748A8 80245FC8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 1748AC 80245FCC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 1748B0 80245FD0 904200AA */ lbu $v0, 0xaa($v0) /* 1748B4 80245FD4 30420001 */ andi $v0, $v0, 1 /* 1748B8 80245FD8 10400005 */ beqz $v0, .L80245FF0 -/* 1748BC 80245FDC 00000000 */ nop +/* 1748BC 80245FDC 00000000 */ nop /* 1748C0 80245FE0 0C090464 */ jal func_80241190 /* 1748C4 80245FE4 24040023 */ addiu $a0, $zero, 0x23 /* 1748C8 80245FE8 080918A2 */ j .L80246288 -/* 1748CC 80245FEC 00000000 */ nop +/* 1748CC 80245FEC 00000000 */ nop .L80245FF0: /* 1748D0 80245FF0 0C03A6CC */ jal decrement_status_menu_disabled -/* 1748D4 80245FF4 00000000 */ nop +/* 1748D4 80245FF4 00000000 */ nop /* 1748D8 80245FF8 3C10800E */ lui $s0, %hi(gBattleStatus) /* 1748DC 80245FFC 2610C070 */ addiu $s0, $s0, %lo(gBattleStatus) /* 1748E0 80246000 8E020000 */ lw $v0, ($s0) @@ -432,7 +432,7 @@ glabel update_player_action /* 1749CC 802460EC 8E030000 */ lw $v1, ($s0) /* 1749D0 802460F0 00661024 */ and $v0, $v1, $a2 /* 1749D4 802460F4 14400003 */ bnez $v0, .L80246104 -/* 1749D8 802460F8 00000000 */ nop +/* 1749D8 802460F8 00000000 */ nop /* 1749DC 802460FC 00651025 */ or $v0, $v1, $a1 /* 1749E0 80246100 AE020000 */ sw $v0, ($s0) .L80246104: @@ -460,7 +460,7 @@ glabel update_player_action /* 174A2C 8024614C 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 174A30 80246150 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 174A34 80246154 080918A2 */ j .L80246288 -/* 174A38 80246158 00000000 */ nop +/* 174A38 80246158 00000000 */ nop .L8024615C: /* 174A3C 8024615C 0C093903 */ jal func_8024E40C /* 174A40 80246160 24040003 */ addiu $a0, $zero, 3 @@ -475,7 +475,7 @@ glabel update_player_action /* 174A64 80246184 00220821 */ addu $at, $at, $v0 /* 174A68 80246188 8C22CAF0 */ lw $v0, %lo(D_8029CAF0)($at) /* 174A6C 8024618C 00400008 */ jr $v0 -/* 174A70 80246190 00000000 */ nop +/* 174A70 80246190 00000000 */ nop /* 174A74 80246194 08091879 */ j .L802461E4 /* 174A78 80246198 24100012 */ addiu $s0, $zero, 0x12 /* 174A7C 8024619C 08091879 */ j .L802461E4 @@ -518,12 +518,12 @@ glabel update_player_action /* 174B00 80246220 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 174B04 80246224 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 174B08 80246228 080918A2 */ j .L80246288 -/* 174B0C 8024622C 00000000 */ nop +/* 174B0C 8024622C 00000000 */ nop .L80246230: /* 174B10 80246230 0C093EAD */ jal is_popup_displayed -/* 174B14 80246234 00000000 */ nop +/* 174B14 80246234 00000000 */ nop /* 174B18 80246238 14400013 */ bnez $v0, .L80246288 -/* 174B1C 8024623C 00000000 */ nop +/* 174B1C 8024623C 00000000 */ nop /* 174B20 80246240 0C093903 */ jal func_8024E40C /* 174B24 80246244 24040002 */ addiu $a0, $zero, 2 /* 174B28 80246248 0C093936 */ jal move_cam_over @@ -556,15 +556,15 @@ glabel update_player_action /* 174B80 802462A0 10400005 */ beqz $v0, .L802462B8 /* 174B84 802462A4 24020014 */ addiu $v0, $zero, 0x14 /* 174B88 802462A8 10620008 */ beq $v1, $v0, .L802462CC -/* 174B8C 802462AC 00000000 */ nop +/* 174B8C 802462AC 00000000 */ nop /* 174B90 802462B0 080918F9 */ j .L802463E4 -/* 174B94 802462B4 00000000 */ nop +/* 174B94 802462B4 00000000 */ nop .L802462B8: /* 174B98 802462B8 24020016 */ addiu $v0, $zero, 0x16 /* 174B9C 802462BC 10620040 */ beq $v1, $v0, .L802463C0 -/* 174BA0 802462C0 00000000 */ nop +/* 174BA0 802462C0 00000000 */ nop /* 174BA4 802462C4 080918F9 */ j .L802463E4 -/* 174BA8 802462C8 00000000 */ nop +/* 174BA8 802462C8 00000000 */ nop .L802462CC: /* 174BAC 802462CC 82A2021C */ lb $v0, 0x21c($s5) /* 174BB0 802462D0 10400043 */ beqz $v0, .L802463E0 @@ -582,7 +582,7 @@ glabel update_player_action /* 174BE0 80246300 00220821 */ addu $at, $at, $v0 /* 174BE4 80246304 8C22CB10 */ lw $v0, %lo(D_8029CB10)($at) /* 174BE8 80246308 00400008 */ jr $v0 -/* 174BEC 8024630C 00000000 */ nop +/* 174BEC 8024630C 00000000 */ nop /* 174BF0 80246310 080918D6 */ j .L80246358 /* 174BF4 80246314 2410000A */ addiu $s0, $zero, 0xa /* 174BF8 80246318 080918D6 */ j .L80246358 @@ -618,9 +618,9 @@ glabel update_player_action /* 174C68 80246388 AEA20000 */ sw $v0, ($s5) .L8024638C: /* 174C6C 8024638C 0C093EAD */ jal is_popup_displayed -/* 174C70 80246390 00000000 */ nop +/* 174C70 80246390 00000000 */ nop /* 174C74 80246394 14400013 */ bnez $v0, .L802463E4 -/* 174C78 80246398 00000000 */ nop +/* 174C78 80246398 00000000 */ nop /* 174C7C 8024639C 0C093903 */ jal func_8024E40C /* 174C80 802463A0 24040002 */ addiu $a0, $zero, 2 /* 174C84 802463A4 0C093936 */ jal move_cam_over @@ -647,15 +647,15 @@ glabel update_player_action /* 174CC8 802463E8 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 174CCC 802463EC 2402001E */ addiu $v0, $zero, 0x1e /* 174CD0 802463F0 1462000C */ bne $v1, $v0, .L80246424 -/* 174CD4 802463F4 00000000 */ nop +/* 174CD4 802463F4 00000000 */ nop /* 174CD8 802463F8 8EA201D4 */ lw $v0, 0x1d4($s5) /* 174CDC 802463FC 50400007 */ beql $v0, $zero, .L8024641C /* 174CE0 80246400 AEA001D4 */ sw $zero, 0x1d4($s5) /* 174CE4 80246404 8EA401E4 */ lw $a0, 0x1e4($s5) /* 174CE8 80246408 0C0B1059 */ jal does_script_exist -/* 174CEC 8024640C 00000000 */ nop +/* 174CEC 8024640C 00000000 */ nop /* 174CF0 80246410 14400004 */ bnez $v0, .L80246424 -/* 174CF4 80246414 00000000 */ nop +/* 174CF4 80246414 00000000 */ nop /* 174CF8 80246418 AEA001D4 */ sw $zero, 0x1d4($s5) .L8024641C: /* 174CFC 8024641C 0C090464 */ jal func_80241190 diff --git a/asm/nonmatchings/code_16F740/update_player_change_turn.s b/asm/nonmatchings/code_16F740/update_player_change_turn.s index c698170775..b490eb38dd 100644 --- a/asm/nonmatchings/code_16F740/update_player_change_turn.s +++ b/asm/nonmatchings/code_16F740/update_player_change_turn.s @@ -26,7 +26,7 @@ glabel update_player_change_turn /* 174D84 802464A4 24020002 */ addiu $v0, $zero, 2 /* 174D88 802464A8 82630178 */ lb $v1, 0x178($s3) /* 174D8C 802464AC 14620007 */ bne $v1, $v0, .L802464CC -/* 174D90 802464B0 00000000 */ nop +/* 174D90 802464B0 00000000 */ nop /* 174D94 802464B4 82620088 */ lb $v0, 0x88($s3) /* 174D98 802464B8 28420002 */ slti $v0, $v0, 2 /* 174D9C 802464BC 14400003 */ bnez $v0, .L802464CC @@ -39,15 +39,15 @@ glabel update_player_change_turn /* 174DB4 802464D4 3C030400 */ lui $v1, 0x400 /* 174DB8 802464D8 00431024 */ and $v0, $v0, $v1 /* 174DBC 802464DC 1440000D */ bnez $v0, .L80246514 -/* 174DC0 802464E0 00000000 */ nop +/* 174DC0 802464E0 00000000 */ nop /* 174DC4 802464E4 0C03A752 */ jal is_ability_active /* 174DC8 802464E8 24040012 */ addiu $a0, $zero, 0x12 /* 174DCC 802464EC 14400009 */ bnez $v0, .L80246514 -/* 174DD0 802464F0 00000000 */ nop +/* 174DD0 802464F0 00000000 */ nop /* 174DD4 802464F4 0C03A752 */ jal is_ability_active /* 174DD8 802464F8 2404001F */ addiu $a0, $zero, 0x1f /* 174DDC 802464FC 14400005 */ bnez $v0, .L80246514 -/* 174DE0 80246500 00000000 */ nop +/* 174DE0 80246500 00000000 */ nop /* 174DE4 80246504 0C03A752 */ jal is_ability_active /* 174DE8 80246508 24040034 */ addiu $a0, $zero, 0x34 /* 174DEC 8024650C 10400031 */ beqz $v0, .L802465D4 @@ -76,7 +76,7 @@ glabel update_player_change_turn /* 174E40 80246560 24040064 */ addiu $a0, $zero, 0x64 /* 174E44 80246564 28420032 */ slti $v0, $v0, 0x32 /* 174E48 80246568 10400005 */ beqz $v0, .L80246580 -/* 174E4C 8024656C 00000000 */ nop +/* 174E4C 8024656C 00000000 */ nop /* 174E50 80246570 0C03A752 */ jal is_ability_active /* 174E54 80246574 2404001F */ addiu $a0, $zero, 0x1f /* 174E58 80246578 00021840 */ sll $v1, $v0, 1 @@ -86,7 +86,7 @@ glabel update_player_change_turn /* 174E64 80246584 24040064 */ addiu $a0, $zero, 0x64 /* 174E68 80246588 28420032 */ slti $v0, $v0, 0x32 /* 174E6C 8024658C 10400004 */ beqz $v0, .L802465A0 -/* 174E70 80246590 00000000 */ nop +/* 174E70 80246590 00000000 */ nop /* 174E74 80246594 0C03A752 */ jal is_ability_active /* 174E78 80246598 24040012 */ addiu $a0, $zero, 0x12 /* 174E7C 8024659C 02429021 */ addu $s2, $s2, $v0 @@ -109,7 +109,7 @@ glabel update_player_change_turn /* 174EB4 802465D4 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 174EB8 802465D8 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 174EBC 802465DC 080919A8 */ j .L802466A0 -/* 174EC0 802465E0 00000000 */ nop +/* 174EC0 802465E0 00000000 */ nop .L802465E4: /* 174EC4 802465E4 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) /* 174EC8 802465E8 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) @@ -171,11 +171,11 @@ glabel update_player_change_turn /* 174F94 802466B4 24020006 */ addiu $v0, $zero, 6 /* 174F98 802466B8 8E0201D4 */ lw $v0, 0x1d4($s0) /* 174F9C 802466BC 10400005 */ beqz $v0, .L802466D4 -/* 174FA0 802466C0 00000000 */ nop +/* 174FA0 802466C0 00000000 */ nop /* 174FA4 802466C4 0C0B1059 */ jal does_script_exist /* 174FA8 802466C8 8E0401E4 */ lw $a0, 0x1e4($s0) /* 174FAC 802466CC 1440001E */ bnez $v0, .L80246748 -/* 174FB0 802466D0 00000000 */ nop +/* 174FB0 802466D0 00000000 */ nop .L802466D4: /* 174FB4 802466D4 3C03800E */ lui $v1, %hi(gBattleStatus) /* 174FB8 802466D8 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) @@ -214,10 +214,10 @@ glabel update_player_change_turn /* 17502C 8024674C 24020006 */ addiu $v0, $zero, 6 .L80246750: /* 175030 80246750 1462006C */ bne $v1, $v0, .L80246904 -/* 175034 80246754 00000000 */ nop +/* 175034 80246754 00000000 */ nop /* 175038 80246758 86020070 */ lh $v0, 0x70($s0) /* 17503C 8024675C 10400022 */ beqz $v0, .L802467E8 -/* 175040 80246760 00000000 */ nop +/* 175040 80246760 00000000 */ nop /* 175044 80246764 C6000018 */ lwc1 $f0, 0x18($s0) /* 175048 80246768 C6080144 */ lwc1 $f8, 0x144($s0) /* 17504C 8024676C C6020020 */ lwc1 $f2, 0x20($s0) @@ -225,7 +225,7 @@ glabel update_player_change_turn /* 175054 80246774 C604014C */ lwc1 $f4, 0x14c($s0) /* 175058 80246778 46041081 */ sub.s $f2, $f2, $f4 /* 17505C 8024677C 44823000 */ mtc1 $v0, $f6 -/* 175060 80246780 00000000 */ nop +/* 175060 80246780 00000000 */ nop /* 175064 80246784 468031A0 */ cvt.s.w $f6, $f6 /* 175068 80246788 46060003 */ div.s $f0, $f0, $f6 /* 17506C 8024678C 46004200 */ add.s $f8, $f8, $f0 @@ -246,7 +246,7 @@ glabel update_player_change_turn /* 1750A8 802467C8 86020070 */ lh $v0, 0x70($s0) /* 1750AC 802467CC 46040001 */ sub.s $f0, $f0, $f4 /* 1750B0 802467D0 44821000 */ mtc1 $v0, $f2 -/* 1750B4 802467D4 00000000 */ nop +/* 1750B4 802467D4 00000000 */ nop /* 1750B8 802467D8 468010A0 */ cvt.s.w $f2, $f2 /* 1750BC 802467DC 46020003 */ div.s $f0, $f0, $f2 /* 1750C0 802467E0 46002100 */ add.s $f4, $f4, $f0 @@ -256,9 +256,9 @@ glabel update_player_change_turn /* 1750CC 802467EC 3C0140C9 */ lui $at, 0x40c9 /* 1750D0 802467F0 34210FD0 */ ori $at, $at, 0xfd0 /* 1750D4 802467F4 4481B000 */ mtc1 $at, $f22 -/* 1750D8 802467F8 00000000 */ nop +/* 1750D8 802467F8 00000000 */ nop /* 1750DC 802467FC 46166302 */ mul.s $f12, $f12, $f22 -/* 1750E0 80246800 00000000 */ nop +/* 1750E0 80246800 00000000 */ nop /* 1750E4 80246804 3C0143B4 */ lui $at, 0x43b4 /* 1750E8 80246808 4481C000 */ mtc1 $at, $f24 /* 1750EC 8024680C 3C014180 */ lui $at, 0x4180 @@ -266,7 +266,7 @@ glabel update_player_change_turn /* 1750F4 80246814 0C00A85B */ jal sin_rad /* 1750F8 80246818 46186303 */ div.s $f12, $f12, $f24 /* 1750FC 8024681C 46140002 */ mul.s $f0, $f0, $f20 -/* 175100 80246820 00000000 */ nop +/* 175100 80246820 00000000 */ nop /* 175104 80246824 C602014C */ lwc1 $f2, 0x14c($s0) /* 175108 80246828 46001080 */ add.s $f2, $f2, $f0 /* 17510C 8024682C C60C0054 */ lwc1 $f12, 0x54($s0) @@ -275,12 +275,12 @@ glabel update_player_change_turn /* 175118 80246838 E602014C */ swc1 $f2, 0x14c($s0) /* 17511C 8024683C C60C0054 */ lwc1 $f12, 0x54($s0) /* 175120 80246840 46166302 */ mul.s $f12, $f12, $f22 -/* 175124 80246844 00000000 */ nop +/* 175124 80246844 00000000 */ nop /* 175128 80246848 E600018C */ swc1 $f0, 0x18c($s0) /* 17512C 8024684C 0C00A85B */ jal sin_rad /* 175130 80246850 46186303 */ div.s $f12, $f12, $f24 /* 175134 80246854 46140002 */ mul.s $f0, $f0, $f20 -/* 175138 80246858 00000000 */ nop +/* 175138 80246858 00000000 */ nop /* 17513C 8024685C C622014C */ lwc1 $f2, 0x14c($s1) /* 175140 80246860 46001081 */ sub.s $f2, $f2, $f0 /* 175144 80246864 E622014C */ swc1 $f2, 0x14c($s1) @@ -329,18 +329,18 @@ glabel update_player_change_turn /* 1751E8 80246908 8C63C4DC */ lw $v1, %lo(gBattleStatus+0x46C)($v1) /* 1751EC 8024690C 2402000A */ addiu $v0, $zero, 0xa /* 1751F0 80246910 14620078 */ bne $v1, $v0, .L80246AF4 -/* 1751F4 80246914 00000000 */ nop +/* 1751F4 80246914 00000000 */ nop /* 1751F8 80246918 0C098D0D */ jal func_80263434 -/* 1751FC 8024691C 00000000 */ nop +/* 1751FC 8024691C 00000000 */ nop /* 175200 80246920 14400074 */ bnez $v0, .L80246AF4 /* 175204 80246924 24020002 */ addiu $v0, $zero, 2 /* 175208 80246928 82630178 */ lb $v1, 0x178($s3) /* 17520C 8024692C 14620010 */ bne $v1, $v0, .L80246970 -/* 175210 80246930 00000000 */ nop +/* 175210 80246930 00000000 */ nop /* 175214 80246934 82620088 */ lb $v0, 0x88($s3) /* 175218 80246938 28420002 */ slti $v0, $v0, 2 /* 17521C 8024693C 1440000C */ bnez $v0, .L80246970 -/* 175220 80246940 00000000 */ nop +/* 175220 80246940 00000000 */ nop /* 175224 80246944 0C093903 */ jal func_8024E40C /* 175228 80246948 24040002 */ addiu $a0, $zero, 2 /* 17522C 8024694C 0C093936 */ jal move_cam_over @@ -380,14 +380,14 @@ glabel update_player_change_turn /* 1752A8 802469C8 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1752AC 802469CC AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1752B0 802469D0 08091ABD */ j .L80246AF4 -/* 1752B4 802469D4 00000000 */ nop +/* 1752B4 802469D4 00000000 */ nop .L802469D8: /* 1752B8 802469D8 3C05800E */ lui $a1, %hi(gBattleStatus) /* 1752BC 802469DC 24A5C070 */ addiu $a1, $a1, %lo(gBattleStatus) /* 1752C0 802469E0 8CA20000 */ lw $v0, ($a1) /* 1752C4 802469E4 00441024 */ and $v0, $v0, $a0 /* 1752C8 802469E8 10400006 */ beqz $v0, .L80246A04 -/* 1752CC 802469EC 00000000 */ nop +/* 1752CC 802469EC 00000000 */ nop /* 1752D0 802469F0 8262008B */ lb $v0, 0x8b($s3) /* 1752D4 802469F4 9263008B */ lbu $v1, 0x8b($s3) /* 1752D8 802469F8 1040000E */ beqz $v0, .L80246A34 @@ -424,7 +424,7 @@ glabel update_player_change_turn /* 175344 80246A64 3C040400 */ lui $a0, 0x400 /* 175348 80246A68 00441024 */ and $v0, $v0, $a0 /* 17534C 80246A6C 10400006 */ beqz $v0, .L80246A88 -/* 175350 80246A70 00000000 */ nop +/* 175350 80246A70 00000000 */ nop /* 175354 80246A74 8262008B */ lb $v0, 0x8b($s3) /* 175358 80246A78 9263008B */ lbu $v1, 0x8b($s3) /* 17535C 80246A7C 1040000E */ beqz $v0, .L80246AB8 @@ -461,7 +461,7 @@ glabel update_player_change_turn /* 1753C8 80246AE8 24040009 */ addiu $a0, $zero, 9 .L80246AEC: /* 1753CC 80246AEC 0C090464 */ jal func_80241190 -/* 1753D0 80246AF0 00000000 */ nop +/* 1753D0 80246AF0 00000000 */ nop .L80246AF4: /* 1753D4 80246AF4 8FBF0030 */ lw $ra, 0x30($sp) /* 1753D8 80246AF8 8FB7002C */ lw $s7, 0x2c($sp) diff --git a/asm/nonmatchings/code_16F740/update_run_away.s b/asm/nonmatchings/code_16F740/update_run_away.s index d29d3d8f90..534331536c 100644 --- a/asm/nonmatchings/code_16F740/update_run_away.s +++ b/asm/nonmatchings/code_16F740/update_run_away.s @@ -22,9 +22,9 @@ glabel update_run_away /* 173824 80244F44 12000005 */ beqz $s0, .L80244F5C /* 173828 80244F48 24020002 */ addiu $v0, $zero, 2 /* 17382C 80244F4C 12020060 */ beq $s0, $v0, .L802450D0 -/* 173830 80244F50 00000000 */ nop +/* 173830 80244F50 00000000 */ nop /* 173834 80244F54 0809146D */ j .L802451B4 -/* 173838 80244F58 00000000 */ nop +/* 173838 80244F58 00000000 */ nop .L80244F5C: /* 17383C 80244F5C 3C03FFFB */ lui $v1, 0xfffb /* 173840 80244F60 3463FFFF */ ori $v1, $v1, 0xffff @@ -62,7 +62,7 @@ glabel update_run_away /* 1738BC 80244FDC 90430018 */ lbu $v1, 0x18($v0) /* 1738C0 80244FE0 90820210 */ lbu $v0, 0x210($a0) /* 1738C4 80244FE4 44830000 */ mtc1 $v1, $f0 -/* 1738C8 80244FE8 00000000 */ nop +/* 1738C8 80244FE8 00000000 */ nop /* 1738CC 80244FEC 46800020 */ cvt.s.w $f0, $f0 /* 1738D0 80244FF0 2442FFFD */ addiu $v0, $v0, -3 /* 1738D4 80244FF4 2C420006 */ sltiu $v0, $v0, 6 @@ -70,7 +70,7 @@ glabel update_run_away /* 1738DC 80244FFC 26100001 */ addiu $s0, $s0, 1 /* 1738E0 80245000 3C0142C8 */ lui $at, 0x42c8 /* 1738E4 80245004 44810000 */ mtc1 $at, $f0 -/* 1738E8 80245008 00000000 */ nop +/* 1738E8 80245008 00000000 */ nop .L8024500C: /* 1738EC 8024500C 46001080 */ add.s $f2, $f2, $f0 /* 1738F0 80245010 24C60001 */ addiu $a2, $a2, 1 @@ -79,7 +79,7 @@ glabel update_run_away /* 1738F8 80245018 1440FFE5 */ bnez $v0, .L80244FB0 /* 1738FC 8024501C 24A50004 */ addiu $a1, $a1, 4 /* 173900 80245020 44900000 */ mtc1 $s0, $f0 -/* 173904 80245024 00000000 */ nop +/* 173904 80245024 00000000 */ nop /* 173908 80245028 46800020 */ cvt.s.w $f0, $f0 /* 17390C 8024502C 46001003 */ div.s $f0, $f2, $f0 /* 173910 80245030 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -124,12 +124,12 @@ glabel update_run_away /* 1739A0 802450C0 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1739A4 802450C4 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1739A8 802450C8 0809146D */ j .L802451B4 -/* 1739AC 802450CC 00000000 */ nop +/* 1739AC 802450CC 00000000 */ nop .L802450D0: /* 1739B0 802450D0 0C0B1059 */ jal does_script_exist /* 1739B4 802450D4 8E6401E4 */ lw $a0, 0x1e4($s3) /* 1739B8 802450D8 14400036 */ bnez $v0, .L802451B4 -/* 1739BC 802450DC 00000000 */ nop +/* 1739BC 802450DC 00000000 */ nop /* 1739C0 802450E0 8222008C */ lb $v0, 0x8c($s1) /* 1739C4 802450E4 14400033 */ bnez $v0, .L802451B4 /* 1739C8 802450E8 3C030004 */ lui $v1, 4 @@ -151,9 +151,9 @@ glabel update_run_away /* 173A04 80245124 AE820000 */ sw $v0, ($s4) .L80245128: /* 173A08 80245128 0C03A6B9 */ jal status_menu_start_blinking_starpoints -/* 173A0C 8024512C 00000000 */ nop +/* 173A0C 8024512C 00000000 */ nop /* 173A10 80245130 0C08F841 */ jal func_8023E104 -/* 173A14 80245134 00000000 */ nop +/* 173A14 80245134 00000000 */ nop /* 173A18 80245138 82230078 */ lb $v1, 0x78($s1) /* 173A1C 8024513C 00031040 */ sll $v0, $v1, 1 /* 173A20 80245140 00431021 */ addu $v0, $v0, $v1 @@ -169,7 +169,7 @@ glabel update_run_away /* 173A44 80245164 14610004 */ bne $v1, $at, .L80245178 /* 173A48 80245168 3C018000 */ lui $at, 0x8000 /* 173A4C 8024516C 14410002 */ bne $v0, $at, .L80245178 -/* 173A50 80245170 00000000 */ nop +/* 173A50 80245170 00000000 */ nop /* 173A54 80245174 0006000D */ break 6 .L80245178: /* 173A58 80245178 00002012 */ mflo $a0 @@ -231,7 +231,7 @@ glabel update_run_away /* 173B30 80245250 AC620000 */ sw $v0, ($v1) /* 173B34 80245254 82220078 */ lb $v0, 0x78($s1) /* 173B38 80245258 10400004 */ beqz $v0, .L8024526C -/* 173B3C 8024525C 00000000 */ nop +/* 173B3C 8024525C 00000000 */ nop /* 173B40 80245260 92A20010 */ lbu $v0, 0x10($s5) /* 173B44 80245264 24420001 */ addiu $v0, $v0, 1 /* 173B48 80245268 A2A20010 */ sb $v0, 0x10($s5) @@ -244,7 +244,7 @@ glabel update_run_away .L80245280: /* 173B60 80245280 82220078 */ lb $v0, 0x78($s1) /* 173B64 80245284 1440000F */ bnez $v0, .L802452C4 -/* 173B68 80245288 00000000 */ nop +/* 173B68 80245288 00000000 */ nop /* 173B6C 8024528C 3C03802A */ lui $v1, %hi(D_8029F250) /* 173B70 80245290 2463F250 */ addiu $v1, $v1, %lo(D_8029F250) /* 173B74 80245294 8C620000 */ lw $v0, ($v1) @@ -254,9 +254,9 @@ glabel update_run_away /* 173B84 802452A4 AC620000 */ sw $v0, ($v1) .L802452A8: /* 173B88 802452A8 0C03A6C3 */ jal status_menu_stop_blinking_starpoints -/* 173B8C 802452AC 00000000 */ nop +/* 173B8C 802452AC 00000000 */ nop /* 173B90 802452B0 0C08F847 */ jal func_8023E11C -/* 173B94 802452B4 00000000 */ nop +/* 173B94 802452B4 00000000 */ nop /* 173B98 802452B8 2402000B */ addiu $v0, $zero, 0xb /* 173B9C 802452BC 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 173BA0 802452C0 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) @@ -291,9 +291,9 @@ glabel update_run_away /* 173C04 80245324 10620005 */ beq $v1, $v0, .L8024533C /* 173C08 80245328 24020004 */ addiu $v0, $zero, 4 /* 173C0C 8024532C 10620022 */ beq $v1, $v0, .L802453B8 -/* 173C10 80245330 00000000 */ nop +/* 173C10 80245330 00000000 */ nop /* 173C14 80245334 08091505 */ j .L80245414 -/* 173C18 80245338 00000000 */ nop +/* 173C18 80245338 00000000 */ nop .L8024533C: /* 173C1C 8024533C 3C048028 */ lui $a0, %hi(PlayerScriptDispatcher) /* 173C20 80245340 24844EBC */ addiu $a0, $a0, %lo(PlayerScriptDispatcher) @@ -327,7 +327,7 @@ glabel update_run_away /* 173C88 802453A8 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 173C8C 802453AC AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 173C90 802453B0 08091505 */ j .L80245414 -/* 173C94 802453B4 00000000 */ nop +/* 173C94 802453B4 00000000 */ nop .L802453B8: /* 173C98 802453B8 3C03802A */ lui $v1, %hi(D_8029F248) /* 173C9C 802453BC 2463F248 */ addiu $v1, $v1, %lo(D_8029F248) @@ -339,19 +339,19 @@ glabel update_run_away .L802453D4: /* 173CB4 802453D4 8E6401E4 */ lw $a0, 0x1e4($s3) /* 173CB8 802453D8 0C0B1059 */ jal does_script_exist -/* 173CBC 802453DC 00000000 */ nop +/* 173CBC 802453DC 00000000 */ nop /* 173CC0 802453E0 1440000C */ bnez $v0, .L80245414 -/* 173CC4 802453E4 00000000 */ nop +/* 173CC4 802453E4 00000000 */ nop /* 173CC8 802453E8 12400005 */ beqz $s2, .L80245400 -/* 173CCC 802453EC 00000000 */ nop +/* 173CCC 802453EC 00000000 */ nop /* 173CD0 802453F0 0C0B1059 */ jal does_script_exist /* 173CD4 802453F4 8E4401E4 */ lw $a0, 0x1e4($s2) /* 173CD8 802453F8 14400006 */ bnez $v0, .L80245414 -/* 173CDC 802453FC 00000000 */ nop +/* 173CDC 802453FC 00000000 */ nop .L80245400: /* 173CE0 80245400 8222008C */ lb $v0, 0x8c($s1) /* 173CE4 80245404 14400003 */ bnez $v0, .L80245414 -/* 173CE8 80245408 00000000 */ nop +/* 173CE8 80245408 00000000 */ nop /* 173CEC 8024540C 0C090464 */ jal func_80241190 /* 173CF0 80245410 24040009 */ addiu $a0, $zero, 9 .L80245414: diff --git a/asm/nonmatchings/code_16F740/update_swap_partner.s b/asm/nonmatchings/code_16F740/update_swap_partner.s index 93835dddfc..2b76e29fc3 100644 --- a/asm/nonmatchings/code_16F740/update_swap_partner.s +++ b/asm/nonmatchings/code_16F740/update_swap_partner.s @@ -22,7 +22,7 @@ glabel update_swap_partner /* 17401C 8024573C 00220821 */ addu $at, $at, $v0 /* 174020 80245740 8C22CAD0 */ lw $v0, %lo(D_8029CAD0)($at) /* 174024 80245744 00400008 */ jr $v0 -/* 174028 80245748 00000000 */ nop +/* 174028 80245748 00000000 */ nop /* 17402C 8024574C 3C03F7FF */ lui $v1, 0xf7ff /* 174030 80245750 8E020000 */ lw $v0, ($s0) /* 174034 80245754 3463FFFF */ ori $v1, $v1, 0xffff @@ -45,7 +45,7 @@ glabel update_swap_partner /* 174078 80245798 3C014220 */ lui $at, 0x4220 /* 17407C 8024579C 44817000 */ mtc1 $at, $f14 /* 174080 802457A0 0C093948 */ jal set_cam_target_pos -/* 174084 802457A4 00000000 */ nop +/* 174084 802457A4 00000000 */ nop /* 174088 802457A8 0C093965 */ jal set_cam_zoom /* 17408C 802457AC 24040174 */ addiu $a0, $zero, 0x174 /* 174090 802457B0 0C093978 */ jal set_cam_zoffset @@ -89,7 +89,7 @@ glabel update_swap_partner /* 174120 80245840 AC620000 */ sw $v0, ($v1) .L80245844: /* 174124 80245844 0C098EF2 */ jal deduct_current_move_fp -/* 174128 80245848 00000000 */ nop +/* 174128 80245848 00000000 */ nop /* 17412C 8024584C 3C048028 */ lui $a0, %hi(BtlPutPartnerAway) /* 174130 80245850 24840A34 */ addiu $a0, $a0, %lo(BtlPutPartnerAway) /* 174134 80245854 2405000A */ addiu $a1, $zero, 0xa @@ -112,9 +112,9 @@ glabel update_swap_partner /* 174178 80245898 E6600020 */ swc1 $f0, 0x20($s3) /* 17417C 8024589C 8E4400C0 */ lw $a0, 0xc0($s2) /* 174180 802458A0 0C0B1059 */ jal does_script_exist -/* 174184 802458A4 00000000 */ nop +/* 174184 802458A4 00000000 */ nop /* 174188 802458A8 14400080 */ bnez $v0, .L80245AAC -/* 17418C 802458AC 00000000 */ nop +/* 17418C 802458AC 00000000 */ nop /* 174190 802458B0 0C0902EF */ jal delete_actor /* 174194 802458B4 0220202D */ daddu $a0, $s1, $zero /* 174198 802458B8 924301AC */ lbu $v1, 0x1ac($s2) @@ -126,7 +126,7 @@ glabel update_swap_partner /* 1741B0 802458D0 3C013DCC */ lui $at, 0x3dcc /* 1741B4 802458D4 3421CCCD */ ori $at, $at, 0xcccd /* 1741B8 802458D8 44810000 */ mtc1 $at, $f0 -/* 1741BC 802458DC 00000000 */ nop +/* 1741BC 802458DC 00000000 */ nop /* 1741C0 802458E0 E6200170 */ swc1 $f0, 0x170($s1) /* 1741C4 802458E4 E6200174 */ swc1 $f0, 0x174($s1) /* 1741C8 802458E8 E6200178 */ swc1 $f0, 0x178($s1) @@ -151,11 +151,11 @@ glabel update_swap_partner /* 174214 80245934 E620014C */ swc1 $f0, 0x14c($s1) /* 174218 80245938 8E5100DC */ lw $s1, 0xdc($s2) /* 17421C 8024593C 12200006 */ beqz $s1, .L80245958 -/* 174220 80245940 00000000 */ nop +/* 174220 80245940 00000000 */ nop /* 174224 80245944 0C0B1059 */ jal does_script_exist /* 174228 80245948 8E2401E4 */ lw $a0, 0x1e4($s1) /* 17422C 8024594C 14400057 */ bnez $v0, .L80245AAC -/* 174230 80245950 00000000 */ nop +/* 174230 80245950 00000000 */ nop /* 174234 80245954 AE2001D4 */ sw $zero, 0x1d4($s1) .L80245958: /* 174238 80245958 3C048028 */ lui $a0, %hi(BtlBringPartnerOut) @@ -175,9 +175,9 @@ glabel update_swap_partner /* 174270 80245990 AC820148 */ sw $v0, 0x148($a0) /* 174274 80245994 8E4400C0 */ lw $a0, 0xc0($s2) /* 174278 80245998 0C0B1059 */ jal does_script_exist -/* 17427C 8024599C 00000000 */ nop +/* 17427C 8024599C 00000000 */ nop /* 174280 802459A0 14400042 */ bnez $v0, .L80245AAC -/* 174284 802459A4 00000000 */ nop +/* 174284 802459A4 00000000 */ nop /* 174288 802459A8 8E5100DC */ lw $s1, 0xdc($s2) /* 17428C 802459AC 12200010 */ beqz $s1, .L802459F0 /* 174290 802459B0 24020006 */ addiu $v0, $zero, 6 @@ -201,17 +201,17 @@ glabel update_swap_partner /* 1742D0 802459F0 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 1742D4 802459F4 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 1742D8 802459F8 080916AB */ j .L80245AAC -/* 1742DC 802459FC 00000000 */ nop +/* 1742DC 802459FC 00000000 */ nop /* 1742E0 80245A00 8E5100DC */ lw $s1, 0xdc($s2) /* 1742E4 80245A04 12200008 */ beqz $s1, .L80245A28 -/* 1742E8 80245A08 00000000 */ nop +/* 1742E8 80245A08 00000000 */ nop /* 1742EC 80245A0C 8E2201CC */ lw $v0, 0x1cc($s1) /* 1742F0 80245A10 10400005 */ beqz $v0, .L80245A28 -/* 1742F4 80245A14 00000000 */ nop +/* 1742F4 80245A14 00000000 */ nop /* 1742F8 80245A18 0C0B1059 */ jal does_script_exist /* 1742FC 80245A1C 8E2401EC */ lw $a0, 0x1ec($s1) /* 174300 80245A20 14400022 */ bnez $v0, .L80245AAC -/* 174304 80245A24 00000000 */ nop +/* 174304 80245A24 00000000 */ nop .L80245A28: /* 174308 80245A28 0C093903 */ jal func_8024E40C /* 17430C 80245A2C 24040002 */ addiu $a0, $zero, 2 @@ -219,7 +219,7 @@ glabel update_swap_partner /* 174314 80245A34 3C01800E */ lui $at, %hi(gBattleStatus+0x46C) /* 174318 80245A38 AC22C4DC */ sw $v0, %lo(gBattleStatus+0x46C)($at) /* 17431C 80245A3C 080916AB */ j .L80245AAC -/* 174320 80245A40 00000000 */ nop +/* 174320 80245A40 00000000 */ nop /* 174324 80245A44 8242008C */ lb $v0, 0x8c($s2) /* 174328 80245A48 14400018 */ bnez $v0, .L80245AAC /* 17432C 80245A4C 2403FFEF */ addiu $v1, $zero, -0x11 @@ -247,7 +247,7 @@ glabel update_swap_partner /* 174380 80245AA0 2404000C */ addiu $a0, $zero, 0xc .L80245AA4: /* 174384 80245AA4 0C090464 */ jal func_80241190 -/* 174388 80245AA8 00000000 */ nop +/* 174388 80245AA8 00000000 */ nop .L80245AAC: /* 17438C 80245AAC 8FBF0020 */ lw $ra, 0x20($sp) /* 174390 80245AB0 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_1776B0/AddBattleCamOffsetZ.s b/asm/nonmatchings/code_1776B0/AddBattleCamOffsetZ.s index ed0bb722b0..a743074c90 100644 --- a/asm/nonmatchings/code_1776B0/AddBattleCamOffsetZ.s +++ b/asm/nonmatchings/code_1776B0/AddBattleCamOffsetZ.s @@ -11,7 +11,7 @@ glabel AddBattleCamOffsetZ /* 17D390 8024EAB0 24020002 */ addiu $v0, $zero, 2 /* 17D394 8024EAB4 8CA50000 */ lw $a1, ($a1) /* 17D398 8024EAB8 0C0B1EAF */ jal get_variable -/* 17D39C 8024EABC 00000000 */ nop +/* 17D39C 8024EABC 00000000 */ nop /* 17D3A0 8024EAC0 3C04802A */ lui $a0, %hi(D_8029F286) /* 17D3A4 8024EAC4 2484F286 */ addiu $a0, $a0, %lo(D_8029F286) /* 17D3A8 8024EAC8 94830000 */ lhu $v1, ($a0) diff --git a/asm/nonmatchings/code_1776B0/AddBattleCamZoom.s b/asm/nonmatchings/code_1776B0/AddBattleCamZoom.s index 478f269054..cef25026af 100644 --- a/asm/nonmatchings/code_1776B0/AddBattleCamZoom.s +++ b/asm/nonmatchings/code_1776B0/AddBattleCamZoom.s @@ -11,7 +11,7 @@ glabel AddBattleCamZoom /* 17D5A4 8024ECC4 24020002 */ addiu $v0, $zero, 2 /* 17D5A8 8024ECC8 8CA50000 */ lw $a1, ($a1) /* 17D5AC 8024ECCC 0C0B1EAF */ jal get_variable -/* 17D5B0 8024ECD0 00000000 */ nop +/* 17D5B0 8024ECD0 00000000 */ nop /* 17D5B4 8024ECD4 3C04802A */ lui $a0, %hi(D_8029F280) /* 17D5B8 8024ECD8 2484F280 */ addiu $a0, $a0, %lo(D_8029F280) /* 17D5BC 8024ECDC 94830000 */ lhu $v1, ($a0) diff --git a/asm/nonmatchings/code_1776B0/BattleCamTargetActor.s b/asm/nonmatchings/code_1776B0/BattleCamTargetActor.s index 17c4a793ee..b0d1c875f4 100644 --- a/asm/nonmatchings/code_1776B0/BattleCamTargetActor.s +++ b/asm/nonmatchings/code_1776B0/BattleCamTargetActor.s @@ -17,11 +17,11 @@ glabel BattleCamTargetActor /* 17D434 8024EB54 0040202D */ daddu $a0, $v0, $zero /* 17D438 8024EB58 2402FF81 */ addiu $v0, $zero, -0x7f /* 17D43C 8024EB5C 14820002 */ bne $a0, $v0, .L8024EB68 -/* 17D440 8024EB60 00000000 */ nop +/* 17D440 8024EB60 00000000 */ nop /* 17D444 8024EB64 8E040148 */ lw $a0, 0x148($s0) .L8024EB68: /* 17D448 8024EB68 0C09390F */ jal cam_target_actor -/* 17D44C 8024EB6C 00000000 */ nop +/* 17D44C 8024EB6C 00000000 */ nop /* 17D450 8024EB70 24020002 */ addiu $v0, $zero, 2 .L8024EB74: /* 17D454 8024EB74 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_1776B0/MoveBattleCamOver.s b/asm/nonmatchings/code_1776B0/MoveBattleCamOver.s index 8ff59d4e7d..0a2d26f5ab 100644 --- a/asm/nonmatchings/code_1776B0/MoveBattleCamOver.s +++ b/asm/nonmatchings/code_1776B0/MoveBattleCamOver.s @@ -11,7 +11,7 @@ glabel MoveBattleCamOver /* 17D500 8024EC20 24020002 */ addiu $v0, $zero, 2 /* 17D504 8024EC24 8CA50000 */ lw $a1, ($a1) /* 17D508 8024EC28 0C0B1EAF */ jal get_variable -/* 17D50C 8024EC2C 00000000 */ nop +/* 17D50C 8024EC2C 00000000 */ nop /* 17D510 8024EC30 3C03800E */ lui $v1, %hi(gBattleStatus) /* 17D514 8024EC34 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) /* 17D518 8024EC38 8C6400C4 */ lw $a0, 0xc4($v1) @@ -22,7 +22,7 @@ glabel MoveBattleCamOver /* 17D52C 8024EC4C 10800004 */ beqz $a0, .L8024EC60 /* 17D530 8024EC50 24020002 */ addiu $v0, $zero, 2 /* 17D534 8024EC54 0C0B0F41 */ jal restart_script -/* 17D538 8024EC58 00000000 */ nop +/* 17D538 8024EC58 00000000 */ nop /* 17D53C 8024EC5C 24020002 */ addiu $v0, $zero, 2 .L8024EC60: /* 17D540 8024EC60 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_1776B0/SetBattleCamOffsetZ.s b/asm/nonmatchings/code_1776B0/SetBattleCamOffsetZ.s index 80422b5bfc..73eb38a1a6 100644 --- a/asm/nonmatchings/code_1776B0/SetBattleCamOffsetZ.s +++ b/asm/nonmatchings/code_1776B0/SetBattleCamOffsetZ.s @@ -11,7 +11,7 @@ glabel SetBattleCamOffsetZ /* 17D350 8024EA70 24020002 */ addiu $v0, $zero, 2 /* 17D354 8024EA74 8CA50000 */ lw $a1, ($a1) /* 17D358 8024EA78 0C0B1EAF */ jal get_variable -/* 17D35C 8024EA7C 00000000 */ nop +/* 17D35C 8024EA7C 00000000 */ nop /* 17D360 8024EA80 3C01802A */ lui $at, %hi(D_8029F286) /* 17D364 8024EA84 A422F286 */ sh $v0, %lo(D_8029F286)($at) /* 17D368 8024EA88 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_1776B0/SetBattleCamTarget.s b/asm/nonmatchings/code_1776B0/SetBattleCamTarget.s index af6f5b7edf..9b55180a00 100644 --- a/asm/nonmatchings/code_1776B0/SetBattleCamTarget.s +++ b/asm/nonmatchings/code_1776B0/SetBattleCamTarget.s @@ -16,7 +16,7 @@ glabel SetBattleCamTarget /* 17D218 8024E938 0C0B1EAF */ jal get_variable /* 17D21C 8024E93C 26100004 */ addiu $s0, $s0, 4 /* 17D220 8024E940 44820000 */ mtc1 $v0, $f0 -/* 17D224 8024E944 00000000 */ nop +/* 17D224 8024E944 00000000 */ nop /* 17D228 8024E948 46800020 */ cvt.s.w $f0, $f0 /* 17D22C 8024E94C 3C01802A */ lui $at, %hi(D_8029F270) /* 17D230 8024E950 E420F270 */ swc1 $f0, %lo(D_8029F270)($at) @@ -25,7 +25,7 @@ glabel SetBattleCamTarget /* 17D23C 8024E95C 0C0B1EAF */ jal get_variable /* 17D240 8024E960 0220202D */ daddu $a0, $s1, $zero /* 17D244 8024E964 44820000 */ mtc1 $v0, $f0 -/* 17D248 8024E968 00000000 */ nop +/* 17D248 8024E968 00000000 */ nop /* 17D24C 8024E96C 46800020 */ cvt.s.w $f0, $f0 /* 17D250 8024E970 3C01802A */ lui $at, %hi(D_8029F274) /* 17D254 8024E974 E420F274 */ swc1 $f0, %lo(D_8029F274)($at) @@ -33,7 +33,7 @@ glabel SetBattleCamTarget /* 17D25C 8024E97C 0C0B1EAF */ jal get_variable /* 17D260 8024E980 0220202D */ daddu $a0, $s1, $zero /* 17D264 8024E984 44820000 */ mtc1 $v0, $f0 -/* 17D268 8024E988 00000000 */ nop +/* 17D268 8024E988 00000000 */ nop /* 17D26C 8024E98C 46800020 */ cvt.s.w $f0, $f0 /* 17D270 8024E990 3C01802A */ lui $at, %hi(D_8029F278) /* 17D274 8024E994 E420F278 */ swc1 $f0, %lo(D_8029F278)($at) diff --git a/asm/nonmatchings/code_1776B0/SetBattleCamYaw.s b/asm/nonmatchings/code_1776B0/SetBattleCamYaw.s index e5a93f55b0..094ebd0717 100644 --- a/asm/nonmatchings/code_1776B0/SetBattleCamYaw.s +++ b/asm/nonmatchings/code_1776B0/SetBattleCamYaw.s @@ -11,7 +11,7 @@ glabel SetBattleCamYaw /* 17D3DC 8024EAFC 24020002 */ addiu $v0, $zero, 2 /* 17D3E0 8024EB00 8CA50000 */ lw $a1, ($a1) /* 17D3E4 8024EB04 0C0B1EAF */ jal get_variable -/* 17D3E8 8024EB08 00000000 */ nop +/* 17D3E8 8024EB08 00000000 */ nop /* 17D3EC 8024EB0C 3C01802A */ lui $at, %hi(D_8029F282) /* 17D3F0 8024EB10 A422F282 */ sh $v0, %lo(D_8029F282)($at) /* 17D3F4 8024EB14 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_1776B0/SetBattleCamZoom.s b/asm/nonmatchings/code_1776B0/SetBattleCamZoom.s index 84f33492db..bad9496cd6 100644 --- a/asm/nonmatchings/code_1776B0/SetBattleCamZoom.s +++ b/asm/nonmatchings/code_1776B0/SetBattleCamZoom.s @@ -11,7 +11,7 @@ glabel SetBattleCamZoom /* 17D564 8024EC84 24020002 */ addiu $v0, $zero, 2 /* 17D568 8024EC88 8CA50000 */ lw $a1, ($a1) /* 17D56C 8024EC8C 0C0B1EAF */ jal get_variable -/* 17D570 8024EC90 00000000 */ nop +/* 17D570 8024EC90 00000000 */ nop /* 17D574 8024EC94 3C01802A */ lui $at, %hi(D_8029F280) /* 17D578 8024EC98 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17D57C 8024EC9C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_1776B0/UseCamPreset.s b/asm/nonmatchings/code_1776B0/UseCamPreset.s index 7511445cde..0426051068 100644 --- a/asm/nonmatchings/code_1776B0/UseCamPreset.s +++ b/asm/nonmatchings/code_1776B0/UseCamPreset.s @@ -11,7 +11,7 @@ glabel UseCamPreset /* 17CF14 8024E634 24020002 */ addiu $v0, $zero, 2 /* 17CF18 8024E638 8CA50000 */ lw $a1, ($a1) /* 17CF1C 8024E63C 0C0B1EAF */ jal get_variable -/* 17CF20 8024E640 00000000 */ nop +/* 17CF20 8024E640 00000000 */ nop /* 17CF24 8024E644 3C01802A */ lui $at, %hi(D_8029F2A4) /* 17CF28 8024E648 A020F2A4 */ sb $zero, %lo(D_8029F2A4)($at) /* 17CF2C 8024E64C 0C0933CD */ jal use_cam_preset diff --git a/asm/nonmatchings/code_1776B0/add_cam_zoom.s b/asm/nonmatchings/code_1776B0/add_cam_zoom.s index 229d317222..8ed23f0944 100644 --- a/asm/nonmatchings/code_1776B0/add_cam_zoom.s +++ b/asm/nonmatchings/code_1776B0/add_cam_zoom.s @@ -5,7 +5,7 @@ glabel add_cam_zoom /* 17CE94 8024E5B4 3C028028 */ lui $v0, %hi(D_80280CE0) /* 17CE98 8024E5B8 80420CE0 */ lb $v0, %lo(D_80280CE0)($v0) /* 17CE9C 8024E5BC 14400006 */ bnez $v0, .L8024E5D8 -/* 17CEA0 8024E5C0 00000000 */ nop +/* 17CEA0 8024E5C0 00000000 */ nop /* 17CEA4 8024E5C4 3C03802A */ lui $v1, %hi(D_8029F280) /* 17CEA8 8024E5C8 2463F280 */ addiu $v1, $v1, %lo(D_8029F280) /* 17CEAC 8024E5CC 94620000 */ lhu $v0, ($v1) @@ -13,4 +13,4 @@ glabel add_cam_zoom /* 17CEB4 8024E5D4 A4620000 */ sh $v0, ($v1) .L8024E5D8: /* 17CEB8 8024E5D8 03E00008 */ jr $ra -/* 17CEBC 8024E5DC 00000000 */ nop +/* 17CEBC 8024E5DC 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/cam_target_actor.s b/asm/nonmatchings/code_1776B0/cam_target_actor.s index 130756f076..df8ce5bd66 100644 --- a/asm/nonmatchings/code_1776B0/cam_target_actor.s +++ b/asm/nonmatchings/code_1776B0/cam_target_actor.s @@ -5,9 +5,9 @@ glabel cam_target_actor /* 17CD1C 8024E43C 3C028028 */ lui $v0, %hi(D_80280CE0) /* 17CD20 8024E440 80420CE0 */ lb $v0, %lo(D_80280CE0)($v0) /* 17CD24 8024E444 14400003 */ bnez $v0, .L8024E454 -/* 17CD28 8024E448 00000000 */ nop +/* 17CD28 8024E448 00000000 */ nop /* 17CD2C 8024E44C 3C01802A */ lui $at, %hi(D_8029F27C) /* 17CD30 8024E450 A424F27C */ sh $a0, %lo(D_8029F27C)($at) .L8024E454: /* 17CD34 8024E454 03E00008 */ jr $ra -/* 17CD38 8024E458 00000000 */ nop +/* 17CD38 8024E458 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/func_80248DE4.s b/asm/nonmatchings/code_1776B0/func_80248DE4.s index b7f81b7c90..8bf389b992 100644 --- a/asm/nonmatchings/code_1776B0/func_80248DE4.s +++ b/asm/nonmatchings/code_1776B0/func_80248DE4.s @@ -29,44 +29,44 @@ glabel func_80248DE4 /* 177724 80248E44 10600007 */ beqz $v1, .L80248E64 /* 177728 80248E48 0000102D */ daddu $v0, $zero, $zero /* 17772C 80248E4C 080925F6 */ j .L802497D8 -/* 177730 80248E50 00000000 */ nop +/* 177730 80248E50 00000000 */ nop .L80248E54: /* 177734 80248E54 106200B8 */ beq $v1, $v0, .L80249138 /* 177738 80248E58 0000102D */ daddu $v0, $zero, $zero /* 17773C 80248E5C 080925F6 */ j .L802497D8 -/* 177740 80248E60 00000000 */ nop +/* 177740 80248E60 00000000 */ nop .L80248E64: /* 177744 80248E64 8C8400D8 */ lw $a0, 0xd8($a0) /* 177748 80248E68 1080025B */ beqz $a0, .L802497D8 -/* 17774C 80248E6C 00000000 */ nop +/* 17774C 80248E6C 00000000 */ nop /* 177750 80248E70 C4980144 */ lwc1 $f24, 0x144($a0) /* 177754 80248E74 90830191 */ lbu $v1, 0x191($a0) /* 177758 80248E78 C490014C */ lwc1 $f16, 0x14c($a0) /* 17775C 80248E7C 00031042 */ srl $v0, $v1, 1 /* 177760 80248E80 44820000 */ mtc1 $v0, $f0 -/* 177764 80248E84 00000000 */ nop +/* 177764 80248E84 00000000 */ nop /* 177768 80248E88 46800020 */ cvt.s.w $f0, $f0 /* 17776C 80248E8C E7B00018 */ swc1 $f16, 0x18($sp) /* 177770 80248E90 C4820148 */ lwc1 $f2, 0x148($a0) /* 177774 80248E94 00031082 */ srl $v0, $v1, 2 /* 177778 80248E98 46001080 */ add.s $f2, $f2, $f0 /* 17777C 80248E9C 44820000 */ mtc1 $v0, $f0 -/* 177780 80248EA0 00000000 */ nop +/* 177780 80248EA0 00000000 */ nop /* 177784 80248EA4 46800020 */ cvt.s.w $f0, $f0 /* 177788 80248EA8 90820190 */ lbu $v0, 0x190($a0) /* 17778C 80248EAC 46001500 */ add.s $f20, $f2, $f0 /* 177790 80248EB0 4483D000 */ mtc1 $v1, $f26 -/* 177794 80248EB4 00000000 */ nop +/* 177794 80248EB4 00000000 */ nop /* 177798 80248EB8 4680D6A0 */ cvt.s.w $f26, $f26 /* 17779C 80248EBC 4482B000 */ mtc1 $v0, $f22 -/* 1777A0 80248EC0 00000000 */ nop +/* 1777A0 80248EC0 00000000 */ nop /* 1777A4 80248EC4 4680B5A0 */ cvt.s.w $f22, $f22 /* 1777A8 80248EC8 4616D000 */ add.s $f0, $f26, $f22 /* 1777AC 80248ECC 3C013F00 */ lui $at, 0x3f00 /* 1777B0 80248ED0 4481E000 */ mtc1 $at, $f28 -/* 1777B4 80248ED4 00000000 */ nop +/* 1777B4 80248ED4 00000000 */ nop /* 1777B8 80248ED8 461C0002 */ mul.s $f0, $f0, $f28 -/* 1777BC 80248EDC 00000000 */ nop +/* 1777BC 80248EDC 00000000 */ nop /* 1777C0 80248EE0 84840428 */ lh $a0, 0x428($a0) /* 1777C4 80248EE4 0C09A75B */ jal get_actor /* 1777C8 80248EE8 E7A0002C */ swc1 $f0, 0x2c($sp) @@ -77,12 +77,12 @@ glabel func_80248DE4 /* 1777DC 80248EFC C4820148 */ lwc1 $f2, 0x148($a0) /* 1777E0 80248F00 00031042 */ srl $v0, $v1, 1 /* 1777E4 80248F04 44820000 */ mtc1 $v0, $f0 -/* 1777E8 80248F08 00000000 */ nop +/* 1777E8 80248F08 00000000 */ nop /* 1777EC 80248F0C 46800020 */ cvt.s.w $f0, $f0 /* 1777F0 80248F10 46001080 */ add.s $f2, $f2, $f0 /* 1777F4 80248F14 00031082 */ srl $v0, $v1, 2 /* 1777F8 80248F18 44820000 */ mtc1 $v0, $f0 -/* 1777FC 80248F1C 00000000 */ nop +/* 1777FC 80248F1C 00000000 */ nop /* 177800 80248F20 46800020 */ cvt.s.w $f0, $f0 /* 177804 80248F24 46001080 */ add.s $f2, $f2, $f0 /* 177808 80248F28 E7A20024 */ swc1 $f2, 0x24($sp) @@ -95,9 +95,9 @@ glabel func_80248DE4 /* 177824 80248F44 00621821 */ addu $v1, $v1, $v0 /* 177828 80248F48 00031843 */ sra $v1, $v1, 1 /* 17782C 80248F4C 461C0002 */ mul.s $f0, $f0, $f28 -/* 177830 80248F50 00000000 */ nop +/* 177830 80248F50 00000000 */ nop /* 177834 80248F54 44839000 */ mtc1 $v1, $f18 -/* 177838 80248F58 00000000 */ nop +/* 177838 80248F58 00000000 */ nop /* 17783C 80248F5C 468094A0 */ cvt.s.w $f18, $f18 /* 177840 80248F60 3C03802A */ lui $v1, %hi(D_8029F2A2) /* 177844 80248F64 8063F2A2 */ lb $v1, %lo(D_8029F2A2)($v1) @@ -108,7 +108,7 @@ glabel func_80248DE4 /* 177858 80248F78 4600A706 */ mov.s $f28, $f20 /* 17785C 80248F7C 4602A001 */ sub.s $f0, $f20, $f2 /* 177860 80248F80 461C0082 */ mul.s $f2, $f0, $f28 -/* 177864 80248F84 00000000 */ nop +/* 177864 80248F84 00000000 */ nop /* 177868 80248F88 C7B00024 */ lwc1 $f16, 0x24($sp) /* 17786C 80248F8C 3C0140C0 */ lui $at, 0x40c0 /* 177870 80248F90 44812000 */ mtc1 $at, $f4 @@ -117,14 +117,14 @@ glabel func_80248DE4 .L80248F9C: /* 17787C 80248F9C 2402FFFF */ addiu $v0, $zero, -1 /* 177880 80248FA0 106200BA */ beq $v1, $v0, .L8024928C -/* 177884 80248FA4 00000000 */ nop +/* 177884 80248FA4 00000000 */ nop /* 177888 80248FA8 C7B20024 */ lwc1 $f18, 0x24($sp) /* 17788C 80248FAC 46149001 */ sub.s $f0, $f18, $f20 /* 177890 80248FB0 3C013E80 */ lui $at, 0x3e80 /* 177894 80248FB4 44811000 */ mtc1 $at, $f2 -/* 177898 80248FB8 00000000 */ nop +/* 177898 80248FB8 00000000 */ nop /* 17789C 80248FBC 46020002 */ mul.s $f0, $f0, $f2 -/* 1778A0 80248FC0 00000000 */ nop +/* 1778A0 80248FC0 00000000 */ nop /* 1778A4 80248FC4 080924A4 */ j .L80249290 /* 1778A8 80248FC8 4600A700 */ add.s $f28, $f20, $f0 .L80248FCC: @@ -136,29 +136,29 @@ glabel func_80248DE4 /* 1778C0 80248FE0 C490014C */ lwc1 $f16, 0x14c($a0) /* 1778C4 80248FE4 00031042 */ srl $v0, $v1, 1 /* 1778C8 80248FE8 44820000 */ mtc1 $v0, $f0 -/* 1778CC 80248FEC 00000000 */ nop +/* 1778CC 80248FEC 00000000 */ nop /* 1778D0 80248FF0 46800020 */ cvt.s.w $f0, $f0 /* 1778D4 80248FF4 E7B00018 */ swc1 $f16, 0x18($sp) /* 1778D8 80248FF8 C4820148 */ lwc1 $f2, 0x148($a0) /* 1778DC 80248FFC 00031082 */ srl $v0, $v1, 2 /* 1778E0 80249000 46001080 */ add.s $f2, $f2, $f0 /* 1778E4 80249004 44820000 */ mtc1 $v0, $f0 -/* 1778E8 80249008 00000000 */ nop +/* 1778E8 80249008 00000000 */ nop /* 1778EC 8024900C 46800020 */ cvt.s.w $f0, $f0 /* 1778F0 80249010 90820190 */ lbu $v0, 0x190($a0) /* 1778F4 80249014 46001500 */ add.s $f20, $f2, $f0 /* 1778F8 80249018 4483D000 */ mtc1 $v1, $f26 -/* 1778FC 8024901C 00000000 */ nop +/* 1778FC 8024901C 00000000 */ nop /* 177900 80249020 4680D6A0 */ cvt.s.w $f26, $f26 /* 177904 80249024 4482B000 */ mtc1 $v0, $f22 -/* 177908 80249028 00000000 */ nop +/* 177908 80249028 00000000 */ nop /* 17790C 8024902C 4680B5A0 */ cvt.s.w $f22, $f22 /* 177910 80249030 4616D000 */ add.s $f0, $f26, $f22 /* 177914 80249034 3C013F00 */ lui $at, 0x3f00 /* 177918 80249038 4481E000 */ mtc1 $at, $f28 -/* 17791C 8024903C 00000000 */ nop +/* 17791C 8024903C 00000000 */ nop /* 177920 80249040 461C0002 */ mul.s $f0, $f0, $f28 -/* 177924 80249044 00000000 */ nop +/* 177924 80249044 00000000 */ nop /* 177928 80249048 84840428 */ lh $a0, 0x428($a0) /* 17792C 8024904C 0C09A75B */ jal get_actor /* 177930 80249050 E7A0002C */ swc1 $f0, 0x2c($sp) @@ -169,12 +169,12 @@ glabel func_80248DE4 /* 177944 80249064 C4820148 */ lwc1 $f2, 0x148($a0) /* 177948 80249068 00031042 */ srl $v0, $v1, 1 /* 17794C 8024906C 44820000 */ mtc1 $v0, $f0 -/* 177950 80249070 00000000 */ nop +/* 177950 80249070 00000000 */ nop /* 177954 80249074 46800020 */ cvt.s.w $f0, $f0 /* 177958 80249078 46001080 */ add.s $f2, $f2, $f0 /* 17795C 8024907C 00031082 */ srl $v0, $v1, 2 /* 177960 80249080 44820000 */ mtc1 $v0, $f0 -/* 177964 80249084 00000000 */ nop +/* 177964 80249084 00000000 */ nop /* 177968 80249088 46800020 */ cvt.s.w $f0, $f0 /* 17796C 8024908C 46001080 */ add.s $f2, $f2, $f0 /* 177970 80249090 E7A20024 */ swc1 $f2, 0x24($sp) @@ -186,12 +186,12 @@ glabel func_80248DE4 /* 177988 802490A8 90820190 */ lbu $v0, 0x190($a0) /* 17798C 802490AC 00621821 */ addu $v1, $v1, $v0 /* 177990 802490B0 461C0002 */ mul.s $f0, $f0, $f28 -/* 177994 802490B4 00000000 */ nop +/* 177994 802490B4 00000000 */ nop /* 177998 802490B8 00031843 */ sra $v1, $v1, 1 /* 17799C 802490BC 3C02802A */ lui $v0, %hi(D_8029F2A2) /* 1779A0 802490C0 8042F2A2 */ lb $v0, %lo(D_8029F2A2)($v0) /* 1779A4 802490C4 44839000 */ mtc1 $v1, $f18 -/* 1779A8 802490C8 00000000 */ nop +/* 1779A8 802490C8 00000000 */ nop /* 1779AC 802490CC 468094A0 */ cvt.s.w $f18, $f18 /* 1779B0 802490D0 E7B20030 */ swc1 $f18, 0x30($sp) /* 1779B4 802490D4 0440000D */ bltz $v0, .L8024910C @@ -200,7 +200,7 @@ glabel func_80248DE4 /* 1779C0 802490E0 4600A706 */ mov.s $f28, $f20 /* 1779C4 802490E4 4602A001 */ sub.s $f0, $f20, $f2 /* 1779C8 802490E8 461C0082 */ mul.s $f2, $f0, $f28 -/* 1779CC 802490EC 00000000 */ nop +/* 1779CC 802490EC 00000000 */ nop /* 1779D0 802490F0 C7B00024 */ lwc1 $f16, 0x24($sp) /* 1779D4 802490F4 3C0140C0 */ lui $at, 0x40c0 /* 1779D8 802490F8 44812000 */ mtc1 $at, $f4 @@ -216,9 +216,9 @@ glabel func_80248DE4 /* 1779F8 80249118 46109001 */ sub.s $f0, $f18, $f16 /* 1779FC 8024911C 3C013F00 */ lui $at, 0x3f00 /* 177A00 80249120 44811000 */ mtc1 $at, $f2 -/* 177A04 80249124 00000000 */ nop +/* 177A04 80249124 00000000 */ nop /* 177A08 80249128 46020002 */ mul.s $f0, $f0, $f2 -/* 177A0C 8024912C 00000000 */ nop +/* 177A0C 8024912C 00000000 */ nop /* 177A10 80249130 080924AD */ j .L802492B4 /* 177A14 80249134 46008000 */ add.s $f0, $f16, $f0 .L80249138: @@ -232,29 +232,29 @@ glabel func_80248DE4 /* 177A34 80249154 C492014C */ lwc1 $f18, 0x14c($a0) /* 177A38 80249158 00031042 */ srl $v0, $v1, 1 /* 177A3C 8024915C 44820000 */ mtc1 $v0, $f0 -/* 177A40 80249160 00000000 */ nop +/* 177A40 80249160 00000000 */ nop /* 177A44 80249164 46800020 */ cvt.s.w $f0, $f0 /* 177A48 80249168 E7B20018 */ swc1 $f18, 0x18($sp) /* 177A4C 8024916C C4820148 */ lwc1 $f2, 0x148($a0) /* 177A50 80249170 00031082 */ srl $v0, $v1, 2 /* 177A54 80249174 46001080 */ add.s $f2, $f2, $f0 /* 177A58 80249178 44820000 */ mtc1 $v0, $f0 -/* 177A5C 8024917C 00000000 */ nop +/* 177A5C 8024917C 00000000 */ nop /* 177A60 80249180 46800020 */ cvt.s.w $f0, $f0 /* 177A64 80249184 90820190 */ lbu $v0, 0x190($a0) /* 177A68 80249188 46001500 */ add.s $f20, $f2, $f0 /* 177A6C 8024918C 4483D000 */ mtc1 $v1, $f26 -/* 177A70 80249190 00000000 */ nop +/* 177A70 80249190 00000000 */ nop /* 177A74 80249194 4680D6A0 */ cvt.s.w $f26, $f26 /* 177A78 80249198 4482B000 */ mtc1 $v0, $f22 -/* 177A7C 8024919C 00000000 */ nop +/* 177A7C 8024919C 00000000 */ nop /* 177A80 802491A0 4680B5A0 */ cvt.s.w $f22, $f22 /* 177A84 802491A4 4616D000 */ add.s $f0, $f26, $f22 /* 177A88 802491A8 3C013F00 */ lui $at, 0x3f00 /* 177A8C 802491AC 4481E000 */ mtc1 $at, $f28 -/* 177A90 802491B0 00000000 */ nop +/* 177A90 802491B0 00000000 */ nop /* 177A94 802491B4 461C0002 */ mul.s $f0, $f0, $f28 -/* 177A98 802491B8 00000000 */ nop +/* 177A98 802491B8 00000000 */ nop /* 177A9C 802491BC 84840428 */ lh $a0, 0x428($a0) /* 177AA0 802491C0 0C09A75B */ jal get_actor /* 177AA4 802491C4 E7A0002C */ swc1 $f0, 0x2c($sp) @@ -265,12 +265,12 @@ glabel func_80248DE4 /* 177AB8 802491D8 C4820148 */ lwc1 $f2, 0x148($a0) /* 177ABC 802491DC 00031042 */ srl $v0, $v1, 1 /* 177AC0 802491E0 44820000 */ mtc1 $v0, $f0 -/* 177AC4 802491E4 00000000 */ nop +/* 177AC4 802491E4 00000000 */ nop /* 177AC8 802491E8 46800020 */ cvt.s.w $f0, $f0 /* 177ACC 802491EC 46001080 */ add.s $f2, $f2, $f0 /* 177AD0 802491F0 00031082 */ srl $v0, $v1, 2 /* 177AD4 802491F4 44820000 */ mtc1 $v0, $f0 -/* 177AD8 802491F8 00000000 */ nop +/* 177AD8 802491F8 00000000 */ nop /* 177ADC 802491FC 46800020 */ cvt.s.w $f0, $f0 /* 177AE0 80249200 46001080 */ add.s $f2, $f2, $f0 /* 177AE4 80249204 E7A20024 */ swc1 $f2, 0x24($sp) @@ -283,9 +283,9 @@ glabel func_80248DE4 /* 177B00 80249220 00621821 */ addu $v1, $v1, $v0 /* 177B04 80249224 00031843 */ sra $v1, $v1, 1 /* 177B08 80249228 461C0002 */ mul.s $f0, $f0, $f28 -/* 177B0C 8024922C 00000000 */ nop +/* 177B0C 8024922C 00000000 */ nop /* 177B10 80249230 44838000 */ mtc1 $v1, $f16 -/* 177B14 80249234 00000000 */ nop +/* 177B14 80249234 00000000 */ nop /* 177B18 80249238 46808420 */ cvt.s.w $f16, $f16 /* 177B1C 8024923C 3C03802A */ lui $v1, %hi(D_8029F2A2) /* 177B20 80249240 8063F2A2 */ lb $v1, %lo(D_8029F2A2)($v1) @@ -296,7 +296,7 @@ glabel func_80248DE4 /* 177B34 80249254 4600A706 */ mov.s $f28, $f20 /* 177B38 80249258 4602A001 */ sub.s $f0, $f20, $f2 /* 177B3C 8024925C 461C0082 */ mul.s $f2, $f0, $f28 -/* 177B40 80249260 00000000 */ nop +/* 177B40 80249260 00000000 */ nop /* 177B44 80249264 C7B20024 */ lwc1 $f18, 0x24($sp) /* 177B48 80249268 3C0140C0 */ lui $at, 0x40c0 /* 177B4C 8024926C 44812000 */ mtc1 $at, $f4 @@ -317,74 +317,74 @@ glabel func_80248DE4 /* 177B78 80249298 46128001 */ sub.s $f0, $f16, $f18 /* 177B7C 8024929C 3C013F00 */ lui $at, 0x3f00 /* 177B80 802492A0 44811000 */ mtc1 $at, $f2 -/* 177B84 802492A4 00000000 */ nop +/* 177B84 802492A4 00000000 */ nop /* 177B88 802492A8 46020002 */ mul.s $f0, $f0, $f2 -/* 177B8C 802492AC 00000000 */ nop +/* 177B8C 802492AC 00000000 */ nop /* 177B90 802492B0 46009000 */ add.s $f0, $f18, $f0 .L802492B4: /* 177B94 802492B4 E7A0001C */ swc1 $f0, 0x1c($sp) /* 177B98 802492B8 3C02802A */ lui $v0, %hi(D_8029F2A6) /* 177B9C 802492BC 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 177BA0 802492C0 10400029 */ beqz $v0, .L80249368 -/* 177BA4 802492C4 00000000 */ nop +/* 177BA4 802492C4 00000000 */ nop /* 177BA8 802492C8 3C01802A */ lui $at, %hi(D_8029F28C) /* 177BAC 802492CC C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) /* 177BB0 802492D0 3C0143FA */ lui $at, 0x43fa /* 177BB4 802492D4 44810000 */ mtc1 $at, $f0 -/* 177BB8 802492D8 00000000 */ nop +/* 177BB8 802492D8 00000000 */ nop /* 177BBC 802492DC 46020001 */ sub.s $f0, $f0, $f2 /* 177BC0 802492E0 3C01802A */ lui $at, %hi(D_8029CC00) /* 177BC4 802492E4 D422CC00 */ ldc1 $f2, %lo(D_8029CC00)($at) /* 177BC8 802492E8 46000021 */ cvt.d.s $f0, $f0 /* 177BCC 802492EC 46220002 */ mul.d $f0, $f0, $f2 -/* 177BD0 802492F0 00000000 */ nop +/* 177BD0 802492F0 00000000 */ nop /* 177BD4 802492F4 3C01403E */ lui $at, 0x403e /* 177BD8 802492F8 44811800 */ mtc1 $at, $f3 /* 177BDC 802492FC 44801000 */ mtc1 $zero, $f2 -/* 177BE0 80249300 00000000 */ nop +/* 177BE0 80249300 00000000 */ nop /* 177BE4 80249304 46220000 */ add.d $f0, $f0, $f2 /* 177BE8 80249308 46200120 */ cvt.s.d $f4, $f0 /* 177BEC 8024930C 46002007 */ neg.s $f0, $f4 /* 177BF0 80249310 4600F03C */ c.lt.s $f30, $f0 -/* 177BF4 80249314 00000000 */ nop +/* 177BF4 80249314 00000000 */ nop /* 177BF8 80249318 45000008 */ bc1f .L8024933C -/* 177BFC 8024931C 00000000 */ nop +/* 177BFC 8024931C 00000000 */ nop /* 177C00 80249320 461E0001 */ sub.s $f0, $f0, $f30 /* 177C04 80249324 3C013F00 */ lui $at, 0x3f00 /* 177C08 80249328 44811000 */ mtc1 $at, $f2 -/* 177C0C 8024932C 00000000 */ nop +/* 177C0C 8024932C 00000000 */ nop /* 177C10 80249330 46020002 */ mul.s $f0, $f0, $f2 -/* 177C14 80249334 00000000 */ nop +/* 177C14 80249334 00000000 */ nop /* 177C18 80249338 4600F780 */ add.s $f30, $f30, $f0 .L8024933C: /* 177C1C 8024933C 461E203C */ c.lt.s $f4, $f30 -/* 177C20 80249340 00000000 */ nop +/* 177C20 80249340 00000000 */ nop /* 177C24 80249344 45000008 */ bc1f .L80249368 -/* 177C28 80249348 00000000 */ nop +/* 177C28 80249348 00000000 */ nop /* 177C2C 8024934C 461E2001 */ sub.s $f0, $f4, $f30 /* 177C30 80249350 3C013F00 */ lui $at, 0x3f00 /* 177C34 80249354 44811000 */ mtc1 $at, $f2 -/* 177C38 80249358 00000000 */ nop +/* 177C38 80249358 00000000 */ nop /* 177C3C 8024935C 46020002 */ mul.s $f0, $f0, $f2 -/* 177C40 80249360 00000000 */ nop +/* 177C40 80249360 00000000 */ nop /* 177C44 80249364 4600F780 */ add.s $f30, $f30, $f0 .L80249368: /* 177C48 80249368 12200055 */ beqz $s1, .L802494C0 -/* 177C4C 8024936C 00000000 */ nop +/* 177C4C 8024936C 00000000 */ nop /* 177C50 80249370 3C0141C0 */ lui $at, 0x41c0 /* 177C54 80249374 44810000 */ mtc1 $at, $f0 -/* 177C58 80249378 00000000 */ nop +/* 177C58 80249378 00000000 */ nop /* 177C5C 8024937C 4600B581 */ sub.s $f22, $f22, $f0 /* 177C60 80249380 4600D681 */ sub.s $f26, $f26, $f0 /* 177C64 80249384 44800000 */ mtc1 $zero, $f0 -/* 177C68 80249388 00000000 */ nop +/* 177C68 80249388 00000000 */ nop /* 177C6C 8024938C 4600B03C */ c.lt.s $f22, $f0 -/* 177C70 80249390 00000000 */ nop +/* 177C70 80249390 00000000 */ nop /* 177C74 80249394 45030001 */ bc1tl .L8024939C /* 177C78 80249398 46000586 */ mov.s $f22, $f0 .L8024939C: /* 177C7C 8024939C 4600D03C */ c.lt.s $f26, $f0 -/* 177C80 802493A0 00000000 */ nop +/* 177C80 802493A0 00000000 */ nop /* 177C84 802493A4 45030001 */ bc1tl .L802493AC /* 177C88 802493A8 46000686 */ mov.s $f26, $f0 .L802493AC: @@ -393,7 +393,7 @@ glabel func_80248DE4 /* 177C94 802493B4 84620000 */ lh $v0, ($v1) /* 177C98 802493B8 461AB080 */ add.s $f2, $f22, $f26 /* 177C9C 802493BC 44820000 */ mtc1 $v0, $f0 -/* 177CA0 802493C0 00000000 */ nop +/* 177CA0 802493C0 00000000 */ nop /* 177CA4 802493C4 46800020 */ cvt.s.w $f0, $f0 /* 177CA8 802493C8 46020000 */ add.s $f0, $f0, $f2 /* 177CAC 802493CC 3C02802A */ lui $v0, %hi(D_8029F2A4) @@ -422,18 +422,18 @@ glabel func_80248DE4 /* 177D04 80249424 86040026 */ lh $a0, 0x26($s0) /* 177D08 80249428 86030024 */ lh $v1, 0x24($s0) /* 177D0C 8024942C 44820000 */ mtc1 $v0, $f0 -/* 177D10 80249430 00000000 */ nop +/* 177D10 80249430 00000000 */ nop /* 177D14 80249434 46800020 */ cvt.s.w $f0, $f0 /* 177D18 80249438 86020022 */ lh $v0, 0x22($s0) /* 177D1C 8024943C 3C01802A */ lui $at, %hi(D_8029F28C) /* 177D20 80249440 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 177D24 80249444 44820000 */ mtc1 $v0, $f0 -/* 177D28 80249448 00000000 */ nop +/* 177D28 80249448 00000000 */ nop /* 177D2C 8024944C 46800020 */ cvt.s.w $f0, $f0 /* 177D30 80249450 3C01802A */ lui $at, %hi(D_8029F294) /* 177D34 80249454 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) /* 177D38 80249458 44830000 */ mtc1 $v1, $f0 -/* 177D3C 8024945C 00000000 */ nop +/* 177D3C 8024945C 00000000 */ nop /* 177D40 80249460 46800020 */ cvt.s.w $f0, $f0 /* 177D44 80249464 3C01802A */ lui $at, %hi(D_8029F290) /* 177D48 80249468 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -447,7 +447,7 @@ glabel func_80248DE4 /* 177D64 80249484 3C03802A */ lui $v1, %hi(D_8029F29E) /* 177D68 80249488 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 177D6C 8024948C 44820000 */ mtc1 $v0, $f0 -/* 177D70 80249490 00000000 */ nop +/* 177D70 80249490 00000000 */ nop /* 177D74 80249494 46800020 */ cvt.s.w $f0, $f0 /* 177D78 80249498 3C01802A */ lui $at, %hi(D_8029F298) /* 177D7C 8024949C E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -463,7 +463,7 @@ glabel func_80248DE4 /* 177DA0 802494C0 3C02802A */ lui $v0, %hi(D_8029F2A5) /* 177DA4 802494C4 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) /* 177DA8 802494C8 14400027 */ bnez $v0, .L80249568 -/* 177DAC 802494CC 00000000 */ nop +/* 177DAC 802494CC 00000000 */ nop /* 177DB0 802494D0 3C02802A */ lui $v0, %hi(D_8029F29E) /* 177DB4 802494D4 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) /* 177DB8 802494D8 3C03802A */ lui $v1, %hi(D_8029F2A0) @@ -471,35 +471,35 @@ glabel func_80248DE4 /* 177DC0 802494E0 3C013F80 */ lui $at, 0x3f80 /* 177DC4 802494E4 4481C000 */ mtc1 $at, $f24 /* 177DC8 802494E8 4482D000 */ mtc1 $v0, $f26 -/* 177DCC 802494EC 00000000 */ nop +/* 177DCC 802494EC 00000000 */ nop /* 177DD0 802494F0 4680D6A0 */ cvt.s.w $f26, $f26 /* 177DD4 802494F4 44830000 */ mtc1 $v1, $f0 -/* 177DD8 802494F8 00000000 */ nop +/* 177DD8 802494F8 00000000 */ nop /* 177DDC 802494FC 46800020 */ cvt.s.w $f0, $f0 /* 177DE0 80249500 4600D683 */ div.s $f26, $f26, $f0 /* 177DE4 80249504 461AC301 */ sub.s $f12, $f24, $f26 /* 177DE8 80249508 3C014049 */ lui $at, 0x4049 /* 177DEC 8024950C 34210FD0 */ ori $at, $at, 0xfd0 /* 177DF0 80249510 4481B000 */ mtc1 $at, $f22 -/* 177DF4 80249514 00000000 */ nop +/* 177DF4 80249514 00000000 */ nop /* 177DF8 80249518 46166302 */ mul.s $f12, $f12, $f22 -/* 177DFC 8024951C 00000000 */ nop +/* 177DFC 8024951C 00000000 */ nop /* 177E00 80249520 3C013F00 */ lui $at, 0x3f00 /* 177E04 80249524 4481A000 */ mtc1 $at, $f20 -/* 177E08 80249528 00000000 */ nop +/* 177E08 80249528 00000000 */ nop /* 177E0C 8024952C 46146302 */ mul.s $f12, $f12, $f20 /* 177E10 80249530 0C00A85B */ jal sin_rad -/* 177E14 80249534 00000000 */ nop +/* 177E14 80249534 00000000 */ nop /* 177E18 80249538 46160002 */ mul.s $f0, $f0, $f22 -/* 177E1C 8024953C 00000000 */ nop +/* 177E1C 8024953C 00000000 */ nop /* 177E20 80249540 46140302 */ mul.s $f12, $f0, $f20 /* 177E24 80249544 0C00A85B */ jal sin_rad -/* 177E28 80249548 00000000 */ nop +/* 177E28 80249548 00000000 */ nop /* 177E2C 8024954C 46160002 */ mul.s $f0, $f0, $f22 -/* 177E30 80249550 00000000 */ nop +/* 177E30 80249550 00000000 */ nop /* 177E34 80249554 46140302 */ mul.s $f12, $f0, $f20 /* 177E38 80249558 0C00A85B */ jal sin_rad -/* 177E3C 8024955C 00000000 */ nop +/* 177E3C 8024955C 00000000 */ nop /* 177E40 80249560 08092565 */ j .L80249594 /* 177E44 80249564 4600C681 */ sub.s $f26, $f24, $f0 .L80249568: @@ -508,47 +508,47 @@ glabel func_80248DE4 /* 177E50 80249570 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 177E54 80249574 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 177E58 80249578 4482D000 */ mtc1 $v0, $f26 -/* 177E5C 8024957C 00000000 */ nop +/* 177E5C 8024957C 00000000 */ nop /* 177E60 80249580 4680D6A0 */ cvt.s.w $f26, $f26 /* 177E64 80249584 44830000 */ mtc1 $v1, $f0 -/* 177E68 80249588 00000000 */ nop +/* 177E68 80249588 00000000 */ nop /* 177E6C 8024958C 46800020 */ cvt.s.w $f0, $f0 /* 177E70 80249590 4600D683 */ div.s $f26, $f26, $f0 .L80249594: /* 177E74 80249594 3C01802A */ lui $at, %hi(D_8029F2A8) /* 177E78 80249598 C426F2A8 */ lwc1 $f6, %lo(D_8029F2A8)($at) /* 177E7C 8024959C 461A3182 */ mul.s $f6, $f6, $f26 -/* 177E80 802495A0 00000000 */ nop +/* 177E80 802495A0 00000000 */ nop /* 177E84 802495A4 3C01802A */ lui $at, %hi(D_8029F2AC) /* 177E88 802495A8 C428F2AC */ lwc1 $f8, %lo(D_8029F2AC)($at) /* 177E8C 802495AC 461A4202 */ mul.s $f8, $f8, $f26 -/* 177E90 802495B0 00000000 */ nop +/* 177E90 802495B0 00000000 */ nop /* 177E94 802495B4 3C01802A */ lui $at, %hi(D_8029F2B0) /* 177E98 802495B8 C424F2B0 */ lwc1 $f4, %lo(D_8029F2B0)($at) /* 177E9C 802495BC 461A2102 */ mul.s $f4, $f4, $f26 -/* 177EA0 802495C0 00000000 */ nop +/* 177EA0 802495C0 00000000 */ nop /* 177EA4 802495C4 3C01802A */ lui $at, %hi(D_8029F298) /* 177EA8 802495C8 C422F298 */ lwc1 $f2, %lo(D_8029F298)($at) /* 177EAC 802495CC 461A1082 */ mul.s $f2, $f2, $f26 -/* 177EB0 802495D0 00000000 */ nop +/* 177EB0 802495D0 00000000 */ nop /* 177EB4 802495D4 3C013F80 */ lui $at, 0x3f80 /* 177EB8 802495D8 4481B000 */ mtc1 $at, $f22 -/* 177EBC 802495DC 00000000 */ nop +/* 177EBC 802495DC 00000000 */ nop /* 177EC0 802495E0 461AB581 */ sub.s $f22, $f22, $f26 /* 177EC4 802495E4 4616F302 */ mul.s $f12, $f30, $f22 -/* 177EC8 802495E8 00000000 */ nop +/* 177EC8 802495E8 00000000 */ nop /* 177ECC 802495EC 4616E382 */ mul.s $f14, $f28, $f22 -/* 177ED0 802495F0 00000000 */ nop +/* 177ED0 802495F0 00000000 */ nop /* 177ED4 802495F4 3C02802A */ lui $v0, %hi(D_8029F286) /* 177ED8 802495F8 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 177EDC 802495FC 44820000 */ mtc1 $v0, $f0 -/* 177EE0 80249600 00000000 */ nop +/* 177EE0 80249600 00000000 */ nop /* 177EE4 80249604 46800020 */ cvt.s.w $f0, $f0 /* 177EE8 80249608 46160002 */ mul.s $f0, $f0, $f22 -/* 177EEC 8024960C 00000000 */ nop +/* 177EEC 8024960C 00000000 */ nop /* 177EF0 80249610 C7B2001C */ lwc1 $f18, 0x1c($sp) /* 177EF4 80249614 46169282 */ mul.s $f10, $f18, $f22 -/* 177EF8 80249618 00000000 */ nop +/* 177EF8 80249618 00000000 */ nop /* 177EFC 8024961C 46001080 */ add.s $f2, $f2, $f0 /* 177F00 80249620 C6180054 */ lwc1 $f24, 0x54($s0) /* 177F04 80249624 C6140058 */ lwc1 $f20, 0x58($s0) @@ -563,7 +563,7 @@ glabel func_80248DE4 /* 177F28 80249648 E7B00018 */ swc1 $f16, 0x18($sp) /* 177F2C 8024964C E6060054 */ swc1 $f6, 0x54($s0) /* 177F30 80249650 46001082 */ mul.s $f2, $f2, $f0 -/* 177F34 80249654 00000000 */ nop +/* 177F34 80249654 00000000 */ nop /* 177F38 80249658 46003306 */ mov.s $f12, $f6 /* 177F3C 8024965C E604005C */ swc1 $f4, 0x5c($s0) /* 177F40 80249660 46002386 */ mov.s $f14, $f4 @@ -581,7 +581,7 @@ glabel func_80248DE4 /* 177F70 80249690 44812000 */ mtc1 $at, $f4 /* 177F74 80249694 8FA60018 */ lw $a2, 0x18($sp) /* 177F78 80249698 46041082 */ mul.s $f2, $f2, $f4 -/* 177F7C 8024969C 00000000 */ nop +/* 177F7C 8024969C 00000000 */ nop /* 177F80 802496A0 8FA70020 */ lw $a3, 0x20($sp) /* 177F84 802496A4 C7B00024 */ lwc1 $f16, 0x24($sp) /* 177F88 802496A8 C7B20028 */ lwc1 $f18, 0x28($sp) @@ -594,60 +594,60 @@ glabel func_80248DE4 /* 177FA4 802496C4 4604A501 */ sub.s $f20, $f20, $f4 /* 177FA8 802496C8 3C013F00 */ lui $at, 0x3f00 /* 177FAC 802496CC 44811000 */ mtc1 $at, $f2 -/* 177FB0 802496D0 00000000 */ nop +/* 177FB0 802496D0 00000000 */ nop /* 177FB4 802496D4 46020002 */ mul.s $f0, $f0, $f2 -/* 177FB8 802496D8 00000000 */ nop +/* 177FB8 802496D8 00000000 */ nop /* 177FBC 802496DC 3C01802A */ lui $at, %hi(D_8029F28C) /* 177FC0 802496E0 C42AF28C */ lwc1 $f10, %lo(D_8029F28C)($at) /* 177FC4 802496E4 461A5282 */ mul.s $f10, $f10, $f26 -/* 177FC8 802496E8 00000000 */ nop +/* 177FC8 802496E8 00000000 */ nop /* 177FCC 802496EC 3C01802A */ lui $at, %hi(D_8029F290) /* 177FD0 802496F0 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 177FD4 802496F4 461A4202 */ mul.s $f8, $f8, $f26 -/* 177FD8 802496F8 00000000 */ nop +/* 177FD8 802496F8 00000000 */ nop /* 177FDC 802496FC 3C01802A */ lui $at, %hi(D_8029F294) /* 177FE0 80249700 C424F294 */ lwc1 $f4, %lo(D_8029F294)($at) /* 177FE4 80249704 3C02802A */ lui $v0, %hi(D_8029F280) /* 177FE8 80249708 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 177FEC 8024970C 461A2102 */ mul.s $f4, $f4, $f26 -/* 177FF0 80249710 00000000 */ nop +/* 177FF0 80249710 00000000 */ nop /* 177FF4 80249714 44821000 */ mtc1 $v0, $f2 -/* 177FF8 80249718 00000000 */ nop +/* 177FF8 80249718 00000000 */ nop /* 177FFC 8024971C 468010A0 */ cvt.s.w $f2, $f2 /* 178000 80249720 3C02802A */ lui $v0, %hi(D_8029F282) /* 178004 80249724 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 178008 80249728 44823000 */ mtc1 $v0, $f6 -/* 17800C 8024972C 00000000 */ nop +/* 17800C 8024972C 00000000 */ nop /* 178010 80249730 468031A0 */ cvt.s.w $f6, $f6 /* 178014 80249734 46163182 */ mul.s $f6, $f6, $f22 -/* 178018 80249738 00000000 */ nop +/* 178018 80249738 00000000 */ nop /* 17801C 8024973C 46141080 */ add.s $f2, $f2, $f20 /* 178020 80249740 3C02802A */ lui $v0, %hi(D_8029F284) /* 178024 80249744 8442F284 */ lh $v0, %lo(D_8029F284)($v0) /* 178028 80249748 46001080 */ add.s $f2, $f2, $f0 /* 17802C 8024974C 44820000 */ mtc1 $v0, $f0 -/* 178030 80249750 00000000 */ nop +/* 178030 80249750 00000000 */ nop /* 178034 80249754 46800020 */ cvt.s.w $f0, $f0 /* 178038 80249758 46160002 */ mul.s $f0, $f0, $f22 -/* 17803C 8024975C 00000000 */ nop +/* 17803C 8024975C 00000000 */ nop /* 178040 80249760 46161082 */ mul.s $f2, $f2, $f22 -/* 178044 80249764 00000000 */ nop +/* 178044 80249764 00000000 */ nop /* 178048 80249768 46064200 */ add.s $f8, $f8, $f6 /* 17804C 8024976C 3C04802A */ lui $a0, %hi(D_8029F29E) /* 178050 80249770 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) /* 178054 80249774 46002100 */ add.s $f4, $f4, $f0 /* 178058 80249778 4600440D */ trunc.w.s $f16, $f8 /* 17805C 8024977C 44028000 */ mfc1 $v0, $f16 -/* 178060 80249780 00000000 */ nop +/* 178060 80249780 00000000 */ nop /* 178064 80249784 A6020024 */ sh $v0, 0x24($s0) /* 178068 80249788 46025280 */ add.s $f10, $f10, $f2 /* 17806C 8024978C 4600240D */ trunc.w.s $f16, $f4 /* 178070 80249790 44028000 */ mfc1 $v0, $f16 -/* 178074 80249794 00000000 */ nop +/* 178074 80249794 00000000 */ nop /* 178078 80249798 A6020022 */ sh $v0, 0x22($s0) /* 17807C 8024979C 4600540D */ trunc.w.s $f16, $f10 /* 178080 802497A0 44028000 */ mfc1 $v0, $f16 -/* 178084 802497A4 00000000 */ nop +/* 178084 802497A4 00000000 */ nop /* 178088 802497A8 A602001E */ sh $v0, 0x1e($s0) /* 17808C 802497AC 84820000 */ lh $v0, ($a0) /* 178090 802497B0 94830000 */ lhu $v1, ($a0) diff --git a/asm/nonmatchings/code_1776B0/func_80249804.s b/asm/nonmatchings/code_1776B0/func_80249804.s index 1550bccbec..a7b5b48985 100644 --- a/asm/nonmatchings/code_1776B0/func_80249804.s +++ b/asm/nonmatchings/code_1776B0/func_80249804.s @@ -29,44 +29,44 @@ glabel func_80249804 /* 178144 80249864 10600007 */ beqz $v1, .L80249884 /* 178148 80249868 0000102D */ daddu $v0, $zero, $zero /* 17814C 8024986C 0809287A */ j .L8024A1E8 -/* 178150 80249870 00000000 */ nop +/* 178150 80249870 00000000 */ nop .L80249874: /* 178154 80249874 106200B8 */ beq $v1, $v0, .L80249B58 /* 178158 80249878 0000102D */ daddu $v0, $zero, $zero /* 17815C 8024987C 0809287A */ j .L8024A1E8 -/* 178160 80249880 00000000 */ nop +/* 178160 80249880 00000000 */ nop .L80249884: /* 178164 80249884 8C8400D8 */ lw $a0, 0xd8($a0) /* 178168 80249888 10800257 */ beqz $a0, .L8024A1E8 -/* 17816C 8024988C 00000000 */ nop +/* 17816C 8024988C 00000000 */ nop /* 178170 80249890 C4980144 */ lwc1 $f24, 0x144($a0) /* 178174 80249894 90830191 */ lbu $v1, 0x191($a0) /* 178178 80249898 C490014C */ lwc1 $f16, 0x14c($a0) /* 17817C 8024989C 00031042 */ srl $v0, $v1, 1 /* 178180 802498A0 44820000 */ mtc1 $v0, $f0 -/* 178184 802498A4 00000000 */ nop +/* 178184 802498A4 00000000 */ nop /* 178188 802498A8 46800020 */ cvt.s.w $f0, $f0 /* 17818C 802498AC E7B00018 */ swc1 $f16, 0x18($sp) /* 178190 802498B0 C4820148 */ lwc1 $f2, 0x148($a0) /* 178194 802498B4 00031082 */ srl $v0, $v1, 2 /* 178198 802498B8 46001080 */ add.s $f2, $f2, $f0 /* 17819C 802498BC 44820000 */ mtc1 $v0, $f0 -/* 1781A0 802498C0 00000000 */ nop +/* 1781A0 802498C0 00000000 */ nop /* 1781A4 802498C4 46800020 */ cvt.s.w $f0, $f0 /* 1781A8 802498C8 90820190 */ lbu $v0, 0x190($a0) /* 1781AC 802498CC 46001500 */ add.s $f20, $f2, $f0 /* 1781B0 802498D0 4483D000 */ mtc1 $v1, $f26 -/* 1781B4 802498D4 00000000 */ nop +/* 1781B4 802498D4 00000000 */ nop /* 1781B8 802498D8 4680D6A0 */ cvt.s.w $f26, $f26 /* 1781BC 802498DC 4482B000 */ mtc1 $v0, $f22 -/* 1781C0 802498E0 00000000 */ nop +/* 1781C0 802498E0 00000000 */ nop /* 1781C4 802498E4 4680B5A0 */ cvt.s.w $f22, $f22 /* 1781C8 802498E8 4616D000 */ add.s $f0, $f26, $f22 /* 1781CC 802498EC 3C013F00 */ lui $at, 0x3f00 /* 1781D0 802498F0 4481E000 */ mtc1 $at, $f28 -/* 1781D4 802498F4 00000000 */ nop +/* 1781D4 802498F4 00000000 */ nop /* 1781D8 802498F8 461C0002 */ mul.s $f0, $f0, $f28 -/* 1781DC 802498FC 00000000 */ nop +/* 1781DC 802498FC 00000000 */ nop /* 1781E0 80249900 84840428 */ lh $a0, 0x428($a0) /* 1781E4 80249904 0C09A75B */ jal get_actor /* 1781E8 80249908 E7A0002C */ swc1 $f0, 0x2c($sp) @@ -77,12 +77,12 @@ glabel func_80249804 /* 1781FC 8024991C C4820148 */ lwc1 $f2, 0x148($a0) /* 178200 80249920 00031042 */ srl $v0, $v1, 1 /* 178204 80249924 44820000 */ mtc1 $v0, $f0 -/* 178208 80249928 00000000 */ nop +/* 178208 80249928 00000000 */ nop /* 17820C 8024992C 46800020 */ cvt.s.w $f0, $f0 /* 178210 80249930 46001080 */ add.s $f2, $f2, $f0 /* 178214 80249934 00031082 */ srl $v0, $v1, 2 /* 178218 80249938 44820000 */ mtc1 $v0, $f0 -/* 17821C 8024993C 00000000 */ nop +/* 17821C 8024993C 00000000 */ nop /* 178220 80249940 46800020 */ cvt.s.w $f0, $f0 /* 178224 80249944 46001080 */ add.s $f2, $f2, $f0 /* 178228 80249948 E7A20024 */ swc1 $f2, 0x24($sp) @@ -95,9 +95,9 @@ glabel func_80249804 /* 178244 80249964 00621821 */ addu $v1, $v1, $v0 /* 178248 80249968 00031843 */ sra $v1, $v1, 1 /* 17824C 8024996C 461C0002 */ mul.s $f0, $f0, $f28 -/* 178250 80249970 00000000 */ nop +/* 178250 80249970 00000000 */ nop /* 178254 80249974 44839000 */ mtc1 $v1, $f18 -/* 178258 80249978 00000000 */ nop +/* 178258 80249978 00000000 */ nop /* 17825C 8024997C 468094A0 */ cvt.s.w $f18, $f18 /* 178260 80249980 3C03802A */ lui $v1, %hi(D_8029F2A2) /* 178264 80249984 8063F2A2 */ lb $v1, %lo(D_8029F2A2)($v1) @@ -108,7 +108,7 @@ glabel func_80249804 /* 178278 80249998 4600A706 */ mov.s $f28, $f20 /* 17827C 8024999C 4602A001 */ sub.s $f0, $f20, $f2 /* 178280 802499A0 461C0082 */ mul.s $f2, $f0, $f28 -/* 178284 802499A4 00000000 */ nop +/* 178284 802499A4 00000000 */ nop /* 178288 802499A8 C7B00024 */ lwc1 $f16, 0x24($sp) /* 17828C 802499AC 3C0140C0 */ lui $at, 0x40c0 /* 178290 802499B0 44812000 */ mtc1 $at, $f4 @@ -117,14 +117,14 @@ glabel func_80249804 .L802499BC: /* 17829C 802499BC 2402FFFF */ addiu $v0, $zero, -1 /* 1782A0 802499C0 106200BA */ beq $v1, $v0, .L80249CAC -/* 1782A4 802499C4 00000000 */ nop +/* 1782A4 802499C4 00000000 */ nop /* 1782A8 802499C8 C7B20024 */ lwc1 $f18, 0x24($sp) /* 1782AC 802499CC 46149001 */ sub.s $f0, $f18, $f20 /* 1782B0 802499D0 3C013E80 */ lui $at, 0x3e80 /* 1782B4 802499D4 44811000 */ mtc1 $at, $f2 -/* 1782B8 802499D8 00000000 */ nop +/* 1782B8 802499D8 00000000 */ nop /* 1782BC 802499DC 46020002 */ mul.s $f0, $f0, $f2 -/* 1782C0 802499E0 00000000 */ nop +/* 1782C0 802499E0 00000000 */ nop /* 1782C4 802499E4 0809272C */ j .L80249CB0 /* 1782C8 802499E8 4600A700 */ add.s $f28, $f20, $f0 .L802499EC: @@ -136,29 +136,29 @@ glabel func_80249804 /* 1782E0 80249A00 C490014C */ lwc1 $f16, 0x14c($a0) /* 1782E4 80249A04 00031042 */ srl $v0, $v1, 1 /* 1782E8 80249A08 44820000 */ mtc1 $v0, $f0 -/* 1782EC 80249A0C 00000000 */ nop +/* 1782EC 80249A0C 00000000 */ nop /* 1782F0 80249A10 46800020 */ cvt.s.w $f0, $f0 /* 1782F4 80249A14 E7B00018 */ swc1 $f16, 0x18($sp) /* 1782F8 80249A18 C4820148 */ lwc1 $f2, 0x148($a0) /* 1782FC 80249A1C 00031082 */ srl $v0, $v1, 2 /* 178300 80249A20 46001080 */ add.s $f2, $f2, $f0 /* 178304 80249A24 44820000 */ mtc1 $v0, $f0 -/* 178308 80249A28 00000000 */ nop +/* 178308 80249A28 00000000 */ nop /* 17830C 80249A2C 46800020 */ cvt.s.w $f0, $f0 /* 178310 80249A30 90820190 */ lbu $v0, 0x190($a0) /* 178314 80249A34 46001500 */ add.s $f20, $f2, $f0 /* 178318 80249A38 4483D000 */ mtc1 $v1, $f26 -/* 17831C 80249A3C 00000000 */ nop +/* 17831C 80249A3C 00000000 */ nop /* 178320 80249A40 4680D6A0 */ cvt.s.w $f26, $f26 /* 178324 80249A44 4482B000 */ mtc1 $v0, $f22 -/* 178328 80249A48 00000000 */ nop +/* 178328 80249A48 00000000 */ nop /* 17832C 80249A4C 4680B5A0 */ cvt.s.w $f22, $f22 /* 178330 80249A50 4616D000 */ add.s $f0, $f26, $f22 /* 178334 80249A54 3C013F00 */ lui $at, 0x3f00 /* 178338 80249A58 4481E000 */ mtc1 $at, $f28 -/* 17833C 80249A5C 00000000 */ nop +/* 17833C 80249A5C 00000000 */ nop /* 178340 80249A60 461C0002 */ mul.s $f0, $f0, $f28 -/* 178344 80249A64 00000000 */ nop +/* 178344 80249A64 00000000 */ nop /* 178348 80249A68 84840428 */ lh $a0, 0x428($a0) /* 17834C 80249A6C 0C09A75B */ jal get_actor /* 178350 80249A70 E7A0002C */ swc1 $f0, 0x2c($sp) @@ -169,12 +169,12 @@ glabel func_80249804 /* 178364 80249A84 C4820148 */ lwc1 $f2, 0x148($a0) /* 178368 80249A88 00031042 */ srl $v0, $v1, 1 /* 17836C 80249A8C 44820000 */ mtc1 $v0, $f0 -/* 178370 80249A90 00000000 */ nop +/* 178370 80249A90 00000000 */ nop /* 178374 80249A94 46800020 */ cvt.s.w $f0, $f0 /* 178378 80249A98 46001080 */ add.s $f2, $f2, $f0 /* 17837C 80249A9C 00031082 */ srl $v0, $v1, 2 /* 178380 80249AA0 44820000 */ mtc1 $v0, $f0 -/* 178384 80249AA4 00000000 */ nop +/* 178384 80249AA4 00000000 */ nop /* 178388 80249AA8 46800020 */ cvt.s.w $f0, $f0 /* 17838C 80249AAC 46001080 */ add.s $f2, $f2, $f0 /* 178390 80249AB0 E7A20024 */ swc1 $f2, 0x24($sp) @@ -186,12 +186,12 @@ glabel func_80249804 /* 1783A8 80249AC8 90820190 */ lbu $v0, 0x190($a0) /* 1783AC 80249ACC 00621821 */ addu $v1, $v1, $v0 /* 1783B0 80249AD0 461C0002 */ mul.s $f0, $f0, $f28 -/* 1783B4 80249AD4 00000000 */ nop +/* 1783B4 80249AD4 00000000 */ nop /* 1783B8 80249AD8 00031843 */ sra $v1, $v1, 1 /* 1783BC 80249ADC 3C02802A */ lui $v0, %hi(D_8029F2A2) /* 1783C0 80249AE0 8042F2A2 */ lb $v0, %lo(D_8029F2A2)($v0) /* 1783C4 80249AE4 44839000 */ mtc1 $v1, $f18 -/* 1783C8 80249AE8 00000000 */ nop +/* 1783C8 80249AE8 00000000 */ nop /* 1783CC 80249AEC 468094A0 */ cvt.s.w $f18, $f18 /* 1783D0 80249AF0 E7B20030 */ swc1 $f18, 0x30($sp) /* 1783D4 80249AF4 0440000D */ bltz $v0, .L80249B2C @@ -200,7 +200,7 @@ glabel func_80249804 /* 1783E0 80249B00 4600A706 */ mov.s $f28, $f20 /* 1783E4 80249B04 4602A001 */ sub.s $f0, $f20, $f2 /* 1783E8 80249B08 461C0082 */ mul.s $f2, $f0, $f28 -/* 1783EC 80249B0C 00000000 */ nop +/* 1783EC 80249B0C 00000000 */ nop /* 1783F0 80249B10 C7B00024 */ lwc1 $f16, 0x24($sp) /* 1783F4 80249B14 3C0140C0 */ lui $at, 0x40c0 /* 1783F8 80249B18 44812000 */ mtc1 $at, $f4 @@ -216,9 +216,9 @@ glabel func_80249804 /* 178418 80249B38 46109001 */ sub.s $f0, $f18, $f16 /* 17841C 80249B3C 3C013F00 */ lui $at, 0x3f00 /* 178420 80249B40 44811000 */ mtc1 $at, $f2 -/* 178424 80249B44 00000000 */ nop +/* 178424 80249B44 00000000 */ nop /* 178428 80249B48 46020002 */ mul.s $f0, $f0, $f2 -/* 17842C 80249B4C 00000000 */ nop +/* 17842C 80249B4C 00000000 */ nop /* 178430 80249B50 08092735 */ j .L80249CD4 /* 178434 80249B54 46008000 */ add.s $f0, $f16, $f0 .L80249B58: @@ -232,29 +232,29 @@ glabel func_80249804 /* 178454 80249B74 C492014C */ lwc1 $f18, 0x14c($a0) /* 178458 80249B78 00031042 */ srl $v0, $v1, 1 /* 17845C 80249B7C 44820000 */ mtc1 $v0, $f0 -/* 178460 80249B80 00000000 */ nop +/* 178460 80249B80 00000000 */ nop /* 178464 80249B84 46800020 */ cvt.s.w $f0, $f0 /* 178468 80249B88 E7B20018 */ swc1 $f18, 0x18($sp) /* 17846C 80249B8C C4820148 */ lwc1 $f2, 0x148($a0) /* 178470 80249B90 00031082 */ srl $v0, $v1, 2 /* 178474 80249B94 46001080 */ add.s $f2, $f2, $f0 /* 178478 80249B98 44820000 */ mtc1 $v0, $f0 -/* 17847C 80249B9C 00000000 */ nop +/* 17847C 80249B9C 00000000 */ nop /* 178480 80249BA0 46800020 */ cvt.s.w $f0, $f0 /* 178484 80249BA4 90820190 */ lbu $v0, 0x190($a0) /* 178488 80249BA8 46001500 */ add.s $f20, $f2, $f0 /* 17848C 80249BAC 4483D000 */ mtc1 $v1, $f26 -/* 178490 80249BB0 00000000 */ nop +/* 178490 80249BB0 00000000 */ nop /* 178494 80249BB4 4680D6A0 */ cvt.s.w $f26, $f26 /* 178498 80249BB8 4482B000 */ mtc1 $v0, $f22 -/* 17849C 80249BBC 00000000 */ nop +/* 17849C 80249BBC 00000000 */ nop /* 1784A0 80249BC0 4680B5A0 */ cvt.s.w $f22, $f22 /* 1784A4 80249BC4 4616D000 */ add.s $f0, $f26, $f22 /* 1784A8 80249BC8 3C013F00 */ lui $at, 0x3f00 /* 1784AC 80249BCC 4481E000 */ mtc1 $at, $f28 -/* 1784B0 80249BD0 00000000 */ nop +/* 1784B0 80249BD0 00000000 */ nop /* 1784B4 80249BD4 461C0002 */ mul.s $f0, $f0, $f28 -/* 1784B8 80249BD8 00000000 */ nop +/* 1784B8 80249BD8 00000000 */ nop /* 1784BC 80249BDC 84840428 */ lh $a0, 0x428($a0) /* 1784C0 80249BE0 0C09A75B */ jal get_actor /* 1784C4 80249BE4 E7A0002C */ swc1 $f0, 0x2c($sp) @@ -265,12 +265,12 @@ glabel func_80249804 /* 1784D8 80249BF8 C4820148 */ lwc1 $f2, 0x148($a0) /* 1784DC 80249BFC 00031042 */ srl $v0, $v1, 1 /* 1784E0 80249C00 44820000 */ mtc1 $v0, $f0 -/* 1784E4 80249C04 00000000 */ nop +/* 1784E4 80249C04 00000000 */ nop /* 1784E8 80249C08 46800020 */ cvt.s.w $f0, $f0 /* 1784EC 80249C0C 46001080 */ add.s $f2, $f2, $f0 /* 1784F0 80249C10 00031082 */ srl $v0, $v1, 2 /* 1784F4 80249C14 44820000 */ mtc1 $v0, $f0 -/* 1784F8 80249C18 00000000 */ nop +/* 1784F8 80249C18 00000000 */ nop /* 1784FC 80249C1C 46800020 */ cvt.s.w $f0, $f0 /* 178500 80249C20 46001080 */ add.s $f2, $f2, $f0 /* 178504 80249C24 E7A20024 */ swc1 $f2, 0x24($sp) @@ -283,9 +283,9 @@ glabel func_80249804 /* 178520 80249C40 00621821 */ addu $v1, $v1, $v0 /* 178524 80249C44 00031843 */ sra $v1, $v1, 1 /* 178528 80249C48 461C0002 */ mul.s $f0, $f0, $f28 -/* 17852C 80249C4C 00000000 */ nop +/* 17852C 80249C4C 00000000 */ nop /* 178530 80249C50 44838000 */ mtc1 $v1, $f16 -/* 178534 80249C54 00000000 */ nop +/* 178534 80249C54 00000000 */ nop /* 178538 80249C58 46808420 */ cvt.s.w $f16, $f16 /* 17853C 80249C5C 3C03802A */ lui $v1, %hi(D_8029F2A2) /* 178540 80249C60 8063F2A2 */ lb $v1, %lo(D_8029F2A2)($v1) @@ -296,7 +296,7 @@ glabel func_80249804 /* 178554 80249C74 4600A706 */ mov.s $f28, $f20 /* 178558 80249C78 4602A001 */ sub.s $f0, $f20, $f2 /* 17855C 80249C7C 461C0082 */ mul.s $f2, $f0, $f28 -/* 178560 80249C80 00000000 */ nop +/* 178560 80249C80 00000000 */ nop /* 178564 80249C84 C7B20024 */ lwc1 $f18, 0x24($sp) /* 178568 80249C88 3C0140C0 */ lui $at, 0x40c0 /* 17856C 80249C8C 44812000 */ mtc1 $at, $f4 @@ -317,74 +317,74 @@ glabel func_80249804 /* 178598 80249CB8 46128001 */ sub.s $f0, $f16, $f18 /* 17859C 80249CBC 3C013F00 */ lui $at, 0x3f00 /* 1785A0 80249CC0 44811000 */ mtc1 $at, $f2 -/* 1785A4 80249CC4 00000000 */ nop +/* 1785A4 80249CC4 00000000 */ nop /* 1785A8 80249CC8 46020002 */ mul.s $f0, $f0, $f2 -/* 1785AC 80249CCC 00000000 */ nop +/* 1785AC 80249CCC 00000000 */ nop /* 1785B0 80249CD0 46009000 */ add.s $f0, $f18, $f0 .L80249CD4: /* 1785B4 80249CD4 E7A0001C */ swc1 $f0, 0x1c($sp) /* 1785B8 80249CD8 3C02802A */ lui $v0, %hi(D_8029F2A6) /* 1785BC 80249CDC 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 1785C0 80249CE0 10400029 */ beqz $v0, .L80249D88 -/* 1785C4 80249CE4 00000000 */ nop +/* 1785C4 80249CE4 00000000 */ nop /* 1785C8 80249CE8 3C01802A */ lui $at, %hi(D_8029F28C) /* 1785CC 80249CEC C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) /* 1785D0 80249CF0 3C0143FA */ lui $at, 0x43fa /* 1785D4 80249CF4 44810000 */ mtc1 $at, $f0 -/* 1785D8 80249CF8 00000000 */ nop +/* 1785D8 80249CF8 00000000 */ nop /* 1785DC 80249CFC 46020001 */ sub.s $f0, $f0, $f2 /* 1785E0 80249D00 3C01802A */ lui $at, %hi(D_8029CC08) /* 1785E4 80249D04 D422CC08 */ ldc1 $f2, %lo(D_8029CC08)($at) /* 1785E8 80249D08 46000021 */ cvt.d.s $f0, $f0 /* 1785EC 80249D0C 46220002 */ mul.d $f0, $f0, $f2 -/* 1785F0 80249D10 00000000 */ nop +/* 1785F0 80249D10 00000000 */ nop /* 1785F4 80249D14 3C01403E */ lui $at, 0x403e /* 1785F8 80249D18 44811800 */ mtc1 $at, $f3 /* 1785FC 80249D1C 44801000 */ mtc1 $zero, $f2 -/* 178600 80249D20 00000000 */ nop +/* 178600 80249D20 00000000 */ nop /* 178604 80249D24 46220000 */ add.d $f0, $f0, $f2 /* 178608 80249D28 46200120 */ cvt.s.d $f4, $f0 /* 17860C 80249D2C 46002007 */ neg.s $f0, $f4 /* 178610 80249D30 4600F03C */ c.lt.s $f30, $f0 -/* 178614 80249D34 00000000 */ nop +/* 178614 80249D34 00000000 */ nop /* 178618 80249D38 45000008 */ bc1f .L80249D5C -/* 17861C 80249D3C 00000000 */ nop +/* 17861C 80249D3C 00000000 */ nop /* 178620 80249D40 461E0001 */ sub.s $f0, $f0, $f30 /* 178624 80249D44 3C013F00 */ lui $at, 0x3f00 /* 178628 80249D48 44811000 */ mtc1 $at, $f2 -/* 17862C 80249D4C 00000000 */ nop +/* 17862C 80249D4C 00000000 */ nop /* 178630 80249D50 46020002 */ mul.s $f0, $f0, $f2 -/* 178634 80249D54 00000000 */ nop +/* 178634 80249D54 00000000 */ nop /* 178638 80249D58 4600F780 */ add.s $f30, $f30, $f0 .L80249D5C: /* 17863C 80249D5C 461E203C */ c.lt.s $f4, $f30 -/* 178640 80249D60 00000000 */ nop +/* 178640 80249D60 00000000 */ nop /* 178644 80249D64 45000008 */ bc1f .L80249D88 -/* 178648 80249D68 00000000 */ nop +/* 178648 80249D68 00000000 */ nop /* 17864C 80249D6C 461E2001 */ sub.s $f0, $f4, $f30 /* 178650 80249D70 3C013F00 */ lui $at, 0x3f00 /* 178654 80249D74 44811000 */ mtc1 $at, $f2 -/* 178658 80249D78 00000000 */ nop +/* 178658 80249D78 00000000 */ nop /* 17865C 80249D7C 46020002 */ mul.s $f0, $f0, $f2 -/* 178660 80249D80 00000000 */ nop +/* 178660 80249D80 00000000 */ nop /* 178664 80249D84 4600F780 */ add.s $f30, $f30, $f0 .L80249D88: /* 178668 80249D88 12200055 */ beqz $s1, .L80249EE0 -/* 17866C 80249D8C 00000000 */ nop +/* 17866C 80249D8C 00000000 */ nop /* 178670 80249D90 3C0141C0 */ lui $at, 0x41c0 /* 178674 80249D94 44810000 */ mtc1 $at, $f0 -/* 178678 80249D98 00000000 */ nop +/* 178678 80249D98 00000000 */ nop /* 17867C 80249D9C 4600B581 */ sub.s $f22, $f22, $f0 /* 178680 80249DA0 4600D681 */ sub.s $f26, $f26, $f0 /* 178684 80249DA4 44800000 */ mtc1 $zero, $f0 -/* 178688 80249DA8 00000000 */ nop +/* 178688 80249DA8 00000000 */ nop /* 17868C 80249DAC 4600B03C */ c.lt.s $f22, $f0 -/* 178690 80249DB0 00000000 */ nop +/* 178690 80249DB0 00000000 */ nop /* 178694 80249DB4 45030001 */ bc1tl .L80249DBC /* 178698 80249DB8 46000586 */ mov.s $f22, $f0 .L80249DBC: /* 17869C 80249DBC 4600D03C */ c.lt.s $f26, $f0 -/* 1786A0 80249DC0 00000000 */ nop +/* 1786A0 80249DC0 00000000 */ nop /* 1786A4 80249DC4 45030001 */ bc1tl .L80249DCC /* 1786A8 80249DC8 46000686 */ mov.s $f26, $f0 .L80249DCC: @@ -393,7 +393,7 @@ glabel func_80249804 /* 1786B4 80249DD4 84620000 */ lh $v0, ($v1) /* 1786B8 80249DD8 461AB080 */ add.s $f2, $f22, $f26 /* 1786BC 80249DDC 44820000 */ mtc1 $v0, $f0 -/* 1786C0 80249DE0 00000000 */ nop +/* 1786C0 80249DE0 00000000 */ nop /* 1786C4 80249DE4 46800020 */ cvt.s.w $f0, $f0 /* 1786C8 80249DE8 46020000 */ add.s $f0, $f0, $f2 /* 1786CC 80249DEC 3C02802A */ lui $v0, %hi(D_8029F2A4) @@ -422,18 +422,18 @@ glabel func_80249804 /* 178724 80249E44 86040026 */ lh $a0, 0x26($s0) /* 178728 80249E48 86030024 */ lh $v1, 0x24($s0) /* 17872C 80249E4C 44820000 */ mtc1 $v0, $f0 -/* 178730 80249E50 00000000 */ nop +/* 178730 80249E50 00000000 */ nop /* 178734 80249E54 46800020 */ cvt.s.w $f0, $f0 /* 178738 80249E58 86020022 */ lh $v0, 0x22($s0) /* 17873C 80249E5C 3C01802A */ lui $at, %hi(D_8029F28C) /* 178740 80249E60 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 178744 80249E64 44820000 */ mtc1 $v0, $f0 -/* 178748 80249E68 00000000 */ nop +/* 178748 80249E68 00000000 */ nop /* 17874C 80249E6C 46800020 */ cvt.s.w $f0, $f0 /* 178750 80249E70 3C01802A */ lui $at, %hi(D_8029F294) /* 178754 80249E74 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) /* 178758 80249E78 44830000 */ mtc1 $v1, $f0 -/* 17875C 80249E7C 00000000 */ nop +/* 17875C 80249E7C 00000000 */ nop /* 178760 80249E80 46800020 */ cvt.s.w $f0, $f0 /* 178764 80249E84 3C01802A */ lui $at, %hi(D_8029F290) /* 178768 80249E88 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -447,7 +447,7 @@ glabel func_80249804 /* 178784 80249EA4 3C03802A */ lui $v1, %hi(D_8029F29E) /* 178788 80249EA8 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 17878C 80249EAC 44820000 */ mtc1 $v0, $f0 -/* 178790 80249EB0 00000000 */ nop +/* 178790 80249EB0 00000000 */ nop /* 178794 80249EB4 46800020 */ cvt.s.w $f0, $f0 /* 178798 80249EB8 3C01802A */ lui $at, %hi(D_8029F298) /* 17879C 80249EBC E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -463,7 +463,7 @@ glabel func_80249804 /* 1787C0 80249EE0 3C02802A */ lui $v0, %hi(D_8029F2A5) /* 1787C4 80249EE4 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) /* 1787C8 80249EE8 14400027 */ bnez $v0, .L80249F88 -/* 1787CC 80249EEC 00000000 */ nop +/* 1787CC 80249EEC 00000000 */ nop /* 1787D0 80249EF0 3C02802A */ lui $v0, %hi(D_8029F29E) /* 1787D4 80249EF4 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) /* 1787D8 80249EF8 3C03802A */ lui $v1, %hi(D_8029F2A0) @@ -471,35 +471,35 @@ glabel func_80249804 /* 1787E0 80249F00 3C013F80 */ lui $at, 0x3f80 /* 1787E4 80249F04 4481C000 */ mtc1 $at, $f24 /* 1787E8 80249F08 4482D000 */ mtc1 $v0, $f26 -/* 1787EC 80249F0C 00000000 */ nop +/* 1787EC 80249F0C 00000000 */ nop /* 1787F0 80249F10 4680D6A0 */ cvt.s.w $f26, $f26 /* 1787F4 80249F14 44830000 */ mtc1 $v1, $f0 -/* 1787F8 80249F18 00000000 */ nop +/* 1787F8 80249F18 00000000 */ nop /* 1787FC 80249F1C 46800020 */ cvt.s.w $f0, $f0 /* 178800 80249F20 4600D683 */ div.s $f26, $f26, $f0 /* 178804 80249F24 461AC301 */ sub.s $f12, $f24, $f26 /* 178808 80249F28 3C014049 */ lui $at, 0x4049 /* 17880C 80249F2C 34210FD0 */ ori $at, $at, 0xfd0 /* 178810 80249F30 4481B000 */ mtc1 $at, $f22 -/* 178814 80249F34 00000000 */ nop +/* 178814 80249F34 00000000 */ nop /* 178818 80249F38 46166302 */ mul.s $f12, $f12, $f22 -/* 17881C 80249F3C 00000000 */ nop +/* 17881C 80249F3C 00000000 */ nop /* 178820 80249F40 3C013F00 */ lui $at, 0x3f00 /* 178824 80249F44 4481A000 */ mtc1 $at, $f20 -/* 178828 80249F48 00000000 */ nop +/* 178828 80249F48 00000000 */ nop /* 17882C 80249F4C 46146302 */ mul.s $f12, $f12, $f20 /* 178830 80249F50 0C00A85B */ jal sin_rad -/* 178834 80249F54 00000000 */ nop +/* 178834 80249F54 00000000 */ nop /* 178838 80249F58 46160002 */ mul.s $f0, $f0, $f22 -/* 17883C 80249F5C 00000000 */ nop +/* 17883C 80249F5C 00000000 */ nop /* 178840 80249F60 46140302 */ mul.s $f12, $f0, $f20 /* 178844 80249F64 0C00A85B */ jal sin_rad -/* 178848 80249F68 00000000 */ nop +/* 178848 80249F68 00000000 */ nop /* 17884C 80249F6C 46160002 */ mul.s $f0, $f0, $f22 -/* 178850 80249F70 00000000 */ nop +/* 178850 80249F70 00000000 */ nop /* 178854 80249F74 46140302 */ mul.s $f12, $f0, $f20 /* 178858 80249F78 0C00A85B */ jal sin_rad -/* 17885C 80249F7C 00000000 */ nop +/* 17885C 80249F7C 00000000 */ nop /* 178860 80249F80 080927ED */ j .L80249FB4 /* 178864 80249F84 4600C681 */ sub.s $f26, $f24, $f0 .L80249F88: @@ -508,47 +508,47 @@ glabel func_80249804 /* 178870 80249F90 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 178874 80249F94 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 178878 80249F98 4482D000 */ mtc1 $v0, $f26 -/* 17887C 80249F9C 00000000 */ nop +/* 17887C 80249F9C 00000000 */ nop /* 178880 80249FA0 4680D6A0 */ cvt.s.w $f26, $f26 /* 178884 80249FA4 44830000 */ mtc1 $v1, $f0 -/* 178888 80249FA8 00000000 */ nop +/* 178888 80249FA8 00000000 */ nop /* 17888C 80249FAC 46800020 */ cvt.s.w $f0, $f0 /* 178890 80249FB0 4600D683 */ div.s $f26, $f26, $f0 .L80249FB4: /* 178894 80249FB4 3C01802A */ lui $at, %hi(D_8029F2A8) /* 178898 80249FB8 C426F2A8 */ lwc1 $f6, %lo(D_8029F2A8)($at) /* 17889C 80249FBC 461A3182 */ mul.s $f6, $f6, $f26 -/* 1788A0 80249FC0 00000000 */ nop +/* 1788A0 80249FC0 00000000 */ nop /* 1788A4 80249FC4 3C01802A */ lui $at, %hi(D_8029F2AC) /* 1788A8 80249FC8 C428F2AC */ lwc1 $f8, %lo(D_8029F2AC)($at) /* 1788AC 80249FCC 461A4202 */ mul.s $f8, $f8, $f26 -/* 1788B0 80249FD0 00000000 */ nop +/* 1788B0 80249FD0 00000000 */ nop /* 1788B4 80249FD4 3C01802A */ lui $at, %hi(D_8029F2B0) /* 1788B8 80249FD8 C424F2B0 */ lwc1 $f4, %lo(D_8029F2B0)($at) /* 1788BC 80249FDC 461A2102 */ mul.s $f4, $f4, $f26 -/* 1788C0 80249FE0 00000000 */ nop +/* 1788C0 80249FE0 00000000 */ nop /* 1788C4 80249FE4 3C01802A */ lui $at, %hi(D_8029F298) /* 1788C8 80249FE8 C422F298 */ lwc1 $f2, %lo(D_8029F298)($at) /* 1788CC 80249FEC 461A1082 */ mul.s $f2, $f2, $f26 -/* 1788D0 80249FF0 00000000 */ nop +/* 1788D0 80249FF0 00000000 */ nop /* 1788D4 80249FF4 3C013F80 */ lui $at, 0x3f80 /* 1788D8 80249FF8 4481B000 */ mtc1 $at, $f22 -/* 1788DC 80249FFC 00000000 */ nop +/* 1788DC 80249FFC 00000000 */ nop /* 1788E0 8024A000 461AB581 */ sub.s $f22, $f22, $f26 /* 1788E4 8024A004 4616F302 */ mul.s $f12, $f30, $f22 -/* 1788E8 8024A008 00000000 */ nop +/* 1788E8 8024A008 00000000 */ nop /* 1788EC 8024A00C 4616E382 */ mul.s $f14, $f28, $f22 -/* 1788F0 8024A010 00000000 */ nop +/* 1788F0 8024A010 00000000 */ nop /* 1788F4 8024A014 3C02802A */ lui $v0, %hi(D_8029F286) /* 1788F8 8024A018 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 1788FC 8024A01C 44820000 */ mtc1 $v0, $f0 -/* 178900 8024A020 00000000 */ nop +/* 178900 8024A020 00000000 */ nop /* 178904 8024A024 46800020 */ cvt.s.w $f0, $f0 /* 178908 8024A028 46160002 */ mul.s $f0, $f0, $f22 -/* 17890C 8024A02C 00000000 */ nop +/* 17890C 8024A02C 00000000 */ nop /* 178910 8024A030 C7B2001C */ lwc1 $f18, 0x1c($sp) /* 178914 8024A034 46169282 */ mul.s $f10, $f18, $f22 -/* 178918 8024A038 00000000 */ nop +/* 178918 8024A038 00000000 */ nop /* 17891C 8024A03C 46001080 */ add.s $f2, $f2, $f0 /* 178920 8024A040 C6180054 */ lwc1 $f24, 0x54($s0) /* 178924 8024A044 C6140058 */ lwc1 $f20, 0x58($s0) @@ -563,7 +563,7 @@ glabel func_80249804 /* 178948 8024A068 E7B00018 */ swc1 $f16, 0x18($sp) /* 17894C 8024A06C E6060054 */ swc1 $f6, 0x54($s0) /* 178950 8024A070 46001082 */ mul.s $f2, $f2, $f0 -/* 178954 8024A074 00000000 */ nop +/* 178954 8024A074 00000000 */ nop /* 178958 8024A078 46003306 */ mov.s $f12, $f6 /* 17895C 8024A07C E604005C */ swc1 $f4, 0x5c($s0) /* 178960 8024A080 46002386 */ mov.s $f14, $f4 @@ -590,60 +590,60 @@ glabel func_80249804 /* 1789B4 8024A0D4 4600A501 */ sub.s $f20, $f20, $f0 /* 1789B8 8024A0D8 3C013F00 */ lui $at, 0x3f00 /* 1789BC 8024A0DC 44811000 */ mtc1 $at, $f2 -/* 1789C0 8024A0E0 00000000 */ nop +/* 1789C0 8024A0E0 00000000 */ nop /* 1789C4 8024A0E4 46020002 */ mul.s $f0, $f0, $f2 -/* 1789C8 8024A0E8 00000000 */ nop +/* 1789C8 8024A0E8 00000000 */ nop /* 1789CC 8024A0EC 3C01802A */ lui $at, %hi(D_8029F28C) /* 1789D0 8024A0F0 C42AF28C */ lwc1 $f10, %lo(D_8029F28C)($at) /* 1789D4 8024A0F4 461A5282 */ mul.s $f10, $f10, $f26 -/* 1789D8 8024A0F8 00000000 */ nop +/* 1789D8 8024A0F8 00000000 */ nop /* 1789DC 8024A0FC 3C01802A */ lui $at, %hi(D_8029F290) /* 1789E0 8024A100 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 1789E4 8024A104 461A4202 */ mul.s $f8, $f8, $f26 -/* 1789E8 8024A108 00000000 */ nop +/* 1789E8 8024A108 00000000 */ nop /* 1789EC 8024A10C 3C01802A */ lui $at, %hi(D_8029F294) /* 1789F0 8024A110 C424F294 */ lwc1 $f4, %lo(D_8029F294)($at) /* 1789F4 8024A114 3C02802A */ lui $v0, %hi(D_8029F280) /* 1789F8 8024A118 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 1789FC 8024A11C 461A2102 */ mul.s $f4, $f4, $f26 -/* 178A00 8024A120 00000000 */ nop +/* 178A00 8024A120 00000000 */ nop /* 178A04 8024A124 44821000 */ mtc1 $v0, $f2 -/* 178A08 8024A128 00000000 */ nop +/* 178A08 8024A128 00000000 */ nop /* 178A0C 8024A12C 468010A0 */ cvt.s.w $f2, $f2 /* 178A10 8024A130 3C02802A */ lui $v0, %hi(D_8029F282) /* 178A14 8024A134 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 178A18 8024A138 44823000 */ mtc1 $v0, $f6 -/* 178A1C 8024A13C 00000000 */ nop +/* 178A1C 8024A13C 00000000 */ nop /* 178A20 8024A140 468031A0 */ cvt.s.w $f6, $f6 /* 178A24 8024A144 46163182 */ mul.s $f6, $f6, $f22 -/* 178A28 8024A148 00000000 */ nop +/* 178A28 8024A148 00000000 */ nop /* 178A2C 8024A14C 46141080 */ add.s $f2, $f2, $f20 /* 178A30 8024A150 3C02802A */ lui $v0, %hi(D_8029F284) /* 178A34 8024A154 8442F284 */ lh $v0, %lo(D_8029F284)($v0) /* 178A38 8024A158 46001080 */ add.s $f2, $f2, $f0 /* 178A3C 8024A15C 44820000 */ mtc1 $v0, $f0 -/* 178A40 8024A160 00000000 */ nop +/* 178A40 8024A160 00000000 */ nop /* 178A44 8024A164 46800020 */ cvt.s.w $f0, $f0 /* 178A48 8024A168 46160002 */ mul.s $f0, $f0, $f22 -/* 178A4C 8024A16C 00000000 */ nop +/* 178A4C 8024A16C 00000000 */ nop /* 178A50 8024A170 46161082 */ mul.s $f2, $f2, $f22 -/* 178A54 8024A174 00000000 */ nop +/* 178A54 8024A174 00000000 */ nop /* 178A58 8024A178 46064200 */ add.s $f8, $f8, $f6 /* 178A5C 8024A17C 3C04802A */ lui $a0, %hi(D_8029F29E) /* 178A60 8024A180 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) /* 178A64 8024A184 46002100 */ add.s $f4, $f4, $f0 /* 178A68 8024A188 4600440D */ trunc.w.s $f16, $f8 /* 178A6C 8024A18C 44028000 */ mfc1 $v0, $f16 -/* 178A70 8024A190 00000000 */ nop +/* 178A70 8024A190 00000000 */ nop /* 178A74 8024A194 A6020024 */ sh $v0, 0x24($s0) /* 178A78 8024A198 46025280 */ add.s $f10, $f10, $f2 /* 178A7C 8024A19C 4600240D */ trunc.w.s $f16, $f4 /* 178A80 8024A1A0 44028000 */ mfc1 $v0, $f16 -/* 178A84 8024A1A4 00000000 */ nop +/* 178A84 8024A1A4 00000000 */ nop /* 178A88 8024A1A8 A6020022 */ sh $v0, 0x22($s0) /* 178A8C 8024A1AC 4600540D */ trunc.w.s $f16, $f10 /* 178A90 8024A1B0 44028000 */ mfc1 $v0, $f16 -/* 178A94 8024A1B4 00000000 */ nop +/* 178A94 8024A1B4 00000000 */ nop /* 178A98 8024A1B8 A602001E */ sh $v0, 0x1e($s0) /* 178A9C 8024A1BC 84820000 */ lh $v0, ($a0) /* 178AA0 8024A1C0 94830000 */ lhu $v1, ($a0) diff --git a/asm/nonmatchings/code_1776B0/func_8024A214.s b/asm/nonmatchings/code_1776B0/func_8024A214.s index b79dd33e31..9ec2e516f6 100644 --- a/asm/nonmatchings/code_1776B0/func_8024A214.s +++ b/asm/nonmatchings/code_1776B0/func_8024A214.s @@ -30,12 +30,12 @@ glabel func_8024A214 /* 178B58 8024A278 10600007 */ beqz $v1, .L8024A298 /* 178B5C 8024A27C 24020002 */ addiu $v0, $zero, 2 /* 178B60 8024A280 08092A58 */ j .L8024A960 -/* 178B64 8024A284 00000000 */ nop +/* 178B64 8024A284 00000000 */ nop .L8024A288: /* 178B68 8024A288 1062003F */ beq $v1, $v0, .L8024A388 /* 178B6C 8024A28C 24020002 */ addiu $v0, $zero, 2 /* 178B70 8024A290 08092A58 */ j .L8024A960 -/* 178B74 8024A294 00000000 */ nop +/* 178B74 8024A294 00000000 */ nop .L8024A298: /* 178B78 8024A298 8C8500D8 */ lw $a1, 0xd8($a0) .L8024A29C: @@ -48,19 +48,19 @@ glabel func_8024A214 /* 178B94 8024A2B4 90A30190 */ lbu $v1, 0x190($a1) /* 178B98 8024A2B8 C4A20148 */ lwc1 $f2, 0x148($a1) /* 178B9C 8024A2BC 4482F000 */ mtc1 $v0, $f30 -/* 178BA0 8024A2C0 00000000 */ nop +/* 178BA0 8024A2C0 00000000 */ nop /* 178BA4 8024A2C4 4680F7A0 */ cvt.s.w $f30, $f30 /* 178BA8 8024A2C8 4483A000 */ mtc1 $v1, $f20 -/* 178BAC 8024A2CC 00000000 */ nop +/* 178BAC 8024A2CC 00000000 */ nop /* 178BB0 8024A2D0 4680A520 */ cvt.s.w $f20, $f20 /* 178BB4 8024A2D4 00021842 */ srl $v1, $v0, 1 /* 178BB8 8024A2D8 44830000 */ mtc1 $v1, $f0 -/* 178BBC 8024A2DC 00000000 */ nop +/* 178BBC 8024A2DC 00000000 */ nop /* 178BC0 8024A2E0 46800020 */ cvt.s.w $f0, $f0 /* 178BC4 8024A2E4 46001080 */ add.s $f2, $f2, $f0 /* 178BC8 8024A2E8 00021082 */ srl $v0, $v0, 2 /* 178BCC 8024A2EC 44820000 */ mtc1 $v0, $f0 -/* 178BD0 8024A2F0 00000000 */ nop +/* 178BD0 8024A2F0 00000000 */ nop /* 178BD4 8024A2F4 46800020 */ cvt.s.w $f0, $f0 /* 178BD8 8024A2F8 0C09A75B */ jal get_actor /* 178BDC 8024A2FC 46001600 */ add.s $f24, $f2, $f0 @@ -71,19 +71,19 @@ glabel func_8024A214 /* 178BF0 8024A310 461A2101 */ sub.s $f4, $f4, $f26 /* 178BF4 8024A314 3C013F00 */ lui $at, 0x3f00 /* 178BF8 8024A318 44815000 */ mtc1 $at, $f10 -/* 178BFC 8024A31C 00000000 */ nop +/* 178BFC 8024A31C 00000000 */ nop /* 178C00 8024A320 460A2102 */ mul.s $f4, $f4, $f10 -/* 178C04 8024A324 00000000 */ nop +/* 178C04 8024A324 00000000 */ nop /* 178C08 8024A328 92020191 */ lbu $v0, 0x191($s0) /* 178C0C 8024A32C C6020148 */ lwc1 $f2, 0x148($s0) /* 178C10 8024A330 00021842 */ srl $v1, $v0, 1 /* 178C14 8024A334 44830000 */ mtc1 $v1, $f0 -/* 178C18 8024A338 00000000 */ nop +/* 178C18 8024A338 00000000 */ nop /* 178C1C 8024A33C 46800020 */ cvt.s.w $f0, $f0 /* 178C20 8024A340 46001080 */ add.s $f2, $f2, $f0 /* 178C24 8024A344 00021082 */ srl $v0, $v0, 2 /* 178C28 8024A348 44820000 */ mtc1 $v0, $f0 -/* 178C2C 8024A34C 00000000 */ nop +/* 178C2C 8024A34C 00000000 */ nop /* 178C30 8024A350 46800020 */ cvt.s.w $f0, $f0 /* 178C34 8024A354 46001180 */ add.s $f6, $f2, $f0 /* 178C38 8024A358 C608014C */ lwc1 $f8, 0x14c($s0) @@ -98,7 +98,7 @@ glabel func_8024A214 .L8024A37C: /* 178C5C 8024A37C 8C8500DC */ lw $a1, 0xdc($a0) /* 178C60 8024A380 080928A7 */ j .L8024A29C -/* 178C64 8024A384 00000000 */ nop +/* 178C64 8024A384 00000000 */ nop .L8024A388: /* 178C68 8024A388 00051080 */ sll $v0, $a1, 2 /* 178C6C 8024A38C 00441021 */ addu $v0, $v0, $a0 @@ -116,19 +116,19 @@ glabel func_8024A214 /* 178C9C 8024A3BC 90450072 */ lbu $a1, 0x72($v0) /* 178CA0 8024A3C0 C4420030 */ lwc1 $f2, 0x30($v0) /* 178CA4 8024A3C4 4483F000 */ mtc1 $v1, $f30 -/* 178CA8 8024A3C8 00000000 */ nop +/* 178CA8 8024A3C8 00000000 */ nop /* 178CAC 8024A3CC 4680F7A0 */ cvt.s.w $f30, $f30 /* 178CB0 8024A3D0 4485A000 */ mtc1 $a1, $f20 -/* 178CB4 8024A3D4 00000000 */ nop +/* 178CB4 8024A3D4 00000000 */ nop /* 178CB8 8024A3D8 4680A520 */ cvt.s.w $f20, $f20 /* 178CBC 8024A3DC 00032842 */ srl $a1, $v1, 1 /* 178CC0 8024A3E0 44850000 */ mtc1 $a1, $f0 -/* 178CC4 8024A3E4 00000000 */ nop +/* 178CC4 8024A3E4 00000000 */ nop /* 178CC8 8024A3E8 46800020 */ cvt.s.w $f0, $f0 /* 178CCC 8024A3EC 46001080 */ add.s $f2, $f2, $f0 /* 178CD0 8024A3F0 00031882 */ srl $v1, $v1, 2 /* 178CD4 8024A3F4 44830000 */ mtc1 $v1, $f0 -/* 178CD8 8024A3F8 00000000 */ nop +/* 178CD8 8024A3F8 00000000 */ nop /* 178CDC 8024A3FC 46800020 */ cvt.s.w $f0, $f0 /* 178CE0 8024A400 0C09A75B */ jal get_actor /* 178CE4 8024A404 46001600 */ add.s $f24, $f2, $f0 @@ -139,19 +139,19 @@ glabel func_8024A214 /* 178CF8 8024A418 461A2101 */ sub.s $f4, $f4, $f26 /* 178CFC 8024A41C 3C013F00 */ lui $at, 0x3f00 /* 178D00 8024A420 44815000 */ mtc1 $at, $f10 -/* 178D04 8024A424 00000000 */ nop +/* 178D04 8024A424 00000000 */ nop /* 178D08 8024A428 460A2102 */ mul.s $f4, $f4, $f10 -/* 178D0C 8024A42C 00000000 */ nop +/* 178D0C 8024A42C 00000000 */ nop /* 178D10 8024A430 92020191 */ lbu $v0, 0x191($s0) /* 178D14 8024A434 C6020148 */ lwc1 $f2, 0x148($s0) /* 178D18 8024A438 00021842 */ srl $v1, $v0, 1 /* 178D1C 8024A43C 44830000 */ mtc1 $v1, $f0 -/* 178D20 8024A440 00000000 */ nop +/* 178D20 8024A440 00000000 */ nop /* 178D24 8024A444 46800020 */ cvt.s.w $f0, $f0 /* 178D28 8024A448 46001080 */ add.s $f2, $f2, $f0 /* 178D2C 8024A44C 00021082 */ srl $v0, $v0, 2 /* 178D30 8024A450 44820000 */ mtc1 $v0, $f0 -/* 178D34 8024A454 00000000 */ nop +/* 178D34 8024A454 00000000 */ nop /* 178D38 8024A458 46800020 */ cvt.s.w $f0, $f0 /* 178D3C 8024A45C 46001180 */ add.s $f6, $f2, $f0 /* 178D40 8024A460 C608014C */ lwc1 $f8, 0x14c($s0) @@ -164,7 +164,7 @@ glabel func_8024A214 /* 178D5C 8024A47C 4606C001 */ sub.s $f0, $f24, $f6 .L8024A480: /* 178D60 8024A480 460A0082 */ mul.s $f2, $f0, $f10 -/* 178D64 8024A484 00000000 */ nop +/* 178D64 8024A484 00000000 */ nop /* 178D68 8024A488 3C0140C0 */ lui $at, 0x40c0 /* 178D6C 8024A48C 44812000 */ mtc1 $at, $f4 /* 178D70 8024A490 46023080 */ add.s $f2, $f6, $f2 @@ -177,73 +177,73 @@ glabel func_8024A214 /* 178D84 8024A4A4 46164001 */ sub.s $f0, $f8, $f22 /* 178D88 8024A4A8 3C013F00 */ lui $at, 0x3f00 /* 178D8C 8024A4AC 44811000 */ mtc1 $at, $f2 -/* 178D90 8024A4B0 00000000 */ nop +/* 178D90 8024A4B0 00000000 */ nop /* 178D94 8024A4B4 46020002 */ mul.s $f0, $f0, $f2 -/* 178D98 8024A4B8 00000000 */ nop +/* 178D98 8024A4B8 00000000 */ nop /* 178D9C 8024A4BC 4600B580 */ add.s $f22, $f22, $f0 /* 178DA0 8024A4C0 E7B60010 */ swc1 $f22, 0x10($sp) /* 178DA4 8024A4C4 3C02802A */ lui $v0, %hi(D_8029F2A6) /* 178DA8 8024A4C8 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 178DAC 8024A4CC 10400029 */ beqz $v0, .L8024A574 -/* 178DB0 8024A4D0 00000000 */ nop +/* 178DB0 8024A4D0 00000000 */ nop /* 178DB4 8024A4D4 3C01802A */ lui $at, %hi(D_8029F28C) /* 178DB8 8024A4D8 C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) /* 178DBC 8024A4DC 3C0143FA */ lui $at, 0x43fa /* 178DC0 8024A4E0 44810000 */ mtc1 $at, $f0 -/* 178DC4 8024A4E4 00000000 */ nop +/* 178DC4 8024A4E4 00000000 */ nop /* 178DC8 8024A4E8 46020001 */ sub.s $f0, $f0, $f2 /* 178DCC 8024A4EC 3C01802A */ lui $at, %hi(D_8029CC10) /* 178DD0 8024A4F0 D422CC10 */ ldc1 $f2, %lo(D_8029CC10)($at) /* 178DD4 8024A4F4 46000021 */ cvt.d.s $f0, $f0 /* 178DD8 8024A4F8 46220002 */ mul.d $f0, $f0, $f2 -/* 178DDC 8024A4FC 00000000 */ nop +/* 178DDC 8024A4FC 00000000 */ nop /* 178DE0 8024A500 3C01403E */ lui $at, 0x403e /* 178DE4 8024A504 44811800 */ mtc1 $at, $f3 /* 178DE8 8024A508 44801000 */ mtc1 $zero, $f2 -/* 178DEC 8024A50C 00000000 */ nop +/* 178DEC 8024A50C 00000000 */ nop /* 178DF0 8024A510 46220000 */ add.d $f0, $f0, $f2 /* 178DF4 8024A514 46200120 */ cvt.s.d $f4, $f0 /* 178DF8 8024A518 46002007 */ neg.s $f0, $f4 /* 178DFC 8024A51C 4600D03C */ c.lt.s $f26, $f0 -/* 178E00 8024A520 00000000 */ nop +/* 178E00 8024A520 00000000 */ nop /* 178E04 8024A524 45000008 */ bc1f .L8024A548 -/* 178E08 8024A528 00000000 */ nop +/* 178E08 8024A528 00000000 */ nop /* 178E0C 8024A52C 461A0001 */ sub.s $f0, $f0, $f26 /* 178E10 8024A530 3C013F00 */ lui $at, 0x3f00 /* 178E14 8024A534 44811000 */ mtc1 $at, $f2 -/* 178E18 8024A538 00000000 */ nop +/* 178E18 8024A538 00000000 */ nop /* 178E1C 8024A53C 46020002 */ mul.s $f0, $f0, $f2 -/* 178E20 8024A540 00000000 */ nop +/* 178E20 8024A540 00000000 */ nop /* 178E24 8024A544 4600D680 */ add.s $f26, $f26, $f0 .L8024A548: /* 178E28 8024A548 461A203C */ c.lt.s $f4, $f26 -/* 178E2C 8024A54C 00000000 */ nop +/* 178E2C 8024A54C 00000000 */ nop /* 178E30 8024A550 45000008 */ bc1f .L8024A574 -/* 178E34 8024A554 00000000 */ nop +/* 178E34 8024A554 00000000 */ nop /* 178E38 8024A558 461A2001 */ sub.s $f0, $f4, $f26 /* 178E3C 8024A55C 3C013F00 */ lui $at, 0x3f00 /* 178E40 8024A560 44811000 */ mtc1 $at, $f2 -/* 178E44 8024A564 00000000 */ nop +/* 178E44 8024A564 00000000 */ nop /* 178E48 8024A568 46020002 */ mul.s $f0, $f0, $f2 -/* 178E4C 8024A56C 00000000 */ nop +/* 178E4C 8024A56C 00000000 */ nop /* 178E50 8024A570 4600D680 */ add.s $f26, $f26, $f0 .L8024A574: /* 178E54 8024A574 12400055 */ beqz $s2, .L8024A6CC -/* 178E58 8024A578 00000000 */ nop +/* 178E58 8024A578 00000000 */ nop /* 178E5C 8024A57C 3C0141C0 */ lui $at, 0x41c0 /* 178E60 8024A580 44810000 */ mtc1 $at, $f0 -/* 178E64 8024A584 00000000 */ nop +/* 178E64 8024A584 00000000 */ nop /* 178E68 8024A588 4600A501 */ sub.s $f20, $f20, $f0 /* 178E6C 8024A58C 4600F781 */ sub.s $f30, $f30, $f0 /* 178E70 8024A590 44800000 */ mtc1 $zero, $f0 -/* 178E74 8024A594 00000000 */ nop +/* 178E74 8024A594 00000000 */ nop /* 178E78 8024A598 4600A03C */ c.lt.s $f20, $f0 -/* 178E7C 8024A59C 00000000 */ nop +/* 178E7C 8024A59C 00000000 */ nop /* 178E80 8024A5A0 45030001 */ bc1tl .L8024A5A8 /* 178E84 8024A5A4 46000506 */ mov.s $f20, $f0 .L8024A5A8: /* 178E88 8024A5A8 4600F03C */ c.lt.s $f30, $f0 -/* 178E8C 8024A5AC 00000000 */ nop +/* 178E8C 8024A5AC 00000000 */ nop /* 178E90 8024A5B0 45030001 */ bc1tl .L8024A5B8 /* 178E94 8024A5B4 46000786 */ mov.s $f30, $f0 .L8024A5B8: @@ -252,7 +252,7 @@ glabel func_8024A214 /* 178EA0 8024A5C0 84620000 */ lh $v0, ($v1) /* 178EA4 8024A5C4 461EA080 */ add.s $f2, $f20, $f30 /* 178EA8 8024A5C8 44820000 */ mtc1 $v0, $f0 -/* 178EAC 8024A5CC 00000000 */ nop +/* 178EAC 8024A5CC 00000000 */ nop /* 178EB0 8024A5D0 46800020 */ cvt.s.w $f0, $f0 /* 178EB4 8024A5D4 46020000 */ add.s $f0, $f0, $f2 /* 178EB8 8024A5D8 3C02802A */ lui $v0, %hi(D_8029F2A4) @@ -281,18 +281,18 @@ glabel func_8024A214 /* 178F10 8024A630 86240026 */ lh $a0, 0x26($s1) /* 178F14 8024A634 86230024 */ lh $v1, 0x24($s1) /* 178F18 8024A638 44820000 */ mtc1 $v0, $f0 -/* 178F1C 8024A63C 00000000 */ nop +/* 178F1C 8024A63C 00000000 */ nop /* 178F20 8024A640 46800020 */ cvt.s.w $f0, $f0 /* 178F24 8024A644 86220022 */ lh $v0, 0x22($s1) /* 178F28 8024A648 3C01802A */ lui $at, %hi(D_8029F28C) /* 178F2C 8024A64C E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 178F30 8024A650 44820000 */ mtc1 $v0, $f0 -/* 178F34 8024A654 00000000 */ nop +/* 178F34 8024A654 00000000 */ nop /* 178F38 8024A658 46800020 */ cvt.s.w $f0, $f0 /* 178F3C 8024A65C 3C01802A */ lui $at, %hi(D_8029F294) /* 178F40 8024A660 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) /* 178F44 8024A664 44830000 */ mtc1 $v1, $f0 -/* 178F48 8024A668 00000000 */ nop +/* 178F48 8024A668 00000000 */ nop /* 178F4C 8024A66C 46800020 */ cvt.s.w $f0, $f0 /* 178F50 8024A670 3C01802A */ lui $at, %hi(D_8029F290) /* 178F54 8024A674 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -306,7 +306,7 @@ glabel func_8024A214 /* 178F70 8024A690 3C03802A */ lui $v1, %hi(D_8029F29E) /* 178F74 8024A694 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 178F78 8024A698 44820000 */ mtc1 $v0, $f0 -/* 178F7C 8024A69C 00000000 */ nop +/* 178F7C 8024A69C 00000000 */ nop /* 178F80 8024A6A0 46800020 */ cvt.s.w $f0, $f0 /* 178F84 8024A6A4 3C01802A */ lui $at, %hi(D_8029F298) /* 178F88 8024A6A8 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -322,7 +322,7 @@ glabel func_8024A214 /* 178FAC 8024A6CC 3C02802A */ lui $v0, %hi(D_8029F2A5) /* 178FB0 8024A6D0 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) /* 178FB4 8024A6D4 14400027 */ bnez $v0, .L8024A774 -/* 178FB8 8024A6D8 00000000 */ nop +/* 178FB8 8024A6D8 00000000 */ nop /* 178FBC 8024A6DC 3C02802A */ lui $v0, %hi(D_8029F29E) /* 178FC0 8024A6E0 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) /* 178FC4 8024A6E4 3C03802A */ lui $v1, %hi(D_8029F2A0) @@ -330,35 +330,35 @@ glabel func_8024A214 /* 178FCC 8024A6EC 3C013F80 */ lui $at, 0x3f80 /* 178FD0 8024A6F0 4481C000 */ mtc1 $at, $f24 /* 178FD4 8024A6F4 44822000 */ mtc1 $v0, $f4 -/* 178FD8 8024A6F8 00000000 */ nop +/* 178FD8 8024A6F8 00000000 */ nop /* 178FDC 8024A6FC 46802120 */ cvt.s.w $f4, $f4 /* 178FE0 8024A700 44830000 */ mtc1 $v1, $f0 -/* 178FE4 8024A704 00000000 */ nop +/* 178FE4 8024A704 00000000 */ nop /* 178FE8 8024A708 46800020 */ cvt.s.w $f0, $f0 /* 178FEC 8024A70C 46002103 */ div.s $f4, $f4, $f0 /* 178FF0 8024A710 4604C301 */ sub.s $f12, $f24, $f4 /* 178FF4 8024A714 3C014049 */ lui $at, 0x4049 /* 178FF8 8024A718 34210FD0 */ ori $at, $at, 0xfd0 /* 178FFC 8024A71C 4481B000 */ mtc1 $at, $f22 -/* 179000 8024A720 00000000 */ nop +/* 179000 8024A720 00000000 */ nop /* 179004 8024A724 46166302 */ mul.s $f12, $f12, $f22 -/* 179008 8024A728 00000000 */ nop +/* 179008 8024A728 00000000 */ nop /* 17900C 8024A72C 3C013F00 */ lui $at, 0x3f00 /* 179010 8024A730 4481A000 */ mtc1 $at, $f20 -/* 179014 8024A734 00000000 */ nop +/* 179014 8024A734 00000000 */ nop /* 179018 8024A738 46146302 */ mul.s $f12, $f12, $f20 /* 17901C 8024A73C 0C00A85B */ jal sin_rad -/* 179020 8024A740 00000000 */ nop +/* 179020 8024A740 00000000 */ nop /* 179024 8024A744 46160002 */ mul.s $f0, $f0, $f22 -/* 179028 8024A748 00000000 */ nop +/* 179028 8024A748 00000000 */ nop /* 17902C 8024A74C 46140302 */ mul.s $f12, $f0, $f20 /* 179030 8024A750 0C00A85B */ jal sin_rad -/* 179034 8024A754 00000000 */ nop +/* 179034 8024A754 00000000 */ nop /* 179038 8024A758 46160002 */ mul.s $f0, $f0, $f22 -/* 17903C 8024A75C 00000000 */ nop +/* 17903C 8024A75C 00000000 */ nop /* 179040 8024A760 46140302 */ mul.s $f12, $f0, $f20 /* 179044 8024A764 0C00A85B */ jal sin_rad -/* 179048 8024A768 00000000 */ nop +/* 179048 8024A768 00000000 */ nop /* 17904C 8024A76C 080929E8 */ j .L8024A7A0 /* 179050 8024A770 4600C101 */ sub.s $f4, $f24, $f0 .L8024A774: @@ -367,79 +367,79 @@ glabel func_8024A214 /* 17905C 8024A77C 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 179060 8024A780 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 179064 8024A784 44822000 */ mtc1 $v0, $f4 -/* 179068 8024A788 00000000 */ nop +/* 179068 8024A788 00000000 */ nop /* 17906C 8024A78C 46802120 */ cvt.s.w $f4, $f4 /* 179070 8024A790 44830000 */ mtc1 $v1, $f0 -/* 179074 8024A794 00000000 */ nop +/* 179074 8024A794 00000000 */ nop /* 179078 8024A798 46800020 */ cvt.s.w $f0, $f0 /* 17907C 8024A79C 46002103 */ div.s $f4, $f4, $f0 .L8024A7A0: /* 179080 8024A7A0 3C01802A */ lui $at, %hi(D_8029F2A8) /* 179084 8024A7A4 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) /* 179088 8024A7A8 4604A502 */ mul.s $f20, $f20, $f4 -/* 17908C 8024A7AC 00000000 */ nop +/* 17908C 8024A7AC 00000000 */ nop /* 179090 8024A7B0 3C01802A */ lui $at, %hi(D_8029F2AC) /* 179094 8024A7B4 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) /* 179098 8024A7B8 46049482 */ mul.s $f18, $f18, $f4 -/* 17909C 8024A7BC 00000000 */ nop +/* 17909C 8024A7BC 00000000 */ nop /* 1790A0 8024A7C0 3C01802A */ lui $at, %hi(D_8029F2B0) /* 1790A4 8024A7C4 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) /* 1790A8 8024A7C8 46048402 */ mul.s $f16, $f16, $f4 -/* 1790AC 8024A7CC 00000000 */ nop +/* 1790AC 8024A7CC 00000000 */ nop /* 1790B0 8024A7D0 3C01802A */ lui $at, %hi(D_8029F298) /* 1790B4 8024A7D4 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) /* 1790B8 8024A7D8 46043182 */ mul.s $f6, $f6, $f4 -/* 1790BC 8024A7DC 00000000 */ nop +/* 1790BC 8024A7DC 00000000 */ nop /* 1790C0 8024A7E0 3C01802A */ lui $at, %hi(D_8029F28C) /* 1790C4 8024A7E4 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) /* 1790C8 8024A7E8 46046302 */ mul.s $f12, $f12, $f4 -/* 1790CC 8024A7EC 00000000 */ nop +/* 1790CC 8024A7EC 00000000 */ nop /* 1790D0 8024A7F0 3C01802A */ lui $at, %hi(D_8029F290) /* 1790D4 8024A7F4 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 1790D8 8024A7F8 46044202 */ mul.s $f8, $f8, $f4 -/* 1790DC 8024A7FC 00000000 */ nop +/* 1790DC 8024A7FC 00000000 */ nop /* 1790E0 8024A800 3C013F80 */ lui $at, 0x3f80 /* 1790E4 8024A804 44811000 */ mtc1 $at, $f2 -/* 1790E8 8024A808 00000000 */ nop +/* 1790E8 8024A808 00000000 */ nop /* 1790EC 8024A80C 46041081 */ sub.s $f2, $f2, $f4 /* 1790F0 8024A810 4602D682 */ mul.s $f26, $f26, $f2 -/* 1790F4 8024A814 00000000 */ nop +/* 1790F4 8024A814 00000000 */ nop /* 1790F8 8024A818 4602E602 */ mul.s $f24, $f28, $f2 -/* 1790FC 8024A81C 00000000 */ nop +/* 1790FC 8024A81C 00000000 */ nop /* 179100 8024A820 3C02802A */ lui $v0, %hi(D_8029F286) /* 179104 8024A824 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 179108 8024A828 44820000 */ mtc1 $v0, $f0 -/* 17910C 8024A82C 00000000 */ nop +/* 17910C 8024A82C 00000000 */ nop /* 179110 8024A830 46800020 */ cvt.s.w $f0, $f0 /* 179114 8024A834 46020002 */ mul.s $f0, $f0, $f2 -/* 179118 8024A838 00000000 */ nop +/* 179118 8024A838 00000000 */ nop /* 17911C 8024A83C C7AE0010 */ lwc1 $f14, 0x10($sp) /* 179120 8024A840 46027582 */ mul.s $f22, $f14, $f2 -/* 179124 8024A844 00000000 */ nop +/* 179124 8024A844 00000000 */ nop /* 179128 8024A848 3C02802A */ lui $v0, %hi(D_8029F280) /* 17912C 8024A84C 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 179130 8024A850 44827000 */ mtc1 $v0, $f14 -/* 179134 8024A854 00000000 */ nop +/* 179134 8024A854 00000000 */ nop /* 179138 8024A858 468073A0 */ cvt.s.w $f14, $f14 /* 17913C 8024A85C 46027382 */ mul.s $f14, $f14, $f2 -/* 179140 8024A860 00000000 */ nop +/* 179140 8024A860 00000000 */ nop /* 179144 8024A864 3C02802A */ lui $v0, %hi(D_8029F282) /* 179148 8024A868 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 17914C 8024A86C 44825000 */ mtc1 $v0, $f10 -/* 179150 8024A870 00000000 */ nop +/* 179150 8024A870 00000000 */ nop /* 179154 8024A874 468052A0 */ cvt.s.w $f10, $f10 /* 179158 8024A878 46025282 */ mul.s $f10, $f10, $f2 -/* 17915C 8024A87C 00000000 */ nop +/* 17915C 8024A87C 00000000 */ nop /* 179160 8024A880 46003180 */ add.s $f6, $f6, $f0 /* 179164 8024A884 3C014380 */ lui $at, 0x4380 /* 179168 8024A888 44810000 */ mtc1 $at, $f0 -/* 17916C 8024A88C 00000000 */ nop +/* 17916C 8024A88C 00000000 */ nop /* 179170 8024A890 46003182 */ mul.s $f6, $f6, $f0 -/* 179174 8024A894 00000000 */ nop +/* 179174 8024A894 00000000 */ nop /* 179178 8024A898 3C01802A */ lui $at, %hi(D_8029F294) /* 17917C 8024A89C C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) /* 179180 8024A8A0 46040002 */ mul.s $f0, $f0, $f4 -/* 179184 8024A8A4 00000000 */ nop +/* 179184 8024A8A4 00000000 */ nop /* 179188 8024A8A8 461AA500 */ add.s $f20, $f20, $f26 /* 17918C 8024A8AC 46189480 */ add.s $f18, $f18, $f24 /* 179190 8024A8B0 46168400 */ add.s $f16, $f16, $f22 @@ -452,28 +452,28 @@ glabel func_8024A214 /* 1791AC 8024A8CC 3C04802A */ lui $a0, %hi(D_8029F29E) /* 1791B0 8024A8D0 2484F29E */ addiu $a0, $a0, %lo(D_8029F29E) /* 1791B4 8024A8D4 44822000 */ mtc1 $v0, $f4 -/* 1791B8 8024A8D8 00000000 */ nop +/* 1791B8 8024A8D8 00000000 */ nop /* 1791BC 8024A8DC 46802120 */ cvt.s.w $f4, $f4 /* 1791C0 8024A8E0 46022102 */ mul.s $f4, $f4, $f2 -/* 1791C4 8024A8E4 00000000 */ nop +/* 1791C4 8024A8E4 00000000 */ nop /* 1791C8 8024A8E8 E6320058 */ swc1 $f18, 0x58($s1) /* 1791CC 8024A8EC E630005C */ swc1 $f16, 0x5c($s1) /* 1791D0 8024A8F0 4600638D */ trunc.w.s $f14, $f12 /* 1791D4 8024A8F4 44027000 */ mfc1 $v0, $f14 -/* 1791D8 8024A8F8 00000000 */ nop +/* 1791D8 8024A8F8 00000000 */ nop /* 1791DC 8024A8FC A622001E */ sh $v0, 0x1e($s1) /* 1791E0 8024A900 46040000 */ add.s $f0, $f0, $f4 /* 1791E4 8024A904 4600438D */ trunc.w.s $f14, $f8 /* 1791E8 8024A908 44027000 */ mfc1 $v0, $f14 -/* 1791EC 8024A90C 00000000 */ nop +/* 1791EC 8024A90C 00000000 */ nop /* 1791F0 8024A910 A6220024 */ sh $v0, 0x24($s1) /* 1791F4 8024A914 4600038D */ trunc.w.s $f14, $f0 /* 1791F8 8024A918 44027000 */ mfc1 $v0, $f14 -/* 1791FC 8024A91C 00000000 */ nop +/* 1791FC 8024A91C 00000000 */ nop /* 179200 8024A920 A6220022 */ sh $v0, 0x22($s1) /* 179204 8024A924 4600338D */ trunc.w.s $f14, $f6 /* 179208 8024A928 44027000 */ mfc1 $v0, $f14 -/* 17920C 8024A92C 00000000 */ nop +/* 17920C 8024A92C 00000000 */ nop /* 179210 8024A930 A6220026 */ sh $v0, 0x26($s1) /* 179214 8024A934 84820000 */ lh $v0, ($a0) /* 179218 8024A938 94830000 */ lhu $v1, ($a0) diff --git a/asm/nonmatchings/code_1776B0/func_8024A990.s b/asm/nonmatchings/code_1776B0/func_8024A990.s index ef068fb4d2..0e97799e58 100644 --- a/asm/nonmatchings/code_1776B0/func_8024A990.s +++ b/asm/nonmatchings/code_1776B0/func_8024A990.s @@ -27,16 +27,16 @@ glabel func_8024A990 /* 1792C8 8024A9E8 10600007 */ beqz $v1, .L8024AA08 /* 1792CC 8024A9EC 24020002 */ addiu $v0, $zero, 2 /* 1792D0 8024A9F0 08092BEF */ j .L8024AFBC -/* 1792D4 8024A9F4 00000000 */ nop +/* 1792D4 8024A9F4 00000000 */ nop .L8024A9F8: /* 1792D8 8024A9F8 10620026 */ beq $v1, $v0, .L8024AA94 /* 1792DC 8024A9FC 24020002 */ addiu $v0, $zero, 2 /* 1792E0 8024AA00 08092BEF */ j .L8024AFBC -/* 1792E4 8024AA04 00000000 */ nop +/* 1792E4 8024AA04 00000000 */ nop .L8024AA08: /* 1792E8 8024AA08 8C8400D8 */ lw $a0, 0xd8($a0) /* 1792EC 8024AA0C 14800005 */ bnez $a0, .L8024AA24 -/* 1792F0 8024AA10 00000000 */ nop +/* 1792F0 8024AA10 00000000 */ nop .L8024AA14: /* 1792F4 8024AA14 0C093903 */ jal func_8024E40C /* 1792F8 8024AA18 24040002 */ addiu $a0, $zero, 2 @@ -53,7 +53,7 @@ glabel func_8024A990 /* 179320 8024AA40 00621821 */ addu $v1, $v1, $v0 /* 179324 8024AA44 00031843 */ sra $v1, $v1, 1 /* 179328 8024AA48 44830000 */ mtc1 $v1, $f0 -/* 17932C 8024AA4C 00000000 */ nop +/* 17932C 8024AA4C 00000000 */ nop /* 179330 8024AA50 46800020 */ cvt.s.w $f0, $f0 /* 179334 8024AA54 46001080 */ add.s $f2, $f2, $f0 /* 179338 8024AA58 C49A0144 */ lwc1 $f26, 0x144($a0) @@ -61,39 +61,39 @@ glabel func_8024A990 /* 179340 8024AA60 90820191 */ lbu $v0, 0x191($a0) /* 179344 8024AA64 90830190 */ lbu $v1, 0x190($a0) /* 179348 8024AA68 44824000 */ mtc1 $v0, $f8 -/* 17934C 8024AA6C 00000000 */ nop +/* 17934C 8024AA6C 00000000 */ nop /* 179350 8024AA70 46804220 */ cvt.s.w $f8, $f8 /* 179354 8024AA74 44833000 */ mtc1 $v1, $f6 -/* 179358 8024AA78 00000000 */ nop +/* 179358 8024AA78 00000000 */ nop /* 17935C 8024AA7C 468031A0 */ cvt.s.w $f6, $f6 /* 179360 8024AA80 08092ABB */ j .L8024AAEC /* 179364 8024AA84 46064080 */ add.s $f2, $f8, $f6 .L8024AA88: /* 179368 8024AA88 8C8400DC */ lw $a0, 0xdc($a0) /* 17936C 8024AA8C 08092AA8 */ j .L8024AAA0 -/* 179370 8024AA90 00000000 */ nop +/* 179370 8024AA90 00000000 */ nop .L8024AA94: /* 179374 8024AA94 00061080 */ sll $v0, $a2, 2 /* 179378 8024AA98 00441021 */ addu $v0, $v0, $a0 /* 17937C 8024AA9C 8C4400E0 */ lw $a0, 0xe0($v0) .L8024AAA0: /* 179380 8024AAA0 1080FFDC */ beqz $a0, .L8024AA14 -/* 179384 8024AAA4 00000000 */ nop +/* 179384 8024AAA4 00000000 */ nop /* 179388 8024AAA8 90830191 */ lbu $v1, 0x191($a0) /* 17938C 8024AAAC C4820148 */ lwc1 $f2, 0x148($a0) /* 179390 8024AAB0 00031042 */ srl $v0, $v1, 1 /* 179394 8024AAB4 44820000 */ mtc1 $v0, $f0 -/* 179398 8024AAB8 00000000 */ nop +/* 179398 8024AAB8 00000000 */ nop /* 17939C 8024AABC 46800020 */ cvt.s.w $f0, $f0 /* 1793A0 8024AAC0 46001080 */ add.s $f2, $f2, $f0 /* 1793A4 8024AAC4 C49A0144 */ lwc1 $f26, 0x144($a0) /* 1793A8 8024AAC8 E7A20010 */ swc1 $f2, 0x10($sp) /* 1793AC 8024AACC 90820190 */ lbu $v0, 0x190($a0) /* 1793B0 8024AAD0 44834000 */ mtc1 $v1, $f8 -/* 1793B4 8024AAD4 00000000 */ nop +/* 1793B4 8024AAD4 00000000 */ nop /* 1793B8 8024AAD8 46804220 */ cvt.s.w $f8, $f8 /* 1793BC 8024AADC 44823000 */ mtc1 $v0, $f6 -/* 1793C0 8024AAE0 00000000 */ nop +/* 1793C0 8024AAE0 00000000 */ nop /* 1793C4 8024AAE4 468031A0 */ cvt.s.w $f6, $f6 /* 1793C8 8024AAE8 46064080 */ add.s $f2, $f8, $f6 .L8024AAEC: @@ -101,69 +101,69 @@ glabel func_8024A990 /* 1793D0 8024AAF0 44810000 */ mtc1 $at, $f0 /* 1793D4 8024AAF4 C49C014C */ lwc1 $f28, 0x14c($a0) /* 1793D8 8024AAF8 46001782 */ mul.s $f30, $f2, $f0 -/* 1793DC 8024AAFC 00000000 */ nop +/* 1793DC 8024AAFC 00000000 */ nop /* 1793E0 8024AB00 3C02802A */ lui $v0, %hi(D_8029F2A6) /* 1793E4 8024AB04 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 1793E8 8024AB08 10400029 */ beqz $v0, .L8024ABB0 -/* 1793EC 8024AB0C 00000000 */ nop +/* 1793EC 8024AB0C 00000000 */ nop /* 1793F0 8024AB10 3C01802A */ lui $at, %hi(D_8029F28C) /* 1793F4 8024AB14 C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) /* 1793F8 8024AB18 3C0143FA */ lui $at, 0x43fa /* 1793FC 8024AB1C 44810000 */ mtc1 $at, $f0 -/* 179400 8024AB20 00000000 */ nop +/* 179400 8024AB20 00000000 */ nop /* 179404 8024AB24 46020001 */ sub.s $f0, $f0, $f2 /* 179408 8024AB28 3C01802A */ lui $at, %hi(D_8029CC18) /* 17940C 8024AB2C D422CC18 */ ldc1 $f2, %lo(D_8029CC18)($at) /* 179410 8024AB30 46000021 */ cvt.d.s $f0, $f0 /* 179414 8024AB34 46220002 */ mul.d $f0, $f0, $f2 -/* 179418 8024AB38 00000000 */ nop +/* 179418 8024AB38 00000000 */ nop /* 17941C 8024AB3C 3C01403E */ lui $at, 0x403e /* 179420 8024AB40 44811800 */ mtc1 $at, $f3 /* 179424 8024AB44 44801000 */ mtc1 $zero, $f2 -/* 179428 8024AB48 00000000 */ nop +/* 179428 8024AB48 00000000 */ nop /* 17942C 8024AB4C 46220000 */ add.d $f0, $f0, $f2 /* 179430 8024AB50 46200120 */ cvt.s.d $f4, $f0 /* 179434 8024AB54 46002007 */ neg.s $f0, $f4 /* 179438 8024AB58 4600D03C */ c.lt.s $f26, $f0 -/* 17943C 8024AB5C 00000000 */ nop +/* 17943C 8024AB5C 00000000 */ nop /* 179440 8024AB60 45000008 */ bc1f .L8024AB84 -/* 179444 8024AB64 00000000 */ nop +/* 179444 8024AB64 00000000 */ nop /* 179448 8024AB68 461A0001 */ sub.s $f0, $f0, $f26 /* 17944C 8024AB6C 3C013F00 */ lui $at, 0x3f00 /* 179450 8024AB70 44811000 */ mtc1 $at, $f2 -/* 179454 8024AB74 00000000 */ nop +/* 179454 8024AB74 00000000 */ nop /* 179458 8024AB78 46020002 */ mul.s $f0, $f0, $f2 -/* 17945C 8024AB7C 00000000 */ nop +/* 17945C 8024AB7C 00000000 */ nop /* 179460 8024AB80 4600D680 */ add.s $f26, $f26, $f0 .L8024AB84: /* 179464 8024AB84 461A203C */ c.lt.s $f4, $f26 -/* 179468 8024AB88 00000000 */ nop +/* 179468 8024AB88 00000000 */ nop /* 17946C 8024AB8C 45000008 */ bc1f .L8024ABB0 -/* 179470 8024AB90 00000000 */ nop +/* 179470 8024AB90 00000000 */ nop /* 179474 8024AB94 461A2001 */ sub.s $f0, $f4, $f26 /* 179478 8024AB98 3C013F00 */ lui $at, 0x3f00 /* 17947C 8024AB9C 44811000 */ mtc1 $at, $f2 -/* 179480 8024ABA0 00000000 */ nop +/* 179480 8024ABA0 00000000 */ nop /* 179484 8024ABA4 46020002 */ mul.s $f0, $f0, $f2 -/* 179488 8024ABA8 00000000 */ nop +/* 179488 8024ABA8 00000000 */ nop /* 17948C 8024ABAC 4600D680 */ add.s $f26, $f26, $f0 .L8024ABB0: /* 179490 8024ABB0 10A00043 */ beqz $a1, .L8024ACC0 -/* 179494 8024ABB4 00000000 */ nop +/* 179494 8024ABB4 00000000 */ nop /* 179498 8024ABB8 3C0141C0 */ lui $at, 0x41c0 /* 17949C 8024ABBC 44810000 */ mtc1 $at, $f0 -/* 1794A0 8024ABC0 00000000 */ nop +/* 1794A0 8024ABC0 00000000 */ nop /* 1794A4 8024ABC4 46003181 */ sub.s $f6, $f6, $f0 /* 1794A8 8024ABC8 46004201 */ sub.s $f8, $f8, $f0 /* 1794AC 8024ABCC 44800000 */ mtc1 $zero, $f0 -/* 1794B0 8024ABD0 00000000 */ nop +/* 1794B0 8024ABD0 00000000 */ nop /* 1794B4 8024ABD4 4600303C */ c.lt.s $f6, $f0 -/* 1794B8 8024ABD8 00000000 */ nop +/* 1794B8 8024ABD8 00000000 */ nop /* 1794BC 8024ABDC 45030001 */ bc1tl .L8024ABE4 /* 1794C0 8024ABE0 46000186 */ mov.s $f6, $f0 .L8024ABE4: /* 1794C4 8024ABE4 4600403C */ c.lt.s $f8, $f0 -/* 1794C8 8024ABE8 00000000 */ nop +/* 1794C8 8024ABE8 00000000 */ nop /* 1794CC 8024ABEC 45030001 */ bc1tl .L8024ABF4 /* 1794D0 8024ABF0 46000206 */ mov.s $f8, $f0 .L8024ABF4: @@ -171,12 +171,12 @@ glabel func_8024A990 /* 1794D8 8024ABF8 8602001E */ lh $v0, 0x1e($s0) /* 1794DC 8024ABFC 86030022 */ lh $v1, 0x22($s0) /* 1794E0 8024AC00 44820000 */ mtc1 $v0, $f0 -/* 1794E4 8024AC04 00000000 */ nop +/* 1794E4 8024AC04 00000000 */ nop /* 1794E8 8024AC08 46800020 */ cvt.s.w $f0, $f0 /* 1794EC 8024AC0C 3C01802A */ lui $at, %hi(D_8029F28C) /* 1794F0 8024AC10 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 1794F4 8024AC14 44830000 */ mtc1 $v1, $f0 -/* 1794F8 8024AC18 00000000 */ nop +/* 1794F8 8024AC18 00000000 */ nop /* 1794FC 8024AC1C 46800020 */ cvt.s.w $f0, $f0 /* 179500 8024AC20 3C03802A */ lui $v1, %hi(D_8029F280) /* 179504 8024AC24 2463F280 */ addiu $v1, $v1, %lo(D_8029F280) @@ -185,12 +185,12 @@ glabel func_8024A990 /* 179510 8024AC30 84620000 */ lh $v0, ($v1) /* 179514 8024AC34 46083000 */ add.s $f0, $f6, $f8 /* 179518 8024AC38 44821000 */ mtc1 $v0, $f2 -/* 17951C 8024AC3C 00000000 */ nop +/* 17951C 8024AC3C 00000000 */ nop /* 179520 8024AC40 468010A0 */ cvt.s.w $f2, $f2 /* 179524 8024AC44 86020024 */ lh $v0, 0x24($s0) /* 179528 8024AC48 46001080 */ add.s $f2, $f2, $f0 /* 17952C 8024AC4C 44820000 */ mtc1 $v0, $f0 -/* 179530 8024AC50 00000000 */ nop +/* 179530 8024AC50 00000000 */ nop /* 179534 8024AC54 46800020 */ cvt.s.w $f0, $f0 /* 179538 8024AC58 3C01802A */ lui $at, %hi(D_8029F290) /* 17953C 8024AC5C E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -207,7 +207,7 @@ glabel func_8024A990 /* 179564 8024AC84 3C03802A */ lui $v1, %hi(D_8029F29E) /* 179568 8024AC88 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 17956C 8024AC8C 44820000 */ mtc1 $v0, $f0 -/* 179570 8024AC90 00000000 */ nop +/* 179570 8024AC90 00000000 */ nop /* 179574 8024AC94 46800020 */ cvt.s.w $f0, $f0 /* 179578 8024AC98 3C01802A */ lui $at, %hi(D_8029F298) /* 17957C 8024AC9C E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -223,7 +223,7 @@ glabel func_8024A990 /* 1795A0 8024ACC0 3C02802A */ lui $v0, %hi(D_8029F2A5) /* 1795A4 8024ACC4 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) /* 1795A8 8024ACC8 14400027 */ bnez $v0, .L8024AD68 -/* 1795AC 8024ACCC 00000000 */ nop +/* 1795AC 8024ACCC 00000000 */ nop /* 1795B0 8024ACD0 3C02802A */ lui $v0, %hi(D_8029F29E) /* 1795B4 8024ACD4 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) /* 1795B8 8024ACD8 3C03802A */ lui $v1, %hi(D_8029F2A0) @@ -231,35 +231,35 @@ glabel func_8024A990 /* 1795C0 8024ACE0 3C013F80 */ lui $at, 0x3f80 /* 1795C4 8024ACE4 4481C000 */ mtc1 $at, $f24 /* 1795C8 8024ACE8 4482A000 */ mtc1 $v0, $f20 -/* 1795CC 8024ACEC 00000000 */ nop +/* 1795CC 8024ACEC 00000000 */ nop /* 1795D0 8024ACF0 4680A520 */ cvt.s.w $f20, $f20 /* 1795D4 8024ACF4 44830000 */ mtc1 $v1, $f0 -/* 1795D8 8024ACF8 00000000 */ nop +/* 1795D8 8024ACF8 00000000 */ nop /* 1795DC 8024ACFC 46800020 */ cvt.s.w $f0, $f0 /* 1795E0 8024AD00 4600A503 */ div.s $f20, $f20, $f0 /* 1795E4 8024AD04 4614C301 */ sub.s $f12, $f24, $f20 /* 1795E8 8024AD08 3C014049 */ lui $at, 0x4049 /* 1795EC 8024AD0C 34210FD0 */ ori $at, $at, 0xfd0 /* 1795F0 8024AD10 4481B000 */ mtc1 $at, $f22 -/* 1795F4 8024AD14 00000000 */ nop +/* 1795F4 8024AD14 00000000 */ nop /* 1795F8 8024AD18 46166302 */ mul.s $f12, $f12, $f22 -/* 1795FC 8024AD1C 00000000 */ nop +/* 1795FC 8024AD1C 00000000 */ nop /* 179600 8024AD20 3C013F00 */ lui $at, 0x3f00 /* 179604 8024AD24 4481A000 */ mtc1 $at, $f20 -/* 179608 8024AD28 00000000 */ nop +/* 179608 8024AD28 00000000 */ nop /* 17960C 8024AD2C 46146302 */ mul.s $f12, $f12, $f20 /* 179610 8024AD30 0C00A85B */ jal sin_rad -/* 179614 8024AD34 00000000 */ nop +/* 179614 8024AD34 00000000 */ nop /* 179618 8024AD38 46160002 */ mul.s $f0, $f0, $f22 -/* 17961C 8024AD3C 00000000 */ nop +/* 17961C 8024AD3C 00000000 */ nop /* 179620 8024AD40 46140302 */ mul.s $f12, $f0, $f20 /* 179624 8024AD44 0C00A85B */ jal sin_rad -/* 179628 8024AD48 00000000 */ nop +/* 179628 8024AD48 00000000 */ nop /* 17962C 8024AD4C 46160002 */ mul.s $f0, $f0, $f22 -/* 179630 8024AD50 00000000 */ nop +/* 179630 8024AD50 00000000 */ nop /* 179634 8024AD54 46140302 */ mul.s $f12, $f0, $f20 /* 179638 8024AD58 0C00A85B */ jal sin_rad -/* 17963C 8024AD5C 00000000 */ nop +/* 17963C 8024AD5C 00000000 */ nop /* 179640 8024AD60 08092B65 */ j .L8024AD94 /* 179644 8024AD64 4600C501 */ sub.s $f20, $f24, $f0 .L8024AD68: @@ -268,118 +268,118 @@ glabel func_8024A990 /* 179650 8024AD70 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 179654 8024AD74 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 179658 8024AD78 4482A000 */ mtc1 $v0, $f20 -/* 17965C 8024AD7C 00000000 */ nop +/* 17965C 8024AD7C 00000000 */ nop /* 179660 8024AD80 4680A520 */ cvt.s.w $f20, $f20 /* 179664 8024AD84 44830000 */ mtc1 $v1, $f0 -/* 179668 8024AD88 00000000 */ nop +/* 179668 8024AD88 00000000 */ nop /* 17966C 8024AD8C 46800020 */ cvt.s.w $f0, $f0 /* 179670 8024AD90 4600A503 */ div.s $f20, $f20, $f0 .L8024AD94: /* 179674 8024AD94 3C02802A */ lui $v0, %hi(D_8029F2A3) /* 179678 8024AD98 8042F2A3 */ lb $v0, %lo(D_8029F2A3)($v0) /* 17967C 8024AD9C 10400013 */ beqz $v0, .L8024ADEC -/* 179680 8024ADA0 00000000 */ nop +/* 179680 8024ADA0 00000000 */ nop /* 179684 8024ADA4 3C01802A */ lui $at, %hi(D_8029F2A8) /* 179688 8024ADA8 C424F2A8 */ lwc1 $f4, %lo(D_8029F2A8)($at) /* 17968C 8024ADAC 46142102 */ mul.s $f4, $f4, $f20 -/* 179690 8024ADB0 00000000 */ nop +/* 179690 8024ADB0 00000000 */ nop /* 179694 8024ADB4 3C02802A */ lui $v0, %hi(D_8029F2A7) /* 179698 8024ADB8 8042F2A7 */ lb $v0, %lo(D_8029F2A7)($v0) /* 17969C 8024ADBC 44821000 */ mtc1 $v0, $f2 -/* 1796A0 8024ADC0 00000000 */ nop +/* 1796A0 8024ADC0 00000000 */ nop /* 1796A4 8024ADC4 468010A0 */ cvt.s.w $f2, $f2 /* 1796A8 8024ADC8 4602D080 */ add.s $f2, $f26, $f2 /* 1796AC 8024ADCC 3C013F80 */ lui $at, 0x3f80 /* 1796B0 8024ADD0 44810000 */ mtc1 $at, $f0 -/* 1796B4 8024ADD4 00000000 */ nop +/* 1796B4 8024ADD4 00000000 */ nop /* 1796B8 8024ADD8 46140001 */ sub.s $f0, $f0, $f20 /* 1796BC 8024ADDC 46001082 */ mul.s $f2, $f2, $f0 -/* 1796C0 8024ADE0 00000000 */ nop +/* 1796C0 8024ADE0 00000000 */ nop /* 1796C4 8024ADE4 46022100 */ add.s $f4, $f4, $f2 /* 1796C8 8024ADE8 E6040054 */ swc1 $f4, 0x54($s0) .L8024ADEC: /* 1796CC 8024ADEC 3C02802A */ lui $v0, %hi(D_8029F2A2) /* 1796D0 8024ADF0 8042F2A2 */ lb $v0, %lo(D_8029F2A2)($v0) /* 1796D4 8024ADF4 1040000E */ beqz $v0, .L8024AE30 -/* 1796D8 8024ADF8 00000000 */ nop +/* 1796D8 8024ADF8 00000000 */ nop /* 1796DC 8024ADFC 3C01802A */ lui $at, %hi(D_8029F2AC) /* 1796E0 8024AE00 C422F2AC */ lwc1 $f2, %lo(D_8029F2AC)($at) /* 1796E4 8024AE04 46141082 */ mul.s $f2, $f2, $f20 -/* 1796E8 8024AE08 00000000 */ nop +/* 1796E8 8024AE08 00000000 */ nop /* 1796EC 8024AE0C 3C013F80 */ lui $at, 0x3f80 /* 1796F0 8024AE10 44810000 */ mtc1 $at, $f0 -/* 1796F4 8024AE14 00000000 */ nop +/* 1796F4 8024AE14 00000000 */ nop /* 1796F8 8024AE18 46140001 */ sub.s $f0, $f0, $f20 /* 1796FC 8024AE1C C7B20010 */ lwc1 $f18, 0x10($sp) /* 179700 8024AE20 46009002 */ mul.s $f0, $f18, $f0 -/* 179704 8024AE24 00000000 */ nop +/* 179704 8024AE24 00000000 */ nop /* 179708 8024AE28 46001080 */ add.s $f2, $f2, $f0 /* 17970C 8024AE2C E6020058 */ swc1 $f2, 0x58($s0) .L8024AE30: /* 179710 8024AE30 3C01802A */ lui $at, %hi(D_8029F2B0) /* 179714 8024AE34 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) /* 179718 8024AE38 46148402 */ mul.s $f16, $f16, $f20 -/* 17971C 8024AE3C 00000000 */ nop +/* 17971C 8024AE3C 00000000 */ nop /* 179720 8024AE40 3C01802A */ lui $at, %hi(D_8029F298) /* 179724 8024AE44 C42CF298 */ lwc1 $f12, %lo(D_8029F298)($at) /* 179728 8024AE48 46146302 */ mul.s $f12, $f12, $f20 -/* 17972C 8024AE4C 00000000 */ nop +/* 17972C 8024AE4C 00000000 */ nop /* 179730 8024AE50 3C01802A */ lui $at, %hi(D_8029F28C) /* 179734 8024AE54 C42EF28C */ lwc1 $f14, %lo(D_8029F28C)($at) /* 179738 8024AE58 46147382 */ mul.s $f14, $f14, $f20 -/* 17973C 8024AE5C 00000000 */ nop +/* 17973C 8024AE5C 00000000 */ nop /* 179740 8024AE60 3C01802A */ lui $at, %hi(D_8029F290) /* 179744 8024AE64 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 179748 8024AE68 46144202 */ mul.s $f8, $f8, $f20 -/* 17974C 8024AE6C 00000000 */ nop +/* 17974C 8024AE6C 00000000 */ nop /* 179750 8024AE70 3C01802A */ lui $at, %hi(D_8029F294) /* 179754 8024AE74 C426F294 */ lwc1 $f6, %lo(D_8029F294)($at) /* 179758 8024AE78 46143182 */ mul.s $f6, $f6, $f20 -/* 17975C 8024AE7C 00000000 */ nop +/* 17975C 8024AE7C 00000000 */ nop /* 179760 8024AE80 3C013F80 */ lui $at, 0x3f80 /* 179764 8024AE84 44812000 */ mtc1 $at, $f4 /* 179768 8024AE88 3C02802A */ lui $v0, %hi(D_8029F286) /* 17976C 8024AE8C 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 179770 8024AE90 46142101 */ sub.s $f4, $f4, $f20 /* 179774 8024AE94 44820000 */ mtc1 $v0, $f0 -/* 179778 8024AE98 00000000 */ nop +/* 179778 8024AE98 00000000 */ nop /* 17977C 8024AE9C 46800020 */ cvt.s.w $f0, $f0 /* 179780 8024AEA0 46040002 */ mul.s $f0, $f0, $f4 -/* 179784 8024AEA4 00000000 */ nop +/* 179784 8024AEA4 00000000 */ nop /* 179788 8024AEA8 3C02802A */ lui $v0, %hi(D_8029F280) /* 17978C 8024AEAC 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 179790 8024AEB0 4604E702 */ mul.s $f28, $f28, $f4 -/* 179794 8024AEB4 00000000 */ nop +/* 179794 8024AEB4 00000000 */ nop /* 179798 8024AEB8 44825000 */ mtc1 $v0, $f10 -/* 17979C 8024AEBC 00000000 */ nop +/* 17979C 8024AEBC 00000000 */ nop /* 1797A0 8024AEC0 468052A0 */ cvt.s.w $f10, $f10 /* 1797A4 8024AEC4 3C02802A */ lui $v0, %hi(D_8029F282) /* 1797A8 8024AEC8 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 1797AC 8024AECC 44821000 */ mtc1 $v0, $f2 -/* 1797B0 8024AED0 00000000 */ nop +/* 1797B0 8024AED0 00000000 */ nop /* 1797B4 8024AED4 468010A0 */ cvt.s.w $f2, $f2 /* 1797B8 8024AED8 46041082 */ mul.s $f2, $f2, $f4 -/* 1797BC 8024AEDC 00000000 */ nop +/* 1797BC 8024AEDC 00000000 */ nop /* 1797C0 8024AEE0 46006300 */ add.s $f12, $f12, $f0 /* 1797C4 8024AEE4 3C014380 */ lui $at, 0x4380 /* 1797C8 8024AEE8 44810000 */ mtc1 $at, $f0 -/* 1797CC 8024AEEC 00000000 */ nop +/* 1797CC 8024AEEC 00000000 */ nop /* 1797D0 8024AEF0 46006302 */ mul.s $f12, $f12, $f0 -/* 1797D4 8024AEF4 00000000 */ nop +/* 1797D4 8024AEF4 00000000 */ nop /* 1797D8 8024AEF8 3C014200 */ lui $at, 0x4200 /* 1797DC 8024AEFC 44810000 */ mtc1 $at, $f0 -/* 1797E0 8024AF00 00000000 */ nop +/* 1797E0 8024AF00 00000000 */ nop /* 1797E4 8024AF04 4600F001 */ sub.s $f0, $f30, $f0 /* 1797E8 8024AF08 3C02802A */ lui $v0, %hi(D_8029F284) /* 1797EC 8024AF0C 8442F284 */ lh $v0, %lo(D_8029F284)($v0) /* 1797F0 8024AF10 46005280 */ add.s $f10, $f10, $f0 /* 1797F4 8024AF14 44820000 */ mtc1 $v0, $f0 -/* 1797F8 8024AF18 00000000 */ nop +/* 1797F8 8024AF18 00000000 */ nop /* 1797FC 8024AF1C 46800020 */ cvt.s.w $f0, $f0 /* 179800 8024AF20 46040002 */ mul.s $f0, $f0, $f4 -/* 179804 8024AF24 00000000 */ nop +/* 179804 8024AF24 00000000 */ nop /* 179808 8024AF28 46045282 */ mul.s $f10, $f10, $f4 -/* 17980C 8024AF2C 00000000 */ nop +/* 17980C 8024AF2C 00000000 */ nop /* 179810 8024AF30 E7BC0018 */ swc1 $f28, 0x18($sp) /* 179814 8024AF34 461C8400 */ add.s $f16, $f16, $f28 /* 179818 8024AF38 46024200 */ add.s $f8, $f8, $f2 @@ -389,20 +389,20 @@ glabel func_8024A990 /* 179828 8024AF48 46003180 */ add.s $f6, $f6, $f0 /* 17982C 8024AF4C 4600448D */ trunc.w.s $f18, $f8 /* 179830 8024AF50 44029000 */ mfc1 $v0, $f18 -/* 179834 8024AF54 00000000 */ nop +/* 179834 8024AF54 00000000 */ nop /* 179838 8024AF58 A6020024 */ sh $v0, 0x24($s0) /* 17983C 8024AF5C 460A7380 */ add.s $f14, $f14, $f10 /* 179840 8024AF60 4600348D */ trunc.w.s $f18, $f6 /* 179844 8024AF64 44029000 */ mfc1 $v0, $f18 -/* 179848 8024AF68 00000000 */ nop +/* 179848 8024AF68 00000000 */ nop /* 17984C 8024AF6C A6020022 */ sh $v0, 0x22($s0) /* 179850 8024AF70 4600748D */ trunc.w.s $f18, $f14 /* 179854 8024AF74 44029000 */ mfc1 $v0, $f18 -/* 179858 8024AF78 00000000 */ nop +/* 179858 8024AF78 00000000 */ nop /* 17985C 8024AF7C A602001E */ sh $v0, 0x1e($s0) /* 179860 8024AF80 4600648D */ trunc.w.s $f18, $f12 /* 179864 8024AF84 44029000 */ mfc1 $v0, $f18 -/* 179868 8024AF88 00000000 */ nop +/* 179868 8024AF88 00000000 */ nop /* 17986C 8024AF8C A6020026 */ sh $v0, 0x26($s0) /* 179870 8024AF90 84820000 */ lh $v0, ($a0) /* 179874 8024AF94 94830000 */ lhu $v1, ($a0) diff --git a/asm/nonmatchings/code_1776B0/func_8024AFE4.s b/asm/nonmatchings/code_1776B0/func_8024AFE4.s index 477e505a82..389d26c916 100644 --- a/asm/nonmatchings/code_1776B0/func_8024AFE4.s +++ b/asm/nonmatchings/code_1776B0/func_8024AFE4.s @@ -27,12 +27,12 @@ glabel func_8024AFE4 /* 17991C 8024B03C 10600007 */ beqz $v1, .L8024B05C /* 179920 8024B040 24020002 */ addiu $v0, $zero, 2 /* 179924 8024B044 08092D75 */ j .L8024B5D4 -/* 179928 8024B048 00000000 */ nop +/* 179928 8024B048 00000000 */ nop .L8024B04C: /* 17992C 8024B04C 10620021 */ beq $v1, $v0, .L8024B0D4 /* 179930 8024B050 24020002 */ addiu $v0, $zero, 2 /* 179934 8024B054 08092D75 */ j .L8024B5D4 -/* 179938 8024B058 00000000 */ nop +/* 179938 8024B058 00000000 */ nop .L8024B05C: /* 17993C 8024B05C 8C8400D8 */ lw $a0, 0xd8($a0) /* 179940 8024B060 1080015C */ beqz $a0, .L8024B5D4 @@ -51,7 +51,7 @@ glabel func_8024AFE4 /* 179974 8024B094 E7BE0010 */ swc1 $f30, 0x10($sp) /* 179978 8024B098 944200B0 */ lhu $v0, 0xb0($v0) /* 17997C 8024B09C 4483F000 */ mtc1 $v1, $f30 -/* 179980 8024B0A0 00000000 */ nop +/* 179980 8024B0A0 00000000 */ nop /* 179984 8024B0A4 4680F7A0 */ cvt.s.w $f30, $f30 /* 179988 8024B0A8 E7BE0014 */ swc1 $f30, 0x14($sp) /* 17998C 8024B0AC C4820148 */ lwc1 $f2, 0x148($a0) @@ -64,7 +64,7 @@ glabel func_8024AFE4 .L8024B0C8: /* 1799A8 8024B0C8 8C8400DC */ lw $a0, 0xdc($a0) /* 1799AC 8024B0CC 08092C38 */ j .L8024B0E0 -/* 1799B0 8024B0D0 00000000 */ nop +/* 1799B0 8024B0D0 00000000 */ nop .L8024B0D4: /* 1799B4 8024B0D4 00061080 */ sll $v0, $a2, 2 /* 1799B8 8024B0D8 00441021 */ addu $v0, $v0, $a0 @@ -83,14 +83,14 @@ glabel func_8024AFE4 /* 1799E8 8024B108 00021043 */ sra $v0, $v0, 1 /* 1799EC 8024B10C E7BE0010 */ swc1 $f30, 0x10($sp) /* 1799F0 8024B110 4482F000 */ mtc1 $v0, $f30 -/* 1799F4 8024B114 00000000 */ nop +/* 1799F4 8024B114 00000000 */ nop /* 1799F8 8024B118 4680F7A0 */ cvt.s.w $f30, $f30 /* 1799FC 8024B11C 00031842 */ srl $v1, $v1, 1 /* 179A00 8024B120 E7BE0014 */ swc1 $f30, 0x14($sp) /* 179A04 8024B124 C4820148 */ lwc1 $f2, 0x148($a0) .L8024B128: /* 179A08 8024B128 44830000 */ mtc1 $v1, $f0 -/* 179A0C 8024B12C 00000000 */ nop +/* 179A0C 8024B12C 00000000 */ nop /* 179A10 8024B130 46800020 */ cvt.s.w $f0, $f0 /* 179A14 8024B134 3C02802A */ lui $v0, %hi(D_8029F2A2) /* 179A18 8024B138 8042F2A2 */ lb $v0, %lo(D_8029F2A2)($v0) @@ -100,12 +100,12 @@ glabel func_8024AFE4 /* 179A28 8024B148 461E0001 */ sub.s $f0, $f0, $f30 /* 179A2C 8024B14C 3C013F00 */ lui $at, 0x3f00 /* 179A30 8024B150 44811000 */ mtc1 $at, $f2 -/* 179A34 8024B154 00000000 */ nop +/* 179A34 8024B154 00000000 */ nop /* 179A38 8024B158 46020082 */ mul.s $f2, $f0, $f2 -/* 179A3C 8024B15C 00000000 */ nop +/* 179A3C 8024B15C 00000000 */ nop /* 179A40 8024B160 3C0140C0 */ lui $at, 0x40c0 /* 179A44 8024B164 44812000 */ mtc1 $at, $f4 -/* 179A48 8024B168 00000000 */ nop +/* 179A48 8024B168 00000000 */ nop /* 179A4C 8024B16C 46040003 */ div.s $f0, $f0, $f4 /* 179A50 8024B170 46001080 */ add.s $f2, $f2, $f0 /* 179A54 8024B174 4602F780 */ add.s $f30, $f30, $f2 @@ -114,21 +114,21 @@ glabel func_8024AFE4 /* 179A5C 8024B17C 3C02802A */ lui $v0, %hi(D_8029F2A3) /* 179A60 8024B180 8042F2A3 */ lb $v0, %lo(D_8029F2A3)($v0) /* 179A64 8024B184 10400012 */ beqz $v0, .L8024B1D0 -/* 179A68 8024B188 00000000 */ nop +/* 179A68 8024B188 00000000 */ nop /* 179A6C 8024B18C 461A3001 */ sub.s $f0, $f6, $f26 /* 179A70 8024B190 3C013F00 */ lui $at, 0x3f00 /* 179A74 8024B194 44811000 */ mtc1 $at, $f2 -/* 179A78 8024B198 00000000 */ nop +/* 179A78 8024B198 00000000 */ nop /* 179A7C 8024B19C 46020002 */ mul.s $f0, $f0, $f2 -/* 179A80 8024B1A0 00000000 */ nop +/* 179A80 8024B1A0 00000000 */ nop /* 179A84 8024B1A4 4600D680 */ add.s $f26, $f26, $f0 /* 179A88 8024B1A8 3C014296 */ lui $at, 0x4296 /* 179A8C 8024B1AC 44810000 */ mtc1 $at, $f0 -/* 179A90 8024B1B0 00000000 */ nop +/* 179A90 8024B1B0 00000000 */ nop /* 179A94 8024B1B4 461A003C */ c.lt.s $f0, $f26 -/* 179A98 8024B1B8 00000000 */ nop +/* 179A98 8024B1B8 00000000 */ nop /* 179A9C 8024B1BC 45000004 */ bc1f .L8024B1D0 -/* 179AA0 8024B1C0 00000000 */ nop +/* 179AA0 8024B1C0 00000000 */ nop /* 179AA4 8024B1C4 461A0001 */ sub.s $f0, $f0, $f26 /* 179AA8 8024B1C8 46000005 */ abs.s $f0, $f0 /* 179AAC 8024B1CC 4600D681 */ sub.s $f26, $f26, $f0 @@ -136,67 +136,67 @@ glabel func_8024AFE4 /* 179AB0 8024B1D0 3C02802A */ lui $v0, %hi(D_8029F2A6) /* 179AB4 8024B1D4 8042F2A6 */ lb $v0, %lo(D_8029F2A6)($v0) /* 179AB8 8024B1D8 10400029 */ beqz $v0, .L8024B280 -/* 179ABC 8024B1DC 00000000 */ nop +/* 179ABC 8024B1DC 00000000 */ nop /* 179AC0 8024B1E0 3C01802A */ lui $at, %hi(D_8029F28C) /* 179AC4 8024B1E4 C422F28C */ lwc1 $f2, %lo(D_8029F28C)($at) /* 179AC8 8024B1E8 3C0143FA */ lui $at, 0x43fa /* 179ACC 8024B1EC 44810000 */ mtc1 $at, $f0 -/* 179AD0 8024B1F0 00000000 */ nop +/* 179AD0 8024B1F0 00000000 */ nop /* 179AD4 8024B1F4 46020001 */ sub.s $f0, $f0, $f2 /* 179AD8 8024B1F8 3C01802A */ lui $at, %hi(D_8029CC20) /* 179ADC 8024B1FC D422CC20 */ ldc1 $f2, %lo(D_8029CC20)($at) /* 179AE0 8024B200 46000021 */ cvt.d.s $f0, $f0 /* 179AE4 8024B204 46220002 */ mul.d $f0, $f0, $f2 -/* 179AE8 8024B208 00000000 */ nop +/* 179AE8 8024B208 00000000 */ nop /* 179AEC 8024B20C 3C01403E */ lui $at, 0x403e /* 179AF0 8024B210 44811800 */ mtc1 $at, $f3 /* 179AF4 8024B214 44801000 */ mtc1 $zero, $f2 -/* 179AF8 8024B218 00000000 */ nop +/* 179AF8 8024B218 00000000 */ nop /* 179AFC 8024B21C 46220000 */ add.d $f0, $f0, $f2 /* 179B00 8024B220 46200120 */ cvt.s.d $f4, $f0 /* 179B04 8024B224 46002007 */ neg.s $f0, $f4 /* 179B08 8024B228 4600D03C */ c.lt.s $f26, $f0 -/* 179B0C 8024B22C 00000000 */ nop +/* 179B0C 8024B22C 00000000 */ nop /* 179B10 8024B230 45000008 */ bc1f .L8024B254 -/* 179B14 8024B234 00000000 */ nop +/* 179B14 8024B234 00000000 */ nop /* 179B18 8024B238 461A0001 */ sub.s $f0, $f0, $f26 /* 179B1C 8024B23C 3C013F00 */ lui $at, 0x3f00 /* 179B20 8024B240 44811000 */ mtc1 $at, $f2 -/* 179B24 8024B244 00000000 */ nop +/* 179B24 8024B244 00000000 */ nop /* 179B28 8024B248 46020002 */ mul.s $f0, $f0, $f2 -/* 179B2C 8024B24C 00000000 */ nop +/* 179B2C 8024B24C 00000000 */ nop /* 179B30 8024B250 4600D680 */ add.s $f26, $f26, $f0 .L8024B254: /* 179B34 8024B254 461A203C */ c.lt.s $f4, $f26 -/* 179B38 8024B258 00000000 */ nop +/* 179B38 8024B258 00000000 */ nop /* 179B3C 8024B25C 45000008 */ bc1f .L8024B280 -/* 179B40 8024B260 00000000 */ nop +/* 179B40 8024B260 00000000 */ nop /* 179B44 8024B264 461A2001 */ sub.s $f0, $f4, $f26 /* 179B48 8024B268 3C013F00 */ lui $at, 0x3f00 /* 179B4C 8024B26C 44811000 */ mtc1 $at, $f2 -/* 179B50 8024B270 00000000 */ nop +/* 179B50 8024B270 00000000 */ nop /* 179B54 8024B274 46020002 */ mul.s $f0, $f0, $f2 -/* 179B58 8024B278 00000000 */ nop +/* 179B58 8024B278 00000000 */ nop /* 179B5C 8024B27C 4600D680 */ add.s $f26, $f26, $f0 .L8024B280: /* 179B60 8024B280 10A00029 */ beqz $a1, .L8024B328 -/* 179B64 8024B284 00000000 */ nop +/* 179B64 8024B284 00000000 */ nop /* 179B68 8024B288 8602001E */ lh $v0, 0x1e($s0) /* 179B6C 8024B28C 86040026 */ lh $a0, 0x26($s0) /* 179B70 8024B290 86030024 */ lh $v1, 0x24($s0) /* 179B74 8024B294 44820000 */ mtc1 $v0, $f0 -/* 179B78 8024B298 00000000 */ nop +/* 179B78 8024B298 00000000 */ nop /* 179B7C 8024B29C 46800020 */ cvt.s.w $f0, $f0 /* 179B80 8024B2A0 86020022 */ lh $v0, 0x22($s0) /* 179B84 8024B2A4 3C01802A */ lui $at, %hi(D_8029F28C) /* 179B88 8024B2A8 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 179B8C 8024B2AC 44820000 */ mtc1 $v0, $f0 -/* 179B90 8024B2B0 00000000 */ nop +/* 179B90 8024B2B0 00000000 */ nop /* 179B94 8024B2B4 46800020 */ cvt.s.w $f0, $f0 /* 179B98 8024B2B8 3C01802A */ lui $at, %hi(D_8029F294) /* 179B9C 8024B2BC E420F294 */ swc1 $f0, %lo(D_8029F294)($at) /* 179BA0 8024B2C0 44830000 */ mtc1 $v1, $f0 -/* 179BA4 8024B2C4 00000000 */ nop +/* 179BA4 8024B2C4 00000000 */ nop /* 179BA8 8024B2C8 46800020 */ cvt.s.w $f0, $f0 /* 179BAC 8024B2CC 3C01802A */ lui $at, %hi(D_8029F290) /* 179BB0 8024B2D0 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -210,7 +210,7 @@ glabel func_8024AFE4 /* 179BCC 8024B2EC 3C03802A */ lui $v1, %hi(D_8029F29E) /* 179BD0 8024B2F0 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 179BD4 8024B2F4 44820000 */ mtc1 $v0, $f0 -/* 179BD8 8024B2F8 00000000 */ nop +/* 179BD8 8024B2F8 00000000 */ nop /* 179BDC 8024B2FC 46800020 */ cvt.s.w $f0, $f0 /* 179BE0 8024B300 3C01802A */ lui $at, %hi(D_8029F298) /* 179BE4 8024B304 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -226,7 +226,7 @@ glabel func_8024AFE4 /* 179C08 8024B328 3C02802A */ lui $v0, %hi(D_8029F2A5) /* 179C0C 8024B32C 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) /* 179C10 8024B330 14400027 */ bnez $v0, .L8024B3D0 -/* 179C14 8024B334 00000000 */ nop +/* 179C14 8024B334 00000000 */ nop /* 179C18 8024B338 3C02802A */ lui $v0, %hi(D_8029F29E) /* 179C1C 8024B33C 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) /* 179C20 8024B340 3C03802A */ lui $v1, %hi(D_8029F2A0) @@ -234,35 +234,35 @@ glabel func_8024AFE4 /* 179C28 8024B348 3C013F80 */ lui $at, 0x3f80 /* 179C2C 8024B34C 4481C000 */ mtc1 $at, $f24 /* 179C30 8024B350 4482E000 */ mtc1 $v0, $f28 -/* 179C34 8024B354 00000000 */ nop +/* 179C34 8024B354 00000000 */ nop /* 179C38 8024B358 4680E720 */ cvt.s.w $f28, $f28 /* 179C3C 8024B35C 44830000 */ mtc1 $v1, $f0 -/* 179C40 8024B360 00000000 */ nop +/* 179C40 8024B360 00000000 */ nop /* 179C44 8024B364 46800020 */ cvt.s.w $f0, $f0 /* 179C48 8024B368 4600E703 */ div.s $f28, $f28, $f0 /* 179C4C 8024B36C 461CC301 */ sub.s $f12, $f24, $f28 /* 179C50 8024B370 3C014049 */ lui $at, 0x4049 /* 179C54 8024B374 34210FD0 */ ori $at, $at, 0xfd0 /* 179C58 8024B378 4481B000 */ mtc1 $at, $f22 -/* 179C5C 8024B37C 00000000 */ nop +/* 179C5C 8024B37C 00000000 */ nop /* 179C60 8024B380 46166302 */ mul.s $f12, $f12, $f22 -/* 179C64 8024B384 00000000 */ nop +/* 179C64 8024B384 00000000 */ nop /* 179C68 8024B388 3C013F00 */ lui $at, 0x3f00 /* 179C6C 8024B38C 4481A000 */ mtc1 $at, $f20 -/* 179C70 8024B390 00000000 */ nop +/* 179C70 8024B390 00000000 */ nop /* 179C74 8024B394 46146302 */ mul.s $f12, $f12, $f20 /* 179C78 8024B398 0C00A85B */ jal sin_rad -/* 179C7C 8024B39C 00000000 */ nop +/* 179C7C 8024B39C 00000000 */ nop /* 179C80 8024B3A0 46160002 */ mul.s $f0, $f0, $f22 -/* 179C84 8024B3A4 00000000 */ nop +/* 179C84 8024B3A4 00000000 */ nop /* 179C88 8024B3A8 46140302 */ mul.s $f12, $f0, $f20 /* 179C8C 8024B3AC 0C00A85B */ jal sin_rad -/* 179C90 8024B3B0 00000000 */ nop +/* 179C90 8024B3B0 00000000 */ nop /* 179C94 8024B3B4 46160002 */ mul.s $f0, $f0, $f22 -/* 179C98 8024B3B8 00000000 */ nop +/* 179C98 8024B3B8 00000000 */ nop /* 179C9C 8024B3BC 46140302 */ mul.s $f12, $f0, $f20 /* 179CA0 8024B3C0 0C00A85B */ jal sin_rad -/* 179CA4 8024B3C4 00000000 */ nop +/* 179CA4 8024B3C4 00000000 */ nop /* 179CA8 8024B3C8 08092CFF */ j .L8024B3FC /* 179CAC 8024B3CC 4600C701 */ sub.s $f28, $f24, $f0 .L8024B3D0: @@ -271,93 +271,93 @@ glabel func_8024AFE4 /* 179CB8 8024B3D8 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 179CBC 8024B3DC 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 179CC0 8024B3E0 4482E000 */ mtc1 $v0, $f28 -/* 179CC4 8024B3E4 00000000 */ nop +/* 179CC4 8024B3E4 00000000 */ nop /* 179CC8 8024B3E8 4680E720 */ cvt.s.w $f28, $f28 /* 179CCC 8024B3EC 44830000 */ mtc1 $v1, $f0 -/* 179CD0 8024B3F0 00000000 */ nop +/* 179CD0 8024B3F0 00000000 */ nop /* 179CD4 8024B3F4 46800020 */ cvt.s.w $f0, $f0 /* 179CD8 8024B3F8 4600E703 */ div.s $f28, $f28, $f0 .L8024B3FC: /* 179CDC 8024B3FC 3C01802A */ lui $at, %hi(D_8029F2A8) /* 179CE0 8024B400 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) /* 179CE4 8024B404 461CA502 */ mul.s $f20, $f20, $f28 -/* 179CE8 8024B408 00000000 */ nop +/* 179CE8 8024B408 00000000 */ nop /* 179CEC 8024B40C 3C01802A */ lui $at, %hi(D_8029F2AC) /* 179CF0 8024B410 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) /* 179CF4 8024B414 461C9482 */ mul.s $f18, $f18, $f28 -/* 179CF8 8024B418 00000000 */ nop +/* 179CF8 8024B418 00000000 */ nop /* 179CFC 8024B41C 3C01802A */ lui $at, %hi(D_8029F2B0) /* 179D00 8024B420 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) /* 179D04 8024B424 461C8402 */ mul.s $f16, $f16, $f28 -/* 179D08 8024B428 00000000 */ nop +/* 179D08 8024B428 00000000 */ nop /* 179D0C 8024B42C 3C01802A */ lui $at, %hi(D_8029F298) /* 179D10 8024B430 C42AF298 */ lwc1 $f10, %lo(D_8029F298)($at) /* 179D14 8024B434 461C5282 */ mul.s $f10, $f10, $f28 -/* 179D18 8024B438 00000000 */ nop +/* 179D18 8024B438 00000000 */ nop /* 179D1C 8024B43C 3C01802A */ lui $at, %hi(D_8029F28C) /* 179D20 8024B440 C42EF28C */ lwc1 $f14, %lo(D_8029F28C)($at) /* 179D24 8024B444 461C7382 */ mul.s $f14, $f14, $f28 -/* 179D28 8024B448 00000000 */ nop +/* 179D28 8024B448 00000000 */ nop /* 179D2C 8024B44C 3C01802A */ lui $at, %hi(D_8029F290) /* 179D30 8024B450 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 179D34 8024B454 461C4202 */ mul.s $f8, $f8, $f28 -/* 179D38 8024B458 00000000 */ nop +/* 179D38 8024B458 00000000 */ nop /* 179D3C 8024B45C 3C01802A */ lui $at, %hi(D_8029F294) /* 179D40 8024B460 C424F294 */ lwc1 $f4, %lo(D_8029F294)($at) /* 179D44 8024B464 461C2102 */ mul.s $f4, $f4, $f28 -/* 179D48 8024B468 00000000 */ nop +/* 179D48 8024B468 00000000 */ nop /* 179D4C 8024B46C 3C013F80 */ lui $at, 0x3f80 /* 179D50 8024B470 44811000 */ mtc1 $at, $f2 -/* 179D54 8024B474 00000000 */ nop +/* 179D54 8024B474 00000000 */ nop /* 179D58 8024B478 461C1081 */ sub.s $f2, $f2, $f28 /* 179D5C 8024B47C 4602D682 */ mul.s $f26, $f26, $f2 -/* 179D60 8024B480 00000000 */ nop +/* 179D60 8024B480 00000000 */ nop /* 179D64 8024B484 C7BE0018 */ lwc1 $f30, 0x18($sp) /* 179D68 8024B488 4602F602 */ mul.s $f24, $f30, $f2 -/* 179D6C 8024B48C 00000000 */ nop +/* 179D6C 8024B48C 00000000 */ nop /* 179D70 8024B490 3C02802A */ lui $v0, %hi(D_8029F286) /* 179D74 8024B494 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 179D78 8024B498 44820000 */ mtc1 $v0, $f0 -/* 179D7C 8024B49C 00000000 */ nop +/* 179D7C 8024B49C 00000000 */ nop /* 179D80 8024B4A0 46800020 */ cvt.s.w $f0, $f0 /* 179D84 8024B4A4 3C02802A */ lui $v0, %hi(D_8029F280) /* 179D88 8024B4A8 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 179D8C 8024B4AC 46020002 */ mul.s $f0, $f0, $f2 -/* 179D90 8024B4B0 00000000 */ nop +/* 179D90 8024B4B0 00000000 */ nop /* 179D94 8024B4B4 44826000 */ mtc1 $v0, $f12 -/* 179D98 8024B4B8 00000000 */ nop +/* 179D98 8024B4B8 00000000 */ nop /* 179D9C 8024B4BC 46806320 */ cvt.s.w $f12, $f12 /* 179DA0 8024B4C0 3C02802A */ lui $v0, %hi(D_8029F282) /* 179DA4 8024B4C4 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 179DA8 8024B4C8 44823000 */ mtc1 $v0, $f6 -/* 179DAC 8024B4CC 00000000 */ nop +/* 179DAC 8024B4CC 00000000 */ nop /* 179DB0 8024B4D0 468031A0 */ cvt.s.w $f6, $f6 /* 179DB4 8024B4D4 46023182 */ mul.s $f6, $f6, $f2 -/* 179DB8 8024B4D8 00000000 */ nop +/* 179DB8 8024B4D8 00000000 */ nop /* 179DBC 8024B4DC C7BE0010 */ lwc1 $f30, 0x10($sp) /* 179DC0 8024B4E0 4602F582 */ mul.s $f22, $f30, $f2 -/* 179DC4 8024B4E4 00000000 */ nop +/* 179DC4 8024B4E4 00000000 */ nop /* 179DC8 8024B4E8 46005280 */ add.s $f10, $f10, $f0 /* 179DCC 8024B4EC 3C014380 */ lui $at, 0x4380 /* 179DD0 8024B4F0 44810000 */ mtc1 $at, $f0 -/* 179DD4 8024B4F4 00000000 */ nop +/* 179DD4 8024B4F4 00000000 */ nop /* 179DD8 8024B4F8 46005282 */ mul.s $f10, $f10, $f0 -/* 179DDC 8024B4FC 00000000 */ nop +/* 179DDC 8024B4FC 00000000 */ nop /* 179DE0 8024B500 C7BE0014 */ lwc1 $f30, 0x14($sp) /* 179DE4 8024B504 3C014200 */ lui $at, 0x4200 /* 179DE8 8024B508 44810000 */ mtc1 $at, $f0 -/* 179DEC 8024B50C 00000000 */ nop +/* 179DEC 8024B50C 00000000 */ nop /* 179DF0 8024B510 4600F001 */ sub.s $f0, $f30, $f0 /* 179DF4 8024B514 3C02802A */ lui $v0, %hi(D_8029F284) /* 179DF8 8024B518 8442F284 */ lh $v0, %lo(D_8029F284)($v0) /* 179DFC 8024B51C 46006300 */ add.s $f12, $f12, $f0 /* 179E00 8024B520 44820000 */ mtc1 $v0, $f0 -/* 179E04 8024B524 00000000 */ nop +/* 179E04 8024B524 00000000 */ nop /* 179E08 8024B528 46800020 */ cvt.s.w $f0, $f0 /* 179E0C 8024B52C 46020002 */ mul.s $f0, $f0, $f2 -/* 179E10 8024B530 00000000 */ nop +/* 179E10 8024B530 00000000 */ nop /* 179E14 8024B534 46026302 */ mul.s $f12, $f12, $f2 -/* 179E18 8024B538 00000000 */ nop +/* 179E18 8024B538 00000000 */ nop /* 179E1C 8024B53C 461AA500 */ add.s $f20, $f20, $f26 /* 179E20 8024B540 46189480 */ add.s $f18, $f18, $f24 /* 179E24 8024B544 46064200 */ add.s $f8, $f8, $f6 @@ -370,20 +370,20 @@ glabel func_8024AFE4 /* 179E40 8024B560 46002100 */ add.s $f4, $f4, $f0 /* 179E44 8024B564 4600478D */ trunc.w.s $f30, $f8 /* 179E48 8024B568 4402F000 */ mfc1 $v0, $f30 -/* 179E4C 8024B56C 00000000 */ nop +/* 179E4C 8024B56C 00000000 */ nop /* 179E50 8024B570 A6020024 */ sh $v0, 0x24($s0) /* 179E54 8024B574 460C7380 */ add.s $f14, $f14, $f12 /* 179E58 8024B578 4600278D */ trunc.w.s $f30, $f4 /* 179E5C 8024B57C 4402F000 */ mfc1 $v0, $f30 -/* 179E60 8024B580 00000000 */ nop +/* 179E60 8024B580 00000000 */ nop /* 179E64 8024B584 A6020022 */ sh $v0, 0x22($s0) /* 179E68 8024B588 4600778D */ trunc.w.s $f30, $f14 /* 179E6C 8024B58C 4402F000 */ mfc1 $v0, $f30 -/* 179E70 8024B590 00000000 */ nop +/* 179E70 8024B590 00000000 */ nop /* 179E74 8024B594 A602001E */ sh $v0, 0x1e($s0) /* 179E78 8024B598 4600578D */ trunc.w.s $f30, $f10 /* 179E7C 8024B59C 4402F000 */ mfc1 $v0, $f30 -/* 179E80 8024B5A0 00000000 */ nop +/* 179E80 8024B5A0 00000000 */ nop /* 179E84 8024B5A4 A6020026 */ sh $v0, 0x26($s0) /* 179E88 8024B5A8 84820000 */ lh $v0, ($a0) /* 179E8C 8024B5AC 94830000 */ lhu $v1, ($a0) diff --git a/asm/nonmatchings/code_1776B0/func_8024B5FC.s b/asm/nonmatchings/code_1776B0/func_8024B5FC.s index 44eed9609e..3b66fbeabe 100644 --- a/asm/nonmatchings/code_1776B0/func_8024B5FC.s +++ b/asm/nonmatchings/code_1776B0/func_8024B5FC.s @@ -25,18 +25,18 @@ glabel func_8024B5FC /* 179F2C 8024B64C 86040026 */ lh $a0, 0x26($s0) /* 179F30 8024B650 86030024 */ lh $v1, 0x24($s0) /* 179F34 8024B654 44820000 */ mtc1 $v0, $f0 -/* 179F38 8024B658 00000000 */ nop +/* 179F38 8024B658 00000000 */ nop /* 179F3C 8024B65C 46800020 */ cvt.s.w $f0, $f0 /* 179F40 8024B660 86020022 */ lh $v0, 0x22($s0) /* 179F44 8024B664 3C01802A */ lui $at, %hi(D_8029F28C) /* 179F48 8024B668 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 179F4C 8024B66C 44820000 */ mtc1 $v0, $f0 -/* 179F50 8024B670 00000000 */ nop +/* 179F50 8024B670 00000000 */ nop /* 179F54 8024B674 46800020 */ cvt.s.w $f0, $f0 /* 179F58 8024B678 3C01802A */ lui $at, %hi(D_8029F294) /* 179F5C 8024B67C E420F294 */ swc1 $f0, %lo(D_8029F294)($at) /* 179F60 8024B680 44830000 */ mtc1 $v1, $f0 -/* 179F64 8024B684 00000000 */ nop +/* 179F64 8024B684 00000000 */ nop /* 179F68 8024B688 46800020 */ cvt.s.w $f0, $f0 /* 179F6C 8024B68C 3C01802A */ lui $at, %hi(D_8029F290) /* 179F70 8024B690 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -50,7 +50,7 @@ glabel func_8024B5FC /* 179F8C 8024B6AC 3C03802A */ lui $v1, %hi(D_8029F29E) /* 179F90 8024B6B0 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 179F94 8024B6B4 44820000 */ mtc1 $v0, $f0 -/* 179F98 8024B6B8 00000000 */ nop +/* 179F98 8024B6B8 00000000 */ nop /* 179F9C 8024B6BC 46800020 */ cvt.s.w $f0, $f0 /* 179FA0 8024B6C0 3C01802A */ lui $at, %hi(D_8029F298) /* 179FA4 8024B6C4 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -66,7 +66,7 @@ glabel func_8024B5FC /* 179FC8 8024B6E8 3C02802A */ lui $v0, %hi(D_8029F2A5) /* 179FCC 8024B6EC 8042F2A5 */ lb $v0, %lo(D_8029F2A5)($v0) /* 179FD0 8024B6F0 14400027 */ bnez $v0, .L8024B790 -/* 179FD4 8024B6F4 00000000 */ nop +/* 179FD4 8024B6F4 00000000 */ nop /* 179FD8 8024B6F8 3C02802A */ lui $v0, %hi(D_8029F29E) /* 179FDC 8024B6FC 8442F29E */ lh $v0, %lo(D_8029F29E)($v0) /* 179FE0 8024B700 3C03802A */ lui $v1, %hi(D_8029F2A0) @@ -74,35 +74,35 @@ glabel func_8024B5FC /* 179FE8 8024B708 3C013F80 */ lui $at, 0x3f80 /* 179FEC 8024B70C 4481C000 */ mtc1 $at, $f24 /* 179FF0 8024B710 44822000 */ mtc1 $v0, $f4 -/* 179FF4 8024B714 00000000 */ nop +/* 179FF4 8024B714 00000000 */ nop /* 179FF8 8024B718 46802120 */ cvt.s.w $f4, $f4 /* 179FFC 8024B71C 44830000 */ mtc1 $v1, $f0 -/* 17A000 8024B720 00000000 */ nop +/* 17A000 8024B720 00000000 */ nop /* 17A004 8024B724 46800020 */ cvt.s.w $f0, $f0 /* 17A008 8024B728 46002103 */ div.s $f4, $f4, $f0 /* 17A00C 8024B72C 4604C301 */ sub.s $f12, $f24, $f4 /* 17A010 8024B730 3C014049 */ lui $at, 0x4049 /* 17A014 8024B734 34210FD0 */ ori $at, $at, 0xfd0 /* 17A018 8024B738 4481B000 */ mtc1 $at, $f22 -/* 17A01C 8024B73C 00000000 */ nop +/* 17A01C 8024B73C 00000000 */ nop /* 17A020 8024B740 46166302 */ mul.s $f12, $f12, $f22 -/* 17A024 8024B744 00000000 */ nop +/* 17A024 8024B744 00000000 */ nop /* 17A028 8024B748 3C013F00 */ lui $at, 0x3f00 /* 17A02C 8024B74C 4481A000 */ mtc1 $at, $f20 -/* 17A030 8024B750 00000000 */ nop +/* 17A030 8024B750 00000000 */ nop /* 17A034 8024B754 46146302 */ mul.s $f12, $f12, $f20 /* 17A038 8024B758 0C00A85B */ jal sin_rad -/* 17A03C 8024B75C 00000000 */ nop +/* 17A03C 8024B75C 00000000 */ nop /* 17A040 8024B760 46160002 */ mul.s $f0, $f0, $f22 -/* 17A044 8024B764 00000000 */ nop +/* 17A044 8024B764 00000000 */ nop /* 17A048 8024B768 46140302 */ mul.s $f12, $f0, $f20 /* 17A04C 8024B76C 0C00A85B */ jal sin_rad -/* 17A050 8024B770 00000000 */ nop +/* 17A050 8024B770 00000000 */ nop /* 17A054 8024B774 46160002 */ mul.s $f0, $f0, $f22 -/* 17A058 8024B778 00000000 */ nop +/* 17A058 8024B778 00000000 */ nop /* 17A05C 8024B77C 46140302 */ mul.s $f12, $f0, $f20 /* 17A060 8024B780 0C00A85B */ jal sin_rad -/* 17A064 8024B784 00000000 */ nop +/* 17A064 8024B784 00000000 */ nop /* 17A068 8024B788 08092DEF */ j .L8024B7BC /* 17A06C 8024B78C 4600C101 */ sub.s $f4, $f24, $f0 .L8024B790: @@ -111,79 +111,79 @@ glabel func_8024B5FC /* 17A078 8024B798 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 17A07C 8024B79C 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 17A080 8024B7A0 44822000 */ mtc1 $v0, $f4 -/* 17A084 8024B7A4 00000000 */ nop +/* 17A084 8024B7A4 00000000 */ nop /* 17A088 8024B7A8 46802120 */ cvt.s.w $f4, $f4 /* 17A08C 8024B7AC 44830000 */ mtc1 $v1, $f0 -/* 17A090 8024B7B0 00000000 */ nop +/* 17A090 8024B7B0 00000000 */ nop /* 17A094 8024B7B4 46800020 */ cvt.s.w $f0, $f0 /* 17A098 8024B7B8 46002103 */ div.s $f4, $f4, $f0 .L8024B7BC: /* 17A09C 8024B7BC 3C01802A */ lui $at, %hi(D_8029F2A8) /* 17A0A0 8024B7C0 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) /* 17A0A4 8024B7C4 4604A502 */ mul.s $f20, $f20, $f4 -/* 17A0A8 8024B7C8 00000000 */ nop +/* 17A0A8 8024B7C8 00000000 */ nop /* 17A0AC 8024B7CC 3C01802A */ lui $at, %hi(D_8029F2AC) /* 17A0B0 8024B7D0 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) /* 17A0B4 8024B7D4 46049482 */ mul.s $f18, $f18, $f4 -/* 17A0B8 8024B7D8 00000000 */ nop +/* 17A0B8 8024B7D8 00000000 */ nop /* 17A0BC 8024B7DC 3C01802A */ lui $at, %hi(D_8029F2B0) /* 17A0C0 8024B7E0 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) /* 17A0C4 8024B7E4 46048402 */ mul.s $f16, $f16, $f4 -/* 17A0C8 8024B7E8 00000000 */ nop +/* 17A0C8 8024B7E8 00000000 */ nop /* 17A0CC 8024B7EC 3C01802A */ lui $at, %hi(D_8029F298) /* 17A0D0 8024B7F0 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) /* 17A0D4 8024B7F4 46043182 */ mul.s $f6, $f6, $f4 -/* 17A0D8 8024B7F8 00000000 */ nop +/* 17A0D8 8024B7F8 00000000 */ nop /* 17A0DC 8024B7FC 3C01802A */ lui $at, %hi(D_8029F28C) /* 17A0E0 8024B800 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) /* 17A0E4 8024B804 46046302 */ mul.s $f12, $f12, $f4 -/* 17A0E8 8024B808 00000000 */ nop +/* 17A0E8 8024B808 00000000 */ nop /* 17A0EC 8024B80C 3C01802A */ lui $at, %hi(D_8029F290) /* 17A0F0 8024B810 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 17A0F4 8024B814 46044202 */ mul.s $f8, $f8, $f4 -/* 17A0F8 8024B818 00000000 */ nop +/* 17A0F8 8024B818 00000000 */ nop /* 17A0FC 8024B81C 3C013F80 */ lui $at, 0x3f80 /* 17A100 8024B820 44811000 */ mtc1 $at, $f2 -/* 17A104 8024B824 00000000 */ nop +/* 17A104 8024B824 00000000 */ nop /* 17A108 8024B828 46041081 */ sub.s $f2, $f2, $f4 /* 17A10C 8024B82C 4602D682 */ mul.s $f26, $f26, $f2 -/* 17A110 8024B830 00000000 */ nop +/* 17A110 8024B830 00000000 */ nop /* 17A114 8024B834 C7BC0010 */ lwc1 $f28, 0x10($sp) /* 17A118 8024B838 4602E602 */ mul.s $f24, $f28, $f2 -/* 17A11C 8024B83C 00000000 */ nop +/* 17A11C 8024B83C 00000000 */ nop /* 17A120 8024B840 3C02802A */ lui $v0, %hi(D_8029F286) /* 17A124 8024B844 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 17A128 8024B848 44820000 */ mtc1 $v0, $f0 -/* 17A12C 8024B84C 00000000 */ nop +/* 17A12C 8024B84C 00000000 */ nop /* 17A130 8024B850 46800020 */ cvt.s.w $f0, $f0 /* 17A134 8024B854 46020002 */ mul.s $f0, $f0, $f2 -/* 17A138 8024B858 00000000 */ nop +/* 17A138 8024B858 00000000 */ nop /* 17A13C 8024B85C 4602F582 */ mul.s $f22, $f30, $f2 -/* 17A140 8024B860 00000000 */ nop +/* 17A140 8024B860 00000000 */ nop /* 17A144 8024B864 3C02802A */ lui $v0, %hi(D_8029F280) /* 17A148 8024B868 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 17A14C 8024B86C 44827000 */ mtc1 $v0, $f14 -/* 17A150 8024B870 00000000 */ nop +/* 17A150 8024B870 00000000 */ nop /* 17A154 8024B874 468073A0 */ cvt.s.w $f14, $f14 /* 17A158 8024B878 46027382 */ mul.s $f14, $f14, $f2 -/* 17A15C 8024B87C 00000000 */ nop +/* 17A15C 8024B87C 00000000 */ nop /* 17A160 8024B880 3C02802A */ lui $v0, %hi(D_8029F282) /* 17A164 8024B884 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 17A168 8024B888 44825000 */ mtc1 $v0, $f10 -/* 17A16C 8024B88C 00000000 */ nop +/* 17A16C 8024B88C 00000000 */ nop /* 17A170 8024B890 468052A0 */ cvt.s.w $f10, $f10 /* 17A174 8024B894 46025282 */ mul.s $f10, $f10, $f2 -/* 17A178 8024B898 00000000 */ nop +/* 17A178 8024B898 00000000 */ nop /* 17A17C 8024B89C 46003180 */ add.s $f6, $f6, $f0 /* 17A180 8024B8A0 3C014380 */ lui $at, 0x4380 /* 17A184 8024B8A4 44810000 */ mtc1 $at, $f0 -/* 17A188 8024B8A8 00000000 */ nop +/* 17A188 8024B8A8 00000000 */ nop /* 17A18C 8024B8AC 46003182 */ mul.s $f6, $f6, $f0 -/* 17A190 8024B8B0 00000000 */ nop +/* 17A190 8024B8B0 00000000 */ nop /* 17A194 8024B8B4 3C01802A */ lui $at, %hi(D_8029F294) /* 17A198 8024B8B8 C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) /* 17A19C 8024B8BC 46040002 */ mul.s $f0, $f0, $f4 -/* 17A1A0 8024B8C0 00000000 */ nop +/* 17A1A0 8024B8C0 00000000 */ nop /* 17A1A4 8024B8C4 461AA500 */ add.s $f20, $f20, $f26 /* 17A1A8 8024B8C8 46189480 */ add.s $f18, $f18, $f24 /* 17A1AC 8024B8CC 46168400 */ add.s $f16, $f16, $f22 @@ -195,28 +195,28 @@ glabel func_8024B5FC /* 17A1C4 8024B8E4 460A4200 */ add.s $f8, $f8, $f10 /* 17A1C8 8024B8E8 E6140054 */ swc1 $f20, 0x54($s0) /* 17A1CC 8024B8EC 44822000 */ mtc1 $v0, $f4 -/* 17A1D0 8024B8F0 00000000 */ nop +/* 17A1D0 8024B8F0 00000000 */ nop /* 17A1D4 8024B8F4 46802120 */ cvt.s.w $f4, $f4 /* 17A1D8 8024B8F8 46022102 */ mul.s $f4, $f4, $f2 -/* 17A1DC 8024B8FC 00000000 */ nop +/* 17A1DC 8024B8FC 00000000 */ nop /* 17A1E0 8024B900 E6120058 */ swc1 $f18, 0x58($s0) /* 17A1E4 8024B904 E610005C */ swc1 $f16, 0x5c($s0) /* 17A1E8 8024B908 4600670D */ trunc.w.s $f28, $f12 /* 17A1EC 8024B90C 4402E000 */ mfc1 $v0, $f28 -/* 17A1F0 8024B910 00000000 */ nop +/* 17A1F0 8024B910 00000000 */ nop /* 17A1F4 8024B914 A602001E */ sh $v0, 0x1e($s0) /* 17A1F8 8024B918 46040000 */ add.s $f0, $f0, $f4 /* 17A1FC 8024B91C 4600470D */ trunc.w.s $f28, $f8 /* 17A200 8024B920 4402E000 */ mfc1 $v0, $f28 -/* 17A204 8024B924 00000000 */ nop +/* 17A204 8024B924 00000000 */ nop /* 17A208 8024B928 A6020024 */ sh $v0, 0x24($s0) /* 17A20C 8024B92C 4600070D */ trunc.w.s $f28, $f0 /* 17A210 8024B930 4402E000 */ mfc1 $v0, $f28 -/* 17A214 8024B934 00000000 */ nop +/* 17A214 8024B934 00000000 */ nop /* 17A218 8024B938 A6020022 */ sh $v0, 0x22($s0) /* 17A21C 8024B93C 4600370D */ trunc.w.s $f28, $f6 /* 17A220 8024B940 4402E000 */ mfc1 $v0, $f28 -/* 17A224 8024B944 00000000 */ nop +/* 17A224 8024B944 00000000 */ nop /* 17A228 8024B948 A6020026 */ sh $v0, 0x26($s0) /* 17A22C 8024B94C 84820000 */ lh $v0, ($a0) /* 17A230 8024B950 94830000 */ lhu $v1, ($a0) @@ -226,7 +226,7 @@ glabel func_8024B5FC /* 17A240 8024B960 3C01802A */ lui $at, %hi(D_8029F29C) /* 17A244 8024B964 A022F29C */ sb $v0, %lo(D_8029F29C)($at) /* 17A248 8024B968 08092E5D */ j .L8024B974 -/* 17A24C 8024B96C 00000000 */ nop +/* 17A24C 8024B96C 00000000 */ nop .L8024B970: /* 17A250 8024B970 A4820000 */ sh $v0, ($a0) .L8024B974: diff --git a/asm/nonmatchings/code_1776B0/func_8024B9A0.s b/asm/nonmatchings/code_1776B0/func_8024B9A0.s index 62624a164a..c35dbf2cbc 100644 --- a/asm/nonmatchings/code_1776B0/func_8024B9A0.s +++ b/asm/nonmatchings/code_1776B0/func_8024B9A0.s @@ -33,7 +33,7 @@ glabel func_8024B9A0 /* 17A2F0 8024BA10 3C01802A */ lui $at, %hi(D_8029F274) /* 17A2F4 8024BA14 E422F274 */ swc1 $f2, %lo(D_8029F274)($at) /* 17A2F8 8024BA18 1040000B */ beqz $v0, .L8024BA48 -/* 17A2FC 8024BA1C 00000000 */ nop +/* 17A2FC 8024BA1C 00000000 */ nop /* 17A300 8024BA20 C4800000 */ lwc1 $f0, ($a0) /* 17A304 8024BA24 3C02802A */ lui $v0, %hi(D_8029F280) /* 17A308 8024BA28 9442F280 */ lhu $v0, %lo(D_8029F280)($v0) @@ -49,18 +49,18 @@ glabel func_8024B9A0 /* 17A32C 8024BA4C 86040026 */ lh $a0, 0x26($s0) /* 17A330 8024BA50 86030024 */ lh $v1, 0x24($s0) /* 17A334 8024BA54 44820000 */ mtc1 $v0, $f0 -/* 17A338 8024BA58 00000000 */ nop +/* 17A338 8024BA58 00000000 */ nop /* 17A33C 8024BA5C 46800020 */ cvt.s.w $f0, $f0 /* 17A340 8024BA60 86020022 */ lh $v0, 0x22($s0) /* 17A344 8024BA64 3C01802A */ lui $at, %hi(D_8029F28C) /* 17A348 8024BA68 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 17A34C 8024BA6C 44820000 */ mtc1 $v0, $f0 -/* 17A350 8024BA70 00000000 */ nop +/* 17A350 8024BA70 00000000 */ nop /* 17A354 8024BA74 46800020 */ cvt.s.w $f0, $f0 /* 17A358 8024BA78 3C01802A */ lui $at, %hi(D_8029F294) /* 17A35C 8024BA7C E420F294 */ swc1 $f0, %lo(D_8029F294)($at) /* 17A360 8024BA80 44830000 */ mtc1 $v1, $f0 -/* 17A364 8024BA84 00000000 */ nop +/* 17A364 8024BA84 00000000 */ nop /* 17A368 8024BA88 46800020 */ cvt.s.w $f0, $f0 /* 17A36C 8024BA8C 3C01802A */ lui $at, %hi(D_8029F290) /* 17A370 8024BA90 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -74,7 +74,7 @@ glabel func_8024B9A0 /* 17A38C 8024BAAC 3C03802A */ lui $v1, %hi(D_8029F29E) /* 17A390 8024BAB0 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 17A394 8024BAB4 44820000 */ mtc1 $v0, $f0 -/* 17A398 8024BAB8 00000000 */ nop +/* 17A398 8024BAB8 00000000 */ nop /* 17A39C 8024BABC 46800020 */ cvt.s.w $f0, $f0 /* 17A3A0 8024BAC0 3C01802A */ lui $at, %hi(D_8029F298) /* 17A3A4 8024BAC4 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -104,30 +104,30 @@ glabel func_8024B9A0 /* 17A400 8024BB20 3C013F80 */ lui $at, 0x3f80 /* 17A404 8024BB24 4481C000 */ mtc1 $at, $f24 /* 17A408 8024BB28 44822000 */ mtc1 $v0, $f4 -/* 17A40C 8024BB2C 00000000 */ nop +/* 17A40C 8024BB2C 00000000 */ nop /* 17A410 8024BB30 46802120 */ cvt.s.w $f4, $f4 /* 17A414 8024BB34 44830000 */ mtc1 $v1, $f0 -/* 17A418 8024BB38 00000000 */ nop +/* 17A418 8024BB38 00000000 */ nop /* 17A41C 8024BB3C 46800020 */ cvt.s.w $f0, $f0 /* 17A420 8024BB40 46002103 */ div.s $f4, $f4, $f0 /* 17A424 8024BB44 4604C301 */ sub.s $f12, $f24, $f4 /* 17A428 8024BB48 3C014049 */ lui $at, 0x4049 /* 17A42C 8024BB4C 34210FD0 */ ori $at, $at, 0xfd0 /* 17A430 8024BB50 4481B000 */ mtc1 $at, $f22 -/* 17A434 8024BB54 00000000 */ nop +/* 17A434 8024BB54 00000000 */ nop /* 17A438 8024BB58 46166302 */ mul.s $f12, $f12, $f22 -/* 17A43C 8024BB5C 00000000 */ nop +/* 17A43C 8024BB5C 00000000 */ nop /* 17A440 8024BB60 3C013F00 */ lui $at, 0x3f00 /* 17A444 8024BB64 4481A000 */ mtc1 $at, $f20 -/* 17A448 8024BB68 00000000 */ nop +/* 17A448 8024BB68 00000000 */ nop /* 17A44C 8024BB6C 46146302 */ mul.s $f12, $f12, $f20 /* 17A450 8024BB70 0C00A85B */ jal sin_rad -/* 17A454 8024BB74 00000000 */ nop +/* 17A454 8024BB74 00000000 */ nop /* 17A458 8024BB78 46160002 */ mul.s $f0, $f0, $f22 -/* 17A45C 8024BB7C 00000000 */ nop +/* 17A45C 8024BB7C 00000000 */ nop /* 17A460 8024BB80 46140302 */ mul.s $f12, $f0, $f20 /* 17A464 8024BB84 0C00A85B */ jal sin_rad -/* 17A468 8024BB88 00000000 */ nop +/* 17A468 8024BB88 00000000 */ nop /* 17A46C 8024BB8C 08092EF0 */ j .L8024BBC0 /* 17A470 8024BB90 4600C101 */ sub.s $f4, $f24, $f0 .L8024BB94: @@ -136,79 +136,79 @@ glabel func_8024B9A0 /* 17A47C 8024BB9C 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 17A480 8024BBA0 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 17A484 8024BBA4 44822000 */ mtc1 $v0, $f4 -/* 17A488 8024BBA8 00000000 */ nop +/* 17A488 8024BBA8 00000000 */ nop /* 17A48C 8024BBAC 46802120 */ cvt.s.w $f4, $f4 /* 17A490 8024BBB0 44830000 */ mtc1 $v1, $f0 -/* 17A494 8024BBB4 00000000 */ nop +/* 17A494 8024BBB4 00000000 */ nop /* 17A498 8024BBB8 46800020 */ cvt.s.w $f0, $f0 /* 17A49C 8024BBBC 46002103 */ div.s $f4, $f4, $f0 .L8024BBC0: /* 17A4A0 8024BBC0 3C01802A */ lui $at, %hi(D_8029F2A8) /* 17A4A4 8024BBC4 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) /* 17A4A8 8024BBC8 4604A502 */ mul.s $f20, $f20, $f4 -/* 17A4AC 8024BBCC 00000000 */ nop +/* 17A4AC 8024BBCC 00000000 */ nop /* 17A4B0 8024BBD0 3C01802A */ lui $at, %hi(D_8029F2AC) /* 17A4B4 8024BBD4 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) /* 17A4B8 8024BBD8 46049482 */ mul.s $f18, $f18, $f4 -/* 17A4BC 8024BBDC 00000000 */ nop +/* 17A4BC 8024BBDC 00000000 */ nop /* 17A4C0 8024BBE0 3C01802A */ lui $at, %hi(D_8029F2B0) /* 17A4C4 8024BBE4 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) /* 17A4C8 8024BBE8 46048402 */ mul.s $f16, $f16, $f4 -/* 17A4CC 8024BBEC 00000000 */ nop +/* 17A4CC 8024BBEC 00000000 */ nop /* 17A4D0 8024BBF0 3C01802A */ lui $at, %hi(D_8029F298) /* 17A4D4 8024BBF4 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) /* 17A4D8 8024BBF8 46043182 */ mul.s $f6, $f6, $f4 -/* 17A4DC 8024BBFC 00000000 */ nop +/* 17A4DC 8024BBFC 00000000 */ nop /* 17A4E0 8024BC00 3C01802A */ lui $at, %hi(D_8029F28C) /* 17A4E4 8024BC04 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) /* 17A4E8 8024BC08 46046302 */ mul.s $f12, $f12, $f4 -/* 17A4EC 8024BC0C 00000000 */ nop +/* 17A4EC 8024BC0C 00000000 */ nop /* 17A4F0 8024BC10 3C01802A */ lui $at, %hi(D_8029F290) /* 17A4F4 8024BC14 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 17A4F8 8024BC18 46044202 */ mul.s $f8, $f8, $f4 -/* 17A4FC 8024BC1C 00000000 */ nop +/* 17A4FC 8024BC1C 00000000 */ nop /* 17A500 8024BC20 3C013F80 */ lui $at, 0x3f80 /* 17A504 8024BC24 44811000 */ mtc1 $at, $f2 -/* 17A508 8024BC28 00000000 */ nop +/* 17A508 8024BC28 00000000 */ nop /* 17A50C 8024BC2C 46041081 */ sub.s $f2, $f2, $f4 /* 17A510 8024BC30 4602D682 */ mul.s $f26, $f26, $f2 -/* 17A514 8024BC34 00000000 */ nop +/* 17A514 8024BC34 00000000 */ nop /* 17A518 8024BC38 C7BC0010 */ lwc1 $f28, 0x10($sp) /* 17A51C 8024BC3C 4602E602 */ mul.s $f24, $f28, $f2 -/* 17A520 8024BC40 00000000 */ nop +/* 17A520 8024BC40 00000000 */ nop /* 17A524 8024BC44 3C02802A */ lui $v0, %hi(D_8029F286) /* 17A528 8024BC48 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 17A52C 8024BC4C 44820000 */ mtc1 $v0, $f0 -/* 17A530 8024BC50 00000000 */ nop +/* 17A530 8024BC50 00000000 */ nop /* 17A534 8024BC54 46800020 */ cvt.s.w $f0, $f0 /* 17A538 8024BC58 46020002 */ mul.s $f0, $f0, $f2 -/* 17A53C 8024BC5C 00000000 */ nop +/* 17A53C 8024BC5C 00000000 */ nop /* 17A540 8024BC60 4602F582 */ mul.s $f22, $f30, $f2 -/* 17A544 8024BC64 00000000 */ nop +/* 17A544 8024BC64 00000000 */ nop /* 17A548 8024BC68 3C02802A */ lui $v0, %hi(D_8029F280) /* 17A54C 8024BC6C 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 17A550 8024BC70 44827000 */ mtc1 $v0, $f14 -/* 17A554 8024BC74 00000000 */ nop +/* 17A554 8024BC74 00000000 */ nop /* 17A558 8024BC78 468073A0 */ cvt.s.w $f14, $f14 /* 17A55C 8024BC7C 46027382 */ mul.s $f14, $f14, $f2 -/* 17A560 8024BC80 00000000 */ nop +/* 17A560 8024BC80 00000000 */ nop /* 17A564 8024BC84 3C02802A */ lui $v0, %hi(D_8029F282) /* 17A568 8024BC88 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 17A56C 8024BC8C 44825000 */ mtc1 $v0, $f10 -/* 17A570 8024BC90 00000000 */ nop +/* 17A570 8024BC90 00000000 */ nop /* 17A574 8024BC94 468052A0 */ cvt.s.w $f10, $f10 /* 17A578 8024BC98 46025282 */ mul.s $f10, $f10, $f2 -/* 17A57C 8024BC9C 00000000 */ nop +/* 17A57C 8024BC9C 00000000 */ nop /* 17A580 8024BCA0 46003180 */ add.s $f6, $f6, $f0 /* 17A584 8024BCA4 3C014380 */ lui $at, 0x4380 /* 17A588 8024BCA8 44810000 */ mtc1 $at, $f0 -/* 17A58C 8024BCAC 00000000 */ nop +/* 17A58C 8024BCAC 00000000 */ nop /* 17A590 8024BCB0 46003182 */ mul.s $f6, $f6, $f0 -/* 17A594 8024BCB4 00000000 */ nop +/* 17A594 8024BCB4 00000000 */ nop /* 17A598 8024BCB8 3C01802A */ lui $at, %hi(D_8029F294) /* 17A59C 8024BCBC C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) /* 17A5A0 8024BCC0 46040002 */ mul.s $f0, $f0, $f4 -/* 17A5A4 8024BCC4 00000000 */ nop +/* 17A5A4 8024BCC4 00000000 */ nop /* 17A5A8 8024BCC8 461AA500 */ add.s $f20, $f20, $f26 /* 17A5AC 8024BCCC 46189480 */ add.s $f18, $f18, $f24 /* 17A5B0 8024BCD0 46168400 */ add.s $f16, $f16, $f22 @@ -220,28 +220,28 @@ glabel func_8024B9A0 /* 17A5C8 8024BCE8 460A4200 */ add.s $f8, $f8, $f10 /* 17A5CC 8024BCEC E6140054 */ swc1 $f20, 0x54($s0) /* 17A5D0 8024BCF0 44822000 */ mtc1 $v0, $f4 -/* 17A5D4 8024BCF4 00000000 */ nop +/* 17A5D4 8024BCF4 00000000 */ nop /* 17A5D8 8024BCF8 46802120 */ cvt.s.w $f4, $f4 /* 17A5DC 8024BCFC 46022102 */ mul.s $f4, $f4, $f2 -/* 17A5E0 8024BD00 00000000 */ nop +/* 17A5E0 8024BD00 00000000 */ nop /* 17A5E4 8024BD04 E6120058 */ swc1 $f18, 0x58($s0) /* 17A5E8 8024BD08 E610005C */ swc1 $f16, 0x5c($s0) /* 17A5EC 8024BD0C 4600670D */ trunc.w.s $f28, $f12 /* 17A5F0 8024BD10 4402E000 */ mfc1 $v0, $f28 -/* 17A5F4 8024BD14 00000000 */ nop +/* 17A5F4 8024BD14 00000000 */ nop /* 17A5F8 8024BD18 A602001E */ sh $v0, 0x1e($s0) /* 17A5FC 8024BD1C 46040000 */ add.s $f0, $f0, $f4 /* 17A600 8024BD20 4600470D */ trunc.w.s $f28, $f8 /* 17A604 8024BD24 4402E000 */ mfc1 $v0, $f28 -/* 17A608 8024BD28 00000000 */ nop +/* 17A608 8024BD28 00000000 */ nop /* 17A60C 8024BD2C A6020024 */ sh $v0, 0x24($s0) /* 17A610 8024BD30 4600070D */ trunc.w.s $f28, $f0 /* 17A614 8024BD34 4402E000 */ mfc1 $v0, $f28 -/* 17A618 8024BD38 00000000 */ nop +/* 17A618 8024BD38 00000000 */ nop /* 17A61C 8024BD3C A6020022 */ sh $v0, 0x22($s0) /* 17A620 8024BD40 4600370D */ trunc.w.s $f28, $f6 /* 17A624 8024BD44 4402E000 */ mfc1 $v0, $f28 -/* 17A628 8024BD48 00000000 */ nop +/* 17A628 8024BD48 00000000 */ nop /* 17A62C 8024BD4C A6020026 */ sh $v0, 0x26($s0) /* 17A630 8024BD50 84820000 */ lh $v0, ($a0) /* 17A634 8024BD54 94830000 */ lhu $v1, ($a0) @@ -251,7 +251,7 @@ glabel func_8024B9A0 /* 17A644 8024BD64 3C01802A */ lui $at, %hi(D_8029F29C) /* 17A648 8024BD68 A022F29C */ sb $v0, %lo(D_8029F29C)($at) /* 17A64C 8024BD6C 08092F5E */ j .L8024BD78 -/* 17A650 8024BD70 00000000 */ nop +/* 17A650 8024BD70 00000000 */ nop .L8024BD74: /* 17A654 8024BD74 A4820000 */ sh $v0, ($a0) .L8024BD78: diff --git a/asm/nonmatchings/code_1776B0/func_8024BDA4.s b/asm/nonmatchings/code_1776B0/func_8024BDA4.s index 134e724df4..6d219d8fa9 100644 --- a/asm/nonmatchings/code_1776B0/func_8024BDA4.s +++ b/asm/nonmatchings/code_1776B0/func_8024BDA4.s @@ -27,7 +27,7 @@ glabel func_8024BDA4 /* 17A6DC 8024BDFC 3C01802A */ lui $at, %hi(D_8029F270) /* 17A6E0 8024BE00 E420F270 */ swc1 $f0, %lo(D_8029F270)($at) /* 17A6E4 8024BE04 44830000 */ mtc1 $v1, $f0 -/* 17A6E8 8024BE08 00000000 */ nop +/* 17A6E8 8024BE08 00000000 */ nop /* 17A6EC 8024BE0C 46800020 */ cvt.s.w $f0, $f0 /* 17A6F0 8024BE10 86030024 */ lh $v1, 0x24($s0) /* 17A6F4 8024BE14 3C01802A */ lui $at, %hi(D_8029F278) @@ -37,14 +37,14 @@ glabel func_8024BDA4 /* 17A704 8024BE24 3C01802A */ lui $at, %hi(D_8029F28C) /* 17A708 8024BE28 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 17A70C 8024BE2C 44820000 */ mtc1 $v0, $f0 -/* 17A710 8024BE30 00000000 */ nop +/* 17A710 8024BE30 00000000 */ nop /* 17A714 8024BE34 46800020 */ cvt.s.w $f0, $f0 /* 17A718 8024BE38 3C01802A */ lui $at, %hi(D_8029F274) /* 17A71C 8024BE3C E422F274 */ swc1 $f2, %lo(D_8029F274)($at) /* 17A720 8024BE40 3C01802A */ lui $at, %hi(D_8029F294) /* 17A724 8024BE44 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) /* 17A728 8024BE48 44830000 */ mtc1 $v1, $f0 -/* 17A72C 8024BE4C 00000000 */ nop +/* 17A72C 8024BE4C 00000000 */ nop /* 17A730 8024BE50 46800020 */ cvt.s.w $f0, $f0 /* 17A734 8024BE54 3C01802A */ lui $at, %hi(D_8029F290) /* 17A738 8024BE58 E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -58,7 +58,7 @@ glabel func_8024BDA4 /* 17A754 8024BE74 3C03802A */ lui $v1, %hi(D_8029F29E) /* 17A758 8024BE78 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 17A75C 8024BE7C 44820000 */ mtc1 $v0, $f0 -/* 17A760 8024BE80 00000000 */ nop +/* 17A760 8024BE80 00000000 */ nop /* 17A764 8024BE84 46800020 */ cvt.s.w $f0, $f0 /* 17A768 8024BE88 3C01802A */ lui $at, %hi(D_8029F298) /* 17A76C 8024BE8C E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -88,35 +88,35 @@ glabel func_8024BDA4 /* 17A7C8 8024BEE8 3C013F80 */ lui $at, 0x3f80 /* 17A7CC 8024BEEC 4481C000 */ mtc1 $at, $f24 /* 17A7D0 8024BEF0 44822000 */ mtc1 $v0, $f4 -/* 17A7D4 8024BEF4 00000000 */ nop +/* 17A7D4 8024BEF4 00000000 */ nop /* 17A7D8 8024BEF8 46802120 */ cvt.s.w $f4, $f4 /* 17A7DC 8024BEFC 44830000 */ mtc1 $v1, $f0 -/* 17A7E0 8024BF00 00000000 */ nop +/* 17A7E0 8024BF00 00000000 */ nop /* 17A7E4 8024BF04 46800020 */ cvt.s.w $f0, $f0 /* 17A7E8 8024BF08 46002103 */ div.s $f4, $f4, $f0 /* 17A7EC 8024BF0C 4604C301 */ sub.s $f12, $f24, $f4 /* 17A7F0 8024BF10 3C014049 */ lui $at, 0x4049 /* 17A7F4 8024BF14 34210FD0 */ ori $at, $at, 0xfd0 /* 17A7F8 8024BF18 4481B000 */ mtc1 $at, $f22 -/* 17A7FC 8024BF1C 00000000 */ nop +/* 17A7FC 8024BF1C 00000000 */ nop /* 17A800 8024BF20 46166302 */ mul.s $f12, $f12, $f22 -/* 17A804 8024BF24 00000000 */ nop +/* 17A804 8024BF24 00000000 */ nop /* 17A808 8024BF28 3C013F00 */ lui $at, 0x3f00 /* 17A80C 8024BF2C 4481A000 */ mtc1 $at, $f20 -/* 17A810 8024BF30 00000000 */ nop +/* 17A810 8024BF30 00000000 */ nop /* 17A814 8024BF34 46146302 */ mul.s $f12, $f12, $f20 /* 17A818 8024BF38 0C00A85B */ jal sin_rad -/* 17A81C 8024BF3C 00000000 */ nop +/* 17A81C 8024BF3C 00000000 */ nop /* 17A820 8024BF40 46160002 */ mul.s $f0, $f0, $f22 -/* 17A824 8024BF44 00000000 */ nop +/* 17A824 8024BF44 00000000 */ nop /* 17A828 8024BF48 46140302 */ mul.s $f12, $f0, $f20 /* 17A82C 8024BF4C 0C00A85B */ jal sin_rad -/* 17A830 8024BF50 00000000 */ nop +/* 17A830 8024BF50 00000000 */ nop /* 17A834 8024BF54 46160002 */ mul.s $f0, $f0, $f22 -/* 17A838 8024BF58 00000000 */ nop +/* 17A838 8024BF58 00000000 */ nop /* 17A83C 8024BF5C 46140302 */ mul.s $f12, $f0, $f20 /* 17A840 8024BF60 0C00A85B */ jal sin_rad -/* 17A844 8024BF64 00000000 */ nop +/* 17A844 8024BF64 00000000 */ nop /* 17A848 8024BF68 08092FE7 */ j .L8024BF9C /* 17A84C 8024BF6C 4600C101 */ sub.s $f4, $f24, $f0 .L8024BF70: @@ -125,79 +125,79 @@ glabel func_8024BDA4 /* 17A858 8024BF78 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 17A85C 8024BF7C 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 17A860 8024BF80 44822000 */ mtc1 $v0, $f4 -/* 17A864 8024BF84 00000000 */ nop +/* 17A864 8024BF84 00000000 */ nop /* 17A868 8024BF88 46802120 */ cvt.s.w $f4, $f4 /* 17A86C 8024BF8C 44830000 */ mtc1 $v1, $f0 -/* 17A870 8024BF90 00000000 */ nop +/* 17A870 8024BF90 00000000 */ nop /* 17A874 8024BF94 46800020 */ cvt.s.w $f0, $f0 /* 17A878 8024BF98 46002103 */ div.s $f4, $f4, $f0 .L8024BF9C: /* 17A87C 8024BF9C 3C01802A */ lui $at, %hi(D_8029F2A8) /* 17A880 8024BFA0 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) /* 17A884 8024BFA4 4604A502 */ mul.s $f20, $f20, $f4 -/* 17A888 8024BFA8 00000000 */ nop +/* 17A888 8024BFA8 00000000 */ nop /* 17A88C 8024BFAC 3C01802A */ lui $at, %hi(D_8029F2AC) /* 17A890 8024BFB0 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) /* 17A894 8024BFB4 46049482 */ mul.s $f18, $f18, $f4 -/* 17A898 8024BFB8 00000000 */ nop +/* 17A898 8024BFB8 00000000 */ nop /* 17A89C 8024BFBC 3C01802A */ lui $at, %hi(D_8029F2B0) /* 17A8A0 8024BFC0 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) /* 17A8A4 8024BFC4 46048402 */ mul.s $f16, $f16, $f4 -/* 17A8A8 8024BFC8 00000000 */ nop +/* 17A8A8 8024BFC8 00000000 */ nop /* 17A8AC 8024BFCC 3C01802A */ lui $at, %hi(D_8029F298) /* 17A8B0 8024BFD0 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) /* 17A8B4 8024BFD4 46043182 */ mul.s $f6, $f6, $f4 -/* 17A8B8 8024BFD8 00000000 */ nop +/* 17A8B8 8024BFD8 00000000 */ nop /* 17A8BC 8024BFDC 3C01802A */ lui $at, %hi(D_8029F28C) /* 17A8C0 8024BFE0 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) /* 17A8C4 8024BFE4 46046302 */ mul.s $f12, $f12, $f4 -/* 17A8C8 8024BFE8 00000000 */ nop +/* 17A8C8 8024BFE8 00000000 */ nop /* 17A8CC 8024BFEC 3C01802A */ lui $at, %hi(D_8029F290) /* 17A8D0 8024BFF0 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 17A8D4 8024BFF4 46044202 */ mul.s $f8, $f8, $f4 -/* 17A8D8 8024BFF8 00000000 */ nop +/* 17A8D8 8024BFF8 00000000 */ nop /* 17A8DC 8024BFFC 3C013F80 */ lui $at, 0x3f80 /* 17A8E0 8024C000 44811000 */ mtc1 $at, $f2 -/* 17A8E4 8024C004 00000000 */ nop +/* 17A8E4 8024C004 00000000 */ nop /* 17A8E8 8024C008 46041081 */ sub.s $f2, $f2, $f4 /* 17A8EC 8024C00C 4602D682 */ mul.s $f26, $f26, $f2 -/* 17A8F0 8024C010 00000000 */ nop +/* 17A8F0 8024C010 00000000 */ nop /* 17A8F4 8024C014 C7BC0010 */ lwc1 $f28, 0x10($sp) /* 17A8F8 8024C018 4602E602 */ mul.s $f24, $f28, $f2 -/* 17A8FC 8024C01C 00000000 */ nop +/* 17A8FC 8024C01C 00000000 */ nop /* 17A900 8024C020 3C02802A */ lui $v0, %hi(D_8029F286) /* 17A904 8024C024 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 17A908 8024C028 44820000 */ mtc1 $v0, $f0 -/* 17A90C 8024C02C 00000000 */ nop +/* 17A90C 8024C02C 00000000 */ nop /* 17A910 8024C030 46800020 */ cvt.s.w $f0, $f0 /* 17A914 8024C034 46020002 */ mul.s $f0, $f0, $f2 -/* 17A918 8024C038 00000000 */ nop +/* 17A918 8024C038 00000000 */ nop /* 17A91C 8024C03C 4602F582 */ mul.s $f22, $f30, $f2 -/* 17A920 8024C040 00000000 */ nop +/* 17A920 8024C040 00000000 */ nop /* 17A924 8024C044 3C02802A */ lui $v0, %hi(D_8029F280) /* 17A928 8024C048 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 17A92C 8024C04C 44827000 */ mtc1 $v0, $f14 -/* 17A930 8024C050 00000000 */ nop +/* 17A930 8024C050 00000000 */ nop /* 17A934 8024C054 468073A0 */ cvt.s.w $f14, $f14 /* 17A938 8024C058 46027382 */ mul.s $f14, $f14, $f2 -/* 17A93C 8024C05C 00000000 */ nop +/* 17A93C 8024C05C 00000000 */ nop /* 17A940 8024C060 3C02802A */ lui $v0, %hi(D_8029F282) /* 17A944 8024C064 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 17A948 8024C068 44825000 */ mtc1 $v0, $f10 -/* 17A94C 8024C06C 00000000 */ nop +/* 17A94C 8024C06C 00000000 */ nop /* 17A950 8024C070 468052A0 */ cvt.s.w $f10, $f10 /* 17A954 8024C074 46025282 */ mul.s $f10, $f10, $f2 -/* 17A958 8024C078 00000000 */ nop +/* 17A958 8024C078 00000000 */ nop /* 17A95C 8024C07C 46003180 */ add.s $f6, $f6, $f0 /* 17A960 8024C080 3C014380 */ lui $at, 0x4380 /* 17A964 8024C084 44810000 */ mtc1 $at, $f0 -/* 17A968 8024C088 00000000 */ nop +/* 17A968 8024C088 00000000 */ nop /* 17A96C 8024C08C 46003182 */ mul.s $f6, $f6, $f0 -/* 17A970 8024C090 00000000 */ nop +/* 17A970 8024C090 00000000 */ nop /* 17A974 8024C094 3C01802A */ lui $at, %hi(D_8029F294) /* 17A978 8024C098 C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) /* 17A97C 8024C09C 46040002 */ mul.s $f0, $f0, $f4 -/* 17A980 8024C0A0 00000000 */ nop +/* 17A980 8024C0A0 00000000 */ nop /* 17A984 8024C0A4 461AA500 */ add.s $f20, $f20, $f26 /* 17A988 8024C0A8 46189480 */ add.s $f18, $f18, $f24 /* 17A98C 8024C0AC 46168400 */ add.s $f16, $f16, $f22 @@ -209,28 +209,28 @@ glabel func_8024BDA4 /* 17A9A4 8024C0C4 460A4200 */ add.s $f8, $f8, $f10 /* 17A9A8 8024C0C8 E6140054 */ swc1 $f20, 0x54($s0) /* 17A9AC 8024C0CC 44822000 */ mtc1 $v0, $f4 -/* 17A9B0 8024C0D0 00000000 */ nop +/* 17A9B0 8024C0D0 00000000 */ nop /* 17A9B4 8024C0D4 46802120 */ cvt.s.w $f4, $f4 /* 17A9B8 8024C0D8 46022102 */ mul.s $f4, $f4, $f2 -/* 17A9BC 8024C0DC 00000000 */ nop +/* 17A9BC 8024C0DC 00000000 */ nop /* 17A9C0 8024C0E0 E6120058 */ swc1 $f18, 0x58($s0) /* 17A9C4 8024C0E4 E610005C */ swc1 $f16, 0x5c($s0) /* 17A9C8 8024C0E8 4600670D */ trunc.w.s $f28, $f12 /* 17A9CC 8024C0EC 4402E000 */ mfc1 $v0, $f28 -/* 17A9D0 8024C0F0 00000000 */ nop +/* 17A9D0 8024C0F0 00000000 */ nop /* 17A9D4 8024C0F4 A602001E */ sh $v0, 0x1e($s0) /* 17A9D8 8024C0F8 46040000 */ add.s $f0, $f0, $f4 /* 17A9DC 8024C0FC 4600470D */ trunc.w.s $f28, $f8 /* 17A9E0 8024C100 4402E000 */ mfc1 $v0, $f28 -/* 17A9E4 8024C104 00000000 */ nop +/* 17A9E4 8024C104 00000000 */ nop /* 17A9E8 8024C108 A6020024 */ sh $v0, 0x24($s0) /* 17A9EC 8024C10C 4600070D */ trunc.w.s $f28, $f0 /* 17A9F0 8024C110 4402E000 */ mfc1 $v0, $f28 -/* 17A9F4 8024C114 00000000 */ nop +/* 17A9F4 8024C114 00000000 */ nop /* 17A9F8 8024C118 A6020022 */ sh $v0, 0x22($s0) /* 17A9FC 8024C11C 4600370D */ trunc.w.s $f28, $f6 /* 17AA00 8024C120 4402E000 */ mfc1 $v0, $f28 -/* 17AA04 8024C124 00000000 */ nop +/* 17AA04 8024C124 00000000 */ nop /* 17AA08 8024C128 A6020026 */ sh $v0, 0x26($s0) /* 17AA0C 8024C12C 84820000 */ lh $v0, ($a0) /* 17AA10 8024C130 94830000 */ lhu $v1, ($a0) @@ -240,7 +240,7 @@ glabel func_8024BDA4 /* 17AA20 8024C140 3C01802A */ lui $at, %hi(D_8029F29C) /* 17AA24 8024C144 A022F29C */ sb $v0, %lo(D_8029F29C)($at) /* 17AA28 8024C148 08093055 */ j .L8024C154 -/* 17AA2C 8024C14C 00000000 */ nop +/* 17AA2C 8024C14C 00000000 */ nop .L8024C150: /* 17AA30 8024C150 A4820000 */ sh $v0, ($a0) .L8024C154: diff --git a/asm/nonmatchings/code_1776B0/func_8024C180.s b/asm/nonmatchings/code_1776B0/func_8024C180.s index 4dc37671f8..541de8c913 100644 --- a/asm/nonmatchings/code_1776B0/func_8024C180.s +++ b/asm/nonmatchings/code_1776B0/func_8024C180.s @@ -24,7 +24,7 @@ glabel func_8024C180 /* 17AAAC 8024C1CC 3C02802A */ lui $v0, %hi(D_8029F274) /* 17AAB0 8024C1D0 2442F274 */ addiu $v0, $v0, %lo(D_8029F274) /* 17AAB4 8024C1D4 4600303C */ c.lt.s $f6, $f0 -/* 17AAB8 8024C1D8 00000000 */ nop +/* 17AAB8 8024C1D8 00000000 */ nop /* 17AABC 8024C1DC 45000002 */ bc1f .L8024C1E8 /* 17AAC0 8024C1E0 E4460000 */ swc1 $f6, ($v0) /* 17AAC4 8024C1E4 E4400000 */ swc1 $f0, ($v0) @@ -36,7 +36,7 @@ glabel func_8024C180 /* 17AAD8 8024C1F8 A422F284 */ sh $v0, %lo(D_8029F284)($at) /* 17AADC 8024C1FC 86020022 */ lh $v0, 0x22($s0) /* 17AAE0 8024C200 44830000 */ mtc1 $v1, $f0 -/* 17AAE4 8024C204 00000000 */ nop +/* 17AAE4 8024C204 00000000 */ nop /* 17AAE8 8024C208 46800020 */ cvt.s.w $f0, $f0 /* 17AAEC 8024C20C 86030024 */ lh $v1, 0x24($s0) /* 17AAF0 8024C210 3C01802A */ lui $at, %hi(D_8029F278) @@ -46,12 +46,12 @@ glabel func_8024C180 /* 17AB00 8024C220 3C01802A */ lui $at, %hi(D_8029F28C) /* 17AB04 8024C224 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 17AB08 8024C228 44820000 */ mtc1 $v0, $f0 -/* 17AB0C 8024C22C 00000000 */ nop +/* 17AB0C 8024C22C 00000000 */ nop /* 17AB10 8024C230 46800020 */ cvt.s.w $f0, $f0 /* 17AB14 8024C234 3C01802A */ lui $at, %hi(D_8029F294) /* 17AB18 8024C238 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) /* 17AB1C 8024C23C 44830000 */ mtc1 $v1, $f0 -/* 17AB20 8024C240 00000000 */ nop +/* 17AB20 8024C240 00000000 */ nop /* 17AB24 8024C244 46800020 */ cvt.s.w $f0, $f0 /* 17AB28 8024C248 3C01802A */ lui $at, %hi(D_8029F290) /* 17AB2C 8024C24C E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -64,7 +64,7 @@ glabel func_8024C180 /* 17AB44 8024C264 3C03802A */ lui $v1, %hi(D_8029F29E) /* 17AB48 8024C268 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 17AB4C 8024C26C 44820000 */ mtc1 $v0, $f0 -/* 17AB50 8024C270 00000000 */ nop +/* 17AB50 8024C270 00000000 */ nop /* 17AB54 8024C274 46800020 */ cvt.s.w $f0, $f0 /* 17AB58 8024C278 3C01802A */ lui $at, %hi(D_8029F298) /* 17AB5C 8024C27C E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -94,35 +94,35 @@ glabel func_8024C180 /* 17ABB8 8024C2D8 3C013F80 */ lui $at, 0x3f80 /* 17ABBC 8024C2DC 4481C000 */ mtc1 $at, $f24 /* 17ABC0 8024C2E0 44822000 */ mtc1 $v0, $f4 -/* 17ABC4 8024C2E4 00000000 */ nop +/* 17ABC4 8024C2E4 00000000 */ nop /* 17ABC8 8024C2E8 46802120 */ cvt.s.w $f4, $f4 /* 17ABCC 8024C2EC 44830000 */ mtc1 $v1, $f0 -/* 17ABD0 8024C2F0 00000000 */ nop +/* 17ABD0 8024C2F0 00000000 */ nop /* 17ABD4 8024C2F4 46800020 */ cvt.s.w $f0, $f0 /* 17ABD8 8024C2F8 46002103 */ div.s $f4, $f4, $f0 /* 17ABDC 8024C2FC 4604C301 */ sub.s $f12, $f24, $f4 /* 17ABE0 8024C300 3C014049 */ lui $at, 0x4049 /* 17ABE4 8024C304 34210FD0 */ ori $at, $at, 0xfd0 /* 17ABE8 8024C308 4481B000 */ mtc1 $at, $f22 -/* 17ABEC 8024C30C 00000000 */ nop +/* 17ABEC 8024C30C 00000000 */ nop /* 17ABF0 8024C310 46166302 */ mul.s $f12, $f12, $f22 -/* 17ABF4 8024C314 00000000 */ nop +/* 17ABF4 8024C314 00000000 */ nop /* 17ABF8 8024C318 3C013F00 */ lui $at, 0x3f00 /* 17ABFC 8024C31C 4481A000 */ mtc1 $at, $f20 -/* 17AC00 8024C320 00000000 */ nop +/* 17AC00 8024C320 00000000 */ nop /* 17AC04 8024C324 46146302 */ mul.s $f12, $f12, $f20 /* 17AC08 8024C328 0C00A85B */ jal sin_rad -/* 17AC0C 8024C32C 00000000 */ nop +/* 17AC0C 8024C32C 00000000 */ nop /* 17AC10 8024C330 46160002 */ mul.s $f0, $f0, $f22 -/* 17AC14 8024C334 00000000 */ nop +/* 17AC14 8024C334 00000000 */ nop /* 17AC18 8024C338 46140302 */ mul.s $f12, $f0, $f20 /* 17AC1C 8024C33C 0C00A85B */ jal sin_rad -/* 17AC20 8024C340 00000000 */ nop +/* 17AC20 8024C340 00000000 */ nop /* 17AC24 8024C344 46160002 */ mul.s $f0, $f0, $f22 -/* 17AC28 8024C348 00000000 */ nop +/* 17AC28 8024C348 00000000 */ nop /* 17AC2C 8024C34C 46140302 */ mul.s $f12, $f0, $f20 /* 17AC30 8024C350 0C00A85B */ jal sin_rad -/* 17AC34 8024C354 00000000 */ nop +/* 17AC34 8024C354 00000000 */ nop /* 17AC38 8024C358 080930E3 */ j .L8024C38C /* 17AC3C 8024C35C 4600C101 */ sub.s $f4, $f24, $f0 .L8024C360: @@ -131,79 +131,79 @@ glabel func_8024C180 /* 17AC48 8024C368 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 17AC4C 8024C36C 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 17AC50 8024C370 44822000 */ mtc1 $v0, $f4 -/* 17AC54 8024C374 00000000 */ nop +/* 17AC54 8024C374 00000000 */ nop /* 17AC58 8024C378 46802120 */ cvt.s.w $f4, $f4 /* 17AC5C 8024C37C 44830000 */ mtc1 $v1, $f0 -/* 17AC60 8024C380 00000000 */ nop +/* 17AC60 8024C380 00000000 */ nop /* 17AC64 8024C384 46800020 */ cvt.s.w $f0, $f0 /* 17AC68 8024C388 46002103 */ div.s $f4, $f4, $f0 .L8024C38C: /* 17AC6C 8024C38C 3C01802A */ lui $at, %hi(D_8029F2A8) /* 17AC70 8024C390 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) /* 17AC74 8024C394 4604A502 */ mul.s $f20, $f20, $f4 -/* 17AC78 8024C398 00000000 */ nop +/* 17AC78 8024C398 00000000 */ nop /* 17AC7C 8024C39C 3C01802A */ lui $at, %hi(D_8029F2AC) /* 17AC80 8024C3A0 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) /* 17AC84 8024C3A4 46049482 */ mul.s $f18, $f18, $f4 -/* 17AC88 8024C3A8 00000000 */ nop +/* 17AC88 8024C3A8 00000000 */ nop /* 17AC8C 8024C3AC 3C01802A */ lui $at, %hi(D_8029F2B0) /* 17AC90 8024C3B0 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) /* 17AC94 8024C3B4 46048402 */ mul.s $f16, $f16, $f4 -/* 17AC98 8024C3B8 00000000 */ nop +/* 17AC98 8024C3B8 00000000 */ nop /* 17AC9C 8024C3BC 3C01802A */ lui $at, %hi(D_8029F298) /* 17ACA0 8024C3C0 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) /* 17ACA4 8024C3C4 46043182 */ mul.s $f6, $f6, $f4 -/* 17ACA8 8024C3C8 00000000 */ nop +/* 17ACA8 8024C3C8 00000000 */ nop /* 17ACAC 8024C3CC 3C01802A */ lui $at, %hi(D_8029F28C) /* 17ACB0 8024C3D0 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) /* 17ACB4 8024C3D4 46046302 */ mul.s $f12, $f12, $f4 -/* 17ACB8 8024C3D8 00000000 */ nop +/* 17ACB8 8024C3D8 00000000 */ nop /* 17ACBC 8024C3DC 3C01802A */ lui $at, %hi(D_8029F290) /* 17ACC0 8024C3E0 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 17ACC4 8024C3E4 46044202 */ mul.s $f8, $f8, $f4 -/* 17ACC8 8024C3E8 00000000 */ nop +/* 17ACC8 8024C3E8 00000000 */ nop /* 17ACCC 8024C3EC 3C013F80 */ lui $at, 0x3f80 /* 17ACD0 8024C3F0 44811000 */ mtc1 $at, $f2 -/* 17ACD4 8024C3F4 00000000 */ nop +/* 17ACD4 8024C3F4 00000000 */ nop /* 17ACD8 8024C3F8 46041081 */ sub.s $f2, $f2, $f4 /* 17ACDC 8024C3FC 4602D682 */ mul.s $f26, $f26, $f2 -/* 17ACE0 8024C400 00000000 */ nop +/* 17ACE0 8024C400 00000000 */ nop /* 17ACE4 8024C404 C7BC0010 */ lwc1 $f28, 0x10($sp) /* 17ACE8 8024C408 4602E602 */ mul.s $f24, $f28, $f2 -/* 17ACEC 8024C40C 00000000 */ nop +/* 17ACEC 8024C40C 00000000 */ nop /* 17ACF0 8024C410 3C02802A */ lui $v0, %hi(D_8029F286) /* 17ACF4 8024C414 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 17ACF8 8024C418 44820000 */ mtc1 $v0, $f0 -/* 17ACFC 8024C41C 00000000 */ nop +/* 17ACFC 8024C41C 00000000 */ nop /* 17AD00 8024C420 46800020 */ cvt.s.w $f0, $f0 /* 17AD04 8024C424 46020002 */ mul.s $f0, $f0, $f2 -/* 17AD08 8024C428 00000000 */ nop +/* 17AD08 8024C428 00000000 */ nop /* 17AD0C 8024C42C 4602F582 */ mul.s $f22, $f30, $f2 -/* 17AD10 8024C430 00000000 */ nop +/* 17AD10 8024C430 00000000 */ nop /* 17AD14 8024C434 3C02802A */ lui $v0, %hi(D_8029F280) /* 17AD18 8024C438 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 17AD1C 8024C43C 44827000 */ mtc1 $v0, $f14 -/* 17AD20 8024C440 00000000 */ nop +/* 17AD20 8024C440 00000000 */ nop /* 17AD24 8024C444 468073A0 */ cvt.s.w $f14, $f14 /* 17AD28 8024C448 46027382 */ mul.s $f14, $f14, $f2 -/* 17AD2C 8024C44C 00000000 */ nop +/* 17AD2C 8024C44C 00000000 */ nop /* 17AD30 8024C450 3C02802A */ lui $v0, %hi(D_8029F282) /* 17AD34 8024C454 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 17AD38 8024C458 44825000 */ mtc1 $v0, $f10 -/* 17AD3C 8024C45C 00000000 */ nop +/* 17AD3C 8024C45C 00000000 */ nop /* 17AD40 8024C460 468052A0 */ cvt.s.w $f10, $f10 /* 17AD44 8024C464 46025282 */ mul.s $f10, $f10, $f2 -/* 17AD48 8024C468 00000000 */ nop +/* 17AD48 8024C468 00000000 */ nop /* 17AD4C 8024C46C 46003180 */ add.s $f6, $f6, $f0 /* 17AD50 8024C470 3C014380 */ lui $at, 0x4380 /* 17AD54 8024C474 44810000 */ mtc1 $at, $f0 -/* 17AD58 8024C478 00000000 */ nop +/* 17AD58 8024C478 00000000 */ nop /* 17AD5C 8024C47C 46003182 */ mul.s $f6, $f6, $f0 -/* 17AD60 8024C480 00000000 */ nop +/* 17AD60 8024C480 00000000 */ nop /* 17AD64 8024C484 3C01802A */ lui $at, %hi(D_8029F294) /* 17AD68 8024C488 C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) /* 17AD6C 8024C48C 46040002 */ mul.s $f0, $f0, $f4 -/* 17AD70 8024C490 00000000 */ nop +/* 17AD70 8024C490 00000000 */ nop /* 17AD74 8024C494 461AA500 */ add.s $f20, $f20, $f26 /* 17AD78 8024C498 46189480 */ add.s $f18, $f18, $f24 /* 17AD7C 8024C49C 46168400 */ add.s $f16, $f16, $f22 @@ -215,28 +215,28 @@ glabel func_8024C180 /* 17AD94 8024C4B4 460A4200 */ add.s $f8, $f8, $f10 /* 17AD98 8024C4B8 E6140054 */ swc1 $f20, 0x54($s0) /* 17AD9C 8024C4BC 44822000 */ mtc1 $v0, $f4 -/* 17ADA0 8024C4C0 00000000 */ nop +/* 17ADA0 8024C4C0 00000000 */ nop /* 17ADA4 8024C4C4 46802120 */ cvt.s.w $f4, $f4 /* 17ADA8 8024C4C8 46022102 */ mul.s $f4, $f4, $f2 -/* 17ADAC 8024C4CC 00000000 */ nop +/* 17ADAC 8024C4CC 00000000 */ nop /* 17ADB0 8024C4D0 E6120058 */ swc1 $f18, 0x58($s0) /* 17ADB4 8024C4D4 E610005C */ swc1 $f16, 0x5c($s0) /* 17ADB8 8024C4D8 4600670D */ trunc.w.s $f28, $f12 /* 17ADBC 8024C4DC 4402E000 */ mfc1 $v0, $f28 -/* 17ADC0 8024C4E0 00000000 */ nop +/* 17ADC0 8024C4E0 00000000 */ nop /* 17ADC4 8024C4E4 A602001E */ sh $v0, 0x1e($s0) /* 17ADC8 8024C4E8 46040000 */ add.s $f0, $f0, $f4 /* 17ADCC 8024C4EC 4600470D */ trunc.w.s $f28, $f8 /* 17ADD0 8024C4F0 4402E000 */ mfc1 $v0, $f28 -/* 17ADD4 8024C4F4 00000000 */ nop +/* 17ADD4 8024C4F4 00000000 */ nop /* 17ADD8 8024C4F8 A6020024 */ sh $v0, 0x24($s0) /* 17ADDC 8024C4FC 4600070D */ trunc.w.s $f28, $f0 /* 17ADE0 8024C500 4402E000 */ mfc1 $v0, $f28 -/* 17ADE4 8024C504 00000000 */ nop +/* 17ADE4 8024C504 00000000 */ nop /* 17ADE8 8024C508 A6020022 */ sh $v0, 0x22($s0) /* 17ADEC 8024C50C 4600370D */ trunc.w.s $f28, $f6 /* 17ADF0 8024C510 4402E000 */ mfc1 $v0, $f28 -/* 17ADF4 8024C514 00000000 */ nop +/* 17ADF4 8024C514 00000000 */ nop /* 17ADF8 8024C518 A6020026 */ sh $v0, 0x26($s0) /* 17ADFC 8024C51C 84820000 */ lh $v0, ($a0) /* 17AE00 8024C520 94830000 */ lhu $v1, ($a0) @@ -246,7 +246,7 @@ glabel func_8024C180 /* 17AE10 8024C530 3C01802A */ lui $at, %hi(D_8029F29C) /* 17AE14 8024C534 A022F29C */ sb $v0, %lo(D_8029F29C)($at) /* 17AE18 8024C538 08093151 */ j .L8024C544 -/* 17AE1C 8024C53C 00000000 */ nop +/* 17AE1C 8024C53C 00000000 */ nop .L8024C540: /* 17AE20 8024C540 A4820000 */ sh $v0, ($a0) .L8024C544: diff --git a/asm/nonmatchings/code_1776B0/func_8024C570.s b/asm/nonmatchings/code_1776B0/func_8024C570.s index defa85a875..49213b3fc6 100644 --- a/asm/nonmatchings/code_1776B0/func_8024C570.s +++ b/asm/nonmatchings/code_1776B0/func_8024C570.s @@ -17,7 +17,7 @@ glabel func_8024C570 /* 17AE80 8024C5A0 3C02802A */ lui $v0, %hi(D_8029F2A4) /* 17AE84 8024C5A4 8042F2A4 */ lb $v0, %lo(D_8029F2A4)($v0) /* 17AE88 8024C5A8 1040000A */ beqz $v0, .L8024C5D4 -/* 17AE8C 8024C5AC 00000000 */ nop +/* 17AE8C 8024C5AC 00000000 */ nop /* 17AE90 8024C5B0 C6000054 */ lwc1 $f0, 0x54($s0) /* 17AE94 8024C5B4 C6020058 */ lwc1 $f2, 0x58($s0) /* 17AE98 8024C5B8 C604005C */ lwc1 $f4, 0x5c($s0) @@ -32,18 +32,18 @@ glabel func_8024C570 /* 17AEB8 8024C5D8 86040026 */ lh $a0, 0x26($s0) /* 17AEBC 8024C5DC 86030024 */ lh $v1, 0x24($s0) /* 17AEC0 8024C5E0 44820000 */ mtc1 $v0, $f0 -/* 17AEC4 8024C5E4 00000000 */ nop +/* 17AEC4 8024C5E4 00000000 */ nop /* 17AEC8 8024C5E8 46800020 */ cvt.s.w $f0, $f0 /* 17AECC 8024C5EC 86020022 */ lh $v0, 0x22($s0) /* 17AED0 8024C5F0 3C01802A */ lui $at, %hi(D_8029F28C) /* 17AED4 8024C5F4 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 17AED8 8024C5F8 44820000 */ mtc1 $v0, $f0 -/* 17AEDC 8024C5FC 00000000 */ nop +/* 17AEDC 8024C5FC 00000000 */ nop /* 17AEE0 8024C600 46800020 */ cvt.s.w $f0, $f0 /* 17AEE4 8024C604 3C01802A */ lui $at, %hi(D_8029F294) /* 17AEE8 8024C608 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) /* 17AEEC 8024C60C 44830000 */ mtc1 $v1, $f0 -/* 17AEF0 8024C610 00000000 */ nop +/* 17AEF0 8024C610 00000000 */ nop /* 17AEF4 8024C614 46800020 */ cvt.s.w $f0, $f0 /* 17AEF8 8024C618 3C01802A */ lui $at, %hi(D_8029F290) /* 17AEFC 8024C61C E420F290 */ swc1 $f0, %lo(D_8029F290)($at) @@ -57,7 +57,7 @@ glabel func_8024C570 /* 17AF18 8024C638 3C03802A */ lui $v1, %hi(D_8029F29E) /* 17AF1C 8024C63C 9463F29E */ lhu $v1, %lo(D_8029F29E)($v1) /* 17AF20 8024C640 44820000 */ mtc1 $v0, $f0 -/* 17AF24 8024C644 00000000 */ nop +/* 17AF24 8024C644 00000000 */ nop /* 17AF28 8024C648 46800020 */ cvt.s.w $f0, $f0 /* 17AF2C 8024C64C 3C01802A */ lui $at, %hi(D_8029F298) /* 17AF30 8024C650 E420F298 */ swc1 $f0, %lo(D_8029F298)($at) @@ -87,35 +87,35 @@ glabel func_8024C570 /* 17AF8C 8024C6AC 3C013F80 */ lui $at, 0x3f80 /* 17AF90 8024C6B0 4481C000 */ mtc1 $at, $f24 /* 17AF94 8024C6B4 44822000 */ mtc1 $v0, $f4 -/* 17AF98 8024C6B8 00000000 */ nop +/* 17AF98 8024C6B8 00000000 */ nop /* 17AF9C 8024C6BC 46802120 */ cvt.s.w $f4, $f4 /* 17AFA0 8024C6C0 44830000 */ mtc1 $v1, $f0 -/* 17AFA4 8024C6C4 00000000 */ nop +/* 17AFA4 8024C6C4 00000000 */ nop /* 17AFA8 8024C6C8 46800020 */ cvt.s.w $f0, $f0 /* 17AFAC 8024C6CC 46002103 */ div.s $f4, $f4, $f0 /* 17AFB0 8024C6D0 4604C301 */ sub.s $f12, $f24, $f4 /* 17AFB4 8024C6D4 3C014049 */ lui $at, 0x4049 /* 17AFB8 8024C6D8 34210FD0 */ ori $at, $at, 0xfd0 /* 17AFBC 8024C6DC 4481B000 */ mtc1 $at, $f22 -/* 17AFC0 8024C6E0 00000000 */ nop +/* 17AFC0 8024C6E0 00000000 */ nop /* 17AFC4 8024C6E4 46166302 */ mul.s $f12, $f12, $f22 -/* 17AFC8 8024C6E8 00000000 */ nop +/* 17AFC8 8024C6E8 00000000 */ nop /* 17AFCC 8024C6EC 3C013F00 */ lui $at, 0x3f00 /* 17AFD0 8024C6F0 4481A000 */ mtc1 $at, $f20 -/* 17AFD4 8024C6F4 00000000 */ nop +/* 17AFD4 8024C6F4 00000000 */ nop /* 17AFD8 8024C6F8 46146302 */ mul.s $f12, $f12, $f20 /* 17AFDC 8024C6FC 0C00A85B */ jal sin_rad -/* 17AFE0 8024C700 00000000 */ nop +/* 17AFE0 8024C700 00000000 */ nop /* 17AFE4 8024C704 46160002 */ mul.s $f0, $f0, $f22 -/* 17AFE8 8024C708 00000000 */ nop +/* 17AFE8 8024C708 00000000 */ nop /* 17AFEC 8024C70C 46140302 */ mul.s $f12, $f0, $f20 /* 17AFF0 8024C710 0C00A85B */ jal sin_rad -/* 17AFF4 8024C714 00000000 */ nop +/* 17AFF4 8024C714 00000000 */ nop /* 17AFF8 8024C718 46160002 */ mul.s $f0, $f0, $f22 -/* 17AFFC 8024C71C 00000000 */ nop +/* 17AFFC 8024C71C 00000000 */ nop /* 17B000 8024C720 46140302 */ mul.s $f12, $f0, $f20 /* 17B004 8024C724 0C00A85B */ jal sin_rad -/* 17B008 8024C728 00000000 */ nop +/* 17B008 8024C728 00000000 */ nop /* 17B00C 8024C72C 080931D8 */ j .L8024C760 /* 17B010 8024C730 4600C101 */ sub.s $f4, $f24, $f0 .L8024C734: @@ -124,79 +124,79 @@ glabel func_8024C570 /* 17B01C 8024C73C 3C03802A */ lui $v1, %hi(D_8029F2A0) /* 17B020 8024C740 8463F2A0 */ lh $v1, %lo(D_8029F2A0)($v1) /* 17B024 8024C744 44822000 */ mtc1 $v0, $f4 -/* 17B028 8024C748 00000000 */ nop +/* 17B028 8024C748 00000000 */ nop /* 17B02C 8024C74C 46802120 */ cvt.s.w $f4, $f4 /* 17B030 8024C750 44830000 */ mtc1 $v1, $f0 -/* 17B034 8024C754 00000000 */ nop +/* 17B034 8024C754 00000000 */ nop /* 17B038 8024C758 46800020 */ cvt.s.w $f0, $f0 /* 17B03C 8024C75C 46002103 */ div.s $f4, $f4, $f0 .L8024C760: /* 17B040 8024C760 3C01802A */ lui $at, %hi(D_8029F2A8) /* 17B044 8024C764 C434F2A8 */ lwc1 $f20, %lo(D_8029F2A8)($at) /* 17B048 8024C768 4604A502 */ mul.s $f20, $f20, $f4 -/* 17B04C 8024C76C 00000000 */ nop +/* 17B04C 8024C76C 00000000 */ nop /* 17B050 8024C770 3C01802A */ lui $at, %hi(D_8029F2AC) /* 17B054 8024C774 C432F2AC */ lwc1 $f18, %lo(D_8029F2AC)($at) /* 17B058 8024C778 46049482 */ mul.s $f18, $f18, $f4 -/* 17B05C 8024C77C 00000000 */ nop +/* 17B05C 8024C77C 00000000 */ nop /* 17B060 8024C780 3C01802A */ lui $at, %hi(D_8029F2B0) /* 17B064 8024C784 C430F2B0 */ lwc1 $f16, %lo(D_8029F2B0)($at) /* 17B068 8024C788 46048402 */ mul.s $f16, $f16, $f4 -/* 17B06C 8024C78C 00000000 */ nop +/* 17B06C 8024C78C 00000000 */ nop /* 17B070 8024C790 3C01802A */ lui $at, %hi(D_8029F298) /* 17B074 8024C794 C426F298 */ lwc1 $f6, %lo(D_8029F298)($at) /* 17B078 8024C798 46043182 */ mul.s $f6, $f6, $f4 -/* 17B07C 8024C79C 00000000 */ nop +/* 17B07C 8024C79C 00000000 */ nop /* 17B080 8024C7A0 3C01802A */ lui $at, %hi(D_8029F28C) /* 17B084 8024C7A4 C42CF28C */ lwc1 $f12, %lo(D_8029F28C)($at) /* 17B088 8024C7A8 46046302 */ mul.s $f12, $f12, $f4 -/* 17B08C 8024C7AC 00000000 */ nop +/* 17B08C 8024C7AC 00000000 */ nop /* 17B090 8024C7B0 3C01802A */ lui $at, %hi(D_8029F290) /* 17B094 8024C7B4 C428F290 */ lwc1 $f8, %lo(D_8029F290)($at) /* 17B098 8024C7B8 46044202 */ mul.s $f8, $f8, $f4 -/* 17B09C 8024C7BC 00000000 */ nop +/* 17B09C 8024C7BC 00000000 */ nop /* 17B0A0 8024C7C0 3C013F80 */ lui $at, 0x3f80 /* 17B0A4 8024C7C4 44811000 */ mtc1 $at, $f2 -/* 17B0A8 8024C7C8 00000000 */ nop +/* 17B0A8 8024C7C8 00000000 */ nop /* 17B0AC 8024C7CC 46041081 */ sub.s $f2, $f2, $f4 /* 17B0B0 8024C7D0 4602D682 */ mul.s $f26, $f26, $f2 -/* 17B0B4 8024C7D4 00000000 */ nop +/* 17B0B4 8024C7D4 00000000 */ nop /* 17B0B8 8024C7D8 C7BC0010 */ lwc1 $f28, 0x10($sp) /* 17B0BC 8024C7DC 4602E602 */ mul.s $f24, $f28, $f2 -/* 17B0C0 8024C7E0 00000000 */ nop +/* 17B0C0 8024C7E0 00000000 */ nop /* 17B0C4 8024C7E4 3C02802A */ lui $v0, %hi(D_8029F286) /* 17B0C8 8024C7E8 8442F286 */ lh $v0, %lo(D_8029F286)($v0) /* 17B0CC 8024C7EC 44820000 */ mtc1 $v0, $f0 -/* 17B0D0 8024C7F0 00000000 */ nop +/* 17B0D0 8024C7F0 00000000 */ nop /* 17B0D4 8024C7F4 46800020 */ cvt.s.w $f0, $f0 /* 17B0D8 8024C7F8 46020002 */ mul.s $f0, $f0, $f2 -/* 17B0DC 8024C7FC 00000000 */ nop +/* 17B0DC 8024C7FC 00000000 */ nop /* 17B0E0 8024C800 4602F582 */ mul.s $f22, $f30, $f2 -/* 17B0E4 8024C804 00000000 */ nop +/* 17B0E4 8024C804 00000000 */ nop /* 17B0E8 8024C808 3C02802A */ lui $v0, %hi(D_8029F280) /* 17B0EC 8024C80C 8442F280 */ lh $v0, %lo(D_8029F280)($v0) /* 17B0F0 8024C810 44827000 */ mtc1 $v0, $f14 -/* 17B0F4 8024C814 00000000 */ nop +/* 17B0F4 8024C814 00000000 */ nop /* 17B0F8 8024C818 468073A0 */ cvt.s.w $f14, $f14 /* 17B0FC 8024C81C 46027382 */ mul.s $f14, $f14, $f2 -/* 17B100 8024C820 00000000 */ nop +/* 17B100 8024C820 00000000 */ nop /* 17B104 8024C824 3C02802A */ lui $v0, %hi(D_8029F282) /* 17B108 8024C828 8442F282 */ lh $v0, %lo(D_8029F282)($v0) /* 17B10C 8024C82C 44825000 */ mtc1 $v0, $f10 -/* 17B110 8024C830 00000000 */ nop +/* 17B110 8024C830 00000000 */ nop /* 17B114 8024C834 468052A0 */ cvt.s.w $f10, $f10 /* 17B118 8024C838 46025282 */ mul.s $f10, $f10, $f2 -/* 17B11C 8024C83C 00000000 */ nop +/* 17B11C 8024C83C 00000000 */ nop /* 17B120 8024C840 46003180 */ add.s $f6, $f6, $f0 /* 17B124 8024C844 3C014380 */ lui $at, 0x4380 /* 17B128 8024C848 44810000 */ mtc1 $at, $f0 -/* 17B12C 8024C84C 00000000 */ nop +/* 17B12C 8024C84C 00000000 */ nop /* 17B130 8024C850 46003182 */ mul.s $f6, $f6, $f0 -/* 17B134 8024C854 00000000 */ nop +/* 17B134 8024C854 00000000 */ nop /* 17B138 8024C858 3C01802A */ lui $at, %hi(D_8029F294) /* 17B13C 8024C85C C420F294 */ lwc1 $f0, %lo(D_8029F294)($at) /* 17B140 8024C860 46040002 */ mul.s $f0, $f0, $f4 -/* 17B144 8024C864 00000000 */ nop +/* 17B144 8024C864 00000000 */ nop /* 17B148 8024C868 461AA500 */ add.s $f20, $f20, $f26 /* 17B14C 8024C86C 46189480 */ add.s $f18, $f18, $f24 /* 17B150 8024C870 46168400 */ add.s $f16, $f16, $f22 @@ -208,28 +208,28 @@ glabel func_8024C570 /* 17B168 8024C888 460A4200 */ add.s $f8, $f8, $f10 /* 17B16C 8024C88C E6140054 */ swc1 $f20, 0x54($s0) /* 17B170 8024C890 44822000 */ mtc1 $v0, $f4 -/* 17B174 8024C894 00000000 */ nop +/* 17B174 8024C894 00000000 */ nop /* 17B178 8024C898 46802120 */ cvt.s.w $f4, $f4 /* 17B17C 8024C89C 46022102 */ mul.s $f4, $f4, $f2 -/* 17B180 8024C8A0 00000000 */ nop +/* 17B180 8024C8A0 00000000 */ nop /* 17B184 8024C8A4 E6120058 */ swc1 $f18, 0x58($s0) /* 17B188 8024C8A8 E610005C */ swc1 $f16, 0x5c($s0) /* 17B18C 8024C8AC 4600670D */ trunc.w.s $f28, $f12 /* 17B190 8024C8B0 4402E000 */ mfc1 $v0, $f28 -/* 17B194 8024C8B4 00000000 */ nop +/* 17B194 8024C8B4 00000000 */ nop /* 17B198 8024C8B8 A602001E */ sh $v0, 0x1e($s0) /* 17B19C 8024C8BC 46040000 */ add.s $f0, $f0, $f4 /* 17B1A0 8024C8C0 4600470D */ trunc.w.s $f28, $f8 /* 17B1A4 8024C8C4 4402E000 */ mfc1 $v0, $f28 -/* 17B1A8 8024C8C8 00000000 */ nop +/* 17B1A8 8024C8C8 00000000 */ nop /* 17B1AC 8024C8CC A6020024 */ sh $v0, 0x24($s0) /* 17B1B0 8024C8D0 4600070D */ trunc.w.s $f28, $f0 /* 17B1B4 8024C8D4 4402E000 */ mfc1 $v0, $f28 -/* 17B1B8 8024C8D8 00000000 */ nop +/* 17B1B8 8024C8D8 00000000 */ nop /* 17B1BC 8024C8DC A6020022 */ sh $v0, 0x22($s0) /* 17B1C0 8024C8E0 4600370D */ trunc.w.s $f28, $f6 /* 17B1C4 8024C8E4 4402E000 */ mfc1 $v0, $f28 -/* 17B1C8 8024C8E8 00000000 */ nop +/* 17B1C8 8024C8E8 00000000 */ nop /* 17B1CC 8024C8EC A6020026 */ sh $v0, 0x26($s0) /* 17B1D0 8024C8F0 84820000 */ lh $v0, ($a0) /* 17B1D4 8024C8F4 94830000 */ lhu $v1, ($a0) @@ -239,7 +239,7 @@ glabel func_8024C570 /* 17B1E4 8024C904 3C01802A */ lui $at, %hi(D_8029F29C) /* 17B1E8 8024C908 A022F29C */ sb $v0, %lo(D_8029F29C)($at) /* 17B1EC 8024C90C 08093246 */ j .L8024C918 -/* 17B1F0 8024C910 00000000 */ nop +/* 17B1F0 8024C910 00000000 */ nop .L8024C914: /* 17B1F4 8024C914 A4820000 */ sh $v0, ($a0) .L8024C918: diff --git a/asm/nonmatchings/code_1776B0/func_8024C944.s b/asm/nonmatchings/code_1776B0/func_8024C944.s index 6d9202f92e..c946eb0c71 100644 --- a/asm/nonmatchings/code_1776B0/func_8024C944.s +++ b/asm/nonmatchings/code_1776B0/func_8024C944.s @@ -19,7 +19,7 @@ glabel func_8024C944 /* 17B25C 8024C97C 3C01802A */ lui $at, %hi(D_8029F270) /* 17B260 8024C980 E420F270 */ swc1 $f0, %lo(D_8029F270)($at) /* 17B264 8024C984 44820000 */ mtc1 $v0, $f0 -/* 17B268 8024C988 00000000 */ nop +/* 17B268 8024C988 00000000 */ nop /* 17B26C 8024C98C 46800020 */ cvt.s.w $f0, $f0 /* 17B270 8024C990 86020024 */ lh $v0, 0x24($s0) /* 17B274 8024C994 3C01802A */ lui $at, %hi(D_8029F274) @@ -29,12 +29,12 @@ glabel func_8024C944 /* 17B284 8024C9A4 3C01802A */ lui $at, %hi(D_8029F288) /* 17B288 8024C9A8 E420F288 */ swc1 $f0, %lo(D_8029F288)($at) /* 17B28C 8024C9AC 44820000 */ mtc1 $v0, $f0 -/* 17B290 8024C9B0 00000000 */ nop +/* 17B290 8024C9B0 00000000 */ nop /* 17B294 8024C9B4 46800020 */ cvt.s.w $f0, $f0 /* 17B298 8024C9B8 3C01802A */ lui $at, %hi(D_8029F290) /* 17B29C 8024C9BC E420F290 */ swc1 $f0, %lo(D_8029F290)($at) /* 17B2A0 8024C9C0 44830000 */ mtc1 $v1, $f0 -/* 17B2A4 8024C9C4 00000000 */ nop +/* 17B2A4 8024C9C4 00000000 */ nop /* 17B2A8 8024C9C8 46800020 */ cvt.s.w $f0, $f0 /* 17B2AC 8024C9CC 3C01802A */ lui $at, %hi(D_8029F294) /* 17B2B0 8024C9D0 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) @@ -72,14 +72,14 @@ glabel func_8024C944 /* 17B324 8024CA44 00621821 */ addu $v1, $v1, $v0 /* 17B328 8024CA48 00031843 */ sra $v1, $v1, 1 /* 17B32C 8024CA4C 44830000 */ mtc1 $v1, $f0 -/* 17B330 8024CA50 00000000 */ nop +/* 17B330 8024CA50 00000000 */ nop /* 17B334 8024CA54 46800020 */ cvt.s.w $f0, $f0 /* 17B338 8024CA58 080932A1 */ j .L8024CA84 /* 17B33C 8024CA5C 46001500 */ add.s $f20, $f2, $f0 .L8024CA60: /* 17B340 8024CA60 8CC600DC */ lw $a2, 0xdc($a2) /* 17B344 8024CA64 0809329E */ j .L8024CA78 -/* 17B348 8024CA68 00000000 */ nop +/* 17B348 8024CA68 00000000 */ nop .L8024CA6C: /* 17B34C 8024CA6C 00041080 */ sll $v0, $a0, 2 /* 17B350 8024CA70 00461021 */ addu $v0, $v0, $a2 @@ -106,16 +106,16 @@ glabel func_8024C944 /* 17B398 8024CAB8 8FA20024 */ lw $v0, 0x24($sp) /* 17B39C 8024CABC 28420064 */ slti $v0, $v0, 0x64 /* 17B3A0 8024CAC0 10400005 */ beqz $v0, .L8024CAD8 -/* 17B3A4 8024CAC4 00000000 */ nop +/* 17B3A4 8024CAC4 00000000 */ nop /* 17B3A8 8024CAC8 3C0141C8 */ lui $at, 0x41c8 /* 17B3AC 8024CACC 44810000 */ mtc1 $at, $f0 -/* 17B3B0 8024CAD0 00000000 */ nop +/* 17B3B0 8024CAD0 00000000 */ nop /* 17B3B4 8024CAD4 4600A500 */ add.s $f20, $f20, $f0 .L8024CAD8: /* 17B3B8 8024CAD8 3C01802A */ lui $at, %hi(D_8029F274) /* 17B3BC 8024CADC C420F274 */ lwc1 $f0, %lo(D_8029F274)($at) /* 17B3C0 8024CAE0 4600A03C */ c.lt.s $f20, $f0 -/* 17B3C4 8024CAE4 00000000 */ nop +/* 17B3C4 8024CAE4 00000000 */ nop /* 17B3C8 8024CAE8 45030001 */ bc1tl .L8024CAF0 /* 17B3CC 8024CAEC 46000506 */ mov.s $f20, $f0 .L8024CAF0: @@ -126,13 +126,13 @@ glabel func_8024C944 /* 17B3E0 8024CB00 46002005 */ abs.s $f0, $f4 /* 17B3E4 8024CB04 46000021 */ cvt.d.s $f0, $f0 /* 17B3E8 8024CB08 4622003C */ c.lt.d $f0, $f2 -/* 17B3EC 8024CB0C 00000000 */ nop +/* 17B3EC 8024CB0C 00000000 */ nop /* 17B3F0 8024CB10 45000009 */ bc1f .L8024CB38 -/* 17B3F4 8024CB14 00000000 */ nop +/* 17B3F4 8024CB14 00000000 */ nop /* 17B3F8 8024CB18 44800000 */ mtc1 $zero, $f0 -/* 17B3FC 8024CB1C 00000000 */ nop +/* 17B3FC 8024CB1C 00000000 */ nop /* 17B400 8024CB20 46002032 */ c.eq.s $f4, $f0 -/* 17B404 8024CB24 00000000 */ nop +/* 17B404 8024CB24 00000000 */ nop /* 17B408 8024CB28 45020009 */ bc1fl .L8024CB50 /* 17B40C 8024CB2C E6140058 */ swc1 $f20, 0x58($s0) /* 17B410 8024CB30 080932D5 */ j .L8024CB54 @@ -140,7 +140,7 @@ glabel func_8024C944 .L8024CB38: /* 17B418 8024CB38 3C0140A0 */ lui $at, 0x40a0 /* 17B41C 8024CB3C 44810000 */ mtc1 $at, $f0 -/* 17B420 8024CB40 00000000 */ nop +/* 17B420 8024CB40 00000000 */ nop /* 17B424 8024CB44 46002003 */ div.s $f0, $f4, $f0 /* 17B428 8024CB48 46003000 */ add.s $f0, $f6, $f0 /* 17B42C 8024CB4C E6000058 */ swc1 $f0, 0x58($s0) diff --git a/asm/nonmatchings/code_1776B0/func_8024CB68.s b/asm/nonmatchings/code_1776B0/func_8024CB68.s index c00b0835e5..b01e4cf5e6 100644 --- a/asm/nonmatchings/code_1776B0/func_8024CB68.s +++ b/asm/nonmatchings/code_1776B0/func_8024CB68.s @@ -38,14 +38,14 @@ glabel func_8024CB68 /* 17B4CC 8024CBEC 00621821 */ addu $v1, $v1, $v0 /* 17B4D0 8024CBF0 00031843 */ sra $v1, $v1, 1 /* 17B4D4 8024CBF4 44830000 */ mtc1 $v1, $f0 -/* 17B4D8 8024CBF8 00000000 */ nop +/* 17B4D8 8024CBF8 00000000 */ nop /* 17B4DC 8024CBFC 46800020 */ cvt.s.w $f0, $f0 /* 17B4E0 8024CC00 0809330C */ j .L8024CC30 /* 17B4E4 8024CC04 46001580 */ add.s $f22, $f2, $f0 .L8024CC08: /* 17B4E8 8024CC08 8C8200DC */ lw $v0, 0xdc($a0) /* 17B4EC 8024CC0C 08093307 */ j .L8024CC1C -/* 17B4F0 8024CC10 00000000 */ nop +/* 17B4F0 8024CC10 00000000 */ nop .L8024CC14: /* 17B4F4 8024CC14 00821021 */ addu $v0, $a0, $v0 .L8024CC18: @@ -67,7 +67,7 @@ glabel func_8024CB68 /* 17B52C 8024CC4C 3C01802A */ lui $at, %hi(D_8029F270) /* 17B530 8024CC50 E420F270 */ swc1 $f0, %lo(D_8029F270)($at) /* 17B534 8024CC54 44820000 */ mtc1 $v0, $f0 -/* 17B538 8024CC58 00000000 */ nop +/* 17B538 8024CC58 00000000 */ nop /* 17B53C 8024CC5C 46800020 */ cvt.s.w $f0, $f0 /* 17B540 8024CC60 86020024 */ lh $v0, 0x24($s0) /* 17B544 8024CC64 3C01802A */ lui $at, %hi(D_8029F274) @@ -77,12 +77,12 @@ glabel func_8024CB68 /* 17B554 8024CC74 3C01802A */ lui $at, %hi(D_8029F288) /* 17B558 8024CC78 E420F288 */ swc1 $f0, %lo(D_8029F288)($at) /* 17B55C 8024CC7C 44820000 */ mtc1 $v0, $f0 -/* 17B560 8024CC80 00000000 */ nop +/* 17B560 8024CC80 00000000 */ nop /* 17B564 8024CC84 46800020 */ cvt.s.w $f0, $f0 /* 17B568 8024CC88 3C01802A */ lui $at, %hi(D_8029F290) /* 17B56C 8024CC8C E420F290 */ swc1 $f0, %lo(D_8029F290)($at) /* 17B570 8024CC90 44830000 */ mtc1 $v1, $f0 -/* 17B574 8024CC94 00000000 */ nop +/* 17B574 8024CC94 00000000 */ nop /* 17B578 8024CC98 46800020 */ cvt.s.w $f0, $f0 /* 17B57C 8024CC9C 3C01802A */ lui $at, %hi(D_8029F294) /* 17B580 8024CCA0 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) @@ -101,41 +101,41 @@ glabel func_8024CB68 /* 17B5B0 8024CCD0 8FA20024 */ lw $v0, 0x24($sp) /* 17B5B4 8024CCD4 28420064 */ slti $v0, $v0, 0x64 /* 17B5B8 8024CCD8 10400005 */ beqz $v0, .L8024CCF0 -/* 17B5BC 8024CCDC 00000000 */ nop +/* 17B5BC 8024CCDC 00000000 */ nop /* 17B5C0 8024CCE0 3C0141C8 */ lui $at, 0x41c8 /* 17B5C4 8024CCE4 44810000 */ mtc1 $at, $f0 -/* 17B5C8 8024CCE8 00000000 */ nop +/* 17B5C8 8024CCE8 00000000 */ nop /* 17B5CC 8024CCEC 4600B580 */ add.s $f22, $f22, $f0 .L8024CCF0: /* 17B5D0 8024CCF0 3C01802A */ lui $at, %hi(D_8029F274) /* 17B5D4 8024CCF4 C420F274 */ lwc1 $f0, %lo(D_8029F274)($at) /* 17B5D8 8024CCF8 4600B03C */ c.lt.s $f22, $f0 -/* 17B5DC 8024CCFC 00000000 */ nop +/* 17B5DC 8024CCFC 00000000 */ nop /* 17B5E0 8024CD00 45030001 */ bc1tl .L8024CD08 /* 17B5E4 8024CD04 46000586 */ mov.s $f22, $f0 .L8024CD08: /* 17B5E8 8024CD08 8FA30020 */ lw $v1, 0x20($sp) /* 17B5EC 8024CD0C 28620064 */ slti $v0, $v1, 0x64 /* 17B5F0 8024CD10 10400005 */ beqz $v0, .L8024CD28 -/* 17B5F4 8024CD14 00000000 */ nop +/* 17B5F4 8024CD14 00000000 */ nop /* 17B5F8 8024CD18 3C0141C8 */ lui $at, 0x41c8 /* 17B5FC 8024CD1C 44810000 */ mtc1 $at, $f0 -/* 17B600 8024CD20 00000000 */ nop +/* 17B600 8024CD20 00000000 */ nop /* 17B604 8024CD24 4600A501 */ sub.s $f20, $f20, $f0 .L8024CD28: /* 17B608 8024CD28 3C01802A */ lui $at, %hi(D_8029F270) /* 17B60C 8024CD2C C420F270 */ lwc1 $f0, %lo(D_8029F270)($at) /* 17B610 8024CD30 4600A03C */ c.lt.s $f20, $f0 -/* 17B614 8024CD34 00000000 */ nop +/* 17B614 8024CD34 00000000 */ nop /* 17B618 8024CD38 45030001 */ bc1tl .L8024CD40 /* 17B61C 8024CD3C 46000506 */ mov.s $f20, $f0 .L8024CD40: /* 17B620 8024CD40 286200DD */ slti $v0, $v1, 0xdd /* 17B624 8024CD44 14400005 */ bnez $v0, .L8024CD5C -/* 17B628 8024CD48 00000000 */ nop +/* 17B628 8024CD48 00000000 */ nop /* 17B62C 8024CD4C 3C0141C8 */ lui $at, 0x41c8 /* 17B630 8024CD50 44810000 */ mtc1 $at, $f0 -/* 17B634 8024CD54 00000000 */ nop +/* 17B634 8024CD54 00000000 */ nop /* 17B638 8024CD58 4600A500 */ add.s $f20, $f20, $f0 .L8024CD5C: /* 17B63C 8024CD5C C6060054 */ lwc1 $f6, 0x54($s0) @@ -145,21 +145,21 @@ glabel func_8024CB68 /* 17B64C 8024CD6C 46002005 */ abs.s $f0, $f4 /* 17B650 8024CD70 46000021 */ cvt.d.s $f0, $f0 /* 17B654 8024CD74 4622003C */ c.lt.d $f0, $f2 -/* 17B658 8024CD78 00000000 */ nop +/* 17B658 8024CD78 00000000 */ nop /* 17B65C 8024CD7C 45000009 */ bc1f .L8024CDA4 -/* 17B660 8024CD80 00000000 */ nop +/* 17B660 8024CD80 00000000 */ nop /* 17B664 8024CD84 44800000 */ mtc1 $zero, $f0 -/* 17B668 8024CD88 00000000 */ nop +/* 17B668 8024CD88 00000000 */ nop /* 17B66C 8024CD8C 46002032 */ c.eq.s $f4, $f0 -/* 17B670 8024CD90 00000000 */ nop +/* 17B670 8024CD90 00000000 */ nop /* 17B674 8024CD94 45020009 */ bc1fl .L8024CDBC /* 17B678 8024CD98 E6140054 */ swc1 $f20, 0x54($s0) /* 17B67C 8024CD9C 0809336F */ j .L8024CDBC -/* 17B680 8024CDA0 00000000 */ nop +/* 17B680 8024CDA0 00000000 */ nop .L8024CDA4: /* 17B684 8024CDA4 3C0140A0 */ lui $at, 0x40a0 /* 17B688 8024CDA8 44810000 */ mtc1 $at, $f0 -/* 17B68C 8024CDAC 00000000 */ nop +/* 17B68C 8024CDAC 00000000 */ nop /* 17B690 8024CDB0 46002003 */ div.s $f0, $f4, $f0 /* 17B694 8024CDB4 46003000 */ add.s $f0, $f6, $f0 /* 17B698 8024CDB8 E6000054 */ swc1 $f0, 0x54($s0) @@ -171,21 +171,21 @@ glabel func_8024CB68 /* 17B6AC 8024CDCC 46002005 */ abs.s $f0, $f4 /* 17B6B0 8024CDD0 46000021 */ cvt.d.s $f0, $f0 /* 17B6B4 8024CDD4 4622003C */ c.lt.d $f0, $f2 -/* 17B6B8 8024CDD8 00000000 */ nop +/* 17B6B8 8024CDD8 00000000 */ nop /* 17B6BC 8024CDDC 45000009 */ bc1f .L8024CE04 -/* 17B6C0 8024CDE0 00000000 */ nop +/* 17B6C0 8024CDE0 00000000 */ nop /* 17B6C4 8024CDE4 44800000 */ mtc1 $zero, $f0 -/* 17B6C8 8024CDE8 00000000 */ nop +/* 17B6C8 8024CDE8 00000000 */ nop /* 17B6CC 8024CDEC 46002032 */ c.eq.s $f4, $f0 -/* 17B6D0 8024CDF0 00000000 */ nop +/* 17B6D0 8024CDF0 00000000 */ nop /* 17B6D4 8024CDF4 45020009 */ bc1fl .L8024CE1C /* 17B6D8 8024CDF8 E6160058 */ swc1 $f22, 0x58($s0) /* 17B6DC 8024CDFC 08093387 */ j .L8024CE1C -/* 17B6E0 8024CE00 00000000 */ nop +/* 17B6E0 8024CE00 00000000 */ nop .L8024CE04: /* 17B6E4 8024CE04 3C0140A0 */ lui $at, 0x40a0 /* 17B6E8 8024CE08 44810000 */ mtc1 $at, $f0 -/* 17B6EC 8024CE0C 00000000 */ nop +/* 17B6EC 8024CE0C 00000000 */ nop /* 17B6F0 8024CE10 46002003 */ div.s $f0, $f4, $f0 /* 17B6F4 8024CE14 46003000 */ add.s $f0, $f6, $f0 /* 17B6F8 8024CE18 E6000058 */ swc1 $f0, 0x58($s0) @@ -197,13 +197,13 @@ glabel func_8024CB68 /* 17B70C 8024CE2C 46002005 */ abs.s $f0, $f4 /* 17B710 8024CE30 46000021 */ cvt.d.s $f0, $f0 /* 17B714 8024CE34 4622003C */ c.lt.d $f0, $f2 -/* 17B718 8024CE38 00000000 */ nop +/* 17B718 8024CE38 00000000 */ nop /* 17B71C 8024CE3C 45000009 */ bc1f .L8024CE64 -/* 17B720 8024CE40 00000000 */ nop +/* 17B720 8024CE40 00000000 */ nop /* 17B724 8024CE44 44800000 */ mtc1 $zero, $f0 -/* 17B728 8024CE48 00000000 */ nop +/* 17B728 8024CE48 00000000 */ nop /* 17B72C 8024CE4C 46002032 */ c.eq.s $f4, $f0 -/* 17B730 8024CE50 00000000 */ nop +/* 17B730 8024CE50 00000000 */ nop /* 17B734 8024CE54 45020009 */ bc1fl .L8024CE7C /* 17B738 8024CE58 E618005C */ swc1 $f24, 0x5c($s0) /* 17B73C 8024CE5C 080933A0 */ j .L8024CE80 @@ -211,7 +211,7 @@ glabel func_8024CB68 .L8024CE64: /* 17B744 8024CE64 3C0140A0 */ lui $at, 0x40a0 /* 17B748 8024CE68 44810000 */ mtc1 $at, $f0 -/* 17B74C 8024CE6C 00000000 */ nop +/* 17B74C 8024CE6C 00000000 */ nop /* 17B750 8024CE70 46002003 */ div.s $f0, $f4, $f0 /* 17B754 8024CE74 46003000 */ add.s $f0, $f6, $f0 /* 17B758 8024CE78 E600005C */ swc1 $f0, 0x5c($s0) diff --git a/asm/nonmatchings/code_1776B0/func_8024CE9C.s b/asm/nonmatchings/code_1776B0/func_8024CE9C.s index 0317e73bbd..bbf70303af 100644 --- a/asm/nonmatchings/code_1776B0/func_8024CE9C.s +++ b/asm/nonmatchings/code_1776B0/func_8024CE9C.s @@ -20,17 +20,17 @@ glabel func_8024CE9C /* 17B7B8 8024CED8 3C018028 */ lui $at, %hi(D_80280CE0) /* 17B7BC 8024CEDC A0200CE0 */ sb $zero, %lo(D_80280CE0)($at) /* 17B7C0 8024CEE0 44830000 */ mtc1 $v1, $f0 -/* 17B7C4 8024CEE4 00000000 */ nop +/* 17B7C4 8024CEE4 00000000 */ nop /* 17B7C8 8024CEE8 46800020 */ cvt.s.w $f0, $f0 /* 17B7CC 8024CEEC 3C01802A */ lui $at, %hi(D_8029F288) /* 17B7D0 8024CEF0 E420F288 */ swc1 $f0, %lo(D_8029F288)($at) /* 17B7D4 8024CEF4 44840000 */ mtc1 $a0, $f0 -/* 17B7D8 8024CEF8 00000000 */ nop +/* 17B7D8 8024CEF8 00000000 */ nop /* 17B7DC 8024CEFC 46800020 */ cvt.s.w $f0, $f0 /* 17B7E0 8024CF00 3C01802A */ lui $at, %hi(D_8029F28C) /* 17B7E4 8024CF04 E420F28C */ swc1 $f0, %lo(D_8029F28C)($at) /* 17B7E8 8024CF08 44820000 */ mtc1 $v0, $f0 -/* 17B7EC 8024CF0C 00000000 */ nop +/* 17B7EC 8024CF0C 00000000 */ nop /* 17B7F0 8024CF10 46800020 */ cvt.s.w $f0, $f0 /* 17B7F4 8024CF14 3C01802A */ lui $at, %hi(D_8029F294) /* 17B7F8 8024CF18 E420F294 */ swc1 $f0, %lo(D_8029F294)($at) diff --git a/asm/nonmatchings/code_1776B0/func_8024E3D8.s b/asm/nonmatchings/code_1776B0/func_8024E3D8.s index db0d0e2cc5..2c011b5f2c 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E3D8.s +++ b/asm/nonmatchings/code_1776B0/func_8024E3D8.s @@ -11,7 +11,7 @@ glabel func_8024E3D8 /* 17CCD0 8024E3F0 3C01802A */ lui $at, %hi(D_8029F2A4) /* 17CCD4 8024E3F4 A022F2A4 */ sb $v0, %lo(D_8029F2A4)($at) /* 17CCD8 8024E3F8 0C0933CD */ jal use_cam_preset -/* 17CCDC 8024E3FC 00000000 */ nop +/* 17CCDC 8024E3FC 00000000 */ nop .L8024E400: /* 17CCE0 8024E400 8FBF0010 */ lw $ra, 0x10($sp) /* 17CCE4 8024E404 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1776B0/func_8024E40C.s b/asm/nonmatchings/code_1776B0/func_8024E40C.s index 4210fcd011..0466e63631 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E40C.s +++ b/asm/nonmatchings/code_1776B0/func_8024E40C.s @@ -10,7 +10,7 @@ glabel func_8024E40C /* 17CD00 8024E420 3C01802A */ lui $at, %hi(D_8029F2A4) /* 17CD04 8024E424 A020F2A4 */ sb $zero, %lo(D_8029F2A4)($at) /* 17CD08 8024E428 0C0933CD */ jal use_cam_preset -/* 17CD0C 8024E42C 00000000 */ nop +/* 17CD0C 8024E42C 00000000 */ nop .L8024E430: /* 17CD10 8024E430 8FBF0010 */ lw $ra, 0x10($sp) /* 17CD14 8024E434 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1776B0/func_8024E45C.s b/asm/nonmatchings/code_1776B0/func_8024E45C.s index ddfefcf049..6ebb91b17f 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E45C.s +++ b/asm/nonmatchings/code_1776B0/func_8024E45C.s @@ -5,11 +5,11 @@ glabel func_8024E45C /* 17CD3C 8024E45C 3C028028 */ lui $v0, %hi(D_80280CE0) /* 17CD40 8024E460 80420CE0 */ lb $v0, %lo(D_80280CE0)($v0) /* 17CD44 8024E464 14400005 */ bnez $v0, .L8024E47C -/* 17CD48 8024E468 00000000 */ nop +/* 17CD48 8024E468 00000000 */ nop /* 17CD4C 8024E46C 3C01802A */ lui $at, %hi(D_8029F27C) /* 17CD50 8024E470 A424F27C */ sh $a0, %lo(D_8029F27C)($at) /* 17CD54 8024E474 3C01802A */ lui $at, %hi(D_8029F27E) /* 17CD58 8024E478 A425F27E */ sh $a1, %lo(D_8029F27E)($at) .L8024E47C: /* 17CD5C 8024E47C 03E00008 */ jr $ra -/* 17CD60 8024E480 00000000 */ nop +/* 17CD60 8024E480 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/func_8024E484.s b/asm/nonmatchings/code_1776B0/func_8024E484.s index eecc07c538..62e293f712 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E484.s +++ b/asm/nonmatchings/code_1776B0/func_8024E484.s @@ -7,7 +7,7 @@ glabel func_8024E484 /* 17CD6C 8024E48C 3C03800B */ lui $v1, %hi(D_800B22D8) /* 17CD70 8024E490 246322D8 */ addiu $v1, $v1, %lo(D_800B22D8) /* 17CD74 8024E494 1440000E */ bnez $v0, .L8024E4D0 -/* 17CD78 8024E498 00000000 */ nop +/* 17CD78 8024E498 00000000 */ nop /* 17CD7C 8024E49C A464001C */ sh $a0, 0x1c($v1) /* 17CD80 8024E4A0 A465001E */ sh $a1, 0x1e($v1) /* 17CD84 8024E4A4 A4660020 */ sh $a2, 0x20($v1) @@ -23,4 +23,4 @@ glabel func_8024E484 /* 17CDAC 8024E4CC A462002A */ sh $v0, 0x2a($v1) .L8024E4D0: /* 17CDB0 8024E4D0 03E00008 */ jr $ra -/* 17CDB4 8024E4D4 00000000 */ nop +/* 17CDB4 8024E4D4 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/func_8024E554.s b/asm/nonmatchings/code_1776B0/func_8024E554.s index ccea8c31fd..ec095284b7 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E554.s +++ b/asm/nonmatchings/code_1776B0/func_8024E554.s @@ -8,10 +8,10 @@ glabel func_8024E554 /* 17CE40 8024E560 80420CE0 */ lb $v0, %lo(D_80280CE0)($v0) /* 17CE44 8024E564 44860000 */ mtc1 $a2, $f0 /* 17CE48 8024E568 14400004 */ bnez $v0, .L8024E57C -/* 17CE4C 8024E56C 00000000 */ nop +/* 17CE4C 8024E56C 00000000 */ nop /* 17CE50 8024E570 E46C0054 */ swc1 $f12, 0x54($v1) /* 17CE54 8024E574 E46E0058 */ swc1 $f14, 0x58($v1) /* 17CE58 8024E578 E460005C */ swc1 $f0, 0x5c($v1) .L8024E57C: /* 17CE5C 8024E57C 03E00008 */ jr $ra -/* 17CE60 8024E580 00000000 */ nop +/* 17CE60 8024E580 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/func_8024E584.s b/asm/nonmatchings/code_1776B0/func_8024E584.s index 23a50e4b18..b76a997eef 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E584.s +++ b/asm/nonmatchings/code_1776B0/func_8024E584.s @@ -5,4 +5,4 @@ glabel func_8024E584 /* 17CE64 8024E584 3C02802A */ lui $v0, %hi(D_8029F29C) /* 17CE68 8024E588 8042F29C */ lb $v0, %lo(D_8029F29C)($v0) /* 17CE6C 8024E58C 03E00008 */ jr $ra -/* 17CE70 8024E590 00000000 */ nop +/* 17CE70 8024E590 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/func_8024E60C.s b/asm/nonmatchings/code_1776B0/func_8024E60C.s index 4f686d4d29..a3296bf4f4 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E60C.s +++ b/asm/nonmatchings/code_1776B0/func_8024E60C.s @@ -5,4 +5,4 @@ glabel func_8024E60C /* 17CEEC 8024E60C 3C01802A */ lui $at, %hi(D_8029F2A6) /* 17CEF0 8024E610 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17CEF4 8024E614 03E00008 */ jr $ra -/* 17CEF8 8024E618 00000000 */ nop +/* 17CEF8 8024E618 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/func_8024E664.s b/asm/nonmatchings/code_1776B0/func_8024E664.s index 5abf31829f..0a032bc809 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E664.s +++ b/asm/nonmatchings/code_1776B0/func_8024E664.s @@ -11,13 +11,13 @@ glabel func_8024E664 /* 17CF5C 8024E67C 24020002 */ addiu $v0, $zero, 2 /* 17CF60 8024E680 8CA50000 */ lw $a1, ($a1) /* 17CF64 8024E684 0C0B1EAF */ jal get_variable -/* 17CF68 8024E688 00000000 */ nop +/* 17CF68 8024E688 00000000 */ nop /* 17CF6C 8024E68C 0040202D */ daddu $a0, $v0, $zero /* 17CF70 8024E690 24020001 */ addiu $v0, $zero, 1 /* 17CF74 8024E694 3C01802A */ lui $at, %hi(D_8029F2A4) /* 17CF78 8024E698 A022F2A4 */ sb $v0, %lo(D_8029F2A4)($at) /* 17CF7C 8024E69C 0C0933CD */ jal use_cam_preset -/* 17CF80 8024E6A0 00000000 */ nop +/* 17CF80 8024E6A0 00000000 */ nop /* 17CF84 8024E6A4 24020002 */ addiu $v0, $zero, 2 .L8024E6A8: /* 17CF88 8024E6A8 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_1776B0/func_8024E6B4.s b/asm/nonmatchings/code_1776B0/func_8024E6B4.s index 99aa8e3ea8..aff6b87b59 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E6B4.s +++ b/asm/nonmatchings/code_1776B0/func_8024E6B4.s @@ -19,7 +19,7 @@ glabel func_8024E6B4 /* 17CFC8 8024E6E8 10600005 */ beqz $v1, .L8024E700 /* 17CFCC 8024E6EC 24020001 */ addiu $v0, $zero, 1 /* 17CFD0 8024E6F0 1062000B */ beq $v1, $v0, .L8024E720 -/* 17CFD4 8024E6F4 00000000 */ nop +/* 17CFD4 8024E6F4 00000000 */ nop /* 17CFD8 8024E6F8 080939CE */ j .L8024E738 /* 17CFDC 8024E6FC 0000102D */ daddu $v0, $zero, $zero .L8024E700: @@ -33,7 +33,7 @@ glabel func_8024E6B4 /* 17CFFC 8024E71C AE020070 */ sw $v0, 0x70($s0) .L8024E720: /* 17D000 8024E720 0C093961 */ jal func_8024E584 -/* 17D004 8024E724 00000000 */ nop +/* 17D004 8024E724 00000000 */ nop /* 17D008 8024E728 0040182D */ daddu $v1, $v0, $zero /* 17D00C 8024E72C 14600002 */ bnez $v1, .L8024E738 /* 17D010 8024E730 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_1776B0/func_8024E748.s b/asm/nonmatchings/code_1776B0/func_8024E748.s index 9e9a684b33..236eb21463 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E748.s +++ b/asm/nonmatchings/code_1776B0/func_8024E748.s @@ -32,7 +32,7 @@ glabel func_8024E748 /* 17D094 8024E7B4 00220821 */ addu $at, $at, $v0 /* 17D098 8024E7B8 8C22CD70 */ lw $v0, %lo(D_8029CD70)($at) /* 17D09C 8024E7BC 00400008 */ jr $v0 -/* 17D0A0 8024E7C0 00000000 */ nop +/* 17D0A0 8024E7C0 00000000 */ nop /* 17D0A4 8024E7C4 08093A01 */ j .L8024E804 /* 17D0A8 8024E7C8 A623001C */ sh $v1, 0x1c($s1) /* 17D0AC 8024E7CC 08093A01 */ j .L8024E804 diff --git a/asm/nonmatchings/code_1776B0/func_8024E9B0.s b/asm/nonmatchings/code_1776B0/func_8024E9B0.s index 615a0e0a39..51a48fbd18 100644 --- a/asm/nonmatchings/code_1776B0/func_8024E9B0.s +++ b/asm/nonmatchings/code_1776B0/func_8024E9B0.s @@ -19,7 +19,7 @@ glabel func_8024E9B0 /* 17D2C8 8024E9E8 0C0B1EAF */ jal get_variable /* 17D2CC 8024E9EC 26100004 */ addiu $s0, $s0, 4 /* 17D2D0 8024E9F0 44820000 */ mtc1 $v0, $f0 -/* 17D2D4 8024E9F4 00000000 */ nop +/* 17D2D4 8024E9F4 00000000 */ nop /* 17D2D8 8024E9F8 46800020 */ cvt.s.w $f0, $f0 /* 17D2DC 8024E9FC E6400054 */ swc1 $f0, 0x54($s2) /* 17D2E0 8024EA00 8E050000 */ lw $a1, ($s0) @@ -27,14 +27,14 @@ glabel func_8024E9B0 /* 17D2E8 8024EA08 0C0B1EAF */ jal get_variable /* 17D2EC 8024EA0C 0220202D */ daddu $a0, $s1, $zero /* 17D2F0 8024EA10 44820000 */ mtc1 $v0, $f0 -/* 17D2F4 8024EA14 00000000 */ nop +/* 17D2F4 8024EA14 00000000 */ nop /* 17D2F8 8024EA18 46800020 */ cvt.s.w $f0, $f0 /* 17D2FC 8024EA1C E6400058 */ swc1 $f0, 0x58($s2) /* 17D300 8024EA20 8E050000 */ lw $a1, ($s0) /* 17D304 8024EA24 0C0B1EAF */ jal get_variable /* 17D308 8024EA28 0220202D */ daddu $a0, $s1, $zero /* 17D30C 8024EA2C 44820000 */ mtc1 $v0, $f0 -/* 17D310 8024EA30 00000000 */ nop +/* 17D310 8024EA30 00000000 */ nop /* 17D314 8024EA34 46800020 */ cvt.s.w $f0, $f0 /* 17D318 8024EA38 24020002 */ addiu $v0, $zero, 2 /* 17D31C 8024EA3C E640005C */ swc1 $f0, 0x5c($s2) diff --git a/asm/nonmatchings/code_1776B0/func_8024EB84.s b/asm/nonmatchings/code_1776B0/func_8024EB84.s index d7571c2dab..f3ec90a907 100644 --- a/asm/nonmatchings/code_1776B0/func_8024EB84.s +++ b/asm/nonmatchings/code_1776B0/func_8024EB84.s @@ -20,7 +20,7 @@ glabel func_8024EB84 /* 17D4A0 8024EBC0 0040802D */ daddu $s0, $v0, $zero /* 17D4A4 8024EBC4 2402FF81 */ addiu $v0, $zero, -0x7f /* 17D4A8 8024EBC8 16020002 */ bne $s0, $v0, .L8024EBD4 -/* 17D4AC 8024EBCC 00000000 */ nop +/* 17D4AC 8024EBCC 00000000 */ nop /* 17D4B0 8024EBD0 8E500148 */ lw $s0, 0x148($s2) .L8024EBD4: /* 17D4B4 8024EBD4 8E250000 */ lw $a1, ($s1) diff --git a/asm/nonmatchings/code_1776B0/func_8024EDA4.s b/asm/nonmatchings/code_1776B0/func_8024EDA4.s index 36bfc1de07..ffa0339d00 100644 --- a/asm/nonmatchings/code_1776B0/func_8024EDA4.s +++ b/asm/nonmatchings/code_1776B0/func_8024EDA4.s @@ -6,6 +6,6 @@ glabel func_8024EDA4 /* 17D688 8024EDA8 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17D68C 8024EDAC 03E00008 */ jr $ra /* 17D690 8024EDB0 24020002 */ addiu $v0, $zero, 2 -/* 17D694 8024EDB4 00000000 */ nop -/* 17D698 8024EDB8 00000000 */ nop -/* 17D69C 8024EDBC 00000000 */ nop +/* 17D694 8024EDB4 00000000 */ nop +/* 17D698 8024EDB8 00000000 */ nop +/* 17D69C 8024EDBC 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/move_cam_over.s b/asm/nonmatchings/code_1776B0/move_cam_over.s index 722200034a..9e97ac9e3e 100644 --- a/asm/nonmatchings/code_1776B0/move_cam_over.s +++ b/asm/nonmatchings/code_1776B0/move_cam_over.s @@ -14,9 +14,9 @@ glabel move_cam_over /* 17CDDC 8024E4FC 3C01802A */ lui $at, %hi(D_8029F29E) /* 17CDE0 8024E500 A423F29E */ sh $v1, %lo(D_8029F29E)($at) /* 17CDE4 8024E504 10800003 */ beqz $a0, .L8024E514 -/* 17CDE8 8024E508 00000000 */ nop +/* 17CDE8 8024E508 00000000 */ nop /* 17CDEC 8024E50C 0C0B0F41 */ jal restart_script -/* 17CDF0 8024E510 00000000 */ nop +/* 17CDF0 8024E510 00000000 */ nop .L8024E514: /* 17CDF4 8024E514 8FBF0010 */ lw $ra, 0x10($sp) /* 17CDF8 8024E518 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_1776B0/set_cam_target_pos.s b/asm/nonmatchings/code_1776B0/set_cam_target_pos.s index 27477da6bf..a2b4a11471 100644 --- a/asm/nonmatchings/code_1776B0/set_cam_target_pos.s +++ b/asm/nonmatchings/code_1776B0/set_cam_target_pos.s @@ -6,7 +6,7 @@ glabel set_cam_target_pos /* 17CE04 8024E524 80420CE0 */ lb $v0, %lo(D_80280CE0)($v0) /* 17CE08 8024E528 44860000 */ mtc1 $a2, $f0 /* 17CE0C 8024E52C 14400007 */ bnez $v0, .L8024E54C -/* 17CE10 8024E530 00000000 */ nop +/* 17CE10 8024E530 00000000 */ nop /* 17CE14 8024E534 3C01802A */ lui $at, %hi(D_8029F270) /* 17CE18 8024E538 E42CF270 */ swc1 $f12, %lo(D_8029F270)($at) /* 17CE1C 8024E53C 3C01802A */ lui $at, %hi(D_8029F274) @@ -15,4 +15,4 @@ glabel set_cam_target_pos /* 17CE28 8024E548 E420F278 */ swc1 $f0, %lo(D_8029F278)($at) .L8024E54C: /* 17CE2C 8024E54C 03E00008 */ jr $ra -/* 17CE30 8024E550 00000000 */ nop +/* 17CE30 8024E550 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/set_cam_zoffset.s b/asm/nonmatchings/code_1776B0/set_cam_zoffset.s index 7c0732c6d0..a59190ab1c 100644 --- a/asm/nonmatchings/code_1776B0/set_cam_zoffset.s +++ b/asm/nonmatchings/code_1776B0/set_cam_zoffset.s @@ -5,9 +5,9 @@ glabel set_cam_zoffset /* 17CEC0 8024E5E0 3C028028 */ lui $v0, %hi(D_80280CE0) /* 17CEC4 8024E5E4 80420CE0 */ lb $v0, %lo(D_80280CE0)($v0) /* 17CEC8 8024E5E8 14400003 */ bnez $v0, .L8024E5F8 -/* 17CECC 8024E5EC 00000000 */ nop +/* 17CECC 8024E5EC 00000000 */ nop /* 17CED0 8024E5F0 3C01802A */ lui $at, %hi(D_8029F286) /* 17CED4 8024E5F4 A424F286 */ sh $a0, %lo(D_8029F286)($at) .L8024E5F8: /* 17CED8 8024E5F8 03E00008 */ jr $ra -/* 17CEDC 8024E5FC 00000000 */ nop +/* 17CEDC 8024E5FC 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/set_cam_zoom.s b/asm/nonmatchings/code_1776B0/set_cam_zoom.s index 4509a3bf4e..71cd23e12e 100644 --- a/asm/nonmatchings/code_1776B0/set_cam_zoom.s +++ b/asm/nonmatchings/code_1776B0/set_cam_zoom.s @@ -5,9 +5,9 @@ glabel set_cam_zoom /* 17CE74 8024E594 3C028028 */ lui $v0, %hi(D_80280CE0) /* 17CE78 8024E598 80420CE0 */ lb $v0, %lo(D_80280CE0)($v0) /* 17CE7C 8024E59C 14400003 */ bnez $v0, .L8024E5AC -/* 17CE80 8024E5A0 00000000 */ nop +/* 17CE80 8024E5A0 00000000 */ nop /* 17CE84 8024E5A4 3C01802A */ lui $at, %hi(D_8029F280) /* 17CE88 8024E5A8 A424F280 */ sh $a0, %lo(D_8029F280)($at) .L8024E5AC: /* 17CE8C 8024E5AC 03E00008 */ jr $ra -/* 17CE90 8024E5B0 00000000 */ nop +/* 17CE90 8024E5B0 00000000 */ nop diff --git a/asm/nonmatchings/code_1776B0/use_cam_preset.s b/asm/nonmatchings/code_1776B0/use_cam_preset.s index e9b5f3a95b..458810bb52 100644 --- a/asm/nonmatchings/code_1776B0/use_cam_preset.s +++ b/asm/nonmatchings/code_1776B0/use_cam_preset.s @@ -32,7 +32,7 @@ glabel use_cam_preset /* 17B880 8024CFA0 00220821 */ addu $at, $at, $v0 /* 17B884 8024CFA4 8C22CC48 */ lw $v0, %lo(D_8029CC48)($at) /* 17B888 8024CFA8 00400008 */ jr $v0 -/* 17B88C 8024CFAC 00000000 */ nop +/* 17B88C 8024CFAC 00000000 */ nop /* 17B890 8024CFB0 3C108028 */ lui $s0, %hi(D_80280E54) /* 17B894 8024CFB4 080938DD */ j .L8024E374 /* 17B898 8024CFB8 26100E54 */ addiu $s0, $s0, %lo(D_80280E54) @@ -51,7 +51,7 @@ glabel use_cam_preset /* 17B8CC 8024CFEC 3C01802A */ lui $at, %hi(D_8029F29E) /* 17B8D0 8024CFF0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17B8D4 8024CFF4 080938DD */ j .L8024E374 -/* 17B8D8 8024CFF8 00000000 */ nop +/* 17B8D8 8024CFF8 00000000 */ nop /* 17B8DC 8024CFFC 3C028028 */ lui $v0, %hi(D_80280CE4) /* 17B8E0 8024D000 8C420CE4 */ lw $v0, %lo(D_80280CE4)($v0) /* 17B8E4 8024D004 105104EE */ beq $v0, $s1, .L8024E3C0 @@ -101,7 +101,7 @@ glabel use_cam_preset /* 17B994 8024D0B4 3C01802A */ lui $at, %hi(D_8029F29E) /* 17B998 8024D0B8 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17B99C 8024D0BC 080938DD */ j .L8024E374 -/* 17B9A0 8024D0C0 00000000 */ nop +/* 17B9A0 8024D0C0 00000000 */ nop /* 17B9A4 8024D0C4 3C108028 */ lui $s0, %hi(D_80280D58) /* 17B9A8 8024D0C8 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17B9AC 8024D0CC 2402012C */ addiu $v0, $zero, 0x12c @@ -214,7 +214,7 @@ glabel use_cam_preset /* 17BB58 8024D278 3C01802A */ lui $at, %hi(D_8029F286) /* 17BB5C 8024D27C A422F286 */ sh $v0, %lo(D_8029F286)($at) /* 17BB60 8024D280 080938DD */ j .L8024E374 -/* 17BB64 8024D284 00000000 */ nop +/* 17BB64 8024D284 00000000 */ nop /* 17BB68 8024D288 3C108028 */ lui $s0, %hi(D_80280D74) /* 17BB6C 8024D28C 26100D74 */ addiu $s0, $s0, %lo(D_80280D74) /* 17BB70 8024D290 2402012C */ addiu $v0, $zero, 0x12c @@ -231,7 +231,7 @@ glabel use_cam_preset /* 17BB9C 8024D2BC 3C01802A */ lui $at, %hi(D_8029F286) /* 17BBA0 8024D2C0 A423F286 */ sh $v1, %lo(D_8029F286)($at) /* 17BBA4 8024D2C4 080938DD */ j .L8024E374 -/* 17BBA8 8024D2C8 00000000 */ nop +/* 17BBA8 8024D2C8 00000000 */ nop /* 17BBAC 8024D2CC 3C108028 */ lui $s0, %hi(D_80280D74) /* 17BBB0 8024D2D0 26100D74 */ addiu $s0, $s0, %lo(D_80280D74) /* 17BBB4 8024D2D4 24020190 */ addiu $v0, $zero, 0x190 @@ -263,7 +263,7 @@ glabel use_cam_preset /* 17BC18 8024D338 3C01802A */ lui $at, %hi(D_8029F286) /* 17BC1C 8024D33C A420F286 */ sh $zero, %lo(D_8029F286)($at) /* 17BC20 8024D340 080938DD */ j .L8024E374 -/* 17BC24 8024D344 00000000 */ nop +/* 17BC24 8024D344 00000000 */ nop /* 17BC28 8024D348 3C108028 */ lui $s0, %hi(D_80280E00) /* 17BC2C 8024D34C 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) /* 17BC30 8024D350 3C01C2A0 */ lui $at, 0xc2a0 @@ -283,14 +283,14 @@ glabel use_cam_preset /* 17BC68 8024D388 3C01802A */ lui $at, %hi(D_8029F286) /* 17BC6C 8024D38C A422F286 */ sh $v0, %lo(D_8029F286)($at) /* 17BC70 8024D390 0C093948 */ jal set_cam_target_pos -/* 17BC74 8024D394 00000000 */ nop +/* 17BC74 8024D394 00000000 */ nop /* 17BC78 8024D398 24020014 */ addiu $v0, $zero, 0x14 /* 17BC7C 8024D39C 3C01802A */ lui $at, %hi(D_8029F29E) /* 17BC80 8024D3A0 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17BC84 8024D3A4 3C01802A */ lui $at, %hi(D_8029F27C) /* 17BC88 8024D3A8 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17BC8C 8024D3AC 080938DD */ j .L8024E374 -/* 17BC90 8024D3B0 00000000 */ nop +/* 17BC90 8024D3B0 00000000 */ nop /* 17BC94 8024D3B4 3C108028 */ lui $s0, %hi(D_80280D58) /* 17BC98 8024D3B8 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17BC9C 8024D3BC 240200FA */ addiu $v0, $zero, 0xfa @@ -345,11 +345,11 @@ glabel use_cam_preset /* 17BD60 8024D480 3C01802A */ lui $at, %hi(D_8029F2A3) /* 17BD64 8024D484 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17BD68 8024D488 0C093948 */ jal set_cam_target_pos -/* 17BD6C 8024D48C 00000000 */ nop +/* 17BD6C 8024D48C 00000000 */ nop /* 17BD70 8024D490 3C01802A */ lui $at, %hi(D_8029F27C) /* 17BD74 8024D494 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17BD78 8024D498 080938DD */ j .L8024E374 -/* 17BD7C 8024D49C 00000000 */ nop +/* 17BD7C 8024D49C 00000000 */ nop /* 17BD80 8024D4A0 3C108028 */ lui $s0, %hi(D_80280E00) /* 17BD84 8024D4A4 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) /* 17BD88 8024D4A8 240200E6 */ addiu $v0, $zero, 0xe6 @@ -368,7 +368,7 @@ glabel use_cam_preset /* 17BDBC 8024D4DC 3C01802A */ lui $at, %hi(D_8029F27C) /* 17BDC0 8024D4E0 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17BDC4 8024D4E4 080938DD */ j .L8024E374 -/* 17BDC8 8024D4E8 00000000 */ nop +/* 17BDC8 8024D4E8 00000000 */ nop /* 17BDCC 8024D4EC 3C108028 */ lui $s0, %hi(D_80280D20) /* 17BDD0 8024D4F0 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17BDD4 8024D4F4 24020136 */ addiu $v0, $zero, 0x136 @@ -391,7 +391,7 @@ glabel use_cam_preset /* 17BE18 8024D538 3C01802A */ lui $at, %hi(D_8029F2A2) /* 17BE1C 8024D53C A022F2A2 */ sb $v0, %lo(D_8029F2A2)($at) /* 17BE20 8024D540 0809369A */ j .L8024DA68 -/* 17BE24 8024D544 00000000 */ nop +/* 17BE24 8024D544 00000000 */ nop /* 17BE28 8024D548 3C108028 */ lui $s0, %hi(D_80280D20) /* 17BE2C 8024D54C 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17BE30 8024D550 24020140 */ addiu $v0, $zero, 0x140 @@ -413,7 +413,7 @@ glabel use_cam_preset /* 17BE70 8024D590 3C01802A */ lui $at, %hi(D_8029F2A3) /* 17BE74 8024D594 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17BE78 8024D598 08093659 */ j .L8024D964 -/* 17BE7C 8024D59C 00000000 */ nop +/* 17BE7C 8024D59C 00000000 */ nop /* 17BE80 8024D5A0 3C108028 */ lui $s0, %hi(D_80280D20) /* 17BE84 8024D5A4 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17BE88 8024D5A8 24020154 */ addiu $v0, $zero, 0x154 @@ -458,7 +458,7 @@ glabel use_cam_preset /* 17BF24 8024D644 3C01802A */ lui $at, %hi(D_8029F27C) /* 17BF28 8024D648 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17BF2C 8024D64C 080938DD */ j .L8024E374 -/* 17BF30 8024D650 00000000 */ nop +/* 17BF30 8024D650 00000000 */ nop /* 17BF34 8024D654 3C108028 */ lui $s0, %hi(D_80280D90) /* 17BF38 8024D658 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17BF3C 8024D65C 3C01C282 */ lui $at, 0xc282 @@ -477,7 +477,7 @@ glabel use_cam_preset /* 17BF70 8024D690 3C01802A */ lui $at, %hi(D_8029F29E) /* 17BF74 8024D694 A422F29E */ sh $v0, %lo(D_8029F29E)($at) /* 17BF78 8024D698 08093825 */ j .L8024E094 -/* 17BF7C 8024D69C 00000000 */ nop +/* 17BF7C 8024D69C 00000000 */ nop /* 17BF80 8024D6A0 3C108028 */ lui $s0, %hi(D_80280D58) /* 17BF84 8024D6A4 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17BF88 8024D6A8 240200DC */ addiu $v0, $zero, 0xdc @@ -518,7 +518,7 @@ glabel use_cam_preset /* 17C010 8024D730 3C01802A */ lui $at, %hi(D_8029F2A6) /* 17C014 8024D734 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17C018 8024D738 080938DD */ j .L8024E374 -/* 17C01C 8024D73C 00000000 */ nop +/* 17C01C 8024D73C 00000000 */ nop /* 17C020 8024D740 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C024 8024D744 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C028 8024D748 2402017C */ addiu $v0, $zero, 0x17c @@ -542,7 +542,7 @@ glabel use_cam_preset /* 17C070 8024D790 3C01802A */ lui $at, %hi(D_8029F2A5) /* 17C074 8024D794 A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) /* 17C078 8024D798 08093659 */ j .L8024D964 -/* 17C07C 8024D79C 00000000 */ nop +/* 17C07C 8024D79C 00000000 */ nop /* 17C080 8024D7A0 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C084 8024D7A4 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C088 8024D7A8 24020140 */ addiu $v0, $zero, 0x140 @@ -565,7 +565,7 @@ glabel use_cam_preset /* 17C0CC 8024D7EC 3C01802A */ lui $at, %hi(D_8029F2A3) /* 17C0D0 8024D7F0 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17C0D4 8024D7F4 08093659 */ j .L8024D964 -/* 17C0D8 8024D7F8 00000000 */ nop +/* 17C0D8 8024D7F8 00000000 */ nop /* 17C0DC 8024D7FC 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C0E0 8024D800 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C0E4 8024D804 2402012C */ addiu $v0, $zero, 0x12c @@ -589,7 +589,7 @@ glabel use_cam_preset /* 17C12C 8024D84C 3C01802A */ lui $at, %hi(D_8029F2A5) /* 17C130 8024D850 A022F2A5 */ sb $v0, %lo(D_8029F2A5)($at) /* 17C134 8024D854 08093659 */ j .L8024D964 -/* 17C138 8024D858 00000000 */ nop +/* 17C138 8024D858 00000000 */ nop /* 17C13C 8024D85C 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C140 8024D860 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C144 8024D864 24020140 */ addiu $v0, $zero, 0x140 @@ -612,7 +612,7 @@ glabel use_cam_preset /* 17C188 8024D8A8 3C01802A */ lui $at, %hi(D_8029F2A3) /* 17C18C 8024D8AC A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17C190 8024D8B0 08093659 */ j .L8024D964 -/* 17C194 8024D8B4 00000000 */ nop +/* 17C194 8024D8B4 00000000 */ nop /* 17C198 8024D8B8 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C19C 8024D8BC 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C1A0 8024D8C0 24020140 */ addiu $v0, $zero, 0x140 @@ -634,7 +634,7 @@ glabel use_cam_preset /* 17C1E0 8024D900 3C01802A */ lui $at, %hi(D_8029F2A3) /* 17C1E4 8024D904 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17C1E8 8024D908 08093659 */ j .L8024D964 -/* 17C1EC 8024D90C 00000000 */ nop +/* 17C1EC 8024D90C 00000000 */ nop /* 17C1F0 8024D910 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C1F4 8024D914 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C1F8 8024D918 24020168 */ addiu $v0, $zero, 0x168 @@ -663,7 +663,7 @@ glabel use_cam_preset /* 17C24C 8024D96C 3C01802A */ lui $at, %hi(D_8029F27C) /* 17C250 8024D970 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17C254 8024D974 080938DD */ j .L8024E374 -/* 17C258 8024D978 00000000 */ nop +/* 17C258 8024D978 00000000 */ nop /* 17C25C 8024D97C 3C10802A */ lui $s0, %hi(D_8029F2B4) /* 17C260 8024D980 8E10F2B4 */ lw $s0, %lo(D_8029F2B4)($s0) /* 17C264 8024D984 240200C8 */ addiu $v0, $zero, 0xc8 @@ -679,7 +679,7 @@ glabel use_cam_preset /* 17C28C 8024D9AC 3C01802A */ lui $at, %hi(D_8029F2A6) /* 17C290 8024D9B0 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17C294 8024D9B4 080938DD */ j .L8024E374 -/* 17C298 8024D9B8 00000000 */ nop +/* 17C298 8024D9B8 00000000 */ nop /* 17C29C 8024D9BC 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C2A0 8024D9C0 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C2A4 8024D9C4 240200D6 */ addiu $v0, $zero, 0xd6 @@ -729,7 +729,7 @@ glabel use_cam_preset /* 17C350 8024DA70 3C01802A */ lui $at, %hi(D_8029F2A6) /* 17C354 8024DA74 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17C358 8024DA78 080938DD */ j .L8024E374 -/* 17C35C 8024DA7C 00000000 */ nop +/* 17C35C 8024DA7C 00000000 */ nop /* 17C360 8024DA80 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C364 8024DA84 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C368 8024DA88 3C014270 */ lui $at, 0x4270 @@ -753,7 +753,7 @@ glabel use_cam_preset /* 17C3B0 8024DAD0 3C01802A */ lui $at, %hi(D_8029F27C) /* 17C3B4 8024DAD4 A420F27C */ sh $zero, %lo(D_8029F27C)($at) /* 17C3B8 8024DAD8 08093827 */ j .L8024E09C -/* 17C3BC 8024DADC 00000000 */ nop +/* 17C3BC 8024DADC 00000000 */ nop /* 17C3C0 8024DAE0 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C3C4 8024DAE4 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C3C8 8024DAE8 3C014270 */ lui $at, 0x4270 @@ -779,7 +779,7 @@ glabel use_cam_preset /* 17C418 8024DB38 3C01802A */ lui $at, %hi(D_8029F2A2) /* 17C41C 8024DB3C A020F2A2 */ sb $zero, %lo(D_8029F2A2)($at) /* 17C420 8024DB40 0809382B */ j .L8024E0AC -/* 17C424 8024DB44 00000000 */ nop +/* 17C424 8024DB44 00000000 */ nop /* 17C428 8024DB48 3C108028 */ lui $s0, %hi(D_80280E00) /* 17C42C 8024DB4C 26100E00 */ addiu $s0, $s0, %lo(D_80280E00) /* 17C430 8024DB50 3C01C28C */ lui $at, 0xc28c @@ -799,7 +799,7 @@ glabel use_cam_preset /* 17C468 8024DB88 3C01802A */ lui $at, %hi(D_8029F286) /* 17C46C 8024DB8C A422F286 */ sh $v0, %lo(D_8029F286)($at) /* 17C470 8024DB90 0C093948 */ jal set_cam_target_pos -/* 17C474 8024DB94 00000000 */ nop +/* 17C474 8024DB94 00000000 */ nop /* 17C478 8024DB98 08093710 */ j .L8024DC40 /* 17C47C 8024DB9C 2402000A */ addiu $v0, $zero, 0xa /* 17C480 8024DBA0 3C108028 */ lui $s0, %hi(D_80280E00) @@ -840,7 +840,7 @@ glabel use_cam_preset /* 17C50C 8024DC2C 3C01802A */ lui $at, %hi(D_8029F286) /* 17C510 8024DC30 A422F286 */ sh $v0, %lo(D_8029F286)($at) /* 17C514 8024DC34 0C093948 */ jal set_cam_target_pos -/* 17C518 8024DC38 00000000 */ nop +/* 17C518 8024DC38 00000000 */ nop /* 17C51C 8024DC3C 24020014 */ addiu $v0, $zero, 0x14 .L8024DC40: /* 17C520 8024DC40 3C01802A */ lui $at, %hi(D_8029F29E) @@ -848,7 +848,7 @@ glabel use_cam_preset /* 17C528 8024DC48 3C01802A */ lui $at, %hi(D_8029F2A6) /* 17C52C 8024DC4C A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17C530 8024DC50 080938DD */ j .L8024E374 -/* 17C534 8024DC54 00000000 */ nop +/* 17C534 8024DC54 00000000 */ nop /* 17C538 8024DC58 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C53C 8024DC5C 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C540 8024DC60 3C01C296 */ lui $at, 0xc296 @@ -966,7 +966,7 @@ glabel use_cam_preset /* 17C700 8024DE20 3C01802A */ lui $at, %hi(D_8029F286) /* 17C704 8024DE24 A420F286 */ sh $zero, %lo(D_8029F286)($at) /* 17C708 8024DE28 080938DD */ j .L8024E374 -/* 17C70C 8024DE2C 00000000 */ nop +/* 17C70C 8024DE2C 00000000 */ nop /* 17C710 8024DE30 3C108028 */ lui $s0, %hi(D_80280D20) /* 17C714 8024DE34 26100D20 */ addiu $s0, $s0, %lo(D_80280D20) /* 17C718 8024DE38 24020118 */ addiu $v0, $zero, 0x118 @@ -1043,7 +1043,7 @@ glabel use_cam_preset /* 17C82C 8024DF4C 3C01802A */ lui $at, %hi(D_8029F27C) /* 17C830 8024DF50 A422F27C */ sh $v0, %lo(D_8029F27C)($at) /* 17C834 8024DF54 080938DD */ j .L8024E374 -/* 17C838 8024DF58 00000000 */ nop +/* 17C838 8024DF58 00000000 */ nop /* 17C83C 8024DF5C 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C840 8024DF60 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C844 8024DF64 3C01C2BE */ lui $at, 0xc2be @@ -1104,7 +1104,7 @@ glabel use_cam_preset /* 17C91C 8024E03C 3C01802A */ lui $at, %hi(D_8029F27C) /* 17C920 8024E040 A422F27C */ sh $v0, %lo(D_8029F27C)($at) /* 17C924 8024E044 080938DD */ j .L8024E374 -/* 17C928 8024E048 00000000 */ nop +/* 17C928 8024E048 00000000 */ nop /* 17C92C 8024E04C 3C108028 */ lui $s0, %hi(D_80280D90) /* 17C930 8024E050 26100D90 */ addiu $s0, $s0, %lo(D_80280D90) /* 17C934 8024E054 3C0141C8 */ lui $at, 0x41c8 @@ -1141,7 +1141,7 @@ glabel use_cam_preset /* 17C99C 8024E0BC 3C01802A */ lui $at, %hi(D_8029F274) /* 17C9A0 8024E0C0 E422F274 */ swc1 $f2, %lo(D_8029F274)($at) /* 17C9A4 8024E0C4 080938DD */ j .L8024E374 -/* 17C9A8 8024E0C8 00000000 */ nop +/* 17C9A8 8024E0C8 00000000 */ nop /* 17C9AC 8024E0CC 3C108028 */ lui $s0, %hi(D_80280D58) /* 17C9B0 8024E0D0 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17C9B4 8024E0D4 240200C8 */ addiu $v0, $zero, 0xc8 @@ -1173,7 +1173,7 @@ glabel use_cam_preset /* 17CA14 8024E134 3C01802A */ lui $at, %hi(D_8029F2A6) /* 17CA18 8024E138 A020F2A6 */ sb $zero, %lo(D_8029F2A6)($at) /* 17CA1C 8024E13C 080938DD */ j .L8024E374 -/* 17CA20 8024E140 00000000 */ nop +/* 17CA20 8024E140 00000000 */ nop /* 17CA24 8024E144 3C108028 */ lui $s0, %hi(D_80280D58) /* 17CA28 8024E148 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17CA2C 8024E14C 2402012C */ addiu $v0, $zero, 0x12c @@ -1197,7 +1197,7 @@ glabel use_cam_preset /* 17CA74 8024E194 3C01802A */ lui $at, %hi(D_8029F2A3) /* 17CA78 8024E198 A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17CA7C 8024E19C 080938DD */ j .L8024E374 -/* 17CA80 8024E1A0 00000000 */ nop +/* 17CA80 8024E1A0 00000000 */ nop /* 17CA84 8024E1A4 3C108028 */ lui $s0, %hi(D_80280D58) /* 17CA88 8024E1A8 26100D58 */ addiu $s0, $s0, %lo(D_80280D58) /* 17CA8C 8024E1AC 2402012C */ addiu $v0, $zero, 0x12c @@ -1226,7 +1226,7 @@ glabel use_cam_preset /* 17CAE8 8024E208 3C01802A */ lui $at, %hi(D_8029F27C) /* 17CAEC 8024E20C A422F27C */ sh $v0, %lo(D_8029F27C)($at) /* 17CAF0 8024E210 080938DD */ j .L8024E374 -/* 17CAF4 8024E214 00000000 */ nop +/* 17CAF4 8024E214 00000000 */ nop /* 17CAF8 8024E218 3C108028 */ lui $s0, %hi(D_80280D04) /* 17CAFC 8024E21C 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17CB00 8024E220 24020190 */ addiu $v0, $zero, 0x190 @@ -1259,7 +1259,7 @@ glabel use_cam_preset /* 17CB6C 8024E28C 3C01802A */ lui $at, %hi(D_8029F280) /* 17CB70 8024E290 A422F280 */ sh $v0, %lo(D_8029F280)($at) /* 17CB74 8024E294 080938DD */ j .L8024E374 -/* 17CB78 8024E298 00000000 */ nop +/* 17CB78 8024E298 00000000 */ nop /* 17CB7C 8024E29C 3C108028 */ lui $s0, %hi(D_80280D04) /* 17CB80 8024E2A0 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17CB84 8024E2A4 2402010B */ addiu $v0, $zero, 0x10b @@ -1283,7 +1283,7 @@ glabel use_cam_preset /* 17CBC8 8024E2E8 3C01802A */ lui $at, %hi(D_8029F2A3) /* 17CBCC 8024E2EC A020F2A3 */ sb $zero, %lo(D_8029F2A3)($at) /* 17CBD0 8024E2F0 080938DD */ j .L8024E374 -/* 17CBD4 8024E2F4 00000000 */ nop +/* 17CBD4 8024E2F4 00000000 */ nop /* 17CBD8 8024E2F8 3C108028 */ lui $s0, %hi(D_80280D04) /* 17CBDC 8024E2FC 26100D04 */ addiu $s0, $s0, %lo(D_80280D04) /* 17CBE0 8024E300 240200D6 */ addiu $v0, $zero, 0xd6 @@ -1326,7 +1326,7 @@ glabel use_cam_preset /* 17CC64 8024E384 0200202D */ daddu $a0, $s0, $zero /* 17CC68 8024E388 8E4400C8 */ lw $a0, 0xc8($s2) /* 17CC6C 8024E38C 0C0B102B */ jal kill_script_by_ID -/* 17CC70 8024E390 00000000 */ nop +/* 17CC70 8024E390 00000000 */ nop /* 17CC74 8024E394 0200202D */ daddu $a0, $s0, $zero .L8024E398: /* 17CC78 8024E398 24060020 */ addiu $a2, $zero, 0x20 diff --git a/asm/nonmatchings/code_17D6A0/close_action_command_instruction_popup.s b/asm/nonmatchings/code_17D6A0/close_action_command_instruction_popup.s index 6abfebbfa9..7fa0e9aace 100644 --- a/asm/nonmatchings/code_17D6A0/close_action_command_instruction_popup.s +++ b/asm/nonmatchings/code_17D6A0/close_action_command_instruction_popup.s @@ -5,7 +5,7 @@ glabel close_action_command_instruction_popup /* 17E3EC 8024FB0C 3C038028 */ lui $v1, %hi(D_802838F8) /* 17E3F0 8024FB10 8C6338F8 */ lw $v1, %lo(D_802838F8)($v1) /* 17E3F4 8024FB14 10600007 */ beqz $v1, .L8024FB34 -/* 17E3F8 8024FB18 00000000 */ nop +/* 17E3F8 8024FB18 00000000 */ nop /* 17E3FC 8024FB1C 84640012 */ lh $a0, 0x12($v1) /* 17E400 8024FB20 28820043 */ slti $v0, $a0, 0x43 /* 17E404 8024FB24 10400003 */ beqz $v0, .L8024FB34 @@ -14,4 +14,4 @@ glabel close_action_command_instruction_popup /* 17E410 8024FB30 A4600014 */ sh $zero, 0x14($v1) .L8024FB34: /* 17E414 8024FB34 03E00008 */ jr $ra -/* 17E418 8024FB38 00000000 */ nop +/* 17E418 8024FB38 00000000 */ nop diff --git a/asm/nonmatchings/code_17D6A0/func_8024EDC0.s b/asm/nonmatchings/code_17D6A0/func_8024EDC0.s index a7cbcaef2c..f4236ee4f5 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024EDC0.s +++ b/asm/nonmatchings/code_17D6A0/func_8024EDC0.s @@ -13,4 +13,4 @@ glabel func_8024EDC0 /* 17D6BC 8024EDDC 1440FFFB */ bnez $v0, .L8024EDCC /* 17D6C0 8024EDE0 2463001C */ addiu $v1, $v1, 0x1c /* 17D6C4 8024EDE4 03E00008 */ jr $ra -/* 17D6C8 8024EDE8 00000000 */ nop +/* 17D6C8 8024EDE8 00000000 */ nop diff --git a/asm/nonmatchings/code_17D6A0/func_8024EDEC.s b/asm/nonmatchings/code_17D6A0/func_8024EDEC.s index 4dbfb895b7..9d7d2869f6 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024EDEC.s +++ b/asm/nonmatchings/code_17D6A0/func_8024EDEC.s @@ -14,7 +14,7 @@ glabel func_8024EDEC /* 17D6EC 8024EE0C 50800005 */ beql $a0, $zero, .L8024EE24 /* 17D6F0 8024EE10 A6000010 */ sh $zero, 0x10($s0) /* 17D6F4 8024EE14 0C00AB4B */ jal heap_free -/* 17D6F8 8024EE18 00000000 */ nop +/* 17D6F8 8024EE18 00000000 */ nop /* 17D6FC 8024EE1C AE000018 */ sw $zero, 0x18($s0) /* 17D700 8024EE20 A6000010 */ sh $zero, 0x10($s0) .L8024EE24: diff --git a/asm/nonmatchings/code_17D6A0/func_8024EFA4.s b/asm/nonmatchings/code_17D6A0/func_8024EFA4.s index c6528606bc..86da09c928 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024EFA4.s +++ b/asm/nonmatchings/code_17D6A0/func_8024EFA4.s @@ -10,7 +10,7 @@ glabel func_8024EFA4 /* 17D898 8024EFB8 50800005 */ beql $a0, $zero, .L8024EFD0 /* 17D89C 8024EFBC A6000010 */ sh $zero, 0x10($s0) /* 17D8A0 8024EFC0 0C00AB4B */ jal heap_free -/* 17D8A4 8024EFC4 00000000 */ nop +/* 17D8A4 8024EFC4 00000000 */ nop /* 17D8A8 8024EFC8 AE000018 */ sw $zero, 0x18($s0) /* 17D8AC 8024EFCC A6000010 */ sh $zero, 0x10($s0) .L8024EFD0: diff --git a/asm/nonmatchings/code_17D6A0/func_8024EFE0.s b/asm/nonmatchings/code_17D6A0/func_8024EFE0.s index c6ec09eb98..04c08961d3 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024EFE0.s +++ b/asm/nonmatchings/code_17D6A0/func_8024EFE0.s @@ -42,16 +42,16 @@ glabel func_8024EFE0 /* 17D950 8024F070 8E220000 */ lw $v0, ($s1) /* 17D954 8024F074 30420240 */ andi $v0, $v0, 0x240 /* 17D958 8024F078 10400004 */ beqz $v0, .L8024F08C -/* 17D95C 8024F07C 00000000 */ nop +/* 17D95C 8024F07C 00000000 */ nop /* 17D960 8024F080 4600B021 */ cvt.d.s $f0, $f22 /* 17D964 8024F084 46200000 */ add.d $f0, $f0, $f0 /* 17D968 8024F088 462005A0 */ cvt.s.d $f22, $f0 .L8024F08C: /* 17D96C 8024F08C 0C093BDA */ jal create_popup -/* 17D970 8024F090 00000000 */ nop +/* 17D970 8024F090 00000000 */ nop /* 17D974 8024F094 0040802D */ daddu $s0, $v0, $zero /* 17D978 8024F098 120000AD */ beqz $s0, .L8024F350 -/* 17D97C 8024F09C 00000000 */ nop +/* 17D97C 8024F09C 00000000 */ nop /* 17D980 8024F0A0 06410003 */ bgez $s2, .L8024F0B0 /* 17D984 8024F0A4 24140001 */ addiu $s4, $zero, 1 /* 17D988 8024F0A8 00129023 */ negu $s2, $s2 @@ -87,7 +87,7 @@ glabel func_8024EFE0 /* 17D9F8 8024F118 AE130018 */ sw $s3, 0x18($s0) .L8024F11C: /* 17D9FC 8024F11C 08093C47 */ j .L8024F11C -/* 17DA00 8024F120 00000000 */ nop +/* 17DA00 8024F120 00000000 */ nop .L8024F124: /* 17DA04 8024F124 1AA0008A */ blez $s5, .L8024F350 /* 17DA08 8024F128 0000882D */ daddu $s1, $zero, $zero @@ -138,13 +138,13 @@ glabel func_8024EFE0 /* 17DAB4 8024F1D4 46000021 */ cvt.d.s $f0, $f0 /* 17DAB8 8024F1D8 46200000 */ add.d $f0, $f0, $f0 /* 17DABC 8024F1DC 44941000 */ mtc1 $s4, $f2 -/* 17DAC0 8024F1E0 00000000 */ nop +/* 17DAC0 8024F1E0 00000000 */ nop /* 17DAC4 8024F1E4 468010A1 */ cvt.d.w $f2, $f2 /* 17DAC8 8024F1E8 46220002 */ mul.d $f0, $f0, $f2 -/* 17DACC 8024F1EC 00000000 */ nop +/* 17DACC 8024F1EC 00000000 */ nop /* 17DAD0 8024F1F0 4600A0A1 */ cvt.d.s $f2, $f20 /* 17DAD4 8024F1F4 46220002 */ mul.d $f0, $f0, $f2 -/* 17DAD8 8024F1F8 00000000 */ nop +/* 17DAD8 8024F1F8 00000000 */ nop /* 17DADC 8024F1FC 24430001 */ addiu $v1, $v0, 1 /* 17DAE0 8024F200 00031880 */ sll $v1, $v1, 2 /* 17DAE4 8024F204 00761821 */ addu $v1, $v1, $s6 @@ -154,7 +154,7 @@ glabel func_8024EFE0 /* 17DAF4 8024F214 46000021 */ cvt.d.s $f0, $f0 /* 17DAF8 8024F218 46200000 */ add.d $f0, $f0, $f0 /* 17DAFC 8024F21C 46220002 */ mul.d $f0, $f0, $f2 -/* 17DB00 8024F220 00000000 */ nop +/* 17DB00 8024F220 00000000 */ nop /* 17DB04 8024F224 24420002 */ addiu $v0, $v0, 2 /* 17DB08 8024F228 00021080 */ sll $v0, $v0, 2 /* 17DB0C 8024F22C 00561021 */ addu $v0, $v0, $s6 @@ -164,25 +164,25 @@ glabel func_8024EFE0 /* 17DB1C 8024F23C 46000021 */ cvt.d.s $f0, $f0 /* 17DB20 8024F240 46200000 */ add.d $f0, $f0, $f0 /* 17DB24 8024F244 46220002 */ mul.d $f0, $f0, $f2 -/* 17DB28 8024F248 00000000 */ nop +/* 17DB28 8024F248 00000000 */ nop /* 17DB2C 8024F24C 46200020 */ cvt.s.d $f0, $f0 /* 17DB30 8024F250 E600FFD4 */ swc1 $f0, -0x2c($s0) /* 17DB34 8024F254 C4800000 */ lwc1 $f0, ($a0) /* 17DB38 8024F258 44941000 */ mtc1 $s4, $f2 -/* 17DB3C 8024F25C 00000000 */ nop +/* 17DB3C 8024F25C 00000000 */ nop /* 17DB40 8024F260 468010A0 */ cvt.s.w $f2, $f2 /* 17DB44 8024F264 46020002 */ mul.s $f0, $f0, $f2 -/* 17DB48 8024F268 00000000 */ nop +/* 17DB48 8024F268 00000000 */ nop /* 17DB4C 8024F26C 46140002 */ mul.s $f0, $f0, $f20 -/* 17DB50 8024F270 00000000 */ nop +/* 17DB50 8024F270 00000000 */ nop /* 17DB54 8024F274 E600FFC0 */ swc1 $f0, -0x40($s0) /* 17DB58 8024F278 C4600000 */ lwc1 $f0, ($v1) /* 17DB5C 8024F27C 46140002 */ mul.s $f0, $f0, $f20 -/* 17DB60 8024F280 00000000 */ nop +/* 17DB60 8024F280 00000000 */ nop /* 17DB64 8024F284 E600FFC4 */ swc1 $f0, -0x3c($s0) /* 17DB68 8024F288 C4400000 */ lwc1 $f0, ($v0) /* 17DB6C 8024F28C 46140002 */ mul.s $f0, $f0, $f20 -/* 17DB70 8024F290 00000000 */ nop +/* 17DB70 8024F290 00000000 */ nop /* 17DB74 8024F294 26520001 */ addiu $s2, $s2, 1 /* 17DB78 8024F298 0220102D */ daddu $v0, $s1, $zero /* 17DB7C 8024F29C 06210002 */ bgez $s1, .L8024F2A8 @@ -200,11 +200,11 @@ glabel func_8024EFE0 /* 17DBA8 8024F2C8 00481021 */ addu $v0, $v0, $t0 /* 17DBAC 8024F2CC C4420000 */ lwc1 $f2, ($v0) /* 17DBB0 8024F2D0 46161082 */ mul.s $f2, $f2, $f22 -/* 17DBB4 8024F2D4 00000000 */ nop +/* 17DBB4 8024F2D4 00000000 */ nop /* 17DBB8 8024F2D8 3C014334 */ lui $at, 0x4334 /* 17DBBC 8024F2DC 44816000 */ mtc1 $at, $f12 /* 17DBC0 8024F2E0 449E0000 */ mtc1 $fp, $f0 -/* 17DBC4 8024F2E4 00000000 */ nop +/* 17DBC4 8024F2E4 00000000 */ nop /* 17DBC8 8024F2E8 46800020 */ cvt.s.w $f0, $f0 /* 17DBCC 8024F2EC AE00FFE0 */ sw $zero, -0x20($s0) /* 17DBD0 8024F2F0 E600FFE4 */ swc1 $f0, -0x1c($s0) diff --git a/asm/nonmatchings/code_17D6A0/func_8024F394.s b/asm/nonmatchings/code_17D6A0/func_8024F394.s index 68ac8ed929..43a665d396 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024F394.s +++ b/asm/nonmatchings/code_17D6A0/func_8024F394.s @@ -39,13 +39,13 @@ glabel func_8024F394 /* 17DCF4 8024F414 0C0483C1 */ jal func_80120F04 /* 17DCF8 8024F418 0220202D */ daddu $a0, $s1, $zero /* 17DCFC 8024F41C 08093D5A */ j .L8024F568 -/* 17DD00 8024F420 00000000 */ nop +/* 17DD00 8024F420 00000000 */ nop .L8024F424: /* 17DD04 8024F424 0C0483C1 */ jal func_80120F04 /* 17DD08 8024F428 0220202D */ daddu $a0, $s1, $zero /* 17DD0C 8024F42C 8E02FFDC */ lw $v0, -0x24($s0) /* 17DD10 8024F430 0440000D */ bltz $v0, .L8024F468 -/* 17DD14 8024F434 00000000 */ nop +/* 17DD14 8024F434 00000000 */ nop /* 17DD18 8024F438 C606FFF4 */ lwc1 $f6, -0xc($s0) /* 17DD1C 8024F43C C600FFD0 */ lwc1 $f0, -0x30($s0) /* 17DD20 8024F440 C604FFF8 */ lwc1 $f4, -8($s0) @@ -76,7 +76,7 @@ glabel func_8024F394 /* 17DD80 8024F4A0 D424CD90 */ ldc1 $f4, %lo(D_8029CD90)($at) /* 17DD84 8024F4A4 460010A1 */ cvt.d.s $f2, $f2 /* 17DD88 8024F4A8 46241082 */ mul.d $f2, $f2, $f4 -/* 17DD8C 8024F4AC 00000000 */ nop +/* 17DD8C 8024F4AC 00000000 */ nop /* 17DD90 8024F4B0 8E02FFDC */ lw $v0, -0x24($s0) /* 17DD94 8024F4B4 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 17DD98 8024F4B8 2842000A */ slti $v0, $v0, 0xa @@ -86,15 +86,15 @@ glabel func_8024F394 /* 17DDA8 8024F4C8 C604FFC4 */ lwc1 $f4, -0x3c($s0) /* 17DDAC 8024F4CC 46002121 */ cvt.d.s $f4, $f4 /* 17DDB0 8024F4D0 46342102 */ mul.d $f4, $f4, $f20 -/* 17DDB4 8024F4D4 00000000 */ nop +/* 17DDB4 8024F4D4 00000000 */ nop /* 17DDB8 8024F4D8 C600FFCC */ lwc1 $f0, -0x34($s0) /* 17DDBC 8024F4DC 46000021 */ cvt.d.s $f0, $f0 /* 17DDC0 8024F4E0 46340002 */ mul.d $f0, $f0, $f20 -/* 17DDC4 8024F4E4 00000000 */ nop +/* 17DDC4 8024F4E4 00000000 */ nop /* 17DDC8 8024F4E8 C602FFC8 */ lwc1 $f2, -0x38($s0) /* 17DDCC 8024F4EC 460010A1 */ cvt.d.s $f2, $f2 /* 17DDD0 8024F4F0 46341082 */ mul.d $f2, $f2, $f20 -/* 17DDD4 8024F4F4 00000000 */ nop +/* 17DDD4 8024F4F4 00000000 */ nop /* 17DDD8 8024F4F8 46202120 */ cvt.s.d $f4, $f4 /* 17DDDC 8024F4FC 46200020 */ cvt.s.d $f0, $f0 /* 17DDE0 8024F500 E604FFC4 */ swc1 $f4, -0x3c($s0) @@ -128,7 +128,7 @@ glabel func_8024F394 /* 17DE44 8024F564 2652004C */ addiu $s2, $s2, 0x4c .L8024F568: /* 17DE48 8024F568 16A00006 */ bnez $s5, .L8024F584 -/* 17DE4C 8024F56C 00000000 */ nop +/* 17DE4C 8024F56C 00000000 */ nop /* 17DE50 8024F570 0C00AB4B */ jal heap_free /* 17DE54 8024F574 8E840018 */ lw $a0, 0x18($s4) /* 17DE58 8024F578 0280202D */ daddu $a0, $s4, $zero diff --git a/asm/nonmatchings/code_17D6A0/func_8024F5AC.s b/asm/nonmatchings/code_17D6A0/func_8024F5AC.s index e4d40f2b4c..86583518b8 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024F5AC.s +++ b/asm/nonmatchings/code_17D6A0/func_8024F5AC.s @@ -41,7 +41,7 @@ glabel func_8024F5AC /* 17DF18 8024F638 26940001 */ addiu $s4, $s4, 1 /* 17DF1C 8024F63C 8E22FFF0 */ lw $v0, -0x10($s1) /* 17DF20 8024F640 1440003B */ bnez $v0, .L8024F730 -/* 17DF24 8024F644 00000000 */ nop +/* 17DF24 8024F644 00000000 */ nop /* 17DF28 8024F648 8E250004 */ lw $a1, 4($s1) /* 17DF2C 8024F64C 8E260008 */ lw $a2, 8($s1) /* 17DF30 8024F650 8E27000C */ lw $a3, 0xc($s1) diff --git a/asm/nonmatchings/code_17D6A0/func_8024F7C8.s b/asm/nonmatchings/code_17D6A0/func_8024F7C8.s index 451e424e20..b3cf6a587b 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024F7C8.s +++ b/asm/nonmatchings/code_17D6A0/func_8024F7C8.s @@ -39,4 +39,4 @@ glabel func_8024F7C8 /* 17E11C 8024F83C 1440FFE7 */ bnez $v0, .L8024F7DC /* 17E120 8024F840 24C6001C */ addiu $a2, $a2, 0x1c /* 17E124 8024F844 03E00008 */ jr $ra -/* 17E128 8024F848 00000000 */ nop +/* 17E128 8024F848 00000000 */ nop diff --git a/asm/nonmatchings/code_17D6A0/func_8024F84C.s b/asm/nonmatchings/code_17D6A0/func_8024F84C.s index 6de32c5130..d3a44d770d 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024F84C.s +++ b/asm/nonmatchings/code_17D6A0/func_8024F84C.s @@ -40,13 +40,13 @@ glabel func_8024F84C /* 17E1B8 8024F8D8 0C0B1EAF */ jal get_variable /* 17E1BC 8024F8DC 0040802D */ daddu $s0, $v0, $zero /* 17E1C0 8024F8E0 44956000 */ mtc1 $s5, $f12 -/* 17E1C4 8024F8E4 00000000 */ nop +/* 17E1C4 8024F8E4 00000000 */ nop /* 17E1C8 8024F8E8 46806320 */ cvt.s.w $f12, $f12 /* 17E1CC 8024F8EC 44947000 */ mtc1 $s4, $f14 -/* 17E1D0 8024F8F0 00000000 */ nop +/* 17E1D0 8024F8F0 00000000 */ nop /* 17E1D4 8024F8F4 468073A0 */ cvt.s.w $f14, $f14 /* 17E1D8 8024F8F8 44930000 */ mtc1 $s3, $f0 -/* 17E1DC 8024F8FC 00000000 */ nop +/* 17E1DC 8024F8FC 00000000 */ nop /* 17E1E0 8024F900 46800020 */ cvt.s.w $f0, $f0 /* 17E1E4 8024F904 44060000 */ mfc1 $a2, $f0 /* 17E1E8 8024F908 0240382D */ daddu $a3, $s2, $zero diff --git a/asm/nonmatchings/code_17D6A0/func_8024F940.s b/asm/nonmatchings/code_17D6A0/func_8024F940.s index 59d200b0e0..93a36400b3 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024F940.s +++ b/asm/nonmatchings/code_17D6A0/func_8024F940.s @@ -5,7 +5,7 @@ glabel func_8024F940 /* 17E220 8024F940 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 17E224 8024F944 AFBF0010 */ sw $ra, 0x10($sp) /* 17E228 8024F948 0C093DF2 */ jal func_8024F7C8 -/* 17E22C 8024F94C 00000000 */ nop +/* 17E22C 8024F94C 00000000 */ nop /* 17E230 8024F950 8FBF0010 */ lw $ra, 0x10($sp) /* 17E234 8024F954 24020002 */ addiu $v0, $zero, 2 /* 17E238 8024F958 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_17D6A0/func_8024FAE8.s b/asm/nonmatchings/code_17D6A0/func_8024FAE8.s index 8f29da4448..abc95f48a9 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024FAE8.s +++ b/asm/nonmatchings/code_17D6A0/func_8024FAE8.s @@ -6,4 +6,4 @@ glabel func_8024FAE8 /* 17E3CC 8024FAEC 3C01802A */ lui $at, %hi(D_8029F64C) /* 17E3D0 8024FAF0 A422F64C */ sh $v0, %lo(D_8029F64C)($at) /* 17E3D4 8024FAF4 03E00008 */ jr $ra -/* 17E3D8 8024FAF8 00000000 */ nop +/* 17E3D8 8024FAF8 00000000 */ nop diff --git a/asm/nonmatchings/code_17D6A0/func_8024FAFC.s b/asm/nonmatchings/code_17D6A0/func_8024FAFC.s index 47242bd23b..b413bc3379 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024FAFC.s +++ b/asm/nonmatchings/code_17D6A0/func_8024FAFC.s @@ -5,4 +5,4 @@ glabel func_8024FAFC /* 17E3DC 8024FAFC 3C01802A */ lui $at, %hi(D_8029F64C) /* 17E3E0 8024FB00 A420F64C */ sh $zero, %lo(D_8029F64C)($at) /* 17E3E4 8024FB04 03E00008 */ jr $ra -/* 17E3E8 8024FB08 00000000 */ nop +/* 17E3E8 8024FB08 00000000 */ nop diff --git a/asm/nonmatchings/code_17D6A0/func_8024FB3C.s b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s index 367963b5e4..a6b5a01ff8 100644 --- a/asm/nonmatchings/code_17D6A0/func_8024FB3C.s +++ b/asm/nonmatchings/code_17D6A0/func_8024FB3C.s @@ -19,7 +19,7 @@ glabel func_8024FB3C /* 17E454 8024FB74 00220821 */ addu $at, $at, $v0 /* 17E458 8024FB78 8C22CD98 */ lw $v0, %lo(D_8029CD98)($at) /* 17E45C 8024FB7C 00400008 */ jr $v0 -/* 17E460 8024FB80 00000000 */ nop +/* 17E460 8024FB80 00000000 */ nop /* 17E464 8024FB84 82230016 */ lb $v1, 0x16($s1) /* 17E468 8024FB88 2C620005 */ sltiu $v0, $v1, 5 /* 17E46C 8024FB8C 10400313 */ beqz $v0, .L802507DC @@ -28,13 +28,13 @@ glabel func_8024FB3C /* 17E478 8024FB98 00220821 */ addu $at, $at, $v0 /* 17E47C 8024FB9C 8C22CEF0 */ lw $v0, %lo(D_8029CEF0)($at) /* 17E480 8024FBA0 00400008 */ jr $v0 -/* 17E484 8024FBA4 00000000 */ nop +/* 17E484 8024FBA4 00000000 */ nop /* 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 +/* 17E49C 8024FBBC 00000000 */ nop /* 17E4A0 8024FBC0 3C03802A */ lui $v1, %hi(D_8029F64A) /* 17E4A4 8024FBC4 2463F64A */ addiu $v1, $v1, %lo(D_8029F64A) /* 17E4A8 8024FBC8 80840083 */ lb $a0, 0x83($a0) @@ -54,12 +54,12 @@ glabel func_8024FB3C /* 17E4DC 8024FBFC 10600007 */ beqz $v1, .L8024FC1C /* 17E4E0 8024FC00 3C04FFFE */ lui $a0, 0xfffe /* 17E4E4 8024FC04 080941F7 */ j .L802507DC -/* 17E4E8 8024FC08 00000000 */ nop +/* 17E4E8 8024FC08 00000000 */ nop .L8024FC0C: /* 17E4EC 8024FC0C 10620231 */ beq $v1, $v0, .L802504D4 -/* 17E4F0 8024FC10 00000000 */ nop +/* 17E4F0 8024FC10 00000000 */ nop /* 17E4F4 8024FC14 080941F7 */ j .L802507DC -/* 17E4F8 8024FC18 00000000 */ nop +/* 17E4F8 8024FC18 00000000 */ nop .L8024FC1C: /* 17E4FC 8024FC1C 3C03800E */ lui $v1, %hi(gBattleStatus) /* 17E500 8024FC20 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus) @@ -79,15 +79,15 @@ glabel func_8024FB3C /* 17E538 8024FC58 00220821 */ addu $at, $at, $v0 /* 17E53C 8024FC5C 8C22CF08 */ lw $v0, %lo(D_8029CF08)($at) /* 17E540 8024FC60 00400008 */ jr $v0 -/* 17E544 8024FC64 00000000 */ nop +/* 17E544 8024FC64 00000000 */ nop /* 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 +/* 17E554 8024FC74 00000000 */ nop /* 17E558 8024FC78 3C048011 */ lui $a0, %hi(D_80108E1C) /* 17E55C 8024FC7C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 17E560 8024FC80 0C050529 */ jal create_icon -/* 17E564 8024FC84 00000000 */ nop +/* 17E564 8024FC84 00000000 */ nop /* 17E568 8024FC88 00022400 */ sll $a0, $v0, 0x10 /* 17E56C 8024FC8C 00042403 */ sra $a0, $a0, 0x10 /* 17E570 8024FC90 34058080 */ ori $a1, $zero, 0x8080 @@ -102,7 +102,7 @@ glabel func_8024FB3C /* 17E594 8024FCB4 3C048029 */ lui $a0, %hi(D_80292788) /* 17E598 8024FCB8 24842788 */ addiu $a0, $a0, %lo(D_80292788) /* 17E59C 8024FCBC 0C050529 */ jal create_icon -/* 17E5A0 8024FCC0 00000000 */ nop +/* 17E5A0 8024FCC0 00000000 */ nop /* 17E5A4 8024FCC4 00022400 */ sll $a0, $v0, 0x10 /* 17E5A8 8024FCC8 00042403 */ sra $a0, $a0, 0x10 /* 17E5AC 8024FCCC 3C10802A */ lui $s0, %hi(D_8029F644) @@ -112,7 +112,7 @@ glabel func_8024FB3C /* 17E5BC 8024FCDC 3C048011 */ lui $a0, %hi(D_80108E1C) /* 17E5C0 8024FCE0 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 17E5C4 8024FCE4 0C050529 */ jal create_icon -/* 17E5C8 8024FCE8 00000000 */ nop +/* 17E5C8 8024FCE8 00000000 */ nop /* 17E5CC 8024FCEC 00022400 */ sll $a0, $v0, 0x10 /* 17E5D0 8024FCF0 00042403 */ sra $a0, $a0, 0x10 /* 17E5D4 8024FCF4 34058080 */ ori $a1, $zero, 0x8080 @@ -127,7 +127,7 @@ glabel func_8024FB3C /* 17E5F8 8024FD18 3C048029 */ lui $a0, %hi(D_802936D4) /* 17E5FC 8024FD1C 248436D4 */ addiu $a0, $a0, %lo(D_802936D4) /* 17E600 8024FD20 0C050529 */ jal create_icon -/* 17E604 8024FD24 00000000 */ nop +/* 17E604 8024FD24 00000000 */ nop /* 17E608 8024FD28 00022400 */ sll $a0, $v0, 0x10 /* 17E60C 8024FD2C 00042403 */ sra $a0, $a0, 0x10 /* 17E610 8024FD30 3C10802A */ lui $s0, %hi(D_8029F644) @@ -137,7 +137,7 @@ glabel func_8024FB3C /* 17E620 8024FD40 3C048029 */ lui $a0, %hi(D_8029259C) /* 17E624 8024FD44 2484259C */ addiu $a0, $a0, %lo(D_8029259C) /* 17E628 8024FD48 0C050529 */ jal create_icon -/* 17E62C 8024FD4C 00000000 */ nop +/* 17E62C 8024FD4C 00000000 */ nop /* 17E630 8024FD50 00022400 */ sll $a0, $v0, 0x10 /* 17E634 8024FD54 00042403 */ sra $a0, $a0, 0x10 /* 17E638 8024FD58 34058080 */ ori $a1, $zero, 0x8080 @@ -152,7 +152,7 @@ glabel func_8024FB3C /* 17E65C 8024FD7C 3C048029 */ lui $a0, %hi(D_80292630) /* 17E660 8024FD80 24842630 */ addiu $a0, $a0, %lo(D_80292630) /* 17E664 8024FD84 0C050529 */ jal create_icon -/* 17E668 8024FD88 00000000 */ nop +/* 17E668 8024FD88 00000000 */ nop /* 17E66C 8024FD8C 00022400 */ sll $a0, $v0, 0x10 /* 17E670 8024FD90 00042403 */ sra $a0, $a0, 0x10 /* 17E674 8024FD94 24050080 */ addiu $a1, $zero, 0x80 @@ -167,7 +167,7 @@ glabel func_8024FB3C /* 17E698 8024FDB8 3C048029 */ lui $a0, %hi(D_80292438) /* 17E69C 8024FDBC 24842438 */ addiu $a0, $a0, %lo(D_80292438) /* 17E6A0 8024FDC0 0C050529 */ jal create_icon -/* 17E6A4 8024FDC4 00000000 */ nop +/* 17E6A4 8024FDC4 00000000 */ nop /* 17E6A8 8024FDC8 00022400 */ sll $a0, $v0, 0x10 /* 17E6AC 8024FDCC 00042403 */ sra $a0, $a0, 0x10 /* 17E6B0 8024FDD0 24050080 */ addiu $a1, $zero, 0x80 @@ -182,7 +182,7 @@ glabel func_8024FB3C /* 17E6D4 8024FDF4 3C048029 */ lui $a0, %hi(D_802924CC) /* 17E6D8 8024FDF8 248424CC */ addiu $a0, $a0, %lo(D_802924CC) /* 17E6DC 8024FDFC 0C050529 */ jal create_icon -/* 17E6E0 8024FE00 00000000 */ nop +/* 17E6E0 8024FE00 00000000 */ nop /* 17E6E4 8024FE04 00022400 */ sll $a0, $v0, 0x10 /* 17E6E8 8024FE08 00042403 */ sra $a0, $a0, 0x10 /* 17E6EC 8024FE0C 3C10802A */ lui $s0, %hi(D_8029F648) @@ -192,11 +192,11 @@ glabel func_8024FB3C /* 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 +/* 17E708 8024FE28 00000000 */ nop /* 17E70C 8024FE2C 3C048011 */ lui $a0, %hi(D_80108B28) /* 17E710 8024FE30 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 17E714 8024FE34 0C050529 */ jal create_icon -/* 17E718 8024FE38 00000000 */ nop +/* 17E718 8024FE38 00000000 */ nop /* 17E71C 8024FE3C 00022400 */ sll $a0, $v0, 0x10 /* 17E720 8024FE40 00042403 */ sra $a0, $a0, 0x10 /* 17E724 8024FE44 34058080 */ ori $a1, $zero, 0x8080 @@ -211,7 +211,7 @@ glabel func_8024FB3C /* 17E748 8024FE68 3C048029 */ lui $a0, %hi(D_8029231C) /* 17E74C 8024FE6C 2484231C */ addiu $a0, $a0, %lo(D_8029231C) /* 17E750 8024FE70 0C050529 */ jal create_icon -/* 17E754 8024FE74 00000000 */ nop +/* 17E754 8024FE74 00000000 */ nop /* 17E758 8024FE78 00022400 */ sll $a0, $v0, 0x10 /* 17E75C 8024FE7C 00042403 */ sra $a0, $a0, 0x10 /* 17E760 8024FE80 34058080 */ ori $a1, $zero, 0x8080 @@ -226,7 +226,7 @@ glabel func_8024FB3C /* 17E784 8024FEA4 3C048029 */ lui $a0, %hi(D_80292630) /* 17E788 8024FEA8 24842630 */ addiu $a0, $a0, %lo(D_80292630) /* 17E78C 8024FEAC 0C050529 */ jal create_icon -/* 17E790 8024FEB0 00000000 */ nop +/* 17E790 8024FEB0 00000000 */ nop /* 17E794 8024FEB4 00022400 */ sll $a0, $v0, 0x10 /* 17E798 8024FEB8 00042403 */ sra $a0, $a0, 0x10 /* 17E79C 8024FEBC 3C10802A */ lui $s0, %hi(D_8029F646) @@ -236,11 +236,11 @@ glabel func_8024FB3C /* 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 +/* 17E7B8 8024FED8 00000000 */ nop /* 17E7BC 8024FEDC 3C048029 */ lui $a0, %hi(D_80292788) /* 17E7C0 8024FEE0 24842788 */ addiu $a0, $a0, %lo(D_80292788) /* 17E7C4 8024FEE4 0C050529 */ jal create_icon -/* 17E7C8 8024FEE8 00000000 */ nop +/* 17E7C8 8024FEE8 00000000 */ nop /* 17E7CC 8024FEEC 00022400 */ sll $a0, $v0, 0x10 /* 17E7D0 8024FEF0 00042403 */ sra $a0, $a0, 0x10 /* 17E7D4 8024FEF4 24050080 */ addiu $a1, $zero, 0x80 @@ -255,7 +255,7 @@ glabel func_8024FB3C /* 17E7F8 8024FF18 3C048011 */ lui $a0, %hi(D_80108B28) /* 17E7FC 8024FF1C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 17E800 8024FF20 0C050529 */ jal create_icon -/* 17E804 8024FF24 00000000 */ nop +/* 17E804 8024FF24 00000000 */ nop /* 17E808 8024FF28 00022400 */ sll $a0, $v0, 0x10 /* 17E80C 8024FF2C 00042403 */ sra $a0, $a0, 0x10 /* 17E810 8024FF30 3C10802A */ lui $s0, %hi(D_8029F644) @@ -265,7 +265,7 @@ glabel func_8024FB3C /* 17E820 8024FF40 3C048011 */ lui $a0, %hi(D_80108B28) /* 17E824 8024FF44 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 17E828 8024FF48 0C050529 */ jal create_icon -/* 17E82C 8024FF4C 00000000 */ nop +/* 17E82C 8024FF4C 00000000 */ nop /* 17E830 8024FF50 00022400 */ sll $a0, $v0, 0x10 /* 17E834 8024FF54 00042403 */ sra $a0, $a0, 0x10 /* 17E838 8024FF58 34058080 */ ori $a1, $zero, 0x8080 @@ -280,7 +280,7 @@ glabel func_8024FB3C /* 17E85C 8024FF7C 3C048029 */ lui $a0, %hi(D_8029231C) /* 17E860 8024FF80 2484231C */ addiu $a0, $a0, %lo(D_8029231C) /* 17E864 8024FF84 0C050529 */ jal create_icon -/* 17E868 8024FF88 00000000 */ nop +/* 17E868 8024FF88 00000000 */ nop /* 17E86C 8024FF8C 86040000 */ lh $a0, ($s0) /* 17E870 8024FF90 3C01802A */ lui $at, %hi(D_8029F644) /* 17E874 8024FF94 A422F644 */ sh $v0, %lo(D_8029F644)($at) @@ -289,7 +289,7 @@ glabel func_8024FB3C /* 17E880 8024FFA0 3C048011 */ lui $a0, %hi(D_80108B28) /* 17E884 8024FFA4 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 17E888 8024FFA8 0C050529 */ jal create_icon -/* 17E88C 8024FFAC 00000000 */ nop +/* 17E88C 8024FFAC 00000000 */ nop /* 17E890 8024FFB0 00022400 */ sll $a0, $v0, 0x10 /* 17E894 8024FFB4 00042403 */ sra $a0, $a0, 0x10 /* 17E898 8024FFB8 34058080 */ ori $a1, $zero, 0x8080 @@ -304,7 +304,7 @@ glabel func_8024FB3C /* 17E8BC 8024FFDC 3C048029 */ lui $a0, %hi(D_8029231C) /* 17E8C0 8024FFE0 2484231C */ addiu $a0, $a0, %lo(D_8029231C) /* 17E8C4 8024FFE4 0C050529 */ jal create_icon -/* 17E8C8 8024FFE8 00000000 */ nop +/* 17E8C8 8024FFE8 00000000 */ nop /* 17E8CC 8024FFEC 00022400 */ sll $a0, $v0, 0x10 /* 17E8D0 8024FFF0 00042403 */ sra $a0, $a0, 0x10 /* 17E8D4 8024FFF4 3C10802A */ lui $s0, %hi(D_8029F644) @@ -314,7 +314,7 @@ glabel func_8024FB3C /* 17E8E4 80250004 3C048029 */ lui $a0, %hi(D_80292788) /* 17E8E8 80250008 24842788 */ addiu $a0, $a0, %lo(D_80292788) /* 17E8EC 8025000C 0C050529 */ jal create_icon -/* 17E8F0 80250010 00000000 */ nop +/* 17E8F0 80250010 00000000 */ nop /* 17E8F4 80250014 00022400 */ sll $a0, $v0, 0x10 /* 17E8F8 80250018 00042403 */ sra $a0, $a0, 0x10 /* 17E8FC 8025001C 24050080 */ addiu $a1, $zero, 0x80 @@ -329,7 +329,7 @@ glabel func_8024FB3C /* 17E920 80250040 3C048011 */ lui $a0, %hi(D_80108B54) /* 17E924 80250044 24848B54 */ addiu $a0, $a0, %lo(D_80108B54) /* 17E928 80250048 0C050529 */ jal create_icon -/* 17E92C 8025004C 00000000 */ nop +/* 17E92C 8025004C 00000000 */ nop /* 17E930 80250050 00022400 */ sll $a0, $v0, 0x10 /* 17E934 80250054 00042403 */ sra $a0, $a0, 0x10 /* 17E938 80250058 3C10802A */ lui $s0, %hi(D_8029F644) @@ -339,7 +339,7 @@ glabel func_8024FB3C /* 17E948 80250068 3C048011 */ lui $a0, %hi(D_80108E1C) /* 17E94C 8025006C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 17E950 80250070 0C050529 */ jal create_icon -/* 17E954 80250074 00000000 */ nop +/* 17E954 80250074 00000000 */ nop /* 17E958 80250078 00022400 */ sll $a0, $v0, 0x10 /* 17E95C 8025007C 00042403 */ sra $a0, $a0, 0x10 /* 17E960 80250080 34058080 */ ori $a1, $zero, 0x8080 @@ -354,7 +354,7 @@ glabel func_8024FB3C /* 17E984 802500A4 3C048029 */ lui $a0, %hi(D_802936D4) /* 17E988 802500A8 248436D4 */ addiu $a0, $a0, %lo(D_802936D4) /* 17E98C 802500AC 0C050529 */ jal create_icon -/* 17E990 802500B0 00000000 */ nop +/* 17E990 802500B0 00000000 */ nop /* 17E994 802500B4 00022400 */ sll $a0, $v0, 0x10 /* 17E998 802500B8 00042403 */ sra $a0, $a0, 0x10 /* 17E99C 802500BC 34058080 */ ori $a1, $zero, 0x8080 @@ -368,11 +368,11 @@ glabel func_8024FB3C /* 17E9BC 802500DC 00A0302D */ daddu $a2, $a1, $zero /* 17E9C0 802500E0 86040000 */ lh $a0, ($s0) /* 17E9C4 802500E4 0C0513F6 */ jal func_80144FD8 -/* 17E9C8 802500E8 00000000 */ nop +/* 17E9C8 802500E8 00000000 */ nop /* 17E9CC 802500EC 3C048029 */ lui $a0, %hi(D_8029369C) /* 17E9D0 802500F0 2484369C */ addiu $a0, $a0, %lo(D_8029369C) /* 17E9D4 802500F4 0C050529 */ jal create_icon -/* 17E9D8 802500F8 00000000 */ nop +/* 17E9D8 802500F8 00000000 */ nop /* 17E9DC 802500FC 00022400 */ sll $a0, $v0, 0x10 /* 17E9E0 80250100 00042403 */ sra $a0, $a0, 0x10 /* 17E9E4 80250104 34058080 */ ori $a1, $zero, 0x8080 @@ -387,13 +387,13 @@ glabel func_8024FB3C /* 17EA04 80250124 00A0302D */ daddu $a2, $a1, $zero /* 17EA08 80250128 86040000 */ lh $a0, ($s0) /* 17EA0C 8025012C 0C0513F6 */ jal func_80144FD8 -/* 17EA10 80250130 00000000 */ nop +/* 17EA10 80250130 00000000 */ nop /* 17EA14 80250134 080941EB */ j .L802507AC /* 17EA18 80250138 24020001 */ addiu $v0, $zero, 1 /* 17EA1C 8025013C 3C048011 */ lui $a0, %hi(D_80108B28) /* 17EA20 80250140 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 17EA24 80250144 0C050529 */ jal create_icon -/* 17EA28 80250148 00000000 */ nop +/* 17EA28 80250148 00000000 */ nop /* 17EA2C 8025014C 00022400 */ sll $a0, $v0, 0x10 /* 17EA30 80250150 00042403 */ sra $a0, $a0, 0x10 /* 17EA34 80250154 34058080 */ ori $a1, $zero, 0x8080 @@ -409,7 +409,7 @@ glabel func_8024FB3C /* 17EA5C 8025017C 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) .L80250180: /* 17EA60 80250180 0C050529 */ jal create_icon -/* 17EA64 80250184 00000000 */ nop +/* 17EA64 80250184 00000000 */ nop /* 17EA68 80250188 00022400 */ sll $a0, $v0, 0x10 /* 17EA6C 8025018C 00042403 */ sra $a0, $a0, 0x10 /* 17EA70 80250190 080941E1 */ j .L80250784 @@ -450,167 +450,167 @@ glabel func_8024FB3C /* 17EAF4 80250214 00220821 */ addu $at, $at, $v0 /* 17EAF8 80250218 8C22CF60 */ lw $v0, %lo(D_8029CF60)($at) /* 17EAFC 8025021C 00400008 */ jr $v0 -/* 17EB00 80250220 00000000 */ nop +/* 17EB00 80250220 00000000 */ nop /* 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 +/* 17EB18 80250238 00000000 */ nop /* 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 +/* 17EB30 80250250 00000000 */ nop /* 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) /* 17EB40 80250260 24A58F90 */ addiu $a1, $a1, %lo(D_80108F90) /* 17EB44 80250264 0C0511FF */ jal set_menu_icon_script -/* 17EB48 80250268 00000000 */ nop +/* 17EB48 80250268 00000000 */ nop /* 17EB4C 8025026C 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EB50 80250270 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EB54 80250274 3C058029 */ lui $a1, %hi(D_802927B4) /* 17EB58 80250278 24A527B4 */ addiu $a1, $a1, %lo(D_802927B4) /* 17EB5C 8025027C 0809412D */ j .L802504B4 -/* 17EB60 80250280 00000000 */ nop +/* 17EB60 80250280 00000000 */ nop /* 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) /* 17EB70 80250290 24A58F90 */ addiu $a1, $a1, %lo(D_80108F90) /* 17EB74 80250294 0C0511FF */ jal set_menu_icon_script -/* 17EB78 80250298 00000000 */ nop +/* 17EB78 80250298 00000000 */ nop /* 17EB7C 8025029C 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EB80 802502A0 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EB84 802502A4 3C058029 */ lui $a1, %hi(D_802936D4) /* 17EB88 802502A8 24A536D4 */ addiu $a1, $a1, %lo(D_802936D4) /* 17EB8C 802502AC 0809412D */ j .L802504B4 -/* 17EB90 802502B0 00000000 */ nop +/* 17EB90 802502B0 00000000 */ nop /* 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) /* 17EBA0 802502C0 24A525F4 */ addiu $a1, $a1, %lo(D_802925F4) /* 17EBA4 802502C4 0C0511FF */ jal set_menu_icon_script -/* 17EBA8 802502C8 00000000 */ nop +/* 17EBA8 802502C8 00000000 */ nop /* 17EBAC 802502CC 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EBB0 802502D0 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EBB4 802502D4 3C058029 */ lui $a1, %hi(D_80292688) /* 17EBB8 802502D8 24A52688 */ addiu $a1, $a1, %lo(D_80292688) /* 17EBBC 802502DC 0C0511FF */ jal set_menu_icon_script -/* 17EBC0 802502E0 00000000 */ nop +/* 17EBC0 802502E0 00000000 */ nop /* 17EBC4 802502E4 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EBC8 802502E8 8484F646 */ lh $a0, %lo(D_8029F646)($a0) /* 17EBCC 802502EC 3C058029 */ lui $a1, %hi(D_80292490) /* 17EBD0 802502F0 24A52490 */ addiu $a1, $a1, %lo(D_80292490) /* 17EBD4 802502F4 0C0511FF */ jal set_menu_icon_script -/* 17EBD8 802502F8 00000000 */ nop +/* 17EBD8 802502F8 00000000 */ nop /* 17EBDC 802502FC 3C04802A */ lui $a0, %hi(D_8029F648) /* 17EBE0 80250300 8484F648 */ lh $a0, %lo(D_8029F648)($a0) /* 17EBE4 80250304 3C058029 */ lui $a1, %hi(D_80292524) /* 17EBE8 80250308 24A52524 */ addiu $a1, $a1, %lo(D_80292524) /* 17EBEC 8025030C 0809412D */ j .L802504B4 -/* 17EBF0 80250310 00000000 */ nop +/* 17EBF0 80250310 00000000 */ nop /* 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 +/* 17EC08 80250328 00000000 */ nop /* 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) /* 17EC18 80250338 24A58BBC */ addiu $a1, $a1, %lo(D_80108BBC) /* 17EC1C 8025033C 0C0511FF */ jal set_menu_icon_script -/* 17EC20 80250340 00000000 */ nop +/* 17EC20 80250340 00000000 */ nop /* 17EC24 80250344 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EC28 80250348 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EC2C 8025034C 3C058029 */ lui $a1, %hi(D_802923B0) /* 17EC30 80250350 24A523B0 */ addiu $a1, $a1, %lo(D_802923B0) /* 17EC34 80250354 0C0511FF */ jal set_menu_icon_script -/* 17EC38 80250358 00000000 */ nop +/* 17EC38 80250358 00000000 */ nop /* 17EC3C 8025035C 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EC40 80250360 8484F646 */ lh $a0, %lo(D_8029F646)($a0) /* 17EC44 80250364 3C058029 */ lui $a1, %hi(D_802926C4) /* 17EC48 80250368 24A526C4 */ addiu $a1, $a1, %lo(D_802926C4) /* 17EC4C 8025036C 0809412D */ j .L802504B4 -/* 17EC50 80250370 00000000 */ nop +/* 17EC50 80250370 00000000 */ nop /* 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 +/* 17EC68 80250388 00000000 */ nop /* 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) /* 17EC78 80250398 24A527B4 */ addiu $a1, $a1, %lo(D_802927B4) /* 17EC7C 8025039C 0C0511FF */ jal set_menu_icon_script -/* 17EC80 802503A0 00000000 */ nop +/* 17EC80 802503A0 00000000 */ nop /* 17EC84 802503A4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EC88 802503A8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EC8C 802503AC 3C058011 */ lui $a1, %hi(D_80108B80) /* 17EC90 802503B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 17EC94 802503B4 0809412D */ j .L802504B4 -/* 17EC98 802503B8 00000000 */ nop +/* 17EC98 802503B8 00000000 */ nop /* 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) /* 17ECA8 802503C8 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 17ECAC 802503CC 0C0511FF */ jal set_menu_icon_script -/* 17ECB0 802503D0 00000000 */ nop +/* 17ECB0 802503D0 00000000 */ nop /* 17ECB4 802503D4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17ECB8 802503D8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17ECBC 802503DC 3C058029 */ lui $a1, %hi(D_802923FC) /* 17ECC0 802503E0 24A523FC */ addiu $a1, $a1, %lo(D_802923FC) /* 17ECC4 802503E4 0809412D */ j .L802504B4 -/* 17ECC8 802503E8 00000000 */ nop +/* 17ECC8 802503E8 00000000 */ nop /* 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) /* 17ECD8 802503F8 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 17ECDC 802503FC 0C0511FF */ jal set_menu_icon_script -/* 17ECE0 80250400 00000000 */ nop +/* 17ECE0 80250400 00000000 */ nop /* 17ECE4 80250404 3C04802A */ lui $a0, %hi(D_8029F644) /* 17ECE8 80250408 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17ECEC 8025040C 3C058029 */ lui $a1, %hi(D_80292374) /* 17ECF0 80250410 24A52374 */ addiu $a1, $a1, %lo(D_80292374) /* 17ECF4 80250414 0809412D */ j .L802504B4 -/* 17ECF8 80250418 00000000 */ nop +/* 17ECF8 80250418 00000000 */ nop /* 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 +/* 17ED10 80250430 00000000 */ nop /* 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) /* 17ED20 80250440 24A527B4 */ addiu $a1, $a1, %lo(D_802927B4) /* 17ED24 80250444 0C0511FF */ jal set_menu_icon_script -/* 17ED28 80250448 00000000 */ nop +/* 17ED28 80250448 00000000 */ nop /* 17ED2C 8025044C 3C04802A */ lui $a0, %hi(D_8029F644) /* 17ED30 80250450 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17ED34 80250454 0809412B */ j .L802504AC -/* 17ED38 80250458 00000000 */ nop +/* 17ED38 80250458 00000000 */ nop /* 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 +/* 17ED50 80250470 00000000 */ nop /* 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 +/* 17ED68 80250488 00000000 */ nop /* 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 +/* 17ED80 802504A0 00000000 */ nop /* 17ED84 802504A4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17ED88 802504A8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) .L802504AC: @@ -618,7 +618,7 @@ glabel func_8024FB3C /* 17ED90 802504B0 24A58BBC */ addiu $a1, $a1, %lo(D_80108BBC) .L802504B4: /* 17ED94 802504B4 0C0511FF */ jal set_menu_icon_script -/* 17ED98 802504B8 00000000 */ nop +/* 17ED98 802504B8 00000000 */ nop .L802504BC: /* 17ED9C 802504BC 86230014 */ lh $v1, 0x14($s1) /* 17EDA0 802504C0 2402FFFF */ addiu $v0, $zero, -1 @@ -633,7 +633,7 @@ glabel func_8024FB3C /* 17EDC0 802504E0 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 17EDC4 802504E4 00431024 */ and $v0, $v0, $v1 /* 17EDC8 802504E8 104000BC */ beqz $v0, .L802507DC -/* 17EDCC 802504EC 00000000 */ nop +/* 17EDCC 802504EC 00000000 */ nop .L802504F0: /* 17EDD0 802504F0 3C04802A */ lui $a0, %hi(D_8029F64E) /* 17EDD4 802504F4 2484F64E */ addiu $a0, $a0, %lo(D_8029F64E) @@ -641,7 +641,7 @@ glabel func_8024FB3C /* 17EDDC 802504FC 94830000 */ lhu $v1, ($a0) /* 17EDE0 80250500 284200C0 */ slti $v0, $v0, 0xc0 /* 17EDE4 80250504 1040000C */ beqz $v0, .L80250538 -/* 17EDE8 80250508 00000000 */ nop +/* 17EDE8 80250508 00000000 */ nop /* 17EDEC 8025050C 3C02802A */ lui $v0, %hi(D_8029F64C) /* 17EDF0 80250510 8442F64C */ lh $v0, %lo(D_8029F64C)($v0) /* 17EDF4 80250514 144000B1 */ bnez $v0, .L802507DC @@ -681,48 +681,48 @@ glabel func_8024FB3C /* 17EE74 80250594 00220821 */ addu $at, $at, $v0 /* 17EE78 80250598 8C22CFB8 */ lw $v0, %lo(D_8029CFB8)($at) /* 17EE7C 8025059C 00400008 */ jr $v0 -/* 17EE80 802505A0 00000000 */ nop +/* 17EE80 802505A0 00000000 */ nop /* 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 +/* 17EE90 802505B0 00000000 */ nop /* 17EE94 802505B4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EE98 802505B8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EE9C 802505BC 0C05123D */ jal free_icon -/* 17EEA0 802505C0 00000000 */ nop +/* 17EEA0 802505C0 00000000 */ nop /* 17EEA4 802505C4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EEA8 802505C8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EEAC 802505CC 0809418F */ j .L8025063C -/* 17EEB0 802505D0 00000000 */ nop +/* 17EEB0 802505D0 00000000 */ nop /* 17EEB4 802505D4 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EEB8 802505D8 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EEBC 802505DC 0C05123D */ jal free_icon -/* 17EEC0 802505E0 00000000 */ nop +/* 17EEC0 802505E0 00000000 */ nop /* 17EEC4 802505E4 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EEC8 802505E8 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EECC 802505EC 0C05123D */ jal free_icon -/* 17EED0 802505F0 00000000 */ nop +/* 17EED0 802505F0 00000000 */ nop /* 17EED4 802505F4 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EED8 802505F8 8484F646 */ lh $a0, %lo(D_8029F646)($a0) /* 17EEDC 802505FC 0809418F */ j .L8025063C -/* 17EEE0 80250600 00000000 */ nop +/* 17EEE0 80250600 00000000 */ nop /* 17EEE4 80250604 3C04802A */ lui $a0, %hi(D_8029F642) /* 17EEE8 80250608 8484F642 */ lh $a0, %lo(D_8029F642)($a0) /* 17EEEC 8025060C 0C05123D */ jal free_icon -/* 17EEF0 80250610 00000000 */ nop +/* 17EEF0 80250610 00000000 */ nop /* 17EEF4 80250614 3C04802A */ lui $a0, %hi(D_8029F644) /* 17EEF8 80250618 8484F644 */ lh $a0, %lo(D_8029F644)($a0) /* 17EEFC 8025061C 0C05123D */ jal free_icon -/* 17EF00 80250620 00000000 */ nop +/* 17EF00 80250620 00000000 */ nop /* 17EF04 80250624 3C04802A */ lui $a0, %hi(D_8029F646) /* 17EF08 80250628 8484F646 */ lh $a0, %lo(D_8029F646)($a0) /* 17EF0C 8025062C 0C05123D */ jal free_icon -/* 17EF10 80250630 00000000 */ nop +/* 17EF10 80250630 00000000 */ nop /* 17EF14 80250634 3C04802A */ lui $a0, %hi(D_8029F648) /* 17EF18 80250638 8484F648 */ lh $a0, %lo(D_8029F648)($a0) .L8025063C: /* 17EF1C 8025063C 0C05123D */ jal free_icon -/* 17EF20 80250640 00000000 */ nop +/* 17EF20 80250640 00000000 */ nop .L80250644: /* 17EF24 80250644 3C01802A */ lui $at, %hi(D_8029F64A) /* 17EF28 80250648 A420F64A */ sh $zero, %lo(D_8029F64A)($at) @@ -736,7 +736,7 @@ glabel func_8024FB3C /* 17EF48 80250668 00220821 */ addu $at, $at, $v0 /* 17EF4C 8025066C 8C22D010 */ lw $v0, %lo(D_8029D010)($at) /* 17EF50 80250670 00400008 */ jr $v0 -/* 17EF54 80250674 00000000 */ nop +/* 17EF54 80250674 00000000 */ nop .L80250678: /* 17EF58 80250678 24020002 */ addiu $v0, $zero, 2 /* 17EF5C 8025067C 080941F7 */ j .L802507DC @@ -760,9 +760,9 @@ glabel func_8024FB3C /* 17EFA0 802506C0 10600005 */ beqz $v1, .L802506D8 /* 17EFA4 802506C4 24020001 */ addiu $v0, $zero, 1 /* 17EFA8 802506C8 1062003A */ beq $v1, $v0, .L802507B4 -/* 17EFAC 802506CC 00000000 */ nop +/* 17EFAC 802506CC 00000000 */ nop /* 17EFB0 802506D0 080941F7 */ j .L802507DC -/* 17EFB4 802506D4 00000000 */ nop +/* 17EFB4 802506D4 00000000 */ nop .L802506D8: /* 17EFB8 802506D8 96220012 */ lhu $v0, 0x12($s1) /* 17EFBC 802506DC 2442FFB7 */ addiu $v0, $v0, -0x49 @@ -775,36 +775,36 @@ glabel func_8024FB3C /* 17EFD8 802506F8 00220821 */ addu $at, $at, $v0 /* 17EFDC 802506FC 8C22D028 */ lw $v0, %lo(D_8029D028)($at) /* 17EFE0 80250700 00400008 */ jr $v0 -/* 17EFE4 80250704 00000000 */ nop +/* 17EFE4 80250704 00000000 */ nop /* 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 +/* 17EFF4 80250714 00000000 */ nop /* 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 +/* 17F004 80250724 00000000 */ nop /* 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 +/* 17F014 80250734 00000000 */ nop /* 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 +/* 17F024 80250744 00000000 */ nop /* 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 +/* 17F034 80250754 00000000 */ nop /* 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 +/* 17F044 80250764 00000000 */ nop /* 17F048 80250768 3C048008 */ lui $a0, %hi(D_800807C0) /* 17F04C 8025076C 248407C0 */ addiu $a0, $a0, %lo(D_800807C0) .L80250770: /* 17F050 80250770 0C050529 */ jal create_icon -/* 17F054 80250774 00000000 */ nop +/* 17F054 80250774 00000000 */ nop /* 17F058 80250778 00022400 */ sll $a0, $v0, 0x10 /* 17F05C 8025077C 00042403 */ sra $a0, $a0, 0x10 /* 17F060 80250780 24050080 */ addiu $a1, $zero, 0x80 @@ -815,7 +815,7 @@ glabel func_8024FB3C /* 17F06C 8025078C A6020000 */ sh $v0, ($s0) .L80250790: /* 17F070 80250790 0C051280 */ jal set_icon_flags -/* 17F074 80250794 00000000 */ nop +/* 17F074 80250794 00000000 */ nop /* 17F078 80250798 2405FF9C */ addiu $a1, $zero, -0x64 /* 17F07C 8025079C 86040000 */ lh $a0, ($s0) /* 17F080 802507A0 0C051261 */ jal set_icon_render_pos @@ -840,7 +840,7 @@ glabel func_8024FB3C /* 17F0B8 802507D8 24120001 */ addiu $s2, $zero, 1 .L802507DC: /* 17F0BC 802507DC 12400008 */ beqz $s2, .L80250800 -/* 17F0C0 802507E0 00000000 */ nop +/* 17F0C0 802507E0 00000000 */ nop /* 17F0C4 802507E4 24040009 */ addiu $a0, $zero, 9 /* 17F0C8 802507E8 0C051F9F */ jal func_80147E7C /* 17F0CC 802507EC 24050002 */ addiu $a1, $zero, 2 diff --git a/asm/nonmatchings/code_17D6A0/func_80250818.s b/asm/nonmatchings/code_17D6A0/func_80250818.s index 26623659c3..6498de415c 100644 --- a/asm/nonmatchings/code_17D6A0/func_80250818.s +++ b/asm/nonmatchings/code_17D6A0/func_80250818.s @@ -21,7 +21,7 @@ glabel func_80250818 /* 17F138 80250858 00220821 */ addu $at, $at, $v0 /* 17F13C 8025085C 8C22D048 */ lw $v0, %lo(D_8029D048)($at) /* 17F140 80250860 00400008 */ jr $v0 -/* 17F144 80250864 00000000 */ nop +/* 17F144 80250864 00000000 */ nop /* 17F148 80250868 86620012 */ lh $v0, 0x12($s3) /* 17F14C 8025086C 00021080 */ sll $v0, $v0, 2 /* 17F150 80250870 3C108028 */ lui $s0, %hi(D_80283770) @@ -43,7 +43,7 @@ glabel func_80250818 /* 17F190 802508B0 0C04993B */ jal draw_string /* 17F194 802508B4 02263021 */ addu $a2, $s1, $a2 /* 17F198 802508B8 080943A0 */ j .L80250E80 -/* 17F19C 802508BC 00000000 */ nop +/* 17F19C 802508BC 00000000 */ nop /* 17F1A0 802508C0 86620012 */ lh $v0, 0x12($s3) /* 17F1A4 802508C4 00021080 */ sll $v0, $v0, 2 /* 17F1A8 802508C8 3C108028 */ lui $s0, %hi(D_80283770) @@ -94,7 +94,7 @@ glabel func_80250818 /* 17F258 80250978 0C04993B */ jal draw_string /* 17F25C 8025097C AFA00014 */ sw $zero, 0x14($sp) /* 17F260 80250980 080943A0 */ j .L80250E80 -/* 17F264 80250984 00000000 */ nop +/* 17F264 80250984 00000000 */ nop /* 17F268 80250988 2645001D */ addiu $a1, $s2, 0x1d /* 17F26C 8025098C 26260006 */ addiu $a2, $s1, 6 /* 17F270 80250990 86620012 */ lh $v0, 0x12($s3) @@ -115,7 +115,7 @@ glabel func_80250818 /* 17F2AC 802509CC 0C051261 */ jal set_icon_render_pos /* 17F2B0 802509D0 2626000E */ addiu $a2, $s1, 0xe /* 17F2B4 802509D4 0809439D */ j .L80250E74 -/* 17F2B8 802509D8 00000000 */ nop +/* 17F2B8 802509D8 00000000 */ nop /* 17F2BC 802509DC 82620016 */ lb $v0, 0x16($s3) /* 17F2C0 802509E0 28420002 */ slti $v0, $v0, 2 /* 17F2C4 802509E4 10400002 */ beqz $v0, .L802509F0 @@ -160,7 +160,7 @@ glabel func_80250818 /* 17F358 80250A78 00220821 */ addu $at, $at, $v0 /* 17F35C 80250A7C 8C22D1A0 */ lw $v0, %lo(D_8029D1A0)($at) /* 17F360 80250A80 00400008 */ jr $v0 -/* 17F364 80250A84 00000000 */ nop +/* 17F364 80250A84 00000000 */ nop /* 17F368 80250A88 26450041 */ addiu $a1, $s2, 0x41 /* 17F36C 80250A8C 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F370 80250A90 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -182,7 +182,7 @@ glabel func_80250818 /* 17F3B0 80250AD0 0280282D */ daddu $a1, $s4, $zero /* 17F3B4 80250AD4 86040000 */ lh $a0, ($s0) /* 17F3B8 80250AD8 0C0511EA */ jal draw_icon_0 -/* 17F3BC 80250ADC 00000000 */ nop +/* 17F3BC 80250ADC 00000000 */ nop /* 17F3C0 80250AE0 26450049 */ addiu $a1, $s2, 0x49 /* 17F3C4 80250AE4 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F3C8 80250AE8 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) @@ -190,7 +190,7 @@ glabel func_80250818 /* 17F3D0 80250AF0 0C051261 */ jal set_icon_render_pos /* 17F3D4 80250AF4 2626001F */ addiu $a2, $s1, 0x1f /* 17F3D8 80250AF8 0809439A */ j .L80250E68 -/* 17F3DC 80250AFC 00000000 */ nop +/* 17F3DC 80250AFC 00000000 */ nop /* 17F3E0 80250B00 26450040 */ addiu $a1, $s2, 0x40 /* 17F3E4 80250B04 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F3E8 80250B08 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -228,7 +228,7 @@ glabel func_80250818 /* 17F468 80250B88 0280282D */ daddu $a1, $s4, $zero /* 17F46C 80250B8C 86040000 */ lh $a0, ($s0) /* 17F470 80250B90 0C0511EA */ jal draw_icon_0 -/* 17F474 80250B94 00000000 */ nop +/* 17F474 80250B94 00000000 */ nop /* 17F478 80250B98 26450092 */ addiu $a1, $s2, 0x92 /* 17F47C 80250B9C 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F480 80250BA0 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) @@ -247,13 +247,13 @@ glabel func_80250818 /* 17F4B4 80250BD4 86040000 */ lh $a0, ($s0) /* 17F4B8 80250BD8 4405A000 */ mfc1 $a1, $f20 /* 17F4BC 80250BDC 0C051308 */ jal func_80144C20 -/* 17F4C0 80250BE0 00000000 */ nop +/* 17F4C0 80250BE0 00000000 */ nop /* 17F4C4 80250BE4 86040000 */ lh $a0, ($s0) /* 17F4C8 80250BE8 0C0513AC */ jal icon_set_opacity /* 17F4CC 80250BEC 0280282D */ daddu $a1, $s4, $zero /* 17F4D0 80250BF0 86040000 */ lh $a0, ($s0) /* 17F4D4 80250BF4 0C0511EA */ jal draw_icon_0 -/* 17F4D8 80250BF8 00000000 */ nop +/* 17F4D8 80250BF8 00000000 */ nop /* 17F4DC 80250BFC 26450040 */ addiu $a1, $s2, 0x40 /* 17F4E0 80250C00 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F4E4 80250C04 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) @@ -263,13 +263,13 @@ glabel func_80250818 /* 17F4F4 80250C14 86040000 */ lh $a0, ($s0) /* 17F4F8 80250C18 4405A000 */ mfc1 $a1, $f20 /* 17F4FC 80250C1C 0C051308 */ jal func_80144C20 -/* 17F500 80250C20 00000000 */ nop +/* 17F500 80250C20 00000000 */ nop /* 17F504 80250C24 86040000 */ lh $a0, ($s0) /* 17F508 80250C28 0C0513AC */ jal icon_set_opacity /* 17F50C 80250C2C 0280282D */ daddu $a1, $s4, $zero /* 17F510 80250C30 86040000 */ lh $a0, ($s0) /* 17F514 80250C34 0C0511EA */ jal draw_icon_0 -/* 17F518 80250C38 00000000 */ nop +/* 17F518 80250C38 00000000 */ nop /* 17F51C 80250C3C 2645006C */ addiu $a1, $s2, 0x6c /* 17F520 80250C40 3C10802A */ lui $s0, %hi(D_8029F646) /* 17F524 80250C44 2610F646 */ addiu $s0, $s0, %lo(D_8029F646) @@ -287,7 +287,7 @@ glabel func_80250818 /* 17F554 80250C74 0280282D */ daddu $a1, $s4, $zero /* 17F558 80250C78 86040000 */ lh $a0, ($s0) /* 17F55C 80250C7C 0C0511EA */ jal draw_icon_0 -/* 17F560 80250C80 00000000 */ nop +/* 17F560 80250C80 00000000 */ nop /* 17F564 80250C84 26450041 */ addiu $a1, $s2, 0x41 /* 17F568 80250C88 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F56C 80250C8C 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) @@ -306,13 +306,13 @@ glabel func_80250818 /* 17F5A0 80250CC0 86040000 */ lh $a0, ($s0) /* 17F5A4 80250CC4 4405A000 */ mfc1 $a1, $f20 /* 17F5A8 80250CC8 0C051308 */ jal func_80144C20 -/* 17F5AC 80250CCC 00000000 */ nop +/* 17F5AC 80250CCC 00000000 */ nop /* 17F5B0 80250CD0 86040000 */ lh $a0, ($s0) /* 17F5B4 80250CD4 0C0513AC */ jal icon_set_opacity /* 17F5B8 80250CD8 0280282D */ daddu $a1, $s4, $zero /* 17F5BC 80250CDC 86040000 */ lh $a0, ($s0) /* 17F5C0 80250CE0 0C0511EA */ jal draw_icon_0 -/* 17F5C4 80250CE4 00000000 */ nop +/* 17F5C4 80250CE4 00000000 */ nop /* 17F5C8 80250CE8 26450054 */ addiu $a1, $s2, 0x54 /* 17F5CC 80250CEC 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F5D0 80250CF0 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) @@ -336,7 +336,7 @@ glabel func_80250818 /* 17F618 80250D38 0280282D */ daddu $a1, $s4, $zero /* 17F61C 80250D3C 86040000 */ lh $a0, ($s0) /* 17F620 80250D40 0C0511EA */ jal draw_icon_0 -/* 17F624 80250D44 00000000 */ nop +/* 17F624 80250D44 00000000 */ nop /* 17F628 80250D48 26450035 */ addiu $a1, $s2, 0x35 /* 17F62C 80250D4C 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F630 80250D50 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) @@ -359,7 +359,7 @@ glabel func_80250818 /* 17F674 80250D94 0280282D */ daddu $a1, $s4, $zero /* 17F678 80250D98 86040000 */ lh $a0, ($s0) /* 17F67C 80250D9C 0C0511EA */ jal draw_icon_0 -/* 17F680 80250DA0 00000000 */ nop +/* 17F680 80250DA0 00000000 */ nop /* 17F684 80250DA4 264500D2 */ addiu $a1, $s2, 0xd2 /* 17F688 80250DA8 3C10802A */ lui $s0, %hi(D_8029F644) /* 17F68C 80250DAC 2610F644 */ addiu $s0, $s0, %lo(D_8029F644) @@ -372,13 +372,13 @@ glabel func_80250818 /* 17F6A8 80250DC8 86040000 */ lh $a0, ($s0) /* 17F6AC 80250DCC 4405A000 */ mfc1 $a1, $f20 /* 17F6B0 80250DD0 0C051308 */ jal func_80144C20 -/* 17F6B4 80250DD4 00000000 */ nop +/* 17F6B4 80250DD4 00000000 */ nop /* 17F6B8 80250DD8 86040000 */ lh $a0, ($s0) /* 17F6BC 80250DDC 0C0513AC */ jal icon_set_opacity /* 17F6C0 80250DE0 0280282D */ daddu $a1, $s4, $zero /* 17F6C4 80250DE4 86040000 */ lh $a0, ($s0) /* 17F6C8 80250DE8 0C051086 */ jal func_80144218 -/* 17F6CC 80250DEC 00000000 */ nop +/* 17F6CC 80250DEC 00000000 */ nop /* 17F6D0 80250DF0 26450038 */ addiu $a1, $s2, 0x38 /* 17F6D4 80250DF4 3C10802A */ lui $s0, %hi(D_8029F646) /* 17F6D8 80250DF8 2610F646 */ addiu $s0, $s0, %lo(D_8029F646) @@ -386,7 +386,7 @@ glabel func_80250818 /* 17F6E0 80250E00 0220302D */ daddu $a2, $s1, $zero .L80250E04: /* 17F6E4 80250E04 0C051261 */ jal set_icon_render_pos -/* 17F6E8 80250E08 00000000 */ nop +/* 17F6E8 80250E08 00000000 */ nop /* 17F6EC 80250E0C 86040000 */ lh $a0, ($s0) /* 17F6F0 80250E10 3C053F4C */ lui $a1, 0x3f4c /* 17F6F4 80250E14 0C051308 */ jal func_80144C20 @@ -396,9 +396,9 @@ glabel func_80250818 /* 17F704 80250E24 0280282D */ daddu $a1, $s4, $zero /* 17F708 80250E28 86040000 */ lh $a0, ($s0) /* 17F70C 80250E2C 0C051086 */ jal func_80144218 -/* 17F710 80250E30 00000000 */ nop +/* 17F710 80250E30 00000000 */ nop /* 17F714 80250E34 080943A0 */ j .L80250E80 -/* 17F718 80250E38 00000000 */ nop +/* 17F718 80250E38 00000000 */ nop /* 17F71C 80250E3C 26450040 */ addiu $a1, $s2, 0x40 /* 17F720 80250E40 3C10802A */ lui $s0, %hi(D_8029F642) /* 17F724 80250E44 2610F642 */ addiu $s0, $s0, %lo(D_8029F642) @@ -406,12 +406,12 @@ glabel func_80250818 /* 17F72C 80250E4C 2626000D */ addiu $a2, $s1, 0xd .L80250E50: /* 17F730 80250E50 0C051261 */ jal set_icon_render_pos -/* 17F734 80250E54 00000000 */ nop +/* 17F734 80250E54 00000000 */ nop /* 17F738 80250E58 86040000 */ lh $a0, ($s0) /* 17F73C 80250E5C 3C053F00 */ lui $a1, 0x3f00 .L80250E60: /* 17F740 80250E60 0C051308 */ jal func_80144C20 -/* 17F744 80250E64 00000000 */ nop +/* 17F744 80250E64 00000000 */ nop .L80250E68: /* 17F748 80250E68 86040000 */ lh $a0, ($s0) /* 17F74C 80250E6C 0C0513AC */ jal icon_set_opacity @@ -419,7 +419,7 @@ glabel func_80250818 .L80250E74: /* 17F754 80250E74 86040000 */ lh $a0, ($s0) /* 17F758 80250E78 0C0511EA */ jal draw_icon_0 -/* 17F75C 80250E7C 00000000 */ nop +/* 17F75C 80250E7C 00000000 */ nop .L80250E80: /* 17F760 80250E80 8FBF002C */ lw $ra, 0x2c($sp) /* 17F764 80250E84 8FB40028 */ lw $s4, 0x28($sp) diff --git a/asm/nonmatchings/code_17D6A0/func_80251434.s b/asm/nonmatchings/code_17D6A0/func_80251434.s index 00b66f1f52..871197f3fe 100644 --- a/asm/nonmatchings/code_17D6A0/func_80251434.s +++ b/asm/nonmatchings/code_17D6A0/func_80251434.s @@ -5,7 +5,7 @@ glabel func_80251434 /* 17FD14 80251434 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 17FD18 80251438 AFBF0010 */ sw $ra, 0x10($sp) /* 17FD1C 8025143C 0C093EBA */ jal func_8024FAE8 -/* 17FD20 80251440 00000000 */ nop +/* 17FD20 80251440 00000000 */ nop /* 17FD24 80251444 8FBF0010 */ lw $ra, 0x10($sp) /* 17FD28 80251448 24020002 */ addiu $v0, $zero, 2 /* 17FD2C 8025144C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_17D6A0/func_80251454.s b/asm/nonmatchings/code_17D6A0/func_80251454.s index 6613f0922e..23afa7ac18 100644 --- a/asm/nonmatchings/code_17D6A0/func_80251454.s +++ b/asm/nonmatchings/code_17D6A0/func_80251454.s @@ -5,7 +5,7 @@ glabel func_80251454 /* 17FD34 80251454 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 17FD38 80251458 AFBF0010 */ sw $ra, 0x10($sp) /* 17FD3C 8025145C 0C093EBF */ jal func_8024FAFC -/* 17FD40 80251460 00000000 */ nop +/* 17FD40 80251460 00000000 */ nop /* 17FD44 80251464 8FBF0010 */ lw $ra, 0x10($sp) /* 17FD48 80251468 24020002 */ addiu $v0, $zero, 2 /* 17FD4C 8025146C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_17D6A0/func_80251474.s b/asm/nonmatchings/code_17D6A0/func_80251474.s index fa85802c49..9e47a5ec74 100644 --- a/asm/nonmatchings/code_17D6A0/func_80251474.s +++ b/asm/nonmatchings/code_17D6A0/func_80251474.s @@ -18,12 +18,12 @@ glabel func_80251474 /* 17FD84 802514A4 8E030000 */ lw $v1, ($s0) /* 17FD88 802514A8 30620001 */ andi $v0, $v1, 1 /* 17FD8C 802514AC 1440003B */ bnez $v0, .L8025159C -/* 17FD90 802514B0 00000000 */ nop +/* 17FD90 802514B0 00000000 */ nop /* 17FD94 802514B4 8E020094 */ lw $v0, 0x94($s0) /* 17FD98 802514B8 10400038 */ beqz $v0, .L8025159C /* 17FD9C 802514BC 00731024 */ and $v0, $v1, $s3 /* 17FDA0 802514C0 14400036 */ bnez $v0, .L8025159C -/* 17FDA4 802514C4 00000000 */ nop +/* 17FDA4 802514C4 00000000 */ nop /* 17FDA8 802514C8 92250191 */ lbu $a1, 0x191($s1) /* 17FDAC 802514CC 92030072 */ lbu $v1, 0x72($s0) /* 17FDB0 802514D0 00B20019 */ multu $a1, $s2 @@ -31,23 +31,23 @@ glabel func_80251474 /* 17FDB8 802514D8 00031082 */ srl $v0, $v1, 2 /* 17FDBC 802514DC 00621821 */ addu $v1, $v1, $v0 /* 17FDC0 802514E0 44833000 */ mtc1 $v1, $f6 -/* 17FDC4 802514E4 00000000 */ nop +/* 17FDC4 802514E4 00000000 */ nop /* 17FDC8 802514E8 468031A0 */ cvt.s.w $f6, $f6 /* 17FDCC 802514EC 46003182 */ mul.s $f6, $f6, $f0 -/* 17FDD0 802514F0 00000000 */ nop +/* 17FDD0 802514F0 00000000 */ nop /* 17FDD4 802514F4 92020073 */ lbu $v0, 0x73($s0) /* 17FDD8 802514F8 2442FFFE */ addiu $v0, $v0, -2 /* 17FDDC 802514FC 44822000 */ mtc1 $v0, $f4 -/* 17FDE0 80251500 00000000 */ nop +/* 17FDE0 80251500 00000000 */ nop /* 17FDE4 80251504 46802120 */ cvt.s.w $f4, $f4 /* 17FDE8 80251508 46002102 */ mul.s $f4, $f4, $f0 -/* 17FDEC 8025150C 00000000 */ nop +/* 17FDEC 8025150C 00000000 */ nop /* 17FDF0 80251510 C602005C */ lwc1 $f2, 0x5c($s0) /* 17FDF4 80251514 00004010 */ mfhi $t0 /* 17FDF8 80251518 000810C2 */ srl $v0, $t0, 3 /* 17FDFC 8025151C 304200FF */ andi $v0, $v0, 0xff /* 17FE00 80251520 44820000 */ mtc1 $v0, $f0 -/* 17FE04 80251524 00000000 */ nop +/* 17FE04 80251524 00000000 */ nop /* 17FE08 80251528 46800020 */ cvt.s.w $f0, $f0 /* 17FE0C 8025152C 4600320D */ trunc.w.s $f8, $f6 /* 17FE10 80251530 44034000 */ mfc1 $v1, $f8 @@ -61,16 +61,16 @@ glabel func_80251474 /* 17FE30 80251550 46001080 */ add.s $f2, $f2, $f0 /* 17FE34 80251554 00051042 */ srl $v0, $a1, 1 /* 17FE38 80251558 44820000 */ mtc1 $v0, $f0 -/* 17FE3C 8025155C 00000000 */ nop +/* 17FE3C 8025155C 00000000 */ nop /* 17FE40 80251560 46800020 */ cvt.s.w $f0, $f0 /* 17FE44 80251564 46001081 */ sub.s $f2, $f2, $f0 .L80251568: /* 17FE48 80251568 44830000 */ mtc1 $v1, $f0 -/* 17FE4C 8025156C 00000000 */ nop +/* 17FE4C 8025156C 00000000 */ nop /* 17FE50 80251570 46800020 */ cvt.s.w $f0, $f0 /* 17FE54 80251574 E7A00010 */ swc1 $f0, 0x10($sp) /* 17FE58 80251578 44840000 */ mtc1 $a0, $f0 -/* 17FE5C 8025157C 00000000 */ nop +/* 17FE5C 8025157C 00000000 */ nop /* 17FE60 80251580 46800020 */ cvt.s.w $f0, $f0 /* 17FE64 80251584 44052000 */ mfc1 $a1, $f4 /* 17FE68 80251588 44061000 */ mfc1 $a2, $f2 @@ -81,7 +81,7 @@ glabel func_80251474 .L8025159C: /* 17FE7C 8025159C 8E10000C */ lw $s0, 0xc($s0) /* 17FE80 802515A0 1600FFC0 */ bnez $s0, .L802514A4 -/* 17FE84 802515A4 00000000 */ nop +/* 17FE84 802515A4 00000000 */ nop .L802515A8: /* 17FE88 802515A8 8FBF0028 */ lw $ra, 0x28($sp) /* 17FE8C 802515AC 8FB30024 */ lw $s3, 0x24($sp) @@ -90,6 +90,6 @@ glabel func_80251474 /* 17FE98 802515B8 8FB00018 */ lw $s0, 0x18($sp) /* 17FE9C 802515BC 03E00008 */ jr $ra /* 17FEA0 802515C0 27BD0030 */ addiu $sp, $sp, 0x30 -/* 17FEA4 802515C4 00000000 */ nop -/* 17FEA8 802515C8 00000000 */ nop -/* 17FEAC 802515CC 00000000 */ nop +/* 17FEA4 802515C4 00000000 */ nop +/* 17FEA8 802515C8 00000000 */ nop +/* 17FEAC 802515CC 00000000 */ nop diff --git a/asm/nonmatchings/code_17D6A0/set_popup_duration.s b/asm/nonmatchings/code_17D6A0/set_popup_duration.s index 1772bf4c6f..0120793cf5 100644 --- a/asm/nonmatchings/code_17D6A0/set_popup_duration.s +++ b/asm/nonmatchings/code_17D6A0/set_popup_duration.s @@ -11,4 +11,4 @@ glabel set_popup_duration /* 17E3BC 8024FADC A4640014 */ sh $a0, 0x14($v1) .L8024FAE0: /* 17E3C0 8024FAE0 03E00008 */ jr $ra -/* 17E3C4 8024FAE4 00000000 */ nop +/* 17E3C4 8024FAE4 00000000 */ nop diff --git a/asm/nonmatchings/code_17D6A0/show_battle_message.s b/asm/nonmatchings/code_17D6A0/show_battle_message.s index 35a142248e..bd67e7f3b9 100644 --- a/asm/nonmatchings/code_17D6A0/show_battle_message.s +++ b/asm/nonmatchings/code_17D6A0/show_battle_message.s @@ -11,7 +11,7 @@ glabel show_battle_message /* 17E258 8024F978 00A0882D */ daddu $s1, $a1, $zero /* 17E25C 8024F97C 0040182D */ daddu $v1, $v0, $zero /* 17E260 8024F980 1060001B */ beqz $v1, .L8024F9F0 -/* 17E264 8024F984 00000000 */ nop +/* 17E264 8024F984 00000000 */ nop /* 17E268 8024F988 3C028025 */ lui $v0, %hi(func_8024FB3C) /* 17E26C 8024F98C 2442FB3C */ addiu $v0, $v0, %lo(func_8024FB3C) /* 17E270 8024F990 AC620004 */ sw $v0, 4($v1) diff --git a/asm/nonmatchings/code_17D6A0/show_message_popup.s b/asm/nonmatchings/code_17D6A0/show_message_popup.s index 81e2d67445..7a2f78a296 100644 --- a/asm/nonmatchings/code_17D6A0/show_message_popup.s +++ b/asm/nonmatchings/code_17D6A0/show_message_popup.s @@ -19,7 +19,7 @@ glabel show_message_popup /* 17F7BC 80250EDC 00220821 */ addu $at, $at, $v0 /* 17F7C0 80250EE0 8C22D1F0 */ lw $v0, %lo(D_8029D1F0)($at) /* 17F7C4 80250EE4 00400008 */ jr $v0 -/* 17F7C8 80250EE8 00000000 */ nop +/* 17F7C8 80250EE8 00000000 */ nop /* 17F7CC 80250EEC 82620017 */ lb $v0, 0x17($s3) /* 17F7D0 80250EF0 104000E8 */ beqz $v0, .L80251294 /* 17F7D4 80250EF4 0000282D */ daddu $a1, $zero, $zero @@ -63,7 +63,7 @@ glabel show_message_popup /* 17F86C 80250F8C 24050001 */ addiu $a1, $zero, 1 /* 17F870 80250F90 82620017 */ lb $v0, 0x17($s3) /* 17F874 80250F94 104000BF */ beqz $v0, .L80251294 -/* 17F878 80250F98 00000000 */ nop +/* 17F878 80250F98 00000000 */ nop /* 17F87C 80250F9C 86620012 */ lh $v0, 0x12($s3) /* 17F880 80250FA0 A2600017 */ sb $zero, 0x17($s3) /* 17F884 80250FA4 00021080 */ sll $v0, $v0, 2 @@ -95,7 +95,7 @@ glabel show_message_popup /* 17F8EC 8025100C 24050001 */ addiu $a1, $zero, 1 /* 17F8F0 80251010 82620017 */ lb $v0, 0x17($s3) /* 17F8F4 80251014 1040009F */ beqz $v0, .L80251294 -/* 17F8F8 80251018 00000000 */ nop +/* 17F8F8 80251018 00000000 */ nop /* 17F8FC 8025101C 86620012 */ lh $v0, 0x12($s3) /* 17F900 80251020 A2600017 */ sb $zero, 0x17($s3) /* 17F904 80251024 3C04802A */ lui $a0, %hi(D_8029F640) @@ -141,7 +141,7 @@ glabel show_message_popup /* 17F9A4 802510C4 24050001 */ addiu $a1, $zero, 1 /* 17F9A8 802510C8 82620017 */ lb $v0, 0x17($s3) /* 17F9AC 802510CC 10400071 */ beqz $v0, .L80251294 -/* 17F9B0 802510D0 00000000 */ nop +/* 17F9B0 802510D0 00000000 */ nop /* 17F9B4 802510D4 A2600017 */ sb $zero, 0x17($s3) /* 17F9B8 802510D8 3C03802A */ lui $v1, %hi(D_8029F640) /* 17F9BC 802510DC 8463F640 */ lh $v1, %lo(D_8029F640)($v1) @@ -256,7 +256,7 @@ glabel show_message_popup /* 17FB68 80251288 24050008 */ addiu $a1, $zero, 8 .L8025128C: /* 17FB6C 8025128C 0C051F9F */ jal func_80147E7C -/* 17FB70 80251290 00000000 */ nop +/* 17FB70 80251290 00000000 */ nop .L80251294: /* 17FB74 80251294 8FBF003C */ lw $ra, 0x3c($sp) /* 17FB78 80251298 8FB40038 */ lw $s4, 0x38($sp) diff --git a/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s b/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s index 5087e9a033..754001feb1 100644 --- a/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s +++ b/asm/nonmatchings/code_17D6A0/show_variable_battle_message.s @@ -13,7 +13,7 @@ glabel show_variable_battle_message /* 17E304 8024FA24 00C0902D */ daddu $s2, $a2, $zero /* 17E308 8024FA28 0040182D */ daddu $v1, $v0, $zero /* 17E30C 8024FA2C 1060001B */ beqz $v1, .L8024FA9C -/* 17E310 8024FA30 00000000 */ nop +/* 17E310 8024FA30 00000000 */ nop /* 17E314 8024FA34 3C028025 */ lui $v0, %hi(func_8024FB3C) /* 17E318 8024FA38 2442FB3C */ addiu $v0, $v0, %lo(func_8024FB3C) /* 17E31C 8024FA3C AC620004 */ sw $v0, 4($v1) diff --git a/asm/nonmatchings/code_1AF120/ActorAddMovePos.s b/asm/nonmatchings/code_1AF120/ActorAddMovePos.s index 57d953e437..a07a747141 100644 --- a/asm/nonmatchings/code_1AF120/ActorAddMovePos.s +++ b/asm/nonmatchings/code_1AF120/ActorAddMovePos.s @@ -19,7 +19,7 @@ glabel ActorAddMovePos /* 1AF198 802808B8 8E43000C */ lw $v1, 0xc($s2) /* 1AF19C 802808BC C4600004 */ lwc1 $f0, 4($v1) /* 1AF1A0 802808C0 44821000 */ mtc1 $v0, $f2 -/* 1AF1A4 802808C4 00000000 */ nop +/* 1AF1A4 802808C4 00000000 */ nop /* 1AF1A8 802808C8 468010A0 */ cvt.s.w $f2, $f2 /* 1AF1AC 802808CC 46020000 */ add.s $f0, $f0, $f2 /* 1AF1B0 802808D0 26100004 */ addiu $s0, $s0, 4 @@ -30,7 +30,7 @@ glabel ActorAddMovePos /* 1AF1C4 802808E4 8E43000C */ lw $v1, 0xc($s2) /* 1AF1C8 802808E8 C4600008 */ lwc1 $f0, 8($v1) /* 1AF1CC 802808EC 44821000 */ mtc1 $v0, $f2 -/* 1AF1D0 802808F0 00000000 */ nop +/* 1AF1D0 802808F0 00000000 */ nop /* 1AF1D4 802808F4 468010A0 */ cvt.s.w $f2, $f2 /* 1AF1D8 802808F8 46020000 */ add.s $f0, $f0, $f2 /* 1AF1DC 802808FC 26100004 */ addiu $s0, $s0, 4 @@ -41,7 +41,7 @@ glabel ActorAddMovePos /* 1AF1F0 80280910 8E43000C */ lw $v1, 0xc($s2) /* 1AF1F4 80280914 C460000C */ lwc1 $f0, 0xc($v1) /* 1AF1F8 80280918 44821000 */ mtc1 $v0, $f2 -/* 1AF1FC 8028091C 00000000 */ nop +/* 1AF1FC 8028091C 00000000 */ nop /* 1AF200 80280920 468010A0 */ cvt.s.w $f2, $f2 /* 1AF204 80280924 46020000 */ add.s $f0, $f0, $f2 /* 1AF208 80280928 E460000C */ swc1 $f0, 0xc($v1) @@ -52,5 +52,5 @@ glabel ActorAddMovePos /* 1AF21C 8028093C 24020002 */ addiu $v0, $zero, 2 /* 1AF220 80280940 03E00008 */ jr $ra /* 1AF224 80280944 27BD0020 */ addiu $sp, $sp, 0x20 -/* 1AF228 80280948 00000000 */ nop -/* 1AF22C 8028094C 00000000 */ nop +/* 1AF228 80280948 00000000 */ nop +/* 1AF22C 8028094C 00000000 */ nop diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s b/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s index aa9d609b97..ef6c89865e 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_800269EC.s @@ -32,7 +32,7 @@ glabel func_800269EC /* 1E58 80026A58 0C009C68 */ jal func_800271A0 /* 1E5C 80026A5C AE020000 */ sw $v0, ($s0) /* 1E60 80026A60 0C009F84 */ jal func_80027E10 -/* 1E64 80026A64 00000000 */ nop +/* 1E64 80026A64 00000000 */ nop /* 1E68 80026A68 8E030000 */ lw $v1, ($s0) /* 1E6C 80026A6C 3C02E900 */ lui $v0, 0xe900 /* 1E70 80026A70 0060202D */ daddu $a0, $v1, $zero @@ -54,7 +54,7 @@ glabel func_800269EC /* 1EB0 80026AB0 3C040001 */ lui $a0, 1 .L80026AB4: /* 1EB4 80026AB4 08009AAD */ j .L80026AB4 -/* 1EB8 80026AB8 00000000 */ nop +/* 1EB8 80026AB8 00000000 */ nop .L80026ABC: /* 1EBC 80026ABC 34840630 */ ori $a0, $a0, 0x630 /* 1EC0 80026AC0 0000302D */ daddu $a2, $zero, $zero diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s index 38b79308d9..261216a6d5 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027088.s @@ -12,7 +12,7 @@ glabel func_80027088 /* 24A4 800270A4 00220821 */ addu $at, $at, $v0 /* 24A8 800270A8 8C227D48 */ lw $v0, %lo(D_80097D48)($at) /* 24AC 800270AC 00400008 */ jr $v0 -/* 24B0 800270B0 00000000 */ nop +/* 24B0 800270B0 00000000 */ nop /* 24B4 800270B4 24040003 */ addiu $a0, $zero, 3 /* 24B8 800270B8 3C02800A */ lui $v0, %hi(D_8009A650) /* 24BC 800270BC 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) @@ -24,7 +24,7 @@ glabel func_80027088 /* 24D4 800270D4 0C0B1192 */ jal resume_all_group /* 24D8 800270D8 AC430000 */ sw $v1, ($v0) /* 24DC 800270DC 08009C61 */ j .L80027184 -/* 24E0 800270E0 00000000 */ nop +/* 24E0 800270E0 00000000 */ nop /* 24E4 800270E4 24040001 */ addiu $a0, $zero, 1 /* 24E8 800270E8 3C02800A */ lui $v0, %hi(D_8009A650) /* 24EC 800270EC 2442A650 */ addiu $v0, $v0, %lo(D_8009A650) @@ -58,7 +58,7 @@ glabel func_80027088 /* 2558 80027158 0C0B117A */ jal suspend_all_group /* 255C 8002715C AC430000 */ sw $v1, ($v0) /* 2560 80027160 08009C61 */ j .L80027184 -/* 2564 80027164 00000000 */ nop +/* 2564 80027164 00000000 */ nop /* 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_1b40_len_20b0/func_8002725C.s b/asm/nonmatchings/code_1b40_len_20b0/func_8002725C.s index 881ab6d257..7c6a59ef56 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_8002725C.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_8002725C.s @@ -78,7 +78,7 @@ glabel func_8002725C .L80027368: /* 2768 80027368 90420000 */ lbu $v0, ($v0) /* 276C 8002736C 14400005 */ bnez $v0, .L80027384 -/* 2770 80027370 00000000 */ nop +/* 2770 80027370 00000000 */ nop /* 2774 80027374 24A50001 */ addiu $a1, $a1, 1 /* 2778 80027378 28A20020 */ slti $v0, $a1, 0x20 /* 277C 8002737C 1440FFFA */ bnez $v0, .L80027368 @@ -111,7 +111,7 @@ glabel func_8002725C .L800273D4: /* 27D4 800273D4 90420000 */ lbu $v0, ($v0) /* 27D8 800273D8 14400005 */ bnez $v0, .L800273F0 -/* 27DC 800273DC 00000000 */ nop +/* 27DC 800273DC 00000000 */ nop /* 27E0 800273E0 24A50001 */ addiu $a1, $a1, 1 /* 27E4 800273E4 28A20020 */ slti $v0, $a1, 0x20 /* 27E8 800273E8 1440FFFA */ bnez $v0, .L800273D4 @@ -144,7 +144,7 @@ glabel func_8002725C .L80027440: /* 2840 80027440 90420000 */ lbu $v0, ($v0) /* 2844 80027444 14400005 */ bnez $v0, .L8002745C -/* 2848 80027448 00000000 */ nop +/* 2848 80027448 00000000 */ nop /* 284C 8002744C 24A50001 */ addiu $a1, $a1, 1 /* 2850 80027450 28A20020 */ slti $v0, $a1, 0x20 /* 2854 80027454 1440FFFA */ bnez $v0, .L80027440 @@ -161,7 +161,7 @@ glabel func_8002725C .L80027478: /* 2878 80027478 90420000 */ lbu $v0, ($v0) /* 287C 8002747C 14400004 */ bnez $v0, .L80027490 -/* 2880 80027480 00000000 */ nop +/* 2880 80027480 00000000 */ nop /* 2884 80027484 24A5FFFF */ addiu $a1, $a1, -1 /* 2888 80027488 04A1FFFB */ bgez $a1, .L80027478 /* 288C 8002748C 00651021 */ addu $v0, $v1, $a1 @@ -177,7 +177,7 @@ glabel func_8002725C .L800274AC: /* 28AC 800274AC 90420000 */ lbu $v0, ($v0) /* 28B0 800274B0 14400004 */ bnez $v0, .L800274C4 -/* 28B4 800274B4 00000000 */ nop +/* 28B4 800274B4 00000000 */ nop /* 28B8 800274B8 24A5FFFF */ addiu $a1, $a1, -1 /* 28BC 800274BC 04A1FFFB */ bgez $a1, .L800274AC /* 28C0 800274C0 00651021 */ addu $v0, $v1, $a1 @@ -193,7 +193,7 @@ glabel func_8002725C .L800274E0: /* 28E0 800274E0 90420000 */ lbu $v0, ($v0) /* 28E4 800274E4 14400004 */ bnez $v0, .L800274F8 -/* 28E8 800274E8 00000000 */ nop +/* 28E8 800274E8 00000000 */ nop /* 28EC 800274EC 24A5FFFF */ addiu $a1, $a1, -1 /* 28F0 800274F0 04A1FFFB */ bgez $a1, .L800274E0 /* 28F4 800274F4 00651021 */ addu $v0, $v1, $a1 @@ -237,7 +237,7 @@ glabel func_8002725C /* 2984 80027584 00440018 */ mult $v0, $a0 /* 2988 80027588 00002812 */ mflo $a1 /* 298C 8002758C 93A20011 */ lbu $v0, 0x11($sp) -/* 2990 80027590 00000000 */ nop +/* 2990 80027590 00000000 */ nop /* 2994 80027594 00430018 */ mult $v0, $v1 /* 2998 80027598 00001012 */ mflo $v0 /* 299C 8002759C 00A21021 */ addu $v0, $a1, $v0 @@ -247,7 +247,7 @@ glabel func_8002725C /* 29AC 800275AC 00440018 */ mult $v0, $a0 /* 29B0 800275B0 00002012 */ mflo $a0 /* 29B4 800275B4 93A20012 */ lbu $v0, 0x12($sp) -/* 29B8 800275B8 00000000 */ nop +/* 29B8 800275B8 00000000 */ nop /* 29BC 800275BC 00430018 */ mult $v0, $v1 /* 29C0 800275C0 00001012 */ mflo $v0 /* 29C4 800275C4 00821021 */ addu $v0, $a0, $v0 diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s b/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s index b04627451d..bf133e26d9 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_800279B4.s @@ -113,7 +113,7 @@ glabel func_800279B4 .L80027B58: /* 2F58 80027B58 2A42013E */ slti $v0, $s2, 0x13e /* 2F5C 80027B5C 1440FFAB */ bnez $v0, .L80027A0C -/* 2F60 80027B60 00000000 */ nop +/* 2F60 80027B60 00000000 */ nop /* 2F64 80027B64 26730001 */ addiu $s3, $s3, 1 /* 2F68 80027B68 8FA8003C */ lw $t0, 0x3c($sp) /* 2F6C 80027B6C 2A6200EF */ slti $v0, $s3, 0xef diff --git a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s index 68d2f80265..25f79c3a57 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s +++ b/asm/nonmatchings/code_1b40_len_20b0/func_80027E10.s @@ -49,13 +49,13 @@ glabel func_80027E10 /* 32C0 80027EC0 10620008 */ beq $v1, $v0, .L80027EE4 /* 32C4 80027EC4 3C03FF10 */ lui $v1, 0xff10 /* 32C8 80027EC8 0800A0CB */ j .L8002832C -/* 32CC 80027ECC 00000000 */ nop +/* 32CC 80027ECC 00000000 */ nop .L80027ED0: /* 32D0 80027ED0 24020030 */ addiu $v0, $zero, 0x30 /* 32D4 80027ED4 10620053 */ beq $v1, $v0, .L80028024 -/* 32D8 80027ED8 00000000 */ nop +/* 32D8 80027ED8 00000000 */ nop /* 32DC 80027EDC 0800A0CB */ j .L8002832C -/* 32E0 80027EE0 00000000 */ nop +/* 32E0 80027EE0 00000000 */ nop .L80027EE4: /* 32E4 80027EE4 3463013F */ ori $v1, $v1, 0x13f /* 32E8 80027EE8 3C06E300 */ lui $a2, 0xe300 @@ -334,7 +334,7 @@ glabel func_80027E10 /* 371C 8002831C 1440FFBB */ bnez $v0, .L8002820C /* 3720 80028320 AC60004C */ sw $zero, 0x4c($v1) /* 3724 80028324 0800A1E4 */ j .L80028790 -/* 3728 80028328 00000000 */ nop +/* 3728 80028328 00000000 */ nop .L8002832C: /* 372C 8002832C 3C02800A */ lui $v0, %hi(D_8009A650) /* 3730 80028330 8C42A650 */ lw $v0, %lo(D_8009A650)($v0) @@ -521,7 +521,7 @@ glabel func_80027E10 /* 39D0 800285D0 ACA30004 */ sw $v1, 4($a1) .L800285D4: /* 39D4 800285D4 0C0517B0 */ jal func_80145EC0 -/* 39D8 800285D8 00000000 */ nop +/* 39D8 800285D8 00000000 */ nop .L800285DC: /* 39DC 800285DC 3C04E300 */ lui $a0, 0xe300 /* 39E0 800285E0 34840A01 */ ori $a0, $a0, 0xa01 @@ -658,6 +658,6 @@ glabel func_80027E10 /* 3BD8 800287D8 8FB00020 */ lw $s0, 0x20($sp) /* 3BDC 800287DC 03E00008 */ jr $ra /* 3BE0 800287E0 27BD0048 */ addiu $sp, $sp, 0x48 -/* 3BE4 800287E4 00000000 */ nop -/* 3BE8 800287E8 00000000 */ nop -/* 3BEC 800287EC 00000000 */ nop +/* 3BE4 800287E4 00000000 */ nop +/* 3BE8 800287E8 00000000 */ nop +/* 3BEC 800287EC 00000000 */ nop diff --git a/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s index bb1f6de537..f6aedcc8eb 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s +++ b/asm/nonmatchings/code_1b40_len_20b0/gfx_draw_frame.s @@ -38,31 +38,31 @@ glabel gfx_draw_frame /* 1F88 80026B88 8E020000 */ lw $v0, ($s0) /* 1F8C 80026B8C 30420002 */ andi $v0, $v0, 2 /* 1F90 80026B90 14400003 */ bnez $v0, .L80026BA0 -/* 1F94 80026B94 00000000 */ nop +/* 1F94 80026B94 00000000 */ nop /* 1F98 80026B98 0C00B5CF */ jal render_frame /* 1F9C 80026B9C 0000202D */ daddu $a0, $zero, $zero .L80026BA0: /* 1FA0 80026BA0 0C038098 */ jal func_800E0260 -/* 1FA4 80026BA4 00000000 */ nop +/* 1FA4 80026BA4 00000000 */ nop /* 1FA8 80026BA8 0C0B0FB9 */ jal func_802C3EE4 -/* 1FAC 80026BAC 00000000 */ nop +/* 1FAC 80026BAC 00000000 */ nop /* 1FB0 80026BB0 0C04E088 */ jal func_80138220 -/* 1FB4 80026BB4 00000000 */ nop +/* 1FB4 80026BB4 00000000 */ nop /* 1FB8 80026BB8 0C048D54 */ jal func_80123550 -/* 1FBC 80026BBC 00000000 */ nop +/* 1FBC 80026BBC 00000000 */ nop /* 1FC0 80026BC0 0C050884 */ jal func_80142210 -/* 1FC4 80026BC4 00000000 */ nop +/* 1FC4 80026BC4 00000000 */ nop /* 1FC8 80026BC8 0C0167E5 */ jal func_80059F94 -/* 1FCC 80026BCC 00000000 */ nop +/* 1FCC 80026BCC 00000000 */ nop /* 1FD0 80026BD0 0C044BD6 */ jal render_ui -/* 1FD4 80026BD4 00000000 */ nop +/* 1FD4 80026BD4 00000000 */ nop /* 1FD8 80026BD8 8E020000 */ lw $v0, ($s0) /* 1FDC 80026BDC 3C030001 */ lui $v1, 1 /* 1FE0 80026BE0 00431024 */ and $v0, $v0, $v1 /* 1FE4 80026BE4 14400003 */ bnez $v0, .L80026BF4 -/* 1FE8 80026BE8 00000000 */ nop +/* 1FE8 80026BE8 00000000 */ nop /* 1FEC 80026BEC 0C051EB1 */ jal func_80147AC4 -/* 1FF0 80026BF0 00000000 */ nop +/* 1FF0 80026BF0 00000000 */ nop .L80026BF4: /* 1FF4 80026BF4 8E020000 */ lw $v0, ($s0) /* 1FF8 80026BF8 30420002 */ andi $v0, $v0, 2 @@ -72,7 +72,7 @@ glabel gfx_draw_frame /* 2008 80026C08 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 200C 80026C0C 80420078 */ lb $v0, 0x78($v0) /* 2010 80026C10 14400004 */ bnez $v0, .L80026C24 -/* 2014 80026C14 00000000 */ nop +/* 2014 80026C14 00000000 */ nop /* 2018 80026C18 0C00B5CF */ jal render_frame /* 201C 80026C1C 24040001 */ addiu $a0, $zero, 1 /* 2020 80026C20 3C100010 */ lui $s0, 0x10 @@ -83,59 +83,59 @@ glabel gfx_draw_frame /* 2030 80026C30 36100010 */ ori $s0, $s0, 0x10 /* 2034 80026C34 00501024 */ and $v0, $v0, $s0 /* 2038 80026C38 14400003 */ bnez $v0, .L80026C48 -/* 203C 80026C3C 00000000 */ nop +/* 203C 80026C3C 00000000 */ nop /* 2040 80026C40 0C049081 */ jal render_messages -/* 2044 80026C44 00000000 */ nop +/* 2044 80026C44 00000000 */ nop .L80026C48: /* 2048 80026C48 0C048D38 */ jal func_801234E0 -/* 204C 80026C4C 00000000 */ nop +/* 204C 80026C4C 00000000 */ nop /* 2050 80026C50 0C0509C7 */ jal func_8014271C -/* 2054 80026C54 00000000 */ nop +/* 2054 80026C54 00000000 */ nop /* 2058 80026C58 0C04E068 */ jal func_801381A0 -/* 205C 80026C5C 00000000 */ nop +/* 205C 80026C5C 00000000 */ nop /* 2060 80026C60 8E220000 */ lw $v0, ($s1) /* 2064 80026C64 24030010 */ addiu $v1, $zero, 0x10 /* 2068 80026C68 00501024 */ and $v0, $v0, $s0 /* 206C 80026C6C 14430003 */ bne $v0, $v1, .L80026C7C -/* 2070 80026C70 00000000 */ nop +/* 2070 80026C70 00000000 */ nop /* 2074 80026C74 0C049081 */ jal render_messages -/* 2078 80026C78 00000000 */ nop +/* 2078 80026C78 00000000 */ nop .L80026C7C: /* 207C 80026C7C 0C00AEA0 */ jal render_curtains -/* 2080 80026C80 00000000 */ nop +/* 2080 80026C80 00000000 */ nop /* 2084 80026C84 8E220000 */ lw $v0, ($s1) /* 2088 80026C88 3C030010 */ lui $v1, 0x10 /* 208C 80026C8C 00431024 */ and $v0, $v0, $v1 /* 2090 80026C90 10400003 */ beqz $v0, .L80026CA0 -/* 2094 80026C94 00000000 */ nop +/* 2094 80026C94 00000000 */ nop /* 2098 80026C98 0C049081 */ jal render_messages -/* 209C 80026C9C 00000000 */ nop +/* 209C 80026C9C 00000000 */ nop .L80026CA0: /* 20A0 80026CA0 8E220000 */ lw $v0, ($s1) /* 20A4 80026CA4 3C030001 */ lui $v1, 1 /* 20A8 80026CA8 00431024 */ and $v0, $v0, $v1 /* 20AC 80026CAC 10400003 */ beqz $v0, .L80026CBC -/* 20B0 80026CB0 00000000 */ nop +/* 20B0 80026CB0 00000000 */ nop /* 20B4 80026CB4 0C051EB1 */ jal func_80147AC4 -/* 20B8 80026CB8 00000000 */ nop +/* 20B8 80026CB8 00000000 */ nop .L80026CBC: /* 20BC 80026CBC 0C044BF1 */ jal func_80112FC4 -/* 20C0 80026CC0 00000000 */ nop +/* 20C0 80026CC0 00000000 */ nop /* 20C4 80026CC4 8E220000 */ lw $v0, ($s1) /* 20C8 80026CC8 30420020 */ andi $v0, $v0, 0x20 /* 20CC 80026CCC 10400010 */ beqz $v0, .L80026D10 -/* 20D0 80026CD0 00000000 */ nop +/* 20D0 80026CD0 00000000 */ nop /* 20D4 80026CD4 3C038007 */ lui $v1, %hi(D_800741A2) /* 20D8 80026CD8 846341A2 */ lh $v1, %lo(D_800741A2)($v1) /* 20DC 80026CDC 28620002 */ slti $v0, $v1, 2 /* 20E0 80026CE0 1040000B */ beqz $v0, .L80026D10 -/* 20E4 80026CE4 00000000 */ nop +/* 20E4 80026CE4 00000000 */ nop /* 20E8 80026CE8 04600009 */ bltz $v1, .L80026D10 /* 20EC 80026CEC 24040007 */ addiu $a0, $zero, 7 /* 20F0 80026CF0 3C028007 */ lui $v0, %hi(D_800741A0) /* 20F4 80026CF4 844241A0 */ lh $v0, %lo(D_800741A0)($v0) /* 20F8 80026CF8 44820000 */ mtc1 $v0, $f0 -/* 20FC 80026CFC 00000000 */ nop +/* 20FC 80026CFC 00000000 */ nop /* 2100 80026D00 46800020 */ cvt.s.w $f0, $f0 /* 2104 80026D04 44050000 */ mfc1 $a1, $f0 /* 2108 80026D08 0C04DAA0 */ jal func_80136A80 @@ -153,7 +153,7 @@ glabel gfx_draw_frame /* 2134 80026D34 0000302D */ daddu $a2, $zero, $zero .L80026D38: /* 2138 80026D38 08009B4E */ j .L80026D38 -/* 213C 80026D3C 00000000 */ nop +/* 213C 80026D3C 00000000 */ nop .L80026D40: /* 2140 80026D40 3C070004 */ lui $a3, 4 /* 2144 80026D44 3C08800A */ lui $t0, %hi(gMasterGfxPos) diff --git a/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s b/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s index 67f8cd42ab..7bd9e2678b 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s +++ b/asm/nonmatchings/code_1b40_len_20b0/load_engine_data.s @@ -19,7 +19,7 @@ glabel load_engine_data /* 2214 80026E14 3C06800E */ lui $a2, %hi(D_800DC500) /* 2218 80026E18 24C6C500 */ addiu $a2, $a2, %lo(D_800DC500) /* 221C 80026E1C 0C00A5CF */ jal dma_copy -/* 2220 80026E20 00000000 */ nop +/* 2220 80026E20 00000000 */ nop /* 2224 80026E24 3C04000E */ lui $a0, 0xe /* 2228 80026E28 248479B0 */ addiu $a0, $a0, 0x79b0 /* 222C 80026E2C 3C050010 */ lui $a1, 0x10 @@ -27,7 +27,7 @@ glabel load_engine_data /* 2234 80026E34 3C06802C */ lui $a2, %hi(sort_scripts) /* 2238 80026E38 24C63000 */ addiu $a2, $a2, %lo(sort_scripts) /* 223C 80026E3C 0C00A5CF */ jal dma_copy -/* 2240 80026E40 00000000 */ nop +/* 2240 80026E40 00000000 */ nop /* 2244 80026E44 3C040010 */ lui $a0, 0x10 /* 2248 80026E48 24842610 */ addiu $a0, $a0, 0x2610 /* 224C 80026E4C 3C050011 */ lui $a1, 0x11 @@ -35,7 +35,7 @@ glabel load_engine_data /* 2254 80026E54 3C06802E */ lui $a2, %hi(create_shadow_callback) /* 2258 80026E58 24C60D90 */ addiu $a2, $a2, %lo(create_shadow_callback) /* 225C 80026E5C 0C00A5CF */ jal dma_copy -/* 2260 80026E60 00000000 */ nop +/* 2260 80026E60 00000000 */ nop /* 2264 80026E64 3C04000A */ lui $a0, 0xa /* 2268 80026E68 24845DD0 */ addiu $a0, $a0, 0x5dd0 /* 226C 80026E6C 3C05000E */ lui $a1, 0xe @@ -43,7 +43,7 @@ glabel load_engine_data /* 2274 80026E74 3C068011 */ lui $a2, %hi(update_entities) /* 2278 80026E78 24C6F6D0 */ addiu $a2, $a2, %lo(update_entities) /* 227C 80026E7C 0C00A5CF */ jal dma_copy -/* 2280 80026E80 00000000 */ nop +/* 2280 80026E80 00000000 */ nop /* 2284 80026E84 3C040011 */ lui $a0, 0x11 /* 2288 80026E88 2484CC10 */ addiu $a0, $a0, -0x33f0 /* 228C 80026E8C 3C050011 */ lui $a1, 0x11 @@ -51,7 +51,7 @@ glabel load_engine_data /* 2294 80026E94 3C06802F */ lui $a2, %hi(D_802EB3D0) /* 2298 80026E98 24C6B3D0 */ addiu $a2, $a2, %lo(D_802EB3D0) /* 229C 80026E9C 0C00A5CF */ jal dma_copy -/* 22A0 80026EA0 00000000 */ nop +/* 22A0 80026EA0 00000000 */ nop /* 22A4 80026EA4 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 22A8 80026EA8 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* 22AC 80026EAC 8E020000 */ lw $v0, ($s0) @@ -89,69 +89,69 @@ glabel load_engine_data /* 232C 80026F2C 0C00AE13 */ jal fio_init_flash /* 2330 80026F30 AC600168 */ sw $zero, 0x168($v1) /* 2334 80026F34 0C00A20E */ jal func_80028838 -/* 2338 80026F38 00000000 */ nop +/* 2338 80026F38 00000000 */ nop /* 233C 80026F3C 0C00AB00 */ jal general_heap_create -/* 2340 80026F40 00000000 */ nop +/* 2340 80026F40 00000000 */ nop /* 2344 80026F44 0C047624 */ jal func_8011D890 -/* 2348 80026F48 00000000 */ nop +/* 2348 80026F48 00000000 */ nop /* 234C 80026F4C 0C048C2E */ jal clear_dynamic_entity_list -/* 2350 80026F50 00000000 */ nop +/* 2350 80026F50 00000000 */ nop /* 2354 80026F54 0C0B0C77 */ jal clear_script_list -/* 2358 80026F58 00000000 */ nop +/* 2358 80026F58 00000000 */ nop /* 235C 80026F5C 0C00B7BD */ jal create_cameras_a -/* 2360 80026F60 00000000 */ nop +/* 2360 80026F60 00000000 */ nop /* 2364 80026F64 0C037F14 */ jal clear_player_status -/* 2368 80026F68 00000000 */ nop +/* 2368 80026F68 00000000 */ nop /* 236C 80026F6C 0C0B763E */ jal func_802DD8F8 /* 2370 80026F70 0000202D */ daddu $a0, $zero, $zero /* 2374 80026F74 0C0482EC */ jal clear_virtual_models -/* 2378 80026F78 00000000 */ nop +/* 2378 80026F78 00000000 */ nop /* 237C 80026F7C 0C047889 */ jal func_8011E224 -/* 2380 80026F80 00000000 */ nop +/* 2380 80026F80 00000000 */ nop /* 2384 80026F84 0C045751 */ jal clear_model_data -/* 2388 80026F88 00000000 */ nop +/* 2388 80026F88 00000000 */ nop /* 238C 80026F8C 0C052010 */ jal func_80148040 -/* 2390 80026F90 00000000 */ nop +/* 2390 80026F90 00000000 */ nop /* 2394 80026F94 0C05177E */ jal func_80145DF8 -/* 2398 80026F98 00000000 */ nop +/* 2398 80026F98 00000000 */ nop /* 239C 80026F9C 0C048D98 */ jal clear_character_set -/* 23A0 80026FA0 00000000 */ nop +/* 23A0 80026FA0 00000000 */ nop /* 23A4 80026FA4 0C048D9D */ jal clear_printers -/* 23A8 80026FA8 00000000 */ nop +/* 23A8 80026FA8 00000000 */ nop /* 23AC 80026FAC 0C044AE6 */ jal func_80112B98 -/* 23B0 80026FB0 00000000 */ nop +/* 23B0 80026FB0 00000000 */ nop /* 23B4 80026FB4 0C00E12F */ jal clear_npcs -/* 23B8 80026FB8 00000000 */ nop +/* 23B8 80026FB8 00000000 */ nop /* 23BC 80026FBC 0C050440 */ jal func_80141100 -/* 23C0 80026FC0 00000000 */ nop +/* 23C0 80026FC0 00000000 */ nop /* 23C4 80026FC4 0C0515A0 */ jal clear_trigger_data -/* 23C8 80026FC8 00000000 */ nop +/* 23C8 80026FC8 00000000 */ nop /* 23CC 80026FCC 0C04432E */ jal clear_entity_data /* 23D0 80026FD0 0000202D */ daddu $a0, $zero, $zero /* 23D4 80026FD4 0C039CE8 */ jal clear_player_data -/* 23D8 80026FD8 00000000 */ nop +/* 23D8 80026FD8 00000000 */ nop /* 23DC 80026FDC 0C00F8CE */ jal func_8003E338 -/* 23E0 80026FE0 00000000 */ nop +/* 23E0 80026FE0 00000000 */ nop /* 23E4 80026FE4 0C04E042 */ jal func_80138108 -/* 23E8 80026FE8 00000000 */ nop +/* 23E8 80026FE8 00000000 */ nop /* 23EC 80026FEC 0C016727 */ jal func_80059C9C -/* 23F0 80026FF0 00000000 */ nop +/* 23F0 80026FF0 00000000 */ nop /* 23F4 80026FF4 0C0514C8 */ jal clear_saved_variables -/* 23F8 80026FF8 00000000 */ nop +/* 23F8 80026FF8 00000000 */ nop /* 23FC 80026FFC 0C04C3FC */ jal clear_item_entity_data -/* 2400 80027000 00000000 */ nop +/* 2400 80027000 00000000 */ nop /* 2404 80027004 0C052926 */ jal func_8014A498 -/* 2408 80027008 00000000 */ nop +/* 2408 80027008 00000000 */ nop /* 240C 8002700C 0C051C8C */ jal func_80147230 -/* 2410 80027010 00000000 */ nop +/* 2410 80027010 00000000 */ nop /* 2414 80027014 0C052586 */ jal func_80149618 -/* 2418 80027018 00000000 */ nop +/* 2418 80027018 00000000 */ nop /* 241C 8002701C 0C051CFC */ jal func_801473F0 -/* 2420 80027020 00000000 */ nop +/* 2420 80027020 00000000 */ nop /* 2424 80027024 0C00AE90 */ jal initialize_curtains -/* 2428 80027028 00000000 */ nop +/* 2428 80027028 00000000 */ nop /* 242C 8002702C 0C00A3B8 */ jal poll_rumble -/* 2430 80027030 00000000 */ nop +/* 2430 80027030 00000000 */ nop /* 2434 80027034 0000182D */ daddu $v1, $zero, $zero /* 2438 80027038 24050003 */ addiu $a1, $zero, 3 /* 243C 8002703C 2404000C */ addiu $a0, $zero, 0xc diff --git a/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s b/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s index d17b09c39a..c81fd9f694 100644 --- a/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s +++ b/asm/nonmatchings/code_1b40_len_20b0/step_game_loop.s @@ -24,7 +24,7 @@ glabel step_game_loop /* 1B8C 8002678C AE0402BC */ sw $a0, 0x2bc($s0) .L80026790: /* 1B90 80026790 0C00A3E3 */ jal func_80028F8C -/* 1B94 80026794 00000000 */ nop +/* 1B94 80026794 00000000 */ nop /* 1B98 80026798 3C048007 */ lui $a0, %hi(D_80074021) /* 1B9C 8002679C 24844021 */ addiu $a0, $a0, %lo(D_80074021) /* 1BA0 800267A0 80820000 */ lb $v0, ($a0) @@ -34,47 +34,47 @@ glabel step_game_loop /* 1BB0 800267B0 A0820000 */ sb $v0, ($a0) /* 1BB4 800267B4 00021600 */ sll $v0, $v0, 0x18 /* 1BB8 800267B8 14400087 */ bnez $v0, .L800269D8 -/* 1BBC 800267BC 00000000 */ nop +/* 1BBC 800267BC 00000000 */ nop /* 1BC0 800267C0 3C028007 */ lui $v0, %hi(D_80074020) /* 1BC4 800267C4 90424020 */ lbu $v0, %lo(D_80074020)($v0) /* 1BC8 800267C8 A0820000 */ sb $v0, ($a0) .L800267CC: /* 1BCC 800267CC 0C046EBA */ jal func_8011BAE8 -/* 1BD0 800267D0 00000000 */ nop +/* 1BD0 800267D0 00000000 */ nop /* 1BD4 800267D4 0C00E15F */ jal func_8003857C -/* 1BD8 800267D8 00000000 */ nop +/* 1BD8 800267D8 00000000 */ nop /* 1BDC 800267DC 0C048D01 */ jal update_dynamic_entities -/* 1BE0 800267E0 00000000 */ nop +/* 1BE0 800267E0 00000000 */ nop /* 1BE4 800267E4 0C051618 */ jal update_triggers -/* 1BE8 800267E8 00000000 */ nop +/* 1BE8 800267E8 00000000 */ nop /* 1BEC 800267EC 0C0B0F5D */ jal update_scripts -/* 1BF0 800267F0 00000000 */ nop +/* 1BF0 800267F0 00000000 */ nop /* 1BF4 800267F4 0C048DF6 */ jal update_messages -/* 1BF8 800267F8 00000000 */ nop +/* 1BF8 800267F8 00000000 */ nop /* 1BFC 800267FC 0C050584 */ jal update_menu_icons -/* 1C00 80026800 00000000 */ nop +/* 1C00 80026800 00000000 */ nop /* 1C04 80026804 0C044B9E */ jal step_current_game_mode -/* 1C08 80026808 00000000 */ nop +/* 1C08 80026808 00000000 */ nop /* 1C0C 8002680C 0C043DB4 */ jal update_entities -/* 1C10 80026810 00000000 */ nop +/* 1C10 80026810 00000000 */ nop /* 1C14 80026814 0C04E066 */ jal func_80138198 -/* 1C18 80026818 00000000 */ nop +/* 1C18 80026818 00000000 */ nop /* 1C1C 8002681C 0C052952 */ jal func_8014A548 -/* 1C20 80026820 00000000 */ nop +/* 1C20 80026820 00000000 */ nop /* 1C24 80026824 0C051C99 */ jal func_80147264 -/* 1C28 80026828 00000000 */ nop +/* 1C28 80026828 00000000 */ nop /* 1C2C 8002682C 0C0525CD */ jal func_80149734 -/* 1C30 80026830 00000000 */ nop +/* 1C30 80026830 00000000 */ nop /* 1C34 80026834 0C051D05 */ jal func_80147414 -/* 1C38 80026838 00000000 */ nop +/* 1C38 80026838 00000000 */ nop /* 1C3C 8002683C 0C00AE9E */ jal update_curtains -/* 1C40 80026840 00000000 */ nop +/* 1C40 80026840 00000000 */ nop /* 1C44 80026844 3C10800A */ lui $s0, %hi(D_8009A650) /* 1C48 80026848 2610A650 */ addiu $s0, $s0, %lo(D_8009A650) /* 1C4C 8002684C 8E040000 */ lw $a0, ($s0) /* 1C50 80026850 30820020 */ andi $v0, $a0, 0x20 /* 1C54 80026854 10400035 */ beqz $v0, .L8002692C -/* 1C58 80026858 00000000 */ nop +/* 1C58 80026858 00000000 */ nop /* 1C5C 8002685C 3C118007 */ lui $s1, %hi(D_800741A2) /* 1C60 80026860 263141A2 */ addiu $s1, $s1, %lo(D_800741A2) /* 1C64 80026864 86230000 */ lh $v1, ($s1) @@ -83,7 +83,7 @@ glabel step_game_loop /* 1C70 80026870 1062001C */ beq $v1, $v0, .L800268E4 /* 1C74 80026874 34840008 */ ori $a0, $a0, 8 /* 1C78 80026878 08009A4F */ j .L8002693C -/* 1C7C 8002687C 00000000 */ nop +/* 1C7C 8002687C 00000000 */ nop .L80026880: /* 1C80 80026880 34820200 */ ori $v0, $a0, 0x200 /* 1C84 80026884 0C03805E */ jal disable_player_input @@ -101,7 +101,7 @@ glabel step_game_loop /* 1CB4 800268B4 3C01800A */ lui $at, %hi(D_8009A690) /* 1CB8 800268B8 A422A690 */ sh $v0, %lo(D_8009A690)($at) /* 1CBC 800268BC 08009A4F */ j .L8002693C -/* 1CC0 800268C0 00000000 */ nop +/* 1CC0 800268C0 00000000 */ nop .L800268C4: /* 1CC4 800268C4 A4820000 */ sh $v0, ($a0) /* 1CC8 800268C8 00021400 */ sll $v0, $v0, 0x10 @@ -110,7 +110,7 @@ glabel step_game_loop /* 1CD4 800268D4 50400019 */ beql $v0, $zero, .L8002693C /* 1CD8 800268D8 A4850000 */ sh $a1, ($a0) /* 1CDC 800268DC 08009A4F */ j .L8002693C -/* 1CE0 800268E0 00000000 */ nop +/* 1CE0 800268E0 00000000 */ nop .L800268E4: /* 1CE4 800268E4 3C02800A */ lui $v0, %hi(D_8009A690) /* 1CE8 800268E8 2442A690 */ addiu $v0, $v0, %lo(D_8009A690) @@ -120,9 +120,9 @@ glabel step_game_loop /* 1CF8 800268F8 A4430000 */ sh $v1, ($v0) /* 1CFC 800268FC 00031C00 */ sll $v1, $v1, 0x10 /* 1D00 80026900 1460000E */ bnez $v1, .L8002693C -/* 1D04 80026904 00000000 */ nop +/* 1D04 80026904 00000000 */ nop /* 1D08 80026908 0C05260E */ jal func_80149838 -/* 1D0C 8002690C 00000000 */ nop +/* 1D0C 8002690C 00000000 */ nop /* 1D10 80026910 0C00CD3C */ jal set_game_mode /* 1D14 80026914 0000202D */ daddu $a0, $zero, $zero /* 1D18 80026918 8E020000 */ lw $v0, ($s0) diff --git a/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s b/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s index 1c41945441..a3ececf061 100644 --- a/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s +++ b/asm/nonmatchings/code_1f580_len_1940/BindNpcAI.s @@ -24,18 +24,18 @@ glabel BindNpcAI /* 1FEC4 80044AC4 0040A02D */ daddu $s4, $v0, $zero /* 1FEC8 80044AC8 2402FFFF */ addiu $v0, $zero, -1 /* 1FECC 80044ACC 12420011 */ beq $s2, $v0, .L80044B14 -/* 1FED0 80044AD0 00000000 */ nop +/* 1FED0 80044AD0 00000000 */ nop /* 1FED4 80044AD4 12620004 */ beq $s3, $v0, .L80044AE8 -/* 1FED8 80044AD8 00000000 */ nop +/* 1FED8 80044AD8 00000000 */ nop /* 1FEDC 80044ADC 86420008 */ lh $v0, 8($s2) /* 1FEE0 80044AE0 1453000C */ bne $v0, $s3, .L80044B14 -/* 1FEE4 80044AE4 00000000 */ nop +/* 1FEE4 80044AE4 00000000 */ nop .L80044AE8: /* 1FEE8 80044AE8 86530008 */ lh $s3, 8($s2) .L80044AEC: /* 1FEEC 80044AEC 8E020064 */ lw $v0, 0x64($s0) /* 1FEF0 80044AF0 10400003 */ beqz $v0, .L80044B00 -/* 1FEF4 80044AF4 00000000 */ nop +/* 1FEF4 80044AF4 00000000 */ nop /* 1FEF8 80044AF8 080112BB */ j .L80044AEC /* 1FEFC 80044AFC 0040802D */ daddu $s0, $v0, $zero .L80044B00: @@ -43,7 +43,7 @@ glabel BindNpcAI /* 1FF04 80044B04 52020006 */ beql $s0, $v0, .L80044B20 /* 1FF08 80044B08 241500FF */ addiu $s5, $zero, 0xff /* 1FF0C 80044B0C 080112C8 */ j .L80044B20 -/* 1FF10 80044B10 00000000 */ nop +/* 1FF10 80044B10 00000000 */ nop .L80044B14: /* 1FF14 80044B14 0C00FB3A */ jal get_enemy /* 1FF18 80044B18 0260202D */ daddu $a0, $s3, $zero @@ -60,7 +60,7 @@ glabel BindNpcAI /* 1FF3C 80044B3C 0280202D */ daddu $a0, $s4, $zero /* 1FF40 80044B40 8E440054 */ lw $a0, 0x54($s2) /* 1FF44 80044B44 0C0B102B */ jal kill_script_by_ID -/* 1FF48 80044B48 00000000 */ nop +/* 1FF48 80044B48 00000000 */ nop /* 1FF4C 80044B4C 0280202D */ daddu $a0, $s4, $zero .L80044B50: /* 1FF50 80044B50 2405000A */ addiu $a1, $zero, 0xa diff --git a/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s b/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s index de35775d9f..6e27e2985c 100644 --- a/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s +++ b/asm/nonmatchings/code_1f580_len_1940/RemoveEncounter.s @@ -18,12 +18,12 @@ glabel RemoveEncounter /* 1F8AC 800444AC 26730F10 */ addiu $s3, $s3, %lo(gCurrentEncounter) /* 1F8B0 800444B0 2402FFFF */ addiu $v0, $zero, -1 /* 1F8B4 800444B4 1202000D */ beq $s0, $v0, .L800444EC -/* 1F8B8 800444B8 00000000 */ nop +/* 1F8B8 800444B8 00000000 */ nop /* 1F8BC 800444BC 12220004 */ beq $s1, $v0, .L800444D0 -/* 1F8C0 800444C0 00000000 */ nop +/* 1F8C0 800444C0 00000000 */ nop /* 1F8C4 800444C4 86020008 */ lh $v0, 8($s0) /* 1F8C8 800444C8 14510008 */ bne $v0, $s1, .L800444EC -/* 1F8CC 800444CC 00000000 */ nop +/* 1F8CC 800444CC 00000000 */ nop .L800444D0: /* 1F8D0 800444D0 86110008 */ lh $s1, 8($s0) /* 1F8D4 800444D4 0801113D */ j .L800444F4 @@ -57,7 +57,7 @@ glabel RemoveEncounter /* 1F930 80044530 24840001 */ addiu $a0, $a0, 1 /* 1F934 80044534 86020008 */ lh $v0, 8($s0) /* 1F938 80044538 1051FFE8 */ beq $v0, $s1, .L800444DC -/* 1F93C 8004453C 00000000 */ nop +/* 1F93C 8004453C 00000000 */ nop .L80044540: /* 1F940 80044540 0086102A */ slt $v0, $a0, $a2 /* 1F944 80044544 1440FFF8 */ bnez $v0, .L80044528 diff --git a/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s b/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s index 272f7eb6e4..f757ce5b76 100644 --- a/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s +++ b/asm/nonmatchings/code_1f580_len_1940/RemoveNpc.s @@ -20,9 +20,9 @@ glabel RemoveNpc /* 1F77C 8004437C 26940F10 */ addiu $s4, $s4, %lo(gCurrentEncounter) /* 1F780 80044380 2402FFFF */ addiu $v0, $zero, -1 /* 1F784 80044384 12020017 */ beq $s0, $v0, .L800443E4 -/* 1F788 80044388 00000000 */ nop +/* 1F788 80044388 00000000 */ nop /* 1F78C 8004438C 16220004 */ bne $s1, $v0, .L800443A0 -/* 1F790 80044390 00000000 */ nop +/* 1F790 80044390 00000000 */ nop /* 1F794 80044394 86110008 */ lh $s1, 8($s0) /* 1F798 80044398 080110FB */ j .L800443EC /* 1F79C 8004439C 241300FF */ addiu $s3, $zero, 0xff @@ -33,7 +33,7 @@ glabel RemoveNpc .L800443AC: /* 1F7AC 800443AC 8C820064 */ lw $v0, 0x64($a0) /* 1F7B0 800443B0 10400003 */ beqz $v0, .L800443C0 -/* 1F7B4 800443B4 00000000 */ nop +/* 1F7B4 800443B4 00000000 */ nop /* 1F7B8 800443B8 080110EB */ j .L800443AC /* 1F7BC 800443BC 0040202D */ daddu $a0, $v0, $zero .L800443C0: @@ -41,7 +41,7 @@ glabel RemoveNpc /* 1F7C4 800443C4 50820009 */ beql $a0, $v0, .L800443EC /* 1F7C8 800443C8 241300FF */ addiu $s3, $zero, 0xff /* 1F7CC 800443CC 080110FB */ j .L800443EC -/* 1F7D0 800443D0 00000000 */ nop +/* 1F7D0 800443D0 00000000 */ nop .L800443D4: /* 1F7D4 800443D4 0C00F9EB */ jal kill_enemy /* 1F7D8 800443D8 0200202D */ daddu $a0, $s0, $zero @@ -71,7 +71,7 @@ glabel RemoveNpc /* 1F828 80044428 24840001 */ addiu $a0, $a0, 1 /* 1F82C 8004442C 86020008 */ lh $v0, 8($s0) /* 1F830 80044430 1051FFE8 */ beq $v0, $s1, .L800443D4 -/* 1F834 80044434 00000000 */ nop +/* 1F834 80044434 00000000 */ nop .L80044438: /* 1F838 80044438 0086102A */ slt $v0, $a0, $a2 /* 1F83C 8004443C 1440FFF8 */ bnez $v0, .L80044420 diff --git a/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s b/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s index 0a415cafcd..9e0ca75915 100644 --- a/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s +++ b/asm/nonmatchings/code_1f580_len_1940/SetNpcAux.s @@ -25,16 +25,16 @@ glabel SetNpcAux /* 201F4 80044DF4 12220011 */ beq $s1, $v0, .L80044E3C /* 201F8 80044DF8 0260182D */ daddu $v1, $s3, $zero /* 201FC 80044DFC 12420004 */ beq $s2, $v0, .L80044E10 -/* 20200 80044E00 00000000 */ nop +/* 20200 80044E00 00000000 */ nop /* 20204 80044E04 86220008 */ lh $v0, 8($s1) /* 20208 80044E08 1452000C */ bne $v0, $s2, .L80044E3C -/* 2020C 80044E0C 00000000 */ nop +/* 2020C 80044E0C 00000000 */ nop .L80044E10: /* 20210 80044E10 86320008 */ lh $s2, 8($s1) .L80044E14: /* 20214 80044E14 8C620064 */ lw $v0, 0x64($v1) /* 20218 80044E18 10400003 */ beqz $v0, .L80044E28 -/* 2021C 80044E1C 00000000 */ nop +/* 2021C 80044E1C 00000000 */ nop /* 20220 80044E20 08011385 */ j .L80044E14 /* 20224 80044E24 0040182D */ daddu $v1, $v0, $zero .L80044E28: @@ -42,7 +42,7 @@ glabel SetNpcAux /* 2022C 80044E2C 50620007 */ beql $v1, $v0, .L80044E4C /* 20230 80044E30 241400FF */ addiu $s4, $zero, 0xff /* 20234 80044E34 08011393 */ j .L80044E4C -/* 20238 80044E38 00000000 */ nop +/* 20238 80044E38 00000000 */ nop .L80044E3C: /* 2023C 80044E3C 0C00FB3A */ jal get_enemy /* 20240 80044E40 0240202D */ daddu $a0, $s2, $zero @@ -50,7 +50,7 @@ glabel SetNpcAux /* 20248 80044E48 8E220044 */ lw $v0, 0x44($s1) .L80044E4C: /* 2024C 80044E4C 10400003 */ beqz $v0, .L80044E5C -/* 20250 80044E50 00000000 */ nop +/* 20250 80044E50 00000000 */ nop /* 20254 80044E54 0C0B102B */ jal kill_script_by_ID /* 20258 80044E58 8E24005C */ lw $a0, 0x5c($s1) .L80044E5C: diff --git a/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s b/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s index 3a4e602f17..6c73c9b617 100644 --- a/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s +++ b/asm/nonmatchings/code_1f580_len_1940/StartBossBattle.s @@ -35,20 +35,20 @@ glabel StartBossBattle /* 1FD14 80044914 AE640088 */ sw $a0, 0x88($s3) /* 1FD18 80044918 8E22003C */ lw $v0, 0x3c($s1) /* 1FD1C 8004491C 10400003 */ beqz $v0, .L8004492C -/* 1FD20 80044920 00000000 */ nop +/* 1FD20 80044920 00000000 */ nop /* 1FD24 80044924 0C0B1108 */ jal suspend_all_script /* 1FD28 80044928 8E240054 */ lw $a0, 0x54($s1) .L8004492C: /* 1FD2C 8004492C 8E220044 */ lw $v0, 0x44($s1) /* 1FD30 80044930 10400003 */ beqz $v0, .L80044940 -/* 1FD34 80044934 00000000 */ nop +/* 1FD34 80044934 00000000 */ nop /* 1FD38 80044938 0C0B1108 */ jal suspend_all_script /* 1FD3C 8004493C 8E24005C */ lw $a0, 0x5c($s1) .L80044940: /* 1FD40 80044940 0C03805E */ jal disable_player_input /* 1FD44 80044944 0000802D */ daddu $s0, $zero, $zero /* 1FD48 80044948 0C03BD8A */ jal func_800EF628 -/* 1FD4C 8004494C 00000000 */ nop +/* 1FD4C 8004494C 00000000 */ nop /* 1FD50 80044950 8E740088 */ lw $s4, 0x88($s3) /* 1FD54 80044954 8E820000 */ lw $v0, ($s4) /* 1FD58 80044958 18400021 */ blez $v0, .L800449E0 @@ -57,14 +57,14 @@ glabel StartBossBattle .L80044964: /* 1FD64 80044964 8E510004 */ lw $s1, 4($s2) /* 1FD68 80044968 12200018 */ beqz $s1, .L800449CC -/* 1FD6C 8004496C 00000000 */ nop +/* 1FD6C 8004496C 00000000 */ nop /* 1FD70 80044970 8E220000 */ lw $v0, ($s1) /* 1FD74 80044974 30420008 */ andi $v0, $v0, 8 /* 1FD78 80044978 10400004 */ beqz $v0, .L8004498C -/* 1FD7C 8004497C 00000000 */ nop +/* 1FD7C 8004497C 00000000 */ nop /* 1FD80 80044980 8E62008C */ lw $v0, 0x8c($s3) /* 1FD84 80044984 16220011 */ bne $s1, $v0, .L800449CC -/* 1FD88 80044988 00000000 */ nop +/* 1FD88 80044988 00000000 */ nop .L8004498C: /* 1FD8C 8004498C 8E220028 */ lw $v0, 0x28($s1) /* 1FD90 80044990 1040000E */ beqz $v0, .L800449CC diff --git a/asm/nonmatchings/code_1f580_len_1940/start_battle.s b/asm/nonmatchings/code_1f580_len_1940/start_battle.s index 9fd989a240..067ff3e1ec 100644 --- a/asm/nonmatchings/code_1f580_len_1940/start_battle.s +++ b/asm/nonmatchings/code_1f580_len_1940/start_battle.s @@ -32,20 +32,20 @@ glabel start_battle /* 1FB20 80044720 AE630088 */ sw $v1, 0x88($s3) /* 1FB24 80044724 8E22003C */ lw $v0, 0x3c($s1) /* 1FB28 80044728 10400003 */ beqz $v0, .L80044738 -/* 1FB2C 8004472C 00000000 */ nop +/* 1FB2C 8004472C 00000000 */ nop /* 1FB30 80044730 0C0B1108 */ jal suspend_all_script /* 1FB34 80044734 8E240054 */ lw $a0, 0x54($s1) .L80044738: /* 1FB38 80044738 8E220044 */ lw $v0, 0x44($s1) /* 1FB3C 8004473C 10400003 */ beqz $v0, .L8004474C -/* 1FB40 80044740 00000000 */ nop +/* 1FB40 80044740 00000000 */ nop /* 1FB44 80044744 0C0B1108 */ jal suspend_all_script /* 1FB48 80044748 8E24005C */ lw $a0, 0x5c($s1) .L8004474C: /* 1FB4C 8004474C 0C03805E */ jal disable_player_input /* 1FB50 80044750 0000802D */ daddu $s0, $zero, $zero /* 1FB54 80044754 0C03BD8A */ jal func_800EF628 -/* 1FB58 80044758 00000000 */ nop +/* 1FB58 80044758 00000000 */ nop /* 1FB5C 8004475C 8E740088 */ lw $s4, 0x88($s3) /* 1FB60 80044760 8E820000 */ lw $v0, ($s4) /* 1FB64 80044764 18400021 */ blez $v0, .L800447EC @@ -54,14 +54,14 @@ glabel start_battle .L80044770: /* 1FB70 80044770 8E510004 */ lw $s1, 4($s2) /* 1FB74 80044774 12200018 */ beqz $s1, .L800447D8 -/* 1FB78 80044778 00000000 */ nop +/* 1FB78 80044778 00000000 */ nop /* 1FB7C 8004477C 8E220000 */ lw $v0, ($s1) /* 1FB80 80044780 30420008 */ andi $v0, $v0, 8 /* 1FB84 80044784 10400004 */ beqz $v0, .L80044798 -/* 1FB88 80044788 00000000 */ nop +/* 1FB88 80044788 00000000 */ nop /* 1FB8C 8004478C 8E62008C */ lw $v0, 0x8c($s3) /* 1FB90 80044790 16220011 */ bne $s1, $v0, .L800447D8 -/* 1FB94 80044794 00000000 */ nop +/* 1FB94 80044794 00000000 */ nop .L80044798: /* 1FB98 80044798 8E220028 */ lw $v0, 0x28($s1) /* 1FB9C 8004479C 1040000E */ beqz $v0, .L800447D8 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s b/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s index 1c0cbac134..9633a2cecc 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004D7E0.s @@ -123,7 +123,7 @@ glabel func_8004D7E0 /* 28D88 8004D988 1440FFFB */ bnez $v0, .L8004D978 /* 28D8C 8004D98C 24840004 */ addiu $a0, $a0, 4 /* 28D90 8004D990 08013668 */ j .L8004D9A0 -/* 28D94 8004D994 00000000 */ nop +/* 28D94 8004D994 00000000 */ nop .L8004D998: /* 28D98 8004D998 AE000078 */ sw $zero, 0x78($s0) /* 28D9C 8004D99C A200021C */ sb $zero, 0x21c($s0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s b/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s index d025d82ae4..ddceeab432 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DA74.s @@ -7,11 +7,11 @@ glabel func_8004DA74 /* 28E7C 8004DA7C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 28E80 8004DA80 AFBF0010 */ sw $ra, 0x10($sp) /* 28E84 8004DA84 0C0136AA */ jal func_8004DAA8 -/* 28E88 8004DA88 00000000 */ nop +/* 28E88 8004DA88 00000000 */ nop /* 28E8C 8004DA8C 3C04800A */ lui $a0, %hi(D_8009A5FC) /* 28E90 8004DA90 8C84A5FC */ lw $a0, %lo(D_8009A5FC)($a0) /* 28E94 8004DA94 0C0136AA */ jal func_8004DAA8 -/* 28E98 8004DA98 00000000 */ nop +/* 28E98 8004DA98 00000000 */ nop /* 28E9C 8004DA9C 8FBF0010 */ lw $ra, 0x10($sp) /* 28EA0 8004DAA0 03E00008 */ jr $ra /* 28EA4 8004DAA4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s b/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s index 1a7711bc78..c3f949966f 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DAE0.s @@ -8,7 +8,7 @@ glabel func_8004DAE0 /* 28EEC 8004DAEC 12000009 */ beqz $s0, .L8004DB14 /* 28EF0 8004DAF0 AFBF0014 */ sw $ra, 0x14($sp) /* 28EF4 8004DAF4 0C0135E5 */ jal func_8004D794 -/* 28EF8 8004DAF8 00000000 */ nop +/* 28EF8 8004DAF8 00000000 */ nop /* 28EFC 8004DAFC 50400006 */ beql $v0, $zero, .L8004DB18 /* 28F00 8004DB00 24020002 */ addiu $v0, $zero, 2 /* 28F04 8004DB04 8C42001C */ lw $v0, 0x1c($v0) diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s b/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s index 7befee5525..c6a6a95d15 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004DE2C.s @@ -16,7 +16,7 @@ glabel func_8004DE2C /* 29258 8004DE58 0000902D */ daddu $s2, $zero, $zero /* 2925C 8004DE5C 8E620014 */ lw $v0, 0x14($s3) /* 29260 8004DE60 14400045 */ bnez $v0, .L8004DF78 -/* 29264 8004DE64 00000000 */ nop +/* 29264 8004DE64 00000000 */ nop /* 29268 8004DE68 0C014FD9 */ jal func_80053F64 /* 2926C 8004DE6C 0200202D */ daddu $a0, $s0, $zero /* 29270 8004DE70 0040882D */ daddu $s1, $v0, $zero @@ -30,7 +30,7 @@ glabel func_8004DE2C /* 29290 8004DE90 24120004 */ addiu $s2, $zero, 4 /* 29294 8004DE94 90840071 */ lbu $a0, 0x71($a0) /* 29298 8004DE98 0C015092 */ jal func_80054248 -/* 2929C 8004DE9C 00000000 */ nop +/* 2929C 8004DE9C 00000000 */ nop /* 292A0 8004DEA0 0040802D */ daddu $s0, $v0, $zero /* 292A4 8004DEA4 52000042 */ beql $s0, $zero, .L8004DFB0 /* 292A8 8004DEA8 24120006 */ addiu $s2, $zero, 6 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s b/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s index db99b50ed6..bea9208592 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E4B8.s @@ -39,7 +39,7 @@ glabel func_8004E4B8 /* 2993C 8004E53C 00541021 */ addu $v0, $v0, $s4 /* 29940 8004E540 8C420000 */ lw $v0, ($v0) /* 29944 8004E544 00400008 */ jr $v0 -/* 29948 8004E548 00000000 */ nop +/* 29948 8004E548 00000000 */ nop /* 2994C 8004E54C 92020220 */ lbu $v0, 0x220($s0) /* 29950 8004E550 54400016 */ bnel $v0, $zero, .L8004E5AC /* 29954 8004E554 0000882D */ daddu $s1, $zero, $zero diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E844.s b/asm/nonmatchings/code_28910_len_5090/func_8004E844.s index 80aba161a4..22e666b09b 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E844.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E844.s @@ -17,4 +17,4 @@ glabel func_8004E844 /* 29C70 8004E870 0441FFFD */ bgez $v0, .L8004E868 /* 29C74 8004E874 24630002 */ addiu $v1, $v1, 2 /* 29C78 8004E878 03E00008 */ jr $ra -/* 29C7C 8004E87C 00000000 */ nop +/* 29C7C 8004E87C 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004E904.s b/asm/nonmatchings/code_28910_len_5090/func_8004E904.s index 634302ca6b..003e1b38d6 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004E904.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004E904.s @@ -43,12 +43,12 @@ glabel func_8004E904 /* 29D90 8004E990 3C020007 */ lui $v0, 7 /* 29D94 8004E994 3C020005 */ lui $v0, 5 /* 29D98 8004E998 10620016 */ beq $v1, $v0, .L8004E9F4 -/* 29D9C 8004E99C 00000000 */ nop +/* 29D9C 8004E99C 00000000 */ nop /* 29DA0 8004E9A0 08013A82 */ j .L8004EA08 /* 29DA4 8004E9A4 0000882D */ daddu $s1, $zero, $zero .L8004E9A8: /* 29DA8 8004E9A8 1062000E */ beq $v1, $v0, .L8004E9E4 -/* 29DAC 8004E9AC 00000000 */ nop +/* 29DAC 8004E9AC 00000000 */ nop /* 29DB0 8004E9B0 08013A82 */ j .L8004EA08 /* 29DB4 8004E9B4 0000882D */ daddu $s1, $zero, $zero .L8004E9B8: @@ -63,7 +63,7 @@ glabel func_8004E904 /* 29DD4 8004E9D4 1440000D */ bnez $v0, .L8004EA0C /* 29DD8 8004E9D8 3222FFFF */ andi $v0, $s1, 0xffff /* 29DDC 8004E9DC 08013A7D */ j .L8004E9F4 -/* 29DE0 8004E9E0 00000000 */ nop +/* 29DE0 8004E9E0 00000000 */ nop .L8004E9E4: /* 29DE4 8004E9E4 92020223 */ lbu $v0, 0x223($s0) /* 29DE8 8004E9E8 30420001 */ andi $v0, $v0, 1 @@ -80,7 +80,7 @@ glabel func_8004E904 /* 29E08 8004EA08 3222FFFF */ andi $v0, $s1, 0xffff .L8004EA0C: /* 29E0C 8004EA0C 1440FFCB */ bnez $v0, .L8004E93C -/* 29E10 8004EA10 00000000 */ nop +/* 29E10 8004EA10 00000000 */ nop /* 29E14 8004EA14 8FBF0024 */ lw $ra, 0x24($sp) /* 29E18 8004EA18 8FB40020 */ lw $s4, 0x20($sp) /* 29E1C 8004EA1C 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s b/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s index ed343cdab7..c2aeef63b5 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004EA34.s @@ -27,7 +27,7 @@ glabel func_8004EA34 /* 29E8C 8004EA8C 2463FFFF */ addiu $v1, $v1, -1 .L8004EA90: /* 29E90 8004EA90 1040000E */ beqz $v0, .L8004EACC -/* 29E94 8004EA94 00000000 */ nop +/* 29E94 8004EA94 00000000 */ nop /* 29E98 8004EA98 24630001 */ addiu $v1, $v1, 1 /* 29E9C 8004EA9C 00031080 */ sll $v0, $v1, 2 /* 29EA0 8004EAA0 00821021 */ addu $v0, $a0, $v0 diff --git a/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s b/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s index de1de6b4a9..e5913e7fb1 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8004EAD4.s @@ -82,4 +82,4 @@ glabel func_8004EAD4 /* 29FF8 8004EBF8 A0800233 */ sb $zero, 0x233($a0) .L8004EBFC: /* 29FFC 8004EBFC 03E00008 */ jr $ra -/* 2A000 8004EC00 00000000 */ nop +/* 2A000 8004EC00 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_800501A8.s b/asm/nonmatchings/code_28910_len_5090/func_800501A8.s index 4b8b614268..24711c48f9 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800501A8.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800501A8.s @@ -51,10 +51,10 @@ glabel func_800501A8 /* 2B658 80050258 90830045 */ lbu $v1, 0x45($a0) /* 2B65C 8005025C 92620234 */ lbu $v0, 0x234($s3) /* 2B660 80050260 14620006 */ bne $v1, $v0, .L8005027C -/* 2B664 80050264 00000000 */ nop +/* 2B664 80050264 00000000 */ nop /* 2B668 80050268 8C82001C */ lw $v0, 0x1c($a0) /* 2B66C 8005026C 10400003 */ beqz $v0, .L8005027C -/* 2B670 80050270 00000000 */ nop +/* 2B670 80050270 00000000 */ nop /* 2B674 80050274 0C014E31 */ jal func_800538C4 /* 2B678 80050278 320500FF */ andi $a1, $s0, 0xff .L8005027C: diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050970.s b/asm/nonmatchings/code_28910_len_5090/func_80050970.s index ef4baad707..7c89165e7a 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050970.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050970.s @@ -61,7 +61,7 @@ glabel func_80050970 /* 2BE48 80050A48 90830045 */ lbu $v1, 0x45($a0) /* 2BE4C 80050A4C 92220234 */ lbu $v0, 0x234($s1) /* 2BE50 80050A50 14620005 */ bne $v1, $v0, .L80050A68 -/* 2BE54 80050A54 00000000 */ nop +/* 2BE54 80050A54 00000000 */ nop /* 2BE58 80050A58 9082003D */ lbu $v0, 0x3d($a0) /* 2BE5C 80050A5C AC960018 */ sw $s6, 0x18($a0) /* 2BE60 80050A60 34420010 */ ori $v0, $v0, 0x10 @@ -100,7 +100,7 @@ glabel func_80050970 /* 2BED4 80050AD4 90830045 */ lbu $v1, 0x45($a0) /* 2BED8 80050AD8 92220234 */ lbu $v0, 0x234($s1) /* 2BEDC 80050ADC 14620005 */ bne $v1, $v0, .L80050AF4 -/* 2BEE0 80050AE0 00000000 */ nop +/* 2BEE0 80050AE0 00000000 */ nop /* 2BEE4 80050AE4 9082003D */ lbu $v0, 0x3d($a0) /* 2BEE8 80050AE8 AC960018 */ sw $s6, 0x18($a0) /* 2BEEC 80050AEC 34420010 */ ori $v0, $v0, 0x10 @@ -152,4 +152,4 @@ glabel func_80050970 /* 2BF80 80050B80 8FB00018 */ lw $s0, 0x18($sp) /* 2BF84 80050B84 03E00008 */ jr $ra /* 2BF88 80050B88 27BD0040 */ addiu $sp, $sp, 0x40 -/* 2BF8C 80050B8C 00000000 */ nop +/* 2BF8C 80050B8C 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050D50.s b/asm/nonmatchings/code_28910_len_5090/func_80050D50.s index b58d9b7c64..d1475534b4 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050D50.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050D50.s @@ -40,7 +40,7 @@ glabel func_80050D50 /* 2C1D4 80050DD4 14410004 */ bne $v0, $at, .L80050DE8 /* 2C1D8 80050DD8 3C018000 */ lui $at, 0x8000 /* 2C1DC 80050DDC 14610002 */ bne $v1, $at, .L80050DE8 -/* 2C1E0 80050DE0 00000000 */ nop +/* 2C1E0 80050DE0 00000000 */ nop /* 2C1E4 80050DE4 0006000D */ break 6 .L80050DE8: /* 2C1E8 80050DE8 00001812 */ mflo $v1 diff --git a/asm/nonmatchings/code_28910_len_5090/func_80050EF0.s b/asm/nonmatchings/code_28910_len_5090/func_80050EF0.s index 3d52653ff0..592b76bcf4 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80050EF0.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80050EF0.s @@ -13,13 +13,13 @@ glabel func_80050EF0 /* 2C310 80050F10 00621821 */ addu $v1, $v1, $v0 /* 2C314 80050F14 8C620004 */ lw $v0, 4($v1) /* 2C318 80050F18 10400010 */ beqz $v0, .L80050F5C -/* 2C31C 80050F1C 00000000 */ nop +/* 2C31C 80050F1C 00000000 */ nop /* 2C320 80050F20 8C620008 */ lw $v0, 8($v1) /* 2C324 80050F24 1040000D */ beqz $v0, .L80050F5C -/* 2C328 80050F28 00000000 */ nop +/* 2C328 80050F28 00000000 */ nop /* 2C32C 80050F2C 90620024 */ lbu $v0, 0x24($v1) /* 2C330 80050F30 10400005 */ beqz $v0, .L80050F48 -/* 2C334 80050F34 00000000 */ nop +/* 2C334 80050F34 00000000 */ nop /* 2C338 80050F38 AC600008 */ sw $zero, 8($v1) /* 2C33C 80050F3C AC600020 */ sw $zero, 0x20($v1) /* 2C340 80050F40 03E00008 */ jr $ra @@ -32,4 +32,4 @@ glabel func_80050EF0 /* 2C358 80050F58 AC620018 */ sw $v0, 0x18($v1) .L80050F5C: /* 2C35C 80050F5C 03E00008 */ jr $ra -/* 2C360 80050F60 00000000 */ nop +/* 2C360 80050F60 00000000 */ nop diff --git a/asm/nonmatchings/code_28910_len_5090/func_80051050.s b/asm/nonmatchings/code_28910_len_5090/func_80051050.s index d408f240c3..4843baf201 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_80051050.s +++ b/asm/nonmatchings/code_28910_len_5090/func_80051050.s @@ -16,7 +16,7 @@ glabel func_80051050 /* 2C47C 8005107C 0000202D */ daddu $a0, $zero, $zero /* 2C480 80051080 8C620008 */ lw $v0, 8($v1) /* 2C484 80051084 10400005 */ beqz $v0, .L8005109C -/* 2C488 80051088 00000000 */ nop +/* 2C488 80051088 00000000 */ nop /* 2C48C 8005108C 90620024 */ lbu $v0, 0x24($v1) /* 2C490 80051090 10400002 */ beqz $v0, .L8005109C /* 2C494 80051094 24040001 */ addiu $a0, $zero, 1 diff --git a/asm/nonmatchings/code_28910_len_5090/func_800511BC.s b/asm/nonmatchings/code_28910_len_5090/func_800511BC.s index 5a453babec..5b7fd80b79 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_800511BC.s +++ b/asm/nonmatchings/code_28910_len_5090/func_800511BC.s @@ -77,7 +77,7 @@ glabel func_800511BC .L800512C0: /* 2C6C0 800512C0 96020028 */ lhu $v0, 0x28($s0) /* 2C6C4 800512C4 10400003 */ beqz $v0, .L800512D4 -/* 2C6C8 800512C8 00000000 */ nop +/* 2C6C8 800512C8 00000000 */ nop /* 2C6CC 800512CC 0C014354 */ jal func_80050D50 /* 2C6D0 800512D0 0200202D */ daddu $a0, $s0, $zero .L800512D4: diff --git a/asm/nonmatchings/code_28910_len_5090/func_8005232C.s b/asm/nonmatchings/code_28910_len_5090/func_8005232C.s index 70b4b3c7d6..4d1cf3c6a5 100644 --- a/asm/nonmatchings/code_28910_len_5090/func_8005232C.s +++ b/asm/nonmatchings/code_28910_len_5090/func_8005232C.s @@ -43,7 +43,7 @@ glabel func_8005232C /* 2D7BC 800523BC 02E38821 */ addu $s1, $s7, $v1 /* 2D7C0 800523C0 92220045 */ lbu $v0, 0x45($s1) /* 2D7C4 800523C4 10400005 */ beqz $v0, .L800523DC -/* 2D7C8 800523C8 00000000 */ nop +/* 2D7C8 800523C8 00000000 */ nop /* 2D7CC 800523CC 26100001 */ addiu $s0, $s0, 1 /* 2D7D0 800523D0 0204102B */ sltu $v0, $s0, $a0 /* 2D7D4 800523D4 1440FFF9 */ bnez $v0, .L800523BC @@ -52,7 +52,7 @@ glabel func_8005232C /* 2D7DC 800523DC 8E820034 */ lw $v0, 0x34($s4) /* 2D7E0 800523E0 0202102B */ sltu $v0, $s0, $v0 /* 2D7E4 800523E4 1440001C */ bnez $v0, .L80052458 -/* 2D7E8 800523E8 00000000 */ nop +/* 2D7E8 800523E8 00000000 */ nop /* 2D7EC 800523EC 8E900030 */ lw $s0, 0x30($s4) .L800523F0: /* 2D7F0 800523F0 8E820034 */ lw $v0, 0x34($s4) @@ -73,7 +73,7 @@ glabel func_8005232C /* 2D828 80052428 0C014E31 */ jal func_800538C4 /* 2D82C 8005242C 320500FF */ andi $a1, $s0, 0xff /* 2D830 80052430 08014912 */ j .L80052448 -/* 2D834 80052434 00000000 */ nop +/* 2D834 80052434 00000000 */ nop .L80052438: /* 2D838 80052438 8E820034 */ lw $v0, 0x34($s4) /* 2D83C 8005243C 0202102B */ sltu $v0, $s0, $v0 @@ -116,8 +116,8 @@ glabel func_8005232C /* 2D8C8 800524C8 86420018 */ lh $v0, 0x18($s2) /* 2D8CC 800524CC 00820018 */ mult $a0, $v0 /* 2D8D0 800524D0 00003012 */ mflo $a2 -/* 2D8D4 800524D4 00000000 */ nop -/* 2D8D8 800524D8 00000000 */ nop +/* 2D8D4 800524D4 00000000 */ nop +/* 2D8D8 800524D8 00000000 */ nop /* 2D8DC 800524DC 00C30018 */ mult $a2, $v1 /* 2D8E0 800524E0 00003012 */ mflo $a2 /* 2D8E4 800524E4 00061383 */ sra $v0, $a2, 0xe @@ -129,7 +129,7 @@ glabel func_8005232C /* 2D8FC 800524FC 8E420000 */ lw $v0, ($s2) /* 2D900 80052500 C4420020 */ lwc1 $f2, 0x20($v0) /* 2D904 80052504 46020002 */ mul.s $f0, $f0, $f2 -/* 2D908 80052508 00000000 */ nop +/* 2D908 80052508 00000000 */ nop /* 2D90C 8005250C E6200004 */ swc1 $f0, 4($s1) /* 2D910 80052510 92420024 */ lbu $v0, 0x24($s2) /* 2D914 80052514 A222000E */ sb $v0, 0xe($s1) @@ -168,5 +168,5 @@ glabel func_8005232C /* 2D98C 8005258C 8FB00010 */ lw $s0, 0x10($sp) /* 2D990 80052590 03E00008 */ jr $ra /* 2D994 80052594 27BD0038 */ addiu $sp, $sp, 0x38 -/* 2D998 80052598 00000000 */ nop -/* 2D99C 8005259C 00000000 */ nop +/* 2D998 80052598 00000000 */ nop +/* 2D99C 8005259C 00000000 */ nop diff --git a/asm/nonmatchings/code_31650/alAudioFrame.s b/asm/nonmatchings/code_31650/alAudioFrame.s index c396e84cf3..b7f81272b1 100644 --- a/asm/nonmatchings/code_31650/alAudioFrame.s +++ b/asm/nonmatchings/code_31650/alAudioFrame.s @@ -25,11 +25,11 @@ glabel alAudioFrame /* 31A10 80056610 ACA00000 */ sw $zero, ($a1) .L80056614: /* 31A14 80056614 0C014D70 */ jal func_800535C0 -/* 31A18 80056618 00000000 */ nop +/* 31A18 80056618 00000000 */ nop /* 31A1C 8005661C 3C028008 */ lui $v0, %hi(D_80078E5C) /* 31A20 80056620 90428E5C */ lbu $v0, %lo(D_80078E5C)($v0) /* 31A24 80056624 1040001B */ beqz $v0, .L80056694 -/* 31A28 80056628 00000000 */ nop +/* 31A28 80056628 00000000 */ nop /* 31A2C 8005662C 3C038008 */ lui $v1, %hi(D_80078E54) /* 31A30 80056630 24638E54 */ addiu $v1, $v1, %lo(D_80078E54) /* 31A34 80056634 8C620000 */ lw $v0, ($v1) @@ -45,7 +45,7 @@ glabel alAudioFrame /* 31A58 80056658 00502021 */ addu $a0, $v0, $s0 /* 31A5C 8005665C 8C820070 */ lw $v0, 0x70($a0) /* 31A60 80056660 14520004 */ bne $v0, $s2, .L80056674 -/* 31A64 80056664 00000000 */ nop +/* 31A64 80056664 00000000 */ nop /* 31A68 80056668 9085004D */ lbu $a1, 0x4d($a0) /* 31A6C 8005666C 0C015E1D */ jal func_80057874 /* 31A70 80056670 32A400FF */ andi $a0, $s5, 0xff @@ -62,7 +62,7 @@ glabel alAudioFrame .L80056694: /* 31A94 80056694 8FA90054 */ lw $t1, 0x54($sp) /* 31A98 80056698 19200194 */ blez $t1, .L80056CEC -/* 31A9C 8005669C 00000000 */ nop +/* 31A9C 8005669C 00000000 */ nop /* 31AA0 800566A0 3C1E800A */ lui $fp, %hi(D_800A3FE8) /* 31AA4 800566A4 27DE3FE8 */ addiu $fp, $fp, %lo(D_800A3FE8) .L800566A8: @@ -194,7 +194,7 @@ glabel alAudioFrame /* 31C68 80056868 14410004 */ bne $v0, $at, .L8005687C /* 31C6C 8005686C 3C018000 */ lui $at, 0x8000 /* 31C70 80056870 14610002 */ bne $v1, $at, .L8005687C -/* 31C74 80056874 00000000 */ nop +/* 31C74 80056874 00000000 */ nop /* 31C78 80056878 0006000D */ break 6 .L8005687C: /* 31C7C 8005687C 00002810 */ mfhi $a1 @@ -223,7 +223,7 @@ glabel alAudioFrame /* 31CD4 800568D4 14810004 */ bne $a0, $at, .L800568E8 /* 31CD8 800568D8 3C018000 */ lui $at, 0x8000 /* 31CDC 800568DC 14610002 */ bne $v1, $at, .L800568E8 -/* 31CE0 800568E0 00000000 */ nop +/* 31CE0 800568E0 00000000 */ nop /* 31CE4 800568E4 0006000D */ break 6 .L800568E8: /* 31CE8 800568E8 00002810 */ mfhi $a1 @@ -253,7 +253,7 @@ glabel alAudioFrame /* 31D44 80056944 14610004 */ bne $v1, $at, .L80056958 /* 31D48 80056948 3C018000 */ lui $at, 0x8000 /* 31D4C 8005694C 14810002 */ bne $a0, $at, .L80056958 -/* 31D50 80056950 00000000 */ nop +/* 31D50 80056950 00000000 */ nop /* 31D54 80056954 0006000D */ break 6 .L80056958: /* 31D58 80056958 00001810 */ mfhi $v1 @@ -286,7 +286,7 @@ glabel alAudioFrame /* 31DC0 800569C0 14810004 */ bne $a0, $at, .L800569D4 /* 31DC4 800569C4 3C018000 */ lui $at, 0x8000 /* 31DC8 800569C8 14610002 */ bne $v1, $at, .L800569D4 -/* 31DCC 800569CC 00000000 */ nop +/* 31DCC 800569CC 00000000 */ nop /* 31DD0 800569D0 0006000D */ break 6 .L800569D4: /* 31DD4 800569D4 00002810 */ mfhi $a1 diff --git a/asm/nonmatchings/code_31650/func_80056EE8.s b/asm/nonmatchings/code_31650/func_80056EE8.s index 7b281402b2..3a672bef01 100644 --- a/asm/nonmatchings/code_31650/func_80056EE8.s +++ b/asm/nonmatchings/code_31650/func_80056EE8.s @@ -28,15 +28,15 @@ glabel func_80056EE8 /* 32344 80056F44 8C840014 */ lw $a0, 0x14($a0) /* 32348 80056F48 90820024 */ lbu $v0, 0x24($a0) /* 3234C 80056F4C 10400003 */ beqz $v0, .L80056F5C -/* 32350 80056F50 00000000 */ nop +/* 32350 80056F50 00000000 */ nop /* 32354 80056F54 14450006 */ bne $v0, $a1, .L80056F70 -/* 32358 80056F58 00000000 */ nop +/* 32358 80056F58 00000000 */ nop .L80056F5C: /* 3235C 80056F5C 8C820010 */ lw $v0, 0x10($a0) /* 32360 80056F60 10400003 */ beqz $v0, .L80056F70 -/* 32364 80056F64 00000000 */ nop +/* 32364 80056F64 00000000 */ nop /* 32368 80056F68 8C820014 */ lw $v0, 0x14($a0) /* 3236C 80056F6C AC620014 */ sw $v0, 0x14($v1) .L80056F70: /* 32370 80056F70 03E00008 */ jr $ra -/* 32374 80056F74 00000000 */ nop +/* 32374 80056F74 00000000 */ nop diff --git a/asm/nonmatchings/code_31650/func_80056FA4.s b/asm/nonmatchings/code_31650/func_80056FA4.s index ffa7b7d466..477051f52b 100644 --- a/asm/nonmatchings/code_31650/func_80056FA4.s +++ b/asm/nonmatchings/code_31650/func_80056FA4.s @@ -36,7 +36,7 @@ glabel func_80056FA4 /* 32420 80057020 24F40038 */ addiu $s4, $a3, 0x38 /* 32424 80057024 24020001 */ addiu $v0, $zero, 1 /* 32428 80057028 10620022 */ beq $v1, $v0, .L800570B4 -/* 3242C 8005702C 00000000 */ nop +/* 3242C 8005702C 00000000 */ nop /* 32430 80057030 08015C3C */ j .L800570F0 /* 32434 80057034 24050001 */ addiu $a1, $zero, 1 .L80057038: @@ -120,7 +120,7 @@ glabel func_80056FA4 /* 3255C 8005715C 3C048008 */ lui $a0, %hi(D_80078E60) /* 32560 80057160 24848E60 */ addiu $a0, $a0, %lo(D_80078E60) /* 32564 80057164 10400004 */ beqz $v0, .L80057178 -/* 32568 80057168 00000000 */ nop +/* 32568 80057168 00000000 */ nop /* 3256C 8005716C A6050008 */ sh $a1, 8($s0) /* 32570 80057170 08015C7F */ j .L800571FC /* 32574 80057174 A605000A */ sh $a1, 0xa($s0) @@ -129,7 +129,7 @@ glabel func_80056FA4 /* 3257C 8005717C 24428181 */ addiu $v0, $v0, %lo(D_80078181) /* 32580 80057180 90420000 */ lbu $v0, ($v0) /* 32584 80057184 1440000A */ bnez $v0, .L800571B0 -/* 32588 80057188 00000000 */ nop +/* 32588 80057188 00000000 */ nop /* 3258C 8005718C 86030006 */ lh $v1, 6($s0) /* 32590 80057190 84820080 */ lh $v0, 0x80($a0) /* 32594 80057194 00620018 */ mult $v1, $v0 diff --git a/asm/nonmatchings/code_31650/func_80057224.s b/asm/nonmatchings/code_31650/func_80057224.s index 0ccc428d61..948223cb3b 100644 --- a/asm/nonmatchings/code_31650/func_80057224.s +++ b/asm/nonmatchings/code_31650/func_80057224.s @@ -23,9 +23,9 @@ glabel func_80057224 /* 3266C 8005726C 10600005 */ beqz $v1, .L80057284 /* 32670 80057270 24020001 */ addiu $v0, $zero, 1 /* 32674 80057274 10620022 */ beq $v1, $v0, .L80057300 -/* 32678 80057278 00000000 */ nop +/* 32678 80057278 00000000 */ nop /* 3267C 8005727C 08015CCE */ j .L80057338 -/* 32680 80057280 00000000 */ nop +/* 32680 80057280 00000000 */ nop .L80057284: /* 32684 80057284 3C0338E3 */ lui $v1, 0x38e3 /* 32688 80057288 8C820004 */ lw $v0, 4($a0) @@ -57,7 +57,7 @@ glabel func_80057224 /* 326F0 800572F0 0C015FF6 */ jal func_80057FD8 /* 326F4 800572F4 24060020 */ addiu $a2, $zero, 0x20 /* 326F8 800572F8 08015CCE */ j .L80057338 -/* 326FC 800572FC 00000000 */ nop +/* 326FC 800572FC 00000000 */ nop .L80057300: /* 32700 80057300 8C820010 */ lw $v0, 0x10($a0) /* 32704 80057304 5040000A */ beql $v0, $zero, .L80057330 diff --git a/asm/nonmatchings/code_31650/func_80057C54.s b/asm/nonmatchings/code_31650/func_80057C54.s index 02eed05f52..ed0e7d3ba0 100644 --- a/asm/nonmatchings/code_31650/func_80057C54.s +++ b/asm/nonmatchings/code_31650/func_80057C54.s @@ -16,12 +16,12 @@ glabel func_80057C54 /* 33080 80057C80 8C620068 */ lw $v0, 0x68($v1) /* 33084 80057C84 00A2102A */ slt $v0, $a1, $v0 /* 33088 80057C88 14400017 */ bnez $v0, .L80057CE8 -/* 3308C 80057C8C 00000000 */ nop +/* 3308C 80057C8C 00000000 */ nop /* 33090 80057C90 3C028008 */ lui $v0, %hi(D_80078181) /* 33094 80057C94 24428181 */ addiu $v0, $v0, %lo(D_80078181) /* 33098 80057C98 90420000 */ lbu $v0, ($v0) /* 3309C 80057C9C 14400008 */ bnez $v0, .L80057CC0 -/* 330A0 80057CA0 00000000 */ nop +/* 330A0 80057CA0 00000000 */ nop /* 330A4 80057CA4 8463004E */ lh $v1, 0x4e($v1) /* 330A8 80057CA8 3C028008 */ lui $v0, %hi(D_80078EE0) /* 330AC 80057CAC 84428EE0 */ lh $v0, %lo(D_80078EE0)($v0) diff --git a/asm/nonmatchings/code_31650/func_80057D0C.s b/asm/nonmatchings/code_31650/func_80057D0C.s index df1bb68858..39ba71cb86 100644 --- a/asm/nonmatchings/code_31650/func_80057D0C.s +++ b/asm/nonmatchings/code_31650/func_80057D0C.s @@ -16,7 +16,7 @@ glabel func_80057D0C /* 33138 80057D38 8CE20068 */ lw $v0, 0x68($a3) /* 3313C 80057D3C 00A2102A */ slt $v0, $a1, $v0 /* 33140 80057D40 14400018 */ bnez $v0, .L80057DA4 -/* 33144 80057D44 00000000 */ nop +/* 33144 80057D44 00000000 */ nop /* 33148 80057D48 3C028008 */ lui $v0, %hi(D_80078181) /* 3314C 80057D4C 24428181 */ addiu $v0, $v0, %lo(D_80078181) /* 33150 80057D50 90420000 */ lbu $v0, ($v0) diff --git a/asm/nonmatchings/code_31650/func_80057F20.s b/asm/nonmatchings/code_31650/func_80057F20.s index c2ec9b45c6..59ee1361a6 100644 --- a/asm/nonmatchings/code_31650/func_80057F20.s +++ b/asm/nonmatchings/code_31650/func_80057F20.s @@ -30,7 +30,7 @@ glabel func_80057F20 /* 33378 80057F78 00021082 */ srl $v0, $v0, 2 /* 3337C 80057F7C 00A2102B */ sltu $v0, $a1, $v0 /* 33380 80057F80 1440FFF7 */ bnez $v0, .L80057F60 -/* 33384 80057F84 00000000 */ nop +/* 33384 80057F84 00000000 */ nop .L80057F88: /* 33388 80057F88 03E00008 */ jr $ra -/* 3338C 80057F8C 00000000 */ nop +/* 3338C 80057F8C 00000000 */ nop diff --git a/asm/nonmatchings/code_31650/func_80058004.s b/asm/nonmatchings/code_31650/func_80058004.s index 0d5a8168f5..5d23b47c70 100644 --- a/asm/nonmatchings/code_31650/func_80058004.s +++ b/asm/nonmatchings/code_31650/func_80058004.s @@ -21,4 +21,4 @@ glabel func_80058004 .L80058044: /* 33444 80058044 03E00008 */ jr $ra /* 33448 80058048 00021403 */ sra $v0, $v0, 0x10 -/* 3344C 8005804C 00000000 */ nop +/* 3344C 8005804C 00000000 */ nop diff --git a/asm/nonmatchings/code_31650/func_80058050.s b/asm/nonmatchings/code_31650/func_80058050.s index a3b81402f4..02b49a02a3 100644 --- a/asm/nonmatchings/code_31650/func_80058050.s +++ b/asm/nonmatchings/code_31650/func_80058050.s @@ -29,13 +29,13 @@ glabel func_80058050 /* 334B0 800580B0 D4228930 */ ldc1 $f2, %lo(D_80098930)($at) /* 334B4 800580B4 46000021 */ cvt.d.s $f0, $f0 /* 334B8 800580B8 4620103C */ c.lt.d $f2, $f0 -/* 334BC 800580BC 00000000 */ nop +/* 334BC 800580BC 00000000 */ nop /* 334C0 800580C0 45000007 */ bc1f .L800580E0 /* 334C4 800580C4 241E0170 */ addiu $fp, $zero, 0x170 /* 334C8 800580C8 3C013FFF */ lui $at, 0x3fff /* 334CC 800580CC 3421FEB0 */ ori $at, $at, 0xfeb0 /* 334D0 800580D0 44810000 */ mtc1 $at, $f0 -/* 334D4 800580D4 00000000 */ nop +/* 334D4 800580D4 00000000 */ nop /* 334D8 800580D8 E500003C */ swc1 $f0, 0x3c($t0) /* 334DC 800580DC 8FA80060 */ lw $t0, 0x60($sp) .L800580E0: @@ -43,29 +43,29 @@ glabel func_80058050 /* 334E4 800580E4 44811000 */ mtc1 $at, $f2 /* 334E8 800580E8 C500003C */ lwc1 $f0, 0x3c($t0) /* 334EC 800580EC 46020002 */ mul.s $f0, $f0, $f2 -/* 334F0 800580F0 00000000 */ nop +/* 334F0 800580F0 00000000 */ nop /* 334F4 800580F4 4600018D */ trunc.w.s $f6, $f0 /* 334F8 800580F8 44023000 */ mfc1 $v0, $f6 /* 334FC 800580FC 3C013800 */ lui $at, 0x3800 /* 33500 80058100 44810000 */ mtc1 $at, $f0 /* 33504 80058104 44822000 */ mtc1 $v0, $f4 -/* 33508 80058108 00000000 */ nop +/* 33508 80058108 00000000 */ nop /* 3350C 8005810C 46802120 */ cvt.s.w $f4, $f4 /* 33510 80058110 46002102 */ mul.s $f4, $f4, $f0 -/* 33514 80058114 00000000 */ nop +/* 33514 80058114 00000000 */ nop /* 33518 80058118 3C014338 */ lui $at, 0x4338 /* 3351C 8005811C 44810000 */ mtc1 $at, $f0 -/* 33520 80058120 00000000 */ nop +/* 33520 80058120 00000000 */ nop /* 33524 80058124 46002002 */ mul.s $f0, $f4, $f0 -/* 33528 80058128 00000000 */ nop +/* 33528 80058128 00000000 */ nop /* 3352C 8005812C 8FA80060 */ lw $t0, 0x60($sp) /* 33530 80058130 C5020040 */ lwc1 $f2, 0x40($t0) /* 33534 80058134 46001080 */ add.s $f2, $f2, $f0 /* 33538 80058138 4600118D */ trunc.w.s $f6, $f2 /* 3353C 8005813C 44143000 */ mfc1 $s4, $f6 -/* 33540 80058140 00000000 */ nop +/* 33540 80058140 00000000 */ nop /* 33544 80058144 44940000 */ mtc1 $s4, $f0 -/* 33548 80058148 00000000 */ nop +/* 33548 80058148 00000000 */ nop /* 3354C 8005814C 46800020 */ cvt.s.w $f0, $f0 /* 33550 80058150 46001081 */ sub.s $f2, $f2, $f0 /* 33554 80058154 8FA80060 */ lw $t0, 0x60($sp) @@ -495,7 +495,7 @@ glabel func_80058050 .L80058768: /* 33B68 80058768 0230102A */ slt $v0, $s1, $s0 /* 33B6C 8005876C 10400021 */ beqz $v0, .L800587F4 -/* 33B70 80058770 00000000 */ nop +/* 33B70 80058770 00000000 */ nop /* 33B74 80058774 1A80001A */ blez $s4, .L800587E0 /* 33B78 80058778 02118023 */ subu $s0, $s0, $s1 /* 33B7C 8005877C 8E440030 */ lw $a0, 0x30($s2) @@ -559,7 +559,7 @@ glabel func_80058050 /* 33C50 80058850 44811000 */ mtc1 $at, $f2 /* 33C54 80058854 C5000004 */ lwc1 $f0, 4($t0) /* 33C58 80058858 46020002 */ mul.s $f0, $f0, $f2 -/* 33C5C 8005885C 00000000 */ nop +/* 33C5C 8005885C 00000000 */ nop /* 33C60 80058860 8D040000 */ lw $a0, ($t0) /* 33C64 80058864 4600018D */ trunc.w.s $f6, $f0 /* 33C68 80058868 44103000 */ mfc1 $s0, $f6 @@ -631,10 +631,10 @@ glabel func_80058050 /* 33D68 80058968 26E20010 */ addiu $v0, $s7, 0x10 /* 33D6C 8005896C AFA20014 */ sw $v0, 0x14($sp) /* 33D70 80058970 44836000 */ mtc1 $v1, $f12 -/* 33D74 80058974 00000000 */ nop +/* 33D74 80058974 00000000 */ nop /* 33D78 80058978 46806321 */ cvt.d.w $f12, $f12 /* 33D7C 8005897C 44847000 */ mtc1 $a0, $f14 -/* 33D80 80058980 00000000 */ nop +/* 33D80 80058980 00000000 */ nop /* 33D84 80058984 468073A1 */ cvt.d.w $f14, $f14 /* 33D88 80058988 0C01631B */ jal func_80058C6C /* 33D8C 8005898C AFA50010 */ sw $a1, 0x10($sp) @@ -645,10 +645,10 @@ glabel func_80058050 /* 33DA0 800589A0 26E20016 */ addiu $v0, $s7, 0x16 /* 33DA4 800589A4 AFA20014 */ sw $v0, 0x14($sp) /* 33DA8 800589A8 44836000 */ mtc1 $v1, $f12 -/* 33DAC 800589AC 00000000 */ nop +/* 33DAC 800589AC 00000000 */ nop /* 33DB0 800589B0 46806321 */ cvt.d.w $f12, $f12 /* 33DB4 800589B4 44847000 */ mtc1 $a0, $f14 -/* 33DB8 800589B8 00000000 */ nop +/* 33DB8 800589B8 00000000 */ nop /* 33DBC 800589BC 468073A1 */ cvt.d.w $f14, $f14 /* 33DC0 800589C0 0C01631B */ jal func_80058C6C /* 33DC4 800589C4 AFA50010 */ sw $a1, 0x10($sp) diff --git a/asm/nonmatchings/code_31650/func_80058C6C.s b/asm/nonmatchings/code_31650/func_80058C6C.s index fbc8587270..6ce15b13a3 100644 --- a/asm/nonmatchings/code_31650/func_80058C6C.s +++ b/asm/nonmatchings/code_31650/func_80058C6C.s @@ -6,7 +6,7 @@ glabel func_80058C6C /* 34070 80058C70 1440000B */ bnez $v0, .L80058CA0 /* 34074 80058C74 8FA50014 */ lw $a1, 0x14($sp) /* 34078 80058C78 462E603E */ c.le.d $f12, $f14 -/* 3407C 80058C7C 00000000 */ nop +/* 3407C 80058C7C 00000000 */ nop /* 34080 80058C80 45020005 */ bc1fl .L80058C98 /* 34084 80058C84 A4A00000 */ sh $zero, ($a1) /* 34088 80058C88 3402FFFF */ ori $v0, $zero, 0xffff @@ -21,61 +21,61 @@ glabel func_80058C6C /* 340A4 80058CA4 44812800 */ mtc1 $at, $f5 /* 340A8 80058CA8 44802000 */ mtc1 $zero, $f4 /* 340AC 80058CAC 44820000 */ mtc1 $v0, $f0 -/* 340B0 80058CB0 00000000 */ nop +/* 340B0 80058CB0 00000000 */ nop /* 340B4 80058CB4 46800021 */ cvt.d.w $f0, $f0 /* 340B8 80058CB8 4624703C */ c.lt.d $f14, $f4 -/* 340BC 80058CBC 00000000 */ nop +/* 340BC 80058CBC 00000000 */ nop /* 340C0 80058CC0 45000002 */ bc1f .L80058CCC /* 340C4 80058CC4 46202083 */ div.d $f2, $f4, $f0 /* 340C8 80058CC8 46202386 */ mov.d $f14, $f4 .L80058CCC: /* 340CC 80058CCC 44800000 */ mtc1 $zero, $f0 /* 340D0 80058CD0 44800800 */ mtc1 $zero, $f1 -/* 340D4 80058CD4 00000000 */ nop +/* 340D4 80058CD4 00000000 */ nop /* 340D8 80058CD8 4620603E */ c.le.d $f12, $f0 -/* 340DC 80058CDC 00000000 */ nop +/* 340DC 80058CDC 00000000 */ nop /* 340E0 80058CE0 45030001 */ bc1tl .L80058CE8 /* 340E4 80058CE4 46202306 */ mov.d $f12, $f4 .L80058CE8: /* 340E8 80058CE8 462C7001 */ sub.d $f0, $f14, $f12 /* 340EC 80058CEC 46220002 */ mul.d $f0, $f0, $f2 -/* 340F0 80058CF0 00000000 */ nop +/* 340F0 80058CF0 00000000 */ nop /* 340F4 80058CF4 3C014020 */ lui $at, 0x4020 /* 340F8 80058CF8 44811800 */ mtc1 $at, $f3 /* 340FC 80058CFC 44801000 */ mtc1 $zero, $f2 -/* 34100 80058D00 00000000 */ nop +/* 34100 80058D00 00000000 */ nop /* 34104 80058D04 46220002 */ mul.d $f0, $f0, $f2 -/* 34108 80058D08 00000000 */ nop +/* 34108 80058D08 00000000 */ nop /* 3410C 80058D0C 4620018D */ trunc.w.d $f6, $f0 /* 34110 80058D10 44033000 */ mfc1 $v1, $f6 -/* 34114 80058D14 00000000 */ nop +/* 34114 80058D14 00000000 */ nop /* 34118 80058D18 00031400 */ sll $v0, $v1, 0x10 /* 3411C 80058D1C 00021403 */ sra $v0, $v0, 0x10 /* 34120 80058D20 44821000 */ mtc1 $v0, $f2 -/* 34124 80058D24 00000000 */ nop +/* 34124 80058D24 00000000 */ nop /* 34128 80058D28 468010A1 */ cvt.d.w $f2, $f2 /* 3412C 80058D2C 46220001 */ sub.d $f0, $f0, $f2 /* 34130 80058D30 46240000 */ add.d $f0, $f0, $f4 /* 34134 80058D34 4620018D */ trunc.w.d $f6, $f0 /* 34138 80058D38 44043000 */ mfc1 $a0, $f6 -/* 3413C 80058D3C 00000000 */ nop +/* 3413C 80058D3C 00000000 */ nop /* 34140 80058D40 00041400 */ sll $v0, $a0, 0x10 /* 34144 80058D44 00021403 */ sra $v0, $v0, 0x10 /* 34148 80058D48 44821000 */ mtc1 $v0, $f2 -/* 3414C 80058D4C 00000000 */ nop +/* 3414C 80058D4C 00000000 */ nop /* 34150 80058D50 468010A1 */ cvt.d.w $f2, $f2 /* 34154 80058D54 46220001 */ sub.d $f0, $f0, $f2 /* 34158 80058D58 3C01800A */ lui $at, %hi(D_80098938) /* 3415C 80058D5C D4228938 */ ldc1 $f2, %lo(D_80098938)($at) /* 34160 80058D60 46220002 */ mul.d $f0, $f0, $f2 -/* 34164 80058D64 00000000 */ nop +/* 34164 80058D64 00000000 */ nop /* 34168 80058D68 2463FFFF */ addiu $v1, $v1, -1 /* 3416C 80058D6C 3C0141E0 */ lui $at, 0x41e0 /* 34170 80058D70 44811800 */ mtc1 $at, $f3 /* 34174 80058D74 44801000 */ mtc1 $zero, $f2 -/* 34178 80058D78 00000000 */ nop +/* 34178 80058D78 00000000 */ nop /* 3417C 80058D7C 4620103E */ c.le.d $f2, $f0 -/* 34180 80058D80 00000000 */ nop +/* 34180 80058D80 00000000 */ nop /* 34184 80058D84 45010005 */ bc1t .L80058D9C /* 34188 80058D88 00641821 */ addu $v1, $v1, $a0 /* 3418C 80058D8C 4620018D */ trunc.w.d $f6, $f0 @@ -87,13 +87,13 @@ glabel func_80058C6C /* 341A0 80058DA0 3C028000 */ lui $v0, 0x8000 /* 341A4 80058DA4 4620018D */ trunc.w.d $f6, $f0 /* 341A8 80058DA8 44043000 */ mfc1 $a0, $f6 -/* 341AC 80058DAC 00000000 */ nop +/* 341AC 80058DAC 00000000 */ nop /* 341B0 80058DB0 00822025 */ or $a0, $a0, $v0 /* 341B4 80058DB4 A4A40000 */ sh $a0, ($a1) .L80058DB8: /* 341B8 80058DB8 00031400 */ sll $v0, $v1, 0x10 /* 341BC 80058DBC 03E00008 */ jr $ra /* 341C0 80058DC0 00021403 */ sra $v0, $v0, 0x10 -/* 341C4 80058DC4 00000000 */ nop -/* 341C8 80058DC8 00000000 */ nop -/* 341CC 80058DCC 00000000 */ nop +/* 341C4 80058DC4 00000000 */ nop +/* 341C8 80058DC8 00000000 */ nop +/* 341CC 80058DCC 00000000 */ nop diff --git a/asm/nonmatchings/code_3169f0/func_80200000.s b/asm/nonmatchings/code_3169f0/func_80200000.s index e980b156a7..f55bb2ba7d 100644 --- a/asm/nonmatchings/code_3169f0/func_80200000.s +++ b/asm/nonmatchings/code_3169f0/func_80200000.s @@ -21,7 +21,7 @@ glabel func_80200000 /* 316A2C 8020003C 8C620000 */ lw $v0, ($v1) /* 316A30 80200040 30420003 */ andi $v0, $v0, 3 /* 316A34 80200044 1440FFFD */ bnez $v0, .L8020003C -/* 316A38 80200048 00000000 */ nop +/* 316A38 80200048 00000000 */ nop .L8020004C: /* 316A3C 8020004C 24C2FE38 */ addiu $v0, $a2, -0x1c8 /* 316A40 80200050 3C03A000 */ lui $v1, 0xa000 @@ -30,9 +30,9 @@ glabel func_80200000 /* 316A4C 8020005C 00A22823 */ subu $a1, $a1, $v0 /* 316A50 80200060 00852021 */ addu $a0, $a0, $a1 /* 316A54 80200064 0080F809 */ jalr $a0 -/* 316A58 80200068 00000000 */ nop +/* 316A58 80200068 00000000 */ nop /* 316A5C 8020006C 8FBF0010 */ lw $ra, 0x10($sp) /* 316A60 80200070 03E00008 */ jr $ra /* 316A64 80200074 27BD0018 */ addiu $sp, $sp, 0x18 -/* 316A68 80200078 00000000 */ nop -/* 316A6C 8020007C 00000000 */ nop +/* 316A68 80200078 00000000 */ nop +/* 316A6C 8020007C 00000000 */ nop diff --git a/asm/nonmatchings/code_316C00/func_802AE000_316C00.s b/asm/nonmatchings/code_316C00/func_802AE000_316C00.s index 37913e9fa0..5ea640d7e8 100644 --- a/asm/nonmatchings/code_316C00/func_802AE000_316C00.s +++ b/asm/nonmatchings/code_316C00/func_802AE000_316C00.s @@ -91,9 +91,9 @@ glabel func_802AE000_316C00 /* 316D44 802AE144 00131F02 */ srl $v1, $s3, 0x1c /* 316D48 802AE148 24020008 */ addiu $v0, $zero, 8 /* 316D4C 802AE14C 14620003 */ bne $v1, $v0, .L802AE15C -/* 316D50 802AE150 00000000 */ nop +/* 316D50 802AE150 00000000 */ nop /* 316D54 802AE154 0260F809 */ jalr $s3 -/* 316D58 802AE158 00000000 */ nop +/* 316D58 802AE158 00000000 */ nop .L802AE15C: /* 316D5C 802AE15C 8FBF003C */ lw $ra, 0x3c($sp) /* 316D60 802AE160 8FBE0038 */ lw $fp, 0x38($sp) @@ -107,4 +107,4 @@ glabel func_802AE000_316C00 /* 316D80 802AE180 8FB00018 */ lw $s0, 0x18($sp) /* 316D84 802AE184 03E00008 */ jr $ra /* 316D88 802AE188 27BD0040 */ addiu $sp, $sp, 0x40 -/* 316D8C 802AE18C 00000000 */ nop +/* 316D8C 802AE18C 00000000 */ nop diff --git a/asm/nonmatchings/code_316d90/func_802AE000.s b/asm/nonmatchings/code_316d90/func_802AE000.s index 862f79f4cf..5a6fe14b38 100644 --- a/asm/nonmatchings/code_316d90/func_802AE000.s +++ b/asm/nonmatchings/code_316d90/func_802AE000.s @@ -90,11 +90,11 @@ glabel func_802AE000 /* 316ED0 802AE140 00131F02 */ srl $v1, $s3, 0x1c /* 316ED4 802AE144 24020008 */ addiu $v0, $zero, 8 /* 316ED8 802AE148 14620005 */ bne $v1, $v0, .L802AE160 -/* 316EDC 802AE14C 00000000 */ nop +/* 316EDC 802AE14C 00000000 */ nop /* 316EE0 802AE150 0260F809 */ jalr $s3 -/* 316EE4 802AE154 00000000 */ nop +/* 316EE4 802AE154 00000000 */ nop /* 316EE8 802AE158 080AB85C */ j .L802AE170 -/* 316EEC 802AE15C 00000000 */ nop +/* 316EEC 802AE15C 00000000 */ nop .L802AE160: /* 316EF0 802AE160 3C04803E */ lui $a0, %hi(D_803DA800) /* 316EF4 802AE164 2484A800 */ addiu $a0, $a0, %lo(D_803DA800) diff --git a/asm/nonmatchings/code_328110/func_E000C000.s b/asm/nonmatchings/code_328110/func_E000C000.s index 2aa9ece420..12ebc8a610 100644 --- a/asm/nonmatchings/code_328110/func_E000C000.s +++ b/asm/nonmatchings/code_328110/func_E000C000.s @@ -11,12 +11,12 @@ glabel func_E000C000 /* 328128 E000C018 46080000 */ add.s $f0, $f0, $f8 /* 32812C E000C01C C4820030 */ lwc1 $f2, 0x30($a0) /* 328130 E000C020 46020082 */ mul.s $f2, $f0, $f2 -/* 328134 E000C024 00000000 */ nop +/* 328134 E000C024 00000000 */ nop /* 328138 E000C028 E4800010 */ swc1 $f0, 0x10($a0) /* 32813C E000C02C 46000286 */ mov.s $f10, $f0 /* 328140 E000C030 C4800034 */ lwc1 $f0, 0x34($a0) /* 328144 E000C034 46005282 */ mul.s $f10, $f10, $f0 -/* 328148 E000C038 00000000 */ nop +/* 328148 E000C038 00000000 */ nop /* 32814C E000C03C C48C0004 */ lwc1 $f12, 4($a0) /* 328150 E000C040 C4860020 */ lwc1 $f6, 0x20($a0) /* 328154 E000C044 C4800028 */ lwc1 $f0, 0x28($a0) diff --git a/asm/nonmatchings/code_328110/func_E000C094.s b/asm/nonmatchings/code_328110/func_E000C094.s index da53018c0a..4a5bfadda3 100644 --- a/asm/nonmatchings/code_328110/func_E000C094.s +++ b/asm/nonmatchings/code_328110/func_E000C094.s @@ -5,7 +5,7 @@ glabel func_E000C094 /* 3281A4 E000C094 C4860024 */ lwc1 $f6, 0x24($a0) /* 3281A8 E000C098 C4800028 */ lwc1 $f0, 0x28($a0) /* 3281AC E000C09C 46003182 */ mul.s $f6, $f6, $f0 -/* 3281B0 E000C0A0 00000000 */ nop +/* 3281B0 E000C0A0 00000000 */ nop /* 3281B4 E000C0A4 C4840008 */ lwc1 $f4, 8($a0) /* 3281B8 E000C0A8 C4800020 */ lwc1 $f0, 0x20($a0) /* 3281BC E000C0AC 46002100 */ add.s $f4, $f4, $f0 diff --git a/asm/nonmatchings/code_328110/func_E000C0C8.s b/asm/nonmatchings/code_328110/func_E000C0C8.s index 265cd844cc..bde8c78f82 100644 --- a/asm/nonmatchings/code_328110/func_E000C0C8.s +++ b/asm/nonmatchings/code_328110/func_E000C0C8.s @@ -5,15 +5,15 @@ glabel func_E000C0C8 /* 3281D8 E000C0C8 C48C0010 */ lwc1 $f12, 0x10($a0) /* 3281DC E000C0CC C4800030 */ lwc1 $f0, 0x30($a0) /* 3281E0 E000C0D0 46006302 */ mul.s $f12, $f12, $f0 -/* 3281E4 E000C0D4 00000000 */ nop +/* 3281E4 E000C0D4 00000000 */ nop /* 3281E8 E000C0D8 C48E0010 */ lwc1 $f14, 0x10($a0) /* 3281EC E000C0DC C4800034 */ lwc1 $f0, 0x34($a0) /* 3281F0 E000C0E0 46007382 */ mul.s $f14, $f14, $f0 -/* 3281F4 E000C0E4 00000000 */ nop +/* 3281F4 E000C0E4 00000000 */ nop /* 3281F8 E000C0E8 C48A0010 */ lwc1 $f10, 0x10($a0) /* 3281FC E000C0EC C4800014 */ lwc1 $f0, 0x14($a0) /* 328200 E000C0F0 46005282 */ mul.s $f10, $f10, $f0 -/* 328204 E000C0F4 00000000 */ nop +/* 328204 E000C0F4 00000000 */ nop /* 328208 E000C0F8 C4800024 */ lwc1 $f0, 0x24($a0) /* 32820C E000C0FC C4820020 */ lwc1 $f2, 0x20($a0) /* 328210 E000C100 46000206 */ mov.s $f8, $f0 @@ -21,12 +21,12 @@ glabel func_E000C0C8 /* 328218 E000C108 C4800028 */ lwc1 $f0, 0x28($a0) /* 32821C E000C10C C4840020 */ lwc1 $f4, 0x20($a0) /* 328220 E000C110 46004202 */ mul.s $f8, $f8, $f0 -/* 328224 E000C114 00000000 */ nop +/* 328224 E000C114 00000000 */ nop /* 328228 E000C118 C480002C */ lwc1 $f0, 0x2c($a0) /* 32822C E000C11C E4820020 */ swc1 $f2, 0x20($a0) /* 328230 E000C120 46001186 */ mov.s $f6, $f2 /* 328234 E000C124 46003182 */ mul.s $f6, $f6, $f0 -/* 328238 E000C128 00000000 */ nop +/* 328238 E000C128 00000000 */ nop /* 32823C E000C12C C4800008 */ lwc1 $f0, 8($a0) /* 328240 E000C130 46040000 */ add.s $f0, $f0, $f4 /* 328244 E000C134 C4820004 */ lwc1 $f2, 4($a0) diff --git a/asm/nonmatchings/code_328110/func_E000C160.s b/asm/nonmatchings/code_328110/func_E000C160.s index 446dffb9aa..64d16290a5 100644 --- a/asm/nonmatchings/code_328110/func_E000C160.s +++ b/asm/nonmatchings/code_328110/func_E000C160.s @@ -28,13 +28,13 @@ glabel func_E000C160 /* 3282CC E000C1BC 12420008 */ beq $s2, $v0, .LE000C1E0 /* 3282D0 E000C1C0 24130003 */ addiu $s3, $zero, 3 /* 3282D4 E000C1C4 0800307D */ j .LE000C1F4 -/* 3282D8 E000C1C8 00000000 */ nop +/* 3282D8 E000C1C8 00000000 */ nop .LE000C1CC: /* 3282DC E000C1CC 24020004 */ addiu $v0, $zero, 4 /* 3282E0 E000C1D0 12420007 */ beq $s2, $v0, .LE000C1F0 /* 3282E4 E000C1D4 24130003 */ addiu $s3, $zero, 3 /* 3282E8 E000C1D8 0800307D */ j .LE000C1F4 -/* 3282EC E000C1DC 00000000 */ nop +/* 3282EC E000C1DC 00000000 */ nop .LE000C1E0: /* 3282F0 E000C1E0 0800307D */ j .LE000C1F4 /* 3282F4 E000C1E4 24130001 */ addiu $s3, $zero, 1 @@ -69,7 +69,7 @@ glabel func_E000C160 /* 32835C E000C24C AE11000C */ sw $s1, 0xc($s0) .LE000C250: /* 328360 E000C250 08003094 */ j .LE000C250 -/* 328364 E000C254 00000000 */ nop +/* 328364 E000C254 00000000 */ nop .LE000C258: /* 328368 E000C258 0220202D */ daddu $a0, $s1, $zero /* 32836C E000C25C 00132900 */ sll $a1, $s3, 4 @@ -83,7 +83,7 @@ glabel func_E000C160 /* 32838C E000C27C 00220821 */ addu $at, $at, $v0 /* 328390 E000C280 8C22CD40 */ lw $v0, %lo(D_E000CD40)($at) /* 328394 E000C284 00400008 */ jr $v0 -/* 328398 E000C288 00000000 */ nop +/* 328398 E000C288 00000000 */ nop /* 32839C E000C28C 080030A9 */ j .LE000C2A4 /* 3283A0 E000C290 AE200038 */ sw $zero, 0x38($s1) /* 3283A4 E000C294 080030A8 */ j .LE000C2A0 @@ -105,7 +105,7 @@ glabel func_E000C160 /* 3283DC E000C2CC 00220821 */ addu $at, $at, $v0 /* 3283E0 E000C2D0 8C22CD58 */ lw $v0, %lo(D_E000CD58)($at) /* 3283E4 E000C2D4 00400008 */ jr $v0 -/* 3283E8 E000C2D8 00000000 */ nop +/* 3283E8 E000C2D8 00000000 */ nop /* 3283EC E000C2DC 24120001 */ addiu $s2, $zero, 1 /* 3283F0 E000C2E0 0253102A */ slt $v0, $s2, $s3 /* 3283F4 E000C2E4 104000CB */ beqz $v0, .LE000C614 @@ -125,7 +125,7 @@ glabel func_E000C160 /* 32842C E000C31C 4481B000 */ mtc1 $at, $f22 .LE000C320: /* 328430 E000C320 44916000 */ mtc1 $s1, $f12 -/* 328434 E000C324 00000000 */ nop +/* 328434 E000C324 00000000 */ nop /* 328438 E000C328 46806320 */ cvt.s.w $f12, $f12 /* 32843C E000C32C E61EFFDC */ swc1 $f30, -0x24($s0) /* 328440 E000C330 E61CFFE0 */ swc1 $f28, -0x20($s0) @@ -152,7 +152,7 @@ glabel func_E000C160 /* 328494 E000C384 1440FFE6 */ bnez $v0, .LE000C320 /* 328498 E000C388 26100044 */ addiu $s0, $s0, 0x44 /* 32849C E000C38C 08003185 */ j .LE000C614 -/* 3284A0 E000C390 00000000 */ nop +/* 3284A0 E000C390 00000000 */ nop /* 3284A4 E000C394 24120001 */ addiu $s2, $zero, 1 /* 3284A8 E000C398 0253102A */ slt $v0, $s2, $s3 /* 3284AC E000C39C 1040009D */ beqz $v0, .LE000C614 @@ -173,12 +173,12 @@ glabel func_E000C160 /* 3284E4 E000C3D4 10400005 */ beqz $v0, .LE000C3EC /* 3284E8 E000C3D8 24020002 */ addiu $v0, $zero, 2 /* 3284EC E000C3DC 10600007 */ beqz $v1, .LE000C3FC -/* 3284F0 E000C3E0 00000000 */ nop +/* 3284F0 E000C3E0 00000000 */ nop /* 3284F4 E000C3E4 0800313E */ j .LE000C4F8 /* 3284F8 E000C3E8 26520001 */ addiu $s2, $s2, 1 .LE000C3EC: /* 3284FC E000C3EC 1062002B */ beq $v1, $v0, .LE000C49C -/* 328500 E000C3F0 00000000 */ nop +/* 328500 E000C3F0 00000000 */ nop /* 328504 E000C3F4 0800313E */ j .LE000C4F8 /* 328508 E000C3F8 26520001 */ addiu $s2, $s2, 1 .LE000C3FC: @@ -188,14 +188,14 @@ glabel func_E000C160 /* 328518 E000C408 4600A306 */ mov.s $f12, $f20 /* 32851C E000C40C 46000007 */ neg.s $f0, $f0 /* 328520 E000C410 46160002 */ mul.s $f0, $f0, $f22 -/* 328524 E000C414 00000000 */ nop +/* 328524 E000C414 00000000 */ nop /* 328528 E000C418 4600A306 */ mov.s $f12, $f20 /* 32852C E000C41C AE00FFD4 */ sw $zero, -0x2c($s0) /* 328530 E000C420 0C080144 */ jal func_E0200510 /* 328534 E000C424 E600FFD0 */ swc1 $f0, -0x30($s0) /* 328538 E000C428 46000007 */ neg.s $f0, $f0 /* 32853C E000C42C 46160002 */ mul.s $f0, $f0, $f22 -/* 328540 E000C430 00000000 */ nop +/* 328540 E000C430 00000000 */ nop /* 328544 E000C434 3C013F73 */ lui $at, 0x3f73 /* 328548 E000C438 34213333 */ ori $at, $at, 0x3333 /* 32854C E000C43C 44811000 */ mtc1 $at, $f2 @@ -208,7 +208,7 @@ glabel func_E000C160 /* 328564 E000C454 4600A306 */ mov.s $f12, $f20 /* 328568 E000C458 46000007 */ neg.s $f0, $f0 /* 32856C E000C45C 46160002 */ mul.s $f0, $f0, $f22 -/* 328570 E000C460 00000000 */ nop +/* 328570 E000C460 00000000 */ nop /* 328574 E000C464 3C014080 */ lui $at, 0x4080 /* 328578 E000C468 44811000 */ mtc1 $at, $f2 /* 32857C E000C46C 4600A306 */ mov.s $f12, $f20 @@ -217,7 +217,7 @@ glabel func_E000C160 /* 328588 E000C478 E600FFD0 */ swc1 $f0, -0x30($s0) /* 32858C E000C47C 46000007 */ neg.s $f0, $f0 /* 328590 E000C480 46160002 */ mul.s $f0, $f0, $f22 -/* 328594 E000C484 00000000 */ nop +/* 328594 E000C484 00000000 */ nop /* 328598 E000C488 3C013F59 */ lui $at, 0x3f59 /* 32859C E000C48C 34219999 */ ori $at, $at, 0x9999 /* 3285A0 E000C490 44811000 */ mtc1 $at, $f2 @@ -230,7 +230,7 @@ glabel func_E000C160 /* 3285B8 E000C4A8 4600A306 */ mov.s $f12, $f20 /* 3285BC E000C4AC 46000007 */ neg.s $f0, $f0 /* 3285C0 E000C4B0 46160002 */ mul.s $f0, $f0, $f22 -/* 3285C4 E000C4B4 00000000 */ nop +/* 3285C4 E000C4B4 00000000 */ nop /* 3285C8 E000C4B8 3C014120 */ lui $at, 0x4120 /* 3285CC E000C4BC 44811000 */ mtc1 $at, $f2 /* 3285D0 E000C4C0 4600A306 */ mov.s $f12, $f20 @@ -239,7 +239,7 @@ glabel func_E000C160 /* 3285DC E000C4CC E600FFD0 */ swc1 $f0, -0x30($s0) /* 3285E0 E000C4D0 46000007 */ neg.s $f0, $f0 /* 3285E4 E000C4D4 46160002 */ mul.s $f0, $f0, $f22 -/* 3285E8 E000C4D8 00000000 */ nop +/* 3285E8 E000C4D8 00000000 */ nop /* 3285EC E000C4DC 3C013F40 */ lui $at, 0x3f40 /* 3285F0 E000C4E0 44811000 */ mtc1 $at, $f2 /* 3285F4 E000C4E4 E61AFFF0 */ swc1 $f26, -0x10($s0) @@ -255,7 +255,7 @@ glabel func_E000C160 /* 328614 E000C504 1440FFAF */ bnez $v0, .LE000C3C4 /* 328618 E000C508 26100044 */ addiu $s0, $s0, 0x44 /* 32861C E000C50C 08003185 */ j .LE000C614 -/* 328620 E000C510 00000000 */ nop +/* 328620 E000C510 00000000 */ nop /* 328624 E000C514 24120001 */ addiu $s2, $zero, 1 /* 328628 E000C518 0253102A */ slt $v0, $s2, $s3 /* 32862C E000C51C 1040003D */ beqz $v0, .LE000C614 @@ -284,7 +284,7 @@ glabel func_E000C160 /* 328680 E000C570 16810004 */ bne $s4, $at, .LE000C584 /* 328684 E000C574 3C018000 */ lui $at, 0x8000 /* 328688 E000C578 16210002 */ bne $s1, $at, .LE000C584 -/* 32868C E000C57C 00000000 */ nop +/* 32868C E000C57C 00000000 */ nop /* 328690 E000C580 0006000D */ break 6 .LE000C584: /* 328694 E000C584 00001812 */ mflo $v1 @@ -294,7 +294,7 @@ glabel func_E000C160 /* 3286A4 E000C594 E61AFFF0 */ swc1 $f26, -0x10($s0) /* 3286A8 E000C598 C7A40080 */ lwc1 $f4, 0x80($sp) /* 3286AC E000C59C 44830000 */ mtc1 $v1, $f0 -/* 3286B0 E000C5A0 00000000 */ nop +/* 3286B0 E000C5A0 00000000 */ nop /* 3286B4 E000C5A4 46800020 */ cvt.s.w $f0, $f0 /* 3286B8 E000C5A8 46002500 */ add.s $f20, $f4, $f0 /* 3286BC E000C5AC E618FFF4 */ swc1 $f24, -0xc($s0) @@ -303,14 +303,14 @@ glabel func_E000C160 /* 3286C8 E000C5B8 4600A306 */ mov.s $f12, $f20 /* 3286CC E000C5BC 46000007 */ neg.s $f0, $f0 /* 3286D0 E000C5C0 46160002 */ mul.s $f0, $f0, $f22 -/* 3286D4 E000C5C4 00000000 */ nop +/* 3286D4 E000C5C4 00000000 */ nop /* 3286D8 E000C5C8 4600A306 */ mov.s $f12, $f20 /* 3286DC E000C5CC AE00FFD4 */ sw $zero, -0x2c($s0) /* 3286E0 E000C5D0 0C080144 */ jal func_E0200510 /* 3286E4 E000C5D4 E600FFD0 */ swc1 $f0, -0x30($s0) /* 3286E8 E000C5D8 46000007 */ neg.s $f0, $f0 /* 3286EC E000C5DC 46160002 */ mul.s $f0, $f0, $f22 -/* 3286F0 E000C5E0 00000000 */ nop +/* 3286F0 E000C5E0 00000000 */ nop /* 3286F4 E000C5E4 26310168 */ addiu $s1, $s1, 0x168 /* 3286F8 E000C5E8 26520001 */ addiu $s2, $s2, 1 /* 3286FC E000C5EC 4600A306 */ mov.s $f12, $f20 diff --git a/asm/nonmatchings/code_328110/func_E000C64C.s b/asm/nonmatchings/code_328110/func_E000C64C.s index 773d6d3639..b0bba382f2 100644 --- a/asm/nonmatchings/code_328110/func_E000C64C.s +++ b/asm/nonmatchings/code_328110/func_E000C64C.s @@ -3,4 +3,4 @@ glabel func_E000C64C /* 32875C E000C64C 03E00008 */ jr $ra -/* 328760 E000C650 00000000 */ nop +/* 328760 E000C650 00000000 */ nop diff --git a/asm/nonmatchings/code_328110/func_E000C654.s b/asm/nonmatchings/code_328110/func_E000C654.s index 6b47e8f6b8..d474ccaf83 100644 --- a/asm/nonmatchings/code_328110/func_E000C654.s +++ b/asm/nonmatchings/code_328110/func_E000C654.s @@ -24,9 +24,9 @@ glabel func_E000C654 /* 3287B0 E000C6A0 04410005 */ bgez $v0, .LE000C6B8 /* 3287B4 E000C6A4 AE020040 */ sw $v0, 0x40($s0) /* 3287B8 E000C6A8 0C080128 */ jal func_E02004A0 -/* 3287BC E000C6AC 00000000 */ nop +/* 3287BC E000C6AC 00000000 */ nop /* 3287C0 E000C6B0 080031CD */ j .LE000C734 -/* 3287C4 E000C6B4 00000000 */ nop +/* 3287C4 E000C6B4 00000000 */ nop .LE000C6B8: /* 3287C8 E000C6B8 96040000 */ lhu $a0, ($s0) /* 3287CC E000C6BC 8E620008 */ lw $v0, 8($s3) @@ -44,7 +44,7 @@ glabel func_E000C654 /* 3287F8 E000C6E8 26310001 */ addiu $s1, $s1, 1 /* 3287FC E000C6EC 8E420000 */ lw $v0, ($s2) /* 328800 E000C6F0 00400008 */ jr $v0 -/* 328804 E000C6F4 00000000 */ nop +/* 328804 E000C6F4 00000000 */ nop /* 328808 E000C6F8 0C003000 */ jal func_E000C000 /* 32880C E000C6FC 0200202D */ daddu $a0, $s0, $zero /* 328810 E000C700 080031C9 */ j .LE000C724 diff --git a/asm/nonmatchings/code_328110/func_E000C798.s b/asm/nonmatchings/code_328110/func_E000C798.s index 717fb8b36d..8206bdb1be 100644 --- a/asm/nonmatchings/code_328110/func_E000C798.s +++ b/asm/nonmatchings/code_328110/func_E000C798.s @@ -195,7 +195,7 @@ glabel func_E000C798 /* 328B8C E000CA7C ACA20004 */ sw $v0, 4($a1) /* 328B90 E000CA80 24020002 */ addiu $v0, $zero, 2 /* 328B94 E000CA84 16A2000A */ bne $s5, $v0, .LE000CAB0 -/* 328B98 E000CA88 00000000 */ nop +/* 328B98 E000CA88 00000000 */ nop /* 328B9C E000CA8C 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 328BA0 E000CA90 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 328BA4 E000CA94 8C620000 */ lw $v0, ($v1) @@ -294,5 +294,5 @@ glabel func_E000C798 /* 328D0C E000CBFC 8FB000E0 */ lw $s0, 0xe0($sp) /* 328D10 E000CC00 03E00008 */ jr $ra /* 328D14 E000CC04 27BD0108 */ addiu $sp, $sp, 0x108 -/* 328D18 E000CC08 00000000 */ nop -/* 328D1C E000CC0C 00000000 */ nop +/* 328D18 E000CC08 00000000 */ nop +/* 328D1C E000CC0C 00000000 */ nop diff --git a/asm/nonmatchings/code_32E490/func_E0014000.s b/asm/nonmatchings/code_32E490/func_E0014000.s index 2bde59cde3..ecd47ea471 100644 --- a/asm/nonmatchings/code_32E490/func_E0014000.s +++ b/asm/nonmatchings/code_32E490/func_E0014000.s @@ -44,7 +44,7 @@ glabel func_E0014000 /* 32E52C E001409C AE11000C */ sw $s1, 0xc($s0) .LE00140A0: /* 32E530 E00140A0 08005028 */ j .LE00140A0 -/* 32E534 E00140A4 00000000 */ nop +/* 32E534 E00140A4 00000000 */ nop .LE00140A8: /* 32E538 E00140A8 0220202D */ daddu $a0, $s1, $zero /* 32E53C E00140AC 00142880 */ sll $a1, $s4, 2 @@ -76,24 +76,24 @@ glabel func_E0014000 /* 32E5A0 E0014110 0C080138 */ jal func_E02004E0 /* 32E5A4 E0014114 A202FFC0 */ sb $v0, -0x40($s0) /* 32E5A8 E0014118 44820000 */ mtc1 $v0, $f0 -/* 32E5AC E001411C 00000000 */ nop +/* 32E5AC E001411C 00000000 */ nop /* 32E5B0 E0014120 46800021 */ cvt.d.w $f0, $f0 /* 32E5B4 E0014124 46360002 */ mul.d $f0, $f0, $f22 -/* 32E5B8 E0014128 00000000 */ nop +/* 32E5B8 E0014128 00000000 */ nop /* 32E5BC E001412C 3C013FF0 */ lui $at, 0x3ff0 /* 32E5C0 E0014130 44811800 */ mtc1 $at, $f3 /* 32E5C4 E0014134 44801000 */ mtc1 $zero, $f2 -/* 32E5C8 E0014138 00000000 */ nop +/* 32E5C8 E0014138 00000000 */ nop /* 32E5CC E001413C 46220000 */ add.d $f0, $f0, $f2 /* 32E5D0 E0014140 2404000A */ addiu $a0, $zero, 0xa /* 32E5D4 E0014144 46200020 */ cvt.s.d $f0, $f0 /* 32E5D8 E0014148 0C080138 */ jal func_E02004E0 /* 32E5DC E001414C E600FFDC */ swc1 $f0, -0x24($s0) /* 32E5E0 E0014150 44820000 */ mtc1 $v0, $f0 -/* 32E5E4 E0014154 00000000 */ nop +/* 32E5E4 E0014154 00000000 */ nop /* 32E5E8 E0014158 46800021 */ cvt.d.w $f0, $f0 /* 32E5EC E001415C 46360002 */ mul.d $f0, $f0, $f22 -/* 32E5F0 E0014160 00000000 */ nop +/* 32E5F0 E0014160 00000000 */ nop /* 32E5F4 E0014164 3C01E001 */ lui $at, %hi(D_E0014788) /* 32E5F8 E0014168 D4224788 */ ldc1 $f2, %lo(D_E0014788)($at) /* 32E5FC E001416C 26520001 */ addiu $s2, $s2, 1 @@ -104,12 +104,12 @@ glabel func_E0014000 /* 32E610 E0014180 0C080000 */ jal func_E0200000 /* 32E614 E0014184 E600FFE0 */ swc1 $f0, -0x20($s0) /* 32E618 E0014188 44936000 */ mtc1 $s3, $f12 -/* 32E61C E001418C 00000000 */ nop +/* 32E61C E001418C 00000000 */ nop /* 32E620 E0014190 46806320 */ cvt.s.w $f12, $f12 /* 32E624 E0014194 2673002D */ addiu $s3, $s3, 0x2d /* 32E628 E0014198 C7A8007C */ lwc1 $f8, 0x7c($sp) /* 32E62C E001419C 44820000 */ mtc1 $v0, $f0 -/* 32E630 E00141A0 00000000 */ nop +/* 32E630 E00141A0 00000000 */ nop /* 32E634 E00141A4 46800020 */ cvt.s.w $f0, $f0 /* 32E638 E00141A8 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 32E63C E00141AC 3C013F00 */ lui $at, 0x3f00 diff --git a/asm/nonmatchings/code_32E490/func_E0014258.s b/asm/nonmatchings/code_32E490/func_E0014258.s index 48f6845698..b010c6a966 100644 --- a/asm/nonmatchings/code_32E490/func_E0014258.s +++ b/asm/nonmatchings/code_32E490/func_E0014258.s @@ -3,4 +3,4 @@ glabel func_E0014258 /* 32E6E8 E0014258 03E00008 */ jr $ra -/* 32E6EC E001425C 00000000 */ nop +/* 32E6EC E001425C 00000000 */ nop diff --git a/asm/nonmatchings/code_32E490/func_E0014260.s b/asm/nonmatchings/code_32E490/func_E0014260.s index f1fbcfe5b9..b1d8bd1f3a 100644 --- a/asm/nonmatchings/code_32E490/func_E0014260.s +++ b/asm/nonmatchings/code_32E490/func_E0014260.s @@ -28,7 +28,7 @@ glabel func_E0014260 /* 32E748 E00142B8 A602FFFE */ sh $v0, -2($s0) /* 32E74C E00142BC 00021400 */ sll $v0, $v0, 0x10 /* 32E750 E00142C0 1C400003 */ bgtz $v0, .LE00142D0 -/* 32E754 E00142C4 00000000 */ nop +/* 32E754 E00142C4 00000000 */ nop /* 32E758 E00142C8 08005114 */ j .LE0014450 /* 32E75C E00142CC AE200000 */ sw $zero, ($s1) .LE00142D0: @@ -42,7 +42,7 @@ glabel func_E0014260 /* 32E77C E00142EC E60C0024 */ swc1 $f12, 0x24($s0) /* 32E780 E00142F0 46000021 */ cvt.d.s $f0, $f0 /* 32E784 E00142F4 46340002 */ mul.d $f0, $f0, $f20 -/* 32E788 E00142F8 00000000 */ nop +/* 32E788 E00142F8 00000000 */ nop /* 32E78C E00142FC C602001C */ lwc1 $f2, 0x1c($s0) /* 32E790 E0014300 460010A1 */ cvt.d.s $f2, $f2 /* 32E794 E0014304 46201080 */ add.d $f2, $f2, $f0 @@ -52,13 +52,13 @@ glabel func_E0014260 /* 32E7A4 E0014314 E6020010 */ swc1 $f2, 0x10($s0) /* 32E7A8 E0014318 46000021 */ cvt.d.s $f0, $f0 /* 32E7AC E001431C 46340002 */ mul.d $f0, $f0, $f20 -/* 32E7B0 E0014320 00000000 */ nop +/* 32E7B0 E0014320 00000000 */ nop /* 32E7B4 E0014324 C6040028 */ lwc1 $f4, 0x28($s0) /* 32E7B8 E0014328 3C01E001 */ lui $at, %hi(D_E0014798) /* 32E7BC E001432C D4224798 */ ldc1 $f2, %lo(D_E0014798)($at) /* 32E7C0 E0014330 46002121 */ cvt.d.s $f4, $f4 /* 32E7C4 E0014334 46222102 */ mul.d $f4, $f4, $f2 -/* 32E7C8 E0014338 00000000 */ nop +/* 32E7C8 E0014338 00000000 */ nop /* 32E7CC E001433C C608001C */ lwc1 $f8, 0x1c($s0) /* 32E7D0 E0014340 3C01401E */ lui $at, 0x401e /* 32E7D4 E0014344 44817800 */ mtc1 $at, $f15 @@ -68,23 +68,23 @@ glabel func_E0014260 /* 32E7E4 E0014354 3C01E001 */ lui $at, %hi(D_E00147A0) /* 32E7E8 E0014358 D42247A0 */ ldc1 $f2, %lo(D_E00147A0)($at) /* 32E7EC E001435C 46227382 */ mul.d $f14, $f14, $f2 -/* 32E7F0 E0014360 00000000 */ nop +/* 32E7F0 E0014360 00000000 */ nop /* 32E7F4 E0014364 C60C0020 */ lwc1 $f12, 0x20($s0) /* 32E7F8 E0014368 3C01E001 */ lui $at, %hi(D_E00147A8) /* 32E7FC E001436C D42247A8 */ ldc1 $f2, %lo(D_E00147A8)($at) /* 32E800 E0014370 46006321 */ cvt.d.s $f12, $f12 /* 32E804 E0014374 46226302 */ mul.d $f12, $f12, $f2 -/* 32E808 E0014378 00000000 */ nop +/* 32E808 E0014378 00000000 */ nop /* 32E80C E001437C C612003C */ lwc1 $f18, 0x3c($s0) /* 32E810 E0014380 46202120 */ cvt.s.d $f4, $f4 /* 32E814 E0014384 46122482 */ mul.s $f18, $f4, $f18 -/* 32E818 E0014388 00000000 */ nop +/* 32E818 E0014388 00000000 */ nop /* 32E81C E001438C C6020040 */ lwc1 $f2, 0x40($s0) /* 32E820 E0014390 24120001 */ addiu $s2, $zero, 1 /* 32E824 E0014394 E6040028 */ swc1 $f4, 0x28($s0) /* 32E828 E0014398 46002406 */ mov.s $f16, $f4 /* 32E82C E001439C 46028402 */ mul.s $f16, $f16, $f2 -/* 32E830 E00143A0 00000000 */ nop +/* 32E830 E00143A0 00000000 */ nop /* 32E834 E00143A4 C60A0030 */ lwc1 $f10, 0x30($s0) /* 32E838 E00143A8 C606002C */ lwc1 $f6, 0x2c($s0) /* 32E83C E00143AC C6020034 */ lwc1 $f2, 0x34($s0) @@ -118,7 +118,7 @@ glabel func_E0014260 /* 32E8AC E001441C D42247B0 */ ldc1 $f2, %lo(D_E00147B0)($at) /* 32E8B0 E0014420 46006021 */ cvt.d.s $f0, $f12 /* 32E8B4 E0014424 46220002 */ mul.d $f0, $f0, $f2 -/* 32E8B8 E0014428 00000000 */ nop +/* 32E8B8 E0014428 00000000 */ nop /* 32E8BC E001442C 46200020 */ cvt.s.d $f0, $f0 /* 32E8C0 E0014430 E6000020 */ swc1 $f0, 0x20($s0) .LE0014434: @@ -139,7 +139,7 @@ glabel func_E0014260 /* 32E8F4 E0014464 2631004C */ addiu $s1, $s1, 0x4c .LE0014468: /* 32E8F8 E0014468 16400003 */ bnez $s2, .LE0014478 -/* 32E8FC E001446C 00000000 */ nop +/* 32E8FC E001446C 00000000 */ nop /* 32E900 E0014470 0C080128 */ jal func_E02004A0 /* 32E904 E0014474 0280202D */ daddu $a0, $s4, $zero .LE0014478: diff --git a/asm/nonmatchings/code_32E490/func_E00144E0.s b/asm/nonmatchings/code_32E490/func_E00144E0.s index 65a7da9137..d6c433c04b 100644 --- a/asm/nonmatchings/code_32E490/func_E00144E0.s +++ b/asm/nonmatchings/code_32E490/func_E00144E0.s @@ -171,5 +171,5 @@ glabel func_E00144E0 /* 32EBFC E001476C D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 32EC00 E0014770 03E00008 */ jr $ra /* 32EC04 E0014774 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 32EC08 E0014778 00000000 */ nop -/* 32EC0C E001477C 00000000 */ nop +/* 32EC08 E0014778 00000000 */ nop +/* 32EC0C E001477C 00000000 */ nop diff --git a/asm/nonmatchings/code_32FE30/func_E001A000.s b/asm/nonmatchings/code_32FE30/func_E001A000.s index fb7d88dcd8..a6d83b0358 100644 --- a/asm/nonmatchings/code_32FE30/func_E001A000.s +++ b/asm/nonmatchings/code_32FE30/func_E001A000.s @@ -41,7 +41,7 @@ glabel func_E001A000 /* 32FEC0 E001A090 AE110000 */ sw $s1, ($s0) .LE001A094: /* 32FEC4 E001A094 08006825 */ j .LE001A094 -/* 32FEC8 E001A098 00000000 */ nop +/* 32FEC8 E001A098 00000000 */ nop .LE001A09C: /* 32FECC E001A09C 3C014120 */ lui $at, 0x4120 /* 32FED0 E001A0A0 44813000 */ mtc1 $at, $f6 @@ -72,7 +72,7 @@ glabel func_E001A000 /* 32FF34 E001A104 E604002C */ swc1 $f4, 0x2c($s0) /* 32FF38 E001A108 3C01C120 */ lui $at, 0xc120 /* 32FF3C E001A10C 44813000 */ mtc1 $at, $f6 -/* 32FF40 E001A110 00000000 */ nop +/* 32FF40 E001A110 00000000 */ nop .LE001A114: /* 32FF44 E001A114 E6060030 */ swc1 $f6, 0x30($s0) /* 32FF48 E001A118 08006876 */ j .LE001A1D8 @@ -94,13 +94,13 @@ glabel func_E001A000 /* 32FF84 E001A154 00031840 */ sll $v1, $v1, 1 /* 32FF88 E001A158 2463FFF1 */ addiu $v1, $v1, -0xf /* 32FF8C E001A15C 44830000 */ mtc1 $v1, $f0 -/* 32FF90 E001A160 00000000 */ nop +/* 32FF90 E001A160 00000000 */ nop /* 32FF94 E001A164 46800020 */ cvt.s.w $f0, $f0 /* 32FF98 E001A168 0C080138 */ jal func_E02004E0 /* 32FF9C E001A16C E6000024 */ swc1 $f0, 0x24($s0) /* 32FFA0 E001A170 24040001 */ addiu $a0, $zero, 1 /* 32FFA4 E001A174 44820000 */ mtc1 $v0, $f0 -/* 32FFA8 E001A178 00000000 */ nop +/* 32FFA8 E001A178 00000000 */ nop /* 32FFAC E001A17C 46800020 */ cvt.s.w $f0, $f0 /* 32FFB0 E001A180 E6000028 */ swc1 $f0, 0x28($s0) /* 32FFB4 E001A184 0C080138 */ jal func_E02004E0 @@ -109,7 +109,7 @@ glabel func_E001A000 /* 32FFC0 E001A190 000210C0 */ sll $v0, $v0, 3 /* 32FFC4 E001A194 2442FFFC */ addiu $v0, $v0, -4 /* 32FFC8 E001A198 44820000 */ mtc1 $v0, $f0 -/* 32FFCC E001A19C 00000000 */ nop +/* 32FFCC E001A19C 00000000 */ nop /* 32FFD0 E001A1A0 46800020 */ cvt.s.w $f0, $f0 /* 32FFD4 E001A1A4 E6000030 */ swc1 $f0, 0x30($s0) /* 32FFD8 E001A1A8 AE120034 */ sw $s2, 0x34($s0) diff --git a/asm/nonmatchings/code_32FE30/func_E001A21C.s b/asm/nonmatchings/code_32FE30/func_E001A21C.s index bf55cc3ab3..3b5a63d7e0 100644 --- a/asm/nonmatchings/code_32FE30/func_E001A21C.s +++ b/asm/nonmatchings/code_32FE30/func_E001A21C.s @@ -3,4 +3,4 @@ glabel func_E001A21C /* 33004C E001A21C 03E00008 */ jr $ra -/* 330050 E001A220 00000000 */ nop +/* 330050 E001A220 00000000 */ nop diff --git a/asm/nonmatchings/code_32FE30/func_E001A224.s b/asm/nonmatchings/code_32FE30/func_E001A224.s index e668c36d94..5e520e0572 100644 --- a/asm/nonmatchings/code_32FE30/func_E001A224.s +++ b/asm/nonmatchings/code_32FE30/func_E001A224.s @@ -9,7 +9,7 @@ glabel func_E001A224 /* 330064 E001A234 8CA60000 */ lw $a2, ($a1) /* 330068 E001A238 28420096 */ slti $v0, $v0, 0x96 /* 33006C E001A23C 10400039 */ beqz $v0, .LE001A324 -/* 330070 E001A240 00000000 */ nop +/* 330070 E001A240 00000000 */ nop /* 330074 E001A244 C4A00010 */ lwc1 $f0, 0x10($a1) /* 330078 E001A248 3C01E002 */ lui $at, %hi(D_E001A620) /* 33007C E001A24C D422A620 */ ldc1 $f2, %lo(D_E001A620)($at) @@ -31,11 +31,11 @@ glabel func_E001A224 /* 3300BC E001A28C E4A20004 */ swc1 $f2, 4($a1) /* 3300C0 E001A290 3C014120 */ lui $at, 0x4120 /* 3300C4 E001A294 44811000 */ mtc1 $at, $f2 -/* 3300C8 E001A298 00000000 */ nop +/* 3300C8 E001A298 00000000 */ nop /* 3300CC E001A29C 4602203C */ c.lt.s $f4, $f2 -/* 3300D0 E001A2A0 00000000 */ nop +/* 3300D0 E001A2A0 00000000 */ nop /* 3300D4 E001A2A4 45000005 */ bc1f .LE001A2BC -/* 3300D8 E001A2A8 00000000 */ nop +/* 3300D8 E001A2A8 00000000 */ nop /* 3300DC E001A2AC C4A0002C */ lwc1 $f0, 0x2c($a1) /* 3300E0 E001A2B0 E4A20024 */ swc1 $f2, 0x24($a1) /* 3300E4 E001A2B4 46000007 */ neg.s $f0, $f0 @@ -44,11 +44,11 @@ glabel func_E001A224 /* 3300EC E001A2BC C4A00024 */ lwc1 $f0, 0x24($a1) /* 3300F0 E001A2C0 3C014234 */ lui $at, 0x4234 /* 3300F4 E001A2C4 44811000 */ mtc1 $at, $f2 -/* 3300F8 E001A2C8 00000000 */ nop +/* 3300F8 E001A2C8 00000000 */ nop /* 3300FC E001A2CC 4600103C */ c.lt.s $f2, $f0 -/* 330100 E001A2D0 00000000 */ nop +/* 330100 E001A2D0 00000000 */ nop /* 330104 E001A2D4 45000005 */ bc1f .LE001A2EC -/* 330108 E001A2D8 00000000 */ nop +/* 330108 E001A2D8 00000000 */ nop /* 33010C E001A2DC C4A0002C */ lwc1 $f0, 0x2c($a1) /* 330110 E001A2E0 E4A20024 */ swc1 $f2, 0x24($a1) /* 330114 E001A2E4 46000007 */ neg.s $f0, $f0 @@ -85,14 +85,14 @@ glabel func_E001A224 /* 330184 E001A354 E4A00020 */ swc1 $f0, 0x20($a1) /* 330188 E001A358 E4A4001C */ swc1 $f4, 0x1c($a1) /* 33018C E001A35C 4602303C */ c.lt.s $f6, $f2 -/* 330190 E001A360 00000000 */ nop +/* 330190 E001A360 00000000 */ nop /* 330194 E001A364 45000002 */ bc1f .LE001A370 /* 330198 E001A368 E4A20014 */ swc1 $f2, 0x14($a1) /* 33019C E001A36C E4A60014 */ swc1 $f6, 0x14($a1) .LE001A370: /* 3301A0 E001A370 24020001 */ addiu $v0, $zero, 1 /* 3301A4 E001A374 14C20010 */ bne $a2, $v0, .LE001A3B8 -/* 3301A8 E001A378 00000000 */ nop +/* 3301A8 E001A378 00000000 */ nop /* 3301AC E001A37C 8CA20040 */ lw $v0, 0x40($a1) /* 3301B0 E001A380 8CA3003C */ lw $v1, 0x3c($a1) /* 3301B4 E001A384 00431821 */ addu $v1, $v0, $v1 @@ -106,7 +106,7 @@ glabel func_E001A224 /* 3301D4 E001A3A4 ACA2003C */ sw $v0, 0x3c($a1) .LE001A3A8: /* 3301D8 E001A3A8 1C600003 */ bgtz $v1, .LE001A3B8 -/* 3301DC E001A3AC 00000000 */ nop +/* 3301DC E001A3AC 00000000 */ nop /* 3301E0 E001A3B0 ACA00040 */ sw $zero, 0x40($a1) /* 3301E4 E001A3B4 ACA6003C */ sw $a2, 0x3c($a1) .LE001A3B8: @@ -123,7 +123,7 @@ glabel func_E001A224 /* 330210 E001A3E0 04610003 */ bgez $v1, .LE001A3F0 /* 330214 E001A3E4 E4A00008 */ swc1 $f0, 8($a1) /* 330218 E001A3E8 0C080128 */ jal func_E02004A0 -/* 33021C E001A3EC 00000000 */ nop +/* 33021C E001A3EC 00000000 */ nop .LE001A3F0: /* 330220 E001A3F0 8FBF0010 */ lw $ra, 0x10($sp) /* 330224 E001A3F4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_32FE30/func_E001A440.s b/asm/nonmatchings/code_32FE30/func_E001A440.s index 5f933d86c1..c7936fae69 100644 --- a/asm/nonmatchings/code_32FE30/func_E001A440.s +++ b/asm/nonmatchings/code_32FE30/func_E001A440.s @@ -119,4 +119,4 @@ glabel func_E001A440 /* 330430 E001A600 8FB000A8 */ lw $s0, 0xa8($sp) /* 330434 E001A604 03E00008 */ jr $ra /* 330438 E001A608 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 33043C E001A60C 00000000 */ nop +/* 33043C E001A60C 00000000 */ nop diff --git a/asm/nonmatchings/code_330910/func_E001C000.s b/asm/nonmatchings/code_330910/func_E001C000.s index 4681b834a2..119367dc8e 100644 --- a/asm/nonmatchings/code_330910/func_E001C000.s +++ b/asm/nonmatchings/code_330910/func_E001C000.s @@ -37,7 +37,7 @@ glabel func_E001C000 /* 330990 E001C080 AE02000C */ sw $v0, 0xc($s0) .LE001C084: /* 330994 E001C084 08007021 */ j .LE001C084 -/* 330998 E001C088 00000000 */ nop +/* 330998 E001C088 00000000 */ nop .LE001C08C: /* 33099C E001C08C 3C04E002 */ lui $a0, %hi(D_E001C5E0) /* 3309A0 E001C090 2484C5E0 */ addiu $a0, $a0, %lo(D_E001C5E0) @@ -60,7 +60,7 @@ glabel func_E001C000 /* 3309E4 E001C0D4 E4420020 */ swc1 $f2, 0x20($v0) /* 3309E8 E001C0D8 3C01C120 */ lui $at, 0xc120 /* 3309EC E001C0DC 44812000 */ mtc1 $at, $f4 -/* 3309F0 E001C0E0 00000000 */ nop +/* 3309F0 E001C0E0 00000000 */ nop .LE001C0E4: /* 3309F4 E001C0E4 E4440024 */ swc1 $f4, 0x24($v0) /* 3309F8 E001C0E8 AC510028 */ sw $s1, 0x28($v0) diff --git a/asm/nonmatchings/code_330910/func_E001C120.s b/asm/nonmatchings/code_330910/func_E001C120.s index bbc98d7380..3777118191 100644 --- a/asm/nonmatchings/code_330910/func_E001C120.s +++ b/asm/nonmatchings/code_330910/func_E001C120.s @@ -3,4 +3,4 @@ glabel func_E001C120 /* 330A30 E001C120 03E00008 */ jr $ra -/* 330A34 E001C124 00000000 */ nop +/* 330A34 E001C124 00000000 */ nop diff --git a/asm/nonmatchings/code_330910/func_E001C128.s b/asm/nonmatchings/code_330910/func_E001C128.s index f999e11da0..5e63ac9f67 100644 --- a/asm/nonmatchings/code_330910/func_E001C128.s +++ b/asm/nonmatchings/code_330910/func_E001C128.s @@ -10,9 +10,9 @@ glabel func_E001C128 /* 330A4C E001C13C 04410005 */ bgez $v0, .LE001C154 /* 330A50 E001C140 AC620028 */ sw $v0, 0x28($v1) /* 330A54 E001C144 0C080128 */ jal func_E02004A0 -/* 330A58 E001C148 00000000 */ nop +/* 330A58 E001C148 00000000 */ nop /* 330A5C E001C14C 0800707D */ j .LE001C1F4 -/* 330A60 E001C150 00000000 */ nop +/* 330A60 E001C150 00000000 */ nop .LE001C154: /* 330A64 E001C154 C4680000 */ lwc1 $f8, ($v1) /* 330A68 E001C158 C460000C */ lwc1 $f0, 0xc($v1) @@ -42,11 +42,11 @@ glabel func_E001C128 /* 330AC4 E001C1B4 C4600018 */ lwc1 $f0, 0x18($v1) /* 330AC8 E001C1B8 3C014234 */ lui $at, 0x4234 /* 330ACC E001C1BC 44811000 */ mtc1 $at, $f2 -/* 330AD0 E001C1C0 00000000 */ nop +/* 330AD0 E001C1C0 00000000 */ nop /* 330AD4 E001C1C4 4600103C */ c.lt.s $f2, $f0 -/* 330AD8 E001C1C8 00000000 */ nop +/* 330AD8 E001C1C8 00000000 */ nop /* 330ADC E001C1CC 45000005 */ bc1f .LE001C1E4 -/* 330AE0 E001C1D0 00000000 */ nop +/* 330AE0 E001C1D0 00000000 */ nop /* 330AE4 E001C1D4 C4600020 */ lwc1 $f0, 0x20($v1) /* 330AE8 E001C1D8 E4620018 */ swc1 $f2, 0x18($v1) /* 330AEC E001C1DC 46000007 */ neg.s $f0, $f0 diff --git a/asm/nonmatchings/code_330910/func_E001C200.s b/asm/nonmatchings/code_330910/func_E001C200.s index 03326eea3e..9931e5ee3e 100644 --- a/asm/nonmatchings/code_330910/func_E001C200.s +++ b/asm/nonmatchings/code_330910/func_E001C200.s @@ -13,9 +13,9 @@ glabel func_E001C200 /* 330B30 E001C220 46041001 */ sub.s $f0, $f2, $f4 /* 330B34 E001C224 3C014348 */ lui $at, 0x4348 /* 330B38 E001C228 44813000 */ mtc1 $at, $f6 -/* 330B3C E001C22C 00000000 */ nop +/* 330B3C E001C22C 00000000 */ nop /* 330B40 E001C230 4600303C */ c.lt.s $f6, $f0 -/* 330B44 E001C234 00000000 */ nop +/* 330B44 E001C234 00000000 */ nop /* 330B48 E001C238 45000005 */ bc1f .LE001C250 /* 330B4C E001C23C 27A40010 */ addiu $a0, $sp, 0x10 /* 330B50 E001C240 3C0143C8 */ lui $at, 0x43c8 @@ -25,12 +25,12 @@ glabel func_E001C200 .LE001C250: /* 330B60 E001C250 46022001 */ sub.s $f0, $f4, $f2 /* 330B64 E001C254 4600303C */ c.lt.s $f6, $f0 -/* 330B68 E001C258 00000000 */ nop +/* 330B68 E001C258 00000000 */ nop /* 330B6C E001C25C 45000006 */ bc1f .LE001C278 -/* 330B70 E001C260 00000000 */ nop +/* 330B70 E001C260 00000000 */ nop /* 330B74 E001C264 3C0143C8 */ lui $at, 0x43c8 /* 330B78 E001C268 44810000 */ mtc1 $at, $f0 -/* 330B7C E001C26C 00000000 */ nop +/* 330B7C E001C26C 00000000 */ nop /* 330B80 E001C270 46001000 */ add.s $f0, $f2, $f0 .LE001C274: /* 330B84 E001C274 E4400000 */ swc1 $f0, ($v0) @@ -40,9 +40,9 @@ glabel func_E001C200 /* 330B90 E001C280 46041001 */ sub.s $f0, $f2, $f4 /* 330B94 E001C284 3C014348 */ lui $at, 0x4348 /* 330B98 E001C288 44813000 */ mtc1 $at, $f6 -/* 330B9C E001C28C 00000000 */ nop +/* 330B9C E001C28C 00000000 */ nop /* 330BA0 E001C290 4600303C */ c.lt.s $f6, $f0 -/* 330BA4 E001C294 00000000 */ nop +/* 330BA4 E001C294 00000000 */ nop /* 330BA8 E001C298 45020005 */ bc1fl .LE001C2B0 /* 330BAC E001C29C 46022001 */ sub.s $f0, $f4, $f2 /* 330BB0 E001C2A0 3C0143C8 */ lui $at, 0x43c8 @@ -51,12 +51,12 @@ glabel func_E001C200 /* 330BBC E001C2AC 46001001 */ sub.s $f0, $f2, $f0 .LE001C2B0: /* 330BC0 E001C2B0 4600303C */ c.lt.s $f6, $f0 -/* 330BC4 E001C2B4 00000000 */ nop +/* 330BC4 E001C2B4 00000000 */ nop /* 330BC8 E001C2B8 45000006 */ bc1f .LE001C2D4 -/* 330BCC E001C2BC 00000000 */ nop +/* 330BCC E001C2BC 00000000 */ nop /* 330BD0 E001C2C0 3C0143C8 */ lui $at, 0x43c8 /* 330BD4 E001C2C4 44810000 */ mtc1 $at, $f0 -/* 330BD8 E001C2C8 00000000 */ nop +/* 330BD8 E001C2C8 00000000 */ nop /* 330BDC E001C2CC 46001000 */ add.s $f0, $f2, $f0 .LE001C2D0: /* 330BE0 E001C2D0 E4400008 */ swc1 $f0, 8($v0) diff --git a/asm/nonmatchings/code_330910/func_E001C30C.s b/asm/nonmatchings/code_330910/func_E001C30C.s index 9a8496620f..216f4ad6e3 100644 --- a/asm/nonmatchings/code_330910/func_E001C30C.s +++ b/asm/nonmatchings/code_330910/func_E001C30C.s @@ -181,5 +181,5 @@ glabel func_E001C30C /* 330EDC E001C5CC D7B40180 */ ldc1 $f20, 0x180($sp) /* 330EE0 E001C5D0 03E00008 */ jr $ra /* 330EE4 E001C5D4 27BD0190 */ addiu $sp, $sp, 0x190 -/* 330EE8 E001C5D8 00000000 */ nop -/* 330EEC E001C5DC 00000000 */ nop +/* 330EE8 E001C5D8 00000000 */ nop +/* 330EEC E001C5DC 00000000 */ nop diff --git a/asm/nonmatchings/code_333EC0/func_E0020000.s b/asm/nonmatchings/code_333EC0/func_E0020000.s index c85ce1627b..41f3221a95 100644 --- a/asm/nonmatchings/code_333EC0/func_E0020000.s +++ b/asm/nonmatchings/code_333EC0/func_E0020000.s @@ -52,7 +52,7 @@ glabel func_E0020000 /* 333F7C E00200BC 4600C001 */ sub.s $f0, $f24, $f0 /* 333F80 E00200C0 00021080 */ sll $v0, $v0, 2 /* 333F84 E00200C4 44821000 */ mtc1 $v0, $f2 -/* 333F88 E00200C8 00000000 */ nop +/* 333F88 E00200C8 00000000 */ nop /* 333F8C E00200CC 468010A0 */ cvt.s.w $f2, $f2 /* 333F90 E00200D0 46020000 */ add.s $f0, $f0, $f2 /* 333F94 E00200D4 27A40018 */ addiu $a0, $sp, 0x18 @@ -63,14 +63,14 @@ glabel func_E0020000 /* 333FA8 E00200E8 0000382D */ daddu $a3, $zero, $zero /* 333FAC E00200EC 2402FFFF */ addiu $v0, $zero, -1 /* 333FB0 E00200F0 1642001F */ bne $s2, $v0, .LE0020170 -/* 333FB4 E00200F4 00000000 */ nop +/* 333FB4 E00200F4 00000000 */ nop /* 333FB8 E00200F8 3C014180 */ lui $at, 0x4180 /* 333FBC E00200FC 44813000 */ mtc1 $at, $f6 -/* 333FC0 E0020100 00000000 */ nop +/* 333FC0 E0020100 00000000 */ nop /* 333FC4 E0020104 4606B180 */ add.s $f6, $f22, $f6 /* 333FC8 E0020108 C7A40028 */ lwc1 $f4, 0x28($sp) /* 333FCC E002010C 46062102 */ mul.s $f4, $f4, $f6 -/* 333FD0 E0020110 00000000 */ nop +/* 333FD0 E0020110 00000000 */ nop /* 333FD4 E0020114 3C028011 */ lui $v0, %hi(gPlayerStatus) /* 333FD8 E0020118 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* 333FDC E002011C C4400028 */ lwc1 $f0, 0x28($v0) @@ -80,7 +80,7 @@ glabel func_E0020000 /* 333FEC E002012C E6200004 */ swc1 $f0, 4($s1) /* 333FF0 E0020130 C7A4002C */ lwc1 $f4, 0x2c($sp) /* 333FF4 E0020134 46062102 */ mul.s $f4, $f4, $f6 -/* 333FF8 E0020138 00000000 */ nop +/* 333FF8 E0020138 00000000 */ nop /* 333FFC E002013C C6220014 */ lwc1 $f2, 0x14($s1) /* 334000 E0020140 C440002C */ lwc1 $f0, 0x2c($v0) /* 334004 E0020144 46020000 */ add.s $f0, $f0, $f2 @@ -88,7 +88,7 @@ glabel func_E0020000 /* 33400C E002014C E6200008 */ swc1 $f0, 8($s1) /* 334010 E0020150 C7A40030 */ lwc1 $f4, 0x30($sp) /* 334014 E0020154 46062102 */ mul.s $f4, $f4, $f6 -/* 334018 E0020158 00000000 */ nop +/* 334018 E0020158 00000000 */ nop /* 33401C E002015C C6220018 */ lwc1 $f2, 0x18($s1) /* 334020 E0020160 C4400030 */ lwc1 $f0, 0x30($v0) /* 334024 E0020164 46020000 */ add.s $f0, $f0, $f2 @@ -96,14 +96,14 @@ glabel func_E0020000 /* 33402C E002016C 46040000 */ add.s $f0, $f0, $f4 .LE0020170: /* 334030 E0020170 1240001D */ beqz $s2, .LE00201E8 -/* 334034 E0020174 00000000 */ nop +/* 334034 E0020174 00000000 */ nop /* 334038 E0020178 3C014180 */ lui $at, 0x4180 /* 33403C E002017C 44813000 */ mtc1 $at, $f6 -/* 334040 E0020180 00000000 */ nop +/* 334040 E0020180 00000000 */ nop /* 334044 E0020184 4606B180 */ add.s $f6, $f22, $f6 /* 334048 E0020188 C7A40028 */ lwc1 $f4, 0x28($sp) /* 33404C E002018C 46062102 */ mul.s $f4, $f4, $f6 -/* 334050 E0020190 00000000 */ nop +/* 334050 E0020190 00000000 */ nop /* 334054 E0020194 C6400038 */ lwc1 $f0, 0x38($s2) /* 334058 E0020198 C6220010 */ lwc1 $f2, 0x10($s1) /* 33405C E002019C 46020000 */ add.s $f0, $f0, $f2 @@ -111,7 +111,7 @@ glabel func_E0020000 /* 334064 E00201A4 E6200004 */ swc1 $f0, 4($s1) /* 334068 E00201A8 C7A4002C */ lwc1 $f4, 0x2c($sp) /* 33406C E00201AC 46062102 */ mul.s $f4, $f4, $f6 -/* 334070 E00201B0 00000000 */ nop +/* 334070 E00201B0 00000000 */ nop /* 334074 E00201B4 C6220014 */ lwc1 $f2, 0x14($s1) /* 334078 E00201B8 C640003C */ lwc1 $f0, 0x3c($s2) /* 33407C E00201BC 46020000 */ add.s $f0, $f0, $f2 @@ -119,7 +119,7 @@ glabel func_E0020000 /* 334084 E00201C4 E6200008 */ swc1 $f0, 8($s1) /* 334088 E00201C8 C7A40030 */ lwc1 $f4, 0x30($sp) /* 33408C E00201CC 46062102 */ mul.s $f4, $f4, $f6 -/* 334090 E00201D0 00000000 */ nop +/* 334090 E00201D0 00000000 */ nop /* 334094 E00201D4 C6220018 */ lwc1 $f2, 0x18($s1) /* 334098 E00201D8 C6400040 */ lwc1 $f0, 0x40($s2) /* 33409C E00201DC 46020000 */ add.s $f0, $f0, $f2 @@ -128,23 +128,23 @@ glabel func_E0020000 .LE00201E8: /* 3340A8 E00201E8 3C014180 */ lui $at, 0x4180 /* 3340AC E00201EC 44812000 */ mtc1 $at, $f4 -/* 3340B0 E00201F0 00000000 */ nop +/* 3340B0 E00201F0 00000000 */ nop /* 3340B4 E00201F4 4604B100 */ add.s $f4, $f22, $f4 /* 3340B8 E00201F8 C7A20028 */ lwc1 $f2, 0x28($sp) /* 3340BC E00201FC 46041082 */ mul.s $f2, $f2, $f4 -/* 3340C0 E0020200 00000000 */ nop +/* 3340C0 E0020200 00000000 */ nop /* 3340C4 E0020204 C6200010 */ lwc1 $f0, 0x10($s1) /* 3340C8 E0020208 46020000 */ add.s $f0, $f0, $f2 /* 3340CC E002020C E6200004 */ swc1 $f0, 4($s1) /* 3340D0 E0020210 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 3340D4 E0020214 46041082 */ mul.s $f2, $f2, $f4 -/* 3340D8 E0020218 00000000 */ nop +/* 3340D8 E0020218 00000000 */ nop /* 3340DC E002021C C6200014 */ lwc1 $f0, 0x14($s1) /* 3340E0 E0020220 46020000 */ add.s $f0, $f0, $f2 /* 3340E4 E0020224 E6200008 */ swc1 $f0, 8($s1) /* 3340E8 E0020228 C7A20030 */ lwc1 $f2, 0x30($sp) /* 3340EC E002022C 46041082 */ mul.s $f2, $f2, $f4 -/* 3340F0 E0020230 00000000 */ nop +/* 3340F0 E0020230 00000000 */ nop /* 3340F4 E0020234 C6200018 */ lwc1 $f0, 0x18($s1) /* 3340F8 E0020238 46020000 */ add.s $f0, $f0, $f2 .LE002023C: @@ -155,7 +155,7 @@ glabel func_E0020000 /* 33410C E002024C 44811000 */ mtc1 $at, $f2 /* 334110 E0020250 4600B003 */ div.s $f0, $f22, $f0 /* 334114 E0020254 46020002 */ mul.s $f0, $f0, $f2 -/* 334118 E0020258 00000000 */ nop +/* 334118 E0020258 00000000 */ nop /* 33411C E002025C 00131080 */ sll $v0, $s3, 2 /* 334120 E0020260 3C0141A0 */ lui $at, 0x41a0 /* 334124 E0020264 44812000 */ mtc1 $at, $f4 @@ -163,7 +163,7 @@ glabel func_E0020000 /* 33412C E002026C 4604C101 */ sub.s $f4, $f24, $f4 /* 334130 E0020270 00021080 */ sll $v0, $v0, 2 /* 334134 E0020274 44821000 */ mtc1 $v0, $f2 -/* 334138 E0020278 00000000 */ nop +/* 334138 E0020278 00000000 */ nop /* 33413C E002027C 468010A0 */ cvt.s.w $f2, $f2 /* 334140 E0020280 46022100 */ add.s $f4, $f4, $f2 /* 334144 E0020284 3C013FE0 */ lui $at, 0x3fe0 diff --git a/asm/nonmatchings/code_333EC0/func_E00202CC.s b/asm/nonmatchings/code_333EC0/func_E00202CC.s index 56404a4647..781b78c509 100644 --- a/asm/nonmatchings/code_333EC0/func_E00202CC.s +++ b/asm/nonmatchings/code_333EC0/func_E00202CC.s @@ -51,7 +51,7 @@ glabel func_E00202CC /* 334240 E0020380 AE91000C */ sw $s1, 0xc($s4) .LE0020384: /* 334244 E0020384 080080E1 */ j .LE0020384 -/* 334248 E0020388 00000000 */ nop +/* 334248 E0020388 00000000 */ nop .LE002038C: /* 33424C E002038C AE35003C */ sw $s5, 0x3c($s1) /* 334250 E0020390 AE320000 */ sw $s2, ($s1) @@ -82,7 +82,7 @@ glabel func_E00202CC /* 3342AC E00203EC 1440FFF3 */ bnez $v0, .LE00203BC /* 3342B0 E00203F0 26310040 */ addiu $s1, $s1, 0x40 /* 3342B4 E00203F4 08008108 */ j .LE0020420 -/* 3342B8 E00203F8 00000000 */ nop +/* 3342B8 E00203F8 00000000 */ nop .LE00203FC: /* 3342BC E00203FC 0220202D */ daddu $a0, $s1, $zero /* 3342C0 E0020400 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/code_333EC0/func_E0020460.s b/asm/nonmatchings/code_333EC0/func_E0020460.s index 6beaf975b6..191d005868 100644 --- a/asm/nonmatchings/code_333EC0/func_E0020460.s +++ b/asm/nonmatchings/code_333EC0/func_E0020460.s @@ -3,4 +3,4 @@ glabel func_E0020460 /* 334320 E0020460 03E00008 */ jr $ra -/* 334324 E0020464 00000000 */ nop +/* 334324 E0020464 00000000 */ nop diff --git a/asm/nonmatchings/code_333EC0/func_E0020468.s b/asm/nonmatchings/code_333EC0/func_E0020468.s index 4c2b351339..2e2227fd9b 100644 --- a/asm/nonmatchings/code_333EC0/func_E0020468.s +++ b/asm/nonmatchings/code_333EC0/func_E0020468.s @@ -46,12 +46,12 @@ glabel func_E0020468 .LE0020508: /* 3343C8 E0020508 8E22002C */ lw $v0, 0x2c($s1) /* 3343CC E002050C 04410005 */ bgez $v0, .LE0020524 -/* 3343D0 E0020510 00000000 */ nop +/* 3343D0 E0020510 00000000 */ nop .LE0020514: /* 3343D4 E0020514 0C080128 */ jal func_E02004A0 /* 3343D8 E0020518 0240202D */ daddu $a0, $s2, $zero /* 3343DC E002051C 0800815D */ j .LE0020574 -/* 3343E0 E0020520 00000000 */ nop +/* 3343E0 E0020520 00000000 */ nop .LE0020524: /* 3343E4 E0020524 8E22003C */ lw $v0, 0x3c($s1) /* 3343E8 E0020528 10400012 */ beqz $v0, .LE0020574 @@ -71,7 +71,7 @@ glabel func_E0020468 /* 33441C E002055C 1440FFF9 */ bnez $v0, .LE0020544 /* 334420 E0020560 26310040 */ addiu $s1, $s1, 0x40 /* 334424 E0020564 0800815D */ j .LE0020574 -/* 334428 E0020568 00000000 */ nop +/* 334428 E0020568 00000000 */ nop .LE002056C: /* 33442C E002056C 0C008000 */ jal func_E0020000 /* 334430 E0020570 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/code_333EC0/func_E00205D0.s b/asm/nonmatchings/code_333EC0/func_E00205D0.s index 9f1b1584e3..106c761202 100644 --- a/asm/nonmatchings/code_333EC0/func_E00205D0.s +++ b/asm/nonmatchings/code_333EC0/func_E00205D0.s @@ -261,7 +261,7 @@ glabel func_E00205D0 /* 334888 E00209C8 1440FFA1 */ bnez $v0, .LE0020850 /* 33488C E00209CC AC870010 */ sw $a3, 0x10($a0) /* 334890 E00209D0 08008316 */ j .LE0020C58 -/* 334894 E00209D4 00000000 */ nop +/* 334894 E00209D4 00000000 */ nop .LE00209D8: /* 334898 E00209D8 3C03DA38 */ lui $v1, 0xda38 /* 33489C E00209DC 3C06800A */ lui $a2, %hi(gMasterGfxPos) @@ -290,14 +290,14 @@ glabel func_E00205D0 /* 3348F8 E0020A38 12A00009 */ beqz $s5, .LE0020A60 /* 3348FC E0020A3C 24090010 */ addiu $t1, $zero, 0x10 /* 334900 E0020A40 080082E2 */ j .LE0020B88 -/* 334904 E0020A44 00000000 */ nop +/* 334904 E0020A44 00000000 */ nop .LE0020A48: /* 334908 E0020A48 12A2001E */ beq $s5, $v0, .LE0020AC4 /* 33490C E0020A4C 24020004 */ addiu $v0, $zero, 4 /* 334910 E0020A50 12A20046 */ beq $s5, $v0, .LE0020B6C /* 334914 E0020A54 24090020 */ addiu $t1, $zero, 0x20 /* 334918 E0020A58 080082E2 */ j .LE0020B88 -/* 33491C E0020A5C 00000000 */ nop +/* 33491C E0020A5C 00000000 */ nop .LE0020A60: /* 334920 E0020A60 00041900 */ sll $v1, $a0, 4 /* 334924 E0020A64 24020080 */ addiu $v0, $zero, 0x80 @@ -379,7 +379,7 @@ glabel func_E00205D0 /* 334A44 E0020B84 AFA900A0 */ sw $t1, 0xa0($sp) .LE0020B88: /* 334A48 E0020B88 10E0000A */ beqz $a3, .LE0020BB4 -/* 334A4C E0020B8C 00000000 */ nop +/* 334A4C E0020B8C 00000000 */ nop /* 334A50 E0020B90 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 334A54 E0020B94 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 334A58 E0020B98 8C620000 */ lw $v0, ($v1) diff --git a/asm/nonmatchings/code_339250/func_E0024000.s b/asm/nonmatchings/code_339250/func_E0024000.s index 348951d8b8..02d10763f8 100644 --- a/asm/nonmatchings/code_339250/func_E0024000.s +++ b/asm/nonmatchings/code_339250/func_E0024000.s @@ -40,7 +40,7 @@ glabel func_E0024000 /* 3392DC E002408C AE02000C */ sw $v0, 0xc($s0) .LE0024090: /* 3392E0 E0024090 08009024 */ j .LE0024090 -/* 3392E4 E0024094 00000000 */ nop +/* 3392E4 E0024094 00000000 */ nop .LE0024098: /* 3392E8 E0024098 3C013F80 */ lui $at, 0x3f80 /* 3392EC E002409C 44810000 */ mtc1 $at, $f0 @@ -56,21 +56,21 @@ glabel func_E0024000 /* 339314 E00240C4 C7A60060 */ lwc1 $f6, 0x60($sp) /* 339318 E00240C8 46143181 */ sub.s $f6, $f6, $f20 /* 33931C E00240CC 44921000 */ mtc1 $s2, $f2 -/* 339320 E00240D0 00000000 */ nop +/* 339320 E00240D0 00000000 */ nop /* 339324 E00240D4 468010A0 */ cvt.s.w $f2, $f2 /* 339328 E00240D8 46020083 */ div.s $f2, $f0, $f2 /* 33932C E00240DC 46023182 */ mul.s $f6, $f6, $f2 -/* 339330 E00240E0 00000000 */ nop +/* 339330 E00240E0 00000000 */ nop /* 339334 E00240E4 C7A40064 */ lwc1 $f4, 0x64($sp) /* 339338 E00240E8 46162101 */ sub.s $f4, $f4, $f22 /* 33933C E00240EC 46022102 */ mul.s $f4, $f4, $f2 -/* 339340 E00240F0 00000000 */ nop +/* 339340 E00240F0 00000000 */ nop /* 339344 E00240F4 C7A00068 */ lwc1 $f0, 0x68($sp) /* 339348 E00240F8 46180001 */ sub.s $f0, $f0, $f24 /* 33934C E00240FC AC600010 */ sw $zero, 0x10($v1) /* 339350 E0024100 AC600014 */ sw $zero, 0x14($v1) /* 339354 E0024104 46020002 */ mul.s $f0, $f0, $f2 -/* 339358 E0024108 00000000 */ nop +/* 339358 E0024108 00000000 */ nop /* 33935C E002410C AC600018 */ sw $zero, 0x18($v1) /* 339360 E0024110 AC720030 */ sw $s2, 0x30($v1) /* 339364 E0024114 E466001C */ swc1 $f6, 0x1c($v1) diff --git a/asm/nonmatchings/code_339250/func_E0024180.s b/asm/nonmatchings/code_339250/func_E0024180.s index 7c6fc1a9a8..81f219dc2b 100644 --- a/asm/nonmatchings/code_339250/func_E0024180.s +++ b/asm/nonmatchings/code_339250/func_E0024180.s @@ -3,4 +3,4 @@ glabel func_E0024180 /* 3393D0 E0024180 03E00008 */ jr $ra -/* 3393D4 E0024184 00000000 */ nop +/* 3393D4 E0024184 00000000 */ nop diff --git a/asm/nonmatchings/code_339250/func_E0024188.s b/asm/nonmatchings/code_339250/func_E0024188.s index 41a6b4662a..fbccedc1ce 100644 --- a/asm/nonmatchings/code_339250/func_E0024188.s +++ b/asm/nonmatchings/code_339250/func_E0024188.s @@ -24,9 +24,9 @@ glabel func_E0024188 /* 339420 E00241D0 04610005 */ bgez $v1, .LE00241E8 /* 339424 E00241D4 AE02002C */ sw $v0, 0x2c($s0) /* 339428 E00241D8 0C080128 */ jal func_E02004A0 -/* 33942C E00241DC 00000000 */ nop +/* 33942C E00241DC 00000000 */ nop /* 339430 E00241E0 080090B3 */ j .LE00242CC -/* 339434 E00241E4 00000000 */ nop +/* 339434 E00241E4 00000000 */ nop .LE00241E8: /* 339438 E00241E8 8E110000 */ lw $s1, ($s0) /* 33943C E00241EC 16200019 */ bnez $s1, .LE0024254 @@ -57,19 +57,19 @@ glabel func_E0024188 /* 3394A0 E0024250 24020001 */ addiu $v0, $zero, 1 .LE0024254: /* 3394A4 E0024254 16220011 */ bne $s1, $v0, .LE002429C -/* 3394A8 E0024258 00000000 */ nop +/* 3394A8 E0024258 00000000 */ nop /* 3394AC E002425C 3C01E002 */ lui $at, %hi(D_E0024CF0) /* 3394B0 E0024260 D4204CF0 */ ldc1 $f0, %lo(D_E0024CF0)($at) /* 3394B4 E0024264 C6020034 */ lwc1 $f2, 0x34($s0) /* 3394B8 E0024268 468010A1 */ cvt.d.w $f2, $f2 /* 3394BC E002426C 46201082 */ mul.d $f2, $f2, $f0 -/* 3394C0 E0024270 00000000 */ nop +/* 3394C0 E0024270 00000000 */ nop /* 3394C4 E0024274 C600001C */ lwc1 $f0, 0x1c($s0) /* 3394C8 E0024278 3C01E002 */ lui $at, %hi(D_E0024CF8) /* 3394CC E002427C D4244CF8 */ ldc1 $f4, %lo(D_E0024CF8)($at) /* 3394D0 E0024280 46000021 */ cvt.d.s $f0, $f0 /* 3394D4 E0024284 46240002 */ mul.d $f0, $f0, $f4 -/* 3394D8 E0024288 00000000 */ nop +/* 3394D8 E0024288 00000000 */ nop /* 3394DC E002428C 4620120D */ trunc.w.d $f8, $f2 /* 3394E0 E0024290 E6080034 */ swc1 $f8, 0x34($s0) /* 3394E4 E0024294 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_339250/func_E0024324.s b/asm/nonmatchings/code_339250/func_E0024324.s index d07e0c7813..523f7997dc 100644 --- a/asm/nonmatchings/code_339250/func_E0024324.s +++ b/asm/nonmatchings/code_339250/func_E0024324.s @@ -11,26 +11,26 @@ glabel func_E0024324 /* 33958C E002433C 00021140 */ sll $v0, $v0, 5 /* 339590 E0024340 00451021 */ addu $v0, $v0, $a1 /* 339594 E0024344 44826000 */ mtc1 $v0, $f12 -/* 339598 E0024348 00000000 */ nop +/* 339598 E0024348 00000000 */ nop /* 33959C E002434C 46806320 */ cvt.s.w $f12, $f12 /* 3395A0 E0024350 0C080140 */ jal func_E0200500 /* 3395A4 E0024354 0080802D */ daddu $s0, $a0, $zero /* 3395A8 E0024358 240200FF */ addiu $v0, $zero, 0xff /* 3395AC E002435C 00501023 */ subu $v0, $v0, $s0 /* 3395B0 E0024360 44821000 */ mtc1 $v0, $f2 -/* 3395B4 E0024364 00000000 */ nop +/* 3395B4 E0024364 00000000 */ nop /* 3395B8 E0024368 468010A0 */ cvt.s.w $f2, $f2 /* 3395BC E002436C 46020002 */ mul.s $f0, $f0, $f2 -/* 3395C0 E0024370 00000000 */ nop +/* 3395C0 E0024370 00000000 */ nop /* 3395C4 E0024374 46020000 */ add.s $f0, $f0, $f2 /* 3395C8 E0024378 3C013FE0 */ lui $at, 0x3fe0 /* 3395CC E002437C 44811800 */ mtc1 $at, $f3 /* 3395D0 E0024380 44801000 */ mtc1 $zero, $f2 /* 3395D4 E0024384 46000021 */ cvt.d.s $f0, $f0 /* 3395D8 E0024388 46220002 */ mul.d $f0, $f0, $f2 -/* 3395DC E002438C 00000000 */ nop +/* 3395DC E002438C 00000000 */ nop /* 3395E0 E0024390 44901000 */ mtc1 $s0, $f2 -/* 3395E4 E0024394 00000000 */ nop +/* 3395E4 E0024394 00000000 */ nop /* 3395E8 E0024398 468010A1 */ cvt.d.w $f2, $f2 /* 3395EC E002439C 46220000 */ add.d $f0, $f0, $f2 /* 3395F0 E00243A0 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_339250/func_E00243BC.s b/asm/nonmatchings/code_339250/func_E00243BC.s index f6873d6598..f573f26174 100644 --- a/asm/nonmatchings/code_339250/func_E00243BC.s +++ b/asm/nonmatchings/code_339250/func_E00243BC.s @@ -12,25 +12,25 @@ glabel func_E00243BC /* 339628 E00243D8 00021140 */ sll $v0, $v0, 5 /* 33962C E00243DC 00451021 */ addu $v0, $v0, $a1 /* 339630 E00243E0 44826000 */ mtc1 $v0, $f12 -/* 339634 E00243E4 00000000 */ nop +/* 339634 E00243E4 00000000 */ nop /* 339638 E00243E8 46806320 */ cvt.s.w $f12, $f12 /* 33963C E00243EC 0C080140 */ jal func_E0200500 /* 339640 E00243F0 0080802D */ daddu $s0, $a0, $zero /* 339644 E00243F4 00101023 */ negu $v0, $s0 /* 339648 E00243F8 44821000 */ mtc1 $v0, $f2 -/* 33964C E00243FC 00000000 */ nop +/* 33964C E00243FC 00000000 */ nop /* 339650 E0024400 468010A0 */ cvt.s.w $f2, $f2 /* 339654 E0024404 46020002 */ mul.s $f0, $f0, $f2 -/* 339658 E0024408 00000000 */ nop +/* 339658 E0024408 00000000 */ nop /* 33965C E002440C 46020000 */ add.s $f0, $f0, $f2 /* 339660 E0024410 3C013FE0 */ lui $at, 0x3fe0 /* 339664 E0024414 44811800 */ mtc1 $at, $f3 /* 339668 E0024418 44801000 */ mtc1 $zero, $f2 /* 33966C E002441C 46000021 */ cvt.d.s $f0, $f0 /* 339670 E0024420 46220002 */ mul.d $f0, $f0, $f2 -/* 339674 E0024424 00000000 */ nop +/* 339674 E0024424 00000000 */ nop /* 339678 E0024428 44901000 */ mtc1 $s0, $f2 -/* 33967C E002442C 00000000 */ nop +/* 33967C E002442C 00000000 */ nop /* 339680 E0024430 468010A1 */ cvt.d.w $f2, $f2 /* 339684 E0024434 46220000 */ add.d $f0, $f0, $f2 /* 339688 E0024438 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_339250/func_E0024454.s b/asm/nonmatchings/code_339250/func_E0024454.s index 0f039c63a6..7aab9ecad4 100644 --- a/asm/nonmatchings/code_339250/func_E0024454.s +++ b/asm/nonmatchings/code_339250/func_E0024454.s @@ -71,7 +71,7 @@ glabel func_E0024454 /* 3397AC E002455C 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 3397B0 E0024560 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 3397B4 E0024564 4482B000 */ mtc1 $v0, $f22 -/* 3397B8 E0024568 00000000 */ nop +/* 3397B8 E0024568 00000000 */ nop /* 3397BC E002456C 4680B5A0 */ cvt.s.w $f22, $f22 /* 3397C0 E0024570 00031080 */ sll $v0, $v1, 2 /* 3397C4 E0024574 00431021 */ addu $v0, $v0, $v1 @@ -92,14 +92,14 @@ glabel func_E0024454 /* 3397FC E00245AC 000210C0 */ sll $v0, $v0, 3 /* 339800 E00245B0 00431021 */ addu $v0, $v0, $v1 /* 339804 E00245B4 4482B000 */ mtc1 $v0, $f22 -/* 339808 E00245B8 00000000 */ nop +/* 339808 E00245B8 00000000 */ nop /* 33980C E00245BC 4680B5A0 */ cvt.s.w $f22, $f22 /* 339810 E00245C0 C7A4007C */ lwc1 $f4, 0x7c($sp) /* 339814 E00245C4 3C0140C0 */ lui $at, 0x40c0 /* 339818 E00245C8 4481C000 */ mtc1 $at, $f24 /* 33981C E00245CC 4480F000 */ mtc1 $zero, $f30 /* 339820 E00245D0 4604D682 */ mul.s $f26, $f26, $f4 -/* 339824 E00245D4 00000000 */ nop +/* 339824 E00245D4 00000000 */ nop .LE00245D8: /* 339828 E00245D8 0000B82D */ daddu $s7, $zero, $zero /* 33982C E00245DC 3C1E8007 */ lui $fp, %hi(gMatrixListPos) @@ -112,13 +112,13 @@ glabel func_E0024454 /* 339848 E00245F8 AFA8008C */ sw $t0, 0x8c($sp) .LE00245FC: /* 33984C E00245FC 1AE00033 */ blez $s7, .LE00246CC -/* 339850 E0024600 00000000 */ nop +/* 339850 E0024600 00000000 */ nop /* 339854 E0024604 8FA80070 */ lw $t0, 0x70($sp) /* 339858 E0024608 15000013 */ bnez $t0, .LE0024658 -/* 33985C E002460C 00000000 */ nop +/* 33985C E002460C 00000000 */ nop /* 339860 E0024610 3C01428C */ lui $at, 0x428c /* 339864 E0024614 44810000 */ mtc1 $at, $f0 -/* 339868 E0024618 00000000 */ nop +/* 339868 E0024618 00000000 */ nop /* 33986C E002461C 4600B581 */ sub.s $f22, $f22, $f0 /* 339870 E0024620 C6C0001C */ lwc1 $f0, 0x1c($s6) /* 339874 E0024624 46000000 */ add.s $f0, $f0, $f0 @@ -140,13 +140,13 @@ glabel func_E0024454 /* 3398B0 E0024660 D4224D00 */ ldc1 $f2, %lo(D_E0024D00)($at) /* 3398B4 E0024664 46000021 */ cvt.d.s $f0, $f0 /* 3398B8 E0024668 46220002 */ mul.d $f0, $f0, $f2 -/* 3398BC E002466C 00000000 */ nop +/* 3398BC E002466C 00000000 */ nop /* 3398C0 E0024670 46200000 */ add.d $f0, $f0, $f0 /* 3398C4 E0024674 4600D0A1 */ cvt.d.s $f2, $f26 /* 3398C8 E0024678 46201081 */ sub.d $f2, $f2, $f0 /* 3398CC E002467C 3C014248 */ lui $at, 0x4248 /* 3398D0 E0024680 44810000 */ mtc1 $at, $f0 -/* 3398D4 E0024684 00000000 */ nop +/* 3398D4 E0024684 00000000 */ nop /* 3398D8 E0024688 4600B581 */ sub.s $f22, $f22, $f0 /* 3398DC E002468C 462016A0 */ cvt.s.d $f26, $f2 .LE0024690: @@ -207,11 +207,11 @@ glabel func_E0024454 /* 3399B4 E0024764 0C080140 */ jal func_E0200500 /* 3399B8 E0024768 AC830004 */ sw $v1, 4($a0) /* 3399BC E002476C 46180502 */ mul.s $f20, $f0, $f24 -/* 3399C0 E0024770 00000000 */ nop +/* 3399C0 E0024770 00000000 */ nop /* 3399C4 E0024774 0C080144 */ jal func_E0200510 /* 3399C8 E0024778 4600B306 */ mov.s $f12, $f22 /* 3399CC E002477C 46180002 */ mul.s $f0, $f0, $f24 -/* 3399D0 E0024780 00000000 */ nop +/* 3399D0 E0024780 00000000 */ nop /* 3399D4 E0024784 27A40020 */ addiu $a0, $sp, 0x20 /* 3399D8 E0024788 4407E000 */ mfc1 $a3, $f28 /* 3399DC E002478C 3C0142F0 */ lui $at, 0x42f0 @@ -236,11 +236,11 @@ glabel func_E0024454 /* 339A28 E00247D8 0C080140 */ jal func_E0200500 /* 339A2C E00247DC 4600B306 */ mov.s $f12, $f22 /* 339A30 E00247E0 46180502 */ mul.s $f20, $f0, $f24 -/* 339A34 E00247E4 00000000 */ nop +/* 339A34 E00247E4 00000000 */ nop /* 339A38 E00247E8 0C080144 */ jal func_E0200510 /* 339A3C E00247EC 4600B306 */ mov.s $f12, $f22 /* 339A40 E00247F0 46180002 */ mul.s $f0, $f0, $f24 -/* 339A44 E00247F4 00000000 */ nop +/* 339A44 E00247F4 00000000 */ nop /* 339A48 E00247F8 27A40020 */ addiu $a0, $sp, 0x20 /* 339A4C E00247FC 4407E000 */ mfc1 $a3, $f28 /* 339A50 E0024800 3C0142F0 */ lui $at, 0x42f0 @@ -265,11 +265,11 @@ glabel func_E0024454 /* 339A9C E002484C 0C080140 */ jal func_E0200500 /* 339AA0 E0024850 4600B306 */ mov.s $f12, $f22 /* 339AA4 E0024854 46180502 */ mul.s $f20, $f0, $f24 -/* 339AA8 E0024858 00000000 */ nop +/* 339AA8 E0024858 00000000 */ nop /* 339AAC E002485C 0C080144 */ jal func_E0200510 /* 339AB0 E0024860 4600B306 */ mov.s $f12, $f22 /* 339AB4 E0024864 46180002 */ mul.s $f0, $f0, $f24 -/* 339AB8 E0024868 00000000 */ nop +/* 339AB8 E0024868 00000000 */ nop /* 339ABC E002486C 0000A02D */ daddu $s4, $zero, $zero /* 339AC0 E0024870 3C13E002 */ lui $s3, %hi(D_E0024CC0) /* 339AC4 E0024874 26734CC0 */ addiu $s3, $s3, %lo(D_E0024CC0) @@ -407,10 +407,10 @@ glabel func_E0024454 /* 339CC8 E0024A78 AD030004 */ sw $v1, 4($t0) /* 339CCC E0024A7C 8FA80070 */ lw $t0, 0x70($sp) /* 339CD0 E0024A80 15000004 */ bnez $t0, .LE0024A94 -/* 339CD4 E0024A84 00000000 */ nop +/* 339CD4 E0024A84 00000000 */ nop /* 339CD8 E0024A88 4480F000 */ mtc1 $zero, $f30 /* 339CDC E0024A8C 080092B2 */ j .LE0024AC8 -/* 339CE0 E0024A90 00000000 */ nop +/* 339CE0 E0024A90 00000000 */ nop .LE0024A94: /* 339CE4 E0024A94 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 339CE8 E0024A98 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -553,5 +553,5 @@ glabel func_E0024454 /* 339EFC E0024CAC D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 339F00 E0024CB0 03E00008 */ jr $ra /* 339F04 E0024CB4 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 339F08 E0024CB8 00000000 */ nop -/* 339F0C E0024CBC 00000000 */ nop +/* 339F08 E0024CB8 00000000 */ nop +/* 339F0C E0024CBC 00000000 */ nop diff --git a/asm/nonmatchings/code_34F4C0/func_E003C000.s b/asm/nonmatchings/code_34F4C0/func_E003C000.s index c62fb5e921..fbd90b6daa 100644 --- a/asm/nonmatchings/code_34F4C0/func_E003C000.s +++ b/asm/nonmatchings/code_34F4C0/func_E003C000.s @@ -52,7 +52,7 @@ glabel func_E003C000 /* 34F578 E003C0B8 AE63000C */ sw $v1, 0xc($s3) .LE003C0BC: /* 34F57C E003C0BC 0800F02F */ j .LE003C0BC -/* 34F580 E003C0C0 00000000 */ nop +/* 34F580 E003C0C0 00000000 */ nop .LE003C0C4: /* 34F584 E003C0C4 24020064 */ addiu $v0, $zero, 0x64 /* 34F588 E003C0C8 AC710000 */ sw $s1, ($v1) @@ -69,7 +69,7 @@ glabel func_E003C000 /* 34F5B4 E003C0F4 24630040 */ addiu $v1, $v1, 0x40 /* 34F5B8 E003C0F8 2470002C */ addiu $s0, $v1, 0x2c /* 34F5BC E003C0FC 44920000 */ mtc1 $s2, $f0 -/* 34F5C0 E003C100 00000000 */ nop +/* 34F5C0 E003C100 00000000 */ nop /* 34F5C4 E003C104 46800020 */ cvt.s.w $f0, $f0 /* 34F5C8 E003C108 3C0141F0 */ lui $at, 0x41f0 /* 34F5CC E003C10C 44811000 */ mtc1 $at, $f2 @@ -97,10 +97,10 @@ glabel func_E003C000 /* 34F620 E003C160 00431021 */ addu $v0, $v0, $v1 /* 34F624 E003C164 00021043 */ sra $v0, $v0, 1 /* 34F628 E003C168 4482A000 */ mtc1 $v0, $f20 -/* 34F62C E003C16C 00000000 */ nop +/* 34F62C E003C16C 00000000 */ nop /* 34F630 E003C170 4680A520 */ cvt.s.w $f20, $f20 /* 34F634 E003C174 461AA502 */ mul.s $f20, $f20, $f26 -/* 34F638 E003C178 00000000 */ nop +/* 34F638 E003C178 00000000 */ nop /* 34F63C E003C17C C600FFE0 */ lwc1 $f0, -0x20($s0) /* 34F640 E003C180 E602FFE8 */ swc1 $f2, -0x18($s0) /* 34F644 E003C184 3C013E4C */ lui $at, 0x3e4c @@ -113,19 +113,19 @@ glabel func_E003C000 /* 34F660 E003C1A0 4600A306 */ mov.s $f12, $f20 /* 34F664 E003C1A4 46000007 */ neg.s $f0, $f0 /* 34F668 E003C1A8 46180002 */ mul.s $f0, $f0, $f24 -/* 34F66C E003C1AC 00000000 */ nop +/* 34F66C E003C1AC 00000000 */ nop /* 34F670 E003C1B0 46000021 */ cvt.d.s $f0, $f0 /* 34F674 E003C1B4 46360002 */ mul.d $f0, $f0, $f22 -/* 34F678 E003C1B8 00000000 */ nop +/* 34F678 E003C1B8 00000000 */ nop /* 34F67C E003C1BC 4600A306 */ mov.s $f12, $f20 /* 34F680 E003C1C0 46200020 */ cvt.s.d $f0, $f0 /* 34F684 E003C1C4 0C080144 */ jal func_E0200510 /* 34F688 E003C1C8 E600FFF0 */ swc1 $f0, -0x10($s0) /* 34F68C E003C1CC 46180002 */ mul.s $f0, $f0, $f24 -/* 34F690 E003C1D0 00000000 */ nop +/* 34F690 E003C1D0 00000000 */ nop /* 34F694 E003C1D4 46000021 */ cvt.d.s $f0, $f0 /* 34F698 E003C1D8 46360002 */ mul.d $f0, $f0, $f22 -/* 34F69C E003C1DC 00000000 */ nop +/* 34F69C E003C1DC 00000000 */ nop /* 34F6A0 E003C1E0 26310001 */ addiu $s1, $s1, 1 /* 34F6A4 E003C1E4 240200FF */ addiu $v0, $zero, 0xff /* 34F6A8 E003C1E8 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_34F4C0/func_E003C23C.s b/asm/nonmatchings/code_34F4C0/func_E003C23C.s index 7fb6bd3830..a21abb1d1b 100644 --- a/asm/nonmatchings/code_34F4C0/func_E003C23C.s +++ b/asm/nonmatchings/code_34F4C0/func_E003C23C.s @@ -3,4 +3,4 @@ glabel func_E003C23C /* 34F6FC E003C23C 03E00008 */ jr $ra -/* 34F700 E003C240 00000000 */ nop +/* 34F700 E003C240 00000000 */ nop diff --git a/asm/nonmatchings/code_34F4C0/func_E003C244.s b/asm/nonmatchings/code_34F4C0/func_E003C244.s index d2030c6ef0..034d3a7873 100644 --- a/asm/nonmatchings/code_34F4C0/func_E003C244.s +++ b/asm/nonmatchings/code_34F4C0/func_E003C244.s @@ -18,9 +18,9 @@ glabel func_E003C244 /* 34F734 E003C274 04610005 */ bgez $v1, .LE003C28C /* 34F738 E003C278 ACA80034 */ sw $t0, 0x34($a1) /* 34F73C E003C27C 0C080128 */ jal func_E02004A0 -/* 34F740 E003C280 00000000 */ nop +/* 34F740 E003C280 00000000 */ nop /* 34F744 E003C284 0800F119 */ j .LE003C464 -/* 34F748 E003C288 00000000 */ nop +/* 34F748 E003C288 00000000 */ nop .LE003C28C: /* 34F74C E003C28C 8C820008 */ lw $v0, 8($a0) /* 34F750 E003C290 24070001 */ addiu $a3, $zero, 1 @@ -48,19 +48,19 @@ glabel func_E003C244 /* 34F7A8 E003C2E8 D42ECD48 */ ldc1 $f14, %lo(D_E003CD48)($at) .LE003C2EC: /* 34F7AC E003C2EC 15800013 */ bnez $t4, .LE003C33C -/* 34F7B0 E003C2F0 00000000 */ nop +/* 34F7B0 E003C2F0 00000000 */ nop /* 34F7B4 E003C2F4 C4A4FFE4 */ lwc1 $f4, -0x1c($a1) /* 34F7B8 E003C2F8 46002121 */ cvt.d.s $f4, $f4 /* 34F7BC E003C2FC 46302102 */ mul.d $f4, $f4, $f16 -/* 34F7C0 E003C300 00000000 */ nop +/* 34F7C0 E003C300 00000000 */ nop /* 34F7C4 E003C304 C4A2FFE8 */ lwc1 $f2, -0x18($a1) /* 34F7C8 E003C308 460010A1 */ cvt.d.s $f2, $f2 /* 34F7CC E003C30C 46301082 */ mul.d $f2, $f2, $f16 -/* 34F7D0 E003C310 00000000 */ nop +/* 34F7D0 E003C310 00000000 */ nop /* 34F7D4 E003C314 C4A0FFEC */ lwc1 $f0, -0x14($a1) /* 34F7D8 E003C318 46000021 */ cvt.d.s $f0, $f0 /* 34F7DC E003C31C 46300002 */ mul.d $f0, $f0, $f16 -/* 34F7E0 E003C320 00000000 */ nop +/* 34F7E0 E003C320 00000000 */ nop /* 34F7E4 E003C324 46202120 */ cvt.s.d $f4, $f4 /* 34F7E8 E003C328 462010A0 */ cvt.s.d $f2, $f2 /* 34F7EC E003C32C 46200020 */ cvt.s.d $f0, $f0 @@ -69,23 +69,23 @@ glabel func_E003C244 /* 34F7F8 E003C338 E4A0FFEC */ swc1 $f0, -0x14($a1) .LE003C33C: /* 34F7FC E003C33C 11600019 */ beqz $t3, .LE003C3A4 -/* 34F800 E003C340 00000000 */ nop +/* 34F800 E003C340 00000000 */ nop /* 34F804 E003C344 C4A6FFF4 */ lwc1 $f6, -0xc($a1) /* 34F808 E003C348 468031A1 */ cvt.d.w $f6, $f6 /* 34F80C E003C34C 46323182 */ mul.d $f6, $f6, $f18 -/* 34F810 E003C350 00000000 */ nop +/* 34F810 E003C350 00000000 */ nop /* 34F814 E003C354 C4A4FFE4 */ lwc1 $f4, -0x1c($a1) /* 34F818 E003C358 46002121 */ cvt.d.s $f4, $f4 /* 34F81C E003C35C 462E2102 */ mul.d $f4, $f4, $f14 -/* 34F820 E003C360 00000000 */ nop +/* 34F820 E003C360 00000000 */ nop /* 34F824 E003C364 C4A2FFE8 */ lwc1 $f2, -0x18($a1) /* 34F828 E003C368 460010A1 */ cvt.d.s $f2, $f2 /* 34F82C E003C36C 462E1082 */ mul.d $f2, $f2, $f14 -/* 34F830 E003C370 00000000 */ nop +/* 34F830 E003C370 00000000 */ nop /* 34F834 E003C374 C4A0FFEC */ lwc1 $f0, -0x14($a1) /* 34F838 E003C378 46000021 */ cvt.d.s $f0, $f0 /* 34F83C E003C37C 462E0002 */ mul.d $f0, $f0, $f14 -/* 34F840 E003C380 00000000 */ nop +/* 34F840 E003C380 00000000 */ nop /* 34F844 E003C384 4620350D */ trunc.w.d $f20, $f6 /* 34F848 E003C388 E4B4FFF4 */ swc1 $f20, -0xc($a1) /* 34F84C E003C38C 46202120 */ cvt.s.d $f4, $f4 @@ -98,15 +98,15 @@ glabel func_E003C244 /* 34F864 E003C3A4 3C013F80 */ lui $at, 0x3f80 /* 34F868 E003C3A8 44816000 */ mtc1 $at, $f12 /* 34F86C E003C3AC 11400002 */ beqz $t2, .LE003C3B8 -/* 34F870 E003C3B0 00000000 */ nop +/* 34F870 E003C3B0 00000000 */ nop /* 34F874 E003C3B4 C52C0000 */ lwc1 $f12, ($t1) .LE003C3B8: /* 34F878 E003C3B8 C4AAFFCC */ lwc1 $f10, -0x34($a1) /* 34F87C E003C3BC 460C5282 */ mul.s $f10, $f10, $f12 -/* 34F880 E003C3C0 00000000 */ nop +/* 34F880 E003C3C0 00000000 */ nop /* 34F884 E003C3C4 C4A8FFD0 */ lwc1 $f8, -0x30($a1) /* 34F888 E003C3C8 460C4202 */ mul.s $f8, $f8, $f12 -/* 34F88C E003C3CC 00000000 */ nop +/* 34F88C E003C3CC 00000000 */ nop /* 34F890 E003C3D0 C4A6FFCC */ lwc1 $f6, -0x34($a1) /* 34F894 E003C3D4 C4A0FFE4 */ lwc1 $f0, -0x1c($a1) /* 34F898 E003C3D8 C4A4FFD0 */ lwc1 $f4, -0x30($a1) @@ -119,7 +119,7 @@ glabel func_E003C244 /* 34F8B4 E003C3F4 C4A0FFD4 */ lwc1 $f0, -0x2c($a1) /* 34F8B8 E003C3F8 E4A6FFCC */ swc1 $f6, -0x34($a1) /* 34F8BC E003C3FC 460C0002 */ mul.s $f0, $f0, $f12 -/* 34F8C0 E003C400 00000000 */ nop +/* 34F8C0 E003C400 00000000 */ nop /* 34F8C4 E003C404 E4A4FFD0 */ swc1 $f4, -0x30($a1) /* 34F8C8 E003C408 E4A2FFD4 */ swc1 $f2, -0x2c($a1) /* 34F8CC E003C40C E4AAFFD8 */ swc1 $f10, -0x28($a1) @@ -130,11 +130,11 @@ glabel func_E003C244 /* 34F8E0 E003C420 3C01E004 */ lui $at, %hi(D_E003CD50) /* 34F8E4 E003C424 D422CD50 */ ldc1 $f2, %lo(D_E003CD50)($at) /* 34F8E8 E003C428 44820000 */ mtc1 $v0, $f0 -/* 34F8EC E003C42C 00000000 */ nop +/* 34F8EC E003C42C 00000000 */ nop /* 34F8F0 E003C430 46800020 */ cvt.s.w $f0, $f0 /* 34F8F4 E003C434 46000021 */ cvt.d.s $f0, $f0 /* 34F8F8 E003C438 46220002 */ mul.d $f0, $f0, $f2 -/* 34F8FC E003C43C 00000000 */ nop +/* 34F8FC E003C43C 00000000 */ nop /* 34F900 E003C440 46200020 */ cvt.s.d $f0, $f0 /* 34F904 E003C444 0800F114 */ j .LE003C450 /* 34F908 E003C448 E4A00000 */ swc1 $f0, ($a1) diff --git a/asm/nonmatchings/code_34F4C0/func_E003C474.s b/asm/nonmatchings/code_34F4C0/func_E003C474.s index 65e1ca4529..c8c74702aa 100644 --- a/asm/nonmatchings/code_34F4C0/func_E003C474.s +++ b/asm/nonmatchings/code_34F4C0/func_E003C474.s @@ -3,4 +3,4 @@ glabel func_E003C474 /* 34F934 E003C474 03E00008 */ jr $ra -/* 34F938 E003C478 00000000 */ nop +/* 34F938 E003C478 00000000 */ nop diff --git a/asm/nonmatchings/code_34F4C0/func_E003C47C.s b/asm/nonmatchings/code_34F4C0/func_E003C47C.s index b9eb5ae20b..f753ee14d1 100644 --- a/asm/nonmatchings/code_34F4C0/func_E003C47C.s +++ b/asm/nonmatchings/code_34F4C0/func_E003C47C.s @@ -5,7 +5,7 @@ glabel func_E003C47C /* 34F93C E003C47C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 34F940 E003C480 AFBF0010 */ sw $ra, 0x10($sp) /* 34F944 E003C484 0C00F126 */ jal func_E003C498 -/* 34F948 E003C488 00000000 */ nop +/* 34F948 E003C488 00000000 */ nop /* 34F94C E003C48C 8FBF0010 */ lw $ra, 0x10($sp) /* 34F950 E003C490 03E00008 */ jr $ra /* 34F954 E003C494 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_34F4C0/func_E003C498.s b/asm/nonmatchings/code_34F4C0/func_E003C498.s index 1cf711f0c2..8d0f1ad144 100644 --- a/asm/nonmatchings/code_34F4C0/func_E003C498.s +++ b/asm/nonmatchings/code_34F4C0/func_E003C498.s @@ -247,7 +247,7 @@ glabel func_E003C498 /* 34FD14 E003C854 46020000 */ add.s $f0, $f0, $f2 /* 34FD18 E003C858 46000021 */ cvt.d.s $f0, $f0 /* 34FD1C E003C85C 46360002 */ mul.d $f0, $f0, $f22 -/* 34FD20 E003C860 00000000 */ nop +/* 34FD20 E003C860 00000000 */ nop /* 34FD24 E003C864 46200020 */ cvt.s.d $f0, $f0 /* 34FD28 E003C868 E7A00014 */ swc1 $f0, 0x14($sp) /* 34FD2C E003C86C C620FFDC */ lwc1 $f0, -0x24($s1) @@ -255,7 +255,7 @@ glabel func_E003C498 /* 34FD34 E003C874 46020000 */ add.s $f0, $f0, $f2 /* 34FD38 E003C878 46000021 */ cvt.d.s $f0, $f0 /* 34FD3C E003C87C 46360002 */ mul.d $f0, $f0, $f22 -/* 34FD40 E003C880 00000000 */ nop +/* 34FD40 E003C880 00000000 */ nop /* 34FD44 E003C884 4405A000 */ mfc1 $a1, $f20 /* 34FD48 E003C888 46200020 */ cvt.s.d $f0, $f0 /* 34FD4C E003C88C E7A00018 */ swc1 $f0, 0x18($sp) @@ -267,7 +267,7 @@ glabel func_E003C498 /* 34FD64 E003C8A4 25290001 */ addiu $t1, $t1, 1 /* 34FD68 E003C8A8 46000021 */ cvt.d.s $f0, $f0 /* 34FD6C E003C8AC 46360002 */ mul.d $f0, $f0, $f22 -/* 34FD70 E003C8B0 00000000 */ nop +/* 34FD70 E003C8B0 00000000 */ nop /* 34FD74 E003C8B4 27A40020 */ addiu $a0, $sp, 0x20 /* 34FD78 E003C8B8 25020008 */ addiu $v0, $t0, 8 /* 34FD7C E003C8BC AE080000 */ sw $t0, ($s0) @@ -525,4 +525,4 @@ glabel func_E003C498 /* 350150 E003CC90 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 350154 E003CC94 03E00008 */ jr $ra /* 350158 E003CC98 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 35015C E003CC9C 00000000 */ nop +/* 35015C E003CC9C 00000000 */ nop diff --git a/asm/nonmatchings/code_355EE0/func_E0046000.s b/asm/nonmatchings/code_355EE0/func_E0046000.s index 023ba51c69..3c1599b835 100644 --- a/asm/nonmatchings/code_355EE0/func_E0046000.s +++ b/asm/nonmatchings/code_355EE0/func_E0046000.s @@ -41,7 +41,7 @@ glabel func_E0046000 /* 355F70 E0046090 AE110000 */ sw $s1, ($s0) .LE0046094: /* 355F74 E0046094 08011825 */ j .LE0046094 -/* 355F78 E0046098 00000000 */ nop +/* 355F78 E0046098 00000000 */ nop .LE004609C: /* 355F7C E004609C 44800000 */ mtc1 $zero, $f0 /* 355F80 E00460A0 E6140004 */ swc1 $f20, 4($s0) @@ -49,7 +49,7 @@ glabel func_E0046000 /* 355F88 E00460A8 E616000C */ swc1 $f22, 0xc($s0) /* 355F8C E00460AC AE000014 */ sw $zero, 0x14($s0) /* 355F90 E00460B0 4600D032 */ c.eq.s $f26, $f0 -/* 355F94 E00460B4 00000000 */ nop +/* 355F94 E00460B4 00000000 */ nop /* 355F98 E00460B8 45010013 */ bc1t .LE0046108 /* 355F9C E00460BC AE00001C */ sw $zero, 0x1c($s0) /* 355FA0 E00460C0 0C080138 */ jal func_E02004E0 @@ -57,23 +57,23 @@ glabel func_E0046000 /* 355FA8 E00460C8 3C01E004 */ lui $at, %hi(D_E0046620) /* 355FAC E00460CC D4226620 */ ldc1 $f2, %lo(D_E0046620)($at) /* 355FB0 E00460D0 44820000 */ mtc1 $v0, $f0 -/* 355FB4 E00460D4 00000000 */ nop +/* 355FB4 E00460D4 00000000 */ nop /* 355FB8 E00460D8 46800021 */ cvt.d.w $f0, $f0 /* 355FBC E00460DC 46220002 */ mul.d $f0, $f0, $f2 -/* 355FC0 E00460E0 00000000 */ nop +/* 355FC0 E00460E0 00000000 */ nop /* 355FC4 E00460E4 3C01E004 */ lui $at, %hi(D_E0046628) /* 355FC8 E00460E8 D4226628 */ ldc1 $f2, %lo(D_E0046628)($at) /* 355FCC E00460EC 46220000 */ add.d $f0, $f0, $f2 /* 355FD0 E00460F0 3C01E004 */ lui $at, %hi(D_E0046630) /* 355FD4 E00460F4 D4226630 */ ldc1 $f2, %lo(D_E0046630)($at) /* 355FD8 E00460F8 46220002 */ mul.d $f0, $f0, $f2 -/* 355FDC E00460FC 00000000 */ nop +/* 355FDC E00460FC 00000000 */ nop /* 355FE0 E0046100 08011845 */ j .LE0046114 /* 355FE4 E0046104 46200020 */ cvt.s.d $f0, $f0 .LE0046108: /* 355FE8 E0046108 3C013F80 */ lui $at, 0x3f80 /* 355FEC E004610C 44810000 */ mtc1 $at, $f0 -/* 355FF0 E0046110 00000000 */ nop +/* 355FF0 E0046110 00000000 */ nop .LE0046114: /* 355FF4 E0046114 E6000010 */ swc1 $f0, 0x10($s0) /* 355FF8 E0046118 2404001F */ addiu $a0, $zero, 0x1f diff --git a/asm/nonmatchings/code_355EE0/func_E0046158.s b/asm/nonmatchings/code_355EE0/func_E0046158.s index 72c2522e5b..0135277a77 100644 --- a/asm/nonmatchings/code_355EE0/func_E0046158.s +++ b/asm/nonmatchings/code_355EE0/func_E0046158.s @@ -3,4 +3,4 @@ glabel func_E0046158 /* 356038 E0046158 03E00008 */ jr $ra -/* 35603C E004615C 00000000 */ nop +/* 35603C E004615C 00000000 */ nop diff --git a/asm/nonmatchings/code_355EE0/func_E00462C0.s b/asm/nonmatchings/code_355EE0/func_E00462C0.s index 2243967ef3..4fb63c88ca 100644 --- a/asm/nonmatchings/code_355EE0/func_E00462C0.s +++ b/asm/nonmatchings/code_355EE0/func_E00462C0.s @@ -32,7 +32,7 @@ glabel func_E00462C0 /* 35620C E004632C C6600024 */ lwc1 $f0, 0x24($s3) /* 356210 E0046330 25020008 */ addiu $v0, $t0, 8 /* 356214 E0046334 4602003E */ c.le.s $f0, $f2 -/* 356218 E0046338 00000000 */ nop +/* 356218 E0046338 00000000 */ nop /* 35621C E004633C 45000032 */ bc1f .LE0046408 /* 356220 E0046340 AD220000 */ sw $v0, ($t1) /* 356224 E0046344 3C047F7F */ lui $a0, 0x7f7f @@ -169,7 +169,7 @@ glabel func_E00462C0 /* 356428 E0046548 C6600024 */ lwc1 $f0, 0x24($s3) /* 35642C E004654C 24840001 */ addiu $a0, $a0, 1 /* 356430 E0046550 4602003E */ c.le.s $f0, $f2 -/* 356434 E0046554 00000000 */ nop +/* 356434 E0046554 00000000 */ nop /* 356438 E0046558 45000007 */ bc1f .LE0046578 /* 35643C E004655C A6040000 */ sh $a0, ($s0) /* 356440 E0046560 3C02DE00 */ lui $v0, 0xde00 diff --git a/asm/nonmatchings/code_359F20/func_E004C000.s b/asm/nonmatchings/code_359F20/func_E004C000.s index 61cd0403c4..2cc12b1c28 100644 --- a/asm/nonmatchings/code_359F20/func_E004C000.s +++ b/asm/nonmatchings/code_359F20/func_E004C000.s @@ -39,7 +39,7 @@ glabel func_E004C000 /* 359FA8 E004C088 24040006 */ addiu $a0, $zero, 6 .LE004C08C: /* 359FAC E004C08C 08013023 */ j .LE004C08C -/* 359FB0 E004C090 00000000 */ nop +/* 359FB0 E004C090 00000000 */ nop .LE004C094: /* 359FB4 E004C094 24020040 */ addiu $v0, $zero, 0x40 /* 359FB8 E004C098 AE110000 */ sw $s1, ($s0) @@ -55,9 +55,9 @@ glabel func_E004C000 /* 359FE0 E004C0C0 AE020020 */ sw $v0, 0x20($s0) /* 359FE4 E004C0C4 24020001 */ addiu $v0, $zero, 1 /* 359FE8 E004C0C8 1222000A */ beq $s1, $v0, .LE004C0F4 -/* 359FEC E004C0CC 00000000 */ nop +/* 359FEC E004C0CC 00000000 */ nop /* 359FF0 E004C0D0 08013059 */ j .LE004C164 -/* 359FF4 E004C0D4 00000000 */ nop +/* 359FF4 E004C0D4 00000000 */ nop .LE004C0D8: /* 359FF8 E004C0D8 3C013F80 */ lui $at, 0x3f80 /* 359FFC E004C0DC 44810000 */ mtc1 $at, $f0 @@ -72,24 +72,24 @@ glabel func_E004C000 /* 35A01C E004C0FC 3C01E005 */ lui $at, %hi(D_E004C6A0) /* 35A020 E004C100 D434C6A0 */ ldc1 $f20, %lo(D_E004C6A0)($at) /* 35A024 E004C104 44820000 */ mtc1 $v0, $f0 -/* 35A028 E004C108 00000000 */ nop +/* 35A028 E004C108 00000000 */ nop /* 35A02C E004C10C 46800021 */ cvt.d.w $f0, $f0 /* 35A030 E004C110 46340002 */ mul.d $f0, $f0, $f20 -/* 35A034 E004C114 00000000 */ nop +/* 35A034 E004C114 00000000 */ nop /* 35A038 E004C118 3C01C014 */ lui $at, 0xc014 /* 35A03C E004C11C 44811800 */ mtc1 $at, $f3 /* 35A040 E004C120 44801000 */ mtc1 $zero, $f2 -/* 35A044 E004C124 00000000 */ nop +/* 35A044 E004C124 00000000 */ nop /* 35A048 E004C128 46220000 */ add.d $f0, $f0, $f2 /* 35A04C E004C12C 2404000A */ addiu $a0, $zero, 0xa /* 35A050 E004C130 46200020 */ cvt.s.d $f0, $f0 /* 35A054 E004C134 0C080138 */ jal func_E02004E0 /* 35A058 E004C138 E6000024 */ swc1 $f0, 0x24($s0) /* 35A05C E004C13C 44820000 */ mtc1 $v0, $f0 -/* 35A060 E004C140 00000000 */ nop +/* 35A060 E004C140 00000000 */ nop /* 35A064 E004C144 46800021 */ cvt.d.w $f0, $f0 /* 35A068 E004C148 46340002 */ mul.d $f0, $f0, $f20 -/* 35A06C E004C14C 00000000 */ nop +/* 35A06C E004C14C 00000000 */ nop /* 35A070 E004C150 3C013FE0 */ lui $at, 0x3fe0 /* 35A074 E004C154 44811800 */ mtc1 $at, $f3 /* 35A078 E004C158 44801000 */ mtc1 $zero, $f2 @@ -101,28 +101,28 @@ glabel func_E004C000 /* 35A08C E004C16C 3C01E005 */ lui $at, %hi(D_E004C6A8) /* 35A090 E004C170 D434C6A8 */ ldc1 $f20, %lo(D_E004C6A8)($at) /* 35A094 E004C174 44821000 */ mtc1 $v0, $f2 -/* 35A098 E004C178 00000000 */ nop +/* 35A098 E004C178 00000000 */ nop /* 35A09C E004C17C 468010A1 */ cvt.d.w $f2, $f2 /* 35A0A0 E004C180 46341082 */ mul.d $f2, $f2, $f20 -/* 35A0A4 E004C184 00000000 */ nop +/* 35A0A4 E004C184 00000000 */ nop /* 35A0A8 E004C188 3C014014 */ lui $at, 0x4014 /* 35A0AC E004C18C 44810800 */ mtc1 $at, $f1 /* 35A0B0 E004C190 44800000 */ mtc1 $zero, $f0 -/* 35A0B4 E004C194 00000000 */ nop +/* 35A0B4 E004C194 00000000 */ nop /* 35A0B8 E004C198 46220001 */ sub.d $f0, $f0, $f2 /* 35A0BC E004C19C 2404000A */ addiu $a0, $zero, 0xa /* 35A0C0 E004C1A0 46200020 */ cvt.s.d $f0, $f0 /* 35A0C4 E004C1A4 0C080138 */ jal func_E02004E0 /* 35A0C8 E004C1A8 E6000024 */ swc1 $f0, 0x24($s0) /* 35A0CC E004C1AC 44820000 */ mtc1 $v0, $f0 -/* 35A0D0 E004C1B0 00000000 */ nop +/* 35A0D0 E004C1B0 00000000 */ nop /* 35A0D4 E004C1B4 46800021 */ cvt.d.w $f0, $f0 /* 35A0D8 E004C1B8 46340002 */ mul.d $f0, $f0, $f20 -/* 35A0DC E004C1BC 00000000 */ nop +/* 35A0DC E004C1BC 00000000 */ nop /* 35A0E0 E004C1C0 3C013FF0 */ lui $at, 0x3ff0 /* 35A0E4 E004C1C4 44811800 */ mtc1 $at, $f3 /* 35A0E8 E004C1C8 44801000 */ mtc1 $zero, $f2 -/* 35A0EC E004C1CC 00000000 */ nop +/* 35A0EC E004C1CC 00000000 */ nop /* 35A0F0 E004C1D0 46220000 */ add.d $f0, $f0, $f2 .LE004C1D4: /* 35A0F4 E004C1D4 AE00002C */ sw $zero, 0x2c($s0) diff --git a/asm/nonmatchings/code_359F20/func_E004C204.s b/asm/nonmatchings/code_359F20/func_E004C204.s index 82b575e7e0..1110055c18 100644 --- a/asm/nonmatchings/code_359F20/func_E004C204.s +++ b/asm/nonmatchings/code_359F20/func_E004C204.s @@ -3,4 +3,4 @@ glabel func_E004C204 /* 35A124 E004C204 03E00008 */ jr $ra -/* 35A128 E004C208 00000000 */ nop +/* 35A128 E004C208 00000000 */ nop diff --git a/asm/nonmatchings/code_359F20/func_E004C20C.s b/asm/nonmatchings/code_359F20/func_E004C20C.s index d33162c85b..7998a1df98 100644 --- a/asm/nonmatchings/code_359F20/func_E004C20C.s +++ b/asm/nonmatchings/code_359F20/func_E004C20C.s @@ -14,9 +14,9 @@ glabel func_E004C20C /* 35A150 E004C230 04C10005 */ bgez $a2, .LE004C248 /* 35A154 E004C234 ACA2001C */ sw $v0, 0x1c($a1) /* 35A158 E004C238 0C080128 */ jal func_E02004A0 -/* 35A15C E004C23C 00000000 */ nop +/* 35A15C E004C23C 00000000 */ nop /* 35A160 E004C240 080130D6 */ j .LE004C358 -/* 35A164 E004C244 00000000 */ nop +/* 35A164 E004C244 00000000 */ nop .LE004C248: /* 35A168 E004C248 28C20006 */ slti $v0, $a2, 6 /* 35A16C E004C24C 1440001E */ bnez $v0, .LE004C2C8 @@ -27,20 +27,20 @@ glabel func_E004C20C /* 35A180 E004C260 D424C6B0 */ ldc1 $f4, %lo(D_E004C6B0)($at) /* 35A184 E004C264 00431023 */ subu $v0, $v0, $v1 /* 35A188 E004C268 44823000 */ mtc1 $v0, $f6 -/* 35A18C E004C26C 00000000 */ nop +/* 35A18C E004C26C 00000000 */ nop /* 35A190 E004C270 468031A1 */ cvt.d.w $f6, $f6 /* 35A194 E004C274 46243182 */ mul.d $f6, $f6, $f4 -/* 35A198 E004C278 00000000 */ nop +/* 35A198 E004C278 00000000 */ nop /* 35A19C E004C27C C4A20010 */ lwc1 $f2, 0x10($a1) /* 35A1A0 E004C280 3C013F80 */ lui $at, 0x3f80 /* 35A1A4 E004C284 44810000 */ mtc1 $at, $f0 -/* 35A1A8 E004C288 00000000 */ nop +/* 35A1A8 E004C288 00000000 */ nop /* 35A1AC E004C28C 46020001 */ sub.s $f0, $f0, $f2 /* 35A1B0 E004C290 46000021 */ cvt.d.s $f0, $f0 /* 35A1B4 E004C294 46240002 */ mul.d $f0, $f0, $f4 -/* 35A1B8 E004C298 00000000 */ nop +/* 35A1B8 E004C298 00000000 */ nop /* 35A1BC E004C29C 44832000 */ mtc1 $v1, $f4 -/* 35A1C0 E004C2A0 00000000 */ nop +/* 35A1C0 E004C2A0 00000000 */ nop /* 35A1C4 E004C2A4 46802121 */ cvt.d.w $f4, $f4 /* 35A1C8 E004C2A8 46262100 */ add.d $f4, $f4, $f6 /* 35A1CC E004C2AC 460010A1 */ cvt.d.s $f2, $f2 @@ -65,13 +65,13 @@ glabel func_E004C20C /* 35A210 E004C2F0 D428C6B8 */ ldc1 $f8, %lo(D_E004C6B8)($at) /* 35A214 E004C2F4 46002121 */ cvt.d.s $f4, $f4 /* 35A218 E004C2F8 46282102 */ mul.d $f4, $f4, $f8 -/* 35A21C E004C2FC 00000000 */ nop +/* 35A21C E004C2FC 00000000 */ nop /* 35A220 E004C300 C4A20028 */ lwc1 $f2, 0x28($a1) /* 35A224 E004C304 C4A00030 */ lwc1 $f0, 0x30($a1) /* 35A228 E004C308 46020001 */ sub.s $f0, $f0, $f2 /* 35A22C E004C30C 46000021 */ cvt.d.s $f0, $f0 /* 35A230 E004C310 46280002 */ mul.d $f0, $f0, $f8 -/* 35A234 E004C314 00000000 */ nop +/* 35A234 E004C314 00000000 */ nop /* 35A238 E004C318 C4AA0004 */ lwc1 $f10, 4($a1) /* 35A23C E004C31C 46003206 */ mov.s $f8, $f6 /* 35A240 E004C320 46085280 */ add.s $f10, $f10, $f8 diff --git a/asm/nonmatchings/code_359F20/func_E004C3A8.s b/asm/nonmatchings/code_359F20/func_E004C3A8.s index d8be8a601c..06fe0ff96d 100644 --- a/asm/nonmatchings/code_359F20/func_E004C3A8.s +++ b/asm/nonmatchings/code_359F20/func_E004C3A8.s @@ -173,6 +173,6 @@ glabel func_E004C3A8 /* 35A568 E004C648 D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 35A56C E004C64C 03E00008 */ jr $ra /* 35A570 E004C650 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 35A574 E004C654 00000000 */ nop -/* 35A578 E004C658 00000000 */ nop -/* 35A57C E004C65C 00000000 */ nop +/* 35A574 E004C654 00000000 */ nop +/* 35A578 E004C658 00000000 */ nop +/* 35A57C E004C65C 00000000 */ nop diff --git a/asm/nonmatchings/code_35B9D0/func_E004E000.s b/asm/nonmatchings/code_35B9D0/func_E004E000.s index 8c803b56af..7414dfd525 100644 --- a/asm/nonmatchings/code_35B9D0/func_E004E000.s +++ b/asm/nonmatchings/code_35B9D0/func_E004E000.s @@ -42,7 +42,7 @@ glabel func_E004E000 /* 35BA64 E004E094 0200202D */ daddu $a0, $s0, $zero .LE004E098: /* 35BA68 E004E098 08013826 */ j .LE004E098 -/* 35BA6C E004E09C 00000000 */ nop +/* 35BA6C E004E09C 00000000 */ nop .LE004E0A0: /* 35BA70 E004E0A0 00112880 */ sll $a1, $s1, 2 /* 35BA74 E004E0A4 00B12821 */ addu $a1, $a1, $s1 diff --git a/asm/nonmatchings/code_35B9D0/func_E004E15C.s b/asm/nonmatchings/code_35B9D0/func_E004E15C.s index c4b61646fe..fa9c1ab75c 100644 --- a/asm/nonmatchings/code_35B9D0/func_E004E15C.s +++ b/asm/nonmatchings/code_35B9D0/func_E004E15C.s @@ -3,4 +3,4 @@ glabel func_E004E15C /* 35BB2C E004E15C 03E00008 */ jr $ra -/* 35BB30 E004E160 00000000 */ nop +/* 35BB30 E004E160 00000000 */ nop diff --git a/asm/nonmatchings/code_35B9D0/func_E004E164.s b/asm/nonmatchings/code_35B9D0/func_E004E164.s index 91f7c38391..b7e9d6128e 100644 --- a/asm/nonmatchings/code_35B9D0/func_E004E164.s +++ b/asm/nonmatchings/code_35B9D0/func_E004E164.s @@ -11,11 +11,11 @@ glabel func_E004E164 /* 35BB4C E004E17C 8C430018 */ lw $v1, 0x18($v0) /* 35BB50 E004E180 8C440014 */ lw $a0, 0x14($v0) /* 35BB54 E004E184 44831000 */ mtc1 $v1, $f2 -/* 35BB58 E004E188 00000000 */ nop +/* 35BB58 E004E188 00000000 */ nop /* 35BB5C E004E18C 468010A0 */ cvt.s.w $f2, $f2 /* 35BB60 E004E190 24630001 */ addiu $v1, $v1, 1 /* 35BB64 E004E194 46001082 */ mul.s $f2, $f2, $f0 -/* 35BB68 E004E198 00000000 */ nop +/* 35BB68 E004E198 00000000 */ nop /* 35BB6C E004E19C 2484FFFF */ addiu $a0, $a0, -1 /* 35BB70 E004E1A0 C440001C */ lwc1 $f0, 0x1c($v0) /* 35BB74 E004E1A4 46800020 */ cvt.s.w $f0, $f0 diff --git a/asm/nonmatchings/code_35B9D0/func_E004E214.s b/asm/nonmatchings/code_35B9D0/func_E004E214.s index d9698154b5..646d8810c7 100644 --- a/asm/nonmatchings/code_35B9D0/func_E004E214.s +++ b/asm/nonmatchings/code_35B9D0/func_E004E214.s @@ -41,9 +41,9 @@ glabel func_E004E214 /* 35BC74 E004E2A4 3C02E700 */ lui $v0, 0xe700 /* 35BC78 E004E2A8 4600328D */ trunc.w.s $f10, $f6 /* 35BC7C E004E2AC 44145000 */ mfc1 $s4, $f10 -/* 35BC80 E004E2B0 00000000 */ nop +/* 35BC80 E004E2B0 00000000 */ nop /* 35BC84 E004E2B4 44941000 */ mtc1 $s4, $f2 -/* 35BC88 E004E2B8 00000000 */ nop +/* 35BC88 E004E2B8 00000000 */ nop /* 35BC8C E004E2BC 468010A0 */ cvt.s.w $f2, $f2 /* 35BC90 E004E2C0 3A950007 */ xori $s5, $s4, 7 /* 35BC94 E004E2C4 2EB50001 */ sltiu $s5, $s5, 1 @@ -80,7 +80,7 @@ glabel func_E004E214 /* 35BD10 E004E340 C6200004 */ lwc1 $f0, 4($s1) /* 35BD14 E004E344 44064000 */ mfc1 $a2, $f8 /* 35BD18 E004E348 46043182 */ mul.s $f6, $f6, $f4 -/* 35BD1C E004E34C 00000000 */ nop +/* 35BD1C E004E34C 00000000 */ nop /* 35BD20 E004E350 AEE20000 */ sw $v0, ($s7) /* 35BD24 E004E354 E7A00014 */ swc1 $f0, 0x14($sp) /* 35BD28 E004E358 C6200008 */ lwc1 $f0, 8($s1) @@ -245,5 +245,5 @@ glabel func_E004E214 /* 35BF9C E004E5CC D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 35BFA0 E004E5D0 03E00008 */ jr $ra /* 35BFA4 E004E5D4 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 35BFA8 E004E5D8 00000000 */ nop -/* 35BFAC E004E5DC 00000000 */ nop +/* 35BFA8 E004E5D8 00000000 */ nop +/* 35BFAC E004E5DC 00000000 */ nop diff --git a/asm/nonmatchings/code_35CA80/func_E00520F0.s b/asm/nonmatchings/code_35CA80/func_E00520F0.s index e30739ab56..a118924287 100644 --- a/asm/nonmatchings/code_35CA80/func_E00520F0.s +++ b/asm/nonmatchings/code_35CA80/func_E00520F0.s @@ -40,9 +40,9 @@ glabel func_E00520F0 /* 35CBF4 E0052174 04610005 */ bgez $v1, .LE005218C /* 35CBF8 E0052178 0060B82D */ daddu $s7, $v1, $zero /* 35CBFC E005217C 0C080128 */ jal func_E02004A0 -/* 35CC00 E0052180 00000000 */ nop +/* 35CC00 E0052180 00000000 */ nop /* 35CC04 E0052184 080148F6 */ j .LE00523D8 -/* 35CC08 E0052188 00000000 */ nop +/* 35CC08 E0052188 00000000 */ nop .LE005218C: /* 35CC0C E005218C C6020014 */ lwc1 $f2, 0x14($s0) /* 35CC10 E0052190 C6140018 */ lwc1 $f20, 0x18($s0) @@ -50,25 +50,25 @@ glabel func_E00520F0 /* 35CC18 E0052198 3C013DCC */ lui $at, 0x3dcc /* 35CC1C E005219C 3421CCCD */ ori $at, $at, 0xcccd /* 35CC20 E00521A0 44810000 */ mtc1 $at, $f0 -/* 35CC24 E00521A4 00000000 */ nop +/* 35CC24 E00521A4 00000000 */ nop /* 35CC28 E00521A8 46001082 */ mul.s $f2, $f2, $f0 -/* 35CC2C E00521AC 00000000 */ nop +/* 35CC2C E00521AC 00000000 */ nop /* 35CC30 E00521B0 8E160020 */ lw $s6, 0x20($s0) /* 35CC34 E00521B4 00161040 */ sll $v0, $s6, 1 /* 35CC38 E00521B8 4602A500 */ add.s $f20, $f20, $f2 /* 35CC3C E00521BC 00561021 */ addu $v0, $v0, $s6 /* 35CC40 E00521C0 44826000 */ mtc1 $v0, $f12 -/* 35CC44 E00521C4 00000000 */ nop +/* 35CC44 E00521C4 00000000 */ nop /* 35CC48 E00521C8 46806320 */ cvt.s.w $f12, $f12 /* 35CC4C E00521CC 0C080140 */ jal func_E0200500 /* 35CC50 E00521D0 E6140018 */ swc1 $f20, 0x18($s0) /* 35CC54 E00521D4 4600A002 */ mul.s $f0, $f20, $f0 -/* 35CC58 E00521D8 00000000 */ nop +/* 35CC58 E00521D8 00000000 */ nop /* 35CC5C E00521DC 3C01E005 */ lui $at, %hi(D_E0052A80) /* 35CC60 E00521E0 D4222A80 */ ldc1 $f2, %lo(D_E0052A80)($at) /* 35CC64 E00521E4 46000021 */ cvt.d.s $f0, $f0 /* 35CC68 E00521E8 46220002 */ mul.d $f0, $f0, $f2 -/* 35CC6C E00521EC 00000000 */ nop +/* 35CC6C E00521EC 00000000 */ nop /* 35CC70 E00521F0 0000902D */ daddu $s2, $zero, $zero /* 35CC74 E00521F4 26110028 */ addiu $s1, $s0, 0x28 /* 35CC78 E00521F8 0240A82D */ daddu $s5, $s2, $zero @@ -87,10 +87,10 @@ glabel func_E00520F0 /* 35CCA8 E0052228 3C0143B4 */ lui $at, 0x43b4 /* 35CCAC E005222C 4481A000 */ mtc1 $at, $f20 /* 35CCB0 E0052230 4492B000 */ mtc1 $s2, $f22 -/* 35CCB4 E0052234 00000000 */ nop +/* 35CCB4 E0052234 00000000 */ nop /* 35CCB8 E0052238 4680B5A0 */ cvt.s.w $f22, $f22 /* 35CCBC E005223C 4614B502 */ mul.s $f20, $f22, $f20 -/* 35CCC0 E0052240 00000000 */ nop +/* 35CCC0 E0052240 00000000 */ nop /* 35CCC4 E0052244 3C0141A8 */ lui $at, 0x41a8 /* 35CCC8 E0052248 44810000 */ mtc1 $at, $f0 /* 35CCCC E005224C 3C014188 */ lui $at, 0x4188 @@ -100,71 +100,71 @@ glabel func_E00520F0 /* 35CCDC E005225C 0C080140 */ jal func_E0200500 /* 35CCE0 E0052260 4600A306 */ mov.s $f12, $f20 /* 35CCE4 E0052264 4600C002 */ mul.s $f0, $f24, $f0 -/* 35CCE8 E0052268 00000000 */ nop +/* 35CCE8 E0052268 00000000 */ nop /* 35CCEC E005226C 4600A306 */ mov.s $f12, $f20 /* 35CCF0 E0052270 0C080144 */ jal func_E0200510 /* 35CCF4 E0052274 E6600000 */ swc1 $f0, ($s3) /* 35CCF8 E0052278 4600C087 */ neg.s $f2, $f24 /* 35CCFC E005227C 46001082 */ mul.s $f2, $f2, $f0 -/* 35CD00 E0052280 00000000 */ nop +/* 35CD00 E0052280 00000000 */ nop /* 35CD04 E0052284 44946000 */ mtc1 $s4, $f12 -/* 35CD08 E0052288 00000000 */ nop +/* 35CD08 E0052288 00000000 */ nop /* 35CD0C E005228C 46806320 */ cvt.s.w $f12, $f12 /* 35CD10 E0052290 0C080140 */ jal func_E0200500 /* 35CD14 E0052294 E6220000 */ swc1 $f2, ($s1) /* 35CD18 E0052298 46000021 */ cvt.d.s $f0, $f0 /* 35CD1C E005229C 463A0002 */ mul.d $f0, $f0, $f26 -/* 35CD20 E00522A0 00000000 */ nop +/* 35CD20 E00522A0 00000000 */ nop /* 35CD24 E00522A4 463E0000 */ add.d $f0, $f0, $f30 /* 35CD28 E00522A8 4496A000 */ mtc1 $s6, $f20 -/* 35CD2C E00522AC 00000000 */ nop +/* 35CD2C E00522AC 00000000 */ nop /* 35CD30 E00522B0 4680A520 */ cvt.s.w $f20, $f20 /* 35CD34 E00522B4 4600A521 */ cvt.d.s $f20, $f20 /* 35CD38 E00522B8 4620A002 */ mul.d $f0, $f20, $f0 -/* 35CD3C E00522BC 00000000 */ nop +/* 35CD3C E00522BC 00000000 */ nop /* 35CD40 E00522C0 3C0140A0 */ lui $at, 0x40a0 /* 35CD44 E00522C4 44811000 */ mtc1 $at, $f2 -/* 35CD48 E00522C8 00000000 */ nop +/* 35CD48 E00522C8 00000000 */ nop /* 35CD4C E00522CC 4602B580 */ add.s $f22, $f22, $f2 /* 35CD50 E00522D0 3C0141F0 */ lui $at, 0x41f0 /* 35CD54 E00522D4 44811000 */ mtc1 $at, $f2 -/* 35CD58 E00522D8 00000000 */ nop +/* 35CD58 E00522D8 00000000 */ nop /* 35CD5C E00522DC 4602B082 */ mul.s $f2, $f22, $f2 -/* 35CD60 E00522E0 00000000 */ nop +/* 35CD60 E00522E0 00000000 */ nop /* 35CD64 E00522E4 460010A1 */ cvt.d.s $f2, $f2 /* 35CD68 E00522E8 46220000 */ add.d $f0, $f0, $f2 /* 35CD6C E00522EC 0C080140 */ jal func_E0200500 /* 35CD70 E00522F0 46200320 */ cvt.s.d $f12, $f0 /* 35CD74 E00522F4 46000021 */ cvt.d.s $f0, $f0 /* 35CD78 E00522F8 463C0002 */ mul.d $f0, $f0, $f28 -/* 35CD7C E00522FC 00000000 */ nop +/* 35CD7C E00522FC 00000000 */ nop /* 35CD80 E0052300 C6620000 */ lwc1 $f2, ($s3) /* 35CD84 E0052304 460010A1 */ cvt.d.s $f2, $f2 /* 35CD88 E0052308 46201080 */ add.d $f2, $f2, $f0 /* 35CD8C E005230C 44956000 */ mtc1 $s5, $f12 -/* 35CD90 E0052310 00000000 */ nop +/* 35CD90 E0052310 00000000 */ nop /* 35CD94 E0052314 46806320 */ cvt.s.w $f12, $f12 /* 35CD98 E0052318 462010A0 */ cvt.s.d $f2, $f2 /* 35CD9C E005231C 0C080144 */ jal func_E0200510 /* 35CDA0 E0052320 E6620000 */ swc1 $f2, ($s3) /* 35CDA4 E0052324 46000021 */ cvt.d.s $f0, $f0 /* 35CDA8 E0052328 463A0002 */ mul.d $f0, $f0, $f26 -/* 35CDAC E005232C 00000000 */ nop +/* 35CDAC E005232C 00000000 */ nop /* 35CDB0 E0052330 463E0000 */ add.d $f0, $f0, $f30 /* 35CDB4 E0052334 4620A502 */ mul.d $f20, $f20, $f0 -/* 35CDB8 E0052338 00000000 */ nop +/* 35CDB8 E0052338 00000000 */ nop /* 35CDBC E005233C 3C014248 */ lui $at, 0x4248 /* 35CDC0 E0052340 44810000 */ mtc1 $at, $f0 -/* 35CDC4 E0052344 00000000 */ nop +/* 35CDC4 E0052344 00000000 */ nop /* 35CDC8 E0052348 4600B582 */ mul.s $f22, $f22, $f0 -/* 35CDCC E005234C 00000000 */ nop +/* 35CDCC E005234C 00000000 */ nop /* 35CDD0 E0052350 4600B5A1 */ cvt.d.s $f22, $f22 /* 35CDD4 E0052354 4636A500 */ add.d $f20, $f20, $f22 /* 35CDD8 E0052358 0C080144 */ jal func_E0200510 /* 35CDDC E005235C 4620A320 */ cvt.s.d $f12, $f20 /* 35CDE0 E0052360 46000021 */ cvt.d.s $f0, $f0 /* 35CDE4 E0052364 463C0002 */ mul.d $f0, $f0, $f28 -/* 35CDE8 E0052368 00000000 */ nop +/* 35CDE8 E0052368 00000000 */ nop /* 35CDEC E005236C 26520001 */ addiu $s2, $s2, 1 /* 35CDF0 E0052370 26940035 */ addiu $s4, $s4, 0x35 /* 35CDF4 E0052374 C6220000 */ lwc1 $f2, ($s1) @@ -190,7 +190,7 @@ glabel func_E00520F0 /* 35CE40 E00523C0 D4222A88 */ ldc1 $f2, %lo(D_E0052A88)($at) /* 35CE44 E00523C4 4600C021 */ cvt.d.s $f0, $f24 /* 35CE48 E00523C8 46220002 */ mul.d $f0, $f0, $f2 -/* 35CE4C E00523CC 00000000 */ nop +/* 35CE4C E00523CC 00000000 */ nop /* 35CE50 E00523D0 46200020 */ cvt.s.d $f0, $f0 .LE00523D4: /* 35CE54 E00523D4 E60000C8 */ swc1 $f0, 0xc8($s0) diff --git a/asm/nonmatchings/code_360F40/func_E005C000.s b/asm/nonmatchings/code_360F40/func_E005C000.s index 7312b854eb..ca0b10b79f 100644 --- a/asm/nonmatchings/code_360F40/func_E005C000.s +++ b/asm/nonmatchings/code_360F40/func_E005C000.s @@ -43,7 +43,7 @@ glabel func_E005C000 /* 360FD8 E005C098 AE11000C */ sw $s1, 0xc($s0) .LE005C09C: /* 360FDC E005C09C 08017027 */ j .LE005C09C -/* 360FE0 E005C0A0 00000000 */ nop +/* 360FE0 E005C0A0 00000000 */ nop .LE005C0A4: /* 360FE4 E005C0A4 0220202D */ daddu $a0, $s1, $zero /* 360FE8 E005C0A8 00132840 */ sll $a1, $s3, 1 diff --git a/asm/nonmatchings/code_360F40/func_E005C178.s b/asm/nonmatchings/code_360F40/func_E005C178.s index 98b2a3e2e2..0b39d21014 100644 --- a/asm/nonmatchings/code_360F40/func_E005C178.s +++ b/asm/nonmatchings/code_360F40/func_E005C178.s @@ -3,4 +3,4 @@ glabel func_E005C178 /* 3610B8 E005C178 03E00008 */ jr $ra -/* 3610BC E005C17C 00000000 */ nop +/* 3610BC E005C17C 00000000 */ nop diff --git a/asm/nonmatchings/code_360F40/func_E005C180.s b/asm/nonmatchings/code_360F40/func_E005C180.s index f35fd2bbda..dced75c71c 100644 --- a/asm/nonmatchings/code_360F40/func_E005C180.s +++ b/asm/nonmatchings/code_360F40/func_E005C180.s @@ -10,11 +10,11 @@ glabel func_E005C180 /* 3610D4 E005C194 8CA20028 */ lw $v0, 0x28($a1) /* 3610D8 E005C198 8CA30024 */ lw $v1, 0x24($a1) /* 3610DC E005C19C 44821000 */ mtc1 $v0, $f2 -/* 3610E0 E005C1A0 00000000 */ nop +/* 3610E0 E005C1A0 00000000 */ nop /* 3610E4 E005C1A4 468010A0 */ cvt.s.w $f2, $f2 /* 3610E8 E005C1A8 24420001 */ addiu $v0, $v0, 1 /* 3610EC E005C1AC 46001082 */ mul.s $f2, $f2, $f0 -/* 3610F0 E005C1B0 00000000 */ nop +/* 3610F0 E005C1B0 00000000 */ nop /* 3610F4 E005C1B4 2463FFFF */ addiu $v1, $v1, -1 /* 3610F8 E005C1B8 C4A0002C */ lwc1 $f0, 0x2c($a1) /* 3610FC E005C1BC 46800020 */ cvt.s.w $f0, $f0 @@ -24,9 +24,9 @@ glabel func_E005C180 /* 36110C E005C1CC 04610005 */ bgez $v1, .LE005C1E4 /* 361110 E005C1D0 E4A20030 */ swc1 $f2, 0x30($a1) /* 361114 E005C1D4 0C080128 */ jal func_E02004A0 -/* 361118 E005C1D8 00000000 */ nop +/* 361118 E005C1D8 00000000 */ nop /* 36111C E005C1DC 080170AA */ j .LE005C2A8 -/* 361120 E005C1E0 00000000 */ nop +/* 361120 E005C1E0 00000000 */ nop .LE005C1E4: /* 361124 E005C1E4 C4A2001C */ lwc1 $f2, 0x1c($a1) /* 361128 E005C1E8 C4A00020 */ lwc1 $f0, 0x20($a1) @@ -35,7 +35,7 @@ glabel func_E005C180 /* 361134 E005C1F4 D424C710 */ ldc1 $f4, %lo(D_E005C710)($at) /* 361138 E005C1F8 46000021 */ cvt.d.s $f0, $f0 /* 36113C E005C1FC 46240002 */ mul.d $f0, $f0, $f4 -/* 361140 E005C200 00000000 */ nop +/* 361140 E005C200 00000000 */ nop /* 361144 E005C204 460010A1 */ cvt.d.s $f2, $f2 /* 361148 E005C208 46201080 */ add.d $f2, $f2, $f0 /* 36114C E005C20C 24060001 */ addiu $a2, $zero, 1 @@ -58,13 +58,13 @@ glabel func_E005C180 /* 36118C E005C24C 46200020 */ cvt.s.d $f0, $f0 /* 361190 E005C250 46000021 */ cvt.d.s $f0, $f0 /* 361194 E005C254 462A0002 */ mul.d $f0, $f0, $f10 -/* 361198 E005C258 00000000 */ nop +/* 361198 E005C258 00000000 */ nop /* 36119C E005C25C C4660004 */ lwc1 $f6, 4($v1) /* 3611A0 E005C260 46064182 */ mul.s $f6, $f8, $f6 -/* 3611A4 E005C264 00000000 */ nop +/* 3611A4 E005C264 00000000 */ nop /* 3611A8 E005C268 C464000C */ lwc1 $f4, 0xc($v1) /* 3611AC E005C26C 46044102 */ mul.s $f4, $f8, $f4 -/* 3611B0 E005C270 00000000 */ nop +/* 3611B0 E005C270 00000000 */ nop /* 3611B4 E005C274 46200020 */ cvt.s.d $f0, $f0 /* 3611B8 E005C278 E4600008 */ swc1 $f0, 8($v1) /* 3611BC E005C27C C460FFFC */ lwc1 $f0, -4($v1) diff --git a/asm/nonmatchings/code_360F40/func_E005C2F8.s b/asm/nonmatchings/code_360F40/func_E005C2F8.s index 23ef011713..6329f13885 100644 --- a/asm/nonmatchings/code_360F40/func_E005C2F8.s +++ b/asm/nonmatchings/code_360F40/func_E005C2F8.s @@ -48,9 +48,9 @@ glabel func_E005C2F8 /* 3612E4 E005C3A4 3C02DE00 */ lui $v0, 0xde00 /* 3612E8 E005C3A8 4600110D */ trunc.w.s $f4, $f2 /* 3612EC E005C3AC 44132000 */ mfc1 $s3, $f4 -/* 3612F0 E005C3B0 00000000 */ nop +/* 3612F0 E005C3B0 00000000 */ nop /* 3612F4 E005C3B4 44930000 */ mtc1 $s3, $f0 -/* 3612F8 E005C3B8 00000000 */ nop +/* 3612F8 E005C3B8 00000000 */ nop /* 3612FC E005C3BC 46800020 */ cvt.s.w $f0, $f0 /* 361300 E005C3C0 3A740006 */ xori $s4, $s3, 6 /* 361304 E005C3C4 46001081 */ sub.s $f2, $f2, $f0 @@ -62,7 +62,7 @@ glabel func_E005C2F8 /* 36131C E005C3DC ACA7000C */ sw $a3, 0xc($a1) /* 361320 E005C3E0 00621821 */ addu $v1, $v1, $v0 /* 361324 E005C3E4 46001082 */ mul.s $f2, $f2, $f0 -/* 361328 E005C3E8 00000000 */ nop +/* 361328 E005C3E8 00000000 */ nop /* 36132C E005C3EC ACA30004 */ sw $v1, 4($a1) /* 361330 E005C3F0 8EC50004 */ lw $a1, 4($s6) /* 361334 E005C3F4 8EC60008 */ lw $a2, 8($s6) diff --git a/asm/nonmatchings/code_3625C0/func_E005E000.s b/asm/nonmatchings/code_3625C0/func_E005E000.s index cf88bf01cf..b380930054 100644 --- a/asm/nonmatchings/code_3625C0/func_E005E000.s +++ b/asm/nonmatchings/code_3625C0/func_E005E000.s @@ -47,7 +47,7 @@ glabel func_E005E000 /* 362668 E005E0A8 AE50000C */ sw $s0, 0xc($s2) .LE005E0AC: /* 36266C E005E0AC 0801782B */ j .LE005E0AC -/* 362670 E005E0B0 00000000 */ nop +/* 362670 E005E0B0 00000000 */ nop .LE005E0B4: /* 362674 E005E0B4 0200202D */ daddu $a0, $s0, $zero /* 362678 E005E0B8 00112840 */ sll $a1, $s1, 1 @@ -84,7 +84,7 @@ glabel func_E005E000 /* 3626EC E005E12C 14E10004 */ bne $a3, $at, .LE005E140 /* 3626F0 E005E130 3C018000 */ lui $at, 0x8000 /* 3626F4 E005E134 14A10002 */ bne $a1, $at, .LE005E140 -/* 3626F8 E005E138 00000000 */ nop +/* 3626F8 E005E138 00000000 */ nop /* 3626FC E005E13C 0006000D */ break 6 .LE005E140: /* 362700 E005E140 00001812 */ mflo $v1 @@ -97,7 +97,7 @@ glabel func_E005E000 /* 36271C E005E15C E482FFF8 */ swc1 $f2, -8($a0) /* 362720 E005E160 AC80FFFC */ sw $zero, -4($a0) /* 362724 E005E164 44830000 */ mtc1 $v1, $f0 -/* 362728 E005E168 00000000 */ nop +/* 362728 E005E168 00000000 */ nop /* 36272C E005E16C 46800020 */ cvt.s.w $f0, $f0 /* 362730 E005E170 E480FFF4 */ swc1 $f0, -0xc($a0) /* 362734 E005E174 AC830000 */ sw $v1, ($a0) diff --git a/asm/nonmatchings/code_3625C0/func_E005E1B0.s b/asm/nonmatchings/code_3625C0/func_E005E1B0.s index 874a067aef..ab3620ba5e 100644 --- a/asm/nonmatchings/code_3625C0/func_E005E1B0.s +++ b/asm/nonmatchings/code_3625C0/func_E005E1B0.s @@ -3,4 +3,4 @@ glabel func_E005E1B0 /* 362770 E005E1B0 03E00008 */ jr $ra -/* 362774 E005E1B4 00000000 */ nop +/* 362774 E005E1B4 00000000 */ nop diff --git a/asm/nonmatchings/code_3625C0/func_E005E1B8.s b/asm/nonmatchings/code_3625C0/func_E005E1B8.s index 2f53c29357..5f8a19392d 100644 --- a/asm/nonmatchings/code_3625C0/func_E005E1B8.s +++ b/asm/nonmatchings/code_3625C0/func_E005E1B8.s @@ -21,7 +21,7 @@ glabel func_E005E1B8 /* 3627B8 E005E1F8 D424E680 */ ldc1 $f4, %lo(D_E005E680)($at) /* 3627BC E005E1FC 46000021 */ cvt.d.s $f0, $f0 /* 3627C0 E005E200 46240002 */ mul.d $f0, $f0, $f4 -/* 3627C4 E005E204 00000000 */ nop +/* 3627C4 E005E204 00000000 */ nop /* 3627C8 E005E208 8C620024 */ lw $v0, 0x24($v1) /* 3627CC E005E20C 460010A1 */ cvt.d.s $f2, $f2 /* 3627D0 E005E210 46201080 */ add.d $f2, $f2, $f0 @@ -40,7 +40,7 @@ glabel func_E005E1B8 /* 362800 E005E240 0C080140 */ jal func_E0200500 /* 362804 E005E244 46806320 */ cvt.s.w $f12, $f12 /* 362808 E005E248 4600B002 */ mul.s $f0, $f22, $f0 -/* 36280C E005E24C 00000000 */ nop +/* 36280C E005E24C 00000000 */ nop /* 362810 E005E250 C60C0000 */ lwc1 $f12, ($s0) /* 362814 E005E254 46806320 */ cvt.s.w $f12, $f12 /* 362818 E005E258 0C080144 */ jal func_E0200510 @@ -49,9 +49,9 @@ glabel func_E005E1B8 /* 362824 E005E264 0C080144 */ jal func_E0200510 /* 362828 E005E268 46000506 */ mov.s $f20, $f0 /* 36282C E005E26C 4614B502 */ mul.s $f20, $f22, $f20 -/* 362830 E005E270 00000000 */ nop +/* 362830 E005E270 00000000 */ nop /* 362834 E005E274 4600A502 */ mul.s $f20, $f20, $f0 -/* 362838 E005E278 00000000 */ nop +/* 362838 E005E278 00000000 */ nop /* 36283C E005E27C C60C0000 */ lwc1 $f12, ($s0) /* 362840 E005E280 46806320 */ cvt.s.w $f12, $f12 /* 362844 E005E284 0C080144 */ jal func_E0200510 @@ -60,11 +60,11 @@ glabel func_E005E1B8 /* 362850 E005E290 0C080140 */ jal func_E0200500 /* 362854 E005E294 46000506 */ mov.s $f20, $f0 /* 362858 E005E298 4614B502 */ mul.s $f20, $f22, $f20 -/* 36285C E005E29C 00000000 */ nop +/* 36285C E005E29C 00000000 */ nop /* 362860 E005E2A0 C602FFF8 */ lwc1 $f2, -8($s0) /* 362864 E005E2A4 8E030000 */ lw $v1, ($s0) /* 362868 E005E2A8 4600A502 */ mul.s $f20, $f20, $f0 -/* 36286C E005E2AC 00000000 */ nop +/* 36286C E005E2AC 00000000 */ nop /* 362870 E005E2B0 AE00FFFC */ sw $zero, -4($s0) /* 362874 E005E2B4 C600FFF4 */ lwc1 $f0, -0xc($s0) /* 362878 E005E2B8 24620010 */ addiu $v0, $v1, 0x10 diff --git a/asm/nonmatchings/code_3625C0/func_E005E310.s b/asm/nonmatchings/code_3625C0/func_E005E310.s index 8c0f206e76..f3666945e9 100644 --- a/asm/nonmatchings/code_3625C0/func_E005E310.s +++ b/asm/nonmatchings/code_3625C0/func_E005E310.s @@ -3,4 +3,4 @@ glabel func_E005E310 /* 3628D0 E005E310 03E00008 */ jr $ra -/* 3628D4 E005E314 00000000 */ nop +/* 3628D4 E005E314 00000000 */ nop diff --git a/asm/nonmatchings/code_3625C0/func_E005E318.s b/asm/nonmatchings/code_3625C0/func_E005E318.s index d436659109..1465b15a1c 100644 --- a/asm/nonmatchings/code_3625C0/func_E005E318.s +++ b/asm/nonmatchings/code_3625C0/func_E005E318.s @@ -5,7 +5,7 @@ glabel func_E005E318 /* 3628D8 E005E318 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3628DC E005E31C AFBF0010 */ sw $ra, 0x10($sp) /* 3628E0 E005E320 0C0178CD */ jal func_E005E334 -/* 3628E4 E005E324 00000000 */ nop +/* 3628E4 E005E324 00000000 */ nop /* 3628E8 E005E328 8FBF0010 */ lw $ra, 0x10($sp) /* 3628EC E005E32C 03E00008 */ jr $ra /* 3628F0 E005E330 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_366030/func_E0066000.s b/asm/nonmatchings/code_366030/func_E0066000.s index 93899e6536..65d22b32e0 100644 --- a/asm/nonmatchings/code_366030/func_E0066000.s +++ b/asm/nonmatchings/code_366030/func_E0066000.s @@ -40,7 +40,7 @@ glabel func_E0066000 /* 3660BC E006608C AE42000C */ sw $v0, 0xc($s2) .LE0066090: /* 3660C0 E0066090 08019824 */ j .LE0066090 -/* 3660C4 E0066094 00000000 */ nop +/* 3660C4 E0066094 00000000 */ nop .LE0066098: /* 3660C8 E0066098 AC910000 */ sw $s1, ($a0) /* 3660CC E006609C AC900028 */ sw $s0, 0x28($a0) @@ -90,7 +90,7 @@ glabel func_E0066000 /* 36617C E006614C 00220821 */ addu $at, $at, $v0 /* 366180 E0066150 8C226CE0 */ lw $v0, %lo(D_E0066CE0)($at) /* 366184 E0066154 00400008 */ jr $v0 -/* 366188 E0066158 00000000 */ nop +/* 366188 E0066158 00000000 */ nop /* 36618C E006615C 3C014300 */ lui $at, 0x4300 /* 366190 E0066160 44810000 */ mtc1 $at, $f0 /* 366194 E0066164 3C01428C */ lui $at, 0x428c @@ -98,7 +98,7 @@ glabel func_E0066000 /* 36619C E006616C 3C01C2C8 */ lui $at, 0xc2c8 /* 3661A0 E0066170 44813000 */ mtc1 $at, $f6 /* 3661A4 E0066174 44901000 */ mtc1 $s0, $f2 -/* 3661A8 E0066178 00000000 */ nop +/* 3661A8 E0066178 00000000 */ nop /* 3661AC E006617C 468010A0 */ cvt.s.w $f2, $f2 /* 3661B0 E0066180 E4800040 */ swc1 $f0, 0x40($a0) /* 3661B4 E0066184 46020003 */ div.s $f0, $f0, $f2 @@ -207,7 +207,7 @@ glabel func_E0066000 /* 366350 E0066320 3C01C2C8 */ lui $at, 0xc2c8 /* 366354 E0066324 44812000 */ mtc1 $at, $f4 /* 366358 E0066328 44901000 */ mtc1 $s0, $f2 -/* 36635C E006632C 00000000 */ nop +/* 36635C E006632C 00000000 */ nop /* 366360 E0066330 468010A0 */ cvt.s.w $f2, $f2 /* 366364 E0066334 E4800040 */ swc1 $f0, 0x40($a0) /* 366368 E0066338 46020003 */ div.s $f0, $f0, $f2 diff --git a/asm/nonmatchings/code_366030/func_E0066490.s b/asm/nonmatchings/code_366030/func_E0066490.s index 460a38c517..e04535c219 100644 --- a/asm/nonmatchings/code_366030/func_E0066490.s +++ b/asm/nonmatchings/code_366030/func_E0066490.s @@ -3,4 +3,4 @@ glabel func_E0066490 /* 3664C0 E0066490 03E00008 */ jr $ra -/* 3664C4 E0066494 00000000 */ nop +/* 3664C4 E0066494 00000000 */ nop diff --git a/asm/nonmatchings/code_366030/func_E0066498.s b/asm/nonmatchings/code_366030/func_E0066498.s index e9d4932c69..56c6e30b72 100644 --- a/asm/nonmatchings/code_366030/func_E0066498.s +++ b/asm/nonmatchings/code_366030/func_E0066498.s @@ -26,11 +26,11 @@ glabel func_E0066498 .LE00664EC: /* 36651C E00664EC 8E050028 */ lw $a1, 0x28($s0) /* 366520 E00664F0 04A10005 */ bgez $a1, .LE0066508 -/* 366524 E00664F4 00000000 */ nop +/* 366524 E00664F4 00000000 */ nop /* 366528 E00664F8 0C080128 */ jal func_E02004A0 /* 36652C E00664FC 0220202D */ daddu $a0, $s1, $zero /* 366530 E0066500 080199C5 */ j .LE0066714 -/* 366534 E0066504 00000000 */ nop +/* 366534 E0066504 00000000 */ nop .LE0066508: /* 366538 E0066508 8E04002C */ lw $a0, 0x2c($s0) /* 36653C E006650C 2882000B */ slti $v0, $a0, 0xb @@ -63,13 +63,13 @@ glabel func_E0066498 /* 3665A0 E0066570 24020004 */ addiu $v0, $zero, 4 /* 3665A4 E0066574 8E030000 */ lw $v1, ($s0) /* 3665A8 E0066578 14620009 */ bne $v1, $v0, .LE00665A0 -/* 3665AC E006657C 00000000 */ nop +/* 3665AC E006657C 00000000 */ nop /* 3665B0 E0066580 C600001C */ lwc1 $f0, 0x1c($s0) /* 3665B4 E0066584 3C01E006 */ lui $at, %hi(D_E0066D20) /* 3665B8 E0066588 D4226D20 */ ldc1 $f2, %lo(D_E0066D20)($at) /* 3665BC E006658C 46000021 */ cvt.d.s $f0, $f0 /* 3665C0 E0066590 46220002 */ mul.d $f0, $f0, $f2 -/* 3665C4 E0066594 00000000 */ nop +/* 3665C4 E0066594 00000000 */ nop /* 3665C8 E0066598 46200020 */ cvt.s.d $f0, $f0 /* 3665CC E006659C E600001C */ swc1 $f0, 0x1c($s0) .LE00665A0: @@ -106,13 +106,13 @@ glabel func_E0066498 /* 366648 E0066618 C7A40028 */ lwc1 $f4, 0x28($sp) /* 36664C E006661C 4600A503 */ div.s $f20, $f20, $f0 /* 366650 E0066620 46142102 */ mul.s $f4, $f4, $f20 -/* 366654 E0066624 00000000 */ nop +/* 366654 E0066624 00000000 */ nop /* 366658 E0066628 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 36665C E006662C 46140002 */ mul.s $f0, $f0, $f20 -/* 366660 E0066630 00000000 */ nop +/* 366660 E0066630 00000000 */ nop /* 366664 E0066634 C7A20030 */ lwc1 $f2, 0x30($sp) /* 366668 E0066638 46141082 */ mul.s $f2, $f2, $f20 -/* 36666C E006663C 00000000 */ nop +/* 36666C E006663C 00000000 */ nop /* 366670 E0066640 AE000018 */ sw $zero, 0x18($s0) /* 366674 E0066644 E6040010 */ swc1 $f4, 0x10($s0) /* 366678 E0066648 E6000014 */ swc1 $f0, 0x14($s0) @@ -159,7 +159,7 @@ glabel func_E0066498 .LE00666E8: /* 366718 E00666E8 C4600000 */ lwc1 $f0, ($v1) /* 36671C E00666EC 460E003C */ c.lt.s $f0, $f14 -/* 366720 E00666F0 00000000 */ nop +/* 366720 E00666F0 00000000 */ nop /* 366724 E00666F4 45000003 */ bc1f .LE0066704 /* 366728 E00666F8 24840001 */ addiu $a0, $a0, 1 /* 36672C E00666FC 460C0000 */ add.s $f0, $f0, $f12 diff --git a/asm/nonmatchings/code_366030/func_E0066770.s b/asm/nonmatchings/code_366030/func_E0066770.s index f4a571ce8d..9d95f44e00 100644 --- a/asm/nonmatchings/code_366030/func_E0066770.s +++ b/asm/nonmatchings/code_366030/func_E0066770.s @@ -84,11 +84,11 @@ glabel func_E0066770 /* 3668DC E00668AC E7B40018 */ swc1 $f20, 0x18($sp) /* 3668E0 E00668B0 E7A20014 */ swc1 $f2, 0x14($sp) /* 3668E4 E00668B4 44821000 */ mtc1 $v0, $f2 -/* 3668E8 E00668B8 00000000 */ nop +/* 3668E8 E00668B8 00000000 */ nop /* 3668EC E00668BC 468010A0 */ cvt.s.w $f2, $f2 /* 3668F0 E00668C0 E7A00010 */ swc1 $f0, 0x10($sp) /* 3668F4 E00668C4 44830000 */ mtc1 $v1, $f0 -/* 3668F8 E00668C8 00000000 */ nop +/* 3668F8 E00668C8 00000000 */ nop /* 3668FC E00668CC 46800020 */ cvt.s.w $f0, $f0 /* 366900 E00668D0 46001083 */ div.s $f2, $f2, $f0 /* 366904 E00668D4 8E860060 */ lw $a2, 0x60($s4) @@ -318,4 +318,4 @@ glabel func_E0066770 /* 366C70 E0066C40 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 366C74 E0066C44 03E00008 */ jr $ra /* 366C78 E0066C48 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 366C7C E0066C4C 00000000 */ nop +/* 366C7C E0066C4C 00000000 */ nop diff --git a/asm/nonmatchings/code_36A8D0/func_E0068000.s b/asm/nonmatchings/code_36A8D0/func_E0068000.s index f10faa86f5..b4478b3703 100644 --- a/asm/nonmatchings/code_36A8D0/func_E0068000.s +++ b/asm/nonmatchings/code_36A8D0/func_E0068000.s @@ -40,7 +40,7 @@ glabel func_E0068000 /* 36A95C E006808C AE02000C */ sw $v0, 0xc($s0) .LE0068090: /* 36A960 E0068090 0801A024 */ j .LE0068090 -/* 36A964 E0068094 00000000 */ nop +/* 36A964 E0068094 00000000 */ nop .LE0068098: /* 36A968 E0068098 240300FF */ addiu $v1, $zero, 0xff /* 36A96C E006809C 24020064 */ addiu $v0, $zero, 0x64 diff --git a/asm/nonmatchings/code_36A8D0/func_E0068140.s b/asm/nonmatchings/code_36A8D0/func_E0068140.s index a01f5bd0f6..5420f0f588 100644 --- a/asm/nonmatchings/code_36A8D0/func_E0068140.s +++ b/asm/nonmatchings/code_36A8D0/func_E0068140.s @@ -3,4 +3,4 @@ glabel func_E0068140 /* 36AA10 E0068140 03E00008 */ jr $ra -/* 36AA14 E0068144 00000000 */ nop +/* 36AA14 E0068144 00000000 */ nop diff --git a/asm/nonmatchings/code_36A8D0/func_E0068148.s b/asm/nonmatchings/code_36A8D0/func_E0068148.s index da4bc9b943..d05aee0ad6 100644 --- a/asm/nonmatchings/code_36A8D0/func_E0068148.s +++ b/asm/nonmatchings/code_36A8D0/func_E0068148.s @@ -26,13 +26,13 @@ glabel func_E0068148 /* 36AA64 E0068194 04A10005 */ bgez $a1, .LE00681AC /* 36AA68 E0068198 AC620020 */ sw $v0, 0x20($v1) /* 36AA6C E006819C 0C080128 */ jal func_E02004A0 -/* 36AA70 E00681A0 00000000 */ nop +/* 36AA70 E00681A0 00000000 */ nop /* 36AA74 E00681A4 0801A073 */ j .LE00681CC -/* 36AA78 E00681A8 00000000 */ nop +/* 36AA78 E00681A8 00000000 */ nop .LE00681AC: /* 36AA7C E00681AC 28A2000A */ slti $v0, $a1, 0xa /* 36AA80 E00681B0 10400006 */ beqz $v0, .LE00681CC -/* 36AA84 E00681B4 00000000 */ nop +/* 36AA84 E00681B4 00000000 */ nop /* 36AA88 E00681B8 8C620018 */ lw $v0, 0x18($v1) /* 36AA8C E00681BC 2442FFE7 */ addiu $v0, $v0, -0x19 /* 36AA90 E00681C0 04410002 */ bgez $v0, .LE00681CC diff --git a/asm/nonmatchings/code_36A8D0/func_E0068234.s b/asm/nonmatchings/code_36A8D0/func_E0068234.s index b576b689e2..30215914a9 100644 --- a/asm/nonmatchings/code_36A8D0/func_E0068234.s +++ b/asm/nonmatchings/code_36A8D0/func_E0068234.s @@ -104,7 +104,7 @@ glabel func_E0068234 /* 36AC90 E00683C0 3C01E007 */ lui $at, %hi(D_E0068600) /* 36AC94 E00683C4 D4208600 */ ldc1 $f0, %lo(D_E0068600)($at) /* 36AC98 E00683C8 46201002 */ mul.d $f0, $f2, $f0 -/* 36AC9C E00683CC 00000000 */ nop +/* 36AC9C E00683CC 00000000 */ nop /* 36ACA0 E00683D0 4620010D */ trunc.w.d $f4, $f0 /* 36ACA4 E00683D4 44092000 */ mfc1 $t1, $f4 /* 36ACA8 E00683D8 0801A0FB */ j .LE00683EC @@ -227,4 +227,4 @@ glabel func_E0068234 /* 36AE70 E00685A0 8FB00060 */ lw $s0, 0x60($sp) /* 36AE74 E00685A4 03E00008 */ jr $ra /* 36AE78 E00685A8 27BD0088 */ addiu $sp, $sp, 0x88 -/* 36AE7C E00685AC 00000000 */ nop +/* 36AE7C E00685AC 00000000 */ nop diff --git a/asm/nonmatchings/code_372790/func_E006E000.s b/asm/nonmatchings/code_372790/func_E006E000.s index eab0982a61..ba51979164 100644 --- a/asm/nonmatchings/code_372790/func_E006E000.s +++ b/asm/nonmatchings/code_372790/func_E006E000.s @@ -49,7 +49,7 @@ glabel func_E006E000 /* 372840 E006E0B0 AE42000C */ sw $v0, 0xc($s2) .LE006E0B4: /* 372844 E006E0B4 0801B82D */ j .LE006E0B4 -/* 372848 E006E0B8 00000000 */ nop +/* 372848 E006E0B8 00000000 */ nop .LE006E0BC: /* 37284C E006E0BC AE130000 */ sw $s3, ($s0) /* 372850 E006E0C0 8FA2008C */ lw $v0, 0x8c($sp) @@ -74,7 +74,7 @@ glabel func_E006E000 /* 372898 E006E108 3C013D23 */ lui $at, 0x3d23 /* 37289C E006E10C 3421D70A */ ori $at, $at, 0xd70a /* 3728A0 E006E110 44810000 */ mtc1 $at, $f0 -/* 3728A4 E006E114 00000000 */ nop +/* 3728A4 E006E114 00000000 */ nop /* 3728A8 E006E118 E6000038 */ swc1 $f0, 0x38($s0) .LE006E11C: /* 3728AC E006E11C C6000038 */ lwc1 $f0, 0x38($s0) @@ -100,15 +100,15 @@ glabel func_E006E000 /* 3728FC E006E16C D434EC20 */ ldc1 $f20, %lo(D_E006EC20)($at) /* 372900 E006E170 46000021 */ cvt.d.s $f0, $f0 /* 372904 E006E174 46340002 */ mul.d $f0, $f0, $f20 -/* 372908 E006E178 00000000 */ nop +/* 372908 E006E178 00000000 */ nop /* 37290C E006E17C 2442FFFB */ addiu $v0, $v0, -5 /* 372910 E006E180 44821000 */ mtc1 $v0, $f2 -/* 372914 E006E184 00000000 */ nop +/* 372914 E006E184 00000000 */ nop /* 372918 E006E188 468010A1 */ cvt.d.w $f2, $f2 /* 37291C E006E18C 46220002 */ mul.d $f0, $f0, $f2 -/* 372920 E006E190 00000000 */ nop +/* 372920 E006E190 00000000 */ nop /* 372924 E006E194 46340002 */ mul.d $f0, $f0, $f20 -/* 372928 E006E198 00000000 */ nop +/* 372928 E006E198 00000000 */ nop /* 37292C E006E19C 2404000A */ addiu $a0, $zero, 0xa /* 372930 E006E1A0 26250001 */ addiu $a1, $s1, 1 /* 372934 E006E1A4 46200020 */ cvt.s.d $f0, $f0 @@ -117,15 +117,15 @@ glabel func_E006E000 /* 372940 E006E1B0 4618D001 */ sub.s $f0, $f26, $f24 /* 372944 E006E1B4 46000021 */ cvt.d.s $f0, $f0 /* 372948 E006E1B8 46340002 */ mul.d $f0, $f0, $f20 -/* 37294C E006E1BC 00000000 */ nop +/* 37294C E006E1BC 00000000 */ nop /* 372950 E006E1C0 2442FFFB */ addiu $v0, $v0, -5 /* 372954 E006E1C4 44821000 */ mtc1 $v0, $f2 -/* 372958 E006E1C8 00000000 */ nop +/* 372958 E006E1C8 00000000 */ nop /* 37295C E006E1CC 468010A1 */ cvt.d.w $f2, $f2 /* 372960 E006E1D0 46220002 */ mul.d $f0, $f0, $f2 -/* 372964 E006E1D4 00000000 */ nop +/* 372964 E006E1D4 00000000 */ nop /* 372968 E006E1D8 46340002 */ mul.d $f0, $f0, $f20 -/* 37296C E006E1DC 00000000 */ nop +/* 37296C E006E1DC 00000000 */ nop /* 372970 E006E1E0 2404000A */ addiu $a0, $zero, 0xa /* 372974 E006E1E4 26250002 */ addiu $a1, $s1, 2 /* 372978 E006E1E8 46200020 */ cvt.s.d $f0, $f0 @@ -134,15 +134,15 @@ glabel func_E006E000 /* 372984 E006E1F4 461CF001 */ sub.s $f0, $f30, $f28 /* 372988 E006E1F8 46000021 */ cvt.d.s $f0, $f0 /* 37298C E006E1FC 46340002 */ mul.d $f0, $f0, $f20 -/* 372990 E006E200 00000000 */ nop +/* 372990 E006E200 00000000 */ nop /* 372994 E006E204 2442FFFB */ addiu $v0, $v0, -5 /* 372998 E006E208 44821000 */ mtc1 $v0, $f2 -/* 37299C E006E20C 00000000 */ nop +/* 37299C E006E20C 00000000 */ nop /* 3729A0 E006E210 468010A1 */ cvt.d.w $f2, $f2 /* 3729A4 E006E214 46220002 */ mul.d $f0, $f0, $f2 -/* 3729A8 E006E218 00000000 */ nop +/* 3729A8 E006E218 00000000 */ nop /* 3729AC E006E21C 46340002 */ mul.d $f0, $f0, $f20 -/* 3729B0 E006E220 00000000 */ nop +/* 3729B0 E006E220 00000000 */ nop /* 3729B4 E006E224 0801B8B9 */ j .LE006E2E4 /* 3729B8 E006E228 46200020 */ cvt.s.d $f0, $f0 .LE006E22C: @@ -154,13 +154,13 @@ glabel func_E006E000 /* 3729D0 E006E240 D434EC28 */ ldc1 $f20, %lo(D_E006EC28)($at) /* 3729D4 E006E244 46000021 */ cvt.d.s $f0, $f0 /* 3729D8 E006E248 46340002 */ mul.d $f0, $f0, $f20 -/* 3729DC E006E24C 00000000 */ nop +/* 3729DC E006E24C 00000000 */ nop /* 3729E0 E006E250 2442FFFB */ addiu $v0, $v0, -5 /* 3729E4 E006E254 44821000 */ mtc1 $v0, $f2 -/* 3729E8 E006E258 00000000 */ nop +/* 3729E8 E006E258 00000000 */ nop /* 3729EC E006E25C 468010A1 */ cvt.d.w $f2, $f2 /* 3729F0 E006E260 46220002 */ mul.d $f0, $f0, $f2 -/* 3729F4 E006E264 00000000 */ nop +/* 3729F4 E006E264 00000000 */ nop /* 3729F8 E006E268 2404000A */ addiu $a0, $zero, 0xa /* 3729FC E006E26C 26250004 */ addiu $a1, $s1, 4 /* 372A00 E006E270 46200020 */ cvt.s.d $f0, $f0 @@ -169,13 +169,13 @@ glabel func_E006E000 /* 372A0C E006E27C 4618D001 */ sub.s $f0, $f26, $f24 /* 372A10 E006E280 46000021 */ cvt.d.s $f0, $f0 /* 372A14 E006E284 46340002 */ mul.d $f0, $f0, $f20 -/* 372A18 E006E288 00000000 */ nop +/* 372A18 E006E288 00000000 */ nop /* 372A1C E006E28C 2442FFFB */ addiu $v0, $v0, -5 /* 372A20 E006E290 44821000 */ mtc1 $v0, $f2 -/* 372A24 E006E294 00000000 */ nop +/* 372A24 E006E294 00000000 */ nop /* 372A28 E006E298 468010A1 */ cvt.d.w $f2, $f2 /* 372A2C E006E29C 46220002 */ mul.d $f0, $f0, $f2 -/* 372A30 E006E2A0 00000000 */ nop +/* 372A30 E006E2A0 00000000 */ nop /* 372A34 E006E2A4 2404000A */ addiu $a0, $zero, 0xa /* 372A38 E006E2A8 26250005 */ addiu $a1, $s1, 5 /* 372A3C E006E2AC 46200020 */ cvt.s.d $f0, $f0 @@ -184,13 +184,13 @@ glabel func_E006E000 /* 372A48 E006E2B8 461CF001 */ sub.s $f0, $f30, $f28 /* 372A4C E006E2BC 46000021 */ cvt.d.s $f0, $f0 /* 372A50 E006E2C0 46340002 */ mul.d $f0, $f0, $f20 -/* 372A54 E006E2C4 00000000 */ nop +/* 372A54 E006E2C4 00000000 */ nop /* 372A58 E006E2C8 2442FFFB */ addiu $v0, $v0, -5 /* 372A5C E006E2CC 44821000 */ mtc1 $v0, $f2 -/* 372A60 E006E2D0 00000000 */ nop +/* 372A60 E006E2D0 00000000 */ nop /* 372A64 E006E2D4 468010A1 */ cvt.d.w $f2, $f2 /* 372A68 E006E2D8 46220002 */ mul.d $f0, $f0, $f2 -/* 372A6C E006E2DC 00000000 */ nop +/* 372A6C E006E2DC 00000000 */ nop /* 372A70 E006E2E0 46200020 */ cvt.s.d $f0, $f0 .LE006E2E4: /* 372A74 E006E2E4 E6000058 */ swc1 $f0, 0x58($s0) diff --git a/asm/nonmatchings/code_372790/func_E006E354.s b/asm/nonmatchings/code_372790/func_E006E354.s index 3890d395f0..c122d3fc41 100644 --- a/asm/nonmatchings/code_372790/func_E006E354.s +++ b/asm/nonmatchings/code_372790/func_E006E354.s @@ -3,4 +3,4 @@ glabel func_E006E354 /* 372AE4 E006E354 03E00008 */ jr $ra -/* 372AE8 E006E358 00000000 */ nop +/* 372AE8 E006E358 00000000 */ nop diff --git a/asm/nonmatchings/code_372790/func_E006E35C.s b/asm/nonmatchings/code_372790/func_E006E35C.s index a4c442a501..18b3b179b3 100644 --- a/asm/nonmatchings/code_372790/func_E006E35C.s +++ b/asm/nonmatchings/code_372790/func_E006E35C.s @@ -14,7 +14,7 @@ glabel func_E006E35C /* 372B10 E006E380 46800020 */ cvt.s.w $f0, $f0 /* 372B14 E006E384 8E020048 */ lw $v0, 0x48($s0) /* 372B18 E006E388 46020002 */ mul.s $f0, $f0, $f2 -/* 372B1C E006E38C 00000000 */ nop +/* 372B1C E006E38C 00000000 */ nop /* 372B20 E006E390 2442FFFF */ addiu $v0, $v0, -1 /* 372B24 E006E394 AE020048 */ sw $v0, 0x48($s0) /* 372B28 E006E398 8E02004C */ lw $v0, 0x4c($s0) @@ -27,9 +27,9 @@ glabel func_E006E35C /* 372B44 E006E3B4 04410005 */ bgez $v0, .LE006E3CC /* 372B48 E006E3B8 E600005C */ swc1 $f0, 0x5c($s0) /* 372B4C E006E3BC 0C080128 */ jal func_E02004A0 -/* 372B50 E006E3C0 00000000 */ nop +/* 372B50 E006E3C0 00000000 */ nop /* 372B54 E006E3C4 0801B9B3 */ j .LE006E6CC -/* 372B58 E006E3C8 00000000 */ nop +/* 372B58 E006E3C8 00000000 */ nop .LE006E3CC: /* 372B5C E006E3CC 0040882D */ daddu $s1, $v0, $zero /* 372B60 E006E3D0 8E120044 */ lw $s2, 0x44($s0) @@ -38,7 +38,7 @@ glabel func_E006E35C /* 372B6C E006E3DC 0060202D */ daddu $a0, $v1, $zero /* 372B70 E006E3E0 8E020000 */ lw $v0, ($s0) /* 372B74 E006E3E4 1440000E */ bnez $v0, .LE006E420 -/* 372B78 E006E3E8 00000000 */ nop +/* 372B78 E006E3E8 00000000 */ nop /* 372B7C E006E3EC C6000038 */ lwc1 $f0, 0x38($s0) /* 372B80 E006E3F0 3C014004 */ lui $at, 0x4004 /* 372B84 E006E3F4 44811800 */ mtc1 $at, $f3 @@ -48,7 +48,7 @@ glabel func_E006E35C /* 372B94 E006E404 3C01E007 */ lui $at, %hi(D_E006EC30) /* 372B98 E006E408 D424EC30 */ ldc1 $f4, %lo(D_E006EC30)($at) /* 372B9C E006E40C 46241082 */ mul.d $f2, $f2, $f4 -/* 372BA0 E006E410 00000000 */ nop +/* 372BA0 E006E410 00000000 */ nop /* 372BA4 E006E414 46220000 */ add.d $f0, $f0, $f2 /* 372BA8 E006E418 46200020 */ cvt.s.d $f0, $f0 /* 372BAC E006E41C E6000038 */ swc1 $f0, 0x38($s0) @@ -59,26 +59,26 @@ glabel func_E006E35C /* 372BBC E006E42C C6000050 */ lwc1 $f0, 0x50($s0) /* 372BC0 E006E430 46003180 */ add.s $f6, $f6, $f0 /* 372BC4 E006E434 44847000 */ mtc1 $a0, $f14 -/* 372BC8 E006E438 00000000 */ nop +/* 372BC8 E006E438 00000000 */ nop /* 372BCC E006E43C 468073A0 */ cvt.s.w $f14, $f14 /* 372BD0 E006E440 460E3182 */ mul.s $f6, $f6, $f14 -/* 372BD4 E006E444 00000000 */ nop +/* 372BD4 E006E444 00000000 */ nop /* 372BD8 E006E448 C6040028 */ lwc1 $f4, 0x28($s0) /* 372BDC E006E44C C60A001C */ lwc1 $f10, 0x1c($s0) /* 372BE0 E006E450 460A2101 */ sub.s $f4, $f4, $f10 /* 372BE4 E006E454 C6000054 */ lwc1 $f0, 0x54($s0) /* 372BE8 E006E458 46002100 */ add.s $f4, $f4, $f0 /* 372BEC E006E45C 460E2102 */ mul.s $f4, $f4, $f14 -/* 372BF0 E006E460 00000000 */ nop +/* 372BF0 E006E460 00000000 */ nop /* 372BF4 E006E464 C6080020 */ lwc1 $f8, 0x20($s0) /* 372BF8 E006E468 C600002C */ lwc1 $f0, 0x2c($s0) /* 372BFC E006E46C 46080001 */ sub.s $f0, $f0, $f8 /* 372C00 E006E470 C6020058 */ lwc1 $f2, 0x58($s0) /* 372C04 E006E474 46020000 */ add.s $f0, $f0, $f2 /* 372C08 E006E478 460E0002 */ mul.s $f0, $f0, $f14 -/* 372C0C E006E47C 00000000 */ nop +/* 372C0C E006E47C 00000000 */ nop /* 372C10 E006E480 44921000 */ mtc1 $s2, $f2 -/* 372C14 E006E484 00000000 */ nop +/* 372C14 E006E484 00000000 */ nop /* 372C18 E006E488 468010A0 */ cvt.s.w $f2, $f2 /* 372C1C E006E48C 46023183 */ div.s $f6, $f6, $f2 /* 372C20 E006E490 46066300 */ add.s $f12, $f12, $f6 @@ -96,7 +96,7 @@ glabel func_E006E35C /* 372C50 E006E4C0 D420EC38 */ ldc1 $f0, %lo(D_E006EC38)($at) /* 372C54 E006E4C4 460070A1 */ cvt.d.s $f2, $f14 /* 372C58 E006E4C8 46201082 */ mul.d $f2, $f2, $f0 -/* 372C5C E006E4CC 00000000 */ nop +/* 372C5C E006E4CC 00000000 */ nop /* 372C60 E006E4D0 C6000060 */ lwc1 $f0, 0x60($s0) /* 372C64 E006E4D4 46000021 */ cvt.d.s $f0, $f0 /* 372C68 E006E4D8 46220000 */ add.d $f0, $f0, $f2 @@ -163,7 +163,7 @@ glabel func_E006E35C /* 372D58 E006E5C8 2A22000A */ slti $v0, $s1, 0xa .LE006E5CC: /* 372D5C E006E5CC 10400008 */ beqz $v0, .LE006E5F0 -/* 372D60 E006E5D0 00000000 */ nop +/* 372D60 E006E5D0 00000000 */ nop /* 372D64 E006E5D4 8E020000 */ lw $v0, ($s0) /* 372D68 E006E5D8 14400005 */ bnez $v0, .LE006E5F0 /* 372D6C E006E5DC 00111040 */ sll $v0, $s1, 1 @@ -187,7 +187,7 @@ glabel func_E006E35C /* 372DAC E006E61C 16410004 */ bne $s2, $at, .LE006E630 /* 372DB0 E006E620 3C018000 */ lui $at, 0x8000 /* 372DB4 E006E624 14410002 */ bne $v0, $at, .LE006E630 -/* 372DB8 E006E628 00000000 */ nop +/* 372DB8 E006E628 00000000 */ nop /* 372DBC E006E62C 0006000D */ break 6 .LE006E630: /* 372DC0 E006E630 00001012 */ mflo $v0 @@ -199,7 +199,7 @@ glabel func_E006E35C /* 372DD8 E006E648 3C01E007 */ lui $at, %hi(D_E006EC48) /* 372DDC E006E64C D424EC48 */ ldc1 $f4, %lo(D_E006EC48)($at) /* 372DE0 E006E650 46241082 */ mul.d $f2, $f2, $f4 -/* 372DE4 E006E654 00000000 */ nop +/* 372DE4 E006E654 00000000 */ nop /* 372DE8 E006E658 46220000 */ add.d $f0, $f0, $f2 /* 372DEC E006E65C 46200020 */ cvt.s.d $f0, $f0 /* 372DF0 E006E660 E6000038 */ swc1 $f0, 0x38($s0) @@ -219,7 +219,7 @@ glabel func_E006E35C /* 372E20 E006E690 16410004 */ bne $s2, $at, .LE006E6A4 /* 372E24 E006E694 3C018000 */ lui $at, 0x8000 /* 372E28 E006E698 14410002 */ bne $v0, $at, .LE006E6A4 -/* 372E2C E006E69C 00000000 */ nop +/* 372E2C E006E69C 00000000 */ nop /* 372E30 E006E6A0 0006000D */ break 6 .LE006E6A4: /* 372E34 E006E6A4 00001012 */ mflo $v0 @@ -228,7 +228,7 @@ glabel func_E006E35C /* 372E40 E006E6B0 46020001 */ sub.s $f0, $f0, $f2 /* 372E44 E006E6B4 C604003C */ lwc1 $f4, 0x3c($s0) /* 372E48 E006E6B8 46040002 */ mul.s $f0, $f0, $f4 -/* 372E4C E006E6BC 00000000 */ nop +/* 372E4C E006E6BC 00000000 */ nop /* 372E50 E006E6C0 46001080 */ add.s $f2, $f2, $f0 /* 372E54 E006E6C4 E6020038 */ swc1 $f2, 0x38($s0) /* 372E58 E006E6C8 AE020040 */ sw $v0, 0x40($s0) diff --git a/asm/nonmatchings/code_372790/func_E006E6E4.s b/asm/nonmatchings/code_372790/func_E006E6E4.s index eb1ca35604..9d2fd0e4e6 100644 --- a/asm/nonmatchings/code_372790/func_E006E6E4.s +++ b/asm/nonmatchings/code_372790/func_E006E6E4.s @@ -18,7 +18,7 @@ glabel func_E006E6E4 /* 372EA8 E006E718 C4A00014 */ lwc1 $f0, 0x14($a1) /* 372EAC E006E71C 3C01447A */ lui $at, 0x447a /* 372EB0 E006E720 44811000 */ mtc1 $at, $f2 -/* 372EB4 E006E724 00000000 */ nop +/* 372EB4 E006E724 00000000 */ nop /* 372EB8 E006E728 46020000 */ add.s $f0, $f0, $f2 /* 372EBC E006E72C 4600010D */ trunc.w.s $f4, $f0 /* 372EC0 E006E730 E7A40014 */ swc1 $f4, 0x14($sp) diff --git a/asm/nonmatchings/code_372790/func_E006E764.s b/asm/nonmatchings/code_372790/func_E006E764.s index 35dfa32531..50c374cae1 100644 --- a/asm/nonmatchings/code_372790/func_E006E764.s +++ b/asm/nonmatchings/code_372790/func_E006E764.s @@ -38,9 +38,9 @@ glabel func_E006E764 /* 372F78 E006E7E8 3C02E700 */ lui $v0, 0xe700 /* 372F7C E006E7EC 4600110D */ trunc.w.s $f4, $f2 /* 372F80 E006E7F0 44162000 */ mfc1 $s6, $f4 -/* 372F84 E006E7F4 00000000 */ nop +/* 372F84 E006E7F4 00000000 */ nop /* 372F88 E006E7F8 44960000 */ mtc1 $s6, $f0 -/* 372F8C E006E7FC 00000000 */ nop +/* 372F8C E006E7FC 00000000 */ nop /* 372F90 E006E800 46800020 */ cvt.s.w $f0, $f0 /* 372F94 E006E804 46001081 */ sub.s $f2, $f2, $f0 /* 372F98 E006E808 AC620000 */ sw $v0, ($v1) @@ -51,7 +51,7 @@ glabel func_E006E764 /* 372FAC E006E81C 44810000 */ mtc1 $at, $f0 /* 372FB0 E006E820 8C42001C */ lw $v0, 0x1c($v0) /* 372FB4 E006E824 46001082 */ mul.s $f2, $f2, $f0 -/* 372FB8 E006E828 00000000 */ nop +/* 372FB8 E006E828 00000000 */ nop /* 372FBC E006E82C 3C038000 */ lui $v1, 0x8000 /* 372FC0 E006E830 00431021 */ addu $v0, $v0, $v1 /* 372FC4 E006E834 ACA20004 */ sw $v0, 4($a1) @@ -296,5 +296,5 @@ glabel func_E006E764 /* 37337C E006EBEC D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 373380 E006EBF0 03E00008 */ jr $ra /* 373384 E006EBF4 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 373388 E006EBF8 00000000 */ nop -/* 37338C E006EBFC 00000000 */ nop +/* 373388 E006EBF8 00000000 */ nop +/* 37338C E006EBFC 00000000 */ nop diff --git a/asm/nonmatchings/code_376460/func_E00741E8.s b/asm/nonmatchings/code_376460/func_E00741E8.s index bd9fe761c2..d12ac5af24 100644 --- a/asm/nonmatchings/code_376460/func_E00741E8.s +++ b/asm/nonmatchings/code_376460/func_E00741E8.s @@ -39,7 +39,7 @@ glabel func_E00741E8 /* 3766C8 E0074268 0C080128 */ jal func_E02004A0 /* 3766CC E007426C 0240202D */ daddu $a0, $s2, $zero /* 3766D0 E0074270 0801D159 */ j .LE0074564 -/* 3766D4 E0074274 00000000 */ nop +/* 3766D4 E0074274 00000000 */ nop .LE0074278: /* 3766D8 E0074278 28820008 */ slti $v0, $a0, 8 /* 3766DC E007427C 10400002 */ beqz $v0, .LE0074288 @@ -74,18 +74,18 @@ glabel func_E00741E8 /* 376744 E00742E4 0442009B */ bltzl $v0, .LE0074554 /* 376748 E00742E8 26310001 */ addiu $s1, $s1, 1 /* 37674C E00742EC 14400055 */ bnez $v0, .LE0074444 -/* 376750 E00742F0 00000000 */ nop +/* 376750 E00742F0 00000000 */ nop /* 376754 E00742F4 0C080138 */ jal func_E02004E0 /* 376758 E00742F8 24040167 */ addiu $a0, $zero, 0x167 /* 37675C E00742FC 4482A000 */ mtc1 $v0, $f20 -/* 376760 E0074300 00000000 */ nop +/* 376760 E0074300 00000000 */ nop /* 376764 E0074304 4680A520 */ cvt.s.w $f20, $f20 /* 376768 E0074308 0C080138 */ jal func_E02004E0 /* 37676C E007430C 24040167 */ addiu $a0, $zero, 0x167 /* 376770 E0074310 0C080140 */ jal func_E0200500 /* 376774 E0074314 4600A306 */ mov.s $f12, $f20 /* 376778 E0074318 4600F002 */ mul.s $f0, $f30, $f0 -/* 37677C E007431C 00000000 */ nop +/* 37677C E007431C 00000000 */ nop /* 376780 E0074320 C7BC0010 */ lwc1 $f28, 0x10($sp) /* 376784 E0074324 4600E70D */ trunc.w.s $f28, $f28 /* 376788 E0074328 4404E000 */ mfc1 $a0, $f28 @@ -94,9 +94,9 @@ glabel func_E00741E8 /* 376794 E0074334 C7BC0010 */ lwc1 $f28, 0x10($sp) /* 376798 E0074338 4600E0A1 */ cvt.d.s $f2, $f28 /* 37679C E007433C 46381082 */ mul.d $f2, $f2, $f24 -/* 3767A0 E0074340 00000000 */ nop +/* 3767A0 E0074340 00000000 */ nop /* 3767A4 E0074344 44820000 */ mtc1 $v0, $f0 -/* 3767A8 E0074348 00000000 */ nop +/* 3767A8 E0074348 00000000 */ nop /* 3767AC E007434C 46800021 */ cvt.d.w $f0, $f0 /* 3767B0 E0074350 46220001 */ sub.d $f0, $f0, $f2 /* 3767B4 E0074354 4600A306 */ mov.s $f12, $f20 @@ -104,7 +104,7 @@ glabel func_E00741E8 /* 3767BC E007435C 0C080144 */ jal func_E0200510 /* 3767C0 E0074360 E600FFE8 */ swc1 $f0, -0x18($s0) /* 3767C4 E0074364 4600F002 */ mul.s $f0, $f30, $f0 -/* 3767C8 E0074368 00000000 */ nop +/* 3767C8 E0074368 00000000 */ nop /* 3767CC E007436C 4600A306 */ mov.s $f12, $f20 /* 3767D0 E0074370 0C080140 */ jal func_E0200500 /* 3767D4 E0074374 E600FFEC */ swc1 $f0, -0x14($s0) @@ -113,12 +113,12 @@ glabel func_E00741E8 /* 3767E0 E0074380 D4244BF8 */ ldc1 $f4, %lo(D_E0074BF8)($at) /* 3767E4 E0074384 460010A1 */ cvt.d.s $f2, $f2 /* 3767E8 E0074388 46241082 */ mul.d $f2, $f2, $f4 -/* 3767EC E007438C 00000000 */ nop +/* 3767EC E007438C 00000000 */ nop /* 3767F0 E0074390 3C014170 */ lui $at, 0x4170 /* 3767F4 E0074394 4481E000 */ mtc1 $at, $f28 -/* 3767F8 E0074398 00000000 */ nop +/* 3767F8 E0074398 00000000 */ nop /* 3767FC E007439C 461C0002 */ mul.s $f0, $f0, $f28 -/* 376800 E00743A0 00000000 */ nop +/* 376800 E00743A0 00000000 */ nop /* 376804 E00743A4 4600A306 */ mov.s $f12, $f20 /* 376808 E00743A8 E600FFF8 */ swc1 $f0, -8($s0) /* 37680C E00743AC 462010A0 */ cvt.s.d $f2, $f2 @@ -127,17 +127,17 @@ glabel func_E00741E8 /* 376818 E00743B8 C604FFF8 */ lwc1 $f4, -8($s0) /* 37681C E00743BC 46002121 */ cvt.d.s $f4, $f4 /* 376820 E00743C0 46382102 */ mul.d $f4, $f4, $f24 -/* 376824 E00743C4 00000000 */ nop +/* 376824 E00743C4 00000000 */ nop /* 376828 E00743C8 C602FFFC */ lwc1 $f2, -4($s0) /* 37682C E00743CC 460010A1 */ cvt.d.s $f2, $f2 /* 376830 E00743D0 46381082 */ mul.d $f2, $f2, $f24 -/* 376834 E00743D4 00000000 */ nop +/* 376834 E00743D4 00000000 */ nop /* 376838 E00743D8 461C0002 */ mul.s $f0, $f0, $f28 -/* 37683C E00743DC 00000000 */ nop +/* 37683C E00743DC 00000000 */ nop /* 376840 E00743E0 E6000000 */ swc1 $f0, ($s0) /* 376844 E00743E4 46000021 */ cvt.d.s $f0, $f0 /* 376848 E00743E8 46380002 */ mul.d $f0, $f0, $f24 -/* 37684C E00743EC 00000000 */ nop +/* 37684C E00743EC 00000000 */ nop /* 376850 E00743F0 2404000F */ addiu $a0, $zero, 0xf /* 376854 E00743F4 46202120 */ cvt.s.d $f4, $f4 /* 376858 E00743F8 462010A0 */ cvt.s.d $f2, $f2 @@ -148,12 +148,12 @@ glabel func_E00741E8 /* 37686C E007440C E600000C */ swc1 $f0, 0xc($s0) /* 376870 E0074410 2404000F */ addiu $a0, $zero, 0xf /* 376874 E0074414 44820000 */ mtc1 $v0, $f0 -/* 376878 E0074418 00000000 */ nop +/* 376878 E0074418 00000000 */ nop /* 37687C E007441C 46800020 */ cvt.s.w $f0, $f0 /* 376880 E0074420 0C080138 */ jal func_E02004E0 /* 376884 E0074424 E6000044 */ swc1 $f0, 0x44($s0) /* 376888 E0074428 44820000 */ mtc1 $v0, $f0 -/* 37688C E007442C 00000000 */ nop +/* 37688C E007442C 00000000 */ nop /* 376890 E0074430 46800020 */ cvt.s.w $f0, $f0 /* 376894 E0074434 240200FF */ addiu $v0, $zero, 0xff /* 376898 E0074438 E6000048 */ swc1 $f0, 0x48($s0) @@ -165,20 +165,20 @@ glabel func_E00741E8 /* 3768AC E007444C 46105281 */ sub.s $f10, $f10, $f16 /* 3768B0 E0074450 460052A1 */ cvt.d.s $f10, $f10 /* 3768B4 E0074454 463A5282 */ mul.d $f10, $f10, $f26 -/* 3768B8 E0074458 00000000 */ nop +/* 3768B8 E0074458 00000000 */ nop /* 3768BC E007445C C60EFFFC */ lwc1 $f14, -4($s0) /* 3768C0 E0074460 C60C0008 */ lwc1 $f12, 8($s0) /* 3768C4 E0074464 460E6301 */ sub.s $f12, $f12, $f14 /* 3768C8 E0074468 46006321 */ cvt.d.s $f12, $f12 /* 3768CC E007446C 463A6302 */ mul.d $f12, $f12, $f26 -/* 3768D0 E0074470 00000000 */ nop +/* 3768D0 E0074470 00000000 */ nop /* 3768D4 E0074474 C6060000 */ lwc1 $f6, ($s0) /* 3768D8 E0074478 C608000C */ lwc1 $f8, 0xc($s0) /* 3768DC E007447C 46064201 */ sub.s $f8, $f8, $f6 /* 3768E0 E0074480 8E020010 */ lw $v0, 0x10($s0) /* 3768E4 E0074484 46004221 */ cvt.d.s $f8, $f8 /* 3768E8 E0074488 463A4202 */ mul.d $f8, $f8, $f26 -/* 3768EC E007448C 00000000 */ nop +/* 3768EC E007448C 00000000 */ nop /* 3768F0 E0074490 C6000014 */ lwc1 $f0, 0x14($s0) /* 3768F4 E0074494 3C014080 */ lui $at, 0x4080 /* 3768F8 E0074498 44811000 */ mtc1 $at, $f2 diff --git a/asm/nonmatchings/code_377070/func_E0076000.s b/asm/nonmatchings/code_377070/func_E0076000.s index 148a0b1282..0632ae5c71 100644 --- a/asm/nonmatchings/code_377070/func_E0076000.s +++ b/asm/nonmatchings/code_377070/func_E0076000.s @@ -40,7 +40,7 @@ glabel func_E0076000 /* 3770FC E007608C AE22000C */ sw $v0, 0xc($s1) .LE0076090: /* 377100 E0076090 0801D824 */ j .LE0076090 -/* 377104 E0076094 00000000 */ nop +/* 377104 E0076094 00000000 */ nop .LE0076098: /* 377108 E0076098 AC600064 */ sw $zero, 0x64($v1) /* 37710C E007609C C46A0064 */ lwc1 $f10, 0x64($v1) @@ -64,12 +64,12 @@ glabel func_E0076000 /* 377154 E00760E4 12000007 */ beqz $s0, .LE0076104 /* 377158 E00760E8 2402004B */ addiu $v0, $zero, 0x4b /* 37715C E00760EC 0801D8A4 */ j .LE0076290 -/* 377160 E00760F0 00000000 */ nop +/* 377160 E00760F0 00000000 */ nop .LE00760F4: /* 377164 E00760F4 12020045 */ beq $s0, $v0, .LE007620C /* 377168 E00760F8 24020019 */ addiu $v0, $zero, 0x19 /* 37716C E00760FC 0801D8A4 */ j .LE0076290 -/* 377170 E0076100 00000000 */ nop +/* 377170 E0076100 00000000 */ nop .LE0076104: /* 377174 E0076104 A0620068 */ sb $v0, 0x68($v1) /* 377178 E0076108 A0620069 */ sb $v0, 0x69($v1) @@ -88,7 +88,7 @@ glabel func_E0076000 /* 3771AC E007613C 34216666 */ ori $at, $at, 0x6666 /* 3771B0 E0076140 44814000 */ mtc1 $at, $f8 /* 3771B4 E0076144 46220082 */ mul.d $f2, $f0, $f2 -/* 3771B8 E0076148 00000000 */ nop +/* 3771B8 E0076148 00000000 */ nop /* 3771BC E007614C A062006B */ sb $v0, 0x6b($v1) /* 3771C0 E0076150 240200F7 */ addiu $v0, $zero, 0xf7 /* 3771C4 E0076154 A062006C */ sb $v0, 0x6c($v1) diff --git a/asm/nonmatchings/code_377070/func_E0076370.s b/asm/nonmatchings/code_377070/func_E0076370.s index 99f9635a82..4ae1e23c42 100644 --- a/asm/nonmatchings/code_377070/func_E0076370.s +++ b/asm/nonmatchings/code_377070/func_E0076370.s @@ -3,4 +3,4 @@ glabel func_E0076370 /* 3773E0 E0076370 03E00008 */ jr $ra -/* 3773E4 E0076374 00000000 */ nop +/* 3773E4 E0076374 00000000 */ nop diff --git a/asm/nonmatchings/code_377070/func_E0076378.s b/asm/nonmatchings/code_377070/func_E0076378.s index 611f40dd17..826f9cd9ae 100644 --- a/asm/nonmatchings/code_377070/func_E0076378.s +++ b/asm/nonmatchings/code_377070/func_E0076378.s @@ -34,9 +34,9 @@ glabel func_E0076378 /* 377450 E00763E0 04410005 */ bgez $v0, .LE00763F8 /* 377454 E00763E4 0040382D */ daddu $a3, $v0, $zero /* 377458 E00763E8 0C080128 */ jal func_E02004A0 -/* 37745C E00763EC 00000000 */ nop +/* 37745C E00763EC 00000000 */ nop /* 377460 E00763F0 0801D9FF */ j .LE00767FC -/* 377464 E00763F4 00000000 */ nop +/* 377464 E00763F4 00000000 */ nop .LE00763F8: /* 377468 E00763F8 8CA60000 */ lw $a2, ($a1) /* 37746C E00763FC 8CA40030 */ lw $a0, 0x30($a1) @@ -51,12 +51,12 @@ glabel func_E0076378 /* 377490 E0076420 44800000 */ mtc1 $zero, $f0 /* 377494 E0076424 00431023 */ subu $v0, $v0, $v1 /* 377498 E0076428 44821000 */ mtc1 $v0, $f2 -/* 37749C E007642C 00000000 */ nop +/* 37749C E007642C 00000000 */ nop /* 3774A0 E0076430 468010A1 */ cvt.d.w $f2, $f2 /* 3774A4 E0076434 46201082 */ mul.d $f2, $f2, $f0 -/* 3774A8 E0076438 00000000 */ nop +/* 3774A8 E0076438 00000000 */ nop /* 3774AC E007643C 44830000 */ mtc1 $v1, $f0 -/* 3774B0 E0076440 00000000 */ nop +/* 3774B0 E0076440 00000000 */ nop /* 3774B4 E0076444 46800021 */ cvt.d.w $f0, $f0 /* 3774B8 E0076448 46220000 */ add.d $f0, $f0, $f2 /* 3774BC E007644C 4620048D */ trunc.w.d $f18, $f0 @@ -79,19 +79,19 @@ glabel func_E0076378 /* 3774F8 E0076488 28E2000A */ slti $v0, $a3, 0xa .LE007648C: /* 3774FC E007648C 1040000A */ beqz $v0, .LE00764B8 -/* 377500 E0076490 00000000 */ nop +/* 377500 E0076490 00000000 */ nop /* 377504 E0076494 3C013FE0 */ lui $at, 0x3fe0 /* 377508 E0076498 44811800 */ mtc1 $at, $f3 /* 37750C E007649C 44801000 */ mtc1 $zero, $f2 /* 377510 E00764A0 C4A00028 */ lwc1 $f0, 0x28($a1) /* 377514 E00764A4 46800021 */ cvt.d.w $f0, $f0 /* 377518 E00764A8 46220002 */ mul.d $f0, $f0, $f2 -/* 37751C E00764AC 00000000 */ nop +/* 37751C E00764AC 00000000 */ nop /* 377520 E00764B0 4620048D */ trunc.w.d $f18, $f0 /* 377524 E00764B4 E4B20028 */ swc1 $f18, 0x28($a1) .LE00764B8: /* 377528 E00764B8 14C0002E */ bnez $a2, .LE0076574 -/* 37752C E00764BC 00000000 */ nop +/* 37752C E00764BC 00000000 */ nop /* 377530 E00764C0 C4AE0038 */ lwc1 $f14, 0x38($a1) /* 377534 E00764C4 C4AA003C */ lwc1 $f10, 0x3c($a1) /* 377538 E00764C8 460E5281 */ sub.s $f10, $f10, $f14 @@ -99,13 +99,13 @@ glabel func_E0076378 /* 377540 E00764D0 D4206EE8 */ ldc1 $f0, %lo(D_E0076EE8)($at) /* 377544 E00764D4 460052A1 */ cvt.d.s $f10, $f10 /* 377548 E00764D8 46205282 */ mul.d $f10, $f10, $f0 -/* 37754C E00764DC 00000000 */ nop +/* 37754C E00764DC 00000000 */ nop /* 377550 E00764E0 C4AC0044 */ lwc1 $f12, 0x44($a1) /* 377554 E00764E4 C4A40048 */ lwc1 $f4, 0x48($a1) /* 377558 E00764E8 460C2101 */ sub.s $f4, $f4, $f12 /* 37755C E00764EC 46002121 */ cvt.d.s $f4, $f4 /* 377560 E00764F0 46202102 */ mul.d $f4, $f4, $f0 -/* 377564 E00764F4 00000000 */ nop +/* 377564 E00764F4 00000000 */ nop /* 377568 E00764F8 C4A8001C */ lwc1 $f8, 0x1c($a1) /* 37756C E00764FC C4A60024 */ lwc1 $f6, 0x24($a1) /* 377570 E0076500 46083181 */ sub.s $f6, $f6, $f8 @@ -113,13 +113,13 @@ glabel func_E0076378 /* 377578 E0076508 D4306EF0 */ ldc1 $f16, %lo(D_E0076EF0)($at) /* 37757C E007650C 460031A1 */ cvt.d.s $f6, $f6 /* 377580 E0076510 46303182 */ mul.d $f6, $f6, $f16 -/* 377584 E0076514 00000000 */ nop +/* 377584 E0076514 00000000 */ nop /* 377588 E0076518 C4A20020 */ lwc1 $f2, 0x20($a1) /* 37758C E007651C C4A00024 */ lwc1 $f0, 0x24($a1) /* 377590 E0076520 46020001 */ sub.s $f0, $f0, $f2 /* 377594 E0076524 46000021 */ cvt.d.s $f0, $f0 /* 377598 E0076528 46300002 */ mul.d $f0, $f0, $f16 -/* 37759C E007652C 00000000 */ nop +/* 37759C E007652C 00000000 */ nop /* 3775A0 E0076530 460073A1 */ cvt.d.s $f14, $f14 /* 3775A4 E0076534 462A7380 */ add.d $f14, $f14, $f10 /* 3775A8 E0076538 46006321 */ cvt.d.s $f12, $f12 @@ -145,25 +145,25 @@ glabel func_E0076378 /* 3775F4 E0076584 D4306EF8 */ ldc1 $f16, %lo(D_E0076EF8)($at) /* 3775F8 E0076588 460052A1 */ cvt.d.s $f10, $f10 /* 3775FC E007658C 46305282 */ mul.d $f10, $f10, $f16 -/* 377600 E0076590 00000000 */ nop +/* 377600 E0076590 00000000 */ nop /* 377604 E0076594 C4AC0044 */ lwc1 $f12, 0x44($a1) /* 377608 E0076598 C4A20048 */ lwc1 $f2, 0x48($a1) /* 37760C E007659C 460C1081 */ sub.s $f2, $f2, $f12 /* 377610 E00765A0 460010A1 */ cvt.d.s $f2, $f2 /* 377614 E00765A4 46301082 */ mul.d $f2, $f2, $f16 -/* 377618 E00765A8 00000000 */ nop +/* 377618 E00765A8 00000000 */ nop /* 37761C E00765AC C4A80050 */ lwc1 $f8, 0x50($a1) /* 377620 E00765B0 C4A40054 */ lwc1 $f4, 0x54($a1) /* 377624 E00765B4 46082101 */ sub.s $f4, $f4, $f8 /* 377628 E00765B8 46002121 */ cvt.d.s $f4, $f4 /* 37762C E00765BC 46302102 */ mul.d $f4, $f4, $f16 -/* 377630 E00765C0 00000000 */ nop +/* 377630 E00765C0 00000000 */ nop /* 377634 E00765C4 C4A6005C */ lwc1 $f6, 0x5c($a1) /* 377638 E00765C8 C4A00060 */ lwc1 $f0, 0x60($a1) /* 37763C E00765CC 46060001 */ sub.s $f0, $f0, $f6 /* 377640 E00765D0 46000021 */ cvt.d.s $f0, $f0 /* 377644 E00765D4 46300002 */ mul.d $f0, $f0, $f16 -/* 377648 E00765D8 00000000 */ nop +/* 377648 E00765D8 00000000 */ nop /* 37764C E00765DC 460073A1 */ cvt.d.s $f14, $f14 /* 377650 E00765E0 462A7380 */ add.d $f14, $f14, $f10 /* 377654 E00765E4 46006321 */ cvt.d.s $f12, $f12 @@ -185,9 +185,9 @@ glabel func_E0076378 /* 377690 E0076620 C4A20038 */ lwc1 $f2, 0x38($a1) /* 377694 E0076624 46020080 */ add.s $f2, $f0, $f2 /* 377698 E0076628 44800000 */ mtc1 $zero, $f0 -/* 37769C E007662C 00000000 */ nop +/* 37769C E007662C 00000000 */ nop /* 3776A0 E0076630 4600103C */ c.lt.s $f2, $f0 -/* 3776A4 E0076634 00000000 */ nop +/* 3776A4 E0076634 00000000 */ nop /* 3776A8 E0076638 45000005 */ bc1f .LE0076650 /* 3776AC E007663C E4A20034 */ swc1 $f2, 0x34($a1) /* 3776B0 E0076640 3C014280 */ lui $at, 0x4280 @@ -197,11 +197,11 @@ glabel func_E0076378 .LE0076650: /* 3776C0 E0076650 3C014280 */ lui $at, 0x4280 /* 3776C4 E0076654 44810000 */ mtc1 $at, $f0 -/* 3776C8 E0076658 00000000 */ nop +/* 3776C8 E0076658 00000000 */ nop /* 3776CC E007665C 4602003C */ c.lt.s $f0, $f2 -/* 3776D0 E0076660 00000000 */ nop +/* 3776D0 E0076660 00000000 */ nop /* 3776D4 E0076664 45000003 */ bc1f .LE0076674 -/* 3776D8 E0076668 00000000 */ nop +/* 3776D8 E0076668 00000000 */ nop /* 3776DC E007666C 46001001 */ sub.s $f0, $f2, $f0 .LE0076670: /* 3776E0 E0076670 E4A00034 */ swc1 $f0, 0x34($a1) @@ -210,9 +210,9 @@ glabel func_E0076378 /* 3776E8 E0076678 C4A20044 */ lwc1 $f2, 0x44($a1) /* 3776EC E007667C 46020080 */ add.s $f2, $f0, $f2 /* 3776F0 E0076680 44800000 */ mtc1 $zero, $f0 -/* 3776F4 E0076684 00000000 */ nop +/* 3776F4 E0076684 00000000 */ nop /* 3776F8 E0076688 4600103C */ c.lt.s $f2, $f0 -/* 3776FC E007668C 00000000 */ nop +/* 3776FC E007668C 00000000 */ nop /* 377700 E0076690 45000005 */ bc1f .LE00766A8 /* 377704 E0076694 E4A20040 */ swc1 $f2, 0x40($a1) /* 377708 E0076698 3C014300 */ lui $at, 0x4300 @@ -222,11 +222,11 @@ glabel func_E0076378 .LE00766A8: /* 377718 E00766A8 3C014300 */ lui $at, 0x4300 /* 37771C E00766AC 44810000 */ mtc1 $at, $f0 -/* 377720 E00766B0 00000000 */ nop +/* 377720 E00766B0 00000000 */ nop /* 377724 E00766B4 4602003C */ c.lt.s $f0, $f2 -/* 377728 E00766B8 00000000 */ nop +/* 377728 E00766B8 00000000 */ nop /* 37772C E00766BC 45000003 */ bc1f .LE00766CC -/* 377730 E00766C0 00000000 */ nop +/* 377730 E00766C0 00000000 */ nop /* 377734 E00766C4 46001001 */ sub.s $f0, $f2, $f0 .LE00766C8: /* 377738 E00766C8 E4A00040 */ swc1 $f0, 0x40($a1) @@ -235,9 +235,9 @@ glabel func_E0076378 /* 377740 E00766D0 C4A20050 */ lwc1 $f2, 0x50($a1) /* 377744 E00766D4 46020080 */ add.s $f2, $f0, $f2 /* 377748 E00766D8 44800000 */ mtc1 $zero, $f0 -/* 37774C E00766DC 00000000 */ nop +/* 37774C E00766DC 00000000 */ nop /* 377750 E00766E0 4600103C */ c.lt.s $f2, $f0 -/* 377754 E00766E4 00000000 */ nop +/* 377754 E00766E4 00000000 */ nop /* 377758 E00766E8 45000005 */ bc1f .LE0076700 /* 37775C E00766EC E4A2004C */ swc1 $f2, 0x4c($a1) /* 377760 E00766F0 3C014280 */ lui $at, 0x4280 @@ -247,11 +247,11 @@ glabel func_E0076378 .LE0076700: /* 377770 E0076700 3C014280 */ lui $at, 0x4280 /* 377774 E0076704 44810000 */ mtc1 $at, $f0 -/* 377778 E0076708 00000000 */ nop +/* 377778 E0076708 00000000 */ nop /* 37777C E007670C 4602003C */ c.lt.s $f0, $f2 -/* 377780 E0076710 00000000 */ nop +/* 377780 E0076710 00000000 */ nop /* 377784 E0076714 45000003 */ bc1f .LE0076724 -/* 377788 E0076718 00000000 */ nop +/* 377788 E0076718 00000000 */ nop /* 37778C E007671C 46001001 */ sub.s $f0, $f2, $f0 .LE0076720: /* 377790 E0076720 E4A0004C */ swc1 $f0, 0x4c($a1) @@ -260,9 +260,9 @@ glabel func_E0076378 /* 377798 E0076728 C4A2005C */ lwc1 $f2, 0x5c($a1) /* 37779C E007672C 46020080 */ add.s $f2, $f0, $f2 /* 3777A0 E0076730 44800000 */ mtc1 $zero, $f0 -/* 3777A4 E0076734 00000000 */ nop +/* 3777A4 E0076734 00000000 */ nop /* 3777A8 E0076738 4600103C */ c.lt.s $f2, $f0 -/* 3777AC E007673C 00000000 */ nop +/* 3777AC E007673C 00000000 */ nop /* 3777B0 E0076740 45000005 */ bc1f .LE0076758 /* 3777B4 E0076744 E4A20058 */ swc1 $f2, 0x58($a1) /* 3777B8 E0076748 3C014300 */ lui $at, 0x4300 @@ -272,11 +272,11 @@ glabel func_E0076378 .LE0076758: /* 3777C8 E0076758 3C014300 */ lui $at, 0x4300 /* 3777CC E007675C 44810000 */ mtc1 $at, $f0 -/* 3777D0 E0076760 00000000 */ nop +/* 3777D0 E0076760 00000000 */ nop /* 3777D4 E0076764 4602003C */ c.lt.s $f0, $f2 -/* 3777D8 E0076768 00000000 */ nop +/* 3777D8 E0076768 00000000 */ nop /* 3777DC E007676C 45000003 */ bc1f .LE007677C -/* 3777E0 E0076770 00000000 */ nop +/* 3777E0 E0076770 00000000 */ nop /* 3777E4 E0076774 46001001 */ sub.s $f0, $f2, $f0 .LE0076778: /* 3777E8 E0076778 E4A00058 */ swc1 $f0, 0x58($a1) @@ -288,19 +288,19 @@ glabel func_E0076378 /* 3777FC E007678C D42C6F00 */ ldc1 $f12, %lo(D_E0076F00)($at) /* 377800 E0076790 460031A1 */ cvt.d.s $f6, $f6 /* 377804 E0076794 462C3182 */ mul.d $f6, $f6, $f12 -/* 377808 E0076798 00000000 */ nop +/* 377808 E0076798 00000000 */ nop /* 37780C E007679C C4A80014 */ lwc1 $f8, 0x14($a1) /* 377810 E00767A0 C4A20008 */ lwc1 $f2, 8($a1) /* 377814 E00767A4 46081081 */ sub.s $f2, $f2, $f8 /* 377818 E00767A8 460010A1 */ cvt.d.s $f2, $f2 /* 37781C E00767AC 462C1082 */ mul.d $f2, $f2, $f12 -/* 377820 E00767B0 00000000 */ nop +/* 377820 E00767B0 00000000 */ nop /* 377824 E00767B4 C4A40018 */ lwc1 $f4, 0x18($a1) /* 377828 E00767B8 C4A0000C */ lwc1 $f0, 0xc($a1) /* 37782C E00767BC 46040001 */ sub.s $f0, $f0, $f4 /* 377830 E00767C0 46000021 */ cvt.d.s $f0, $f0 /* 377834 E00767C4 462C0002 */ mul.d $f0, $f0, $f12 -/* 377838 E00767C8 00000000 */ nop +/* 377838 E00767C8 00000000 */ nop /* 37783C E00767CC 460052A1 */ cvt.d.s $f10, $f10 /* 377840 E00767D0 46265280 */ add.d $f10, $f10, $f6 /* 377844 E00767D4 46004221 */ cvt.d.s $f8, $f8 diff --git a/asm/nonmatchings/code_377070/func_E007684C.s b/asm/nonmatchings/code_377070/func_E007684C.s index 5d507204ae..5f550c2641 100644 --- a/asm/nonmatchings/code_377070/func_E007684C.s +++ b/asm/nonmatchings/code_377070/func_E007684C.s @@ -3,4 +3,4 @@ glabel func_E007684C /* 3778BC E007684C 03E00008 */ jr $ra -/* 3778C0 E0076850 00000000 */ nop +/* 3778C0 E0076850 00000000 */ nop diff --git a/asm/nonmatchings/code_377070/func_E0076854.s b/asm/nonmatchings/code_377070/func_E0076854.s index 700fa70365..1bbcdc2270 100644 --- a/asm/nonmatchings/code_377070/func_E0076854.s +++ b/asm/nonmatchings/code_377070/func_E0076854.s @@ -3,4 +3,4 @@ glabel func_E0076854 /* 3778C4 E0076854 03E00008 */ jr $ra -/* 3778C8 E0076858 00000000 */ nop +/* 3778C8 E0076858 00000000 */ nop diff --git a/asm/nonmatchings/code_377070/func_E007685C.s b/asm/nonmatchings/code_377070/func_E007685C.s index 6a675c21a0..c15255f068 100644 --- a/asm/nonmatchings/code_377070/func_E007685C.s +++ b/asm/nonmatchings/code_377070/func_E007685C.s @@ -52,7 +52,7 @@ glabel func_E007685C /* 377988 E0076918 8E650064 */ lw $a1, 0x64($s3) /* 37798C E007691C 44060000 */ mfc1 $a2, $f0 /* 377990 E0076920 0801DA5C */ j .LE0076970 -/* 377994 E0076924 00000000 */ nop +/* 377994 E0076924 00000000 */ nop .LE0076928: /* 377998 E0076928 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 37799C E007692C 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -74,7 +74,7 @@ glabel func_E007685C /* 3779DC E007696C AFA60010 */ sw $a2, 0x10($sp) .LE0076970: /* 3779E0 E0076970 0C080104 */ jal func_E0200410 -/* 3779E4 E0076974 00000000 */ nop +/* 3779E4 E0076974 00000000 */ nop /* 3779E8 E0076978 27B40058 */ addiu $s4, $sp, 0x58 /* 3779EC E007697C 0280202D */ daddu $a0, $s4, $zero /* 3779F0 E0076980 27A50018 */ addiu $a1, $sp, 0x18 @@ -102,10 +102,10 @@ glabel func_E007685C /* 377A48 E00769D8 46000007 */ neg.s $f0, $f0 /* 377A4C E00769DC 46040003 */ div.s $f0, $f0, $f4 /* 377A50 E00769E0 46020002 */ mul.s $f0, $f0, $f2 -/* 377A54 E00769E4 00000000 */ nop +/* 377A54 E00769E4 00000000 */ nop /* 377A58 E00769E8 44050000 */ mfc1 $a1, $f0 /* 377A5C E00769EC 44800000 */ mtc1 $zero, $f0 -/* 377A60 E00769F0 00000000 */ nop +/* 377A60 E00769F0 00000000 */ nop /* 377A64 E00769F4 44060000 */ mfc1 $a2, $f0 /* 377A68 E00769F8 0280202D */ daddu $a0, $s4, $zero /* 377A6C E00769FC 0C080108 */ jal func_E0200420 @@ -176,7 +176,7 @@ glabel func_E007685C /* 377B6C E0076AFC 8E650064 */ lw $a1, 0x64($s3) /* 377B70 E0076B00 44060000 */ mfc1 $a2, $f0 /* 377B74 E0076B04 0801DAD5 */ j .LE0076B54 -/* 377B78 E0076B08 00000000 */ nop +/* 377B78 E0076B08 00000000 */ nop .LE0076B0C: /* 377B7C E0076B0C 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 377B80 E0076B10 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -198,7 +198,7 @@ glabel func_E007685C /* 377BC0 E0076B50 AFA60010 */ sw $a2, 0x10($sp) .LE0076B54: /* 377BC4 E0076B54 0C080104 */ jal func_E0200410 -/* 377BC8 E0076B58 00000000 */ nop +/* 377BC8 E0076B58 00000000 */ nop /* 377BCC E0076B5C 27B10058 */ addiu $s1, $sp, 0x58 /* 377BD0 E0076B60 0220202D */ daddu $a0, $s1, $zero /* 377BD4 E0076B64 27A50018 */ addiu $a1, $sp, 0x18 @@ -224,10 +224,10 @@ glabel func_E007685C /* 377C24 E0076BB4 46000007 */ neg.s $f0, $f0 /* 377C28 E0076BB8 46040003 */ div.s $f0, $f0, $f4 /* 377C2C E0076BBC 46020002 */ mul.s $f0, $f0, $f2 -/* 377C30 E0076BC0 00000000 */ nop +/* 377C30 E0076BC0 00000000 */ nop /* 377C34 E0076BC4 44050000 */ mfc1 $a1, $f0 /* 377C38 E0076BC8 44800000 */ mtc1 $zero, $f0 -/* 377C3C E0076BCC 00000000 */ nop +/* 377C3C E0076BCC 00000000 */ nop /* 377C40 E0076BD0 44060000 */ mfc1 $a2, $f0 /* 377C44 E0076BD4 0220202D */ daddu $a0, $s1, $zero /* 377C48 E0076BD8 0C080108 */ jal func_E0200420 @@ -318,13 +318,13 @@ glabel func_E007685C /* 377D98 E0076D28 ACA2001C */ sw $v0, 0x1c($a1) /* 377D9C E0076D2C C6620034 */ lwc1 $f2, 0x34($s3) /* 377DA0 E0076D30 46041082 */ mul.s $f2, $f2, $f4 -/* 377DA4 E0076D34 00000000 */ nop +/* 377DA4 E0076D34 00000000 */ nop /* 377DA8 E0076D38 3C06F200 */ lui $a2, 0xf200 /* 377DAC E0076D3C 3C040100 */ lui $a0, 0x100 /* 377DB0 E0076D40 C6600040 */ lwc1 $f0, 0x40($s3) /* 377DB4 E0076D44 24A20028 */ addiu $v0, $a1, 0x28 /* 377DB8 E0076D48 46040002 */ mul.s $f0, $f0, $f4 -/* 377DBC E0076D4C 00000000 */ nop +/* 377DBC E0076D4C 00000000 */ nop /* 377DC0 E0076D50 ACE20000 */ sw $v0, ($a3) /* 377DC4 E0076D54 24A20030 */ addiu $v0, $a1, 0x30 /* 377DC8 E0076D58 ACE20000 */ sw $v0, ($a3) @@ -354,13 +354,13 @@ glabel func_E007685C /* 377E28 E0076DB8 C662004C */ lwc1 $f2, 0x4c($s3) /* 377E2C E0076DBC 24A20038 */ addiu $v0, $a1, 0x38 /* 377E30 E0076DC0 46041082 */ mul.s $f2, $f2, $f4 -/* 377E34 E0076DC4 00000000 */ nop +/* 377E34 E0076DC4 00000000 */ nop /* 377E38 E0076DC8 ACE20000 */ sw $v0, ($a3) /* 377E3C E0076DCC C6600058 */ lwc1 $f0, 0x58($s3) /* 377E40 E0076DD0 24A20040 */ addiu $v0, $a1, 0x40 /* 377E44 E0076DD4 ACE20000 */ sw $v0, ($a3) /* 377E48 E0076DD8 46040002 */ mul.s $f0, $f0, $f4 -/* 377E4C E0076DDC 00000000 */ nop +/* 377E4C E0076DDC 00000000 */ nop /* 377E50 E0076DE0 24A20048 */ addiu $v0, $a1, 0x48 /* 377E54 E0076DE4 ACE20000 */ sw $v0, ($a3) /* 377E58 E0076DE8 ACA80038 */ sw $t0, 0x38($a1) @@ -402,6 +402,6 @@ glabel func_E007685C /* 377EE8 E0076E78 D7B400F8 */ ldc1 $f20, 0xf8($sp) /* 377EEC E0076E7C 03E00008 */ jr $ra /* 377EF0 E0076E80 27BD0100 */ addiu $sp, $sp, 0x100 -/* 377EF4 E0076E84 00000000 */ nop -/* 377EF8 E0076E88 00000000 */ nop -/* 377EFC E0076E8C 00000000 */ nop +/* 377EF4 E0076E84 00000000 */ nop +/* 377EF8 E0076E88 00000000 */ nop +/* 377EFC E0076E8C 00000000 */ nop diff --git a/asm/nonmatchings/code_37A3F0/func_E0078000.s b/asm/nonmatchings/code_37A3F0/func_E0078000.s index 943eb11429..10d9d9322b 100644 --- a/asm/nonmatchings/code_37A3F0/func_E0078000.s +++ b/asm/nonmatchings/code_37A3F0/func_E0078000.s @@ -39,7 +39,7 @@ glabel func_E0078000 /* 37A478 E0078088 AE22000C */ sw $v0, 0xc($s1) .LE007808C: /* 37A47C E007808C 0801E023 */ j .LE007808C -/* 37A480 E0078090 00000000 */ nop +/* 37A480 E0078090 00000000 */ nop .LE0078094: /* 37A484 E0078094 324200FF */ andi $v0, $s2, 0xff /* 37A488 E0078098 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_37A3F0/func_E0078124.s b/asm/nonmatchings/code_37A3F0/func_E0078124.s index 7f45141048..993212ef16 100644 --- a/asm/nonmatchings/code_37A3F0/func_E0078124.s +++ b/asm/nonmatchings/code_37A3F0/func_E0078124.s @@ -3,4 +3,4 @@ glabel func_E0078124 /* 37A514 E0078124 03E00008 */ jr $ra -/* 37A518 E0078128 00000000 */ nop +/* 37A518 E0078128 00000000 */ nop diff --git a/asm/nonmatchings/code_37A3F0/func_E007812C.s b/asm/nonmatchings/code_37A3F0/func_E007812C.s index 685907398a..4842bb9b1c 100644 --- a/asm/nonmatchings/code_37A3F0/func_E007812C.s +++ b/asm/nonmatchings/code_37A3F0/func_E007812C.s @@ -25,11 +25,11 @@ glabel func_E007812C .LE0078178: /* 37A568 E0078178 8C620014 */ lw $v0, 0x14($v1) /* 37A56C E007817C 04410005 */ bgez $v0, .LE0078194 -/* 37A570 E0078180 00000000 */ nop +/* 37A570 E0078180 00000000 */ nop /* 37A574 E0078184 0C080128 */ jal func_E02004A0 -/* 37A578 E0078188 00000000 */ nop +/* 37A578 E0078188 00000000 */ nop /* 37A57C E007818C 0801E081 */ j .LE0078204 -/* 37A580 E0078190 00000000 */ nop +/* 37A580 E0078190 00000000 */ nop .LE0078194: /* 37A584 E0078194 8C620000 */ lw $v0, ($v1) /* 37A588 E0078198 8C640018 */ lw $a0, 0x18($v1) @@ -53,7 +53,7 @@ glabel func_E007812C /* 37A5C8 E00781D8 C4600010 */ lwc1 $f0, 0x10($v1) /* 37A5CC E00781DC 46800021 */ cvt.d.w $f0, $f0 /* 37A5D0 E00781E0 46220002 */ mul.d $f0, $f0, $f2 -/* 37A5D4 E00781E4 00000000 */ nop +/* 37A5D4 E00781E4 00000000 */ nop /* 37A5D8 E00781E8 4620010D */ trunc.w.d $f4, $f0 /* 37A5DC E00781EC E4640010 */ swc1 $f4, 0x10($v1) .LE00781F0: diff --git a/asm/nonmatchings/code_37A3F0/func_E0078274.s b/asm/nonmatchings/code_37A3F0/func_E0078274.s index 66ada643a3..a39df1a670 100644 --- a/asm/nonmatchings/code_37A3F0/func_E0078274.s +++ b/asm/nonmatchings/code_37A3F0/func_E0078274.s @@ -3,4 +3,4 @@ glabel func_E0078274 /* 37A664 E0078274 03E00008 */ jr $ra -/* 37A668 E0078278 00000000 */ nop +/* 37A668 E0078278 00000000 */ nop diff --git a/asm/nonmatchings/code_37A3F0/func_E007827C.s b/asm/nonmatchings/code_37A3F0/func_E007827C.s index 9a5d184ff1..1befedd7c2 100644 --- a/asm/nonmatchings/code_37A3F0/func_E007827C.s +++ b/asm/nonmatchings/code_37A3F0/func_E007827C.s @@ -63,31 +63,31 @@ glabel func_E007827C /* 37A750 E0078360 24030001 */ addiu $v1, $zero, 1 .LE0078364: /* 37A754 E0078364 10600157 */ beqz $v1, .LE00788C4 -/* 37A758 E0078368 00000000 */ nop +/* 37A758 E0078368 00000000 */ nop /* 37A75C E007836C C7A20018 */ lwc1 $f2, 0x18($sp) /* 37A760 E0078370 44800000 */ mtc1 $zero, $f0 -/* 37A764 E0078374 00000000 */ nop +/* 37A764 E0078374 00000000 */ nop /* 37A768 E0078378 4600103C */ c.lt.s $f2, $f0 -/* 37A76C E007837C 00000000 */ nop +/* 37A76C E007837C 00000000 */ nop /* 37A770 E0078380 45010150 */ bc1t .LE00788C4 -/* 37A774 E0078384 00000000 */ nop +/* 37A774 E0078384 00000000 */ nop /* 37A778 E0078388 C7A4001C */ lwc1 $f4, 0x1c($sp) /* 37A77C E007838C 4600203C */ c.lt.s $f4, $f0 -/* 37A780 E0078390 00000000 */ nop +/* 37A780 E0078390 00000000 */ nop /* 37A784 E0078394 4501014B */ bc1t .LE00788C4 -/* 37A788 E0078398 00000000 */ nop +/* 37A788 E0078398 00000000 */ nop /* 37A78C E007839C 3C0143A0 */ lui $at, 0x43a0 /* 37A790 E00783A0 44810000 */ mtc1 $at, $f0 -/* 37A794 E00783A4 00000000 */ nop +/* 37A794 E00783A4 00000000 */ nop /* 37A798 E00783A8 4602003E */ c.le.s $f0, $f2 -/* 37A79C E00783AC 00000000 */ nop +/* 37A79C E00783AC 00000000 */ nop /* 37A7A0 E00783B0 45010144 */ bc1t .LE00788C4 -/* 37A7A4 E00783B4 00000000 */ nop +/* 37A7A4 E00783B4 00000000 */ nop /* 37A7A8 E00783B8 3C014370 */ lui $at, 0x4370 /* 37A7AC E00783BC 44810000 */ mtc1 $at, $f0 -/* 37A7B0 E00783C0 00000000 */ nop +/* 37A7B0 E00783C0 00000000 */ nop /* 37A7B4 E00783C4 4604003E */ c.le.s $f0, $f4 -/* 37A7B8 E00783C8 00000000 */ nop +/* 37A7B8 E00783C8 00000000 */ nop /* 37A7BC E00783CC 4501013D */ bc1t .LE00788C4 /* 37A7C0 E00783D0 3C02DE00 */ lui $v0, 0xde00 /* 37A7C4 E00783D4 8EA70000 */ lw $a3, ($s5) @@ -114,7 +114,7 @@ glabel func_E007827C /* 37A818 E0078428 35298081 */ ori $t1, $t1, 0x8081 /* 37A81C E007842C 00690018 */ mult $v1, $t1 /* 37A820 E0078430 44960000 */ mtc1 $s6, $f0 -/* 37A824 E0078434 00000000 */ nop +/* 37A824 E0078434 00000000 */ nop /* 37A828 E0078438 46800020 */ cvt.s.w $f0, $f0 /* 37A82C E007843C 46001081 */ sub.s $f2, $f2, $f0 /* 37A830 E0078440 46002001 */ sub.s $f0, $f4, $f0 @@ -122,7 +122,7 @@ glabel func_E007827C /* 37A838 E0078448 E7A60020 */ swc1 $f6, 0x20($sp) /* 37A83C E007844C 00007010 */ mfhi $t6 /* 37A840 E0078450 90460001 */ lbu $a2, 1($v0) -/* 37A844 E0078454 00000000 */ nop +/* 37A844 E0078454 00000000 */ nop /* 37A848 E0078458 00C80018 */ mult $a2, $t0 /* 37A84C E007845C 00162040 */ sll $a0, $s6, 1 /* 37A850 E0078460 90450002 */ lbu $a1, 2($v0) @@ -136,7 +136,7 @@ glabel func_E007827C /* 37A870 E0078480 02E47821 */ addu $t7, $s7, $a0 /* 37A874 E0078484 4600018D */ trunc.w.s $f6, $f0 /* 37A878 E0078488 440A3000 */ mfc1 $t2, $f6 -/* 37A87C E007848C 00000000 */ nop +/* 37A87C E007848C 00000000 */ nop /* 37A880 E0078490 01446021 */ addu $t4, $t2, $a0 /* 37A884 E0078494 00005810 */ mfhi $t3 /* 37A888 E0078498 01C32021 */ addu $a0, $t6, $v1 @@ -189,7 +189,7 @@ glabel func_E007827C /* 37A930 E0078540 16610004 */ bne $s3, $at, .LE0078554 /* 37A934 E0078544 3C018000 */ lui $at, 0x8000 /* 37A938 E0078548 14610002 */ bne $v1, $at, .LE0078554 -/* 37A93C E007854C 00000000 */ nop +/* 37A93C E007854C 00000000 */ nop /* 37A940 E0078550 0006000D */ break 6 .LE0078554: /* 37A944 E0078554 00005812 */ mflo $t3 @@ -202,7 +202,7 @@ glabel func_E007827C /* 37A95C E007856C 16610004 */ bne $s3, $at, .LE0078580 /* 37A960 E0078570 3C018000 */ lui $at, 0x8000 /* 37A964 E0078574 14410002 */ bne $v0, $at, .LE0078580 -/* 37A968 E0078578 00000000 */ nop +/* 37A968 E0078578 00000000 */ nop /* 37A96C E007857C 0006000D */ break 6 .LE0078580: /* 37A970 E0078580 0000B812 */ mflo $s7 @@ -252,7 +252,7 @@ glabel func_E007827C /* 37AA1C E007862C C6200008 */ lwc1 $f0, 8($s1) /* 37AA20 E0078630 02021025 */ or $v0, $s0, $v0 /* 37AA24 E0078634 46002002 */ mul.s $f0, $f4, $f0 -/* 37AA28 E0078638 00000000 */ nop +/* 37AA28 E0078638 00000000 */ nop /* 37AA2C E007863C 0242C825 */ or $t9, $s2, $v0 /* 37AA30 E0078640 8E220014 */ lw $v0, 0x14($s1) /* 37AA34 E0078644 8D250000 */ lw $a1, ($t1) @@ -266,22 +266,22 @@ glabel func_E007827C /* 37AA54 E0078664 0000B812 */ mflo $s7 /* 37AA58 E0078668 C620000C */ lwc1 $f0, 0xc($s1) /* 37AA5C E007866C 44971000 */ mtc1 $s7, $f2 -/* 37AA60 E0078670 00000000 */ nop +/* 37AA60 E0078670 00000000 */ nop /* 37AA64 E0078674 468010A0 */ cvt.s.w $f2, $f2 /* 37AA68 E0078678 46001082 */ mul.s $f2, $f2, $f0 -/* 37AA6C E007867C 00000000 */ nop +/* 37AA6C E007867C 00000000 */ nop /* 37AA70 E0078680 00021080 */ sll $v0, $v0, 2 /* 37AA74 E0078684 24A50008 */ addiu $a1, $a1, 8 /* 37AA78 E0078688 00031880 */ sll $v1, $v1, 2 /* 37AA7C E007868C 44820000 */ mtc1 $v0, $f0 -/* 37AA80 E0078690 00000000 */ nop +/* 37AA80 E0078690 00000000 */ nop /* 37AA84 E0078694 46800020 */ cvt.s.w $f0, $f0 /* 37AA88 E0078698 46020001 */ sub.s $f0, $f0, $f2 /* 37AA8C E007869C 30630FFF */ andi $v1, $v1, 0xfff /* 37AA90 E00786A0 00031B00 */ sll $v1, $v1, 0xc /* 37AA94 E00786A4 4600018D */ trunc.w.s $f6, $f0 /* 37AA98 E00786A8 44023000 */ mfc1 $v0, $f6 -/* 37AA9C E00786AC 00000000 */ nop +/* 37AA9C E00786AC 00000000 */ nop /* 37AAA0 E00786B0 00021080 */ sll $v0, $v0, 2 /* 37AAA4 E00786B4 30420FFF */ andi $v0, $v0, 0xfff /* 37AAA8 E00786B8 3C17F200 */ lui $s7, 0xf200 @@ -292,7 +292,7 @@ glabel func_E007827C /* 37AABC E00786CC C6200008 */ lwc1 $f0, 8($s1) /* 37AAC0 E00786D0 0002A540 */ sll $s4, $v0, 0x15 /* 37AAC4 E00786D4 46002102 */ mul.s $f4, $f4, $f0 -/* 37AAC8 E00786D8 00000000 */ nop +/* 37AAC8 E00786D8 00000000 */ nop /* 37AACC E00786DC C6200000 */ lwc1 $f0, ($s1) /* 37AAD0 E00786E0 46800020 */ cvt.s.w $f0, $f0 /* 37AAD4 E00786E4 AD250000 */ sw $a1, ($t1) @@ -311,22 +311,22 @@ glabel func_E007827C /* 37AB08 E0078718 0000B812 */ mflo $s7 /* 37AB0C E007871C C620000C */ lwc1 $f0, 0xc($s1) /* 37AB10 E0078720 44971000 */ mtc1 $s7, $f2 -/* 37AB14 E0078724 00000000 */ nop +/* 37AB14 E0078724 00000000 */ nop /* 37AB18 E0078728 468010A0 */ cvt.s.w $f2, $f2 /* 37AB1C E007872C 46001082 */ mul.s $f2, $f2, $f0 -/* 37AB20 E0078730 00000000 */ nop +/* 37AB20 E0078730 00000000 */ nop /* 37AB24 E0078734 00021080 */ sll $v0, $v0, 2 /* 37AB28 E0078738 00441021 */ addu $v0, $v0, $a0 /* 37AB2C E007873C 00031880 */ sll $v1, $v1, 2 /* 37AB30 E0078740 44820000 */ mtc1 $v0, $f0 -/* 37AB34 E0078744 00000000 */ nop +/* 37AB34 E0078744 00000000 */ nop /* 37AB38 E0078748 46800020 */ cvt.s.w $f0, $f0 /* 37AB3C E007874C 46020001 */ sub.s $f0, $f0, $f2 /* 37AB40 E0078750 30630FFF */ andi $v1, $v1, 0xfff /* 37AB44 E0078754 00031B00 */ sll $v1, $v1, 0xc /* 37AB48 E0078758 4600018D */ trunc.w.s $f6, $f0 /* 37AB4C E007875C 44023000 */ mfc1 $v0, $f6 -/* 37AB50 E0078760 00000000 */ nop +/* 37AB50 E0078760 00000000 */ nop /* 37AB54 E0078764 00021080 */ sll $v0, $v0, 2 /* 37AB58 E0078768 30420FFF */ andi $v0, $v0, 0xfff /* 37AB5C E007876C 00621825 */ or $v1, $v1, $v0 @@ -429,6 +429,6 @@ glabel func_E007827C /* 37ACD8 E00788E8 8FB00038 */ lw $s0, 0x38($sp) /* 37ACDC E00788EC 03E00008 */ jr $ra /* 37ACE0 E00788F0 27BD0060 */ addiu $sp, $sp, 0x60 -/* 37ACE4 E00788F4 00000000 */ nop -/* 37ACE8 E00788F8 00000000 */ nop -/* 37ACEC E00788FC 00000000 */ nop +/* 37ACE4 E00788F4 00000000 */ nop +/* 37ACE8 E00788F8 00000000 */ nop +/* 37ACEC E00788FC 00000000 */ nop diff --git a/asm/nonmatchings/code_37D490/func_E007C000.s b/asm/nonmatchings/code_37D490/func_E007C000.s index 89bca70f30..83e04d73b2 100644 --- a/asm/nonmatchings/code_37D490/func_E007C000.s +++ b/asm/nonmatchings/code_37D490/func_E007C000.s @@ -42,7 +42,7 @@ glabel func_E007C000 /* 37D524 E007C094 0200202D */ daddu $a0, $s0, $zero .LE007C098: /* 37D528 E007C098 0801F026 */ j .LE007C098 -/* 37D52C E007C09C 00000000 */ nop +/* 37D52C E007C09C 00000000 */ nop .LE007C0A0: /* 37D530 E007C0A0 00112840 */ sll $a1, $s1, 1 /* 37D534 E007C0A4 00B12821 */ addu $a1, $a1, $s1 @@ -67,7 +67,7 @@ glabel func_E007C000 .LE007C0F0: /* 37D580 E007C0F0 3C014220 */ lui $at, 0x4220 /* 37D584 E007C0F4 44810000 */ mtc1 $at, $f0 -/* 37D588 E007C0F8 00000000 */ nop +/* 37D588 E007C0F8 00000000 */ nop /* 37D58C E007C0FC E6000028 */ swc1 $f0, 0x28($s0) .LE007C100: /* 37D590 E007C100 8FBF0038 */ lw $ra, 0x38($sp) diff --git a/asm/nonmatchings/code_37D490/func_E007C128.s b/asm/nonmatchings/code_37D490/func_E007C128.s index 64b31ae9ac..64752fa03c 100644 --- a/asm/nonmatchings/code_37D490/func_E007C128.s +++ b/asm/nonmatchings/code_37D490/func_E007C128.s @@ -3,4 +3,4 @@ glabel func_E007C128 /* 37D5B8 E007C128 03E00008 */ jr $ra -/* 37D5BC E007C12C 00000000 */ nop +/* 37D5BC E007C12C 00000000 */ nop diff --git a/asm/nonmatchings/code_37D490/func_E007C130.s b/asm/nonmatchings/code_37D490/func_E007C130.s index 5d2ad72764..48d00c324d 100644 --- a/asm/nonmatchings/code_37D490/func_E007C130.s +++ b/asm/nonmatchings/code_37D490/func_E007C130.s @@ -10,11 +10,11 @@ glabel func_E007C130 /* 37D5D4 E007C144 8CA20018 */ lw $v0, 0x18($a1) /* 37D5D8 E007C148 8CA30014 */ lw $v1, 0x14($a1) /* 37D5DC E007C14C 44821000 */ mtc1 $v0, $f2 -/* 37D5E0 E007C150 00000000 */ nop +/* 37D5E0 E007C150 00000000 */ nop /* 37D5E4 E007C154 468010A0 */ cvt.s.w $f2, $f2 /* 37D5E8 E007C158 24420001 */ addiu $v0, $v0, 1 /* 37D5EC E007C15C 46001082 */ mul.s $f2, $f2, $f0 -/* 37D5F0 E007C160 00000000 */ nop +/* 37D5F0 E007C160 00000000 */ nop /* 37D5F4 E007C164 2463FFFF */ addiu $v1, $v1, -1 /* 37D5F8 E007C168 C4A0001C */ lwc1 $f0, 0x1c($a1) /* 37D5FC E007C16C 46800020 */ cvt.s.w $f0, $f0 @@ -24,9 +24,9 @@ glabel func_E007C130 /* 37D60C E007C17C 04610005 */ bgez $v1, .LE007C194 /* 37D610 E007C180 E4A20020 */ swc1 $f2, 0x20($a1) /* 37D614 E007C184 0C080128 */ jal func_E02004A0 -/* 37D618 E007C188 00000000 */ nop +/* 37D618 E007C188 00000000 */ nop /* 37D61C E007C18C 0801F069 */ j .LE007C1A4 -/* 37D620 E007C190 00000000 */ nop +/* 37D620 E007C190 00000000 */ nop .LE007C194: /* 37D624 E007C194 C4A00024 */ lwc1 $f0, 0x24($a1) /* 37D628 E007C198 C4A20028 */ lwc1 $f2, 0x28($a1) diff --git a/asm/nonmatchings/code_37D490/func_E007C1F4.s b/asm/nonmatchings/code_37D490/func_E007C1F4.s index 8387e7f246..2e15e65b22 100644 --- a/asm/nonmatchings/code_37D490/func_E007C1F4.s +++ b/asm/nonmatchings/code_37D490/func_E007C1F4.s @@ -50,9 +50,9 @@ glabel func_E007C1F4 /* 37D738 E007C2A8 00A22821 */ addu $a1, $a1, $v0 /* 37D73C E007C2AC 4600110D */ trunc.w.s $f4, $f2 /* 37D740 E007C2B0 44022000 */ mfc1 $v0, $f4 -/* 37D744 E007C2B4 00000000 */ nop +/* 37D744 E007C2B4 00000000 */ nop /* 37D748 E007C2B8 44820000 */ mtc1 $v0, $f0 -/* 37D74C E007C2BC 00000000 */ nop +/* 37D74C E007C2BC 00000000 */ nop /* 37D750 E007C2C0 46800020 */ cvt.s.w $f0, $f0 /* 37D754 E007C2C4 00021080 */ sll $v0, $v0, 2 /* 37D758 E007C2C8 46001081 */ sub.s $f2, $f2, $f0 @@ -61,7 +61,7 @@ glabel func_E007C1F4 /* 37D764 E007C2D4 00220821 */ addu $at, $at, $v0 /* 37D768 E007C2D8 8C22C510 */ lw $v0, %lo(D_E007C510)($at) /* 37D76C E007C2DC 46181082 */ mul.s $f2, $f2, $f24 -/* 37D770 E007C2E0 00000000 */ nop +/* 37D770 E007C2E0 00000000 */ nop /* 37D774 E007C2E4 AC620014 */ sw $v0, 0x14($v1) /* 37D778 E007C2E8 8E250004 */ lw $a1, 4($s1) /* 37D77C E007C2EC 8E260008 */ lw $a2, 8($s1) @@ -147,7 +147,7 @@ glabel func_E007C1F4 /* 37D8BC E007C42C AC830004 */ sw $v1, 4($a0) /* 37D8C0 E007C430 C6220020 */ lwc1 $f2, 0x20($s1) /* 37D8C4 E007C434 4602003C */ c.lt.s $f0, $f2 -/* 37D8C8 E007C438 00000000 */ nop +/* 37D8C8 E007C438 00000000 */ nop /* 37D8CC E007C43C 45000006 */ bc1f .LE007C458 /* 37D8D0 E007C440 24A20008 */ addiu $v0, $a1, 8 /* 37D8D4 E007C444 AE820000 */ sw $v0, ($s4) @@ -200,6 +200,6 @@ glabel func_E007C1F4 /* 37D988 E007C4F8 D7B400F8 */ ldc1 $f20, 0xf8($sp) /* 37D98C E007C4FC 03E00008 */ jr $ra /* 37D990 E007C500 27BD0110 */ addiu $sp, $sp, 0x110 -/* 37D994 E007C504 00000000 */ nop -/* 37D998 E007C508 00000000 */ nop -/* 37D99C E007C50C 00000000 */ nop +/* 37D994 E007C504 00000000 */ nop +/* 37D998 E007C508 00000000 */ nop +/* 37D99C E007C50C 00000000 */ nop diff --git a/asm/nonmatchings/code_3812C0/func_E0080000.s b/asm/nonmatchings/code_3812C0/func_E0080000.s index 0f66c6a26a..d3dc14e50f 100644 --- a/asm/nonmatchings/code_3812C0/func_E0080000.s +++ b/asm/nonmatchings/code_3812C0/func_E0080000.s @@ -43,7 +43,7 @@ glabel func_E0080000 /* 381358 E0080098 AE23000C */ sw $v1, 0xc($s1) .LE008009C: /* 38135C E008009C 08020027 */ j .LE008009C -/* 381360 E00800A0 00000000 */ nop +/* 381360 E00800A0 00000000 */ nop .LE00800A4: /* 381364 E00800A4 2402002E */ addiu $v0, $zero, 0x2e /* 381368 E00800A8 AC730000 */ sw $s3, ($v1) @@ -102,7 +102,7 @@ glabel func_E0080000 /* 38142C E008016C 00004012 */ mflo $t0 /* 381430 E0080170 00081080 */ sll $v0, $t0, 2 /* 381434 E0080174 44820000 */ mtc1 $v0, $f0 -/* 381438 E0080178 00000000 */ nop +/* 381438 E0080178 00000000 */ nop /* 38143C E008017C 46800020 */ cvt.s.w $f0, $f0 /* 381440 E0080180 E480FFDC */ swc1 $f0, -0x24($a0) .LE0080184: diff --git a/asm/nonmatchings/code_3812C0/func_E00801C8.s b/asm/nonmatchings/code_3812C0/func_E00801C8.s index 72e65265da..8971a25c54 100644 --- a/asm/nonmatchings/code_3812C0/func_E00801C8.s +++ b/asm/nonmatchings/code_3812C0/func_E00801C8.s @@ -3,4 +3,4 @@ glabel func_E00801C8 /* 381488 E00801C8 03E00008 */ jr $ra -/* 38148C E00801CC 00000000 */ nop +/* 38148C E00801CC 00000000 */ nop diff --git a/asm/nonmatchings/code_3812C0/func_E00801D0.s b/asm/nonmatchings/code_3812C0/func_E00801D0.s index c5a00f998a..4188e83043 100644 --- a/asm/nonmatchings/code_3812C0/func_E00801D0.s +++ b/asm/nonmatchings/code_3812C0/func_E00801D0.s @@ -27,7 +27,7 @@ glabel func_E00801D0 /* 3814E8 E0080228 0C080128 */ jal func_E02004A0 /* 3814EC E008022C 02A0202D */ daddu $a0, $s5, $zero /* 3814F0 E0080230 080200FC */ j .LE00803F0 -/* 3814F4 E0080234 00000000 */ nop +/* 3814F4 E0080234 00000000 */ nop .LE0080238: /* 3814F8 E0080238 24630048 */ addiu $v1, $v1, 0x48 /* 3814FC E008023C 24120001 */ addiu $s2, $zero, 1 @@ -71,7 +71,7 @@ glabel func_E00801D0 /* 381584 E00802C4 00141080 */ sll $v0, $s4, 2 /* 381588 E00802C8 02621021 */ addu $v0, $s3, $v0 /* 38158C E00802CC 4482A000 */ mtc1 $v0, $f20 -/* 381590 E00802D0 00000000 */ nop +/* 381590 E00802D0 00000000 */ nop /* 381594 E00802D4 4680A520 */ cvt.s.w $f20, $f20 /* 381598 E00802D8 C606FFD8 */ lwc1 $f6, -0x28($s0) /* 38159C E00802DC C600FFE4 */ lwc1 $f0, -0x1c($s0) @@ -89,35 +89,35 @@ glabel func_E00801D0 /* 3815CC E008030C E600FFE0 */ swc1 $f0, -0x20($s0) /* 3815D0 E0080310 3C01C1F0 */ lui $at, 0xc1f0 /* 3815D4 E0080314 44811000 */ mtc1 $at, $f2 -/* 3815D8 E0080318 00000000 */ nop +/* 3815D8 E0080318 00000000 */ nop /* 3815DC E008031C 46020002 */ mul.s $f0, $f0, $f2 -/* 3815E0 E0080320 00000000 */ nop +/* 3815E0 E0080320 00000000 */ nop /* 3815E4 E0080324 4600A306 */ mov.s $f12, $f20 /* 3815E8 E0080328 0C080144 */ jal func_E0200510 /* 3815EC E008032C E600FFF0 */ swc1 $f0, -0x10($s0) /* 3815F0 E0080330 3C014100 */ lui $at, 0x4100 /* 3815F4 E0080334 44811000 */ mtc1 $at, $f2 -/* 3815F8 E0080338 00000000 */ nop +/* 3815F8 E0080338 00000000 */ nop /* 3815FC E008033C 46020082 */ mul.s $f2, $f0, $f2 -/* 381600 E0080340 00000000 */ nop +/* 381600 E0080340 00000000 */ nop /* 381604 E0080344 2A220014 */ slti $v0, $s1, 0x14 /* 381608 E0080348 10400014 */ beqz $v0, .LE008039C /* 38160C E008034C E602FFF8 */ swc1 $f2, -8($s0) /* 381610 E0080350 44912000 */ mtc1 $s1, $f4 -/* 381614 E0080354 00000000 */ nop +/* 381614 E0080354 00000000 */ nop /* 381618 E0080358 46802120 */ cvt.s.w $f4, $f4 /* 38161C E008035C 3C01E008 */ lui $at, %hi(D_E0080B30) /* 381620 E0080360 D4200B30 */ ldc1 $f0, %lo(D_E0080B30)($at) /* 381624 E0080364 46002121 */ cvt.d.s $f4, $f4 /* 381628 E0080368 46202102 */ mul.d $f4, $f4, $f0 -/* 38162C E008036C 00000000 */ nop +/* 38162C E008036C 00000000 */ nop /* 381630 E0080370 460010A1 */ cvt.d.s $f2, $f2 /* 381634 E0080374 46241082 */ mul.d $f2, $f2, $f4 -/* 381638 E0080378 00000000 */ nop +/* 381638 E0080378 00000000 */ nop /* 38163C E008037C C600FFF0 */ lwc1 $f0, -0x10($s0) /* 381640 E0080380 46000021 */ cvt.d.s $f0, $f0 /* 381644 E0080384 46240002 */ mul.d $f0, $f0, $f4 -/* 381648 E0080388 00000000 */ nop +/* 381648 E0080388 00000000 */ nop /* 38164C E008038C 462010A0 */ cvt.s.d $f2, $f2 /* 381650 E0080390 46200020 */ cvt.s.d $f0, $f0 /* 381654 E0080394 E602FFF8 */ swc1 $f2, -8($s0) @@ -125,13 +125,13 @@ glabel func_E00801D0 .LE008039C: /* 38165C E008039C 2A22000A */ slti $v0, $s1, 0xa /* 381660 E00803A0 1040000A */ beqz $v0, .LE00803CC -/* 381664 E00803A4 00000000 */ nop +/* 381664 E00803A4 00000000 */ nop /* 381668 E00803A8 C600FFE8 */ lwc1 $f0, -0x18($s0) /* 38166C E00803AC 3C01E008 */ lui $at, %hi(D_E0080B38) /* 381670 E00803B0 D4220B38 */ ldc1 $f2, %lo(D_E0080B38)($at) /* 381674 E00803B4 46000021 */ cvt.d.s $f0, $f0 /* 381678 E00803B8 46220002 */ mul.d $f0, $f0, $f2 -/* 38167C E00803BC 00000000 */ nop +/* 38167C E00803BC 00000000 */ nop /* 381680 E00803C0 AE16FFFC */ sw $s6, -4($s0) /* 381684 E00803C4 46200020 */ cvt.s.d $f0, $f0 /* 381688 E00803C8 E600FFE8 */ swc1 $f0, -0x18($s0) diff --git a/asm/nonmatchings/code_3812C0/func_E0080424.s b/asm/nonmatchings/code_3812C0/func_E0080424.s index 0e07704ece..36899c7a61 100644 --- a/asm/nonmatchings/code_3812C0/func_E0080424.s +++ b/asm/nonmatchings/code_3812C0/func_E0080424.s @@ -3,4 +3,4 @@ glabel func_E0080424 /* 3816E4 E0080424 03E00008 */ jr $ra -/* 3816E8 E0080428 00000000 */ nop +/* 3816E8 E0080428 00000000 */ nop diff --git a/asm/nonmatchings/code_3812C0/func_E008042C.s b/asm/nonmatchings/code_3812C0/func_E008042C.s index 5b7db07373..10bf45adef 100644 --- a/asm/nonmatchings/code_3812C0/func_E008042C.s +++ b/asm/nonmatchings/code_3812C0/func_E008042C.s @@ -5,7 +5,7 @@ glabel func_E008042C /* 3816EC E008042C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3816F0 E0080430 AFBF0010 */ sw $ra, 0x10($sp) /* 3816F4 E0080434 0C020112 */ jal func_E0080448 -/* 3816F8 E0080438 00000000 */ nop +/* 3816F8 E0080438 00000000 */ nop /* 3816FC E008043C 8FBF0010 */ lw $ra, 0x10($sp) /* 381700 E0080440 03E00008 */ jr $ra /* 381704 E0080444 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3812C0/func_E0080448.s b/asm/nonmatchings/code_3812C0/func_E0080448.s index 5ad74dd732..cca9656bd4 100644 --- a/asm/nonmatchings/code_3812C0/func_E0080448.s +++ b/asm/nonmatchings/code_3812C0/func_E0080448.s @@ -175,7 +175,7 @@ glabel func_E0080448 /* 3819A4 E00806E4 24630004 */ addiu $v1, $v1, 4 /* 3819A8 E00806E8 24020002 */ addiu $v0, $zero, 2 /* 3819AC E00806EC 1682000A */ bne $s4, $v0, .LE0080718 -/* 3819B0 E00806F0 00000000 */ nop +/* 3819B0 E00806F0 00000000 */ nop .LE00806F4: /* 3819B4 E00806F4 8FAA00DC */ lw $t2, 0xdc($sp) /* 3819B8 E00806F8 3C020900 */ lui $v0, 0x900 @@ -429,6 +429,6 @@ glabel func_E0080448 /* 381D68 E0080AA8 D7B40110 */ ldc1 $f20, 0x110($sp) /* 381D6C E0080AAC 03E00008 */ jr $ra /* 381D70 E0080AB0 27BD0118 */ addiu $sp, $sp, 0x118 -/* 381D74 E0080AB4 00000000 */ nop -/* 381D78 E0080AB8 00000000 */ nop -/* 381D7C E0080ABC 00000000 */ nop +/* 381D74 E0080AB4 00000000 */ nop +/* 381D78 E0080AB8 00000000 */ nop +/* 381D7C E0080ABC 00000000 */ nop diff --git a/asm/nonmatchings/code_3889D0/func_E008403C.s b/asm/nonmatchings/code_3889D0/func_E008403C.s index 505a43fcbf..0a5aee4769 100644 --- a/asm/nonmatchings/code_3889D0/func_E008403C.s +++ b/asm/nonmatchings/code_3889D0/func_E008403C.s @@ -7,7 +7,7 @@ glabel func_E008403C /* 388A14 E0084044 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 388A18 E0084048 AFBF0010 */ sw $ra, 0x10($sp) /* 388A1C E008404C 0040F809 */ jalr $v0 -/* 388A20 E0084050 00000000 */ nop +/* 388A20 E0084050 00000000 */ nop /* 388A24 E0084054 8FBF0010 */ lw $ra, 0x10($sp) /* 388A28 E0084058 03E00008 */ jr $ra /* 388A2C E008405C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3889D0/func_E0084060.s b/asm/nonmatchings/code_3889D0/func_E0084060.s index 57f78afe93..01728a1ab5 100644 --- a/asm/nonmatchings/code_3889D0/func_E0084060.s +++ b/asm/nonmatchings/code_3889D0/func_E0084060.s @@ -7,7 +7,7 @@ glabel func_E0084060 /* 388A38 E0084068 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 388A3C E008406C AFBF0010 */ sw $ra, 0x10($sp) /* 388A40 E0084070 0040F809 */ jalr $v0 -/* 388A44 E0084074 00000000 */ nop +/* 388A44 E0084074 00000000 */ nop /* 388A48 E0084078 8FBF0010 */ lw $ra, 0x10($sp) /* 388A4C E008407C 03E00008 */ jr $ra /* 388A50 E0084080 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3889D0/func_E0084084.s b/asm/nonmatchings/code_3889D0/func_E0084084.s index 0c86476d10..e2341c0068 100644 --- a/asm/nonmatchings/code_3889D0/func_E0084084.s +++ b/asm/nonmatchings/code_3889D0/func_E0084084.s @@ -34,18 +34,18 @@ glabel func_E0084084 /* 388AC8 E00840F8 C7A80044 */ lwc1 $f8, 0x44($sp) /* 388ACC E00840FC 3C013D80 */ lui $at, 0x3d80 /* 388AD0 E0084100 44810000 */ mtc1 $at, $f0 -/* 388AD4 E0084104 00000000 */ nop +/* 388AD4 E0084104 00000000 */ nop /* 388AD8 E0084108 46004182 */ mul.s $f6, $f8, $f0 -/* 388ADC E008410C 00000000 */ nop +/* 388ADC E008410C 00000000 */ nop /* 388AE0 E0084110 C7AA0048 */ lwc1 $f10, 0x48($sp) /* 388AE4 E0084114 46005102 */ mul.s $f4, $f10, $f0 -/* 388AE8 E0084118 00000000 */ nop +/* 388AE8 E0084118 00000000 */ nop /* 388AEC E008411C C7AC004C */ lwc1 $f12, 0x4c($sp) /* 388AF0 E0084120 46006002 */ mul.s $f0, $f12, $f0 -/* 388AF4 E0084124 00000000 */ nop +/* 388AF4 E0084124 00000000 */ nop /* 388AF8 E0084128 3C013F80 */ lui $at, 0x3f80 /* 388AFC E008412C 44811000 */ mtc1 $at, $f2 -/* 388B00 E0084130 00000000 */ nop +/* 388B00 E0084130 00000000 */ nop /* 388B04 E0084134 46023180 */ add.s $f6, $f6, $f2 /* 388B08 E0084138 27B00020 */ addiu $s0, $sp, 0x20 /* 388B0C E008413C 46022100 */ add.s $f4, $f4, $f2 @@ -66,11 +66,11 @@ glabel func_E0084084 /* 388B44 E0084174 00021100 */ sll $v0, $v0, 4 /* 388B48 E0084178 00621023 */ subu $v0, $v1, $v0 /* 388B4C E008417C 4482A000 */ mtc1 $v0, $f20 -/* 388B50 E0084180 00000000 */ nop +/* 388B50 E0084180 00000000 */ nop /* 388B54 E0084184 4680A520 */ cvt.s.w $f20, $f20 /* 388B58 E0084188 4600570D */ trunc.w.s $f28, $f10 /* 388B5C E008418C 4403E000 */ mfc1 $v1, $f28 -/* 388B60 E0084190 00000000 */ nop +/* 388B60 E0084190 00000000 */ nop /* 388B64 E0084194 04610002 */ bgez $v1, .LE00841A0 /* 388B68 E0084198 0060102D */ daddu $v0, $v1, $zero /* 388B6C E008419C 2462000F */ addiu $v0, $v1, 0xf @@ -79,17 +79,17 @@ glabel func_E0084084 /* 388B74 E00841A4 00021100 */ sll $v0, $v0, 4 /* 388B78 E00841A8 00621023 */ subu $v0, $v1, $v0 /* 388B7C E00841AC 4482F000 */ mtc1 $v0, $f30 -/* 388B80 E00841B0 00000000 */ nop +/* 388B80 E00841B0 00000000 */ nop /* 388B84 E00841B4 4680F7A0 */ cvt.s.w $f30, $f30 /* 388B88 E00841B8 3C013FE0 */ lui $at, 0x3fe0 /* 388B8C E00841BC 44810800 */ mtc1 $at, $f1 /* 388B90 E00841C0 44800000 */ mtc1 $zero, $f0 /* 388B94 E00841C4 4600A121 */ cvt.d.s $f4, $f20 /* 388B98 E00841C8 46202102 */ mul.d $f4, $f4, $f0 -/* 388B9C E00841CC 00000000 */ nop +/* 388B9C E00841CC 00000000 */ nop /* 388BA0 E00841D0 4600F0A1 */ cvt.d.s $f2, $f30 /* 388BA4 E00841D4 46201082 */ mul.d $f2, $f2, $f0 -/* 388BA8 E00841D8 00000000 */ nop +/* 388BA8 E00841D8 00000000 */ nop /* 388BAC E00841DC 0200202D */ daddu $a0, $s0, $zero /* 388BB0 E00841E0 3C02E008 */ lui $v0, %hi(func_E0084658) /* 388BB4 E00841E4 24424658 */ addiu $v0, $v0, %lo(func_E0084658) @@ -123,7 +123,7 @@ glabel func_E0084084 /* 388C24 E0084254 AE84000C */ sw $a0, 0xc($s4) .LE0084258: /* 388C28 E0084258 08021096 */ j .LE0084258 -/* 388C2C E008425C 00000000 */ nop +/* 388C2C E008425C 00000000 */ nop .LE0084260: /* 388C30 E0084260 C7A00048 */ lwc1 $f0, 0x48($sp) /* 388C34 E0084264 3C013FE0 */ lui $at, 0x3fe0 @@ -132,7 +132,7 @@ glabel func_E0084084 /* 388C40 E0084270 46000107 */ neg.s $f4, $f0 /* 388C44 E0084274 46002121 */ cvt.d.s $f4, $f4 /* 388C48 E0084278 462A2102 */ mul.d $f4, $f4, $f10 -/* 388C4C E008427C 00000000 */ nop +/* 388C4C E008427C 00000000 */ nop /* 388C50 E0084280 8FA200CC */ lw $v0, 0xcc($sp) /* 388C54 E0084284 3C01E008 */ lui $at, %hi(D_E0084E40) /* 388C58 E0084288 D4224E40 */ ldc1 $f2, %lo(D_E0084E40)($at) @@ -141,7 +141,7 @@ glabel func_E0084084 /* 388C64 E0084294 E4960038 */ swc1 $f22, 0x38($a0) /* 388C68 E0084298 46000021 */ cvt.d.s $f0, $f0 /* 388C6C E008429C 46220002 */ mul.d $f0, $f0, $f2 -/* 388C70 E00842A0 00000000 */ nop +/* 388C70 E00842A0 00000000 */ nop /* 388C74 E00842A4 AC820044 */ sw $v0, 0x44($a0) /* 388C78 E00842A8 C7A20038 */ lwc1 $f2, 0x38($sp) /* 388C7C E00842AC 240200FF */ addiu $v0, $zero, 0xff @@ -171,7 +171,7 @@ glabel func_E0084084 /* 388CD8 E0084308 46205486 */ mov.d $f18, $f10 /* 388CDC E008430C 4600D0A1 */ cvt.d.s $f2, $f26 /* 388CE0 E0084310 46321082 */ mul.d $f2, $f2, $f18 -/* 388CE4 E0084314 00000000 */ nop +/* 388CE4 E0084314 00000000 */ nop /* 388CE8 E0084318 C7BC0048 */ lwc1 $f28, 0x48($sp) /* 388CEC E008431C C7B6004C */ lwc1 $f22, 0x4c($sp) /* 388CF0 E0084320 3C01E008 */ lui $at, %hi(D_E0084E48) @@ -185,10 +185,10 @@ glabel func_E0084084 /* 388D0C E008433C 3C014180 */ lui $at, 0x4180 /* 388D10 E0084340 4481E000 */ mtc1 $at, $f28 /* 388D14 E0084344 44870000 */ mtc1 $a3, $f0 -/* 388D18 E0084348 00000000 */ nop +/* 388D18 E0084348 00000000 */ nop /* 388D1C E008434C 46800020 */ cvt.s.w $f0, $f0 /* 388D20 E0084350 461C0002 */ mul.s $f0, $f0, $f28 -/* 388D24 E0084354 00000000 */ nop +/* 388D24 E0084354 00000000 */ nop /* 388D28 E0084358 D7BC0050 */ ldc1 $f28, 0x50($sp) /* 388D2C E008435C 46000021 */ cvt.d.s $f0, $f0 /* 388D30 E0084360 4620E000 */ add.d $f0, $f28, $f0 @@ -199,7 +199,7 @@ glabel func_E0084084 /* 388D44 E0084374 C7BC0058 */ lwc1 $f28, 0x58($sp) /* 388D48 E0084378 4600E0A1 */ cvt.d.s $f2, $f28 /* 388D4C E008437C 46321082 */ mul.d $f2, $f2, $f18 -/* 388D50 E0084380 00000000 */ nop +/* 388D50 E0084380 00000000 */ nop /* 388D54 E0084384 46000186 */ mov.s $f6, $f0 /* 388D58 E0084388 4600F021 */ cvt.d.s $f0, $f30 /* 388D5C E008438C 46220001 */ sub.d $f0, $f0, $f2 @@ -208,10 +208,10 @@ glabel func_E0084084 /* 388D64 E0084394 3C014180 */ lui $at, 0x4180 /* 388D68 E0084398 4481E000 */ mtc1 $at, $f28 /* 388D6C E008439C 44860000 */ mtc1 $a2, $f0 -/* 388D70 E00843A0 00000000 */ nop +/* 388D70 E00843A0 00000000 */ nop /* 388D74 E00843A4 46800020 */ cvt.s.w $f0, $f0 /* 388D78 E00843A8 461C0002 */ mul.s $f0, $f0, $f28 -/* 388D7C E00843AC 00000000 */ nop +/* 388D7C E00843AC 00000000 */ nop /* 388D80 E00843B0 D7BC0060 */ ldc1 $f28, 0x60($sp) /* 388D84 E00843B4 46000021 */ cvt.d.s $f0, $f0 /* 388D88 E00843B8 4620E000 */ add.d $f0, $f28, $f0 @@ -221,7 +221,7 @@ glabel func_E0084084 /* 388D98 E00843C8 E7A0003C */ swc1 $f0, 0x3c($sp) /* 388D9C E00843CC 4600B0A1 */ cvt.d.s $f2, $f22 /* 388DA0 E00843D0 46321082 */ mul.d $f2, $f2, $f18 -/* 388DA4 E00843D4 00000000 */ nop +/* 388DA4 E00843D4 00000000 */ nop /* 388DA8 E00843D8 46000286 */ mov.s $f10, $f0 /* 388DAC E00843DC 2483004C */ addiu $v1, $a0, 0x4c /* 388DB0 E00843E0 4600F021 */ cvt.d.s $f0, $f30 @@ -238,10 +238,10 @@ glabel func_E0084084 /* 388DD8 E0084408 3C014180 */ lui $at, 0x4180 /* 388DDC E008440C 4481E000 */ mtc1 $at, $f28 /* 388DE0 E0084410 44850000 */ mtc1 $a1, $f0 -/* 388DE4 E0084414 00000000 */ nop +/* 388DE4 E0084414 00000000 */ nop /* 388DE8 E0084418 46800020 */ cvt.s.w $f0, $f0 /* 388DEC E008441C 461C0002 */ mul.s $f0, $f0, $f28 -/* 388DF0 E0084420 00000000 */ nop +/* 388DF0 E0084420 00000000 */ nop /* 388DF4 E0084424 4616D03C */ c.lt.s $f26, $f22 /* 388DF8 E0084428 E466FFC8 */ swc1 $f6, -0x38($v1) /* 388DFC E008442C E466FFBC */ swc1 $f6, -0x44($v1) @@ -259,7 +259,7 @@ glabel func_E0084084 /* 388E2C E008445C 30A20001 */ andi $v0, $a1, 1 /* 388E30 E0084460 4600D0A1 */ cvt.d.s $f2, $f26 /* 388E34 E0084464 46321082 */ mul.d $f2, $f2, $f18 -/* 388E38 E0084468 00000000 */ nop +/* 388E38 E0084468 00000000 */ nop /* 388E3C E008446C 46003021 */ cvt.d.s $f0, $f6 /* 388E40 E0084470 46220003 */ div.d $f0, $f0, $f2 /* 388E44 E0084474 46200000 */ add.d $f0, $f0, $f0 @@ -273,7 +273,7 @@ glabel func_E0084084 /* 388E60 E0084490 E47CFFD4 */ swc1 $f28, -0x2c($v1) /* 388E64 E0084494 3C014000 */ lui $at, 0x4000 /* 388E68 E0084498 4481E000 */ mtc1 $at, $f28 -/* 388E6C E008449C 00000000 */ nop +/* 388E6C E008449C 00000000 */ nop /* 388E70 E00844A0 E47CFFD4 */ swc1 $f28, -0x2c($v1) .LE00844A4: /* 388E74 E00844A4 08021140 */ j .LE0084500 @@ -284,7 +284,7 @@ glabel func_E0084084 /* 388E84 E00844B4 AC60FFD4 */ sw $zero, -0x2c($v1) /* 388E88 E00844B8 4600B0A1 */ cvt.d.s $f2, $f22 /* 388E8C E00844BC 46321082 */ mul.d $f2, $f2, $f18 -/* 388E90 E00844C0 00000000 */ nop +/* 388E90 E00844C0 00000000 */ nop /* 388E94 E00844C4 46000021 */ cvt.d.s $f0, $f0 /* 388E98 E00844C8 46220003 */ div.d $f0, $f0, $f2 /* 388E9C E00844CC 46200000 */ add.d $f0, $f0, $f0 @@ -299,30 +299,30 @@ glabel func_E0084084 /* 388EBC E00844EC E47CFFDC */ swc1 $f28, -0x24($v1) /* 388EC0 E00844F0 3C014000 */ lui $at, 0x4000 /* 388EC4 E00844F4 4481E000 */ mtc1 $at, $f28 -/* 388EC8 E00844F8 00000000 */ nop +/* 388EC8 E00844F8 00000000 */ nop /* 388ECC E00844FC E47CFFDC */ swc1 $f28, -0x24($v1) .LE0084500: /* 388ED0 E0084500 46005021 */ cvt.d.s $f0, $f10 /* 388ED4 E0084504 462C0002 */ mul.d $f0, $f0, $f12 -/* 388ED8 E0084508 00000000 */ nop +/* 388ED8 E0084508 00000000 */ nop /* 388EDC E008450C C7A20040 */ lwc1 $f2, 0x40($sp) /* 388EE0 E0084510 4602303C */ c.lt.s $f6, $f2 /* 388EE4 E0084514 46200020 */ cvt.s.d $f0, $f0 /* 388EE8 E0084518 E460FFD8 */ swc1 $f0, -0x28($v1) /* 388EEC E008451C 46001021 */ cvt.d.s $f0, $f2 /* 388EF0 E0084520 462C0002 */ mul.d $f0, $f0, $f12 -/* 388EF4 E0084524 00000000 */ nop +/* 388EF4 E0084524 00000000 */ nop /* 388EF8 E0084528 4500000D */ bc1f .LE0084560 /* 388EFC E008452C 2482002C */ addiu $v0, $a0, 0x2c /* 388F00 E0084530 4618103C */ c.lt.s $f2, $f24 -/* 388F04 E0084534 00000000 */ nop +/* 388F04 E0084534 00000000 */ nop /* 388F08 E0084538 45000003 */ bc1f .LE0084548 -/* 388F0C E008453C 00000000 */ nop +/* 388F0C E008453C 00000000 */ nop /* 388F10 E0084540 08021159 */ j .LE0084564 /* 388F14 E0084544 46300080 */ add.d $f2, $f0, $f16 .LE0084548: /* 388F18 E0084548 4602C03C */ c.lt.s $f24, $f2 -/* 388F1C E008454C 00000000 */ nop +/* 388F1C E008454C 00000000 */ nop /* 388F20 E0084550 45020004 */ bc1fl .LE0084564 /* 388F24 E0084554 46280080 */ add.d $f2, $f0, $f8 /* 388F28 E0084558 08021159 */ j .LE0084564 @@ -332,7 +332,7 @@ glabel func_E0084084 .LE0084564: /* 388F34 E0084564 46005021 */ cvt.d.s $f0, $f10 /* 388F38 E0084568 462C0002 */ mul.d $f0, $f0, $f12 -/* 388F3C E008456C 00000000 */ nop +/* 388F3C E008456C 00000000 */ nop /* 388F40 E0084570 C7A40040 */ lwc1 $f4, 0x40($sp) /* 388F44 E0084574 462010A0 */ cvt.s.d $f2, $f2 /* 388F48 E0084578 E4420000 */ swc1 $f2, ($v0) @@ -341,18 +341,18 @@ glabel func_E0084084 /* 388F54 E0084584 E460FFE4 */ swc1 $f0, -0x1c($v1) /* 388F58 E0084588 46003021 */ cvt.d.s $f0, $f6 /* 388F5C E008458C 462C0002 */ mul.d $f0, $f0, $f12 -/* 388F60 E0084590 00000000 */ nop +/* 388F60 E0084590 00000000 */ nop /* 388F64 E0084594 4500000D */ bc1f .LE00845CC /* 388F68 E0084598 24820034 */ addiu $v0, $a0, 0x34 /* 388F6C E008459C 4618303C */ c.lt.s $f6, $f24 -/* 388F70 E00845A0 00000000 */ nop +/* 388F70 E00845A0 00000000 */ nop /* 388F74 E00845A4 45000003 */ bc1f .LE00845B4 -/* 388F78 E00845A8 00000000 */ nop +/* 388F78 E00845A8 00000000 */ nop /* 388F7C E00845AC 08021174 */ j .LE00845D0 /* 388F80 E00845B0 46300000 */ add.d $f0, $f0, $f16 .LE00845B4: /* 388F84 E00845B4 4606C03C */ c.lt.s $f24, $f6 -/* 388F88 E00845B8 00000000 */ nop +/* 388F88 E00845B8 00000000 */ nop /* 388F8C E00845BC 45020004 */ bc1fl .LE00845D0 /* 388F90 E00845C0 46280000 */ add.d $f0, $f0, $f8 /* 388F94 E00845C4 08021174 */ j .LE00845D0 @@ -373,12 +373,12 @@ glabel func_E0084084 /* 388FC4 E00845F4 24C60001 */ addiu $a2, $a2, 1 /* 388FC8 E00845F8 00D3102A */ slt $v0, $a2, $s3 /* 388FCC E00845FC 1440FF65 */ bnez $v0, .LE0084394 -/* 388FD0 E0084600 00000000 */ nop +/* 388FD0 E0084600 00000000 */ nop .LE0084604: /* 388FD4 E0084604 24E70001 */ addiu $a3, $a3, 1 /* 388FD8 E0084608 00F2102A */ slt $v0, $a3, $s2 /* 388FDC E008460C 1440FF4B */ bnez $v0, .LE008433C -/* 388FE0 E0084610 00000000 */ nop +/* 388FE0 E0084610 00000000 */ nop .LE0084614: /* 388FE4 E0084614 0280102D */ daddu $v0, $s4, $zero /* 388FE8 E0084618 8FBF0084 */ lw $ra, 0x84($sp) diff --git a/asm/nonmatchings/code_3889D0/func_E0084658.s b/asm/nonmatchings/code_3889D0/func_E0084658.s index b92c433be5..b6c859bc9c 100644 --- a/asm/nonmatchings/code_3889D0/func_E0084658.s +++ b/asm/nonmatchings/code_3889D0/func_E0084658.s @@ -3,4 +3,4 @@ glabel func_E0084658 /* 389028 E0084658 03E00008 */ jr $ra -/* 38902C E008465C 00000000 */ nop +/* 38902C E008465C 00000000 */ nop diff --git a/asm/nonmatchings/code_3889D0/func_E0084660.s b/asm/nonmatchings/code_3889D0/func_E0084660.s index d9c632fcab..46562b135c 100644 --- a/asm/nonmatchings/code_3889D0/func_E0084660.s +++ b/asm/nonmatchings/code_3889D0/func_E0084660.s @@ -16,25 +16,25 @@ glabel func_E0084660 /* 38905C E008468C 04610005 */ bgez $v1, .LE00846A4 /* 389060 E0084690 ACA30044 */ sw $v1, 0x44($a1) /* 389064 E0084694 0C080128 */ jal func_E02004A0 -/* 389068 E0084698 00000000 */ nop +/* 389068 E0084698 00000000 */ nop /* 38906C E008469C 08021233 */ j .LE00848CC -/* 389070 E00846A0 00000000 */ nop +/* 389070 E00846A0 00000000 */ nop .LE00846A4: /* 389074 E00846A4 44831000 */ mtc1 $v1, $f2 -/* 389078 E00846A8 00000000 */ nop +/* 389078 E00846A8 00000000 */ nop /* 38907C E00846AC 468010A0 */ cvt.s.w $f2, $f2 /* 389080 E00846B0 3C0141C8 */ lui $at, 0x41c8 /* 389084 E00846B4 44810000 */ mtc1 $at, $f0 /* 389088 E00846B8 C4AA0004 */ lwc1 $f10, 4($a1) /* 38908C E00846BC 4600103C */ c.lt.s $f2, $f0 -/* 389090 E00846C0 00000000 */ nop +/* 389090 E00846C0 00000000 */ nop /* 389094 E00846C4 45000008 */ bc1f .LE00846E8 -/* 389098 E00846C8 00000000 */ nop +/* 389098 E00846C8 00000000 */ nop /* 38909C E00846CC 3C014120 */ lui $at, 0x4120 /* 3890A0 E00846D0 44810000 */ mtc1 $at, $f0 -/* 3890A4 E00846D4 00000000 */ nop +/* 3890A4 E00846D4 00000000 */ nop /* 3890A8 E00846D8 46001002 */ mul.s $f0, $f2, $f0 -/* 3890AC E00846DC 00000000 */ nop +/* 3890AC E00846DC 00000000 */ nop /* 3890B0 E00846E0 4600060D */ trunc.w.s $f24, $f0 /* 3890B4 E00846E4 E4B8004C */ swc1 $f24, 0x4c($a1) .LE00846E8: @@ -45,7 +45,7 @@ glabel func_E0084660 /* 3890C8 E00846F8 D4244E50 */ ldc1 $f4, %lo(D_E0084E50)($at) /* 3890CC E00846FC 46000021 */ cvt.d.s $f0, $f0 /* 3890D0 E0084700 46240002 */ mul.d $f0, $f0, $f4 -/* 3890D4 E0084704 00000000 */ nop +/* 3890D4 E0084704 00000000 */ nop /* 3890D8 E0084708 460010A1 */ cvt.d.s $f2, $f2 /* 3890DC E008470C 46201080 */ add.d $f2, $f2, $f0 /* 3890E0 E0084710 24060001 */ addiu $a2, $zero, 1 @@ -71,15 +71,15 @@ glabel func_E0084660 /* 38912C E008475C C460FFF0 */ lwc1 $f0, -0x10($v1) /* 389130 E0084760 46000021 */ cvt.d.s $f0, $f0 /* 389134 E0084764 462C0002 */ mul.d $f0, $f0, $f12 -/* 389138 E0084768 00000000 */ nop +/* 389138 E0084768 00000000 */ nop /* 38913C E008476C C462FFF4 */ lwc1 $f2, -0xc($v1) /* 389140 E0084770 460010A1 */ cvt.d.s $f2, $f2 /* 389144 E0084774 462C1082 */ mul.d $f2, $f2, $f12 -/* 389148 E0084778 00000000 */ nop +/* 389148 E0084778 00000000 */ nop /* 38914C E008477C C464FFF8 */ lwc1 $f4, -8($v1) /* 389150 E0084780 46002121 */ cvt.d.s $f4, $f4 /* 389154 E0084784 462C2102 */ mul.d $f4, $f4, $f12 -/* 389158 E0084788 00000000 */ nop +/* 389158 E0084788 00000000 */ nop /* 38915C E008478C C468FFD8 */ lwc1 $f8, -0x28($v1) /* 389160 E0084790 C466FFDC */ lwc1 $f6, -0x24($v1) /* 389164 E0084794 46200020 */ cvt.s.d $f0, $f0 @@ -98,17 +98,17 @@ glabel func_E0084660 /* 389198 E00847C8 46003086 */ mov.s $f2, $f6 /* 38919C E00847CC E468FFD8 */ swc1 $f8, -0x28($v1) /* 3891A0 E00847D0 460A103C */ c.lt.s $f2, $f10 -/* 3891A4 E00847D4 00000000 */ nop +/* 3891A4 E00847D4 00000000 */ nop /* 3891A8 E00847D8 4500000C */ bc1f .LE008480C /* 3891AC E00847DC E460FFE0 */ swc1 $f0, -0x20($v1) /* 3891B0 E00847E0 C460FFF4 */ lwc1 $f0, -0xc($v1) /* 3891B4 E00847E4 4610003C */ c.lt.s $f0, $f16 -/* 3891B8 E00847E8 00000000 */ nop +/* 3891B8 E00847E8 00000000 */ nop /* 3891BC E00847EC 45000007 */ bc1f .LE008480C -/* 3891C0 E00847F0 00000000 */ nop +/* 3891C0 E00847F0 00000000 */ nop /* 3891C4 E00847F4 46000021 */ cvt.d.s $f0, $f0 /* 3891C8 E00847F8 46360002 */ mul.d $f0, $f0, $f22 -/* 3891CC E00847FC 00000000 */ nop +/* 3891CC E00847FC 00000000 */ nop /* 3891D0 E0084800 E46AFFDC */ swc1 $f10, -0x24($v1) /* 3891D4 E0084804 46200020 */ cvt.s.d $f0, $f0 /* 3891D8 E0084808 E460FFF4 */ swc1 $f0, -0xc($v1) @@ -116,11 +116,11 @@ glabel func_E0084660 /* 3891DC E008480C C460FFFC */ lwc1 $f0, -4($v1) /* 3891E0 E0084810 46000021 */ cvt.d.s $f0, $f0 /* 3891E4 E0084814 462E0002 */ mul.d $f0, $f0, $f14 -/* 3891E8 E0084818 00000000 */ nop +/* 3891E8 E0084818 00000000 */ nop /* 3891EC E008481C C4640004 */ lwc1 $f4, 4($v1) /* 3891F0 E0084820 46002121 */ cvt.d.s $f4, $f4 /* 3891F4 E0084824 462E2102 */ mul.d $f4, $f4, $f14 -/* 3891F8 E0084828 00000000 */ nop +/* 3891F8 E0084828 00000000 */ nop /* 3891FC E008482C C4620000 */ lwc1 $f2, ($v1) /* 389200 E0084830 460010A1 */ cvt.d.s $f2, $f2 /* 389204 E0084834 46341081 */ sub.d $f2, $f2, $f20 @@ -142,17 +142,17 @@ glabel func_E0084660 /* 389244 E0084874 E462FFE8 */ swc1 $f2, -0x18($v1) /* 389248 E0084878 46001006 */ mov.s $f0, $f2 /* 38924C E008487C 460A003C */ c.lt.s $f0, $f10 -/* 389250 E0084880 00000000 */ nop +/* 389250 E0084880 00000000 */ nop /* 389254 E0084884 4500000C */ bc1f .LE00848B8 /* 389258 E0084888 E464FFEC */ swc1 $f4, -0x14($v1) /* 38925C E008488C C4600000 */ lwc1 $f0, ($v1) /* 389260 E0084890 4610003C */ c.lt.s $f0, $f16 -/* 389264 E0084894 00000000 */ nop +/* 389264 E0084894 00000000 */ nop /* 389268 E0084898 45020008 */ bc1fl .LE00848BC /* 38926C E008489C 24C60001 */ addiu $a2, $a2, 1 /* 389270 E00848A0 46000021 */ cvt.d.s $f0, $f0 /* 389274 E00848A4 46320002 */ mul.d $f0, $f0, $f18 -/* 389278 E00848A8 00000000 */ nop +/* 389278 E00848A8 00000000 */ nop /* 38927C E00848AC E46AFFE8 */ swc1 $f10, -0x18($v1) /* 389280 E00848B0 46200020 */ cvt.s.d $f0, $f0 /* 389284 E00848B4 E4600000 */ swc1 $f0, ($v1) diff --git a/asm/nonmatchings/code_3889D0/func_E0084928.s b/asm/nonmatchings/code_3889D0/func_E0084928.s index 876b556e71..cde66dc5b3 100644 --- a/asm/nonmatchings/code_3889D0/func_E0084928.s +++ b/asm/nonmatchings/code_3889D0/func_E0084928.s @@ -109,15 +109,15 @@ glabel func_E0084928 .LE0084AC8: /* 389498 E0084AC8 27A40020 */ addiu $a0, $sp, 0x20 /* 38949C E0084ACC 44912000 */ mtc1 $s1, $f4 -/* 3894A0 E0084AD0 00000000 */ nop +/* 3894A0 E0084AD0 00000000 */ nop /* 3894A4 E0084AD4 46802120 */ cvt.s.w $f4, $f4 /* 3894A8 E0084AD8 44052000 */ mfc1 $a1, $f4 /* 3894AC E0084ADC 44932000 */ mtc1 $s3, $f4 -/* 3894B0 E0084AE0 00000000 */ nop +/* 3894B0 E0084AE0 00000000 */ nop /* 3894B4 E0084AE4 46802120 */ cvt.s.w $f4, $f4 /* 3894B8 E0084AE8 44062000 */ mfc1 $a2, $f4 /* 3894BC E0084AEC 44942000 */ mtc1 $s4, $f4 -/* 3894C0 E0084AF0 00000000 */ nop +/* 3894C0 E0084AF0 00000000 */ nop /* 3894C4 E0084AF4 46802120 */ cvt.s.w $f4, $f4 /* 3894C8 E0084AF8 44072000 */ mfc1 $a3, $f4 /* 3894CC E0084AFC 26940050 */ addiu $s4, $s4, 0x50 @@ -319,4 +319,4 @@ glabel func_E0084928 /* 3897D0 E0084E00 D7B40098 */ ldc1 $f20, 0x98($sp) /* 3897D4 E0084E04 03E00008 */ jr $ra /* 3897D8 E0084E08 27BD00A8 */ addiu $sp, $sp, 0xa8 -/* 3897DC E0084E0C 00000000 */ nop +/* 3897DC E0084E0C 00000000 */ nop diff --git a/asm/nonmatchings/code_38DE00/func_E008C000.s b/asm/nonmatchings/code_38DE00/func_E008C000.s index 39189993f1..acb0d60000 100644 --- a/asm/nonmatchings/code_38DE00/func_E008C000.s +++ b/asm/nonmatchings/code_38DE00/func_E008C000.s @@ -45,7 +45,7 @@ glabel func_E008C000 /* 38DEA0 E008C0A0 AD24000C */ sw $a0, 0xc($t1) .LE008C0A4: /* 38DEA4 E008C0A4 08023029 */ j .LE008C0A4 -/* 38DEA8 E008C0A8 00000000 */ nop +/* 38DEA8 E008C0A8 00000000 */ nop .LE008C0AC: /* 38DEAC E008C0AC 4600A0A1 */ cvt.d.s $f2, $f20 /* 38DEB0 E008C0B0 24110001 */ addiu $s1, $zero, 1 @@ -53,7 +53,7 @@ glabel func_E008C000 /* 38DEB8 E008C0B8 D420CB20 */ ldc1 $f0, %lo(D_E008CB20)($at) /* 38DEBC E008C0BC 8FA80070 */ lw $t0, 0x70($sp) /* 38DEC0 E008C0C0 46201082 */ mul.d $f2, $f2, $f0 -/* 38DEC4 E008C0C4 00000000 */ nop +/* 38DEC4 E008C0C4 00000000 */ nop /* 38DEC8 E008C0C8 AC880000 */ sw $t0, ($a0) /* 38DECC E008C0CC 8FA90074 */ lw $t1, 0x74($sp) /* 38DED0 E008C0D0 2A220005 */ slti $v0, $s1, 5 @@ -100,15 +100,15 @@ glabel func_E008C000 /* 38DF70 E008C170 8FA9002C */ lw $t1, 0x2c($sp) /* 38DF74 E008C174 8D220000 */ lw $v0, ($t1) /* 38DF78 E008C178 00400008 */ jr $v0 -/* 38DF7C E008C17C 00000000 */ nop +/* 38DF7C E008C17C 00000000 */ nop /* 38DF80 E008C180 3C014270 */ lui $at, 0x4270 /* 38DF84 E008C184 44811000 */ mtc1 $at, $f2 /* 38DF88 E008C188 44920000 */ mtc1 $s2, $f0 -/* 38DF8C E008C18C 00000000 */ nop +/* 38DF8C E008C18C 00000000 */ nop /* 38DF90 E008C190 46800020 */ cvt.s.w $f0, $f0 /* 38DF94 E008C194 E600FFC6 */ swc1 $f0, -0x3a($s0) /* 38DF98 E008C198 44930000 */ mtc1 $s3, $f0 -/* 38DF9C E008C19C 00000000 */ nop +/* 38DF9C E008C19C 00000000 */ nop /* 38DFA0 E008C1A0 46800020 */ cvt.s.w $f0, $f0 /* 38DFA4 E008C1A4 AE00FFC2 */ sw $zero, -0x3e($s0) /* 38DFA8 E008C1A8 AE00FFCA */ sw $zero, -0x36($s0) @@ -121,11 +121,11 @@ glabel func_E008C000 /* 38DFC4 E008C1C4 080230CC */ j .LE008C330 /* 38DFC8 E008C1C8 E602FFF6 */ swc1 $f2, -0xa($s0) /* 38DFCC E008C1CC 44920000 */ mtc1 $s2, $f0 -/* 38DFD0 E008C1D0 00000000 */ nop +/* 38DFD0 E008C1D0 00000000 */ nop /* 38DFD4 E008C1D4 46800020 */ cvt.s.w $f0, $f0 /* 38DFD8 E008C1D8 E600FFC6 */ swc1 $f0, -0x3a($s0) /* 38DFDC E008C1DC 44930000 */ mtc1 $s3, $f0 -/* 38DFE0 E008C1E0 00000000 */ nop +/* 38DFE0 E008C1E0 00000000 */ nop /* 38DFE4 E008C1E4 46800020 */ cvt.s.w $f0, $f0 /* 38DFE8 E008C1E8 240800FF */ addiu $t0, $zero, 0xff /* 38DFEC E008C1EC 3C01C270 */ lui $at, 0xc270 @@ -148,10 +148,10 @@ glabel func_E008C000 /* 38E02C E008C22C 8FA90074 */ lw $t1, 0x74($sp) /* 38E030 E008C230 852200B0 */ lh $v0, 0xb0($t1) /* 38E034 E008C234 44820000 */ mtc1 $v0, $f0 -/* 38E038 E008C238 00000000 */ nop +/* 38E038 E008C238 00000000 */ nop /* 38E03C E008C23C 46800021 */ cvt.d.w $f0, $f0 /* 38E040 E008C240 46340002 */ mul.d $f0, $f0, $f20 -/* 38E044 E008C244 00000000 */ nop +/* 38E044 E008C244 00000000 */ nop /* 38E048 E008C248 24040001 */ addiu $a0, $zero, 1 /* 38E04C E008C24C AE00FFCA */ sw $zero, -0x36($s0) /* 38E050 E008C250 46200020 */ cvt.s.d $f0, $f0 @@ -161,7 +161,7 @@ glabel func_E008C000 /* 38E060 E008C260 000210C0 */ sll $v0, $v0, 3 /* 38E064 E008C264 2442FFFC */ addiu $v0, $v0, -4 /* 38E068 E008C268 44820000 */ mtc1 $v0, $f0 -/* 38E06C E008C26C 00000000 */ nop +/* 38E06C E008C26C 00000000 */ nop /* 38E070 E008C270 46800020 */ cvt.s.w $f0, $f0 /* 38E074 E008C274 E600FFF2 */ swc1 $f0, -0xe($s0) /* 38E078 E008C278 0C080000 */ jal func_E0200000 @@ -174,42 +174,42 @@ glabel func_E008C000 /* 38E090 E008C290 16E10004 */ bne $s7, $at, .LE008C2A4 /* 38E094 E008C294 3C018000 */ lui $at, 0x8000 /* 38E098 E008C298 16810002 */ bne $s4, $at, .LE008C2A4 -/* 38E09C E008C29C 00000000 */ nop +/* 38E09C E008C29C 00000000 */ nop /* 38E0A0 E008C2A0 0006000D */ break 6 .LE008C2A4: /* 38E0A4 E008C2A4 00002012 */ mflo $a0 /* 38E0A8 E008C2A8 000210C0 */ sll $v0, $v0, 3 /* 38E0AC E008C2AC 2623FFFF */ addiu $v1, $s1, -1 /* 38E0B0 E008C2B0 44830000 */ mtc1 $v1, $f0 -/* 38E0B4 E008C2B4 00000000 */ nop +/* 38E0B4 E008C2B4 00000000 */ nop /* 38E0B8 E008C2B8 46800020 */ cvt.s.w $f0, $f0 /* 38E0BC E008C2BC 44971000 */ mtc1 $s7, $f2 -/* 38E0C0 E008C2C0 00000000 */ nop +/* 38E0C0 E008C2C0 00000000 */ nop /* 38E0C4 E008C2C4 468010A0 */ cvt.s.w $f2, $f2 /* 38E0C8 E008C2C8 46020003 */ div.s $f0, $f0, $f2 /* 38E0CC E008C2CC 46000021 */ cvt.d.s $f0, $f0 /* 38E0D0 E008C2D0 46340002 */ mul.d $f0, $f0, $f20 -/* 38E0D4 E008C2D4 00000000 */ nop +/* 38E0D4 E008C2D4 00000000 */ nop /* 38E0D8 E008C2D8 2442FFFC */ addiu $v0, $v0, -4 /* 38E0DC E008C2DC 44821000 */ mtc1 $v0, $f2 -/* 38E0E0 E008C2E0 00000000 */ nop +/* 38E0E0 E008C2E0 00000000 */ nop /* 38E0E4 E008C2E4 468010A0 */ cvt.s.w $f2, $f2 /* 38E0E8 E008C2E8 E602FFFA */ swc1 $f2, -6($s0) /* 38E0EC E008C2EC 44951000 */ mtc1 $s5, $f2 -/* 38E0F0 E008C2F0 00000000 */ nop +/* 38E0F0 E008C2F0 00000000 */ nop /* 38E0F4 E008C2F4 468010A0 */ cvt.s.w $f2, $f2 /* 38E0F8 E008C2F8 24020168 */ addiu $v0, $zero, 0x168 /* 38E0FC E008C2FC 00561023 */ subu $v0, $v0, $s6 /* 38E100 E008C300 E602FFE6 */ swc1 $f2, -0x1a($s0) /* 38E104 E008C304 46340000 */ add.d $f0, $f0, $f20 /* 38E108 E008C308 44821000 */ mtc1 $v0, $f2 -/* 38E10C E008C30C 00000000 */ nop +/* 38E10C E008C30C 00000000 */ nop /* 38E110 E008C310 468010A0 */ cvt.s.w $f2, $f2 /* 38E114 E008C314 E602FFEE */ swc1 $f2, -0x12($s0) /* 38E118 E008C318 46200020 */ cvt.s.d $f0, $f0 /* 38E11C E008C31C E600FFCE */ swc1 $f0, -0x32($s0) /* 38E120 E008C320 44840000 */ mtc1 $a0, $f0 -/* 38E124 E008C324 00000000 */ nop +/* 38E124 E008C324 00000000 */ nop /* 38E128 E008C328 46800020 */ cvt.s.w $f0, $f0 /* 38E12C E008C32C E600FFEA */ swc1 $f0, -0x16($s0) .LE008C330: @@ -219,7 +219,7 @@ glabel func_E008C000 /* 38E13C E008C33C 8FA80030 */ lw $t0, 0x30($sp) /* 38E140 E008C340 8D020000 */ lw $v0, ($t0) /* 38E144 E008C344 00400008 */ jr $v0 -/* 38E148 E008C348 00000000 */ nop +/* 38E148 E008C348 00000000 */ nop /* 38E14C E008C34C 080230D9 */ j .LE008C364 /* 38E150 E008C350 24030001 */ addiu $v1, $zero, 1 /* 38E154 E008C354 080230D9 */ j .LE008C364 diff --git a/asm/nonmatchings/code_38DE00/func_E008C3F4.s b/asm/nonmatchings/code_38DE00/func_E008C3F4.s index b70951389c..41bde1b454 100644 --- a/asm/nonmatchings/code_38DE00/func_E008C3F4.s +++ b/asm/nonmatchings/code_38DE00/func_E008C3F4.s @@ -3,4 +3,4 @@ glabel func_E008C3F4 /* 38E1F4 E008C3F4 03E00008 */ jr $ra -/* 38E1F8 E008C3F8 00000000 */ nop +/* 38E1F8 E008C3F8 00000000 */ nop diff --git a/asm/nonmatchings/code_38DE00/func_E008C3FC.s b/asm/nonmatchings/code_38DE00/func_E008C3FC.s index 6323f35928..d2d0cda85c 100644 --- a/asm/nonmatchings/code_38DE00/func_E008C3FC.s +++ b/asm/nonmatchings/code_38DE00/func_E008C3FC.s @@ -14,9 +14,9 @@ glabel func_E008C3FC /* 38E220 E008C420 04610005 */ bgez $v1, .LE008C438 /* 38E224 E008C424 ACA20028 */ sw $v0, 0x28($a1) /* 38E228 E008C428 0C080128 */ jal func_E02004A0 -/* 38E22C E008C42C 00000000 */ nop +/* 38E22C E008C42C 00000000 */ nop /* 38E230 E008C430 080231AB */ j .LE008C6AC -/* 38E234 E008C434 00000000 */ nop +/* 38E234 E008C434 00000000 */ nop .LE008C438: /* 38E238 E008C438 8CA80000 */ lw $t0, ($a1) /* 38E23C E008C43C 24020008 */ addiu $v0, $zero, 8 @@ -30,12 +30,12 @@ glabel func_E008C3FC /* 38E25C E008C45C D420CB60 */ ldc1 $f0, %lo(D_E008CB60)($at) /* 38E260 E008C460 00431023 */ subu $v0, $v0, $v1 /* 38E264 E008C464 44821000 */ mtc1 $v0, $f2 -/* 38E268 E008C468 00000000 */ nop +/* 38E268 E008C468 00000000 */ nop /* 38E26C E008C46C 468010A1 */ cvt.d.w $f2, $f2 /* 38E270 E008C470 46201082 */ mul.d $f2, $f2, $f0 -/* 38E274 E008C474 00000000 */ nop +/* 38E274 E008C474 00000000 */ nop /* 38E278 E008C478 44830000 */ mtc1 $v1, $f0 -/* 38E27C E008C47C 00000000 */ nop +/* 38E27C E008C47C 00000000 */ nop /* 38E280 E008C480 46800021 */ cvt.d.w $f0, $f0 /* 38E284 E008C484 46220000 */ add.d $f0, $f0, $f2 /* 38E288 E008C488 4620040D */ trunc.w.d $f16, $f0 @@ -43,10 +43,10 @@ glabel func_E008C3FC .LE008C490: /* 38E290 E008C490 C4A00018 */ lwc1 $f0, 0x18($a1) /* 38E294 E008C494 44871000 */ mtc1 $a3, $f2 -/* 38E298 E008C498 00000000 */ nop +/* 38E298 E008C498 00000000 */ nop /* 38E29C E008C49C 468010A0 */ cvt.s.w $f2, $f2 /* 38E2A0 E008C4A0 46020002 */ mul.s $f0, $f0, $f2 -/* 38E2A4 E008C4A4 00000000 */ nop +/* 38E2A4 E008C4A4 00000000 */ nop /* 38E2A8 E008C4A8 28E2000A */ slti $v0, $a3, 0xa /* 38E2AC E008C4AC C4A20020 */ lwc1 $f2, 0x20($a1) /* 38E2B0 E008C4B0 468010A0 */ cvt.s.w $f2, $f2 @@ -69,12 +69,12 @@ glabel func_E008C3FC /* 38E2F0 E008C4F0 D420CB68 */ ldc1 $f0, %lo(D_E008CB68)($at) /* 38E2F4 E008C4F4 00431023 */ subu $v0, $v0, $v1 /* 38E2F8 E008C4F8 44821000 */ mtc1 $v0, $f2 -/* 38E2FC E008C4FC 00000000 */ nop +/* 38E2FC E008C4FC 00000000 */ nop /* 38E300 E008C500 468010A1 */ cvt.d.w $f2, $f2 /* 38E304 E008C504 46201082 */ mul.d $f2, $f2, $f0 -/* 38E308 E008C508 00000000 */ nop +/* 38E308 E008C508 00000000 */ nop /* 38E30C E008C50C 44830000 */ mtc1 $v1, $f0 -/* 38E310 E008C510 00000000 */ nop +/* 38E310 E008C510 00000000 */ nop /* 38E314 E008C514 46800021 */ cvt.d.w $f0, $f0 /* 38E318 E008C518 46220000 */ add.d $f0, $f0, $f2 /* 38E31C E008C51C 4620040D */ trunc.w.d $f16, $f0 @@ -82,13 +82,13 @@ glabel func_E008C3FC /* 38E324 E008C524 28E2000A */ slti $v0, $a3, 0xa .LE008C528: /* 38E328 E008C528 10400016 */ beqz $v0, .LE008C584 -/* 38E32C E008C52C 00000000 */ nop +/* 38E32C E008C52C 00000000 */ nop /* 38E330 E008C530 3C01E009 */ lui $at, %hi(D_E008CB70) /* 38E334 E008C534 D420CB70 */ ldc1 $f0, %lo(D_E008CB70)($at) /* 38E338 E008C538 C4A6001C */ lwc1 $f6, 0x1c($a1) /* 38E33C E008C53C 468031A1 */ cvt.d.w $f6, $f6 /* 38E340 E008C540 46203182 */ mul.d $f6, $f6, $f0 -/* 38E344 E008C544 00000000 */ nop +/* 38E344 E008C544 00000000 */ nop /* 38E348 E008C548 C4A00018 */ lwc1 $f0, 0x18($a1) /* 38E34C E008C54C 46000000 */ add.s $f0, $f0, $f0 /* 38E350 E008C550 C4A20014 */ lwc1 $f2, 0x14($a1) @@ -97,7 +97,7 @@ glabel func_E008C3FC /* 38E35C E008C55C D424CB78 */ ldc1 $f4, %lo(D_E008CB78)($at) /* 38E360 E008C560 46000021 */ cvt.d.s $f0, $f0 /* 38E364 E008C564 46240002 */ mul.d $f0, $f0, $f4 -/* 38E368 E008C568 00000000 */ nop +/* 38E368 E008C568 00000000 */ nop /* 38E36C E008C56C 460010A1 */ cvt.d.s $f2, $f2 /* 38E370 E008C570 46201080 */ add.d $f2, $f2, $f0 /* 38E374 E008C574 4620340D */ trunc.w.d $f16, $f6 @@ -132,7 +132,7 @@ glabel func_E008C3FC /* 38E3E0 E008C5E0 150A001C */ bne $t0, $t2, .LE008C654 /* 38E3E4 E008C5E4 30C20001 */ andi $v0, $a2, 1 /* 38E3E8 E008C5E8 10400004 */ beqz $v0, .LE008C5FC -/* 38E3EC E008C5EC 00000000 */ nop +/* 38E3EC E008C5EC 00000000 */ nop /* 38E3F0 E008C5F0 C460000C */ lwc1 $f0, 0xc($v1) /* 38E3F4 E008C5F4 08023181 */ j .LE008C604 /* 38E3F8 E008C5F8 46007081 */ sub.s $f2, $f14, $f0 @@ -142,7 +142,7 @@ glabel func_E008C3FC .LE008C604: /* 38E404 E008C604 460010A1 */ cvt.d.s $f2, $f2 /* 38E408 E008C608 46281082 */ mul.d $f2, $f2, $f8 -/* 38E40C E008C60C 00000000 */ nop +/* 38E40C E008C60C 00000000 */ nop /* 38E410 E008C610 46000021 */ cvt.d.s $f0, $f0 /* 38E414 E008C614 46220000 */ add.d $f0, $f0, $f2 /* 38E418 E008C618 46200020 */ cvt.s.d $f0, $f0 @@ -162,13 +162,13 @@ glabel func_E008C3FC /* 38E450 E008C650 E4620004 */ swc1 $f2, 4($v1) .LE008C654: /* 38E454 E008C654 1120000C */ beqz $t1, .LE008C688 -/* 38E458 E008C658 00000000 */ nop +/* 38E458 E008C658 00000000 */ nop /* 38E45C E008C65C C460000C */ lwc1 $f0, 0xc($v1) /* 38E460 E008C660 44871000 */ mtc1 $a3, $f2 -/* 38E464 E008C664 00000000 */ nop +/* 38E464 E008C664 00000000 */ nop /* 38E468 E008C668 468010A0 */ cvt.s.w $f2, $f2 /* 38E46C E008C66C 46020002 */ mul.s $f0, $f0, $f2 -/* 38E470 E008C670 00000000 */ nop +/* 38E470 E008C670 00000000 */ nop /* 38E474 E008C674 C4620000 */ lwc1 $f2, ($v1) /* 38E478 E008C678 460A0003 */ div.s $f0, $f0, $f10 /* 38E47C E008C67C 46001080 */ add.s $f2, $f2, $f0 diff --git a/asm/nonmatchings/code_38DE00/func_E008C6FC.s b/asm/nonmatchings/code_38DE00/func_E008C6FC.s index fbdb19b0ec..e4328ef37a 100644 --- a/asm/nonmatchings/code_38DE00/func_E008C6FC.s +++ b/asm/nonmatchings/code_38DE00/func_E008C6FC.s @@ -124,7 +124,7 @@ glabel func_E008C6FC .LE008C8D8: /* 38E6D8 E008C8D8 C600FFCE */ lwc1 $f0, -0x32($s0) /* 38E6DC E008C8DC 4600C002 */ mul.s $f0, $f24, $f0 -/* 38E6E0 E008C8E0 00000000 */ nop +/* 38E6E0 E008C8E0 00000000 */ nop /* 38E6E4 E008C8E4 4406A000 */ mfc1 $a2, $f20 /* 38E6E8 E008C8E8 E7A00010 */ swc1 $f0, 0x10($sp) /* 38E6EC E008C8EC C600FFC2 */ lwc1 $f0, -0x3e($s0) @@ -150,17 +150,17 @@ glabel func_E008C6FC /* 38E73C E008C93C 8FA800A0 */ lw $t0, 0xa0($sp) /* 38E740 E008C940 29020008 */ slti $v0, $t0, 8 /* 38E744 E008C944 1040000B */ beqz $v0, .LE008C974 -/* 38E748 E008C948 00000000 */ nop +/* 38E748 E008C948 00000000 */ nop /* 38E74C E008C94C 4616C001 */ sub.s $f0, $f24, $f22 /* 38E750 E008C950 461A0002 */ mul.s $f0, $f0, $f26 -/* 38E754 E008C954 00000000 */ nop +/* 38E754 E008C954 00000000 */ nop /* 38E758 E008C958 46160003 */ div.s $f0, $f0, $f22 /* 38E75C E008C95C 4600D001 */ sub.s $f0, $f26, $f0 /* 38E760 E008C960 4406A000 */ mfc1 $a2, $f20 /* 38E764 E008C964 4407A000 */ mfc1 $a3, $f20 /* 38E768 E008C968 44050000 */ mfc1 $a1, $f0 /* 38E76C E008C96C 08023260 */ j .LE008C980 -/* 38E770 E008C970 00000000 */ nop +/* 38E770 E008C970 00000000 */ nop .LE008C974: /* 38E774 E008C974 3C054000 */ lui $a1, 0x4000 /* 38E778 E008C978 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/code_38F900/func_E0090000.s b/asm/nonmatchings/code_38F900/func_E0090000.s index 09fda2d335..c6d7b7722d 100644 --- a/asm/nonmatchings/code_38F900/func_E0090000.s +++ b/asm/nonmatchings/code_38F900/func_E0090000.s @@ -46,7 +46,7 @@ glabel func_E0090000 /* 38F9A4 E00900A4 AE22000C */ sw $v0, 0xc($s1) .LE00900A8: /* 38F9A8 E00900A8 0802402A */ j .LE00900A8 -/* 38F9AC E00900AC 00000000 */ nop +/* 38F9AC E00900AC 00000000 */ nop .LE00900B0: /* 38F9B0 E00900B0 3C036666 */ lui $v1, 0x6666 /* 38F9B4 E00900B4 34636667 */ ori $v1, $v1, 0x6667 @@ -85,13 +85,13 @@ glabel func_E0090000 /* 38FA30 E0090130 4600A306 */ mov.s $f12, $f20 /* 38FA34 E0090134 46000007 */ neg.s $f0, $f0 /* 38FA38 E0090138 46160002 */ mul.s $f0, $f0, $f22 -/* 38FA3C E009013C 00000000 */ nop +/* 38FA3C E009013C 00000000 */ nop /* 38FA40 E0090140 46000000 */ add.s $f0, $f0, $f0 /* 38FA44 E0090144 4600A306 */ mov.s $f12, $f20 /* 38FA48 E0090148 0C080144 */ jal func_E0200510 /* 38FA4C E009014C E6000030 */ swc1 $f0, 0x30($s0) /* 38FA50 E0090150 46160002 */ mul.s $f0, $f0, $f22 -/* 38FA54 E0090154 00000000 */ nop +/* 38FA54 E0090154 00000000 */ nop /* 38FA58 E0090158 46000000 */ add.s $f0, $f0, $f0 /* 38FA5C E009015C 08024063 */ j .LE009018C /* 38FA60 E0090160 E6000034 */ swc1 $f0, 0x34($s0) diff --git a/asm/nonmatchings/code_38F900/func_E00901C0.s b/asm/nonmatchings/code_38F900/func_E00901C0.s index 0b73b2a61a..d0ed968bb1 100644 --- a/asm/nonmatchings/code_38F900/func_E00901C0.s +++ b/asm/nonmatchings/code_38F900/func_E00901C0.s @@ -3,4 +3,4 @@ glabel func_E00901C0 /* 38FAC0 E00901C0 03E00008 */ jr $ra -/* 38FAC4 E00901C4 00000000 */ nop +/* 38FAC4 E00901C4 00000000 */ nop diff --git a/asm/nonmatchings/code_38F900/func_E00901C8.s b/asm/nonmatchings/code_38F900/func_E00901C8.s index f256512937..fac6d40fdc 100644 --- a/asm/nonmatchings/code_38F900/func_E00901C8.s +++ b/asm/nonmatchings/code_38F900/func_E00901C8.s @@ -22,7 +22,7 @@ glabel func_E00901C8 /* 38FB08 E0090208 0C080128 */ jal func_E02004A0 /* 38FB0C E009020C ACA20018 */ sw $v0, 0x18($a1) /* 38FB10 E0090210 08024105 */ j .LE0090414 -/* 38FB14 E0090214 00000000 */ nop +/* 38FB14 E0090214 00000000 */ nop .LE0090218: /* 38FB18 E0090218 28E20005 */ slti $v0, $a3, 5 /* 38FB1C E009021C 10400048 */ beqz $v0, .LE0090340 @@ -35,11 +35,11 @@ glabel func_E00901C8 /* 38FB38 E0090238 3C01E009 */ lui $at, %hi(D_E0090AA0) /* 38FB3C E009023C D4220AA0 */ ldc1 $f2, %lo(D_E0090AA0)($at) /* 38FB40 E0090240 44820000 */ mtc1 $v0, $f0 -/* 38FB44 E0090244 00000000 */ nop +/* 38FB44 E0090244 00000000 */ nop /* 38FB48 E0090248 46800020 */ cvt.s.w $f0, $f0 /* 38FB4C E009024C 46000021 */ cvt.d.s $f0, $f0 /* 38FB50 E0090250 46220002 */ mul.d $f0, $f0, $f2 -/* 38FB54 E0090254 00000000 */ nop +/* 38FB54 E0090254 00000000 */ nop /* 38FB58 E0090258 46200020 */ cvt.s.d $f0, $f0 /* 38FB5C E009025C E4A00028 */ swc1 $f0, 0x28($a1) /* 38FB60 E0090260 2402000A */ addiu $v0, $zero, 0xa @@ -58,11 +58,11 @@ glabel func_E00901C8 /* 38FB8C E009028C 3C01E009 */ lui $at, %hi(D_E0090AA8) /* 38FB90 E0090290 D4220AA8 */ ldc1 $f2, %lo(D_E0090AA8)($at) /* 38FB94 E0090294 44820000 */ mtc1 $v0, $f0 -/* 38FB98 E0090298 00000000 */ nop +/* 38FB98 E0090298 00000000 */ nop /* 38FB9C E009029C 46800020 */ cvt.s.w $f0, $f0 /* 38FBA0 E00902A0 46000021 */ cvt.d.s $f0, $f0 /* 38FBA4 E00902A4 46220002 */ mul.d $f0, $f0, $f2 -/* 38FBA8 E00902A8 00000000 */ nop +/* 38FBA8 E00902A8 00000000 */ nop /* 38FBAC E00902AC 46200020 */ cvt.s.d $f0, $f0 /* 38FBB0 E00902B0 E4A00028 */ swc1 $f0, 0x28($a1) /* 38FBB4 E00902B4 2402006D */ addiu $v0, $zero, 0x6d @@ -87,18 +87,18 @@ glabel func_E00901C8 /* 38FBF4 E00902F4 44802000 */ mtc1 $zero, $f4 /* 38FBF8 E00902F8 46000021 */ cvt.d.s $f0, $f0 /* 38FBFC E00902FC 46240002 */ mul.d $f0, $f0, $f4 -/* 38FC00 E0090300 00000000 */ nop +/* 38FC00 E0090300 00000000 */ nop /* 38FC04 E0090304 C4A20034 */ lwc1 $f2, 0x34($a1) /* 38FC08 E0090308 460010A1 */ cvt.d.s $f2, $f2 /* 38FC0C E009030C 46241082 */ mul.d $f2, $f2, $f4 -/* 38FC10 E0090310 00000000 */ nop +/* 38FC10 E0090310 00000000 */ nop /* 38FC14 E0090314 46200020 */ cvt.s.d $f0, $f0 /* 38FC18 E0090318 462010A0 */ cvt.s.d $f2, $f2 /* 38FC1C E009031C E4A00030 */ swc1 $f0, 0x30($a1) /* 38FC20 E0090320 E4A20034 */ swc1 $f2, 0x34($a1) .LE0090324: /* 38FC24 E0090324 10400027 */ beqz $v0, .LE00903C4 -/* 38FC28 E0090328 00000000 */ nop +/* 38FC28 E0090328 00000000 */ nop /* 38FC2C E009032C C4A00030 */ lwc1 $f0, 0x30($a1) /* 38FC30 E0090330 3C01E009 */ lui $at, %hi(D_E0090AB0) /* 38FC34 E0090334 D4240AB0 */ ldc1 $f4, %lo(D_E0090AB0)($at) @@ -113,29 +113,29 @@ glabel func_E00901C8 /* 38FC54 E0090354 D4240AB8 */ ldc1 $f4, %lo(D_E0090AB8)($at) /* 38FC58 E0090358 46000021 */ cvt.d.s $f0, $f0 /* 38FC5C E009035C 46240002 */ mul.d $f0, $f0, $f4 -/* 38FC60 E0090360 00000000 */ nop +/* 38FC60 E0090360 00000000 */ nop /* 38FC64 E0090364 C4A20034 */ lwc1 $f2, 0x34($a1) /* 38FC68 E0090368 460010A1 */ cvt.d.s $f2, $f2 /* 38FC6C E009036C 46241082 */ mul.d $f2, $f2, $f4 -/* 38FC70 E0090370 00000000 */ nop +/* 38FC70 E0090370 00000000 */ nop /* 38FC74 E0090374 46200020 */ cvt.s.d $f0, $f0 /* 38FC78 E0090378 462010A0 */ cvt.s.d $f2, $f2 /* 38FC7C E009037C E4A00030 */ swc1 $f0, 0x30($a1) /* 38FC80 E0090380 E4A20034 */ swc1 $f2, 0x34($a1) .LE0090384: /* 38FC84 E0090384 1040000F */ beqz $v0, .LE00903C4 -/* 38FC88 E0090388 00000000 */ nop +/* 38FC88 E0090388 00000000 */ nop /* 38FC8C E009038C C4A00030 */ lwc1 $f0, 0x30($a1) /* 38FC90 E0090390 3C01E009 */ lui $at, %hi(D_E0090AC0) /* 38FC94 E0090394 D4240AC0 */ ldc1 $f4, %lo(D_E0090AC0)($at) /* 38FC98 E0090398 46000021 */ cvt.d.s $f0, $f0 .LE009039C: /* 38FC9C E009039C 46240002 */ mul.d $f0, $f0, $f4 -/* 38FCA0 E00903A0 00000000 */ nop +/* 38FCA0 E00903A0 00000000 */ nop /* 38FCA4 E00903A4 C4A20034 */ lwc1 $f2, 0x34($a1) /* 38FCA8 E00903A8 460010A1 */ cvt.d.s $f2, $f2 /* 38FCAC E00903AC 46241082 */ mul.d $f2, $f2, $f4 -/* 38FCB0 E00903B0 00000000 */ nop +/* 38FCB0 E00903B0 00000000 */ nop /* 38FCB4 E00903B4 46200020 */ cvt.s.d $f0, $f0 /* 38FCB8 E00903B8 462010A0 */ cvt.s.d $f2, $f2 /* 38FCBC E00903BC E4A00030 */ swc1 $f0, 0x30($a1) diff --git a/asm/nonmatchings/code_38F900/func_E0090420.s b/asm/nonmatchings/code_38F900/func_E0090420.s index 2bfd51d1fa..28e286d38d 100644 --- a/asm/nonmatchings/code_38F900/func_E0090420.s +++ b/asm/nonmatchings/code_38F900/func_E0090420.s @@ -3,4 +3,4 @@ glabel func_E0090420 /* 38FD20 E0090420 03E00008 */ jr $ra -/* 38FD24 E0090424 00000000 */ nop +/* 38FD24 E0090424 00000000 */ nop diff --git a/asm/nonmatchings/code_38F900/func_E0090428.s b/asm/nonmatchings/code_38F900/func_E0090428.s index 936059e068..28e6295d1e 100644 --- a/asm/nonmatchings/code_38F900/func_E0090428.s +++ b/asm/nonmatchings/code_38F900/func_E0090428.s @@ -5,7 +5,7 @@ glabel func_E0090428 /* 38FD28 E0090428 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 38FD2C E009042C AFBF0010 */ sw $ra, 0x10($sp) /* 38FD30 E0090430 0C024111 */ jal func_E0090444 -/* 38FD34 E0090434 00000000 */ nop +/* 38FD34 E0090434 00000000 */ nop /* 38FD38 E0090438 8FBF0010 */ lw $ra, 0x10($sp) /* 38FD3C E009043C 03E00008 */ jr $ra /* 38FD40 E0090440 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_38F900/func_E0090444.s b/asm/nonmatchings/code_38F900/func_E0090444.s index 78cce009ea..fade004c45 100644 --- a/asm/nonmatchings/code_38F900/func_E0090444.s +++ b/asm/nonmatchings/code_38F900/func_E0090444.s @@ -225,14 +225,14 @@ glabel func_E0090444 /* 3900AC E00907AC 44811000 */ mtc1 $at, $f2 /* 3900B0 E00907B0 25020030 */ addiu $v0, $t0, 0x30 /* 3900B4 E00907B4 46020002 */ mul.s $f0, $f0, $f2 -/* 3900B8 E00907B8 00000000 */ nop +/* 3900B8 E00907B8 00000000 */ nop /* 3900BC E00907BC AE820000 */ sw $v0, ($s4) /* 3900C0 E00907C0 25020040 */ addiu $v0, $t0, 0x40 /* 3900C4 E00907C4 AE830000 */ sw $v1, ($s4) /* 3900C8 E00907C8 AE820000 */ sw $v0, ($s4) /* 3900CC E00907CC 4600010D */ trunc.w.s $f4, $f0 /* 3900D0 E00907D0 44022000 */ mfc1 $v0, $f4 -/* 3900D4 E00907D4 00000000 */ nop +/* 3900D4 E00907D4 00000000 */ nop /* 3900D8 E00907D8 00021400 */ sll $v0, $v0, 0x10 /* 3900DC E00907DC 00021403 */ sra $v0, $v0, 0x10 /* 3900E0 E00907E0 18400006 */ blez $v0, .LE00907FC @@ -248,17 +248,17 @@ glabel func_E0090444 /* 390100 E0090800 C660000C */ lwc1 $f0, 0xc($s3) /* 390104 E0090804 3C014280 */ lui $at, 0x4280 /* 390108 E0090808 44811000 */ mtc1 $at, $f2 -/* 39010C E009080C 00000000 */ nop +/* 39010C E009080C 00000000 */ nop /* 390110 E0090810 46020000 */ add.s $f0, $f0, $f2 /* 390114 E0090814 3C014080 */ lui $at, 0x4080 /* 390118 E0090818 44811000 */ mtc1 $at, $f2 -/* 39011C E009081C 00000000 */ nop +/* 39011C E009081C 00000000 */ nop /* 390120 E0090820 46020002 */ mul.s $f0, $f0, $f2 -/* 390124 E0090824 00000000 */ nop +/* 390124 E0090824 00000000 */ nop /* 390128 E0090828 0040182D */ daddu $v1, $v0, $zero /* 39012C E009082C 4600010D */ trunc.w.s $f4, $f0 /* 390130 E0090830 44022000 */ mfc1 $v0, $f4 -/* 390134 E0090834 00000000 */ nop +/* 390134 E0090834 00000000 */ nop /* 390138 E0090838 00021400 */ sll $v0, $v0, 0x10 /* 39013C E009083C 00021403 */ sra $v0, $v0, 0x10 /* 390140 E0090840 18400002 */ blez $v0, .LE009084C @@ -268,10 +268,10 @@ glabel func_E0090444 /* 39014C E009084C AC830000 */ sw $v1, ($a0) /* 390150 E0090850 C6600008 */ lwc1 $f0, 8($s3) /* 390154 E0090854 46020002 */ mul.s $f0, $f0, $f2 -/* 390158 E0090858 00000000 */ nop +/* 390158 E0090858 00000000 */ nop /* 39015C E009085C 4600010D */ trunc.w.s $f4, $f0 /* 390160 E0090860 44022000 */ mfc1 $v0, $f4 -/* 390164 E0090864 00000000 */ nop +/* 390164 E0090864 00000000 */ nop /* 390168 E0090868 00021400 */ sll $v0, $v0, 0x10 /* 39016C E009086C 00021403 */ sra $v0, $v0, 0x10 /* 390170 E0090870 18400004 */ blez $v0, .LE0090884 @@ -285,13 +285,13 @@ glabel func_E0090444 /* 390188 E0090888 C660000C */ lwc1 $f0, 0xc($s3) /* 39018C E009088C 3C014080 */ lui $at, 0x4080 /* 390190 E0090890 44811000 */ mtc1 $at, $f2 -/* 390194 E0090894 00000000 */ nop +/* 390194 E0090894 00000000 */ nop /* 390198 E0090898 46020002 */ mul.s $f0, $f0, $f2 -/* 39019C E009089C 00000000 */ nop +/* 39019C E009089C 00000000 */ nop /* 3901A0 E00908A0 0040202D */ daddu $a0, $v0, $zero /* 3901A4 E00908A4 4600010D */ trunc.w.s $f4, $f0 /* 3901A8 E00908A8 44022000 */ mfc1 $v0, $f4 -/* 3901AC E00908AC 00000000 */ nop +/* 3901AC E00908AC 00000000 */ nop /* 3901B0 E00908B0 00021400 */ sll $v0, $v0, 0x10 /* 3901B4 E00908B4 00021403 */ sra $v0, $v0, 0x10 /* 3901B8 E00908B8 18400002 */ blez $v0, .LE00908C4 @@ -307,12 +307,12 @@ glabel func_E0090444 /* 3901DC E00908DC AC820000 */ sw $v0, ($a0) /* 3901E0 E00908E0 C6600008 */ lwc1 $f0, 8($s3) /* 3901E4 E00908E4 46020002 */ mul.s $f0, $f0, $f2 -/* 3901E8 E00908E8 00000000 */ nop +/* 3901E8 E00908E8 00000000 */ nop /* 3901EC E00908EC 24630008 */ addiu $v1, $v1, 8 /* 3901F0 E00908F0 24860004 */ addiu $a2, $a0, 4 /* 3901F4 E00908F4 4600010D */ trunc.w.s $f4, $f0 /* 3901F8 E00908F8 44022000 */ mfc1 $v0, $f4 -/* 3901FC E00908FC 00000000 */ nop +/* 3901FC E00908FC 00000000 */ nop /* 390200 E0090900 00021400 */ sll $v0, $v0, 0x10 /* 390204 E0090904 00021403 */ sra $v0, $v0, 0x10 /* 390208 E0090908 04410007 */ bgez $v0, .LE0090928 @@ -330,18 +330,18 @@ glabel func_E0090444 /* 39022C E009092C C660000C */ lwc1 $f0, 0xc($s3) /* 390230 E0090930 3C014080 */ lui $at, 0x4080 /* 390234 E0090934 44811000 */ mtc1 $at, $f2 -/* 390238 E0090938 00000000 */ nop +/* 390238 E0090938 00000000 */ nop /* 39023C E009093C 46020082 */ mul.s $f2, $f0, $f2 -/* 390240 E0090940 00000000 */ nop +/* 390240 E0090940 00000000 */ nop /* 390244 E0090944 44800000 */ mtc1 $zero, $f0 -/* 390248 E0090948 00000000 */ nop +/* 390248 E0090948 00000000 */ nop /* 39024C E009094C 4600103C */ c.lt.s $f2, $f0 -/* 390250 E0090950 00000000 */ nop +/* 390250 E0090950 00000000 */ nop /* 390254 E0090954 4500000E */ bc1f .LE0090990 /* 390258 E0090958 34830400 */ ori $v1, $a0, 0x400 /* 39025C E009095C 4600110D */ trunc.w.s $f4, $f2 /* 390260 E0090960 44022000 */ mfc1 $v0, $f4 -/* 390264 E0090964 00000000 */ nop +/* 390264 E0090964 00000000 */ nop /* 390268 E0090968 00021400 */ sll $v0, $v0, 0x10 /* 39026C E009096C 000211C3 */ sra $v0, $v0, 7 /* 390270 E0090970 00021023 */ negu $v0, $v0 @@ -397,6 +397,6 @@ glabel func_E0090444 /* 390328 E0090A28 D7B400B0 */ ldc1 $f20, 0xb0($sp) /* 39032C E0090A2C 03E00008 */ jr $ra /* 390330 E0090A30 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 390334 E0090A34 00000000 */ nop -/* 390338 E0090A38 00000000 */ nop -/* 39033C E0090A3C 00000000 */ nop +/* 390334 E0090A34 00000000 */ nop +/* 390338 E0090A38 00000000 */ nop +/* 39033C E0090A3C 00000000 */ nop diff --git a/asm/nonmatchings/code_391D30/func_E0092000.s b/asm/nonmatchings/code_391D30/func_E0092000.s index 42e4debe4e..bf958e67d4 100644 --- a/asm/nonmatchings/code_391D30/func_E0092000.s +++ b/asm/nonmatchings/code_391D30/func_E0092000.s @@ -41,7 +41,7 @@ glabel func_E0092000 /* 391DC0 E0092090 AE03000C */ sw $v1, 0xc($s0) .LE0092094: /* 391DC4 E0092094 08024825 */ j .LE0092094 -/* 391DC8 E0092098 00000000 */ nop +/* 391DC8 E0092098 00000000 */ nop .LE009209C: /* 391DCC E009209C 2402000E */ addiu $v0, $zero, 0xe /* 391DD0 E00920A0 AC720000 */ sw $s2, ($v1) @@ -86,10 +86,10 @@ glabel func_E0092000 /* 391E68 E0092138 C4400000 */ lwc1 $f0, ($v0) /* 391E6C E009213C 46800020 */ cvt.s.w $f0, $f0 /* 391E70 E0092140 4600D002 */ mul.s $f0, $f26, $f0 -/* 391E74 E0092144 00000000 */ nop +/* 391E74 E0092144 00000000 */ nop /* 391E78 E0092148 46000021 */ cvt.d.s $f0, $f0 /* 391E7C E009214C 46220002 */ mul.d $f0, $f0, $f2 -/* 391E80 E0092150 00000000 */ nop +/* 391E80 E0092150 00000000 */ nop /* 391E84 E0092154 25290014 */ addiu $t1, $t1, 0x14 /* 391E88 E0092158 24E70014 */ addiu $a3, $a3, 0x14 /* 391E8C E009215C 24C60014 */ addiu $a2, $a2, 0x14 diff --git a/asm/nonmatchings/code_391D30/func_E00921AC.s b/asm/nonmatchings/code_391D30/func_E00921AC.s index 0dbc77c8bc..b50e487e59 100644 --- a/asm/nonmatchings/code_391D30/func_E00921AC.s +++ b/asm/nonmatchings/code_391D30/func_E00921AC.s @@ -3,4 +3,4 @@ glabel func_E00921AC /* 391EDC E00921AC 03E00008 */ jr $ra -/* 391EE0 E00921B0 00000000 */ nop +/* 391EE0 E00921B0 00000000 */ nop diff --git a/asm/nonmatchings/code_391D30/func_E00921B4.s b/asm/nonmatchings/code_391D30/func_E00921B4.s index 5ca9281c93..8cf3cba0bf 100644 --- a/asm/nonmatchings/code_391D30/func_E00921B4.s +++ b/asm/nonmatchings/code_391D30/func_E00921B4.s @@ -14,9 +14,9 @@ glabel func_E00921B4 /* 391F08 E00921D8 04610005 */ bgez $v1, .LE00921F0 /* 391F0C E00921DC ACA20018 */ sw $v0, 0x18($a1) /* 391F10 E00921E0 0C080128 */ jal func_E02004A0 -/* 391F14 E00921E4 00000000 */ nop +/* 391F14 E00921E4 00000000 */ nop /* 391F18 E00921E8 08024893 */ j .LE009224C -/* 391F1C E00921EC 00000000 */ nop +/* 391F1C E00921EC 00000000 */ nop .LE00921F0: /* 391F20 E00921F0 8C820008 */ lw $v0, 8($a0) /* 391F24 E00921F4 24060001 */ addiu $a2, $zero, 1 diff --git a/asm/nonmatchings/code_391D30/func_E00922A0.s b/asm/nonmatchings/code_391D30/func_E00922A0.s index fe13130e0e..abbaaae837 100644 --- a/asm/nonmatchings/code_391D30/func_E00922A0.s +++ b/asm/nonmatchings/code_391D30/func_E00922A0.s @@ -143,7 +143,7 @@ glabel func_E00922A0 .LE00924C8: /* 3921F8 E00924C8 8E02001C */ lw $v0, 0x1c($s0) /* 3921FC E00924CC 14400049 */ bnez $v0, .LE00925F4 -/* 392200 E00924D0 00000000 */ nop +/* 392200 E00924D0 00000000 */ nop /* 392204 E00924D4 8E050004 */ lw $a1, 4($s0) /* 392208 E00924D8 8E060008 */ lw $a2, 8($s0) /* 39220C E00924DC 8E07000C */ lw $a3, 0xc($s0) @@ -151,7 +151,7 @@ glabel func_E00922A0 /* 392214 E00924E4 0C080108 */ jal func_E0200420 /* 392218 E00924E8 27A40018 */ addiu $a0, $sp, 0x18 /* 39221C E00924EC 4616A032 */ c.eq.s $f20, $f22 -/* 392220 E00924F0 00000000 */ nop +/* 392220 E00924F0 00000000 */ nop /* 392224 E00924F4 4501000B */ bc1t .LE0092524 /* 392228 E00924F8 27A40018 */ addiu $a0, $sp, 0x18 /* 39222C E00924FC 02A0202D */ daddu $a0, $s5, $zero @@ -255,6 +255,6 @@ glabel func_E00922A0 /* 3923A8 E0092678 D7B40108 */ ldc1 $f20, 0x108($sp) /* 3923AC E009267C 03E00008 */ jr $ra /* 3923B0 E0092680 27BD0118 */ addiu $sp, $sp, 0x118 -/* 3923B4 E0092684 00000000 */ nop -/* 3923B8 E0092688 00000000 */ nop -/* 3923BC E009268C 00000000 */ nop +/* 3923B4 E0092684 00000000 */ nop +/* 3923B8 E0092688 00000000 */ nop +/* 3923BC E009268C 00000000 */ nop diff --git a/asm/nonmatchings/code_394280/func_E0096000.s b/asm/nonmatchings/code_394280/func_E0096000.s index ccf05f2579..9c63113ab2 100644 --- a/asm/nonmatchings/code_394280/func_E0096000.s +++ b/asm/nonmatchings/code_394280/func_E0096000.s @@ -38,7 +38,7 @@ glabel func_E0096000 /* 394304 E0096084 AE02000C */ sw $v0, 0xc($s0) .LE0096088: /* 394308 E0096088 08025822 */ j .LE0096088 -/* 39430C E009608C 00000000 */ nop +/* 39430C E009608C 00000000 */ nop .LE0096090: /* 394310 E0096090 3C013F2B */ lui $at, 0x3f2b /* 394314 E0096094 3421851F */ ori $at, $at, 0x851f diff --git a/asm/nonmatchings/code_394280/func_E00960EC.s b/asm/nonmatchings/code_394280/func_E00960EC.s index 093bc41d52..8bc5f97502 100644 --- a/asm/nonmatchings/code_394280/func_E00960EC.s +++ b/asm/nonmatchings/code_394280/func_E00960EC.s @@ -3,4 +3,4 @@ glabel func_E00960EC /* 39436C E00960EC 03E00008 */ jr $ra -/* 394370 E00960F0 00000000 */ nop +/* 394370 E00960F0 00000000 */ nop diff --git a/asm/nonmatchings/code_394280/func_E00960F4.s b/asm/nonmatchings/code_394280/func_E00960F4.s index 55b414dd9a..836371d36c 100644 --- a/asm/nonmatchings/code_394280/func_E00960F4.s +++ b/asm/nonmatchings/code_394280/func_E00960F4.s @@ -14,18 +14,18 @@ glabel func_E00960F4 /* 394398 E0096118 04610005 */ bgez $v1, .LE0096130 /* 39439C E009611C ACA20020 */ sw $v0, 0x20($a1) /* 3943A0 E0096120 0C080128 */ jal func_E02004A0 -/* 3943A4 E0096124 00000000 */ nop +/* 3943A4 E0096124 00000000 */ nop /* 3943A8 E0096128 0802585B */ j .LE009616C -/* 3943AC E009612C 00000000 */ nop +/* 3943AC E009612C 00000000 */ nop .LE0096130: /* 3943B0 E0096130 C4A00010 */ lwc1 $f0, 0x10($a1) /* 3943B4 E0096134 C4A20014 */ lwc1 $f2, 0x14($a1) /* 3943B8 E0096138 46020000 */ add.s $f0, $f0, $f2 /* 3943BC E009613C 3C014000 */ lui $at, 0x4000 /* 3943C0 E0096140 44811000 */ mtc1 $at, $f2 -/* 3943C4 E0096144 00000000 */ nop +/* 3943C4 E0096144 00000000 */ nop /* 3943C8 E0096148 4600103C */ c.lt.s $f2, $f0 -/* 3943CC E009614C 00000000 */ nop +/* 3943CC E009614C 00000000 */ nop /* 3943D0 E0096150 45000002 */ bc1f .LE009615C /* 3943D4 E0096154 E4A00010 */ swc1 $f0, 0x10($a1) /* 3943D8 E0096158 E4A20010 */ swc1 $f2, 0x10($a1) diff --git a/asm/nonmatchings/code_394280/func_E00961BC.s b/asm/nonmatchings/code_394280/func_E00961BC.s index de3cfac2df..8153f51eb1 100644 --- a/asm/nonmatchings/code_394280/func_E00961BC.s +++ b/asm/nonmatchings/code_394280/func_E00961BC.s @@ -138,4 +138,4 @@ glabel func_E00961BC /* 394650 E00963D0 D7B400B8 */ ldc1 $f20, 0xb8($sp) /* 394654 E00963D4 03E00008 */ jr $ra /* 394658 E00963D8 27BD00C0 */ addiu $sp, $sp, 0xc0 -/* 39465C E00963DC 00000000 */ nop +/* 39465C E00963DC 00000000 */ nop diff --git a/asm/nonmatchings/code_3965B0/func_E009A000.s b/asm/nonmatchings/code_3965B0/func_E009A000.s index bdf0049518..59e9cf52d1 100644 --- a/asm/nonmatchings/code_3965B0/func_E009A000.s +++ b/asm/nonmatchings/code_3965B0/func_E009A000.s @@ -43,7 +43,7 @@ glabel func_E009A000 /* 396648 E009A098 AE22000C */ sw $v0, 0xc($s1) .LE009A09C: /* 39664C E009A09C 08026827 */ j .LE009A09C -/* 396650 E009A0A0 00000000 */ nop +/* 396650 E009A0A0 00000000 */ nop .LE009A0A4: /* 396654 E009A0A4 3C013F80 */ lui $at, 0x3f80 /* 396658 E009A0A8 44811000 */ mtc1 $at, $f2 diff --git a/asm/nonmatchings/code_3965B0/func_E009A138.s b/asm/nonmatchings/code_3965B0/func_E009A138.s index 9413315963..0faf3bf7ae 100644 --- a/asm/nonmatchings/code_3965B0/func_E009A138.s +++ b/asm/nonmatchings/code_3965B0/func_E009A138.s @@ -3,4 +3,4 @@ glabel func_E009A138 /* 3966E8 E009A138 03E00008 */ jr $ra -/* 3966EC E009A13C 00000000 */ nop +/* 3966EC E009A13C 00000000 */ nop diff --git a/asm/nonmatchings/code_3965B0/func_E009A140.s b/asm/nonmatchings/code_3965B0/func_E009A140.s index 68ae26eca0..256fba05e3 100644 --- a/asm/nonmatchings/code_3965B0/func_E009A140.s +++ b/asm/nonmatchings/code_3965B0/func_E009A140.s @@ -17,9 +17,9 @@ glabel func_E009A140 /* 396720 E009A170 04610005 */ bgez $v1, .LE009A188 /* 396724 E009A174 AE220044 */ sw $v0, 0x44($s1) /* 396728 E009A178 0C080128 */ jal func_E02004A0 -/* 39672C E009A17C 00000000 */ nop +/* 39672C E009A17C 00000000 */ nop /* 396730 E009A180 080268E0 */ j .LE009A380 -/* 396734 E009A184 00000000 */ nop +/* 396734 E009A184 00000000 */ nop .LE009A188: /* 396738 E009A188 8E24002C */ lw $a0, 0x2c($s1) /* 39673C E009A18C 2C820006 */ sltiu $v0, $a0, 6 @@ -29,21 +29,21 @@ glabel func_E009A140 /* 39674C E009A19C 00220821 */ addu $at, $at, $v0 /* 396750 E009A1A0 8C22AA60 */ lw $v0, %lo(D_E009AA60)($at) /* 396754 E009A1A4 00400008 */ jr $v0 -/* 396758 E009A1A8 00000000 */ nop +/* 396758 E009A1A8 00000000 */ nop /* 39675C E009A1AC 8E23003C */ lw $v1, 0x3c($s1) /* 396760 E009A1B0 8E220020 */ lw $v0, 0x20($s1) /* 396764 E009A1B4 C6200028 */ lwc1 $f0, 0x28($s1) /* 396768 E009A1B8 00431023 */ subu $v0, $v0, $v1 /* 39676C E009A1BC 44822000 */ mtc1 $v0, $f4 -/* 396770 E009A1C0 00000000 */ nop +/* 396770 E009A1C0 00000000 */ nop /* 396774 E009A1C4 46802120 */ cvt.s.w $f4, $f4 /* 396778 E009A1C8 46002102 */ mul.s $f4, $f4, $f0 -/* 39677C E009A1CC 00000000 */ nop +/* 39677C E009A1CC 00000000 */ nop /* 396780 E009A1D0 C6220018 */ lwc1 $f2, 0x18($s1) /* 396784 E009A1D4 C6260024 */ lwc1 $f6, 0x24($s1) /* 396788 E009A1D8 46061081 */ sub.s $f2, $f2, $f6 /* 39678C E009A1DC 46001082 */ mul.s $f2, $f2, $f0 -/* 396790 E009A1E0 00000000 */ nop +/* 396790 E009A1E0 00000000 */ nop /* 396794 E009A1E4 C6200034 */ lwc1 $f0, 0x34($s1) /* 396798 E009A1E8 46023180 */ add.s $f6, $f6, $f2 /* 39679C E009A1EC 3C01E00A */ lui $at, %hi(D_E009AA78) @@ -52,7 +52,7 @@ glabel func_E009A140 /* 3967A8 E009A1F8 46220001 */ sub.d $f0, $f0, $f2 /* 3967AC E009A1FC 44804000 */ mtc1 $zero, $f8 /* 3967B0 E009A200 44831000 */ mtc1 $v1, $f2 -/* 3967B4 E009A204 00000000 */ nop +/* 3967B4 E009A204 00000000 */ nop /* 3967B8 E009A208 468010A0 */ cvt.s.w $f2, $f2 /* 3967BC E009A20C 46041080 */ add.s $f2, $f2, $f4 /* 3967C0 E009A210 E6260024 */ swc1 $f6, 0x24($s1) @@ -60,7 +60,7 @@ glabel func_E009A140 /* 3967C8 E009A218 4600128D */ trunc.w.s $f10, $f2 /* 3967CC E009A21C E62A003C */ swc1 $f10, 0x3c($s1) /* 3967D0 E009A220 4608003C */ c.lt.s $f0, $f8 -/* 3967D4 E009A224 00000000 */ nop +/* 3967D4 E009A224 00000000 */ nop /* 3967D8 E009A228 45000055 */ bc1f .LE009A380 /* 3967DC E009A22C E6200034 */ swc1 $f0, 0x34($s1) /* 3967E0 E009A230 2402000A */ addiu $v0, $zero, 0xa @@ -89,14 +89,14 @@ glabel func_E009A140 /* 39683C E009A28C C6200010 */ lwc1 $f0, 0x10($s1) /* 396840 E009A290 3C013F80 */ lui $at, 0x3f80 /* 396844 E009A294 44811000 */ mtc1 $at, $f2 -/* 396848 E009A298 00000000 */ nop +/* 396848 E009A298 00000000 */ nop /* 39684C E009A29C 46020001 */ sub.s $f0, $f0, $f2 /* 396850 E009A2A0 C6220008 */ lwc1 $f2, 8($s1) /* 396854 E009A2A4 44802000 */ mtc1 $zero, $f4 /* 396858 E009A2A8 46001080 */ add.s $f2, $f2, $f0 /* 39685C E009A2AC E6200010 */ swc1 $f0, 0x10($s1) /* 396860 E009A2B0 4604103C */ c.lt.s $f2, $f4 -/* 396864 E009A2B4 00000000 */ nop +/* 396864 E009A2B4 00000000 */ nop /* 396868 E009A2B8 45000031 */ bc1f .LE009A380 /* 39686C E009A2BC E6220008 */ swc1 $f2, 8($s1) /* 396870 E009A2C0 24040015 */ addiu $a0, $zero, 0x15 diff --git a/asm/nonmatchings/code_3965B0/func_E009A3E0.s b/asm/nonmatchings/code_3965B0/func_E009A3E0.s index 268db749de..9968ed28d7 100644 --- a/asm/nonmatchings/code_3965B0/func_E009A3E0.s +++ b/asm/nonmatchings/code_3965B0/func_E009A3E0.s @@ -55,11 +55,11 @@ glabel func_E009A3E0 /* 396A58 E009A4A8 E7A00010 */ swc1 $f0, 0x10($sp) /* 396A5C E009A4AC C6A00004 */ lwc1 $f0, 4($s5) /* 396A60 E009A4B0 46040002 */ mul.s $f0, $f0, $f4 -/* 396A64 E009A4B4 00000000 */ nop +/* 396A64 E009A4B4 00000000 */ nop /* 396A68 E009A4B8 E7A00014 */ swc1 $f0, 0x14($sp) /* 396A6C E009A4BC C6A00008 */ lwc1 $f0, 8($s5) /* 396A70 E009A4C0 46040002 */ mul.s $f0, $f0, $f4 -/* 396A74 E009A4C4 00000000 */ nop +/* 396A74 E009A4C4 00000000 */ nop /* 396A78 E009A4C8 3C140001 */ lui $s4, 1 /* 396A7C E009A4CC 36941630 */ ori $s4, $s4, 0x1630 /* 396A80 E009A4D0 27B00060 */ addiu $s0, $sp, 0x60 @@ -67,7 +67,7 @@ glabel func_E009A3E0 /* 396A88 E009A4D8 C6A0000C */ lwc1 $f0, 0xc($s5) /* 396A8C E009A4DC 44801000 */ mtc1 $zero, $f2 /* 396A90 E009A4E0 46040002 */ mul.s $f0, $f0, $f4 -/* 396A94 E009A4E4 00000000 */ nop +/* 396A94 E009A4E4 00000000 */ nop /* 396A98 E009A4E8 44051000 */ mfc1 $a1, $f2 /* 396A9C E009A4EC 0200202D */ daddu $a0, $s0, $zero /* 396AA0 E009A4F0 00A0302D */ daddu $a2, $a1, $zero @@ -95,7 +95,7 @@ glabel func_E009A3E0 /* 396AF8 E009A548 00561023 */ subu $v0, $v0, $s6 /* 396AFC E009A54C 00021040 */ sll $v0, $v0, 1 /* 396B00 E009A550 4482A000 */ mtc1 $v0, $f20 -/* 396B04 E009A554 00000000 */ nop +/* 396B04 E009A554 00000000 */ nop /* 396B08 E009A558 4680A520 */ cvt.s.w $f20, $f20 /* 396B0C E009A55C 4600A306 */ mov.s $f12, $f20 /* 396B10 E009A560 8E500000 */ lw $s0, ($s2) @@ -122,45 +122,45 @@ glabel func_E009A3E0 /* 396B64 E009A5B4 46000506 */ mov.s $f20, $f0 /* 396B68 E009A5B8 3C0141C8 */ lui $at, 0x41c8 /* 396B6C E009A5BC 44811000 */ mtc1 $at, $f2 -/* 396B70 E009A5C0 00000000 */ nop +/* 396B70 E009A5C0 00000000 */ nop /* 396B74 E009A5C4 4602A502 */ mul.s $f20, $f20, $f2 -/* 396B78 E009A5C8 00000000 */ nop +/* 396B78 E009A5C8 00000000 */ nop /* 396B7C E009A5CC 3C014361 */ lui $at, 0x4361 /* 396B80 E009A5D0 44811000 */ mtc1 $at, $f2 /* 396B84 E009A5D4 46000106 */ mov.s $f4, $f0 /* 396B88 E009A5D8 4602A500 */ add.s $f20, $f20, $f2 /* 396B8C E009A5DC 3C014F00 */ lui $at, 0x4f00 /* 396B90 E009A5E0 44811000 */ mtc1 $at, $f2 -/* 396B94 E009A5E4 00000000 */ nop +/* 396B94 E009A5E4 00000000 */ nop /* 396B98 E009A5E8 4614103E */ c.le.s $f2, $f20 -/* 396B9C E009A5EC 00000000 */ nop +/* 396B9C E009A5EC 00000000 */ nop /* 396BA0 E009A5F0 45010005 */ bc1t .LE009A608 /* 396BA4 E009A5F4 26100004 */ addiu $s0, $s0, 4 /* 396BA8 E009A5F8 4600A18D */ trunc.w.s $f6, $f20 /* 396BAC E009A5FC 44023000 */ mfc1 $v0, $f6 /* 396BB0 E009A600 08026987 */ j .LE009A61C -/* 396BB4 E009A604 00000000 */ nop +/* 396BB4 E009A604 00000000 */ nop .LE009A608: /* 396BB8 E009A608 4602A001 */ sub.s $f0, $f20, $f2 /* 396BBC E009A60C 4600018D */ trunc.w.s $f6, $f0 /* 396BC0 E009A610 44023000 */ mfc1 $v0, $f6 -/* 396BC4 E009A614 00000000 */ nop +/* 396BC4 E009A614 00000000 */ nop /* 396BC8 E009A618 005E1025 */ or $v0, $v0, $fp .LE009A61C: /* 396BCC E009A61C 3C0141C8 */ lui $at, 0x41c8 /* 396BD0 E009A620 44810000 */ mtc1 $at, $f0 -/* 396BD4 E009A624 00000000 */ nop +/* 396BD4 E009A624 00000000 */ nop /* 396BD8 E009A628 46002002 */ mul.s $f0, $f4, $f0 -/* 396BDC E009A62C 00000000 */ nop +/* 396BDC E009A62C 00000000 */ nop /* 396BE0 E009A630 3C014361 */ lui $at, 0x4361 /* 396BE4 E009A634 44811000 */ mtc1 $at, $f2 -/* 396BE8 E009A638 00000000 */ nop +/* 396BE8 E009A638 00000000 */ nop /* 396BEC E009A63C 46020000 */ add.s $f0, $f0, $f2 /* 396BF0 E009A640 3C014F00 */ lui $at, 0x4f00 /* 396BF4 E009A644 44811000 */ mtc1 $at, $f2 -/* 396BF8 E009A648 00000000 */ nop +/* 396BF8 E009A648 00000000 */ nop /* 396BFC E009A64C 4600103E */ c.le.s $f2, $f0 -/* 396C00 E009A650 00000000 */ nop +/* 396C00 E009A650 00000000 */ nop /* 396C04 E009A654 45010005 */ bc1t .LE009A66C /* 396C08 E009A658 00022600 */ sll $a0, $v0, 0x18 /* 396C0C E009A65C 4600018D */ trunc.w.s $f6, $f0 @@ -172,7 +172,7 @@ glabel func_E009A3E0 /* 396C20 E009A670 3C028000 */ lui $v0, 0x8000 /* 396C24 E009A674 4600018D */ trunc.w.s $f6, $f0 /* 396C28 E009A678 44033000 */ mfc1 $v1, $f6 -/* 396C2C E009A67C 00000000 */ nop +/* 396C2C E009A67C 00000000 */ nop /* 396C30 E009A680 00621825 */ or $v1, $v1, $v0 /* 396C34 E009A684 306200FF */ andi $v0, $v1, 0xff .LE009A688: @@ -235,7 +235,7 @@ glabel func_E009A3E0 /* 396D18 E009A768 AC82000C */ sw $v0, 0xc($a0) .LE009A76C: /* 396D1C E009A76C 1860000D */ blez $v1, .LE009A7A4 -/* 396D20 E009A770 00000000 */ nop +/* 396D20 E009A770 00000000 */ nop /* 396D24 E009A774 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* 396D28 E009A778 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* 396D2C E009A77C 8C620000 */ lw $v0, ($v1) @@ -281,20 +281,20 @@ glabel func_E009A3E0 /* 396DC0 E009A810 00128140 */ sll $s0, $s2, 5 /* 396DC4 E009A814 02971021 */ addu $v0, $s4, $s7 /* 396DC8 E009A818 44826000 */ mtc1 $v0, $f12 -/* 396DCC E009A81C 00000000 */ nop +/* 396DCC E009A81C 00000000 */ nop /* 396DD0 E009A820 46806320 */ cvt.s.w $f12, $f12 /* 396DD4 E009A824 0C080140 */ jal func_E0200500 /* 396DD8 E009A828 02D08021 */ addu $s0, $s6, $s0 /* 396DDC E009A82C 3C0143FA */ lui $at, 0x43fa /* 396DE0 E009A830 44811000 */ mtc1 $at, $f2 -/* 396DE4 E009A834 00000000 */ nop +/* 396DE4 E009A834 00000000 */ nop /* 396DE8 E009A838 46020002 */ mul.s $f0, $f0, $f2 -/* 396DEC E009A83C 00000000 */ nop +/* 396DEC E009A83C 00000000 */ nop /* 396DF0 E009A840 46160002 */ mul.s $f0, $f0, $f22 -/* 396DF4 E009A844 00000000 */ nop +/* 396DF4 E009A844 00000000 */ nop /* 396DF8 E009A848 02771021 */ addu $v0, $s3, $s7 /* 396DFC E009A84C 44826000 */ mtc1 $v0, $f12 -/* 396E00 E009A850 00000000 */ nop +/* 396E00 E009A850 00000000 */ nop /* 396E04 E009A854 46806320 */ cvt.s.w $f12, $f12 /* 396E08 E009A858 4600018D */ trunc.w.s $f6, $f0 /* 396E0C E009A85C 44113000 */ mfc1 $s1, $f6 @@ -304,20 +304,20 @@ glabel func_E009A3E0 /* 396E1C E009A86C 44811000 */ mtc1 $at, $f2 /* 396E20 E009A870 2694003C */ addiu $s4, $s4, 0x3c /* 396E24 E009A874 46020002 */ mul.s $f0, $f0, $f2 -/* 396E28 E009A878 00000000 */ nop +/* 396E28 E009A878 00000000 */ nop /* 396E2C E009A87C 001219C0 */ sll $v1, $s2, 7 /* 396E30 E009A880 26520001 */ addiu $s2, $s2, 1 /* 396E34 E009A884 2622F380 */ addiu $v0, $s1, -0xc80 /* 396E38 E009A888 26310C80 */ addiu $s1, $s1, 0xc80 /* 396E3C E009A88C 46160002 */ mul.s $f0, $f0, $f22 -/* 396E40 E009A890 00000000 */ nop +/* 396E40 E009A890 00000000 */ nop /* 396E44 E009A894 A6020000 */ sh $v0, ($s0) /* 396E48 E009A898 A6000004 */ sh $zero, 4($s0) /* 396E4C E009A89C A6000008 */ sh $zero, 8($s0) /* 396E50 E009A8A0 A603000A */ sh $v1, 0xa($s0) /* 396E54 E009A8A4 4600018D */ trunc.w.s $f6, $f0 /* 396E58 E009A8A8 44023000 */ mfc1 $v0, $f6 -/* 396E5C E009A8AC 00000000 */ nop +/* 396E5C E009A8AC 00000000 */ nop /* 396E60 E009A8B0 02A21021 */ addu $v0, $s5, $v0 /* 396E64 E009A8B4 A6020002 */ sh $v0, 2($s0) /* 396E68 E009A8B8 26100010 */ addiu $s0, $s0, 0x10 @@ -378,7 +378,7 @@ glabel func_E009A3E0 /* 396F34 E009A984 AC820000 */ sw $v0, ($a0) .LE009A988: /* 396F38 E009A988 14A00003 */ bnez $a1, .LE009A998 -/* 396F3C E009A98C 00000000 */ nop +/* 396F3C E009A98C 00000000 */ nop /* 396F40 E009A990 08026A71 */ j .LE009A9C4 /* 396F44 E009A994 AC8D0004 */ sw $t5, 4($a0) .LE009A998: @@ -432,6 +432,6 @@ glabel func_E009A3E0 /* 396FF8 E009AA48 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 396FFC E009AA4C 03E00008 */ jr $ra /* 397000 E009AA50 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 397004 E009AA54 00000000 */ nop -/* 397008 E009AA58 00000000 */ nop -/* 39700C E009AA5C 00000000 */ nop +/* 397004 E009AA54 00000000 */ nop +/* 397008 E009AA58 00000000 */ nop +/* 39700C E009AA5C 00000000 */ nop diff --git a/asm/nonmatchings/code_3981F0/func_E009C000.s b/asm/nonmatchings/code_3981F0/func_E009C000.s index c12b9486a7..280b6ffffa 100644 --- a/asm/nonmatchings/code_3981F0/func_E009C000.s +++ b/asm/nonmatchings/code_3981F0/func_E009C000.s @@ -38,7 +38,7 @@ glabel func_E009C000 /* 398274 E009C084 AE02000C */ sw $v0, 0xc($s0) .LE009C088: /* 398278 E009C088 08027022 */ j .LE009C088 -/* 39827C E009C08C 00000000 */ nop +/* 39827C E009C08C 00000000 */ nop .LE009C090: /* 398280 E009C090 0200102D */ daddu $v0, $s0, $zero /* 398284 E009C094 24030064 */ addiu $v1, $zero, 0x64 diff --git a/asm/nonmatchings/code_3981F0/func_E009C100.s b/asm/nonmatchings/code_3981F0/func_E009C100.s index b37f920893..c282ccf1d4 100644 --- a/asm/nonmatchings/code_3981F0/func_E009C100.s +++ b/asm/nonmatchings/code_3981F0/func_E009C100.s @@ -3,4 +3,4 @@ glabel func_E009C100 /* 3982F0 E009C100 03E00008 */ jr $ra -/* 3982F4 E009C104 00000000 */ nop +/* 3982F4 E009C104 00000000 */ nop diff --git a/asm/nonmatchings/code_3981F0/func_E009C108.s b/asm/nonmatchings/code_3981F0/func_E009C108.s index 3ab646443e..cd1336e052 100644 --- a/asm/nonmatchings/code_3981F0/func_E009C108.s +++ b/asm/nonmatchings/code_3981F0/func_E009C108.s @@ -26,9 +26,9 @@ glabel func_E009C108 /* 398344 E009C154 04C10005 */ bgez $a2, .LE009C16C /* 398348 E009C158 ACA30008 */ sw $v1, 8($a1) /* 39834C E009C15C 0C080128 */ jal func_E02004A0 -/* 398350 E009C160 00000000 */ nop +/* 398350 E009C160 00000000 */ nop /* 398354 E009C164 08027074 */ j .LE009C1D0 -/* 398358 E009C168 00000000 */ nop +/* 398358 E009C168 00000000 */ nop .LE009C16C: /* 39835C E009C16C 28C20010 */ slti $v0, $a2, 0x10 /* 398360 E009C170 10400002 */ beqz $v0, .LE009C17C @@ -44,12 +44,12 @@ glabel func_E009C108 /* 398380 E009C190 14410004 */ bne $v0, $at, .LE009C1A4 /* 398384 E009C194 3C018000 */ lui $at, 0x8000 /* 398388 E009C198 14610002 */ bne $v1, $at, .LE009C1A4 -/* 39838C E009C19C 00000000 */ nop +/* 39838C E009C19C 00000000 */ nop /* 398390 E009C1A0 0006000D */ break 6 .LE009C1A4: /* 398394 E009C1A4 00001810 */ mfhi $v1 /* 398398 E009C1A8 14600009 */ bnez $v1, .LE009C1D0 -/* 39839C E009C1AC 00000000 */ nop +/* 39839C E009C1AC 00000000 */ nop /* 3983A0 E009C1B0 8CA2002C */ lw $v0, 0x2c($a1) /* 3983A4 E009C1B4 8CA30030 */ lw $v1, 0x30($a1) /* 3983A8 E009C1B8 00431821 */ addu $v1, $v0, $v1 diff --git a/asm/nonmatchings/code_3981F0/func_E009C220.s b/asm/nonmatchings/code_3981F0/func_E009C220.s index ec49c03f29..f3b52f99e0 100644 --- a/asm/nonmatchings/code_3981F0/func_E009C220.s +++ b/asm/nonmatchings/code_3981F0/func_E009C220.s @@ -160,7 +160,7 @@ glabel func_E009C220 /* 39867C E009C48C 00431023 */ subu $v0, $v0, $v1 /* 398680 E009C490 2442FF4C */ addiu $v0, $v0, -0xb4 /* 398684 E009C494 44821000 */ mtc1 $v0, $f2 -/* 398688 E009C498 00000000 */ nop +/* 398688 E009C498 00000000 */ nop /* 39868C E009C49C 468010A0 */ cvt.s.w $f2, $f2 /* 398690 E009C4A0 44051000 */ mfc1 $a1, $f2 /* 398694 E009C4A4 27A40018 */ addiu $a0, $sp, 0x18 @@ -250,7 +250,7 @@ glabel func_E009C220 /* 3987E4 E009C5F4 00431023 */ subu $v0, $v0, $v1 /* 3987E8 E009C5F8 02021023 */ subu $v0, $s0, $v0 /* 3987EC E009C5FC 44821000 */ mtc1 $v0, $f2 -/* 3987F0 E009C600 00000000 */ nop +/* 3987F0 E009C600 00000000 */ nop /* 3987F4 E009C604 468010A0 */ cvt.s.w $f2, $f2 /* 3987F8 E009C608 44051000 */ mfc1 $a1, $f2 /* 3987FC E009C60C 27A40018 */ addiu $a0, $sp, 0x18 @@ -312,7 +312,7 @@ glabel func_E009C220 /* 3988DC E009C6EC 00431023 */ subu $v0, $v0, $v1 /* 3988E0 E009C6F0 2442FFA6 */ addiu $v0, $v0, -0x5a /* 3988E4 E009C6F4 44821000 */ mtc1 $v0, $f2 -/* 3988E8 E009C6F8 00000000 */ nop +/* 3988E8 E009C6F8 00000000 */ nop /* 3988EC E009C6FC 468010A0 */ cvt.s.w $f2, $f2 /* 3988F0 E009C700 44051000 */ mfc1 $a1, $f2 /* 3988F4 E009C704 27A40018 */ addiu $a0, $sp, 0x18 @@ -412,7 +412,7 @@ glabel func_E009C220 /* 398A6C E009C87C 00431023 */ subu $v0, $v0, $v1 /* 398A70 E009C880 02028023 */ subu $s0, $s0, $v0 /* 398A74 E009C884 44901000 */ mtc1 $s0, $f2 -/* 398A78 E009C888 00000000 */ nop +/* 398A78 E009C888 00000000 */ nop /* 398A7C E009C88C 468010A0 */ cvt.s.w $f2, $f2 /* 398A80 E009C890 44051000 */ mfc1 $a1, $f2 /* 398A84 E009C894 27A40018 */ addiu $a0, $sp, 0x18 @@ -492,6 +492,6 @@ glabel func_E009C220 /* 398BA8 E009C9B8 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 398BAC E009C9BC 03E00008 */ jr $ra /* 398BB0 E009C9C0 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 398BB4 E009C9C4 00000000 */ nop -/* 398BB8 E009C9C8 00000000 */ nop -/* 398BBC E009C9CC 00000000 */ nop +/* 398BB4 E009C9C4 00000000 */ nop +/* 398BB8 E009C9C8 00000000 */ nop +/* 398BBC E009C9CC 00000000 */ nop diff --git a/asm/nonmatchings/code_39FF20/func_E009E000.s b/asm/nonmatchings/code_39FF20/func_E009E000.s index 8dfca5f25f..0197bf6c29 100644 --- a/asm/nonmatchings/code_39FF20/func_E009E000.s +++ b/asm/nonmatchings/code_39FF20/func_E009E000.s @@ -42,7 +42,7 @@ glabel func_E009E000 /* 39FFB4 E009E094 AE43000C */ sw $v1, 0xc($s2) .LE009E098: /* 39FFB8 E009E098 08027826 */ j .LE009E098 -/* 39FFBC E009E09C 00000000 */ nop +/* 39FFBC E009E09C 00000000 */ nop .LE009E0A0: /* 39FFC0 E009E0A0 AC710004 */ sw $s1, 4($v1) /* 39FFC4 E009E0A4 1E000004 */ bgtz $s0, .LE009E0B8 @@ -75,7 +75,7 @@ glabel func_E009E000 /* 3A0024 E009E104 00B40018 */ mult $a1, $s4 /* 3A0028 E009E108 2404000F */ addiu $a0, $zero, 0xf /* 3A002C E009E10C 44820000 */ mtc1 $v0, $f0 -/* 3A0030 E009E110 00000000 */ nop +/* 3A0030 E009E110 00000000 */ nop /* 3A0034 E009E114 46800020 */ cvt.s.w $f0, $f0 /* 3A0038 E009E118 000517C3 */ sra $v0, $a1, 0x1f /* 3A003C E009E11C E600FFF0 */ swc1 $f0, -0x10($s0) @@ -88,25 +88,25 @@ glabel func_E009E000 /* 3A0058 E009E138 00A22823 */ subu $a1, $a1, $v0 /* 3A005C E009E13C 24A5003C */ addiu $a1, $a1, 0x3c /* 3A0060 E009E140 44850000 */ mtc1 $a1, $f0 -/* 3A0064 E009E144 00000000 */ nop +/* 3A0064 E009E144 00000000 */ nop /* 3A0068 E009E148 46800020 */ cvt.s.w $f0, $f0 /* 3A006C E009E14C 0C080138 */ jal func_E02004E0 /* 3A0070 E009E150 E600FFFC */ swc1 $f0, -4($s0) /* 3A0074 E009E154 44820000 */ mtc1 $v0, $f0 -/* 3A0078 E009E158 00000000 */ nop +/* 3A0078 E009E158 00000000 */ nop /* 3A007C E009E15C 46800021 */ cvt.d.w $f0, $f0 /* 3A0080 E009E160 46340002 */ mul.d $f0, $f0, $f20 -/* 3A0084 E009E164 00000000 */ nop +/* 3A0084 E009E164 00000000 */ nop /* 3A0088 E009E168 46360000 */ add.d $f0, $f0, $f22 /* 3A008C E009E16C 2404000A */ addiu $a0, $zero, 0xa /* 3A0090 E009E170 46200020 */ cvt.s.d $f0, $f0 /* 3A0094 E009E174 0C080138 */ jal func_E02004E0 /* 3A0098 E009E178 E600FFF8 */ swc1 $f0, -8($s0) /* 3A009C E009E17C 44820000 */ mtc1 $v0, $f0 -/* 3A00A0 E009E180 00000000 */ nop +/* 3A00A0 E009E180 00000000 */ nop /* 3A00A4 E009E184 46800021 */ cvt.d.w $f0, $f0 /* 3A00A8 E009E188 46340002 */ mul.d $f0, $f0, $f20 -/* 3A00AC E009E18C 00000000 */ nop +/* 3A00AC E009E18C 00000000 */ nop /* 3A00B0 E009E190 46340000 */ add.d $f0, $f0, $f20 /* 3A00B4 E009E194 26310001 */ addiu $s1, $s1, 1 /* 3A00B8 E009E198 0233102A */ slt $v0, $s1, $s3 diff --git a/asm/nonmatchings/code_39FF20/func_E009E1DC.s b/asm/nonmatchings/code_39FF20/func_E009E1DC.s index e2addf6321..7e2e09cddf 100644 --- a/asm/nonmatchings/code_39FF20/func_E009E1DC.s +++ b/asm/nonmatchings/code_39FF20/func_E009E1DC.s @@ -3,4 +3,4 @@ glabel func_E009E1DC /* 3A00FC E009E1DC 03E00008 */ jr $ra -/* 3A0100 E009E1E0 00000000 */ nop +/* 3A0100 E009E1E0 00000000 */ nop diff --git a/asm/nonmatchings/code_39FF20/func_E009E1E4.s b/asm/nonmatchings/code_39FF20/func_E009E1E4.s index 8d53d9beec..0481c25b64 100644 --- a/asm/nonmatchings/code_39FF20/func_E009E1E4.s +++ b/asm/nonmatchings/code_39FF20/func_E009E1E4.s @@ -37,7 +37,7 @@ glabel func_E009E1E4 /* 3A017C E009E25C 0C080128 */ jal func_E02004A0 /* 3A0180 E009E260 0240202D */ daddu $a0, $s2, $zero /* 3A0184 E009E264 080278EC */ j .LE009E3B0 -/* 3A0188 E009E268 00000000 */ nop +/* 3A0188 E009E268 00000000 */ nop .LE009E26C: /* 3A018C E009E26C 28620015 */ slti $v0, $v1, 0x15 /* 3A0190 E009E270 10400003 */ beqz $v0, .LE009E280 @@ -73,11 +73,11 @@ glabel func_E009E1E4 /* 3A01F8 E009E2D8 C60C000C */ lwc1 $f12, 0xc($s0) /* 3A01FC E009E2DC 461C6301 */ sub.s $f12, $f12, $f28 /* 3A0200 E009E2E0 461A6302 */ mul.s $f12, $f12, $f26 -/* 3A0204 E009E2E4 00000000 */ nop +/* 3A0204 E009E2E4 00000000 */ nop /* 3A0208 E009E2E8 0C080144 */ jal func_E0200510 /* 3A020C E009E2EC 46186303 */ div.s $f12, $f12, $f24 /* 3A0210 E009E2F0 46160002 */ mul.s $f0, $f0, $f22 -/* 3A0214 E009E2F4 00000000 */ nop +/* 3A0214 E009E2F4 00000000 */ nop /* 3A0218 E009E2F8 C604000C */ lwc1 $f4, 0xc($s0) /* 3A021C E009E2FC C6020010 */ lwc1 $f2, 0x10($s0) /* 3A0220 E009E300 46022100 */ add.s $f4, $f4, $f2 @@ -94,10 +94,10 @@ glabel func_E009E1E4 /* 3A024C E009E32C 0C080138 */ jal func_E02004E0 /* 3A0250 E009E330 E600000C */ swc1 $f0, 0xc($s0) /* 3A0254 E009E334 44820000 */ mtc1 $v0, $f0 -/* 3A0258 E009E338 00000000 */ nop +/* 3A0258 E009E338 00000000 */ nop /* 3A025C E009E33C 46800021 */ cvt.d.w $f0, $f0 /* 3A0260 E009E340 46340002 */ mul.d $f0, $f0, $f20 -/* 3A0264 E009E344 00000000 */ nop +/* 3A0264 E009E344 00000000 */ nop /* 3A0268 E009E348 3C01E00A */ lui $at, %hi(D_E009EE18) /* 3A026C E009E34C D422EE18 */ ldc1 $f2, %lo(D_E009EE18)($at) /* 3A0270 E009E350 46220000 */ add.d $f0, $f0, $f2 @@ -106,17 +106,17 @@ glabel func_E009E1E4 /* 3A027C E009E35C 0C080138 */ jal func_E02004E0 /* 3A0280 E009E360 E6000008 */ swc1 $f0, 8($s0) /* 3A0284 E009E364 44820000 */ mtc1 $v0, $f0 -/* 3A0288 E009E368 00000000 */ nop +/* 3A0288 E009E368 00000000 */ nop /* 3A028C E009E36C 46800021 */ cvt.d.w $f0, $f0 /* 3A0290 E009E370 46340002 */ mul.d $f0, $f0, $f20 -/* 3A0294 E009E374 00000000 */ nop +/* 3A0294 E009E374 00000000 */ nop /* 3A0298 E009E378 46340000 */ add.d $f0, $f0, $f20 /* 3A029C E009E37C 24040168 */ addiu $a0, $zero, 0x168 /* 3A02A0 E009E380 46200020 */ cvt.s.d $f0, $f0 /* 3A02A4 E009E384 0C080138 */ jal func_E02004E0 /* 3A02A8 E009E388 E6000010 */ swc1 $f0, 0x10($s0) /* 3A02AC E009E38C 44820000 */ mtc1 $v0, $f0 -/* 3A02B0 E009E390 00000000 */ nop +/* 3A02B0 E009E390 00000000 */ nop /* 3A02B4 E009E394 46800020 */ cvt.s.w $f0, $f0 /* 3A02B8 E009E398 E6000000 */ swc1 $f0, ($s0) .LE009E39C: diff --git a/asm/nonmatchings/code_39FF20/func_E009E424.s b/asm/nonmatchings/code_39FF20/func_E009E424.s index 2d0c06a19d..e56e0e48b2 100644 --- a/asm/nonmatchings/code_39FF20/func_E009E424.s +++ b/asm/nonmatchings/code_39FF20/func_E009E424.s @@ -43,7 +43,7 @@ glabel func_E009E424 /* 3A03DC E009E4BC C7A000DC */ lwc1 $f0, 0xdc($sp) /* 3A03E0 E009E4C0 46800021 */ cvt.d.w $f0, $f0 /* 3A03E4 E009E4C4 46220002 */ mul.d $f0, $f0, $f2 -/* 3A03E8 E009E4C8 00000000 */ nop +/* 3A03E8 E009E4C8 00000000 */ nop /* 3A03EC E009E4CC 4620010D */ trunc.w.d $f4, $f0 /* 3A03F0 E009E4D0 E7A400DC */ swc1 $f4, 0xdc($sp) .LE009E4D4: @@ -101,7 +101,7 @@ glabel func_E009E424 /* 3A04C0 E009E5A0 4481C000 */ mtc1 $at, $f24 /* 3A04C4 E009E5A4 004D1021 */ addu $v0, $v0, $t5 /* 3A04C8 E009E5A8 44822000 */ mtc1 $v0, $f4 -/* 3A04CC E009E5AC 00000000 */ nop +/* 3A04CC E009E5AC 00000000 */ nop /* 3A04D0 E009E5B0 46802120 */ cvt.s.w $f4, $f4 /* 3A04D4 E009E5B4 0100482D */ daddu $t1, $t0, $zero /* 3A04D8 E009E5B8 44052000 */ mfc1 $a1, $f4 @@ -206,7 +206,7 @@ glabel func_E009E424 .LE009E744: /* 3A0664 E009E744 C634FFFC */ lwc1 $f20, -4($s1) /* 3A0668 E009E748 4616A032 */ c.eq.s $f20, $f22 -/* 3A066C E009E74C 00000000 */ nop +/* 3A066C E009E74C 00000000 */ nop /* 3A0670 E009E750 45030185 */ bc1tl .LE009ED68 /* 3A0674 E009E754 2694000A */ addiu $s4, $s4, 0xa /* 3A0678 E009E758 3C0AFCFF */ lui $t2, 0xfcff @@ -298,7 +298,7 @@ glabel func_E009E424 /* 3A07D0 E009E8B0 C6220000 */ lwc1 $f2, ($s1) /* 3A07D4 E009E8B4 3C0140A0 */ lui $at, 0x40a0 /* 3A07D8 E009E8B8 44810000 */ mtc1 $at, $f0 -/* 3A07DC E009E8BC 00000000 */ nop +/* 3A07DC E009E8BC 00000000 */ nop /* 3A07E0 E009E8C0 46001080 */ add.s $f2, $f2, $f0 /* 3A07E4 E009E8C4 4406B000 */ mfc1 $a2, $f22 /* 3A07E8 E009E8C8 4407B000 */ mfc1 $a3, $f22 @@ -414,7 +414,7 @@ glabel func_E009E424 /* 3A09A0 E009EA80 02821023 */ subu $v0, $s4, $v0 /* 3A09A4 E009EA84 004D1021 */ addu $v0, $v0, $t5 /* 3A09A8 E009EA88 44822000 */ mtc1 $v0, $f4 -/* 3A09AC E009EA8C 00000000 */ nop +/* 3A09AC E009EA8C 00000000 */ nop /* 3A09B0 E009EA90 46802120 */ cvt.s.w $f4, $f4 /* 3A09B4 E009EA94 44052000 */ mfc1 $a1, $f4 /* 3A09B8 E009EA98 0200202D */ daddu $a0, $s0, $zero @@ -439,11 +439,11 @@ glabel func_E009E424 /* 3A0A04 E009EAE4 D422EE30 */ ldc1 $f2, %lo(D_E009EE30)($at) /* 3A0A08 E009EAE8 46000021 */ cvt.d.s $f0, $f0 /* 3A0A0C E009EAEC 46220002 */ mul.d $f0, $f0, $f2 -/* 3A0A10 E009EAF0 00000000 */ nop +/* 3A0A10 E009EAF0 00000000 */ nop /* 3A0A14 E009EAF4 3C013FF0 */ lui $at, 0x3ff0 /* 3A0A18 E009EAF8 44811800 */ mtc1 $at, $f3 /* 3A0A1C E009EAFC 44801000 */ mtc1 $zero, $f2 -/* 3A0A20 E009EB00 00000000 */ nop +/* 3A0A20 E009EB00 00000000 */ nop /* 3A0A24 E009EB04 46220080 */ add.d $f2, $f0, $f2 /* 3A0A28 E009EB08 4620D001 */ sub.d $f0, $f26, $f0 /* 3A0A2C E009EB0C 4407C000 */ mfc1 $a3, $f24 @@ -523,7 +523,7 @@ glabel func_E009E424 /* 3A0B54 E009EC34 00021080 */ sll $v0, $v0, 2 /* 3A0B58 E009EC38 00571023 */ subu $v0, $v0, $s7 /* 3A0B5C E009EC3C 44822000 */ mtc1 $v0, $f4 -/* 3A0B60 E009EC40 00000000 */ nop +/* 3A0B60 E009EC40 00000000 */ nop /* 3A0B64 E009EC44 46802120 */ cvt.s.w $f4, $f4 /* 3A0B68 E009EC48 4406B000 */ mfc1 $a2, $f22 /* 3A0B6C E009EC4C 4407C000 */ mfc1 $a3, $f24 @@ -550,7 +550,7 @@ glabel func_E009E424 /* 3A0BC0 E009ECA0 D422EE38 */ ldc1 $f2, %lo(D_E009EE38)($at) /* 3A0BC4 E009ECA4 46000021 */ cvt.d.s $f0, $f0 /* 3A0BC8 E009ECA8 46220002 */ mul.d $f0, $f0, $f2 -/* 3A0BCC E009ECAC 00000000 */ nop +/* 3A0BCC E009ECAC 00000000 */ nop /* 3A0BD0 E009ECB0 463A0000 */ add.d $f0, $f0, $f26 /* 3A0BD4 E009ECB4 4406C000 */ mfc1 $a2, $f24 /* 3A0BD8 E009ECB8 4407C000 */ mfc1 $a3, $f24 diff --git a/asm/nonmatchings/code_3A2990/func_E00A2118.s b/asm/nonmatchings/code_3A2990/func_E00A2118.s index fd4ee87114..09152617df 100644 --- a/asm/nonmatchings/code_3A2990/func_E00A2118.s +++ b/asm/nonmatchings/code_3A2990/func_E00A2118.s @@ -3,4 +3,4 @@ glabel func_E00A2118 /* 3A2AA8 E00A2118 03E00008 */ jr $ra -/* 3A2AAC E00A211C 00000000 */ nop +/* 3A2AAC E00A211C 00000000 */ nop diff --git a/asm/nonmatchings/code_3A2990/func_E00A2120.s b/asm/nonmatchings/code_3A2990/func_E00A2120.s index f7116213ba..5791af6c7d 100644 --- a/asm/nonmatchings/code_3A2990/func_E00A2120.s +++ b/asm/nonmatchings/code_3A2990/func_E00A2120.s @@ -27,9 +27,9 @@ glabel func_E00A2120 /* 3A2B00 E00A2170 04410005 */ bgez $v0, .LE00A2188 /* 3A2B04 E00A2174 0040282D */ daddu $a1, $v0, $zero /* 3A2B08 E00A2178 0C080128 */ jal func_E02004A0 -/* 3A2B0C E00A217C 00000000 */ nop +/* 3A2B0C E00A217C 00000000 */ nop /* 3A2B10 E00A2180 08028878 */ j .LE00A21E0 -/* 3A2B14 E00A2184 00000000 */ nop +/* 3A2B14 E00A2184 00000000 */ nop .LE00A2188: /* 3A2B18 E00A2188 8C640054 */ lw $a0, 0x54($v1) /* 3A2B1C E00A218C 28820011 */ slti $v0, $a0, 0x11 diff --git a/asm/nonmatchings/code_3A2990/func_E00A223C.s b/asm/nonmatchings/code_3A2990/func_E00A223C.s index 21ef439904..5fb4f82cf8 100644 --- a/asm/nonmatchings/code_3A2990/func_E00A223C.s +++ b/asm/nonmatchings/code_3A2990/func_E00A223C.s @@ -88,27 +88,27 @@ glabel func_E00A223C /* 3A2D0C E00A237C 10C0016B */ beqz $a2, .LE00A292C /* 3A2D10 E00A2380 E4440038 */ swc1 $f4, 0x38($v0) /* 3A2D14 E00A2384 44800000 */ mtc1 $zero, $f0 -/* 3A2D18 E00A2388 00000000 */ nop +/* 3A2D18 E00A2388 00000000 */ nop /* 3A2D1C E00A238C 4600103C */ c.lt.s $f2, $f0 -/* 3A2D20 E00A2390 00000000 */ nop +/* 3A2D20 E00A2390 00000000 */ nop /* 3A2D24 E00A2394 45030166 */ bc1tl .LE00A2930 /* 3A2D28 E00A2398 26F70004 */ addiu $s7, $s7, 4 /* 3A2D2C E00A239C 4600203C */ c.lt.s $f4, $f0 -/* 3A2D30 E00A23A0 00000000 */ nop +/* 3A2D30 E00A23A0 00000000 */ nop /* 3A2D34 E00A23A4 45030162 */ bc1tl .LE00A2930 /* 3A2D38 E00A23A8 26F70004 */ addiu $s7, $s7, 4 /* 3A2D3C E00A23AC 3C0143A0 */ lui $at, 0x43a0 /* 3A2D40 E00A23B0 44810000 */ mtc1 $at, $f0 -/* 3A2D44 E00A23B4 00000000 */ nop +/* 3A2D44 E00A23B4 00000000 */ nop /* 3A2D48 E00A23B8 4602003E */ c.le.s $f0, $f2 -/* 3A2D4C E00A23BC 00000000 */ nop +/* 3A2D4C E00A23BC 00000000 */ nop /* 3A2D50 E00A23C0 4503015B */ bc1tl .LE00A2930 /* 3A2D54 E00A23C4 26F70004 */ addiu $s7, $s7, 4 /* 3A2D58 E00A23C8 3C014370 */ lui $at, 0x4370 /* 3A2D5C E00A23CC 44810000 */ mtc1 $at, $f0 -/* 3A2D60 E00A23D0 00000000 */ nop +/* 3A2D60 E00A23D0 00000000 */ nop /* 3A2D64 E00A23D4 4604003E */ c.le.s $f0, $f4 -/* 3A2D68 E00A23D8 00000000 */ nop +/* 3A2D68 E00A23D8 00000000 */ nop /* 3A2D6C E00A23DC 45030154 */ bc1tl .LE00A2930 /* 3A2D70 E00A23E0 26F70004 */ addiu $s7, $s7, 4 /* 3A2D74 E00A23E4 3C02E00A */ lui $v0, %hi(D_E00A2A24) @@ -128,11 +128,11 @@ glabel func_E00A223C /* 3A2DAC E00A241C 00640018 */ mult $v1, $a0 /* 3A2DB0 E00A2420 00001812 */ mflo $v1 /* 3A2DB4 E00A2424 8E820060 */ lw $v0, 0x60($s4) -/* 3A2DB8 E00A2428 00000000 */ nop +/* 3A2DB8 E00A2428 00000000 */ nop /* 3A2DBC E00A242C 00440018 */ mult $v0, $a0 /* 3A2DC0 E00A2430 00003812 */ mflo $a3 /* 3A2DC4 E00A2434 8E820064 */ lw $v0, 0x64($s4) -/* 3A2DC8 E00A2438 00000000 */ nop +/* 3A2DC8 E00A2438 00000000 */ nop /* 3A2DCC E00A243C 00440018 */ mult $v0, $a0 /* 3A2DD0 E00A2440 00004812 */ mflo $t1 /* 3A2DD4 E00A2444 8E060000 */ lw $a2, ($s0) @@ -189,7 +189,7 @@ glabel func_E00A223C /* 3A2E94 E00A2504 00621825 */ or $v1, $v1, $v0 /* 3A2E98 E00A2508 C7A00048 */ lwc1 $f0, 0x48($sp) /* 3A2E9C E00A250C 44952000 */ mtc1 $s5, $f4 -/* 3A2EA0 E00A2510 00000000 */ nop +/* 3A2EA0 E00A2510 00000000 */ nop /* 3A2EA4 E00A2514 46802120 */ cvt.s.w $f4, $f4 /* 3A2EA8 E00A2518 ACC30004 */ sw $v1, 4($a2) /* 3A2EAC E00A251C 46040001 */ sub.s $f0, $f0, $f4 @@ -198,11 +198,11 @@ glabel func_E00A223C /* 3A2EB8 E00A2528 46041081 */ sub.s $f2, $f2, $f4 /* 3A2EBC E00A252C 4600018D */ trunc.w.s $f6, $f0 /* 3A2EC0 E00A2530 44133000 */ mfc1 $s3, $f6 -/* 3A2EC4 E00A2534 00000000 */ nop +/* 3A2EC4 E00A2534 00000000 */ nop /* 3A2EC8 E00A2538 02637021 */ addu $t6, $s3, $v1 /* 3A2ECC E00A253C 4600118D */ trunc.w.s $f6, $f2 /* 3A2ED0 E00A2540 44023000 */ mfc1 $v0, $f6 -/* 3A2ED4 E00A2544 00000000 */ nop +/* 3A2ED4 E00A2544 00000000 */ nop /* 3A2ED8 E00A2548 00432021 */ addu $a0, $v0, $v1 /* 3A2EDC E00A254C 06610002 */ bgez $s3, .LE00A2558 /* 3A2EE0 E00A2550 0040582D */ daddu $t3, $v0, $zero @@ -228,7 +228,7 @@ glabel func_E00A223C /* 3A2F1C E00A258C 16410004 */ bne $s2, $at, .LE00A25A0 /* 3A2F20 E00A2590 3C018000 */ lui $at, 0x8000 /* 3A2F24 E00A2594 14610002 */ bne $v1, $at, .LE00A25A0 -/* 3A2F28 E00A2598 00000000 */ nop +/* 3A2F28 E00A2598 00000000 */ nop /* 3A2F2C E00A259C 0006000D */ break 6 .LE00A25A0: /* 3A2F30 E00A25A0 00005012 */ mflo $t2 @@ -241,7 +241,7 @@ glabel func_E00A223C /* 3A2F48 E00A25B8 16410004 */ bne $s2, $at, .LE00A25CC /* 3A2F4C E00A25BC 3C018000 */ lui $at, 0x8000 /* 3A2F50 E00A25C0 14410002 */ bne $v0, $at, .LE00A25CC -/* 3A2F54 E00A25C4 00000000 */ nop +/* 3A2F54 E00A25C4 00000000 */ nop /* 3A2F58 E00A25C8 0006000D */ break 6 .LE00A25CC: /* 3A2F5C E00A25CC 0000B012 */ mflo $s6 @@ -265,7 +265,7 @@ glabel func_E00A223C /* 3A2FA0 E00A2610 000211C0 */ sll $v0, $v0, 7 /* 3A2FA4 E00A2614 8FB6005C */ lw $s6, 0x5c($sp) /* 3A2FA8 E00A2618 44932000 */ mtc1 $s3, $f4 -/* 3A2FAC E00A261C 00000000 */ nop +/* 3A2FAC E00A261C 00000000 */ nop /* 3A2FB0 E00A2620 46802120 */ cvt.s.w $f4, $f4 /* 3A2FB4 E00A2624 AFA20058 */ sw $v0, 0x58($sp) /* 3A2FB8 E00A2628 26C20007 */ addiu $v0, $s6, 7 @@ -292,7 +292,7 @@ glabel func_E00A223C /* 3A300C E00A267C C6200008 */ lwc1 $f0, 8($s1) /* 3A3010 E00A2680 03221025 */ or $v0, $t9, $v0 /* 3A3014 E00A2684 46002002 */ mul.s $f0, $f4, $f0 -/* 3A3018 E00A2688 00000000 */ nop +/* 3A3018 E00A2688 00000000 */ nop /* 3A301C E00A268C AFA20068 */ sw $v0, 0x68($sp) /* 3A3020 E00A2690 8E220014 */ lw $v0, 0x14($s1) /* 3A3024 E00A2694 8E050000 */ lw $a1, ($s0) @@ -306,22 +306,22 @@ glabel func_E00A223C /* 3A3044 E00A26B4 0000B012 */ mflo $s6 /* 3A3048 E00A26B8 C620000C */ lwc1 $f0, 0xc($s1) /* 3A304C E00A26BC 44961000 */ mtc1 $s6, $f2 -/* 3A3050 E00A26C0 00000000 */ nop +/* 3A3050 E00A26C0 00000000 */ nop /* 3A3054 E00A26C4 468010A0 */ cvt.s.w $f2, $f2 /* 3A3058 E00A26C8 46001082 */ mul.s $f2, $f2, $f0 -/* 3A305C E00A26CC 00000000 */ nop +/* 3A305C E00A26CC 00000000 */ nop /* 3A3060 E00A26D0 00021080 */ sll $v0, $v0, 2 /* 3A3064 E00A26D4 24A50008 */ addiu $a1, $a1, 8 /* 3A3068 E00A26D8 00042080 */ sll $a0, $a0, 2 /* 3A306C E00A26DC 44820000 */ mtc1 $v0, $f0 -/* 3A3070 E00A26E0 00000000 */ nop +/* 3A3070 E00A26E0 00000000 */ nop /* 3A3074 E00A26E4 46800020 */ cvt.s.w $f0, $f0 /* 3A3078 E00A26E8 46020001 */ sub.s $f0, $f0, $f2 /* 3A307C E00A26EC 30840FFF */ andi $a0, $a0, 0xfff /* 3A3080 E00A26F0 00042300 */ sll $a0, $a0, 0xc /* 3A3084 E00A26F4 4600018D */ trunc.w.s $f6, $f0 /* 3A3088 E00A26F8 44023000 */ mfc1 $v0, $f6 -/* 3A308C E00A26FC 00000000 */ nop +/* 3A308C E00A26FC 00000000 */ nop /* 3A3090 E00A2700 00021080 */ sll $v0, $v0, 2 /* 3A3094 E00A2704 30420FFF */ andi $v0, $v0, 0xfff /* 3A3098 E00A2708 3C16F200 */ lui $s6, 0xf200 @@ -333,7 +333,7 @@ glabel func_E00A223C /* 3A30B0 E00A2720 00021540 */ sll $v0, $v0, 0x15 /* 3A30B4 E00A2724 AFA20070 */ sw $v0, 0x70($sp) /* 3A30B8 E00A2728 46002102 */ mul.s $f4, $f4, $f0 -/* 3A30BC E00A272C 00000000 */ nop +/* 3A30BC E00A272C 00000000 */ nop /* 3A30C0 E00A2730 C6200000 */ lwc1 $f0, ($s1) /* 3A30C4 E00A2734 46800020 */ cvt.s.w $f0, $f0 /* 3A30C8 E00A2738 AE050000 */ sw $a1, ($s0) @@ -351,22 +351,22 @@ glabel func_E00A223C /* 3A30F8 E00A2768 0000B012 */ mflo $s6 /* 3A30FC E00A276C C620000C */ lwc1 $f0, 0xc($s1) /* 3A3100 E00A2770 44961000 */ mtc1 $s6, $f2 -/* 3A3104 E00A2774 00000000 */ nop +/* 3A3104 E00A2774 00000000 */ nop /* 3A3108 E00A2778 468010A0 */ cvt.s.w $f2, $f2 /* 3A310C E00A277C 46001082 */ mul.s $f2, $f2, $f0 -/* 3A3110 E00A2780 00000000 */ nop +/* 3A3110 E00A2780 00000000 */ nop /* 3A3114 E00A2784 00021080 */ sll $v0, $v0, 2 /* 3A3118 E00A2788 00441021 */ addu $v0, $v0, $a0 /* 3A311C E00A278C 00031880 */ sll $v1, $v1, 2 /* 3A3120 E00A2790 44820000 */ mtc1 $v0, $f0 -/* 3A3124 E00A2794 00000000 */ nop +/* 3A3124 E00A2794 00000000 */ nop /* 3A3128 E00A2798 46800020 */ cvt.s.w $f0, $f0 /* 3A312C E00A279C 46020001 */ sub.s $f0, $f0, $f2 /* 3A3130 E00A27A0 30630FFF */ andi $v1, $v1, 0xfff /* 3A3134 E00A27A4 00031B00 */ sll $v1, $v1, 0xc /* 3A3138 E00A27A8 4600018D */ trunc.w.s $f6, $f0 /* 3A313C E00A27AC 44023000 */ mfc1 $v0, $f6 -/* 3A3140 E00A27B0 00000000 */ nop +/* 3A3140 E00A27B0 00000000 */ nop /* 3A3144 E00A27B4 00021080 */ sll $v0, $v0, 2 /* 3A3148 E00A27B8 30420FFF */ andi $v0, $v0, 0xfff /* 3A314C E00A27BC 00621825 */ or $v1, $v1, $v0 @@ -505,4 +505,4 @@ glabel func_E00A223C /* 3A3350 E00A29C0 8FB00078 */ lw $s0, 0x78($sp) /* 3A3354 E00A29C4 03E00008 */ jr $ra /* 3A3358 E00A29C8 27BD00A0 */ addiu $sp, $sp, 0xa0 -/* 3A335C E00A29CC 00000000 */ nop +/* 3A335C E00A29CC 00000000 */ nop diff --git a/asm/nonmatchings/code_3A37E0/func_E00A4000.s b/asm/nonmatchings/code_3A37E0/func_E00A4000.s index 2568b207fc..784092da0a 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A4000.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A4000.s @@ -42,7 +42,7 @@ glabel func_E00A4000 /* 3A3874 E00A4094 AE02000C */ sw $v0, 0xc($s0) .LE00A4098: /* 3A3878 E00A4098 08029026 */ j .LE00A4098 -/* 3A387C E00A409C 00000000 */ nop +/* 3A387C E00A409C 00000000 */ nop .LE00A40A0: /* 3A3880 E00A40A0 AC710000 */ sw $s1, ($v1) /* 3A3884 E00A40A4 1E400004 */ bgtz $s2, .LE00A40B8 @@ -66,7 +66,7 @@ glabel func_E00A4000 /* 3A38C4 E00A40E4 00220821 */ addu $at, $at, $v0 /* 3A38C8 E00A40E8 8C224AD0 */ lw $v0, %lo(D_E00A4AD0)($at) /* 3A38CC E00A40EC 00400008 */ jr $v0 -/* 3A38D0 E00A40F0 00000000 */ nop +/* 3A38D0 E00A40F0 00000000 */ nop /* 3A38D4 E00A40F4 0802905E */ j .LE00A4178 /* 3A38D8 E00A40F8 AC60001C */ sw $zero, 0x1c($v1) /* 3A38DC E00A40FC 24020002 */ addiu $v0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_E00A4000 /* 3A3934 E00A4154 46220001 */ sub.d $f0, $f0, $f2 /* 3A3938 E00A4158 AC62001C */ sw $v0, 0x1c($v1) /* 3A393C E00A415C 44921000 */ mtc1 $s2, $f2 -/* 3A3940 E00A4160 00000000 */ nop +/* 3A3940 E00A4160 00000000 */ nop /* 3A3944 E00A4164 468010A1 */ cvt.d.w $f2, $f2 /* 3A3948 E00A4168 46200007 */ neg.d $f0, $f0 /* 3A394C E00A416C 46220003 */ div.d $f0, $f0, $f2 diff --git a/asm/nonmatchings/code_3A37E0/func_E00A41A4.s b/asm/nonmatchings/code_3A37E0/func_E00A41A4.s index 62eaa1f74b..2003976d54 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A41A4.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A41A4.s @@ -3,4 +3,4 @@ glabel func_E00A41A4 /* 3A3984 E00A41A4 03E00008 */ jr $ra -/* 3A3988 E00A41A8 00000000 */ nop +/* 3A3988 E00A41A8 00000000 */ nop diff --git a/asm/nonmatchings/code_3A37E0/func_E00A41AC.s b/asm/nonmatchings/code_3A37E0/func_E00A41AC.s index 01a826da21..6ae3f2b5ff 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A41AC.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A41AC.s @@ -28,9 +28,9 @@ glabel func_E00A41AC /* 3A39E0 E00A4200 04A10005 */ bgez $a1, .LE00A4218 /* 3A39E4 E00A4204 AE020014 */ sw $v0, 0x14($s0) /* 3A39E8 E00A4208 0C080128 */ jal func_E02004A0 -/* 3A39EC E00A420C 00000000 */ nop +/* 3A39EC E00A420C 00000000 */ nop /* 3A39F0 E00A4210 08029172 */ j .LE00A45C8 -/* 3A39F4 E00A4214 00000000 */ nop +/* 3A39F4 E00A4214 00000000 */ nop .LE00A4218: /* 3A39F8 E00A4218 241100FF */ addiu $s1, $zero, 0xff /* 3A39FC E00A421C 0040182D */ daddu $v1, $v0, $zero @@ -59,10 +59,10 @@ glabel func_E00A41AC /* 3A3A4C E00A426C 00220821 */ addu $at, $at, $v0 /* 3A3A50 E00A4270 8C224AF8 */ lw $v0, %lo(D_E00A4AF8)($at) /* 3A3A54 E00A4274 00400008 */ jr $v0 -/* 3A3A58 E00A4278 00000000 */ nop +/* 3A3A58 E00A4278 00000000 */ nop /* 3A3A5C E00A427C 00031040 */ sll $v0, $v1, 1 /* 3A3A60 E00A4280 44826000 */ mtc1 $v0, $f12 -/* 3A3A64 E00A4284 00000000 */ nop +/* 3A3A64 E00A4284 00000000 */ nop /* 3A3A68 E00A4288 46806320 */ cvt.s.w $f12, $f12 /* 3A3A6C E00A428C 24020046 */ addiu $v0, $zero, 0x46 /* 3A3A70 E00A4290 AE020020 */ sw $v0, 0x20($s0) @@ -73,9 +73,9 @@ glabel func_E00A41AC /* 3A3A84 E00A42A4 AE020028 */ sw $v0, 0x28($s0) /* 3A3A88 E00A42A8 3C014120 */ lui $at, 0x4120 /* 3A3A8C E00A42AC 44811000 */ mtc1 $at, $f2 -/* 3A3A90 E00A42B0 00000000 */ nop +/* 3A3A90 E00A42B0 00000000 */ nop /* 3A3A94 E00A42B4 46020002 */ mul.s $f0, $f0, $f2 -/* 3A3A98 E00A42B8 00000000 */ nop +/* 3A3A98 E00A42B8 00000000 */ nop /* 3A3A9C E00A42BC 3C01433E */ lui $at, 0x433e /* 3A3AA0 E00A42C0 44811000 */ mtc1 $at, $f2 /* 3A3AA4 E00A42C4 080290F4 */ j .LE00A43D0 @@ -96,7 +96,7 @@ glabel func_E00A41AC /* 3A3AE0 E00A4300 00C31021 */ addu $v0, $a2, $v1 /* 3A3AE4 E00A4304 00031040 */ sll $v0, $v1, 1 /* 3A3AE8 E00A4308 44826000 */ mtc1 $v0, $f12 -/* 3A3AEC E00A430C 00000000 */ nop +/* 3A3AEC E00A430C 00000000 */ nop /* 3A3AF0 E00A4310 46806320 */ cvt.s.w $f12, $f12 /* 3A3AF4 E00A4314 240200AA */ addiu $v0, $zero, 0xaa /* 3A3AF8 E00A4318 AE020020 */ sw $v0, 0x20($s0) @@ -107,9 +107,9 @@ glabel func_E00A41AC /* 3A3B0C E00A432C AE020028 */ sw $v0, 0x28($s0) /* 3A3B10 E00A4330 3C014120 */ lui $at, 0x4120 /* 3A3B14 E00A4334 44811000 */ mtc1 $at, $f2 -/* 3A3B18 E00A4338 00000000 */ nop +/* 3A3B18 E00A4338 00000000 */ nop /* 3A3B1C E00A433C 46020002 */ mul.s $f0, $f0, $f2 -/* 3A3B20 E00A4340 00000000 */ nop +/* 3A3B20 E00A4340 00000000 */ nop /* 3A3B24 E00A4344 3C01433E */ lui $at, 0x433e /* 3A3B28 E00A4348 44811000 */ mtc1 $at, $f2 /* 3A3B2C E00A434C 080290F4 */ j .LE00A43D0 @@ -128,7 +128,7 @@ glabel func_E00A41AC /* 3A3B60 E00A4380 240200AA */ addiu $v0, $zero, 0xaa /* 3A3B64 E00A4384 00031040 */ sll $v0, $v1, 1 /* 3A3B68 E00A4388 44826000 */ mtc1 $v0, $f12 -/* 3A3B6C E00A438C 00000000 */ nop +/* 3A3B6C E00A438C 00000000 */ nop /* 3A3B70 E00A4390 46806320 */ cvt.s.w $f12, $f12 /* 3A3B74 E00A4394 240200EB */ addiu $v0, $zero, 0xeb /* 3A3B78 E00A4398 AE020020 */ sw $v0, 0x20($s0) @@ -138,17 +138,17 @@ glabel func_E00A41AC /* 3A3B88 E00A43A8 AE020028 */ sw $v0, 0x28($s0) /* 3A3B8C E00A43AC 3C014170 */ lui $at, 0x4170 /* 3A3B90 E00A43B0 44811000 */ mtc1 $at, $f2 -/* 3A3B94 E00A43B4 00000000 */ nop +/* 3A3B94 E00A43B4 00000000 */ nop /* 3A3B98 E00A43B8 46020002 */ mul.s $f0, $f0, $f2 -/* 3A3B9C E00A43BC 00000000 */ nop +/* 3A3B9C E00A43BC 00000000 */ nop /* 3A3BA0 E00A43C0 3C014357 */ lui $at, 0x4357 /* 3A3BA4 E00A43C4 44811000 */ mtc1 $at, $f2 -/* 3A3BA8 E00A43C8 00000000 */ nop +/* 3A3BA8 E00A43C8 00000000 */ nop /* 3A3BAC E00A43CC 46020000 */ add.s $f0, $f0, $f2 .LE00A43D0: /* 3A3BB0 E00A43D0 4600010D */ trunc.w.s $f4, $f0 /* 3A3BB4 E00A43D4 44022000 */ mfc1 $v0, $f4 -/* 3A3BB8 E00A43D8 00000000 */ nop +/* 3A3BB8 E00A43D8 00000000 */ nop /* 3A3BBC E00A43DC 00510018 */ mult $v0, $s1 /* 3A3BC0 E00A43E0 00001012 */ mflo $v0 /* 3A3BC4 E00A43E4 3C038080 */ lui $v1, 0x8080 @@ -177,7 +177,7 @@ glabel func_E00A41AC /* 3A3C20 E00A4440 D4224B20 */ ldc1 $f2, %lo(D_E00A4B20)($at) /* 3A3C24 E00A4444 46000021 */ cvt.d.s $f0, $f0 /* 3A3C28 E00A4448 46220002 */ mul.d $f0, $f0, $f2 -/* 3A3C2C E00A444C 00000000 */ nop +/* 3A3C2C E00A444C 00000000 */ nop /* 3A3C30 E00A4450 2403007F */ addiu $v1, $zero, 0x7f /* 3A3C34 E00A4454 00C30018 */ mult $a2, $v1 /* 3A3C38 E00A4458 3C048080 */ lui $a0, 0x8080 @@ -195,7 +195,7 @@ glabel func_E00A41AC /* 3A3C68 E00A4488 D4224B28 */ ldc1 $f2, %lo(D_E00A4B28)($at) /* 3A3C6C E00A448C 46000021 */ cvt.d.s $f0, $f0 /* 3A3C70 E00A4490 46220002 */ mul.d $f0, $f0, $f2 -/* 3A3C74 E00A4494 00000000 */ nop +/* 3A3C74 E00A4494 00000000 */ nop /* 3A3C78 E00A4498 240300A0 */ addiu $v1, $zero, 0xa0 /* 3A3C7C E00A449C 00C30018 */ mult $a2, $v1 /* 3A3C80 E00A44A0 3C048080 */ lui $a0, 0x8080 @@ -211,7 +211,7 @@ glabel func_E00A41AC /* 3A3CA8 E00A44C8 D4224B30 */ ldc1 $f2, %lo(D_E00A4B30)($at) /* 3A3CAC E00A44CC 46000021 */ cvt.d.s $f0, $f0 /* 3A3CB0 E00A44D0 46220002 */ mul.d $f0, $f0, $f2 -/* 3A3CB4 E00A44D4 00000000 */ nop +/* 3A3CB4 E00A44D4 00000000 */ nop /* 3A3CB8 E00A44D8 2403007F */ addiu $v1, $zero, 0x7f /* 3A3CBC E00A44DC 00C30018 */ mult $a2, $v1 /* 3A3CC0 E00A44E0 3C048080 */ lui $a0, 0x8080 @@ -229,7 +229,7 @@ glabel func_E00A41AC /* 3A3CF0 E00A4510 D4224B38 */ ldc1 $f2, %lo(D_E00A4B38)($at) /* 3A3CF4 E00A4514 46000021 */ cvt.d.s $f0, $f0 /* 3A3CF8 E00A4518 46220002 */ mul.d $f0, $f0, $f2 -/* 3A3CFC E00A451C 00000000 */ nop +/* 3A3CFC E00A451C 00000000 */ nop /* 3A3D00 E00A4520 240300A0 */ addiu $v1, $zero, 0xa0 /* 3A3D04 E00A4524 00C30018 */ mult $a2, $v1 /* 3A3D08 E00A4528 3C048080 */ lui $a0, 0x8080 diff --git a/asm/nonmatchings/code_3A37E0/func_E00A45DC.s b/asm/nonmatchings/code_3A37E0/func_E00A45DC.s index 89b19aa673..355eeced9f 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A45DC.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A45DC.s @@ -18,12 +18,12 @@ glabel func_E00A45DC /* 3A3DF0 E00A4610 14400005 */ bnez $v0, .LE00A4628 /* 3A3DF4 E00A4614 27A40010 */ addiu $a0, $sp, 0x10 /* 3A3DF8 E00A4618 0C080120 */ jal func_E0200480 -/* 3A3DFC E00A461C 00000000 */ nop +/* 3A3DFC E00A461C 00000000 */ nop /* 3A3E00 E00A4620 0802918F */ j .LE00A463C -/* 3A3E04 E00A4624 00000000 */ nop +/* 3A3E04 E00A4624 00000000 */ nop .LE00A4628: /* 3A3E08 E00A4628 0C080120 */ jal func_E0200480 -/* 3A3E0C E00A462C 00000000 */ nop +/* 3A3E0C E00A462C 00000000 */ nop /* 3A3E10 E00A4630 8C430000 */ lw $v1, ($v0) /* 3A3E14 E00A4634 34630002 */ ori $v1, $v1, 2 /* 3A3E18 E00A4638 AC430000 */ sw $v1, ($v0) diff --git a/asm/nonmatchings/code_3A37E0/func_E00A4648.s b/asm/nonmatchings/code_3A37E0/func_E00A4648.s index c8908e5952..14e2af326b 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A4648.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A4648.s @@ -3,4 +3,4 @@ glabel func_E00A4648 /* 3A3E28 E00A4648 03E00008 */ jr $ra -/* 3A3E2C E00A464C 00000000 */ nop +/* 3A3E2C E00A464C 00000000 */ nop diff --git a/asm/nonmatchings/code_3A37E0/func_E00A4650.s b/asm/nonmatchings/code_3A37E0/func_E00A4650.s index 24eee77f3a..84d47a6232 100644 --- a/asm/nonmatchings/code_3A37E0/func_E00A4650.s +++ b/asm/nonmatchings/code_3A37E0/func_E00A4650.s @@ -169,7 +169,7 @@ glabel func_E00A4650 /* 3A40C0 E00A48E0 000A1023 */ negu $v0, $t2 /* 3A40C4 E00A48E4 000210C0 */ sll $v0, $v0, 3 /* 3A40C8 E00A48E8 44820000 */ mtc1 $v0, $f0 -/* 3A40CC E00A48EC 00000000 */ nop +/* 3A40CC E00A48EC 00000000 */ nop /* 3A40D0 E00A48F0 46800020 */ cvt.s.w $f0, $f0 /* 3A40D4 E00A48F4 0100482D */ daddu $t1, $t0, $zero /* 3A40D8 E00A48F8 44050000 */ mfc1 $a1, $f0 diff --git a/asm/nonmatchings/code_3AEE20/func_E00AC000.s b/asm/nonmatchings/code_3AEE20/func_E00AC000.s index bedcbf1f5b..71e1137c1f 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC000.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC000.s @@ -40,7 +40,7 @@ glabel func_E00AC000 /* 3AEEAC E00AC08C AE02000C */ sw $v0, 0xc($s0) .LE00AC090: /* 3AEEB0 E00AC090 0802B024 */ j .LE00AC090 -/* 3AEEB4 E00AC094 00000000 */ nop +/* 3AEEB4 E00AC094 00000000 */ nop .LE00AC098: /* 3AEEB8 E00AC098 AC910000 */ sw $s1, ($a0) /* 3AEEBC E00AC09C E4940004 */ swc1 $f20, 4($a0) diff --git a/asm/nonmatchings/code_3AEE20/func_E00AC11C.s b/asm/nonmatchings/code_3AEE20/func_E00AC11C.s index 9fdd15c8d3..bbc18458c9 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC11C.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC11C.s @@ -3,4 +3,4 @@ glabel func_E00AC11C /* 3AEF3C E00AC11C 03E00008 */ jr $ra -/* 3AEF40 E00AC120 00000000 */ nop +/* 3AEF40 E00AC120 00000000 */ nop diff --git a/asm/nonmatchings/code_3AEE20/func_E00AC124.s b/asm/nonmatchings/code_3AEE20/func_E00AC124.s index 5479c6f8a9..b16cdd378f 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC124.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC124.s @@ -14,9 +14,9 @@ glabel func_E00AC124 /* 3AEF68 E00AC148 04610005 */ bgez $v1, .LE00AC160 /* 3AEF6C E00AC14C ACA20018 */ sw $v0, 0x18($a1) /* 3AEF70 E00AC150 0C080128 */ jal func_E02004A0 -/* 3AEF74 E00AC154 00000000 */ nop +/* 3AEF74 E00AC154 00000000 */ nop /* 3AEF78 E00AC158 0802B09D */ j .LE00AC274 -/* 3AEF7C E00AC15C 00000000 */ nop +/* 3AEF7C E00AC15C 00000000 */ nop .LE00AC160: /* 3AEF80 E00AC160 8CA3001C */ lw $v1, 0x1c($a1) /* 3AEF84 E00AC164 24020001 */ addiu $v0, $zero, 1 @@ -33,11 +33,11 @@ glabel func_E00AC124 /* 3AEFB0 E00AC190 3C01E00B */ lui $at, %hi(D_E00AC8D0) /* 3AEFB4 E00AC194 D422C8D0 */ ldc1 $f2, %lo(D_E00AC8D0)($at) /* 3AEFB8 E00AC198 44820000 */ mtc1 $v0, $f0 -/* 3AEFBC E00AC19C 00000000 */ nop +/* 3AEFBC E00AC19C 00000000 */ nop /* 3AEFC0 E00AC1A0 46800020 */ cvt.s.w $f0, $f0 /* 3AEFC4 E00AC1A4 46000021 */ cvt.d.s $f0, $f0 /* 3AEFC8 E00AC1A8 46220002 */ mul.d $f0, $f0, $f2 -/* 3AEFCC E00AC1AC 00000000 */ nop +/* 3AEFCC E00AC1AC 00000000 */ nop /* 3AEFD0 E00AC1B0 3C013F80 */ lui $at, 0x3f80 /* 3AEFD4 E00AC1B4 44812000 */ mtc1 $at, $f4 /* 3AEFD8 E00AC1B8 46200020 */ cvt.s.d $f0, $f0 @@ -64,11 +64,11 @@ glabel func_E00AC124 /* 3AF020 E00AC200 3C01E00B */ lui $at, %hi(D_E00AC8D8) /* 3AF024 E00AC204 D422C8D8 */ ldc1 $f2, %lo(D_E00AC8D8)($at) /* 3AF028 E00AC208 44820000 */ mtc1 $v0, $f0 -/* 3AF02C E00AC20C 00000000 */ nop +/* 3AF02C E00AC20C 00000000 */ nop /* 3AF030 E00AC210 46800020 */ cvt.s.w $f0, $f0 /* 3AF034 E00AC214 46000021 */ cvt.d.s $f0, $f0 /* 3AF038 E00AC218 46220002 */ mul.d $f0, $f0, $f2 -/* 3AF03C E00AC21C 00000000 */ nop +/* 3AF03C E00AC21C 00000000 */ nop /* 3AF040 E00AC220 3C013F80 */ lui $at, 0x3f80 /* 3AF044 E00AC224 44812000 */ mtc1 $at, $f4 /* 3AF048 E00AC228 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_3AEE20/func_E00AC280.s b/asm/nonmatchings/code_3AEE20/func_E00AC280.s index 50d77cef71..c5f9f89a5e 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC280.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC280.s @@ -3,4 +3,4 @@ glabel func_E00AC280 /* 3AF0A0 E00AC280 03E00008 */ jr $ra -/* 3AF0A4 E00AC284 00000000 */ nop +/* 3AF0A4 E00AC284 00000000 */ nop diff --git a/asm/nonmatchings/code_3AEE20/func_E00AC288.s b/asm/nonmatchings/code_3AEE20/func_E00AC288.s index 268373edb5..6a68a1dcbb 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC288.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC288.s @@ -5,7 +5,7 @@ glabel func_E00AC288 /* 3AF0A8 E00AC288 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3AF0AC E00AC28C AFBF0010 */ sw $ra, 0x10($sp) /* 3AF0B0 E00AC290 0C02B0A9 */ jal func_E00AC2A4 -/* 3AF0B4 E00AC294 00000000 */ nop +/* 3AF0B4 E00AC294 00000000 */ nop /* 3AF0B8 E00AC298 8FBF0010 */ lw $ra, 0x10($sp) /* 3AF0BC E00AC29C 03E00008 */ jr $ra /* 3AF0C0 E00AC2A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s b/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s index 5aa6b702af..9875ad2602 100644 --- a/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s +++ b/asm/nonmatchings/code_3AEE20/func_E00AC2A4.s @@ -21,12 +21,12 @@ glabel func_E00AC2A4 /* 3AF104 E00AC2E4 8E9E001C */ lw $fp, 0x1c($s4) /* 3AF108 E00AC2E8 8E970020 */ lw $s7, 0x20($s4) /* 3AF10C E00AC2EC 46020032 */ c.eq.s $f0, $f2 -/* 3AF110 E00AC2F0 00000000 */ nop +/* 3AF110 E00AC2F0 00000000 */ nop /* 3AF114 E00AC2F4 4501011F */ bc1t .LE00AC774 -/* 3AF118 E00AC2F8 00000000 */ nop +/* 3AF118 E00AC2F8 00000000 */ nop /* 3AF11C E00AC2FC C680002C */ lwc1 $f0, 0x2c($s4) /* 3AF120 E00AC300 46020032 */ c.eq.s $f0, $f2 -/* 3AF124 E00AC304 00000000 */ nop +/* 3AF124 E00AC304 00000000 */ nop /* 3AF128 E00AC308 4501011A */ bc1t .LE00AC774 /* 3AF12C E00AC30C 3C08DB06 */ lui $t0, 0xdb06 /* 3AF130 E00AC310 35080024 */ ori $t0, $t0, 0x24 @@ -329,5 +329,5 @@ glabel func_E00AC2A4 /* 3AF5BC E00AC79C D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 3AF5C0 E00AC7A0 03E00008 */ jr $ra /* 3AF5C4 E00AC7A4 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* 3AF5C8 E00AC7A8 00000000 */ nop -/* 3AF5CC E00AC7AC 00000000 */ nop +/* 3AF5C8 E00AC7A8 00000000 */ nop +/* 3AF5CC E00AC7AC 00000000 */ nop diff --git a/asm/nonmatchings/code_3B8BD0/func_E00BA000.s b/asm/nonmatchings/code_3B8BD0/func_E00BA000.s index be54f44ecd..36e0b34a14 100644 --- a/asm/nonmatchings/code_3B8BD0/func_E00BA000.s +++ b/asm/nonmatchings/code_3B8BD0/func_E00BA000.s @@ -40,7 +40,7 @@ glabel func_E00BA000 /* 3B8C5C E00BA08C AE02000C */ sw $v0, 0xc($s0) .LE00BA090: /* 3B8C60 E00BA090 0802E824 */ j .LE00BA090 -/* 3B8C64 E00BA094 00000000 */ nop +/* 3B8C64 E00BA094 00000000 */ nop .LE00BA098: /* 3B8C68 E00BA098 ACD20000 */ sw $s2, ($a2) /* 3B8C6C E00BA09C 1E200004 */ bgtz $s1, .LE00BA0B0 diff --git a/asm/nonmatchings/code_3B8BD0/func_E00BA16C.s b/asm/nonmatchings/code_3B8BD0/func_E00BA16C.s index 32b971f327..d4e0e20422 100644 --- a/asm/nonmatchings/code_3B8BD0/func_E00BA16C.s +++ b/asm/nonmatchings/code_3B8BD0/func_E00BA16C.s @@ -3,4 +3,4 @@ glabel func_E00BA16C /* 3B8D3C E00BA16C 03E00008 */ jr $ra -/* 3B8D40 E00BA170 00000000 */ nop +/* 3B8D40 E00BA170 00000000 */ nop diff --git a/asm/nonmatchings/code_3B8BD0/func_E00BA174.s b/asm/nonmatchings/code_3B8BD0/func_E00BA174.s index 4de9d0f6d1..b857c9cdc7 100644 --- a/asm/nonmatchings/code_3B8BD0/func_E00BA174.s +++ b/asm/nonmatchings/code_3B8BD0/func_E00BA174.s @@ -33,9 +33,9 @@ glabel func_E00BA174 /* 3B8DAC E00BA1DC 04610005 */ bgez $v1, .LE00BA1F4 /* 3B8DB0 E00BA1E0 AE020014 */ sw $v0, 0x14($s0) /* 3B8DB4 E00BA1E4 0C080128 */ jal func_E02004A0 -/* 3B8DB8 E00BA1E8 00000000 */ nop +/* 3B8DB8 E00BA1E8 00000000 */ nop /* 3B8DBC E00BA1EC 0802E96D */ j .LE00BA5B4 -/* 3B8DC0 E00BA1F0 00000000 */ nop +/* 3B8DC0 E00BA1F0 00000000 */ nop .LE00BA1F4: /* 3B8DC4 E00BA1F4 0060A02D */ daddu $s4, $v1, $zero /* 3B8DC8 E00BA1F8 0040982D */ daddu $s3, $v0, $zero @@ -52,10 +52,10 @@ glabel func_E00BA174 /* 3B8DEC E00BA21C 3C014F00 */ lui $at, 0x4f00 /* 3B8DF0 E00BA220 44811000 */ mtc1 $at, $f2 /* 3B8DF4 E00BA224 44840000 */ mtc1 $a0, $f0 -/* 3B8DF8 E00BA228 00000000 */ nop +/* 3B8DF8 E00BA228 00000000 */ nop /* 3B8DFC E00BA22C 46800020 */ cvt.s.w $f0, $f0 /* 3B8E00 E00BA230 4600103E */ c.le.s $f2, $f0 -/* 3B8E04 E00BA234 00000000 */ nop +/* 3B8E04 E00BA234 00000000 */ nop /* 3B8E08 E00BA238 45010005 */ bc1t .LE00BA250 /* 3B8E0C E00BA23C 2605001F */ addiu $a1, $s0, 0x1f /* 3B8E10 E00BA240 4600038D */ trunc.w.s $f14, $f0 @@ -67,7 +67,7 @@ glabel func_E00BA174 /* 3B8E24 E00BA254 3C028000 */ lui $v0, 0x8000 /* 3B8E28 E00BA258 4600038D */ trunc.w.s $f14, $f0 /* 3B8E2C E00BA25C 44037000 */ mfc1 $v1, $f14 -/* 3B8E30 E00BA260 00000000 */ nop +/* 3B8E30 E00BA260 00000000 */ nop /* 3B8E34 E00BA264 00621825 */ or $v1, $v1, $v0 /* 3B8E38 E00BA268 24120001 */ addiu $s2, $zero, 1 .LE00BA26C: @@ -77,7 +77,7 @@ glabel func_E00BA174 /* 3B8E48 E00BA278 3C01437F */ lui $at, 0x437f /* 3B8E4C E00BA27C 44811000 */ mtc1 $at, $f2 /* 3B8E50 E00BA280 44840000 */ mtc1 $a0, $f0 -/* 3B8E54 E00BA284 00000000 */ nop +/* 3B8E54 E00BA284 00000000 */ nop /* 3B8E58 E00BA288 46800020 */ cvt.s.w $f0, $f0 /* 3B8E5C E00BA28C A0A30000 */ sb $v1, ($a1) /* 3B8E60 E00BA290 46020503 */ div.s $f20, $f0, $f2 @@ -88,17 +88,17 @@ glabel func_E00BA174 /* 3B8E70 E00BA2A0 00021080 */ sll $v0, $v0, 2 /* 3B8E74 E00BA2A4 00021023 */ negu $v0, $v0 /* 3B8E78 E00BA2A8 44826000 */ mtc1 $v0, $f12 -/* 3B8E7C E00BA2AC 00000000 */ nop +/* 3B8E7C E00BA2AC 00000000 */ nop /* 3B8E80 E00BA2B0 46806320 */ cvt.s.w $f12, $f12 /* 3B8E84 E00BA2B4 0C080140 */ jal func_E0200500 /* 3B8E88 E00BA2B8 26520001 */ addiu $s2, $s2, 1 /* 3B8E8C E00BA2BC 46160002 */ mul.s $f0, $f0, $f22 -/* 3B8E90 E00BA2C0 00000000 */ nop +/* 3B8E90 E00BA2C0 00000000 */ nop /* 3B8E94 E00BA2C4 46140002 */ mul.s $f0, $f0, $f20 -/* 3B8E98 E00BA2C8 00000000 */ nop +/* 3B8E98 E00BA2C8 00000000 */ nop /* 3B8E9C E00BA2CC 4600038D */ trunc.w.s $f14, $f0 /* 3B8EA0 E00BA2D0 44027000 */ mfc1 $v0, $f14 -/* 3B8EA4 E00BA2D4 00000000 */ nop +/* 3B8EA4 E00BA2D4 00000000 */ nop /* 3B8EA8 E00BA2D8 A2220029 */ sb $v0, 0x29($s1) /* 3B8EAC E00BA2DC 2A420012 */ slti $v0, $s2, 0x12 /* 3B8EB0 E00BA2E0 1440FFEC */ bnez $v0, .LE00BA294 @@ -128,17 +128,17 @@ glabel func_E00BA174 /* 3B8F08 E00BA338 80420023 */ lb $v0, 0x23($v0) /* 3B8F0C E00BA33C 80630023 */ lb $v1, 0x23($v1) /* 3B8F10 E00BA340 44822000 */ mtc1 $v0, $f4 -/* 3B8F14 E00BA344 00000000 */ nop +/* 3B8F14 E00BA344 00000000 */ nop /* 3B8F18 E00BA348 46802120 */ cvt.s.w $f4, $f4 /* 3B8F1C E00BA34C 25020001 */ addiu $v0, $t0, 1 /* 3B8F20 E00BA350 00A21021 */ addu $v0, $a1, $v0 /* 3B8F24 E00BA354 02021021 */ addu $v0, $s0, $v0 /* 3B8F28 E00BA358 80420023 */ lb $v0, 0x23($v0) /* 3B8F2C E00BA35C 44831000 */ mtc1 $v1, $f2 -/* 3B8F30 E00BA360 00000000 */ nop +/* 3B8F30 E00BA360 00000000 */ nop /* 3B8F34 E00BA364 468010A0 */ cvt.s.w $f2, $f2 /* 3B8F38 E00BA368 44820000 */ mtc1 $v0, $f0 -/* 3B8F3C E00BA36C 00000000 */ nop +/* 3B8F3C E00BA36C 00000000 */ nop /* 3B8F40 E00BA370 46800020 */ cvt.s.w $f0, $f0 /* 3B8F44 E00BA374 00B11021 */ addu $v0, $a1, $s1 /* 3B8F48 E00BA378 46002100 */ add.s $f4, $f4, $f0 @@ -147,7 +147,7 @@ glabel func_E00BA174 /* 3B8F54 E00BA384 46022100 */ add.s $f4, $f4, $f2 /* 3B8F58 E00BA388 02042021 */ addu $a0, $s0, $a0 /* 3B8F5C E00BA38C 44820000 */ mtc1 $v0, $f0 -/* 3B8F60 E00BA390 00000000 */ nop +/* 3B8F60 E00BA390 00000000 */ nop /* 3B8F64 E00BA394 46800020 */ cvt.s.w $f0, $f0 /* 3B8F68 E00BA398 46002100 */ add.s $f4, $f4, $f0 /* 3B8F6C E00BA39C 80830023 */ lb $v1, 0x23($a0) @@ -156,9 +156,9 @@ glabel func_E00BA174 /* 3B8F78 E00BA3A8 44800000 */ mtc1 $zero, $f0 /* 3B8F7C E00BA3AC 46002121 */ cvt.d.s $f4, $f4 /* 3B8F80 E00BA3B0 46202102 */ mul.d $f4, $f4, $f0 -/* 3B8F84 E00BA3B4 00000000 */ nop +/* 3B8F84 E00BA3B4 00000000 */ nop /* 3B8F88 E00BA3B8 44835000 */ mtc1 $v1, $f10 -/* 3B8F8C E00BA3BC 00000000 */ nop +/* 3B8F8C E00BA3BC 00000000 */ nop /* 3B8F90 E00BA3C0 468052A0 */ cvt.s.w $f10, $f10 /* 3B8F94 E00BA3C4 00A81821 */ addu $v1, $a1, $t0 /* 3B8F98 E00BA3C8 02031821 */ addu $v1, $s0, $v1 @@ -168,9 +168,9 @@ glabel func_E00BA174 /* 3B8FA8 E00BA3D8 44810000 */ mtc1 $at, $f0 /* 3B8FAC E00BA3DC 80420023 */ lb $v0, 0x23($v0) /* 3B8FB0 E00BA3E0 46005282 */ mul.s $f10, $f10, $f0 -/* 3B8FB4 E00BA3E4 00000000 */ nop +/* 3B8FB4 E00BA3E4 00000000 */ nop /* 3B8FB8 E00BA3E8 44821000 */ mtc1 $v0, $f2 -/* 3B8FBC E00BA3EC 00000000 */ nop +/* 3B8FBC E00BA3EC 00000000 */ nop /* 3B8FC0 E00BA3F0 468010A0 */ cvt.s.w $f2, $f2 /* 3B8FC4 E00BA3F4 24E20001 */ addiu $v0, $a3, 1 /* 3B8FC8 E00BA3F8 00A21021 */ addu $v0, $a1, $v0 @@ -178,24 +178,24 @@ glabel func_E00BA174 /* 3B8FD0 E00BA400 D420AE80 */ ldc1 $f0, %lo(D_E00BAE80)($at) /* 3B8FD4 E00BA404 460051A1 */ cvt.d.s $f6, $f10 /* 3B8FD8 E00BA408 46203182 */ mul.d $f6, $f6, $f0 -/* 3B8FDC E00BA40C 00000000 */ nop +/* 3B8FDC E00BA40C 00000000 */ nop /* 3B8FE0 E00BA410 02021021 */ addu $v0, $s0, $v0 /* 3B8FE4 E00BA414 80420023 */ lb $v0, 0x23($v0) /* 3B8FE8 E00BA418 80630023 */ lb $v1, 0x23($v1) /* 3B8FEC E00BA41C 44824000 */ mtc1 $v0, $f8 -/* 3B8FF0 E00BA420 00000000 */ nop +/* 3B8FF0 E00BA420 00000000 */ nop /* 3B8FF4 E00BA424 46804220 */ cvt.s.w $f8, $f8 /* 3B8FF8 E00BA428 24E2FFFF */ addiu $v0, $a3, -1 /* 3B8FFC E00BA42C 00A21021 */ addu $v0, $a1, $v0 /* 3B9000 E00BA430 44830000 */ mtc1 $v1, $f0 -/* 3B9004 E00BA434 00000000 */ nop +/* 3B9004 E00BA434 00000000 */ nop /* 3B9008 E00BA438 46800020 */ cvt.s.w $f0, $f0 /* 3B900C E00BA43C 46001080 */ add.s $f2, $f2, $f0 /* 3B9010 E00BA440 02021021 */ addu $v0, $s0, $v0 /* 3B9014 E00BA444 80420023 */ lb $v0, 0x23($v0) /* 3B9018 E00BA448 46081080 */ add.s $f2, $f2, $f8 /* 3B901C E00BA44C 44820000 */ mtc1 $v0, $f0 -/* 3B9020 E00BA450 00000000 */ nop +/* 3B9020 E00BA450 00000000 */ nop /* 3B9024 E00BA454 46800020 */ cvt.s.w $f0, $f0 /* 3B9028 E00BA458 46001080 */ add.s $f2, $f2, $f0 /* 3B902C E00BA45C 460A1081 */ sub.s $f2, $f2, $f10 @@ -206,37 +206,37 @@ glabel func_E00BA174 /* 3B9040 E00BA470 460010A1 */ cvt.d.s $f2, $f2 /* 3B9044 E00BA474 46261081 */ sub.d $f2, $f2, $f6 /* 3B9048 E00BA478 44820000 */ mtc1 $v0, $f0 -/* 3B904C E00BA47C 00000000 */ nop +/* 3B904C E00BA47C 00000000 */ nop /* 3B9050 E00BA480 46800021 */ cvt.d.w $f0, $f0 /* 3B9054 E00BA484 46220000 */ add.d $f0, $f0, $f2 /* 3B9058 E00BA488 3C01E00C */ lui $at, %hi(D_E00BAE88) /* 3B905C E00BA48C D422AE88 */ ldc1 $f2, %lo(D_E00BAE88)($at) /* 3B9060 E00BA490 4620038D */ trunc.w.d $f14, $f0 /* 3B9064 E00BA494 44027000 */ mfc1 $v0, $f14 -/* 3B9068 E00BA498 00000000 */ nop +/* 3B9068 E00BA498 00000000 */ nop /* 3B906C E00BA49C 00021400 */ sll $v0, $v0, 0x10 /* 3B9070 E00BA4A0 00021403 */ sra $v0, $v0, 0x10 /* 3B9074 E00BA4A4 44820000 */ mtc1 $v0, $f0 -/* 3B9078 E00BA4A8 00000000 */ nop +/* 3B9078 E00BA4A8 00000000 */ nop /* 3B907C E00BA4AC 46800021 */ cvt.d.w $f0, $f0 /* 3B9080 E00BA4B0 46220002 */ mul.d $f0, $f0, $f2 -/* 3B9084 E00BA4B4 00000000 */ nop +/* 3B9084 E00BA4B4 00000000 */ nop /* 3B9088 E00BA4B8 4620038D */ trunc.w.d $f14, $f0 /* 3B908C E00BA4BC 44027000 */ mfc1 $v0, $f14 -/* 3B9090 E00BA4C0 00000000 */ nop +/* 3B9090 E00BA4C0 00000000 */ nop /* 3B9094 E00BA4C4 A462011A */ sh $v0, 0x11a($v1) /* 3B9098 E00BA4C8 2A820020 */ slti $v0, $s4, 0x20 /* 3B909C E00BA4CC 1040000B */ beqz $v0, .LE00BA4FC /* 3B90A0 E00BA4D0 24A50001 */ addiu $a1, $a1, 1 /* 3B90A4 E00BA4D4 80820023 */ lb $v0, 0x23($a0) /* 3B90A8 E00BA4D8 44820000 */ mtc1 $v0, $f0 -/* 3B90AC E00BA4DC 00000000 */ nop +/* 3B90AC E00BA4DC 00000000 */ nop /* 3B90B0 E00BA4E0 46800020 */ cvt.s.w $f0, $f0 /* 3B90B4 E00BA4E4 46140002 */ mul.s $f0, $f0, $f20 -/* 3B90B8 E00BA4E8 00000000 */ nop +/* 3B90B8 E00BA4E8 00000000 */ nop /* 3B90BC E00BA4EC 4600038D */ trunc.w.s $f14, $f0 /* 3B90C0 E00BA4F0 44027000 */ mfc1 $v0, $f14 -/* 3B90C4 E00BA4F4 00000000 */ nop +/* 3B90C4 E00BA4F4 00000000 */ nop /* 3B90C8 E00BA4F8 A0820023 */ sb $v0, 0x23($a0) .LE00BA4FC: /* 3B90CC E00BA4FC 28A2000C */ slti $v0, $a1, 0xc @@ -263,21 +263,21 @@ glabel func_E00BA174 /* 3B9118 E00BA548 02041021 */ addu $v0, $s0, $a0 /* 3B911C E00BA54C 8442011A */ lh $v0, 0x11a($v0) /* 3B9120 E00BA550 44821000 */ mtc1 $v0, $f2 -/* 3B9124 E00BA554 00000000 */ nop +/* 3B9124 E00BA554 00000000 */ nop /* 3B9128 E00BA558 468010A1 */ cvt.d.w $f2, $f2 /* 3B912C E00BA55C 46241082 */ mul.d $f2, $f2, $f4 -/* 3B9130 E00BA560 00000000 */ nop +/* 3B9130 E00BA560 00000000 */ nop /* 3B9134 E00BA564 00A61821 */ addu $v1, $a1, $a2 /* 3B9138 E00BA568 02031821 */ addu $v1, $s0, $v1 /* 3B913C E00BA56C 80620023 */ lb $v0, 0x23($v1) /* 3B9140 E00BA570 44820000 */ mtc1 $v0, $f0 -/* 3B9144 E00BA574 00000000 */ nop +/* 3B9144 E00BA574 00000000 */ nop /* 3B9148 E00BA578 46800021 */ cvt.d.w $f0, $f0 /* 3B914C E00BA57C 46220000 */ add.d $f0, $f0, $f2 /* 3B9150 E00BA580 24A50001 */ addiu $a1, $a1, 1 /* 3B9154 E00BA584 4620038D */ trunc.w.d $f14, $f0 /* 3B9158 E00BA588 44027000 */ mfc1 $v0, $f14 -/* 3B915C E00BA58C 00000000 */ nop +/* 3B915C E00BA58C 00000000 */ nop /* 3B9160 E00BA590 A0620023 */ sb $v0, 0x23($v1) /* 3B9164 E00BA594 28A2000C */ slti $v0, $a1, 0xc /* 3B9168 E00BA598 1440FFEB */ bnez $v0, .LE00BA548 diff --git a/asm/nonmatchings/code_3B8BD0/func_E00BA618.s b/asm/nonmatchings/code_3B8BD0/func_E00BA618.s index 7b0ea7d568..998a66b9c7 100644 --- a/asm/nonmatchings/code_3B8BD0/func_E00BA618.s +++ b/asm/nonmatchings/code_3B8BD0/func_E00BA618.s @@ -3,4 +3,4 @@ glabel func_E00BA618 /* 3B91E8 E00BA618 03E00008 */ jr $ra -/* 3B91EC E00BA61C 00000000 */ nop +/* 3B91EC E00BA61C 00000000 */ nop diff --git a/asm/nonmatchings/code_3B8BD0/func_E00BA620.s b/asm/nonmatchings/code_3B8BD0/func_E00BA620.s index acf0bc2dd9..53c84c70c4 100644 --- a/asm/nonmatchings/code_3B8BD0/func_E00BA620.s +++ b/asm/nonmatchings/code_3B8BD0/func_E00BA620.s @@ -546,6 +546,6 @@ glabel func_E00BA620 /* 3B9A38 E00BAE68 8FB000B0 */ lw $s0, 0xb0($sp) /* 3B9A3C E00BAE6C 03E00008 */ jr $ra /* 3B9A40 E00BAE70 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 3B9A44 E00BAE74 00000000 */ nop -/* 3B9A48 E00BAE78 00000000 */ nop -/* 3B9A4C E00BAE7C 00000000 */ nop +/* 3B9A44 E00BAE74 00000000 */ nop +/* 3B9A48 E00BAE78 00000000 */ nop +/* 3B9A4C E00BAE7C 00000000 */ nop diff --git a/asm/nonmatchings/code_3BA030/func_E00BC000.s b/asm/nonmatchings/code_3BA030/func_E00BC000.s index 811a026ca9..3fa73ff472 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC000.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC000.s @@ -47,7 +47,7 @@ glabel func_E00BC000 /* 3BA0D8 E00BC0A8 AE42000C */ sw $v0, 0xc($s2) .LE00BC0AC: /* 3BA0DC E00BC0AC 0802F02B */ j .LE00BC0AC -/* 3BA0E0 E00BC0B0 00000000 */ nop +/* 3BA0E0 E00BC0B0 00000000 */ nop .LE00BC0B4: /* 3BA0E4 E00BC0B4 AE130000 */ sw $s3, ($s0) /* 3BA0E8 E00BC0B8 1E200004 */ bgtz $s1, .LE00BC0CC @@ -60,10 +60,10 @@ glabel func_E00BC000 .LE00BC0D0: /* 3BA100 E00BC0D0 461AA081 */ sub.s $f2, $f20, $f26 /* 3BA104 E00BC0D4 46021082 */ mul.s $f2, $f2, $f2 -/* 3BA108 E00BC0D8 00000000 */ nop +/* 3BA108 E00BC0D8 00000000 */ nop /* 3BA10C E00BC0DC 461CB101 */ sub.s $f4, $f22, $f28 /* 3BA110 E00BC0E0 46042102 */ mul.s $f4, $f4, $f4 -/* 3BA114 E00BC0E4 00000000 */ nop +/* 3BA114 E00BC0E4 00000000 */ nop /* 3BA118 E00BC0E8 241100FF */ addiu $s1, $zero, 0xff /* 3BA11C E00BC0EC AE11003C */ sw $s1, 0x3c($s0) /* 3BA120 E00BC0F0 E6140010 */ swc1 $f20, 0x10($s0) @@ -72,7 +72,7 @@ glabel func_E00BC000 /* 3BA12C E00BC0FC E6180018 */ swc1 $f24, 0x18($s0) /* 3BA130 E00BC100 E61A001C */ swc1 $f26, 0x1c($s0) /* 3BA134 E00BC104 46000002 */ mul.s $f0, $f0, $f0 -/* 3BA138 E00BC108 00000000 */ nop +/* 3BA138 E00BC108 00000000 */ nop /* 3BA13C E00BC10C E61C0020 */ swc1 $f28, 0x20($s0) /* 3BA140 E00BC110 E61E0024 */ swc1 $f30, 0x24($s0) /* 3BA144 E00BC114 E6140004 */ swc1 $f20, 4($s0) @@ -83,21 +83,21 @@ glabel func_E00BC000 /* 3BA158 E00BC128 46001300 */ add.s $f12, $f2, $f0 /* 3BA15C E00BC12C C7A0008C */ lwc1 $f0, 0x8c($sp) /* 3BA160 E00BC130 46046032 */ c.eq.s $f12, $f4 -/* 3BA164 E00BC134 00000000 */ nop +/* 3BA164 E00BC134 00000000 */ nop /* 3BA168 E00BC138 45000003 */ bc1f .LE00BC148 /* 3BA16C E00BC13C E600004C */ swc1 $f0, 0x4c($s0) /* 3BA170 E00BC140 0802F067 */ j .LE00BC19C /* 3BA174 E00BC144 0000102D */ daddu $v0, $zero, $zero .LE00BC148: /* 3BA178 E00BC148 0C080154 */ jal func_E0200550 -/* 3BA17C E00BC14C 00000000 */ nop +/* 3BA17C E00BC14C 00000000 */ nop /* 3BA180 E00BC150 24040167 */ addiu $a0, $zero, 0x167 /* 3BA184 E00BC154 46000021 */ cvt.d.s $f0, $f0 /* 3BA188 E00BC158 3C01E00C */ lui $at, %hi(D_E00BCE50) /* 3BA18C E00BC15C D422CE50 */ ldc1 $f2, %lo(D_E00BCE50)($at) /* 3BA190 E00BC160 240200DC */ addiu $v0, $zero, 0xdc /* 3BA194 E00BC164 46220002 */ mul.d $f0, $f0, $f2 -/* 3BA198 E00BC168 00000000 */ nop +/* 3BA198 E00BC168 00000000 */ nop /* 3BA19C E00BC16C AE020034 */ sw $v0, 0x34($s0) /* 3BA1A0 E00BC170 24020014 */ addiu $v0, $zero, 0x14 /* 3BA1A4 E00BC174 AE110030 */ sw $s1, 0x30($s0) diff --git a/asm/nonmatchings/code_3BA030/func_E00BC1D0.s b/asm/nonmatchings/code_3BA030/func_E00BC1D0.s index 6d2bc663aa..a5c7118014 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC1D0.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC1D0.s @@ -3,4 +3,4 @@ glabel func_E00BC1D0 /* 3BA200 E00BC1D0 03E00008 */ jr $ra -/* 3BA204 E00BC1D4 00000000 */ nop +/* 3BA204 E00BC1D4 00000000 */ nop diff --git a/asm/nonmatchings/code_3BA030/func_E00BC1D8.s b/asm/nonmatchings/code_3BA030/func_E00BC1D8.s index da69311477..4bf25958c9 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC1D8.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC1D8.s @@ -9,15 +9,15 @@ glabel func_E00BC1D8 /* 3BA218 E00BC1E8 44041000 */ mfc1 $a0, $f2 /* 3BA21C E00BC1EC AFBF0010 */ sw $ra, 0x10($sp) /* 3BA220 E00BC1F0 0C080138 */ jal func_E02004E0 -/* 3BA224 E00BC1F4 00000000 */ nop +/* 3BA224 E00BC1F4 00000000 */ nop /* 3BA228 E00BC1F8 3C013FE0 */ lui $at, 0x3fe0 /* 3BA22C E00BC1FC 44810800 */ mtc1 $at, $f1 /* 3BA230 E00BC200 44800000 */ mtc1 $zero, $f0 /* 3BA234 E00BC204 4600A521 */ cvt.d.s $f20, $f20 /* 3BA238 E00BC208 4620A502 */ mul.d $f20, $f20, $f0 -/* 3BA23C E00BC20C 00000000 */ nop +/* 3BA23C E00BC20C 00000000 */ nop /* 3BA240 E00BC210 44820000 */ mtc1 $v0, $f0 -/* 3BA244 E00BC214 00000000 */ nop +/* 3BA244 E00BC214 00000000 */ nop /* 3BA248 E00BC218 46800020 */ cvt.s.w $f0, $f0 /* 3BA24C E00BC21C 46000021 */ cvt.d.s $f0, $f0 /* 3BA250 E00BC220 46340001 */ sub.d $f0, $f0, $f20 diff --git a/asm/nonmatchings/code_3BA030/func_E00BC238.s b/asm/nonmatchings/code_3BA030/func_E00BC238.s index 4d9cd1988c..58e28bc686 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC238.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC238.s @@ -27,9 +27,9 @@ glabel func_E00BC238 /* 3BA2B8 E00BC288 04610005 */ bgez $v1, .LE00BC2A0 /* 3BA2BC E00BC28C ACC5002C */ sw $a1, 0x2c($a2) /* 3BA2C0 E00BC290 0C080128 */ jal func_E02004A0 -/* 3BA2C4 E00BC294 00000000 */ nop +/* 3BA2C4 E00BC294 00000000 */ nop /* 3BA2C8 E00BC298 0802F0B7 */ j .LE00BC2DC -/* 3BA2CC E00BC29C 00000000 */ nop +/* 3BA2CC E00BC29C 00000000 */ nop .LE00BC2A0: /* 3BA2D0 E00BC2A0 24020002 */ addiu $v0, $zero, 2 /* 3BA2D4 E00BC2A4 14E20002 */ bne $a3, $v0, .LE00BC2B0 @@ -37,14 +37,14 @@ glabel func_E00BC238 /* 3BA2DC E00BC2AC 28A20028 */ slti $v0, $a1, 0x28 .LE00BC2B0: /* 3BA2E0 E00BC2B0 1440000A */ bnez $v0, .LE00BC2DC -/* 3BA2E4 E00BC2B4 00000000 */ nop +/* 3BA2E4 E00BC2B4 00000000 */ nop /* 3BA2E8 E00BC2B8 3C013FE0 */ lui $at, 0x3fe0 /* 3BA2EC E00BC2BC 44811800 */ mtc1 $at, $f3 /* 3BA2F0 E00BC2C0 44801000 */ mtc1 $zero, $f2 /* 3BA2F4 E00BC2C4 C4C0003C */ lwc1 $f0, 0x3c($a2) /* 3BA2F8 E00BC2C8 46800021 */ cvt.d.w $f0, $f0 /* 3BA2FC E00BC2CC 46220002 */ mul.d $f0, $f0, $f2 -/* 3BA300 E00BC2D0 00000000 */ nop +/* 3BA300 E00BC2D0 00000000 */ nop /* 3BA304 E00BC2D4 4620010D */ trunc.w.d $f4, $f0 /* 3BA308 E00BC2D8 E4C4003C */ swc1 $f4, 0x3c($a2) .LE00BC2DC: diff --git a/asm/nonmatchings/code_3BA030/func_E00BC2E8.s b/asm/nonmatchings/code_3BA030/func_E00BC2E8.s index 1457e444c0..437f973d5f 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC2E8.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC2E8.s @@ -18,7 +18,7 @@ glabel func_E00BC2E8 /* 3BA34C E00BC31C C4A0000C */ lwc1 $f0, 0xc($a1) /* 3BA350 E00BC320 3C01447A */ lui $at, 0x447a /* 3BA354 E00BC324 44811000 */ mtc1 $at, $f2 -/* 3BA358 E00BC328 00000000 */ nop +/* 3BA358 E00BC328 00000000 */ nop /* 3BA35C E00BC32C 46020000 */ add.s $f0, $f0, $f2 /* 3BA360 E00BC330 4600010D */ trunc.w.s $f4, $f0 /* 3BA364 E00BC334 E7A40014 */ swc1 $f4, 0x14($sp) diff --git a/asm/nonmatchings/code_3BA030/func_E00BC36C.s b/asm/nonmatchings/code_3BA030/func_E00BC36C.s index 14b0f07ddd..35c886d263 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC36C.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC36C.s @@ -3,4 +3,4 @@ glabel func_E00BC36C /* 3BA39C E00BC36C 03E00008 */ jr $ra -/* 3BA3A0 E00BC370 00000000 */ nop +/* 3BA3A0 E00BC370 00000000 */ nop diff --git a/asm/nonmatchings/code_3BA030/func_E00BC374.s b/asm/nonmatchings/code_3BA030/func_E00BC374.s index e0accab943..e2c7c2680f 100644 --- a/asm/nonmatchings/code_3BA030/func_E00BC374.s +++ b/asm/nonmatchings/code_3BA030/func_E00BC374.s @@ -193,12 +193,12 @@ glabel func_E00BC374 /* 3BA67C E00BC64C C6A00010 */ lwc1 $f0, 0x10($s5) /* 3BA680 E00BC650 4600C601 */ sub.s $f24, $f24, $f0 /* 3BA684 E00BC654 461EC602 */ mul.s $f24, $f24, $f30 -/* 3BA688 E00BC658 00000000 */ nop +/* 3BA688 E00BC658 00000000 */ nop /* 3BA68C E00BC65C C6B60020 */ lwc1 $f22, 0x20($s5) /* 3BA690 E00BC660 C6A00014 */ lwc1 $f0, 0x14($s5) /* 3BA694 E00BC664 4600B581 */ sub.s $f22, $f22, $f0 /* 3BA698 E00BC668 461EB582 */ mul.s $f22, $f22, $f30 -/* 3BA69C E00BC66C 00000000 */ nop +/* 3BA69C E00BC66C 00000000 */ nop /* 3BA6A0 E00BC670 02538021 */ addu $s0, $s2, $s3 /* 3BA6A4 E00BC674 000417C3 */ sra $v0, $a0, 0x1f /* 3BA6A8 E00BC678 00007010 */ mfhi $t6 @@ -211,61 +211,61 @@ glabel func_E00BC374 /* 3BA6C4 E00BC694 00822023 */ subu $a0, $a0, $v0 /* 3BA6C8 E00BC698 2484FFC4 */ addiu $a0, $a0, -0x3c /* 3BA6CC E00BC69C 4484E000 */ mtc1 $a0, $f28 -/* 3BA6D0 E00BC6A0 00000000 */ nop +/* 3BA6D0 E00BC6A0 00000000 */ nop /* 3BA6D4 E00BC6A4 4680E720 */ cvt.s.w $f28, $f28 /* 3BA6D8 E00BC6A8 92020000 */ lbu $v0, ($s0) /* 3BA6DC E00BC6AC 4482D000 */ mtc1 $v0, $f26 -/* 3BA6E0 E00BC6B0 00000000 */ nop +/* 3BA6E0 E00BC6B0 00000000 */ nop /* 3BA6E4 E00BC6B4 4680D6A0 */ cvt.s.w $f26, $f26 /* 3BA6E8 E00BC6B8 0C080140 */ jal func_E0200500 /* 3BA6EC E00BC6BC 4600E306 */ mov.s $f12, $f28 /* 3BA6F0 E00BC6C0 461A0502 */ mul.s $f20, $f0, $f26 -/* 3BA6F4 E00BC6C4 00000000 */ nop +/* 3BA6F4 E00BC6C4 00000000 */ nop /* 3BA6F8 E00BC6C8 3C01E00C */ lui $at, %hi(D_E00BCE58) /* 3BA6FC E00BC6CC D430CE58 */ ldc1 $f16, %lo(D_E00BCE58)($at) /* 3BA700 E00BC6D0 4600A521 */ cvt.d.s $f20, $f20 /* 3BA704 E00BC6D4 4630A502 */ mul.d $f20, $f20, $f16 -/* 3BA708 E00BC6D8 00000000 */ nop +/* 3BA708 E00BC6D8 00000000 */ nop /* 3BA70C E00BC6DC 4600E306 */ mov.s $f12, $f28 /* 3BA710 E00BC6E0 0C080144 */ jal func_E0200510 /* 3BA714 E00BC6E4 4620A520 */ cvt.s.d $f20, $f20 /* 3BA718 E00BC6E8 461A0002 */ mul.s $f0, $f0, $f26 -/* 3BA71C E00BC6EC 00000000 */ nop +/* 3BA71C E00BC6EC 00000000 */ nop /* 3BA720 E00BC6F0 3C01E00C */ lui $at, %hi(D_E00BCE60) /* 3BA724 E00BC6F4 D430CE60 */ ldc1 $f16, %lo(D_E00BCE60)($at) /* 3BA728 E00BC6F8 46000021 */ cvt.d.s $f0, $f0 /* 3BA72C E00BC6FC 46300002 */ mul.d $f0, $f0, $f16 -/* 3BA730 E00BC700 00000000 */ nop +/* 3BA730 E00BC700 00000000 */ nop /* 3BA734 E00BC704 4614B182 */ mul.s $f6, $f22, $f20 -/* 3BA738 E00BC708 00000000 */ nop +/* 3BA738 E00BC708 00000000 */ nop /* 3BA73C E00BC70C C6A2001C */ lwc1 $f2, 0x1c($s5) /* 3BA740 E00BC710 C6A40010 */ lwc1 $f4, 0x10($s5) /* 3BA744 E00BC714 46041081 */ sub.s $f2, $f2, $f4 /* 3BA748 E00BC718 44935000 */ mtc1 $s3, $f10 -/* 3BA74C E00BC71C 00000000 */ nop +/* 3BA74C E00BC71C 00000000 */ nop /* 3BA750 E00BC720 468052A0 */ cvt.s.w $f10, $f10 /* 3BA754 E00BC724 460A1082 */ mul.s $f2, $f2, $f10 -/* 3BA758 E00BC728 00000000 */ nop +/* 3BA758 E00BC728 00000000 */ nop /* 3BA75C E00BC72C 461E1082 */ mul.s $f2, $f2, $f30 -/* 3BA760 E00BC730 00000000 */ nop +/* 3BA760 E00BC730 00000000 */ nop /* 3BA764 E00BC734 46200020 */ cvt.s.d $f0, $f0 /* 3BA768 E00BC738 4600C202 */ mul.s $f8, $f24, $f0 -/* 3BA76C E00BC73C 00000000 */ nop +/* 3BA76C E00BC73C 00000000 */ nop /* 3BA770 E00BC740 4614C602 */ mul.s $f24, $f24, $f20 -/* 3BA774 E00BC744 00000000 */ nop +/* 3BA774 E00BC744 00000000 */ nop /* 3BA778 E00BC748 46022100 */ add.s $f4, $f4, $f2 /* 3BA77C E00BC74C 46064201 */ sub.s $f8, $f8, $f6 /* 3BA780 E00BC750 46082100 */ add.s $f4, $f4, $f8 /* 3BA784 E00BC754 4600B582 */ mul.s $f22, $f22, $f0 -/* 3BA788 E00BC758 00000000 */ nop +/* 3BA788 E00BC758 00000000 */ nop /* 3BA78C E00BC75C E6240050 */ swc1 $f4, 0x50($s1) /* 3BA790 E00BC760 C6A20020 */ lwc1 $f2, 0x20($s5) /* 3BA794 E00BC764 C6A40014 */ lwc1 $f4, 0x14($s5) /* 3BA798 E00BC768 46041081 */ sub.s $f2, $f2, $f4 /* 3BA79C E00BC76C 460A1082 */ mul.s $f2, $f2, $f10 -/* 3BA7A0 E00BC770 00000000 */ nop +/* 3BA7A0 E00BC770 00000000 */ nop /* 3BA7A4 E00BC774 461E1082 */ mul.s $f2, $f2, $f30 -/* 3BA7A8 E00BC778 00000000 */ nop +/* 3BA7A8 E00BC778 00000000 */ nop /* 3BA7AC E00BC77C 4616C600 */ add.s $f24, $f24, $f22 /* 3BA7B0 E00BC780 46022100 */ add.s $f4, $f4, $f2 /* 3BA7B4 E00BC784 46182100 */ add.s $f4, $f4, $f24 @@ -274,23 +274,23 @@ glabel func_E00BC374 /* 3BA7C0 E00BC790 C6A20018 */ lwc1 $f2, 0x18($s5) /* 3BA7C4 E00BC794 46020001 */ sub.s $f0, $f0, $f2 /* 3BA7C8 E00BC798 460A0002 */ mul.s $f0, $f0, $f10 -/* 3BA7CC E00BC79C 00000000 */ nop +/* 3BA7CC E00BC79C 00000000 */ nop /* 3BA7D0 E00BC7A0 461E0002 */ mul.s $f0, $f0, $f30 -/* 3BA7D4 E00BC7A4 00000000 */ nop +/* 3BA7D4 E00BC7A4 00000000 */ nop /* 3BA7D8 E00BC7A8 46001080 */ add.s $f2, $f2, $f0 /* 3BA7DC E00BC7AC 44808000 */ mtc1 $zero, $f16 -/* 3BA7E0 E00BC7B0 00000000 */ nop +/* 3BA7E0 E00BC7B0 00000000 */ nop /* 3BA7E4 E00BC7B4 46101080 */ add.s $f2, $f2, $f16 /* 3BA7E8 E00BC7B8 E62200B0 */ swc1 $f2, 0xb0($s1) /* 3BA7EC E00BC7BC 9202000C */ lbu $v0, 0xc($s0) /* 3BA7F0 E00BC7C0 3C01E00C */ lui $at, %hi(D_E00BCE68) /* 3BA7F4 E00BC7C4 D422CE68 */ ldc1 $f2, %lo(D_E00BCE68)($at) /* 3BA7F8 E00BC7C8 44820000 */ mtc1 $v0, $f0 -/* 3BA7FC E00BC7CC 00000000 */ nop +/* 3BA7FC E00BC7CC 00000000 */ nop /* 3BA800 E00BC7D0 46800020 */ cvt.s.w $f0, $f0 /* 3BA804 E00BC7D4 46000021 */ cvt.d.s $f0, $f0 /* 3BA808 E00BC7D8 46220002 */ mul.d $f0, $f0, $f2 -/* 3BA80C E00BC7DC 00000000 */ nop +/* 3BA80C E00BC7DC 00000000 */ nop /* 3BA810 E00BC7E0 26730001 */ addiu $s3, $s3, 1 /* 3BA814 E00BC7E4 2A62000C */ slti $v0, $s3, 0xc /* 3BA818 E00BC7E8 46200020 */ cvt.s.d $f0, $f0 @@ -343,7 +343,7 @@ glabel func_E00BC374 /* 3BA8CC E00BC89C 3C01C2B4 */ lui $at, 0xc2b4 /* 3BA8D0 E00BC8A0 4481B000 */ mtc1 $at, $f22 /* 3BA8D4 E00BC8A4 0802F25B */ j .LE00BC96C -/* 3BA8D8 E00BC8A8 00000000 */ nop +/* 3BA8D8 E00BC8A8 00000000 */ nop .LE00BC8AC: /* 3BA8DC E00BC8AC 00021080 */ sll $v0, $v0, 2 /* 3BA8E0 E00BC8B0 02A21021 */ addu $v0, $s5, $v0 @@ -371,19 +371,19 @@ glabel func_E00BC374 /* 3BA938 E00BC908 46141101 */ sub.s $f4, $f2, $f20 /* 3BA93C E00BC90C 3C014334 */ lui $at, 0x4334 /* 3BA940 E00BC910 44810000 */ mtc1 $at, $f0 -/* 3BA944 E00BC914 00000000 */ nop +/* 3BA944 E00BC914 00000000 */ nop /* 3BA948 E00BC918 4604003C */ c.lt.s $f0, $f4 -/* 3BA94C E00BC91C 00000000 */ nop +/* 3BA94C E00BC91C 00000000 */ nop /* 3BA950 E00BC920 45000003 */ bc1f .LE00BC930 -/* 3BA954 E00BC924 00000000 */ nop +/* 3BA954 E00BC924 00000000 */ nop /* 3BA958 E00BC928 0802F253 */ j .LE00BC94C /* 3BA95C E00BC92C 461EA500 */ add.s $f20, $f20, $f30 .LE00BC930: /* 3BA960 E00BC930 3C01C334 */ lui $at, 0xc334 /* 3BA964 E00BC934 44810000 */ mtc1 $at, $f0 -/* 3BA968 E00BC938 00000000 */ nop +/* 3BA968 E00BC938 00000000 */ nop /* 3BA96C E00BC93C 4600203C */ c.lt.s $f4, $f0 -/* 3BA970 E00BC940 00000000 */ nop +/* 3BA970 E00BC940 00000000 */ nop /* 3BA974 E00BC944 45030001 */ bc1tl .LE00BC94C /* 3BA978 E00BC948 461E1080 */ add.s $f2, $f2, $f30 .LE00BC94C: @@ -393,77 +393,77 @@ glabel func_E00BC374 /* 3BA988 E00BC958 44800000 */ mtc1 $zero, $f0 /* 3BA98C E00BC95C 4600B0A1 */ cvt.d.s $f2, $f22 /* 3BA990 E00BC960 46201082 */ mul.d $f2, $f2, $f0 -/* 3BA994 E00BC964 00000000 */ nop +/* 3BA994 E00BC964 00000000 */ nop /* 3BA998 E00BC968 462015A0 */ cvt.s.d $f22, $f2 .LE00BC96C: /* 3BA99C E00BC96C C64000E0 */ lwc1 $f0, 0xe0($s2) /* 3BA9A0 E00BC970 C7B00094 */ lwc1 $f16, 0x94($sp) /* 3BA9A4 E00BC974 46008002 */ mul.s $f0, $f16, $f0 -/* 3BA9A8 E00BC978 00000000 */ nop +/* 3BA9A8 E00BC978 00000000 */ nop /* 3BA9AC E00BC97C 4600B306 */ mov.s $f12, $f22 /* 3BA9B0 E00BC980 8FAE0098 */ lw $t6, 0x98($sp) /* 3BA9B4 E00BC984 4600C602 */ mul.s $f24, $f24, $f0 -/* 3BA9B8 E00BC988 00000000 */ nop +/* 3BA9B8 E00BC988 00000000 */ nop /* 3BA9BC E00BC98C 24100080 */ addiu $s0, $zero, 0x80 /* 3BA9C0 E00BC990 020E8023 */ subu $s0, $s0, $t6 /* 3BA9C4 E00BC994 0C080140 */ jal func_E0200500 /* 3BA9C8 E00BC998 00108140 */ sll $s0, $s0, 5 /* 3BA9CC E00BC99C 4600C502 */ mul.s $f20, $f24, $f0 -/* 3BA9D0 E00BC9A0 00000000 */ nop +/* 3BA9D0 E00BC9A0 00000000 */ nop /* 3BA9D4 E00BC9A4 0C080144 */ jal func_E0200510 /* 3BA9D8 E00BC9A8 4600B306 */ mov.s $f12, $f22 /* 3BA9DC E00BC9AC C6420050 */ lwc1 $f2, 0x50($s2) /* 3BA9E0 E00BC9B0 46141080 */ add.s $f2, $f2, $f20 /* 3BA9E4 E00BC9B4 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BA9E8 E00BC9B8 00000000 */ nop +/* 3BA9E8 E00BC9B8 00000000 */ nop /* 3BA9EC E00BC9BC 4600C002 */ mul.s $f0, $f24, $f0 -/* 3BA9F0 E00BC9C0 00000000 */ nop +/* 3BA9F0 E00BC9C0 00000000 */ nop /* 3BA9F4 E00BC9C4 4600140D */ trunc.w.s $f16, $f2 /* 3BA9F8 E00BC9C8 44028000 */ mfc1 $v0, $f16 -/* 3BA9FC E00BC9CC 00000000 */ nop +/* 3BA9FC E00BC9CC 00000000 */ nop /* 3BAA00 E00BC9D0 A6820000 */ sh $v0, ($s4) /* 3BAA04 E00BC9D4 C6420080 */ lwc1 $f2, 0x80($s2) /* 3BAA08 E00BC9D8 46001080 */ add.s $f2, $f2, $f0 /* 3BAA0C E00BC9DC 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BAA10 E00BC9E0 00000000 */ nop +/* 3BAA10 E00BC9E0 00000000 */ nop /* 3BAA14 E00BC9E4 4600140D */ trunc.w.s $f16, $f2 /* 3BAA18 E00BC9E8 44028000 */ mfc1 $v0, $f16 -/* 3BAA1C E00BC9EC 00000000 */ nop +/* 3BAA1C E00BC9EC 00000000 */ nop /* 3BAA20 E00BC9F0 A622FFF4 */ sh $v0, -0xc($s1) /* 3BAA24 E00BC9F4 C64200B0 */ lwc1 $f2, 0xb0($s2) /* 3BAA28 E00BC9F8 461C1080 */ add.s $f2, $f2, $f28 /* 3BAA2C E00BC9FC A630FFFA */ sh $s0, -6($s1) /* 3BAA30 E00BCA00 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BAA34 E00BCA04 00000000 */ nop +/* 3BAA34 E00BCA04 00000000 */ nop /* 3BAA38 E00BCA08 A620FFFC */ sh $zero, -4($s1) /* 3BAA3C E00BCA0C A236FFFE */ sb $s6, -2($s1) /* 3BAA40 E00BCA10 A237FFFF */ sb $s7, -1($s1) /* 3BAA44 E00BCA14 A23E0000 */ sb $fp, ($s1) /* 3BAA48 E00BCA18 4600140D */ trunc.w.s $f16, $f2 /* 3BAA4C E00BCA1C 44028000 */ mfc1 $v0, $f16 -/* 3BAA50 E00BCA20 00000000 */ nop +/* 3BAA50 E00BCA20 00000000 */ nop /* 3BAA54 E00BCA24 A622FFF6 */ sh $v0, -0xa($s1) /* 3BAA58 E00BCA28 C6420050 */ lwc1 $f2, 0x50($s2) /* 3BAA5C E00BCA2C 46141081 */ sub.s $f2, $f2, $f20 /* 3BAA60 E00BCA30 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BAA64 E00BCA34 00000000 */ nop +/* 3BAA64 E00BCA34 00000000 */ nop /* 3BAA68 E00BCA38 26940010 */ addiu $s4, $s4, 0x10 /* 3BAA6C E00BCA3C 4600140D */ trunc.w.s $f16, $f2 /* 3BAA70 E00BCA40 44028000 */ mfc1 $v0, $f16 -/* 3BAA74 E00BCA44 00000000 */ nop +/* 3BAA74 E00BCA44 00000000 */ nop /* 3BAA78 E00BCA48 A6820000 */ sh $v0, ($s4) /* 3BAA7C E00BCA4C C6420080 */ lwc1 $f2, 0x80($s2) /* 3BAA80 E00BCA50 46001081 */ sub.s $f2, $f2, $f0 /* 3BAA84 E00BCA54 26730001 */ addiu $s3, $s3, 1 /* 3BAA88 E00BCA58 461A1082 */ mul.s $f2, $f2, $f26 -/* 3BAA8C E00BCA5C 00000000 */ nop +/* 3BAA8C E00BCA5C 00000000 */ nop /* 3BAA90 E00BCA60 8FAE0098 */ lw $t6, 0x98($sp) /* 3BAA94 E00BCA64 26310010 */ addiu $s1, $s1, 0x10 /* 3BAA98 E00BCA68 25CE000C */ addiu $t6, $t6, 0xc /* 3BAA9C E00BCA6C AFAE0098 */ sw $t6, 0x98($sp) /* 3BAAA0 E00BCA70 4600140D */ trunc.w.s $f16, $f2 /* 3BAAA4 E00BCA74 44028000 */ mfc1 $v0, $f16 -/* 3BAAA8 E00BCA78 00000000 */ nop +/* 3BAAA8 E00BCA78 00000000 */ nop /* 3BAAAC E00BCA7C A622FFF4 */ sh $v0, -0xc($s1) /* 3BAAB0 E00BCA80 C64000B0 */ lwc1 $f0, 0xb0($s2) /* 3BAAB4 E00BCA84 26940010 */ addiu $s4, $s4, 0x10 @@ -475,14 +475,14 @@ glabel func_E00BC374 /* 3BAACC E00BCA9C A236FFFE */ sb $s6, -2($s1) /* 3BAAD0 E00BCAA0 26D60032 */ addiu $s6, $s6, 0x32 /* 3BAAD4 E00BCAA4 461A0002 */ mul.s $f0, $f0, $f26 -/* 3BAAD8 E00BCAA8 00000000 */ nop +/* 3BAAD8 E00BCAA8 00000000 */ nop /* 3BAADC E00BCAAC 26520004 */ addiu $s2, $s2, 4 /* 3BAAE0 E00BCAB0 24020400 */ addiu $v0, $zero, 0x400 /* 3BAAE4 E00BCAB4 A630FFFA */ sh $s0, -6($s1) /* 3BAAE8 E00BCAB8 A622FFFC */ sh $v0, -4($s1) /* 3BAAEC E00BCABC 4600040D */ trunc.w.s $f16, $f0 /* 3BAAF0 E00BCAC0 44028000 */ mfc1 $v0, $f16 -/* 3BAAF4 E00BCAC4 00000000 */ nop +/* 3BAAF4 E00BCAC4 00000000 */ nop /* 3BAAF8 E00BCAC8 A622FFF6 */ sh $v0, -0xa($s1) /* 3BAAFC E00BCACC 2A62000C */ slti $v0, $s3, 0xc /* 3BAB00 E00BCAD0 1440FF60 */ bnez $v0, .LE00BC854 @@ -574,4 +574,4 @@ glabel func_E00BC374 /* 3BAC50 E00BCC20 D7B400C8 */ ldc1 $f20, 0xc8($sp) /* 3BAC54 E00BCC24 03E00008 */ jr $ra /* 3BAC58 E00BCC28 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* 3BAC5C E00BCC2C 00000000 */ nop +/* 3BAC5C E00BCC2C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D0500/func_E00CA000.s b/asm/nonmatchings/code_3D0500/func_E00CA000.s index d611ac25c2..512c3b97a9 100644 --- a/asm/nonmatchings/code_3D0500/func_E00CA000.s +++ b/asm/nonmatchings/code_3D0500/func_E00CA000.s @@ -41,7 +41,7 @@ glabel func_E00CA000 /* 3D0590 E00CA090 AE42000C */ sw $v0, 0xc($s2) .LE00CA094: /* 3D0594 E00CA094 08032825 */ j .LE00CA094 -/* 3D0598 E00CA098 00000000 */ nop +/* 3D0598 E00CA098 00000000 */ nop .LE00CA09C: /* 3D059C E00CA09C AE110000 */ sw $s1, ($s0) /* 3D05A0 E00CA0A0 1E600004 */ bgtz $s3, .LE00CA0B4 @@ -145,7 +145,7 @@ glabel func_E00CA000 /* 3D06F8 E00CA1F8 2443000A */ addiu $v1, $v0, 0xa /* 3D06FC E00CA1FC 0240102D */ daddu $v0, $s2, $zero /* 3D0700 E00CA200 44830000 */ mtc1 $v1, $f0 -/* 3D0704 E00CA204 00000000 */ nop +/* 3D0704 E00CA204 00000000 */ nop /* 3D0708 E00CA208 46800020 */ cvt.s.w $f0, $f0 /* 3D070C E00CA20C E6000044 */ swc1 $f0, 0x44($s0) /* 3D0710 E00CA210 AE000048 */ sw $zero, 0x48($s0) diff --git a/asm/nonmatchings/code_3D0500/func_E00CA240.s b/asm/nonmatchings/code_3D0500/func_E00CA240.s index c07c93f51d..e78be47f02 100644 --- a/asm/nonmatchings/code_3D0500/func_E00CA240.s +++ b/asm/nonmatchings/code_3D0500/func_E00CA240.s @@ -3,4 +3,4 @@ glabel func_E00CA240 /* 3D0740 E00CA240 03E00008 */ jr $ra -/* 3D0744 E00CA244 00000000 */ nop +/* 3D0744 E00CA244 00000000 */ nop diff --git a/asm/nonmatchings/code_3D0500/func_E00CA248.s b/asm/nonmatchings/code_3D0500/func_E00CA248.s index 490837f70e..b81c5735e6 100644 --- a/asm/nonmatchings/code_3D0500/func_E00CA248.s +++ b/asm/nonmatchings/code_3D0500/func_E00CA248.s @@ -30,9 +30,9 @@ glabel func_E00CA248 /* 3D07A4 E00CA2A4 04610005 */ bgez $v1, .LE00CA2BC /* 3D07A8 E00CA2A8 AE020014 */ sw $v0, 0x14($s0) /* 3D07AC E00CA2AC 0C080128 */ jal func_E02004A0 -/* 3D07B0 E00CA2B0 00000000 */ nop +/* 3D07B0 E00CA2B0 00000000 */ nop /* 3D07B4 E00CA2B4 0803291B */ j .LE00CA46C -/* 3D07B8 E00CA2B8 00000000 */ nop +/* 3D07B8 E00CA2B8 00000000 */ nop .LE00CA2BC: /* 3D07BC E00CA2BC 0040882D */ daddu $s1, $v0, $zero /* 3D07C0 E00CA2C0 28620010 */ slti $v0, $v1, 0x10 @@ -48,7 +48,7 @@ glabel func_E00CA248 /* 3D07E4 E00CA2E4 2442FFFB */ addiu $v0, $v0, %lo(D_8887FFFB) /* 3D07E8 E00CA2E8 C6000044 */ lwc1 $f0, 0x44($s0) /* 3D07EC E00CA2EC 44821000 */ mtc1 $v0, $f2 -/* 3D07F0 E00CA2F0 00000000 */ nop +/* 3D07F0 E00CA2F0 00000000 */ nop /* 3D07F4 E00CA2F4 468010A0 */ cvt.s.w $f2, $f2 /* 3D07F8 E00CA2F8 46020000 */ add.s $f0, $f0, $f2 /* 3D07FC E00CA2FC 2404000A */ addiu $a0, $zero, 0xa @@ -56,7 +56,7 @@ glabel func_E00CA248 /* 3D0804 E00CA304 E6000044 */ swc1 $f0, 0x44($s0) /* 3D0808 E00CA308 2442FFFB */ addiu $v0, $v0, -5 /* 3D080C E00CA30C 44820000 */ mtc1 $v0, $f0 -/* 3D0810 E00CA310 00000000 */ nop +/* 3D0810 E00CA310 00000000 */ nop /* 3D0814 E00CA314 46800020 */ cvt.s.w $f0, $f0 /* 3D0818 E00CA318 C6020048 */ lwc1 $f2, 0x48($s0) /* 3D081C E00CA31C C6060038 */ lwc1 $f6, 0x38($s0) @@ -96,17 +96,17 @@ glabel func_E00CA248 /* 3D08A0 E00CA3A0 C44000C8 */ lwc1 $f0, 0xc8($v0) /* 3D08A4 E00CA3A4 C44C0140 */ lwc1 $f12, 0x140($v0) /* 3D08A8 E00CA3A8 46024032 */ c.eq.s $f8, $f2 -/* 3D08AC E00CA3AC 00000000 */ nop +/* 3D08AC E00CA3AC 00000000 */ nop /* 3D08B0 E00CA3B0 45000009 */ bc1f .LE00CA3D8 /* 3D08B4 E00CA3B4 00031880 */ sll $v1, $v1, 2 /* 3D08B8 E00CA3B8 46003032 */ c.eq.s $f6, $f0 -/* 3D08BC E00CA3BC 00000000 */ nop +/* 3D08BC E00CA3BC 00000000 */ nop /* 3D08C0 E00CA3C0 45000005 */ bc1f .LE00CA3D8 -/* 3D08C4 E00CA3C4 00000000 */ nop +/* 3D08C4 E00CA3C4 00000000 */ nop /* 3D08C8 E00CA3C8 460C5032 */ c.eq.s $f10, $f12 -/* 3D08CC E00CA3CC 00000000 */ nop +/* 3D08CC E00CA3CC 00000000 */ nop /* 3D08D0 E00CA3D0 45010026 */ bc1t .LE00CA46C -/* 3D08D4 E00CA3D4 00000000 */ nop +/* 3D08D4 E00CA3D4 00000000 */ nop .LE00CA3D8: /* 3D08D8 E00CA3D8 02031821 */ addu $v1, $s0, $v1 /* 3D08DC E00CA3DC 8E0202A8 */ lw $v0, 0x2a8($s0) @@ -119,15 +119,15 @@ glabel func_E00CA248 .LE00CA3F8: /* 3D08F8 E00CA3F8 46024101 */ sub.s $f4, $f8, $f2 /* 3D08FC E00CA3FC 46042102 */ mul.s $f4, $f4, $f4 -/* 3D0900 E00CA400 00000000 */ nop +/* 3D0900 E00CA400 00000000 */ nop /* 3D0904 E00CA404 46003001 */ sub.s $f0, $f6, $f0 /* 3D0908 E00CA408 46000002 */ mul.s $f0, $f0, $f0 -/* 3D090C E00CA40C 00000000 */ nop +/* 3D090C E00CA40C 00000000 */ nop /* 3D0910 E00CA410 8E0302A8 */ lw $v1, 0x2a8($s0) /* 3D0914 E00CA414 460C5081 */ sub.s $f2, $f10, $f12 /* 3D0918 E00CA418 00031080 */ sll $v0, $v1, 2 /* 3D091C E00CA41C 46021082 */ mul.s $f2, $f2, $f2 -/* 3D0920 E00CA420 00000000 */ nop +/* 3D0920 E00CA420 00000000 */ nop /* 3D0924 E00CA424 02028021 */ addu $s0, $s0, $v0 /* 3D0928 E00CA428 24020001 */ addiu $v0, $zero, 1 /* 3D092C E00CA42C AE020230 */ sw $v0, 0x230($s0) @@ -138,11 +138,11 @@ glabel func_E00CA248 /* 3D0940 E00CA440 46022300 */ add.s $f12, $f4, $f2 /* 3D0944 E00CA444 E60A0140 */ swc1 $f10, 0x140($s0) /* 3D0948 E00CA448 46006032 */ c.eq.s $f12, $f0 -/* 3D094C E00CA44C 00000000 */ nop +/* 3D094C E00CA44C 00000000 */ nop /* 3D0950 E00CA450 45010004 */ bc1t .LE00CA464 /* 3D0954 E00CA454 AE1101B8 */ sw $s1, 0x1b8($s0) /* 3D0958 E00CA458 0C080154 */ jal func_E0200550 -/* 3D095C E00CA45C 00000000 */ nop +/* 3D095C E00CA45C 00000000 */ nop /* 3D0960 E00CA460 46000306 */ mov.s $f12, $f0 .LE00CA464: /* 3D0964 E00CA464 460CA000 */ add.s $f0, $f20, $f12 diff --git a/asm/nonmatchings/code_3D0500/func_E00CA4CC.s b/asm/nonmatchings/code_3D0500/func_E00CA4CC.s index abcc568a51..21826cb24b 100644 --- a/asm/nonmatchings/code_3D0500/func_E00CA4CC.s +++ b/asm/nonmatchings/code_3D0500/func_E00CA4CC.s @@ -188,7 +188,7 @@ glabel func_E00CA4CC /* 3D0C94 E00CA794 17C10004 */ bne $fp, $at, .LE00CA7A8 /* 3D0C98 E00CA798 3C018000 */ lui $at, 0x8000 /* 3D0C9C E00CA79C 15610002 */ bne $t3, $at, .LE00CA7A8 -/* 3D0CA0 E00CA7A0 00000000 */ nop +/* 3D0CA0 E00CA7A0 00000000 */ nop /* 3D0CA4 E00CA7A4 0006000D */ break 6 .LE00CA7A8: /* 3D0CA8 E00CA7A8 00002812 */ mflo $a1 @@ -210,18 +210,18 @@ glabel func_E00CA4CC /* 3D0CE8 E00CA7E8 00531023 */ subu $v0, $v0, $s3 /* 3D0CEC E00CA7EC 00021040 */ sll $v0, $v0, 1 /* 3D0CF0 E00CA7F0 44856000 */ mtc1 $a1, $f12 -/* 3D0CF4 E00CA7F4 00000000 */ nop +/* 3D0CF4 E00CA7F4 00000000 */ nop /* 3D0CF8 E00CA7F8 46806320 */ cvt.s.w $f12, $f12 /* 3D0CFC E00CA7FC 0C080140 */ jal func_E0200500 /* 3D0D00 E00CA800 00829823 */ subu $s3, $a0, $v0 /* 3D0D04 E00CA804 3C01437F */ lui $at, 0x437f /* 3D0D08 E00CA808 44811000 */ mtc1 $at, $f2 -/* 3D0D0C E00CA80C 00000000 */ nop +/* 3D0D0C E00CA80C 00000000 */ nop /* 3D0D10 E00CA810 46020002 */ mul.s $f0, $f0, $f2 -/* 3D0D14 E00CA814 00000000 */ nop +/* 3D0D14 E00CA814 00000000 */ nop /* 3D0D18 E00CA818 4600018D */ trunc.w.s $f6, $f0 /* 3D0D1C E00CA81C 44173000 */ mfc1 $s7, $f6 -/* 3D0D20 E00CA820 00000000 */ nop +/* 3D0D20 E00CA820 00000000 */ nop /* 3D0D24 E00CA824 2AE200C9 */ slti $v0, $s7, 0xc9 /* 3D0D28 E00CA828 50400001 */ beql $v0, $zero, .LE00CA830 /* 3D0D2C E00CA82C 241700C8 */ addiu $s7, $zero, 0xc8 @@ -289,11 +289,11 @@ glabel func_E00CA4CC /* 3D0E10 E00CA910 46146081 */ sub.s $f2, $f12, $f20 /* 3D0E14 E00CA914 3C014334 */ lui $at, 0x4334 /* 3D0E18 E00CA918 44810000 */ mtc1 $at, $f0 -/* 3D0E1C E00CA91C 00000000 */ nop +/* 3D0E1C E00CA91C 00000000 */ nop /* 3D0E20 E00CA920 4602003C */ c.lt.s $f0, $f2 -/* 3D0E24 E00CA924 00000000 */ nop +/* 3D0E24 E00CA924 00000000 */ nop /* 3D0E28 E00CA928 45000005 */ bc1f .LE00CA940 -/* 3D0E2C E00CA92C 00000000 */ nop +/* 3D0E2C E00CA92C 00000000 */ nop /* 3D0E30 E00CA930 3C0143B4 */ lui $at, 0x43b4 /* 3D0E34 E00CA934 44813000 */ mtc1 $at, $f6 /* 3D0E38 E00CA938 08032A5B */ j .LE00CA96C @@ -301,14 +301,14 @@ glabel func_E00CA4CC .LE00CA940: /* 3D0E40 E00CA940 3C01C334 */ lui $at, 0xc334 /* 3D0E44 E00CA944 44810000 */ mtc1 $at, $f0 -/* 3D0E48 E00CA948 00000000 */ nop +/* 3D0E48 E00CA948 00000000 */ nop /* 3D0E4C E00CA94C 4600103C */ c.lt.s $f2, $f0 -/* 3D0E50 E00CA950 00000000 */ nop +/* 3D0E50 E00CA950 00000000 */ nop /* 3D0E54 E00CA954 45020006 */ bc1fl .LE00CA970 /* 3D0E58 E00CA958 460CA780 */ add.s $f30, $f20, $f12 /* 3D0E5C E00CA95C 3C0143B4 */ lui $at, 0x43b4 /* 3D0E60 E00CA960 44813000 */ mtc1 $at, $f6 -/* 3D0E64 E00CA964 00000000 */ nop +/* 3D0E64 E00CA964 00000000 */ nop /* 3D0E68 E00CA968 46066300 */ add.s $f12, $f12, $f6 .LE00CA96C: /* 3D0E6C E00CA96C 460CA780 */ add.s $f30, $f20, $f12 @@ -318,7 +318,7 @@ glabel func_E00CA4CC /* 3D0E78 E00CA978 44801000 */ mtc1 $zero, $f2 /* 3D0E7C E00CA97C 4600F021 */ cvt.d.s $f0, $f30 /* 3D0E80 E00CA980 46220002 */ mul.d $f0, $f0, $f2 -/* 3D0E84 E00CA984 00000000 */ nop +/* 3D0E84 E00CA984 00000000 */ nop /* 3D0E88 E00CA988 462007A0 */ cvt.s.d $f30, $f0 .LE00CA98C: /* 3D0E8C E00CA98C 00131080 */ sll $v0, $s3, 2 @@ -334,33 +334,33 @@ glabel func_E00CA4CC /* 3D0EB4 E00CA9B4 01621023 */ subu $v0, $t3, $v0 /* 3D0EB8 E00CA9B8 00021080 */ sll $v0, $v0, 2 /* 3D0EBC E00CA9BC 44826000 */ mtc1 $v0, $f12 -/* 3D0EC0 E00CA9C0 00000000 */ nop +/* 3D0EC0 E00CA9C0 00000000 */ nop /* 3D0EC4 E00CA9C4 46806320 */ cvt.s.w $f12, $f12 /* 3D0EC8 E00CA9C8 0C080140 */ jal func_E0200500 /* 3D0ECC E00CA9CC 01638823 */ subu $s1, $t3, $v1 /* 3D0ED0 E00CA9D0 3C014040 */ lui $at, 0x4040 /* 3D0ED4 E00CA9D4 44811000 */ mtc1 $at, $f2 -/* 3D0ED8 E00CA9D8 00000000 */ nop +/* 3D0ED8 E00CA9D8 00000000 */ nop /* 3D0EDC E00CA9DC 46020002 */ mul.s $f0, $f0, $f2 -/* 3D0EE0 E00CA9E0 00000000 */ nop +/* 3D0EE0 E00CA9E0 00000000 */ nop /* 3D0EE4 E00CA9E4 3C014180 */ lui $at, 0x4180 /* 3D0EE8 E00CA9E8 44811000 */ mtc1 $at, $f2 -/* 3D0EEC E00CA9EC 00000000 */ nop +/* 3D0EEC E00CA9EC 00000000 */ nop /* 3D0EF0 E00CA9F0 46020000 */ add.s $f0, $f0, $f2 /* 3D0EF4 E00CA9F4 44911000 */ mtc1 $s1, $f2 -/* 3D0EF8 E00CA9F8 00000000 */ nop +/* 3D0EF8 E00CA9F8 00000000 */ nop /* 3D0EFC E00CA9FC 468010A0 */ cvt.s.w $f2, $f2 /* 3D0F00 E00CAA00 46020580 */ add.s $f22, $f0, $f2 /* 3D0F04 E00CAA04 C7A60058 */ lwc1 $f6, 0x58($sp) /* 3D0F08 E00CAA08 8FAB0054 */ lw $t3, 0x54($sp) /* 3D0F0C E00CAA0C 4606B582 */ mul.s $f22, $f22, $f6 -/* 3D0F10 E00CAA10 00000000 */ nop +/* 3D0F10 E00CAA10 00000000 */ nop /* 3D0F14 E00CAA14 C60002AC */ lwc1 $f0, 0x2ac($s0) /* 3D0F18 E00CAA18 3C0141C0 */ lui $at, 0x41c0 /* 3D0F1C E00CAA1C 44813000 */ mtc1 $at, $f6 -/* 3D0F20 E00CAA20 00000000 */ nop +/* 3D0F20 E00CAA20 00000000 */ nop /* 3D0F24 E00CAA24 46060002 */ mul.s $f0, $f0, $f6 -/* 3D0F28 E00CAA28 00000000 */ nop +/* 3D0F28 E00CAA28 00000000 */ nop /* 3D0F2C E00CAA2C C7A20064 */ lwc1 $f2, 0x64($sp) /* 3D0F30 E00CAA30 468010A0 */ cvt.s.w $f2, $f2 /* 3D0F34 E00CAA34 46020000 */ add.s $f0, $f0, $f2 @@ -375,37 +375,37 @@ glabel func_E00CA4CC /* 3D0F58 E00CAA58 00021080 */ sll $v0, $v0, 2 /* 3D0F5C E00CAA5C 02028823 */ subu $s1, $s0, $v0 /* 3D0F60 E00CAA60 06210022 */ bgez $s1, .LE00CAAEC -/* 3D0F64 E00CAA64 00000000 */ nop +/* 3D0F64 E00CAA64 00000000 */ nop /* 3D0F68 E00CAA68 44910000 */ mtc1 $s1, $f0 -/* 3D0F6C E00CAA6C 00000000 */ nop +/* 3D0F6C E00CAA6C 00000000 */ nop /* 3D0F70 E00CAA70 46800020 */ cvt.s.w $f0, $f0 /* 3D0F74 E00CAA74 3C01E00D */ lui $at, %hi(D_E00CACC0) /* 3D0F78 E00CAA78 D422ACC0 */ ldc1 $f2, %lo(D_E00CACC0)($at) /* 3D0F7C E00CAA7C 46000021 */ cvt.d.s $f0, $f0 /* 3D0F80 E00CAA80 46220002 */ mul.d $f0, $f0, $f2 -/* 3D0F84 E00CAA84 00000000 */ nop +/* 3D0F84 E00CAA84 00000000 */ nop /* 3D0F88 E00CAA88 3C01E00D */ lui $at, %hi(D_E00CACC8) /* 3D0F8C E00CAA8C D426ACC8 */ ldc1 $f6, %lo(D_E00CACC8)($at) /* 3D0F90 E00CAA90 46260000 */ add.d $f0, $f0, $f6 /* 3D0F94 E00CAA94 4620018D */ trunc.w.d $f6, $f0 /* 3D0F98 E00CAA98 44103000 */ mfc1 $s0, $f6 -/* 3D0F9C E00CAA9C 00000000 */ nop +/* 3D0F9C E00CAA9C 00000000 */ nop /* 3D0FA0 E00CAAA0 06010012 */ bgez $s0, .LE00CAAEC /* 3D0FA4 E00CAAA4 0000882D */ daddu $s1, $zero, $zero /* 3D0FA8 E00CAAA8 44900000 */ mtc1 $s0, $f0 -/* 3D0FAC E00CAAAC 00000000 */ nop +/* 3D0FAC E00CAAAC 00000000 */ nop /* 3D0FB0 E00CAAB0 46800020 */ cvt.s.w $f0, $f0 /* 3D0FB4 E00CAAB4 3C01E00D */ lui $at, %hi(D_E00CACD0) /* 3D0FB8 E00CAAB8 D422ACD0 */ ldc1 $f2, %lo(D_E00CACD0)($at) /* 3D0FBC E00CAABC 46000021 */ cvt.d.s $f0, $f0 /* 3D0FC0 E00CAAC0 46220002 */ mul.d $f0, $f0, $f2 -/* 3D0FC4 E00CAAC4 00000000 */ nop +/* 3D0FC4 E00CAAC4 00000000 */ nop /* 3D0FC8 E00CAAC8 3C01E00D */ lui $at, %hi(D_E00CACD8) /* 3D0FCC E00CAACC D426ACD8 */ ldc1 $f6, %lo(D_E00CACD8)($at) /* 3D0FD0 E00CAAD0 46260000 */ add.d $f0, $f0, $f6 /* 3D0FD4 E00CAAD4 4620018D */ trunc.w.d $f6, $f0 /* 3D0FD8 E00CAAD8 44133000 */ mfc1 $s3, $f6 -/* 3D0FDC E00CAADC 00000000 */ nop +/* 3D0FDC E00CAADC 00000000 */ nop /* 3D0FE0 E00CAAE0 06610002 */ bgez $s3, .LE00CAAEC /* 3D0FE4 E00CAAE4 0220802D */ daddu $s0, $s1, $zero /* 3D0FE8 E00CAAE8 0220982D */ daddu $s3, $s1, $zero @@ -413,11 +413,11 @@ glabel func_E00CA4CC /* 3D0FEC E00CAAEC 0C080140 */ jal func_E0200500 /* 3D0FF0 E00CAAF0 4600F306 */ mov.s $f12, $f30 /* 3D0FF4 E00CAAF4 4600B502 */ mul.s $f20, $f22, $f0 -/* 3D0FF8 E00CAAF8 00000000 */ nop +/* 3D0FF8 E00CAAF8 00000000 */ nop /* 3D0FFC E00CAAFC 0C080144 */ jal func_E0200510 /* 3D1000 E00CAB00 4600F306 */ mov.s $f12, $f30 /* 3D1004 E00CAB04 4600B002 */ mul.s $f0, $f22, $f0 -/* 3D1008 E00CAB08 00000000 */ nop +/* 3D1008 E00CAB08 00000000 */ nop /* 3D100C E00CAB0C 24020400 */ addiu $v0, $zero, 0x400 /* 3D1010 E00CAB10 8FAB0068 */ lw $t3, 0x68($sp) /* 3D1014 E00CAB14 44803000 */ mtc1 $zero, $f6 @@ -439,20 +439,20 @@ glabel func_E00CA4CC /* 3D1054 E00CAB54 4600D001 */ sub.s $f0, $f26, $f0 /* 3D1058 E00CAB58 4600218D */ trunc.w.s $f6, $f4 /* 3D105C E00CAB5C 44023000 */ mfc1 $v0, $f6 -/* 3D1060 E00CAB60 00000000 */ nop +/* 3D1060 E00CAB60 00000000 */ nop /* 3D1064 E00CAB64 A6420000 */ sh $v0, ($s2) /* 3D1068 E00CAB68 4600118D */ trunc.w.s $f6, $f2 /* 3D106C E00CAB6C 44023000 */ mfc1 $v0, $f6 -/* 3D1070 E00CAB70 00000000 */ nop +/* 3D1070 E00CAB70 00000000 */ nop /* 3D1074 E00CAB74 A6420002 */ sh $v0, 2($s2) /* 3D1078 E00CAB78 26520010 */ addiu $s2, $s2, 0x10 /* 3D107C E00CAB7C 4600A18D */ trunc.w.s $f6, $f20 /* 3D1080 E00CAB80 44023000 */ mfc1 $v0, $f6 -/* 3D1084 E00CAB84 00000000 */ nop +/* 3D1084 E00CAB84 00000000 */ nop /* 3D1088 E00CAB88 A6420000 */ sh $v0, ($s2) /* 3D108C E00CAB8C 4600018D */ trunc.w.s $f6, $f0 /* 3D1090 E00CAB90 44023000 */ mfc1 $v0, $f6 -/* 3D1094 E00CAB94 00000000 */ nop +/* 3D1094 E00CAB94 00000000 */ nop /* 3D1098 E00CAB98 A6420002 */ sh $v0, 2($s2) /* 3D109C E00CAB9C A6430004 */ sh $v1, 4($s2) /* 3D10A0 E00CABA0 A6550008 */ sh $s5, 8($s2) @@ -465,7 +465,7 @@ glabel func_E00CA4CC .LE00CABBC: /* 3D10BC E00CABBC 2A82001E */ slti $v0, $s4, 0x1e /* 3D10C0 E00CABC0 1440FEEF */ bnez $v0, .LE00CA780 -/* 3D10C4 E00CABC4 00000000 */ nop +/* 3D10C4 E00CABC4 00000000 */ nop /* 3D10C8 E00CABC8 8FB40060 */ lw $s4, 0x60($sp) /* 3D10CC E00CABCC 2A82001D */ slti $v0, $s4, 0x1d /* 3D10D0 E00CABD0 10400019 */ beqz $v0, .LE00CAC38 @@ -525,4 +525,4 @@ glabel func_E00CA4CC /* 3D11A0 E00CACA0 D7B40098 */ ldc1 $f20, 0x98($sp) /* 3D11A4 E00CACA4 03E00008 */ jr $ra /* 3D11A8 E00CACA8 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* 3D11AC E00CACAC 00000000 */ nop +/* 3D11AC E00CACAC 00000000 */ nop diff --git a/asm/nonmatchings/code_3D2AC0/func_E00CE000.s b/asm/nonmatchings/code_3D2AC0/func_E00CE000.s index bf8238b531..b9729374e9 100644 --- a/asm/nonmatchings/code_3D2AC0/func_E00CE000.s +++ b/asm/nonmatchings/code_3D2AC0/func_E00CE000.s @@ -44,7 +44,7 @@ glabel func_E00CE000 /* 3D2B5C E00CE09C AE62000C */ sw $v0, 0xc($s3) .LE00CE0A0: /* 3D2B60 E00CE0A0 08033828 */ j .LE00CE0A0 -/* 3D2B64 E00CE0A4 00000000 */ nop +/* 3D2B64 E00CE0A4 00000000 */ nop .LE00CE0A8: /* 3D2B68 E00CE0A8 AE320000 */ sw $s2, ($s1) /* 3D2B6C E00CE0AC 1E000004 */ bgtz $s0, .LE00CE0C0 @@ -84,10 +84,10 @@ glabel func_E00CE000 /* 3D2BEC E00CE12C E6200034 */ swc1 $f0, 0x34($s1) .LE00CE130: /* 3D2BF0 E00CE130 44920000 */ mtc1 $s2, $f0 -/* 3D2BF4 E00CE134 00000000 */ nop +/* 3D2BF4 E00CE134 00000000 */ nop /* 3D2BF8 E00CE138 46800021 */ cvt.d.w $f0, $f0 /* 3D2BFC E00CE13C 463A0002 */ mul.d $f0, $f0, $f26 -/* 3D2C00 E00CE140 00000000 */ nop +/* 3D2C00 E00CE140 00000000 */ nop /* 3D2C04 E00CE144 E61C0038 */ swc1 $f28, 0x38($s0) /* 3D2C08 E00CE148 E61E0058 */ swc1 $f30, 0x58($s0) /* 3D2C0C E00CE14C C7A2007C */ lwc1 $f2, 0x7c($sp) @@ -99,25 +99,25 @@ glabel func_E00CE000 /* 3D2C24 E00CE164 E6000098 */ swc1 $f0, 0x98($s0) /* 3D2C28 E00CE168 24040064 */ addiu $a0, $zero, 0x64 /* 3D2C2C E00CE16C 44820000 */ mtc1 $v0, $f0 -/* 3D2C30 E00CE170 00000000 */ nop +/* 3D2C30 E00CE170 00000000 */ nop /* 3D2C34 E00CE174 46800020 */ cvt.s.w $f0, $f0 /* 3D2C38 E00CE178 0C080138 */ jal func_E02004E0 /* 3D2C3C E00CE17C E60000B8 */ swc1 $f0, 0xb8($s0) /* 3D2C40 E00CE180 44820000 */ mtc1 $v0, $f0 -/* 3D2C44 E00CE184 00000000 */ nop +/* 3D2C44 E00CE184 00000000 */ nop /* 3D2C48 E00CE188 46800021 */ cvt.d.w $f0, $f0 /* 3D2C4C E00CE18C 46340002 */ mul.d $f0, $f0, $f20 -/* 3D2C50 E00CE190 00000000 */ nop +/* 3D2C50 E00CE190 00000000 */ nop /* 3D2C54 E00CE194 46360000 */ add.d $f0, $f0, $f22 /* 3D2C58 E00CE198 2404001E */ addiu $a0, $zero, 0x1e /* 3D2C5C E00CE19C 46200020 */ cvt.s.d $f0, $f0 /* 3D2C60 E00CE1A0 0C080138 */ jal func_E02004E0 /* 3D2C64 E00CE1A4 E60000D8 */ swc1 $f0, 0xd8($s0) /* 3D2C68 E00CE1A8 44820000 */ mtc1 $v0, $f0 -/* 3D2C6C E00CE1AC 00000000 */ nop +/* 3D2C6C E00CE1AC 00000000 */ nop /* 3D2C70 E00CE1B0 46800021 */ cvt.d.w $f0, $f0 /* 3D2C74 E00CE1B4 46340002 */ mul.d $f0, $f0, $f20 -/* 3D2C78 E00CE1B8 00000000 */ nop +/* 3D2C78 E00CE1B8 00000000 */ nop /* 3D2C7C E00CE1BC 26520001 */ addiu $s2, $s2, 1 /* 3D2C80 E00CE1C0 2A420008 */ slti $v0, $s2, 8 /* 3D2C84 E00CE1C4 AE000118 */ sw $zero, 0x118($s0) diff --git a/asm/nonmatchings/code_3D2AC0/func_E00CE21C.s b/asm/nonmatchings/code_3D2AC0/func_E00CE21C.s index ec495153d3..79ad8fff13 100644 --- a/asm/nonmatchings/code_3D2AC0/func_E00CE21C.s +++ b/asm/nonmatchings/code_3D2AC0/func_E00CE21C.s @@ -3,4 +3,4 @@ glabel func_E00CE21C /* 3D2CDC E00CE21C 03E00008 */ jr $ra -/* 3D2CE0 E00CE220 00000000 */ nop +/* 3D2CE0 E00CE220 00000000 */ nop diff --git a/asm/nonmatchings/code_3D2AC0/func_E00CE224.s b/asm/nonmatchings/code_3D2AC0/func_E00CE224.s index 3e8c6fc114..45be44ad11 100644 --- a/asm/nonmatchings/code_3D2AC0/func_E00CE224.s +++ b/asm/nonmatchings/code_3D2AC0/func_E00CE224.s @@ -26,9 +26,9 @@ glabel func_E00CE224 /* 3D2D30 E00CE270 04610005 */ bgez $v1, .LE00CE288 /* 3D2D34 E00CE274 ACA60014 */ sw $a2, 0x14($a1) /* 3D2D38 E00CE278 0C080128 */ jal func_E02004A0 -/* 3D2D3C E00CE27C 00000000 */ nop +/* 3D2D3C E00CE27C 00000000 */ nop /* 3D2D40 E00CE280 08033907 */ j .LE00CE41C -/* 3D2D44 E00CE284 00000000 */ nop +/* 3D2D44 E00CE284 00000000 */ nop .LE00CE288: /* 3D2D48 E00CE288 C4AC0034 */ lwc1 $f12, 0x34($a1) /* 3D2D4C E00CE28C 28620010 */ slti $v0, $v1, 0x10 @@ -57,7 +57,7 @@ glabel func_E00CE224 /* 3D2DA0 E00CE2E0 44810000 */ mtc1 $at, $f0 /* 3D2DA4 E00CE2E4 C4A2000C */ lwc1 $f2, 0xc($a1) /* 3D2DA8 E00CE2E8 46006302 */ mul.s $f12, $f12, $f0 -/* 3D2DAC E00CE2EC 00000000 */ nop +/* 3D2DAC E00CE2EC 00000000 */ nop /* 3D2DB0 E00CE2F0 E4A40038 */ swc1 $f4, 0x38($a1) /* 3D2DB4 E00CE2F4 E4A60058 */ swc1 $f6, 0x58($a1) /* 3D2DB8 E00CE2F8 E4A20078 */ swc1 $f2, 0x78($a1) @@ -67,7 +67,7 @@ glabel func_E00CE224 /* 3D2DC4 E00CE304 C4620038 */ lwc1 $f2, 0x38($v1) /* 3D2DC8 E00CE308 46020001 */ sub.s $f0, $f0, $f2 /* 3D2DCC E00CE30C 460E0002 */ mul.s $f0, $f0, $f14 -/* 3D2DD0 E00CE310 00000000 */ nop +/* 3D2DD0 E00CE310 00000000 */ nop /* 3D2DD4 E00CE314 E4600118 */ swc1 $f0, 0x118($v1) /* 3D2DD8 E00CE318 C4400038 */ lwc1 $f0, 0x38($v0) /* 3D2DDC E00CE31C E4600038 */ swc1 $f0, 0x38($v1) @@ -77,14 +77,14 @@ glabel func_E00CE224 /* 3D2DEC E00CE32C E4600058 */ swc1 $f0, 0x58($v1) /* 3D2DF0 E00CE330 C4400078 */ lwc1 $f0, 0x78($v0) /* 3D2DF4 E00CE334 4602503C */ c.lt.s $f10, $f2 -/* 3D2DF8 E00CE338 00000000 */ nop +/* 3D2DF8 E00CE338 00000000 */ nop /* 3D2DFC E00CE33C 45000003 */ bc1f .LE00CE34C /* 3D2E00 E00CE340 E4600078 */ swc1 $f0, 0x78($v1) /* 3D2E04 E00CE344 080338D7 */ j .LE00CE35C /* 3D2E08 E00CE348 E46A0118 */ swc1 $f10, 0x118($v1) .LE00CE34C: /* 3D2E0C E00CE34C 4608103C */ c.lt.s $f2, $f8 -/* 3D2E10 E00CE350 00000000 */ nop +/* 3D2E10 E00CE350 00000000 */ nop /* 3D2E14 E00CE354 45030001 */ bc1tl .LE00CE35C /* 3D2E18 E00CE358 E4680118 */ swc1 $f8, 0x118($v1) .LE00CE35C: @@ -95,7 +95,7 @@ glabel func_E00CE224 /* 3D2E2C E00CE36C C4A40138 */ lwc1 $f4, 0x138($a1) /* 3D2E30 E00CE370 3C014120 */ lui $at, 0x4120 /* 3D2E34 E00CE374 44810000 */ mtc1 $at, $f0 -/* 3D2E38 E00CE378 00000000 */ nop +/* 3D2E38 E00CE378 00000000 */ nop /* 3D2E3C E00CE37C 46002100 */ add.s $f4, $f4, $f0 /* 3D2E40 E00CE380 C4A0013C */ lwc1 $f0, 0x13c($a1) /* 3D2E44 E00CE384 3C01E00D */ lui $at, %hi(D_E00CEE60) @@ -113,7 +113,7 @@ glabel func_E00CE224 /* 3D2E74 E00CE3B4 46220000 */ add.d $f0, $f0, $f2 /* 3D2E78 E00CE3B8 3C014280 */ lui $at, 0x4280 /* 3D2E7C E00CE3BC 44811000 */ mtc1 $at, $f2 -/* 3D2E80 E00CE3C0 00000000 */ nop +/* 3D2E80 E00CE3C0 00000000 */ nop /* 3D2E84 E00CE3C4 4604103C */ c.lt.s $f2, $f4 /* 3D2E88 E00CE3C8 46200020 */ cvt.s.d $f0, $f0 /* 3D2E8C E00CE3CC 45000003 */ bc1f .LE00CE3DC @@ -123,7 +123,7 @@ glabel func_E00CE224 .LE00CE3DC: /* 3D2E9C E00CE3DC C4A00140 */ lwc1 $f0, 0x140($a1) /* 3D2EA0 E00CE3E0 4600103C */ c.lt.s $f2, $f0 -/* 3D2EA4 E00CE3E4 00000000 */ nop +/* 3D2EA4 E00CE3E4 00000000 */ nop /* 3D2EA8 E00CE3E8 45000003 */ bc1f .LE00CE3F8 /* 3D2EAC E00CE3EC 0000202D */ daddu $a0, $zero, $zero /* 3D2EB0 E00CE3F0 46020001 */ sub.s $f0, $f0, $f2 diff --git a/asm/nonmatchings/code_3D2AC0/func_E00CE470.s b/asm/nonmatchings/code_3D2AC0/func_E00CE470.s index db14521606..d3ad0b8525 100644 --- a/asm/nonmatchings/code_3D2AC0/func_E00CE470.s +++ b/asm/nonmatchings/code_3D2AC0/func_E00CE470.s @@ -3,4 +3,4 @@ glabel func_E00CE470 /* 3D2F30 E00CE470 03E00008 */ jr $ra -/* 3D2F34 E00CE474 00000000 */ nop +/* 3D2F34 E00CE474 00000000 */ nop diff --git a/asm/nonmatchings/code_3D2AC0/func_E00CE478.s b/asm/nonmatchings/code_3D2AC0/func_E00CE478.s index 7bdb101a3b..2c6c117e02 100644 --- a/asm/nonmatchings/code_3D2AC0/func_E00CE478.s +++ b/asm/nonmatchings/code_3D2AC0/func_E00CE478.s @@ -57,13 +57,13 @@ glabel func_E00CE478 /* 3D3008 E00CE548 3C088000 */ lui $t0, 0x8000 /* 3D300C E00CE54C AE220000 */ sw $v0, ($s1) /* 3D3010 E00CE550 46040002 */ mul.s $f0, $f0, $f4 -/* 3D3014 E00CE554 00000000 */ nop +/* 3D3014 E00CE554 00000000 */ nop /* 3D3018 E00CE558 AC6B0000 */ sw $t3, ($v1) /* 3D301C E00CE55C 8D420010 */ lw $v0, 0x10($t2) /* 3D3020 E00CE560 00094843 */ sra $t1, $t1, 1 /* 3D3024 E00CE564 8C42001C */ lw $v0, 0x1c($v0) /* 3D3028 E00CE568 46041082 */ mul.s $f2, $f2, $f4 -/* 3D302C E00CE56C 00000000 */ nop +/* 3D302C E00CE56C 00000000 */ nop /* 3D3030 E00CE570 00481021 */ addu $v0, $v0, $t0 /* 3D3034 E00CE574 AC620004 */ sw $v0, 4($v1) /* 3D3038 E00CE578 AFA900A4 */ sw $t1, 0xa4($sp) @@ -117,14 +117,14 @@ glabel func_E00CE478 /* 3D30F8 E00CE638 00141100 */ sll $v0, $s4, 4 .LE00CE63C: /* 3D30FC E00CE63C 4495A000 */ mtc1 $s5, $f20 -/* 3D3100 E00CE640 00000000 */ nop +/* 3D3100 E00CE640 00000000 */ nop /* 3D3104 E00CE644 4680A520 */ cvt.s.w $f20, $f20 /* 3D3108 E00CE648 8FAC00AC */ lw $t4, 0xac($sp) /* 3D310C E00CE64C 4600A306 */ mov.s $f12, $f20 /* 3D3110 E00CE650 0C080144 */ jal func_E0200510 /* 3D3114 E00CE654 01828021 */ addu $s0, $t4, $v0 /* 3D3118 E00CE658 46160002 */ mul.s $f0, $f0, $f22 -/* 3D311C E00CE65C 00000000 */ nop +/* 3D311C E00CE65C 00000000 */ nop /* 3D3120 E00CE660 4600A306 */ mov.s $f12, $f20 /* 3D3124 E00CE664 26B50018 */ addiu $s5, $s5, 0x18 /* 3D3128 E00CE668 A6000002 */ sh $zero, 2($s0) @@ -133,7 +133,7 @@ glabel func_E00CE478 /* 3D3134 E00CE674 0C080140 */ jal func_E0200500 /* 3D3138 E00CE678 A6020000 */ sh $v0, ($s0) /* 3D313C E00CE67C 46160002 */ mul.s $f0, $f0, $f22 -/* 3D3140 E00CE680 00000000 */ nop +/* 3D3140 E00CE680 00000000 */ nop /* 3D3144 E00CE684 4600A306 */ mov.s $f12, $f20 /* 3D3148 E00CE688 001411C0 */ sll $v0, $s4, 7 /* 3D314C E00CE68C A6020008 */ sh $v0, 8($s0) @@ -143,7 +143,7 @@ glabel func_E00CE478 /* 3D315C E00CE69C 0C080144 */ jal func_E0200510 /* 3D3160 E00CE6A0 A6020004 */ sh $v0, 4($s0) /* 3D3164 E00CE6A4 46160002 */ mul.s $f0, $f0, $f22 -/* 3D3168 E00CE6A8 00000000 */ nop +/* 3D3168 E00CE6A8 00000000 */ nop /* 3D316C E00CE6AC 8FAC00AC */ lw $t4, 0xac($sp) /* 3D3170 E00CE6B0 4600A306 */ mov.s $f12, $f20 /* 3D3174 E00CE6B4 01978021 */ addu $s0, $t4, $s7 @@ -154,14 +154,14 @@ glabel func_E00CE478 /* 3D3188 E00CE6C8 0C080140 */ jal func_E0200500 /* 3D318C E00CE6CC A6020000 */ sh $v0, ($s0) /* 3D3190 E00CE6D0 46160002 */ mul.s $f0, $f0, $f22 -/* 3D3194 E00CE6D4 00000000 */ nop +/* 3D3194 E00CE6D4 00000000 */ nop /* 3D3198 E00CE6D8 00141240 */ sll $v0, $s4, 9 /* 3D319C E00CE6DC 26940001 */ addiu $s4, $s4, 1 /* 3D31A0 E00CE6E0 A6020008 */ sh $v0, 8($s0) /* 3D31A4 E00CE6E4 A61E000A */ sh $fp, 0xa($s0) /* 3D31A8 E00CE6E8 4600018D */ trunc.w.s $f6, $f0 /* 3D31AC E00CE6EC 44023000 */ mfc1 $v0, $f6 -/* 3D31B0 E00CE6F0 00000000 */ nop +/* 3D31B0 E00CE6F0 00000000 */ nop /* 3D31B4 E00CE6F4 A6020004 */ sh $v0, 4($s0) /* 3D31B8 E00CE6F8 2A820010 */ slti $v0, $s4, 0x10 /* 3D31BC E00CE6FC 1440FFCF */ bnez $v0, .LE00CE63C @@ -279,15 +279,15 @@ glabel func_E00CE478 /* 3D3374 E00CE8B4 E7A60010 */ swc1 $f6, 0x10($sp) /* 3D3378 E00CE8B8 C6400038 */ lwc1 $f0, 0x38($s2) /* 3D337C E00CE8BC 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D3380 E00CE8C0 00000000 */ nop +/* 3D3380 E00CE8C0 00000000 */ nop /* 3D3384 E00CE8C4 E7A00014 */ swc1 $f0, 0x14($sp) /* 3D3388 E00CE8C8 C6400058 */ lwc1 $f0, 0x58($s2) /* 3D338C E00CE8CC 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D3390 E00CE8D0 00000000 */ nop +/* 3D3390 E00CE8D0 00000000 */ nop /* 3D3394 E00CE8D4 E7A00018 */ swc1 $f0, 0x18($sp) /* 3D3398 E00CE8D8 C6400078 */ lwc1 $f0, 0x78($s2) /* 3D339C E00CE8DC 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D33A0 E00CE8E0 00000000 */ nop +/* 3D33A0 E00CE8E0 00000000 */ nop /* 3D33A4 E00CE8E4 4405F000 */ mfc1 $a1, $f30 /* 3D33A8 E00CE8E8 4406F000 */ mfc1 $a2, $f30 /* 3D33AC E00CE8EC E7A0001C */ swc1 $f0, 0x1c($sp) @@ -298,7 +298,7 @@ glabel func_E00CE478 /* 3D33C0 E00CE900 00006012 */ mflo $t4 /* 3D33C4 E00CE904 C6C00138 */ lwc1 $f0, 0x138($s6) /* 3D33C8 E00CE908 448CE000 */ mtc1 $t4, $f28 -/* 3D33CC E00CE90C 00000000 */ nop +/* 3D33CC E00CE90C 00000000 */ nop /* 3D33D0 E00CE910 4680E720 */ cvt.s.w $f28, $f28 /* 3D33D4 E00CE914 461C0000 */ add.s $f0, $f0, $f28 /* 3D33D8 E00CE918 3C06BCF5 */ lui $a2, 0xbcf5 @@ -320,7 +320,7 @@ glabel func_E00CE478 /* 3D3418 E00CE958 C7A600B8 */ lwc1 $f6, 0xb8($sp) /* 3D341C E00CE95C 29820010 */ slti $v0, $t4, 0x10 /* 3D3420 E00CE960 46060102 */ mul.s $f4, $f0, $f6 -/* 3D3424 E00CE964 00000000 */ nop +/* 3D3424 E00CE964 00000000 */ nop /* 3D3428 E00CE968 1040000C */ beqz $v0, .LE00CE99C /* 3D342C E00CE96C 2402007F */ addiu $v0, $zero, 0x7f /* 3D3430 E00CE970 8FAC00A4 */ lw $t4, 0xa4($sp) @@ -329,10 +329,10 @@ glabel func_E00CE478 /* 3D343C E00CE97C 44811000 */ mtc1 $at, $f2 /* 3D3440 E00CE980 004C1023 */ subu $v0, $v0, $t4 /* 3D3444 E00CE984 44820000 */ mtc1 $v0, $f0 -/* 3D3448 E00CE988 00000000 */ nop +/* 3D3448 E00CE988 00000000 */ nop /* 3D344C E00CE98C 46800020 */ cvt.s.w $f0, $f0 /* 3D3450 E00CE990 46020002 */ mul.s $f0, $f0, $f2 -/* 3D3454 E00CE994 00000000 */ nop +/* 3D3454 E00CE994 00000000 */ nop /* 3D3458 E00CE998 46002100 */ add.s $f4, $f4, $f0 .LE00CE99C: /* 3D345C E00CE99C 0260202D */ daddu $a0, $s3, $zero @@ -346,16 +346,16 @@ glabel func_E00CE478 /* 3D347C E00CE9BC 00A0302D */ daddu $a2, $a1, $zero /* 3D3480 E00CE9C0 C65400F8 */ lwc1 $f20, 0xf8($s2) /* 3D3484 E00CE9C4 461AA502 */ mul.s $f20, $f20, $f26 -/* 3D3488 E00CE9C8 00000000 */ nop +/* 3D3488 E00CE9C8 00000000 */ nop /* 3D348C E00CE9CC C65600B8 */ lwc1 $f22, 0xb8($s2) /* 3D3490 E00CE9D0 0C080140 */ jal func_E0200500 /* 3D3494 E00CE9D4 4600B306 */ mov.s $f12, $f22 /* 3D3498 E00CE9D8 4600A602 */ mul.s $f24, $f20, $f0 -/* 3D349C E00CE9DC 00000000 */ nop +/* 3D349C E00CE9DC 00000000 */ nop /* 3D34A0 E00CE9E0 0C080144 */ jal func_E0200510 /* 3D34A4 E00CE9E4 4600B306 */ mov.s $f12, $f22 /* 3D34A8 E00CE9E8 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D34AC E00CE9EC 00000000 */ nop +/* 3D34AC E00CE9EC 00000000 */ nop /* 3D34B0 E00CE9F0 4406F000 */ mfc1 $a2, $f30 /* 3D34B4 E00CE9F4 4407A000 */ mfc1 $a3, $f20 /* 3D34B8 E00CE9F8 4405C000 */ mfc1 $a1, $f24 @@ -403,11 +403,11 @@ glabel func_E00CE478 /* 3D3560 E00CEAA0 E7A60010 */ swc1 $f6, 0x10($sp) /* 3D3564 E00CEAA4 C6000038 */ lwc1 $f0, 0x38($s0) /* 3D3568 E00CEAA8 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D356C E00CEAAC 00000000 */ nop +/* 3D356C E00CEAAC 00000000 */ nop /* 3D3570 E00CEAB0 E7A00014 */ swc1 $f0, 0x14($sp) /* 3D3574 E00CEAB4 C6000058 */ lwc1 $f0, 0x58($s0) /* 3D3578 E00CEAB8 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D357C E00CEABC 00000000 */ nop +/* 3D357C E00CEABC 00000000 */ nop /* 3D3580 E00CEAC0 4406F000 */ mfc1 $a2, $f30 /* 3D3584 E00CEAC4 27A40020 */ addiu $a0, $sp, 0x20 /* 3D3588 E00CEAC8 24E70001 */ addiu $a3, $a3, 1 @@ -415,7 +415,7 @@ glabel func_E00CE478 /* 3D3590 E00CEAD0 C6000078 */ lwc1 $f0, 0x78($s0) /* 3D3594 E00CEAD4 4405F000 */ mfc1 $a1, $f30 /* 3D3598 E00CEAD8 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D359C E00CEADC 00000000 */ nop +/* 3D359C E00CEADC 00000000 */ nop /* 3D35A0 E00CEAE0 25020008 */ addiu $v0, $t0, 8 /* 3D35A4 E00CEAE4 AEA80000 */ sw $t0, ($s5) /* 3D35A8 E00CEAE8 A6E70000 */ sh $a3, ($s7) @@ -441,7 +441,7 @@ glabel func_E00CE478 /* 3D35F8 E00CEB38 C6000098 */ lwc1 $f0, 0x98($s0) /* 3D35FC E00CEB3C C7A600B8 */ lwc1 $f6, 0xb8($sp) /* 3D3600 E00CEB40 46060002 */ mul.s $f0, $f0, $f6 -/* 3D3604 E00CEB44 00000000 */ nop +/* 3D3604 E00CEB44 00000000 */ nop /* 3D3608 E00CEB48 0260202D */ daddu $a0, $s3, $zero /* 3D360C E00CEB4C 44050000 */ mfc1 $a1, $f0 /* 3D3610 E00CEB50 44063000 */ mfc1 $a2, $f6 @@ -453,15 +453,15 @@ glabel func_E00CE478 /* 3D3628 E00CEB68 00A0302D */ daddu $a2, $a1, $zero /* 3D362C E00CEB6C C65400F8 */ lwc1 $f20, 0xf8($s2) /* 3D3630 E00CEB70 461AA502 */ mul.s $f20, $f20, $f26 -/* 3D3634 E00CEB74 00000000 */ nop +/* 3D3634 E00CEB74 00000000 */ nop /* 3D3638 E00CEB78 0C080140 */ jal func_E0200500 /* 3D363C E00CEB7C C64C00B8 */ lwc1 $f12, 0xb8($s2) /* 3D3640 E00CEB80 4600A582 */ mul.s $f22, $f20, $f0 -/* 3D3644 E00CEB84 00000000 */ nop +/* 3D3644 E00CEB84 00000000 */ nop /* 3D3648 E00CEB88 0C080144 */ jal func_E0200510 /* 3D364C E00CEB8C C64C00B8 */ lwc1 $f12, 0xb8($s2) /* 3D3650 E00CEB90 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D3654 E00CEB94 00000000 */ nop +/* 3D3654 E00CEB94 00000000 */ nop /* 3D3658 E00CEB98 4406F000 */ mfc1 $a2, $f30 /* 3D365C E00CEB9C 4407A000 */ mfc1 $a3, $f20 /* 3D3660 E00CEBA0 4405B000 */ mfc1 $a1, $f22 @@ -635,4 +635,4 @@ glabel func_E00CE478 /* 3D3900 E00CEE40 D7B400F0 */ ldc1 $f20, 0xf0($sp) /* 3D3904 E00CEE44 03E00008 */ jr $ra /* 3D3908 E00CEE48 27BD0120 */ addiu $sp, $sp, 0x120 -/* 3D390C E00CEE4C 00000000 */ nop +/* 3D390C E00CEE4C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D3E20/func_E00D0000.s b/asm/nonmatchings/code_3D3E20/func_E00D0000.s index e381ab8a4b..e914780722 100644 --- a/asm/nonmatchings/code_3D3E20/func_E00D0000.s +++ b/asm/nonmatchings/code_3D3E20/func_E00D0000.s @@ -51,7 +51,7 @@ glabel func_E00D0000 /* 3D3ED4 E00D00B4 AE23000C */ sw $v1, 0xc($s1) .LE00D00B8: /* 3D3ED8 E00D00B8 0803402E */ j .LE00D00B8 -/* 3D3EDC E00D00BC 00000000 */ nop +/* 3D3EDC E00D00BC 00000000 */ nop .LE00D00C0: /* 3D3EE0 E00D00C0 2402003C */ addiu $v0, $zero, 0x3c /* 3D3EE4 E00D00C4 AC620028 */ sw $v0, 0x28($v1) @@ -82,7 +82,7 @@ glabel func_E00D0000 /* 3D3F48 E00D0128 2405FFFF */ addiu $a1, $zero, -1 .LE00D012C: /* 3D3F4C E00D012C 44860000 */ mtc1 $a2, $f0 -/* 3D3F50 E00D0130 00000000 */ nop +/* 3D3F50 E00D0130 00000000 */ nop /* 3D3F54 E00D0134 46800020 */ cvt.s.w $f0, $f0 /* 3D3F58 E00D0138 24C6001E */ addiu $a2, $a2, 0x1e /* 3D3F5C E00D013C AC65001C */ sw $a1, 0x1c($v1) diff --git a/asm/nonmatchings/code_3D3E20/func_E00D018C.s b/asm/nonmatchings/code_3D3E20/func_E00D018C.s index baf683f1fb..467c00f31b 100644 --- a/asm/nonmatchings/code_3D3E20/func_E00D018C.s +++ b/asm/nonmatchings/code_3D3E20/func_E00D018C.s @@ -3,4 +3,4 @@ glabel func_E00D018C /* 3D3FAC E00D018C 03E00008 */ jr $ra -/* 3D3FB0 E00D0190 00000000 */ nop +/* 3D3FB0 E00D0190 00000000 */ nop diff --git a/asm/nonmatchings/code_3D3E20/func_E00D0194.s b/asm/nonmatchings/code_3D3E20/func_E00D0194.s index 50e7982e39..b3d3670003 100644 --- a/asm/nonmatchings/code_3D3E20/func_E00D0194.s +++ b/asm/nonmatchings/code_3D3E20/func_E00D0194.s @@ -25,19 +25,19 @@ glabel func_E00D0194 /* 3D4004 E00D01E4 0C080128 */ jal func_E02004A0 /* 3D4008 E00D01E8 0260202D */ daddu $a0, $s3, $zero /* 3D400C E00D01EC 08034106 */ j .LE00D0418 -/* 3D4010 E00D01F0 00000000 */ nop +/* 3D4010 E00D01F0 00000000 */ nop .LE00D01F4: /* 3D4014 E00D01F4 8C82002C */ lw $v0, 0x2c($a0) /* 3D4018 E00D01F8 94940000 */ lhu $s4, ($a0) /* 3D401C E00D01FC 28420008 */ slti $v0, $v0, 8 /* 3D4020 E00D0200 14400009 */ bnez $v0, .LE00D0228 -/* 3D4024 E00D0204 00000000 */ nop +/* 3D4024 E00D0204 00000000 */ nop /* 3D4028 E00D0208 3C01E00D */ lui $at, %hi(D_E00D0B20) /* 3D402C E00D020C D4220B20 */ ldc1 $f2, %lo(D_E00D0B20)($at) /* 3D4030 E00D0210 C4800038 */ lwc1 $f0, 0x38($a0) /* 3D4034 E00D0214 46800021 */ cvt.d.w $f0, $f0 /* 3D4038 E00D0218 46220002 */ mul.d $f0, $f0, $f2 -/* 3D403C E00D021C 00000000 */ nop +/* 3D403C E00D021C 00000000 */ nop /* 3D4040 E00D0220 4620028D */ trunc.w.d $f10, $f0 /* 3D4044 E00D0224 E48A0038 */ swc1 $f10, 0x38($a0) .LE00D0228: @@ -63,7 +63,7 @@ glabel func_E00D0194 /* 3D4090 E00D0270 04400063 */ bltz $v0, .LE00D0400 /* 3D4094 E00D0274 AE020010 */ sw $v0, 0x10($s0) /* 3D4098 E00D0278 14400041 */ bnez $v0, .LE00D0380 -/* 3D409C E00D027C 00000000 */ nop +/* 3D409C E00D027C 00000000 */ nop /* 3D40A0 E00D0280 C60CFFF8 */ lwc1 $f12, -8($s0) /* 3D40A4 E00D0284 AE00FFC8 */ sw $zero, -0x38($s0) /* 3D40A8 E00D0288 AE00FFCC */ sw $zero, -0x34($s0) @@ -72,16 +72,16 @@ glabel func_E00D0194 /* 3D40B4 E00D0294 46000007 */ neg.s $f0, $f0 /* 3D40B8 E00D0298 46000021 */ cvt.d.s $f0, $f0 /* 3D40BC E00D029C 46340002 */ mul.d $f0, $f0, $f20 -/* 3D40C0 E00D02A0 00000000 */ nop +/* 3D40C0 E00D02A0 00000000 */ nop /* 3D40C4 E00D02A4 C60CFFF8 */ lwc1 $f12, -8($s0) /* 3D40C8 E00D02A8 46200020 */ cvt.s.d $f0, $f0 /* 3D40CC E00D02AC 0C080144 */ jal func_E0200510 /* 3D40D0 E00D02B0 E600FFD4 */ swc1 $f0, -0x2c($s0) /* 3D40D4 E00D02B4 46000021 */ cvt.d.s $f0, $f0 /* 3D40D8 E00D02B8 46340002 */ mul.d $f0, $f0, $f20 -/* 3D40DC E00D02BC 00000000 */ nop +/* 3D40DC E00D02BC 00000000 */ nop /* 3D40E0 E00D02C0 44911000 */ mtc1 $s1, $f2 -/* 3D40E4 E00D02C4 00000000 */ nop +/* 3D40E4 E00D02C4 00000000 */ nop /* 3D40E8 E00D02C8 468010A0 */ cvt.s.w $f2, $f2 /* 3D40EC E00D02CC 3C014020 */ lui $at, 0x4020 /* 3D40F0 E00D02D0 44812800 */ mtc1 $at, $f5 @@ -98,12 +98,12 @@ glabel func_E00D0194 /* 3D411C E00D02FC 1680000D */ bnez $s4, .LE00D0334 /* 3D4120 E00D0300 E600FFD8 */ swc1 $f0, -0x28($s0) /* 3D4124 E00D0304 44920000 */ mtc1 $s2, $f0 -/* 3D4128 E00D0308 00000000 */ nop +/* 3D4128 E00D0308 00000000 */ nop /* 3D412C E00D030C 46800021 */ cvt.d.w $f0, $f0 /* 3D4130 E00D0310 46340002 */ mul.d $f0, $f0, $f20 -/* 3D4134 E00D0314 00000000 */ nop +/* 3D4134 E00D0314 00000000 */ nop /* 3D4138 E00D0318 44921000 */ mtc1 $s2, $f2 -/* 3D413C E00D031C 00000000 */ nop +/* 3D413C E00D031C 00000000 */ nop /* 3D4140 E00D0320 468010A0 */ cvt.s.w $f2, $f2 /* 3D4144 E00D0324 E602FFE0 */ swc1 $f2, -0x20($s0) /* 3D4148 E00D0328 46200020 */ cvt.s.d $f0, $f0 @@ -115,13 +115,13 @@ glabel func_E00D0194 /* 3D415C E00D033C D4200B30 */ ldc1 $f0, %lo(D_E00D0B30)($at) /* 3D4160 E00D0340 460010A1 */ cvt.d.s $f2, $f2 /* 3D4164 E00D0344 46201082 */ mul.d $f2, $f2, $f0 -/* 3D4168 E00D0348 00000000 */ nop +/* 3D4168 E00D0348 00000000 */ nop /* 3D416C E00D034C 44910000 */ mtc1 $s1, $f0 -/* 3D4170 E00D0350 00000000 */ nop +/* 3D4170 E00D0350 00000000 */ nop /* 3D4174 E00D0354 46800021 */ cvt.d.w $f0, $f0 /* 3D4178 E00D0358 46340000 */ add.d $f0, $f0, $f20 /* 3D417C E00D035C 46340102 */ mul.d $f4, $f0, $f20 -/* 3D4180 E00D0360 00000000 */ nop +/* 3D4180 E00D0360 00000000 */ nop /* 3D4184 E00D0364 46200020 */ cvt.s.d $f0, $f0 /* 3D4188 E00D0368 E600FFE0 */ swc1 $f0, -0x20($s0) /* 3D418C E00D036C 462010A0 */ cvt.s.d $f2, $f2 @@ -136,11 +136,11 @@ glabel func_E00D0194 /* 3D41A8 E00D0388 D4200B38 */ ldc1 $f0, %lo(D_E00D0B38)($at) /* 3D41AC E00D038C 46002121 */ cvt.d.s $f4, $f4 /* 3D41B0 E00D0390 46202102 */ mul.d $f4, $f4, $f0 -/* 3D41B4 E00D0394 00000000 */ nop +/* 3D41B4 E00D0394 00000000 */ nop /* 3D41B8 E00D0398 C602FFE0 */ lwc1 $f2, -0x20($s0) /* 3D41BC E00D039C 460010A1 */ cvt.d.s $f2, $f2 /* 3D41C0 E00D03A0 46381082 */ mul.d $f2, $f2, $f24 -/* 3D41C4 E00D03A4 00000000 */ nop +/* 3D41C4 E00D03A4 00000000 */ nop /* 3D41C8 E00D03A8 C6080000 */ lwc1 $f8, ($s0) /* 3D41CC E00D03AC C6000004 */ lwc1 $f0, 4($s0) /* 3D41D0 E00D03B0 C6060008 */ lwc1 $f6, 8($s0) @@ -150,7 +150,7 @@ glabel func_E00D0194 /* 3D41E0 E00D03C0 C600FFE8 */ lwc1 $f0, -0x18($s0) /* 3D41E4 E00D03C4 46000021 */ cvt.d.s $f0, $f0 /* 3D41E8 E00D03C8 46380002 */ mul.d $f0, $f0, $f24 -/* 3D41EC E00D03CC 00000000 */ nop +/* 3D41EC E00D03CC 00000000 */ nop /* 3D41F0 E00D03D0 E6080000 */ swc1 $f8, ($s0) /* 3D41F4 E00D03D4 E6060008 */ swc1 $f6, 8($s0) /* 3D41F8 E00D03D8 46202120 */ cvt.s.d $f4, $f4 diff --git a/asm/nonmatchings/code_3D3E20/func_E00D048C.s b/asm/nonmatchings/code_3D3E20/func_E00D048C.s index 5811277bfb..906b269763 100644 --- a/asm/nonmatchings/code_3D3E20/func_E00D048C.s +++ b/asm/nonmatchings/code_3D3E20/func_E00D048C.s @@ -50,7 +50,7 @@ glabel func_E00D048C /* 3D4360 E00D0540 AFAD00A4 */ sw $t5, 0xa4($sp) /* 3D4364 E00D0544 922D0051 */ lbu $t5, 0x51($s1) /* 3D4368 E00D0548 46202102 */ mul.d $f4, $f4, $f0 -/* 3D436C E00D054C 00000000 */ nop +/* 3D436C E00D054C 00000000 */ nop /* 3D4370 E00D0550 AFAD00A8 */ sw $t5, 0xa8($sp) /* 3D4374 E00D0554 922D0052 */ lbu $t5, 0x52($s1) /* 3D4378 E00D0558 3C02E700 */ lui $v0, 0xe700 @@ -60,7 +60,7 @@ glabel func_E00D048C /* 3D4388 E00D0568 AFAD00B0 */ sw $t5, 0xb0($sp) /* 3D438C E00D056C 922D0054 */ lbu $t5, 0x54($s1) /* 3D4390 E00D0570 46203182 */ mul.d $f6, $f6, $f0 -/* 3D4394 E00D0574 00000000 */ nop +/* 3D4394 E00D0574 00000000 */ nop /* 3D4398 E00D0578 AFAD00B4 */ sw $t5, 0xb4($sp) /* 3D439C E00D057C 922D0055 */ lbu $t5, 0x55($s1) /* 3D43A0 E00D0580 46004221 */ cvt.d.s $f8, $f8 @@ -70,7 +70,7 @@ glabel func_E00D048C /* 3D43B0 E00D0590 ACC70000 */ sw $a3, ($a2) /* 3D43B4 E00D0594 8FAD0128 */ lw $t5, 0x128($sp) /* 3D43B8 E00D0598 46204202 */ mul.d $f8, $f8, $f0 -/* 3D43BC E00D059C 00000000 */ nop +/* 3D43BC E00D059C 00000000 */ nop /* 3D43C0 E00D05A0 8DA20010 */ lw $v0, 0x10($t5) /* 3D43C4 E00D05A4 4407A000 */ mfc1 $a3, $f20 /* 3D43C8 E00D05A8 8C43001C */ lw $v1, 0x1c($v0) @@ -169,7 +169,7 @@ glabel func_E00D048C .LE00D071C: /* 3D453C E00D071C 8E020008 */ lw $v0, 8($s0) /* 3D4540 E00D0720 04400078 */ bltz $v0, .LE00D0904 -/* 3D4544 E00D0724 00000000 */ nop +/* 3D4544 E00D0724 00000000 */ nop /* 3D4548 E00D0728 8E05FFC0 */ lw $a1, -0x40($s0) /* 3D454C E00D072C 8E06FFC4 */ lw $a2, -0x3c($s0) /* 3D4550 E00D0730 8E07FFC8 */ lw $a3, -0x38($s0) @@ -187,15 +187,15 @@ glabel func_E00D048C /* 3D4580 E00D0760 00A0302D */ daddu $a2, $a1, $zero /* 3D4584 E00D0764 C600FFD8 */ lwc1 $f0, -0x28($s0) /* 3D4588 E00D0768 461C0002 */ mul.s $f0, $f0, $f28 -/* 3D458C E00D076C 00000000 */ nop +/* 3D458C E00D076C 00000000 */ nop /* 3D4590 E00D0770 44050000 */ mfc1 $a1, $f0 /* 3D4594 E00D0774 C600FFDC */ lwc1 $f0, -0x24($s0) /* 3D4598 E00D0778 461A0002 */ mul.s $f0, $f0, $f26 -/* 3D459C E00D077C 00000000 */ nop +/* 3D459C E00D077C 00000000 */ nop /* 3D45A0 E00D0780 44060000 */ mfc1 $a2, $f0 /* 3D45A4 E00D0784 C600FFE0 */ lwc1 $f0, -0x20($s0) /* 3D45A8 E00D0788 46180002 */ mul.s $f0, $f0, $f24 -/* 3D45AC E00D078C 00000000 */ nop +/* 3D45AC E00D078C 00000000 */ nop /* 3D45B0 E00D0790 44070000 */ mfc1 $a3, $f0 /* 3D45B4 E00D0794 0C080110 */ jal func_E0200440 /* 3D45B8 E00D0798 0240202D */ daddu $a0, $s2, $zero @@ -233,7 +233,7 @@ glabel func_E00D048C /* 3D4638 E00D0818 24630008 */ addiu $v1, $v1, 8 /* 3D463C E00D081C 4600030D */ trunc.w.s $f12, $f0 /* 3D4640 E00D0820 44026000 */ mfc1 $v0, $f12 -/* 3D4644 E00D0824 00000000 */ nop +/* 3D4644 E00D0824 00000000 */ nop /* 3D4648 E00D0828 30420FFF */ andi $v0, $v0, 0xfff /* 3D464C E00D082C 005E1025 */ or $v0, $v0, $fp /* 3D4650 E00D0830 AE630000 */ sw $v1, ($s3) @@ -253,7 +253,7 @@ glabel func_E00D048C /* 3D4688 E00D0868 AE620000 */ sw $v0, ($s3) /* 3D468C E00D086C 4600030D */ trunc.w.s $f12, $f0 /* 3D4690 E00D0870 44026000 */ mfc1 $v0, $f12 -/* 3D4694 E00D0874 00000000 */ nop +/* 3D4694 E00D0874 00000000 */ nop /* 3D4698 E00D0878 2442007C */ addiu $v0, $v0, 0x7c /* 3D469C E00D087C 30420FFF */ andi $v0, $v0, 0xfff /* 3D46A0 E00D0880 00461025 */ or $v0, $v0, $a2 @@ -263,7 +263,7 @@ glabel func_E00D048C /* 3D46B0 E00D0890 AE620000 */ sw $v0, ($s3) /* 3D46B4 E00D0894 4600030D */ trunc.w.s $f12, $f0 /* 3D46B8 E00D0898 44026000 */ mfc1 $v0, $f12 -/* 3D46BC E00D089C 00000000 */ nop +/* 3D46BC E00D089C 00000000 */ nop /* 3D46C0 E00D08A0 30420FFF */ andi $v0, $v0, 0xfff /* 3D46C4 E00D08A4 005E1025 */ or $v0, $v0, $fp /* 3D46C8 E00D08A8 AC620000 */ sw $v0, ($v1) @@ -284,7 +284,7 @@ glabel func_E00D048C /* 3D4704 E00D08E4 AC62001C */ sw $v0, 0x1c($v1) /* 3D4708 E00D08E8 4600030D */ trunc.w.s $f12, $f0 /* 3D470C E00D08EC 44026000 */ mfc1 $v0, $f12 -/* 3D4710 E00D08F0 00000000 */ nop +/* 3D4710 E00D08F0 00000000 */ nop /* 3D4714 E00D08F4 2442007C */ addiu $v0, $v0, 0x7c /* 3D4718 E00D08F8 30420FFF */ andi $v0, $v0, 0xfff /* 3D471C E00D08FC 00481025 */ or $v0, $v0, $t0 @@ -420,5 +420,5 @@ glabel func_E00D048C /* 3D491C E00D0AFC D7B40100 */ ldc1 $f20, 0x100($sp) /* 3D4920 E00D0B00 03E00008 */ jr $ra /* 3D4924 E00D0B04 27BD0128 */ addiu $sp, $sp, 0x128 -/* 3D4928 E00D0B08 00000000 */ nop -/* 3D492C E00D0B0C 00000000 */ nop +/* 3D4928 E00D0B08 00000000 */ nop +/* 3D492C E00D0B0C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D5020/func_E00D6000.s b/asm/nonmatchings/code_3D5020/func_E00D6000.s index ef114bc08d..a844a037f6 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D6000.s +++ b/asm/nonmatchings/code_3D5020/func_E00D6000.s @@ -56,7 +56,7 @@ glabel func_E00D6000 /* 3D50EC E00D60CC AD12000C */ sw $s2, 0xc($t0) .LE00D60D0: /* 3D50F0 E00D60D0 08035834 */ j .LE00D60D0 -/* 3D50F4 E00D60D4 00000000 */ nop +/* 3D50F4 E00D60D4 00000000 */ nop .LE00D60D8: /* 3D50F8 E00D60D8 AE570000 */ sw $s7, ($s2) /* 3D50FC E00D60DC 1E000004 */ bgtz $s0, .LE00D60F0 @@ -90,14 +90,14 @@ glabel func_E00D6000 /* 3D5164 E00D6144 90426E84 */ lbu $v0, %lo(D_E00D6E84)($v0) /* 3D5168 E00D6148 24110001 */ addiu $s1, $zero, 1 /* 3D516C E00D614C 44820000 */ mtc1 $v0, $f0 -/* 3D5170 E00D6150 00000000 */ nop +/* 3D5170 E00D6150 00000000 */ nop /* 3D5174 E00D6154 46800020 */ cvt.s.w $f0, $f0 /* 3D5178 E00D6158 0C080138 */ jal func_E02004E0 /* 3D517C E00D615C E6400038 */ swc1 $f0, 0x38($s2) /* 3D5180 E00D6160 8FA90028 */ lw $t1, 0x28($sp) /* 3D5184 E00D6164 8D230008 */ lw $v1, 8($t1) /* 3D5188 E00D6168 4482E000 */ mtc1 $v0, $f28 -/* 3D518C E00D616C 00000000 */ nop +/* 3D518C E00D616C 00000000 */ nop /* 3D5190 E00D6170 4680E720 */ cvt.s.w $f28, $f28 /* 3D5194 E00D6174 0223182A */ slt $v1, $s1, $v1 /* 3D5198 E00D6178 10600155 */ beqz $v1, .LE00D66D0 @@ -135,14 +135,14 @@ glabel func_E00D6000 /* 3D5214 E00D61F4 00220821 */ addu $at, $at, $v0 /* 3D5218 E00D61F8 8C226EB8 */ lw $v0, %lo(D_E00D6EB8)($at) /* 3D521C E00D61FC 00400008 */ jr $v0 -/* 3D5220 E00D6200 00000000 */ nop +/* 3D5220 E00D6200 00000000 */ nop /* 3D5224 E00D6204 0C080138 */ jal func_E02004E0 /* 3D5228 E00D6208 2404000A */ addiu $a0, $zero, 0xa /* 3D522C E00D620C 44821000 */ mtc1 $v0, $f2 -/* 3D5230 E00D6210 00000000 */ nop +/* 3D5230 E00D6210 00000000 */ nop /* 3D5234 E00D6214 468010A1 */ cvt.d.w $f2, $f2 /* 3D5238 E00D6218 46361082 */ mul.d $f2, $f2, $f22 -/* 3D523C E00D621C 00000000 */ nop +/* 3D523C E00D621C 00000000 */ nop /* 3D5240 E00D6220 02330018 */ mult $s1, $s3 /* 3D5244 E00D6224 00111FC3 */ sra $v1, $s1, 0x1f /* 3D5248 E00D6228 00004010 */ mfhi $t0 @@ -151,10 +151,10 @@ glabel func_E00D6000 /* 3D5254 E00D6234 00431021 */ addu $v0, $v0, $v1 /* 3D5258 E00D6238 02221023 */ subu $v0, $s1, $v0 /* 3D525C E00D623C 44820000 */ mtc1 $v0, $f0 -/* 3D5260 E00D6240 00000000 */ nop +/* 3D5260 E00D6240 00000000 */ nop /* 3D5264 E00D6244 46800021 */ cvt.d.w $f0, $f0 /* 3D5268 E00D6248 463A0002 */ mul.d $f0, $f0, $f26 -/* 3D526C E00D624C 00000000 */ nop +/* 3D526C E00D624C 00000000 */ nop /* 3D5270 E00D6250 46361080 */ add.d $f2, $f2, $f22 /* 3D5274 E00D6254 AE16FFD4 */ sw $s6, -0x2c($s0) /* 3D5278 E00D6258 AE000004 */ sw $zero, 4($s0) @@ -163,10 +163,10 @@ glabel func_E00D6000 /* 3D5284 E00D6264 0C080138 */ jal func_E02004E0 /* 3D5288 E00D6268 2404000A */ addiu $a0, $zero, 0xa /* 3D528C E00D626C 44821000 */ mtc1 $v0, $f2 -/* 3D5290 E00D6270 00000000 */ nop +/* 3D5290 E00D6270 00000000 */ nop /* 3D5294 E00D6274 468010A1 */ cvt.d.w $f2, $f2 /* 3D5298 E00D6278 46361082 */ mul.d $f2, $f2, $f22 -/* 3D529C E00D627C 00000000 */ nop +/* 3D529C E00D627C 00000000 */ nop /* 3D52A0 E00D6280 02330018 */ mult $s1, $s3 /* 3D52A4 E00D6284 00111FC3 */ sra $v1, $s1, 0x1f /* 3D52A8 E00D6288 00004010 */ mfhi $t0 @@ -175,10 +175,10 @@ glabel func_E00D6000 /* 3D52B4 E00D6294 00431021 */ addu $v0, $v0, $v1 /* 3D52B8 E00D6298 02221023 */ subu $v0, $s1, $v0 /* 3D52BC E00D629C 44820000 */ mtc1 $v0, $f0 -/* 3D52C0 E00D62A0 00000000 */ nop +/* 3D52C0 E00D62A0 00000000 */ nop /* 3D52C4 E00D62A4 46800021 */ cvt.d.w $f0, $f0 /* 3D52C8 E00D62A8 463A0002 */ mul.d $f0, $f0, $f26 -/* 3D52CC E00D62AC 00000000 */ nop +/* 3D52CC E00D62AC 00000000 */ nop /* 3D52D0 E00D62B0 46361080 */ add.d $f2, $f2, $f22 /* 3D52D4 E00D62B4 AE16FFD4 */ sw $s6, -0x2c($s0) /* 3D52D8 E00D62B8 08035982 */ j .LE00D6608 @@ -193,14 +193,14 @@ glabel func_E00D6000 /* 3D52FC E00D62DC 00641821 */ addu $v1, $v1, $a0 /* 3D5300 E00D62E0 02231823 */ subu $v1, $s1, $v1 /* 3D5304 E00D62E4 44830000 */ mtc1 $v1, $f0 -/* 3D5308 E00D62E8 00000000 */ nop +/* 3D5308 E00D62E8 00000000 */ nop /* 3D530C E00D62EC 46800021 */ cvt.d.w $f0, $f0 /* 3D5310 E00D62F0 46380002 */ mul.d $f0, $f0, $f24 -/* 3D5314 E00D62F4 00000000 */ nop +/* 3D5314 E00D62F4 00000000 */ nop /* 3D5318 E00D62F8 24420004 */ addiu $v0, $v0, 4 /* 3D531C E00D62FC 00021023 */ negu $v0, $v0 /* 3D5320 E00D6300 44821000 */ mtc1 $v0, $f2 -/* 3D5324 E00D6304 00000000 */ nop +/* 3D5324 E00D6304 00000000 */ nop /* 3D5328 E00D6308 468010A0 */ cvt.s.w $f2, $f2 /* 3D532C E00D630C E602FFFC */ swc1 $f2, -4($s0) /* 3D5330 E00D6310 4620A001 */ sub.d $f0, $f20, $f0 @@ -217,14 +217,14 @@ glabel func_E00D6000 /* 3D535C E00D633C 00641821 */ addu $v1, $v1, $a0 /* 3D5360 E00D6340 02231823 */ subu $v1, $s1, $v1 /* 3D5364 E00D6344 44830000 */ mtc1 $v1, $f0 -/* 3D5368 E00D6348 00000000 */ nop +/* 3D5368 E00D6348 00000000 */ nop /* 3D536C E00D634C 46800021 */ cvt.d.w $f0, $f0 /* 3D5370 E00D6350 46380002 */ mul.d $f0, $f0, $f24 -/* 3D5374 E00D6354 00000000 */ nop +/* 3D5374 E00D6354 00000000 */ nop /* 3D5378 E00D6358 24420004 */ addiu $v0, $v0, 4 /* 3D537C E00D635C 00021023 */ negu $v0, $v0 /* 3D5380 E00D6360 44821000 */ mtc1 $v0, $f2 -/* 3D5384 E00D6364 00000000 */ nop +/* 3D5384 E00D6364 00000000 */ nop /* 3D5388 E00D6368 468010A0 */ cvt.s.w $f2, $f2 /* 3D538C E00D636C E602FFFC */ swc1 $f2, -4($s0) /* 3D5390 E00D6370 4620A001 */ sub.d $f0, $f20, $f0 @@ -234,10 +234,10 @@ glabel func_E00D6000 /* 3D53A0 E00D6380 0C080138 */ jal func_E02004E0 /* 3D53A4 E00D6384 2404000A */ addiu $a0, $zero, 0xa /* 3D53A8 E00D6388 44821000 */ mtc1 $v0, $f2 -/* 3D53AC E00D638C 00000000 */ nop +/* 3D53AC E00D638C 00000000 */ nop /* 3D53B0 E00D6390 468010A1 */ cvt.d.w $f2, $f2 /* 3D53B4 E00D6394 46361082 */ mul.d $f2, $f2, $f22 -/* 3D53B8 E00D6398 00000000 */ nop +/* 3D53B8 E00D6398 00000000 */ nop /* 3D53BC E00D639C 02330018 */ mult $s1, $s3 /* 3D53C0 E00D63A0 00111FC3 */ sra $v1, $s1, 0x1f /* 3D53C4 E00D63A4 00004010 */ mfhi $t0 @@ -246,10 +246,10 @@ glabel func_E00D6000 /* 3D53D0 E00D63B0 00431021 */ addu $v0, $v0, $v1 /* 3D53D4 E00D63B4 02221023 */ subu $v0, $s1, $v0 /* 3D53D8 E00D63B8 44820000 */ mtc1 $v0, $f0 -/* 3D53DC E00D63BC 00000000 */ nop +/* 3D53DC E00D63BC 00000000 */ nop /* 3D53E0 E00D63C0 46800021 */ cvt.d.w $f0, $f0 /* 3D53E4 E00D63C4 46380002 */ mul.d $f0, $f0, $f24 -/* 3D53E8 E00D63C8 00000000 */ nop +/* 3D53E8 E00D63C8 00000000 */ nop /* 3D53EC E00D63CC 3C01E00D */ lui $at, %hi(D_E00D6EF0) /* 3D53F0 E00D63D0 D4246EF0 */ ldc1 $f4, %lo(D_E00D6EF0)($at) /* 3D53F4 E00D63D4 3C01BF80 */ lui $at, 0xbf80 @@ -259,10 +259,10 @@ glabel func_E00D6000 /* 3D5404 E00D63E4 0C080138 */ jal func_E02004E0 /* 3D5408 E00D63E8 2404000A */ addiu $a0, $zero, 0xa /* 3D540C E00D63EC 44821000 */ mtc1 $v0, $f2 -/* 3D5410 E00D63F0 00000000 */ nop +/* 3D5410 E00D63F0 00000000 */ nop /* 3D5414 E00D63F4 468010A1 */ cvt.d.w $f2, $f2 /* 3D5418 E00D63F8 46361082 */ mul.d $f2, $f2, $f22 -/* 3D541C E00D63FC 00000000 */ nop +/* 3D541C E00D63FC 00000000 */ nop /* 3D5420 E00D6400 02330018 */ mult $s1, $s3 /* 3D5424 E00D6404 00111FC3 */ sra $v1, $s1, 0x1f /* 3D5428 E00D6408 00004010 */ mfhi $t0 @@ -271,10 +271,10 @@ glabel func_E00D6000 /* 3D5434 E00D6414 00431021 */ addu $v0, $v0, $v1 /* 3D5438 E00D6418 02221023 */ subu $v0, $s1, $v0 /* 3D543C E00D641C 44820000 */ mtc1 $v0, $f0 -/* 3D5440 E00D6420 00000000 */ nop +/* 3D5440 E00D6420 00000000 */ nop /* 3D5444 E00D6424 46800021 */ cvt.d.w $f0, $f0 /* 3D5448 E00D6428 46380002 */ mul.d $f0, $f0, $f24 -/* 3D544C E00D642C 00000000 */ nop +/* 3D544C E00D642C 00000000 */ nop /* 3D5450 E00D6430 3C01E00D */ lui $at, %hi(D_E00D6EF8) /* 3D5454 E00D6434 D4246EF8 */ ldc1 $f4, %lo(D_E00D6EF8)($at) /* 3D5458 E00D6438 3C01C000 */ lui $at, 0xc000 @@ -303,10 +303,10 @@ glabel func_E00D6000 /* 3D54B4 E00D6494 0C080138 */ jal func_E02004E0 /* 3D54B8 E00D6498 2404000A */ addiu $a0, $zero, 0xa /* 3D54BC E00D649C 44821000 */ mtc1 $v0, $f2 -/* 3D54C0 E00D64A0 00000000 */ nop +/* 3D54C0 E00D64A0 00000000 */ nop /* 3D54C4 E00D64A4 468010A1 */ cvt.d.w $f2, $f2 /* 3D54C8 E00D64A8 463A1082 */ mul.d $f2, $f2, $f26 -/* 3D54CC E00D64AC 00000000 */ nop +/* 3D54CC E00D64AC 00000000 */ nop /* 3D54D0 E00D64B0 02330018 */ mult $s1, $s3 /* 3D54D4 E00D64B4 001127C3 */ sra $a0, $s1, 0x1f /* 3D54D8 E00D64B8 00004010 */ mfhi $t0 @@ -315,21 +315,21 @@ glabel func_E00D6000 /* 3D54E4 E00D64C4 00641821 */ addu $v1, $v1, $a0 /* 3D54E8 E00D64C8 02231823 */ subu $v1, $s1, $v1 /* 3D54EC E00D64CC 44832000 */ mtc1 $v1, $f4 -/* 3D54F0 E00D64D0 00000000 */ nop +/* 3D54F0 E00D64D0 00000000 */ nop /* 3D54F4 E00D64D4 46802121 */ cvt.d.w $f4, $f4 /* 3D54F8 E00D64D8 46382102 */ mul.d $f4, $f4, $f24 -/* 3D54FC E00D64DC 00000000 */ nop +/* 3D54FC E00D64DC 00000000 */ nop /* 3D5500 E00D64E0 4624A101 */ sub.d $f4, $f20, $f4 /* 3D5504 E00D64E4 3C013FE0 */ lui $at, 0x3fe0 /* 3D5508 E00D64E8 44810800 */ mtc1 $at, $f1 /* 3D550C E00D64EC 44800000 */ mtc1 $zero, $f0 -/* 3D5510 E00D64F0 00000000 */ nop +/* 3D5510 E00D64F0 00000000 */ nop /* 3D5514 E00D64F4 46202102 */ mul.d $f4, $f4, $f0 -/* 3D5518 E00D64F8 00000000 */ nop +/* 3D5518 E00D64F8 00000000 */ nop /* 3D551C E00D64FC 3C014000 */ lui $at, 0x4000 /* 3D5520 E00D6500 44810800 */ mtc1 $at, $f1 /* 3D5524 E00D6504 44800000 */ mtc1 $zero, $f0 -/* 3D5528 E00D6508 00000000 */ nop +/* 3D5528 E00D6508 00000000 */ nop /* 3D552C E00D650C 46201080 */ add.d $f2, $f2, $f0 /* 3D5530 E00D6510 AE1EFFD4 */ sw $fp, -0x2c($s0) /* 3D5534 E00D6514 AE000004 */ sw $zero, 4($s0) @@ -343,10 +343,10 @@ glabel func_E00D6000 /* 3D5554 E00D6534 3C01E00D */ lui $at, %hi(D_E00D6F00) /* 3D5558 E00D6538 D4206F00 */ ldc1 $f0, %lo(D_E00D6F00)($at) /* 3D555C E00D653C 44821000 */ mtc1 $v0, $f2 -/* 3D5560 E00D6540 00000000 */ nop +/* 3D5560 E00D6540 00000000 */ nop /* 3D5564 E00D6544 468010A1 */ cvt.d.w $f2, $f2 /* 3D5568 E00D6548 46201082 */ mul.d $f2, $f2, $f0 -/* 3D556C E00D654C 00000000 */ nop +/* 3D556C E00D654C 00000000 */ nop /* 3D5570 E00D6550 02330018 */ mult $s1, $s3 /* 3D5574 E00D6554 00111FC3 */ sra $v1, $s1, 0x1f /* 3D5578 E00D6558 00004010 */ mfhi $t0 @@ -355,13 +355,13 @@ glabel func_E00D6000 /* 3D5584 E00D6564 00431021 */ addu $v0, $v0, $v1 /* 3D5588 E00D6568 02221023 */ subu $v0, $s1, $v0 /* 3D558C E00D656C 44820000 */ mtc1 $v0, $f0 -/* 3D5590 E00D6570 00000000 */ nop +/* 3D5590 E00D6570 00000000 */ nop /* 3D5594 E00D6574 46800021 */ cvt.d.w $f0, $f0 /* 3D5598 E00D6578 46380002 */ mul.d $f0, $f0, $f24 -/* 3D559C E00D657C 00000000 */ nop +/* 3D559C E00D657C 00000000 */ nop /* 3D55A0 E00D6580 3C01BF80 */ lui $at, 0xbf80 /* 3D55A4 E00D6584 44812000 */ mtc1 $at, $f4 -/* 3D55A8 E00D6588 00000000 */ nop +/* 3D55A8 E00D6588 00000000 */ nop /* 3D55AC E00D658C E6040004 */ swc1 $f4, 4($s0) /* 3D55B0 E00D6590 46361080 */ add.d $f2, $f2, $f22 /* 3D55B4 E00D6594 2402001E */ addiu $v0, $zero, 0x1e @@ -370,10 +370,10 @@ glabel func_E00D6000 /* 3D55C0 E00D65A0 0C080138 */ jal func_E02004E0 /* 3D55C4 E00D65A4 2404000A */ addiu $a0, $zero, 0xa /* 3D55C8 E00D65A8 44821000 */ mtc1 $v0, $f2 -/* 3D55CC E00D65AC 00000000 */ nop +/* 3D55CC E00D65AC 00000000 */ nop /* 3D55D0 E00D65B0 468010A1 */ cvt.d.w $f2, $f2 /* 3D55D4 E00D65B4 46361082 */ mul.d $f2, $f2, $f22 -/* 3D55D8 E00D65B8 00000000 */ nop +/* 3D55D8 E00D65B8 00000000 */ nop /* 3D55DC E00D65BC 02330018 */ mult $s1, $s3 /* 3D55E0 E00D65C0 00111FC3 */ sra $v1, $s1, 0x1f /* 3D55E4 E00D65C4 00004010 */ mfhi $t0 @@ -382,10 +382,10 @@ glabel func_E00D6000 /* 3D55F0 E00D65D0 00431021 */ addu $v0, $v0, $v1 /* 3D55F4 E00D65D4 02221023 */ subu $v0, $s1, $v0 /* 3D55F8 E00D65D8 44820000 */ mtc1 $v0, $f0 -/* 3D55FC E00D65DC 00000000 */ nop +/* 3D55FC E00D65DC 00000000 */ nop /* 3D5600 E00D65E0 46800021 */ cvt.d.w $f0, $f0 /* 3D5604 E00D65E4 46380002 */ mul.d $f0, $f0, $f24 -/* 3D5608 E00D65E8 00000000 */ nop +/* 3D5608 E00D65E8 00000000 */ nop /* 3D560C E00D65EC 3C01E00D */ lui $at, %hi(D_E00D6F08) /* 3D5610 E00D65F0 D4246F08 */ ldc1 $f4, %lo(D_E00D6F08)($at) /* 3D5614 E00D65F4 3C01C000 */ lui $at, 0xc000 @@ -408,7 +408,7 @@ glabel func_E00D6000 /* 3D5648 E00D6628 44800000 */ mtc1 $zero, $f0 /* 3D564C E00D662C 00021823 */ negu $v1, $v0 /* 3D5650 E00D6630 4600103C */ c.lt.s $f2, $f0 -/* 3D5654 E00D6634 00000000 */ nop +/* 3D5654 E00D6634 00000000 */ nop /* 3D5658 E00D6638 45000004 */ bc1f .LE00D664C /* 3D565C E00D663C AE03FFD8 */ sw $v1, -0x28($s0) /* 3D5660 E00D6640 8E02FFD4 */ lw $v0, -0x2c($s0) @@ -416,10 +416,10 @@ glabel func_E00D6000 /* 3D5668 E00D6648 00431023 */ subu $v0, $v0, $v1 .LE00D664C: /* 3D566C E00D664C 44820000 */ mtc1 $v0, $f0 -/* 3D5670 E00D6650 00000000 */ nop +/* 3D5670 E00D6650 00000000 */ nop /* 3D5674 E00D6654 46800020 */ cvt.s.w $f0, $f0 /* 3D5678 E00D6658 46020002 */ mul.s $f0, $f0, $f2 -/* 3D567C E00D665C 00000000 */ nop +/* 3D567C E00D665C 00000000 */ nop /* 3D5680 E00D6660 E600FFC8 */ swc1 $f0, -0x38($s0) /* 3D5684 E00D6664 8FA9002C */ lw $t1, 0x2c($sp) /* 3D5688 E00D6668 2522FFFF */ addiu $v0, $t1, -1 @@ -431,14 +431,14 @@ glabel func_E00D6000 /* 3D569C E00D667C 14410004 */ bne $v0, $at, .LE00D6690 /* 3D56A0 E00D6680 3C018000 */ lui $at, 0x8000 /* 3D56A4 E00D6684 16A10002 */ bne $s5, $at, .LE00D6690 -/* 3D56A8 E00D6688 00000000 */ nop +/* 3D56A8 E00D6688 00000000 */ nop /* 3D56AC E00D668C 0006000D */ break 6 .LE00D6690: /* 3D56B0 E00D6690 00001012 */ mflo $v0 /* 3D56B4 E00D6694 26310001 */ addiu $s1, $s1, 1 /* 3D56B8 E00D6698 26520048 */ addiu $s2, $s2, 0x48 /* 3D56BC E00D669C 44820000 */ mtc1 $v0, $f0 -/* 3D56C0 E00D66A0 00000000 */ nop +/* 3D56C0 E00D66A0 00000000 */ nop /* 3D56C4 E00D66A4 46800020 */ cvt.s.w $f0, $f0 /* 3D56C8 E00D66A8 461C0000 */ add.s $f0, $f0, $f28 /* 3D56CC E00D66AC AE00FFCC */ sw $zero, -0x34($s0) diff --git a/asm/nonmatchings/code_3D5020/func_E00D6718.s b/asm/nonmatchings/code_3D5020/func_E00D6718.s index d4b33c5b30..4042973e25 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D6718.s +++ b/asm/nonmatchings/code_3D5020/func_E00D6718.s @@ -3,4 +3,4 @@ glabel func_E00D6718 /* 3D5738 E00D6718 03E00008 */ jr $ra -/* 3D573C E00D671C 00000000 */ nop +/* 3D573C E00D671C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D5020/func_E00D6720.s b/asm/nonmatchings/code_3D5020/func_E00D6720.s index 044fd95f14..a29461d71e 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D6720.s +++ b/asm/nonmatchings/code_3D5020/func_E00D6720.s @@ -33,7 +33,7 @@ glabel func_E00D6720 /* 3D57A8 E00D6788 0C080128 */ jal func_E02004A0 /* 3D57AC E00D678C 0240202D */ daddu $a0, $s2, $zero /* 3D57B0 E00D6790 08035A48 */ j .LE00D6920 -/* 3D57B4 E00D6794 00000000 */ nop +/* 3D57B4 E00D6794 00000000 */ nop .LE00D6798: /* 3D57B8 E00D6798 28620010 */ slti $v0, $v1, 0x10 /* 3D57BC E00D679C 10400002 */ beqz $v0, .LE00D67A8 @@ -60,19 +60,19 @@ glabel func_E00D6720 /* 3D5804 E00D67E4 AE02FFF0 */ sw $v0, -0x10($s0) /* 3D5808 E00D67E8 0043102A */ slt $v0, $v0, $v1 /* 3D580C E00D67EC 14400016 */ bnez $v0, .LE00D6848 -/* 3D5810 E00D67F0 00000000 */ nop +/* 3D5810 E00D67F0 00000000 */ nop /* 3D5814 E00D67F4 C6020014 */ lwc1 $f2, 0x14($s0) /* 3D5818 E00D67F8 4614103C */ c.lt.s $f2, $f20 -/* 3D581C E00D67FC 00000000 */ nop +/* 3D581C E00D67FC 00000000 */ nop /* 3D5820 E00D6800 4500000A */ bc1f .LE00D682C /* 3D5824 E00D6804 AE00FFF0 */ sw $zero, -0x10($s0) /* 3D5828 E00D6808 0060102D */ daddu $v0, $v1, $zero /* 3D582C E00D680C 00021023 */ negu $v0, $v0 /* 3D5830 E00D6810 44820000 */ mtc1 $v0, $f0 -/* 3D5834 E00D6814 00000000 */ nop +/* 3D5834 E00D6814 00000000 */ nop /* 3D5838 E00D6818 46800020 */ cvt.s.w $f0, $f0 /* 3D583C E00D681C 46020002 */ mul.s $f0, $f0, $f2 -/* 3D5840 E00D6820 00000000 */ nop +/* 3D5840 E00D6820 00000000 */ nop /* 3D5844 E00D6824 08035A0C */ j .LE00D6830 /* 3D5848 E00D6828 E600FFE0 */ swc1 $f0, -0x20($s0) .LE00D682C: @@ -81,7 +81,7 @@ glabel func_E00D6720 /* 3D5850 E00D6830 0C080138 */ jal func_E02004E0 /* 3D5854 E00D6834 24040167 */ addiu $a0, $zero, 0x167 /* 3D5858 E00D6838 44820000 */ mtc1 $v0, $f0 -/* 3D585C E00D683C 00000000 */ nop +/* 3D585C E00D683C 00000000 */ nop /* 3D5860 E00D6840 46800020 */ cvt.s.w $f0, $f0 /* 3D5864 E00D6844 E6000018 */ swc1 $f0, 0x18($s0) .LE00D6848: @@ -100,7 +100,7 @@ glabel func_E00D6720 /* 3D5894 E00D6874 14410004 */ bne $v0, $at, .LE00D6888 /* 3D5898 E00D6878 3C018000 */ lui $at, 0x8000 /* 3D589C E00D687C 14610002 */ bne $v1, $at, .LE00D6888 -/* 3D58A0 E00D6880 00000000 */ nop +/* 3D58A0 E00D6880 00000000 */ nop /* 3D58A4 E00D6884 0006000D */ break 6 .LE00D6888: /* 3D58A8 E00D6888 00001812 */ mflo $v1 @@ -112,30 +112,30 @@ glabel func_E00D6720 /* 3D58C0 E00D68A0 46001080 */ add.s $f2, $f2, $f0 /* 3D58C4 E00D68A4 E604FFE0 */ swc1 $f4, -0x20($s0) /* 3D58C8 E00D68A8 44836000 */ mtc1 $v1, $f12 -/* 3D58CC E00D68AC 00000000 */ nop +/* 3D58CC E00D68AC 00000000 */ nop /* 3D58D0 E00D68B0 46806320 */ cvt.s.w $f12, $f12 /* 3D58D4 E00D68B4 4614603C */ c.lt.s $f12, $f20 -/* 3D58D8 E00D68B8 00000000 */ nop +/* 3D58D8 E00D68B8 00000000 */ nop /* 3D58DC E00D68BC 45010008 */ bc1t .LE00D68E0 /* 3D58E0 E00D68C0 E6020018 */ swc1 $f2, 0x18($s0) /* 3D58E4 E00D68C4 3C014334 */ lui $at, 0x4334 /* 3D58E8 E00D68C8 44810000 */ mtc1 $at, $f0 -/* 3D58EC E00D68CC 00000000 */ nop +/* 3D58EC E00D68CC 00000000 */ nop /* 3D58F0 E00D68D0 460C003C */ c.lt.s $f0, $f12 -/* 3D58F4 E00D68D4 00000000 */ nop +/* 3D58F4 E00D68D4 00000000 */ nop /* 3D58F8 E00D68D8 45000003 */ bc1f .LE00D68E8 -/* 3D58FC E00D68DC 00000000 */ nop +/* 3D58FC E00D68DC 00000000 */ nop .LE00D68E0: /* 3D5900 E00D68E0 08035A43 */ j .LE00D690C /* 3D5904 E00D68E4 AE000000 */ sw $zero, ($s0) .LE00D68E8: /* 3D5908 E00D68E8 0C080140 */ jal func_E0200500 -/* 3D590C E00D68EC 00000000 */ nop +/* 3D590C E00D68EC 00000000 */ nop /* 3D5910 E00D68F0 3C01437F */ lui $at, 0x437f /* 3D5914 E00D68F4 44811000 */ mtc1 $at, $f2 -/* 3D5918 E00D68F8 00000000 */ nop +/* 3D5918 E00D68F8 00000000 */ nop /* 3D591C E00D68FC 46020002 */ mul.s $f0, $f0, $f2 -/* 3D5920 E00D6900 00000000 */ nop +/* 3D5920 E00D6900 00000000 */ nop /* 3D5924 E00D6904 4600018D */ trunc.w.s $f6, $f0 /* 3D5928 E00D6908 E6060000 */ swc1 $f6, ($s0) .LE00D690C: diff --git a/asm/nonmatchings/code_3D5020/func_E00D6978.s b/asm/nonmatchings/code_3D5020/func_E00D6978.s index 2934b34f03..c1e469ee73 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D6978.s +++ b/asm/nonmatchings/code_3D5020/func_E00D6978.s @@ -3,4 +3,4 @@ glabel func_E00D6978 /* 3D5998 E00D6978 03E00008 */ jr $ra -/* 3D599C E00D697C 00000000 */ nop +/* 3D599C E00D697C 00000000 */ nop diff --git a/asm/nonmatchings/code_3D5020/func_E00D6980.s b/asm/nonmatchings/code_3D5020/func_E00D6980.s index d6c9fe6869..1a7be8f4f8 100644 --- a/asm/nonmatchings/code_3D5020/func_E00D6980.s +++ b/asm/nonmatchings/code_3D5020/func_E00D6980.s @@ -49,7 +49,7 @@ glabel func_E00D6980 /* 3D5A50 E00D6A30 3C088000 */ lui $t0, 0x8000 /* 3D5A54 E00D6A34 8D220010 */ lw $v0, 0x10($t1) /* 3D5A58 E00D6A38 46020002 */ mul.s $f0, $f0, $f2 -/* 3D5A5C E00D6A3C 00000000 */ nop +/* 3D5A5C E00D6A3C 00000000 */ nop /* 3D5A60 E00D6A40 8C42001C */ lw $v0, 0x1c($v0) /* 3D5A64 E00D6A44 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 3D5A68 E00D6A48 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -219,7 +219,7 @@ glabel func_E00D6980 /* 3D5CF4 E00D6CD4 3C020900 */ lui $v0, 0x900 /* 3D5CF8 E00D6CD8 24420688 */ addiu $v0, $v0, 0x688 /* 3D5CFC E00D6CDC 10620005 */ beq $v1, $v0, .LE00D6CF4 -/* 3D5D00 E00D6CE0 00000000 */ nop +/* 3D5D00 E00D6CE0 00000000 */ nop /* 3D5D04 E00D6CE4 3C020900 */ lui $v0, 0x900 /* 3D5D08 E00D6CE8 24420808 */ addiu $v0, $v0, 0x808 /* 3D5D0C E00D6CEC 14620006 */ bne $v1, $v0, .LE00D6D08 @@ -309,5 +309,5 @@ glabel func_E00D6980 /* 3D5E4C E00D6E2C D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 3D5E50 E00D6E30 03E00008 */ jr $ra /* 3D5E54 E00D6E34 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* 3D5E58 E00D6E38 00000000 */ nop -/* 3D5E5C E00D6E3C 00000000 */ nop +/* 3D5E58 E00D6E38 00000000 */ nop +/* 3D5E5C E00D6E3C 00000000 */ nop diff --git a/asm/nonmatchings/code_3DB460/func_E00E0000.s b/asm/nonmatchings/code_3DB460/func_E00E0000.s index 37bef84f74..d6a89fe1c6 100644 --- a/asm/nonmatchings/code_3DB460/func_E00E0000.s +++ b/asm/nonmatchings/code_3DB460/func_E00E0000.s @@ -44,7 +44,7 @@ glabel func_E00E0000 /* 3DB4FC E00E009C AE24000C */ sw $a0, 0xc($s1) .LE00E00A0: /* 3DB500 E00E00A0 08038028 */ j .LE00E00A0 -/* 3DB504 E00E00A4 00000000 */ nop +/* 3DB504 E00E00A4 00000000 */ nop .LE00E00A8: /* 3DB508 E00E00A8 AC930000 */ sw $s3, ($a0) /* 3DB50C E00E00AC 1E400004 */ bgtz $s2, .LE00E00C0 @@ -78,7 +78,7 @@ glabel func_E00E0000 /* 3DB574 E00E0114 24030001 */ addiu $v1, $zero, 1 /* 3DB578 E00E0118 E480006C */ swc1 $f0, 0x6c($a0) /* 3DB57C E00E011C 44820000 */ mtc1 $v0, $f0 -/* 3DB580 E00E0120 00000000 */ nop +/* 3DB580 E00E0120 00000000 */ nop /* 3DB584 E00E0124 46800020 */ cvt.s.w $f0, $f0 /* 3DB588 E00E0128 46001083 */ div.s $f2, $f2, $f0 /* 3DB58C E00E012C 3C013FE0 */ lui $at, 0x3fe0 @@ -86,7 +86,7 @@ glabel func_E00E0000 /* 3DB594 E00E0134 44800000 */ mtc1 $zero, $f0 /* 3DB598 E00E0138 460010A1 */ cvt.d.s $f2, $f2 /* 3DB59C E00E013C 46201082 */ mul.d $f2, $f2, $f0 -/* 3DB5A0 E00E0140 00000000 */ nop +/* 3DB5A0 E00E0140 00000000 */ nop /* 3DB5A4 E00E0144 AC800024 */ sw $zero, 0x24($a0) /* 3DB5A8 E00E0148 AC800028 */ sw $zero, 0x28($a0) /* 3DB5AC E00E014C AC800038 */ sw $zero, 0x38($a0) @@ -98,15 +98,15 @@ glabel func_E00E0000 /* 3DB5C4 E00E0164 462010A0 */ cvt.s.d $f2, $f2 .LE00E0168: /* 3DB5C8 E00E0168 44830000 */ mtc1 $v1, $f0 -/* 3DB5CC E00E016C 00000000 */ nop +/* 3DB5CC E00E016C 00000000 */ nop /* 3DB5D0 E00E0170 46800020 */ cvt.s.w $f0, $f0 /* 3DB5D4 E00E0174 46000007 */ neg.s $f0, $f0 /* 3DB5D8 E00E0178 46020002 */ mul.s $f0, $f0, $f2 -/* 3DB5DC E00E017C 00000000 */ nop +/* 3DB5DC E00E017C 00000000 */ nop /* 3DB5E0 E00E0180 24630001 */ addiu $v1, $v1, 1 /* 3DB5E4 E00E0184 4600010D */ trunc.w.s $f4, $f0 /* 3DB5E8 E00E0188 44022000 */ mfc1 $v0, $f4 -/* 3DB5EC E00E018C 00000000 */ nop +/* 3DB5EC E00E018C 00000000 */ nop /* 3DB5F0 E00E0190 2442FFFF */ addiu $v0, $v0, -1 /* 3DB5F4 E00E0194 AC820064 */ sw $v0, 0x64($a0) /* 3DB5F8 E00E0198 0070102A */ slt $v0, $v1, $s0 diff --git a/asm/nonmatchings/code_3DB460/func_E00E01D0.s b/asm/nonmatchings/code_3DB460/func_E00E01D0.s index 2aa6d2a10d..d7a63fd5b8 100644 --- a/asm/nonmatchings/code_3DB460/func_E00E01D0.s +++ b/asm/nonmatchings/code_3DB460/func_E00E01D0.s @@ -3,4 +3,4 @@ glabel func_E00E01D0 /* 3DB630 E00E01D0 03E00008 */ jr $ra -/* 3DB634 E00E01D4 00000000 */ nop +/* 3DB634 E00E01D4 00000000 */ nop diff --git a/asm/nonmatchings/code_3DB460/func_E00E01D8.s b/asm/nonmatchings/code_3DB460/func_E00E01D8.s index cd3debbb7d..1ec335d4eb 100644 --- a/asm/nonmatchings/code_3DB460/func_E00E01D8.s +++ b/asm/nonmatchings/code_3DB460/func_E00E01D8.s @@ -47,7 +47,7 @@ glabel func_E00E01D8 /* 3DB6D4 E00E0274 0C080128 */ jal func_E02004A0 /* 3DB6D8 E00E0278 0240202D */ daddu $a0, $s2, $zero /* 3DB6DC E00E027C 0803815F */ j .LE00E057C -/* 3DB6E0 E00E0280 00000000 */ nop +/* 3DB6E0 E00E0280 00000000 */ nop .LE00E0284: /* 3DB6E4 E00E0284 8C85001C */ lw $a1, 0x1c($a0) /* 3DB6E8 E00E0288 10400002 */ beqz $v0, .LE00E0294 @@ -89,19 +89,19 @@ glabel func_E00E01D8 /* 3DB768 E00E0308 04420098 */ bltzl $v0, .LE00E056C /* 3DB76C E00E030C 26310001 */ addiu $s1, $s1, 1 /* 3DB770 E00E0310 14400058 */ bnez $v0, .LE00E0474 -/* 3DB774 E00E0314 00000000 */ nop +/* 3DB774 E00E0314 00000000 */ nop /* 3DB778 E00E0318 4600C68D */ trunc.w.s $f26, $f24 /* 3DB77C E00E031C 4404D000 */ mfc1 $a0, $f26 /* 3DB780 E00E0320 0C080138 */ jal func_E02004E0 -/* 3DB784 E00E0324 00000000 */ nop +/* 3DB784 E00E0324 00000000 */ nop /* 3DB788 E00E0328 3C013FE0 */ lui $at, 0x3fe0 /* 3DB78C E00E032C 44810800 */ mtc1 $at, $f1 /* 3DB790 E00E0330 44800000 */ mtc1 $zero, $f0 /* 3DB794 E00E0334 4600C0A1 */ cvt.d.s $f2, $f24 /* 3DB798 E00E0338 46201082 */ mul.d $f2, $f2, $f0 -/* 3DB79C E00E033C 00000000 */ nop +/* 3DB79C E00E033C 00000000 */ nop /* 3DB7A0 E00E0340 44820000 */ mtc1 $v0, $f0 -/* 3DB7A4 E00E0344 00000000 */ nop +/* 3DB7A4 E00E0344 00000000 */ nop /* 3DB7A8 E00E0348 46800021 */ cvt.d.w $f0, $f0 /* 3DB7AC E00E034C 46220001 */ sub.d $f0, $f0, $f2 /* 3DB7B0 E00E0350 4600F68D */ trunc.w.s $f26, $f30 @@ -111,31 +111,31 @@ glabel func_E00E01D8 /* 3DB7C0 E00E0360 E600FFB8 */ swc1 $f0, -0x48($s0) /* 3DB7C4 E00E0364 24040014 */ addiu $a0, $zero, 0x14 /* 3DB7C8 E00E0368 44820000 */ mtc1 $v0, $f0 -/* 3DB7CC E00E036C 00000000 */ nop +/* 3DB7CC E00E036C 00000000 */ nop /* 3DB7D0 E00E0370 46800020 */ cvt.s.w $f0, $f0 /* 3DB7D4 E00E0374 E600FFBC */ swc1 $f0, -0x44($s0) /* 3DB7D8 E00E0378 0C080138 */ jal func_E02004E0 /* 3DB7DC E00E037C AE00FFC0 */ sw $zero, -0x40($s0) /* 3DB7E0 E00E0380 2442FFF6 */ addiu $v0, $v0, -0xa /* 3DB7E4 E00E0384 44820000 */ mtc1 $v0, $f0 -/* 3DB7E8 E00E0388 00000000 */ nop +/* 3DB7E8 E00E0388 00000000 */ nop /* 3DB7EC E00E038C 46800020 */ cvt.s.w $f0, $f0 /* 3DB7F0 E00E0390 46000021 */ cvt.d.s $f0, $f0 /* 3DB7F4 E00E0394 46340002 */ mul.d $f0, $f0, $f20 -/* 3DB7F8 E00E0398 00000000 */ nop +/* 3DB7F8 E00E0398 00000000 */ nop /* 3DB7FC E00E039C 24040028 */ addiu $a0, $zero, 0x28 /* 3DB800 E00E03A0 46200020 */ cvt.s.d $f0, $f0 /* 3DB804 E00E03A4 0C080138 */ jal func_E02004E0 /* 3DB808 E00E03A8 E600FFF8 */ swc1 $f0, -8($s0) /* 3DB80C E00E03AC 2442FFFF */ addiu $v0, $v0, -1 /* 3DB810 E00E03B0 44820000 */ mtc1 $v0, $f0 -/* 3DB814 E00E03B4 00000000 */ nop +/* 3DB814 E00E03B4 00000000 */ nop /* 3DB818 E00E03B8 46800020 */ cvt.s.w $f0, $f0 /* 3DB81C E00E03BC 461C0002 */ mul.s $f0, $f0, $f28 -/* 3DB820 E00E03C0 00000000 */ nop +/* 3DB820 E00E03C0 00000000 */ nop /* 3DB824 E00E03C4 46000021 */ cvt.d.s $f0, $f0 /* 3DB828 E00E03C8 46340002 */ mul.d $f0, $f0, $f20 -/* 3DB82C E00E03CC 00000000 */ nop +/* 3DB82C E00E03CC 00000000 */ nop /* 3DB830 E00E03D0 24040014 */ addiu $a0, $zero, 0x14 /* 3DB834 E00E03D4 AE000000 */ sw $zero, ($s0) /* 3DB838 E00E03D8 46200020 */ cvt.s.d $f0, $f0 @@ -143,11 +143,11 @@ glabel func_E00E01D8 /* 3DB840 E00E03E0 E600FFFC */ swc1 $f0, -4($s0) /* 3DB844 E00E03E4 2442FFF6 */ addiu $v0, $v0, -0xa /* 3DB848 E00E03E8 44820000 */ mtc1 $v0, $f0 -/* 3DB84C E00E03EC 00000000 */ nop +/* 3DB84C E00E03EC 00000000 */ nop /* 3DB850 E00E03F0 46800020 */ cvt.s.w $f0, $f0 /* 3DB854 E00E03F4 46000021 */ cvt.d.s $f0, $f0 /* 3DB858 E00E03F8 46340002 */ mul.d $f0, $f0, $f20 -/* 3DB85C E00E03FC 00000000 */ nop +/* 3DB85C E00E03FC 00000000 */ nop /* 3DB860 E00E0400 2404001E */ addiu $a0, $zero, 0x1e /* 3DB864 E00E0404 46200020 */ cvt.s.d $f0, $f0 /* 3DB868 E00E0408 0C080138 */ jal func_E02004E0 @@ -155,13 +155,13 @@ glabel func_E00E01D8 /* 3DB870 E00E0410 2442FFFF */ addiu $v0, $v0, -1 /* 3DB874 E00E0414 C7BA0010 */ lwc1 $f26, 0x10($sp) /* 3DB878 E00E0418 44820000 */ mtc1 $v0, $f0 -/* 3DB87C E00E041C 00000000 */ nop +/* 3DB87C E00E041C 00000000 */ nop /* 3DB880 E00E0420 46800020 */ cvt.s.w $f0, $f0 /* 3DB884 E00E0424 461A0002 */ mul.s $f0, $f0, $f26 -/* 3DB888 E00E0428 00000000 */ nop +/* 3DB888 E00E0428 00000000 */ nop /* 3DB88C E00E042C 46000021 */ cvt.d.s $f0, $f0 /* 3DB890 E00E0430 46340002 */ mul.d $f0, $f0, $f20 -/* 3DB894 E00E0434 00000000 */ nop +/* 3DB894 E00E0434 00000000 */ nop /* 3DB898 E00E0438 2404000F */ addiu $a0, $zero, 0xf /* 3DB89C E00E043C AE00000C */ sw $zero, 0xc($s0) /* 3DB8A0 E00E0440 46200020 */ cvt.s.d $f0, $f0 @@ -169,12 +169,12 @@ glabel func_E00E01D8 /* 3DB8A8 E00E0448 E6000008 */ swc1 $f0, 8($s0) /* 3DB8AC E00E044C 2404000F */ addiu $a0, $zero, 0xf /* 3DB8B0 E00E0450 44820000 */ mtc1 $v0, $f0 -/* 3DB8B4 E00E0454 00000000 */ nop +/* 3DB8B4 E00E0454 00000000 */ nop /* 3DB8B8 E00E0458 46800020 */ cvt.s.w $f0, $f0 /* 3DB8BC E00E045C 0C080138 */ jal func_E02004E0 /* 3DB8C0 E00E0460 E6000010 */ swc1 $f0, 0x10($s0) /* 3DB8C4 E00E0464 44820000 */ mtc1 $v0, $f0 -/* 3DB8C8 E00E0468 00000000 */ nop +/* 3DB8C8 E00E0468 00000000 */ nop /* 3DB8CC E00E046C 46800020 */ cvt.s.w $f0, $f0 /* 3DB8D0 E00E0470 E6000014 */ swc1 $f0, 0x14($s0) .LE00E0474: @@ -183,19 +183,19 @@ glabel func_E00E01D8 /* 3DB8DC E00E047C 46105281 */ sub.s $f10, $f10, $f16 /* 3DB8E0 E00E0480 460052A1 */ cvt.d.s $f10, $f10 /* 3DB8E4 E00E0484 46365282 */ mul.d $f10, $f10, $f22 -/* 3DB8E8 E00E0488 00000000 */ nop +/* 3DB8E8 E00E0488 00000000 */ nop /* 3DB8EC E00E048C C60EFFFC */ lwc1 $f14, -4($s0) /* 3DB8F0 E00E0490 C60C0008 */ lwc1 $f12, 8($s0) /* 3DB8F4 E00E0494 460E6301 */ sub.s $f12, $f12, $f14 /* 3DB8F8 E00E0498 46006321 */ cvt.d.s $f12, $f12 /* 3DB8FC E00E049C 46366302 */ mul.d $f12, $f12, $f22 -/* 3DB900 E00E04A0 00000000 */ nop +/* 3DB900 E00E04A0 00000000 */ nop /* 3DB904 E00E04A4 C6060000 */ lwc1 $f6, ($s0) /* 3DB908 E00E04A8 C608000C */ lwc1 $f8, 0xc($s0) /* 3DB90C E00E04AC 46064201 */ sub.s $f8, $f8, $f6 /* 3DB910 E00E04B0 46004221 */ cvt.d.s $f8, $f8 /* 3DB914 E00E04B4 46364202 */ mul.d $f8, $f8, $f22 -/* 3DB918 E00E04B8 00000000 */ nop +/* 3DB918 E00E04B8 00000000 */ nop /* 3DB91C E00E04BC 8E020018 */ lw $v0, 0x18($s0) /* 3DB920 E00E04C0 C600FFB8 */ lwc1 $f0, -0x48($s0) /* 3DB924 E00E04C4 C612FFBC */ lwc1 $f18, -0x44($s0) diff --git a/asm/nonmatchings/code_3DB460/func_E00E05F8.s b/asm/nonmatchings/code_3DB460/func_E00E05F8.s index 8a424a0dbe..6282910c7e 100644 --- a/asm/nonmatchings/code_3DB460/func_E00E05F8.s +++ b/asm/nonmatchings/code_3DB460/func_E00E05F8.s @@ -3,4 +3,4 @@ glabel func_E00E05F8 /* 3DBA58 E00E05F8 03E00008 */ jr $ra -/* 3DBA5C E00E05FC 00000000 */ nop +/* 3DBA5C E00E05FC 00000000 */ nop diff --git a/asm/nonmatchings/code_3DB460/func_E00E0600.s b/asm/nonmatchings/code_3DB460/func_E00E0600.s index d95ed137d8..9c40bf44bf 100644 --- a/asm/nonmatchings/code_3DB460/func_E00E0600.s +++ b/asm/nonmatchings/code_3DB460/func_E00E0600.s @@ -207,14 +207,14 @@ glabel func_E00E0600 /* 3DBD80 E00E0920 AE220000 */ sw $v0, ($s1) /* 3DBD84 E00E0924 4600010D */ trunc.w.s $f4, $f0 /* 3DBD88 E00E0928 44032000 */ mfc1 $v1, $f4 -/* 3DBD8C E00E092C 00000000 */ nop +/* 3DBD8C E00E092C 00000000 */ nop /* 3DBD90 E00E0930 00031880 */ sll $v1, $v1, 2 /* 3DBD94 E00E0934 30630FFF */ andi $v1, $v1, 0xfff /* 3DBD98 E00E0938 C6000000 */ lwc1 $f0, ($s0) /* 3DBD9C E00E093C 00031B00 */ sll $v1, $v1, 0xc /* 3DBDA0 E00E0940 4600010D */ trunc.w.s $f4, $f0 /* 3DBDA4 E00E0944 44022000 */ mfc1 $v0, $f4 -/* 3DBDA8 E00E0948 00000000 */ nop +/* 3DBDA8 E00E0948 00000000 */ nop /* 3DBDAC E00E094C 00021080 */ sll $v0, $v0, 2 /* 3DBDB0 E00E0950 30420FFF */ andi $v0, $v0, 0xfff /* 3DBDB4 E00E0954 00561025 */ or $v0, $v0, $s6 @@ -226,14 +226,14 @@ glabel func_E00E0600 /* 3DBDCC E00E096C ACC20010 */ sw $v0, 0x10($a2) /* 3DBDD0 E00E0970 4600010D */ trunc.w.s $f4, $f0 /* 3DBDD4 E00E0974 44032000 */ mfc1 $v1, $f4 -/* 3DBDD8 E00E0978 00000000 */ nop +/* 3DBDD8 E00E0978 00000000 */ nop /* 3DBDDC E00E097C 2463000F */ addiu $v1, $v1, 0xf /* 3DBDE0 E00E0980 00031880 */ sll $v1, $v1, 2 /* 3DBDE4 E00E0984 30630FFF */ andi $v1, $v1, 0xfff /* 3DBDE8 E00E0988 00031B00 */ sll $v1, $v1, 0xc /* 3DBDEC E00E098C 4600110D */ trunc.w.s $f4, $f2 /* 3DBDF0 E00E0990 44022000 */ mfc1 $v0, $f4 -/* 3DBDF4 E00E0994 00000000 */ nop +/* 3DBDF4 E00E0994 00000000 */ nop /* 3DBDF8 E00E0998 2442000F */ addiu $v0, $v0, 0xf /* 3DBDFC E00E099C 00021080 */ sll $v0, $v0, 2 /* 3DBE00 E00E09A0 30420FFF */ andi $v0, $v0, 0xfff diff --git a/asm/nonmatchings/code_3DC310/func_E00E2000.s b/asm/nonmatchings/code_3DC310/func_E00E2000.s index 1d77699003..07f164e18d 100644 --- a/asm/nonmatchings/code_3DC310/func_E00E2000.s +++ b/asm/nonmatchings/code_3DC310/func_E00E2000.s @@ -40,7 +40,7 @@ glabel func_E00E2000 /* 3DC39C E00E208C AE02000C */ sw $v0, 0xc($s0) .LE00E2090: /* 3DC3A0 E00E2090 08038824 */ j .LE00E2090 -/* 3DC3A4 E00E2094 00000000 */ nop +/* 3DC3A4 E00E2094 00000000 */ nop .LE00E2098: /* 3DC3A8 E00E2098 AC920000 */ sw $s2, ($a0) /* 3DC3AC E00E209C 1E200004 */ bgtz $s1, .LE00E20B0 diff --git a/asm/nonmatchings/code_3DC310/func_E00E212C.s b/asm/nonmatchings/code_3DC310/func_E00E212C.s index 885c596fd9..5bd57c825f 100644 --- a/asm/nonmatchings/code_3DC310/func_E00E212C.s +++ b/asm/nonmatchings/code_3DC310/func_E00E212C.s @@ -3,4 +3,4 @@ glabel func_E00E212C /* 3DC43C E00E212C 03E00008 */ jr $ra -/* 3DC440 E00E2130 00000000 */ nop +/* 3DC440 E00E2130 00000000 */ nop diff --git a/asm/nonmatchings/code_3DC310/func_E00E2134.s b/asm/nonmatchings/code_3DC310/func_E00E2134.s index 0ecbb6feb6..37b86e3a5c 100644 --- a/asm/nonmatchings/code_3DC310/func_E00E2134.s +++ b/asm/nonmatchings/code_3DC310/func_E00E2134.s @@ -26,9 +26,9 @@ glabel func_E00E2134 /* 3DC490 E00E2180 04610005 */ bgez $v1, .LE00E2198 /* 3DC494 E00E2184 ACA60014 */ sw $a2, 0x14($a1) /* 3DC498 E00E2188 0C080128 */ jal func_E02004A0 -/* 3DC49C E00E218C 00000000 */ nop +/* 3DC49C E00E218C 00000000 */ nop /* 3DC4A0 E00E2190 0803886F */ j .LE00E21BC -/* 3DC4A4 E00E2194 00000000 */ nop +/* 3DC4A4 E00E2194 00000000 */ nop .LE00E2198: /* 3DC4A8 E00E2198 28620010 */ slti $v0, $v1, 0x10 /* 3DC4AC E00E219C 10400002 */ beqz $v0, .LE00E21A8 diff --git a/asm/nonmatchings/code_3DC310/func_E00E2210.s b/asm/nonmatchings/code_3DC310/func_E00E2210.s index 1cae24ecf8..29bd59cbdc 100644 --- a/asm/nonmatchings/code_3DC310/func_E00E2210.s +++ b/asm/nonmatchings/code_3DC310/func_E00E2210.s @@ -3,4 +3,4 @@ glabel func_E00E2210 /* 3DC520 E00E2210 03E00008 */ jr $ra -/* 3DC524 E00E2214 00000000 */ nop +/* 3DC524 E00E2214 00000000 */ nop diff --git a/asm/nonmatchings/code_3DC310/func_E00E2218.s b/asm/nonmatchings/code_3DC310/func_E00E2218.s index fea19a9f22..76eef0d4f4 100644 --- a/asm/nonmatchings/code_3DC310/func_E00E2218.s +++ b/asm/nonmatchings/code_3DC310/func_E00E2218.s @@ -177,7 +177,7 @@ glabel func_E00E2218 /* 3DC7D8 E00E24C8 3C01E00E */ lui $at, %hi(D_E00E2A30) /* 3DC7DC E00E24CC D4202A30 */ ldc1 $f0, %lo(D_E00E2A30)($at) /* 3DC7E0 E00E24D0 44906000 */ mtc1 $s0, $f12 -/* 3DC7E4 E00E24D4 00000000 */ nop +/* 3DC7E4 E00E24D4 00000000 */ nop /* 3DC7E8 E00E24D8 46806321 */ cvt.d.w $f12, $f12 /* 3DC7EC E00E24DC 46206300 */ add.d $f12, $f12, $f0 /* 3DC7F0 E00E24E0 0000A02D */ daddu $s4, $zero, $zero @@ -188,7 +188,7 @@ glabel func_E00E2218 /* 3DC804 E00E24F4 3C1E0900 */ lui $fp, 0x900 /* 3DC808 E00E24F8 27DE10A8 */ addiu $fp, $fp, 0x10a8 /* 3DC80C E00E24FC 46020002 */ mul.s $f0, $f0, $f2 -/* 3DC810 E00E2500 00000000 */ nop +/* 3DC810 E00E2500 00000000 */ nop /* 3DC814 E00E2504 24110002 */ addiu $s1, $zero, 2 /* 3DC818 E00E2508 4405A000 */ mfc1 $a1, $f20 /* 3DC81C E00E250C 4407A000 */ mfc1 $a3, $f20 @@ -235,24 +235,24 @@ glabel func_E00E2218 /* 3DC8BC E00E25AC 000F10C0 */ sll $v0, $t7, 3 /* 3DC8C0 E00E25B0 02021021 */ addu $v0, $s0, $v0 /* 3DC8C4 E00E25B4 44826000 */ mtc1 $v0, $f12 -/* 3DC8C8 E00E25B8 00000000 */ nop +/* 3DC8C8 E00E25B8 00000000 */ nop /* 3DC8CC E00E25BC 46806320 */ cvt.s.w $f12, $f12 /* 3DC8D0 E00E25C0 0C080140 */ jal func_E0200500 /* 3DC8D4 E00E25C4 26100030 */ addiu $s0, $s0, 0x30 /* 3DC8D8 E00E25C8 44941000 */ mtc1 $s4, $f2 -/* 3DC8DC E00E25CC 00000000 */ nop +/* 3DC8DC E00E25CC 00000000 */ nop /* 3DC8E0 E00E25D0 468010A0 */ cvt.s.w $f2, $f2 /* 3DC8E4 E00E25D4 3C01E00E */ lui $at, %hi(D_E00E2A38) /* 3DC8E8 E00E25D8 D4242A38 */ ldc1 $f4, %lo(D_E00E2A38)($at) /* 3DC8EC E00E25DC 460010A1 */ cvt.d.s $f2, $f2 /* 3DC8F0 E00E25E0 46241082 */ mul.d $f2, $f2, $f4 -/* 3DC8F4 E00E25E4 00000000 */ nop +/* 3DC8F4 E00E25E4 00000000 */ nop /* 3DC8F8 E00E25E8 27A40020 */ addiu $a0, $sp, 0x20 /* 3DC8FC E00E25EC 3C0141F0 */ lui $at, 0x41f0 /* 3DC900 E00E25F0 44812000 */ mtc1 $at, $f4 -/* 3DC904 E00E25F4 00000000 */ nop +/* 3DC904 E00E25F4 00000000 */ nop /* 3DC908 E00E25F8 46040002 */ mul.s $f0, $f0, $f4 -/* 3DC90C E00E25FC 00000000 */ nop +/* 3DC90C E00E25FC 00000000 */ nop /* 3DC910 E00E2600 4405A000 */ mfc1 $a1, $f20 /* 3DC914 E00E2604 3C0740C0 */ lui $a3, 0x40c0 /* 3DC918 E00E2608 26940001 */ addiu $s4, $s4, 1 @@ -349,7 +349,7 @@ glabel func_E00E2218 /* 3DCA74 E00E2764 AC820000 */ sw $v0, ($a0) .LE00E2768: /* 3DCA78 E00E2768 14A00003 */ bnez $a1, .LE00E2778 -/* 3DCA7C E00E276C 00000000 */ nop +/* 3DCA7C E00E276C 00000000 */ nop /* 3DCA80 E00E2770 080389E9 */ j .LE00E27A4 /* 3DCA84 E00E2774 AC8D0004 */ sw $t5, 4($a0) .LE00E2778: @@ -404,7 +404,7 @@ glabel func_E00E2218 /* 3DCB3C E00E282C 34427879 */ ori $v0, $v0, 0x7879 /* 3DCB40 E00E2830 27A40020 */ addiu $a0, $sp, 0x20 /* 3DCB44 E00E2834 44933000 */ mtc1 $s3, $f6 -/* 3DCB48 E00E2838 00000000 */ nop +/* 3DCB48 E00E2838 00000000 */ nop /* 3DCB4C E00E283C 468031A0 */ cvt.s.w $f6, $f6 /* 3DCB50 E00E2840 26730024 */ addiu $s3, $s3, 0x24 /* 3DCB54 E00E2844 26940001 */ addiu $s4, $s4, 1 @@ -513,4 +513,4 @@ glabel func_E00E2218 /* 3DCCF0 E00E29E0 D7B400D8 */ ldc1 $f20, 0xd8($sp) /* 3DCCF4 E00E29E4 03E00008 */ jr $ra /* 3DCCF8 E00E29E8 27BD00E8 */ addiu $sp, $sp, 0xe8 -/* 3DCCFC E00E29EC 00000000 */ nop +/* 3DCCFC E00E29EC 00000000 */ nop diff --git a/asm/nonmatchings/code_3DE000/func_E00E4000.s b/asm/nonmatchings/code_3DE000/func_E00E4000.s index de2dc26df9..0db94f7e36 100644 --- a/asm/nonmatchings/code_3DE000/func_E00E4000.s +++ b/asm/nonmatchings/code_3DE000/func_E00E4000.s @@ -47,7 +47,7 @@ glabel func_E00E4000 /* 3DE0A8 E00E40A8 AE70000C */ sw $s0, 0xc($s3) .LE00E40AC: /* 3DE0AC E00E40AC 0803902B */ j .LE00E40AC -/* 3DE0B0 E00E40B0 00000000 */ nop +/* 3DE0B0 E00E40B0 00000000 */ nop .LE00E40B4: /* 3DE0B4 E00E40B4 AE120000 */ sw $s2, ($s0) /* 3DE0B8 E00E40B8 1E800004 */ bgtz $s4, .LE00E40CC @@ -80,7 +80,7 @@ glabel func_E00E4000 /* 3DE11C E00E411C 52400007 */ beql $s2, $zero, .LE00E413C /* 3DE120 E00E4120 AE030048 */ sw $v1, 0x48($s0) /* 3DE124 E00E4124 0803905C */ j .LE00E4170 -/* 3DE128 E00E4128 00000000 */ nop +/* 3DE128 E00E4128 00000000 */ nop .LE00E412C: /* 3DE12C E00E412C 10400010 */ beqz $v0, .LE00E4170 /* 3DE130 E00E4130 240300FF */ addiu $v1, $zero, 0xff @@ -131,10 +131,10 @@ glabel func_E00E4000 /* 3DE1CC E00E41CC 10400009 */ beqz $v0, .LE00E41F4 /* 3DE1D0 E00E41D0 2622FFFF */ addiu $v0, $s1, -1 /* 3DE1D4 E00E41D4 44830000 */ mtc1 $v1, $f0 -/* 3DE1D8 E00E41D8 00000000 */ nop +/* 3DE1D8 E00E41D8 00000000 */ nop /* 3DE1DC E00E41DC 46800020 */ cvt.s.w $f0, $f0 /* 3DE1E0 E00E41E0 44821000 */ mtc1 $v0, $f2 -/* 3DE1E4 E00E41E4 00000000 */ nop +/* 3DE1E4 E00E41E4 00000000 */ nop /* 3DE1E8 E00E41E8 468010A0 */ cvt.s.w $f2, $f2 /* 3DE1EC E00E41EC 08039083 */ j .LE00E420C /* 3DE1F0 E00E41F0 46020083 */ div.s $f2, $f0, $f2 @@ -142,7 +142,7 @@ glabel func_E00E4000 /* 3DE1F4 E00E41F4 3C0141F0 */ lui $at, 0x41f0 /* 3DE1F8 E00E41F8 44811000 */ mtc1 $at, $f2 /* 3DE1FC E00E41FC 44820000 */ mtc1 $v0, $f0 -/* 3DE200 E00E4200 00000000 */ nop +/* 3DE200 E00E4200 00000000 */ nop /* 3DE204 E00E4204 46800020 */ cvt.s.w $f0, $f0 /* 3DE208 E00E4208 46001083 */ div.s $f2, $f2, $f0 .LE00E420C: @@ -152,15 +152,15 @@ glabel func_E00E4000 /* 3DE218 E00E4218 26100064 */ addiu $s0, $s0, 0x64 .LE00E421C: /* 3DE21C E00E421C 44830000 */ mtc1 $v1, $f0 -/* 3DE220 E00E4220 00000000 */ nop +/* 3DE220 E00E4220 00000000 */ nop /* 3DE224 E00E4224 46800020 */ cvt.s.w $f0, $f0 /* 3DE228 E00E4228 46000007 */ neg.s $f0, $f0 /* 3DE22C E00E422C 46020002 */ mul.s $f0, $f0, $f2 -/* 3DE230 E00E4230 00000000 */ nop +/* 3DE230 E00E4230 00000000 */ nop /* 3DE234 E00E4234 24630001 */ addiu $v1, $v1, 1 /* 3DE238 E00E4238 4600010D */ trunc.w.s $f4, $f0 /* 3DE23C E00E423C 44022000 */ mfc1 $v0, $f4 -/* 3DE240 E00E4240 00000000 */ nop +/* 3DE240 E00E4240 00000000 */ nop /* 3DE244 E00E4244 2442FFFF */ addiu $v0, $v0, -1 /* 3DE248 E00E4248 AE02002C */ sw $v0, 0x2c($s0) /* 3DE24C E00E424C 0071102A */ slt $v0, $v1, $s1 diff --git a/asm/nonmatchings/code_3DE000/func_E00E4288.s b/asm/nonmatchings/code_3DE000/func_E00E4288.s index dfbb2f33a9..bbf2147fc6 100644 --- a/asm/nonmatchings/code_3DE000/func_E00E4288.s +++ b/asm/nonmatchings/code_3DE000/func_E00E4288.s @@ -3,4 +3,4 @@ glabel func_E00E4288 /* 3DE288 E00E4288 03E00008 */ jr $ra -/* 3DE28C E00E428C 00000000 */ nop +/* 3DE28C E00E428C 00000000 */ nop diff --git a/asm/nonmatchings/code_3DE000/func_E00E4290.s b/asm/nonmatchings/code_3DE000/func_E00E4290.s index 9c28c1d2b2..df871013f8 100644 --- a/asm/nonmatchings/code_3DE000/func_E00E4290.s +++ b/asm/nonmatchings/code_3DE000/func_E00E4290.s @@ -45,7 +45,7 @@ glabel func_E00E4290 /* 3DE328 E00E4328 0C080128 */ jal func_E02004A0 /* 3DE32C E00E432C 0280202D */ daddu $a0, $s4, $zero /* 3DE330 E00E4330 08039231 */ j .LE00E48C4 -/* 3DE334 E00E4334 00000000 */ nop +/* 3DE334 E00E4334 00000000 */ nop .LE00E4338: /* 3DE338 E00E4338 0060A82D */ daddu $s5, $v1, $zero /* 3DE33C E00E433C 2AA20008 */ slti $v0, $s5, 8 @@ -126,24 +126,24 @@ glabel func_E00E4290 /* 3DE458 E00E4458 04420116 */ bltzl $v0, .LE00E48B4 /* 3DE45C E00E445C 26730001 */ addiu $s3, $s3, 1 /* 3DE460 E00E4460 1440002B */ bnez $v0, .LE00E4510 -/* 3DE464 E00E4464 00000000 */ nop +/* 3DE464 E00E4464 00000000 */ nop /* 3DE468 E00E4468 4600F40D */ trunc.w.s $f16, $f30 /* 3DE46C E00E446C 44048000 */ mfc1 $a0, $f16 /* 3DE470 E00E4470 0C080138 */ jal func_E02004E0 -/* 3DE474 E00E4474 00000000 */ nop +/* 3DE474 E00E4474 00000000 */ nop /* 3DE478 E00E4478 3C013FE0 */ lui $at, 0x3fe0 /* 3DE47C E00E447C 44811800 */ mtc1 $at, $f3 /* 3DE480 E00E4480 44801000 */ mtc1 $zero, $f2 /* 3DE484 E00E4484 4600F021 */ cvt.d.s $f0, $f30 /* 3DE488 E00E4488 46220002 */ mul.d $f0, $f0, $f2 -/* 3DE48C E00E448C 00000000 */ nop +/* 3DE48C E00E448C 00000000 */ nop /* 3DE490 E00E4490 4482A000 */ mtc1 $v0, $f20 -/* 3DE494 E00E4494 00000000 */ nop +/* 3DE494 E00E4494 00000000 */ nop /* 3DE498 E00E4498 4680A521 */ cvt.d.w $f20, $f20 /* 3DE49C E00E449C 4620A501 */ sub.d $f20, $f20, $f0 /* 3DE4A0 E00E44A0 4620A520 */ cvt.s.d $f20, $f20 /* 3DE4A4 E00E44A4 461CA002 */ mul.s $f0, $f20, $f28 -/* 3DE4A8 E00E44A8 00000000 */ nop +/* 3DE4A8 E00E44A8 00000000 */ nop /* 3DE4AC E00E44AC C7B00014 */ lwc1 $f16, 0x14($sp) /* 3DE4B0 E00E44B0 46008000 */ add.s $f0, $f16, $f0 /* 3DE4B4 E00E44B4 C7B00010 */ lwc1 $f16, 0x10($sp) @@ -153,9 +153,9 @@ glabel func_E00E4290 /* 3DE4C4 E00E44C4 0C080138 */ jal func_E02004E0 /* 3DE4C8 E00E44C8 E600FFAC */ swc1 $f0, -0x54($s0) /* 3DE4CC E00E44CC 461AA502 */ mul.s $f20, $f20, $f26 -/* 3DE4D0 E00E44D0 00000000 */ nop +/* 3DE4D0 E00E44D0 00000000 */ nop /* 3DE4D4 E00E44D4 44820000 */ mtc1 $v0, $f0 -/* 3DE4D8 E00E44D8 00000000 */ nop +/* 3DE4D8 E00E44D8 00000000 */ nop /* 3DE4DC E00E44DC 46800020 */ cvt.s.w $f0, $f0 /* 3DE4E0 E00E44E0 C7B00018 */ lwc1 $f16, 0x18($sp) /* 3DE4E4 E00E44E4 8FA50020 */ lw $a1, 0x20($sp) @@ -175,9 +175,9 @@ glabel func_E00E4290 /* 3DE518 E00E4518 14400005 */ bnez $v0, .LE00E4530 /* 3DE51C E00E451C 2A420004 */ slti $v0, $s2, 4 /* 3DE520 E00E4520 104000B6 */ beqz $v0, .LE00E47FC -/* 3DE524 E00E4524 00000000 */ nop +/* 3DE524 E00E4524 00000000 */ nop /* 3DE528 E00E4528 0803919A */ j .LE00E4668 -/* 3DE52C E00E452C 00000000 */ nop +/* 3DE52C E00E452C 00000000 */ nop .LE00E4530: /* 3DE530 E00E4530 8E02FFD4 */ lw $v0, -0x2c($s0) /* 3DE534 E00E4534 14400020 */ bnez $v0, .LE00E45B8 @@ -189,11 +189,11 @@ glabel func_E00E4290 /* 3DE54C E00E454C 00021023 */ negu $v0, $v0 /* 3DE550 E00E4550 2442FFFE */ addiu $v0, $v0, -2 /* 3DE554 E00E4554 44820000 */ mtc1 $v0, $f0 -/* 3DE558 E00E4558 00000000 */ nop +/* 3DE558 E00E4558 00000000 */ nop /* 3DE55C E00E455C 46800020 */ cvt.s.w $f0, $f0 /* 3DE560 E00E4560 46000021 */ cvt.d.s $f0, $f0 /* 3DE564 E00E4564 46380002 */ mul.d $f0, $f0, $f24 -/* 3DE568 E00E4568 00000000 */ nop +/* 3DE568 E00E4568 00000000 */ nop /* 3DE56C E00E456C 2404000A */ addiu $a0, $zero, 0xa /* 3DE570 E00E4570 AE000004 */ sw $zero, 4($s0) /* 3DE574 E00E4574 AE000008 */ sw $zero, 8($s0) @@ -201,15 +201,15 @@ glabel func_E00E4290 /* 3DE57C E00E457C 0C080138 */ jal func_E02004E0 /* 3DE580 E00E4580 E600FFD0 */ swc1 $f0, -0x30($s0) /* 3DE584 E00E4584 44820000 */ mtc1 $v0, $f0 -/* 3DE588 E00E4588 00000000 */ nop +/* 3DE588 E00E4588 00000000 */ nop /* 3DE58C E00E458C 46800020 */ cvt.s.w $f0, $f0 /* 3DE590 E00E4590 46000021 */ cvt.d.s $f0, $f0 /* 3DE594 E00E4594 46380002 */ mul.d $f0, $f0, $f24 -/* 3DE598 E00E4598 00000000 */ nop +/* 3DE598 E00E4598 00000000 */ nop /* 3DE59C E00E459C 3C013FE0 */ lui $at, 0x3fe0 /* 3DE5A0 E00E45A0 44811800 */ mtc1 $at, $f3 /* 3DE5A4 E00E45A4 44801000 */ mtc1 $zero, $f2 -/* 3DE5A8 E00E45A8 00000000 */ nop +/* 3DE5A8 E00E45A8 00000000 */ nop /* 3DE5AC E00E45AC 46220000 */ add.d $f0, $f0, $f2 /* 3DE5B0 E00E45B0 46200020 */ cvt.s.d $f0, $f0 /* 3DE5B4 E00E45B4 E6000000 */ swc1 $f0, ($s0) @@ -219,7 +219,7 @@ glabel func_E00E4290 /* 3DE5C0 E00E45C0 460C5281 */ sub.s $f10, $f10, $f12 /* 3DE5C4 E00E45C4 460052A1 */ cvt.d.s $f10, $f10 /* 3DE5C8 E00E45C8 46365282 */ mul.d $f10, $f10, $f22 -/* 3DE5CC E00E45CC 00000000 */ nop +/* 3DE5CC E00E45CC 00000000 */ nop /* 3DE5D0 E00E45D0 C608FFC4 */ lwc1 $f8, -0x3c($s0) /* 3DE5D4 E00E45D4 C606FFD0 */ lwc1 $f6, -0x30($s0) /* 3DE5D8 E00E45D8 C604FFAC */ lwc1 $f4, -0x54($s0) @@ -235,7 +235,7 @@ glabel func_E00E4290 /* 3DE600 E00E4600 90224E00 */ lbu $v0, %lo(D_E00E4E00)($at) /* 3DE604 E00E4604 460031A1 */ cvt.d.s $f6, $f6 /* 3DE608 E00E4608 46363182 */ mul.d $f6, $f6, $f22 -/* 3DE60C E00E460C 00000000 */ nop +/* 3DE60C E00E460C 00000000 */ nop /* 3DE610 E00E4610 3C01E00E */ lui $at, %hi(D_E00E4E30) /* 3DE614 E00E4614 D4224E30 */ ldc1 $f2, %lo(D_E00E4E30)($at) /* 3DE618 E00E4618 46006321 */ cvt.d.s $f12, $f12 @@ -269,22 +269,22 @@ glabel func_E00E4290 /* 3DE684 E00E4684 24040014 */ addiu $a0, $zero, 0x14 /* 3DE688 E00E4688 2442FFF6 */ addiu $v0, $v0, -0xa /* 3DE68C E00E468C 44820000 */ mtc1 $v0, $f0 -/* 3DE690 E00E4690 00000000 */ nop +/* 3DE690 E00E4690 00000000 */ nop /* 3DE694 E00E4694 46800020 */ cvt.s.w $f0, $f0 /* 3DE698 E00E4698 46000021 */ cvt.d.s $f0, $f0 /* 3DE69C E00E469C 46380002 */ mul.d $f0, $f0, $f24 -/* 3DE6A0 E00E46A0 00000000 */ nop +/* 3DE6A0 E00E46A0 00000000 */ nop /* 3DE6A4 E00E46A4 24040014 */ addiu $a0, $zero, 0x14 /* 3DE6A8 E00E46A8 46200020 */ cvt.s.d $f0, $f0 /* 3DE6AC E00E46AC 0C080138 */ jal func_E02004E0 /* 3DE6B0 E00E46B0 E600FFC0 */ swc1 $f0, -0x40($s0) /* 3DE6B4 E00E46B4 2442FFF6 */ addiu $v0, $v0, -0xa /* 3DE6B8 E00E46B8 44820000 */ mtc1 $v0, $f0 -/* 3DE6BC E00E46BC 00000000 */ nop +/* 3DE6BC E00E46BC 00000000 */ nop /* 3DE6C0 E00E46C0 46800020 */ cvt.s.w $f0, $f0 /* 3DE6C4 E00E46C4 46000021 */ cvt.d.s $f0, $f0 /* 3DE6C8 E00E46C8 46380002 */ mul.d $f0, $f0, $f24 -/* 3DE6CC E00E46CC 00000000 */ nop +/* 3DE6CC E00E46CC 00000000 */ nop /* 3DE6D0 E00E46D0 46200020 */ cvt.s.d $f0, $f0 /* 3DE6D4 E00E46D4 080391B8 */ j .LE00E46E0 /* 3DE6D8 E00E46D8 E600FFC4 */ swc1 $f0, -0x3c($s0) @@ -297,12 +297,12 @@ glabel func_E00E4290 /* 3DE6EC E00E46EC AE00FFD0 */ sw $zero, -0x30($s0) /* 3DE6F0 E00E46F0 2404000F */ addiu $a0, $zero, 0xf /* 3DE6F4 E00E46F4 44820000 */ mtc1 $v0, $f0 -/* 3DE6F8 E00E46F8 00000000 */ nop +/* 3DE6F8 E00E46F8 00000000 */ nop /* 3DE6FC E00E46FC 46800020 */ cvt.s.w $f0, $f0 /* 3DE700 E00E4700 0C080138 */ jal func_E02004E0 /* 3DE704 E00E4704 E6000004 */ swc1 $f0, 4($s0) /* 3DE708 E00E4708 44820000 */ mtc1 $v0, $f0 -/* 3DE70C E00E470C 00000000 */ nop +/* 3DE70C E00E470C 00000000 */ nop /* 3DE710 E00E4710 46800020 */ cvt.s.w $f0, $f0 /* 3DE714 E00E4714 E6000008 */ swc1 $f0, 8($s0) /* 3DE718 E00E4718 AE16FFEC */ sw $s6, -0x14($s0) @@ -313,17 +313,17 @@ glabel func_E00E4290 /* 3DE728 E00E4728 3C01E00E */ lui $at, %hi(D_E00E4E40) /* 3DE72C E00E472C D4204E40 */ ldc1 $f0, %lo(D_E00E4E40)($at) /* 3DE730 E00E4730 44827000 */ mtc1 $v0, $f14 -/* 3DE734 E00E4734 00000000 */ nop +/* 3DE734 E00E4734 00000000 */ nop /* 3DE738 E00E4738 468073A0 */ cvt.s.w $f14, $f14 /* 3DE73C E00E473C 460073A1 */ cvt.d.s $f14, $f14 /* 3DE740 E00E4740 46207382 */ mul.d $f14, $f14, $f0 -/* 3DE744 E00E4744 00000000 */ nop +/* 3DE744 E00E4744 00000000 */ nop /* 3DE748 E00E4748 C60CFFC0 */ lwc1 $f12, -0x40($s0) /* 3DE74C E00E474C C60AFFCC */ lwc1 $f10, -0x34($s0) /* 3DE750 E00E4750 460C5281 */ sub.s $f10, $f10, $f12 /* 3DE754 E00E4754 460052A1 */ cvt.d.s $f10, $f10 /* 3DE758 E00E4758 46365282 */ mul.d $f10, $f10, $f22 -/* 3DE75C E00E475C 00000000 */ nop +/* 3DE75C E00E475C 00000000 */ nop /* 3DE760 E00E4760 C608FFC4 */ lwc1 $f8, -0x3c($s0) /* 3DE764 E00E4764 C606FFD0 */ lwc1 $f6, -0x30($s0) /* 3DE768 E00E4768 46083181 */ sub.s $f6, $f6, $f8 @@ -335,7 +335,7 @@ glabel func_E00E4290 /* 3DE780 E00E4780 46001080 */ add.s $f2, $f2, $f0 /* 3DE784 E00E4784 460031A1 */ cvt.d.s $f6, $f6 /* 3DE788 E00E4788 46363182 */ mul.d $f6, $f6, $f22 -/* 3DE78C E00E478C 00000000 */ nop +/* 3DE78C E00E478C 00000000 */ nop /* 3DE790 E00E4790 3C01E00E */ lui $at, %hi(D_E00E4E48) /* 3DE794 E00E4794 D4204E48 */ ldc1 $f0, %lo(D_E00E4E48)($at) /* 3DE798 E00E4798 46006321 */ cvt.d.s $f12, $f12 @@ -392,7 +392,7 @@ glabel func_E00E4290 /* 3DE85C E00E485C 24020004 */ addiu $v0, $zero, 4 .LE00E4860: /* 3DE860 E00E4860 16420006 */ bne $s2, $v0, .LE00E487C -/* 3DE864 E00E4864 00000000 */ nop +/* 3DE864 E00E4864 00000000 */ nop /* 3DE868 E00E4868 8E02FFD4 */ lw $v0, -0x2c($s0) /* 3DE86C E00E486C 3C01E00E */ lui $at, %hi(D_E00E4DE0) /* 3DE870 E00E4870 00220821 */ addu $at, $at, $v0 @@ -406,11 +406,11 @@ glabel func_E00E4290 /* 3DE888 E00E4888 3C01E00E */ lui $at, %hi(D_E00E4E58) /* 3DE88C E00E488C D4224E58 */ ldc1 $f2, %lo(D_E00E4E58)($at) /* 3DE890 E00E4890 44820000 */ mtc1 $v0, $f0 -/* 3DE894 E00E4894 00000000 */ nop +/* 3DE894 E00E4894 00000000 */ nop /* 3DE898 E00E4898 46800020 */ cvt.s.w $f0, $f0 /* 3DE89C E00E489C 46000021 */ cvt.d.s $f0, $f0 /* 3DE8A0 E00E48A0 46220002 */ mul.d $f0, $f0, $f2 -/* 3DE8A4 E00E48A4 00000000 */ nop +/* 3DE8A4 E00E48A4 00000000 */ nop /* 3DE8A8 E00E48A8 46200020 */ cvt.s.d $f0, $f0 /* 3DE8AC E00E48AC E6000000 */ swc1 $f0, ($s0) .LE00E48B0: diff --git a/asm/nonmatchings/code_3DE000/func_E00E4954.s b/asm/nonmatchings/code_3DE000/func_E00E4954.s index 83c00fab5b..8508c3b632 100644 --- a/asm/nonmatchings/code_3DE000/func_E00E4954.s +++ b/asm/nonmatchings/code_3DE000/func_E00E4954.s @@ -3,4 +3,4 @@ glabel func_E00E4954 /* 3DE954 E00E4954 03E00008 */ jr $ra -/* 3DE958 E00E4958 00000000 */ nop +/* 3DE958 E00E4958 00000000 */ nop diff --git a/asm/nonmatchings/code_3DE000/func_E00E495C.s b/asm/nonmatchings/code_3DE000/func_E00E495C.s index 13b4e00c4a..ca4da6531f 100644 --- a/asm/nonmatchings/code_3DE000/func_E00E495C.s +++ b/asm/nonmatchings/code_3DE000/func_E00E495C.s @@ -48,7 +48,7 @@ glabel func_E00E495C /* 3DEA08 E00E4A08 AC820008 */ sw $v0, 8($a0) /* 3DEA0C E00E4A0C 3C028000 */ lui $v0, 0x8000 /* 3DEA10 E00E4A10 46041502 */ mul.s $f20, $f2, $f4 -/* 3DEA14 E00E4A14 00000000 */ nop +/* 3DEA14 E00E4A14 00000000 */ nop /* 3DEA18 E00E4A18 00621821 */ addu $v1, $v1, $v0 /* 3DEA1C E00E4A1C AC830004 */ sw $v1, 4($a0) /* 3DEA20 E00E4A20 9102004B */ lbu $v0, 0x4b($t0) @@ -105,7 +105,7 @@ glabel func_E00E495C /* 3DEAE8 E00E4AE8 000218C0 */ sll $v1, $v0, 3 /* 3DEAEC E00E4AEC 00431021 */ addu $v0, $v0, $v1 /* 3DEAF0 E00E4AF0 46140002 */ mul.s $f0, $f0, $f20 -/* 3DEAF4 E00E4AF4 00000000 */ nop +/* 3DEAF4 E00E4AF4 00000000 */ nop /* 3DEAF8 E00E4AF8 000210C0 */ sll $v0, $v0, 3 /* 3DEAFC E00E4AFC 004A1021 */ addu $v0, $v0, $t2 /* 3DEB00 E00E4B00 C442006C */ lwc1 $f2, 0x6c($v0) @@ -155,7 +155,7 @@ glabel func_E00E495C /* 3DEBB0 E00E4BB0 C600FFE4 */ lwc1 $f0, -0x1c($s0) /* 3DEBB4 E00E4BB4 46800020 */ cvt.s.w $f0, $f0 /* 3DEBB8 E00E4BB8 4600A002 */ mul.s $f0, $f20, $f0 -/* 3DEBBC E00E4BBC 00000000 */ nop +/* 3DEBBC E00E4BBC 00000000 */ nop /* 3DEBC0 E00E4BC0 9203FFDB */ lbu $v1, -0x25($s0) /* 3DEBC4 E00E4BC4 9204FFDF */ lbu $a0, -0x21($s0) /* 3DEBC8 E00E4BC8 9202FFE3 */ lbu $v0, -0x1d($s0) @@ -164,7 +164,7 @@ glabel func_E00E495C /* 3DEBD4 E00E4BD4 00641825 */ or $v1, $v1, $a0 /* 3DEBD8 E00E4BD8 00021200 */ sll $v0, $v0, 8 /* 3DEBDC E00E4BDC 4600B03E */ c.le.s $f22, $f0 -/* 3DEBE0 E00E4BE0 00000000 */ nop +/* 3DEBE0 E00E4BE0 00000000 */ nop /* 3DEBE4 E00E4BE4 45010005 */ bc1t .LE00E4BFC /* 3DEBE8 E00E4BE8 00621825 */ or $v1, $v1, $v0 /* 3DEBEC E00E4BEC 4600018D */ trunc.w.s $f6, $f0 @@ -176,7 +176,7 @@ glabel func_E00E495C /* 3DEC00 E00E4C00 3C028000 */ lui $v0, 0x8000 /* 3DEC04 E00E4C04 4600018D */ trunc.w.s $f6, $f0 /* 3DEC08 E00E4C08 44043000 */ mfc1 $a0, $f6 -/* 3DEC0C E00E4C0C 00000000 */ nop +/* 3DEC0C E00E4C0C 00000000 */ nop /* 3DEC10 E00E4C10 00822025 */ or $a0, $a0, $v0 /* 3DEC14 E00E4C14 308200FF */ andi $v0, $a0, 0xff .LE00E4C18: @@ -188,7 +188,7 @@ glabel func_E00E495C /* 3DEC2C E00E4C2C 00C0282D */ daddu $a1, $a2, $zero /* 3DEC30 E00E4C30 4600018D */ trunc.w.s $f6, $f0 /* 3DEC34 E00E4C34 44043000 */ mfc1 $a0, $f6 -/* 3DEC38 E00E4C38 00000000 */ nop +/* 3DEC38 E00E4C38 00000000 */ nop /* 3DEC3C E00E4C3C 00042080 */ sll $a0, $a0, 2 /* 3DEC40 E00E4C40 30840FFF */ andi $a0, $a0, 0xfff /* 3DEC44 E00E4C44 00042300 */ sll $a0, $a0, 0xc @@ -196,7 +196,7 @@ glabel func_E00E495C /* 3DEC4C E00E4C4C 24C60008 */ addiu $a2, $a2, 8 /* 3DEC50 E00E4C50 4600018D */ trunc.w.s $f6, $f0 /* 3DEC54 E00E4C54 44023000 */ mfc1 $v0, $f6 -/* 3DEC58 E00E4C58 00000000 */ nop +/* 3DEC58 E00E4C58 00000000 */ nop /* 3DEC5C E00E4C5C 00021080 */ sll $v0, $v0, 2 /* 3DEC60 E00E4C60 30420FFF */ andi $v0, $v0, 0xfff /* 3DEC64 E00E4C64 00431025 */ or $v0, $v0, $v1 @@ -207,7 +207,7 @@ glabel func_E00E495C /* 3DEC78 E00E4C78 AE260000 */ sw $a2, ($s1) /* 3DEC7C E00E4C7C 4600018D */ trunc.w.s $f6, $f0 /* 3DEC80 E00E4C80 44043000 */ mfc1 $a0, $f6 -/* 3DEC84 E00E4C84 00000000 */ nop +/* 3DEC84 E00E4C84 00000000 */ nop /* 3DEC88 E00E4C88 2484000F */ addiu $a0, $a0, 0xf /* 3DEC8C E00E4C8C 00042080 */ sll $a0, $a0, 2 /* 3DEC90 E00E4C90 30840FFF */ andi $a0, $a0, 0xfff @@ -215,7 +215,7 @@ glabel func_E00E495C /* 3DEC98 E00E4C98 00042300 */ sll $a0, $a0, 0xc /* 3DEC9C E00E4C9C 4600018D */ trunc.w.s $f6, $f0 /* 3DECA0 E00E4CA0 44023000 */ mfc1 $v0, $f6 -/* 3DECA4 E00E4CA4 00000000 */ nop +/* 3DECA4 E00E4CA4 00000000 */ nop /* 3DECA8 E00E4CA8 2442000F */ addiu $v0, $v0, 0xf /* 3DECAC E00E4CAC 00021080 */ sll $v0, $v0, 2 /* 3DECB0 E00E4CB0 30420FFF */ andi $v0, $v0, 0xfff diff --git a/asm/nonmatchings/code_3E1690/func_E00E8000.s b/asm/nonmatchings/code_3E1690/func_E00E8000.s index e5550d66f0..6fbd75cd51 100644 --- a/asm/nonmatchings/code_3E1690/func_E00E8000.s +++ b/asm/nonmatchings/code_3E1690/func_E00E8000.s @@ -43,57 +43,57 @@ glabel func_E00E8000 /* 3E1728 E00E8098 AE22000C */ sw $v0, 0xc($s1) .LE00E809C: /* 3E172C E00E809C 0803A027 */ j .LE00E809C -/* 3E1730 E00E80A0 00000000 */ nop +/* 3E1730 E00E80A0 00000000 */ nop .LE00E80A4: /* 3E1734 E00E80A4 C7A00078 */ lwc1 $f0, 0x78($sp) /* 3E1738 E00E80A8 461E0601 */ sub.s $f24, $f0, $f30 /* 3E173C E00E80AC 4618C082 */ mul.s $f2, $f24, $f24 -/* 3E1740 E00E80B0 00000000 */ nop +/* 3E1740 E00E80B0 00000000 */ nop /* 3E1744 E00E80B4 C7A60070 */ lwc1 $f6, 0x70($sp) /* 3E1748 E00E80B8 C7A0007C */ lwc1 $f0, 0x7c($sp) /* 3E174C E00E80BC 46060581 */ sub.s $f22, $f0, $f6 /* 3E1750 E00E80C0 4616B102 */ mul.s $f4, $f22, $f22 -/* 3E1754 E00E80C4 00000000 */ nop +/* 3E1754 E00E80C4 00000000 */ nop /* 3E1758 E00E80C8 C7A00080 */ lwc1 $f0, 0x80($sp) /* 3E175C E00E80CC C7A60074 */ lwc1 $f6, 0x74($sp) /* 3E1760 E00E80D0 46060501 */ sub.s $f20, $f0, $f6 /* 3E1764 E00E80D4 4614A002 */ mul.s $f0, $f20, $f20 -/* 3E1768 E00E80D8 00000000 */ nop +/* 3E1768 E00E80D8 00000000 */ nop /* 3E176C E00E80DC 46041080 */ add.s $f2, $f2, $f4 /* 3E1770 E00E80E0 4480D000 */ mtc1 $zero, $f26 /* 3E1774 E00E80E4 46001300 */ add.s $f12, $f2, $f0 /* 3E1778 E00E80E8 AE120000 */ sw $s2, ($s0) /* 3E177C E00E80EC 461A6032 */ c.eq.s $f12, $f26 -/* 3E1780 E00E80F0 00000000 */ nop +/* 3E1780 E00E80F0 00000000 */ nop /* 3E1784 E00E80F4 45010004 */ bc1t .LE00E8108 /* 3E1788 E00E80F8 AE000020 */ sw $zero, 0x20($s0) /* 3E178C E00E80FC 0C080154 */ jal func_E0200550 -/* 3E1790 E00E8100 00000000 */ nop +/* 3E1790 E00E8100 00000000 */ nop /* 3E1794 E00E8104 46000306 */ mov.s $f12, $f0 .LE00E8108: /* 3E1798 E00E8108 461CD03C */ c.lt.s $f26, $f28 -/* 3E179C E00E810C 00000000 */ nop +/* 3E179C E00E810C 00000000 */ nop /* 3E17A0 E00E8110 45000005 */ bc1f .LE00E8128 /* 3E17A4 E00E8114 0000102D */ daddu $v0, $zero, $zero /* 3E17A8 E00E8118 461C6003 */ div.s $f0, $f12, $f28 /* 3E17AC E00E811C 4600018D */ trunc.w.s $f6, $f0 /* 3E17B0 E00E8120 44023000 */ mfc1 $v0, $f6 -/* 3E17B4 E00E8124 00000000 */ nop +/* 3E17B4 E00E8124 00000000 */ nop .LE00E8128: /* 3E17B8 E00E8128 50400011 */ beql $v0, $zero, .LE00E8170 /* 3E17BC E00E812C AE000010 */ sw $zero, 0x10($s0) /* 3E17C0 E00E8130 3C013F80 */ lui $at, 0x3f80 /* 3E17C4 E00E8134 44811000 */ mtc1 $at, $f2 /* 3E17C8 E00E8138 44820000 */ mtc1 $v0, $f0 -/* 3E17CC E00E813C 00000000 */ nop +/* 3E17CC E00E813C 00000000 */ nop /* 3E17D0 E00E8140 46800020 */ cvt.s.w $f0, $f0 /* 3E17D4 E00E8144 46001303 */ div.s $f12, $f2, $f0 /* 3E17D8 E00E8148 460CC002 */ mul.s $f0, $f24, $f12 -/* 3E17DC E00E814C 00000000 */ nop +/* 3E17DC E00E814C 00000000 */ nop /* 3E17E0 E00E8150 460CB082 */ mul.s $f2, $f22, $f12 -/* 3E17E4 E00E8154 00000000 */ nop +/* 3E17E4 E00E8154 00000000 */ nop /* 3E17E8 E00E8158 460CA102 */ mul.s $f4, $f20, $f12 -/* 3E17EC E00E815C 00000000 */ nop +/* 3E17EC E00E815C 00000000 */ nop /* 3E17F0 E00E8160 E6000010 */ swc1 $f0, 0x10($s0) /* 3E17F4 E00E8164 E6020014 */ swc1 $f2, 0x14($s0) /* 3E17F8 E00E8168 0803A05E */ j .LE00E8178 diff --git a/asm/nonmatchings/code_3E1690/func_E00E825C.s b/asm/nonmatchings/code_3E1690/func_E00E825C.s index 67f2b765a5..6f174dfbb8 100644 --- a/asm/nonmatchings/code_3E1690/func_E00E825C.s +++ b/asm/nonmatchings/code_3E1690/func_E00E825C.s @@ -3,4 +3,4 @@ glabel func_E00E825C /* 3E18EC E00E825C 03E00008 */ jr $ra -/* 3E18F0 E00E8260 00000000 */ nop +/* 3E18F0 E00E8260 00000000 */ nop diff --git a/asm/nonmatchings/code_3E1690/func_E00E8264.s b/asm/nonmatchings/code_3E1690/func_E00E8264.s index 6f1ec6d512..923db3cb6e 100644 --- a/asm/nonmatchings/code_3E1690/func_E00E8264.s +++ b/asm/nonmatchings/code_3E1690/func_E00E8264.s @@ -27,9 +27,9 @@ glabel func_E00E8264 /* 3E1944 E00E82B4 04C10005 */ bgez $a2, .LE00E82CC /* 3E1948 E00E82B8 AC650020 */ sw $a1, 0x20($v1) /* 3E194C E00E82BC 0C080128 */ jal func_E02004A0 -/* 3E1950 E00E82C0 00000000 */ nop +/* 3E1950 E00E82C0 00000000 */ nop /* 3E1954 E00E82C4 0803A0DA */ j .LE00E8368 -/* 3E1958 E00E82C8 00000000 */ nop +/* 3E1958 E00E82C8 00000000 */ nop .LE00E82CC: /* 3E195C E00E82CC 10E00004 */ beqz $a3, .LE00E82E0 /* 3E1960 E00E82D0 00C0202D */ daddu $a0, $a2, $zero diff --git a/asm/nonmatchings/code_3E1690/func_E00E83BC.s b/asm/nonmatchings/code_3E1690/func_E00E83BC.s index 844513c696..cce4d9e646 100644 --- a/asm/nonmatchings/code_3E1690/func_E00E83BC.s +++ b/asm/nonmatchings/code_3E1690/func_E00E83BC.s @@ -156,6 +156,6 @@ glabel func_E00E83BC /* 3E1CA8 E00E8618 8FB00090 */ lw $s0, 0x90($sp) /* 3E1CAC E00E861C 03E00008 */ jr $ra /* 3E1CB0 E00E8620 27BD00B0 */ addiu $sp, $sp, 0xb0 -/* 3E1CB4 E00E8624 00000000 */ nop -/* 3E1CB8 E00E8628 00000000 */ nop -/* 3E1CBC E00E862C 00000000 */ nop +/* 3E1CB4 E00E8624 00000000 */ nop +/* 3E1CB8 E00E8628 00000000 */ nop +/* 3E1CBC E00E862C 00000000 */ nop diff --git a/asm/nonmatchings/code_3E54C0/func_E010C000.s b/asm/nonmatchings/code_3E54C0/func_E010C000.s index 3bbe859a06..cd625bbd89 100644 --- a/asm/nonmatchings/code_3E54C0/func_E010C000.s +++ b/asm/nonmatchings/code_3E54C0/func_E010C000.s @@ -40,7 +40,7 @@ glabel func_E010C000 /* 3E554C E010C08C AE02000C */ sw $v0, 0xc($s0) .LE010C090: /* 3E5550 E010C090 08043024 */ j .LE010C090 -/* 3E5554 E010C094 00000000 */ nop +/* 3E5554 E010C094 00000000 */ nop .LE010C098: /* 3E5558 E010C098 AC920000 */ sw $s2, ($a0) /* 3E555C E010C09C 1E200004 */ bgtz $s1, .LE010C0B0 diff --git a/asm/nonmatchings/code_3E54C0/func_E010C190.s b/asm/nonmatchings/code_3E54C0/func_E010C190.s index 42271748e5..a83ed30035 100644 --- a/asm/nonmatchings/code_3E54C0/func_E010C190.s +++ b/asm/nonmatchings/code_3E54C0/func_E010C190.s @@ -3,4 +3,4 @@ glabel func_E010C190 /* 3E5650 E010C190 03E00008 */ jr $ra -/* 3E5654 E010C194 00000000 */ nop +/* 3E5654 E010C194 00000000 */ nop diff --git a/asm/nonmatchings/code_3E54C0/func_E010C198.s b/asm/nonmatchings/code_3E54C0/func_E010C198.s index bdd50ed516..f3c19da652 100644 --- a/asm/nonmatchings/code_3E54C0/func_E010C198.s +++ b/asm/nonmatchings/code_3E54C0/func_E010C198.s @@ -38,9 +38,9 @@ glabel func_E010C198 /* 3E56D4 E010C214 04610005 */ bgez $v1, .LE010C22C /* 3E56D8 E010C218 AE220014 */ sw $v0, 0x14($s1) /* 3E56DC E010C21C 0C080128 */ jal func_E02004A0 -/* 3E56E0 E010C220 00000000 */ nop +/* 3E56E0 E010C220 00000000 */ nop /* 3E56E4 E010C224 080430C6 */ j .LE010C318 -/* 3E56E8 E010C228 00000000 */ nop +/* 3E56E8 E010C228 00000000 */ nop .LE010C22C: /* 3E56EC E010C22C 0000982D */ daddu $s3, $zero, $zero /* 3E56F0 E010C230 3C159249 */ lui $s5, 0x9249 @@ -73,20 +73,20 @@ glabel func_E010C198 /* 3E5754 E010C294 00021083 */ sra $v0, $v0, 2 /* 3E5758 E010C298 00431023 */ subu $v0, $v0, $v1 /* 3E575C E010C29C 4482A000 */ mtc1 $v0, $f20 -/* 3E5760 E010C2A0 00000000 */ nop +/* 3E5760 E010C2A0 00000000 */ nop /* 3E5764 E010C2A4 4680A520 */ cvt.s.w $f20, $f20 /* 3E5768 E010C2A8 4614F500 */ add.s $f20, $f30, $f20 /* 3E576C E010C2AC 0C080140 */ jal func_E0200500 /* 3E5770 E010C2B0 4600A306 */ mov.s $f12, $f20 /* 3E5774 E010C2B4 4600E002 */ mul.s $f0, $f28, $f0 -/* 3E5778 E010C2B8 00000000 */ nop +/* 3E5778 E010C2B8 00000000 */ nop /* 3E577C E010C2BC 4600D000 */ add.s $f0, $f26, $f0 /* 3E5780 E010C2C0 4600A306 */ mov.s $f12, $f20 /* 3E5784 E010C2C4 E6180008 */ swc1 $f24, 8($s0) /* 3E5788 E010C2C8 0C080144 */ jal func_E0200510 /* 3E578C E010C2CC E6000004 */ swc1 $f0, 4($s0) /* 3E5790 E010C2D0 4600E002 */ mul.s $f0, $f28, $f0 -/* 3E5794 E010C2D4 00000000 */ nop +/* 3E5794 E010C2D4 00000000 */ nop /* 3E5798 E010C2D8 4600B000 */ add.s $f0, $f22, $f0 /* 3E579C E010C2DC E600000C */ swc1 $f0, 0xc($s0) .LE010C2E0: diff --git a/asm/nonmatchings/code_3E54C0/func_E010C39C.s b/asm/nonmatchings/code_3E54C0/func_E010C39C.s index 7640f4b6a4..d9101d41d5 100644 --- a/asm/nonmatchings/code_3E54C0/func_E010C39C.s +++ b/asm/nonmatchings/code_3E54C0/func_E010C39C.s @@ -74,7 +74,7 @@ glabel func_E010C39C /* 3E596C E010C4AC 10400056 */ beqz $v0, .LE010C608 /* 3E5970 E010C4B0 30820002 */ andi $v0, $a0, 2 /* 3E5974 E010C4B4 10400005 */ beqz $v0, .LE010C4CC -/* 3E5978 E010C4B8 00000000 */ nop +/* 3E5978 E010C4B8 00000000 */ nop /* 3E597C E010C4BC C4660010 */ lwc1 $f6, 0x10($v1) /* 3E5980 E010C4C0 C4640014 */ lwc1 $f4, 0x14($v1) /* 3E5984 E010C4C4 08043136 */ j .LE010C4D8 @@ -86,7 +86,7 @@ glabel func_E010C39C .LE010C4D8: /* 3E5998 E010C4D8 C640000C */ lwc1 $f0, 0xc($s2) /* 3E599C E010C4DC 4602003C */ c.lt.s $f0, $f2 -/* 3E59A0 E010C4E0 00000000 */ nop +/* 3E59A0 E010C4E0 00000000 */ nop /* 3E59A4 E010C4E4 45030049 */ bc1tl .LE010C60C /* 3E59A8 E010C4E8 26730001 */ addiu $s3, $s3, 1 /* 3E59AC E010C4EC 4405A000 */ mfc1 $a1, $f20 @@ -174,11 +174,11 @@ glabel func_E010C39C /* 3E5AEC E010C62C 44801000 */ mtc1 $zero, $f2 /* 3E5AF0 E010C630 00431023 */ subu $v0, $v0, $v1 /* 3E5AF4 E010C634 44820000 */ mtc1 $v0, $f0 -/* 3E5AF8 E010C638 00000000 */ nop +/* 3E5AF8 E010C638 00000000 */ nop /* 3E5AFC E010C63C 46800020 */ cvt.s.w $f0, $f0 /* 3E5B00 E010C640 46000021 */ cvt.d.s $f0, $f0 /* 3E5B04 E010C644 46220002 */ mul.d $f0, $f0, $f2 -/* 3E5B08 E010C648 00000000 */ nop +/* 3E5B08 E010C648 00000000 */ nop /* 3E5B0C E010C64C 3C110001 */ lui $s1, 1 /* 3E5B10 E010C650 36311630 */ ori $s1, $s1, 0x1630 /* 3E5B14 E010C654 0000982D */ daddu $s3, $zero, $zero @@ -203,7 +203,7 @@ glabel func_E010C39C /* 3E5B60 E010C6A0 D422CA68 */ ldc1 $f2, %lo(D_E010CA68)($at) /* 3E5B64 E010C6A4 46000021 */ cvt.d.s $f0, $f0 /* 3E5B68 E010C6A8 46220002 */ mul.d $f0, $f0, $f2 -/* 3E5B6C E010C6AC 00000000 */ nop +/* 3E5B6C E010C6AC 00000000 */ nop /* 3E5B70 E010C6B0 0040A02D */ daddu $s4, $v0, $zero /* 3E5B74 E010C6B4 3C160001 */ lui $s6, 1 /* 3E5B78 E010C6B8 36D61630 */ ori $s6, $s6, 0x1630 @@ -319,7 +319,7 @@ glabel func_E010C39C /* 3E5D2C E010C86C 10400056 */ beqz $v0, .LE010C9C8 /* 3E5D30 E010C870 30820002 */ andi $v0, $a0, 2 /* 3E5D34 E010C874 10400005 */ beqz $v0, .LE010C88C -/* 3E5D38 E010C878 00000000 */ nop +/* 3E5D38 E010C878 00000000 */ nop /* 3E5D3C E010C87C C4660010 */ lwc1 $f6, 0x10($v1) /* 3E5D40 E010C880 C4640014 */ lwc1 $f4, 0x14($v1) /* 3E5D44 E010C884 08043226 */ j .LE010C898 @@ -331,7 +331,7 @@ glabel func_E010C39C .LE010C898: /* 3E5D58 E010C898 C640000C */ lwc1 $f0, 0xc($s2) /* 3E5D5C E010C89C 4600103E */ c.le.s $f2, $f0 -/* 3E5D60 E010C8A0 00000000 */ nop +/* 3E5D60 E010C8A0 00000000 */ nop /* 3E5D64 E010C8A4 45030049 */ bc1tl .LE010C9CC /* 3E5D68 E010C8A8 26730001 */ addiu $s3, $s3, 1 /* 3E5D6C E010C8AC 4405A000 */ mfc1 $a1, $f20 @@ -424,4 +424,4 @@ glabel func_E010C39C /* 3E5EC0 E010CA00 D7B400D0 */ ldc1 $f20, 0xd0($sp) /* 3E5EC4 E010CA04 03E00008 */ jr $ra /* 3E5EC8 E010CA08 27BD00D8 */ addiu $sp, $sp, 0xd8 -/* 3E5ECC E010CA0C 00000000 */ nop +/* 3E5ECC E010CA0C 00000000 */ nop diff --git a/asm/nonmatchings/code_3F9E50/func_E0112000.s b/asm/nonmatchings/code_3F9E50/func_E0112000.s index f222778cec..636ed9c0fe 100644 --- a/asm/nonmatchings/code_3F9E50/func_E0112000.s +++ b/asm/nonmatchings/code_3F9E50/func_E0112000.s @@ -44,7 +44,7 @@ glabel func_E0112000 /* 3F9EEC E011209C AE22000C */ sw $v0, 0xc($s1) .LE01120A0: /* 3F9EF0 E01120A0 08044828 */ j .LE01120A0 -/* 3F9EF4 E01120A4 00000000 */ nop +/* 3F9EF4 E01120A4 00000000 */ nop .LE01120A8: /* 3F9EF8 E01120A8 AE120000 */ sw $s2, ($s0) /* 3F9EFC E01120AC 1E600004 */ bgtz $s3, .LE01120C0 @@ -84,7 +84,7 @@ glabel func_E0112000 /* 3F9F78 E0112128 0C080150 */ jal func_E0200540 /* 3F9F7C E011212C 24040072 */ addiu $a0, $zero, 0x72 /* 3F9F80 E0112130 4616A102 */ mul.s $f4, $f20, $f22 -/* 3F9F84 E0112134 00000000 */ nop +/* 3F9F84 E0112134 00000000 */ nop /* 3F9F88 E0112138 24040003 */ addiu $a0, $zero, 3 /* 3F9F8C E011213C 24020010 */ addiu $v0, $zero, 0x10 /* 3F9F90 E0112140 4405C000 */ mfc1 $a1, $f24 @@ -96,7 +96,7 @@ glabel func_E0112000 /* 3F9FA8 E0112158 44811000 */ mtc1 $at, $f2 /* 3F9FAC E011215C 4406E000 */ mfc1 $a2, $f28 /* 3F9FB0 E0112160 4600A002 */ mul.s $f0, $f20, $f0 -/* 3F9FB4 E0112164 00000000 */ nop +/* 3F9FB4 E0112164 00000000 */ nop /* 3F9FB8 E0112168 AFA2001C */ sw $v0, 0x1c($sp) /* 3F9FBC E011216C AFA00020 */ sw $zero, 0x20($sp) /* 3F9FC0 E0112170 E7A20018 */ swc1 $f2, 0x18($sp) diff --git a/asm/nonmatchings/code_3F9E50/func_E01121B8.s b/asm/nonmatchings/code_3F9E50/func_E01121B8.s index 823b53e94e..46f0c513ff 100644 --- a/asm/nonmatchings/code_3F9E50/func_E01121B8.s +++ b/asm/nonmatchings/code_3F9E50/func_E01121B8.s @@ -3,4 +3,4 @@ glabel func_E01121B8 /* 3FA008 E01121B8 03E00008 */ jr $ra -/* 3FA00C E01121BC 00000000 */ nop +/* 3FA00C E01121BC 00000000 */ nop diff --git a/asm/nonmatchings/code_3F9E50/func_E01121C0.s b/asm/nonmatchings/code_3F9E50/func_E01121C0.s index fc9fc3a6e9..9d84d8dd80 100644 --- a/asm/nonmatchings/code_3F9E50/func_E01121C0.s +++ b/asm/nonmatchings/code_3F9E50/func_E01121C0.s @@ -27,10 +27,10 @@ glabel func_E01121C0 /* 3FA060 E0112210 0461000A */ bgez $v1, .LE011223C /* 3FA064 E0112214 AE020014 */ sw $v0, 0x14($s0) /* 3FA068 E0112218 0C080128 */ jal func_E02004A0 -/* 3FA06C E011221C 00000000 */ nop +/* 3FA06C E011221C 00000000 */ nop /* 3FA070 E0112220 8E03001C */ lw $v1, 0x1c($s0) /* 3FA074 E0112224 1060002C */ beqz $v1, .LE01122D8 -/* 3FA078 E0112228 00000000 */ nop +/* 3FA078 E0112228 00000000 */ nop /* 3FA07C E011222C 8C620000 */ lw $v0, ($v1) /* 3FA080 E0112230 34420010 */ ori $v0, $v0, 0x10 /* 3FA084 E0112234 080448B6 */ j .LE01122D8 @@ -38,24 +38,24 @@ glabel func_E01121C0 .LE011223C: /* 3FA08C E011223C 28620010 */ slti $v0, $v1, 0x10 /* 3FA090 E0112240 14400025 */ bnez $v0, .LE01122D8 -/* 3FA094 E0112244 00000000 */ nop +/* 3FA094 E0112244 00000000 */ nop /* 3FA098 E0112248 8E02001C */ lw $v0, 0x1c($s0) /* 3FA09C E011224C 10400022 */ beqz $v0, .LE01122D8 -/* 3FA0A0 E0112250 00000000 */ nop +/* 3FA0A0 E0112250 00000000 */ nop /* 3FA0A4 E0112254 C6000018 */ lwc1 $f0, 0x18($s0) /* 3FA0A8 E0112258 3C0141F0 */ lui $at, 0x41f0 /* 3FA0AC E011225C 44812000 */ mtc1 $at, $f4 -/* 3FA0B0 E0112260 00000000 */ nop +/* 3FA0B0 E0112260 00000000 */ nop /* 3FA0B4 E0112264 46040002 */ mul.s $f0, $f0, $f4 -/* 3FA0B8 E0112268 00000000 */ nop +/* 3FA0B8 E0112268 00000000 */ nop /* 3FA0BC E011226C 8C42000C */ lw $v0, 0xc($v0) /* 3FA0C0 E0112270 E4400010 */ swc1 $f0, 0x10($v0) /* 3FA0C4 E0112274 C6020018 */ lwc1 $f2, 0x18($s0) /* 3FA0C8 E0112278 3C014248 */ lui $at, 0x4248 /* 3FA0CC E011227C 44810000 */ mtc1 $at, $f0 -/* 3FA0D0 E0112280 00000000 */ nop +/* 3FA0D0 E0112280 00000000 */ nop /* 3FA0D4 E0112284 46001082 */ mul.s $f2, $f2, $f0 -/* 3FA0D8 E0112288 00000000 */ nop +/* 3FA0D8 E0112288 00000000 */ nop /* 3FA0DC E011228C 8E02001C */ lw $v0, 0x1c($s0) /* 3FA0E0 E0112290 8C42000C */ lw $v0, 0xc($v0) /* 3FA0E4 E0112294 E4420014 */ swc1 $f2, 0x14($v0) @@ -65,7 +65,7 @@ glabel func_E01121C0 /* 3FA0F4 E01122A4 E4400004 */ swc1 $f0, 4($v0) /* 3FA0F8 E01122A8 C6000018 */ lwc1 $f0, 0x18($s0) /* 3FA0FC E01122AC 46040002 */ mul.s $f0, $f0, $f4 -/* 3FA100 E01122B0 00000000 */ nop +/* 3FA100 E01122B0 00000000 */ nop /* 3FA104 E01122B4 C6020008 */ lwc1 $f2, 8($s0) /* 3FA108 E01122B8 8E02001C */ lw $v0, 0x1c($s0) /* 3FA10C E01122BC 46001081 */ sub.s $f2, $f2, $f0 diff --git a/asm/nonmatchings/code_3F9E50/func_E0112330.s b/asm/nonmatchings/code_3F9E50/func_E0112330.s index 2b3e68ccce..382ad9d47b 100644 --- a/asm/nonmatchings/code_3F9E50/func_E0112330.s +++ b/asm/nonmatchings/code_3F9E50/func_E0112330.s @@ -23,7 +23,7 @@ glabel func_E0112330 /* 3FA1C8 E0112378 00230821 */ addu $at, $at, $v1 /* 3FA1CC E011237C C4261DEC */ lwc1 $f6, %lo(D_800B1DEC)($at) /* 3FA1D0 E0112380 080448E3 */ j .LE011238C -/* 3FA1D4 E0112384 00000000 */ nop +/* 3FA1D4 E0112384 00000000 */ nop .LE0112388: /* 3FA1D8 E0112388 44803000 */ mtc1 $zero, $f6 .LE011238C: diff --git a/asm/nonmatchings/code_3F9E50/func_E01124CC.s b/asm/nonmatchings/code_3F9E50/func_E01124CC.s index fa5d55926d..b5995cb8bd 100644 --- a/asm/nonmatchings/code_3F9E50/func_E01124CC.s +++ b/asm/nonmatchings/code_3F9E50/func_E01124CC.s @@ -91,4 +91,4 @@ glabel func_E01124CC /* 3FA470 E0112620 8FB00010 */ lw $s0, 0x10($sp) /* 3FA474 E0112624 03E00008 */ jr $ra /* 3FA478 E0112628 27BD0028 */ addiu $sp, $sp, 0x28 -/* 3FA47C E011262C 00000000 */ nop +/* 3FA47C E011262C 00000000 */ nop diff --git a/asm/nonmatchings/code_412730/func_E0124000.s b/asm/nonmatchings/code_412730/func_E0124000.s index d0521db2b7..316faa8604 100644 --- a/asm/nonmatchings/code_412730/func_E0124000.s +++ b/asm/nonmatchings/code_412730/func_E0124000.s @@ -46,7 +46,7 @@ glabel func_E0124000 /* 4127D4 E01240A4 AFD1000C */ sw $s1, 0xc($fp) .LE01240A8: /* 4127D8 E01240A8 0804902A */ j .LE01240A8 -/* 4127DC E01240AC 00000000 */ nop +/* 4127DC E01240AC 00000000 */ nop .LE01240B0: /* 4127E0 E01240B0 24020050 */ addiu $v0, $zero, 0x50 /* 4127E4 E01240B4 24120001 */ addiu $s2, $zero, 1 @@ -87,31 +87,31 @@ glabel func_E0124000 /* 412868 E0124138 24040014 */ addiu $a0, $zero, 0x14 /* 41286C E012413C 2442FFF6 */ addiu $v0, $v0, -0xa /* 412870 E0124140 44820000 */ mtc1 $v0, $f0 -/* 412874 E0124144 00000000 */ nop +/* 412874 E0124144 00000000 */ nop /* 412878 E0124148 46800021 */ cvt.d.w $f0, $f0 /* 41287C E012414C 46380002 */ mul.d $f0, $f0, $f24 -/* 412880 E0124150 00000000 */ nop +/* 412880 E0124150 00000000 */ nop /* 412884 E0124154 4494A000 */ mtc1 $s4, $f20 -/* 412888 E0124158 00000000 */ nop +/* 412888 E0124158 00000000 */ nop /* 41288C E012415C 4680A521 */ cvt.d.w $f20, $f20 /* 412890 E0124160 4620A500 */ add.d $f20, $f20, $f0 /* 412894 E0124164 4600D306 */ mov.s $f12, $f26 /* 412898 E0124168 0C080144 */ jal func_E0200510 /* 41289C E012416C 4620A520 */ cvt.s.d $f20, $f20 /* 4128A0 E0124170 4600A002 */ mul.s $f0, $f20, $f0 -/* 4128A4 E0124174 00000000 */ nop +/* 4128A4 E0124174 00000000 */ nop /* 4128A8 E0124178 24040014 */ addiu $a0, $zero, 0x14 /* 4128AC E012417C 0C080138 */ jal func_E02004E0 /* 4128B0 E0124180 E600FFE4 */ swc1 $f0, -0x1c($s0) /* 4128B4 E0124184 2442FFF6 */ addiu $v0, $v0, -0xa /* 4128B8 E0124188 44821000 */ mtc1 $v0, $f2 -/* 4128BC E012418C 00000000 */ nop +/* 4128BC E012418C 00000000 */ nop /* 4128C0 E0124190 468010A1 */ cvt.d.w $f2, $f2 /* 4128C4 E0124194 46381082 */ mul.d $f2, $f2, $f24 -/* 4128C8 E0124198 00000000 */ nop +/* 4128C8 E0124198 00000000 */ nop /* 4128CC E012419C 00151040 */ sll $v0, $s5, 1 /* 4128D0 E01241A0 44820000 */ mtc1 $v0, $f0 -/* 4128D4 E01241A4 00000000 */ nop +/* 4128D4 E01241A4 00000000 */ nop /* 4128D8 E01241A8 46800021 */ cvt.d.w $f0, $f0 /* 4128DC E01241AC 46220000 */ add.d $f0, $f0, $f2 /* 4128E0 E01241B0 4600D306 */ mov.s $f12, $f26 @@ -121,13 +121,13 @@ glabel func_E0124000 /* 4128F0 E01241C0 C602FFE4 */ lwc1 $f2, -0x1c($s0) /* 4128F4 E01241C4 460010A1 */ cvt.d.s $f2, $f2 /* 4128F8 E01241C8 46361082 */ mul.d $f2, $f2, $f22 -/* 4128FC E01241CC 00000000 */ nop +/* 4128FC E01241CC 00000000 */ nop /* 412900 E01241D0 4600A502 */ mul.s $f20, $f20, $f0 -/* 412904 E01241D4 00000000 */ nop +/* 412904 E01241D4 00000000 */ nop /* 412908 E01241D8 C600FFE8 */ lwc1 $f0, -0x18($s0) /* 41290C E01241DC 46000021 */ cvt.d.s $f0, $f0 /* 412910 E01241E0 46360002 */ mul.d $f0, $f0, $f22 -/* 412914 E01241E4 00000000 */ nop +/* 412914 E01241E4 00000000 */ nop /* 412918 E01241E8 2404000A */ addiu $a0, $zero, 0xa /* 41291C E01241EC E614FFEC */ swc1 $f20, -0x14($s0) /* 412920 E01241F0 462010A0 */ cvt.s.d $f2, $f2 @@ -138,10 +138,10 @@ glabel func_E0124000 /* 412934 E0124204 3C01E012 */ lui $at, %hi(D_E0124C10) /* 412938 E0124208 D4224C10 */ ldc1 $f2, %lo(D_E0124C10)($at) /* 41293C E012420C 44820000 */ mtc1 $v0, $f0 -/* 412940 E0124210 00000000 */ nop +/* 412940 E0124210 00000000 */ nop /* 412944 E0124214 46800021 */ cvt.d.w $f0, $f0 /* 412948 E0124218 46220002 */ mul.d $f0, $f0, $f2 -/* 41294C E012421C 00000000 */ nop +/* 41294C E012421C 00000000 */ nop /* 412950 E0124220 26520001 */ addiu $s2, $s2, 1 /* 412954 E0124224 2631002C */ addiu $s1, $s1, 0x2c /* 412958 E0124228 24040007 */ addiu $a0, $zero, 7 diff --git a/asm/nonmatchings/code_412730/func_E01242FC.s b/asm/nonmatchings/code_412730/func_E01242FC.s index 1dc64f1b69..b4ae8396ce 100644 --- a/asm/nonmatchings/code_412730/func_E01242FC.s +++ b/asm/nonmatchings/code_412730/func_E01242FC.s @@ -3,4 +3,4 @@ glabel func_E01242FC /* 412A2C E01242FC 03E00008 */ jr $ra -/* 412A30 E0124300 00000000 */ nop +/* 412A30 E0124300 00000000 */ nop diff --git a/asm/nonmatchings/code_412730/func_E0124304.s b/asm/nonmatchings/code_412730/func_E0124304.s index 32f9f2714a..d08651f55d 100644 --- a/asm/nonmatchings/code_412730/func_E0124304.s +++ b/asm/nonmatchings/code_412730/func_E0124304.s @@ -41,7 +41,7 @@ glabel func_E0124304 /* 412ABC E012438C AC620010 */ sw $v0, 0x10($v1) /* 412AC0 E0124390 2C42001F */ sltiu $v0, $v0, 0x1f /* 412AC4 E0124394 14400003 */ bnez $v0, .LE01243A4 -/* 412AC8 E0124398 00000000 */ nop +/* 412AC8 E0124398 00000000 */ nop /* 412ACC E012439C 08049113 */ j .LE012444C /* 412AD0 E01243A0 AC6A001C */ sw $t2, 0x1c($v1) .LE01243A4: @@ -54,13 +54,13 @@ glabel func_E0124304 /* 412AEC E01243BC 00A91021 */ addu $v0, $a1, $t1 /* 412AF0 E01243C0 90420000 */ lbu $v0, ($v0) /* 412AF4 E01243C4 44820000 */ mtc1 $v0, $f0 -/* 412AF8 E01243C8 00000000 */ nop +/* 412AF8 E01243C8 00000000 */ nop /* 412AFC E01243CC 46800020 */ cvt.s.w $f0, $f0 /* 412B00 E01243D0 46000021 */ cvt.d.s $f0, $f0 /* 412B04 E01243D4 462E0002 */ mul.d $f0, $f0, $f14 -/* 412B08 E01243D8 00000000 */ nop +/* 412B08 E01243D8 00000000 */ nop /* 412B0C E01243DC 462C0002 */ mul.d $f0, $f0, $f12 -/* 412B10 E01243E0 00000000 */ nop +/* 412B10 E01243E0 00000000 */ nop /* 412B14 E01243E4 08049102 */ j .LE0124408 /* 412B18 E01243E8 46200020 */ cvt.s.d $f0, $f0 .LE01243EC: @@ -68,7 +68,7 @@ glabel func_E0124304 /* 412B20 E01243F0 46000021 */ cvt.d.s $f0, $f0 /* 412B24 E01243F4 46205081 */ sub.d $f2, $f10, $f0 /* 412B28 E01243F8 462A1082 */ mul.d $f2, $f2, $f10 -/* 412B2C E01243FC 00000000 */ nop +/* 412B2C E01243FC 00000000 */ nop /* 412B30 E0124400 46220000 */ add.d $f0, $f0, $f2 /* 412B34 E0124404 46200020 */ cvt.s.d $f0, $f0 .LE0124408: @@ -100,10 +100,10 @@ glabel func_E0124304 /* 412B98 E0124468 2442FFFF */ addiu $v0, $v0, -1 /* 412B9C E012446C 0102102A */ slt $v0, $t0, $v0 /* 412BA0 E0124470 14400003 */ bnez $v0, .LE0124480 -/* 412BA4 E0124474 00000000 */ nop +/* 412BA4 E0124474 00000000 */ nop .LE0124478: /* 412BA8 E0124478 0C080128 */ jal func_E02004A0 -/* 412BAC E012447C 00000000 */ nop +/* 412BAC E012447C 00000000 */ nop .LE0124480: /* 412BB0 E0124480 8FBF0010 */ lw $ra, 0x10($sp) /* 412BB4 E0124484 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_412730/func_E01244C4.s b/asm/nonmatchings/code_412730/func_E01244C4.s index 1d15f4be4e..0f6ced915a 100644 --- a/asm/nonmatchings/code_412730/func_E01244C4.s +++ b/asm/nonmatchings/code_412730/func_E01244C4.s @@ -108,7 +108,7 @@ glabel func_E01244C4 .LE0124660: /* 412D90 E0124660 8E340004 */ lw $s4, 4($s1) /* 412D94 E0124664 0680006E */ bltz $s4, .LE0124820 -/* 412D98 E0124668 00000000 */ nop +/* 412D98 E0124668 00000000 */ nop /* 412D9C E012466C 8E25FFE0 */ lw $a1, -0x20($s1) /* 412DA0 E0124670 8E26FFE4 */ lw $a2, -0x1c($s1) /* 412DA4 E0124674 8E27FFE8 */ lw $a3, -0x18($s1) @@ -137,27 +137,27 @@ glabel func_E01244C4 .LE01246D0: /* 412E00 E01246D0 92020000 */ lbu $v0, ($s0) /* 412E04 E01246D4 44822000 */ mtc1 $v0, $f4 -/* 412E08 E01246D8 00000000 */ nop +/* 412E08 E01246D8 00000000 */ nop /* 412E0C E01246DC 46802120 */ cvt.s.w $f4, $f4 /* 412E10 E01246E0 46162102 */ mul.s $f4, $f4, $f22 -/* 412E14 E01246E4 00000000 */ nop +/* 412E14 E01246E4 00000000 */ nop /* 412E18 E01246E8 26100001 */ addiu $s0, $s0, 1 /* 412E1C E01246EC 92020000 */ lbu $v0, ($s0) /* 412E20 E01246F0 44821000 */ mtc1 $v0, $f2 -/* 412E24 E01246F4 00000000 */ nop +/* 412E24 E01246F4 00000000 */ nop /* 412E28 E01246F8 468010A0 */ cvt.s.w $f2, $f2 /* 412E2C E01246FC 46181082 */ mul.s $f2, $f2, $f24 -/* 412E30 E0124700 00000000 */ nop +/* 412E30 E0124700 00000000 */ nop /* 412E34 E0124704 26100001 */ addiu $s0, $s0, 1 /* 412E38 E0124708 92020000 */ lbu $v0, ($s0) /* 412E3C E012470C 44820000 */ mtc1 $v0, $f0 -/* 412E40 E0124710 00000000 */ nop +/* 412E40 E0124710 00000000 */ nop /* 412E44 E0124714 46800020 */ cvt.s.w $f0, $f0 /* 412E48 E0124718 46140002 */ mul.s $f0, $f0, $f20 -/* 412E4C E012471C 00000000 */ nop +/* 412E4C E012471C 00000000 */ nop /* 412E50 E0124720 4600218D */ trunc.w.s $f6, $f4 /* 412E54 E0124724 44033000 */ mfc1 $v1, $f6 -/* 412E58 E0124728 00000000 */ nop +/* 412E58 E0124728 00000000 */ nop /* 412E5C E012472C 28620100 */ slti $v0, $v1, 0x100 /* 412E60 E0124730 4600118D */ trunc.w.s $f6, $f2 /* 412E64 E0124734 44073000 */ mfc1 $a3, $f6 @@ -255,4 +255,4 @@ glabel func_E01244C4 /* 412FC0 E0124890 D7B40108 */ ldc1 $f20, 0x108($sp) /* 412FC4 E0124894 03E00008 */ jr $ra /* 412FC8 E0124898 27BD0120 */ addiu $sp, $sp, 0x120 -/* 412FCC E012489C 00000000 */ nop +/* 412FCC E012489C 00000000 */ nop diff --git a/asm/nonmatchings/code_414BA0/func_E0128000.s b/asm/nonmatchings/code_414BA0/func_E0128000.s index a7afa5ffeb..a709e6143f 100644 --- a/asm/nonmatchings/code_414BA0/func_E0128000.s +++ b/asm/nonmatchings/code_414BA0/func_E0128000.s @@ -40,7 +40,7 @@ glabel func_E0128000 /* 414C2C E012808C AE02000C */ sw $v0, 0xc($s0) .LE0128090: /* 414C30 E0128090 0804A024 */ j .LE0128090 -/* 414C34 E0128094 00000000 */ nop +/* 414C34 E0128094 00000000 */ nop .LE0128098: /* 414C38 E0128098 AC920000 */ sw $s2, ($a0) /* 414C3C E012809C 1E200004 */ bgtz $s1, .LE01280B0 diff --git a/asm/nonmatchings/code_414BA0/func_E0128128.s b/asm/nonmatchings/code_414BA0/func_E0128128.s index 7e4e0f844e..b8fc0f20a8 100644 --- a/asm/nonmatchings/code_414BA0/func_E0128128.s +++ b/asm/nonmatchings/code_414BA0/func_E0128128.s @@ -3,4 +3,4 @@ glabel func_E0128128 /* 414CC8 E0128128 03E00008 */ jr $ra -/* 414CCC E012812C 00000000 */ nop +/* 414CCC E012812C 00000000 */ nop diff --git a/asm/nonmatchings/code_414BA0/func_E0128130.s b/asm/nonmatchings/code_414BA0/func_E0128130.s index b21da62b71..ad1107da73 100644 --- a/asm/nonmatchings/code_414BA0/func_E0128130.s +++ b/asm/nonmatchings/code_414BA0/func_E0128130.s @@ -26,7 +26,7 @@ glabel func_E0128130 /* 414D1C E012817C 04610003 */ bgez $v1, .LE012818C /* 414D20 E0128180 ACA20014 */ sw $v0, 0x14($a1) /* 414D24 E0128184 0C080128 */ jal func_E02004A0 -/* 414D28 E0128188 00000000 */ nop +/* 414D28 E0128188 00000000 */ nop .LE012818C: /* 414D2C E012818C 8FBF0010 */ lw $ra, 0x10($sp) /* 414D30 E0128190 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_422AD0/func_802A9000_422AD0.s b/asm/nonmatchings/code_422AD0/func_802A9000_422AD0.s index 6ec10aaf7c..7a926ca85f 100644 --- a/asm/nonmatchings/code_422AD0/func_802A9000_422AD0.s +++ b/asm/nonmatchings/code_422AD0/func_802A9000_422AD0.s @@ -71,7 +71,7 @@ glabel func_802A9000_422AD0 /* 422BD8 802A9108 3C048011 */ lui $a0, %hi(D_80108AFC) /* 422BDC 802A910C 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 422BE0 802A9110 0C050529 */ jal create_icon -/* 422BE4 802A9114 00000000 */ nop +/* 422BE4 802A9114 00000000 */ nop /* 422BE8 802A9118 0040882D */ daddu $s1, $v0, $zero /* 422BEC 802A911C 86050056 */ lh $a1, 0x56($s0) /* 422BF0 802A9120 86060058 */ lh $a2, 0x58($s0) @@ -88,7 +88,7 @@ glabel func_802A9000_422AD0 /* 422C1C 802A914C 3C048029 */ lui $a0, %hi(D_802928F8) /* 422C20 802A9150 248428F8 */ addiu $a0, $a0, %lo(D_802928F8) /* 422C24 802A9154 0C050529 */ jal create_icon -/* 422C28 802A9158 00000000 */ nop +/* 422C28 802A9158 00000000 */ nop /* 422C2C 802A915C 0040882D */ daddu $s1, $v0, $zero /* 422C30 802A9160 86050056 */ lh $a1, 0x56($s0) /* 422C34 802A9164 86060058 */ lh $a2, 0x58($s0) @@ -105,7 +105,7 @@ glabel func_802A9000_422AD0 /* 422C60 802A9190 3C048011 */ lui $a0, %hi(D_80109244) /* 422C64 802A9194 24849244 */ addiu $a0, $a0, %lo(D_80109244) /* 422C68 802A9198 0C050529 */ jal create_icon -/* 422C6C 802A919C 00000000 */ nop +/* 422C6C 802A919C 00000000 */ nop /* 422C70 802A91A0 0040882D */ daddu $s1, $v0, $zero /* 422C74 802A91A4 86050056 */ lh $a1, 0x56($s0) /* 422C78 802A91A8 86060058 */ lh $a2, 0x58($s0) @@ -149,7 +149,7 @@ glabel func_802A9000_422AD0 /* 422D10 802A9240 3C048029 */ lui $a0, %hi(D_80292974) /* 422D14 802A9244 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 422D18 802A9248 0C050529 */ jal create_icon -/* 422D1C 802A924C 00000000 */ nop +/* 422D1C 802A924C 00000000 */ nop /* 422D20 802A9250 0040882D */ daddu $s1, $v0, $zero /* 422D24 802A9254 86050056 */ lh $a1, 0x56($s0) /* 422D28 802A9258 86060058 */ lh $a2, 0x58($s0) diff --git a/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s b/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s index d6a05038ad..ad6ef76969 100644 --- a/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s +++ b/asm/nonmatchings/code_422AD0/func_802A9378_422E48.s @@ -19,7 +19,7 @@ glabel func_802A9378_422E48 /* 422E80 802A93B0 00220821 */ addu $at, $at, $v0 /* 422E84 802A93B4 8C2298E0 */ lw $v0, %lo(func_802A98E0)($at) /* 422E88 802A93B8 00400008 */ jr $v0 -/* 422E8C 802A93BC 00000000 */ nop +/* 422E8C 802A93BC 00000000 */ nop /* 422E90 802A93C0 8E300004 */ lw $s0, 4($s1) /* 422E94 802A93C4 240500FF */ addiu $a1, $zero, 0xff /* 422E98 802A93C8 0C0513AC */ jal icon_set_opacity @@ -83,7 +83,7 @@ glabel func_802A9378_422E48 /* 422F6C 802A949C 0C051261 */ jal set_icon_render_pos /* 422F70 802A94A0 24C6001C */ addiu $a2, $a2, 0x1c /* 422F74 802A94A4 080AA593 */ j .L802A964C -/* 422F78 802A94A8 00000000 */ nop +/* 422F78 802A94A8 00000000 */ nop /* 422F7C 802A94AC 8622004E */ lh $v0, 0x4e($s1) /* 422F80 802A94B0 9623004E */ lhu $v1, 0x4e($s1) /* 422F84 802A94B4 10400003 */ beqz $v0, .L802A94C4 @@ -95,7 +95,7 @@ glabel func_802A9378_422E48 /* 422F98 802A94C8 3C058011 */ lui $a1, %hi(D_80108B80) /* 422F9C 802A94CC 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 422FA0 802A94D0 0C0511FF */ jal set_menu_icon_script -/* 422FA4 802A94D4 00000000 */ nop +/* 422FA4 802A94D4 00000000 */ nop /* 422FA8 802A94D8 96230052 */ lhu $v1, 0x52($s1) /* 422FAC 802A94DC 24020001 */ addiu $v0, $zero, 1 /* 422FB0 802A94E0 3C01802B */ lui $at, %hi(D_802A9920) @@ -105,7 +105,7 @@ glabel func_802A9378_422E48 /* 422FC0 802A94F0 A6230054 */ sh $v1, 0x54($s1) /* 422FC4 802A94F4 82420083 */ lb $v0, 0x83($s2) /* 422FC8 802A94F8 10400018 */ beqz $v0, .L802A955C -/* 422FCC 802A94FC 00000000 */ nop +/* 422FCC 802A94FC 00000000 */ nop /* 422FD0 802A9500 8E420214 */ lw $v0, 0x214($s2) /* 422FD4 802A9504 30428000 */ andi $v0, $v0, 0x8000 /* 422FD8 802A9508 10400014 */ beqz $v0, .L802A955C @@ -194,19 +194,19 @@ glabel func_802A9378_422E48 /* 423110 802A9640 A6220054 */ sh $v0, 0x54($s1) .L802A9644: /* 423114 802A9644 0C09A327 */ jal func_80268C9C -/* 423118 802A9648 00000000 */ nop +/* 423118 802A9648 00000000 */ nop .L802A964C: /* 42311C 802A964C 8623004C */ lh $v1, 0x4c($s1) .L802A9650: /* 423120 802A9650 24040001 */ addiu $a0, $zero, 1 /* 423124 802A9654 10640007 */ beq $v1, $a0, .L802A9674 -/* 423128 802A9658 00000000 */ nop +/* 423128 802A9658 00000000 */ nop /* 42312C 802A965C 1860001F */ blez $v1, .L802A96DC /* 423130 802A9660 2862000C */ slti $v0, $v1, 0xc /* 423134 802A9664 1040001D */ beqz $v0, .L802A96DC /* 423138 802A9668 2862000A */ slti $v0, $v1, 0xa /* 42313C 802A966C 1440001B */ bnez $v0, .L802A96DC -/* 423140 802A9670 00000000 */ nop +/* 423140 802A9670 00000000 */ nop .L802A9674: /* 423144 802A9674 8622005A */ lh $v0, 0x5a($s1) /* 423148 802A9678 14400002 */ bnez $v0, .L802A9684 @@ -215,7 +215,7 @@ glabel func_802A9378_422E48 .L802A9684: /* 423154 802A9684 8222005C */ lb $v0, 0x5c($s1) /* 423158 802A9688 1440000C */ bnez $v0, .L802A96BC -/* 42315C 802A968C 00000000 */ nop +/* 42315C 802A968C 00000000 */ nop /* 423160 802A9690 96220046 */ lhu $v0, 0x46($s1) /* 423164 802A9694 00431021 */ addu $v0, $v0, $v1 /* 423168 802A9698 A6220046 */ sh $v0, 0x46($s1) @@ -233,7 +233,7 @@ glabel func_802A9378_422E48 /* 423194 802A96C4 A6220046 */ sh $v0, 0x46($s1) /* 423198 802A96C8 00021400 */ sll $v0, $v0, 0x10 /* 42319C 802A96CC 1C400003 */ bgtz $v0, .L802A96DC -/* 4231A0 802A96D0 00000000 */ nop +/* 4231A0 802A96D0 00000000 */ nop /* 4231A4 802A96D4 A6200046 */ sh $zero, 0x46($s1) /* 4231A8 802A96D8 A220005C */ sb $zero, 0x5c($s1) .L802A96DC: diff --git a/asm/nonmatchings/code_422AD0/func_802A96F4_4231C4.s b/asm/nonmatchings/code_422AD0/func_802A96F4_4231C4.s index 1b75e90059..e3e1007c9d 100644 --- a/asm/nonmatchings/code_422AD0/func_802A96F4_4231C4.s +++ b/asm/nonmatchings/code_422AD0/func_802A96F4_4231C4.s @@ -43,7 +43,7 @@ glabel func_802A96F4_4231C4 /* 42325C 802A978C 3C02800E */ lui $v0, %hi(gBattleStatus+0x83) /* 423260 802A9790 8042C0F3 */ lb $v0, %lo(gBattleStatus+0x83)($v0) /* 423264 802A9794 10400003 */ beqz $v0, .L802A97A4 -/* 423268 802A9798 00000000 */ nop +/* 423268 802A9798 00000000 */ nop /* 42326C 802A979C 0C0511EA */ jal draw_icon_0 /* 423270 802A97A0 8E240004 */ lw $a0, 4($s1) .L802A97A4: @@ -82,7 +82,7 @@ glabel func_802A96F4_4231C4 /* 4232EC 802A981C 0C09A1E6 */ jal func_80268798 /* 4232F0 802A9820 00063403 */ sra $a2, $a2, 0x10 /* 4232F4 802A9824 080AA618 */ j .L802A9860 -/* 4232F8 802A9828 00000000 */ nop +/* 4232F8 802A9828 00000000 */ nop .L802A982C: /* 4232FC 802A982C 96230044 */ lhu $v1, 0x44($s1) /* 423300 802A9830 00031C00 */ sll $v1, $v1, 0x10 @@ -100,7 +100,7 @@ glabel func_802A96F4_4231C4 .L802A9860: /* 423330 802A9860 8E24000C */ lw $a0, 0xc($s1) /* 423334 802A9864 0C0511EA */ jal draw_icon_0 -/* 423338 802A9868 00000000 */ nop +/* 423338 802A9868 00000000 */ nop /* 42333C 802A986C 0C0511EA */ jal draw_icon_0 /* 423340 802A9870 8E240010 */ lw $a0, 0x10($s1) /* 423344 802A9874 0C0511EA */ jal draw_icon_0 diff --git a/asm/nonmatchings/code_4273B0/func_802A9000_4273B0.s b/asm/nonmatchings/code_4273B0/func_802A9000_4273B0.s index 9437bcbbec..4d62f6b9e7 100644 --- a/asm/nonmatchings/code_4273B0/func_802A9000_4273B0.s +++ b/asm/nonmatchings/code_4273B0/func_802A9000_4273B0.s @@ -21,7 +21,7 @@ glabel func_802A9000_4273B0 /* 4273F0 802A9040 10400044 */ beqz $v0, .L802A9154 /* 4273F4 802A9044 0200182D */ daddu $v1, $s0, $zero /* 4273F8 802A9048 0C09A216 */ jal func_80268858 -/* 4273FC 802A904C 00000000 */ nop +/* 4273FC 802A904C 00000000 */ nop /* 427400 802A9050 3C048011 */ lui $a0, %hi(D_80108B28) /* 427404 802A9054 24848B28 */ addiu $a0, $a0, %lo(D_80108B28) /* 427408 802A9058 2402000A */ addiu $v0, $zero, 0xa @@ -54,7 +54,7 @@ glabel func_802A9000_4273B0 /* 427474 802A90C4 3C048011 */ lui $a0, %hi(D_80108AFC) /* 427478 802A90C8 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 42747C 802A90CC 0C050529 */ jal create_icon -/* 427480 802A90D0 00000000 */ nop +/* 427480 802A90D0 00000000 */ nop /* 427484 802A90D4 0040802D */ daddu $s0, $v0, $zero /* 427488 802A90D8 86250056 */ lh $a1, 0x56($s1) /* 42748C 802A90DC 86260058 */ lh $a2, 0x58($s1) @@ -71,7 +71,7 @@ glabel func_802A9000_4273B0 /* 4274B8 802A9108 3C048029 */ lui $a0, %hi(D_80292974) /* 4274BC 802A910C 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 4274C0 802A9110 0C050529 */ jal create_icon -/* 4274C4 802A9114 00000000 */ nop +/* 4274C4 802A9114 00000000 */ nop /* 4274C8 802A9118 0040802D */ daddu $s0, $v0, $zero /* 4274CC 802A911C 86250056 */ lh $a1, 0x56($s1) /* 4274D0 802A9120 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_4273B0/func_802A9170_427520.s b/asm/nonmatchings/code_4273B0/func_802A9170_427520.s index 2fe5652609..949fea215e 100644 --- a/asm/nonmatchings/code_4273B0/func_802A9170_427520.s +++ b/asm/nonmatchings/code_4273B0/func_802A9170_427520.s @@ -18,7 +18,7 @@ glabel func_802A9170_427520 /* 427554 802A91A4 10400030 */ beqz $v0, .L802A9268 /* 427558 802A91A8 0240182D */ daddu $v1, $s2, $zero /* 42755C 802A91AC 0C09A216 */ jal func_80268858 -/* 427560 802A91B0 00000000 */ nop +/* 427560 802A91B0 00000000 */ nop /* 427564 802A91B4 8E050000 */ lw $a1, ($s0) /* 427568 802A91B8 26100004 */ addiu $s0, $s0, 4 /* 42756C 802A91BC 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s b/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s index 1dc2bb08a3..49a87777b5 100644 --- a/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s +++ b/asm/nonmatchings/code_4273B0/func_802A928C_42763C.s @@ -19,7 +19,7 @@ glabel func_802A928C_42763C /* 427674 802A92C4 00220821 */ addu $at, $at, $v0 /* 427678 802A92C8 8C229680 */ lw $v0, %lo(D_802A9680)($at) /* 42767C 802A92CC 00400008 */ jr $v0 -/* 427680 802A92D0 00000000 */ nop +/* 427680 802A92D0 00000000 */ nop /* 427684 802A92D4 0C093EB1 */ jal set_popup_duration /* 427688 802A92D8 24040063 */ addiu $a0, $zero, 0x63 /* 42768C 802A92DC 8E300004 */ lw $s0, 4($s1) @@ -67,7 +67,7 @@ glabel func_802A928C_42763C /* 427728 802A9378 0C051261 */ jal set_icon_render_pos /* 42772C 802A937C 24C6001C */ addiu $a2, $a2, 0x1c /* 427730 802A9380 080AA551 */ j .L802A9544 -/* 427734 802A9384 00000000 */ nop +/* 427734 802A9384 00000000 */ nop /* 427738 802A9388 0C093EB1 */ jal set_popup_duration /* 42773C 802A938C 24040063 */ addiu $a0, $zero, 0x63 /* 427740 802A9390 8622004E */ lh $v0, 0x4e($s1) @@ -81,7 +81,7 @@ glabel func_802A928C_42763C /* 42775C 802A93AC 3C058011 */ lui $a1, %hi(D_80108B80) /* 427760 802A93B0 24A58B80 */ addiu $a1, $a1, %lo(D_80108B80) /* 427764 802A93B4 0C0511FF */ jal set_menu_icon_script -/* 427768 802A93B8 00000000 */ nop +/* 427768 802A93B8 00000000 */ nop /* 42776C 802A93BC 96230052 */ lhu $v1, 0x52($s1) /* 427770 802A93C0 2402000B */ addiu $v0, $zero, 0xb /* 427774 802A93C4 A6200044 */ sh $zero, 0x44($s1) @@ -92,7 +92,7 @@ glabel func_802A928C_42763C /* 427788 802A93D8 8E420214 */ lw $v0, 0x214($s2) /* 42778C 802A93DC 30428000 */ andi $v0, $v0, 0x8000 /* 427790 802A93E0 1040000B */ beqz $v0, .L802A9410 -/* 427794 802A93E4 00000000 */ nop +/* 427794 802A93E4 00000000 */ nop /* 427798 802A93E8 86220050 */ lh $v0, 0x50($s1) /* 42779C 802A93EC 8E430434 */ lw $v1, 0x434($s2) /* 4277A0 802A93F0 00021080 */ sll $v0, $v0, 2 @@ -167,9 +167,9 @@ glabel func_802A928C_42763C /* 4278A0 802A94F0 82430081 */ lb $v1, 0x81($s2) /* 4278A4 802A94F4 24020064 */ addiu $v0, $zero, 0x64 /* 4278A8 802A94F8 14620003 */ bne $v1, $v0, .L802A9508 -/* 4278AC 802A94FC 00000000 */ nop +/* 4278AC 802A94FC 00000000 */ nop /* 4278B0 802A9500 0C09A458 */ jal func_80269160 -/* 4278B4 802A9504 00000000 */ nop +/* 4278B4 802A9504 00000000 */ nop .L802A9508: /* 4278B8 802A9508 0C093EB1 */ jal set_popup_duration /* 4278BC 802A950C 0000202D */ daddu $a0, $zero, $zero @@ -187,7 +187,7 @@ glabel func_802A928C_42763C /* 4278E8 802A9538 A6220054 */ sh $v0, 0x54($s1) .L802A953C: /* 4278EC 802A953C 0C09A327 */ jal func_80268C9C -/* 4278F0 802A9540 00000000 */ nop +/* 4278F0 802A9540 00000000 */ nop .L802A9544: /* 4278F4 802A9544 8FBF001C */ lw $ra, 0x1c($sp) /* 4278F8 802A9548 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_4273B0/func_802A955C_42790C.s b/asm/nonmatchings/code_4273B0/func_802A955C_42790C.s index 907ea7a589..fd44ef2181 100644 --- a/asm/nonmatchings/code_4273B0/func_802A955C_42790C.s +++ b/asm/nonmatchings/code_4273B0/func_802A955C_42790C.s @@ -35,7 +35,7 @@ glabel func_802A955C_42790C /* 427984 802A95D4 0C09A1DC */ jal func_80268770 /* 427988 802A95D8 00063403 */ sra $a2, $a2, 0x10 /* 42798C 802A95DC 080AA587 */ j .L802A961C -/* 427990 802A95E0 00000000 */ nop +/* 427990 802A95E0 00000000 */ nop .L802A95E4: /* 427994 802A95E4 96230044 */ lhu $v1, 0x44($s1) /* 427998 802A95E8 3484851F */ ori $a0, $a0, 0x851f @@ -54,7 +54,7 @@ glabel func_802A955C_42790C .L802A961C: /* 4279CC 802A961C 8E24000C */ lw $a0, 0xc($s1) /* 4279D0 802A9620 0C0511EA */ jal draw_icon_0 -/* 4279D4 802A9624 00000000 */ nop +/* 4279D4 802A9624 00000000 */ nop /* 4279D8 802A9628 8FBF0020 */ lw $ra, 0x20($sp) /* 4279DC 802A962C 8FB1001C */ lw $s1, 0x1c($sp) /* 4279E0 802A9630 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_4273B0/func_802A963C_4279EC.s b/asm/nonmatchings/code_4273B0/func_802A963C_4279EC.s index de550ef354..38b3c7e5e6 100644 --- a/asm/nonmatchings/code_4273B0/func_802A963C_4279EC.s +++ b/asm/nonmatchings/code_4273B0/func_802A963C_4279EC.s @@ -17,5 +17,5 @@ glabel func_802A963C_4279EC /* 427A1C 802A966C 8FB00010 */ lw $s0, 0x10($sp) /* 427A20 802A9670 03E00008 */ jr $ra /* 427A24 802A9674 27BD0018 */ addiu $sp, $sp, 0x18 -/* 427A28 802A9678 00000000 */ nop -/* 427A2C 802A967C 00000000 */ nop +/* 427A28 802A9678 00000000 */ nop +/* 427A2C 802A967C 00000000 */ nop diff --git a/asm/nonmatchings/code_42A4F0/func_802A9000_42A4F0.s b/asm/nonmatchings/code_42A4F0/func_802A9000_42A4F0.s index b1bb7deff7..a88edd0523 100644 --- a/asm/nonmatchings/code_42A4F0/func_802A9000_42A4F0.s +++ b/asm/nonmatchings/code_42A4F0/func_802A9000_42A4F0.s @@ -26,7 +26,7 @@ glabel func_802A9000_42A4F0 /* 42A544 802A9054 A0600081 */ sb $zero, 0x81($v1) .L802A9058: /* 42A548 802A9058 0C09A216 */ jal func_80268858 -/* 42A54C 802A905C 00000000 */ nop +/* 42A54C 802A905C 00000000 */ nop /* 42A550 802A9060 24020016 */ addiu $v0, $zero, 0x16 /* 42A554 802A9064 A642004A */ sh $v0, 0x4a($s2) /* 42A558 802A9068 A640004C */ sh $zero, 0x4c($s2) @@ -63,7 +63,7 @@ glabel func_802A9000_42A4F0 /* 42A5D4 802A90E4 3C048029 */ lui $a0, %hi(D_80292AFC) /* 42A5D8 802A90E8 24842AFC */ addiu $a0, $a0, %lo(D_80292AFC) /* 42A5DC 802A90EC 0C050529 */ jal create_icon -/* 42A5E0 802A90F0 00000000 */ nop +/* 42A5E0 802A90F0 00000000 */ nop /* 42A5E4 802A90F4 0040882D */ daddu $s1, $v0, $zero /* 42A5E8 802A90F8 86450056 */ lh $a1, 0x56($s2) /* 42A5EC 802A90FC 86460058 */ lh $a2, 0x58($s2) @@ -179,7 +179,7 @@ glabel func_802A9000_42A4F0 /* 42A7A4 802A92B4 3C048029 */ lui $a0, %hi(D_802928A0) /* 42A7A8 802A92B8 248428A0 */ addiu $a0, $a0, %lo(D_802928A0) /* 42A7AC 802A92BC 0C050529 */ jal create_icon -/* 42A7B0 802A92C0 00000000 */ nop +/* 42A7B0 802A92C0 00000000 */ nop /* 42A7B4 802A92C4 86450056 */ lh $a1, 0x56($s2) /* 42A7B8 802A92C8 86460058 */ lh $a2, 0x58($s2) /* 42A7BC 802A92CC 0040202D */ daddu $a0, $v0, $zero @@ -188,7 +188,7 @@ glabel func_802A9000_42A4F0 /* 42A7C8 802A92D8 3C048029 */ lui $a0, %hi(D_80292848) /* 42A7CC 802A92DC 24842848 */ addiu $a0, $a0, %lo(D_80292848) /* 42A7D0 802A92E0 0C050529 */ jal create_icon -/* 42A7D4 802A92E4 00000000 */ nop +/* 42A7D4 802A92E4 00000000 */ nop /* 42A7D8 802A92E8 0040882D */ daddu $s1, $v0, $zero /* 42A7DC 802A92EC 86450056 */ lh $a1, 0x56($s2) /* 42A7E0 802A92F0 86460058 */ lh $a2, 0x58($s2) @@ -202,14 +202,14 @@ glabel func_802A9000_42A4F0 /* 42A800 802A9310 10400005 */ beqz $v0, .L802A9328 /* 42A804 802A9314 24020002 */ addiu $v0, $zero, 2 /* 42A808 802A9318 10600007 */ beqz $v1, .L802A9338 -/* 42A80C 802A931C 00000000 */ nop +/* 42A80C 802A931C 00000000 */ nop /* 42A810 802A9320 080AA4DA */ j .L802A9368 -/* 42A814 802A9324 00000000 */ nop +/* 42A814 802A9324 00000000 */ nop .L802A9328: /* 42A818 802A9328 10620009 */ beq $v1, $v0, .L802A9350 -/* 42A81C 802A932C 00000000 */ nop +/* 42A81C 802A932C 00000000 */ nop /* 42A820 802A9330 080AA4DA */ j .L802A9368 -/* 42A824 802A9334 00000000 */ nop +/* 42A824 802A9334 00000000 */ nop .L802A9338: /* 42A828 802A9338 3C04802B */ lui $a0, %hi(D_802AB108) /* 42A82C 802A933C 080AA4D6 */ j .L802A9358 @@ -223,7 +223,7 @@ glabel func_802A9000_42A4F0 /* 42A844 802A9354 2484B158 */ addiu $a0, $a0, %lo(D_802AB158) .L802A9358: /* 42A848 802A9358 0C050529 */ jal create_icon -/* 42A84C 802A935C 00000000 */ nop +/* 42A84C 802A935C 00000000 */ nop /* 42A850 802A9360 AE420038 */ sw $v0, 0x38($s2) /* 42A854 802A9364 0040882D */ daddu $s1, $v0, $zero .L802A9368: diff --git a/asm/nonmatchings/code_42A4F0/func_802A9398_42A888.s b/asm/nonmatchings/code_42A4F0/func_802A9398_42A888.s index 505332f5ef..add195d852 100644 --- a/asm/nonmatchings/code_42A4F0/func_802A9398_42A888.s +++ b/asm/nonmatchings/code_42A4F0/func_802A9398_42A888.s @@ -18,7 +18,7 @@ glabel func_802A9398_42A888 /* 42A8BC 802A93CC 10400026 */ beqz $v0, .L802A9468 /* 42A8C0 802A93D0 0240182D */ daddu $v1, $s2, $zero /* 42A8C4 802A93D4 0C09A216 */ jal func_80268858 -/* 42A8C8 802A93D8 00000000 */ nop +/* 42A8C8 802A93D8 00000000 */ nop /* 42A8CC 802A93DC 8E050000 */ lw $a1, ($s0) /* 42A8D0 802A93E0 26100004 */ addiu $s0, $s0, 4 /* 42A8D4 802A93E4 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s b/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s index cb0f12ac70..146d600439 100644 --- a/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s +++ b/asm/nonmatchings/code_42A4F0/func_802A948C_42A97C.s @@ -18,7 +18,7 @@ glabel func_802A948C_42A97C /* 42A9B0 802A94C0 00220821 */ addu $at, $at, $v0 /* 42A9B4 802A94C4 8C22B1B0 */ lw $v0, %lo(D_802AB1B0)($at) /* 42A9B8 802A94C8 00400008 */ jr $v0 -/* 42A9BC 802A94CC 00000000 */ nop +/* 42A9BC 802A94CC 00000000 */ nop /* 42A9C0 802A94D0 0C093EB1 */ jal set_popup_duration /* 42A9C4 802A94D4 24040063 */ addiu $a0, $zero, 0x63 /* 42A9C8 802A94D8 82220061 */ lb $v0, 0x61($s1) @@ -171,12 +171,12 @@ glabel func_802A948C_42A97C /* 42ABE8 802A96F8 10600007 */ beqz $v1, .L802A9718 /* 42ABEC 802A96FC 0200202D */ daddu $a0, $s0, $zero /* 42ABF0 802A9700 080AA5D2 */ j .L802A9748 -/* 42ABF4 802A9704 00000000 */ nop +/* 42ABF4 802A9704 00000000 */ nop .L802A9708: /* 42ABF8 802A9708 10620009 */ beq $v1, $v0, .L802A9730 /* 42ABFC 802A970C 0200202D */ daddu $a0, $s0, $zero /* 42AC00 802A9710 080AA5D2 */ j .L802A9748 -/* 42AC04 802A9714 00000000 */ nop +/* 42AC04 802A9714 00000000 */ nop .L802A9718: /* 42AC08 802A9718 86250056 */ lh $a1, 0x56($s1) /* 42AC0C 802A971C 86260058 */ lh $a2, 0x58($s1) @@ -192,7 +192,7 @@ glabel func_802A948C_42A97C /* 42AC2C 802A973C 24C6000D */ addiu $a2, $a2, 0xd .L802A9740: /* 42AC30 802A9740 0C051261 */ jal set_icon_render_pos -/* 42AC34 802A9744 00000000 */ nop +/* 42AC34 802A9744 00000000 */ nop .L802A9748: /* 42AC38 802A9748 8E240030 */ lw $a0, 0x30($s1) /* 42AC3C 802A974C 86250056 */ lh $a1, 0x56($s1) @@ -213,7 +213,7 @@ glabel func_802A948C_42A97C /* 42AC78 802A9788 0C051261 */ jal set_icon_render_pos /* 42AC7C 802A978C 24C60017 */ addiu $a2, $a2, 0x17 /* 42AC80 802A9790 080AA800 */ j .L802AA000 -/* 42AC84 802A9794 00000000 */ nop +/* 42AC84 802A9794 00000000 */ nop /* 42AC88 802A9798 0C093EB1 */ jal set_popup_duration /* 42AC8C 802A979C 24040063 */ addiu $a0, $zero, 0x63 /* 42AC90 802A97A0 8622004E */ lh $v0, 0x4e($s1) @@ -245,36 +245,36 @@ glabel func_802A948C_42A97C /* 42ACF0 802A9800 3C058029 */ lui $a1, %hi(D_802928CC) /* 42ACF4 802A9804 24A528CC */ addiu $a1, $a1, %lo(D_802928CC) /* 42ACF8 802A9808 0C0511FF */ jal set_menu_icon_script -/* 42ACFC 802A980C 00000000 */ nop +/* 42ACFC 802A980C 00000000 */ nop /* 42AD00 802A9810 0C05272D */ jal play_sound /* 42AD04 802A9814 24040233 */ addiu $a0, $zero, 0x233 /* 42AD08 802A9818 86230054 */ lh $v1, 0x54($s1) /* 42AD0C 802A981C 24020016 */ addiu $v0, $zero, 0x16 .L802A9820: /* 42AD10 802A9820 14620008 */ bne $v1, $v0, .L802A9844 -/* 42AD14 802A9824 00000000 */ nop +/* 42AD14 802A9824 00000000 */ nop /* 42AD18 802A9828 8E240034 */ lw $a0, 0x34($s1) /* 42AD1C 802A982C 3C058029 */ lui $a1, %hi(D_80292874) /* 42AD20 802A9830 24A52874 */ addiu $a1, $a1, %lo(D_80292874) /* 42AD24 802A9834 0C0511FF */ jal set_menu_icon_script -/* 42AD28 802A9838 00000000 */ nop +/* 42AD28 802A9838 00000000 */ nop /* 42AD2C 802A983C 0C05272D */ jal play_sound /* 42AD30 802A9840 24040233 */ addiu $a0, $zero, 0x233 .L802A9844: /* 42AD34 802A9844 86230054 */ lh $v1, 0x54($s1) /* 42AD38 802A9848 24020002 */ addiu $v0, $zero, 2 /* 42AD3C 802A984C 1462000D */ bne $v1, $v0, .L802A9884 -/* 42AD40 802A9850 00000000 */ nop +/* 42AD40 802A9850 00000000 */ nop /* 42AD44 802A9854 8E24000C */ lw $a0, 0xc($s1) /* 42AD48 802A9858 3C058029 */ lui $a1, %hi(D_80292788) /* 42AD4C 802A985C 24A52788 */ addiu $a1, $a1, %lo(D_80292788) /* 42AD50 802A9860 0C0511FF */ jal set_menu_icon_script -/* 42AD54 802A9864 00000000 */ nop +/* 42AD54 802A9864 00000000 */ nop /* 42AD58 802A9868 8E240004 */ lw $a0, 4($s1) /* 42AD5C 802A986C 3C058011 */ lui $a1, %hi(D_80108B54) /* 42AD60 802A9870 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) /* 42AD64 802A9874 0C0511FF */ jal set_menu_icon_script -/* 42AD68 802A9878 00000000 */ nop +/* 42AD68 802A9878 00000000 */ nop /* 42AD6C 802A987C 0C05272D */ jal play_sound /* 42AD70 802A9880 24040234 */ addiu $a0, $zero, 0x234 .L802A9884: @@ -291,14 +291,14 @@ glabel func_802A948C_42A97C /* 42AD9C 802A98AC 24040063 */ addiu $a0, $zero, 0x63 /* 42ADA0 802A98B0 82220060 */ lb $v0, 0x60($s1) /* 42ADA4 802A98B4 1440003A */ bnez $v0, .L802A99A0 -/* 42ADA8 802A98B8 00000000 */ nop +/* 42ADA8 802A98B8 00000000 */ nop /* 42ADAC 802A98BC 8222005C */ lb $v0, 0x5c($s1) /* 42ADB0 802A98C0 14400037 */ bnez $v0, .L802A99A0 -/* 42ADB4 802A98C4 00000000 */ nop +/* 42ADB4 802A98C4 00000000 */ nop /* 42ADB8 802A98C8 8222005D */ lb $v0, 0x5d($s1) /* 42ADBC 802A98CC 2842FFFB */ slti $v0, $v0, -5 /* 42ADC0 802A98D0 14400033 */ bnez $v0, .L802A99A0 -/* 42ADC4 802A98D4 00000000 */ nop +/* 42ADC4 802A98D4 00000000 */ nop /* 42ADC8 802A98D8 86220050 */ lh $v0, 0x50($s1) /* 42ADCC 802A98DC 8E030434 */ lw $v1, 0x434($s0) /* 42ADD0 802A98E0 000210C0 */ sll $v0, $v0, 3 @@ -328,20 +328,20 @@ glabel func_802A948C_42A97C /* 42AE24 802A9934 2484FFC0 */ addiu $a0, $a0, -0x40 .L802A9938: /* 42AE28 802A9938 10400006 */ beqz $v0, .L802A9954 -/* 42AE2C 802A993C 00000000 */ nop +/* 42AE2C 802A993C 00000000 */ nop /* 42AE30 802A9940 8CA20330 */ lw $v0, 0x330($a1) /* 42AE34 802A9944 30428000 */ andi $v0, $v0, 0x8000 /* 42AE38 802A9948 10400009 */ beqz $v0, .L802A9970 -/* 42AE3C 802A994C 00000000 */ nop +/* 42AE3C 802A994C 00000000 */ nop /* 42AE40 802A9950 A2270060 */ sb $a3, 0x60($s1) .L802A9954: /* 42AE44 802A9954 8CA20330 */ lw $v0, 0x330($a1) /* 42AE48 802A9958 30428000 */ andi $v0, $v0, 0x8000 /* 42AE4C 802A995C 10400004 */ beqz $v0, .L802A9970 -/* 42AE50 802A9960 00000000 */ nop +/* 42AE50 802A9960 00000000 */ nop /* 42AE54 802A9964 82220060 */ lb $v0, 0x60($s1) /* 42AE58 802A9968 10400004 */ beqz $v0, .L802A997C -/* 42AE5C 802A996C 00000000 */ nop +/* 42AE5C 802A996C 00000000 */ nop .L802A9970: /* 42AE60 802A9970 8222005E */ lb $v0, 0x5e($s1) /* 42AE64 802A9974 50400006 */ beql $v0, $zero, .L802A9990 @@ -361,13 +361,13 @@ glabel func_802A948C_42A97C /* 42AE90 802A99A0 8222005D */ lb $v0, 0x5d($s1) /* 42AE94 802A99A4 2842FFFC */ slti $v0, $v0, -4 /* 42AE98 802A99A8 1440001C */ bnez $v0, .L802A9A1C -/* 42AE9C 802A99AC 00000000 */ nop +/* 42AE9C 802A99AC 00000000 */ nop /* 42AEA0 802A99B0 82220060 */ lb $v0, 0x60($s1) /* 42AEA4 802A99B4 14400004 */ bnez $v0, .L802A99C8 -/* 42AEA8 802A99B8 00000000 */ nop +/* 42AEA8 802A99B8 00000000 */ nop /* 42AEAC 802A99BC 8222005C */ lb $v0, 0x5c($s1) /* 42AEB0 802A99C0 10400016 */ beqz $v0, .L802A9A1C -/* 42AEB4 802A99C4 00000000 */ nop +/* 42AEB4 802A99C4 00000000 */ nop .L802A99C8: /* 42AEB8 802A99C8 8222005C */ lb $v0, 0x5c($s1) /* 42AEBC 802A99CC 8E30001C */ lw $s0, 0x1c($s1) @@ -376,13 +376,13 @@ glabel func_802A948C_42A97C /* 42AEC8 802A99D8 3C058029 */ lui $a1, %hi(D_80292B54) /* 42AECC 802A99DC 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) /* 42AED0 802A99E0 080AA67C */ j .L802A99F0 -/* 42AED4 802A99E4 00000000 */ nop +/* 42AED4 802A99E4 00000000 */ nop .L802A99E8: /* 42AED8 802A99E8 3C058029 */ lui $a1, %hi(D_80292B80) /* 42AEDC 802A99EC 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A99F0: /* 42AEE0 802A99F0 0C0511FF */ jal set_menu_icon_script -/* 42AEE4 802A99F4 00000000 */ nop +/* 42AEE4 802A99F4 00000000 */ nop /* 42AEE8 802A99F8 0200202D */ daddu $a0, $s0, $zero /* 42AEEC 802A99FC 86250056 */ lh $a1, 0x56($s1) /* 42AEF0 802A9A00 86260058 */ lh $a2, 0x58($s1) @@ -396,7 +396,7 @@ glabel func_802A948C_42A97C /* 42AF0C 802A9A1C 8223005D */ lb $v1, 0x5d($s1) /* 42AF10 802A9A20 2402FFFB */ addiu $v0, $zero, -5 /* 42AF14 802A9A24 1462001B */ bne $v1, $v0, .L802A9A94 -/* 42AF18 802A9A28 00000000 */ nop +/* 42AF18 802A9A28 00000000 */ nop /* 42AF1C 802A9A2C 8222005C */ lb $v0, 0x5c($s1) /* 42AF20 802A9A30 8E30001C */ lw $s0, 0x1c($s1) /* 42AF24 802A9A34 10400005 */ beqz $v0, .L802A9A4C @@ -404,13 +404,13 @@ glabel func_802A948C_42A97C /* 42AF2C 802A9A3C 3C058029 */ lui $a1, %hi(D_80292B54) /* 42AF30 802A9A40 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) /* 42AF34 802A9A44 080AA695 */ j .L802A9A54 -/* 42AF38 802A9A48 00000000 */ nop +/* 42AF38 802A9A48 00000000 */ nop .L802A9A4C: /* 42AF3C 802A9A4C 3C058029 */ lui $a1, %hi(D_80292B80) /* 42AF40 802A9A50 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9A54: /* 42AF44 802A9A54 0C0511FF */ jal set_menu_icon_script -/* 42AF48 802A9A58 00000000 */ nop +/* 42AF48 802A9A58 00000000 */ nop /* 42AF4C 802A9A5C 0200202D */ daddu $a0, $s0, $zero /* 42AF50 802A9A60 86250056 */ lh $a1, 0x56($s1) /* 42AF54 802A9A64 86260058 */ lh $a2, 0x58($s1) @@ -424,7 +424,7 @@ glabel func_802A948C_42A97C /* 42AF74 802A9A84 3C058011 */ lui $a1, %hi(D_80108B28) /* 42AF78 802A9A88 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) /* 42AF7C 802A9A8C 0C0511FF */ jal set_menu_icon_script -/* 42AF80 802A9A90 00000000 */ nop +/* 42AF80 802A9A90 00000000 */ nop .L802A9A94: /* 42AF84 802A9A94 9222005D */ lbu $v0, 0x5d($s1) /* 42AF88 802A9A98 86230054 */ lh $v1, 0x54($s1) @@ -432,17 +432,17 @@ glabel func_802A948C_42A97C /* 42AF90 802A9AA0 A222005D */ sb $v0, 0x5d($s1) /* 42AF94 802A9AA4 24020002 */ addiu $v0, $zero, 2 /* 42AF98 802A9AA8 1462000D */ bne $v1, $v0, .L802A9AE0 -/* 42AF9C 802A9AAC 00000000 */ nop +/* 42AF9C 802A9AAC 00000000 */ nop /* 42AFA0 802A9AB0 8E240010 */ lw $a0, 0x10($s1) /* 42AFA4 802A9AB4 3C058029 */ lui $a1, %hi(D_80292788) /* 42AFA8 802A9AB8 24A52788 */ addiu $a1, $a1, %lo(D_80292788) /* 42AFAC 802A9ABC 0C0511FF */ jal set_menu_icon_script -/* 42AFB0 802A9AC0 00000000 */ nop +/* 42AFB0 802A9AC0 00000000 */ nop /* 42AFB4 802A9AC4 8E240004 */ lw $a0, 4($s1) /* 42AFB8 802A9AC8 3C058011 */ lui $a1, %hi(D_80108B54) /* 42AFBC 802A9ACC 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) /* 42AFC0 802A9AD0 0C0511FF */ jal set_menu_icon_script -/* 42AFC4 802A9AD4 00000000 */ nop +/* 42AFC4 802A9AD4 00000000 */ nop /* 42AFC8 802A9AD8 0C05272D */ jal play_sound /* 42AFCC 802A9ADC 24040234 */ addiu $a0, $zero, 0x234 .L802A9AE0: @@ -459,14 +459,14 @@ glabel func_802A948C_42A97C /* 42AFF8 802A9B08 24040063 */ addiu $a0, $zero, 0x63 /* 42AFFC 802A9B0C 82220060 */ lb $v0, 0x60($s1) /* 42B000 802A9B10 1440003D */ bnez $v0, .L802A9C08 -/* 42B004 802A9B14 00000000 */ nop +/* 42B004 802A9B14 00000000 */ nop /* 42B008 802A9B18 8222005C */ lb $v0, 0x5c($s1) /* 42B00C 802A9B1C 1440003A */ bnez $v0, .L802A9C08 -/* 42B010 802A9B20 00000000 */ nop +/* 42B010 802A9B20 00000000 */ nop /* 42B014 802A9B24 8222005D */ lb $v0, 0x5d($s1) /* 42B018 802A9B28 2842FFFB */ slti $v0, $v0, -5 /* 42B01C 802A9B2C 14400036 */ bnez $v0, .L802A9C08 -/* 42B020 802A9B30 00000000 */ nop +/* 42B020 802A9B30 00000000 */ nop /* 42B024 802A9B34 86220050 */ lh $v0, 0x50($s1) /* 42B028 802A9B38 8E030434 */ lw $v1, 0x434($s0) /* 42B02C 802A9B3C 000210C0 */ sll $v0, $v0, 3 @@ -500,20 +500,20 @@ glabel func_802A948C_42A97C /* 42B08C 802A9B9C 2484FFC0 */ addiu $a0, $a0, -0x40 .L802A9BA0: /* 42B090 802A9BA0 10400006 */ beqz $v0, .L802A9BBC -/* 42B094 802A9BA4 00000000 */ nop +/* 42B094 802A9BA4 00000000 */ nop /* 42B098 802A9BA8 8CA20330 */ lw $v0, 0x330($a1) /* 42B09C 802A9BAC 30428000 */ andi $v0, $v0, 0x8000 /* 42B0A0 802A9BB0 10400009 */ beqz $v0, .L802A9BD8 -/* 42B0A4 802A9BB4 00000000 */ nop +/* 42B0A4 802A9BB4 00000000 */ nop /* 42B0A8 802A9BB8 A2270060 */ sb $a3, 0x60($s1) .L802A9BBC: /* 42B0AC 802A9BBC 8CA20330 */ lw $v0, 0x330($a1) /* 42B0B0 802A9BC0 30428000 */ andi $v0, $v0, 0x8000 /* 42B0B4 802A9BC4 10400004 */ beqz $v0, .L802A9BD8 -/* 42B0B8 802A9BC8 00000000 */ nop +/* 42B0B8 802A9BC8 00000000 */ nop /* 42B0BC 802A9BCC 82220060 */ lb $v0, 0x60($s1) /* 42B0C0 802A9BD0 10400004 */ beqz $v0, .L802A9BE4 -/* 42B0C4 802A9BD4 00000000 */ nop +/* 42B0C4 802A9BD4 00000000 */ nop .L802A9BD8: /* 42B0C8 802A9BD8 8222005E */ lb $v0, 0x5e($s1) /* 42B0CC 802A9BDC 50400006 */ beql $v0, $zero, .L802A9BF8 @@ -533,13 +533,13 @@ glabel func_802A948C_42A97C /* 42B0F8 802A9C08 8222005D */ lb $v0, 0x5d($s1) /* 42B0FC 802A9C0C 2842FFFC */ slti $v0, $v0, -4 /* 42B100 802A9C10 1440001C */ bnez $v0, .L802A9C84 -/* 42B104 802A9C14 00000000 */ nop +/* 42B104 802A9C14 00000000 */ nop /* 42B108 802A9C18 82220060 */ lb $v0, 0x60($s1) /* 42B10C 802A9C1C 14400004 */ bnez $v0, .L802A9C30 -/* 42B110 802A9C20 00000000 */ nop +/* 42B110 802A9C20 00000000 */ nop /* 42B114 802A9C24 8222005C */ lb $v0, 0x5c($s1) /* 42B118 802A9C28 10400016 */ beqz $v0, .L802A9C84 -/* 42B11C 802A9C2C 00000000 */ nop +/* 42B11C 802A9C2C 00000000 */ nop .L802A9C30: /* 42B120 802A9C30 8222005C */ lb $v0, 0x5c($s1) /* 42B124 802A9C34 8E300020 */ lw $s0, 0x20($s1) @@ -548,13 +548,13 @@ glabel func_802A948C_42A97C /* 42B130 802A9C40 3C058029 */ lui $a1, %hi(D_80292B54) /* 42B134 802A9C44 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) /* 42B138 802A9C48 080AA716 */ j .L802A9C58 -/* 42B13C 802A9C4C 00000000 */ nop +/* 42B13C 802A9C4C 00000000 */ nop .L802A9C50: /* 42B140 802A9C50 3C058029 */ lui $a1, %hi(D_80292B80) /* 42B144 802A9C54 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9C58: /* 42B148 802A9C58 0C0511FF */ jal set_menu_icon_script -/* 42B14C 802A9C5C 00000000 */ nop +/* 42B14C 802A9C5C 00000000 */ nop /* 42B150 802A9C60 0200202D */ daddu $a0, $s0, $zero /* 42B154 802A9C64 86250056 */ lh $a1, 0x56($s1) /* 42B158 802A9C68 86260058 */ lh $a2, 0x58($s1) @@ -568,7 +568,7 @@ glabel func_802A948C_42A97C /* 42B174 802A9C84 8223005D */ lb $v1, 0x5d($s1) /* 42B178 802A9C88 2402FFFB */ addiu $v0, $zero, -5 /* 42B17C 802A9C8C 1462001B */ bne $v1, $v0, .L802A9CFC -/* 42B180 802A9C90 00000000 */ nop +/* 42B180 802A9C90 00000000 */ nop /* 42B184 802A9C94 8222005C */ lb $v0, 0x5c($s1) /* 42B188 802A9C98 8E300020 */ lw $s0, 0x20($s1) /* 42B18C 802A9C9C 10400005 */ beqz $v0, .L802A9CB4 @@ -576,13 +576,13 @@ glabel func_802A948C_42A97C /* 42B194 802A9CA4 3C058029 */ lui $a1, %hi(D_80292B54) /* 42B198 802A9CA8 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) /* 42B19C 802A9CAC 080AA72F */ j .L802A9CBC -/* 42B1A0 802A9CB0 00000000 */ nop +/* 42B1A0 802A9CB0 00000000 */ nop .L802A9CB4: /* 42B1A4 802A9CB4 3C058029 */ lui $a1, %hi(D_80292B80) /* 42B1A8 802A9CB8 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9CBC: /* 42B1AC 802A9CBC 0C0511FF */ jal set_menu_icon_script -/* 42B1B0 802A9CC0 00000000 */ nop +/* 42B1B0 802A9CC0 00000000 */ nop /* 42B1B4 802A9CC4 0200202D */ daddu $a0, $s0, $zero /* 42B1B8 802A9CC8 86250056 */ lh $a1, 0x56($s1) /* 42B1BC 802A9CCC 86260058 */ lh $a2, 0x58($s1) @@ -596,7 +596,7 @@ glabel func_802A948C_42A97C /* 42B1DC 802A9CEC 3C058011 */ lui $a1, %hi(D_80108B28) /* 42B1E0 802A9CF0 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) /* 42B1E4 802A9CF4 0C0511FF */ jal set_menu_icon_script -/* 42B1E8 802A9CF8 00000000 */ nop +/* 42B1E8 802A9CF8 00000000 */ nop .L802A9CFC: /* 42B1EC 802A9CFC 9222005D */ lbu $v0, 0x5d($s1) /* 42B1F0 802A9D00 86230054 */ lh $v1, 0x54($s1) @@ -604,17 +604,17 @@ glabel func_802A948C_42A97C /* 42B1F8 802A9D08 A222005D */ sb $v0, 0x5d($s1) /* 42B1FC 802A9D0C 24020002 */ addiu $v0, $zero, 2 /* 42B200 802A9D10 1462000D */ bne $v1, $v0, .L802A9D48 -/* 42B204 802A9D14 00000000 */ nop +/* 42B204 802A9D14 00000000 */ nop /* 42B208 802A9D18 8E240014 */ lw $a0, 0x14($s1) /* 42B20C 802A9D1C 3C058029 */ lui $a1, %hi(D_80292788) /* 42B210 802A9D20 24A52788 */ addiu $a1, $a1, %lo(D_80292788) /* 42B214 802A9D24 0C0511FF */ jal set_menu_icon_script -/* 42B218 802A9D28 00000000 */ nop +/* 42B218 802A9D28 00000000 */ nop /* 42B21C 802A9D2C 8E240004 */ lw $a0, 4($s1) /* 42B220 802A9D30 3C058011 */ lui $a1, %hi(D_80108B54) /* 42B224 802A9D34 24A58B54 */ addiu $a1, $a1, %lo(D_80108B54) /* 42B228 802A9D38 0C0511FF */ jal set_menu_icon_script -/* 42B22C 802A9D3C 00000000 */ nop +/* 42B22C 802A9D3C 00000000 */ nop /* 42B230 802A9D40 0C05272D */ jal play_sound /* 42B234 802A9D44 24040234 */ addiu $a0, $zero, 0x234 .L802A9D48: @@ -636,14 +636,14 @@ glabel func_802A948C_42A97C /* 42B270 802A9D80 24040063 */ addiu $a0, $zero, 0x63 /* 42B274 802A9D84 82220060 */ lb $v0, 0x60($s1) /* 42B278 802A9D88 1440003D */ bnez $v0, .L802A9E80 -/* 42B27C 802A9D8C 00000000 */ nop +/* 42B27C 802A9D8C 00000000 */ nop /* 42B280 802A9D90 8222005C */ lb $v0, 0x5c($s1) /* 42B284 802A9D94 1440003A */ bnez $v0, .L802A9E80 -/* 42B288 802A9D98 00000000 */ nop +/* 42B288 802A9D98 00000000 */ nop /* 42B28C 802A9D9C 8222005D */ lb $v0, 0x5d($s1) /* 42B290 802A9DA0 2842FFFB */ slti $v0, $v0, -5 /* 42B294 802A9DA4 14400036 */ bnez $v0, .L802A9E80 -/* 42B298 802A9DA8 00000000 */ nop +/* 42B298 802A9DA8 00000000 */ nop /* 42B29C 802A9DAC 86220050 */ lh $v0, 0x50($s1) /* 42B2A0 802A9DB0 8E030434 */ lw $v1, 0x434($s0) /* 42B2A4 802A9DB4 000210C0 */ sll $v0, $v0, 3 @@ -677,20 +677,20 @@ glabel func_802A948C_42A97C /* 42B304 802A9E14 2484FFC0 */ addiu $a0, $a0, -0x40 .L802A9E18: /* 42B308 802A9E18 10400006 */ beqz $v0, .L802A9E34 -/* 42B30C 802A9E1C 00000000 */ nop +/* 42B30C 802A9E1C 00000000 */ nop /* 42B310 802A9E20 8CA20330 */ lw $v0, 0x330($a1) /* 42B314 802A9E24 30428000 */ andi $v0, $v0, 0x8000 /* 42B318 802A9E28 10400009 */ beqz $v0, .L802A9E50 -/* 42B31C 802A9E2C 00000000 */ nop +/* 42B31C 802A9E2C 00000000 */ nop /* 42B320 802A9E30 A2270060 */ sb $a3, 0x60($s1) .L802A9E34: /* 42B324 802A9E34 8CA20330 */ lw $v0, 0x330($a1) /* 42B328 802A9E38 30428000 */ andi $v0, $v0, 0x8000 /* 42B32C 802A9E3C 10400004 */ beqz $v0, .L802A9E50 -/* 42B330 802A9E40 00000000 */ nop +/* 42B330 802A9E40 00000000 */ nop /* 42B334 802A9E44 82220060 */ lb $v0, 0x60($s1) /* 42B338 802A9E48 10400004 */ beqz $v0, .L802A9E5C -/* 42B33C 802A9E4C 00000000 */ nop +/* 42B33C 802A9E4C 00000000 */ nop .L802A9E50: /* 42B340 802A9E50 8222005E */ lb $v0, 0x5e($s1) /* 42B344 802A9E54 50400006 */ beql $v0, $zero, .L802A9E70 @@ -713,7 +713,7 @@ glabel func_802A948C_42A97C /* 42B37C 802A9E8C 2403FFFB */ addiu $v1, $zero, -5 /* 42B380 802A9E90 82220060 */ lb $v0, 0x60($s1) /* 42B384 802A9E94 14400004 */ bnez $v0, .L802A9EA8 -/* 42B388 802A9E98 00000000 */ nop +/* 42B388 802A9E98 00000000 */ nop /* 42B38C 802A9E9C 8222005C */ lb $v0, 0x5c($s1) /* 42B390 802A9EA0 10400017 */ beqz $v0, .L802A9F00 /* 42B394 802A9EA4 2403FFFB */ addiu $v1, $zero, -5 @@ -725,13 +725,13 @@ glabel func_802A948C_42A97C /* 42B3A8 802A9EB8 3C058029 */ lui $a1, %hi(D_80292B54) /* 42B3AC 802A9EBC 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) /* 42B3B0 802A9EC0 080AA7B4 */ j .L802A9ED0 -/* 42B3B4 802A9EC4 00000000 */ nop +/* 42B3B4 802A9EC4 00000000 */ nop .L802A9EC8: /* 42B3B8 802A9EC8 3C058029 */ lui $a1, %hi(D_80292B80) /* 42B3BC 802A9ECC 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9ED0: /* 42B3C0 802A9ED0 0C0511FF */ jal set_menu_icon_script -/* 42B3C4 802A9ED4 00000000 */ nop +/* 42B3C4 802A9ED4 00000000 */ nop /* 42B3C8 802A9ED8 0200202D */ daddu $a0, $s0, $zero /* 42B3CC 802A9EDC 86250056 */ lh $a1, 0x56($s1) /* 42B3D0 802A9EE0 86260058 */ lh $a2, 0x58($s1) @@ -754,13 +754,13 @@ glabel func_802A948C_42A97C /* 42B410 802A9F20 3C058029 */ lui $a1, %hi(D_80292B54) /* 42B414 802A9F24 24A52B54 */ addiu $a1, $a1, %lo(D_80292B54) /* 42B418 802A9F28 080AA7CE */ j .L802A9F38 -/* 42B41C 802A9F2C 00000000 */ nop +/* 42B41C 802A9F2C 00000000 */ nop .L802A9F30: /* 42B420 802A9F30 3C058029 */ lui $a1, %hi(D_80292B80) /* 42B424 802A9F34 24A52B80 */ addiu $a1, $a1, %lo(D_80292B80) .L802A9F38: /* 42B428 802A9F38 0C0511FF */ jal set_menu_icon_script -/* 42B42C 802A9F3C 00000000 */ nop +/* 42B42C 802A9F3C 00000000 */ nop /* 42B430 802A9F40 0200202D */ daddu $a0, $s0, $zero /* 42B434 802A9F44 86250056 */ lh $a1, 0x56($s1) /* 42B438 802A9F48 86260058 */ lh $a2, 0x58($s1) @@ -774,7 +774,7 @@ glabel func_802A948C_42A97C /* 42B458 802A9F68 3C058011 */ lui $a1, %hi(D_80108B28) /* 42B45C 802A9F6C 24A58B28 */ addiu $a1, $a1, %lo(D_80108B28) /* 42B460 802A9F70 0C0511FF */ jal set_menu_icon_script -/* 42B464 802A9F74 00000000 */ nop +/* 42B464 802A9F74 00000000 */ nop /* 42B468 802A9F78 24020010 */ addiu $v0, $zero, 0x10 /* 42B46C 802A9F7C 080AA800 */ j .L802AA000 /* 42B470 802A9F80 A622004C */ sh $v0, 0x4c($s1) @@ -793,9 +793,9 @@ glabel func_802A948C_42A97C /* 42B49C 802A9FAC A2020086 */ sb $v0, 0x86($s0) /* 42B4A0 802A9FB0 24020003 */ addiu $v0, $zero, 3 /* 42B4A4 802A9FB4 14620003 */ bne $v1, $v0, .L802A9FC4 -/* 42B4A8 802A9FB8 00000000 */ nop +/* 42B4A8 802A9FB8 00000000 */ nop /* 42B4AC 802A9FBC 0C09A458 */ jal func_80269160 -/* 42B4B0 802A9FC0 00000000 */ nop +/* 42B4B0 802A9FC0 00000000 */ nop .L802A9FC4: /* 42B4B4 802A9FC4 0C093EB1 */ jal set_popup_duration /* 42B4B8 802A9FC8 0000202D */ daddu $a0, $zero, $zero @@ -812,7 +812,7 @@ glabel func_802A948C_42A97C /* 42B4E4 802A9FF4 A6220054 */ sh $v0, 0x54($s1) .L802A9FF8: /* 42B4E8 802A9FF8 0C09A327 */ jal func_80268C9C -/* 42B4EC 802A9FFC 00000000 */ nop +/* 42B4EC 802A9FFC 00000000 */ nop .L802AA000: /* 42B4F0 802AA000 8FBF0018 */ lw $ra, 0x18($sp) /* 42B4F4 802AA004 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_42A4F0/func_802AA014_42B504.s b/asm/nonmatchings/code_42A4F0/func_802AA014_42B504.s index bcc75a9d69..fbcbdb5954 100644 --- a/asm/nonmatchings/code_42A4F0/func_802AA014_42B504.s +++ b/asm/nonmatchings/code_42A4F0/func_802AA014_42B504.s @@ -36,7 +36,7 @@ glabel func_802AA014_42B504 /* 42B580 802AA090 00A32821 */ addu $a1, $a1, $v1 /* 42B584 802AA094 8CA5B180 */ lw $a1, %lo(D_802AB180)($a1) /* 42B588 802AA098 10450003 */ beq $v0, $a1, .L802AA0A8 -/* 42B58C 802AA09C 00000000 */ nop +/* 42B58C 802AA09C 00000000 */ nop /* 42B590 802AA0A0 0C0511FF */ jal set_menu_icon_script /* 42B594 802AA0A4 0220202D */ daddu $a0, $s1, $zero .L802AA0A8: @@ -44,7 +44,7 @@ glabel func_802AA014_42B504 /* 42B59C 802AA0AC 0220202D */ daddu $a0, $s1, $zero /* 42B5A0 802AA0B0 8E040030 */ lw $a0, 0x30($s0) /* 42B5A4 802AA0B4 0C0511EA */ jal draw_icon_0 -/* 42B5A8 802AA0B8 00000000 */ nop +/* 42B5A8 802AA0B8 00000000 */ nop /* 42B5AC 802AA0BC 0C0511EA */ jal draw_icon_0 /* 42B5B0 802AA0C0 8E040034 */ lw $a0, 0x34($s0) /* 42B5B4 802AA0C4 8FBF0018 */ lw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_42A4F0/func_802AA0D8_42B5C8.s b/asm/nonmatchings/code_42A4F0/func_802AA0D8_42B5C8.s index 8155ebc72f..07dca8c15a 100644 --- a/asm/nonmatchings/code_42A4F0/func_802AA0D8_42B5C8.s +++ b/asm/nonmatchings/code_42A4F0/func_802AA0D8_42B5C8.s @@ -35,4 +35,4 @@ glabel func_802AA0D8_42B5C8 /* 42B640 802AA150 8FB00010 */ lw $s0, 0x10($sp) /* 42B644 802AA154 03E00008 */ jr $ra /* 42B648 802AA158 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42B64C 802AA15C 00000000 */ nop +/* 42B64C 802AA15C 00000000 */ nop diff --git a/asm/nonmatchings/code_42C6F0/func_802A9000_42C6F0.s b/asm/nonmatchings/code_42C6F0/func_802A9000_42C6F0.s index 15547cb4dd..0085cf8395 100644 --- a/asm/nonmatchings/code_42C6F0/func_802A9000_42C6F0.s +++ b/asm/nonmatchings/code_42C6F0/func_802A9000_42C6F0.s @@ -73,7 +73,7 @@ glabel func_802A9000_42C6F0 /* 42C7F8 802A9108 24050082 */ addiu $a1, $zero, 0x82 /* 42C7FC 802A910C 2A62000F */ slti $v0, $s3, 0xf /* 42C800 802A9110 1440FFED */ bnez $v0, .L802A90C8 -/* 42C804 802A9114 00000000 */ nop +/* 42C804 802A9114 00000000 */ nop .L802A9118: /* 42C808 802A9118 24020002 */ addiu $v0, $zero, 2 /* 42C80C 802A911C 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_42C6F0/func_802A9138_42C828.s b/asm/nonmatchings/code_42C6F0/func_802A9138_42C828.s index 27b555c828..a69315a95d 100644 --- a/asm/nonmatchings/code_42C6F0/func_802A9138_42C828.s +++ b/asm/nonmatchings/code_42C6F0/func_802A9138_42C828.s @@ -18,7 +18,7 @@ glabel func_802A9138_42C828 /* 42C85C 802A916C 10400025 */ beqz $v0, .L802A9204 /* 42C860 802A9170 0240182D */ daddu $v1, $s2, $zero /* 42C864 802A9174 0C09A216 */ jal func_80268858 -/* 42C868 802A9178 00000000 */ nop +/* 42C868 802A9178 00000000 */ nop /* 42C86C 802A917C 8E050000 */ lw $a1, ($s0) /* 42C870 802A9180 26100004 */ addiu $s0, $s0, 4 /* 42C874 802A9184 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s b/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s index 96471a17a9..15375af32f 100644 --- a/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s +++ b/asm/nonmatchings/code_42C6F0/func_802A9228_42C918.s @@ -25,7 +25,7 @@ glabel func_802A9228_42C918 /* 42C968 802A9278 00220821 */ addu $at, $at, $v0 /* 42C96C 802A927C 8C2297E0 */ lw $v0, %lo(D_802A97E0)($at) /* 42C970 802A9280 00400008 */ jr $v0 -/* 42C974 802A9284 00000000 */ nop +/* 42C974 802A9284 00000000 */ nop /* 42C978 802A9288 0C093EB1 */ jal set_popup_duration /* 42C97C 802A928C 24040063 */ addiu $a0, $zero, 0x63 /* 42C980 802A9290 82220061 */ lb $v0, 0x61($s1) @@ -60,7 +60,7 @@ glabel func_802A9228_42C918 /* 42C9EC 802A92FC 0C051261 */ jal set_icon_render_pos /* 42C9F0 802A9300 24C6001C */ addiu $a2, $a2, 0x1c /* 42C9F4 802A9304 080AA5BA */ j .L802A96E8 -/* 42C9F8 802A9308 00000000 */ nop +/* 42C9F8 802A9308 00000000 */ nop /* 42C9FC 802A930C 0C093EB1 */ jal set_popup_duration /* 42CA00 802A9310 24040063 */ addiu $a0, $zero, 0x63 /* 42CA04 802A9314 8622004E */ lh $v0, 0x4e($s1) @@ -90,7 +90,7 @@ glabel func_802A9228_42C918 /* 42CA5C 802A936C 00021600 */ sll $v0, $v0, 0x18 /* 42CA60 802A9370 00021E03 */ sra $v1, $v0, 0x18 /* 42CA64 802A9374 1203FFFA */ beq $s0, $v1, .L802A9360 -/* 42CA68 802A9378 00000000 */ nop +/* 42CA68 802A9378 00000000 */ nop /* 42CA6C 802A937C 8222005D */ lb $v0, 0x5d($s1) /* 42CA70 802A9380 00021080 */ sll $v0, $v0, 2 /* 42CA74 802A9384 02221021 */ addu $v0, $s1, $v0 @@ -135,7 +135,7 @@ glabel func_802A9228_42C918 .L802A9420: /* 42CB10 802A9420 8223005D */ lb $v1, 0x5d($s1) /* 42CB14 802A9424 106200B0 */ beq $v1, $v0, .L802A96E8 -/* 42CB18 802A9428 00000000 */ nop +/* 42CB18 802A9428 00000000 */ nop /* 42CB1C 802A942C 96220070 */ lhu $v0, 0x70($s1) /* 42CB20 802A9430 2442FFFF */ addiu $v0, $v0, -1 /* 42CB24 802A9434 A6220070 */ sh $v0, 0x70($s1) @@ -170,7 +170,7 @@ glabel func_802A9228_42C918 .L802A9498: /* 42CB88 802A9498 2A620040 */ slti $v0, $s3, 0x40 /* 42CB8C 802A949C 14400003 */ bnez $v0, .L802A94AC -/* 42CB90 802A94A0 00000000 */ nop +/* 42CB90 802A94A0 00000000 */ nop /* 42CB94 802A94A4 2652FF00 */ addiu $s2, $s2, -0x100 /* 42CB98 802A94A8 2673FFC0 */ addiu $s3, $s3, -0x40 .L802A94AC: @@ -184,14 +184,14 @@ glabel func_802A9228_42C918 /* 42CBB8 802A94C8 10400005 */ beqz $v0, .L802A94E0 /* 42CBBC 802A94CC 24020002 */ addiu $v0, $zero, 2 /* 42CBC0 802A94D0 10600007 */ beqz $v1, .L802A94F0 -/* 42CBC4 802A94D4 00000000 */ nop +/* 42CBC4 802A94D4 00000000 */ nop /* 42CBC8 802A94D8 080AA55A */ j .L802A9568 -/* 42CBCC 802A94DC 00000000 */ nop +/* 42CBCC 802A94DC 00000000 */ nop .L802A94E0: /* 42CBD0 802A94E0 10620017 */ beq $v1, $v0, .L802A9540 -/* 42CBD4 802A94E4 00000000 */ nop +/* 42CBD4 802A94E4 00000000 */ nop /* 42CBD8 802A94E8 080AA55A */ j .L802A9568 -/* 42CBDC 802A94EC 00000000 */ nop +/* 42CBDC 802A94EC 00000000 */ nop .L802A94F0: /* 42CBE0 802A94F0 8222005E */ lb $v0, 0x5e($s1) /* 42CBE4 802A94F4 5440001C */ bnel $v0, $zero, .L802A9568 @@ -290,14 +290,14 @@ glabel func_802A9228_42C918 /* 42CD40 802A9650 0C05272D */ jal play_sound /* 42CD44 802A9654 A2E30084 */ sb $v1, 0x84($s7) /* 42CD48 802A9658 080AA5BA */ j .L802A96E8 -/* 42CD4C 802A965C 00000000 */ nop +/* 42CD4C 802A965C 00000000 */ nop .L802A9660: /* 42CD50 802A9660 26940001 */ addiu $s4, $s4, 1 /* 42CD54 802A9664 0295102A */ slt $v0, $s4, $s5 /* 42CD58 802A9668 1440FF8B */ bnez $v0, .L802A9498 /* 42CD5C 802A966C 26730001 */ addiu $s3, $s3, 1 /* 42CD60 802A9670 080AA5BA */ j .L802A96E8 -/* 42CD64 802A9674 00000000 */ nop +/* 42CD64 802A9674 00000000 */ nop /* 42CD68 802A9678 82E20084 */ lb $v0, 0x84($s7) /* 42CD6C 802A967C 92E30084 */ lbu $v1, 0x84($s7) /* 42CD70 802A9680 54400003 */ bnel $v0, $zero, .L802A9690 @@ -311,7 +311,7 @@ glabel func_802A9228_42C918 /* 42CD8C 802A969C 14400003 */ bnez $v0, .L802A96AC /* 42CD90 802A96A0 A2E30086 */ sb $v1, 0x86($s7) /* 42CD94 802A96A4 0C09A458 */ jal func_80269160 -/* 42CD98 802A96A8 00000000 */ nop +/* 42CD98 802A96A8 00000000 */ nop .L802A96AC: /* 42CD9C 802A96AC 0C093EB1 */ jal set_popup_duration /* 42CDA0 802A96B0 0000202D */ daddu $a0, $zero, $zero @@ -328,7 +328,7 @@ glabel func_802A9228_42C918 /* 42CDCC 802A96DC A6220054 */ sh $v0, 0x54($s1) .L802A96E0: /* 42CDD0 802A96E0 0C09A327 */ jal func_80268C9C -/* 42CDD4 802A96E4 00000000 */ nop +/* 42CDD4 802A96E4 00000000 */ nop .L802A96E8: /* 42CDD8 802A96E8 8FBF0034 */ lw $ra, 0x34($sp) /* 42CDDC 802A96EC 8FBE0030 */ lw $fp, 0x30($sp) diff --git a/asm/nonmatchings/code_42C6F0/func_802A9718_42CE08.s b/asm/nonmatchings/code_42C6F0/func_802A9718_42CE08.s index f590ac8877..f3f6658ce2 100644 --- a/asm/nonmatchings/code_42C6F0/func_802A9718_42CE08.s +++ b/asm/nonmatchings/code_42C6F0/func_802A9718_42CE08.s @@ -16,7 +16,7 @@ glabel func_802A9718_42CE08 /* 42CE30 802A9740 26310001 */ addiu $s1, $s1, 1 /* 42CE34 802A9744 2A22000F */ slti $v0, $s1, 0xf /* 42CE38 802A9748 1440FFFA */ bnez $v0, .L802A9734 -/* 42CE3C 802A974C 00000000 */ nop +/* 42CE3C 802A974C 00000000 */ nop /* 42CE40 802A9750 8FBF0018 */ lw $ra, 0x18($sp) /* 42CE44 802A9754 8FB10014 */ lw $s1, 0x14($sp) /* 42CE48 802A9758 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_42C6F0/func_802A9764_42CE54.s b/asm/nonmatchings/code_42C6F0/func_802A9764_42CE54.s index 1f7172fb69..4a474ef42a 100644 --- a/asm/nonmatchings/code_42C6F0/func_802A9764_42CE54.s +++ b/asm/nonmatchings/code_42C6F0/func_802A9764_42CE54.s @@ -19,10 +19,10 @@ glabel func_802A9764_42CE54 /* 42CE88 802A9798 26310001 */ addiu $s1, $s1, 1 /* 42CE8C 802A979C 2A22000F */ slti $v0, $s1, 0xf /* 42CE90 802A97A0 1440FFFA */ bnez $v0, .L802A978C -/* 42CE94 802A97A4 00000000 */ nop +/* 42CE94 802A97A4 00000000 */ nop /* 42CE98 802A97A8 8FBF0018 */ lw $ra, 0x18($sp) /* 42CE9C 802A97AC 8FB10014 */ lw $s1, 0x14($sp) /* 42CEA0 802A97B0 8FB00010 */ lw $s0, 0x10($sp) /* 42CEA4 802A97B4 03E00008 */ jr $ra /* 42CEA8 802A97B8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 42CEAC 802A97BC 00000000 */ nop +/* 42CEAC 802A97BC 00000000 */ nop diff --git a/asm/nonmatchings/code_42E3A0/func_802A9000_42E3A0.s b/asm/nonmatchings/code_42E3A0/func_802A9000_42E3A0.s index 8f64341629..4de9c45d8c 100644 --- a/asm/nonmatchings/code_42E3A0/func_802A9000_42E3A0.s +++ b/asm/nonmatchings/code_42E3A0/func_802A9000_42E3A0.s @@ -21,7 +21,7 @@ glabel func_802A9000_42E3A0 /* 42E3E0 802A9040 10400047 */ beqz $v0, .L802A9160 /* 42E3E4 802A9044 0200182D */ daddu $v1, $s0, $zero /* 42E3E8 802A9048 0C09A216 */ jal func_80268858 -/* 42E3EC 802A904C 00000000 */ nop +/* 42E3EC 802A904C 00000000 */ nop /* 42E3F0 802A9050 3C048011 */ lui $a0, %hi(D_80108E1C) /* 42E3F4 802A9054 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 42E3F8 802A9058 24020012 */ addiu $v0, $zero, 0x12 @@ -57,7 +57,7 @@ glabel func_802A9000_42E3A0 /* 42E470 802A90D0 3C048011 */ lui $a0, %hi(D_80108AFC) /* 42E474 802A90D4 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 42E478 802A90D8 0C050529 */ jal create_icon -/* 42E47C 802A90DC 00000000 */ nop +/* 42E47C 802A90DC 00000000 */ nop /* 42E480 802A90E0 0040802D */ daddu $s0, $v0, $zero /* 42E484 802A90E4 86250056 */ lh $a1, 0x56($s1) /* 42E488 802A90E8 86260058 */ lh $a2, 0x58($s1) @@ -74,7 +74,7 @@ glabel func_802A9000_42E3A0 /* 42E4B4 802A9114 3C048029 */ lui $a0, %hi(D_80292974) /* 42E4B8 802A9118 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 42E4BC 802A911C 0C050529 */ jal create_icon -/* 42E4C0 802A9120 00000000 */ nop +/* 42E4C0 802A9120 00000000 */ nop /* 42E4C4 802A9124 0040802D */ daddu $s0, $v0, $zero /* 42E4C8 802A9128 86250056 */ lh $a1, 0x56($s1) /* 42E4CC 802A912C 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_42E3A0/func_802A917C_42E51C.s b/asm/nonmatchings/code_42E3A0/func_802A917C_42E51C.s index 5cb1184682..b107edd192 100644 --- a/asm/nonmatchings/code_42E3A0/func_802A917C_42E51C.s +++ b/asm/nonmatchings/code_42E3A0/func_802A917C_42E51C.s @@ -18,7 +18,7 @@ glabel func_802A917C_42E51C /* 42E550 802A91B0 10400030 */ beqz $v0, .L802A9274 /* 42E554 802A91B4 0240182D */ daddu $v1, $s2, $zero /* 42E558 802A91B8 0C09A216 */ jal func_80268858 -/* 42E55C 802A91BC 00000000 */ nop +/* 42E55C 802A91BC 00000000 */ nop /* 42E560 802A91C0 8E050000 */ lw $a1, ($s0) /* 42E564 802A91C4 26100004 */ addiu $s0, $s0, 4 /* 42E568 802A91C8 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s b/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s index 6d903781ed..b699f91e97 100644 --- a/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s +++ b/asm/nonmatchings/code_42E3A0/func_802A9298_42E638.s @@ -21,7 +21,7 @@ glabel func_802A9298_42E638 /* 42E678 802A92D8 00220821 */ addu $at, $at, $v0 /* 42E67C 802A92DC 8C229A40 */ lw $v0, %lo(D_802A9A40)($at) /* 42E680 802A92E0 00400008 */ jr $v0 -/* 42E684 802A92E4 00000000 */ nop +/* 42E684 802A92E4 00000000 */ nop /* 42E688 802A92E8 0C093EB1 */ jal set_popup_duration /* 42E68C 802A92EC 24040063 */ addiu $a0, $zero, 0x63 /* 42E690 802A92F0 8E300004 */ lw $s0, 4($s1) @@ -76,7 +76,7 @@ glabel func_802A9298_42E638 /* 42E744 802A93A4 0C051261 */ jal set_icon_render_pos /* 42E748 802A93A8 24C6001C */ addiu $a2, $a2, 0x1c /* 42E74C 802A93AC 080AA625 */ j .L802A9894 -/* 42E750 802A93B0 00000000 */ nop +/* 42E750 802A93B0 00000000 */ nop /* 42E754 802A93B4 0C093EB1 */ jal set_popup_duration /* 42E758 802A93B8 24040063 */ addiu $a0, $zero, 0x63 /* 42E75C 802A93BC 8622004E */ lh $v0, 0x4e($s1) @@ -90,7 +90,7 @@ glabel func_802A9298_42E638 /* 42E778 802A93D8 3C058011 */ lui $a1, %hi(D_80108F30) /* 42E77C 802A93DC 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) /* 42E780 802A93E0 0C0511FF */ jal set_menu_icon_script -/* 42E784 802A93E4 00000000 */ nop +/* 42E784 802A93E4 00000000 */ nop /* 42E788 802A93E8 3C048000 */ lui $a0, 0x8000 /* 42E78C 802A93EC 34840041 */ ori $a0, $a0, 0x41 /* 42E790 802A93F0 0000282D */ daddu $a1, $zero, $zero @@ -108,7 +108,7 @@ glabel func_802A9298_42E638 /* 42E7C0 802A9420 24040063 */ addiu $a0, $zero, 0x63 /* 42E7C4 802A9424 86220068 */ lh $v0, 0x68($s1) /* 42E7C8 802A9428 14400066 */ bnez $v0, .L802A95C4 -/* 42E7CC 802A942C 00000000 */ nop +/* 42E7CC 802A942C 00000000 */ nop /* 42E7D0 802A9430 82220080 */ lb $v0, 0x80($s1) /* 42E7D4 802A9434 00021040 */ sll $v0, $v0, 1 /* 42E7D8 802A9438 02221021 */ addu $v0, $s1, $v0 @@ -122,7 +122,7 @@ glabel func_802A9298_42E638 /* 42E7F4 802A9454 14610004 */ bne $v1, $at, .L802A9468 /* 42E7F8 802A9458 3C018000 */ lui $at, 0x8000 /* 42E7FC 802A945C 14410002 */ bne $v0, $at, .L802A9468 -/* 42E800 802A9460 00000000 */ nop +/* 42E800 802A9460 00000000 */ nop /* 42E804 802A9464 0006000D */ break 6 .L802A9468: /* 42E808 802A9468 00001012 */ mflo $v0 @@ -150,7 +150,7 @@ glabel func_802A9298_42E638 /* 42E85C 802A94BC 8E420210 */ lw $v0, 0x210($s2) /* 42E860 802A94C0 00441024 */ and $v0, $v0, $a0 /* 42E864 802A94C4 10400006 */ beqz $v0, .L802A94E0 -/* 42E868 802A94C8 00000000 */ nop +/* 42E868 802A94C8 00000000 */ nop /* 42E86C 802A94CC 8E420210 */ lw $v0, 0x210($s2) /* 42E870 802A94D0 24030001 */ addiu $v1, $zero, 1 /* 42E874 802A94D4 00441024 */ and $v0, $v0, $a0 @@ -159,7 +159,7 @@ glabel func_802A9298_42E638 .L802A94E0: /* 42E880 802A94E0 8222005C */ lb $v0, 0x5c($s1) /* 42E884 802A94E4 10400026 */ beqz $v0, .L802A9580 -/* 42E888 802A94E8 00000000 */ nop +/* 42E888 802A94E8 00000000 */ nop /* 42E88C 802A94EC 86220064 */ lh $v0, 0x64($s1) /* 42E890 802A94F0 1440000D */ bnez $v0, .L802A9528 /* 42E894 802A94F4 3C0451EB */ lui $a0, 0x51eb @@ -204,7 +204,7 @@ glabel func_802A9298_42E638 /* 42E924 802A9584 3C030008 */ lui $v1, 8 /* 42E928 802A9588 00431024 */ and $v0, $v0, $v1 /* 42E92C 802A958C 1040000D */ beqz $v0, .L802A95C4 -/* 42E930 802A9590 00000000 */ nop +/* 42E930 802A9590 00000000 */ nop /* 42E934 802A9594 86220050 */ lh $v0, 0x50($s1) /* 42E938 802A9598 8E430434 */ lw $v1, 0x434($s2) /* 42E93C 802A959C 00021080 */ sll $v0, $v0, 2 @@ -270,14 +270,14 @@ glabel func_802A9298_42E638 /* 42EA20 802A9680 10400005 */ beqz $v0, .L802A9698 /* 42EA24 802A9684 24020002 */ addiu $v0, $zero, 2 /* 42EA28 802A9688 10600007 */ beqz $v1, .L802A96A8 -/* 42EA2C 802A968C 00000000 */ nop +/* 42EA2C 802A968C 00000000 */ nop /* 42EA30 802A9690 080AA5F0 */ j .L802A97C0 -/* 42EA34 802A9694 00000000 */ nop +/* 42EA34 802A9694 00000000 */ nop .L802A9698: /* 42EA38 802A9698 1062001F */ beq $v1, $v0, .L802A9718 -/* 42EA3C 802A969C 00000000 */ nop +/* 42EA3C 802A969C 00000000 */ nop /* 42EA40 802A96A0 080AA5F0 */ j .L802A97C0 -/* 42EA44 802A96A4 00000000 */ nop +/* 42EA44 802A96A4 00000000 */ nop .L802A96A8: /* 42EA48 802A96A8 82420085 */ lb $v0, 0x85($s2) /* 42EA4C 802A96AC 82430084 */ lb $v1, 0x84($s2) @@ -311,7 +311,7 @@ glabel func_802A9298_42E638 .L802A9718: /* 42EAB8 802A9718 86220064 */ lh $v0, 0x64($s1) /* 42EABC 802A971C 1440000F */ bnez $v0, .L802A975C -/* 42EAC0 802A9720 00000000 */ nop +/* 42EAC0 802A9720 00000000 */ nop /* 42EAC4 802A9724 82420085 */ lb $v0, 0x85($s2) /* 42EAC8 802A9728 82430084 */ lb $v1, 0x84($s2) /* 42EACC 802A972C 00021080 */ sll $v0, $v0, 2 @@ -389,9 +389,9 @@ glabel func_802A9298_42E638 /* 42EBD4 802A9834 82430081 */ lb $v1, 0x81($s2) /* 42EBD8 802A9838 24020064 */ addiu $v0, $zero, 0x64 /* 42EBDC 802A983C 14620003 */ bne $v1, $v0, .L802A984C -/* 42EBE0 802A9840 00000000 */ nop +/* 42EBE0 802A9840 00000000 */ nop /* 42EBE4 802A9844 0C09A458 */ jal func_80269160 -/* 42EBE8 802A9848 00000000 */ nop +/* 42EBE8 802A9848 00000000 */ nop .L802A984C: /* 42EBEC 802A984C 0C093EB1 */ jal set_popup_duration /* 42EBF0 802A9850 0000202D */ daddu $a0, $zero, $zero @@ -412,7 +412,7 @@ glabel func_802A9298_42E638 /* 42EC28 802A9888 A6220054 */ sh $v0, 0x54($s1) .L802A988C: /* 42EC2C 802A988C 0C09A327 */ jal func_80268C9C -/* 42EC30 802A9890 00000000 */ nop +/* 42EC30 802A9890 00000000 */ nop .L802A9894: /* 42EC34 802A9894 8FBF0020 */ lw $ra, 0x20($sp) /* 42EC38 802A9898 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_42E3A0/func_802A98B0_42EC50.s b/asm/nonmatchings/code_42E3A0/func_802A98B0_42EC50.s index 1deb8b5d16..6a07ed196f 100644 --- a/asm/nonmatchings/code_42E3A0/func_802A98B0_42EC50.s +++ b/asm/nonmatchings/code_42E3A0/func_802A98B0_42EC50.s @@ -35,7 +35,7 @@ glabel func_802A98B0_42EC50 /* 42ECC8 802A9928 0C09A1DC */ jal func_80268770 /* 42ECCC 802A992C 00063403 */ sra $a2, $a2, 0x10 /* 42ECD0 802A9930 080AA65C */ j .L802A9970 -/* 42ECD4 802A9934 00000000 */ nop +/* 42ECD4 802A9934 00000000 */ nop .L802A9938: /* 42ECD8 802A9938 96230044 */ lhu $v1, 0x44($s1) /* 42ECDC 802A993C 3484851F */ ori $a0, $a0, 0x851f @@ -54,7 +54,7 @@ glabel func_802A98B0_42EC50 .L802A9970: /* 42ED10 802A9970 8E24000C */ lw $a0, 0xc($s1) /* 42ED14 802A9974 0C0511EA */ jal draw_icon_0 -/* 42ED18 802A9978 00000000 */ nop +/* 42ED18 802A9978 00000000 */ nop /* 42ED1C 802A997C 8FBF0020 */ lw $ra, 0x20($sp) /* 42ED20 802A9980 8FB1001C */ lw $s1, 0x1c($sp) /* 42ED24 802A9984 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_42E3A0/func_802A9990_42ED30.s b/asm/nonmatchings/code_42E3A0/func_802A9990_42ED30.s index 45355ed750..7c18ab4d9c 100644 --- a/asm/nonmatchings/code_42E3A0/func_802A9990_42ED30.s +++ b/asm/nonmatchings/code_42E3A0/func_802A9990_42ED30.s @@ -17,4 +17,4 @@ glabel func_802A9990_42ED30 /* 42ED60 802A99C0 8FB00010 */ lw $s0, 0x10($sp) /* 42ED64 802A99C4 03E00008 */ jr $ra /* 42ED68 802A99C8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42ED6C 802A99CC 00000000 */ nop +/* 42ED6C 802A99CC 00000000 */ nop diff --git a/asm/nonmatchings/code_42EE20/func_802A9000_42EE20.s b/asm/nonmatchings/code_42EE20/func_802A9000_42EE20.s index 8a936b0f20..b75e38f033 100644 --- a/asm/nonmatchings/code_42EE20/func_802A9000_42EE20.s +++ b/asm/nonmatchings/code_42EE20/func_802A9000_42EE20.s @@ -19,7 +19,7 @@ glabel func_802A9000_42EE20 /* 42EE58 802A9038 10400045 */ beqz $v0, .L802A9150 /* 42EE5C 802A903C 0200182D */ daddu $v1, $s0, $zero /* 42EE60 802A9040 0C09A216 */ jal func_80268858 -/* 42EE64 802A9044 00000000 */ nop +/* 42EE64 802A9044 00000000 */ nop /* 42EE68 802A9048 3C048011 */ lui $a0, %hi(D_80108E1C) /* 42EE6C 802A904C 24848E1C */ addiu $a0, $a0, %lo(D_80108E1C) /* 42EE70 802A9050 24020013 */ addiu $v0, $zero, 0x13 @@ -53,7 +53,7 @@ glabel func_802A9000_42EE20 /* 42EEE0 802A90C0 3C048011 */ lui $a0, %hi(D_80108AFC) /* 42EEE4 802A90C4 24848AFC */ addiu $a0, $a0, %lo(D_80108AFC) /* 42EEE8 802A90C8 0C050529 */ jal create_icon -/* 42EEEC 802A90CC 00000000 */ nop +/* 42EEEC 802A90CC 00000000 */ nop /* 42EEF0 802A90D0 0040802D */ daddu $s0, $v0, $zero /* 42EEF4 802A90D4 86250056 */ lh $a1, 0x56($s1) /* 42EEF8 802A90D8 86260058 */ lh $a2, 0x58($s1) @@ -70,7 +70,7 @@ glabel func_802A9000_42EE20 /* 42EF24 802A9104 3C048029 */ lui $a0, %hi(D_80292974) /* 42EF28 802A9108 24842974 */ addiu $a0, $a0, %lo(D_80292974) /* 42EF2C 802A910C 0C050529 */ jal create_icon -/* 42EF30 802A9110 00000000 */ nop +/* 42EF30 802A9110 00000000 */ nop /* 42EF34 802A9114 0040802D */ daddu $s0, $v0, $zero /* 42EF38 802A9118 86250056 */ lh $a1, 0x56($s1) /* 42EF3C 802A911C 86260058 */ lh $a2, 0x58($s1) diff --git a/asm/nonmatchings/code_42EE20/func_802A916C_42EF8C.s b/asm/nonmatchings/code_42EE20/func_802A916C_42EF8C.s index 98a5d53835..284320cf46 100644 --- a/asm/nonmatchings/code_42EE20/func_802A916C_42EF8C.s +++ b/asm/nonmatchings/code_42EE20/func_802A916C_42EF8C.s @@ -18,7 +18,7 @@ glabel func_802A916C_42EF8C /* 42EFC0 802A91A0 10400023 */ beqz $v0, .L802A9230 /* 42EFC4 802A91A4 0260182D */ daddu $v1, $s3, $zero /* 42EFC8 802A91A8 0C09A216 */ jal func_80268858 -/* 42EFCC 802A91AC 00000000 */ nop +/* 42EFCC 802A91AC 00000000 */ nop /* 42EFD0 802A91B0 8E050000 */ lw $a1, ($s0) /* 42EFD4 802A91B4 26100004 */ addiu $s0, $s0, 4 /* 42EFD8 802A91B8 0C0B1EAF */ jal get_variable diff --git a/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s b/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s index d7ac7fccb3..026cb6a0b0 100644 --- a/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s +++ b/asm/nonmatchings/code_42EE20/func_802A9254_42F074.s @@ -19,7 +19,7 @@ glabel func_802A9254_42F074 /* 42F0AC 802A928C 00220821 */ addu $at, $at, $v0 /* 42F0B0 802A9290 8C229880 */ lw $v0, %lo(D_802A9880)($at) /* 42F0B4 802A9294 00400008 */ jr $v0 -/* 42F0B8 802A9298 00000000 */ nop +/* 42F0B8 802A9298 00000000 */ nop /* 42F0BC 802A929C 0C093EB1 */ jal set_popup_duration /* 42F0C0 802A92A0 24040063 */ addiu $a0, $zero, 0x63 /* 42F0C4 802A92A4 8E300004 */ lw $s0, 4($s1) @@ -74,7 +74,7 @@ glabel func_802A9254_42F074 /* 42F178 802A9358 0C051261 */ jal set_icon_render_pos /* 42F17C 802A935C 24C6001C */ addiu $a2, $a2, 0x1c /* 42F180 802A9360 080AA5C9 */ j .L802A9724 -/* 42F184 802A9364 00000000 */ nop +/* 42F184 802A9364 00000000 */ nop /* 42F188 802A9368 0C093EB1 */ jal set_popup_duration /* 42F18C 802A936C 24040063 */ addiu $a0, $zero, 0x63 /* 42F190 802A9370 8622004E */ lh $v0, 0x4e($s1) @@ -88,7 +88,7 @@ glabel func_802A9254_42F074 /* 42F1AC 802A938C 3C058011 */ lui $a1, %hi(D_80108F30) /* 42F1B0 802A9390 24A58F30 */ addiu $a1, $a1, %lo(D_80108F30) /* 42F1B4 802A9394 0C0511FF */ jal set_menu_icon_script -/* 42F1B8 802A9398 00000000 */ nop +/* 42F1B8 802A9398 00000000 */ nop /* 42F1BC 802A939C 3C048000 */ lui $a0, 0x8000 /* 42F1C0 802A93A0 34840041 */ ori $a0, $a0, 0x41 /* 42F1C4 802A93A4 0000282D */ daddu $a1, $zero, $zero @@ -106,7 +106,7 @@ glabel func_802A9254_42F074 /* 42F1F4 802A93D4 24040063 */ addiu $a0, $zero, 0x63 /* 42F1F8 802A93D8 86220068 */ lh $v0, 0x68($s1) /* 42F1FC 802A93DC 14400057 */ bnez $v0, .L802A953C -/* 42F200 802A93E0 00000000 */ nop +/* 42F200 802A93E0 00000000 */ nop /* 42F204 802A93E4 82220080 */ lb $v0, 0x80($s1) /* 42F208 802A93E8 00021040 */ sll $v0, $v0, 1 /* 42F20C 802A93EC 02221021 */ addu $v0, $s1, $v0 @@ -120,7 +120,7 @@ glabel func_802A9254_42F074 /* 42F228 802A9408 14610004 */ bne $v1, $at, .L802A941C /* 42F22C 802A940C 3C018000 */ lui $at, 0x8000 /* 42F230 802A9410 14410002 */ bne $v0, $at, .L802A941C -/* 42F234 802A9414 00000000 */ nop +/* 42F234 802A9414 00000000 */ nop /* 42F238 802A9418 0006000D */ break 6 .L802A941C: /* 42F23C 802A941C 00001012 */ mflo $v0 @@ -307,9 +307,9 @@ glabel func_802A9254_42F074 /* 42F4E4 802A96C4 82430081 */ lb $v1, 0x81($s2) /* 42F4E8 802A96C8 24020064 */ addiu $v0, $zero, 0x64 /* 42F4EC 802A96CC 14620003 */ bne $v1, $v0, .L802A96DC -/* 42F4F0 802A96D0 00000000 */ nop +/* 42F4F0 802A96D0 00000000 */ nop /* 42F4F4 802A96D4 0C09A458 */ jal func_80269160 -/* 42F4F8 802A96D8 00000000 */ nop +/* 42F4F8 802A96D8 00000000 */ nop .L802A96DC: /* 42F4FC 802A96DC 0C093EB1 */ jal set_popup_duration /* 42F500 802A96E0 0000202D */ daddu $a0, $zero, $zero @@ -330,7 +330,7 @@ glabel func_802A9254_42F074 /* 42F538 802A9718 A6220054 */ sh $v0, 0x54($s1) .L802A971C: /* 42F53C 802A971C 0C09A327 */ jal func_80268C9C -/* 42F540 802A9720 00000000 */ nop +/* 42F540 802A9720 00000000 */ nop .L802A9724: /* 42F544 802A9724 8FBF001C */ lw $ra, 0x1c($sp) /* 42F548 802A9728 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_42EE20/func_802A973C_42F55C.s b/asm/nonmatchings/code_42EE20/func_802A973C_42F55C.s index aaf814fa4d..b95030b639 100644 --- a/asm/nonmatchings/code_42EE20/func_802A973C_42F55C.s +++ b/asm/nonmatchings/code_42EE20/func_802A973C_42F55C.s @@ -35,7 +35,7 @@ glabel func_802A973C_42F55C /* 42F5D4 802A97B4 0C09A1DC */ jal func_80268770 /* 42F5D8 802A97B8 00063403 */ sra $a2, $a2, 0x10 /* 42F5DC 802A97BC 080AA5FF */ j .L802A97FC -/* 42F5E0 802A97C0 00000000 */ nop +/* 42F5E0 802A97C0 00000000 */ nop .L802A97C4: /* 42F5E4 802A97C4 96230044 */ lhu $v1, 0x44($s1) /* 42F5E8 802A97C8 3484851F */ ori $a0, $a0, 0x851f @@ -54,7 +54,7 @@ glabel func_802A973C_42F55C .L802A97FC: /* 42F61C 802A97FC 8E24000C */ lw $a0, 0xc($s1) /* 42F620 802A9800 0C0511EA */ jal draw_icon_0 -/* 42F624 802A9804 00000000 */ nop +/* 42F624 802A9804 00000000 */ nop /* 42F628 802A9808 8FBF0020 */ lw $ra, 0x20($sp) /* 42F62C 802A980C 8FB1001C */ lw $s1, 0x1c($sp) /* 42F630 802A9810 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/nonmatchings/code_42EE20/func_802A981C_42F63C.s b/asm/nonmatchings/code_42EE20/func_802A981C_42F63C.s index 41ecd5ed6f..0670b0df99 100644 --- a/asm/nonmatchings/code_42EE20/func_802A981C_42F63C.s +++ b/asm/nonmatchings/code_42EE20/func_802A981C_42F63C.s @@ -17,5 +17,5 @@ glabel func_802A981C_42F63C /* 42F66C 802A984C 8FB00010 */ lw $s0, 0x10($sp) /* 42F670 802A9850 03E00008 */ jr $ra /* 42F674 802A9854 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42F678 802A9858 00000000 */ nop -/* 42F67C 802A985C 00000000 */ nop +/* 42F678 802A9858 00000000 */ nop +/* 42F67C 802A985C 00000000 */ nop diff --git a/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s b/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s index c14779663d..01f8e2c5ff 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_heap_free.s @@ -3,7 +3,7 @@ glabel _heap_free /* 461C 8002921C 14A00003 */ bnez $a1, .L8002922C -/* 4620 80029220 00000000 */ nop +/* 4620 80029220 00000000 */ nop .L80029224: /* 4624 80029224 03E00008 */ jr $ra /* 4628 80029228 24020001 */ addiu $v0, $zero, 1 @@ -33,7 +33,7 @@ glabel _heap_free /* 4680 80029280 1080000A */ beqz $a0, .L800292AC /* 4684 80029284 0080182D */ daddu $v1, $a0, $zero /* 4688 80029288 0800A49B */ j .L8002926C -/* 468C 8002928C 00000000 */ nop +/* 468C 8002928C 00000000 */ nop .L80029290: /* 4690 80029290 94620008 */ lhu $v0, 8($v1) /* 4694 80029294 54400006 */ bnel $v0, $zero, .L800292B0 diff --git a/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s b/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s index 627c790a4c..19e8ebafbe 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc.s @@ -16,7 +16,7 @@ glabel _heap_malloc .L80029094: /* 4494 80029094 94C20008 */ lhu $v0, 8($a2) /* 4498 80029098 1440000C */ bnez $v0, .L800290CC -/* 449C 8002909C 00000000 */ nop +/* 449C 8002909C 00000000 */ nop /* 44A0 800290A0 8CC30004 */ lw $v1, 4($a2) /* 44A4 800290A4 0065102B */ sltu $v0, $v1, $a1 /* 44A8 800290A8 14400008 */ bnez $v0, .L800290CC @@ -24,7 +24,7 @@ glabel _heap_malloc /* 44B0 800290B0 54400004 */ bnel $v0, $zero, .L800290C4 /* 44B4 800290B4 00C0382D */ daddu $a3, $a2, $zero /* 44B8 800290B8 15000004 */ bnez $t0, .L800290CC -/* 44BC 800290BC 00000000 */ nop +/* 44BC 800290BC 00000000 */ nop /* 44C0 800290C0 00C0382D */ daddu $a3, $a2, $zero .L800290C4: /* 44C4 800290C4 0060402D */ daddu $t0, $v1, $zero diff --git a/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s b/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s index 9f73240cab..72ab3382de 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_heap_malloc_tail.s @@ -15,18 +15,18 @@ glabel _heap_malloc_tail .L80029188: /* 4588 80029188 94820008 */ lhu $v0, 8($a0) /* 458C 8002918C 14400008 */ bnez $v0, .L800291B0 -/* 4590 80029190 00000000 */ nop +/* 4590 80029190 00000000 */ nop /* 4594 80029194 8C830004 */ lw $v1, 4($a0) /* 4598 80029198 0065102B */ sltu $v0, $v1, $a1 /* 459C 8002919C 14400004 */ bnez $v0, .L800291B0 -/* 45A0 800291A0 00000000 */ nop +/* 45A0 800291A0 00000000 */ nop /* 45A4 800291A4 0080402D */ daddu $t0, $a0, $zero /* 45A8 800291A8 0060302D */ daddu $a2, $v1, $zero /* 45AC 800291AC 8C870000 */ lw $a3, ($a0) .L800291B0: /* 45B0 800291B0 8C840000 */ lw $a0, ($a0) /* 45B4 800291B4 1480FFF4 */ bnez $a0, .L80029188 -/* 45B8 800291B8 00000000 */ nop +/* 45B8 800291B8 00000000 */ nop /* 45BC 800291BC 10C00015 */ beqz $a2, .L80029214 /* 45C0 800291C0 24A30010 */ addiu $v1, $a1, 0x10 /* 45C4 800291C4 00C3102B */ sltu $v0, $a2, $v1 diff --git a/asm/nonmatchings/code_42e0_len_1f60/_wrap_trig_lookup_value.s b/asm/nonmatchings/code_42e0_len_1f60/_wrap_trig_lookup_value.s index 7abc0c9162..32af6846f7 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/_wrap_trig_lookup_value.s +++ b/asm/nonmatchings/code_42e0_len_1f60/_wrap_trig_lookup_value.s @@ -4,32 +4,32 @@ glabel _wrap_trig_lookup_value /* 5434 8002A034 3C014980 */ lui $at, 0x4980 /* 5438 8002A038 44812000 */ mtc1 $at, $f4 -/* 543C 8002A03C 00000000 */ nop +/* 543C 8002A03C 00000000 */ nop /* 5440 8002A040 460C203E */ c.le.s $f4, $f12 -/* 5444 8002A044 00000000 */ nop +/* 5444 8002A044 00000000 */ nop /* 5448 8002A048 45010008 */ bc1t .L8002A06C /* 544C 8002A04C 46006086 */ mov.s $f2, $f12 /* 5450 8002A050 3C01C980 */ lui $at, 0xc980 /* 5454 8002A054 44810000 */ mtc1 $at, $f0 -/* 5458 8002A058 00000000 */ nop +/* 5458 8002A058 00000000 */ nop /* 545C 8002A05C 4600603E */ c.le.s $f12, $f0 -/* 5460 8002A060 00000000 */ nop +/* 5460 8002A060 00000000 */ nop /* 5464 8002A064 4500000F */ bc1f .L8002A0A4 -/* 5468 8002A068 00000000 */ nop +/* 5468 8002A068 00000000 */ nop .L8002A06C: /* 546C 8002A06C 3C013580 */ lui $at, 0x3580 /* 5470 8002A070 44810000 */ mtc1 $at, $f0 -/* 5474 8002A074 00000000 */ nop +/* 5474 8002A074 00000000 */ nop /* 5478 8002A078 46006302 */ mul.s $f12, $f12, $f0 -/* 547C 8002A07C 00000000 */ nop +/* 547C 8002A07C 00000000 */ nop /* 5480 8002A080 4600618D */ trunc.w.s $f6, $f12 /* 5484 8002A084 44023000 */ mfc1 $v0, $f6 -/* 5488 8002A088 00000000 */ nop +/* 5488 8002A088 00000000 */ nop /* 548C 8002A08C 44820000 */ mtc1 $v0, $f0 -/* 5490 8002A090 00000000 */ nop +/* 5490 8002A090 00000000 */ nop /* 5494 8002A094 46800020 */ cvt.s.w $f0, $f0 /* 5498 8002A098 46040002 */ mul.s $f0, $f0, $f4 -/* 549C 8002A09C 00000000 */ nop +/* 549C 8002A09C 00000000 */ nop /* 54A0 8002A0A0 46001301 */ sub.s $f12, $f2, $f0 .L8002A0A4: /* 54A4 8002A0A4 4600618D */ trunc.w.s $f6, $f12 diff --git a/asm/nonmatchings/code_42e0_len_1f60/atan2.s b/asm/nonmatchings/code_42e0_len_1f60/atan2.s index 1ea0b4e535..fe2ba8a196 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/atan2.s +++ b/asm/nonmatchings/code_42e0_len_1f60/atan2.s @@ -15,14 +15,14 @@ glabel atan2 /* 50A8 80029CA8 4600D105 */ abs.s $f4, $f26 /* 50AC 80029CAC 4600C005 */ abs.s $f0, $f24 /* 50B0 80029CB0 4604003C */ c.lt.s $f0, $f4 -/* 50B4 80029CB4 00000000 */ nop +/* 50B4 80029CB4 00000000 */ nop /* 50B8 80029CB8 45000029 */ bc1f .L80029D60 -/* 50BC 80029CBC 00000000 */ nop +/* 50BC 80029CBC 00000000 */ nop /* 50C0 80029CC0 3C014234 */ lui $at, 0x4234 /* 50C4 80029CC4 44811000 */ mtc1 $at, $f2 /* 50C8 80029CC8 46040003 */ div.s $f0, $f0, $f4 /* 50CC 80029CCC 46020502 */ mul.s $f20, $f0, $f2 -/* 50D0 80029CD0 00000000 */ nop +/* 50D0 80029CD0 00000000 */ nop /* 50D4 80029CD4 0C00A6B1 */ jal round /* 50D8 80029CD8 4614A300 */ add.s $f12, $f20, $f20 /* 50DC 80029CDC 00021080 */ sll $v0, $v0, 2 @@ -30,17 +30,17 @@ glabel atan2 /* 50E4 80029CE4 00220821 */ addu $at, $at, $v0 /* 50E8 80029CE8 C4204414 */ lwc1 $f0, %lo(D_80074414)($at) /* 50EC 80029CEC 4600A502 */ mul.s $f20, $f20, $f0 -/* 50F0 80029CF0 00000000 */ nop +/* 50F0 80029CF0 00000000 */ nop /* 50F4 80029CF4 44800000 */ mtc1 $zero, $f0 -/* 50F8 80029CF8 00000000 */ nop +/* 50F8 80029CF8 00000000 */ nop /* 50FC 80029CFC 461A003E */ c.le.s $f0, $f26 -/* 5100 80029D00 00000000 */ nop +/* 5100 80029D00 00000000 */ nop /* 5104 80029D04 4500000D */ bc1f .L80029D3C -/* 5108 80029D08 00000000 */ nop +/* 5108 80029D08 00000000 */ nop /* 510C 80029D0C 4618003E */ c.le.s $f0, $f24 -/* 5110 80029D10 00000000 */ nop +/* 5110 80029D10 00000000 */ nop /* 5114 80029D14 45000005 */ bc1f .L80029D2C -/* 5118 80029D18 00000000 */ nop +/* 5118 80029D18 00000000 */ nop /* 511C 80029D1C 3C0142B4 */ lui $at, 0x42b4 /* 5120 80029D20 44810000 */ mtc1 $at, $f0 /* 5124 80029D24 0800A781 */ j .L80029E04 @@ -62,9 +62,9 @@ glabel atan2 /* 515C 80029D5C 4600A000 */ add.s $f0, $f20, $f0 .L80029D60: /* 5160 80029D60 4480B000 */ mtc1 $zero, $f22 -/* 5164 80029D64 00000000 */ nop +/* 5164 80029D64 00000000 */ nop /* 5168 80029D68 46160032 */ c.eq.s $f0, $f22 -/* 516C 80029D6C 00000000 */ nop +/* 516C 80029D6C 00000000 */ nop /* 5170 80029D70 45020003 */ bc1fl .L80029D80 /* 5174 80029D74 46002003 */ div.s $f0, $f4, $f0 /* 5178 80029D78 0800A781 */ j .L80029E04 @@ -72,9 +72,9 @@ glabel atan2 .L80029D80: /* 5180 80029D80 3C014234 */ lui $at, 0x4234 /* 5184 80029D84 44811000 */ mtc1 $at, $f2 -/* 5188 80029D88 00000000 */ nop +/* 5188 80029D88 00000000 */ nop /* 518C 80029D8C 46020502 */ mul.s $f20, $f0, $f2 -/* 5190 80029D90 00000000 */ nop +/* 5190 80029D90 00000000 */ nop /* 5194 80029D94 0C00A6B1 */ jal round /* 5198 80029D98 4614A300 */ add.s $f12, $f20, $f20 /* 519C 80029D9C 00021080 */ sll $v0, $v0, 2 @@ -83,9 +83,9 @@ glabel atan2 /* 51A8 80029DA8 C4204414 */ lwc1 $f0, %lo(D_80074414)($at) /* 51AC 80029DAC 4618B03E */ c.le.s $f22, $f24 /* 51B0 80029DB0 4600A502 */ mul.s $f20, $f20, $f0 -/* 51B4 80029DB4 00000000 */ nop +/* 51B4 80029DB4 00000000 */ nop /* 51B8 80029DB8 4500000A */ bc1f .L80029DE4 -/* 51BC 80029DBC 00000000 */ nop +/* 51BC 80029DBC 00000000 */ nop /* 51C0 80029DC0 461AB03E */ c.le.s $f22, $f26 /* 51C4 80029DC4 3C014334 */ lui $at, 0x4334 /* 51C8 80029DC8 44810000 */ mtc1 $at, $f0 @@ -97,12 +97,12 @@ glabel atan2 /* 51E0 80029DE0 4600A000 */ add.s $f0, $f20, $f0 .L80029DE4: /* 51E4 80029DE4 461AB03E */ c.le.s $f22, $f26 -/* 51E8 80029DE8 00000000 */ nop +/* 51E8 80029DE8 00000000 */ nop /* 51EC 80029DEC 45010005 */ bc1t .L80029E04 /* 51F0 80029DF0 4600A006 */ mov.s $f0, $f20 /* 51F4 80029DF4 3C0143B4 */ lui $at, 0x43b4 /* 51F8 80029DF8 44810000 */ mtc1 $at, $f0 -/* 51FC 80029DFC 00000000 */ nop +/* 51FC 80029DFC 00000000 */ nop /* 5200 80029E00 46140001 */ sub.s $f0, $f0, $f20 .L80029E04: /* 5204 80029E04 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s b/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s index 8cfe938d1b..815319fb94 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s +++ b/asm/nonmatchings/code_42e0_len_1f60/clamp_angle.s @@ -6,12 +6,12 @@ glabel clamp_angle /* 4F28 80029B28 44811000 */ mtc1 $at, $f2 /* 4F2C 80029B2C 46006005 */ abs.s $f0, $f12 /* 4F30 80029B30 4600103C */ c.lt.s $f2, $f0 -/* 4F34 80029B34 00000000 */ nop +/* 4F34 80029B34 00000000 */ nop /* 4F38 80029B38 45000026 */ bc1f .L80029BD4 -/* 4F3C 80029B3C 00000000 */ nop +/* 4F3C 80029B3C 00000000 */ nop /* 4F40 80029B40 4600610D */ trunc.w.s $f4, $f12 /* 4F44 80029B44 44042000 */ mfc1 $a0, $f4 -/* 4F48 80029B48 00000000 */ nop +/* 4F48 80029B48 00000000 */ nop /* 4F4C 80029B4C 0480000F */ bltz $a0, .L80029B8C /* 4F50 80029B50 3C02B60B */ lui $v0, 0xb60b /* 4F54 80029B54 344260B7 */ ori $v0, $v0, 0x60b7 @@ -45,7 +45,7 @@ glabel clamp_angle /* 4FC0 80029BC0 00442023 */ subu $a0, $v0, $a0 .L80029BC4: /* 4FC4 80029BC4 44840000 */ mtc1 $a0, $f0 -/* 4FC8 80029BC8 00000000 */ nop +/* 4FC8 80029BC8 00000000 */ nop /* 4FCC 80029BCC 03E00008 */ jr $ra /* 4FD0 80029BD0 46800020 */ cvt.s.w $f0, $f0 .L80029BD4: @@ -54,22 +54,22 @@ glabel clamp_angle /* 4FDC 80029BDC 44810000 */ mtc1 $at, $f0 .L80029BE0: /* 4FE0 80029BE0 4602603C */ c.lt.s $f12, $f2 -/* 4FE4 80029BE4 00000000 */ nop +/* 4FE4 80029BE4 00000000 */ nop /* 4FE8 80029BE8 45030001 */ bc1tl .L80029BF0 /* 4FEC 80029BEC 46006300 */ add.s $f12, $f12, $f0 .L80029BF0: /* 4FF0 80029BF0 460C003E */ c.le.s $f0, $f12 -/* 4FF4 80029BF4 00000000 */ nop +/* 4FF4 80029BF4 00000000 */ nop /* 4FF8 80029BF8 45030001 */ bc1tl .L80029C00 /* 4FFC 80029BFC 46006301 */ sub.s $f12, $f12, $f0 .L80029C00: /* 5000 80029C00 460C103E */ c.le.s $f2, $f12 -/* 5004 80029C04 00000000 */ nop +/* 5004 80029C04 00000000 */ nop /* 5008 80029C08 4500FFF5 */ bc1f .L80029BE0 -/* 500C 80029C0C 00000000 */ nop +/* 500C 80029C0C 00000000 */ nop /* 5010 80029C10 4600603C */ c.lt.s $f12, $f0 -/* 5014 80029C14 00000000 */ nop +/* 5014 80029C14 00000000 */ nop /* 5018 80029C18 4500FFF1 */ bc1f .L80029BE0 -/* 501C 80029C1C 00000000 */ nop +/* 501C 80029C1C 00000000 */ nop /* 5020 80029C20 03E00008 */ jr $ra /* 5024 80029C24 46006006 */ mov.s $f0, $f12 diff --git a/asm/nonmatchings/code_42e0_len_1f60/cos_deg.s b/asm/nonmatchings/code_42e0_len_1f60/cos_deg.s index 47cb770d7c..a6860b0596 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/cos_deg.s +++ b/asm/nonmatchings/code_42e0_len_1f60/cos_deg.s @@ -5,13 +5,13 @@ glabel cos_deg /* 5750 8002A350 3C014336 */ lui $at, 0x4336 /* 5754 8002A354 34210B61 */ ori $at, $at, 0xb61 /* 5758 8002A358 44810000 */ mtc1 $at, $f0 -/* 575C 8002A35C 00000000 */ nop +/* 575C 8002A35C 00000000 */ nop /* 5760 8002A360 46006302 */ mul.s $f12, $f12, $f0 -/* 5764 8002A364 00000000 */ nop +/* 5764 8002A364 00000000 */ nop /* 5768 8002A368 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 576C 8002A36C AFBF0010 */ sw $ra, 0x10($sp) /* 5770 8002A370 0C00A80D */ jal _wrap_trig_lookup_value -/* 5774 8002A374 00000000 */ nop +/* 5774 8002A374 00000000 */ nop /* 5778 8002A378 0C0187C0 */ jal coss /* 577C 8002A37C 3044FFFF */ andi $a0, $v0, 0xffff /* 5780 8002A380 00021400 */ sll $v0, $v0, 0x10 @@ -19,10 +19,10 @@ glabel cos_deg /* 5788 8002A388 3C018009 */ lui $at, %hi(D_80097D88) /* 578C 8002A38C D4227D88 */ ldc1 $f2, %lo(D_80097D88)($at) /* 5790 8002A390 44820000 */ mtc1 $v0, $f0 -/* 5794 8002A394 00000000 */ nop +/* 5794 8002A394 00000000 */ nop /* 5798 8002A398 46800021 */ cvt.d.w $f0, $f0 /* 579C 8002A39C 46220002 */ mul.d $f0, $f0, $f2 -/* 57A0 8002A3A0 00000000 */ nop +/* 57A0 8002A3A0 00000000 */ nop /* 57A4 8002A3A4 8FBF0010 */ lw $ra, 0x10($sp) /* 57A8 8002A3A8 46200020 */ cvt.s.d $f0, $f0 /* 57AC 8002A3AC 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_42e0_len_1f60/cos_rad.s b/asm/nonmatchings/code_42e0_len_1f60/cos_rad.s index 117a0eaf91..53865d18e1 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/cos_rad.s +++ b/asm/nonmatchings/code_42e0_len_1f60/cos_rad.s @@ -5,13 +5,13 @@ glabel cos_rad /* 55D0 8002A1D0 3C014622 */ lui $at, 0x4622 /* 55D4 8002A1D4 3421F983 */ ori $at, $at, 0xf983 /* 55D8 8002A1D8 44810000 */ mtc1 $at, $f0 -/* 55DC 8002A1DC 00000000 */ nop +/* 55DC 8002A1DC 00000000 */ nop /* 55E0 8002A1E0 46006302 */ mul.s $f12, $f12, $f0 -/* 55E4 8002A1E4 00000000 */ nop +/* 55E4 8002A1E4 00000000 */ nop /* 55E8 8002A1E8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 55EC 8002A1EC AFBF0010 */ sw $ra, 0x10($sp) /* 55F0 8002A1F0 0C00A80D */ jal _wrap_trig_lookup_value -/* 55F4 8002A1F4 00000000 */ nop +/* 55F4 8002A1F4 00000000 */ nop /* 55F8 8002A1F8 0C0187C0 */ jal coss /* 55FC 8002A1FC 3044FFFF */ andi $a0, $v0, 0xffff /* 5600 8002A200 00021400 */ sll $v0, $v0, 0x10 @@ -19,10 +19,10 @@ glabel cos_rad /* 5608 8002A208 3C018009 */ lui $at, %hi(D_80097D70) /* 560C 8002A20C D4227D70 */ ldc1 $f2, %lo(D_80097D70)($at) /* 5610 8002A210 44820000 */ mtc1 $v0, $f0 -/* 5614 8002A214 00000000 */ nop +/* 5614 8002A214 00000000 */ nop /* 5618 8002A218 46800021 */ cvt.d.w $f0, $f0 /* 561C 8002A21C 46220002 */ mul.d $f0, $f0, $f2 -/* 5620 8002A220 00000000 */ nop +/* 5620 8002A220 00000000 */ nop /* 5624 8002A224 8FBF0010 */ lw $ra, 0x10($sp) /* 5628 8002A228 46200020 */ cvt.s.d $f0, $f0 /* 562C 8002A22C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_80028F8C.s b/asm/nonmatchings/code_42e0_len_1f60/func_80028F8C.s index c88cecde72..2bbbfd4ef7 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_80028F8C.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_80028F8C.s @@ -11,7 +11,7 @@ glabel func_80028F8C /* 43A4 80028FA4 8C830000 */ lw $v1, ($a0) /* 43A8 80028FA8 8C420000 */ lw $v0, ($v0) /* 43AC 80028FAC 10620003 */ beq $v1, $v0, .L80028FBC -/* 43B0 80028FB0 00000000 */ nop +/* 43B0 80028FB0 00000000 */ nop /* 43B4 80028FB4 0C00A3F8 */ jal func_80028FE0 /* 43B8 80028FB8 AC820000 */ sw $v0, ($a0) .L80028FBC: diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_80029934.s b/asm/nonmatchings/code_42e0_len_1f60/func_80029934.s index 03ac643b83..6ad10e5d1c 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_80029934.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_80029934.s @@ -5,24 +5,24 @@ glabel func_80029934 /* 4D34 80029934 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4D38 80029938 AFBF0010 */ sw $ra, 0x10($sp) /* 4D3C 8002993C 0C00A640 */ jal _advance_rng -/* 4D40 80029940 00000000 */ nop +/* 4D40 80029940 00000000 */ nop /* 4D44 80029944 30427FFF */ andi $v0, $v0, 0x7fff /* 4D48 80029948 44821000 */ mtc1 $v0, $f2 -/* 4D4C 8002994C 00000000 */ nop +/* 4D4C 8002994C 00000000 */ nop /* 4D50 80029950 04410006 */ bgez $v0, .L8002996C /* 4D54 80029954 468010A1 */ cvt.d.w $f2, $f2 /* 4D58 80029958 3C0141F0 */ lui $at, 0x41f0 /* 4D5C 8002995C 44810800 */ mtc1 $at, $f1 /* 4D60 80029960 44800000 */ mtc1 $zero, $f0 -/* 4D64 80029964 00000000 */ nop +/* 4D64 80029964 00000000 */ nop /* 4D68 80029968 46201080 */ add.d $f2, $f2, $f0 .L8002996C: /* 4D6C 8002996C 3C013F00 */ lui $at, 0x3f00 /* 4D70 80029970 44810800 */ mtc1 $at, $f1 /* 4D74 80029974 44800000 */ mtc1 $zero, $f0 -/* 4D78 80029978 00000000 */ nop +/* 4D78 80029978 00000000 */ nop /* 4D7C 8002997C 46201002 */ mul.d $f0, $f2, $f0 -/* 4D80 80029980 00000000 */ nop +/* 4D80 80029980 00000000 */ nop /* 4D84 80029984 8FBF0010 */ lw $ra, 0x10($sp) /* 4D88 80029988 46200020 */ cvt.s.d $f0, $f0 /* 4D8C 8002998C 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s b/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s index 6d5bd763f2..d1addcdc03 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s +++ b/asm/nonmatchings/code_42e0_len_1f60/func_8002AB5C.s @@ -42,6 +42,6 @@ glabel func_8002AB5C /* 5FE8 8002ABE8 8FBF0020 */ lw $ra, 0x20($sp) /* 5FEC 8002ABEC 03E00008 */ jr $ra /* 5FF0 8002ABF0 27BD0028 */ addiu $sp, $sp, 0x28 -/* 5FF4 8002ABF4 00000000 */ nop -/* 5FF8 8002ABF8 00000000 */ nop -/* 5FFC 8002ABFC 00000000 */ nop +/* 5FF4 8002ABF4 00000000 */ nop +/* 5FF8 8002ABF8 00000000 */ nop +/* 5FFC 8002ABFC 00000000 */ nop diff --git a/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s b/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s index 2376156a39..dce892b1c2 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s +++ b/asm/nonmatchings/code_42e0_len_1f60/int_to_string.s @@ -56,9 +56,9 @@ glabel int_to_string /* 4988 80029588 0060982D */ daddu $s3, $v1, $zero /* 498C 8002958C 02721025 */ or $v0, $s3, $s2 /* 4990 80029590 10400005 */ beqz $v0, .L800295A8 -/* 4994 80029594 00000000 */ nop +/* 4994 80029594 00000000 */ nop /* 4998 80029598 12800003 */ beqz $s4, .L800295A8 -/* 499C 8002959C 00000000 */ nop +/* 499C 8002959C 00000000 */ nop /* 49A0 800295A0 0800A54F */ j .L8002953C /* 49A4 800295A4 2694FFFF */ addiu $s4, $s4, -1 .L800295A8: diff --git a/asm/nonmatchings/code_42e0_len_1f60/rand_int.s b/asm/nonmatchings/code_42e0_len_1f60/rand_int.s index e34159c215..8c4df6ea3c 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/rand_int.s +++ b/asm/nonmatchings/code_42e0_len_1f60/rand_int.s @@ -19,11 +19,11 @@ glabel rand_int /* 4E30 80029A30 38420001 */ xori $v0, $v0, 1 .L80029A34: /* 4E34 80029A34 10820005 */ beq $a0, $v0, .L80029A4C -/* 4E38 80029A38 00000000 */ nop +/* 4E38 80029A38 00000000 */ nop /* 4E3C 80029A3C 0C00A665 */ jal func_80029994 -/* 4E40 80029A40 00000000 */ nop +/* 4E40 80029A40 00000000 */ nop /* 4E44 80029A44 0800A69C */ j .L80029A70 -/* 4E48 80029A48 00000000 */ nop +/* 4E48 80029A48 00000000 */ nop .L80029A4C: /* 4E4C 80029A4C 0C00A665 */ jal func_80029994 /* 4E50 80029A50 240403F1 */ addiu $a0, $zero, 0x3f1 diff --git a/asm/nonmatchings/code_42e0_len_1f60/round.s b/asm/nonmatchings/code_42e0_len_1f60/round.s index 90c1e30d25..2924809847 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/round.s +++ b/asm/nonmatchings/code_42e0_len_1f60/round.s @@ -3,9 +3,9 @@ glabel round /* 4EC4 80029AC4 44800000 */ mtc1 $zero, $f0 -/* 4EC8 80029AC8 00000000 */ nop +/* 4EC8 80029AC8 00000000 */ nop /* 4ECC 80029ACC 460C003E */ c.le.s $f0, $f12 -/* 4ED0 80029AD0 00000000 */ nop +/* 4ED0 80029AD0 00000000 */ nop /* 4ED4 80029AD4 4502000A */ bc1fl .L80029B00 /* 4ED8 80029AD8 460060A1 */ cvt.d.s $f2, $f12 /* 4EDC 80029ADC 3C013FE0 */ lui $at, 0x3fe0 @@ -16,12 +16,12 @@ glabel round /* 4EF0 80029AF0 4620010D */ trunc.w.d $f4, $f0 /* 4EF4 80029AF4 44022000 */ mfc1 $v0, $f4 /* 4EF8 80029AF8 03E00008 */ jr $ra -/* 4EFC 80029AFC 00000000 */ nop +/* 4EFC 80029AFC 00000000 */ nop .L80029B00: /* 4F00 80029B00 3C013FE0 */ lui $at, 0x3fe0 /* 4F04 80029B04 44810800 */ mtc1 $at, $f1 /* 4F08 80029B08 44800000 */ mtc1 $zero, $f0 -/* 4F0C 80029B0C 00000000 */ nop +/* 4F0C 80029B0C 00000000 */ nop /* 4F10 80029B10 46220001 */ sub.d $f0, $f0, $f2 /* 4F14 80029B14 4620010D */ trunc.w.d $f4, $f0 /* 4F18 80029B18 44022000 */ mfc1 $v0, $f4 diff --git a/asm/nonmatchings/code_42e0_len_1f60/sin_cos_deg.s b/asm/nonmatchings/code_42e0_len_1f60/sin_cos_deg.s index 26a76938a8..2d7b9e730b 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/sin_cos_deg.s +++ b/asm/nonmatchings/code_42e0_len_1f60/sin_cos_deg.s @@ -10,7 +10,7 @@ glabel sin_cos_deg /* 5648 8002A248 00A0882D */ daddu $s1, $a1, $zero /* 564C 8002A24C AFB20018 */ sw $s2, 0x18($sp) /* 5650 8002A250 46006302 */ mul.s $f12, $f12, $f0 -/* 5654 8002A254 00000000 */ nop +/* 5654 8002A254 00000000 */ nop /* 5658 8002A258 AFBF001C */ sw $ra, 0x1c($sp) /* 565C 8002A25C AFB00010 */ sw $s0, 0x10($sp) /* 5660 8002A260 F7B40020 */ sdc1 $f20, 0x20($sp) @@ -24,10 +24,10 @@ glabel sin_cos_deg /* 5680 8002A280 3C018009 */ lui $at, %hi(D_80097D78) /* 5684 8002A284 D4347D78 */ ldc1 $f20, %lo(D_80097D78)($at) /* 5688 8002A288 44820000 */ mtc1 $v0, $f0 -/* 568C 8002A28C 00000000 */ nop +/* 568C 8002A28C 00000000 */ nop /* 5690 8002A290 46800021 */ cvt.d.w $f0, $f0 /* 5694 8002A294 46340002 */ mul.d $f0, $f0, $f20 -/* 5698 8002A298 00000000 */ nop +/* 5698 8002A298 00000000 */ nop /* 569C 8002A29C 0200202D */ daddu $a0, $s0, $zero /* 56A0 8002A2A0 46200020 */ cvt.s.d $f0, $f0 /* 56A4 8002A2A4 0C0187C0 */ jal coss @@ -35,10 +35,10 @@ glabel sin_cos_deg /* 56AC 8002A2AC 00021400 */ sll $v0, $v0, 0x10 /* 56B0 8002A2B0 00021403 */ sra $v0, $v0, 0x10 /* 56B4 8002A2B4 44820000 */ mtc1 $v0, $f0 -/* 56B8 8002A2B8 00000000 */ nop +/* 56B8 8002A2B8 00000000 */ nop /* 56BC 8002A2BC 46800021 */ cvt.d.w $f0, $f0 /* 56C0 8002A2C0 46340002 */ mul.d $f0, $f0, $f20 -/* 56C4 8002A2C4 00000000 */ nop +/* 56C4 8002A2C4 00000000 */ nop /* 56C8 8002A2C8 46200020 */ cvt.s.d $f0, $f0 /* 56CC 8002A2CC E6400000 */ swc1 $f0, ($s2) /* 56D0 8002A2D0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_42e0_len_1f60/sin_cos_rad.s b/asm/nonmatchings/code_42e0_len_1f60/sin_cos_rad.s index 722249eb60..3a100d51a5 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/sin_cos_rad.s +++ b/asm/nonmatchings/code_42e0_len_1f60/sin_cos_rad.s @@ -10,7 +10,7 @@ glabel sin_cos_rad /* 54C8 8002A0C8 00A0882D */ daddu $s1, $a1, $zero /* 54CC 8002A0CC AFB20018 */ sw $s2, 0x18($sp) /* 54D0 8002A0D0 46006302 */ mul.s $f12, $f12, $f0 -/* 54D4 8002A0D4 00000000 */ nop +/* 54D4 8002A0D4 00000000 */ nop /* 54D8 8002A0D8 AFBF001C */ sw $ra, 0x1c($sp) /* 54DC 8002A0DC AFB00010 */ sw $s0, 0x10($sp) /* 54E0 8002A0E0 F7B40020 */ sdc1 $f20, 0x20($sp) @@ -24,10 +24,10 @@ glabel sin_cos_rad /* 5500 8002A100 3C018009 */ lui $at, %hi(D_80097D60) /* 5504 8002A104 D4347D60 */ ldc1 $f20, %lo(D_80097D60)($at) /* 5508 8002A108 44820000 */ mtc1 $v0, $f0 -/* 550C 8002A10C 00000000 */ nop +/* 550C 8002A10C 00000000 */ nop /* 5510 8002A110 46800021 */ cvt.d.w $f0, $f0 /* 5514 8002A114 46340002 */ mul.d $f0, $f0, $f20 -/* 5518 8002A118 00000000 */ nop +/* 5518 8002A118 00000000 */ nop /* 551C 8002A11C 0200202D */ daddu $a0, $s0, $zero /* 5520 8002A120 46200020 */ cvt.s.d $f0, $f0 /* 5524 8002A124 0C0187C0 */ jal coss @@ -35,10 +35,10 @@ glabel sin_cos_rad /* 552C 8002A12C 00021400 */ sll $v0, $v0, 0x10 /* 5530 8002A130 00021403 */ sra $v0, $v0, 0x10 /* 5534 8002A134 44820000 */ mtc1 $v0, $f0 -/* 5538 8002A138 00000000 */ nop +/* 5538 8002A138 00000000 */ nop /* 553C 8002A13C 46800021 */ cvt.d.w $f0, $f0 /* 5540 8002A140 46340002 */ mul.d $f0, $f0, $f20 -/* 5544 8002A144 00000000 */ nop +/* 5544 8002A144 00000000 */ nop /* 5548 8002A148 46200020 */ cvt.s.d $f0, $f0 /* 554C 8002A14C E6400000 */ swc1 $f0, ($s2) /* 5550 8002A150 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_42e0_len_1f60/sin_deg.s b/asm/nonmatchings/code_42e0_len_1f60/sin_deg.s index be5b833af5..6a09823b3d 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/sin_deg.s +++ b/asm/nonmatchings/code_42e0_len_1f60/sin_deg.s @@ -5,13 +5,13 @@ glabel sin_deg /* 56EC 8002A2EC 3C014336 */ lui $at, 0x4336 /* 56F0 8002A2F0 34210B61 */ ori $at, $at, 0xb61 /* 56F4 8002A2F4 44810000 */ mtc1 $at, $f0 -/* 56F8 8002A2F8 00000000 */ nop +/* 56F8 8002A2F8 00000000 */ nop /* 56FC 8002A2FC 46006302 */ mul.s $f12, $f12, $f0 -/* 5700 8002A300 00000000 */ nop +/* 5700 8002A300 00000000 */ nop /* 5704 8002A304 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 5708 8002A308 AFBF0010 */ sw $ra, 0x10($sp) /* 570C 8002A30C 0C00A80D */ jal _wrap_trig_lookup_value -/* 5710 8002A310 00000000 */ nop +/* 5710 8002A310 00000000 */ nop /* 5714 8002A314 0C01917C */ jal sins /* 5718 8002A318 3044FFFF */ andi $a0, $v0, 0xffff /* 571C 8002A31C 00021400 */ sll $v0, $v0, 0x10 @@ -19,10 +19,10 @@ glabel sin_deg /* 5724 8002A324 3C018009 */ lui $at, %hi(D_80097D80) /* 5728 8002A328 D4227D80 */ ldc1 $f2, %lo(D_80097D80)($at) /* 572C 8002A32C 44820000 */ mtc1 $v0, $f0 -/* 5730 8002A330 00000000 */ nop +/* 5730 8002A330 00000000 */ nop /* 5734 8002A334 46800021 */ cvt.d.w $f0, $f0 /* 5738 8002A338 46220002 */ mul.d $f0, $f0, $f2 -/* 573C 8002A33C 00000000 */ nop +/* 573C 8002A33C 00000000 */ nop /* 5740 8002A340 8FBF0010 */ lw $ra, 0x10($sp) /* 5744 8002A344 46200020 */ cvt.s.d $f0, $f0 /* 5748 8002A348 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_42e0_len_1f60/sin_rad.s b/asm/nonmatchings/code_42e0_len_1f60/sin_rad.s index 471320c95a..57fc257628 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/sin_rad.s +++ b/asm/nonmatchings/code_42e0_len_1f60/sin_rad.s @@ -5,13 +5,13 @@ glabel sin_rad /* 556C 8002A16C 3C014622 */ lui $at, 0x4622 /* 5570 8002A170 3421F983 */ ori $at, $at, 0xf983 /* 5574 8002A174 44810000 */ mtc1 $at, $f0 -/* 5578 8002A178 00000000 */ nop +/* 5578 8002A178 00000000 */ nop /* 557C 8002A17C 46006302 */ mul.s $f12, $f12, $f0 -/* 5580 8002A180 00000000 */ nop +/* 5580 8002A180 00000000 */ nop /* 5584 8002A184 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 5588 8002A188 AFBF0010 */ sw $ra, 0x10($sp) /* 558C 8002A18C 0C00A80D */ jal _wrap_trig_lookup_value -/* 5590 8002A190 00000000 */ nop +/* 5590 8002A190 00000000 */ nop /* 5594 8002A194 0C01917C */ jal sins /* 5598 8002A198 3044FFFF */ andi $a0, $v0, 0xffff /* 559C 8002A19C 00021400 */ sll $v0, $v0, 0x10 @@ -19,10 +19,10 @@ glabel sin_rad /* 55A4 8002A1A4 3C018009 */ lui $at, %hi(D_80097D68) /* 55A8 8002A1A8 D4227D68 */ ldc1 $f2, %lo(D_80097D68)($at) /* 55AC 8002A1AC 44820000 */ mtc1 $v0, $f0 -/* 55B0 8002A1B0 00000000 */ nop +/* 55B0 8002A1B0 00000000 */ nop /* 55B4 8002A1B4 46800021 */ cvt.d.w $f0, $f0 /* 55B8 8002A1B8 46220002 */ mul.d $f0, $f0, $f2 -/* 55BC 8002A1BC 00000000 */ nop +/* 55BC 8002A1BC 00000000 */ nop /* 55C0 8002A1C0 8FBF0010 */ lw $ra, 0x10($sp) /* 55C4 8002A1C4 46200020 */ cvt.s.d $f0, $f0 /* 55C8 8002A1C8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_42e0_len_1f60/transform_point.s b/asm/nonmatchings/code_42e0_len_1f60/transform_point.s index 43cfe223fc..8c14df6a35 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/transform_point.s +++ b/asm/nonmatchings/code_42e0_len_1f60/transform_point.s @@ -5,15 +5,15 @@ glabel transform_point /* 4A20 80029620 44853000 */ mtc1 $a1, $f6 /* 4A24 80029624 C4800000 */ lwc1 $f0, ($a0) /* 4A28 80029628 46060002 */ mul.s $f0, $f0, $f6 -/* 4A2C 8002962C 00000000 */ nop +/* 4A2C 8002962C 00000000 */ nop /* 4A30 80029630 44864000 */ mtc1 $a2, $f8 /* 4A34 80029634 C4820010 */ lwc1 $f2, 0x10($a0) /* 4A38 80029638 46081082 */ mul.s $f2, $f2, $f8 -/* 4A3C 8002963C 00000000 */ nop +/* 4A3C 8002963C 00000000 */ nop /* 4A40 80029640 44875000 */ mtc1 $a3, $f10 /* 4A44 80029644 C4840020 */ lwc1 $f4, 0x20($a0) /* 4A48 80029648 460A2102 */ mul.s $f4, $f4, $f10 -/* 4A4C 8002964C 00000000 */ nop +/* 4A4C 8002964C 00000000 */ nop /* 4A50 80029650 46020000 */ add.s $f0, $f0, $f2 /* 4A54 80029654 8FA20014 */ lw $v0, 0x14($sp) /* 4A58 80029658 8FA30018 */ lw $v1, 0x18($sp) @@ -25,13 +25,13 @@ glabel transform_point /* 4A70 80029670 E4400000 */ swc1 $f0, ($v0) /* 4A74 80029674 C4800004 */ lwc1 $f0, 4($a0) /* 4A78 80029678 46060002 */ mul.s $f0, $f0, $f6 -/* 4A7C 8002967C 00000000 */ nop +/* 4A7C 8002967C 00000000 */ nop /* 4A80 80029680 C4840014 */ lwc1 $f4, 0x14($a0) /* 4A84 80029684 46082102 */ mul.s $f4, $f4, $f8 -/* 4A88 80029688 00000000 */ nop +/* 4A88 80029688 00000000 */ nop /* 4A8C 8002968C C4820024 */ lwc1 $f2, 0x24($a0) /* 4A90 80029690 460A1082 */ mul.s $f2, $f2, $f10 -/* 4A94 80029694 00000000 */ nop +/* 4A94 80029694 00000000 */ nop /* 4A98 80029698 46040000 */ add.s $f0, $f0, $f4 /* 4A9C 8002969C 46020000 */ add.s $f0, $f0, $f2 /* 4AA0 800296A0 C4820034 */ lwc1 $f2, 0x34($a0) @@ -39,13 +39,13 @@ glabel transform_point /* 4AA8 800296A8 E4600000 */ swc1 $f0, ($v1) /* 4AAC 800296AC C4800008 */ lwc1 $f0, 8($a0) /* 4AB0 800296B0 46060002 */ mul.s $f0, $f0, $f6 -/* 4AB4 800296B4 00000000 */ nop +/* 4AB4 800296B4 00000000 */ nop /* 4AB8 800296B8 C4840018 */ lwc1 $f4, 0x18($a0) /* 4ABC 800296BC 46082102 */ mul.s $f4, $f4, $f8 -/* 4AC0 800296C0 00000000 */ nop +/* 4AC0 800296C0 00000000 */ nop /* 4AC4 800296C4 C4820028 */ lwc1 $f2, 0x28($a0) /* 4AC8 800296C8 460A1082 */ mul.s $f2, $f2, $f10 -/* 4ACC 800296CC 00000000 */ nop +/* 4ACC 800296CC 00000000 */ nop /* 4AD0 800296D0 46040000 */ add.s $f0, $f0, $f4 /* 4AD4 800296D4 46020000 */ add.s $f0, $f0, $f2 /* 4AD8 800296D8 C4820038 */ lwc1 $f2, 0x38($a0) @@ -53,13 +53,13 @@ glabel transform_point /* 4AE0 800296E0 E4A00000 */ swc1 $f0, ($a1) /* 4AE4 800296E4 C480000C */ lwc1 $f0, 0xc($a0) /* 4AE8 800296E8 46060002 */ mul.s $f0, $f0, $f6 -/* 4AEC 800296EC 00000000 */ nop +/* 4AEC 800296EC 00000000 */ nop /* 4AF0 800296F0 C484001C */ lwc1 $f4, 0x1c($a0) /* 4AF4 800296F4 46082102 */ mul.s $f4, $f4, $f8 -/* 4AF8 800296F8 00000000 */ nop +/* 4AF8 800296F8 00000000 */ nop /* 4AFC 800296FC C482002C */ lwc1 $f2, 0x2c($a0) /* 4B00 80029700 460A1082 */ mul.s $f2, $f2, $f10 -/* 4B04 80029704 00000000 */ nop +/* 4B04 80029704 00000000 */ nop /* 4B08 80029708 46040000 */ add.s $f0, $f0, $f4 /* 4B0C 8002970C 46020000 */ add.s $f0, $f0, $f2 /* 4B10 80029710 C482003C */ lwc1 $f2, 0x3c($a0) diff --git a/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s b/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s index 1c03c41ad7..9cf1316ab3 100644 --- a/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s +++ b/asm/nonmatchings/code_42e0_len_1f60/update_lerp.s @@ -24,125 +24,125 @@ glabel update_lerp /* 57FC 8002A3FC 00220821 */ addu $at, $at, $v0 /* 5800 8002A400 8C227D90 */ lw $v0, %lo(D_80097D90)($at) /* 5804 8002A404 00400008 */ jr $v0 -/* 5808 8002A408 00000000 */ nop +/* 5808 8002A408 00000000 */ nop /* 580C 8002A40C 4616C001 */ sub.s $f0, $f24, $f22 /* 5810 8002A410 44911000 */ mtc1 $s1, $f2 -/* 5814 8002A414 00000000 */ nop +/* 5814 8002A414 00000000 */ nop /* 5818 8002A418 468010A0 */ cvt.s.w $f2, $f2 /* 581C 8002A41C 46020002 */ mul.s $f0, $f0, $f2 -/* 5820 8002A420 00000000 */ nop +/* 5820 8002A420 00000000 */ nop /* 5824 8002A424 44901000 */ mtc1 $s0, $f2 -/* 5828 8002A428 00000000 */ nop +/* 5828 8002A428 00000000 */ nop /* 582C 8002A42C 468010A0 */ cvt.s.w $f2, $f2 /* 5830 8002A430 0800A938 */ j .L8002A4E0 /* 5834 8002A434 46020003 */ div.s $f0, $f0, $f2 /* 5838 8002A438 02310018 */ mult $s1, $s1 /* 583C 8002A43C 00004012 */ mflo $t0 -/* 5840 8002A440 00000000 */ nop +/* 5840 8002A440 00000000 */ nop /* 5844 8002A444 0800A92D */ j .L8002A4B4 /* 5848 8002A448 02100018 */ mult $s0, $s0 /* 584C 8002A44C 02310018 */ mult $s1, $s1 /* 5850 8002A450 00004012 */ mflo $t0 -/* 5854 8002A454 00000000 */ nop +/* 5854 8002A454 00000000 */ nop /* 5858 8002A458 0800A925 */ j .L8002A494 /* 585C 8002A45C 02100018 */ mult $s0, $s0 /* 5860 8002A460 02310018 */ mult $s1, $s1 /* 5864 8002A464 00004012 */ mflo $t0 -/* 5868 8002A468 00000000 */ nop -/* 586C 8002A46C 00000000 */ nop +/* 5868 8002A468 00000000 */ nop +/* 586C 8002A46C 00000000 */ nop /* 5870 8002A470 02100018 */ mult $s0, $s0 /* 5874 8002A474 00001012 */ mflo $v0 -/* 5878 8002A478 00000000 */ nop -/* 587C 8002A47C 00000000 */ nop +/* 5878 8002A478 00000000 */ nop +/* 587C 8002A47C 00000000 */ nop /* 5880 8002A480 01110018 */ mult $t0, $s1 /* 5884 8002A484 00004012 */ mflo $t0 -/* 5888 8002A488 00000000 */ nop -/* 588C 8002A48C 00000000 */ nop +/* 5888 8002A488 00000000 */ nop +/* 588C 8002A48C 00000000 */ nop /* 5890 8002A490 00500018 */ mult $v0, $s0 .L8002A494: /* 5894 8002A494 00001012 */ mflo $v0 -/* 5898 8002A498 00000000 */ nop -/* 589C 8002A49C 00000000 */ nop +/* 5898 8002A498 00000000 */ nop +/* 589C 8002A49C 00000000 */ nop /* 58A0 8002A4A0 01110018 */ mult $t0, $s1 /* 58A4 8002A4A4 00004012 */ mflo $t0 -/* 58A8 8002A4A8 00000000 */ nop -/* 58AC 8002A4AC 00000000 */ nop +/* 58A8 8002A4A8 00000000 */ nop +/* 58AC 8002A4AC 00000000 */ nop /* 58B0 8002A4B0 00500018 */ mult $v0, $s0 .L8002A4B4: /* 58B4 8002A4B4 4616C081 */ sub.s $f2, $f24, $f22 /* 58B8 8002A4B8 44880000 */ mtc1 $t0, $f0 -/* 58BC 8002A4BC 00000000 */ nop +/* 58BC 8002A4BC 00000000 */ nop /* 58C0 8002A4C0 46800020 */ cvt.s.w $f0, $f0 /* 58C4 8002A4C4 46020002 */ mul.s $f0, $f0, $f2 -/* 58C8 8002A4C8 00000000 */ nop +/* 58C8 8002A4C8 00000000 */ nop /* 58CC 8002A4CC 00001012 */ mflo $v0 /* 58D0 8002A4D0 44821000 */ mtc1 $v0, $f2 -/* 58D4 8002A4D4 00000000 */ nop +/* 58D4 8002A4D4 00000000 */ nop /* 58D8 8002A4D8 468010A0 */ cvt.s.w $f2, $f2 /* 58DC 8002A4DC 46020003 */ div.s $f0, $f0, $f2 .L8002A4E0: /* 58E0 8002A4E0 0800AA39 */ j .L8002A8E4 /* 58E4 8002A4E4 4600B000 */ add.s $f0, $f22, $f0 /* 58E8 8002A4E8 44916000 */ mtc1 $s1, $f12 -/* 58EC 8002A4EC 00000000 */ nop +/* 58EC 8002A4EC 00000000 */ nop /* 58F0 8002A4F0 46806320 */ cvt.s.w $f12, $f12 /* 58F4 8002A4F4 4490A000 */ mtc1 $s0, $f20 -/* 58F8 8002A4F8 00000000 */ nop +/* 58F8 8002A4F8 00000000 */ nop /* 58FC 8002A4FC 4680A520 */ cvt.s.w $f20, $f20 /* 5900 8002A500 46146303 */ div.s $f12, $f12, $f20 /* 5904 8002A504 3C018009 */ lui $at, %hi(D_80097DC8) /* 5908 8002A508 D4207DC8 */ ldc1 $f0, %lo(D_80097DC8)($at) /* 590C 8002A50C 46006321 */ cvt.d.s $f12, $f12 /* 5910 8002A510 46206302 */ mul.d $f12, $f12, $f0 -/* 5914 8002A514 00000000 */ nop +/* 5914 8002A514 00000000 */ nop /* 5918 8002A518 3C014010 */ lui $at, 0x4010 /* 591C 8002A51C 44810800 */ mtc1 $at, $f1 /* 5920 8002A520 44800000 */ mtc1 $zero, $f0 -/* 5924 8002A524 00000000 */ nop +/* 5924 8002A524 00000000 */ nop /* 5928 8002A528 46206302 */ mul.d $f12, $f12, $f0 /* 592C 8002A52C 0800A966 */ j .L8002A598 -/* 5930 8002A530 00000000 */ nop +/* 5930 8002A530 00000000 */ nop /* 5934 8002A534 02310018 */ mult $s1, $s1 /* 5938 8002A538 4490A000 */ mtc1 $s0, $f20 -/* 593C 8002A53C 00000000 */ nop +/* 593C 8002A53C 00000000 */ nop /* 5940 8002A540 4680A520 */ cvt.s.w $f20, $f20 /* 5944 8002A544 3C018009 */ lui $at, %hi(D_80097DD0) /* 5948 8002A548 D4207DD0 */ ldc1 $f0, %lo(D_80097DD0)($at) /* 594C 8002A54C 00001812 */ mflo $v1 /* 5950 8002A550 44836000 */ mtc1 $v1, $f12 -/* 5954 8002A554 00000000 */ nop +/* 5954 8002A554 00000000 */ nop /* 5958 8002A558 46806320 */ cvt.s.w $f12, $f12 /* 595C 8002A55C 46146303 */ div.s $f12, $f12, $f20 /* 5960 8002A560 46006321 */ cvt.d.s $f12, $f12 /* 5964 8002A564 46206302 */ mul.d $f12, $f12, $f0 -/* 5968 8002A568 00000000 */ nop +/* 5968 8002A568 00000000 */ nop /* 596C 8002A56C 3C014010 */ lui $at, 0x4010 /* 5970 8002A570 44810800 */ mtc1 $at, $f1 /* 5974 8002A574 44800000 */ mtc1 $zero, $f0 -/* 5978 8002A578 00000000 */ nop +/* 5978 8002A578 00000000 */ nop /* 597C 8002A57C 46206302 */ mul.d $f12, $f12, $f0 -/* 5980 8002A580 00000000 */ nop +/* 5980 8002A580 00000000 */ nop /* 5984 8002A584 3C01402E */ lui $at, 0x402e /* 5988 8002A588 44810800 */ mtc1 $at, $f1 /* 598C 8002A58C 44800000 */ mtc1 $zero, $f0 -/* 5990 8002A590 00000000 */ nop +/* 5990 8002A590 00000000 */ nop /* 5994 8002A594 46206303 */ div.d $f12, $f12, $f0 .L8002A598: /* 5998 8002A598 0C00A874 */ jal cos_rad /* 599C 8002A59C 46206320 */ cvt.s.d $f12, $f12 /* 59A0 8002A5A0 4614A502 */ mul.s $f20, $f20, $f20 -/* 59A4 8002A5A4 00000000 */ nop +/* 59A4 8002A5A4 00000000 */ nop /* 59A8 8002A5A8 4616C081 */ sub.s $f2, $f24, $f22 /* 59AC 8002A5AC 46001082 */ mul.s $f2, $f2, $f0 -/* 59B0 8002A5B0 00000000 */ nop +/* 59B0 8002A5B0 00000000 */ nop /* 59B4 8002A5B4 02111023 */ subu $v0, $s0, $s1 /* 59B8 8002A5B8 44820000 */ mtc1 $v0, $f0 -/* 59BC 8002A5BC 00000000 */ nop +/* 59BC 8002A5BC 00000000 */ nop /* 59C0 8002A5C0 46800020 */ cvt.s.w $f0, $f0 /* 59C4 8002A5C4 46001082 */ mul.s $f2, $f2, $f0 -/* 59C8 8002A5C8 00000000 */ nop +/* 59C8 8002A5C8 00000000 */ nop /* 59CC 8002A5CC 46001082 */ mul.s $f2, $f2, $f0 -/* 59D0 8002A5D0 00000000 */ nop +/* 59D0 8002A5D0 00000000 */ nop /* 59D4 8002A5D4 46141083 */ div.s $f2, $f2, $f20 /* 59D8 8002A5D8 0800AA39 */ j .L8002A8E4 /* 59DC 8002A5DC 4602C001 */ sub.s $f0, $f24, $f2 @@ -151,60 +151,60 @@ glabel update_lerp /* 59E8 8002A5E8 4616C101 */ sub.s $f4, $f24, $f22 /* 59EC 8002A5EC 00001812 */ mflo $v1 /* 59F0 8002A5F0 44830000 */ mtc1 $v1, $f0 -/* 59F4 8002A5F4 00000000 */ nop +/* 59F4 8002A5F4 00000000 */ nop /* 59F8 8002A5F8 46800020 */ cvt.s.w $f0, $f0 /* 59FC 8002A5FC 46040002 */ mul.s $f0, $f0, $f4 -/* 5A00 8002A600 00000000 */ nop +/* 5A00 8002A600 00000000 */ nop /* 5A04 8002A604 02100018 */ mult $s0, $s0 /* 5A08 8002A608 00001812 */ mflo $v1 /* 5A0C 8002A60C 44831000 */ mtc1 $v1, $f2 -/* 5A10 8002A610 00000000 */ nop +/* 5A10 8002A610 00000000 */ nop /* 5A14 8002A614 468010A0 */ cvt.s.w $f2, $f2 /* 5A18 8002A618 0800A9B3 */ j .L8002A6CC /* 5A1C 8002A61C 4604B100 */ add.s $f4, $f22, $f4 /* 5A20 8002A620 02113823 */ subu $a3, $s0, $s1 /* 5A24 8002A624 00E70018 */ mult $a3, $a3 /* 5A28 8002A628 00001012 */ mflo $v0 -/* 5A2C 8002A62C 00000000 */ nop -/* 5A30 8002A630 00000000 */ nop +/* 5A2C 8002A62C 00000000 */ nop +/* 5A30 8002A630 00000000 */ nop /* 5A34 8002A634 00470018 */ mult $v0, $a3 /* 5A38 8002A638 00004012 */ mflo $t0 -/* 5A3C 8002A63C 00000000 */ nop +/* 5A3C 8002A63C 00000000 */ nop /* 5A40 8002A640 0800A9A4 */ j .L8002A690 /* 5A44 8002A644 02100018 */ mult $s0, $s0 /* 5A48 8002A648 02113823 */ subu $a3, $s0, $s1 /* 5A4C 8002A64C 00E70018 */ mult $a3, $a3 /* 5A50 8002A650 00001012 */ mflo $v0 -/* 5A54 8002A654 00000000 */ nop -/* 5A58 8002A658 00000000 */ nop +/* 5A54 8002A654 00000000 */ nop +/* 5A58 8002A658 00000000 */ nop /* 5A5C 8002A65C 00470018 */ mult $v0, $a3 /* 5A60 8002A660 00004012 */ mflo $t0 -/* 5A64 8002A664 00000000 */ nop -/* 5A68 8002A668 00000000 */ nop +/* 5A64 8002A664 00000000 */ nop +/* 5A68 8002A668 00000000 */ nop /* 5A6C 8002A66C 02100018 */ mult $s0, $s0 /* 5A70 8002A670 00001012 */ mflo $v0 -/* 5A74 8002A674 00000000 */ nop -/* 5A78 8002A678 00000000 */ nop +/* 5A74 8002A674 00000000 */ nop +/* 5A78 8002A678 00000000 */ nop /* 5A7C 8002A67C 01070018 */ mult $t0, $a3 /* 5A80 8002A680 00004012 */ mflo $t0 -/* 5A84 8002A684 00000000 */ nop -/* 5A88 8002A688 00000000 */ nop +/* 5A84 8002A684 00000000 */ nop +/* 5A88 8002A688 00000000 */ nop /* 5A8C 8002A68C 00500018 */ mult $v0, $s0 .L8002A690: /* 5A90 8002A690 4616C101 */ sub.s $f4, $f24, $f22 /* 5A94 8002A694 44880000 */ mtc1 $t0, $f0 -/* 5A98 8002A698 00000000 */ nop +/* 5A98 8002A698 00000000 */ nop /* 5A9C 8002A69C 46800020 */ cvt.s.w $f0, $f0 /* 5AA0 8002A6A0 46040002 */ mul.s $f0, $f0, $f4 -/* 5AA4 8002A6A4 00000000 */ nop +/* 5AA4 8002A6A4 00000000 */ nop /* 5AA8 8002A6A8 00001012 */ mflo $v0 -/* 5AAC 8002A6AC 00000000 */ nop -/* 5AB0 8002A6B0 00000000 */ nop +/* 5AAC 8002A6AC 00000000 */ nop +/* 5AB0 8002A6B0 00000000 */ nop /* 5AB4 8002A6B4 00500018 */ mult $v0, $s0 /* 5AB8 8002A6B8 4604B100 */ add.s $f4, $f22, $f4 /* 5ABC 8002A6BC 00001012 */ mflo $v0 /* 5AC0 8002A6C0 44821000 */ mtc1 $v0, $f2 -/* 5AC4 8002A6C4 00000000 */ nop +/* 5AC4 8002A6C4 00000000 */ nop /* 5AC8 8002A6C8 468010A0 */ cvt.s.w $f2, $f2 .L8002A6CC: /* 5ACC 8002A6CC 46020003 */ div.s $f0, $f0, $f2 @@ -212,63 +212,63 @@ glabel update_lerp /* 5AD4 8002A6D4 46002001 */ sub.s $f0, $f4, $f0 /* 5AD8 8002A6D8 02310018 */ mult $s1, $s1 /* 5ADC 8002A6DC 4490A000 */ mtc1 $s0, $f20 -/* 5AE0 8002A6E0 00000000 */ nop +/* 5AE0 8002A6E0 00000000 */ nop /* 5AE4 8002A6E4 4680A520 */ cvt.s.w $f20, $f20 /* 5AE8 8002A6E8 3C018009 */ lui $at, %hi(D_80097DD8) /* 5AEC 8002A6EC D4207DD8 */ ldc1 $f0, %lo(D_80097DD8)($at) /* 5AF0 8002A6F0 00001812 */ mflo $v1 /* 5AF4 8002A6F4 44836000 */ mtc1 $v1, $f12 -/* 5AF8 8002A6F8 00000000 */ nop +/* 5AF8 8002A6F8 00000000 */ nop /* 5AFC 8002A6FC 46806320 */ cvt.s.w $f12, $f12 /* 5B00 8002A700 46146303 */ div.s $f12, $f12, $f20 /* 5B04 8002A704 46006321 */ cvt.d.s $f12, $f12 /* 5B08 8002A708 46206302 */ mul.d $f12, $f12, $f0 -/* 5B0C 8002A70C 00000000 */ nop +/* 5B0C 8002A70C 00000000 */ nop /* 5B10 8002A710 3C014010 */ lui $at, 0x4010 /* 5B14 8002A714 44810800 */ mtc1 $at, $f1 /* 5B18 8002A718 44800000 */ mtc1 $zero, $f0 -/* 5B1C 8002A71C 00000000 */ nop +/* 5B1C 8002A71C 00000000 */ nop /* 5B20 8002A720 46206302 */ mul.d $f12, $f12, $f0 -/* 5B24 8002A724 00000000 */ nop +/* 5B24 8002A724 00000000 */ nop /* 5B28 8002A728 3C014044 */ lui $at, 0x4044 /* 5B2C 8002A72C 44810800 */ mtc1 $at, $f1 /* 5B30 8002A730 44800000 */ mtc1 $zero, $f0 -/* 5B34 8002A734 00000000 */ nop +/* 5B34 8002A734 00000000 */ nop /* 5B38 8002A738 46206303 */ div.d $f12, $f12, $f0 /* 5B3C 8002A73C 0C00A874 */ jal cos_rad /* 5B40 8002A740 46206320 */ cvt.s.d $f12, $f12 /* 5B44 8002A744 02111023 */ subu $v0, $s0, $s1 /* 5B48 8002A748 44821000 */ mtc1 $v0, $f2 -/* 5B4C 8002A74C 00000000 */ nop +/* 5B4C 8002A74C 00000000 */ nop /* 5B50 8002A750 468010A0 */ cvt.s.w $f2, $f2 /* 5B54 8002A754 46020002 */ mul.s $f0, $f0, $f2 -/* 5B58 8002A758 00000000 */ nop +/* 5B58 8002A758 00000000 */ nop /* 5B5C 8002A75C 4614A502 */ mul.s $f20, $f20, $f20 -/* 5B60 8002A760 00000000 */ nop +/* 5B60 8002A760 00000000 */ nop /* 5B64 8002A764 46020002 */ mul.s $f0, $f0, $f2 -/* 5B68 8002A768 00000000 */ nop +/* 5B68 8002A768 00000000 */ nop /* 5B6C 8002A76C 44801000 */ mtc1 $zero, $f2 /* 5B70 8002A770 46140103 */ div.s $f4, $f0, $f20 /* 5B74 8002A774 4602203C */ c.lt.s $f4, $f2 -/* 5B78 8002A778 00000000 */ nop +/* 5B78 8002A778 00000000 */ nop /* 5B7C 8002A77C 45030001 */ bc1tl .L8002A784 /* 5B80 8002A780 46002107 */ neg.s $f4, $f4 .L8002A784: /* 5B84 8002A784 4616C001 */ sub.s $f0, $f24, $f22 /* 5B88 8002A788 46040002 */ mul.s $f0, $f0, $f4 -/* 5B8C 8002A78C 00000000 */ nop +/* 5B8C 8002A78C 00000000 */ nop /* 5B90 8002A790 0800AA39 */ j .L8002A8E4 /* 5B94 8002A794 4600C001 */ sub.s $f0, $f24, $f0 /* 5B98 8002A798 44916000 */ mtc1 $s1, $f12 -/* 5B9C 8002A79C 00000000 */ nop +/* 5B9C 8002A79C 00000000 */ nop /* 5BA0 8002A7A0 46806320 */ cvt.s.w $f12, $f12 /* 5BA4 8002A7A4 3C018009 */ lui $at, %hi(D_80097DE0) /* 5BA8 8002A7A8 D4207DE0 */ ldc1 $f0, %lo(D_80097DE0)($at) /* 5BAC 8002A7AC 46006321 */ cvt.d.s $f12, $f12 /* 5BB0 8002A7B0 46206302 */ mul.d $f12, $f12, $f0 -/* 5BB4 8002A7B4 00000000 */ nop +/* 5BB4 8002A7B4 00000000 */ nop /* 5BB8 8002A7B8 44900000 */ mtc1 $s0, $f0 -/* 5BBC 8002A7BC 00000000 */ nop +/* 5BBC 8002A7BC 00000000 */ nop /* 5BC0 8002A7C0 46800020 */ cvt.s.w $f0, $f0 /* 5BC4 8002A7C4 46000021 */ cvt.d.s $f0, $f0 /* 5BC8 8002A7C8 46206303 */ div.d $f12, $f12, $f0 @@ -282,27 +282,27 @@ glabel update_lerp /* 5BE8 8002A7E8 46202101 */ sub.d $f4, $f4, $f0 /* 5BEC 8002A7EC 460010A1 */ cvt.d.s $f2, $f2 /* 5BF0 8002A7F0 46241082 */ mul.d $f2, $f2, $f4 -/* 5BF4 8002A7F4 00000000 */ nop +/* 5BF4 8002A7F4 00000000 */ nop /* 5BF8 8002A7F8 3C013FE0 */ lui $at, 0x3fe0 /* 5BFC 8002A7FC 44810800 */ mtc1 $at, $f1 /* 5C00 8002A800 44800000 */ mtc1 $zero, $f0 -/* 5C04 8002A804 00000000 */ nop +/* 5C04 8002A804 00000000 */ nop /* 5C08 8002A808 46201082 */ mul.d $f2, $f2, $f0 -/* 5C0C 8002A80C 00000000 */ nop +/* 5C0C 8002A80C 00000000 */ nop /* 5C10 8002A810 4600B021 */ cvt.d.s $f0, $f22 /* 5C14 8002A814 46220000 */ add.d $f0, $f0, $f2 /* 5C18 8002A818 0800AA39 */ j .L8002A8E4 /* 5C1C 8002A81C 46200020 */ cvt.s.d $f0, $f0 /* 5C20 8002A820 44916000 */ mtc1 $s1, $f12 -/* 5C24 8002A824 00000000 */ nop +/* 5C24 8002A824 00000000 */ nop /* 5C28 8002A828 46806320 */ cvt.s.w $f12, $f12 /* 5C2C 8002A82C 3C018009 */ lui $at, %hi(D_80097DE8) /* 5C30 8002A830 D4207DE8 */ ldc1 $f0, %lo(D_80097DE8)($at) /* 5C34 8002A834 46006321 */ cvt.d.s $f12, $f12 /* 5C38 8002A838 46206302 */ mul.d $f12, $f12, $f0 -/* 5C3C 8002A83C 00000000 */ nop +/* 5C3C 8002A83C 00000000 */ nop /* 5C40 8002A840 44900000 */ mtc1 $s0, $f0 -/* 5C44 8002A844 00000000 */ nop +/* 5C44 8002A844 00000000 */ nop /* 5C48 8002A848 46800020 */ cvt.s.w $f0, $f0 /* 5C4C 8002A84C 46000021 */ cvt.d.s $f0, $f0 /* 5C50 8002A850 46206303 */ div.d $f12, $f12, $f0 @@ -310,19 +310,19 @@ glabel update_lerp /* 5C58 8002A858 46206320 */ cvt.s.d $f12, $f12 /* 5C5C 8002A85C 4616C081 */ sub.s $f2, $f24, $f22 /* 5C60 8002A860 46001082 */ mul.s $f2, $f2, $f0 -/* 5C64 8002A864 00000000 */ nop +/* 5C64 8002A864 00000000 */ nop /* 5C68 8002A868 0800AA39 */ j .L8002A8E4 /* 5C6C 8002A86C 4602B000 */ add.s $f0, $f22, $f2 /* 5C70 8002A870 44916000 */ mtc1 $s1, $f12 -/* 5C74 8002A874 00000000 */ nop +/* 5C74 8002A874 00000000 */ nop /* 5C78 8002A878 46806320 */ cvt.s.w $f12, $f12 /* 5C7C 8002A87C 3C018009 */ lui $at, %hi(D_80097DF0) /* 5C80 8002A880 D4207DF0 */ ldc1 $f0, %lo(D_80097DF0)($at) /* 5C84 8002A884 46006321 */ cvt.d.s $f12, $f12 /* 5C88 8002A888 46206302 */ mul.d $f12, $f12, $f0 -/* 5C8C 8002A88C 00000000 */ nop +/* 5C8C 8002A88C 00000000 */ nop /* 5C90 8002A890 44900000 */ mtc1 $s0, $f0 -/* 5C94 8002A894 00000000 */ nop +/* 5C94 8002A894 00000000 */ nop /* 5C98 8002A898 46800020 */ cvt.s.w $f0, $f0 /* 5C9C 8002A89C 46000021 */ cvt.d.s $f0, $f0 /* 5CA0 8002A8A0 46206303 */ div.d $f12, $f12, $f0 @@ -336,7 +336,7 @@ glabel update_lerp /* 5CC0 8002A8C0 46201081 */ sub.d $f2, $f2, $f0 /* 5CC4 8002A8C4 46002121 */ cvt.d.s $f4, $f4 /* 5CC8 8002A8C8 46222102 */ mul.d $f4, $f4, $f2 -/* 5CCC 8002A8CC 00000000 */ nop +/* 5CCC 8002A8CC 00000000 */ nop /* 5CD0 8002A8D0 4600B021 */ cvt.d.s $f0, $f22 /* 5CD4 8002A8D4 46240000 */ add.d $f0, $f0, $f4 /* 5CD8 8002A8D8 0800AA39 */ j .L8002A8E4 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s b/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s index ce35a2fb12..515b1bbd3a 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_deserialize_state.s @@ -98,4 +98,4 @@ glabel fio_deserialize_state /* 69F8 8002B5F8 00220821 */ addu $at, $at, $v0 /* 69FC 8002B5FC AC2A79D8 */ sw $t2, %lo(D_800779D8)($at) /* 6A00 8002B600 03E00008 */ jr $ra -/* 6A04 8002B604 00000000 */ nop +/* 6A04 8002B604 00000000 */ nop diff --git a/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s b/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s index b65ab3c954..3b84babd49 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_fetch_saved_file_info.s @@ -76,7 +76,7 @@ glabel fio_fetch_saved_file_info .L8002B260: /* 6660 8002B260 8C620000 */ lw $v0, ($v1) /* 6664 8002B264 10820005 */ beq $a0, $v0, .L8002B27C -/* 6668 8002B268 00000000 */ nop +/* 6668 8002B268 00000000 */ nop /* 666C 8002B26C 26100001 */ addiu $s0, $s0, 1 /* 6670 8002B270 2A020004 */ slti $v0, $s0, 4 /* 6674 8002B274 1440FFFA */ bnez $v0, .L8002B260 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s b/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s index 14a1bb7d31..9853346e79 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_has_valid_backup.s @@ -12,7 +12,7 @@ glabel fio_has_valid_backup /* 63F4 8002AFF4 0C00AE1A */ jal fio_read_flash /* 63F8 8002AFF8 24060080 */ addiu $a2, $zero, 0x80 /* 63FC 8002AFFC 0C00ABDC */ jal fio_validate_header_checksums -/* 6400 8002B000 00000000 */ nop +/* 6400 8002B000 00000000 */ nop /* 6404 8002B004 1440000D */ bnez $v0, .L8002B03C /* 6408 8002B008 24020001 */ addiu $v0, $zero, 1 /* 640C 8002B00C 24040007 */ addiu $a0, $zero, 7 @@ -20,7 +20,7 @@ glabel fio_has_valid_backup /* 6414 8002B014 0C00AE1A */ jal fio_read_flash /* 6418 8002B018 24060080 */ addiu $a2, $zero, 0x80 /* 641C 8002B01C 0C00ABDC */ jal fio_validate_header_checksums -/* 6420 8002B020 00000000 */ nop +/* 6420 8002B020 00000000 */ nop /* 6424 8002B024 14400005 */ bnez $v0, .L8002B03C /* 6428 8002B028 24020001 */ addiu $v0, $zero, 1 /* 642C 8002B02C 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_6240_len_c00/fio_load_game.s b/asm/nonmatchings/code_6240_len_c00/fio_load_game.s index 2e24aa9b0d..221166327f 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_load_game.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_load_game.s @@ -36,7 +36,7 @@ glabel fio_load_game /* 674C 8002B34C AC640168 */ sw $a0, 0x168($v1) .L8002B350: /* 6750 8002B350 0C00AD24 */ jal fio_deserialize_state -/* 6754 8002B354 00000000 */ nop +/* 6754 8002B354 00000000 */ nop /* 6758 8002B358 24020001 */ addiu $v0, $zero, 1 .L8002B35C: /* 675C 8002B35C 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s b/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s index b281f86e5b..ddfc9eff28 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_serialize_state.s @@ -88,7 +88,7 @@ glabel fio_serialize_state /* 6B70 8002B770 00220821 */ addu $at, $at, $v0 /* 6B74 8002B774 A02379CA */ sb $v1, %lo(D_800779CA)($at) /* 6B78 8002B778 0C00AB90 */ jal get_spirits_rescued -/* 6B7C 8002B77C 00000000 */ nop +/* 6B7C 8002B77C 00000000 */ nop /* 6B80 8002B780 8E030000 */ lw $v1, ($s0) /* 6B84 8002B784 90640166 */ lbu $a0, 0x166($v1) /* 6B88 8002B788 00041840 */ sll $v1, $a0, 1 diff --git a/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s b/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s index 0e4b1ebe22..963f48777a 100644 --- a/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s +++ b/asm/nonmatchings/code_6240_len_c00/fio_validate_header_checksums.s @@ -20,7 +20,7 @@ glabel fio_validate_header_checksums /* 63AC 8002AFAC 54620006 */ bnel $v1, $v0, .L8002AFC8 /* 63B0 8002AFB0 0000102D */ daddu $v0, $zero, $zero /* 63B4 8002AFB4 0C00ABD0 */ jal fio_calc_header_checksum -/* 63B8 8002AFB8 00000000 */ nop +/* 63B8 8002AFB8 00000000 */ nop /* 63BC 8002AFBC 8E030030 */ lw $v1, 0x30($s0) /* 63C0 8002AFC0 00431026 */ xor $v0, $v0, $v1 /* 63C4 8002AFC4 2C420001 */ sltiu $v0, $v0, 1 diff --git a/asm/nonmatchings/code_6F10E0/func_80238000_6F10E0.s b/asm/nonmatchings/code_6F10E0/func_80238000_6F10E0.s index d7afe140f5..e59599564c 100644 --- a/asm/nonmatchings/code_6F10E0/func_80238000_6F10E0.s +++ b/asm/nonmatchings/code_6F10E0/func_80238000_6F10E0.s @@ -24,16 +24,16 @@ glabel func_80238000_6F10E0 /* 6F112C 8023804C E7A00014 */ swc1 $f0, 0x14($sp) /* 6F1130 80238050 3C014170 */ lui $at, 0x4170 /* 6F1134 80238054 44811000 */ mtc1 $at, $f2 -/* 6F1138 80238058 00000000 */ nop +/* 6F1138 80238058 00000000 */ nop /* 6F113C 8023805C 46020002 */ mul.s $f0, $f0, $f2 -/* 6F1140 80238060 00000000 */ nop +/* 6F1140 80238060 00000000 */ nop /* 6F1144 80238064 3C0142C8 */ lui $at, 0x42c8 /* 6F1148 80238068 44811000 */ mtc1 $at, $f2 -/* 6F114C 8023806C 00000000 */ nop +/* 6F114C 8023806C 00000000 */ nop /* 6F1150 80238070 46020003 */ div.s $f0, $f0, $f2 /* 6F1154 80238074 4600020D */ trunc.w.s $f8, $f0 /* 6F1158 80238078 44024000 */ mfc1 $v0, $f8 -/* 6F115C 8023807C 00000000 */ nop +/* 6F115C 8023807C 00000000 */ nop /* 6F1160 80238080 AE020084 */ sw $v0, 0x84($s0) /* 6F1164 80238084 28420015 */ slti $v0, $v0, 0x15 /* 6F1168 80238088 14400002 */ bnez $v0, .L80238094 @@ -42,7 +42,7 @@ glabel func_80238000_6F10E0 .L80238094: /* 6F1174 80238094 82220083 */ lb $v0, 0x83($s1) /* 6F1178 80238098 10400007 */ beqz $v0, .L802380B8 -/* 6F117C 8023809C 00000000 */ nop +/* 6F117C 8023809C 00000000 */ nop /* 6F1180 802380A0 8E020084 */ lw $v0, 0x84($s0) /* 6F1184 802380A4 2842000A */ slti $v0, $v0, 0xa /* 6F1188 802380A8 10400008 */ beqz $v0, .L802380CC diff --git a/asm/nonmatchings/code_6F10E0/func_8023817C_6F125C.s b/asm/nonmatchings/code_6F10E0/func_8023817C_6F125C.s index 65c1decb27..010ed2bc19 100644 --- a/asm/nonmatchings/code_6F10E0/func_8023817C_6F125C.s +++ b/asm/nonmatchings/code_6F10E0/func_8023817C_6F125C.s @@ -38,7 +38,7 @@ glabel func_8023817C_6F125C .L80238200: /* 6F12E0 80238200 8E620070 */ lw $v0, 0x70($s3) /* 6F12E4 80238204 144000F5 */ bnez $v0, .L802385DC -/* 6F12E8 80238208 00000000 */ nop +/* 6F12E8 80238208 00000000 */ nop /* 6F12EC 8023820C C6400144 */ lwc1 $f0, 0x144($s2) /* 6F12F0 80238210 C618000C */ lwc1 $f24, 0xc($s0) /* 6F12F4 80238214 C61A0014 */ lwc1 $f26, 0x14($s0) @@ -68,29 +68,29 @@ glabel func_8023817C_6F125C /* 6F1354 80238274 46002003 */ div.s $f0, $f4, $f0 /* 6F1358 80238278 4600028D */ trunc.w.s $f10, $f0 /* 6F135C 8023827C 44035000 */ mfc1 $v1, $f10 -/* 6F1360 80238280 00000000 */ nop +/* 6F1360 80238280 00000000 */ nop /* 6F1364 80238284 00031400 */ sll $v0, $v1, 0x10 /* 6F1368 80238288 00021403 */ sra $v0, $v0, 0x10 /* 6F136C 8023828C 44820000 */ mtc1 $v0, $f0 -/* 6F1370 80238290 00000000 */ nop +/* 6F1370 80238290 00000000 */ nop /* 6F1374 80238294 46800020 */ cvt.s.w $f0, $f0 /* 6F1378 80238298 46020002 */ mul.s $f0, $f0, $f2 -/* 6F137C 8023829C 00000000 */ nop +/* 6F137C 8023829C 00000000 */ nop /* 6F1380 802382A0 46002086 */ mov.s $f2, $f4 /* 6F1384 802382A4 A6030064 */ sh $v1, 0x64($s0) /* 6F1388 802382A8 0808E0B9 */ j .L802382E4 /* 6F138C 802382AC 46001201 */ sub.s $f8, $f2, $f0 .L802382B0: /* 6F1390 802382B0 44821000 */ mtc1 $v0, $f2 -/* 6F1394 802382B4 00000000 */ nop +/* 6F1394 802382B4 00000000 */ nop /* 6F1398 802382B8 468010A0 */ cvt.s.w $f2, $f2 /* 6F139C 802382BC 86020064 */ lh $v0, 0x64($s0) /* 6F13A0 802382C0 46022083 */ div.s $f2, $f4, $f2 /* 6F13A4 802382C4 44820000 */ mtc1 $v0, $f0 -/* 6F13A8 802382C8 00000000 */ nop +/* 6F13A8 802382C8 00000000 */ nop /* 6F13AC 802382CC 46800020 */ cvt.s.w $f0, $f0 /* 6F13B0 802382D0 46020002 */ mul.s $f0, $f0, $f2 -/* 6F13B4 802382D4 00000000 */ nop +/* 6F13B4 802382D4 00000000 */ nop /* 6F13B8 802382D8 C604004C */ lwc1 $f4, 0x4c($s0) /* 6F13BC 802382DC E6020040 */ swc1 $f2, 0x40($s0) /* 6F13C0 802382E0 46002201 */ sub.s $f8, $f4, $f0 @@ -105,13 +105,13 @@ glabel func_8023817C_6F125C /* 6F13E0 80238300 44810000 */ mtc1 $at, $f0 /* 6F13E4 80238304 C6040000 */ lwc1 $f4, ($s0) /* 6F13E8 80238308 44823000 */ mtc1 $v0, $f6 -/* 6F13EC 8023830C 00000000 */ nop +/* 6F13EC 8023830C 00000000 */ nop /* 6F13F0 80238310 468031A0 */ cvt.s.w $f6, $f6 /* 6F13F4 80238314 46060003 */ div.s $f0, $f0, $f6 /* 6F13F8 80238318 46041081 */ sub.s $f2, $f2, $f4 /* 6F13FC 8023831C E600003C */ swc1 $f0, 0x3c($s0) /* 6F1400 80238320 44830000 */ mtc1 $v1, $f0 -/* 6F1404 80238324 00000000 */ nop +/* 6F1404 80238324 00000000 */ nop /* 6F1408 80238328 46800020 */ cvt.s.w $f0, $f0 /* 6F140C 8023832C 46001083 */ div.s $f2, $f2, $f0 /* 6F1410 80238330 C6000010 */ lwc1 $f0, 0x10($s0) @@ -145,7 +145,7 @@ glabel func_8023817C_6F125C /* 6F147C 8023839C 14410004 */ bne $v0, $at, .L802383B0 /* 6F1480 802383A0 3C018000 */ lui $at, 0x8000 /* 6F1484 802383A4 14610002 */ bne $v1, $at, .L802383B0 -/* 6F1488 802383A8 00000000 */ nop +/* 6F1488 802383A8 00000000 */ nop /* 6F148C 802383AC 0006000D */ break 6 .L802383B0: /* 6F1490 802383B0 00001812 */ mflo $v1 @@ -170,7 +170,7 @@ glabel func_8023817C_6F125C /* 6F14DC 802383FC 44811000 */ mtc1 $at, $f2 /* 6F14E0 80238400 46200220 */ cvt.s.d $f8, $f0 /* 6F14E4 80238404 44830000 */ mtc1 $v1, $f0 -/* 6F14E8 80238408 00000000 */ nop +/* 6F14E8 80238408 00000000 */ nop /* 6F14EC 8023840C 46800020 */ cvt.s.w $f0, $f0 /* 6F14F0 80238410 86030066 */ lh $v1, 0x66($s0) /* 6F14F4 80238414 24020002 */ addiu $v0, $zero, 2 @@ -182,7 +182,7 @@ glabel func_8023817C_6F125C /* 6F150C 8023842C D422CD58 */ ldc1 $f2, %lo(D_8023CD58)($at) /* 6F1510 80238430 46004021 */ cvt.d.s $f0, $f8 /* 6F1514 80238434 46220002 */ mul.d $f0, $f0, $f2 -/* 6F1518 80238438 00000000 */ nop +/* 6F1518 80238438 00000000 */ nop /* 6F151C 8023843C 46200020 */ cvt.s.d $f0, $f0 /* 6F1520 80238440 E6000050 */ swc1 $f0, 0x50($s0) .L80238444: @@ -194,7 +194,7 @@ glabel func_8023817C_6F125C /* 6F1538 80238458 C616003C */ lwc1 $f22, 0x3c($s0) /* 6F153C 8023845C AE000018 */ sw $zero, 0x18($s0) /* 6F1540 80238460 46006302 */ mul.s $f12, $f12, $f0 -/* 6F1544 80238464 00000000 */ nop +/* 6F1544 80238464 00000000 */ nop /* 6F1548 80238468 AE00001C */ sw $zero, 0x1c($s0) /* 6F154C 8023846C 4600A521 */ cvt.d.s $f20, $f20 /* 6F1550 80238470 3C0143B4 */ lui $at, 0x43b4 @@ -217,7 +217,7 @@ glabel func_8023817C_6F125C /* 6F158C 802384AC 14410004 */ bne $v0, $at, .L802384C0 /* 6F1590 802384B0 3C018000 */ lui $at, 0x8000 /* 6F1594 802384B4 14610002 */ bne $v1, $at, .L802384C0 -/* 6F1598 802384B8 00000000 */ nop +/* 6F1598 802384B8 00000000 */ nop /* 6F159C 802384BC 0006000D */ break 6 .L802384C0: /* 6F15A0 802384C0 00001812 */ mflo $v1 @@ -242,7 +242,7 @@ glabel func_8023817C_6F125C /* 6F15EC 8023850C 44811000 */ mtc1 $at, $f2 /* 6F15F0 80238510 46200220 */ cvt.s.d $f8, $f0 /* 6F15F4 80238514 44830000 */ mtc1 $v1, $f0 -/* 6F15F8 80238518 00000000 */ nop +/* 6F15F8 80238518 00000000 */ nop /* 6F15FC 8023851C 46800020 */ cvt.s.w $f0, $f0 /* 6F1600 80238520 86030066 */ lh $v1, 0x66($s0) /* 6F1604 80238524 24020004 */ addiu $v0, $zero, 4 @@ -255,7 +255,7 @@ glabel func_8023817C_6F125C /* 6F1620 80238540 44801000 */ mtc1 $zero, $f2 /* 6F1624 80238544 46004021 */ cvt.d.s $f0, $f8 /* 6F1628 80238548 46220002 */ mul.d $f0, $f0, $f2 -/* 6F162C 8023854C 00000000 */ nop +/* 6F162C 8023854C 00000000 */ nop /* 6F1630 80238550 46200020 */ cvt.s.d $f0, $f0 /* 6F1634 80238554 E6000050 */ swc1 $f0, 0x50($s0) .L80238558: @@ -267,7 +267,7 @@ glabel func_8023817C_6F125C /* 6F164C 8023856C C616003C */ lwc1 $f22, 0x3c($s0) /* 6F1650 80238570 AE000018 */ sw $zero, 0x18($s0) /* 6F1654 80238574 46006302 */ mul.s $f12, $f12, $f0 -/* 6F1658 80238578 00000000 */ nop +/* 6F1658 80238578 00000000 */ nop /* 6F165C 8023857C AE00001C */ sw $zero, 0x1c($s0) /* 6F1660 80238580 4600A521 */ cvt.d.s $f20, $f20 /* 6F1664 80238584 3C0143B4 */ lui $at, 0x43b4 @@ -280,9 +280,9 @@ glabel func_8023817C_6F125C /* 6F1680 802385A0 46000021 */ cvt.d.s $f0, $f0 .L802385A4: /* 6F1684 802385A4 46220002 */ mul.d $f0, $f0, $f2 -/* 6F1688 802385A8 00000000 */ nop +/* 6F1688 802385A8 00000000 */ nop /* 6F168C 802385AC 46360002 */ mul.d $f0, $f0, $f22 -/* 6F1690 802385B0 00000000 */ nop +/* 6F1690 802385B0 00000000 */ nop /* 6F1694 802385B4 46360000 */ add.d $f0, $f0, $f22 /* 6F1698 802385B8 4620A500 */ add.d $f20, $f20, $f0 /* 6F169C 802385BC 4620A520 */ cvt.s.d $f20, $f20 @@ -303,21 +303,21 @@ glabel func_8023817C_6F125C /* 6F16D4 802385F4 10620008 */ beq $v1, $v0, .L80238618 /* 6F16D8 802385F8 0000102D */ daddu $v0, $zero, $zero /* 6F16DC 802385FC 0808E27C */ j .L802389F0 -/* 6F16E0 80238600 00000000 */ nop +/* 6F16E0 80238600 00000000 */ nop .L80238604: /* 6F16E4 80238604 24020003 */ addiu $v0, $zero, 3 /* 6F16E8 80238608 106200BD */ beq $v1, $v0, .L80238900 /* 6F16EC 8023860C 0000102D */ daddu $v0, $zero, $zero /* 6F16F0 80238610 0808E27C */ j .L802389F0 -/* 6F16F4 80238614 00000000 */ nop +/* 6F16F4 80238614 00000000 */ nop .L80238618: /* 6F16F8 80238618 C6020044 */ lwc1 $f2, 0x44($s0) /* 6F16FC 8023861C 3C013FC9 */ lui $at, 0x3fc9 /* 6F1700 80238620 34210FD0 */ ori $at, $at, 0xfd0 /* 6F1704 80238624 44810000 */ mtc1 $at, $f0 -/* 6F1708 80238628 00000000 */ nop +/* 6F1708 80238628 00000000 */ nop /* 6F170C 8023862C 4602003C */ c.lt.s $f0, $f2 -/* 6F1710 80238630 00000000 */ nop +/* 6F1710 80238630 00000000 */ nop /* 6F1714 80238634 45000004 */ bc1f .L80238648 /* 6F1718 80238638 24040100 */ addiu $a0, $zero, 0x100 /* 6F171C 8023863C 8E06005C */ lw $a2, 0x5c($s0) @@ -346,7 +346,7 @@ glabel func_8023817C_6F125C /* 6F1774 80238694 C60C0044 */ lwc1 $f12, 0x44($s0) /* 6F1778 80238698 C6020050 */ lwc1 $f2, 0x50($s0) /* 6F177C 8023869C 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1780 802386A0 00000000 */ nop +/* 6F1780 802386A0 00000000 */ nop /* 6F1784 802386A4 C6000004 */ lwc1 $f0, 4($s0) /* 6F1788 802386A8 46020000 */ add.s $f0, $f0, $f2 /* 6F178C 802386AC E6400148 */ swc1 $f0, 0x148($s2) @@ -355,7 +355,7 @@ glabel func_8023817C_6F125C /* 6F1798 802386B8 C6020010 */ lwc1 $f2, 0x10($s0) /* 6F179C 802386BC C6400148 */ lwc1 $f0, 0x148($s2) /* 6F17A0 802386C0 4602003C */ c.lt.s $f0, $f2 -/* 6F17A4 802386C4 00000000 */ nop +/* 6F17A4 802386C4 00000000 */ nop /* 6F17A8 802386C8 45000007 */ bc1f .L802386E8 /* 6F17AC 802386CC 4600B306 */ mov.s $f12, $f22 /* 6F17B0 802386D0 86020064 */ lh $v0, 0x64($s0) @@ -384,7 +384,7 @@ glabel func_8023817C_6F125C /* 6F1804 80238724 44810000 */ mtc1 $at, $f0 /* 6F1808 80238728 C6140044 */ lwc1 $f20, 0x44($s0) /* 6F180C 8023872C 46006302 */ mul.s $f12, $f12, $f0 -/* 6F1810 80238730 00000000 */ nop +/* 6F1810 80238730 00000000 */ nop /* 6F1814 80238734 C616003C */ lwc1 $f22, 0x3c($s0) /* 6F1818 80238738 4600A521 */ cvt.d.s $f20, $f20 /* 6F181C 8023873C 3C0143B4 */ lui $at, 0x43b4 @@ -403,7 +403,7 @@ glabel func_8023817C_6F125C /* 6F184C 8023876C 44810000 */ mtc1 $at, $f0 /* 6F1850 80238770 C6140044 */ lwc1 $f20, 0x44($s0) /* 6F1854 80238774 46006302 */ mul.s $f12, $f12, $f0 -/* 6F1858 80238778 00000000 */ nop +/* 6F1858 80238778 00000000 */ nop /* 6F185C 8023877C C616003C */ lwc1 $f22, 0x3c($s0) /* 6F1860 80238780 4600A521 */ cvt.d.s $f20, $f20 /* 6F1864 80238784 3C0143B4 */ lui $at, 0x43b4 @@ -416,9 +416,9 @@ glabel func_8023817C_6F125C /* 6F1880 802387A0 46000021 */ cvt.d.s $f0, $f0 .L802387A4: /* 6F1884 802387A4 46220002 */ mul.d $f0, $f0, $f2 -/* 6F1888 802387A8 00000000 */ nop +/* 6F1888 802387A8 00000000 */ nop /* 6F188C 802387AC 46360002 */ mul.d $f0, $f0, $f22 -/* 6F1890 802387B0 00000000 */ nop +/* 6F1890 802387B0 00000000 */ nop /* 6F1894 802387B4 46360000 */ add.d $f0, $f0, $f22 /* 6F1898 802387B8 4620A500 */ add.d $f20, $f20, $f0 /* 6F189C 802387BC 4620A520 */ cvt.s.d $f20, $f20 @@ -467,7 +467,7 @@ glabel func_8023817C_6F125C /* 6F1940 80238860 14410004 */ bne $v0, $at, .L80238874 /* 6F1944 80238864 3C018000 */ lui $at, 0x8000 /* 6F1948 80238868 14610002 */ bne $v1, $at, .L80238874 -/* 6F194C 8023886C 00000000 */ nop +/* 6F194C 8023886C 00000000 */ nop /* 6F1950 80238870 0006000D */ break 6 .L80238874: /* 6F1954 80238874 00001812 */ mflo $v1 @@ -494,7 +494,7 @@ glabel func_8023817C_6F125C /* 6F19A8 802388C8 46200020 */ cvt.s.d $f0, $f0 /* 6F19AC 802388CC E6000050 */ swc1 $f0, 0x50($s0) /* 6F19B0 802388D0 44830000 */ mtc1 $v1, $f0 -/* 6F19B4 802388D4 00000000 */ nop +/* 6F19B4 802388D4 00000000 */ nop /* 6F19B8 802388D8 46800020 */ cvt.s.w $f0, $f0 /* 6F19BC 802388DC E6000028 */ swc1 $f0, 0x28($s0) /* 6F19C0 802388E0 C6400144 */ lwc1 $f0, 0x144($s2) @@ -510,9 +510,9 @@ glabel func_8023817C_6F125C /* 6F19E4 80238904 3C0140C9 */ lui $at, 0x40c9 /* 6F19E8 80238908 34210FD0 */ ori $at, $at, 0xfd0 /* 6F19EC 8023890C 4481B000 */ mtc1 $at, $f22 -/* 6F19F0 80238910 00000000 */ nop +/* 6F19F0 80238910 00000000 */ nop /* 6F19F4 80238914 46166302 */ mul.s $f12, $f12, $f22 -/* 6F19F8 80238918 00000000 */ nop +/* 6F19F8 80238918 00000000 */ nop /* 6F19FC 8023891C C6140000 */ lwc1 $f20, ($s0) /* 6F1A00 80238920 3C0143B4 */ lui $at, 0x43b4 /* 6F1A04 80238924 4481C000 */ mtc1 $at, $f24 @@ -521,10 +521,10 @@ glabel func_8023817C_6F125C /* 6F1A10 80238930 46186303 */ div.s $f12, $f12, $f24 /* 6F1A14 80238934 C6020050 */ lwc1 $f2, 0x50($s0) /* 6F1A18 80238938 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1A1C 8023893C 00000000 */ nop +/* 6F1A1C 8023893C 00000000 */ nop /* 6F1A20 80238940 C60C0024 */ lwc1 $f12, 0x24($s0) /* 6F1A24 80238944 46166302 */ mul.s $f12, $f12, $f22 -/* 6F1A28 80238948 00000000 */ nop +/* 6F1A28 80238948 00000000 */ nop /* 6F1A2C 8023894C 3C018024 */ lui $at, %hi(D_8023CD90) /* 6F1A30 80238950 D420CD90 */ ldc1 $f0, %lo(D_8023CD90)($at) /* 6F1A34 80238954 460010A1 */ cvt.d.s $f2, $f2 @@ -536,7 +536,7 @@ glabel func_8023817C_6F125C /* 6F1A4C 8023896C E6140000 */ swc1 $f20, ($s0) /* 6F1A50 80238970 C6020050 */ lwc1 $f2, 0x50($s0) /* 6F1A54 80238974 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1A58 80238978 00000000 */ nop +/* 6F1A58 80238978 00000000 */ nop /* 6F1A5C 8023897C C60C0024 */ lwc1 $f12, 0x24($s0) /* 6F1A60 80238980 C6000028 */ lwc1 $f0, 0x28($s0) /* 6F1A64 80238984 46006300 */ add.s $f12, $f12, $f0 @@ -556,7 +556,7 @@ glabel func_8023817C_6F125C /* 6F1A9C 802389BC 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) /* 6F1AA0 802389C0 30422000 */ andi $v0, $v0, 0x2000 /* 6F1AA4 802389C4 10400003 */ beqz $v0, .L802389D4 -/* 6F1AA8 802389C8 00000000 */ nop +/* 6F1AA8 802389C8 00000000 */ nop .L802389CC: /* 6F1AAC 802389CC 0808E27C */ j .L802389F0 /* 6F1AB0 802389D0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_6F10E0/func_80238A20_6F1B00.s b/asm/nonmatchings/code_6F10E0/func_80238A20_6F1B00.s index 305f192615..da9585e24e 100644 --- a/asm/nonmatchings/code_6F10E0/func_80238A20_6F1B00.s +++ b/asm/nonmatchings/code_6F10E0/func_80238A20_6F1B00.s @@ -26,9 +26,9 @@ glabel func_80238A20_6F1B00 .L80238A70: /* 6F1B50 80238A70 C6000050 */ lwc1 $f0, 0x50($s0) /* 6F1B54 80238A74 4480A000 */ mtc1 $zero, $f20 -/* 6F1B58 80238A78 00000000 */ nop +/* 6F1B58 80238A78 00000000 */ nop /* 6F1B5C 80238A7C 4600A03C */ c.lt.s $f20, $f0 -/* 6F1B60 80238A80 00000000 */ nop +/* 6F1B60 80238A80 00000000 */ nop /* 6F1B64 80238A84 45000005 */ bc1f .L80238A9C /* 6F1B68 80238A88 24040100 */ addiu $a0, $zero, 0x100 /* 6F1B6C 80238A8C 8E060064 */ lw $a2, 0x64($s0) @@ -37,7 +37,7 @@ glabel func_80238A20_6F1B00 /* 6F1B78 80238A98 C6000050 */ lwc1 $f0, 0x50($s0) .L80238A9C: /* 6F1B7C 80238A9C 4614003C */ c.lt.s $f0, $f20 -/* 6F1B80 80238AA0 00000000 */ nop +/* 6F1B80 80238AA0 00000000 */ nop /* 6F1B84 80238AA4 45000004 */ bc1f .L80238AB8 /* 6F1B88 80238AA8 24040100 */ addiu $a0, $zero, 0x100 /* 6F1B8C 80238AAC 8E060068 */ lw $a2, 0x68($s0) @@ -64,7 +64,7 @@ glabel func_80238A20_6F1B00 /* 6F1BDC 80238AFC C6040148 */ lwc1 $f4, 0x148($s0) /* 6F1BE0 80238B00 E602014C */ swc1 $f2, 0x14c($s0) /* 6F1BE4 80238B04 4606203C */ c.lt.s $f4, $f6 -/* 6F1BE8 80238B08 00000000 */ nop +/* 6F1BE8 80238B08 00000000 */ nop /* 6F1BEC 80238B0C 45010003 */ bc1t .L80238B1C /* 6F1BF0 80238B10 E6000144 */ swc1 $f0, 0x144($s0) /* 6F1BF4 80238B14 0808E2D2 */ j .L80238B48 diff --git a/asm/nonmatchings/code_6F10E0/func_80238BCC_6F1CAC.s b/asm/nonmatchings/code_6F10E0/func_80238BCC_6F1CAC.s index 45a7f39ee5..0f2784f0fb 100644 --- a/asm/nonmatchings/code_6F10E0/func_80238BCC_6F1CAC.s +++ b/asm/nonmatchings/code_6F10E0/func_80238BCC_6F1CAC.s @@ -14,7 +14,7 @@ glabel func_80238BCC_6F1CAC /* 6F1CD0 80238BF0 8C820000 */ lw $v0, ($a0) /* 6F1CD4 80238BF4 30420800 */ andi $v0, $v0, 0x800 /* 6F1CD8 80238BF8 14400022 */ bnez $v0, .L80238C84 -/* 6F1CDC 80238BFC 00000000 */ nop +/* 6F1CDC 80238BFC 00000000 */ nop /* 6F1CE0 80238C00 90830191 */ lbu $v1, 0x191($a0) /* 6F1CE4 80238C04 3C02AAAA */ lui $v0, 0xaaaa /* 6F1CE8 80238C08 3442AAAB */ ori $v0, $v0, 0xaaab @@ -24,27 +24,27 @@ glabel func_80238BCC_6F1CAC /* 6F1CF8 80238C18 00061042 */ srl $v0, $a2, 1 /* 6F1CFC 80238C1C 304200FF */ andi $v0, $v0, 0xff /* 6F1D00 80238C20 44821000 */ mtc1 $v0, $f2 -/* 6F1D04 80238C24 00000000 */ nop +/* 6F1D04 80238C24 00000000 */ nop /* 6F1D08 80238C28 468010A0 */ cvt.s.w $f2, $f2 /* 6F1D0C 80238C2C 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1D10 80238C30 00000000 */ nop +/* 6F1D10 80238C30 00000000 */ nop /* 6F1D14 80238C34 C6000088 */ lwc1 $f0, 0x88($s0) /* 6F1D18 80238C38 46800020 */ cvt.s.w $f0, $f0 /* 6F1D1C 80238C3C 46020000 */ add.s $f0, $f0, $f2 /* 6F1D20 80238C40 4600010D */ trunc.w.s $f4, $f0 /* 6F1D24 80238C44 44032000 */ mfc1 $v1, $f4 -/* 6F1D28 80238C48 00000000 */ nop +/* 6F1D28 80238C48 00000000 */ nop /* 6F1D2C 80238C4C AE030088 */ sw $v1, 0x88($s0) /* 6F1D30 80238C50 90820191 */ lbu $v0, 0x191($a0) /* 6F1D34 80238C54 C4800188 */ lwc1 $f0, 0x188($a0) /* 6F1D38 80238C58 00021082 */ srl $v0, $v0, 2 /* 6F1D3C 80238C5C 44821000 */ mtc1 $v0, $f2 -/* 6F1D40 80238C60 00000000 */ nop +/* 6F1D40 80238C60 00000000 */ nop /* 6F1D44 80238C64 468010A0 */ cvt.s.w $f2, $f2 /* 6F1D48 80238C68 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1D4C 80238C6C 00000000 */ nop +/* 6F1D4C 80238C6C 00000000 */ nop /* 6F1D50 80238C70 44830000 */ mtc1 $v1, $f0 -/* 6F1D54 80238C74 00000000 */ nop +/* 6F1D54 80238C74 00000000 */ nop /* 6F1D58 80238C78 46800020 */ cvt.s.w $f0, $f0 /* 6F1D5C 80238C7C 0808E341 */ j .L80238D04 /* 6F1D60 80238C80 46020000 */ add.s $f0, $f0, $f2 @@ -58,27 +58,27 @@ glabel func_80238BCC_6F1CAC /* 6F1D7C 80238C9C 00061042 */ srl $v0, $a2, 1 /* 6F1D80 80238CA0 304200FF */ andi $v0, $v0, 0xff /* 6F1D84 80238CA4 44821000 */ mtc1 $v0, $f2 -/* 6F1D88 80238CA8 00000000 */ nop +/* 6F1D88 80238CA8 00000000 */ nop /* 6F1D8C 80238CAC 468010A0 */ cvt.s.w $f2, $f2 /* 6F1D90 80238CB0 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1D94 80238CB4 00000000 */ nop +/* 6F1D94 80238CB4 00000000 */ nop /* 6F1D98 80238CB8 C6000088 */ lwc1 $f0, 0x88($s0) /* 6F1D9C 80238CBC 46800020 */ cvt.s.w $f0, $f0 /* 6F1DA0 80238CC0 46020001 */ sub.s $f0, $f0, $f2 /* 6F1DA4 80238CC4 4600010D */ trunc.w.s $f4, $f0 /* 6F1DA8 80238CC8 44032000 */ mfc1 $v1, $f4 -/* 6F1DAC 80238CCC 00000000 */ nop +/* 6F1DAC 80238CCC 00000000 */ nop /* 6F1DB0 80238CD0 AE030088 */ sw $v1, 0x88($s0) /* 6F1DB4 80238CD4 90820191 */ lbu $v0, 0x191($a0) /* 6F1DB8 80238CD8 C4800188 */ lwc1 $f0, 0x188($a0) /* 6F1DBC 80238CDC 00021082 */ srl $v0, $v0, 2 /* 6F1DC0 80238CE0 44821000 */ mtc1 $v0, $f2 -/* 6F1DC4 80238CE4 00000000 */ nop +/* 6F1DC4 80238CE4 00000000 */ nop /* 6F1DC8 80238CE8 468010A0 */ cvt.s.w $f2, $f2 /* 6F1DCC 80238CEC 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1DD0 80238CF0 00000000 */ nop +/* 6F1DD0 80238CF0 00000000 */ nop /* 6F1DD4 80238CF4 44830000 */ mtc1 $v1, $f0 -/* 6F1DD8 80238CF8 00000000 */ nop +/* 6F1DD8 80238CF8 00000000 */ nop /* 6F1DDC 80238CFC 46800020 */ cvt.s.w $f0, $f0 /* 6F1DE0 80238D00 46020001 */ sub.s $f0, $f0, $f2 .L80238D04: @@ -87,15 +87,15 @@ glabel func_80238BCC_6F1CAC /* 6F1DEC 80238D0C 8C820000 */ lw $v0, ($a0) /* 6F1DF0 80238D10 30428000 */ andi $v0, $v0, 0x8000 /* 6F1DF4 80238D14 1040000E */ beqz $v0, .L80238D50 -/* 6F1DF8 80238D18 00000000 */ nop +/* 6F1DF8 80238D18 00000000 */ nop /* 6F1DFC 80238D1C 90820191 */ lbu $v0, 0x191($a0) /* 6F1E00 80238D20 C4800188 */ lwc1 $f0, 0x188($a0) /* 6F1E04 80238D24 00021042 */ srl $v0, $v0, 1 /* 6F1E08 80238D28 44821000 */ mtc1 $v0, $f2 -/* 6F1E0C 80238D2C 00000000 */ nop +/* 6F1E0C 80238D2C 00000000 */ nop /* 6F1E10 80238D30 468010A0 */ cvt.s.w $f2, $f2 /* 6F1E14 80238D34 46001082 */ mul.s $f2, $f2, $f0 -/* 6F1E18 80238D38 00000000 */ nop +/* 6F1E18 80238D38 00000000 */ nop /* 6F1E1C 80238D3C C6000088 */ lwc1 $f0, 0x88($s0) /* 6F1E20 80238D40 46800020 */ cvt.s.w $f0, $f0 /* 6F1E24 80238D44 46020001 */ sub.s $f0, $f0, $f2 @@ -105,14 +105,14 @@ glabel func_80238BCC_6F1CAC /* 6F1E30 80238D50 90820191 */ lbu $v0, 0x191($a0) /* 6F1E34 80238D54 C4820188 */ lwc1 $f2, 0x188($a0) /* 6F1E38 80238D58 44820000 */ mtc1 $v0, $f0 -/* 6F1E3C 80238D5C 00000000 */ nop +/* 6F1E3C 80238D5C 00000000 */ nop /* 6F1E40 80238D60 46800020 */ cvt.s.w $f0, $f0 /* 6F1E44 80238D64 46020002 */ mul.s $f0, $f0, $f2 -/* 6F1E48 80238D68 00000000 */ nop +/* 6F1E48 80238D68 00000000 */ nop /* 6F1E4C 80238D6C 90850190 */ lbu $a1, 0x190($a0) /* 6F1E50 80238D70 4600010D */ trunc.w.s $f4, $f0 /* 6F1E54 80238D74 44032000 */ mfc1 $v1, $f4 -/* 6F1E58 80238D78 00000000 */ nop +/* 6F1E58 80238D78 00000000 */ nop /* 6F1E5C 80238D7C 0065102A */ slt $v0, $v1, $a1 /* 6F1E60 80238D80 54400001 */ bnel $v0, $zero, .L80238D88 /* 6F1E64 80238D84 00A0182D */ daddu $v1, $a1, $zero diff --git a/asm/nonmatchings/code_6F10E0/func_80238E74_6F1F54.s b/asm/nonmatchings/code_6F10E0/func_80238E74_6F1F54.s index cde40f5c3f..a007f4f194 100644 --- a/asm/nonmatchings/code_6F10E0/func_80238E74_6F1F54.s +++ b/asm/nonmatchings/code_6F10E0/func_80238E74_6F1F54.s @@ -15,7 +15,7 @@ glabel func_80238E74_6F1F54 /* 6F1F7C 80238E9C 10620006 */ beq $v1, $v0, .L80238EB8 /* 6F1F80 80238EA0 24020002 */ addiu $v0, $zero, 2 /* 6F1F84 80238EA4 0808E3B5 */ j .L80238ED4 -/* 6F1F88 80238EA8 00000000 */ nop +/* 6F1F88 80238EA8 00000000 */ nop .L80238EAC: /* 6F1F8C 80238EAC 24020088 */ addiu $v0, $zero, 0x88 /* 6F1F90 80238EB0 14620008 */ bne $v1, $v0, .L80238ED4 @@ -30,4 +30,4 @@ glabel func_80238E74_6F1F54 /* 6F1FB0 80238ED0 24020002 */ addiu $v0, $zero, 2 .L80238ED4: /* 6F1FB4 80238ED4 03E00008 */ jr $ra -/* 6F1FB8 80238ED8 00000000 */ nop +/* 6F1FB8 80238ED8 00000000 */ nop diff --git a/asm/nonmatchings/code_6F10E0/func_80238EDC_6F1FBC.s b/asm/nonmatchings/code_6F10E0/func_80238EDC_6F1FBC.s index 59a117c3ab..bbc8b7c895 100644 --- a/asm/nonmatchings/code_6F10E0/func_80238EDC_6F1FBC.s +++ b/asm/nonmatchings/code_6F10E0/func_80238EDC_6F1FBC.s @@ -29,13 +29,13 @@ glabel func_80238EDC_6F1FBC /* 6F2018 80238F38 10400005 */ beqz $v0, .L80238F50 /* 6F201C 80238F3C 24020086 */ addiu $v0, $zero, 0x86 /* 6F2020 80238F40 10620006 */ beq $v1, $v0, .L80238F5C -/* 6F2024 80238F44 00000000 */ nop +/* 6F2024 80238F44 00000000 */ nop /* 6F2028 80238F48 0808E3E1 */ j .L80238F84 -/* 6F202C 80238F4C 00000000 */ nop +/* 6F202C 80238F4C 00000000 */ nop .L80238F50: /* 6F2030 80238F50 24020088 */ addiu $v0, $zero, 0x88 /* 6F2034 80238F54 1462000B */ bne $v1, $v0, .L80238F84 -/* 6F2038 80238F58 00000000 */ nop +/* 6F2038 80238F58 00000000 */ nop .L80238F5C: /* 6F203C 80238F5C 90820220 */ lbu $v0, 0x220($a0) /* 6F2040 80238F60 24420002 */ addiu $v0, $v0, 2 @@ -63,15 +63,15 @@ glabel func_80238EDC_6F1FBC /* 6F2094 80238FB4 0040882D */ daddu $s1, $v0, $zero /* 6F2098 80238FB8 0240202D */ daddu $a0, $s2, $zero /* 6F209C 80238FBC 44901000 */ mtc1 $s0, $f2 -/* 6F20A0 80238FC0 00000000 */ nop +/* 6F20A0 80238FC0 00000000 */ nop /* 6F20A4 80238FC4 468010A0 */ cvt.s.w $f2, $f2 /* 6F20A8 80238FC8 44051000 */ mfc1 $a1, $f2 /* 6F20AC 80238FCC 44911000 */ mtc1 $s1, $f2 -/* 6F20B0 80238FD0 00000000 */ nop +/* 6F20B0 80238FD0 00000000 */ nop /* 6F20B4 80238FD4 468010A0 */ cvt.s.w $f2, $f2 /* 6F20B8 80238FD8 44061000 */ mfc1 $a2, $f2 /* 6F20BC 80238FDC 44821000 */ mtc1 $v0, $f2 -/* 6F20C0 80238FE0 00000000 */ nop +/* 6F20C0 80238FE0 00000000 */ nop /* 6F20C4 80238FE4 468010A0 */ cvt.s.w $f2, $f2 /* 6F20C8 80238FE8 3C013F80 */ lui $at, 0x3f80 /* 6F20CC 80238FEC 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_6F10E0/func_802390C8_6F21A8.s b/asm/nonmatchings/code_6F10E0/func_802390C8_6F21A8.s index 392762ae34..ff297ff1ca 100644 --- a/asm/nonmatchings/code_6F10E0/func_802390C8_6F21A8.s +++ b/asm/nonmatchings/code_6F10E0/func_802390C8_6F21A8.s @@ -29,15 +29,15 @@ glabel func_802390C8_6F21A8 /* 6F2208 80239128 0040802D */ daddu $s0, $v0, $zero /* 6F220C 8023912C 24040006 */ addiu $a0, $zero, 6 /* 6F2210 80239130 44931000 */ mtc1 $s3, $f2 -/* 6F2214 80239134 00000000 */ nop +/* 6F2214 80239134 00000000 */ nop /* 6F2218 80239138 468010A0 */ cvt.s.w $f2, $f2 /* 6F221C 8023913C 44051000 */ mfc1 $a1, $f2 /* 6F2220 80239140 44921000 */ mtc1 $s2, $f2 -/* 6F2224 80239144 00000000 */ nop +/* 6F2224 80239144 00000000 */ nop /* 6F2228 80239148 468010A0 */ cvt.s.w $f2, $f2 /* 6F222C 8023914C 44061000 */ mfc1 $a2, $f2 /* 6F2230 80239150 44901000 */ mtc1 $s0, $f2 -/* 6F2234 80239154 00000000 */ nop +/* 6F2234 80239154 00000000 */ nop /* 6F2238 80239158 468010A0 */ cvt.s.w $f2, $f2 /* 6F223C 8023915C 44071000 */ mfc1 $a3, $f2 /* 6F2240 80239160 2402002D */ addiu $v0, $zero, 0x2d diff --git a/asm/nonmatchings/code_6FAD10/func_80238000_6FAD10.s b/asm/nonmatchings/code_6FAD10/func_80238000_6FAD10.s index 5c1b207584..d1c339d6f1 100644 --- a/asm/nonmatchings/code_6FAD10/func_80238000_6FAD10.s +++ b/asm/nonmatchings/code_6FAD10/func_80238000_6FAD10.s @@ -25,14 +25,14 @@ glabel func_80238000_6FAD10 /* 6FAD60 80238050 0C0B1EAF */ jal get_variable /* 6FAD64 80238054 0040802D */ daddu $s0, $v0, $zero /* 6FAD68 80238058 4493A000 */ mtc1 $s3, $f20 -/* 6FAD6C 8023805C 00000000 */ nop +/* 6FAD6C 8023805C 00000000 */ nop /* 6FAD70 80238060 4680A520 */ cvt.s.w $f20, $f20 /* 6FAD74 80238064 0040902D */ daddu $s2, $v0, $zero /* 6FAD78 80238068 4492B000 */ mtc1 $s2, $f22 -/* 6FAD7C 8023806C 00000000 */ nop +/* 6FAD7C 8023806C 00000000 */ nop /* 6FAD80 80238070 4680B5A0 */ cvt.s.w $f22, $f22 /* 6FAD84 80238074 44900000 */ mtc1 $s0, $f0 -/* 6FAD88 80238078 00000000 */ nop +/* 6FAD88 80238078 00000000 */ nop /* 6FAD8C 8023807C 46800020 */ cvt.s.w $f0, $f0 /* 6FAD90 80238080 4405A000 */ mfc1 $a1, $f20 /* 6FAD94 80238084 4407B000 */ mfc1 $a3, $f22 @@ -47,21 +47,21 @@ glabel func_80238000_6FAD10 /* 6FADB8 802380A8 10400005 */ beqz $v0, .L802380C0 /* 6FADBC 802380AC 24020092 */ addiu $v0, $zero, 0x92 /* 6FADC0 802380B0 10620008 */ beq $v1, $v0, .L802380D4 -/* 6FADC4 802380B4 00000000 */ nop +/* 6FADC4 802380B4 00000000 */ nop /* 6FADC8 802380B8 0808E074 */ j .L802381D0 -/* 6FADCC 802380BC 00000000 */ nop +/* 6FADCC 802380BC 00000000 */ nop .L802380C0: /* 6FADD0 802380C0 24020094 */ addiu $v0, $zero, 0x94 /* 6FADD4 802380C4 1062002C */ beq $v1, $v0, .L80238178 -/* 6FADD8 802380C8 00000000 */ nop +/* 6FADD8 802380C8 00000000 */ nop /* 6FADDC 802380CC 0808E074 */ j .L802381D0 -/* 6FADE0 802380D0 00000000 */ nop +/* 6FADE0 802380D0 00000000 */ nop .L802380D4: /* 6FADE4 802380D4 8E2200AC */ lw $v0, 0xac($s1) /* 6FADE8 802380D8 18400009 */ blez $v0, .L80238100 /* 6FADEC 802380DC 26020014 */ addiu $v0, $s0, 0x14 /* 6FADF0 802380E0 44820000 */ mtc1 $v0, $f0 -/* 6FADF4 802380E4 00000000 */ nop +/* 6FADF4 802380E4 00000000 */ nop /* 6FADF8 802380E8 46800020 */ cvt.s.w $f0, $f0 /* 6FADFC 802380EC 4405A000 */ mfc1 $a1, $f20 /* 6FAE00 802380F0 4407B000 */ mfc1 $a3, $f22 @@ -70,7 +70,7 @@ glabel func_80238000_6FAD10 /* 6FAE0C 802380FC 24040001 */ addiu $a0, $zero, 1 .L80238100: /* 6FAE10 80238100 44820000 */ mtc1 $v0, $f0 -/* 6FAE14 80238104 00000000 */ nop +/* 6FAE14 80238104 00000000 */ nop /* 6FAE18 80238108 46800020 */ cvt.s.w $f0, $f0 /* 6FAE1C 8023810C 4405A000 */ mfc1 $a1, $f20 /* 6FAE20 80238110 4407B000 */ mfc1 $a3, $f22 @@ -82,7 +82,7 @@ glabel func_80238000_6FAD10 /* 6FAE34 80238124 18400009 */ blez $v0, .L8023814C /* 6FAE38 80238128 26020014 */ addiu $v0, $s0, 0x14 /* 6FAE3C 8023812C 44820000 */ mtc1 $v0, $f0 -/* 6FAE40 80238130 00000000 */ nop +/* 6FAE40 80238130 00000000 */ nop /* 6FAE44 80238134 46800020 */ cvt.s.w $f0, $f0 /* 6FAE48 80238138 4405A000 */ mfc1 $a1, $f20 /* 6FAE4C 8023813C 4407B000 */ mfc1 $a3, $f22 @@ -91,7 +91,7 @@ glabel func_80238000_6FAD10 /* 6FAE58 80238148 24040001 */ addiu $a0, $zero, 1 .L8023814C: /* 6FAE5C 8023814C 44820000 */ mtc1 $v0, $f0 -/* 6FAE60 80238150 00000000 */ nop +/* 6FAE60 80238150 00000000 */ nop /* 6FAE64 80238154 46800020 */ cvt.s.w $f0, $f0 /* 6FAE68 80238158 4405A000 */ mfc1 $a1, $f20 /* 6FAE6C 8023815C 4407B000 */ mfc1 $a3, $f22 @@ -99,7 +99,7 @@ glabel func_80238000_6FAD10 /* 6FAE74 80238164 0000202D */ daddu $a0, $zero, $zero .L80238168: /* 6FAE78 80238168 0C01C07C */ jal func_800701F0 -/* 6FAE7C 8023816C 00000000 */ nop +/* 6FAE7C 8023816C 00000000 */ nop /* 6FAE80 80238170 0808E085 */ j .L80238214 /* 6FAE84 80238174 24042017 */ addiu $a0, $zero, 0x2017 .L80238178: @@ -107,7 +107,7 @@ glabel func_80238000_6FAD10 /* 6FAE8C 8023817C 18400009 */ blez $v0, .L802381A4 /* 6FAE90 80238180 26020014 */ addiu $v0, $s0, 0x14 /* 6FAE94 80238184 44820000 */ mtc1 $v0, $f0 -/* 6FAE98 80238188 00000000 */ nop +/* 6FAE98 80238188 00000000 */ nop /* 6FAE9C 8023818C 46800020 */ cvt.s.w $f0, $f0 /* 6FAEA0 80238190 4405A000 */ mfc1 $a1, $f20 /* 6FAEA4 80238194 4407B000 */ mfc1 $a3, $f22 @@ -116,7 +116,7 @@ glabel func_80238000_6FAD10 /* 6FAEB0 802381A0 24040002 */ addiu $a0, $zero, 2 .L802381A4: /* 6FAEB4 802381A4 44820000 */ mtc1 $v0, $f0 -/* 6FAEB8 802381A8 00000000 */ nop +/* 6FAEB8 802381A8 00000000 */ nop /* 6FAEBC 802381AC 46800020 */ cvt.s.w $f0, $f0 /* 6FAEC0 802381B0 4405A000 */ mfc1 $a1, $f20 /* 6FAEC4 802381B4 4407B000 */ mfc1 $a3, $f22 @@ -124,31 +124,31 @@ glabel func_80238000_6FAD10 /* 6FAECC 802381BC 24040001 */ addiu $a0, $zero, 1 .L802381C0: /* 6FAED0 802381C0 0C01C07C */ jal func_800701F0 -/* 6FAED4 802381C4 00000000 */ nop +/* 6FAED4 802381C4 00000000 */ nop /* 6FAED8 802381C8 0808E085 */ j .L80238214 /* 6FAEDC 802381CC 24042017 */ addiu $a0, $zero, 0x2017 .L802381D0: /* 6FAEE0 802381D0 44930000 */ mtc1 $s3, $f0 -/* 6FAEE4 802381D4 00000000 */ nop +/* 6FAEE4 802381D4 00000000 */ nop /* 6FAEE8 802381D8 46800020 */ cvt.s.w $f0, $f0 /* 6FAEEC 802381DC 26020014 */ addiu $v0, $s0, 0x14 /* 6FAEF0 802381E0 44050000 */ mfc1 $a1, $f0 /* 6FAEF4 802381E4 44820000 */ mtc1 $v0, $f0 -/* 6FAEF8 802381E8 00000000 */ nop +/* 6FAEF8 802381E8 00000000 */ nop /* 6FAEFC 802381EC 46800020 */ cvt.s.w $f0, $f0 /* 6FAF00 802381F0 44060000 */ mfc1 $a2, $f0 /* 6FAF04 802381F4 44920000 */ mtc1 $s2, $f0 -/* 6FAF08 802381F8 00000000 */ nop +/* 6FAF08 802381F8 00000000 */ nop /* 6FAF0C 802381FC 46800020 */ cvt.s.w $f0, $f0 /* 6FAF10 80238200 44070000 */ mfc1 $a3, $f0 /* 6FAF14 80238204 0000202D */ daddu $a0, $zero, $zero .L80238208: /* 6FAF18 80238208 0C01C07C */ jal func_800701F0 -/* 6FAF1C 8023820C 00000000 */ nop +/* 6FAF1C 8023820C 00000000 */ nop /* 6FAF20 80238210 24042016 */ addiu $a0, $zero, 0x2016 .L80238214: /* 6FAF24 80238214 0C05272D */ jal play_sound -/* 6FAF28 80238218 00000000 */ nop +/* 6FAF28 80238218 00000000 */ nop /* 6FAF2C 8023821C 8FBF0020 */ lw $ra, 0x20($sp) /* 6FAF30 80238220 8FB3001C */ lw $s3, 0x1c($sp) /* 6FAF34 80238224 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_6FAD10/func_80238244_6FAF54.s b/asm/nonmatchings/code_6FAD10/func_80238244_6FAF54.s index 4adf00d6a1..04add46a90 100644 --- a/asm/nonmatchings/code_6FAD10/func_80238244_6FAF54.s +++ b/asm/nonmatchings/code_6FAD10/func_80238244_6FAF54.s @@ -24,9 +24,9 @@ glabel func_80238244_6FAF54 /* 6FAF9C 8023828C C602004C */ lwc1 $f2, 0x4c($s0) /* 6FAFA0 80238290 3C014080 */ lui $at, 0x4080 /* 6FAFA4 80238294 44810000 */ mtc1 $at, $f0 -/* 6FAFA8 80238298 00000000 */ nop +/* 6FAFA8 80238298 00000000 */ nop /* 6FAFAC 8023829C 4600103C */ c.lt.s $f2, $f0 -/* 6FAFB0 802382A0 00000000 */ nop +/* 6FAFB0 802382A0 00000000 */ nop /* 6FAFB4 802382A4 45000007 */ bc1f .L802382C4 /* 6FAFB8 802382A8 0000202D */ daddu $a0, $zero, $zero /* 6FAFBC 802382AC C6000054 */ lwc1 $f0, 0x54($s0) @@ -44,7 +44,7 @@ glabel func_80238244_6FAF54 /* 6FAFE8 802382D8 24040001 */ addiu $a0, $zero, 1 .L802382DC: /* 6FAFEC 802382DC 0C0990BC */ jal play_movement_dust_effects -/* 6FAFF0 802382E0 00000000 */ nop +/* 6FAFF0 802382E0 00000000 */ nop /* 6FAFF4 802382E4 C6200040 */ lwc1 $f0, 0x40($s1) /* 6FAFF8 802382E8 3C013FF8 */ lui $at, 0x3ff8 /* 6FAFFC 802382EC 44811800 */ mtc1 $at, $f3 @@ -65,7 +65,7 @@ glabel func_80238244_6FAF54 /* 6FB038 80238328 44801000 */ mtc1 $zero, $f2 /* 6FB03C 8023832C 46000021 */ cvt.d.s $f0, $f0 /* 6FB040 80238330 4622003C */ c.lt.d $f0, $f2 -/* 6FB044 80238334 00000000 */ nop +/* 6FB044 80238334 00000000 */ nop /* 6FB048 80238338 45010002 */ bc1t .L80238344 /* 6FB04C 8023833C 24020002 */ addiu $v0, $zero, 2 /* 6FB050 80238340 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_6FAD10/func_80238358_6FB068.s b/asm/nonmatchings/code_6FAD10/func_80238358_6FB068.s index 534a2cba0b..8de2cef08f 100644 --- a/asm/nonmatchings/code_6FAD10/func_80238358_6FB068.s +++ b/asm/nonmatchings/code_6FAD10/func_80238358_6FB068.s @@ -12,7 +12,7 @@ glabel func_80238358_6FB068 /* 6FB084 80238374 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) /* 6FB088 80238378 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) /* 6FB08C 8023837C 0C0B1EAF */ jal get_variable -/* 6FB090 80238380 00000000 */ nop +/* 6FB090 80238380 00000000 */ nop /* 6FB094 80238384 8E030008 */ lw $v1, 8($s0) /* 6FB098 80238388 0040282D */ daddu $a1, $v0, $zero /* 6FB09C 8023838C 90630006 */ lbu $v1, 6($v1) @@ -25,12 +25,12 @@ glabel func_80238358_6FB068 /* 6FB0B8 802383A8 10600007 */ beqz $v1, .L802383C8 /* 6FB0BC 802383AC 28A20064 */ slti $v0, $a1, 0x64 /* 6FB0C0 802383B0 0808E11C */ j .L80238470 -/* 6FB0C4 802383B4 00000000 */ nop +/* 6FB0C4 802383B4 00000000 */ nop .L802383B8: /* 6FB0C8 802383B8 1062001F */ beq $v1, $v0, .L80238438 /* 6FB0CC 802383BC 28A20064 */ slti $v0, $a1, 0x64 /* 6FB0D0 802383C0 0808E11C */ j .L80238470 -/* 6FB0D4 802383C4 00000000 */ nop +/* 6FB0D4 802383C4 00000000 */ nop .L802383C8: /* 6FB0D8 802383C8 28A20024 */ slti $v0, $a1, 0x24 /* 6FB0DC 802383CC 14400027 */ bnez $v0, .L8023846C diff --git a/asm/nonmatchings/code_6FAD10/func_8023849C_6FB1AC.s b/asm/nonmatchings/code_6FAD10/func_8023849C_6FB1AC.s index 5dfc42d66f..63672f379b 100644 --- a/asm/nonmatchings/code_6FAD10/func_8023849C_6FB1AC.s +++ b/asm/nonmatchings/code_6FAD10/func_8023849C_6FB1AC.s @@ -12,7 +12,7 @@ glabel func_8023849C_6FB1AC /* 6FB1C8 802384B8 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) /* 6FB1CC 802384BC 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) /* 6FB1D0 802384C0 0C0B1EAF */ jal get_variable -/* 6FB1D4 802384C4 00000000 */ nop +/* 6FB1D4 802384C4 00000000 */ nop /* 6FB1D8 802384C8 8E030008 */ lw $v1, 8($s0) /* 6FB1DC 802384CC 0040282D */ daddu $a1, $v0, $zero /* 6FB1E0 802384D0 90630006 */ lbu $v1, 6($v1) @@ -23,7 +23,7 @@ glabel func_8023849C_6FB1AC /* 6FB1F4 802384E4 10620011 */ beq $v1, $v0, .L8023852C /* 6FB1F8 802384E8 28A20064 */ slti $v0, $a1, 0x64 /* 6FB1FC 802384EC 0808E159 */ j .L80238564 -/* 6FB200 802384F0 00000000 */ nop +/* 6FB200 802384F0 00000000 */ nop .L802384F4: /* 6FB204 802384F4 28A20024 */ slti $v0, $a1, 0x24 /* 6FB208 802384F8 14400019 */ bnez $v0, .L80238560 diff --git a/asm/nonmatchings/code_6FAD10/func_80238590_6FB2A0.s b/asm/nonmatchings/code_6FAD10/func_80238590_6FB2A0.s index 114eb74972..158527a857 100644 --- a/asm/nonmatchings/code_6FAD10/func_80238590_6FB2A0.s +++ b/asm/nonmatchings/code_6FAD10/func_80238590_6FB2A0.s @@ -12,7 +12,7 @@ glabel func_80238590_6FB2A0 /* 6FB2BC 802385AC 3C10800E */ lui $s0, %hi(gBattleStatus+0xDC) /* 6FB2C0 802385B0 8E10C14C */ lw $s0, %lo(gBattleStatus+0xDC)($s0) /* 6FB2C4 802385B4 0C0B1EAF */ jal get_variable -/* 6FB2C8 802385B8 00000000 */ nop +/* 6FB2C8 802385B8 00000000 */ nop /* 6FB2CC 802385BC 8E030008 */ lw $v1, 8($s0) /* 6FB2D0 802385C0 0040282D */ daddu $a1, $v0, $zero /* 6FB2D4 802385C4 90630006 */ lbu $v1, 6($v1) @@ -47,5 +47,5 @@ glabel func_80238590_6FB2A0 /* 6FB33C 8023862C 24020002 */ addiu $v0, $zero, 2 /* 6FB340 80238630 03E00008 */ jr $ra /* 6FB344 80238634 27BD0020 */ addiu $sp, $sp, 0x20 -/* 6FB348 80238638 00000000 */ nop -/* 6FB34C 8023863C 00000000 */ nop +/* 6FB348 80238638 00000000 */ nop +/* 6FB34C 8023863C 00000000 */ nop diff --git a/asm/nonmatchings/code_6e40_len_500/render_curtains.s b/asm/nonmatchings/code_6e40_len_500/render_curtains.s index 57742f6699..7d1c437295 100644 --- a/asm/nonmatchings/code_6e40_len_500/render_curtains.s +++ b/asm/nonmatchings/code_6e40_len_500/render_curtains.s @@ -17,15 +17,15 @@ glabel render_curtains /* 6EB0 8002BAB0 F7B40080 */ sdc1 $f20, 0x80($sp) /* 6EB4 8002BAB4 C6440000 */ lwc1 $f4, ($s2) /* 6EB8 8002BAB8 46040032 */ c.eq.s $f0, $f4 -/* 6EBC 8002BABC 00000000 */ nop +/* 6EBC 8002BABC 00000000 */ nop /* 6EC0 8002BAC0 4501000B */ bc1t .L8002BAF0 -/* 6EC4 8002BAC4 00000000 */ nop +/* 6EC4 8002BAC4 00000000 */ nop /* 6EC8 8002BAC8 46040001 */ sub.s $f0, $f0, $f4 /* 6ECC 8002BACC 3C018009 */ lui $at, %hi(D_80097E00) /* 6ED0 8002BAD0 D4227E00 */ ldc1 $f2, %lo(D_80097E00)($at) /* 6ED4 8002BAD4 46000021 */ cvt.d.s $f0, $f0 /* 6ED8 8002BAD8 46220002 */ mul.d $f0, $f0, $f2 -/* 6EDC 8002BADC 00000000 */ nop +/* 6EDC 8002BADC 00000000 */ nop /* 6EE0 8002BAE0 460020A1 */ cvt.d.s $f2, $f4 /* 6EE4 8002BAE4 46201080 */ add.d $f2, $f2, $f0 /* 6EE8 8002BAE8 462010A0 */ cvt.s.d $f2, $f2 @@ -37,15 +37,15 @@ glabel render_curtains /* 6EFC 8002BAFC C420BA9C */ lwc1 $f0, %lo(gCurtainFadeGoal)($at) /* 6F00 8002BB00 C6640000 */ lwc1 $f4, ($s3) /* 6F04 8002BB04 46040032 */ c.eq.s $f0, $f4 -/* 6F08 8002BB08 00000000 */ nop +/* 6F08 8002BB08 00000000 */ nop /* 6F0C 8002BB0C 4501000B */ bc1t .L8002BB3C -/* 6F10 8002BB10 00000000 */ nop +/* 6F10 8002BB10 00000000 */ nop /* 6F14 8002BB14 46040001 */ sub.s $f0, $f0, $f4 /* 6F18 8002BB18 3C018009 */ lui $at, %hi(D_80097E08) /* 6F1C 8002BB1C D4227E08 */ ldc1 $f2, %lo(D_80097E08)($at) /* 6F20 8002BB20 46000021 */ cvt.d.s $f0, $f0 /* 6F24 8002BB24 46220002 */ mul.d $f0, $f0, $f2 -/* 6F28 8002BB28 00000000 */ nop +/* 6F28 8002BB28 00000000 */ nop /* 6F2C 8002BB2C 460020A1 */ cvt.d.s $f2, $f4 /* 6F30 8002BB30 46201080 */ add.d $f2, $f2, $f0 /* 6F34 8002BB34 462010A0 */ cvt.s.d $f2, $f2 @@ -56,7 +56,7 @@ glabel render_curtains /* 6F44 8002BB44 D4227E10 */ ldc1 $f2, %lo(D_80097E10)($at) /* 6F48 8002BB48 46000021 */ cvt.d.s $f0, $f0 /* 6F4C 8002BB4C 4622003C */ c.lt.d $f0, $f2 -/* 6F50 8002BB50 00000000 */ nop +/* 6F50 8002BB50 00000000 */ nop /* 6F54 8002BB54 45000087 */ bc1f .L8002BD74 /* 6F58 8002BB58 3C03FF10 */ lui $v1, 0xff10 /* 6F5C 8002BB5C 3463013F */ ori $v1, $v1, 0x13f @@ -121,7 +121,7 @@ glabel render_curtains /* 7048 8002BC48 AC640000 */ sw $a0, ($v1) /* 704C 8002BC4C 46200120 */ cvt.s.d $f4, $f0 /* 7050 8002BC50 4614203C */ c.lt.s $f4, $f20 -/* 7054 8002BC54 00000000 */ nop +/* 7054 8002BC54 00000000 */ nop /* 7058 8002BC58 45000002 */ bc1f .L8002BC64 /* 705C 8002BC5C AC700004 */ sw $s0, 4($v1) /* 7060 8002BC60 4600A106 */ mov.s $f4, $f20 @@ -132,7 +132,7 @@ glabel render_curtains /* 7070 8002BC70 44050000 */ mfc1 $a1, $f0 /* 7074 8002BC74 46002021 */ cvt.d.s $f0, $f4 /* 7078 8002BC78 46220002 */ mul.d $f0, $f0, $f2 -/* 707C 8002BC7C 00000000 */ nop +/* 707C 8002BC7C 00000000 */ nop /* 7080 8002BC80 27A40020 */ addiu $a0, $sp, 0x20 /* 7084 8002BC84 3C01C3A0 */ lui $at, 0xc3a0 /* 7088 8002BC88 44811000 */ mtc1 $at, $f2 @@ -175,7 +175,7 @@ glabel render_curtains /* 711C 8002BD1C AE220000 */ sw $v0, ($s1) /* 7120 8002BD20 24020040 */ addiu $v0, $zero, 0x40 /* 7124 8002BD24 46001082 */ mul.s $f2, $f2, $f0 -/* 7128 8002BD28 00000000 */ nop +/* 7128 8002BD28 00000000 */ nop /* 712C 8002BD2C ACA20014 */ sw $v0, 0x14($a1) /* 7130 8002BD30 24A20020 */ addiu $v0, $a1, 0x20 /* 7134 8002BD34 ACA40010 */ sw $a0, 0x10($a1) @@ -185,7 +185,7 @@ glabel render_curtains /* 7144 8002BD44 ACA0001C */ sw $zero, 0x1c($a1) /* 7148 8002BD48 4600018D */ trunc.w.s $f6, $f0 /* 714C 8002BD4C 44023000 */ mfc1 $v0, $f6 -/* 7150 8002BD50 00000000 */ nop +/* 7150 8002BD50 00000000 */ nop /* 7154 8002BD54 304200FF */ andi $v0, $v0, 0xff /* 7158 8002BD58 00021E00 */ sll $v1, $v0, 0x18 /* 715C 8002BD5C 00022400 */ sll $a0, $v0, 0x10 @@ -198,9 +198,9 @@ glabel render_curtains /* 7174 8002BD74 3C02800A */ lui $v0, %hi(gCurtainDrawCallback) /* 7178 8002BD78 8C42BAA0 */ lw $v0, %lo(gCurtainDrawCallback)($v0) /* 717C 8002BD7C 10400003 */ beqz $v0, .L8002BD8C -/* 7180 8002BD80 00000000 */ nop +/* 7180 8002BD80 00000000 */ nop /* 7184 8002BD84 0040F809 */ jalr $v0 -/* 7188 8002BD88 00000000 */ nop +/* 7188 8002BD88 00000000 */ nop .L8002BD8C: /* 718C 8002BD8C 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* 7190 8002BD90 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) @@ -208,25 +208,25 @@ glabel render_curtains /* 7198 8002BD98 90420073 */ lbu $v0, 0x73($v0) /* 719C 8002BD9C 30420001 */ andi $v0, $v0, 1 /* 71A0 8002BDA0 14400044 */ bnez $v0, .L8002BEB4 -/* 71A4 8002BDA4 00000000 */ nop +/* 71A4 8002BDA4 00000000 */ nop /* 71A8 8002BDA8 0C00CD4A */ jal get_game_mode -/* 71AC 8002BDAC 00000000 */ nop +/* 71AC 8002BDAC 00000000 */ nop /* 71B0 8002BDB0 00021400 */ sll $v0, $v0, 0x10 /* 71B4 8002BDB4 00021403 */ sra $v0, $v0, 0x10 /* 71B8 8002BDB8 24030010 */ addiu $v1, $zero, 0x10 /* 71BC 8002BDBC 1043000C */ beq $v0, $v1, .L8002BDF0 -/* 71C0 8002BDC0 00000000 */ nop +/* 71C0 8002BDC0 00000000 */ nop /* 71C4 8002BDC4 0C00CD4A */ jal get_game_mode -/* 71C8 8002BDC8 00000000 */ nop +/* 71C8 8002BDC8 00000000 */ nop /* 71CC 8002BDCC 00021400 */ sll $v0, $v0, 0x10 /* 71D0 8002BDD0 00021403 */ sra $v0, $v0, 0x10 /* 71D4 8002BDD4 24030002 */ addiu $v1, $zero, 2 /* 71D8 8002BDD8 10430005 */ beq $v0, $v1, .L8002BDF0 -/* 71DC 8002BDDC 00000000 */ nop +/* 71DC 8002BDDC 00000000 */ nop /* 71E0 8002BDE0 8E020000 */ lw $v0, ($s0) /* 71E4 8002BDE4 80420071 */ lb $v0, 0x71($v0) /* 71E8 8002BDE8 10400032 */ beqz $v0, .L8002BEB4 -/* 71EC 8002BDEC 00000000 */ nop +/* 71EC 8002BDEC 00000000 */ nop .L8002BDF0: /* 71F0 8002BDF0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 71F4 8002BDF4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) diff --git a/asm/nonmatchings/code_703AF0/func_80238000_703AF0.s b/asm/nonmatchings/code_703AF0/func_80238000_703AF0.s index 07b7577508..6a8d8c9ae8 100644 --- a/asm/nonmatchings/code_703AF0/func_80238000_703AF0.s +++ b/asm/nonmatchings/code_703AF0/func_80238000_703AF0.s @@ -57,13 +57,13 @@ glabel func_80238000_703AF0 /* 703BBC 802380CC 3C028024 */ lui $v0, %hi(D_8023C1BC) /* 703BC0 802380D0 8C42C1BC */ lw $v0, %lo(D_8023C1BC)($v0) /* 703BC4 802380D4 1040000C */ beqz $v0, .L80238108 -/* 703BC8 802380D8 00000000 */ nop +/* 703BC8 802380D8 00000000 */ nop /* 703BCC 802380DC 3C108024 */ lui $s0, %hi(D_8023C1C0) /* 703BD0 802380E0 2610C1C0 */ addiu $s0, $s0, %lo(D_8023C1C0) /* 703BD4 802380E4 8E020000 */ lw $v0, ($s0) /* 703BD8 802380E8 2442000F */ addiu $v0, $v0, 0xf /* 703BDC 802380EC 44826000 */ mtc1 $v0, $f12 -/* 703BE0 802380F0 00000000 */ nop +/* 703BE0 802380F0 00000000 */ nop /* 703BE4 802380F4 46806320 */ cvt.s.w $f12, $f12 /* 703BE8 802380F8 0C00A6C9 */ jal clamp_angle /* 703BEC 802380FC AE020000 */ sw $v0, ($s0) @@ -77,37 +77,37 @@ glabel func_80238000_703AF0 /* 703C08 80238118 C42CC1C0 */ lwc1 $f12, %lo(D_8023C1C0)($at) /* 703C0C 8023811C 46806320 */ cvt.s.w $f12, $f12 /* 703C10 80238120 46006302 */ mul.s $f12, $f12, $f0 -/* 703C14 80238124 00000000 */ nop +/* 703C14 80238124 00000000 */ nop /* 703C18 80238128 3C0143B4 */ lui $at, 0x43b4 /* 703C1C 8023812C 44810000 */ mtc1 $at, $f0 /* 703C20 80238130 0C00A85B */ jal sin_rad /* 703C24 80238134 46006303 */ div.s $f12, $f12, $f0 /* 703C28 80238138 3C014040 */ lui $at, 0x4040 /* 703C2C 8023813C 44811000 */ mtc1 $at, $f2 -/* 703C30 80238140 00000000 */ nop +/* 703C30 80238140 00000000 */ nop /* 703C34 80238144 46020002 */ mul.s $f0, $f0, $f2 -/* 703C38 80238148 00000000 */ nop +/* 703C38 80238148 00000000 */ nop /* 703C3C 8023814C 86420152 */ lh $v0, 0x152($s2) /* 703C40 80238150 3C014140 */ lui $at, 0x4140 /* 703C44 80238154 44812000 */ mtc1 $at, $f4 /* 703C48 80238158 44821000 */ mtc1 $v0, $f2 -/* 703C4C 8023815C 00000000 */ nop +/* 703C4C 8023815C 00000000 */ nop /* 703C50 80238160 468010A0 */ cvt.s.w $f2, $f2 /* 703C54 80238164 4600018D */ trunc.w.s $f6, $f0 /* 703C58 80238168 44033000 */ mfc1 $v1, $f6 -/* 703C5C 8023816C 00000000 */ nop +/* 703C5C 8023816C 00000000 */ nop /* 703C60 80238170 00031600 */ sll $v0, $v1, 0x18 /* 703C64 80238174 C6400148 */ lwc1 $f0, 0x148($s2) /* 703C68 80238178 00021603 */ sra $v0, $v0, 0x18 /* 703C6C 8023817C A243019A */ sb $v1, 0x19a($s2) /* 703C70 80238180 46020000 */ add.s $f0, $f0, $f2 /* 703C74 80238184 44821000 */ mtc1 $v0, $f2 -/* 703C78 80238188 00000000 */ nop +/* 703C78 80238188 00000000 */ nop /* 703C7C 8023818C 468010A0 */ cvt.s.w $f2, $f2 /* 703C80 80238190 86420150 */ lh $v0, 0x150($s2) /* 703C84 80238194 46020000 */ add.s $f0, $f0, $f2 /* 703C88 80238198 44821000 */ mtc1 $v0, $f2 -/* 703C8C 8023819C 00000000 */ nop +/* 703C8C 8023819C 00000000 */ nop /* 703C90 802381A0 468010A0 */ cvt.s.w $f2, $f2 /* 703C94 802381A4 8E620004 */ lw $v0, 4($s3) /* 703C98 802381A8 86430154 */ lh $v1, 0x154($s2) @@ -115,7 +115,7 @@ glabel func_80238000_703AF0 /* 703CA0 802381B0 46040580 */ add.s $f22, $f0, $f4 /* 703CA4 802381B4 C6400144 */ lwc1 $f0, 0x144($s2) /* 703CA8 802381B8 44832000 */ mtc1 $v1, $f4 -/* 703CAC 802381BC 00000000 */ nop +/* 703CAC 802381BC 00000000 */ nop /* 703CB0 802381C0 46802120 */ cvt.s.w $f4, $f4 /* 703CB4 802381C4 46020500 */ add.s $f20, $f0, $f2 /* 703CB8 802381C8 C640014C */ lwc1 $f0, 0x14c($s2) @@ -128,7 +128,7 @@ glabel func_80238000_703AF0 /* 703CD0 802381E0 3C028024 */ lui $v0, %hi(D_8023C1C4) /* 703CD4 802381E4 8C42C1C4 */ lw $v0, %lo(D_8023C1C4)($v0) /* 703CD8 802381E8 10400044 */ beqz $v0, .L802382FC -/* 703CDC 802381EC 00000000 */ nop +/* 703CDC 802381EC 00000000 */ nop /* 703CE0 802381F0 3C038024 */ lui $v1, %hi(D_8023C1C8) /* 703CE4 802381F4 8C63C1C8 */ lw $v1, %lo(D_8023C1C8)($v1) /* 703CE8 802381F8 10600005 */ beqz $v1, .L80238210 @@ -136,7 +136,7 @@ glabel func_80238000_703AF0 /* 703CF0 80238200 1062001D */ beq $v1, $v0, .L80238278 /* 703CF4 80238204 0000102D */ daddu $v0, $zero, $zero /* 703CF8 80238208 0808E0D2 */ j .L80238348 -/* 703CFC 8023820C 00000000 */ nop +/* 703CFC 8023820C 00000000 */ nop .L80238210: /* 703D00 80238210 3C108024 */ lui $s0, %hi(D_8023C1CC) /* 703D04 80238214 2610C1CC */ addiu $s0, $s0, %lo(D_8023C1CC) @@ -159,7 +159,7 @@ glabel func_80238000_703AF0 /* 703D44 80238254 2484C1D0 */ addiu $a0, $a0, %lo(D_8023C1D0) /* 703D48 80238258 8C830000 */ lw $v1, ($a0) /* 703D4C 8023825C 1060001F */ beqz $v1, .L802382DC -/* 703D50 80238260 00000000 */ nop +/* 703D50 80238260 00000000 */ nop /* 703D54 80238264 8C620000 */ lw $v0, ($v1) /* 703D58 80238268 AC800000 */ sw $zero, ($a0) /* 703D5C 8023826C 34420010 */ ori $v0, $v0, 0x10 @@ -170,7 +170,7 @@ glabel func_80238000_703AF0 /* 703D6C 8023827C 2484C1CC */ addiu $a0, $a0, %lo(D_8023C1CC) /* 703D70 80238280 8C830000 */ lw $v1, ($a0) /* 703D74 80238284 10600005 */ beqz $v1, .L8023829C -/* 703D78 80238288 00000000 */ nop +/* 703D78 80238288 00000000 */ nop /* 703D7C 8023828C 8C620000 */ lw $v0, ($v1) /* 703D80 80238290 AC800000 */ sw $zero, ($a0) /* 703D84 80238294 34420010 */ ori $v0, $v0, 0x10 @@ -206,7 +206,7 @@ glabel func_80238000_703AF0 /* 703DF0 80238300 2484C1CC */ addiu $a0, $a0, %lo(D_8023C1CC) /* 703DF4 80238304 8C830000 */ lw $v1, ($a0) /* 703DF8 80238308 10600005 */ beqz $v1, .L80238320 -/* 703DFC 8023830C 00000000 */ nop +/* 703DFC 8023830C 00000000 */ nop /* 703E00 80238310 8C620000 */ lw $v0, ($v1) /* 703E04 80238314 AC800000 */ sw $zero, ($a0) /* 703E08 80238318 34420010 */ ori $v0, $v0, 0x10 diff --git a/asm/nonmatchings/code_703AF0/func_80238370_703E60.s b/asm/nonmatchings/code_703AF0/func_80238370_703E60.s index 4482080492..c4a558d173 100644 --- a/asm/nonmatchings/code_703AF0/func_80238370_703E60.s +++ b/asm/nonmatchings/code_703AF0/func_80238370_703E60.s @@ -9,16 +9,16 @@ glabel func_80238370_703E60 /* 703E70 80238380 3C018024 */ lui $at, %hi(D_8023C1B8) /* 703E74 80238384 AC20C1B8 */ sw $zero, %lo(D_8023C1B8)($at) /* 703E78 80238388 10800003 */ beqz $a0, .L80238398 -/* 703E7C 8023838C 00000000 */ nop +/* 703E7C 8023838C 00000000 */ nop /* 703E80 80238390 0C016914 */ jal remove_effect -/* 703E84 80238394 00000000 */ nop +/* 703E84 80238394 00000000 */ nop .L80238398: /* 703E88 80238398 3C048024 */ lui $a0, %hi(D_8023C1D0) /* 703E8C 8023839C 8C84C1D0 */ lw $a0, %lo(D_8023C1D0)($a0) /* 703E90 802383A0 10800003 */ beqz $a0, .L802383B0 -/* 703E94 802383A4 00000000 */ nop +/* 703E94 802383A4 00000000 */ nop /* 703E98 802383A8 0C016914 */ jal remove_effect -/* 703E9C 802383AC 00000000 */ nop +/* 703E9C 802383AC 00000000 */ nop .L802383B0: /* 703EA0 802383B0 8FBF0010 */ lw $ra, 0x10($sp) /* 703EA4 802383B4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_703AF0/func_802384B0_703FA0.s b/asm/nonmatchings/code_703AF0/func_802384B0_703FA0.s index 7e5283e1e9..babae56513 100644 --- a/asm/nonmatchings/code_703AF0/func_802384B0_703FA0.s +++ b/asm/nonmatchings/code_703AF0/func_802384B0_703FA0.s @@ -23,15 +23,15 @@ glabel func_802384B0_703FA0 /* 703FE8 802384F8 0040802D */ daddu $s0, $v0, $zero /* 703FEC 802384FC 24040008 */ addiu $a0, $zero, 8 /* 703FF0 80238500 44921000 */ mtc1 $s2, $f2 -/* 703FF4 80238504 00000000 */ nop +/* 703FF4 80238504 00000000 */ nop /* 703FF8 80238508 468010A0 */ cvt.s.w $f2, $f2 /* 703FFC 8023850C 44051000 */ mfc1 $a1, $f2 /* 704000 80238510 44901000 */ mtc1 $s0, $f2 -/* 704004 80238514 00000000 */ nop +/* 704004 80238514 00000000 */ nop /* 704008 80238518 468010A0 */ cvt.s.w $f2, $f2 /* 70400C 8023851C 44061000 */ mfc1 $a2, $f2 /* 704010 80238520 44821000 */ mtc1 $v0, $f2 -/* 704014 80238524 00000000 */ nop +/* 704014 80238524 00000000 */ nop /* 704018 80238528 468010A0 */ cvt.s.w $f2, $f2 /* 70401C 8023852C 3C013FA6 */ lui $at, 0x3fa6 /* 704020 80238530 34216666 */ ori $at, $at, 0x6666 diff --git a/asm/nonmatchings/code_703AF0/func_8023859C_70408C.s b/asm/nonmatchings/code_703AF0/func_8023859C_70408C.s index f8eb755116..b052ca4ab8 100644 --- a/asm/nonmatchings/code_703AF0/func_8023859C_70408C.s +++ b/asm/nonmatchings/code_703AF0/func_8023859C_70408C.s @@ -23,15 +23,15 @@ glabel func_8023859C_70408C /* 7040D4 802385E4 0040802D */ daddu $s0, $v0, $zero /* 7040D8 802385E8 0000202D */ daddu $a0, $zero, $zero /* 7040DC 802385EC 44921000 */ mtc1 $s2, $f2 -/* 7040E0 802385F0 00000000 */ nop +/* 7040E0 802385F0 00000000 */ nop /* 7040E4 802385F4 468010A0 */ cvt.s.w $f2, $f2 /* 7040E8 802385F8 44051000 */ mfc1 $a1, $f2 /* 7040EC 802385FC 44901000 */ mtc1 $s0, $f2 -/* 7040F0 80238600 00000000 */ nop +/* 7040F0 80238600 00000000 */ nop /* 7040F4 80238604 468010A0 */ cvt.s.w $f2, $f2 /* 7040F8 80238608 44061000 */ mfc1 $a2, $f2 /* 7040FC 8023860C 44821000 */ mtc1 $v0, $f2 -/* 704100 80238610 00000000 */ nop +/* 704100 80238610 00000000 */ nop /* 704104 80238614 468010A0 */ cvt.s.w $f2, $f2 /* 704108 80238618 3C013F80 */ lui $at, 0x3f80 /* 70410C 8023861C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_703AF0/func_80238668_704158.s b/asm/nonmatchings/code_703AF0/func_80238668_704158.s index 4fe2a39903..f5fabab58f 100644 --- a/asm/nonmatchings/code_703AF0/func_80238668_704158.s +++ b/asm/nonmatchings/code_703AF0/func_80238668_704158.s @@ -13,19 +13,19 @@ glabel func_80238668_704158 /* 704178 80238688 84620150 */ lh $v0, 0x150($v1) /* 70417C 8023868C C4620144 */ lwc1 $f2, 0x144($v1) /* 704180 80238690 44820000 */ mtc1 $v0, $f0 -/* 704184 80238694 00000000 */ nop +/* 704184 80238694 00000000 */ nop /* 704188 80238698 46800020 */ cvt.s.w $f0, $f0 /* 70418C 8023869C 46001600 */ add.s $f24, $f2, $f0 /* 704190 802386A0 84620152 */ lh $v0, 0x152($v1) /* 704194 802386A4 C4620148 */ lwc1 $f2, 0x148($v1) /* 704198 802386A8 44820000 */ mtc1 $v0, $f0 -/* 70419C 802386AC 00000000 */ nop +/* 70419C 802386AC 00000000 */ nop /* 7041A0 802386B0 46800020 */ cvt.s.w $f0, $f0 /* 7041A4 802386B4 46001080 */ add.s $f2, $f2, $f0 /* 7041A8 802386B8 8062019A */ lb $v0, 0x19a($v1) /* 7041AC 802386BC 0080802D */ daddu $s0, $a0, $zero /* 7041B0 802386C0 44820000 */ mtc1 $v0, $f0 -/* 7041B4 802386C4 00000000 */ nop +/* 7041B4 802386C4 00000000 */ nop /* 7041B8 802386C8 46800020 */ cvt.s.w $f0, $f0 /* 7041BC 802386CC 46001080 */ add.s $f2, $f2, $f0 /* 7041C0 802386D0 3C014140 */ lui $at, 0x4140 @@ -33,7 +33,7 @@ glabel func_80238668_704158 /* 7041C8 802386D8 84620154 */ lh $v0, 0x154($v1) /* 7041CC 802386DC 46001580 */ add.s $f22, $f2, $f0 /* 7041D0 802386E0 44820000 */ mtc1 $v0, $f0 -/* 7041D4 802386E4 00000000 */ nop +/* 7041D4 802386E4 00000000 */ nop /* 7041D8 802386E8 46800020 */ cvt.s.w $f0, $f0 /* 7041DC 802386EC C462014C */ lwc1 $f2, 0x14c($v1) /* 7041E0 802386F0 8E02000C */ lw $v0, 0xc($s0) @@ -41,7 +41,7 @@ glabel func_80238668_704158 /* 7041E8 802386F8 46001500 */ add.s $f20, $f2, $f0 /* 7041EC 802386FC 8C450000 */ lw $a1, ($v0) /* 7041F0 80238700 0C0B1EAF */ jal get_variable -/* 7041F4 80238704 00000000 */ nop +/* 7041F4 80238704 00000000 */ nop /* 7041F8 80238708 4405C000 */ mfc1 $a1, $f24 /* 7041FC 8023870C 3C013F80 */ lui $at, 0x3f80 /* 704200 80238710 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_703AF0/func_80238810_704300.s b/asm/nonmatchings/code_703AF0/func_80238810_704300.s index 014225784e..364fb8a53d 100644 --- a/asm/nonmatchings/code_703AF0/func_80238810_704300.s +++ b/asm/nonmatchings/code_703AF0/func_80238810_704300.s @@ -28,16 +28,16 @@ glabel func_80238810_704300 /* 704358 80238868 50400005 */ beql $v0, $zero, .L80238880 /* 70435C 8023886C 24020002 */ addiu $v0, $zero, 2 /* 704360 80238870 10600009 */ beqz $v1, .L80238898 -/* 704364 80238874 00000000 */ nop +/* 704364 80238874 00000000 */ nop /* 704368 80238878 0808E2AA */ j .L80238AA8 -/* 70436C 8023887C 00000000 */ nop +/* 70436C 8023887C 00000000 */ nop .L80238880: /* 704370 80238880 1062005A */ beq $v1, $v0, .L802389EC /* 704374 80238884 24020003 */ addiu $v0, $zero, 3 /* 704378 80238888 10620084 */ beq $v1, $v0, .L80238A9C /* 70437C 8023888C 24020002 */ addiu $v0, $zero, 2 /* 704380 80238890 0808E2AA */ j .L80238AA8 -/* 704384 80238894 00000000 */ nop +/* 704384 80238894 00000000 */ nop .L80238898: /* 704388 80238898 8C850000 */ lw $a1, ($a0) /* 70438C 8023889C 0C0B1EAF */ jal get_variable @@ -84,12 +84,12 @@ glabel func_80238810_704300 /* 70442C 8023893C 3C0140C9 */ lui $at, 0x40c9 /* 704430 80238940 34210FD0 */ ori $at, $at, 0xfd0 /* 704434 80238944 44811000 */ mtc1 $at, $f2 -/* 704438 80238948 00000000 */ nop +/* 704438 80238948 00000000 */ nop /* 70443C 8023894C 46020002 */ mul.s $f0, $f0, $f2 -/* 704440 80238950 00000000 */ nop +/* 704440 80238950 00000000 */ nop /* 704444 80238954 3C0143B4 */ lui $at, 0x43b4 /* 704448 80238958 44811000 */ mtc1 $at, $f2 -/* 70444C 8023895C 00000000 */ nop +/* 70444C 8023895C 00000000 */ nop /* 704450 80238960 46020503 */ div.s $f20, $f0, $f2 /* 704454 80238964 0C00A85B */ jal sin_rad /* 704458 80238968 4600A306 */ mov.s $f12, $f20 @@ -98,10 +98,10 @@ glabel func_80238810_704300 /* 704464 80238974 4600A306 */ mov.s $f12, $f20 /* 704468 80238978 C6020058 */ lwc1 $f2, 0x58($s0) /* 70446C 8023897C 46161182 */ mul.s $f6, $f2, $f22 -/* 704470 80238980 00000000 */ nop +/* 704470 80238980 00000000 */ nop /* 704474 80238984 46001087 */ neg.s $f2, $f2 /* 704478 80238988 46001202 */ mul.s $f8, $f2, $f0 -/* 70447C 8023898C 00000000 */ nop +/* 70447C 8023898C 00000000 */ nop /* 704480 80238990 C6020050 */ lwc1 $f2, 0x50($s0) /* 704484 80238994 C6000048 */ lwc1 $f0, 0x48($s0) /* 704488 80238998 46001080 */ add.s $f2, $f2, $f0 @@ -130,12 +130,12 @@ glabel func_80238810_704300 /* 7044E0 802389F0 3C0140C9 */ lui $at, 0x40c9 /* 7044E4 802389F4 34210FD0 */ ori $at, $at, 0xfd0 /* 7044E8 802389F8 44811000 */ mtc1 $at, $f2 -/* 7044EC 802389FC 00000000 */ nop +/* 7044EC 802389FC 00000000 */ nop /* 7044F0 80238A00 46020002 */ mul.s $f0, $f0, $f2 -/* 7044F4 80238A04 00000000 */ nop +/* 7044F4 80238A04 00000000 */ nop /* 7044F8 80238A08 3C0143B4 */ lui $at, 0x43b4 /* 7044FC 80238A0C 44811000 */ mtc1 $at, $f2 -/* 704500 80238A10 00000000 */ nop +/* 704500 80238A10 00000000 */ nop /* 704504 80238A14 46020503 */ div.s $f20, $f0, $f2 /* 704508 80238A18 0C00A85B */ jal sin_rad /* 70450C 80238A1C 4600A306 */ mov.s $f12, $f20 @@ -144,10 +144,10 @@ glabel func_80238810_704300 /* 704518 80238A28 4600A306 */ mov.s $f12, $f20 /* 70451C 80238A2C C6020058 */ lwc1 $f2, 0x58($s0) /* 704520 80238A30 46161182 */ mul.s $f6, $f2, $f22 -/* 704524 80238A34 00000000 */ nop +/* 704524 80238A34 00000000 */ nop /* 704528 80238A38 46001087 */ neg.s $f2, $f2 /* 70452C 80238A3C 46001202 */ mul.s $f8, $f2, $f0 -/* 704530 80238A40 00000000 */ nop +/* 704530 80238A40 00000000 */ nop /* 704534 80238A44 C60C0054 */ lwc1 $f12, 0x54($s0) /* 704538 80238A48 C6000050 */ lwc1 $f0, 0x50($s0) /* 70453C 80238A4C 46006300 */ add.s $f12, $f12, $f0 @@ -161,9 +161,9 @@ glabel func_80238810_704300 /* 70455C 80238A6C E6000010 */ swc1 $f0, 0x10($s0) /* 704560 80238A70 3C014234 */ lui $at, 0x4234 /* 704564 80238A74 44811000 */ mtc1 $at, $f2 -/* 704568 80238A78 00000000 */ nop +/* 704568 80238A78 00000000 */ nop /* 70456C 80238A7C 4602003C */ c.lt.s $f0, $f2 -/* 704570 80238A80 00000000 */ nop +/* 704570 80238A80 00000000 */ nop /* 704574 80238A84 45000004 */ bc1f .L80238A98 /* 704578 80238A88 E6000054 */ swc1 $f0, 0x54($s0) /* 70457C 80238A8C 24020003 */ addiu $v0, $zero, 3 @@ -179,9 +179,9 @@ glabel func_80238810_704300 /* 704598 80238AA8 C6600048 */ lwc1 $f0, 0x48($s3) /* 70459C 80238AAC 3C014334 */ lui $at, 0x4334 /* 7045A0 80238AB0 44811000 */ mtc1 $at, $f2 -/* 7045A4 80238AB4 00000000 */ nop +/* 7045A4 80238AB4 00000000 */ nop /* 7045A8 80238AB8 4600103C */ c.lt.s $f2, $f0 -/* 7045AC 80238ABC 00000000 */ nop +/* 7045AC 80238ABC 00000000 */ nop /* 7045B0 80238AC0 45020002 */ bc1fl .L80238ACC /* 7045B4 80238AC4 E602018C */ swc1 $f2, 0x18c($s0) /* 7045B8 80238AC8 AE00018C */ sw $zero, 0x18c($s0) diff --git a/asm/nonmatchings/code_703AF0/func_80238B3C_70462C.s b/asm/nonmatchings/code_703AF0/func_80238B3C_70462C.s index 0bd20245cb..6711fe8a70 100644 --- a/asm/nonmatchings/code_703AF0/func_80238B3C_70462C.s +++ b/asm/nonmatchings/code_703AF0/func_80238B3C_70462C.s @@ -23,15 +23,15 @@ glabel func_80238B3C_70462C /* 704674 80238B84 0040802D */ daddu $s0, $v0, $zero /* 704678 80238B88 0000202D */ daddu $a0, $zero, $zero /* 70467C 80238B8C 44921000 */ mtc1 $s2, $f2 -/* 704680 80238B90 00000000 */ nop +/* 704680 80238B90 00000000 */ nop /* 704684 80238B94 468010A0 */ cvt.s.w $f2, $f2 /* 704688 80238B98 44051000 */ mfc1 $a1, $f2 /* 70468C 80238B9C 44901000 */ mtc1 $s0, $f2 -/* 704690 80238BA0 00000000 */ nop +/* 704690 80238BA0 00000000 */ nop /* 704694 80238BA4 468010A0 */ cvt.s.w $f2, $f2 /* 704698 80238BA8 44061000 */ mfc1 $a2, $f2 /* 70469C 80238BAC 44821000 */ mtc1 $v0, $f2 -/* 7046A0 80238BB0 00000000 */ nop +/* 7046A0 80238BB0 00000000 */ nop /* 7046A4 80238BB4 468010A0 */ cvt.s.w $f2, $f2 /* 7046A8 80238BB8 3C013F80 */ lui $at, 0x3f80 /* 7046AC 80238BBC 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_703AF0/func_80238C84_704774.s b/asm/nonmatchings/code_703AF0/func_80238C84_704774.s index 89bd086550..0e5db2657e 100644 --- a/asm/nonmatchings/code_703AF0/func_80238C84_704774.s +++ b/asm/nonmatchings/code_703AF0/func_80238C84_704774.s @@ -18,7 +18,7 @@ glabel func_80238C84_704774 /* 7047A4 80238CB4 1062003F */ beq $v1, $v0, .L80238DB4 /* 7047A8 80238CB8 0000102D */ daddu $v0, $zero, $zero /* 7047AC 80238CBC 0808E391 */ j .L80238E44 -/* 7047B0 80238CC0 00000000 */ nop +/* 7047B0 80238CC0 00000000 */ nop .L80238CC4: /* 7047B4 80238CC4 8E050000 */ lw $a1, ($s0) /* 7047B8 80238CC8 26100004 */ addiu $s0, $s0, 4 @@ -43,17 +43,17 @@ glabel func_80238C84_704774 /* 704804 80238D14 AE430078 */ sw $v1, 0x78($s2) /* 704808 80238D18 2403000A */ addiu $v1, $zero, 0xa /* 70480C 80238D1C 44911000 */ mtc1 $s1, $f2 -/* 704810 80238D20 00000000 */ nop +/* 704810 80238D20 00000000 */ nop /* 704814 80238D24 468010A0 */ cvt.s.w $f2, $f2 /* 704818 80238D28 44051000 */ mfc1 $a1, $f2 /* 70481C 80238D2C 44901000 */ mtc1 $s0, $f2 -/* 704820 80238D30 00000000 */ nop +/* 704820 80238D30 00000000 */ nop /* 704824 80238D34 468010A0 */ cvt.s.w $f2, $f2 /* 704828 80238D38 3C013F80 */ lui $at, 0x3f80 /* 70482C 80238D3C 44810000 */ mtc1 $at, $f0 /* 704830 80238D40 44061000 */ mfc1 $a2, $f2 /* 704834 80238D44 44821000 */ mtc1 $v0, $f2 -/* 704838 80238D48 00000000 */ nop +/* 704838 80238D48 00000000 */ nop /* 70483C 80238D4C 468010A0 */ cvt.s.w $f2, $f2 /* 704840 80238D50 AE43007C */ sw $v1, 0x7c($s2) /* 704844 80238D54 E7A00010 */ swc1 $f0, 0x10($sp) diff --git a/asm/nonmatchings/code_703AF0/func_80238E5C_70494C.s b/asm/nonmatchings/code_703AF0/func_80238E5C_70494C.s index c7cdf55c4b..6233755ebf 100644 --- a/asm/nonmatchings/code_703AF0/func_80238E5C_70494C.s +++ b/asm/nonmatchings/code_703AF0/func_80238E5C_70494C.s @@ -45,7 +45,7 @@ glabel func_80238E5C_70494C /* 7049E4 80238EF4 0000202D */ daddu $a0, $zero, $zero .L80238EF8: /* 7049E8 80238EF8 18800003 */ blez $a0, .L80238F08 -/* 7049EC 80238EFC 00000000 */ nop +/* 7049EC 80238EFC 00000000 */ nop /* 7049F0 80238F00 02649821 */ addu $s3, $s3, $a0 /* 7049F4 80238F04 26940001 */ addiu $s4, $s4, 1 .L80238F08: @@ -65,7 +65,7 @@ glabel func_80238E5C_70494C /* 704A24 80238F34 16810004 */ bne $s4, $at, .L80238F48 /* 704A28 80238F38 3C018000 */ lui $at, 0x8000 /* 704A2C 80238F3C 16610002 */ bne $s3, $at, .L80238F48 -/* 704A30 80238F40 00000000 */ nop +/* 704A30 80238F40 00000000 */ nop /* 704A34 80238F44 0006000D */ break 6 .L80238F48: /* 704A38 80238F48 00001012 */ mflo $v0 diff --git a/asm/nonmatchings/code_714CF0/func_80238028_714D18.s b/asm/nonmatchings/code_714CF0/func_80238028_714D18.s index d405d55d9a..a7bb037b43 100644 --- a/asm/nonmatchings/code_714CF0/func_80238028_714D18.s +++ b/asm/nonmatchings/code_714CF0/func_80238028_714D18.s @@ -14,7 +14,7 @@ glabel func_80238028_714D18 /* 714D3C 8023804C 0040882D */ daddu $s1, $v0, $zero /* 714D40 80238050 24630012 */ addiu $v1, $v1, 0x12 /* 714D44 80238054 44836000 */ mtc1 $v1, $f12 -/* 714D48 80238058 00000000 */ nop +/* 714D48 80238058 00000000 */ nop /* 714D4C 8023805C 46806320 */ cvt.s.w $f12, $f12 /* 714D50 80238060 0C00A6C9 */ jal clamp_angle /* 714D54 80238064 AE030000 */ sw $v1, ($s0) @@ -24,10 +24,10 @@ glabel func_80238028_714D18 /* 714D64 80238074 34210FD0 */ ori $at, $at, 0xfd0 /* 714D68 80238078 44810000 */ mtc1 $at, $f0 /* 714D6C 8023807C 44826000 */ mtc1 $v0, $f12 -/* 714D70 80238080 00000000 */ nop +/* 714D70 80238080 00000000 */ nop /* 714D74 80238084 46806320 */ cvt.s.w $f12, $f12 /* 714D78 80238088 46006302 */ mul.s $f12, $f12, $f0 -/* 714D7C 8023808C 00000000 */ nop +/* 714D7C 8023808C 00000000 */ nop /* 714D80 80238090 3C0143B4 */ lui $at, 0x43b4 /* 714D84 80238094 44810000 */ mtc1 $at, $f0 /* 714D88 80238098 AE020000 */ sw $v0, ($s0) @@ -36,7 +36,7 @@ glabel func_80238028_714D18 /* 714D94 802380A4 46000000 */ add.s $f0, $f0, $f0 /* 714D98 802380A8 4600008D */ trunc.w.s $f2, $f0 /* 714D9C 802380AC 44031000 */ mfc1 $v1, $f2 -/* 714DA0 802380B0 00000000 */ nop +/* 714DA0 802380B0 00000000 */ nop /* 714DA4 802380B4 A223019A */ sb $v1, 0x19a($s1) /* 714DA8 802380B8 8FBF0018 */ lw $ra, 0x18($sp) /* 714DAC 802380BC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_715850/func_802A1000_715850.s b/asm/nonmatchings/code_715850/func_802A1000_715850.s index b0fe5be554..bec9e437c9 100644 --- a/asm/nonmatchings/code_715850/func_802A1000_715850.s +++ b/asm/nonmatchings/code_715850/func_802A1000_715850.s @@ -29,7 +29,7 @@ glabel func_802A1000_715850 /* 7158B0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 7158B4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 7158B8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7158BC 802A106C 00000000 */ nop +/* 7158BC 802A106C 00000000 */ nop /* 7158C0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 7158C4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 7158C8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_715850 /* 715964 802A1114 24040001 */ addiu $a0, $zero, 1 /* 715968 802A1118 0212102A */ slt $v0, $s0, $s2 /* 71596C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 715970 802A1120 00000000 */ nop +/* 715970 802A1120 00000000 */ nop .L802A1124: /* 715974 802A1124 00101040 */ sll $v0, $s0, 1 /* 715978 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_715850 /* 7159BC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 7159C0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 7159C4 802A1174 0C050529 */ jal create_icon -/* 7159C8 802A1178 00000000 */ nop +/* 7159C8 802A1178 00000000 */ nop /* 7159CC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 7159D0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 7159D4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_715850/func_802A11D4_715A24.s b/asm/nonmatchings/code_715850/func_802A11D4_715A24.s index 3b39679796..6620a2255e 100644 --- a/asm/nonmatchings/code_715850/func_802A11D4_715A24.s +++ b/asm/nonmatchings/code_715850/func_802A11D4_715A24.s @@ -16,13 +16,13 @@ glabel func_802A11D4_715A24 /* 715A50 802A1200 0C099CAB */ jal heroes_is_ability_active /* 715A54 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 715A58 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 715A5C 802A120C 00000000 */ nop +/* 715A5C 802A120C 00000000 */ nop /* 715A60 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 715A64 802A1214 00000000 */ nop +/* 715A64 802A1214 00000000 */ nop /* 715A68 802A1218 3C04802A */ lui $a0, %hi(D_802A2410) /* 715A6C 802A121C 8C842410 */ lw $a0, %lo(D_802A2410)($a0) /* 715A70 802A1220 0C05123D */ jal free_icon -/* 715A74 802A1224 00000000 */ nop +/* 715A74 802A1224 00000000 */ nop .L802A1228: /* 715A78 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 715A7C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_715850/func_802A123C_715A8C.s b/asm/nonmatchings/code_715850/func_802A123C_715A8C.s index c8e1ff4f76..d33f15408e 100644 --- a/asm/nonmatchings/code_715850/func_802A123C_715A8C.s +++ b/asm/nonmatchings/code_715850/func_802A123C_715A8C.s @@ -27,15 +27,15 @@ glabel func_802A123C_715A8C /* 715AE4 802A1294 0040802D */ daddu $s0, $v0, $zero /* 715AE8 802A1298 0040182D */ daddu $v1, $v0, $zero /* 715AEC 802A129C 44930000 */ mtc1 $s3, $f0 -/* 715AF0 802A12A0 00000000 */ nop +/* 715AF0 802A12A0 00000000 */ nop /* 715AF4 802A12A4 46800020 */ cvt.s.w $f0, $f0 /* 715AF8 802A12A8 E4600008 */ swc1 $f0, 8($v1) /* 715AFC 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 715B00 802A12B0 00000000 */ nop +/* 715B00 802A12B0 00000000 */ nop /* 715B04 802A12B4 46800020 */ cvt.s.w $f0, $f0 /* 715B08 802A12B8 E460000C */ swc1 $f0, 0xc($v1) /* 715B0C 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 715B10 802A12C0 00000000 */ nop +/* 715B10 802A12C0 00000000 */ nop /* 715B14 802A12C4 46800020 */ cvt.s.w $f0, $f0 /* 715B18 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) /* 715B1C 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_715850/func_802A12EC_715B3C.s b/asm/nonmatchings/code_715850/func_802A12EC_715B3C.s index 9794d8daf2..5bfee63806 100644 --- a/asm/nonmatchings/code_715850/func_802A12EC_715B3C.s +++ b/asm/nonmatchings/code_715850/func_802A12EC_715B3C.s @@ -13,7 +13,7 @@ glabel func_802A12EC_715B3C /* 715B5C 802A130C 24020002 */ addiu $v0, $zero, 2 /* 715B60 802A1310 8CA50000 */ lw $a1, ($a1) /* 715B64 802A1314 0C0B1EAF */ jal get_variable -/* 715B68 802A1318 00000000 */ nop +/* 715B68 802A1318 00000000 */ nop /* 715B6C 802A131C 92030217 */ lbu $v1, 0x217($s0) /* 715B70 802A1320 00621823 */ subu $v1, $v1, $v0 /* 715B74 802A1324 A2030217 */ sb $v1, 0x217($s0) diff --git a/asm/nonmatchings/code_715850/func_802A1378_715BC8.s b/asm/nonmatchings/code_715850/func_802A1378_715BC8.s index 0a9b7c074e..5a7bbcbb61 100644 --- a/asm/nonmatchings/code_715850/func_802A1378_715BC8.s +++ b/asm/nonmatchings/code_715850/func_802A1378_715BC8.s @@ -28,15 +28,15 @@ glabel func_802A1378_715BC8 /* 715C24 802A13D4 0C0B1EAF */ jal get_variable /* 715C28 802A13D8 0040802D */ daddu $s0, $v0, $zero /* 715C2C 802A13DC 44930000 */ mtc1 $s3, $f0 -/* 715C30 802A13E0 00000000 */ nop +/* 715C30 802A13E0 00000000 */ nop /* 715C34 802A13E4 46800020 */ cvt.s.w $f0, $f0 /* 715C38 802A13E8 44050000 */ mfc1 $a1, $f0 /* 715C3C 802A13EC 44920000 */ mtc1 $s2, $f0 -/* 715C40 802A13F0 00000000 */ nop +/* 715C40 802A13F0 00000000 */ nop /* 715C44 802A13F4 46800020 */ cvt.s.w $f0, $f0 /* 715C48 802A13F8 44060000 */ mfc1 $a2, $f0 /* 715C4C 802A13FC 44900000 */ mtc1 $s0, $f0 -/* 715C50 802A1400 00000000 */ nop +/* 715C50 802A1400 00000000 */ nop /* 715C54 802A1404 46800020 */ cvt.s.w $f0, $f0 /* 715C58 802A1408 44070000 */ mfc1 $a3, $f0 /* 715C5C 802A140C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_715850/func_802A1438_715C88.s b/asm/nonmatchings/code_715850/func_802A1438_715C88.s index eb1d497a1e..4e7982ce37 100644 --- a/asm/nonmatchings/code_715850/func_802A1438_715C88.s +++ b/asm/nonmatchings/code_715850/func_802A1438_715C88.s @@ -28,15 +28,15 @@ glabel func_802A1438_715C88 /* 715CE4 802A1494 0C0B1EAF */ jal get_variable /* 715CE8 802A1498 0040802D */ daddu $s0, $v0, $zero /* 715CEC 802A149C 44930000 */ mtc1 $s3, $f0 -/* 715CF0 802A14A0 00000000 */ nop +/* 715CF0 802A14A0 00000000 */ nop /* 715CF4 802A14A4 46800020 */ cvt.s.w $f0, $f0 /* 715CF8 802A14A8 44050000 */ mfc1 $a1, $f0 /* 715CFC 802A14AC 44920000 */ mtc1 $s2, $f0 -/* 715D00 802A14B0 00000000 */ nop +/* 715D00 802A14B0 00000000 */ nop /* 715D04 802A14B4 46800020 */ cvt.s.w $f0, $f0 /* 715D08 802A14B8 44060000 */ mfc1 $a2, $f0 /* 715D0C 802A14BC 44900000 */ mtc1 $s0, $f0 -/* 715D10 802A14C0 00000000 */ nop +/* 715D10 802A14C0 00000000 */ nop /* 715D14 802A14C4 46800020 */ cvt.s.w $f0, $f0 /* 715D18 802A14C8 44070000 */ mfc1 $a3, $f0 /* 715D1C 802A14CC 24040001 */ addiu $a0, $zero, 1 diff --git a/asm/nonmatchings/code_716C60/func_802A1000_716C60.s b/asm/nonmatchings/code_716C60/func_802A1000_716C60.s index 30cb775a0c..1a86e63c83 100644 --- a/asm/nonmatchings/code_716C60/func_802A1000_716C60.s +++ b/asm/nonmatchings/code_716C60/func_802A1000_716C60.s @@ -29,7 +29,7 @@ glabel func_802A1000_716C60 /* 716CC0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 716CC4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 716CC8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 716CCC 802A106C 00000000 */ nop +/* 716CCC 802A106C 00000000 */ nop /* 716CD0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 716CD4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 716CD8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_716C60 /* 716D74 802A1114 24040001 */ addiu $a0, $zero, 1 /* 716D78 802A1118 0212102A */ slt $v0, $s0, $s2 /* 716D7C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 716D80 802A1120 00000000 */ nop +/* 716D80 802A1120 00000000 */ nop .L802A1124: /* 716D84 802A1124 00101040 */ sll $v0, $s0, 1 /* 716D88 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_716C60 /* 716DCC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 716DD0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 716DD4 802A1174 0C050529 */ jal create_icon -/* 716DD8 802A1178 00000000 */ nop +/* 716DD8 802A1178 00000000 */ nop /* 716DDC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 716DE0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 716DE4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_716C60/func_802A11D4_716E34.s b/asm/nonmatchings/code_716C60/func_802A11D4_716E34.s index ce64439ace..d81f0b632e 100644 --- a/asm/nonmatchings/code_716C60/func_802A11D4_716E34.s +++ b/asm/nonmatchings/code_716C60/func_802A11D4_716E34.s @@ -16,13 +16,13 @@ glabel func_802A11D4_716E34 /* 716E60 802A1200 0C099CAB */ jal heroes_is_ability_active /* 716E64 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 716E68 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 716E6C 802A120C 00000000 */ nop +/* 716E6C 802A120C 00000000 */ nop /* 716E70 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 716E74 802A1214 00000000 */ nop +/* 716E74 802A1214 00000000 */ nop /* 716E78 802A1218 3C04802A */ lui $a0, %hi(D_802A1D70) /* 716E7C 802A121C 8C841D70 */ lw $a0, %lo(D_802A1D70)($a0) /* 716E80 802A1220 0C05123D */ jal free_icon -/* 716E84 802A1224 00000000 */ nop +/* 716E84 802A1224 00000000 */ nop .L802A1228: /* 716E88 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 716E8C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_716C60/func_802A123C_716E9C.s b/asm/nonmatchings/code_716C60/func_802A123C_716E9C.s index a2cdab8e49..dbb9514e43 100644 --- a/asm/nonmatchings/code_716C60/func_802A123C_716E9C.s +++ b/asm/nonmatchings/code_716C60/func_802A123C_716E9C.s @@ -22,15 +22,15 @@ glabel func_802A123C_716E9C /* 716EE0 802A1280 0C0B1EAF */ jal get_variable /* 716EE4 802A1284 0040802D */ daddu $s0, $v0, $zero /* 716EE8 802A1288 44920000 */ mtc1 $s2, $f0 -/* 716EEC 802A128C 00000000 */ nop +/* 716EEC 802A128C 00000000 */ nop /* 716EF0 802A1290 46800020 */ cvt.s.w $f0, $f0 /* 716EF4 802A1294 44050000 */ mfc1 $a1, $f0 /* 716EF8 802A1298 44900000 */ mtc1 $s0, $f0 -/* 716EFC 802A129C 00000000 */ nop +/* 716EFC 802A129C 00000000 */ nop /* 716F00 802A12A0 46800020 */ cvt.s.w $f0, $f0 /* 716F04 802A12A4 44060000 */ mfc1 $a2, $f0 /* 716F08 802A12A8 44820000 */ mtc1 $v0, $f0 -/* 716F0C 802A12AC 00000000 */ nop +/* 716F0C 802A12AC 00000000 */ nop /* 716F10 802A12B0 46800020 */ cvt.s.w $f0, $f0 /* 716F14 802A12B4 44070000 */ mfc1 $a3, $f0 /* 716F18 802A12B8 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_716C60/func_802A1378_716FD8.s b/asm/nonmatchings/code_716C60/func_802A1378_716FD8.s index 4caac9fe08..6ca95ec0d7 100644 --- a/asm/nonmatchings/code_716C60/func_802A1378_716FD8.s +++ b/asm/nonmatchings/code_716C60/func_802A1378_716FD8.s @@ -37,5 +37,5 @@ glabel func_802A1378_716FD8 /* 71704C 802A13EC 8FB00010 */ lw $s0, 0x10($sp) /* 717050 802A13F0 03E00008 */ jr $ra /* 717054 802A13F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 717058 802A13F8 00000000 */ nop -/* 71705C 802A13FC 00000000 */ nop +/* 717058 802A13F8 00000000 */ nop +/* 71705C 802A13FC 00000000 */ nop diff --git a/asm/nonmatchings/code_723780/func_802A1000_723780.s b/asm/nonmatchings/code_723780/func_802A1000_723780.s index b525c56ecb..6a1411db6a 100644 --- a/asm/nonmatchings/code_723780/func_802A1000_723780.s +++ b/asm/nonmatchings/code_723780/func_802A1000_723780.s @@ -29,7 +29,7 @@ glabel func_802A1000_723780 /* 7237E0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 7237E4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 7237E8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 7237EC 802A106C 00000000 */ nop +/* 7237EC 802A106C 00000000 */ nop /* 7237F0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 7237F4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 7237F8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_723780 /* 723894 802A1114 24040001 */ addiu $a0, $zero, 1 /* 723898 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72389C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7238A0 802A1120 00000000 */ nop +/* 7238A0 802A1120 00000000 */ nop .L802A1124: /* 7238A4 802A1124 00101040 */ sll $v0, $s0, 1 /* 7238A8 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_723780 /* 7238EC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 7238F0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 7238F4 802A1174 0C050529 */ jal create_icon -/* 7238F8 802A1178 00000000 */ nop +/* 7238F8 802A1178 00000000 */ nop /* 7238FC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 723900 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 723904 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_723780/func_802A11D4_723954.s b/asm/nonmatchings/code_723780/func_802A11D4_723954.s index 8e7be3a767..d88655f519 100644 --- a/asm/nonmatchings/code_723780/func_802A11D4_723954.s +++ b/asm/nonmatchings/code_723780/func_802A11D4_723954.s @@ -16,13 +16,13 @@ glabel func_802A11D4_723954 /* 723980 802A1200 0C099CAB */ jal heroes_is_ability_active /* 723984 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 723988 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72398C 802A120C 00000000 */ nop +/* 72398C 802A120C 00000000 */ nop /* 723990 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 723994 802A1214 00000000 */ nop +/* 723994 802A1214 00000000 */ nop /* 723998 802A1218 3C04802A */ lui $a0, %hi(D_802A1AC0) /* 72399C 802A121C 8C841AC0 */ lw $a0, %lo(D_802A1AC0)($a0) /* 7239A0 802A1220 0C05123D */ jal free_icon -/* 7239A4 802A1224 00000000 */ nop +/* 7239A4 802A1224 00000000 */ nop .L802A1228: /* 7239A8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 7239AC 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_723780/func_802A123C_7239BC.s b/asm/nonmatchings/code_723780/func_802A123C_7239BC.s index ecbdfa082d..53c602e256 100644 --- a/asm/nonmatchings/code_723780/func_802A123C_7239BC.s +++ b/asm/nonmatchings/code_723780/func_802A123C_7239BC.s @@ -28,15 +28,15 @@ glabel func_802A123C_7239BC /* 723A18 802A1298 0C0B1EAF */ jal get_variable /* 723A1C 802A129C 0040802D */ daddu $s0, $v0, $zero /* 723A20 802A12A0 44930000 */ mtc1 $s3, $f0 -/* 723A24 802A12A4 00000000 */ nop +/* 723A24 802A12A4 00000000 */ nop /* 723A28 802A12A8 46800020 */ cvt.s.w $f0, $f0 /* 723A2C 802A12AC 44050000 */ mfc1 $a1, $f0 /* 723A30 802A12B0 44920000 */ mtc1 $s2, $f0 -/* 723A34 802A12B4 00000000 */ nop +/* 723A34 802A12B4 00000000 */ nop /* 723A38 802A12B8 46800020 */ cvt.s.w $f0, $f0 /* 723A3C 802A12BC 44060000 */ mfc1 $a2, $f0 /* 723A40 802A12C0 44900000 */ mtc1 $s0, $f0 -/* 723A44 802A12C4 00000000 */ nop +/* 723A44 802A12C4 00000000 */ nop /* 723A48 802A12C8 46800020 */ cvt.s.w $f0, $f0 /* 723A4C 802A12CC 44070000 */ mfc1 $a3, $f0 /* 723A50 802A12D0 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_724CE0/func_802A1000_724CE0.s b/asm/nonmatchings/code_724CE0/func_802A1000_724CE0.s index f73df82f1e..28aa9603c2 100644 --- a/asm/nonmatchings/code_724CE0/func_802A1000_724CE0.s +++ b/asm/nonmatchings/code_724CE0/func_802A1000_724CE0.s @@ -29,7 +29,7 @@ glabel func_802A1000_724CE0 /* 724D40 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 724D44 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 724D48 802A1068 44820000 */ mtc1 $v0, $f0 -/* 724D4C 802A106C 00000000 */ nop +/* 724D4C 802A106C 00000000 */ nop /* 724D50 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 724D54 802A1074 0C099CAB */ jal heroes_is_ability_active /* 724D58 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_724CE0 /* 724DF4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 724DF8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 724DFC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 724E00 802A1120 00000000 */ nop +/* 724E00 802A1120 00000000 */ nop .L802A1124: /* 724E04 802A1124 00101040 */ sll $v0, $s0, 1 /* 724E08 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_724CE0 /* 724E4C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 724E50 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 724E54 802A1174 0C050529 */ jal create_icon -/* 724E58 802A1178 00000000 */ nop +/* 724E58 802A1178 00000000 */ nop /* 724E5C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 724E60 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 724E64 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_724CE0/func_802A11D4_724EB4.s b/asm/nonmatchings/code_724CE0/func_802A11D4_724EB4.s index e1a4e561f4..81033fdbd5 100644 --- a/asm/nonmatchings/code_724CE0/func_802A11D4_724EB4.s +++ b/asm/nonmatchings/code_724CE0/func_802A11D4_724EB4.s @@ -16,13 +16,13 @@ glabel func_802A11D4_724EB4 /* 724EE0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 724EE4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 724EE8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 724EEC 802A120C 00000000 */ nop +/* 724EEC 802A120C 00000000 */ nop /* 724EF0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 724EF4 802A1214 00000000 */ nop +/* 724EF4 802A1214 00000000 */ nop /* 724EF8 802A1218 3C04802A */ lui $a0, %hi(D_802A2280) /* 724EFC 802A121C 8C842280 */ lw $a0, %lo(D_802A2280)($a0) /* 724F00 802A1220 0C05123D */ jal free_icon -/* 724F04 802A1224 00000000 */ nop +/* 724F04 802A1224 00000000 */ nop .L802A1228: /* 724F08 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 724F0C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_724CE0/func_802A123C_724F1C.s b/asm/nonmatchings/code_724CE0/func_802A123C_724F1C.s index 11cfe7484a..bc9b427a74 100644 --- a/asm/nonmatchings/code_724CE0/func_802A123C_724F1C.s +++ b/asm/nonmatchings/code_724CE0/func_802A123C_724F1C.s @@ -27,15 +27,15 @@ glabel func_802A123C_724F1C /* 724F74 802A1294 0040802D */ daddu $s0, $v0, $zero /* 724F78 802A1298 0040182D */ daddu $v1, $v0, $zero /* 724F7C 802A129C 44930000 */ mtc1 $s3, $f0 -/* 724F80 802A12A0 00000000 */ nop +/* 724F80 802A12A0 00000000 */ nop /* 724F84 802A12A4 46800020 */ cvt.s.w $f0, $f0 /* 724F88 802A12A8 E4600008 */ swc1 $f0, 8($v1) /* 724F8C 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 724F90 802A12B0 00000000 */ nop +/* 724F90 802A12B0 00000000 */ nop /* 724F94 802A12B4 46800020 */ cvt.s.w $f0, $f0 /* 724F98 802A12B8 E460000C */ swc1 $f0, 0xc($v1) /* 724F9C 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 724FA0 802A12C0 00000000 */ nop +/* 724FA0 802A12C0 00000000 */ nop /* 724FA4 802A12C4 46800020 */ cvt.s.w $f0, $f0 /* 724FA8 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) /* 724FAC 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_724CE0/func_802A12EC_724FCC.s b/asm/nonmatchings/code_724CE0/func_802A12EC_724FCC.s index ec78dffa35..63bbdbcd4d 100644 --- a/asm/nonmatchings/code_724CE0/func_802A12EC_724FCC.s +++ b/asm/nonmatchings/code_724CE0/func_802A12EC_724FCC.s @@ -13,7 +13,7 @@ glabel func_802A12EC_724FCC /* 724FEC 802A130C 24020002 */ addiu $v0, $zero, 2 /* 724FF0 802A1310 8CA50000 */ lw $a1, ($a1) /* 724FF4 802A1314 0C0B1EAF */ jal get_variable -/* 724FF8 802A1318 00000000 */ nop +/* 724FF8 802A1318 00000000 */ nop /* 724FFC 802A131C 92030217 */ lbu $v1, 0x217($s0) /* 725000 802A1320 00621823 */ subu $v1, $v1, $v0 /* 725004 802A1324 A2030217 */ sb $v1, 0x217($s0) diff --git a/asm/nonmatchings/code_724CE0/func_802A1378_725058.s b/asm/nonmatchings/code_724CE0/func_802A1378_725058.s index d628c4e927..511e8ebccd 100644 --- a/asm/nonmatchings/code_724CE0/func_802A1378_725058.s +++ b/asm/nonmatchings/code_724CE0/func_802A1378_725058.s @@ -23,13 +23,13 @@ glabel func_802A1378_725058 .L802A13C0: /* 7250A0 802A13C0 82020216 */ lb $v0, 0x216($s0) /* 7250A4 802A13C4 1040000C */ beqz $v0, .L802A13F8 -/* 7250A8 802A13C8 00000000 */ nop +/* 7250A8 802A13C8 00000000 */ nop /* 7250AC 802A13CC A2000217 */ sb $zero, 0x217($s0) /* 7250B0 802A13D0 12200006 */ beqz $s1, .L802A13EC /* 7250B4 802A13D4 A2000216 */ sb $zero, 0x216($s0) /* 7250B8 802A13D8 24020100 */ addiu $v0, $zero, 0x100 /* 7250BC 802A13DC 16220003 */ bne $s1, $v0, .L802A13EC -/* 7250C0 802A13E0 00000000 */ nop +/* 7250C0 802A13E0 00000000 */ nop /* 7250C4 802A13E4 0C09F7A0 */ jal dispatch_event_partner /* 7250C8 802A13E8 24040031 */ addiu $a0, $zero, 0x31 .L802A13EC: @@ -38,7 +38,7 @@ glabel func_802A1378_725058 /* 7250D4 802A13F4 AC40003C */ sw $zero, 0x3c($v0) .L802A13F8: /* 7250D8 802A13F8 0C099DDF */ jal func_8026777C -/* 7250DC 802A13FC 00000000 */ nop +/* 7250DC 802A13FC 00000000 */ nop /* 7250E0 802A1400 8FBF0018 */ lw $ra, 0x18($sp) /* 7250E4 802A1404 8FB10014 */ lw $s1, 0x14($sp) /* 7250E8 802A1408 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_724CE0/func_802A1418_7250F8.s b/asm/nonmatchings/code_724CE0/func_802A1418_7250F8.s index 8e164e689b..a2011bd42b 100644 --- a/asm/nonmatchings/code_724CE0/func_802A1418_7250F8.s +++ b/asm/nonmatchings/code_724CE0/func_802A1418_7250F8.s @@ -28,15 +28,15 @@ glabel func_802A1418_7250F8 /* 725154 802A1474 0C0B1EAF */ jal get_variable /* 725158 802A1478 0040802D */ daddu $s0, $v0, $zero /* 72515C 802A147C 44930000 */ mtc1 $s3, $f0 -/* 725160 802A1480 00000000 */ nop +/* 725160 802A1480 00000000 */ nop /* 725164 802A1484 46800020 */ cvt.s.w $f0, $f0 /* 725168 802A1488 44050000 */ mfc1 $a1, $f0 /* 72516C 802A148C 44920000 */ mtc1 $s2, $f0 -/* 725170 802A1490 00000000 */ nop +/* 725170 802A1490 00000000 */ nop /* 725174 802A1494 46800020 */ cvt.s.w $f0, $f0 /* 725178 802A1498 44060000 */ mfc1 $a2, $f0 /* 72517C 802A149C 44900000 */ mtc1 $s0, $f0 -/* 725180 802A14A0 00000000 */ nop +/* 725180 802A14A0 00000000 */ nop /* 725184 802A14A4 46800020 */ cvt.s.w $f0, $f0 /* 725188 802A14A8 44070000 */ mfc1 $a3, $f0 /* 72518C 802A14AC 24040001 */ addiu $a0, $zero, 1 diff --git a/asm/nonmatchings/code_724CE0/func_802A14D8_7251B8.s b/asm/nonmatchings/code_724CE0/func_802A14D8_7251B8.s index 5db4c01a7c..d61b02c6c3 100644 --- a/asm/nonmatchings/code_724CE0/func_802A14D8_7251B8.s +++ b/asm/nonmatchings/code_724CE0/func_802A14D8_7251B8.s @@ -24,4 +24,4 @@ glabel func_802A14D8_7251B8 /* 725200 802A1520 24020002 */ addiu $v0, $zero, 2 /* 725204 802A1524 03E00008 */ jr $ra /* 725208 802A1528 27BD0018 */ addiu $sp, $sp, 0x18 -/* 72520C 802A152C 00000000 */ nop +/* 72520C 802A152C 00000000 */ nop diff --git a/asm/nonmatchings/code_726DD0/func_802A1000_726DD0.s b/asm/nonmatchings/code_726DD0/func_802A1000_726DD0.s index 4819da162d..6a8d0df6b5 100644 --- a/asm/nonmatchings/code_726DD0/func_802A1000_726DD0.s +++ b/asm/nonmatchings/code_726DD0/func_802A1000_726DD0.s @@ -29,7 +29,7 @@ glabel func_802A1000_726DD0 /* 726E30 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 726E34 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 726E38 802A1068 44820000 */ mtc1 $v0, $f0 -/* 726E3C 802A106C 00000000 */ nop +/* 726E3C 802A106C 00000000 */ nop /* 726E40 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 726E44 802A1074 0C099CAB */ jal heroes_is_ability_active /* 726E48 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_726DD0 /* 726EE4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 726EE8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 726EEC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 726EF0 802A1120 00000000 */ nop +/* 726EF0 802A1120 00000000 */ nop .L802A1124: /* 726EF4 802A1124 00101040 */ sll $v0, $s0, 1 /* 726EF8 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_726DD0 /* 726F3C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 726F40 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 726F44 802A1174 0C050529 */ jal create_icon -/* 726F48 802A1178 00000000 */ nop +/* 726F48 802A1178 00000000 */ nop /* 726F4C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 726F50 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 726F54 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_726DD0/func_802A11D4_726FA4.s b/asm/nonmatchings/code_726DD0/func_802A11D4_726FA4.s index 116d3e2836..3601b9f2c3 100644 --- a/asm/nonmatchings/code_726DD0/func_802A11D4_726FA4.s +++ b/asm/nonmatchings/code_726DD0/func_802A11D4_726FA4.s @@ -16,13 +16,13 @@ glabel func_802A11D4_726FA4 /* 726FD0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 726FD4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 726FD8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 726FDC 802A120C 00000000 */ nop +/* 726FDC 802A120C 00000000 */ nop /* 726FE0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 726FE4 802A1214 00000000 */ nop +/* 726FE4 802A1214 00000000 */ nop /* 726FE8 802A1218 3C04802A */ lui $a0, %hi(D_802A1B40) /* 726FEC 802A121C 8C841B40 */ lw $a0, %lo(D_802A1B40)($a0) /* 726FF0 802A1220 0C05123D */ jal free_icon -/* 726FF4 802A1224 00000000 */ nop +/* 726FF4 802A1224 00000000 */ nop .L802A1228: /* 726FF8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 726FFC 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_727910/func_802A1000_727910.s b/asm/nonmatchings/code_727910/func_802A1000_727910.s index 2c2270274f..0302fbbe72 100644 --- a/asm/nonmatchings/code_727910/func_802A1000_727910.s +++ b/asm/nonmatchings/code_727910/func_802A1000_727910.s @@ -29,7 +29,7 @@ glabel func_802A1000_727910 /* 727970 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 727974 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 727978 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72797C 802A106C 00000000 */ nop +/* 72797C 802A106C 00000000 */ nop /* 727980 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 727984 802A1074 0C099CAB */ jal heroes_is_ability_active /* 727988 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_727910 /* 727A24 802A1114 24040001 */ addiu $a0, $zero, 1 /* 727A28 802A1118 0212102A */ slt $v0, $s0, $s2 /* 727A2C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 727A30 802A1120 00000000 */ nop +/* 727A30 802A1120 00000000 */ nop .L802A1124: /* 727A34 802A1124 00101040 */ sll $v0, $s0, 1 /* 727A38 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_727910 /* 727A7C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 727A80 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 727A84 802A1174 0C050529 */ jal create_icon -/* 727A88 802A1178 00000000 */ nop +/* 727A88 802A1178 00000000 */ nop /* 727A8C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 727A90 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 727A94 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_727910/func_802A11D4_727AE4.s b/asm/nonmatchings/code_727910/func_802A11D4_727AE4.s index 8836da0aa6..6676bd056e 100644 --- a/asm/nonmatchings/code_727910/func_802A11D4_727AE4.s +++ b/asm/nonmatchings/code_727910/func_802A11D4_727AE4.s @@ -16,13 +16,13 @@ glabel func_802A11D4_727AE4 /* 727B10 802A1200 0C099CAB */ jal heroes_is_ability_active /* 727B14 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 727B18 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 727B1C 802A120C 00000000 */ nop +/* 727B1C 802A120C 00000000 */ nop /* 727B20 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 727B24 802A1214 00000000 */ nop +/* 727B24 802A1214 00000000 */ nop /* 727B28 802A1218 3C04802A */ lui $a0, %hi(D_802A1CD4) /* 727B2C 802A121C 8C841CD4 */ lw $a0, %lo(D_802A1CD4)($a0) /* 727B30 802A1220 0C05123D */ jal free_icon -/* 727B34 802A1224 00000000 */ nop +/* 727B34 802A1224 00000000 */ nop .L802A1228: /* 727B38 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 727B3C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_727910/func_802A1270_727B80.s b/asm/nonmatchings/code_727910/func_802A1270_727B80.s index 115f1b0be2..6dd40d4f9a 100644 --- a/asm/nonmatchings/code_727910/func_802A1270_727B80.s +++ b/asm/nonmatchings/code_727910/func_802A1270_727B80.s @@ -18,7 +18,7 @@ glabel func_802A1270_727B80 /* 727BB0 802A12A0 10620010 */ beq $v1, $v0, .L802A12E4 /* 727BB4 802A12A4 0000102D */ daddu $v0, $zero, $zero /* 727BB8 802A12A8 080A84EF */ j .L802A13BC -/* 727BBC 802A12AC 00000000 */ nop +/* 727BBC 802A12AC 00000000 */ nop .L802A12B0: /* 727BC0 802A12B0 24042033 */ addiu $a0, $zero, 0x2033 /* 727BC4 802A12B4 AE000074 */ sw $zero, 0x74($s0) @@ -54,10 +54,10 @@ glabel func_802A1270_727B80 /* 727C38 802A1328 44810000 */ mtc1 $at, $f0 /* 727C3C 802A132C 2442005A */ addiu $v0, $v0, 0x5a /* 727C40 802A1330 44826000 */ mtc1 $v0, $f12 -/* 727C44 802A1334 00000000 */ nop +/* 727C44 802A1334 00000000 */ nop /* 727C48 802A1338 46806320 */ cvt.s.w $f12, $f12 /* 727C4C 802A133C 46006302 */ mul.s $f12, $f12, $f0 -/* 727C50 802A1340 00000000 */ nop +/* 727C50 802A1340 00000000 */ nop /* 727C54 802A1344 3C0143B4 */ lui $at, 0x43b4 /* 727C58 802A1348 44810000 */ mtc1 $at, $f0 /* 727C5C 802A134C 0C00A85B */ jal sin_rad @@ -70,7 +70,7 @@ glabel func_802A1270_727B80 /* 727C78 802A1368 3C01802A */ lui $at, %hi(D_802A1CC0) /* 727C7C 802A136C D4201CC0 */ ldc1 $f0, %lo(D_802A1CC0)($at) /* 727C80 802A1370 46201082 */ mul.d $f2, $f2, $f0 -/* 727C84 802A1374 00000000 */ nop +/* 727C84 802A1374 00000000 */ nop /* 727C88 802A1378 8E020078 */ lw $v0, 0x78($s0) /* 727C8C 802A137C 24420001 */ addiu $v0, $v0, 1 /* 727C90 802A1380 46221080 */ add.d $f2, $f2, $f2 diff --git a/asm/nonmatchings/code_72DB70/func_802A1000_72DB70.s b/asm/nonmatchings/code_72DB70/func_802A1000_72DB70.s index 5ed296ffe4..6631454944 100644 --- a/asm/nonmatchings/code_72DB70/func_802A1000_72DB70.s +++ b/asm/nonmatchings/code_72DB70/func_802A1000_72DB70.s @@ -29,7 +29,7 @@ glabel func_802A1000_72DB70 /* 72DBD0 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 72DBD4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 72DBD8 802A1068 44820000 */ mtc1 $v0, $f0 -/* 72DBDC 802A106C 00000000 */ nop +/* 72DBDC 802A106C 00000000 */ nop /* 72DBE0 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 72DBE4 802A1074 0C099CAB */ jal heroes_is_ability_active /* 72DBE8 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_72DB70 /* 72DC84 802A1114 24040001 */ addiu $a0, $zero, 1 /* 72DC88 802A1118 0212102A */ slt $v0, $s0, $s2 /* 72DC8C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 72DC90 802A1120 00000000 */ nop +/* 72DC90 802A1120 00000000 */ nop .L802A1124: /* 72DC94 802A1124 00101040 */ sll $v0, $s0, 1 /* 72DC98 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_72DB70 /* 72DCDC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 72DCE0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 72DCE4 802A1174 0C050529 */ jal create_icon -/* 72DCE8 802A1178 00000000 */ nop +/* 72DCE8 802A1178 00000000 */ nop /* 72DCEC 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 72DCF0 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 72DCF4 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_72DB70/func_802A11D4_72DD44.s b/asm/nonmatchings/code_72DB70/func_802A11D4_72DD44.s index d96a09773e..cdafccd5e4 100644 --- a/asm/nonmatchings/code_72DB70/func_802A11D4_72DD44.s +++ b/asm/nonmatchings/code_72DB70/func_802A11D4_72DD44.s @@ -16,13 +16,13 @@ glabel func_802A11D4_72DD44 /* 72DD70 802A1200 0C099CAB */ jal heroes_is_ability_active /* 72DD74 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 72DD78 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 72DD7C 802A120C 00000000 */ nop +/* 72DD7C 802A120C 00000000 */ nop /* 72DD80 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 72DD84 802A1214 00000000 */ nop +/* 72DD84 802A1214 00000000 */ nop /* 72DD88 802A1218 3C04802A */ lui $a0, %hi(D_802A19C0) /* 72DD8C 802A121C 8C8419C0 */ lw $a0, %lo(D_802A19C0)($a0) /* 72DD90 802A1220 0C05123D */ jal free_icon -/* 72DD94 802A1224 00000000 */ nop +/* 72DD94 802A1224 00000000 */ nop .L802A1228: /* 72DD98 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 72DD9C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_731300/func_802A1000_731300.s b/asm/nonmatchings/code_731300/func_802A1000_731300.s index 6c1561f7ea..0457c82353 100644 --- a/asm/nonmatchings/code_731300/func_802A1000_731300.s +++ b/asm/nonmatchings/code_731300/func_802A1000_731300.s @@ -29,7 +29,7 @@ glabel func_802A1000_731300 /* 731360 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 731364 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 731368 802A1068 44820000 */ mtc1 $v0, $f0 -/* 73136C 802A106C 00000000 */ nop +/* 73136C 802A106C 00000000 */ nop /* 731370 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 731374 802A1074 0C099CAB */ jal heroes_is_ability_active /* 731378 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_731300 /* 731414 802A1114 24040001 */ addiu $a0, $zero, 1 /* 731418 802A1118 0212102A */ slt $v0, $s0, $s2 /* 73141C 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 731420 802A1120 00000000 */ nop +/* 731420 802A1120 00000000 */ nop .L802A1124: /* 731424 802A1124 00101040 */ sll $v0, $s0, 1 /* 731428 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_731300 /* 73146C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 731470 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 731474 802A1174 0C050529 */ jal create_icon -/* 731478 802A1178 00000000 */ nop +/* 731478 802A1178 00000000 */ nop /* 73147C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 731480 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 731484 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_731300/func_802A11D4_7314D4.s b/asm/nonmatchings/code_731300/func_802A11D4_7314D4.s index f2d74a459e..b24928173d 100644 --- a/asm/nonmatchings/code_731300/func_802A11D4_7314D4.s +++ b/asm/nonmatchings/code_731300/func_802A11D4_7314D4.s @@ -16,13 +16,13 @@ glabel func_802A11D4_7314D4 /* 731500 802A1200 0C099CAB */ jal heroes_is_ability_active /* 731504 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 731508 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 73150C 802A120C 00000000 */ nop +/* 73150C 802A120C 00000000 */ nop /* 731510 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 731514 802A1214 00000000 */ nop +/* 731514 802A1214 00000000 */ nop /* 731518 802A1218 3C04802A */ lui $a0, %hi(D_802A2DD0) /* 73151C 802A121C 8C842DD0 */ lw $a0, %lo(D_802A2DD0)($a0) /* 731520 802A1220 0C05123D */ jal free_icon -/* 731524 802A1224 00000000 */ nop +/* 731524 802A1224 00000000 */ nop .L802A1228: /* 731528 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 73152C 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_731300/func_802A13E4_7316E4.s b/asm/nonmatchings/code_731300/func_802A13E4_7316E4.s index ea3918afe1..2e8630e7cc 100644 --- a/asm/nonmatchings/code_731300/func_802A13E4_7316E4.s +++ b/asm/nonmatchings/code_731300/func_802A13E4_7316E4.s @@ -22,7 +22,7 @@ glabel func_802A13E4_7316E4 /* 731724 802A1424 00220821 */ addu $at, $at, $v0 /* 731728 802A1428 8C222DB0 */ lw $v0, %lo(D_802A2DB0)($at) /* 73172C 802A142C 00400008 */ jr $v0 -/* 731730 802A1430 00000000 */ nop +/* 731730 802A1430 00000000 */ nop /* 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 @@ -125,7 +125,7 @@ glabel func_802A13E4_7316E4 /* 7318B0 802A15B0 00621823 */ subu $v1, $v1, $v0 /* 7318B4 802A15B4 2863000D */ slti $v1, $v1, 0xd /* 7318B8 802A15B8 10600008 */ beqz $v1, .L802A15DC -/* 7318BC 802A15BC 00000000 */ nop +/* 7318BC 802A15BC 00000000 */ nop /* 7318C0 802A15C0 0C00A67F */ jal rand_int /* 7318C4 802A15C4 24040064 */ addiu $a0, $zero, 0x64 /* 7318C8 802A15C8 28420050 */ slti $v0, $v0, 0x50 @@ -277,7 +277,7 @@ glabel func_802A13E4_7316E4 /* 731AE8 802A17E8 1440FFFA */ bnez $v0, .L802A17D4 /* 731AEC 802A17EC 24020002 */ addiu $v0, $zero, 2 /* 731AF0 802A17F0 080A85FF */ j .L802A17FC -/* 731AF4 802A17F4 00000000 */ nop +/* 731AF4 802A17F4 00000000 */ nop .L802A17F8: /* 731AF8 802A17F8 0000102D */ daddu $v0, $zero, $zero .L802A17FC: diff --git a/asm/nonmatchings/code_731300/func_802A1818_731B18.s b/asm/nonmatchings/code_731300/func_802A1818_731B18.s index 189c66e261..eb707c90d2 100644 --- a/asm/nonmatchings/code_731300/func_802A1818_731B18.s +++ b/asm/nonmatchings/code_731300/func_802A1818_731B18.s @@ -28,15 +28,15 @@ glabel func_802A1818_731B18 /* 731B74 802A1874 0C0B1EAF */ jal get_variable /* 731B78 802A1878 0040802D */ daddu $s0, $v0, $zero /* 731B7C 802A187C 44930000 */ mtc1 $s3, $f0 -/* 731B80 802A1880 00000000 */ nop +/* 731B80 802A1880 00000000 */ nop /* 731B84 802A1884 46800020 */ cvt.s.w $f0, $f0 /* 731B88 802A1888 44050000 */ mfc1 $a1, $f0 /* 731B8C 802A188C 44920000 */ mtc1 $s2, $f0 -/* 731B90 802A1890 00000000 */ nop +/* 731B90 802A1890 00000000 */ nop /* 731B94 802A1894 46800020 */ cvt.s.w $f0, $f0 /* 731B98 802A1898 44060000 */ mfc1 $a2, $f0 /* 731B9C 802A189C 44900000 */ mtc1 $s0, $f0 -/* 731BA0 802A18A0 00000000 */ nop +/* 731BA0 802A18A0 00000000 */ nop /* 731BA4 802A18A4 46800020 */ cvt.s.w $f0, $f0 /* 731BA8 802A18A8 44070000 */ mfc1 $a3, $f0 /* 731BAC 802A18AC 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_731300/func_802A18D8_731BD8.s b/asm/nonmatchings/code_731300/func_802A18D8_731BD8.s index 6794780868..352c2c3c98 100644 --- a/asm/nonmatchings/code_731300/func_802A18D8_731BD8.s +++ b/asm/nonmatchings/code_731300/func_802A18D8_731BD8.s @@ -28,15 +28,15 @@ glabel func_802A18D8_731BD8 /* 731C34 802A1934 0C0B1EAF */ jal get_variable /* 731C38 802A1938 0040802D */ daddu $s0, $v0, $zero /* 731C3C 802A193C 44930000 */ mtc1 $s3, $f0 -/* 731C40 802A1940 00000000 */ nop +/* 731C40 802A1940 00000000 */ nop /* 731C44 802A1944 46800020 */ cvt.s.w $f0, $f0 /* 731C48 802A1948 44050000 */ mfc1 $a1, $f0 /* 731C4C 802A194C 44920000 */ mtc1 $s2, $f0 -/* 731C50 802A1950 00000000 */ nop +/* 731C50 802A1950 00000000 */ nop /* 731C54 802A1954 46800020 */ cvt.s.w $f0, $f0 /* 731C58 802A1958 44060000 */ mfc1 $a2, $f0 /* 731C5C 802A195C 44900000 */ mtc1 $s0, $f0 -/* 731C60 802A1960 00000000 */ nop +/* 731C60 802A1960 00000000 */ nop /* 731C64 802A1964 46800020 */ cvt.s.w $f0, $f0 /* 731C68 802A1968 44070000 */ mfc1 $a3, $f0 /* 731C6C 802A196C 24040001 */ addiu $a0, $zero, 1 diff --git a/asm/nonmatchings/code_7330D0/func_802A1000_7330D0.s b/asm/nonmatchings/code_7330D0/func_802A1000_7330D0.s index 1104ad5b60..f1233496bc 100644 --- a/asm/nonmatchings/code_7330D0/func_802A1000_7330D0.s +++ b/asm/nonmatchings/code_7330D0/func_802A1000_7330D0.s @@ -29,7 +29,7 @@ glabel func_802A1000_7330D0 /* 733130 802A1060 92620191 */ lbu $v0, 0x191($s3) /* 733134 802A1064 C6620148 */ lwc1 $f2, 0x148($s3) /* 733138 802A1068 44820000 */ mtc1 $v0, $f0 -/* 73313C 802A106C 00000000 */ nop +/* 73313C 802A106C 00000000 */ nop /* 733140 802A1070 46800020 */ cvt.s.w $f0, $f0 /* 733144 802A1074 0C099CAB */ jal heroes_is_ability_active /* 733148 802A1078 46001580 */ add.s $f22, $f2, $f0 @@ -75,7 +75,7 @@ glabel func_802A1000_7330D0 /* 7331E4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 7331E8 802A1118 0212102A */ slt $v0, $s0, $s2 /* 7331EC 802A111C 1440FFED */ bnez $v0, .L802A10D4 -/* 7331F0 802A1120 00000000 */ nop +/* 7331F0 802A1120 00000000 */ nop .L802A1124: /* 7331F4 802A1124 00101040 */ sll $v0, $s0, 1 /* 7331F8 802A1128 00501021 */ addu $v0, $v0, $s0 @@ -98,7 +98,7 @@ glabel func_802A1000_7330D0 /* 73323C 802A116C 3C048011 */ lui $a0, %hi(D_80108A64) /* 733240 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64) /* 733244 802A1174 0C050529 */ jal create_icon -/* 733248 802A1178 00000000 */ nop +/* 733248 802A1178 00000000 */ nop /* 73324C 802A117C 8FA50020 */ lw $a1, 0x20($sp) /* 733250 802A1180 8FA60024 */ lw $a2, 0x24($sp) /* 733254 802A1184 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_7330D0/func_802A11D4_7332A4.s b/asm/nonmatchings/code_7330D0/func_802A11D4_7332A4.s index 73e01fc1fb..a970c4c79b 100644 --- a/asm/nonmatchings/code_7330D0/func_802A11D4_7332A4.s +++ b/asm/nonmatchings/code_7330D0/func_802A11D4_7332A4.s @@ -16,13 +16,13 @@ glabel func_802A11D4_7332A4 /* 7332D0 802A1200 0C099CAB */ jal heroes_is_ability_active /* 7332D4 802A1204 2405001D */ addiu $a1, $zero, 0x1d /* 7332D8 802A1208 10400007 */ beqz $v0, .L802A1228 -/* 7332DC 802A120C 00000000 */ nop +/* 7332DC 802A120C 00000000 */ nop /* 7332E0 802A1210 1A000005 */ blez $s0, .L802A1228 -/* 7332E4 802A1214 00000000 */ nop +/* 7332E4 802A1214 00000000 */ nop /* 7332E8 802A1218 3C04802A */ lui $a0, %hi(D_802A24D0) /* 7332EC 802A121C 8C8424D0 */ lw $a0, %lo(D_802A24D0)($a0) /* 7332F0 802A1220 0C05123D */ jal free_icon -/* 7332F4 802A1224 00000000 */ nop +/* 7332F4 802A1224 00000000 */ nop .L802A1228: /* 7332F8 802A1228 8FBF0014 */ lw $ra, 0x14($sp) /* 7332FC 802A122C 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_7330D0/func_802A123C_73330C.s b/asm/nonmatchings/code_7330D0/func_802A123C_73330C.s index b206eb263a..b578de0aa6 100644 --- a/asm/nonmatchings/code_7330D0/func_802A123C_73330C.s +++ b/asm/nonmatchings/code_7330D0/func_802A123C_73330C.s @@ -27,15 +27,15 @@ glabel func_802A123C_73330C /* 733364 802A1294 0040802D */ daddu $s0, $v0, $zero /* 733368 802A1298 0040182D */ daddu $v1, $v0, $zero /* 73336C 802A129C 44930000 */ mtc1 $s3, $f0 -/* 733370 802A12A0 00000000 */ nop +/* 733370 802A12A0 00000000 */ nop /* 733374 802A12A4 46800020 */ cvt.s.w $f0, $f0 /* 733378 802A12A8 E4600008 */ swc1 $f0, 8($v1) /* 73337C 802A12AC 44920000 */ mtc1 $s2, $f0 -/* 733380 802A12B0 00000000 */ nop +/* 733380 802A12B0 00000000 */ nop /* 733384 802A12B4 46800020 */ cvt.s.w $f0, $f0 /* 733388 802A12B8 E460000C */ swc1 $f0, 0xc($v1) /* 73338C 802A12BC 44900000 */ mtc1 $s0, $f0 -/* 733390 802A12C0 00000000 */ nop +/* 733390 802A12C0 00000000 */ nop /* 733394 802A12C4 46800020 */ cvt.s.w $f0, $f0 /* 733398 802A12C8 E4600010 */ swc1 $f0, 0x10($v1) /* 73339C 802A12CC 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_7330D0/func_802A12EC_7333BC.s b/asm/nonmatchings/code_7330D0/func_802A12EC_7333BC.s index b0828ea5aa..b4a118fe89 100644 --- a/asm/nonmatchings/code_7330D0/func_802A12EC_7333BC.s +++ b/asm/nonmatchings/code_7330D0/func_802A12EC_7333BC.s @@ -13,7 +13,7 @@ glabel func_802A12EC_7333BC /* 7333DC 802A130C 24020002 */ addiu $v0, $zero, 2 /* 7333E0 802A1310 8CA50000 */ lw $a1, ($a1) /* 7333E4 802A1314 0C0B1EAF */ jal get_variable -/* 7333E8 802A1318 00000000 */ nop +/* 7333E8 802A1318 00000000 */ nop /* 7333EC 802A131C 92030217 */ lbu $v1, 0x217($s0) /* 7333F0 802A1320 00621823 */ subu $v1, $v1, $v0 /* 7333F4 802A1324 A2030217 */ sb $v1, 0x217($s0) diff --git a/asm/nonmatchings/code_7330D0/func_802A1378_733448.s b/asm/nonmatchings/code_7330D0/func_802A1378_733448.s index caae702d32..f1543bbd69 100644 --- a/asm/nonmatchings/code_7330D0/func_802A1378_733448.s +++ b/asm/nonmatchings/code_7330D0/func_802A1378_733448.s @@ -28,15 +28,15 @@ glabel func_802A1378_733448 /* 7334A4 802A13D4 0C0B1EAF */ jal get_variable /* 7334A8 802A13D8 0040802D */ daddu $s0, $v0, $zero /* 7334AC 802A13DC 44930000 */ mtc1 $s3, $f0 -/* 7334B0 802A13E0 00000000 */ nop +/* 7334B0 802A13E0 00000000 */ nop /* 7334B4 802A13E4 46800020 */ cvt.s.w $f0, $f0 /* 7334B8 802A13E8 44050000 */ mfc1 $a1, $f0 /* 7334BC 802A13EC 44920000 */ mtc1 $s2, $f0 -/* 7334C0 802A13F0 00000000 */ nop +/* 7334C0 802A13F0 00000000 */ nop /* 7334C4 802A13F4 46800020 */ cvt.s.w $f0, $f0 /* 7334C8 802A13F8 44060000 */ mfc1 $a2, $f0 /* 7334CC 802A13FC 44900000 */ mtc1 $s0, $f0 -/* 7334D0 802A1400 00000000 */ nop +/* 7334D0 802A1400 00000000 */ nop /* 7334D4 802A1404 46800020 */ cvt.s.w $f0, $f0 /* 7334D8 802A1408 44070000 */ mfc1 $a3, $f0 /* 7334DC 802A140C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_7330D0/func_802A1438_733508.s b/asm/nonmatchings/code_7330D0/func_802A1438_733508.s index f96abda74f..b8cb06859b 100644 --- a/asm/nonmatchings/code_7330D0/func_802A1438_733508.s +++ b/asm/nonmatchings/code_7330D0/func_802A1438_733508.s @@ -28,15 +28,15 @@ glabel func_802A1438_733508 /* 733564 802A1494 0C0B1EAF */ jal get_variable /* 733568 802A1498 0040802D */ daddu $s0, $v0, $zero /* 73356C 802A149C 44930000 */ mtc1 $s3, $f0 -/* 733570 802A14A0 00000000 */ nop +/* 733570 802A14A0 00000000 */ nop /* 733574 802A14A4 46800020 */ cvt.s.w $f0, $f0 /* 733578 802A14A8 44050000 */ mfc1 $a1, $f0 /* 73357C 802A14AC 44920000 */ mtc1 $s2, $f0 -/* 733580 802A14B0 00000000 */ nop +/* 733580 802A14B0 00000000 */ nop /* 733584 802A14B4 46800020 */ cvt.s.w $f0, $f0 /* 733588 802A14B8 44060000 */ mfc1 $a2, $f0 /* 73358C 802A14BC 44900000 */ mtc1 $s0, $f0 -/* 733590 802A14C0 00000000 */ nop +/* 733590 802A14C0 00000000 */ nop /* 733594 802A14C4 46800020 */ cvt.s.w $f0, $f0 /* 733598 802A14C8 44070000 */ mfc1 $a3, $f0 /* 73359C 802A14CC 24040001 */ addiu $a0, $zero, 1 diff --git a/asm/nonmatchings/code_748DD0/func_802A1000_748DD0.s b/asm/nonmatchings/code_748DD0/func_802A1000_748DD0.s index 854ed49f20..93edd0ea75 100644 --- a/asm/nonmatchings/code_748DD0/func_802A1000_748DD0.s +++ b/asm/nonmatchings/code_748DD0/func_802A1000_748DD0.s @@ -24,16 +24,16 @@ glabel func_802A1000_748DD0 /* 748E1C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 748E20 802A1050 3C014170 */ lui $at, 0x4170 /* 748E24 802A1054 44811000 */ mtc1 $at, $f2 -/* 748E28 802A1058 00000000 */ nop +/* 748E28 802A1058 00000000 */ nop /* 748E2C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 748E30 802A1060 00000000 */ nop +/* 748E30 802A1060 00000000 */ nop /* 748E34 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 748E38 802A1068 44811000 */ mtc1 $at, $f2 -/* 748E3C 802A106C 00000000 */ nop +/* 748E3C 802A106C 00000000 */ nop /* 748E40 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 748E44 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 748E48 802A1078 44024000 */ mfc1 $v0, $f8 -/* 748E4C 802A107C 00000000 */ nop +/* 748E4C 802A107C 00000000 */ nop /* 748E50 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 748E54 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 748E58 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_748DD0 .L802A1094: /* 748E64 802A1094 82220083 */ lb $v0, 0x83($s1) /* 748E68 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 748E6C 802A109C 00000000 */ nop +/* 748E6C 802A109C 00000000 */ nop /* 748E70 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 748E74 802A10A4 28420006 */ slti $v0, $v0, 6 /* 748E78 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_74D570/func_802A1000_74D570.s b/asm/nonmatchings/code_74D570/func_802A1000_74D570.s index 2536fbd093..564b67fd59 100644 --- a/asm/nonmatchings/code_74D570/func_802A1000_74D570.s +++ b/asm/nonmatchings/code_74D570/func_802A1000_74D570.s @@ -24,16 +24,16 @@ glabel func_802A1000_74D570 /* 74D5BC 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 74D5C0 802A1050 3C014170 */ lui $at, 0x4170 /* 74D5C4 802A1054 44811000 */ mtc1 $at, $f2 -/* 74D5C8 802A1058 00000000 */ nop +/* 74D5C8 802A1058 00000000 */ nop /* 74D5CC 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 74D5D0 802A1060 00000000 */ nop +/* 74D5D0 802A1060 00000000 */ nop /* 74D5D4 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 74D5D8 802A1068 44811000 */ mtc1 $at, $f2 -/* 74D5DC 802A106C 00000000 */ nop +/* 74D5DC 802A106C 00000000 */ nop /* 74D5E0 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 74D5E4 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 74D5E8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 74D5EC 802A107C 00000000 */ nop +/* 74D5EC 802A107C 00000000 */ nop /* 74D5F0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 74D5F4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 74D5F8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_74D570 .L802A1094: /* 74D604 802A1094 82220083 */ lb $v0, 0x83($s1) /* 74D608 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 74D60C 802A109C 00000000 */ nop +/* 74D60C 802A109C 00000000 */ nop /* 74D610 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 74D614 802A10A4 28420006 */ slti $v0, $v0, 6 /* 74D618 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_74D570/func_802A1108_74D678.s b/asm/nonmatchings/code_74D570/func_802A1108_74D678.s index 0221502389..1d57354ceb 100644 --- a/asm/nonmatchings/code_74D570/func_802A1108_74D678.s +++ b/asm/nonmatchings/code_74D570/func_802A1108_74D678.s @@ -23,15 +23,15 @@ glabel func_802A1108_74D678 /* 74D6C0 802A1150 0040802D */ daddu $s0, $v0, $zero /* 74D6C4 802A1154 0000202D */ daddu $a0, $zero, $zero /* 74D6C8 802A1158 44921000 */ mtc1 $s2, $f2 -/* 74D6CC 802A115C 00000000 */ nop +/* 74D6CC 802A115C 00000000 */ nop /* 74D6D0 802A1160 468010A0 */ cvt.s.w $f2, $f2 /* 74D6D4 802A1164 44051000 */ mfc1 $a1, $f2 /* 74D6D8 802A1168 44901000 */ mtc1 $s0, $f2 -/* 74D6DC 802A116C 00000000 */ nop +/* 74D6DC 802A116C 00000000 */ nop /* 74D6E0 802A1170 468010A0 */ cvt.s.w $f2, $f2 /* 74D6E4 802A1174 44061000 */ mfc1 $a2, $f2 /* 74D6E8 802A1178 44821000 */ mtc1 $v0, $f2 -/* 74D6EC 802A117C 00000000 */ nop +/* 74D6EC 802A117C 00000000 */ nop /* 74D6F0 802A1180 468010A0 */ cvt.s.w $f2, $f2 /* 74D6F4 802A1184 3C013F80 */ lui $at, 0x3f80 /* 74D6F8 802A1188 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_74D570/func_802A120C_74D77C.s b/asm/nonmatchings/code_74D570/func_802A120C_74D77C.s index 7a167c101d..f670ac68ce 100644 --- a/asm/nonmatchings/code_74D570/func_802A120C_74D77C.s +++ b/asm/nonmatchings/code_74D570/func_802A120C_74D77C.s @@ -30,16 +30,16 @@ glabel func_802A120C_74D77C /* 74D7E0 802A1270 24040006 */ addiu $a0, $zero, 6 /* 74D7E4 802A1274 2673000A */ addiu $s3, $s3, 0xa /* 74D7E8 802A1278 44931000 */ mtc1 $s3, $f2 -/* 74D7EC 802A127C 00000000 */ nop +/* 74D7EC 802A127C 00000000 */ nop /* 74D7F0 802A1280 468010A0 */ cvt.s.w $f2, $f2 /* 74D7F4 802A1284 26520012 */ addiu $s2, $s2, 0x12 /* 74D7F8 802A1288 44051000 */ mfc1 $a1, $f2 /* 74D7FC 802A128C 44921000 */ mtc1 $s2, $f2 -/* 74D800 802A1290 00000000 */ nop +/* 74D800 802A1290 00000000 */ nop /* 74D804 802A1294 468010A0 */ cvt.s.w $f2, $f2 /* 74D808 802A1298 44061000 */ mfc1 $a2, $f2 /* 74D80C 802A129C 44901000 */ mtc1 $s0, $f2 -/* 74D810 802A12A0 00000000 */ nop +/* 74D810 802A12A0 00000000 */ nop /* 74D814 802A12A4 468010A0 */ cvt.s.w $f2, $f2 /* 74D818 802A12A8 44071000 */ mfc1 $a3, $f2 /* 74D81C 802A12AC 2402002D */ addiu $v0, $zero, 0x2d @@ -54,4 +54,4 @@ glabel func_802A120C_74D77C /* 74D840 802A12D0 24020002 */ addiu $v0, $zero, 2 /* 74D844 802A12D4 03E00008 */ jr $ra /* 74D848 802A12D8 27BD0030 */ addiu $sp, $sp, 0x30 -/* 74D84C 802A12DC 00000000 */ nop +/* 74D84C 802A12DC 00000000 */ nop diff --git a/asm/nonmatchings/code_756780/func_802A10A4_756824.s b/asm/nonmatchings/code_756780/func_802A10A4_756824.s index c16e690919..a9dfed2299 100644 --- a/asm/nonmatchings/code_756780/func_802A10A4_756824.s +++ b/asm/nonmatchings/code_756780/func_802A10A4_756824.s @@ -15,7 +15,7 @@ glabel func_802A10A4_756824 /* 756848 802A10C8 10620007 */ beq $v1, $v0, .L802A10E8 /* 75684C 802A10CC 0000102D */ daddu $v0, $zero, $zero /* 756850 802A10D0 080A845B */ j .L802A116C -/* 756854 802A10D4 00000000 */ nop +/* 756854 802A10D4 00000000 */ nop .L802A10D8: /* 756858 802A10D8 2402001E */ addiu $v0, $zero, 0x1e /* 75685C 802A10DC AE020074 */ sw $v0, 0x74($s0) @@ -61,4 +61,4 @@ glabel func_802A10A4_756824 /* 7568F0 802A1170 8FB00010 */ lw $s0, 0x10($sp) /* 7568F4 802A1174 03E00008 */ jr $ra /* 7568F8 802A1178 27BD0018 */ addiu $sp, $sp, 0x18 -/* 7568FC 802A117C 00000000 */ nop +/* 7568FC 802A117C 00000000 */ nop diff --git a/asm/nonmatchings/code_7595B0/func_802A10C8_759678.s b/asm/nonmatchings/code_7595B0/func_802A10C8_759678.s index 43e4e3a331..46e3be57b3 100644 --- a/asm/nonmatchings/code_7595B0/func_802A10C8_759678.s +++ b/asm/nonmatchings/code_7595B0/func_802A10C8_759678.s @@ -23,15 +23,15 @@ glabel func_802A10C8_759678 /* 7596C0 802A1110 0040802D */ daddu $s0, $v0, $zero /* 7596C4 802A1114 24040001 */ addiu $a0, $zero, 1 /* 7596C8 802A1118 44921000 */ mtc1 $s2, $f2 -/* 7596CC 802A111C 00000000 */ nop +/* 7596CC 802A111C 00000000 */ nop /* 7596D0 802A1120 468010A0 */ cvt.s.w $f2, $f2 /* 7596D4 802A1124 44051000 */ mfc1 $a1, $f2 /* 7596D8 802A1128 44901000 */ mtc1 $s0, $f2 -/* 7596DC 802A112C 00000000 */ nop +/* 7596DC 802A112C 00000000 */ nop /* 7596E0 802A1130 468010A0 */ cvt.s.w $f2, $f2 /* 7596E4 802A1134 44061000 */ mfc1 $a2, $f2 /* 7596E8 802A1138 44821000 */ mtc1 $v0, $f2 -/* 7596EC 802A113C 00000000 */ nop +/* 7596EC 802A113C 00000000 */ nop /* 7596F0 802A1140 468010A0 */ cvt.s.w $f2, $f2 /* 7596F4 802A1144 3C013F80 */ lui $at, 0x3f80 /* 7596F8 802A1148 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7595B0/func_802A11E8_759798.s b/asm/nonmatchings/code_7595B0/func_802A11E8_759798.s index fadb26c839..b55a102a5b 100644 --- a/asm/nonmatchings/code_7595B0/func_802A11E8_759798.s +++ b/asm/nonmatchings/code_7595B0/func_802A11E8_759798.s @@ -34,14 +34,14 @@ glabel func_802A11E8_759798 /* 75980C 802A125C 24040006 */ addiu $a0, $zero, 6 /* 759810 802A1260 2673000A */ addiu $s3, $s3, 0xa /* 759814 802A1264 4493D000 */ mtc1 $s3, $f26 -/* 759818 802A1268 00000000 */ nop +/* 759818 802A1268 00000000 */ nop /* 75981C 802A126C 4680D6A0 */ cvt.s.w $f26, $f26 /* 759820 802A1270 26310012 */ addiu $s1, $s1, 0x12 /* 759824 802A1274 4491C000 */ mtc1 $s1, $f24 -/* 759828 802A1278 00000000 */ nop +/* 759828 802A1278 00000000 */ nop /* 75982C 802A127C 4680C620 */ cvt.s.w $f24, $f24 /* 759830 802A1280 4490A000 */ mtc1 $s0, $f20 -/* 759834 802A1284 00000000 */ nop +/* 759834 802A1284 00000000 */ nop /* 759838 802A1288 4680A520 */ cvt.s.w $f20, $f20 /* 75983C 802A128C 46000586 */ mov.s $f22, $f0 /* 759840 802A1290 4405D000 */ mfc1 $a1, $f26 diff --git a/asm/nonmatchings/code_7595B0/func_802A12FC_7598AC.s b/asm/nonmatchings/code_7595B0/func_802A12FC_7598AC.s index b1e0503d27..1ad920bc2b 100644 --- a/asm/nonmatchings/code_7595B0/func_802A12FC_7598AC.s +++ b/asm/nonmatchings/code_7595B0/func_802A12FC_7598AC.s @@ -11,4 +11,4 @@ glabel func_802A12FC_7598AC /* 7598C0 802A1310 AC820084 */ sw $v0, 0x84($a0) /* 7598C4 802A1314 03E00008 */ jr $ra /* 7598C8 802A1318 24020002 */ addiu $v0, $zero, 2 -/* 7598CC 802A131C 00000000 */ nop +/* 7598CC 802A131C 00000000 */ nop diff --git a/asm/nonmatchings/code_76A830/func_802A1000_76A830.s b/asm/nonmatchings/code_76A830/func_802A1000_76A830.s index d5d9a9e457..386c412892 100644 --- a/asm/nonmatchings/code_76A830/func_802A1000_76A830.s +++ b/asm/nonmatchings/code_76A830/func_802A1000_76A830.s @@ -24,16 +24,16 @@ glabel func_802A1000_76A830 /* 76A87C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 76A880 802A1050 3C014170 */ lui $at, 0x4170 /* 76A884 802A1054 44811000 */ mtc1 $at, $f2 -/* 76A888 802A1058 00000000 */ nop +/* 76A888 802A1058 00000000 */ nop /* 76A88C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 76A890 802A1060 00000000 */ nop +/* 76A890 802A1060 00000000 */ nop /* 76A894 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 76A898 802A1068 44811000 */ mtc1 $at, $f2 -/* 76A89C 802A106C 00000000 */ nop +/* 76A89C 802A106C 00000000 */ nop /* 76A8A0 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 76A8A4 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 76A8A8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 76A8AC 802A107C 00000000 */ nop +/* 76A8AC 802A107C 00000000 */ nop /* 76A8B0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 76A8B4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 76A8B8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_76A830 .L802A1094: /* 76A8C4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 76A8C8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 76A8CC 802A109C 00000000 */ nop +/* 76A8CC 802A109C 00000000 */ nop /* 76A8D0 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 76A8D4 802A10A4 28420006 */ slti $v0, $v0, 6 /* 76A8D8 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_76F330/func_802A1000_76F330.s b/asm/nonmatchings/code_76F330/func_802A1000_76F330.s index 64cf273b3c..6018c4c18c 100644 --- a/asm/nonmatchings/code_76F330/func_802A1000_76F330.s +++ b/asm/nonmatchings/code_76F330/func_802A1000_76F330.s @@ -24,16 +24,16 @@ glabel func_802A1000_76F330 /* 76F37C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 76F380 802A1050 3C014170 */ lui $at, 0x4170 /* 76F384 802A1054 44811000 */ mtc1 $at, $f2 -/* 76F388 802A1058 00000000 */ nop +/* 76F388 802A1058 00000000 */ nop /* 76F38C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 76F390 802A1060 00000000 */ nop +/* 76F390 802A1060 00000000 */ nop /* 76F394 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 76F398 802A1068 44811000 */ mtc1 $at, $f2 -/* 76F39C 802A106C 00000000 */ nop +/* 76F39C 802A106C 00000000 */ nop /* 76F3A0 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 76F3A4 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 76F3A8 802A1078 44024000 */ mfc1 $v0, $f8 -/* 76F3AC 802A107C 00000000 */ nop +/* 76F3AC 802A107C 00000000 */ nop /* 76F3B0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 76F3B4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 76F3B8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_76F330 .L802A1094: /* 76F3C4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 76F3C8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 76F3CC 802A109C 00000000 */ nop +/* 76F3CC 802A109C 00000000 */ nop /* 76F3D0 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 76F3D4 802A10A4 28420006 */ slti $v0, $v0, 6 /* 76F3D8 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_781920/func_802A1000_781920.s b/asm/nonmatchings/code_781920/func_802A1000_781920.s index fa7c30409f..c9f53caa5f 100644 --- a/asm/nonmatchings/code_781920/func_802A1000_781920.s +++ b/asm/nonmatchings/code_781920/func_802A1000_781920.s @@ -24,16 +24,16 @@ glabel func_802A1000_781920 /* 78196C 802A104C E7A00014 */ swc1 $f0, 0x14($sp) /* 781970 802A1050 3C014170 */ lui $at, 0x4170 /* 781974 802A1054 44811000 */ mtc1 $at, $f2 -/* 781978 802A1058 00000000 */ nop +/* 781978 802A1058 00000000 */ nop /* 78197C 802A105C 46020002 */ mul.s $f0, $f0, $f2 -/* 781980 802A1060 00000000 */ nop +/* 781980 802A1060 00000000 */ nop /* 781984 802A1064 3C0142C8 */ lui $at, 0x42c8 /* 781988 802A1068 44811000 */ mtc1 $at, $f2 -/* 78198C 802A106C 00000000 */ nop +/* 78198C 802A106C 00000000 */ nop /* 781990 802A1070 46020003 */ div.s $f0, $f0, $f2 /* 781994 802A1074 4600020D */ trunc.w.s $f8, $f0 /* 781998 802A1078 44024000 */ mfc1 $v0, $f8 -/* 78199C 802A107C 00000000 */ nop +/* 78199C 802A107C 00000000 */ nop /* 7819A0 802A1080 AE020084 */ sw $v0, 0x84($s0) /* 7819A4 802A1084 28420015 */ slti $v0, $v0, 0x15 /* 7819A8 802A1088 14400002 */ bnez $v0, .L802A1094 @@ -42,7 +42,7 @@ glabel func_802A1000_781920 .L802A1094: /* 7819B4 802A1094 82220083 */ lb $v0, 0x83($s1) /* 7819B8 802A1098 10400007 */ beqz $v0, .L802A10B8 -/* 7819BC 802A109C 00000000 */ nop +/* 7819BC 802A109C 00000000 */ nop /* 7819C0 802A10A0 8E020084 */ lw $v0, 0x84($s0) /* 7819C4 802A10A4 28420006 */ slti $v0, $v0, 6 /* 7819C8 802A10A8 10400008 */ beqz $v0, .L802A10CC diff --git a/asm/nonmatchings/code_781920/func_802A10E4_781A04.s b/asm/nonmatchings/code_781920/func_802A10E4_781A04.s index 5cf6cae636..cfa32590e3 100644 --- a/asm/nonmatchings/code_781920/func_802A10E4_781A04.s +++ b/asm/nonmatchings/code_781920/func_802A10E4_781A04.s @@ -25,30 +25,30 @@ glabel func_802A10E4_781A04 /* 781A54 802A1134 1460000F */ bnez $v1, .L802A1174 /* 781A58 802A1138 0000202D */ daddu $a0, $zero, $zero /* 781A5C 802A113C 44920000 */ mtc1 $s2, $f0 -/* 781A60 802A1140 00000000 */ nop +/* 781A60 802A1140 00000000 */ nop /* 781A64 802A1144 46800020 */ cvt.s.w $f0, $f0 /* 781A68 802A1148 44050000 */ mfc1 $a1, $f0 /* 781A6C 802A114C 44900000 */ mtc1 $s0, $f0 -/* 781A70 802A1150 00000000 */ nop +/* 781A70 802A1150 00000000 */ nop /* 781A74 802A1154 46800020 */ cvt.s.w $f0, $f0 /* 781A78 802A1158 44060000 */ mfc1 $a2, $f0 /* 781A7C 802A115C 44820000 */ mtc1 $v0, $f0 -/* 781A80 802A1160 00000000 */ nop +/* 781A80 802A1160 00000000 */ nop /* 781A84 802A1164 46800020 */ cvt.s.w $f0, $f0 /* 781A88 802A1168 44070000 */ mfc1 $a3, $f0 /* 781A8C 802A116C 080A8469 */ j .L802A11A4 /* 781A90 802A1170 24040001 */ addiu $a0, $zero, 1 .L802A1174: /* 781A94 802A1174 44920000 */ mtc1 $s2, $f0 -/* 781A98 802A1178 00000000 */ nop +/* 781A98 802A1178 00000000 */ nop /* 781A9C 802A117C 46800020 */ cvt.s.w $f0, $f0 /* 781AA0 802A1180 44050000 */ mfc1 $a1, $f0 /* 781AA4 802A1184 44900000 */ mtc1 $s0, $f0 -/* 781AA8 802A1188 00000000 */ nop +/* 781AA8 802A1188 00000000 */ nop /* 781AAC 802A118C 46800020 */ cvt.s.w $f0, $f0 /* 781AB0 802A1190 44060000 */ mfc1 $a2, $f0 /* 781AB4 802A1194 44820000 */ mtc1 $v0, $f0 -/* 781AB8 802A1198 00000000 */ nop +/* 781AB8 802A1198 00000000 */ nop /* 781ABC 802A119C 46800020 */ cvt.s.w $f0, $f0 /* 781AC0 802A11A0 44070000 */ mfc1 $a3, $f0 .L802A11A4: @@ -61,5 +61,5 @@ glabel func_802A10E4_781A04 /* 781ADC 802A11BC 24020002 */ addiu $v0, $zero, 2 /* 781AE0 802A11C0 03E00008 */ jr $ra /* 781AE4 802A11C4 27BD0028 */ addiu $sp, $sp, 0x28 -/* 781AE8 802A11C8 00000000 */ nop -/* 781AEC 802A11CC 00000000 */ nop +/* 781AE8 802A11C8 00000000 */ nop +/* 781AEC 802A11CC 00000000 */ nop diff --git a/asm/nonmatchings/code_78B600/func_802A1000_78B600.s b/asm/nonmatchings/code_78B600/func_802A1000_78B600.s index b982504dcf..bbd32d5922 100644 --- a/asm/nonmatchings/code_78B600/func_802A1000_78B600.s +++ b/asm/nonmatchings/code_78B600/func_802A1000_78B600.s @@ -22,15 +22,15 @@ glabel func_802A1000_78B600 /* 78B644 802A1044 0C0B1EAF */ jal get_variable /* 78B648 802A1048 0040802D */ daddu $s0, $v0, $zero /* 78B64C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 78B650 802A1050 00000000 */ nop +/* 78B650 802A1050 00000000 */ nop /* 78B654 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 78B658 802A1058 44051000 */ mfc1 $a1, $f2 /* 78B65C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 78B660 802A1060 00000000 */ nop +/* 78B660 802A1060 00000000 */ nop /* 78B664 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 78B668 802A1068 44061000 */ mfc1 $a2, $f2 /* 78B66C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 78B670 802A1070 00000000 */ nop +/* 78B670 802A1070 00000000 */ nop /* 78B674 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 78B678 802A1078 3C014220 */ lui $at, 0x4220 /* 78B67C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78B600/func_802A10AC_78B6AC.s b/asm/nonmatchings/code_78B600/func_802A10AC_78B6AC.s index a175f8fc08..9e49d55f6f 100644 --- a/asm/nonmatchings/code_78B600/func_802A10AC_78B6AC.s +++ b/asm/nonmatchings/code_78B600/func_802A10AC_78B6AC.s @@ -23,15 +23,15 @@ glabel func_802A10AC_78B6AC /* 78B6F4 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 78B6F8 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 78B6FC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 78B700 802A1100 00000000 */ nop +/* 78B700 802A1100 00000000 */ nop /* 78B704 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 78B708 802A1108 44051000 */ mfc1 $a1, $f2 /* 78B70C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 78B710 802A1110 00000000 */ nop +/* 78B710 802A1110 00000000 */ nop /* 78B714 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 78B718 802A1118 44061000 */ mfc1 $a2, $f2 /* 78B71C 802A111C 44821000 */ mtc1 $v0, $f2 -/* 78B720 802A1120 00000000 */ nop +/* 78B720 802A1120 00000000 */ nop /* 78B724 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 78B728 802A1128 3C014248 */ lui $at, 0x4248 /* 78B72C 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78B600/func_802A116C_78B76C.s b/asm/nonmatchings/code_78B600/func_802A116C_78B76C.s index 6faaf8a240..c53e2ab073 100644 --- a/asm/nonmatchings/code_78B600/func_802A116C_78B76C.s +++ b/asm/nonmatchings/code_78B600/func_802A116C_78B76C.s @@ -22,15 +22,15 @@ glabel func_802A116C_78B76C /* 78B7B0 802A11B0 0C0B1EAF */ jal get_variable /* 78B7B4 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 78B7B8 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 78B7BC 802A11BC 00000000 */ nop +/* 78B7BC 802A11BC 00000000 */ nop /* 78B7C0 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 78B7C4 802A11C4 44051000 */ mfc1 $a1, $f2 /* 78B7C8 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 78B7CC 802A11CC 00000000 */ nop +/* 78B7CC 802A11CC 00000000 */ nop /* 78B7D0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 78B7D4 802A11D4 44061000 */ mfc1 $a2, $f2 /* 78B7D8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 78B7DC 802A11DC 00000000 */ nop +/* 78B7DC 802A11DC 00000000 */ nop /* 78B7E0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 78B7E4 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 78B7E8 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78B600/func_802A1218_78B818.s b/asm/nonmatchings/code_78B600/func_802A1218_78B818.s index 2bd3acf5fd..9223211c70 100644 --- a/asm/nonmatchings/code_78B600/func_802A1218_78B818.s +++ b/asm/nonmatchings/code_78B600/func_802A1218_78B818.s @@ -23,15 +23,15 @@ glabel func_802A1218_78B818 /* 78B860 802A1260 0040802D */ daddu $s0, $v0, $zero /* 78B864 802A1264 24040004 */ addiu $a0, $zero, 4 /* 78B868 802A1268 44922000 */ mtc1 $s2, $f4 -/* 78B86C 802A126C 00000000 */ nop +/* 78B86C 802A126C 00000000 */ nop /* 78B870 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 78B874 802A1274 44052000 */ mfc1 $a1, $f4 /* 78B878 802A1278 44902000 */ mtc1 $s0, $f4 -/* 78B87C 802A127C 00000000 */ nop +/* 78B87C 802A127C 00000000 */ nop /* 78B880 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 78B884 802A1284 44062000 */ mfc1 $a2, $f4 /* 78B888 802A1288 44822000 */ mtc1 $v0, $f4 -/* 78B88C 802A128C 00000000 */ nop +/* 78B88C 802A128C 00000000 */ nop /* 78B890 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 78B894 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 78B898 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78B600/func_802A1518_78BB18.s b/asm/nonmatchings/code_78B600/func_802A1518_78BB18.s index 9dfcee97ae..562421c572 100644 --- a/asm/nonmatchings/code_78B600/func_802A1518_78BB18.s +++ b/asm/nonmatchings/code_78B600/func_802A1518_78BB18.s @@ -22,12 +22,12 @@ glabel func_802A1518_78BB18 /* 78BB58 802A1558 10600007 */ beqz $v1, .L802A1578 /* 78BB5C 802A155C 0000102D */ daddu $v0, $zero, $zero /* 78BB60 802A1560 080A85EF */ j .L802A17BC -/* 78BB64 802A1564 00000000 */ nop +/* 78BB64 802A1564 00000000 */ nop .L802A1568: /* 78BB68 802A1568 10620091 */ beq $v1, $v0, .L802A17B0 /* 78BB6C 802A156C 0000102D */ daddu $v0, $zero, $zero /* 78BB70 802A1570 080A85EF */ j .L802A17BC -/* 78BB74 802A1574 00000000 */ nop +/* 78BB74 802A1574 00000000 */ nop .L802A1578: /* 78BB78 802A1578 8C850000 */ lw $a1, ($a0) /* 78BB7C 802A157C 0C0B1EAF */ jal get_variable @@ -60,11 +60,11 @@ glabel func_802A1518_78BB18 .L802A15E8: /* 78BBE8 802A15E8 C602001C */ lwc1 $f2, 0x1c($s0) /* 78BBEC 802A15EC 44800000 */ mtc1 $zero, $f0 -/* 78BBF0 802A15F0 00000000 */ nop +/* 78BBF0 802A15F0 00000000 */ nop /* 78BBF4 802A15F4 4600103C */ c.lt.s $f2, $f0 -/* 78BBF8 802A15F8 00000000 */ nop +/* 78BBF8 802A15F8 00000000 */ nop /* 78BBFC 802A15FC 4500000D */ bc1f .L802A1634 -/* 78BC00 802A1600 00000000 */ nop +/* 78BC00 802A1600 00000000 */ nop /* 78BC04 802A1604 C6000010 */ lwc1 $f0, 0x10($s0) /* 78BC08 802A1608 3C014008 */ lui $at, 0x4008 /* 78BC0C 802A160C 44811800 */ mtc1 $at, $f3 @@ -144,10 +144,10 @@ glabel func_802A1518_78BB18 /* 78BD24 802A1724 00822023 */ subu $a0, $a0, $v0 /* 78BD28 802A1728 00042400 */ sll $a0, $a0, 0x10 /* 78BD2C 802A172C 1480000A */ bnez $a0, .L802A1758 -/* 78BD30 802A1730 00000000 */ nop +/* 78BD30 802A1730 00000000 */ nop /* 78BD34 802A1734 3C0141F0 */ lui $at, 0x41f0 /* 78BD38 802A1738 44810000 */ mtc1 $at, $f0 -/* 78BD3C 802A173C 00000000 */ nop +/* 78BD3C 802A173C 00000000 */ nop /* 78BD40 802A1740 E7A00010 */ swc1 $f0, 0x10($sp) /* 78BD44 802A1744 8E050038 */ lw $a1, 0x38($s0) /* 78BD48 802A1748 8E06003C */ lw $a2, 0x3c($s0) @@ -162,18 +162,18 @@ glabel func_802A1518_78BB18 /* 78BD68 802A1768 00021403 */ sra $v0, $v0, 0x10 /* 78BD6C 802A176C 28420029 */ slti $v0, $v0, 0x29 /* 78BD70 802A1770 14400005 */ bnez $v0, .L802A1788 -/* 78BD74 802A1774 00000000 */ nop +/* 78BD74 802A1774 00000000 */ nop /* 78BD78 802A1778 3C013F00 */ lui $at, 0x3f00 /* 78BD7C 802A177C 44810000 */ mtc1 $at, $f0 -/* 78BD80 802A1780 00000000 */ nop +/* 78BD80 802A1780 00000000 */ nop /* 78BD84 802A1784 E6000014 */ swc1 $f0, 0x14($s0) .L802A1788: /* 78BD88 802A1788 C602003C */ lwc1 $f2, 0x3c($s0) /* 78BD8C 802A178C 3C014348 */ lui $at, 0x4348 /* 78BD90 802A1790 44810000 */ mtc1 $at, $f0 -/* 78BD94 802A1794 00000000 */ nop +/* 78BD94 802A1794 00000000 */ nop /* 78BD98 802A1798 4602003C */ c.lt.s $f0, $f2 -/* 78BD9C 802A179C 00000000 */ nop +/* 78BD9C 802A179C 00000000 */ nop /* 78BDA0 802A17A0 45000005 */ bc1f .L802A17B8 /* 78BDA4 802A17A4 24020002 */ addiu $v0, $zero, 2 /* 78BDA8 802A17A8 080A85EE */ j .L802A17B8 diff --git a/asm/nonmatchings/code_78B600/func_802A17D4_78BDD4.s b/asm/nonmatchings/code_78B600/func_802A17D4_78BDD4.s index d4cdcbfad7..7744a8c4fc 100644 --- a/asm/nonmatchings/code_78B600/func_802A17D4_78BDD4.s +++ b/asm/nonmatchings/code_78B600/func_802A17D4_78BDD4.s @@ -9,7 +9,7 @@ glabel func_802A17D4_78BDD4 /* 78BDE4 802A17E4 AFBF0014 */ sw $ra, 0x14($sp) /* 78BDE8 802A17E8 82020210 */ lb $v0, 0x210($s0) /* 78BDEC 802A17EC 10400005 */ beqz $v0, .L802A1804 -/* 78BDF0 802A17F0 00000000 */ nop +/* 78BDF0 802A17F0 00000000 */ nop /* 78BDF4 802A17F4 86040436 */ lh $a0, 0x436($s0) /* 78BDF8 802A17F8 A2000211 */ sb $zero, 0x211($s0) /* 78BDFC 802A17FC 0C011E26 */ jal func_80047898 @@ -17,7 +17,7 @@ glabel func_802A17D4_78BDD4 .L802A1804: /* 78BE04 802A1804 82020216 */ lb $v0, 0x216($s0) /* 78BE08 802A1808 10400006 */ beqz $v0, .L802A1824 -/* 78BE0C 802A180C 00000000 */ nop +/* 78BE0C 802A180C 00000000 */ nop /* 78BE10 802A1810 8E020440 */ lw $v0, 0x440($s0) /* 78BE14 802A1814 A2000217 */ sb $zero, 0x217($s0) /* 78BE18 802A1818 A2000216 */ sb $zero, 0x216($s0) @@ -25,7 +25,7 @@ glabel func_802A17D4_78BDD4 /* 78BE20 802A1820 AC40003C */ sw $zero, 0x3c($v0) .L802A1824: /* 78BE24 802A1824 0C099DDF */ jal func_8026777C -/* 78BE28 802A1828 00000000 */ nop +/* 78BE28 802A1828 00000000 */ nop /* 78BE2C 802A182C 8FBF0014 */ lw $ra, 0x14($sp) /* 78BE30 802A1830 8FB00010 */ lw $s0, 0x10($sp) /* 78BE34 802A1834 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/code_78B600/func_802A18E8_78BEE8.s b/asm/nonmatchings/code_78B600/func_802A18E8_78BEE8.s index db13e583ea..030d470f7f 100644 --- a/asm/nonmatchings/code_78B600/func_802A18E8_78BEE8.s +++ b/asm/nonmatchings/code_78B600/func_802A18E8_78BEE8.s @@ -28,15 +28,15 @@ glabel func_802A18E8_78BEE8 /* 78BF44 802A1944 0C0B1EAF */ jal get_variable /* 78BF48 802A1948 0040802D */ daddu $s0, $v0, $zero /* 78BF4C 802A194C 44930000 */ mtc1 $s3, $f0 -/* 78BF50 802A1950 00000000 */ nop +/* 78BF50 802A1950 00000000 */ nop /* 78BF54 802A1954 46800020 */ cvt.s.w $f0, $f0 /* 78BF58 802A1958 44050000 */ mfc1 $a1, $f0 /* 78BF5C 802A195C 44920000 */ mtc1 $s2, $f0 -/* 78BF60 802A1960 00000000 */ nop +/* 78BF60 802A1960 00000000 */ nop /* 78BF64 802A1964 46800020 */ cvt.s.w $f0, $f0 /* 78BF68 802A1968 44060000 */ mfc1 $a2, $f0 /* 78BF6C 802A196C 44900000 */ mtc1 $s0, $f0 -/* 78BF70 802A1970 00000000 */ nop +/* 78BF70 802A1970 00000000 */ nop /* 78BF74 802A1974 46800020 */ cvt.s.w $f0, $f0 /* 78BF78 802A1978 44070000 */ mfc1 $a3, $f0 /* 78BF7C 802A197C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/code_78B600/func_802A19A8_78BFA8.s b/asm/nonmatchings/code_78B600/func_802A19A8_78BFA8.s index 860f794c9d..da9fea2ad1 100644 --- a/asm/nonmatchings/code_78B600/func_802A19A8_78BFA8.s +++ b/asm/nonmatchings/code_78B600/func_802A19A8_78BFA8.s @@ -28,15 +28,15 @@ glabel func_802A19A8_78BFA8 /* 78C004 802A1A04 0C0B1EAF */ jal get_variable /* 78C008 802A1A08 0040802D */ daddu $s0, $v0, $zero /* 78C00C 802A1A0C 44930000 */ mtc1 $s3, $f0 -/* 78C010 802A1A10 00000000 */ nop +/* 78C010 802A1A10 00000000 */ nop /* 78C014 802A1A14 46800020 */ cvt.s.w $f0, $f0 /* 78C018 802A1A18 44050000 */ mfc1 $a1, $f0 /* 78C01C 802A1A1C 44920000 */ mtc1 $s2, $f0 -/* 78C020 802A1A20 00000000 */ nop +/* 78C020 802A1A20 00000000 */ nop /* 78C024 802A1A24 46800020 */ cvt.s.w $f0, $f0 /* 78C028 802A1A28 44060000 */ mfc1 $a2, $f0 /* 78C02C 802A1A2C 44900000 */ mtc1 $s0, $f0 -/* 78C030 802A1A30 00000000 */ nop +/* 78C030 802A1A30 00000000 */ nop /* 78C034 802A1A34 46800020 */ cvt.s.w $f0, $f0 /* 78C038 802A1A38 44070000 */ mfc1 $a3, $f0 /* 78C03C 802A1A3C 24040001 */ addiu $a0, $zero, 1 @@ -50,5 +50,5 @@ glabel func_802A19A8_78BFA8 /* 78C05C 802A1A5C 24020002 */ addiu $v0, $zero, 2 /* 78C060 802A1A60 03E00008 */ jr $ra /* 78C064 802A1A64 27BD0030 */ addiu $sp, $sp, 0x30 -/* 78C068 802A1A68 00000000 */ nop -/* 78C06C 802A1A6C 00000000 */ nop +/* 78C068 802A1A68 00000000 */ nop +/* 78C06C 802A1A6C 00000000 */ nop diff --git a/asm/nonmatchings/code_78D150/func_802A1000_78D150.s b/asm/nonmatchings/code_78D150/func_802A1000_78D150.s index 374c24b6b2..1ac1e8882a 100644 --- a/asm/nonmatchings/code_78D150/func_802A1000_78D150.s +++ b/asm/nonmatchings/code_78D150/func_802A1000_78D150.s @@ -22,15 +22,15 @@ glabel func_802A1000_78D150 /* 78D194 802A1044 0C0B1EAF */ jal get_variable /* 78D198 802A1048 0040802D */ daddu $s0, $v0, $zero /* 78D19C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 78D1A0 802A1050 00000000 */ nop +/* 78D1A0 802A1050 00000000 */ nop /* 78D1A4 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 78D1A8 802A1058 44051000 */ mfc1 $a1, $f2 /* 78D1AC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 78D1B0 802A1060 00000000 */ nop +/* 78D1B0 802A1060 00000000 */ nop /* 78D1B4 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 78D1B8 802A1068 44061000 */ mfc1 $a2, $f2 /* 78D1BC 802A106C 44821000 */ mtc1 $v0, $f2 -/* 78D1C0 802A1070 00000000 */ nop +/* 78D1C0 802A1070 00000000 */ nop /* 78D1C4 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 78D1C8 802A1078 3C014220 */ lui $at, 0x4220 /* 78D1CC 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78D150/func_802A10AC_78D1FC.s b/asm/nonmatchings/code_78D150/func_802A10AC_78D1FC.s index c55ad04816..df10e81e72 100644 --- a/asm/nonmatchings/code_78D150/func_802A10AC_78D1FC.s +++ b/asm/nonmatchings/code_78D150/func_802A10AC_78D1FC.s @@ -23,15 +23,15 @@ glabel func_802A10AC_78D1FC /* 78D244 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 78D248 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 78D24C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 78D250 802A1100 00000000 */ nop +/* 78D250 802A1100 00000000 */ nop /* 78D254 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 78D258 802A1108 44051000 */ mfc1 $a1, $f2 /* 78D25C 802A110C 44901000 */ mtc1 $s0, $f2 -/* 78D260 802A1110 00000000 */ nop +/* 78D260 802A1110 00000000 */ nop /* 78D264 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 78D268 802A1118 44061000 */ mfc1 $a2, $f2 /* 78D26C 802A111C 44821000 */ mtc1 $v0, $f2 -/* 78D270 802A1120 00000000 */ nop +/* 78D270 802A1120 00000000 */ nop /* 78D274 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 78D278 802A1128 3C014248 */ lui $at, 0x4248 /* 78D27C 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78D150/func_802A116C_78D2BC.s b/asm/nonmatchings/code_78D150/func_802A116C_78D2BC.s index 635e088261..6e5398975d 100644 --- a/asm/nonmatchings/code_78D150/func_802A116C_78D2BC.s +++ b/asm/nonmatchings/code_78D150/func_802A116C_78D2BC.s @@ -22,15 +22,15 @@ glabel func_802A116C_78D2BC /* 78D300 802A11B0 0C0B1EAF */ jal get_variable /* 78D304 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 78D308 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 78D30C 802A11BC 00000000 */ nop +/* 78D30C 802A11BC 00000000 */ nop /* 78D310 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 78D314 802A11C4 44051000 */ mfc1 $a1, $f2 /* 78D318 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 78D31C 802A11CC 00000000 */ nop +/* 78D31C 802A11CC 00000000 */ nop /* 78D320 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 78D324 802A11D4 44061000 */ mfc1 $a2, $f2 /* 78D328 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 78D32C 802A11DC 00000000 */ nop +/* 78D32C 802A11DC 00000000 */ nop /* 78D330 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 78D334 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 78D338 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78D150/func_802A1218_78D368.s b/asm/nonmatchings/code_78D150/func_802A1218_78D368.s index 97c4ff87d0..24cd003581 100644 --- a/asm/nonmatchings/code_78D150/func_802A1218_78D368.s +++ b/asm/nonmatchings/code_78D150/func_802A1218_78D368.s @@ -23,15 +23,15 @@ glabel func_802A1218_78D368 /* 78D3B0 802A1260 0040802D */ daddu $s0, $v0, $zero /* 78D3B4 802A1264 24040004 */ addiu $a0, $zero, 4 /* 78D3B8 802A1268 44922000 */ mtc1 $s2, $f4 -/* 78D3BC 802A126C 00000000 */ nop +/* 78D3BC 802A126C 00000000 */ nop /* 78D3C0 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 78D3C4 802A1274 44052000 */ mfc1 $a1, $f4 /* 78D3C8 802A1278 44902000 */ mtc1 $s0, $f4 -/* 78D3CC 802A127C 00000000 */ nop +/* 78D3CC 802A127C 00000000 */ nop /* 78D3D0 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 78D3D4 802A1284 44062000 */ mfc1 $a2, $f4 /* 78D3D8 802A1288 44822000 */ mtc1 $v0, $f4 -/* 78D3DC 802A128C 00000000 */ nop +/* 78D3DC 802A128C 00000000 */ nop /* 78D3E0 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 78D3E4 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 78D3E8 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_78D150/func_802A1518_78D668.s b/asm/nonmatchings/code_78D150/func_802A1518_78D668.s index 14cb6177bd..c0bda46592 100644 --- a/asm/nonmatchings/code_78D150/func_802A1518_78D668.s +++ b/asm/nonmatchings/code_78D150/func_802A1518_78D668.s @@ -16,7 +16,7 @@ glabel func_802A1518_78D668 /* 78D690 802A1540 10620008 */ beq $v1, $v0, .L802A1564 /* 78D694 802A1544 0000102D */ daddu $v0, $zero, $zero /* 78D698 802A1548 080A8582 */ j .L802A1608 -/* 78D69C 802A154C 00000000 */ nop +/* 78D69C 802A154C 00000000 */ nop .L802A1550: /* 78D6A0 802A1550 2402FFB0 */ addiu $v0, $zero, -0x50 /* 78D6A4 802A1554 AE220078 */ sw $v0, 0x78($s1) @@ -30,7 +30,7 @@ glabel func_802A1518_78D668 /* 78D6C0 802A1570 C62C0074 */ lwc1 $f12, 0x74($s1) /* 78D6C4 802A1574 46806320 */ cvt.s.w $f12, $f12 /* 78D6C8 802A1578 46006302 */ mul.s $f12, $f12, $f0 -/* 78D6CC 802A157C 00000000 */ nop +/* 78D6CC 802A157C 00000000 */ nop /* 78D6D0 802A1580 3C0143B4 */ lui $at, 0x43b4 /* 78D6D4 802A1584 44810000 */ mtc1 $at, $f0 /* 78D6D8 802A1588 8E300078 */ lw $s0, 0x78($s1) @@ -38,19 +38,19 @@ glabel func_802A1518_78D668 /* 78D6E0 802A1590 46006303 */ div.s $f12, $f12, $f0 /* 78D6E4 802A1594 3C0141F0 */ lui $at, 0x41f0 /* 78D6E8 802A1598 44811000 */ mtc1 $at, $f2 -/* 78D6EC 802A159C 00000000 */ nop +/* 78D6EC 802A159C 00000000 */ nop /* 78D6F0 802A15A0 46020002 */ mul.s $f0, $f0, $f2 -/* 78D6F4 802A15A4 00000000 */ nop +/* 78D6F4 802A15A4 00000000 */ nop /* 78D6F8 802A15A8 46020000 */ add.s $f0, $f0, $f2 /* 78D6FC 802A15AC 3C074248 */ lui $a3, 0x4248 /* 78D700 802A15B0 4600010D */ trunc.w.s $f4, $f0 /* 78D704 802A15B4 44022000 */ mfc1 $v0, $f4 /* 78D708 802A15B8 44902000 */ mtc1 $s0, $f4 -/* 78D70C 802A15BC 00000000 */ nop +/* 78D70C 802A15BC 00000000 */ nop /* 78D710 802A15C0 46802120 */ cvt.s.w $f4, $f4 /* 78D714 802A15C4 44052000 */ mfc1 $a1, $f4 /* 78D718 802A15C8 44822000 */ mtc1 $v0, $f4 -/* 78D71C 802A15CC 00000000 */ nop +/* 78D71C 802A15CC 00000000 */ nop /* 78D720 802A15D0 46802120 */ cvt.s.w $f4, $f4 /* 78D724 802A15D4 44062000 */ mfc1 $a2, $f4 /* 78D728 802A15D8 0C01C1B4 */ jal func_800706D0 @@ -71,4 +71,4 @@ glabel func_802A1518_78D668 /* 78D760 802A1610 8FB00010 */ lw $s0, 0x10($sp) /* 78D764 802A1614 03E00008 */ jr $ra /* 78D768 802A1618 27BD0020 */ addiu $sp, $sp, 0x20 -/* 78D76C 802A161C 00000000 */ nop +/* 78D76C 802A161C 00000000 */ nop diff --git a/asm/nonmatchings/code_7900D0/func_802A1000_7900D0.s b/asm/nonmatchings/code_7900D0/func_802A1000_7900D0.s index 21531fd584..2bd9e4d7d0 100644 --- a/asm/nonmatchings/code_7900D0/func_802A1000_7900D0.s +++ b/asm/nonmatchings/code_7900D0/func_802A1000_7900D0.s @@ -22,15 +22,15 @@ glabel func_802A1000_7900D0 /* 790114 802A1044 0C0B1EAF */ jal get_variable /* 790118 802A1048 0040802D */ daddu $s0, $v0, $zero /* 79011C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 790120 802A1050 00000000 */ nop +/* 790120 802A1050 00000000 */ nop /* 790124 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 790128 802A1058 44051000 */ mfc1 $a1, $f2 /* 79012C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 790130 802A1060 00000000 */ nop +/* 790130 802A1060 00000000 */ nop /* 790134 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 790138 802A1068 44061000 */ mfc1 $a2, $f2 /* 79013C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 790140 802A1070 00000000 */ nop +/* 790140 802A1070 00000000 */ nop /* 790144 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 790148 802A1078 3C014220 */ lui $at, 0x4220 /* 79014C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7900D0/func_802A10AC_79017C.s b/asm/nonmatchings/code_7900D0/func_802A10AC_79017C.s index 3d2fd1ae0b..dd970cc23b 100644 --- a/asm/nonmatchings/code_7900D0/func_802A10AC_79017C.s +++ b/asm/nonmatchings/code_7900D0/func_802A10AC_79017C.s @@ -23,15 +23,15 @@ glabel func_802A10AC_79017C /* 7901C4 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 7901C8 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 7901CC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7901D0 802A1100 00000000 */ nop +/* 7901D0 802A1100 00000000 */ nop /* 7901D4 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 7901D8 802A1108 44051000 */ mfc1 $a1, $f2 /* 7901DC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7901E0 802A1110 00000000 */ nop +/* 7901E0 802A1110 00000000 */ nop /* 7901E4 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 7901E8 802A1118 44061000 */ mfc1 $a2, $f2 /* 7901EC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 7901F0 802A1120 00000000 */ nop +/* 7901F0 802A1120 00000000 */ nop /* 7901F4 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 7901F8 802A1128 3C014248 */ lui $at, 0x4248 /* 7901FC 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7900D0/func_802A116C_79023C.s b/asm/nonmatchings/code_7900D0/func_802A116C_79023C.s index 7d7645c285..166b5eea14 100644 --- a/asm/nonmatchings/code_7900D0/func_802A116C_79023C.s +++ b/asm/nonmatchings/code_7900D0/func_802A116C_79023C.s @@ -22,15 +22,15 @@ glabel func_802A116C_79023C /* 790280 802A11B0 0C0B1EAF */ jal get_variable /* 790284 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 790288 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79028C 802A11BC 00000000 */ nop +/* 79028C 802A11BC 00000000 */ nop /* 790290 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 790294 802A11C4 44051000 */ mfc1 $a1, $f2 /* 790298 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79029C 802A11CC 00000000 */ nop +/* 79029C 802A11CC 00000000 */ nop /* 7902A0 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 7902A4 802A11D4 44061000 */ mfc1 $a2, $f2 /* 7902A8 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 7902AC 802A11DC 00000000 */ nop +/* 7902AC 802A11DC 00000000 */ nop /* 7902B0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 7902B4 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 7902B8 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7900D0/func_802A1218_7902E8.s b/asm/nonmatchings/code_7900D0/func_802A1218_7902E8.s index ad9c7780a6..ef617e8282 100644 --- a/asm/nonmatchings/code_7900D0/func_802A1218_7902E8.s +++ b/asm/nonmatchings/code_7900D0/func_802A1218_7902E8.s @@ -23,15 +23,15 @@ glabel func_802A1218_7902E8 /* 790330 802A1260 0040802D */ daddu $s0, $v0, $zero /* 790334 802A1264 24040004 */ addiu $a0, $zero, 4 /* 790338 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79033C 802A126C 00000000 */ nop +/* 79033C 802A126C 00000000 */ nop /* 790340 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 790344 802A1274 44052000 */ mfc1 $a1, $f4 /* 790348 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79034C 802A127C 00000000 */ nop +/* 79034C 802A127C 00000000 */ nop /* 790350 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 790354 802A1284 44062000 */ mfc1 $a2, $f4 /* 790358 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79035C 802A128C 00000000 */ nop +/* 79035C 802A128C 00000000 */ nop /* 790360 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 790364 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 790368 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7900D0/func_802A153C_79060C.s b/asm/nonmatchings/code_7900D0/func_802A153C_79060C.s index 832ff7753c..a7adcd814c 100644 --- a/asm/nonmatchings/code_7900D0/func_802A153C_79060C.s +++ b/asm/nonmatchings/code_7900D0/func_802A153C_79060C.s @@ -10,20 +10,20 @@ glabel func_802A153C_79060C /* 790620 802A1550 240400C8 */ addiu $a0, $zero, 0xc8 /* 790624 802A1554 2442FFE7 */ addiu $v0, $v0, -0x19 /* 790628 802A1558 4482B000 */ mtc1 $v0, $f22 -/* 79062C 802A155C 00000000 */ nop +/* 79062C 802A155C 00000000 */ nop /* 790630 802A1560 4680B5A0 */ cvt.s.w $f22, $f22 /* 790634 802A1564 0C00A67F */ jal rand_int /* 790638 802A1568 24040078 */ addiu $a0, $zero, 0x78 /* 79063C 802A156C 24420007 */ addiu $v0, $v0, 7 /* 790640 802A1570 4482A000 */ mtc1 $v0, $f20 -/* 790644 802A1574 00000000 */ nop +/* 790644 802A1574 00000000 */ nop /* 790648 802A1578 4680A520 */ cvt.s.w $f20, $f20 /* 79064C 802A157C 0C00A67F */ jal rand_int /* 790650 802A1580 24040032 */ addiu $a0, $zero, 0x32 /* 790654 802A1584 24040002 */ addiu $a0, $zero, 2 /* 790658 802A1588 2442FFE7 */ addiu $v0, $v0, -0x19 /* 79065C 802A158C 44821000 */ mtc1 $v0, $f2 -/* 790660 802A1590 00000000 */ nop +/* 790660 802A1590 00000000 */ nop /* 790664 802A1594 468010A0 */ cvt.s.w $f2, $f2 /* 790668 802A1598 44071000 */ mfc1 $a3, $f2 /* 79066C 802A159C 4405B000 */ mfc1 $a1, $f22 @@ -38,19 +38,19 @@ glabel func_802A153C_79060C /* 790690 802A15C0 240400C8 */ addiu $a0, $zero, 0xc8 /* 790694 802A15C4 2442FFE7 */ addiu $v0, $v0, -0x19 /* 790698 802A15C8 4482B000 */ mtc1 $v0, $f22 -/* 79069C 802A15CC 00000000 */ nop +/* 79069C 802A15CC 00000000 */ nop /* 7906A0 802A15D0 4680B5A0 */ cvt.s.w $f22, $f22 /* 7906A4 802A15D4 0C00A67F */ jal rand_int /* 7906A8 802A15D8 24040078 */ addiu $a0, $zero, 0x78 /* 7906AC 802A15DC 24420007 */ addiu $v0, $v0, 7 /* 7906B0 802A15E0 4482A000 */ mtc1 $v0, $f20 -/* 7906B4 802A15E4 00000000 */ nop +/* 7906B4 802A15E4 00000000 */ nop /* 7906B8 802A15E8 4680A520 */ cvt.s.w $f20, $f20 /* 7906BC 802A15EC 0C00A67F */ jal rand_int /* 7906C0 802A15F0 24040032 */ addiu $a0, $zero, 0x32 /* 7906C4 802A15F4 2442FFE7 */ addiu $v0, $v0, -0x19 /* 7906C8 802A15F8 44821000 */ mtc1 $v0, $f2 -/* 7906CC 802A15FC 00000000 */ nop +/* 7906CC 802A15FC 00000000 */ nop /* 7906D0 802A1600 468010A0 */ cvt.s.w $f2, $f2 /* 7906D4 802A1604 4405B000 */ mfc1 $a1, $f22 /* 7906D8 802A1608 4406A000 */ mfc1 $a2, $f20 diff --git a/asm/nonmatchings/code_7900D0/func_802A16F4_7907C4.s b/asm/nonmatchings/code_7900D0/func_802A16F4_7907C4.s index 419578a7bd..eef24f0e29 100644 --- a/asm/nonmatchings/code_7900D0/func_802A16F4_7907C4.s +++ b/asm/nonmatchings/code_7900D0/func_802A16F4_7907C4.s @@ -49,13 +49,13 @@ glabel func_802A16F4_7907C4 /* 790870 802A17A0 C6000144 */ lwc1 $f0, 0x144($s0) /* 790874 802A17A4 8E030000 */ lw $v1, ($s0) /* 790878 802A17A8 44821000 */ mtc1 $v0, $f2 -/* 79087C 802A17AC 00000000 */ nop +/* 79087C 802A17AC 00000000 */ nop /* 790880 802A17B0 468010A0 */ cvt.s.w $f2, $f2 /* 790884 802A17B4 92020190 */ lbu $v0, 0x190($s0) /* 790888 802A17B8 46020000 */ add.s $f0, $f0, $f2 /* 79088C 802A17BC 00021042 */ srl $v0, $v0, 1 /* 790890 802A17C0 44821000 */ mtc1 $v0, $f2 -/* 790894 802A17C4 00000000 */ nop +/* 790894 802A17C4 00000000 */ nop /* 790898 802A17C8 468010A0 */ cvt.s.w $f2, $f2 /* 79089C 802A17CC 30620800 */ andi $v0, $v1, 0x800 /* 7908A0 802A17D0 1040000D */ beqz $v0, .L802A1808 @@ -63,28 +63,28 @@ glabel func_802A16F4_7907C4 /* 7908A8 802A17D8 86020152 */ lh $v0, 0x152($s0) /* 7908AC 802A17DC C6000148 */ lwc1 $f0, 0x148($s0) /* 7908B0 802A17E0 44821000 */ mtc1 $v0, $f2 -/* 7908B4 802A17E4 00000000 */ nop +/* 7908B4 802A17E4 00000000 */ nop /* 7908B8 802A17E8 468010A0 */ cvt.s.w $f2, $f2 /* 7908BC 802A17EC 92020191 */ lbu $v0, 0x191($s0) /* 7908C0 802A17F0 46020000 */ add.s $f0, $f0, $f2 /* 7908C4 802A17F4 44821000 */ mtc1 $v0, $f2 -/* 7908C8 802A17F8 00000000 */ nop +/* 7908C8 802A17F8 00000000 */ nop /* 7908CC 802A17FC 468010A0 */ cvt.s.w $f2, $f2 /* 7908D0 802A1800 080A861D */ j .L802A1874 /* 7908D4 802A1804 46020001 */ sub.s $f0, $f0, $f2 .L802A1808: /* 7908D8 802A1808 30628000 */ andi $v0, $v1, 0x8000 /* 7908DC 802A180C 1440000D */ bnez $v0, .L802A1844 -/* 7908E0 802A1810 00000000 */ nop +/* 7908E0 802A1810 00000000 */ nop /* 7908E4 802A1814 86020152 */ lh $v0, 0x152($s0) /* 7908E8 802A1818 C6000148 */ lwc1 $f0, 0x148($s0) /* 7908EC 802A181C 44821000 */ mtc1 $v0, $f2 -/* 7908F0 802A1820 00000000 */ nop +/* 7908F0 802A1820 00000000 */ nop /* 7908F4 802A1824 468010A0 */ cvt.s.w $f2, $f2 /* 7908F8 802A1828 92020191 */ lbu $v0, 0x191($s0) /* 7908FC 802A182C 46020000 */ add.s $f0, $f0, $f2 /* 790900 802A1830 44821000 */ mtc1 $v0, $f2 -/* 790904 802A1834 00000000 */ nop +/* 790904 802A1834 00000000 */ nop /* 790908 802A1838 468010A0 */ cvt.s.w $f2, $f2 /* 79090C 802A183C 080A861D */ j .L802A1874 /* 790910 802A1840 46001000 */ add.s $f0, $f2, $f0 @@ -92,13 +92,13 @@ glabel func_802A16F4_7907C4 /* 790914 802A1844 86020152 */ lh $v0, 0x152($s0) /* 790918 802A1848 C6020148 */ lwc1 $f2, 0x148($s0) /* 79091C 802A184C 44820000 */ mtc1 $v0, $f0 -/* 790920 802A1850 00000000 */ nop +/* 790920 802A1850 00000000 */ nop /* 790924 802A1854 46800020 */ cvt.s.w $f0, $f0 /* 790928 802A1858 92020191 */ lbu $v0, 0x191($s0) /* 79092C 802A185C 46001080 */ add.s $f2, $f2, $f0 /* 790930 802A1860 00021040 */ sll $v0, $v0, 1 /* 790934 802A1864 44820000 */ mtc1 $v0, $f0 -/* 790938 802A1868 00000000 */ nop +/* 790938 802A1868 00000000 */ nop /* 79093C 802A186C 46800020 */ cvt.s.w $f0, $f0 /* 790940 802A1870 46001000 */ add.s $f0, $f2, $f0 .L802A1874: @@ -106,7 +106,7 @@ glabel func_802A16F4_7907C4 /* 790948 802A1878 44060000 */ mfc1 $a2, $f0 /* 79094C 802A187C C600014C */ lwc1 $f0, 0x14c($s0) /* 790950 802A1880 44821000 */ mtc1 $v0, $f2 -/* 790954 802A1884 00000000 */ nop +/* 790954 802A1884 00000000 */ nop /* 790958 802A1888 468010A0 */ cvt.s.w $f2, $f2 /* 79095C 802A188C 46020000 */ add.s $f0, $f0, $f2 /* 790960 802A1890 3C0140A0 */ lui $at, 0x40a0 @@ -132,5 +132,5 @@ glabel func_802A16F4_7907C4 /* 7909AC 802A18DC 8FB00018 */ lw $s0, 0x18($sp) /* 7909B0 802A18E0 03E00008 */ jr $ra /* 7909B4 802A18E4 27BD0020 */ addiu $sp, $sp, 0x20 -/* 7909B8 802A18E8 00000000 */ nop -/* 7909BC 802A18EC 00000000 */ nop +/* 7909B8 802A18E8 00000000 */ nop +/* 7909BC 802A18EC 00000000 */ nop diff --git a/asm/nonmatchings/code_7952E0/func_802A10AC_79538C.s b/asm/nonmatchings/code_7952E0/func_802A10AC_79538C.s index 304a21647a..51abb48ccc 100644 --- a/asm/nonmatchings/code_7952E0/func_802A10AC_79538C.s +++ b/asm/nonmatchings/code_7952E0/func_802A10AC_79538C.s @@ -23,15 +23,15 @@ glabel func_802A10AC_79538C /* 7953D4 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 7953D8 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 7953DC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7953E0 802A1100 00000000 */ nop +/* 7953E0 802A1100 00000000 */ nop /* 7953E4 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 7953E8 802A1108 44051000 */ mfc1 $a1, $f2 /* 7953EC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7953F0 802A1110 00000000 */ nop +/* 7953F0 802A1110 00000000 */ nop /* 7953F4 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 7953F8 802A1118 44061000 */ mfc1 $a2, $f2 /* 7953FC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 795400 802A1120 00000000 */ nop +/* 795400 802A1120 00000000 */ nop /* 795404 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 795408 802A1128 3C014248 */ lui $at, 0x4248 /* 79540C 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7952E0/func_802A1218_7954F8.s b/asm/nonmatchings/code_7952E0/func_802A1218_7954F8.s index 19c4799812..88ea7f98b4 100644 --- a/asm/nonmatchings/code_7952E0/func_802A1218_7954F8.s +++ b/asm/nonmatchings/code_7952E0/func_802A1218_7954F8.s @@ -23,15 +23,15 @@ glabel func_802A1218_7954F8 /* 795540 802A1260 0040802D */ daddu $s0, $v0, $zero /* 795544 802A1264 24040004 */ addiu $a0, $zero, 4 /* 795548 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79554C 802A126C 00000000 */ nop +/* 79554C 802A126C 00000000 */ nop /* 795550 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 795554 802A1274 44052000 */ mfc1 $a1, $f4 /* 795558 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79555C 802A127C 00000000 */ nop +/* 79555C 802A127C 00000000 */ nop /* 795560 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 795564 802A1284 44062000 */ mfc1 $a2, $f4 /* 795568 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79556C 802A128C 00000000 */ nop +/* 79556C 802A128C 00000000 */ nop /* 795570 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 795574 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 795578 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7952E0/func_802A1628_795908.s b/asm/nonmatchings/code_7952E0/func_802A1628_795908.s index 230f370981..529f658a80 100644 --- a/asm/nonmatchings/code_7952E0/func_802A1628_795908.s +++ b/asm/nonmatchings/code_7952E0/func_802A1628_795908.s @@ -44,4 +44,4 @@ glabel func_802A1628_795908 /* 7959A0 802A16C0 8FB00010 */ lw $s0, 0x10($sp) /* 7959A4 802A16C4 03E00008 */ jr $ra /* 7959A8 802A16C8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 7959AC 802A16CC 00000000 */ nop +/* 7959AC 802A16CC 00000000 */ nop diff --git a/asm/nonmatchings/code_796FC0/func_802A1000_796FC0.s b/asm/nonmatchings/code_796FC0/func_802A1000_796FC0.s index 303e76f699..b2bb6aafb4 100644 --- a/asm/nonmatchings/code_796FC0/func_802A1000_796FC0.s +++ b/asm/nonmatchings/code_796FC0/func_802A1000_796FC0.s @@ -22,15 +22,15 @@ glabel func_802A1000_796FC0 /* 797004 802A1044 0C0B1EAF */ jal get_variable /* 797008 802A1048 0040802D */ daddu $s0, $v0, $zero /* 79700C 802A104C 44921000 */ mtc1 $s2, $f2 -/* 797010 802A1050 00000000 */ nop +/* 797010 802A1050 00000000 */ nop /* 797014 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 797018 802A1058 44051000 */ mfc1 $a1, $f2 /* 79701C 802A105C 44901000 */ mtc1 $s0, $f2 -/* 797020 802A1060 00000000 */ nop +/* 797020 802A1060 00000000 */ nop /* 797024 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 797028 802A1068 44061000 */ mfc1 $a2, $f2 /* 79702C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 797030 802A1070 00000000 */ nop +/* 797030 802A1070 00000000 */ nop /* 797034 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 797038 802A1078 3C014220 */ lui $at, 0x4220 /* 79703C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_796FC0/func_802A10AC_79706C.s b/asm/nonmatchings/code_796FC0/func_802A10AC_79706C.s index a2f7e28387..91323d6d4f 100644 --- a/asm/nonmatchings/code_796FC0/func_802A10AC_79706C.s +++ b/asm/nonmatchings/code_796FC0/func_802A10AC_79706C.s @@ -23,15 +23,15 @@ glabel func_802A10AC_79706C /* 7970B4 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 7970B8 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 7970BC 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 7970C0 802A1100 00000000 */ nop +/* 7970C0 802A1100 00000000 */ nop /* 7970C4 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 7970C8 802A1108 44051000 */ mfc1 $a1, $f2 /* 7970CC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 7970D0 802A1110 00000000 */ nop +/* 7970D0 802A1110 00000000 */ nop /* 7970D4 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 7970D8 802A1118 44061000 */ mfc1 $a2, $f2 /* 7970DC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 7970E0 802A1120 00000000 */ nop +/* 7970E0 802A1120 00000000 */ nop /* 7970E4 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 7970E8 802A1128 3C014248 */ lui $at, 0x4248 /* 7970EC 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_796FC0/func_802A116C_79712C.s b/asm/nonmatchings/code_796FC0/func_802A116C_79712C.s index cec8975de1..a547d453ac 100644 --- a/asm/nonmatchings/code_796FC0/func_802A116C_79712C.s +++ b/asm/nonmatchings/code_796FC0/func_802A116C_79712C.s @@ -22,15 +22,15 @@ glabel func_802A116C_79712C /* 797170 802A11B0 0C0B1EAF */ jal get_variable /* 797174 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 797178 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79717C 802A11BC 00000000 */ nop +/* 79717C 802A11BC 00000000 */ nop /* 797180 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 797184 802A11C4 44051000 */ mfc1 $a1, $f2 /* 797188 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79718C 802A11CC 00000000 */ nop +/* 79718C 802A11CC 00000000 */ nop /* 797190 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 797194 802A11D4 44061000 */ mfc1 $a2, $f2 /* 797198 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79719C 802A11DC 00000000 */ nop +/* 79719C 802A11DC 00000000 */ nop /* 7971A0 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 7971A4 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 7971A8 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_796FC0/func_802A1218_7971D8.s b/asm/nonmatchings/code_796FC0/func_802A1218_7971D8.s index 4088445a9a..a707b21699 100644 --- a/asm/nonmatchings/code_796FC0/func_802A1218_7971D8.s +++ b/asm/nonmatchings/code_796FC0/func_802A1218_7971D8.s @@ -23,15 +23,15 @@ glabel func_802A1218_7971D8 /* 797220 802A1260 0040802D */ daddu $s0, $v0, $zero /* 797224 802A1264 24040004 */ addiu $a0, $zero, 4 /* 797228 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79722C 802A126C 00000000 */ nop +/* 79722C 802A126C 00000000 */ nop /* 797230 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 797234 802A1274 44052000 */ mfc1 $a1, $f4 /* 797238 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79723C 802A127C 00000000 */ nop +/* 79723C 802A127C 00000000 */ nop /* 797240 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 797244 802A1284 44062000 */ mfc1 $a2, $f4 /* 797248 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79724C 802A128C 00000000 */ nop +/* 79724C 802A128C 00000000 */ nop /* 797250 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 797254 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 797258 802A1298 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 061914770d..e20f4bfad8 100644 --- a/asm/nonmatchings/code_796FC0/func_802A1518_7974D8.s +++ b/asm/nonmatchings/code_796FC0/func_802A1518_7974D8.s @@ -35,7 +35,7 @@ glabel func_802A1518_7974D8 /* 79754C 802A158C 82A3040C */ lb $v1, 0x40c($s5) /* 797550 802A1590 24020001 */ addiu $v0, $zero, 1 /* 797554 802A1594 14620040 */ bne $v1, $v0, .L802A1698 -/* 797558 802A1598 00000000 */ nop +/* 797558 802A1598 00000000 */ nop /* 79755C 802A159C 0C09A75B */ jal get_actor /* 797560 802A15A0 86A40428 */ lh $a0, 0x428($s5) /* 797564 802A15A4 0040802D */ daddu $s0, $v0, $zero @@ -48,7 +48,7 @@ glabel func_802A1518_7974D8 /* 797580 802A15C0 C6000144 */ lwc1 $f0, 0x144($s0) /* 797584 802A15C4 8E030000 */ lw $v1, ($s0) /* 797588 802A15C8 44821000 */ mtc1 $v0, $f2 -/* 79758C 802A15CC 00000000 */ nop +/* 79758C 802A15CC 00000000 */ nop /* 797590 802A15D0 468010A0 */ cvt.s.w $f2, $f2 /* 797594 802A15D4 30620800 */ andi $v0, $v1, 0x800 /* 797598 802A15D8 1040000D */ beqz $v0, .L802A1610 @@ -56,28 +56,28 @@ glabel func_802A1518_7974D8 /* 7975A0 802A15E0 86020152 */ lh $v0, 0x152($s0) /* 7975A4 802A15E4 C6000148 */ lwc1 $f0, 0x148($s0) /* 7975A8 802A15E8 44821000 */ mtc1 $v0, $f2 -/* 7975AC 802A15EC 00000000 */ nop +/* 7975AC 802A15EC 00000000 */ nop /* 7975B0 802A15F0 468010A0 */ cvt.s.w $f2, $f2 /* 7975B4 802A15F4 92020191 */ lbu $v0, 0x191($s0) /* 7975B8 802A15F8 46020000 */ add.s $f0, $f0, $f2 /* 7975BC 802A15FC 44821000 */ mtc1 $v0, $f2 -/* 7975C0 802A1600 00000000 */ nop +/* 7975C0 802A1600 00000000 */ nop /* 7975C4 802A1604 468010A0 */ cvt.s.w $f2, $f2 /* 7975C8 802A1608 080A859F */ j .L802A167C /* 7975CC 802A160C 46020601 */ sub.s $f24, $f0, $f2 .L802A1610: /* 7975D0 802A1610 30628000 */ andi $v0, $v1, 0x8000 /* 7975D4 802A1614 1440000D */ bnez $v0, .L802A164C -/* 7975D8 802A1618 00000000 */ nop +/* 7975D8 802A1618 00000000 */ nop /* 7975DC 802A161C 86020152 */ lh $v0, 0x152($s0) /* 7975E0 802A1620 C6000148 */ lwc1 $f0, 0x148($s0) /* 7975E4 802A1624 44821000 */ mtc1 $v0, $f2 -/* 7975E8 802A1628 00000000 */ nop +/* 7975E8 802A1628 00000000 */ nop /* 7975EC 802A162C 468010A0 */ cvt.s.w $f2, $f2 /* 7975F0 802A1630 92020191 */ lbu $v0, 0x191($s0) /* 7975F4 802A1634 46020000 */ add.s $f0, $f0, $f2 /* 7975F8 802A1638 44821000 */ mtc1 $v0, $f2 -/* 7975FC 802A163C 00000000 */ nop +/* 7975FC 802A163C 00000000 */ nop /* 797600 802A1640 468010A0 */ cvt.s.w $f2, $f2 /* 797604 802A1644 080A859F */ j .L802A167C /* 797608 802A1648 46001600 */ add.s $f24, $f2, $f0 @@ -85,20 +85,20 @@ glabel func_802A1518_7974D8 /* 79760C 802A164C 86020152 */ lh $v0, 0x152($s0) /* 797610 802A1650 C6020148 */ lwc1 $f2, 0x148($s0) /* 797614 802A1654 44820000 */ mtc1 $v0, $f0 -/* 797618 802A1658 00000000 */ nop +/* 797618 802A1658 00000000 */ nop /* 79761C 802A165C 46800020 */ cvt.s.w $f0, $f0 /* 797620 802A1660 92020191 */ lbu $v0, 0x191($s0) /* 797624 802A1664 46001080 */ add.s $f2, $f2, $f0 /* 797628 802A1668 00021040 */ sll $v0, $v0, 1 /* 79762C 802A166C 44820000 */ mtc1 $v0, $f0 -/* 797630 802A1670 00000000 */ nop +/* 797630 802A1670 00000000 */ nop /* 797634 802A1674 46800020 */ cvt.s.w $f0, $f0 /* 797638 802A1678 46001600 */ add.s $f24, $f2, $f0 .L802A167C: /* 79763C 802A167C 86020154 */ lh $v0, 0x154($s0) /* 797640 802A1680 C602014C */ lwc1 $f2, 0x14c($s0) /* 797644 802A1684 44820000 */ mtc1 $v0, $f0 -/* 797648 802A1688 00000000 */ nop +/* 797648 802A1688 00000000 */ nop /* 79764C 802A168C 46800020 */ cvt.s.w $f0, $f0 /* 797650 802A1690 080A85AB */ j .L802A16AC /* 797654 802A1694 46001680 */ add.s $f26, $f2, $f0 @@ -118,7 +118,7 @@ glabel func_802A1518_7974D8 /* 797684 802A16C4 1062003B */ beq $v1, $v0, .L802A17B4 /* 797688 802A16C8 2C620016 */ sltiu $v0, $v1, 0x16 /* 79768C 802A16CC 080A8625 */ j .L802A1894 -/* 797690 802A16D0 00000000 */ nop +/* 797690 802A16D0 00000000 */ nop .L802A16D4: /* 797694 802A16D4 24160014 */ addiu $s6, $zero, 0x14 /* 797698 802A16D8 2417000A */ addiu $s7, $zero, 0xa @@ -182,7 +182,7 @@ glabel func_802A1518_7974D8 /* 797764 802A17A4 1440FFD8 */ bnez $v0, .L802A1708 /* 797768 802A17A8 2694001C */ addiu $s4, $s4, 0x1c /* 79776C 802A17AC 080A8623 */ j .L802A188C -/* 797770 802A17B0 00000000 */ nop +/* 797770 802A17B0 00000000 */ nop .L802A17B4: /* 797774 802A17B4 24160014 */ addiu $s6, $zero, 0x14 /* 797778 802A17B8 2417000A */ addiu $s7, $zero, 0xa @@ -256,7 +256,7 @@ glabel func_802A1518_7974D8 /* 797860 802A18A0 00220821 */ addu $at, $at, $v0 /* 797864 802A18A4 8C223790 */ lw $v0, %lo(D_802A3790)($at) /* 797868 802A18A8 00400008 */ jr $v0 -/* 79786C 802A18AC 00000000 */ nop +/* 79786C 802A18AC 00000000 */ nop /* 797870 802A18B0 C6B40144 */ lwc1 $f20, 0x144($s5) /* 797874 802A18B4 C6BE014C */ lwc1 $f30, 0x14c($s5) /* 797878 802A18B8 92A20191 */ lbu $v0, 0x191($s5) @@ -264,7 +264,7 @@ glabel func_802A1518_7974D8 /* 797880 802A18C0 3C0141F0 */ lui $at, 0x41f0 /* 797884 802A18C4 44812000 */ mtc1 $at, $f4 /* 797888 802A18C8 44820000 */ mtc1 $v0, $f0 -/* 79788C 802A18CC 00000000 */ nop +/* 79788C 802A18CC 00000000 */ nop /* 797890 802A18D0 46800020 */ cvt.s.w $f0, $f0 /* 797894 802A18D4 46001080 */ add.s $f2, $f2, $f0 /* 797898 802A18D8 3C014316 */ lui $at, 0x4316 @@ -342,7 +342,7 @@ glabel func_802A1518_7974D8 /* 7979A8 802A19E8 34840069 */ ori $a0, $a0, 0x69 .L802A19EC: /* 7979AC 802A19EC 0C05272D */ jal play_sound -/* 7979B0 802A19F0 00000000 */ nop +/* 7979B0 802A19F0 00000000 */ nop /* 7979B4 802A19F4 24020001 */ addiu $v0, $zero, 1 /* 7979B8 802A19F8 080A8907 */ j .L802A241C /* 7979BC 802A19FC AFC20070 */ sw $v0, 0x70($fp) @@ -395,13 +395,13 @@ glabel func_802A1518_7974D8 /* 797A78 802A1AB8 C624004C */ lwc1 $f4, 0x4c($s1) /* 797A7C 802A1ABC 3C0141C0 */ lui $at, 0x41c0 /* 797A80 802A1AC0 44810000 */ mtc1 $at, $f0 -/* 797A84 802A1AC4 00000000 */ nop +/* 797A84 802A1AC4 00000000 */ nop /* 797A88 802A1AC8 46040001 */ sub.s $f0, $f0, $f4 /* 797A8C 802A1ACC 3C013E00 */ lui $at, 0x3e00 /* 797A90 802A1AD0 44811000 */ mtc1 $at, $f2 -/* 797A94 802A1AD4 00000000 */ nop +/* 797A94 802A1AD4 00000000 */ nop /* 797A98 802A1AD8 46020002 */ mul.s $f0, $f0, $f2 -/* 797A9C 802A1ADC 00000000 */ nop +/* 797A9C 802A1ADC 00000000 */ nop /* 797AA0 802A1AE0 46002100 */ add.s $f4, $f4, $f0 /* 797AA4 802A1AE4 3C02802A */ lui $v0, %hi(D_802A37F0) /* 797AA8 802A1AE8 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) @@ -429,20 +429,20 @@ glabel func_802A1518_7974D8 /* 797AFC 802A1B3C 24040648 */ addiu $a0, $zero, 0x648 .L802A1B40: /* 797B00 802A1B40 0C05272D */ jal play_sound -/* 797B04 802A1B44 00000000 */ nop +/* 797B04 802A1B44 00000000 */ nop /* 797B08 802A1B48 24020004 */ addiu $v0, $zero, 4 /* 797B0C 802A1B4C 080A8907 */ j .L802A241C /* 797B10 802A1B50 AFC20070 */ sw $v0, 0x70($fp) /* 797B14 802A1B54 C624004C */ lwc1 $f4, 0x4c($s1) /* 797B18 802A1B58 3C014240 */ lui $at, 0x4240 /* 797B1C 802A1B5C 44811000 */ mtc1 $at, $f2 -/* 797B20 802A1B60 00000000 */ nop +/* 797B20 802A1B60 00000000 */ nop /* 797B24 802A1B64 46041081 */ sub.s $f2, $f2, $f4 /* 797B28 802A1B68 3C013E80 */ lui $at, 0x3e80 /* 797B2C 802A1B6C 44810000 */ mtc1 $at, $f0 -/* 797B30 802A1B70 00000000 */ nop +/* 797B30 802A1B70 00000000 */ nop /* 797B34 802A1B74 46001082 */ mul.s $f2, $f2, $f0 -/* 797B38 802A1B78 00000000 */ nop +/* 797B38 802A1B78 00000000 */ nop /* 797B3C 802A1B7C 0000B82D */ daddu $s7, $zero, $zero /* 797B40 802A1B80 02E0902D */ daddu $s2, $s7, $zero /* 797B44 802A1B84 3C13802A */ lui $s3, %hi(D_802A3818) @@ -462,7 +462,7 @@ glabel func_802A1518_7974D8 /* 797B78 802A1BB8 26730004 */ addiu $s3, $s3, 4 /* 797B7C 802A1BBC 8E020000 */ lw $v0, ($s0) /* 797B80 802A1BC0 04410013 */ bgez $v0, .L802A1C10 -/* 797B84 802A1BC4 00000000 */ nop +/* 797B84 802A1BC4 00000000 */ nop /* 797B88 802A1BC8 C6340000 */ lwc1 $f20, ($s1) /* 797B8C 802A1BCC C638000C */ lwc1 $f24, 0xc($s1) /* 797B90 802A1BD0 C6360004 */ lwc1 $f22, 4($s1) @@ -602,7 +602,7 @@ glabel func_802A1518_7974D8 .L802A1DD0: /* 797D90 802A1DD0 8FC20078 */ lw $v0, 0x78($fp) /* 797D94 802A1DD4 14400003 */ bnez $v0, .L802A1DE4 -/* 797D98 802A1DD8 00000000 */ nop +/* 797D98 802A1DD8 00000000 */ nop /* 797D9C 802A1DDC 52400008 */ beql $s2, $zero, .L802A1E00 /* 797DA0 802A1DE0 24A50004 */ addiu $a1, $a1, 4 .L802A1DE4: @@ -667,7 +667,7 @@ glabel func_802A1518_7974D8 /* 797E84 802A1EC4 E4480084 */ swc1 $f8, 0x84($v0) /* 797E88 802A1EC8 C6200004 */ lwc1 $f0, 4($s1) /* 797E8C 802A1ECC 46020002 */ mul.s $f0, $f0, $f2 -/* 797E90 802A1ED0 00000000 */ nop +/* 797E90 802A1ED0 00000000 */ nop /* 797E94 802A1ED4 4600020D */ trunc.w.s $f8, $f0 /* 797E98 802A1ED8 E4480088 */ swc1 $f8, 0x88($v0) /* 797E9C 802A1EDC C6200008 */ lwc1 $f0, 8($s1) @@ -714,7 +714,7 @@ glabel func_802A1518_7974D8 /* 797F3C 802A1F7C 2402000F */ addiu $v0, $zero, 0xf /* 797F40 802A1F80 86A40428 */ lh $a0, 0x428($s5) /* 797F44 802A1F84 0C09A75B */ jal get_actor -/* 797F48 802A1F88 00000000 */ nop +/* 797F48 802A1F88 00000000 */ nop /* 797F4C 802A1F8C 82A50426 */ lb $a1, 0x426($s5) /* 797F50 802A1F90 0C099117 */ jal get_actor_part /* 797F54 802A1F94 0040202D */ daddu $a0, $v0, $zero @@ -800,7 +800,7 @@ glabel func_802A1518_7974D8 /* 79807C 802A20BC 24040649 */ addiu $a0, $zero, 0x649 .L802A20C0: /* 798080 802A20C0 0C05272D */ jal play_sound -/* 798084 802A20C4 00000000 */ nop +/* 798084 802A20C4 00000000 */ nop .L802A20C8: /* 798088 802A20C8 0000B82D */ daddu $s7, $zero, $zero /* 79808C 802A20CC 02E0902D */ daddu $s2, $s7, $zero @@ -820,7 +820,7 @@ glabel func_802A1518_7974D8 .L802A2104: /* 7980C4 802A2104 8FC20078 */ lw $v0, 0x78($fp) /* 7980C8 802A2108 14400003 */ bnez $v0, .L802A2118 -/* 7980CC 802A210C 00000000 */ nop +/* 7980CC 802A210C 00000000 */ nop /* 7980D0 802A2110 5240001C */ beql $s2, $zero, .L802A2184 /* 7980D4 802A2114 24630004 */ addiu $v1, $v1, 4 .L802A2118: @@ -848,7 +848,7 @@ glabel func_802A1518_7974D8 /* 798128 802A2168 46000005 */ abs.s $f0, $f0 /* 79812C 802A216C 46000021 */ cvt.d.s $f0, $f0 /* 798130 802A2170 4624003C */ c.lt.d $f0, $f4 -/* 798134 802A2174 00000000 */ nop +/* 798134 802A2174 00000000 */ nop /* 798138 802A2178 45030001 */ bc1tl .L802A2180 /* 79813C 802A217C AC650000 */ sw $a1, ($v1) .L802A2180: @@ -859,7 +859,7 @@ glabel func_802A1518_7974D8 /* 79814C 802A218C 1440FFDD */ bnez $v0, .L802A2104 /* 798150 802A2190 2484001C */ addiu $a0, $a0, 0x1c /* 798154 802A2194 080A88FB */ j .L802A23EC -/* 798158 802A2198 00000000 */ nop +/* 798158 802A2198 00000000 */ nop /* 79815C 802A219C 3C02802A */ lui $v0, %hi(D_802A37F0) /* 798160 802A21A0 8C4237F0 */ lw $v0, %lo(D_802A37F0)($v0) /* 798164 802A21A4 2404000F */ addiu $a0, $zero, 0xf @@ -905,7 +905,7 @@ glabel func_802A1518_7974D8 .L802A223C: /* 7981FC 802A223C 8FC20078 */ lw $v0, 0x78($fp) /* 798200 802A2240 14400003 */ bnez $v0, .L802A2250 -/* 798204 802A2244 00000000 */ nop +/* 798204 802A2244 00000000 */ nop /* 798208 802A2248 5240005F */ beql $s2, $zero, .L802A23C8 /* 79820C 802A224C 26730004 */ addiu $s3, $s3, 4 .L802A2250: diff --git a/asm/nonmatchings/code_79BFA0/func_802A1000_79BFA0.s b/asm/nonmatchings/code_79BFA0/func_802A1000_79BFA0.s index 217a02973b..f2b5fffd2d 100644 --- a/asm/nonmatchings/code_79BFA0/func_802A1000_79BFA0.s +++ b/asm/nonmatchings/code_79BFA0/func_802A1000_79BFA0.s @@ -22,15 +22,15 @@ glabel func_802A1000_79BFA0 /* 79BFE4 802A1044 0C0B1EAF */ jal get_variable /* 79BFE8 802A1048 0040802D */ daddu $s0, $v0, $zero /* 79BFEC 802A104C 44921000 */ mtc1 $s2, $f2 -/* 79BFF0 802A1050 00000000 */ nop +/* 79BFF0 802A1050 00000000 */ nop /* 79BFF4 802A1054 468010A0 */ cvt.s.w $f2, $f2 /* 79BFF8 802A1058 44051000 */ mfc1 $a1, $f2 /* 79BFFC 802A105C 44901000 */ mtc1 $s0, $f2 -/* 79C000 802A1060 00000000 */ nop +/* 79C000 802A1060 00000000 */ nop /* 79C004 802A1064 468010A0 */ cvt.s.w $f2, $f2 /* 79C008 802A1068 44061000 */ mfc1 $a2, $f2 /* 79C00C 802A106C 44821000 */ mtc1 $v0, $f2 -/* 79C010 802A1070 00000000 */ nop +/* 79C010 802A1070 00000000 */ nop /* 79C014 802A1074 468010A0 */ cvt.s.w $f2, $f2 /* 79C018 802A1078 3C014220 */ lui $at, 0x4220 /* 79C01C 802A107C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_79BFA0/func_802A10AC_79C04C.s b/asm/nonmatchings/code_79BFA0/func_802A10AC_79C04C.s index 8b78cd1e48..d333785388 100644 --- a/asm/nonmatchings/code_79BFA0/func_802A10AC_79C04C.s +++ b/asm/nonmatchings/code_79BFA0/func_802A10AC_79C04C.s @@ -23,15 +23,15 @@ glabel func_802A10AC_79C04C /* 79C094 802A10F4 0040802D */ daddu $s0, $v0, $zero /* 79C098 802A10F8 24040005 */ addiu $a0, $zero, 5 /* 79C09C 802A10FC 44921000 */ mtc1 $s2, $f2 -/* 79C0A0 802A1100 00000000 */ nop +/* 79C0A0 802A1100 00000000 */ nop /* 79C0A4 802A1104 468010A0 */ cvt.s.w $f2, $f2 /* 79C0A8 802A1108 44051000 */ mfc1 $a1, $f2 /* 79C0AC 802A110C 44901000 */ mtc1 $s0, $f2 -/* 79C0B0 802A1110 00000000 */ nop +/* 79C0B0 802A1110 00000000 */ nop /* 79C0B4 802A1114 468010A0 */ cvt.s.w $f2, $f2 /* 79C0B8 802A1118 44061000 */ mfc1 $a2, $f2 /* 79C0BC 802A111C 44821000 */ mtc1 $v0, $f2 -/* 79C0C0 802A1120 00000000 */ nop +/* 79C0C0 802A1120 00000000 */ nop /* 79C0C4 802A1124 468010A0 */ cvt.s.w $f2, $f2 /* 79C0C8 802A1128 3C014248 */ lui $at, 0x4248 /* 79C0CC 802A112C 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_79BFA0/func_802A116C_79C10C.s b/asm/nonmatchings/code_79BFA0/func_802A116C_79C10C.s index 640fcdd3c6..0189e3a3b9 100644 --- a/asm/nonmatchings/code_79BFA0/func_802A116C_79C10C.s +++ b/asm/nonmatchings/code_79BFA0/func_802A116C_79C10C.s @@ -22,15 +22,15 @@ glabel func_802A116C_79C10C /* 79C150 802A11B0 0C0B1EAF */ jal get_variable /* 79C154 802A11B4 0040802D */ daddu $s0, $v0, $zero /* 79C158 802A11B8 44921000 */ mtc1 $s2, $f2 -/* 79C15C 802A11BC 00000000 */ nop +/* 79C15C 802A11BC 00000000 */ nop /* 79C160 802A11C0 468010A0 */ cvt.s.w $f2, $f2 /* 79C164 802A11C4 44051000 */ mfc1 $a1, $f2 /* 79C168 802A11C8 44901000 */ mtc1 $s0, $f2 -/* 79C16C 802A11CC 00000000 */ nop +/* 79C16C 802A11CC 00000000 */ nop /* 79C170 802A11D0 468010A0 */ cvt.s.w $f2, $f2 /* 79C174 802A11D4 44061000 */ mfc1 $a2, $f2 /* 79C178 802A11D8 44821000 */ mtc1 $v0, $f2 -/* 79C17C 802A11DC 00000000 */ nop +/* 79C17C 802A11DC 00000000 */ nop /* 79C180 802A11E0 468010A0 */ cvt.s.w $f2, $f2 /* 79C184 802A11E4 3C0141F0 */ lui $at, 0x41f0 /* 79C188 802A11E8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_79BFA0/func_802A1218_79C1B8.s b/asm/nonmatchings/code_79BFA0/func_802A1218_79C1B8.s index 02e3c8870e..bec665a6a3 100644 --- a/asm/nonmatchings/code_79BFA0/func_802A1218_79C1B8.s +++ b/asm/nonmatchings/code_79BFA0/func_802A1218_79C1B8.s @@ -23,15 +23,15 @@ glabel func_802A1218_79C1B8 /* 79C200 802A1260 0040802D */ daddu $s0, $v0, $zero /* 79C204 802A1264 24040004 */ addiu $a0, $zero, 4 /* 79C208 802A1268 44922000 */ mtc1 $s2, $f4 -/* 79C20C 802A126C 00000000 */ nop +/* 79C20C 802A126C 00000000 */ nop /* 79C210 802A1270 46802120 */ cvt.s.w $f4, $f4 /* 79C214 802A1274 44052000 */ mfc1 $a1, $f4 /* 79C218 802A1278 44902000 */ mtc1 $s0, $f4 -/* 79C21C 802A127C 00000000 */ nop +/* 79C21C 802A127C 00000000 */ nop /* 79C220 802A1280 46802120 */ cvt.s.w $f4, $f4 /* 79C224 802A1284 44062000 */ mfc1 $a2, $f4 /* 79C228 802A1288 44822000 */ mtc1 $v0, $f4 -/* 79C22C 802A128C 00000000 */ nop +/* 79C22C 802A128C 00000000 */ nop /* 79C230 802A1290 46802120 */ cvt.s.w $f4, $f4 /* 79C234 802A1294 3C0141A0 */ lui $at, 0x41a0 /* 79C238 802A1298 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s b/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s index e1924850a0..49a54701c9 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/check_input_jump.s @@ -16,14 +16,14 @@ glabel check_input_jump /* 7F63C 800E618C 0000102D */ daddu $v0, $zero, $zero /* 7F640 800E6190 96040002 */ lhu $a0, 2($s0) /* 7F644 800E6194 0C016F6A */ jal get_collider_type_by_id -/* 7F648 800E6198 00000000 */ nop +/* 7F648 800E6198 00000000 */ nop /* 7F64C 800E619C 24030005 */ addiu $v1, $zero, 5 /* 7F650 800E61A0 14430007 */ bne $v0, $v1, .L800E61C0 -/* 7F654 800E61A4 00000000 */ nop +/* 7F654 800E61A4 00000000 */ nop /* 7F658 800E61A8 0C039178 */ jal func_800E45E0 -/* 7F65C 800E61AC 00000000 */ nop +/* 7F65C 800E61AC 00000000 */ nop /* 7F660 800E61B0 10400003 */ beqz $v0, .L800E61C0 -/* 7F664 800E61B4 00000000 */ nop +/* 7F664 800E61B4 00000000 */ nop .L800E61B8: /* 7F668 800E61B8 08039895 */ j .L800E6254 /* 7F66C 800E61BC 0000102D */ daddu $v0, $zero, $zero @@ -41,14 +41,14 @@ glabel check_input_jump /* 7F698 800E61E8 10820017 */ beq $a0, $v0, .L800E6248 /* 7F69C 800E61EC 30624000 */ andi $v0, $v1, 0x4000 /* 7F6A0 800E61F0 10400015 */ beqz $v0, .L800E6248 -/* 7F6A4 800E61F4 00000000 */ nop +/* 7F6A4 800E61F4 00000000 */ nop /* 7F6A8 800E61F8 0C04417A */ jal get_entity_by_index -/* 7F6AC 800E61FC 00000000 */ nop +/* 7F6AC 800E61FC 00000000 */ nop /* 7F6B0 800E6200 0040182D */ daddu $v1, $v0, $zero /* 7F6B4 800E6204 8C440000 */ lw $a0, ($v0) /* 7F6B8 800E6208 30821000 */ andi $v0, $a0, 0x1000 /* 7F6BC 800E620C 1040000E */ beqz $v0, .L800E6248 -/* 7F6C0 800E6210 00000000 */ nop +/* 7F6C0 800E6210 00000000 */ nop /* 7F6C4 800E6214 8C620028 */ lw $v0, 0x28($v1) /* 7F6C8 800E6218 10400003 */ beqz $v0, .L800E6228 /* 7F6CC 800E621C 30824000 */ andi $v0, $a0, 0x4000 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/check_input_midair_jump.s b/asm/nonmatchings/code_7bb60_len_41b0/check_input_midair_jump.s index 89602e2291..a3ede4e73d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/check_input_midair_jump.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/check_input_midair_jump.s @@ -12,19 +12,19 @@ glabel check_input_midair_jump /* 7E498 800E4FE8 34630018 */ ori $v1, $v1, 0x18 /* 7E49C 800E4FEC 00431024 */ and $v0, $v0, $v1 /* 7E4A0 800E4FF0 14400021 */ bnez $v0, .L800E5078 -/* 7E4A4 800E4FF4 00000000 */ nop +/* 7E4A4 800E4FF4 00000000 */ nop /* 7E4A8 800E4FF8 8E020004 */ lw $v0, 4($s0) /* 7E4AC 800E4FFC 30424001 */ andi $v0, $v0, 0x4001 /* 7E4B0 800E5000 1440001D */ bnez $v0, .L800E5078 -/* 7E4B4 800E5004 00000000 */ nop +/* 7E4B4 800E5004 00000000 */ nop /* 7E4B8 800E5008 860200C2 */ lh $v0, 0xc2($s0) /* 7E4BC 800E500C 28420006 */ slti $v0, $v0, 6 /* 7E4C0 800E5010 14400019 */ bnez $v0, .L800E5078 -/* 7E4C4 800E5014 00000000 */ nop +/* 7E4C4 800E5014 00000000 */ nop /* 7E4C8 800E5018 860200C0 */ lh $v0, 0xc0($s0) /* 7E4CC 800E501C 28420012 */ slti $v0, $v0, 0x12 /* 7E4D0 800E5020 10400015 */ beqz $v0, .L800E5078 -/* 7E4D4 800E5024 00000000 */ nop +/* 7E4D4 800E5024 00000000 */ nop /* 7E4D8 800E5028 8E0200E0 */ lw $v0, 0xe0($s0) /* 7E4DC 800E502C 30428000 */ andi $v0, $v0, 0x8000 /* 7E4E0 800E5030 10400011 */ beqz $v0, .L800E5078 @@ -38,12 +38,12 @@ glabel check_input_midair_jump /* 7E500 800E5050 10620004 */ beq $v1, $v0, .L800E5064 /* 7E504 800E5054 2404000F */ addiu $a0, $zero, 0xf /* 7E508 800E5058 0803941E */ j .L800E5078 -/* 7E50C 800E505C 00000000 */ nop +/* 7E50C 800E505C 00000000 */ nop .L800E5060: /* 7E510 800E5060 2404000D */ addiu $a0, $zero, 0xd .L800E5064: /* 7E514 800E5064 0C039769 */ jal set_action_state -/* 7E518 800E5068 00000000 */ nop +/* 7E518 800E5068 00000000 */ nop /* 7E51C 800E506C 8E020000 */ lw $v0, ($s0) /* 7E520 800E5070 34420008 */ ori $v0, $v0, 8 /* 7E524 800E5074 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/check_input_spin.s b/asm/nonmatchings/code_7bb60_len_41b0/check_input_spin.s index f71ceb8a2c..0dbddd80e3 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/check_input_spin.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/check_input_spin.s @@ -18,15 +18,15 @@ glabel check_input_spin /* 7F74C 800E629C 8E020004 */ lw $v0, 4($s0) /* 7F750 800E62A0 30420001 */ andi $v0, $v0, 1 /* 7F754 800E62A4 1440002B */ bnez $v0, .L800E6354 -/* 7F758 800E62A8 00000000 */ nop +/* 7F758 800E62A8 00000000 */ nop /* 7F75C 800E62AC 8E0200DC */ lw $v0, 0xdc($s0) /* 7F760 800E62B0 30420004 */ andi $v0, $v0, 4 /* 7F764 800E62B4 14400027 */ bnez $v0, .L800E6354 -/* 7F768 800E62B8 00000000 */ nop +/* 7F768 800E62B8 00000000 */ nop /* 7F76C 800E62BC 0C03A752 */ jal is_ability_active /* 7F770 800E62C0 2404000B */ addiu $a0, $zero, 0xb /* 7F774 800E62C4 14400023 */ bnez $v0, .L800E6354 -/* 7F778 800E62C8 00000000 */ nop +/* 7F778 800E62C8 00000000 */ nop /* 7F77C 800E62CC 8E0200E0 */ lw $v0, 0xe0($s0) /* 7F780 800E62D0 820300B4 */ lb $v1, 0xb4($s0) /* 7F784 800E62D4 30442000 */ andi $a0, $v0, 0x2000 @@ -36,27 +36,27 @@ glabel check_input_spin /* 7F794 800E62E4 1040001B */ beqz $v0, .L800E6354 /* 7F798 800E62E8 28620003 */ slti $v0, $v1, 3 /* 7F79C 800E62EC 10400019 */ beqz $v0, .L800E6354 -/* 7F7A0 800E62F0 00000000 */ nop +/* 7F7A0 800E62F0 00000000 */ nop /* 7F7A4 800E62F4 04600017 */ bltz $v1, .L800E6354 /* 7F7A8 800E62F8 3C030001 */ lui $v1, 1 /* 7F7AC 800E62FC 8E020004 */ lw $v0, 4($s0) /* 7F7B0 800E6300 00431024 */ and $v0, $v0, $v1 /* 7F7B4 800E6304 14400013 */ bnez $v0, .L800E6354 -/* 7F7B8 800E6308 00000000 */ nop +/* 7F7B8 800E6308 00000000 */ nop /* 7F7BC 800E630C 14800004 */ bnez $a0, .L800E6320 -/* 7F7C0 800E6310 00000000 */ nop +/* 7F7C0 800E6310 00000000 */ nop /* 7F7C4 800E6314 82220001 */ lb $v0, 1($s1) /* 7F7C8 800E6318 1040000E */ beqz $v0, .L800E6354 -/* 7F7CC 800E631C 00000000 */ nop +/* 7F7CC 800E631C 00000000 */ nop .L800E6320: /* 7F7D0 800E6320 0C039769 */ jal set_action_state /* 7F7D4 800E6324 2404001A */ addiu $a0, $zero, 0x1a /* 7F7D8 800E6328 82220001 */ lb $v0, 1($s1) /* 7F7DC 800E632C 10400009 */ beqz $v0, .L800E6354 -/* 7F7E0 800E6330 00000000 */ nop +/* 7F7E0 800E6330 00000000 */ nop /* 7F7E4 800E6334 8E220008 */ lw $v0, 8($s1) /* 7F7E8 800E6338 14400004 */ bnez $v0, .L800E634C -/* 7F7EC 800E633C 00000000 */ nop +/* 7F7EC 800E633C 00000000 */ nop /* 7F7F0 800E6340 8E22000C */ lw $v0, 0xc($s1) /* 7F7F4 800E6344 50400003 */ beql $v0, $zero, .L800E6354 /* 7F7F8 800E6348 A20000B5 */ sb $zero, 0xb5($s0) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/collision_check_player_intersecting_world.s b/asm/nonmatchings/code_7bb60_len_41b0/collision_check_player_intersecting_world.s index e67810da35..5213653399 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/collision_check_player_intersecting_world.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/collision_check_player_intersecting_world.s @@ -19,7 +19,7 @@ glabel collision_check_player_intersecting_world /* 7D7F0 800E4340 26107B30 */ addiu $s0, $s0, %lo(gPlayerStatusPtr) /* 7D7F4 800E4344 F7B60050 */ sdc1 $f22, 0x50($sp) /* 7D7F8 800E4348 4485B000 */ mtc1 $a1, $f22 -/* 7D7FC 800E434C 00000000 */ nop +/* 7D7FC 800E434C 00000000 */ nop /* 7D800 800E4350 4680B5A0 */ cvt.s.w $f22, $f22 /* 7D804 800E4354 AFB3003C */ sw $s3, 0x3c($sp) /* 7D808 800E4358 27B30028 */ addiu $s3, $sp, 0x28 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s b/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s index 2d76ae1054..97796ceecb 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/collision_main_above.s @@ -14,10 +14,10 @@ glabel collision_main_above /* 7BCB4 800E2804 3C013F00 */ lui $at, 0x3f00 /* 7BCB8 800E2808 44811000 */ mtc1 $at, $f2 /* 7BCBC 800E280C 44820000 */ mtc1 $v0, $f0 -/* 7BCC0 800E2810 00000000 */ nop +/* 7BCC0 800E2810 00000000 */ nop /* 7BCC4 800E2814 46800020 */ cvt.s.w $f0, $f0 /* 7BCC8 800E2818 46020002 */ mul.s $f0, $f0, $f2 -/* 7BCCC 800E281C 00000000 */ nop +/* 7BCCC 800E281C 00000000 */ nop /* 7BCD0 800E2820 27A40018 */ addiu $a0, $sp, 0x18 /* 7BCD4 800E2824 C6220028 */ lwc1 $f2, 0x28($s1) /* 7BCD8 800E2828 27A5001C */ addiu $a1, $sp, 0x1c @@ -35,7 +35,7 @@ glabel collision_main_above /* 7BD08 800E2858 3C128016 */ lui $s2, %hi(gCollisionStatus) /* 7BD0C 800E285C 2652A550 */ addiu $s2, $s2, %lo(gCollisionStatus) /* 7BD10 800E2860 46001032 */ c.eq.s $f2, $f0 -/* 7BD14 800E2864 00000000 */ nop +/* 7BD14 800E2864 00000000 */ nop /* 7BD18 800E2868 45010004 */ bc1t .L800E287C /* 7BD1C 800E286C 0220202D */ daddu $a0, $s1, $zero /* 7BD20 800E2870 C6220080 */ lwc1 $f2, 0x80($s1) @@ -84,11 +84,11 @@ glabel collision_main_above /* 7BDC4 800E2914 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 7BDC8 800E2918 46000005 */ abs.s $f0, $f0 /* 7BDCC 800E291C 4600103E */ c.le.s $f2, $f0 -/* 7BDD0 800E2920 00000000 */ nop +/* 7BDD0 800E2920 00000000 */ nop /* 7BDD4 800E2924 45000020 */ bc1f .L800E29A8 /* 7BDD8 800E2928 32024000 */ andi $v0, $s0, 0x4000 /* 7BDDC 800E292C 10400006 */ beqz $v0, .L800E2948 -/* 7BDE0 800E2930 00000000 */ nop +/* 7BDE0 800E2930 00000000 */ nop /* 7BDE4 800E2934 0C0441A9 */ jal get_entity_type /* 7BDE8 800E2938 0200202D */ daddu $a0, $s0, $zero /* 7BDEC 800E293C 2403000D */ addiu $v1, $zero, 0xd @@ -101,11 +101,11 @@ glabel collision_main_above /* 7BE04 800E2954 3C014040 */ lui $at, 0x4040 /* 7BE08 800E2958 44812000 */ mtc1 $at, $f4 /* 7BE0C 800E295C 44821000 */ mtc1 $v0, $f2 -/* 7BE10 800E2960 00000000 */ nop +/* 7BE10 800E2960 00000000 */ nop /* 7BE14 800E2964 468010A0 */ cvt.s.w $f2, $f2 /* 7BE18 800E2968 46001083 */ div.s $f2, $f2, $f0 /* 7BE1C 800E296C 46041082 */ mul.s $f2, $f2, $f4 -/* 7BE20 800E2970 00000000 */ nop +/* 7BE20 800E2970 00000000 */ nop /* 7BE24 800E2974 C7A00024 */ lwc1 $f0, 0x24($sp) /* 7BE28 800E2978 46020001 */ sub.s $f0, $f0, $f2 /* 7BE2C 800E297C 822300B4 */ lb $v1, 0xb4($s1) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s b/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s index 4e2aa2845a..8a303ef47d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/collision_main_lateral.s @@ -27,9 +27,9 @@ glabel collision_main_lateral /* 7CB44 800E3694 E7A20030 */ swc1 $f2, 0x30($sp) /* 7CB48 800E3698 3C013F00 */ lui $at, 0x3f00 /* 7CB4C 800E369C 44810000 */ mtc1 $at, $f0 -/* 7CB50 800E36A0 00000000 */ nop +/* 7CB50 800E36A0 00000000 */ nop /* 7CB54 800E36A4 46001002 */ mul.s $f0, $f2, $f0 -/* 7CB58 800E36A8 00000000 */ nop +/* 7CB58 800E36A8 00000000 */ nop /* 7CB5C 800E36AC E7A00030 */ swc1 $f0, 0x30($sp) .L800E36B0: /* 7CB60 800E36B0 26240028 */ addiu $a0, $s1, 0x28 @@ -38,7 +38,7 @@ glabel collision_main_lateral /* 7CB6C 800E36BC 0C00A7E7 */ jal add_vec2D_polar /* 7CB70 800E36C0 26250030 */ addiu $a1, $s1, 0x30 /* 7CB74 800E36C4 080390B8 */ j .L800E42E0 -/* 7CB78 800E36C8 00000000 */ nop +/* 7CB78 800E36C8 00000000 */ nop .L800E36CC: /* 7CB7C 800E36CC 922200B4 */ lbu $v0, 0xb4($s1) /* 7CB80 800E36D0 2442FFF9 */ addiu $v0, $v0, -7 @@ -51,7 +51,7 @@ glabel collision_main_lateral /* 7CB9C 800E36EC 00220821 */ addu $at, $at, $v0 /* 7CBA0 800E36F0 8C22BE58 */ lw $v0, %lo(D_8010BE58)($at) /* 7CBA4 800E36F4 00400008 */ jr $v0 -/* 7CBA8 800E36F8 00000000 */ nop +/* 7CBA8 800E36F8 00000000 */ nop /* 7CBAC 800E36FC 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 7CBB0 800E3700 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) /* 7CBB4 800E3704 C62200A8 */ lwc1 $f2, 0xa8($s1) @@ -74,12 +74,12 @@ glabel collision_main_lateral /* 7CBF8 800E3748 080390B6 */ j .L800E42D8 /* 7CBFC 800E374C 0080282D */ daddu $a1, $a0, $zero /* 7CC00 800E3750 0C039422 */ jal get_current_partner_id -/* 7CC04 800E3754 00000000 */ nop +/* 7CC04 800E3754 00000000 */ nop /* 7CC08 800E3758 00021600 */ sll $v0, $v0, 0x18 /* 7CC0C 800E375C 00021603 */ sra $v0, $v0, 0x18 /* 7CC10 800E3760 24030009 */ addiu $v1, $zero, 9 /* 7CC14 800E3764 144302DE */ bne $v0, $v1, .L800E42E0 -/* 7CC18 800E3768 00000000 */ nop +/* 7CC18 800E3768 00000000 */ nop /* 7CC1C 800E376C C6260028 */ lwc1 $f6, 0x28($s1) /* 7CC20 800E3770 C620001C */ lwc1 $f0, 0x1c($s1) /* 7CC24 800E3774 C624002C */ lwc1 $f4, 0x2c($s1) @@ -98,13 +98,13 @@ glabel collision_main_lateral /* 7CC58 800E37A8 E6200030 */ swc1 $f0, 0x30($s1) /* 7CC5C 800E37AC C6200020 */ lwc1 $f0, 0x20($s1) /* 7CC60 800E37B0 460A0032 */ c.eq.s $f0, $f10 -/* 7CC64 800E37B4 00000000 */ nop +/* 7CC64 800E37B4 00000000 */ nop /* 7CC68 800E37B8 45000005 */ bc1f .L800E37D0 /* 7CC6C 800E37BC 46001006 */ mov.s $f0, $f2 /* 7CC70 800E37C0 460A0032 */ c.eq.s $f0, $f10 -/* 7CC74 800E37C4 00000000 */ nop +/* 7CC74 800E37C4 00000000 */ nop /* 7CC78 800E37C8 450102C5 */ bc1t .L800E42E0 -/* 7CC7C 800E37CC 00000000 */ nop +/* 7CC7C 800E37CC 00000000 */ nop .L800E37D0: /* 7CC80 800E37D0 C6200028 */ lwc1 $f0, 0x28($s1) /* 7CC84 800E37D4 C622002C */ lwc1 $f2, 0x2c($s1) @@ -117,7 +117,7 @@ glabel collision_main_lateral /* 7CCA0 800E37F0 9223000E */ lbu $v1, 0xe($s1) /* 7CCA4 800E37F4 24020080 */ addiu $v0, $zero, 0x80 /* 7CCA8 800E37F8 106202B9 */ beq $v1, $v0, .L800E42E0 -/* 7CCAC 800E37FC 00000000 */ nop +/* 7CCAC 800E37FC 00000000 */ nop /* 7CCB0 800E3800 8E26001C */ lw $a2, 0x1c($s1) /* 7CCB4 800E3804 44806000 */ mtc1 $zero, $f12 /* 7CCB8 800E3808 8E270024 */ lw $a3, 0x24($s1) @@ -145,13 +145,13 @@ glabel collision_main_lateral /* 7CD10 800E3860 E6200030 */ swc1 $f0, 0x30($s1) /* 7CD14 800E3864 C6200020 */ lwc1 $f0, 0x20($s1) /* 7CD18 800E3868 460A0032 */ c.eq.s $f0, $f10 -/* 7CD1C 800E386C 00000000 */ nop +/* 7CD1C 800E386C 00000000 */ nop /* 7CD20 800E3870 45000005 */ bc1f .L800E3888 /* 7CD24 800E3874 46001006 */ mov.s $f0, $f2 /* 7CD28 800E3878 460A0032 */ c.eq.s $f0, $f10 -/* 7CD2C 800E387C 00000000 */ nop +/* 7CD2C 800E387C 00000000 */ nop /* 7CD30 800E3880 45010009 */ bc1t .L800E38A8 -/* 7CD34 800E3884 00000000 */ nop +/* 7CD34 800E3884 00000000 */ nop .L800E3888: /* 7CD38 800E3888 C6200028 */ lwc1 $f0, 0x28($s1) /* 7CD3C 800E388C C622002C */ lwc1 $f2, 0x2c($s1) @@ -164,21 +164,21 @@ glabel collision_main_lateral .L800E38A8: /* 7CD58 800E38A8 C620001C */ lwc1 $f0, 0x1c($s1) /* 7CD5C 800E38AC 44801000 */ mtc1 $zero, $f2 -/* 7CD60 800E38B0 00000000 */ nop +/* 7CD60 800E38B0 00000000 */ nop /* 7CD64 800E38B4 46020032 */ c.eq.s $f0, $f2 -/* 7CD68 800E38B8 00000000 */ nop +/* 7CD68 800E38B8 00000000 */ nop /* 7CD6C 800E38BC 4500000B */ bc1f .L800E38EC -/* 7CD70 800E38C0 00000000 */ nop +/* 7CD70 800E38C0 00000000 */ nop /* 7CD74 800E38C4 C6200020 */ lwc1 $f0, 0x20($s1) /* 7CD78 800E38C8 46020032 */ c.eq.s $f0, $f2 -/* 7CD7C 800E38CC 00000000 */ nop +/* 7CD7C 800E38CC 00000000 */ nop /* 7CD80 800E38D0 45000006 */ bc1f .L800E38EC -/* 7CD84 800E38D4 00000000 */ nop +/* 7CD84 800E38D4 00000000 */ nop /* 7CD88 800E38D8 C6200024 */ lwc1 $f0, 0x24($s1) /* 7CD8C 800E38DC 46020032 */ c.eq.s $f0, $f2 -/* 7CD90 800E38E0 00000000 */ nop +/* 7CD90 800E38E0 00000000 */ nop /* 7CD94 800E38E4 4501027E */ bc1t .L800E42E0 -/* 7CD98 800E38E8 00000000 */ nop +/* 7CD98 800E38E8 00000000 */ nop .L800E38EC: /* 7CD9C 800E38EC 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 7CDA0 800E38F0 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -219,13 +219,13 @@ glabel collision_main_lateral /* 7CE2C 800E397C E6200030 */ swc1 $f0, 0x30($s1) /* 7CE30 800E3980 C6200020 */ lwc1 $f0, 0x20($s1) /* 7CE34 800E3984 460A0032 */ c.eq.s $f0, $f10 -/* 7CE38 800E3988 00000000 */ nop +/* 7CE38 800E3988 00000000 */ nop /* 7CE3C 800E398C 45000005 */ bc1f .L800E39A4 /* 7CE40 800E3990 46001006 */ mov.s $f0, $f2 /* 7CE44 800E3994 460A0032 */ c.eq.s $f0, $f10 -/* 7CE48 800E3998 00000000 */ nop +/* 7CE48 800E3998 00000000 */ nop /* 7CE4C 800E399C 45010009 */ bc1t .L800E39C4 -/* 7CE50 800E39A0 00000000 */ nop +/* 7CE50 800E39A0 00000000 */ nop .L800E39A4: /* 7CE54 800E39A4 C6200028 */ lwc1 $f0, 0x28($s1) /* 7CE58 800E39A8 C622002C */ lwc1 $f2, 0x2c($s1) @@ -273,10 +273,10 @@ glabel collision_main_lateral /* 7CEF4 800E3A44 3C013F00 */ lui $at, 0x3f00 /* 7CEF8 800E3A48 44811000 */ mtc1 $at, $f2 /* 7CEFC 800E3A4C 44820000 */ mtc1 $v0, $f0 -/* 7CF00 800E3A50 00000000 */ nop +/* 7CF00 800E3A50 00000000 */ nop /* 7CF04 800E3A54 46800020 */ cvt.s.w $f0, $f0 /* 7CF08 800E3A58 46020002 */ mul.s $f0, $f0, $f2 -/* 7CF0C 800E3A5C 00000000 */ nop +/* 7CF0C 800E3A5C 00000000 */ nop /* 7CF10 800E3A60 0220202D */ daddu $a0, $s1, $zero /* 7CF14 800E3A64 27A50020 */ addiu $a1, $sp, 0x20 /* 7CF18 800E3A68 27A60024 */ addiu $a2, $sp, 0x24 @@ -287,21 +287,21 @@ glabel collision_main_lateral /* 7CF2C 800E3A7C E7A00014 */ swc1 $f0, 0x14($sp) /* 7CF30 800E3A80 C620001C */ lwc1 $f0, 0x1c($s1) /* 7CF34 800E3A84 44801000 */ mtc1 $zero, $f2 -/* 7CF38 800E3A88 00000000 */ nop +/* 7CF38 800E3A88 00000000 */ nop /* 7CF3C 800E3A8C 46020032 */ c.eq.s $f0, $f2 -/* 7CF40 800E3A90 00000000 */ nop +/* 7CF40 800E3A90 00000000 */ nop /* 7CF44 800E3A94 4500000B */ bc1f .L800E3AC4 /* 7CF48 800E3A98 A6820012 */ sh $v0, 0x12($s4) /* 7CF4C 800E3A9C C6200020 */ lwc1 $f0, 0x20($s1) /* 7CF50 800E3AA0 46020032 */ c.eq.s $f0, $f2 -/* 7CF54 800E3AA4 00000000 */ nop +/* 7CF54 800E3AA4 00000000 */ nop /* 7CF58 800E3AA8 45000006 */ bc1f .L800E3AC4 -/* 7CF5C 800E3AAC 00000000 */ nop +/* 7CF5C 800E3AAC 00000000 */ nop /* 7CF60 800E3AB0 C6200024 */ lwc1 $f0, 0x24($s1) /* 7CF64 800E3AB4 46020032 */ c.eq.s $f0, $f2 -/* 7CF68 800E3AB8 00000000 */ nop +/* 7CF68 800E3AB8 00000000 */ nop /* 7CF6C 800E3ABC 45010208 */ bc1t .L800E42E0 -/* 7CF70 800E3AC0 00000000 */ nop +/* 7CF70 800E3AC0 00000000 */ nop .L800E3AC4: /* 7CF74 800E3AC4 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 7CF78 800E3AC8 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -341,13 +341,13 @@ glabel collision_main_lateral /* 7CFFC 800E3B4C 3C030001 */ lui $v1, 1 /* 7D000 800E3B50 00431024 */ and $v0, $v0, $v1 /* 7D004 800E3B54 1440002C */ bnez $v0, .L800E3C08 -/* 7D008 800E3B58 00000000 */ nop +/* 7D008 800E3B58 00000000 */ nop /* 7D00C 800E3B5C C7A20030 */ lwc1 $f2, 0x30($sp) /* 7D010 800E3B60 3C013D00 */ lui $at, 0x3d00 /* 7D014 800E3B64 44810000 */ mtc1 $at, $f0 -/* 7D018 800E3B68 00000000 */ nop +/* 7D018 800E3B68 00000000 */ nop /* 7D01C 800E3B6C 46001002 */ mul.s $f0, $f2, $f0 -/* 7D020 800E3B70 00000000 */ nop +/* 7D020 800E3B70 00000000 */ nop /* 7D024 800E3B74 8E220000 */ lw $v0, ($s1) /* 7D028 800E3B78 30420006 */ andi $v0, $v0, 6 /* 7D02C 800E3B7C 14400009 */ bnez $v0, .L800E3BA4 @@ -357,21 +357,21 @@ glabel collision_main_lateral /* 7D03C 800E3B8C 44801000 */ mtc1 $zero, $f2 /* 7D040 800E3B90 46000021 */ cvt.d.s $f0, $f0 /* 7D044 800E3B94 46220002 */ mul.d $f0, $f0, $f2 -/* 7D048 800E3B98 00000000 */ nop +/* 7D048 800E3B98 00000000 */ nop /* 7D04C 800E3B9C 46200020 */ cvt.s.d $f0, $f0 /* 7D050 800E3BA0 E7A00030 */ swc1 $f0, 0x30($sp) .L800E3BA4: /* 7D054 800E3BA4 822300B4 */ lb $v1, 0xb4($s1) /* 7D058 800E3BA8 24020006 */ addiu $v0, $zero, 6 /* 7D05C 800E3BAC 1462000A */ bne $v1, $v0, .L800E3BD8 -/* 7D060 800E3BB0 00000000 */ nop +/* 7D060 800E3BB0 00000000 */ nop /* 7D064 800E3BB4 C7A00030 */ lwc1 $f0, 0x30($sp) /* 7D068 800E3BB8 3C013FF8 */ lui $at, 0x3ff8 /* 7D06C 800E3BBC 44811800 */ mtc1 $at, $f3 /* 7D070 800E3BC0 44801000 */ mtc1 $zero, $f2 /* 7D074 800E3BC4 46000021 */ cvt.d.s $f0, $f0 /* 7D078 800E3BC8 46220002 */ mul.d $f0, $f0, $f2 -/* 7D07C 800E3BCC 00000000 */ nop +/* 7D07C 800E3BCC 00000000 */ nop /* 7D080 800E3BD0 46200020 */ cvt.s.d $f0, $f0 /* 7D084 800E3BD4 E7A00030 */ swc1 $f0, 0x30($sp) .L800E3BD8: @@ -379,22 +379,22 @@ glabel collision_main_lateral /* 7D08C 800E3BDC 3C030004 */ lui $v1, 4 /* 7D090 800E3BE0 00431024 */ and $v0, $v0, $v1 /* 7D094 800E3BE4 10400008 */ beqz $v0, .L800E3C08 -/* 7D098 800E3BE8 00000000 */ nop +/* 7D098 800E3BE8 00000000 */ nop /* 7D09C 800E3BEC C7A00030 */ lwc1 $f0, 0x30($sp) /* 7D0A0 800E3BF0 3C013F00 */ lui $at, 0x3f00 /* 7D0A4 800E3BF4 44811000 */ mtc1 $at, $f2 -/* 7D0A8 800E3BF8 00000000 */ nop +/* 7D0A8 800E3BF8 00000000 */ nop /* 7D0AC 800E3BFC 46020002 */ mul.s $f0, $f0, $f2 -/* 7D0B0 800E3C00 00000000 */ nop +/* 7D0B0 800E3C00 00000000 */ nop /* 7D0B4 800E3C04 E7A00030 */ swc1 $f0, 0x30($sp) .L800E3C08: /* 7D0B8 800E3C08 C7AC002C */ lwc1 $f12, 0x2c($sp) /* 7D0BC 800E3C0C 3C0140C9 */ lui $at, 0x40c9 /* 7D0C0 800E3C10 34210FD0 */ ori $at, $at, 0xfd0 /* 7D0C4 800E3C14 44810000 */ mtc1 $at, $f0 -/* 7D0C8 800E3C18 00000000 */ nop +/* 7D0C8 800E3C18 00000000 */ nop /* 7D0CC 800E3C1C 46006302 */ mul.s $f12, $f12, $f0 -/* 7D0D0 800E3C20 00000000 */ nop +/* 7D0D0 800E3C20 00000000 */ nop /* 7D0D4 800E3C24 27A50034 */ addiu $a1, $sp, 0x34 /* 7D0D8 800E3C28 3C0143B4 */ lui $at, 0x43b4 /* 7D0DC 800E3C2C 44810000 */ mtc1 $at, $f0 @@ -410,47 +410,47 @@ glabel collision_main_lateral /* 7D104 800E3C54 46003085 */ abs.s $f2, $f6 /* 7D108 800E3C58 46002005 */ abs.s $f0, $f4 /* 7D10C 800E3C5C 4602003C */ c.lt.s $f0, $f2 -/* 7D110 800E3C60 00000000 */ nop +/* 7D110 800E3C60 00000000 */ nop /* 7D114 800E3C64 45000006 */ bc1f .L800E3C80 -/* 7D118 800E3C68 00000000 */ nop +/* 7D118 800E3C68 00000000 */ nop /* 7D11C 800E3C6C C7A00030 */ lwc1 $f0, 0x30($sp) /* 7D120 800E3C70 4480A000 */ mtc1 $zero, $f20 /* 7D124 800E3C74 46060582 */ mul.s $f22, $f0, $f6 /* 7D128 800E3C78 08038F36 */ j .L800E3CD8 -/* 7D12C 800E3C7C 00000000 */ nop +/* 7D12C 800E3C7C 00000000 */ nop .L800E3C80: /* 7D130 800E3C80 C7A00030 */ lwc1 $f0, 0x30($sp) /* 7D134 800E3C84 4480B000 */ mtc1 $zero, $f22 /* 7D138 800E3C88 46000007 */ neg.s $f0, $f0 /* 7D13C 800E3C8C 46040502 */ mul.s $f20, $f0, $f4 /* 7D140 800E3C90 08038F36 */ j .L800E3CD8 -/* 7D144 800E3C94 00000000 */ nop +/* 7D144 800E3C94 00000000 */ nop .L800E3C98: /* 7D148 800E3C98 8E220004 */ lw $v0, 4($s1) /* 7D14C 800E3C9C 00431024 */ and $v0, $v0, $v1 /* 7D150 800E3CA0 1440000A */ bnez $v0, .L800E3CCC -/* 7D154 800E3CA4 00000000 */ nop +/* 7D154 800E3CA4 00000000 */ nop /* 7D158 800E3CA8 C7A00030 */ lwc1 $f0, 0x30($sp) /* 7D15C 800E3CAC C7A20034 */ lwc1 $f2, 0x34($sp) /* 7D160 800E3CB0 46020582 */ mul.s $f22, $f0, $f2 -/* 7D164 800E3CB4 00000000 */ nop +/* 7D164 800E3CB4 00000000 */ nop /* 7D168 800E3CB8 C7A20038 */ lwc1 $f2, 0x38($sp) /* 7D16C 800E3CBC 46000007 */ neg.s $f0, $f0 /* 7D170 800E3CC0 46020502 */ mul.s $f20, $f0, $f2 /* 7D174 800E3CC4 08038F36 */ j .L800E3CD8 -/* 7D178 800E3CC8 00000000 */ nop +/* 7D178 800E3CC8 00000000 */ nop .L800E3CCC: /* 7D17C 800E3CCC 4480A000 */ mtc1 $zero, $f20 -/* 7D180 800E3CD0 00000000 */ nop +/* 7D180 800E3CD0 00000000 */ nop /* 7D184 800E3CD4 4600A586 */ mov.s $f22, $f20 .L800E3CD8: /* 7D188 800E3CD8 C62C0080 */ lwc1 $f12, 0x80($s1) /* 7D18C 800E3CDC 3C0140C9 */ lui $at, 0x40c9 /* 7D190 800E3CE0 34210FD0 */ ori $at, $at, 0xfd0 /* 7D194 800E3CE4 44810000 */ mtc1 $at, $f0 -/* 7D198 800E3CE8 00000000 */ nop +/* 7D198 800E3CE8 00000000 */ nop /* 7D19C 800E3CEC 46006302 */ mul.s $f12, $f12, $f0 -/* 7D1A0 800E3CF0 00000000 */ nop +/* 7D1A0 800E3CF0 00000000 */ nop /* 7D1A4 800E3CF4 27A50034 */ addiu $a1, $sp, 0x34 /* 7D1A8 800E3CF8 3C0143B4 */ lui $at, 0x43b4 /* 7D1AC 800E3CFC 44810000 */ mtc1 $at, $f0 @@ -463,21 +463,21 @@ glabel collision_main_lateral /* 7D1C8 800E3D18 3C030004 */ lui $v1, 4 /* 7D1CC 800E3D1C 00431024 */ and $v0, $v0, $v1 /* 7D1D0 800E3D20 10400007 */ beqz $v0, .L800E3D40 -/* 7D1D4 800E3D24 00000000 */ nop +/* 7D1D4 800E3D24 00000000 */ nop /* 7D1D8 800E3D28 3C013F00 */ lui $at, 0x3f00 /* 7D1DC 800E3D2C 44810000 */ mtc1 $at, $f0 -/* 7D1E0 800E3D30 00000000 */ nop +/* 7D1E0 800E3D30 00000000 */ nop /* 7D1E4 800E3D34 46001002 */ mul.s $f0, $f2, $f0 -/* 7D1E8 800E3D38 00000000 */ nop +/* 7D1E8 800E3D38 00000000 */ nop /* 7D1EC 800E3D3C E7A00030 */ swc1 $f0, 0x30($sp) .L800E3D40: /* 7D1F0 800E3D40 C7A40030 */ lwc1 $f4, 0x30($sp) /* 7D1F4 800E3D44 C7A20034 */ lwc1 $f2, 0x34($sp) /* 7D1F8 800E3D48 46022082 */ mul.s $f2, $f4, $f2 -/* 7D1FC 800E3D4C 00000000 */ nop +/* 7D1FC 800E3D4C 00000000 */ nop /* 7D200 800E3D50 C7A00038 */ lwc1 $f0, 0x38($sp) /* 7D204 800E3D54 46002102 */ mul.s $f4, $f4, $f0 -/* 7D208 800E3D58 00000000 */ nop +/* 7D208 800E3D58 00000000 */ nop /* 7D20C 800E3D5C 4602B080 */ add.s $f2, $f22, $f2 /* 7D210 800E3D60 4604A101 */ sub.s $f4, $f20, $f4 /* 7D214 800E3D64 44806000 */ mtc1 $zero, $f12 @@ -489,19 +489,19 @@ glabel collision_main_lateral /* 7D22C 800E3D7C AFA70028 */ sw $a3, 0x28($sp) /* 7D230 800E3D80 C7A40020 */ lwc1 $f4, 0x20($sp) /* 7D234 800E3D84 46042102 */ mul.s $f4, $f4, $f4 -/* 7D238 800E3D88 00000000 */ nop +/* 7D238 800E3D88 00000000 */ nop /* 7D23C 800E3D8C C7A20028 */ lwc1 $f2, 0x28($sp) /* 7D240 800E3D90 46021082 */ mul.s $f2, $f2, $f2 -/* 7D244 800E3D94 00000000 */ nop +/* 7D244 800E3D94 00000000 */ nop /* 7D248 800E3D98 46022300 */ add.s $f12, $f4, $f2 /* 7D24C 800E3D9C E7A0002C */ swc1 $f0, 0x2c($sp) /* 7D250 800E3DA0 46006004 */ sqrt.s $f0, $f12 /* 7D254 800E3DA4 46000032 */ c.eq.s $f0, $f0 -/* 7D258 800E3DA8 00000000 */ nop +/* 7D258 800E3DA8 00000000 */ nop /* 7D25C 800E3DAC 45010003 */ bc1t .L800E3DBC -/* 7D260 800E3DB0 00000000 */ nop +/* 7D260 800E3DB0 00000000 */ nop /* 7D264 800E3DB4 0C0187BC */ jal sqrtf -/* 7D268 800E3DB8 00000000 */ nop +/* 7D268 800E3DB8 00000000 */ nop .L800E3DBC: /* 7D26C 800E3DBC 8E220000 */ lw $v0, ($s1) /* 7D270 800E3DC0 30420006 */ andi $v0, $v0, 6 @@ -509,7 +509,7 @@ glabel collision_main_lateral /* 7D278 800E3DC8 E7A00030 */ swc1 $f0, 0x30($sp) /* 7D27C 800E3DCC C622005C */ lwc1 $f2, 0x5c($s1) /* 7D280 800E3DD0 4600103C */ c.lt.s $f2, $f0 -/* 7D284 800E3DD4 00000000 */ nop +/* 7D284 800E3DD4 00000000 */ nop /* 7D288 800E3DD8 45030001 */ bc1tl .L800E3DE0 /* 7D28C 800E3DDC E7A20030 */ swc1 $f2, 0x30($sp) .L800E3DE0: @@ -530,19 +530,19 @@ glabel collision_main_lateral .L800E3E18: /* 7D2C8 800E3E18 C620001C */ lwc1 $f0, 0x1c($s1) /* 7D2CC 800E3E1C 44801000 */ mtc1 $zero, $f2 -/* 7D2D0 800E3E20 00000000 */ nop +/* 7D2D0 800E3E20 00000000 */ nop /* 7D2D4 800E3E24 46020032 */ c.eq.s $f0, $f2 -/* 7D2D8 800E3E28 00000000 */ nop +/* 7D2D8 800E3E28 00000000 */ nop /* 7D2DC 800E3E2C 4500000B */ bc1f .L800E3E5C -/* 7D2E0 800E3E30 00000000 */ nop +/* 7D2E0 800E3E30 00000000 */ nop /* 7D2E4 800E3E34 C6200020 */ lwc1 $f0, 0x20($s1) /* 7D2E8 800E3E38 46020032 */ c.eq.s $f0, $f2 -/* 7D2EC 800E3E3C 00000000 */ nop +/* 7D2EC 800E3E3C 00000000 */ nop /* 7D2F0 800E3E40 45000006 */ bc1f .L800E3E5C -/* 7D2F4 800E3E44 00000000 */ nop +/* 7D2F4 800E3E44 00000000 */ nop /* 7D2F8 800E3E48 C6200024 */ lwc1 $f0, 0x24($s1) /* 7D2FC 800E3E4C 46020032 */ c.eq.s $f0, $f2 -/* 7D300 800E3E50 00000000 */ nop +/* 7D300 800E3E50 00000000 */ nop /* 7D304 800E3E54 4501000A */ bc1t .L800E3E80 /* 7D308 800E3E58 0220202D */ daddu $a0, $s1, $zero .L800E3E5C: @@ -570,10 +570,10 @@ glabel collision_main_lateral /* 7D35C 800E3EAC 4481B000 */ mtc1 $at, $f22 /* 7D360 800E3EB0 C6220080 */ lwc1 $f2, 0x80($s1) /* 7D364 800E3EB4 44820000 */ mtc1 $v0, $f0 -/* 7D368 800E3EB8 00000000 */ nop +/* 7D368 800E3EB8 00000000 */ nop /* 7D36C 800E3EBC 46800020 */ cvt.s.w $f0, $f0 /* 7D370 800E3EC0 46160002 */ mul.s $f0, $f0, $f22 -/* 7D374 800E3EC4 00000000 */ nop +/* 7D374 800E3EC4 00000000 */ nop /* 7D378 800E3EC8 E7A40020 */ swc1 $f4, 0x20($sp) /* 7D37C 800E3ECC E7A60024 */ swc1 $f6, 0x24($sp) /* 7D380 800E3ED0 E7A80028 */ swc1 $f8, 0x28($sp) @@ -582,9 +582,9 @@ glabel collision_main_lateral /* 7D38C 800E3EDC E7A00010 */ swc1 $f0, 0x10($sp) /* 7D390 800E3EE0 C7A20030 */ lwc1 $f2, 0x30($sp) /* 7D394 800E3EE4 44800000 */ mtc1 $zero, $f0 -/* 7D398 800E3EE8 00000000 */ nop +/* 7D398 800E3EE8 00000000 */ nop /* 7D39C 800E3EEC 46001032 */ c.eq.s $f2, $f0 -/* 7D3A0 800E3EF0 00000000 */ nop +/* 7D3A0 800E3EF0 00000000 */ nop /* 7D3A4 800E3EF4 45020045 */ bc1fl .L800E400C /* 7D3A8 800E3EF8 A6820012 */ sh $v0, 0x12($s4) /* 7D3AC 800E3EFC 04430043 */ bgezl $v0, .L800E400C @@ -608,14 +608,14 @@ glabel collision_main_lateral /* 7D3F4 800E3F44 46001500 */ add.s $f20, $f2, $f0 /* 7D3F8 800E3F48 3C014334 */ lui $at, 0x4334 /* 7D3FC 800E3F4C 44816000 */ mtc1 $at, $f12 -/* 7D400 800E3F50 00000000 */ nop +/* 7D400 800E3F50 00000000 */ nop /* 7D404 800E3F54 460CA300 */ add.s $f12, $f20, $f12 /* 7D408 800E3F58 3C0140C9 */ lui $at, 0x40c9 /* 7D40C 800E3F5C 34210FD0 */ ori $at, $at, 0xfd0 /* 7D410 800E3F60 44810000 */ mtc1 $at, $f0 -/* 7D414 800E3F64 00000000 */ nop +/* 7D414 800E3F64 00000000 */ nop /* 7D418 800E3F68 46006302 */ mul.s $f12, $f12, $f0 -/* 7D41C 800E3F6C 00000000 */ nop +/* 7D41C 800E3F6C 00000000 */ nop /* 7D420 800E3F70 27A50034 */ addiu $a1, $sp, 0x34 /* 7D424 800E3F74 3C0143B4 */ lui $at, 0x43b4 /* 7D428 800E3F78 44810000 */ mtc1 $at, $f0 @@ -625,17 +625,17 @@ glabel collision_main_lateral /* 7D438 800E3F88 862200B2 */ lh $v0, 0xb2($s1) /* 7D43C 800E3F8C C7A60034 */ lwc1 $f6, 0x34($sp) /* 7D440 800E3F90 44820000 */ mtc1 $v0, $f0 -/* 7D444 800E3F94 00000000 */ nop +/* 7D444 800E3F94 00000000 */ nop /* 7D448 800E3F98 46800020 */ cvt.s.w $f0, $f0 /* 7D44C 800E3F9C 46003182 */ mul.s $f6, $f6, $f0 -/* 7D450 800E3FA0 00000000 */ nop +/* 7D450 800E3FA0 00000000 */ nop /* 7D454 800E3FA4 C7A40038 */ lwc1 $f4, 0x38($sp) /* 7D458 800E3FA8 46002102 */ mul.s $f4, $f4, $f0 -/* 7D45C 800E3FAC 00000000 */ nop +/* 7D45C 800E3FAC 00000000 */ nop /* 7D460 800E3FB0 46163182 */ mul.s $f6, $f6, $f22 -/* 7D464 800E3FB4 00000000 */ nop +/* 7D464 800E3FB4 00000000 */ nop /* 7D468 800E3FB8 46162102 */ mul.s $f4, $f4, $f22 -/* 7D46C 800E3FBC 00000000 */ nop +/* 7D46C 800E3FBC 00000000 */ nop /* 7D470 800E3FC0 0220202D */ daddu $a0, $s1, $zero /* 7D474 800E3FC4 0260282D */ daddu $a1, $s3, $zero /* 7D478 800E3FC8 C6220028 */ lwc1 $f2, 0x28($s1) @@ -648,7 +648,7 @@ glabel collision_main_lateral /* 7D494 800E3FE4 E7A60024 */ swc1 $f6, 0x24($sp) /* 7D498 800E3FE8 E7A00028 */ swc1 $f0, 0x28($sp) /* 7D49C 800E3FEC 44820000 */ mtc1 $v0, $f0 -/* 7D4A0 800E3FF0 00000000 */ nop +/* 7D4A0 800E3FF0 00000000 */ nop /* 7D4A4 800E3FF4 46800020 */ cvt.s.w $f0, $f0 /* 7D4A8 800E3FF8 E7A20020 */ swc1 $f2, 0x20($sp) /* 7D4AC 800E3FFC E7A00010 */ swc1 $f0, 0x10($sp) @@ -663,12 +663,12 @@ glabel collision_main_lateral /* 7D4CC 800E401C 24020012 */ addiu $v0, $zero, 0x12 /* 7D4D0 800E4020 822300B4 */ lb $v1, 0xb4($s1) /* 7D4D4 800E4024 106200AE */ beq $v1, $v0, .L800E42E0 -/* 7D4D8 800E4028 00000000 */ nop +/* 7D4D8 800E4028 00000000 */ nop /* 7D4DC 800E402C C7A60030 */ lwc1 $f6, 0x30($sp) /* 7D4E0 800E4030 44800000 */ mtc1 $zero, $f0 -/* 7D4E4 800E4034 00000000 */ nop +/* 7D4E4 800E4034 00000000 */ nop /* 7D4E8 800E4038 46003032 */ c.eq.s $f6, $f0 -/* 7D4EC 800E403C 00000000 */ nop +/* 7D4EC 800E403C 00000000 */ nop /* 7D4F0 800E4040 45000015 */ bc1f .L800E4098 /* 7D4F4 800E4044 0000202D */ daddu $a0, $zero, $zero /* 7D4F8 800E4048 3C038007 */ lui $v1, %hi(gCurrentCameraID) @@ -733,7 +733,7 @@ glabel collision_main_lateral /* 7D5DC 800E412C E7B40014 */ swc1 $f20, 0x14($sp) .L800E4130: /* 7D5E0 800E4130 0C037D18 */ jal test_player_lateral -/* 7D5E4 800E4134 00000000 */ nop +/* 7D5E4 800E4134 00000000 */ nop /* 7D5E8 800E4138 A6820000 */ sh $v0, ($s4) .L800E413C: /* 7D5EC 800E413C C7A00020 */ lwc1 $f0, 0x20($sp) @@ -779,9 +779,9 @@ glabel collision_main_lateral /* 7D68C 800E41DC 0C037B01 */ jal do_lateral_collision /* 7D690 800E41E0 E7A00018 */ swc1 $f0, 0x18($sp) /* 7D694 800E41E4 0601000B */ bgez $s0, .L800E4214 -/* 7D698 800E41E8 00000000 */ nop +/* 7D698 800E41E8 00000000 */ nop /* 7D69C 800E41EC 04410005 */ bgez $v0, .L800E4204 -/* 7D6A0 800E41F0 00000000 */ nop +/* 7D6A0 800E41F0 00000000 */ nop /* 7D6A4 800E41F4 C7A00020 */ lwc1 $f0, 0x20($sp) /* 7D6A8 800E41F8 C7A20028 */ lwc1 $f2, 0x28($sp) /* 7D6AC 800E41FC 0803908A */ j .L800E4228 @@ -793,7 +793,7 @@ glabel collision_main_lateral /* 7D6C0 800E4210 E6200028 */ swc1 $f0, 0x28($s1) .L800E4214: /* 7D6C4 800E4214 04410005 */ bgez $v0, .L800E422C -/* 7D6C8 800E4218 00000000 */ nop +/* 7D6C8 800E4218 00000000 */ nop /* 7D6CC 800E421C C7A00048 */ lwc1 $f0, 0x48($sp) /* 7D6D0 800E4220 C7A20050 */ lwc1 $f2, 0x50($sp) /* 7D6D4 800E4224 E6200028 */ swc1 $f0, 0x28($s1) @@ -809,7 +809,7 @@ glabel collision_main_lateral /* 7D6F4 800E4244 0000202D */ daddu $a0, $zero, $zero /* 7D6F8 800E4248 C6340080 */ lwc1 $f20, 0x80($s1) /* 7D6FC 800E424C 080390A6 */ j .L800E4298 -/* 7D700 800E4250 00000000 */ nop +/* 7D700 800E4250 00000000 */ nop .L800E4254: /* 7D704 800E4254 3C038007 */ lui $v1, %hi(gCurrentCameraID) /* 7D708 800E4258 8C637410 */ lw $v1, %lo(gCurrentCameraID)($v1) @@ -838,16 +838,16 @@ glabel collision_main_lateral /* 7D760 800E42B0 3C013F40 */ lui $at, 0x3f40 /* 7D764 800E42B4 44811000 */ mtc1 $at, $f2 /* 7D768 800E42B8 44820000 */ mtc1 $v0, $f0 -/* 7D76C 800E42BC 00000000 */ nop +/* 7D76C 800E42BC 00000000 */ nop /* 7D770 800E42C0 46800020 */ cvt.s.w $f0, $f0 /* 7D774 800E42C4 46020002 */ mul.s $f0, $f0, $f2 -/* 7D778 800E42C8 00000000 */ nop +/* 7D778 800E42C8 00000000 */ nop /* 7D77C 800E42CC 4406A000 */ mfc1 $a2, $f20 /* 7D780 800E42D0 4600040D */ trunc.w.s $f16, $f0 /* 7D784 800E42D4 44058000 */ mfc1 $a1, $f16 .L800E42D8: /* 7D788 800E42D8 0C0390C2 */ jal collision_check_player_intersecting_world -/* 7D78C 800E42DC 00000000 */ nop +/* 7D78C 800E42DC 00000000 */ nop .L800E42E0: /* 7D790 800E42E0 8FBF006C */ lw $ra, 0x6c($sp) /* 7D794 800E42E4 8FB40068 */ lw $s4, 0x68($sp) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E26C4.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E26C4.s index 9872366bcc..7acb69877d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E26C4.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E26C4.s @@ -19,17 +19,17 @@ glabel func_800E26C4 /* 7BBA8 800E26F8 24020001 */ addiu $v0, $zero, 1 .L800E26FC: /* 7BBAC 800E26FC 1462001C */ bne $v1, $v0, .L800E2770 -/* 7BBB0 800E2700 00000000 */ nop +/* 7BBB0 800E2700 00000000 */ nop /* 7BBB4 800E2704 3C028011 */ lui $v0, %hi(gPlayerData) /* 7BBB8 800E2708 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* 7BBBC 800E270C 90420012 */ lbu $v0, 0x12($v0) /* 7BBC0 800E2710 2442FFF8 */ addiu $v0, $v0, -8 /* 7BBC4 800E2714 2C420002 */ sltiu $v0, $v0, 2 /* 7BBC8 800E2718 10400009 */ beqz $v0, .L800E2740 -/* 7BBCC 800E271C 00000000 */ nop +/* 7BBCC 800E271C 00000000 */ nop /* 7BBD0 800E2720 80A20000 */ lb $v0, ($a1) /* 7BBD4 800E2724 1440FFF3 */ bnez $v0, .L800E26F4 -/* 7BBD8 800E2728 00000000 */ nop +/* 7BBD8 800E2728 00000000 */ nop .L800E272C: /* 7BBDC 800E272C 8C830004 */ lw $v1, 4($a0) /* 7BBE0 800E2730 0000102D */ daddu $v0, $zero, $zero @@ -49,7 +49,7 @@ glabel func_800E26C4 /* 7BC10 800E2760 00021603 */ sra $v0, $v0, 0x18 /* 7BC14 800E2764 24030004 */ addiu $v1, $zero, 4 /* 7BC18 800E2768 1043FFF0 */ beq $v0, $v1, .L800E272C -/* 7BC1C 800E276C 00000000 */ nop +/* 7BC1C 800E276C 00000000 */ nop .L800E2770: /* 7BC20 800E2770 03E00008 */ jr $ra /* 7BC24 800E2774 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s index 4a7d1e2d41..2ef7788490 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E29C8.s @@ -33,9 +33,9 @@ glabel func_800E29C8 /* 7BEE4 800E2A34 26110028 */ addiu $s1, $s0, 0x28 /* 7BEE8 800E2A38 3C0141B0 */ lui $at, 0x41b0 /* 7BEEC 800E2A3C 44811000 */ mtc1 $at, $f2 -/* 7BEF0 800E2A40 00000000 */ nop +/* 7BEF0 800E2A40 00000000 */ nop /* 7BEF4 800E2A44 4602003E */ c.le.s $f0, $f2 -/* 7BEF8 800E2A48 00000000 */ nop +/* 7BEF8 800E2A48 00000000 */ nop /* 7BEFC 800E2A4C 45000006 */ bc1f .L800E2A68 /* 7BF00 800E2A50 26120030 */ addiu $s2, $s0, 0x30 /* 7BF04 800E2A54 0220202D */ daddu $a0, $s1, $zero @@ -45,27 +45,27 @@ glabel func_800E29C8 /* 7BF14 800E2A64 0240282D */ daddu $a1, $s2, $zero .L800E2A68: /* 7BF18 800E2A68 0C038D12 */ jal integrate_gravity -/* 7BF1C 800E2A6C 00000000 */ nop +/* 7BF1C 800E2A6C 00000000 */ nop /* 7BF20 800E2A70 C6020070 */ lwc1 $f2, 0x70($s0) /* 7BF24 800E2A74 44800000 */ mtc1 $zero, $f0 -/* 7BF28 800E2A78 00000000 */ nop +/* 7BF28 800E2A78 00000000 */ nop /* 7BF2C 800E2A7C 4600103E */ c.le.s $f2, $f0 -/* 7BF30 800E2A80 00000000 */ nop +/* 7BF30 800E2A80 00000000 */ nop /* 7BF34 800E2A84 45000009 */ bc1f .L800E2AAC -/* 7BF38 800E2A88 00000000 */ nop +/* 7BF38 800E2A88 00000000 */ nop /* 7BF3C 800E2A8C 0C0389AC */ jal func_800E26B0 -/* 7BF40 800E2A90 00000000 */ nop +/* 7BF40 800E2A90 00000000 */ nop /* 7BF44 800E2A94 0C038C1B */ jal gravity_use_fall_parms -/* 7BF48 800E2A98 00000000 */ nop +/* 7BF48 800E2A98 00000000 */ nop /* 7BF4C 800E2A9C 0C038D12 */ jal integrate_gravity -/* 7BF50 800E2AA0 00000000 */ nop +/* 7BF50 800E2AA0 00000000 */ nop /* 7BF54 800E2AA4 24020001 */ addiu $v0, $zero, 1 /* 7BF58 800E2AA8 A20200B6 */ sb $v0, 0xb6($s0) .L800E2AAC: /* 7BF5C 800E2AAC C6000070 */ lwc1 $f0, 0x70($s0) /* 7BF60 800E2AB0 C602006C */ lwc1 $f2, 0x6c($s0) /* 7BF64 800E2AB4 4600103C */ c.lt.s $f2, $f0 -/* 7BF68 800E2AB8 00000000 */ nop +/* 7BF68 800E2AB8 00000000 */ nop /* 7BF6C 800E2ABC 45030001 */ bc1tl .L800E2AC4 /* 7BF70 800E2AC0 E6020070 */ swc1 $f2, 0x70($s0) .L800E2AC4: @@ -76,7 +76,7 @@ glabel func_800E29C8 /* 7BF84 800E2AD4 E600002C */ swc1 $f0, 0x2c($s0) .L800E2AD8: /* 7BF88 800E2AD8 1462002D */ bne $v1, $v0, .L800E2B90 -/* 7BF8C 800E2ADC 00000000 */ nop +/* 7BF8C 800E2ADC 00000000 */ nop /* 7BF90 800E2AE0 3C018011 */ lui $at, %hi(D_8010C960) /* 7BF94 800E2AE4 C42CC960 */ lwc1 $f12, %lo(D_8010C960)($at) /* 7BF98 800E2AE8 3C018011 */ lui $at, %hi(D_8010C97C) @@ -87,9 +87,9 @@ glabel func_800E29C8 /* 7BFAC 800E2AFC 26110028 */ addiu $s1, $s0, 0x28 /* 7BFB0 800E2B00 3C0141B0 */ lui $at, 0x41b0 /* 7BFB4 800E2B04 44811000 */ mtc1 $at, $f2 -/* 7BFB8 800E2B08 00000000 */ nop +/* 7BFB8 800E2B08 00000000 */ nop /* 7BFBC 800E2B0C 4602003E */ c.le.s $f0, $f2 -/* 7BFC0 800E2B10 00000000 */ nop +/* 7BFC0 800E2B10 00000000 */ nop /* 7BFC4 800E2B14 45000006 */ bc1f .L800E2B30 /* 7BFC8 800E2B18 26120030 */ addiu $s2, $s0, 0x30 /* 7BFCC 800E2B1C 0220202D */ daddu $a0, $s1, $zero @@ -99,7 +99,7 @@ glabel func_800E29C8 /* 7BFDC 800E2B2C 0240282D */ daddu $a1, $s2, $zero .L800E2B30: /* 7BFE0 800E2B30 0C038D36 */ jal func_800E34D8 -/* 7BFE4 800E2B34 00000000 */ nop +/* 7BFE4 800E2B34 00000000 */ nop /* 7BFE8 800E2B38 46000306 */ mov.s $f12, $f0 /* 7BFEC 800E2B3C 0C038D45 */ jal func_800E3514 /* 7BFF0 800E2B40 27A50010 */ addiu $a1, $sp, 0x10 @@ -118,11 +118,11 @@ glabel func_800E29C8 /* 7C024 800E2B74 34840009 */ ori $a0, $a0, 9 .L800E2B78: /* 7C028 800E2B78 0C037FBF */ jal func_800DFEFC -/* 7C02C 800E2B7C 00000000 */ nop +/* 7C02C 800E2B7C 00000000 */ nop /* 7C030 800E2B80 0C038069 */ jal enable_player_input -/* 7C034 800E2B84 00000000 */ nop +/* 7C034 800E2B84 00000000 */ nop /* 7C038 800E2B88 0C038C9E */ jal phys_player_land -/* 7C03C 800E2B8C 00000000 */ nop +/* 7C03C 800E2B8C 00000000 */ nop .L800E2B90: /* 7C040 800E2B90 8FBF0028 */ lw $ra, 0x28($sp) /* 7C044 800E2B94 8FB30024 */ lw $s3, 0x24($sp) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s index a3aa242314..828c8c7f98 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E2BB0.s @@ -12,22 +12,22 @@ glabel func_800E2BB0 /* 7C07C 800E2BCC 46001000 */ add.s $f0, $f2, $f0 /* 7C080 800E2BD0 C604002C */ lwc1 $f4, 0x2c($s0) /* 7C084 800E2BD4 4600203C */ c.lt.s $f4, $f0 -/* 7C088 800E2BD8 00000000 */ nop +/* 7C088 800E2BD8 00000000 */ nop /* 7C08C 800E2BDC 45000026 */ bc1f .L800E2C78 /* 7C090 800E2BE0 0000102D */ daddu $v0, $zero, $zero /* 7C094 800E2BE4 46041081 */ sub.s $f2, $f2, $f4 /* 7C098 800E2BE8 3C014442 */ lui $at, 0x4442 /* 7C09C 800E2BEC 34214000 */ ori $at, $at, 0x4000 /* 7C0A0 800E2BF0 44810000 */ mtc1 $at, $f0 -/* 7C0A4 800E2BF4 00000000 */ nop +/* 7C0A4 800E2BF4 00000000 */ nop /* 7C0A8 800E2BF8 46001183 */ div.s $f6, $f2, $f0 /* 7C0AC 800E2BFC 3C018011 */ lui $at, %hi(D_8010BD80) /* 7C0B0 800E2C00 D422BD80 */ ldc1 $f2, %lo(D_8010BD80)($at) /* 7C0B4 800E2C04 46003021 */ cvt.d.s $f0, $f6 /* 7C0B8 800E2C08 4622003C */ c.lt.d $f0, $f2 -/* 7C0BC 800E2C0C 00000000 */ nop +/* 7C0BC 800E2C0C 00000000 */ nop /* 7C0C0 800E2C10 45000004 */ bc1f .L800E2C24 -/* 7C0C4 800E2C14 00000000 */ nop +/* 7C0C4 800E2C14 00000000 */ nop /* 7C0C8 800E2C18 3C01BEF0 */ lui $at, 0xbef0 /* 7C0CC 800E2C1C 3421A3D7 */ ori $at, $at, 0xa3d7 /* 7C0D0 800E2C20 44813000 */ mtc1 $at, $f6 @@ -36,9 +36,9 @@ glabel func_800E2BB0 /* 7C0D8 800E2C28 D422BD88 */ ldc1 $f2, %lo(D_8010BD88)($at) /* 7C0DC 800E2C2C 46003021 */ cvt.d.s $f0, $f6 /* 7C0E0 800E2C30 4620103C */ c.lt.d $f2, $f0 -/* 7C0E4 800E2C34 00000000 */ nop +/* 7C0E4 800E2C34 00000000 */ nop /* 7C0E8 800E2C38 45000004 */ bc1f .L800E2C4C -/* 7C0EC 800E2C3C 00000000 */ nop +/* 7C0EC 800E2C3C 00000000 */ nop /* 7C0F0 800E2C40 3C013A83 */ lui $at, 0x3a83 /* 7C0F4 800E2C44 3421126F */ ori $at, $at, 0x126f /* 7C0F8 800E2C48 44813000 */ mtc1 $at, $f6 @@ -49,7 +49,7 @@ glabel func_800E2BB0 /* 7C108 800E2C58 46002100 */ add.s $f4, $f4, $f0 /* 7C10C 800E2C5C E6000070 */ swc1 $f0, 0x70($s0) /* 7C110 800E2C60 4602003E */ c.le.s $f0, $f2 -/* 7C114 800E2C64 00000000 */ nop +/* 7C114 800E2C64 00000000 */ nop /* 7C118 800E2C68 45000011 */ bc1f .L800E2CB0 /* 7C11C 800E2C6C E604002C */ swc1 $f4, 0x2c($s0) /* 7C120 800E2C70 08038B2C */ j .L800E2CB0 @@ -63,7 +63,7 @@ glabel func_800E2BB0 /* 7C13C 800E2C8C 44801000 */ mtc1 $zero, $f2 /* 7C140 800E2C90 46200020 */ cvt.s.d $f0, $f0 /* 7C144 800E2C94 4602003E */ c.le.s $f0, $f2 -/* 7C148 800E2C98 00000000 */ nop +/* 7C148 800E2C98 00000000 */ nop /* 7C14C 800E2C9C 45000002 */ bc1f .L800E2CA8 /* 7C150 800E2CA0 E6000070 */ swc1 $f0, 0x70($s0) /* 7C154 800E2CA4 24020001 */ addiu $v0, $zero, 1 @@ -72,9 +72,9 @@ glabel func_800E2BB0 /* 7C15C 800E2CAC E600002C */ swc1 $f0, 0x2c($s0) .L800E2CB0: /* 7C160 800E2CB0 10400015 */ beqz $v0, .L800E2D08 -/* 7C164 800E2CB4 00000000 */ nop +/* 7C164 800E2CB4 00000000 */ nop /* 7C168 800E2CB8 0C0389AC */ jal func_800E26B0 -/* 7C16C 800E2CBC 00000000 */ nop +/* 7C16C 800E2CBC 00000000 */ nop /* 7C170 800E2CC0 3C013DEA */ lui $at, 0x3dea /* 7C174 800E2CC4 3421161E */ ori $at, $at, 0x161e /* 7C178 800E2CC8 44810000 */ mtc1 $at, $f0 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s index f2ed54ad31..7f30a51ca5 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E2F60.s @@ -15,7 +15,7 @@ glabel func_800E2F60 /* 7C438 800E2F88 00220821 */ addu $at, $at, $v0 /* 7C43C 800E2F8C 8C22BDE8 */ lw $v0, %lo(D_8010BDE8)($at) /* 7C440 800E2F90 00400008 */ jr $v0 -/* 7C444 800E2F94 00000000 */ nop +/* 7C444 800E2F94 00000000 */ nop /* 7C448 800E2F98 3C014120 */ lui $at, 0x4120 /* 7C44C 800E2F9C 44810000 */ mtc1 $at, $f0 /* 7C450 800E2FA0 3C01C0A0 */ lui $at, 0xc0a0 @@ -52,22 +52,22 @@ glabel func_800E2F60 /* 7C4C8 800E3018 C4880000 */ lwc1 $f8, ($a0) /* 7C4CC 800E301C 3C013F00 */ lui $at, 0x3f00 /* 7C4D0 800E3020 44811000 */ mtc1 $at, $f2 -/* 7C4D4 800E3024 00000000 */ nop +/* 7C4D4 800E3024 00000000 */ nop /* 7C4D8 800E3028 46024202 */ mul.s $f8, $f8, $f2 -/* 7C4DC 800E302C 00000000 */ nop +/* 7C4DC 800E302C 00000000 */ nop /* 7C4E0 800E3030 C4C60004 */ lwc1 $f6, 4($a2) /* 7C4E4 800E3034 46023182 */ mul.s $f6, $f6, $f2 -/* 7C4E8 800E3038 00000000 */ nop +/* 7C4E8 800E3038 00000000 */ nop /* 7C4EC 800E303C C4C40008 */ lwc1 $f4, 8($a2) /* 7C4F0 800E3040 46022102 */ mul.s $f4, $f4, $f2 -/* 7C4F4 800E3044 00000000 */ nop +/* 7C4F4 800E3044 00000000 */ nop /* 7C4F8 800E3048 C4C0000C */ lwc1 $f0, 0xc($a2) /* 7C4FC 800E304C 46020002 */ mul.s $f0, $f0, $f2 -/* 7C500 800E3050 00000000 */ nop +/* 7C500 800E3050 00000000 */ nop /* 7C504 800E3054 E4A80070 */ swc1 $f8, 0x70($a1) /* 7C508 800E3058 E4A60074 */ swc1 $f6, 0x74($a1) /* 7C50C 800E305C E4A40078 */ swc1 $f4, 0x78($a1) /* 7C510 800E3060 E4A0007C */ swc1 $f0, 0x7c($a1) .L800E3064: /* 7C514 800E3064 03E00008 */ jr $ra -/* 7C518 800E3068 00000000 */ nop +/* 7C518 800E3068 00000000 */ nop diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3100.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3100.s index 2554d3844f..3d66f9afd4 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3100.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3100.s @@ -12,9 +12,9 @@ glabel func_800E3100 /* 7C5CC 800E311C 1062000B */ beq $v1, $v0, .L800E314C /* 7C5D0 800E3120 24020004 */ addiu $v0, $zero, 4 /* 7C5D4 800E3124 10620009 */ beq $v1, $v0, .L800E314C -/* 7C5D8 800E3128 00000000 */ nop +/* 7C5D8 800E3128 00000000 */ nop /* 7C5DC 800E312C 0C038D36 */ jal func_800E34D8 -/* 7C5E0 800E3130 00000000 */ nop +/* 7C5E0 800E3130 00000000 */ nop /* 7C5E4 800E3134 46000306 */ mov.s $f12, $f0 /* 7C5E8 800E3138 0C038D45 */ jal func_800E3514 /* 7C5EC 800E313C 27A50010 */ addiu $a1, $sp, 0x10 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s index a3af41febd..ba2b05a52d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E315C.s @@ -12,7 +12,7 @@ glabel func_800E315C /* 7C628 800E3178 0480003A */ bltz $a0, .L800E3264 /* 7C62C 800E317C AFBF0018 */ sw $ra, 0x18($sp) /* 7C630 800E3180 0C016F6A */ jal get_collider_type_by_id -/* 7C634 800E3184 00000000 */ nop +/* 7C634 800E3184 00000000 */ nop /* 7C638 800E3188 304200FF */ andi $v0, $v0, 0xff /* 7C63C 800E318C 2443FFFF */ addiu $v1, $v0, -1 /* 7C640 800E3190 2C620005 */ sltiu $v0, $v1, 5 @@ -22,11 +22,11 @@ glabel func_800E315C /* 7C650 800E31A0 00220821 */ addu $at, $at, $v0 /* 7C654 800E31A4 8C22BE40 */ lw $v0, %lo(D_8010BE40)($at) /* 7C658 800E31A8 00400008 */ jr $v0 -/* 7C65C 800E31AC 00000000 */ nop +/* 7C65C 800E31AC 00000000 */ nop /* 7C660 800E31B0 0C039769 */ jal set_action_state /* 7C664 800E31B4 2404000A */ addiu $a0, $zero, 0xa /* 7C668 800E31B8 08038C99 */ j .L800E3264 -/* 7C66C 800E31BC 00000000 */ nop +/* 7C66C 800E31BC 00000000 */ nop /* 7C670 800E31C0 3C04FF00 */ lui $a0, 0xff00 /* 7C674 800E31C4 348400FF */ ori $a0, $a0, 0xff /* 7C678 800E31C8 3C030100 */ lui $v1, 0x100 @@ -34,7 +34,7 @@ glabel func_800E315C /* 7C680 800E31D0 34630009 */ ori $v1, $v1, 9 /* 7C684 800E31D4 00441024 */ and $v0, $v0, $a0 /* 7C688 800E31D8 10430022 */ beq $v0, $v1, .L800E3264 -/* 7C68C 800E31DC 00000000 */ nop +/* 7C68C 800E31DC 00000000 */ nop /* 7C690 800E31E0 86020010 */ lh $v0, 0x10($s0) /* 7C694 800E31E4 14400019 */ bnez $v0, .L800E324C /* 7C698 800E31E8 24020017 */ addiu $v0, $zero, 0x17 @@ -50,7 +50,7 @@ glabel func_800E315C /* 7C6C0 800E3210 34630009 */ ori $v1, $v1, 9 /* 7C6C4 800E3214 00441024 */ and $v0, $v0, $a0 /* 7C6C8 800E3218 10430012 */ beq $v0, $v1, .L800E3264 -/* 7C6CC 800E321C 00000000 */ nop +/* 7C6CC 800E321C 00000000 */ nop /* 7C6D0 800E3220 86020010 */ lh $v0, 0x10($s0) /* 7C6D4 800E3224 14400009 */ bnez $v0, .L800E324C /* 7C6D8 800E3228 24020015 */ addiu $v0, $zero, 0x15 @@ -62,15 +62,15 @@ glabel func_800E315C /* 7C6EC 800E323C 0C039769 */ jal set_action_state /* 7C6F0 800E3240 24040017 */ addiu $a0, $zero, 0x17 /* 7C6F4 800E3244 08038C99 */ j .L800E3264 -/* 7C6F8 800E3248 00000000 */ nop +/* 7C6F8 800E3248 00000000 */ nop .L800E324C: /* 7C6FC 800E324C 0C039769 */ jal set_action_state /* 7C700 800E3250 24040016 */ addiu $a0, $zero, 0x16 /* 7C704 800E3254 08038C99 */ j .L800E3264 -/* 7C708 800E3258 00000000 */ nop +/* 7C708 800E3258 00000000 */ nop .L800E325C: /* 7C70C 800E325C 0C038C9E */ jal phys_player_land -/* 7C710 800E3260 00000000 */ nop +/* 7C710 800E3260 00000000 */ nop .L800E3264: /* 7C714 800E3264 8FBF0018 */ lw $ra, 0x18($sp) /* 7C718 800E3268 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s index 5961d95f45..fea4464fcc 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E3514.s @@ -16,10 +16,10 @@ glabel func_800E3514 /* 7C9F0 800E3540 3C013F00 */ lui $at, 0x3f00 /* 7C9F4 800E3544 44810000 */ mtc1 $at, $f0 /* 7C9F8 800E3548 44822000 */ mtc1 $v0, $f4 -/* 7C9FC 800E354C 00000000 */ nop +/* 7C9FC 800E354C 00000000 */ nop /* 7CA00 800E3550 46802120 */ cvt.s.w $f4, $f4 /* 7CA04 800E3554 46002102 */ mul.s $f4, $f4, $f0 -/* 7CA08 800E3558 00000000 */ nop +/* 7CA08 800E3558 00000000 */ nop /* 7CA0C 800E355C 0220202D */ daddu $a0, $s1, $zero /* 7CA10 800E3560 27A50028 */ addiu $a1, $sp, 0x28 /* 7CA14 800E3564 27A6002C */ addiu $a2, $sp, 0x2c @@ -51,14 +51,14 @@ glabel func_800E3514 /* 7CA7C 800E35CC 04410010 */ bgez $v0, .L800E3610 /* 7CA80 800E35D0 0240802D */ daddu $s0, $s2, $zero /* 7CA84 800E35D4 44800000 */ mtc1 $zero, $f0 -/* 7CA88 800E35D8 00000000 */ nop +/* 7CA88 800E35D8 00000000 */ nop /* 7CA8C 800E35DC 4614003E */ c.le.s $f0, $f20 -/* 7CA90 800E35E0 00000000 */ nop +/* 7CA90 800E35E0 00000000 */ nop /* 7CA94 800E35E4 45000006 */ bc1f .L800E3600 -/* 7CA98 800E35E8 00000000 */ nop +/* 7CA98 800E35E8 00000000 */ nop /* 7CA9C 800E35EC 86420008 */ lh $v0, 8($s2) /* 7CAA0 800E35F0 04400003 */ bltz $v0, .L800E3600 -/* 7CAA4 800E35F4 00000000 */ nop +/* 7CAA4 800E35F4 00000000 */ nop /* 7CAA8 800E35F8 08038D88 */ j .L800E3620 /* 7CAAC 800E35FC C620002C */ lwc1 $f0, 0x2c($s1) .L800E3600: diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4404.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4404.s index 9a14dbf9d8..b95b33500f 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4404.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4404.s @@ -22,7 +22,7 @@ glabel func_800E4404 /* 7D8F8 800E4448 0000802D */ daddu $s0, $zero, $zero /* 7D8FC 800E444C F7B60058 */ sdc1 $f22, 0x58($sp) /* 7D900 800E4450 4485B000 */ mtc1 $a1, $f22 -/* 7D904 800E4454 00000000 */ nop +/* 7D904 800E4454 00000000 */ nop /* 7D908 800E4458 4680B5A0 */ cvt.s.w $f22, $f22 /* 7D90C 800E445C AFB40040 */ sw $s4, 0x40($sp) /* 7D910 800E4460 27B40028 */ addiu $s4, $sp, 0x28 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4508.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4508.s index ac9c87f3ce..c68260e63e 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4508.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4508.s @@ -12,9 +12,9 @@ glabel func_800E4508 /* 7D9D4 800E4524 F7B40040 */ sdc1 $f20, 0x40($sp) /* 7D9D8 800E4528 C6140064 */ lwc1 $f20, 0x64($s0) /* 7D9DC 800E452C 4480B000 */ mtc1 $zero, $f22 -/* 7D9E0 800E4530 00000000 */ nop +/* 7D9E0 800E4530 00000000 */ nop /* 7D9E4 800E4534 4616A032 */ c.eq.s $f20, $f22 -/* 7D9E8 800E4538 00000000 */ nop +/* 7D9E8 800E4538 00000000 */ nop /* 7D9EC 800E453C 45010021 */ bc1t .L800E45C4 /* 7D9F0 800E4540 0200882D */ daddu $s1, $s0, $zero /* 7D9F4 800E4544 27A20028 */ addiu $v0, $sp, 0x28 @@ -44,7 +44,7 @@ glabel func_800E4508 /* 7DA54 800E45A4 E604002C */ swc1 $f4, 0x2c($s0) /* 7DA58 800E45A8 E6060030 */ swc1 $f6, 0x30($s0) /* 7DA5C 800E45AC 4616A03C */ c.lt.s $f20, $f22 -/* 7DA60 800E45B0 00000000 */ nop +/* 7DA60 800E45B0 00000000 */ nop /* 7DA64 800E45B4 45000002 */ bc1f .L800E45C0 /* 7DA68 800E45B8 E6000028 */ swc1 $f0, 0x28($s0) /* 7DA6C 800E45BC 4600B506 */ mov.s $f20, $f22 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s index 0933030353..a228903cf7 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E45E0.s @@ -24,37 +24,37 @@ glabel func_800E45E0 /* 7DADC 800E462C 44801000 */ mtc1 $zero, $f2 /* 7DAE0 800E4630 46200020 */ cvt.s.d $f0, $f0 /* 7DAE4 800E4634 46020032 */ c.eq.s $f0, $f2 -/* 7DAE8 800E4638 00000000 */ nop +/* 7DAE8 800E4638 00000000 */ nop /* 7DAEC 800E463C 4501001D */ bc1t .L800E46B4 -/* 7DAF0 800E4640 00000000 */ nop +/* 7DAF0 800E4640 00000000 */ nop /* 7DAF4 800E4644 84C2008C */ lh $v0, 0x8c($a2) /* 7DAF8 800E4648 10400005 */ beqz $v0, .L800E4660 /* 7DAFC 800E464C 24050001 */ addiu $a1, $zero, 1 /* 7DB00 800E4650 10450009 */ beq $v0, $a1, .L800E4678 -/* 7DB04 800E4654 00000000 */ nop +/* 7DB04 800E4654 00000000 */ nop /* 7DB08 800E4658 080391AD */ j .L800E46B4 -/* 7DB0C 800E465C 00000000 */ nop +/* 7DB0C 800E465C 00000000 */ nop .L800E4660: /* 7DB10 800E4660 3C0141A0 */ lui $at, 0x41a0 /* 7DB14 800E4664 44811000 */ mtc1 $at, $f2 /* 7DB18 800E4668 46000005 */ abs.s $f0, $f0 /* 7DB1C 800E466C 4602003C */ c.lt.s $f0, $f2 /* 7DB20 800E4670 080391AB */ j .L800E46AC -/* 7DB24 800E4674 00000000 */ nop +/* 7DB24 800E4674 00000000 */ nop .L800E4678: /* 7DB28 800E4678 C6020028 */ lwc1 $f2, 0x28($s0) /* 7DB2C 800E467C 3C01C396 */ lui $at, 0xc396 /* 7DB30 800E4680 44810000 */ mtc1 $at, $f0 -/* 7DB34 800E4684 00000000 */ nop +/* 7DB34 800E4684 00000000 */ nop /* 7DB38 800E4688 4602003E */ c.le.s $f0, $f2 -/* 7DB3C 800E468C 00000000 */ nop +/* 7DB3C 800E468C 00000000 */ nop /* 7DB40 800E4690 45000008 */ bc1f .L800E46B4 -/* 7DB44 800E4694 00000000 */ nop +/* 7DB44 800E4694 00000000 */ nop /* 7DB48 800E4698 3C01C30C */ lui $at, 0xc30c /* 7DB4C 800E469C 44810000 */ mtc1 $at, $f0 -/* 7DB50 800E46A0 00000000 */ nop +/* 7DB50 800E46A0 00000000 */ nop /* 7DB54 800E46A4 4600103E */ c.le.s $f2, $f0 -/* 7DB58 800E46A8 00000000 */ nop +/* 7DB58 800E46A8 00000000 */ nop .L800E46AC: /* 7DB5C 800E46AC 45030001 */ bc1tl .L800E46B4 /* 7DB60 800E46B0 0000282D */ daddu $a1, $zero, $zero diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s index beb3c1ad91..741903f20d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E46C8.s @@ -7,7 +7,7 @@ glabel func_800E46C8 /* 7DB80 800E46D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7DB84 800E46D4 AFBF0010 */ sw $ra, 0x10($sp) /* 7DB88 800E46D8 0C044181 */ jal get_shadow_by_index -/* 7DB8C 800E46DC 00000000 */ nop +/* 7DB8C 800E46DC 00000000 */ nop /* 7DB90 800E46E0 C4400030 */ lwc1 $f0, 0x30($v0) /* 7DB94 800E46E4 3C018011 */ lui $at, %hi(D_8010BEE8) /* 7DB98 800E46E8 D424BEE8 */ ldc1 $f4, %lo(D_8010BEE8)($at) @@ -22,12 +22,12 @@ glabel func_800E46C8 /* 7DBBC 800E470C 46200020 */ cvt.s.d $f0, $f0 /* 7DBC0 800E4710 46000005 */ abs.s $f0, $f0 /* 7DBC4 800E4714 4604003C */ c.lt.s $f0, $f4 -/* 7DBC8 800E4718 00000000 */ nop +/* 7DBC8 800E4718 00000000 */ nop /* 7DBCC 800E471C 45000006 */ bc1f .L800E4738 /* 7DBD0 800E4720 46201020 */ cvt.s.d $f0, $f2 /* 7DBD4 800E4724 46000005 */ abs.s $f0, $f0 /* 7DBD8 800E4728 4604003C */ c.lt.s $f0, $f4 -/* 7DBDC 800E472C 00000000 */ nop +/* 7DBDC 800E472C 00000000 */ nop /* 7DBE0 800E4730 45030001 */ bc1tl .L800E4738 /* 7DBE4 800E4734 0000102D */ daddu $v0, $zero, $zero .L800E4738: diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s index 913083a961..aa0c1154d4 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4744.s @@ -22,10 +22,10 @@ glabel func_800E4744 /* 7DC38 800E4788 4481A000 */ mtc1 $at, $f20 /* 7DC3C 800E478C C6000028 */ lwc1 $f0, 0x28($s0) /* 7DC40 800E4790 44822000 */ mtc1 $v0, $f4 -/* 7DC44 800E4794 00000000 */ nop +/* 7DC44 800E4794 00000000 */ nop /* 7DC48 800E4798 46802120 */ cvt.s.w $f4, $f4 /* 7DC4C 800E479C 46142582 */ mul.s $f22, $f4, $f20 -/* 7DC50 800E47A0 00000000 */ nop +/* 7DC50 800E47A0 00000000 */ nop /* 7DC54 800E47A4 27A70030 */ addiu $a3, $sp, 0x30 /* 7DC58 800E47A8 E7A00028 */ swc1 $f0, 0x28($sp) /* 7DC5C 800E47AC C600002C */ lwc1 $f0, 0x2c($s0) @@ -52,7 +52,7 @@ glabel func_800E4744 /* 7DCB0 800E4800 0C00A794 */ jal get_player_normal_pitch /* 7DCB4 800E4804 0040882D */ daddu $s1, $v0, $zero /* 7DCB8 800E4808 4614C502 */ mul.s $f20, $f24, $f20 -/* 7DCBC 800E480C 00000000 */ nop +/* 7DCBC 800E480C 00000000 */ nop /* 7DCC0 800E4810 3C138011 */ lui $s3, %hi(D_8010EBB0) /* 7DCC4 800E4814 2673EBB0 */ addiu $s3, $s3, %lo(D_8010EBB0) /* 7DCC8 800E4818 C7A20034 */ lwc1 $f2, 0x34($sp) @@ -60,7 +60,7 @@ glabel func_800E4744 /* 7DCD0 800E4820 3C148016 */ lui $s4, %hi(gCollisionStatus) /* 7DCD4 800E4824 2694A550 */ addiu $s4, $s4, %lo(gCollisionStatus) /* 7DCD8 800E4828 4602A03C */ c.lt.s $f20, $f2 -/* 7DCDC 800E482C 00000000 */ nop +/* 7DCDC 800E482C 00000000 */ nop /* 7DCE0 800E4830 45000002 */ bc1f .L800E483C /* 7DCE4 800E4834 E6000068 */ swc1 $f0, 0x68($s0) /* 7DCE8 800E4838 2411FFFF */ addiu $s1, $zero, -1 @@ -70,16 +70,16 @@ glabel func_800E4744 /* 7DCF4 800E4844 A6910002 */ sh $s1, 2($s4) .L800E4848: /* 7DCF8 800E4848 06200005 */ bltz $s1, .L800E4860 -/* 7DCFC 800E484C 00000000 */ nop +/* 7DCFC 800E484C 00000000 */ nop /* 7DD00 800E4850 C7A00040 */ lwc1 $f0, 0x40($sp) /* 7DD04 800E4854 C7A20044 */ lwc1 $f2, 0x44($sp) /* 7DD08 800E4858 E6000034 */ swc1 $f0, 0x34($s0) /* 7DD0C 800E485C E6020038 */ swc1 $f2, 0x38($s0) .L800E4860: /* 7DD10 800E4860 0C038082 */ jal func_800E0208 -/* 7DD14 800E4864 00000000 */ nop +/* 7DD14 800E4864 00000000 */ nop /* 7DD18 800E4868 14400090 */ bnez $v0, .L800E4AAC -/* 7DD1C 800E486C 00000000 */ nop +/* 7DD1C 800E486C 00000000 */ nop /* 7DD20 800E4870 8E030000 */ lw $v1, ($s0) /* 7DD24 800E4874 3062000E */ andi $v0, $v1, 0xe /* 7DD28 800E4878 1440008C */ bnez $v0, .L800E4AAC @@ -88,21 +88,21 @@ glabel func_800E4744 /* 7DD34 800E4884 10520089 */ beq $v0, $s2, .L800E4AAC /* 7DD38 800E4888 30620010 */ andi $v0, $v1, 0x10 /* 7DD3C 800E488C 1040000C */ beqz $v0, .L800E48C0 -/* 7DD40 800E4890 00000000 */ nop +/* 7DD40 800E4890 00000000 */ nop /* 7DD44 800E4894 0C03954C */ jal func_800E5530 -/* 7DD48 800E4898 00000000 */ nop +/* 7DD48 800E4898 00000000 */ nop /* 7DD4C 800E489C 0C039178 */ jal func_800E45E0 -/* 7DD50 800E48A0 00000000 */ nop +/* 7DD50 800E48A0 00000000 */ nop /* 7DD54 800E48A4 10400006 */ beqz $v0, .L800E48C0 -/* 7DD58 800E48A8 00000000 */ nop +/* 7DD58 800E48A8 00000000 */ nop /* 7DD5C 800E48AC 0C039769 */ jal set_action_state /* 7DD60 800E48B0 0240202D */ daddu $a0, $s2, $zero /* 7DD64 800E48B4 820200B4 */ lb $v0, 0xb4($s0) /* 7DD68 800E48B8 1052007C */ beq $v0, $s2, .L800E4AAC -/* 7DD6C 800E48BC 00000000 */ nop +/* 7DD6C 800E48BC 00000000 */ nop .L800E48C0: /* 7DD70 800E48C0 0620005D */ bltz $s1, .L800E4A38 -/* 7DD74 800E48C4 00000000 */ nop +/* 7DD74 800E48C4 00000000 */ nop /* 7DD78 800E48C8 0C016F6A */ jal get_collider_type_by_id /* 7DD7C 800E48CC 0220202D */ daddu $a0, $s1, $zero /* 7DD80 800E48D0 304400FF */ andi $a0, $v0, 0xff @@ -112,21 +112,21 @@ glabel func_800E4744 /* 7DD90 800E48E0 10820011 */ beq $a0, $v0, .L800E4928 /* 7DD94 800E48E4 0000282D */ daddu $a1, $zero, $zero /* 7DD98 800E48E8 0803925F */ j .L800E497C -/* 7DD9C 800E48EC 00000000 */ nop +/* 7DD9C 800E48EC 00000000 */ nop .L800E48F0: /* 7DDA0 800E48F0 82620000 */ lb $v0, ($s3) /* 7DDA4 800E48F4 10400004 */ beqz $v0, .L800E4908 /* 7DDA8 800E48F8 24020009 */ addiu $v0, $zero, 9 /* 7DDAC 800E48FC 82630003 */ lb $v1, 3($s3) /* 7DDB0 800E4900 1062006A */ beq $v1, $v0, .L800E4AAC -/* 7DDB4 800E4904 00000000 */ nop +/* 7DDB4 800E4904 00000000 */ nop .L800E4908: /* 7DDB8 800E4908 86020010 */ lh $v0, 0x10($s0) /* 7DDBC 800E490C 14400017 */ bnez $v0, .L800E496C /* 7DDC0 800E4910 24020017 */ addiu $v0, $zero, 0x17 /* 7DDC4 800E4914 820300B4 */ lb $v1, 0xb4($s0) /* 7DDC8 800E4918 10620064 */ beq $v1, $v0, .L800E4AAC -/* 7DDCC 800E491C 00000000 */ nop +/* 7DDCC 800E491C 00000000 */ nop /* 7DDD0 800E4920 08039257 */ j .L800E495C /* 7DDD4 800E4924 A20400BF */ sb $a0, 0xbf($s0) .L800E4928: @@ -135,7 +135,7 @@ glabel func_800E4744 /* 7DDE0 800E4930 24020009 */ addiu $v0, $zero, 9 /* 7DDE4 800E4934 82630003 */ lb $v1, 3($s3) /* 7DDE8 800E4938 1062005C */ beq $v1, $v0, .L800E4AAC -/* 7DDEC 800E493C 00000000 */ nop +/* 7DDEC 800E493C 00000000 */ nop .L800E4940: /* 7DDF0 800E4940 86020010 */ lh $v0, 0x10($s0) /* 7DDF4 800E4944 14400009 */ bnez $v0, .L800E496C @@ -148,17 +148,17 @@ glabel func_800E4744 /* 7DE0C 800E495C 0C039769 */ jal set_action_state /* 7DE10 800E4960 24040017 */ addiu $a0, $zero, 0x17 /* 7DE14 800E4964 080392AB */ j .L800E4AAC -/* 7DE18 800E4968 00000000 */ nop +/* 7DE18 800E4968 00000000 */ nop .L800E496C: /* 7DE1C 800E496C 0C039769 */ jal set_action_state /* 7DE20 800E4970 24040016 */ addiu $a0, $zero, 0x16 /* 7DE24 800E4974 080392AB */ j .L800E4AAC -/* 7DE28 800E4978 00000000 */ nop +/* 7DE28 800E4978 00000000 */ nop .L800E497C: /* 7DE2C 800E497C 96840002 */ lhu $a0, 2($s4) /* 7DE30 800E4980 30824000 */ andi $v0, $a0, 0x4000 /* 7DE34 800E4984 10400006 */ beqz $v0, .L800E49A0 -/* 7DE38 800E4988 00000000 */ nop +/* 7DE38 800E4988 00000000 */ nop /* 7DE3C 800E498C 00042400 */ sll $a0, $a0, 0x10 /* 7DE40 800E4990 0C0441A9 */ jal get_entity_type /* 7DE44 800E4994 00042403 */ sra $a0, $a0, 0x10 @@ -168,23 +168,23 @@ glabel func_800E4744 /* 7DE50 800E49A0 820300B4 */ lb $v1, 0xb4($s0) /* 7DE54 800E49A4 24020022 */ addiu $v0, $zero, 0x22 /* 7DE58 800E49A8 10620040 */ beq $v1, $v0, .L800E4AAC -/* 7DE5C 800E49AC 00000000 */ nop +/* 7DE5C 800E49AC 00000000 */ nop /* 7DE60 800E49B0 14A0003E */ bnez $a1, .L800E4AAC -/* 7DE64 800E49B4 00000000 */ nop +/* 7DE64 800E49B4 00000000 */ nop /* 7DE68 800E49B8 8E020004 */ lw $v0, 4($s0) /* 7DE6C 800E49BC 30421000 */ andi $v0, $v0, 0x1000 /* 7DE70 800E49C0 14400017 */ bnez $v0, .L800E4A20 -/* 7DE74 800E49C4 00000000 */ nop +/* 7DE74 800E49C4 00000000 */ nop /* 7DE78 800E49C8 C7A4002C */ lwc1 $f4, 0x2c($sp) /* 7DE7C 800E49CC C600002C */ lwc1 $f0, 0x2c($s0) /* 7DE80 800E49D0 46002001 */ sub.s $f0, $f4, $f0 /* 7DE84 800E49D4 3C0140C0 */ lui $at, 0x40c0 /* 7DE88 800E49D8 44811000 */ mtc1 $at, $f2 -/* 7DE8C 800E49DC 00000000 */ nop +/* 7DE8C 800E49DC 00000000 */ nop /* 7DE90 800E49E0 4602003C */ c.lt.s $f0, $f2 -/* 7DE94 800E49E4 00000000 */ nop +/* 7DE94 800E49E4 00000000 */ nop /* 7DE98 800E49E8 45000003 */ bc1f .L800E49F8 -/* 7DE9C 800E49EC 00000000 */ nop +/* 7DE9C 800E49EC 00000000 */ nop /* 7DEA0 800E49F0 0803928A */ j .L800E4A28 /* 7DEA4 800E49F4 E604002C */ swc1 $f4, 0x2c($s0) .L800E49F8: @@ -197,15 +197,15 @@ glabel func_800E4744 /* 7DEC0 800E4A10 3C018011 */ lui $at, %hi(D_8010C984) /* 7DEC4 800E4A14 E422C984 */ swc1 $f2, %lo(D_8010C984)($at) /* 7DEC8 800E4A18 0803928A */ j .L800E4A28 -/* 7DECC 800E4A1C 00000000 */ nop +/* 7DECC 800E4A1C 00000000 */ nop .L800E4A20: /* 7DED0 800E4A20 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 7DED4 800E4A24 E600002C */ swc1 $f0, 0x2c($s0) .L800E4A28: /* 7DED8 800E4A28 0C039538 */ jal save_ground_pos -/* 7DEDC 800E4A2C 00000000 */ nop +/* 7DEDC 800E4A2C 00000000 */ nop /* 7DEE0 800E4A30 080392AB */ j .L800E4AAC -/* 7DEE4 800E4A34 00000000 */ nop +/* 7DEE4 800E4A34 00000000 */ nop .L800E4A38: /* 7DEE8 800E4A38 8E020000 */ lw $v0, ($s0) /* 7DEEC 800E4A3C 30420008 */ andi $v0, $v0, 8 @@ -213,30 +213,30 @@ glabel func_800E4744 /* 7DEF4 800E4A44 2402001D */ addiu $v0, $zero, 0x1d /* 7DEF8 800E4A48 820300B4 */ lb $v1, 0xb4($s0) /* 7DEFC 800E4A4C 10620017 */ beq $v1, $v0, .L800E4AAC -/* 7DF00 800E4A50 00000000 */ nop +/* 7DF00 800E4A50 00000000 */ nop /* 7DF04 800E4A54 4618B080 */ add.s $f2, $f22, $f24 /* 7DF08 800E4A58 C7A00034 */ lwc1 $f0, 0x34($sp) /* 7DF0C 800E4A5C 4602003E */ c.le.s $f0, $f2 -/* 7DF10 800E4A60 00000000 */ nop +/* 7DF10 800E4A60 00000000 */ nop /* 7DF14 800E4A64 4500000D */ bc1f .L800E4A9C /* 7DF18 800E4A68 24040008 */ addiu $a0, $zero, 8 /* 7DF1C 800E4A6C C7A00040 */ lwc1 $f0, 0x40($sp) /* 7DF20 800E4A70 44801000 */ mtc1 $zero, $f2 -/* 7DF24 800E4A74 00000000 */ nop +/* 7DF24 800E4A74 00000000 */ nop /* 7DF28 800E4A78 46020032 */ c.eq.s $f0, $f2 -/* 7DF2C 800E4A7C 00000000 */ nop +/* 7DF2C 800E4A7C 00000000 */ nop /* 7DF30 800E4A80 45000006 */ bc1f .L800E4A9C -/* 7DF34 800E4A84 00000000 */ nop +/* 7DF34 800E4A84 00000000 */ nop /* 7DF38 800E4A88 C7A00044 */ lwc1 $f0, 0x44($sp) /* 7DF3C 800E4A8C 46020032 */ c.eq.s $f0, $f2 -/* 7DF40 800E4A90 00000000 */ nop +/* 7DF40 800E4A90 00000000 */ nop /* 7DF44 800E4A94 45030001 */ bc1tl .L800E4A9C /* 7DF48 800E4A98 24040009 */ addiu $a0, $zero, 9 .L800E4A9C: /* 7DF4C 800E4A9C 0C039769 */ jal set_action_state -/* 7DF50 800E4AA0 00000000 */ nop +/* 7DF50 800E4AA0 00000000 */ nop /* 7DF54 800E4AA4 0C038C1B */ jal gravity_use_fall_parms -/* 7DF58 800E4AA8 00000000 */ nop +/* 7DF58 800E4AA8 00000000 */ nop .L800E4AAC: /* 7DF5C 800E4AAC 8FBF005C */ lw $ra, 0x5c($sp) /* 7DF60 800E4AB0 8FB40058 */ lw $s4, 0x58($sp) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s index 56117e2ab0..f104739baa 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4BB8.s @@ -17,9 +17,9 @@ glabel func_800E4BB8 /* 7E098 800E4BE8 10400005 */ beqz $v0, .L800E4C00 /* 7E09C 800E4BEC 0060982D */ daddu $s3, $v1, $zero /* 7E0A0 800E4BF0 0C0393C4 */ jal func_800E4F10 -/* 7E0A4 800E4BF4 00000000 */ nop +/* 7E0A4 800E4BF4 00000000 */ nop /* 7E0A8 800E4BF8 080393BB */ j .L800E4EEC -/* 7E0AC 800E4BFC 00000000 */ nop +/* 7E0AC 800E4BFC 00000000 */ nop .L800E4C00: /* 7E0B0 800E4C00 C66C0080 */ lwc1 $f12, 0x80($s3) /* 7E0B4 800E4C04 3C01403E */ lui $at, 0x403e @@ -39,10 +39,10 @@ glabel func_800E4BB8 /* 7E0EC 800E4C3C 3C013F40 */ lui $at, 0x3f40 /* 7E0F0 800E4C40 4481B000 */ mtc1 $at, $f22 /* 7E0F4 800E4C44 44822000 */ mtc1 $v0, $f4 -/* 7E0F8 800E4C48 00000000 */ nop +/* 7E0F8 800E4C48 00000000 */ nop /* 7E0FC 800E4C4C 46802120 */ cvt.s.w $f4, $f4 /* 7E100 800E4C50 46162102 */ mul.s $f4, $f4, $f22 -/* 7E104 800E4C54 00000000 */ nop +/* 7E104 800E4C54 00000000 */ nop /* 7E108 800E4C58 27B00028 */ addiu $s0, $sp, 0x28 /* 7E10C 800E4C5C C662002C */ lwc1 $f2, 0x2c($s3) /* 7E110 800E4C60 C6660028 */ lwc1 $f6, 0x28($s3) @@ -69,10 +69,10 @@ glabel func_800E4BB8 /* 7E164 800E4CB4 866200B0 */ lh $v0, 0xb0($s3) /* 7E168 800E4CB8 0240302D */ daddu $a2, $s2, $zero /* 7E16C 800E4CBC 44821000 */ mtc1 $v0, $f2 -/* 7E170 800E4CC0 00000000 */ nop +/* 7E170 800E4CC0 00000000 */ nop /* 7E174 800E4CC4 468010A0 */ cvt.s.w $f2, $f2 /* 7E178 800E4CC8 46161082 */ mul.s $f2, $f2, $f22 -/* 7E17C 800E4CCC 00000000 */ nop +/* 7E17C 800E4CCC 00000000 */ nop /* 7E180 800E4CD0 0220382D */ daddu $a3, $s1, $zero /* 7E184 800E4CD4 C664002C */ lwc1 $f4, 0x2c($s3) /* 7E188 800E4CD8 C6660028 */ lwc1 $f6, 0x28($s3) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4F10.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4F10.s index 6bfb3fb8ac..78d5708096 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E4F10.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E4F10.s @@ -30,19 +30,19 @@ glabel func_800E4F10 /* 7E424 800E4F74 E6020030 */ swc1 $f2, 0x30($s0) /* 7E428 800E4F78 8FA3002C */ lw $v1, 0x2c($sp) /* 7E42C 800E4F7C 1060000F */ beqz $v1, .L800E4FBC -/* 7E430 800E4F80 00000000 */ nop +/* 7E430 800E4F80 00000000 */ nop /* 7E434 800E4F84 0441000D */ bgez $v0, .L800E4FBC /* 7E438 800E4F88 24020018 */ addiu $v0, $zero, 0x18 /* 7E43C 800E4F8C 820300B4 */ lb $v1, 0xb4($s0) /* 7E440 800E4F90 1062000A */ beq $v1, $v0, .L800E4FBC -/* 7E444 800E4F94 00000000 */ nop +/* 7E444 800E4F94 00000000 */ nop /* 7E448 800E4F98 C6020054 */ lwc1 $f2, 0x54($s0) /* 7E44C 800E4F9C 44800000 */ mtc1 $zero, $f0 -/* 7E450 800E4FA0 00000000 */ nop +/* 7E450 800E4FA0 00000000 */ nop /* 7E454 800E4FA4 46001032 */ c.eq.s $f2, $f0 -/* 7E458 800E4FA8 00000000 */ nop +/* 7E458 800E4FA8 00000000 */ nop /* 7E45C 800E4FAC 45010003 */ bc1t .L800E4FBC -/* 7E460 800E4FB0 00000000 */ nop +/* 7E460 800E4FB0 00000000 */ nop /* 7E464 800E4FB4 0C039769 */ jal set_action_state /* 7E468 800E4FB8 0040202D */ daddu $a0, $v0, $zero .L800E4FBC: diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5098.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5098.s index ae0afb8da9..76be2d54cb 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5098.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5098.s @@ -16,16 +16,16 @@ glabel func_800E5098 /* 7E570 800E50C0 14810004 */ bne $a0, $at, .L800E50D4 /* 7E574 800E50C4 3C018000 */ lui $at, 0x8000 /* 7E578 800E50C8 14410002 */ bne $v0, $at, .L800E50D4 -/* 7E57C 800E50CC 00000000 */ nop +/* 7E57C 800E50CC 00000000 */ nop /* 7E580 800E50D0 0006000D */ break 6 .L800E50D4: /* 7E584 800E50D4 00001810 */ mfhi $v1 /* 7E588 800E50D8 14600019 */ bnez $v1, .L800E5140 -/* 7E58C 800E50DC 00000000 */ nop +/* 7E58C 800E50DC 00000000 */ nop /* 7E590 800E50E0 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2) /* 7E594 800E50E4 8484A552 */ lh $a0, %lo(gCollisionStatus+0x2)($a0) /* 7E598 800E50E8 0C016F6A */ jal get_collider_type_by_id -/* 7E59C 800E50EC 00000000 */ nop +/* 7E59C 800E50EC 00000000 */ nop /* 7E5A0 800E50F0 304300FF */ andi $v1, $v0, 0xff /* 7E5A4 800E50F4 24020006 */ addiu $v0, $zero, 6 /* 7E5A8 800E50F8 10620003 */ beq $v1, $v0, .L800E5108 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s index b2e3dd04e3..74e6fb7885 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5174.s @@ -34,10 +34,10 @@ glabel func_800E5174 /* 7E698 800E51E8 4481A000 */ mtc1 $at, $f20 /* 7E69C 800E51EC C6020030 */ lwc1 $f2, 0x30($s0) /* 7E6A0 800E51F0 44820000 */ mtc1 $v0, $f0 -/* 7E6A4 800E51F4 00000000 */ nop +/* 7E6A4 800E51F4 00000000 */ nop /* 7E6A8 800E51F8 46800020 */ cvt.s.w $f0, $f0 /* 7E6AC 800E51FC 46140002 */ mul.s $f0, $f0, $f20 -/* 7E6B0 800E5200 00000000 */ nop +/* 7E6B0 800E5200 00000000 */ nop /* 7E6B4 800E5204 E7A40018 */ swc1 $f4, 0x18($sp) /* 7E6B8 800E5208 E7A6001C */ swc1 $f6, 0x1c($sp) /* 7E6BC 800E520C E7A20020 */ swc1 $f2, 0x20($sp) @@ -49,9 +49,9 @@ glabel func_800E5174 /* 7E6D4 800E5224 0080102D */ daddu $v0, $a0, $zero /* 7E6D8 800E5228 C6020054 */ lwc1 $f2, 0x54($s0) /* 7E6DC 800E522C 44800000 */ mtc1 $zero, $f0 -/* 7E6E0 800E5230 00000000 */ nop +/* 7E6E0 800E5230 00000000 */ nop /* 7E6E4 800E5234 46001032 */ c.eq.s $f2, $f0 -/* 7E6E8 800E5238 00000000 */ nop +/* 7E6E8 800E5238 00000000 */ nop /* 7E6EC 800E523C 45000026 */ bc1f .L800E52D8 /* 7E6F0 800E5240 0240282D */ daddu $a1, $s2, $zero /* 7E6F4 800E5244 0200202D */ daddu $a0, $s0, $zero @@ -70,10 +70,10 @@ glabel func_800E5174 /* 7E728 800E5278 848300B2 */ lh $v1, 0xb2($a0) /* 7E72C 800E527C 000240C0 */ sll $t0, $v0, 3 /* 7E730 800E5280 44833000 */ mtc1 $v1, $f6 -/* 7E734 800E5284 00000000 */ nop +/* 7E734 800E5284 00000000 */ nop /* 7E738 800E5288 468031A0 */ cvt.s.w $f6, $f6 /* 7E73C 800E528C 46143182 */ mul.s $f6, $f6, $f20 -/* 7E740 800E5290 00000000 */ nop +/* 7E740 800E5290 00000000 */ nop /* 7E744 800E5294 00481021 */ addu $v0, $v0, $t0 /* 7E748 800E5298 C48000A8 */ lwc1 $f0, 0xa8($a0) /* 7E74C 800E529C 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s index 3e8cba0f3c..fd02f5ba87 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5348.s @@ -19,40 +19,40 @@ glabel func_800E5348 /* 7E830 800E5380 00220821 */ addu $at, $at, $v0 /* 7E834 800E5384 C42C1DEC */ lwc1 $f12, %lo(D_800B1DEC)($at) /* 7E838 800E5388 0C00A70A */ jal get_clamped_angle_diff -/* 7E83C 800E538C 00000000 */ nop +/* 7E83C 800E538C 00000000 */ nop /* 7E840 800E5390 3C01C0A0 */ lui $at, 0xc0a0 /* 7E844 800E5394 44811000 */ mtc1 $at, $f2 /* 7E848 800E5398 46000106 */ mov.s $f4, $f0 /* 7E84C 800E539C 4602203C */ c.lt.s $f4, $f2 -/* 7E850 800E53A0 00000000 */ nop +/* 7E850 800E53A0 00000000 */ nop /* 7E854 800E53A4 4500000B */ bc1f .L800E53D4 -/* 7E858 800E53A8 00000000 */ nop +/* 7E858 800E53A8 00000000 */ nop /* 7E85C 800E53AC 3C01C32F */ lui $at, 0xc32f /* 7E860 800E53B0 44810000 */ mtc1 $at, $f0 -/* 7E864 800E53B4 00000000 */ nop +/* 7E864 800E53B4 00000000 */ nop /* 7E868 800E53B8 4604003C */ c.lt.s $f0, $f4 -/* 7E86C 800E53BC 00000000 */ nop +/* 7E86C 800E53BC 00000000 */ nop /* 7E870 800E53C0 45000004 */ bc1f .L800E53D4 -/* 7E874 800E53C4 00000000 */ nop +/* 7E874 800E53C4 00000000 */ nop /* 7E878 800E53C8 44802000 */ mtc1 $zero, $f4 /* 7E87C 800E53CC 08039507 */ j .L800E541C -/* 7E880 800E53D0 00000000 */ nop +/* 7E880 800E53D0 00000000 */ nop .L800E53D4: /* 7E884 800E53D4 3C0140A0 */ lui $at, 0x40a0 /* 7E888 800E53D8 44810000 */ mtc1 $at, $f0 -/* 7E88C 800E53DC 00000000 */ nop +/* 7E88C 800E53DC 00000000 */ nop /* 7E890 800E53E0 4604003C */ c.lt.s $f0, $f4 -/* 7E894 800E53E4 00000000 */ nop +/* 7E894 800E53E4 00000000 */ nop /* 7E898 800E53E8 45000009 */ bc1f .L800E5410 -/* 7E89C 800E53EC 00000000 */ nop +/* 7E89C 800E53EC 00000000 */ nop /* 7E8A0 800E53F0 3C01432F */ lui $at, 0x432f /* 7E8A4 800E53F4 44810000 */ mtc1 $at, $f0 -/* 7E8A8 800E53F8 00000000 */ nop +/* 7E8A8 800E53F8 00000000 */ nop /* 7E8AC 800E53FC 4600203C */ c.lt.s $f4, $f0 /* 7E8B0 800E5400 3C014334 */ lui $at, 0x4334 /* 7E8B4 800E5404 44812000 */ mtc1 $at, $f4 /* 7E8B8 800E5408 45010004 */ bc1t .L800E541C -/* 7E8BC 800E540C 00000000 */ nop +/* 7E8BC 800E540C 00000000 */ nop .L800E5410: /* 7E8C0 800E5410 3C01800F */ lui $at, %hi(D_800F7B40) /* 7E8C4 800E5414 C4247B40 */ lwc1 $f4, %lo(D_800F7B40)($at) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s index e6ac123ea9..61fc057b77 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E546C.s @@ -9,16 +9,16 @@ glabel func_800E546C /* 7E92C 800E547C 44801000 */ mtc1 $zero, $f2 /* 7E930 800E5480 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7E934 800E5484 4604003E */ c.le.s $f0, $f4 -/* 7E938 800E5488 00000000 */ nop +/* 7E938 800E5488 00000000 */ nop /* 7E93C 800E548C 4500000A */ bc1f .L800E54B8 /* 7E940 800E5490 AFBF0010 */ sw $ra, 0x10($sp) /* 7E944 800E5494 3C014387 */ lui $at, 0x4387 /* 7E948 800E5498 44810000 */ mtc1 $at, $f0 -/* 7E94C 800E549C 00000000 */ nop +/* 7E94C 800E549C 00000000 */ nop /* 7E950 800E54A0 4600203C */ c.lt.s $f4, $f0 -/* 7E954 800E54A4 00000000 */ nop +/* 7E954 800E54A4 00000000 */ nop /* 7E958 800E54A8 45000003 */ bc1f .L800E54B8 -/* 7E95C 800E54AC 00000000 */ nop +/* 7E95C 800E54AC 00000000 */ nop /* 7E960 800E54B0 3C014334 */ lui $at, 0x4334 /* 7E964 800E54B4 44811000 */ mtc1 $at, $f2 .L800E54B8: diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s index 24fd735a5f..dfd4524b27 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5530.s @@ -32,17 +32,17 @@ glabel func_800E5530 /* 7EA48 800E5598 00220821 */ addu $at, $at, $v0 /* 7EA4C 800E559C 8C22BF00 */ lw $v0, %lo(D_8010BF00)($at) /* 7EA50 800E55A0 00400008 */ jr $v0 -/* 7EA54 800E55A4 00000000 */ nop +/* 7EA54 800E55A4 00000000 */ nop /* 7EA58 800E55A8 3C038011 */ lui $v1, %hi(D_8010C9B0) /* 7EA5C 800E55AC 2463C9B0 */ addiu $v1, $v1, %lo(D_8010C9B0) /* 7EA60 800E55B0 84620000 */ lh $v0, ($v1) /* 7EA64 800E55B4 1440000A */ bnez $v0, .L800E55E0 -/* 7EA68 800E55B8 00000000 */ nop +/* 7EA68 800E55B8 00000000 */ nop /* 7EA6C 800E55BC C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EA70 800E55C0 44800000 */ mtc1 $zero, $f0 -/* 7EA74 800E55C4 00000000 */ nop +/* 7EA74 800E55C4 00000000 */ nop /* 7EA78 800E55C8 4600103E */ c.le.s $f2, $f0 -/* 7EA7C 800E55CC 00000000 */ nop +/* 7EA7C 800E55CC 00000000 */ nop /* 7EA80 800E55D0 4500009A */ bc1f .L800E583C /* 7EA84 800E55D4 24020001 */ addiu $v0, $zero, 1 /* 7EA88 800E55D8 0803960F */ j .L800E583C @@ -51,46 +51,46 @@ glabel func_800E5530 /* 7EA90 800E55E0 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EA94 800E55E4 44800000 */ mtc1 $zero, $f0 /* 7EA98 800E55E8 080395E6 */ j .L800E5798 -/* 7EA9C 800E55EC 00000000 */ nop +/* 7EA9C 800E55EC 00000000 */ nop /* 7EAA0 800E55F0 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EAA4 800E55F4 3C0141C8 */ lui $at, 0x41c8 /* 7EAA8 800E55F8 44810000 */ mtc1 $at, $f0 /* 7EAAC 800E55FC 080395E6 */ j .L800E5798 -/* 7EAB0 800E5600 00000000 */ nop +/* 7EAB0 800E5600 00000000 */ nop /* 7EAB4 800E5604 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EAB8 800E5608 3C014248 */ lui $at, 0x4248 /* 7EABC 800E560C 44810000 */ mtc1 $at, $f0 /* 7EAC0 800E5610 080395E6 */ j .L800E5798 -/* 7EAC4 800E5614 00000000 */ nop +/* 7EAC4 800E5614 00000000 */ nop /* 7EAC8 800E5618 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EACC 800E561C 3C01C3C3 */ lui $at, 0xc3c3 /* 7EAD0 800E5620 44810000 */ mtc1 $at, $f0 -/* 7EAD4 800E5624 00000000 */ nop +/* 7EAD4 800E5624 00000000 */ nop /* 7EAD8 800E5628 4602003C */ c.lt.s $f0, $f2 -/* 7EADC 800E562C 00000000 */ nop +/* 7EADC 800E562C 00000000 */ nop /* 7EAE0 800E5630 45030083 */ bc1tl .L800E5840 /* 7EAE4 800E5634 0000802D */ daddu $s0, $zero, $zero /* 7EAE8 800E5638 3C01C3F7 */ lui $at, 0xc3f7 /* 7EAEC 800E563C 34218000 */ ori $at, $at, 0x8000 /* 7EAF0 800E5640 44810000 */ mtc1 $at, $f0 -/* 7EAF4 800E5644 00000000 */ nop +/* 7EAF4 800E5644 00000000 */ nop /* 7EAF8 800E5648 4600103C */ c.lt.s $f2, $f0 /* 7EAFC 800E564C 080395E8 */ j .L800E57A0 -/* 7EB00 800E5650 00000000 */ nop +/* 7EB00 800E5650 00000000 */ nop /* 7EB04 800E5654 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EB08 800E5658 3C01C2B4 */ lui $at, 0xc2b4 /* 7EB0C 800E565C 44810000 */ mtc1 $at, $f0 -/* 7EB10 800E5660 00000000 */ nop +/* 7EB10 800E5660 00000000 */ nop /* 7EB14 800E5664 4602003C */ c.lt.s $f0, $f2 -/* 7EB18 800E5668 00000000 */ nop +/* 7EB18 800E5668 00000000 */ nop /* 7EB1C 800E566C 45030074 */ bc1tl .L800E5840 /* 7EB20 800E5670 0000802D */ daddu $s0, $zero, $zero /* 7EB24 800E5674 3C01C3B9 */ lui $at, 0xc3b9 /* 7EB28 800E5678 44810000 */ mtc1 $at, $f0 -/* 7EB2C 800E567C 00000000 */ nop +/* 7EB2C 800E567C 00000000 */ nop /* 7EB30 800E5680 4600103C */ c.lt.s $f2, $f0 /* 7EB34 800E5684 080395E8 */ j .L800E57A0 -/* 7EB38 800E5688 00000000 */ nop +/* 7EB38 800E5688 00000000 */ nop /* 7EB3C 800E568C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 7EB40 800E5690 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 7EB44 800E5694 8442008E */ lh $v0, 0x8e($v0) @@ -100,12 +100,12 @@ glabel func_800E5530 /* 7EB54 800E56A4 2463C9B0 */ addiu $v1, $v1, %lo(D_8010C9B0) /* 7EB58 800E56A8 84620000 */ lh $v0, ($v1) /* 7EB5C 800E56AC 1440000A */ bnez $v0, .L800E56D8 -/* 7EB60 800E56B0 00000000 */ nop +/* 7EB60 800E56B0 00000000 */ nop /* 7EB64 800E56B4 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EB68 800E56B8 44800000 */ mtc1 $zero, $f0 -/* 7EB6C 800E56BC 00000000 */ nop +/* 7EB6C 800E56BC 00000000 */ nop /* 7EB70 800E56C0 4602003C */ c.lt.s $f0, $f2 -/* 7EB74 800E56C4 00000000 */ nop +/* 7EB74 800E56C4 00000000 */ nop /* 7EB78 800E56C8 4503005D */ bc1tl .L800E5840 /* 7EB7C 800E56CC 24100002 */ addiu $s0, $zero, 2 /* 7EB80 800E56D0 24020001 */ addiu $v0, $zero, 1 @@ -114,7 +114,7 @@ glabel func_800E5530 /* 7EB88 800E56D8 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EB8C 800E56DC 44800000 */ mtc1 $zero, $f0 /* 7EB90 800E56E0 080395E6 */ j .L800E5798 -/* 7EB94 800E56E4 00000000 */ nop +/* 7EB94 800E56E4 00000000 */ nop /* 7EB98 800E56E8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 7EB9C 800E56EC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 7EBA0 800E56F0 8442008E */ lh $v0, 0x8e($v0) @@ -124,13 +124,13 @@ glabel func_800E5530 /* 7EBB0 800E5700 2463C9B0 */ addiu $v1, $v1, %lo(D_8010C9B0) /* 7EBB4 800E5704 84620000 */ lh $v0, ($v1) /* 7EBB8 800E5708 1440000B */ bnez $v0, .L800E5738 -/* 7EBBC 800E570C 00000000 */ nop +/* 7EBBC 800E570C 00000000 */ nop /* 7EBC0 800E5710 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EBC4 800E5714 3C01C302 */ lui $at, 0xc302 /* 7EBC8 800E5718 44810000 */ mtc1 $at, $f0 -/* 7EBCC 800E571C 00000000 */ nop +/* 7EBCC 800E571C 00000000 */ nop /* 7EBD0 800E5720 4602003C */ c.lt.s $f0, $f2 -/* 7EBD4 800E5724 00000000 */ nop +/* 7EBD4 800E5724 00000000 */ nop /* 7EBD8 800E5728 45030045 */ bc1tl .L800E5840 /* 7EBDC 800E572C 24100002 */ addiu $s0, $zero, 2 /* 7EBE0 800E5730 24020001 */ addiu $v0, $zero, 1 @@ -140,18 +140,18 @@ glabel func_800E5530 /* 7EBEC 800E573C 3C01C302 */ lui $at, 0xc302 /* 7EBF0 800E5740 44810000 */ mtc1 $at, $f0 /* 7EBF4 800E5744 080395E6 */ j .L800E5798 -/* 7EBF8 800E5748 00000000 */ nop +/* 7EBF8 800E5748 00000000 */ nop /* 7EBFC 800E574C 3C038011 */ lui $v1, %hi(D_8010C9B0) /* 7EC00 800E5750 2463C9B0 */ addiu $v1, $v1, %lo(D_8010C9B0) /* 7EC04 800E5754 84620000 */ lh $v0, ($v1) /* 7EC08 800E5758 1440000B */ bnez $v0, .L800E5788 -/* 7EC0C 800E575C 00000000 */ nop +/* 7EC0C 800E575C 00000000 */ nop /* 7EC10 800E5760 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EC14 800E5764 3C01C402 */ lui $at, 0xc402 /* 7EC18 800E5768 44810000 */ mtc1 $at, $f0 -/* 7EC1C 800E576C 00000000 */ nop +/* 7EC1C 800E576C 00000000 */ nop /* 7EC20 800E5770 4602003C */ c.lt.s $f0, $f2 -/* 7EC24 800E5774 00000000 */ nop +/* 7EC24 800E5774 00000000 */ nop /* 7EC28 800E5778 45030031 */ bc1tl .L800E5840 /* 7EC2C 800E577C 24100002 */ addiu $s0, $zero, 2 /* 7EC30 800E5780 24020001 */ addiu $v0, $zero, 1 @@ -160,10 +160,10 @@ glabel func_800E5530 /* 7EC38 800E5788 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EC3C 800E578C 3C01C402 */ lui $at, 0xc402 /* 7EC40 800E5790 44810000 */ mtc1 $at, $f0 -/* 7EC44 800E5794 00000000 */ nop +/* 7EC44 800E5794 00000000 */ nop .L800E5798: /* 7EC48 800E5798 4602003C */ c.lt.s $f0, $f2 -/* 7EC4C 800E579C 00000000 */ nop +/* 7EC4C 800E579C 00000000 */ nop .L800E57A0: /* 7EC50 800E57A0 45000028 */ bc1f .L800E5844 /* 7EC54 800E57A4 24020001 */ addiu $v0, $zero, 1 @@ -178,13 +178,13 @@ glabel func_800E5530 /* 7EC78 800E57C8 2463C9B0 */ addiu $v1, $v1, %lo(D_8010C9B0) /* 7EC7C 800E57CC 84620000 */ lh $v0, ($v1) /* 7EC80 800E57D0 1440000B */ bnez $v0, .L800E5800 -/* 7EC84 800E57D4 00000000 */ nop +/* 7EC84 800E57D4 00000000 */ nop /* 7EC88 800E57D8 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7EC8C 800E57DC 3C01C402 */ lui $at, 0xc402 /* 7EC90 800E57E0 44810000 */ mtc1 $at, $f0 -/* 7EC94 800E57E4 00000000 */ nop +/* 7EC94 800E57E4 00000000 */ nop /* 7EC98 800E57E8 4602003C */ c.lt.s $f0, $f2 -/* 7EC9C 800E57EC 00000000 */ nop +/* 7EC9C 800E57EC 00000000 */ nop /* 7ECA0 800E57F0 45030013 */ bc1tl .L800E5840 /* 7ECA4 800E57F4 24100002 */ addiu $s0, $zero, 2 /* 7ECA8 800E57F8 24020001 */ addiu $v0, $zero, 1 @@ -193,9 +193,9 @@ glabel func_800E5530 /* 7ECB0 800E5800 C4A2002C */ lwc1 $f2, 0x2c($a1) /* 7ECB4 800E5804 3C01C402 */ lui $at, 0xc402 /* 7ECB8 800E5808 44810000 */ mtc1 $at, $f0 -/* 7ECBC 800E580C 00000000 */ nop +/* 7ECBC 800E580C 00000000 */ nop /* 7ECC0 800E5810 4602003C */ c.lt.s $f0, $f2 -/* 7ECC4 800E5814 00000000 */ nop +/* 7ECC4 800E5814 00000000 */ nop /* 7ECC8 800E5818 45030001 */ bc1tl .L800E5820 /* 7ECCC 800E581C 0000802D */ daddu $s0, $zero, $zero .L800E5820: @@ -213,15 +213,15 @@ glabel func_800E5530 /* 7ECF0 800E5840 24020001 */ addiu $v0, $zero, 1 .L800E5844: /* 7ECF4 800E5844 16020014 */ bne $s0, $v0, .L800E5898 -/* 7ECF8 800E5848 00000000 */ nop +/* 7ECF8 800E5848 00000000 */ nop /* 7ECFC 800E584C 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2) /* 7ED00 800E5850 8484A552 */ lh $a0, %lo(gCollisionStatus+0x2)($a0) /* 7ED04 800E5854 0C016F6A */ jal get_collider_type_by_id -/* 7ED08 800E5858 00000000 */ nop +/* 7ED08 800E5858 00000000 */ nop /* 7ED0C 800E585C 304200FF */ andi $v0, $v0, 0xff /* 7ED10 800E5860 24030003 */ addiu $v1, $zero, 3 /* 7ED14 800E5864 14430007 */ bne $v0, $v1, .L800E5884 -/* 7ED18 800E5868 00000000 */ nop +/* 7ED18 800E5868 00000000 */ nop /* 7ED1C 800E586C 3C03800B */ lui $v1, %hi(gCameras) /* 7ED20 800E5870 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* 7ED24 800E5874 94620002 */ lhu $v0, 2($v1) @@ -240,7 +240,7 @@ glabel func_800E5530 /* 7ED50 800E58A0 24020004 */ addiu $v0, $zero, 4 /* 7ED54 800E58A4 82230003 */ lb $v1, 3($s1) /* 7ED58 800E58A8 14620006 */ bne $v1, $v0, .L800E58C4 -/* 7ED5C 800E58AC 00000000 */ nop +/* 7ED5C 800E58AC 00000000 */ nop /* 7ED60 800E58B0 3C03800B */ lui $v1, %hi(gCameras) /* 7ED64 800E58B4 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* 7ED68 800E58B8 94620002 */ lhu $v0, 2($v1) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E58F0.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E58F0.s index b17877e72c..8cea7ea50f 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E58F0.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E58F0.s @@ -20,4 +20,4 @@ glabel func_800E58F0 /* 7EDD8 800E5928 1440FFFA */ bnez $v0, .L800E5914 /* 7EDDC 800E592C 24630002 */ addiu $v1, $v1, 2 /* 7EDE0 800E5930 03E00008 */ jr $ra -/* 7EDE4 800E5934 00000000 */ nop +/* 7EDE4 800E5934 00000000 */ nop diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s index 3c716467b2..5ac5e367d4 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5938.s @@ -26,6 +26,6 @@ glabel func_800E5938 /* 7EE38 800E5988 00220821 */ addu $at, $at, $v0 /* 7EE3C 800E598C 8422F6B8 */ lh $v0, %lo(D_8010F6B8)($at) /* 7EE40 800E5990 44820000 */ mtc1 $v0, $f0 -/* 7EE44 800E5994 00000000 */ nop +/* 7EE44 800E5994 00000000 */ nop /* 7EE48 800E5998 03E00008 */ jr $ra /* 7EE4C 800E599C 46800020 */ cvt.s.w $f0, $f0 diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s index 5776cf6e95..77690a1eeb 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5A2C.s @@ -29,11 +29,11 @@ glabel func_800E5A2C /* 7EF38 800E5A88 8E020004 */ lw $v0, 4($s0) /* 7EF3C 800E5A8C 30421000 */ andi $v0, $v0, 0x1000 /* 7EF40 800E5A90 10400005 */ beqz $v0, .L800E5AA8 -/* 7EF44 800E5A94 00000000 */ nop +/* 7EF44 800E5A94 00000000 */ nop /* 7EF48 800E5A98 0C03971E */ jal func_800E5C78 -/* 7EF4C 800E5A9C 00000000 */ nop +/* 7EF4C 800E5A9C 00000000 */ nop /* 7EF50 800E5AA0 08039716 */ j .L800E5C58 -/* 7EF54 800E5AA4 00000000 */ nop +/* 7EF54 800E5AA4 00000000 */ nop .L800E5AA8: /* 7EF58 800E5AA8 820200C5 */ lb $v0, 0xc5($s0) /* 7EF5C 800E5AAC 920300C5 */ lbu $v1, 0xc5($s0) @@ -42,7 +42,7 @@ glabel func_800E5A2C /* 7EF68 800E5AB8 A20200C5 */ sb $v0, 0xc5($s0) /* 7EF6C 800E5ABC 00021600 */ sll $v0, $v0, 0x18 /* 7EF70 800E5AC0 14400004 */ bnez $v0, .L800E5AD4 -/* 7EF74 800E5AC4 00000000 */ nop +/* 7EF74 800E5AC4 00000000 */ nop /* 7EF78 800E5AC8 94820002 */ lhu $v0, 2($a0) /* 7EF7C 800E5ACC 34420004 */ ori $v0, $v0, 4 /* 7EF80 800E5AD0 A4820002 */ sh $v0, 2($a0) @@ -52,15 +52,15 @@ glabel func_800E5A2C /* 7EF8C 800E5ADC 960300C0 */ lhu $v1, 0xc0($s0) /* 7EF90 800E5AE0 C6000070 */ lwc1 $f0, 0x70($s0) /* 7EF94 800E5AE4 44801000 */ mtc1 $zero, $f2 -/* 7EF98 800E5AE8 00000000 */ nop +/* 7EF98 800E5AE8 00000000 */ nop /* 7EF9C 800E5AEC 4602003E */ c.le.s $f0, $f2 -/* 7EFA0 800E5AF0 00000000 */ nop +/* 7EFA0 800E5AF0 00000000 */ nop /* 7EFA4 800E5AF4 45000008 */ bc1f .L800E5B18 -/* 7EFA8 800E5AF8 00000000 */ nop +/* 7EFA8 800E5AF8 00000000 */ nop /* 7EFAC 800E5AFC 3C01800F */ lui $at, %hi(D_800F7B90) /* 7EFB0 800E5B00 C4207B90 */ lwc1 $f0, %lo(D_800F7B90)($at) /* 7EFB4 800E5B04 4600103C */ c.lt.s $f2, $f0 -/* 7EFB8 800E5B08 00000000 */ nop +/* 7EFB8 800E5B08 00000000 */ nop /* 7EFBC 800E5B0C 45030001 */ bc1tl .L800E5B14 /* 7EFC0 800E5B10 A60300C2 */ sh $v1, 0xc2($s0) .L800E5B14: @@ -70,7 +70,7 @@ glabel func_800E5A2C /* 7EFCC 800E5B1C E4207B90 */ swc1 $f0, %lo(D_800F7B90)($at) .L800E5B20: /* 7EFD0 800E5B20 0C03893E */ jal func_800E24F8 -/* 7EFD4 800E5B24 00000000 */ nop +/* 7EFD4 800E5B24 00000000 */ nop /* 7EFD8 800E5B28 82220000 */ lb $v0, ($s1) /* 7EFDC 800E5B2C 92230000 */ lbu $v1, ($s1) /* 7EFE0 800E5B30 1040000E */ beqz $v0, .L800E5B6C @@ -87,7 +87,7 @@ glabel func_800E5A2C /* 7F00C 800E5B5C 10800004 */ beqz $a0, .L800E5B70 /* 7F010 800E5B60 AE020004 */ sw $v0, 4($s0) /* 7F014 800E5B64 0C05271B */ jal stop_sound -/* 7F018 800E5B68 00000000 */ nop +/* 7F018 800E5B68 00000000 */ nop .L800E5B6C: /* 7F01C 800E5B6C 3C138000 */ lui $s3, 0x8000 .L800E5B70: @@ -99,40 +99,40 @@ glabel func_800E5A2C /* 7F030 800E5B80 820200B4 */ lb $v0, 0xb4($s0) /* 7F034 800E5B84 2C420003 */ sltiu $v0, $v0, 3 /* 7F038 800E5B88 10400015 */ beqz $v0, .L800E5BE0 -/* 7F03C 800E5B8C 00000000 */ nop +/* 7F03C 800E5B8C 00000000 */ nop /* 7F040 800E5B90 8E020000 */ lw $v0, ($s0) /* 7F044 800E5B94 30422000 */ andi $v0, $v0, 0x2000 /* 7F048 800E5B98 14400004 */ bnez $v0, .L800E5BAC /* 7F04C 800E5B9C 0000182D */ daddu $v1, $zero, $zero /* 7F050 800E5BA0 0C010C77 */ jal func_800431DC -/* 7F054 800E5BA4 00000000 */ nop +/* 7F054 800E5BA4 00000000 */ nop /* 7F058 800E5BA8 0040182D */ daddu $v1, $v0, $zero .L800E5BAC: /* 7F05C 800E5BAC 82820000 */ lb $v0, ($s4) /* 7F060 800E5BB0 14400009 */ bnez $v0, .L800E5BD8 -/* 7F064 800E5BB4 00000000 */ nop +/* 7F064 800E5BB4 00000000 */ nop /* 7F068 800E5BB8 8E020000 */ lw $v0, ($s0) /* 7F06C 800E5BBC 30420020 */ andi $v0, $v0, 0x20 /* 7F070 800E5BC0 14400005 */ bnez $v0, .L800E5BD8 -/* 7F074 800E5BC4 00000000 */ nop +/* 7F074 800E5BC4 00000000 */ nop /* 7F078 800E5BC8 10600003 */ beqz $v1, .L800E5BD8 -/* 7F07C 800E5BCC 00000000 */ nop +/* 7F07C 800E5BCC 00000000 */ nop /* 7F080 800E5BD0 0C039769 */ jal set_action_state /* 7F084 800E5BD4 2404000C */ addiu $a0, $zero, 0xc .L800E5BD8: /* 7F088 800E5BD8 0C03989A */ jal check_input_spin -/* 7F08C 800E5BDC 00000000 */ nop +/* 7F08C 800E5BDC 00000000 */ nop .L800E5BE0: /* 7F090 800E5BE0 8E020000 */ lw $v0, ($s0) /* 7F094 800E5BE4 00531024 */ and $v0, $v0, $s3 /* 7F098 800E5BE8 10400011 */ beqz $v0, .L800E5C30 -/* 7F09C 800E5BEC 00000000 */ nop +/* 7F09C 800E5BEC 00000000 */ nop /* 7F0A0 800E5BF0 820200B4 */ lb $v0, 0xb4($s0) /* 7F0A4 800E5BF4 00021100 */ sll $v0, $v0, 4 /* 7F0A8 800E5BF8 00511021 */ addu $v0, $v0, $s1 /* 7F0AC 800E5BFC 8C440004 */ lw $a0, 4($v0) /* 7F0B0 800E5C00 1080000B */ beqz $a0, .L800E5C30 -/* 7F0B4 800E5C04 00000000 */ nop +/* 7F0B4 800E5C04 00000000 */ nop /* 7F0B8 800E5C08 8E420000 */ lw $v0, ($s2) /* 7F0BC 800E5C0C 10820008 */ beq $a0, $v0, .L800E5C30 /* 7F0C0 800E5C10 3C06802B */ lui $a2, 0x802b @@ -149,11 +149,11 @@ glabel func_800E5A2C /* 7F0E8 800E5C38 00511021 */ addu $v0, $v0, $s1 /* 7F0EC 800E5C3C 8C420000 */ lw $v0, ($v0) /* 7F0F0 800E5C40 0040F809 */ jalr $v0 -/* 7F0F4 800E5C44 00000000 */ nop +/* 7F0F4 800E5C44 00000000 */ nop /* 7F0F8 800E5C48 8E020000 */ lw $v0, ($s0) /* 7F0FC 800E5C4C 00531024 */ and $v0, $v0, $s3 /* 7F100 800E5C50 1440FFCB */ bnez $v0, .L800E5B80 -/* 7F104 800E5C54 00000000 */ nop +/* 7F104 800E5C54 00000000 */ nop .L800E5C58: /* 7F108 800E5C58 8FBF0024 */ lw $ra, 0x24($sp) /* 7F10C 800E5C5C 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s index aa534ddf7c..5dc8a10f8c 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E5C78.s @@ -20,27 +20,27 @@ glabel func_800E5C78 /* 7F160 800E5CB0 8E020000 */ lw $v0, ($s0) /* 7F164 800E5CB4 30420020 */ andi $v0, $v0, 0x20 /* 7F168 800E5CB8 14400007 */ bnez $v0, .L800E5CD8 -/* 7F16C 800E5CBC 00000000 */ nop +/* 7F16C 800E5CBC 00000000 */ nop /* 7F170 800E5CC0 0C010C77 */ jal func_800431DC -/* 7F174 800E5CC4 00000000 */ nop +/* 7F174 800E5CC4 00000000 */ nop /* 7F178 800E5CC8 10400003 */ beqz $v0, .L800E5CD8 -/* 7F17C 800E5CCC 00000000 */ nop +/* 7F17C 800E5CCC 00000000 */ nop /* 7F180 800E5CD0 0C039769 */ jal set_action_state /* 7F184 800E5CD4 2404000C */ addiu $a0, $zero, 0xc .L800E5CD8: /* 7F188 800E5CD8 8E020000 */ lw $v0, ($s0) /* 7F18C 800E5CDC 00531024 */ and $v0, $v0, $s3 /* 7F190 800E5CE0 10400014 */ beqz $v0, .L800E5D34 -/* 7F194 800E5CE4 00000000 */ nop +/* 7F194 800E5CE4 00000000 */ nop /* 7F198 800E5CE8 820200B4 */ lb $v0, 0xb4($s0) /* 7F19C 800E5CEC 00021100 */ sll $v0, $v0, 4 /* 7F1A0 800E5CF0 00512021 */ addu $a0, $v0, $s1 /* 7F1A4 800E5CF4 8082000C */ lb $v0, 0xc($a0) /* 7F1A8 800E5CF8 10400017 */ beqz $v0, .L800E5D58 -/* 7F1AC 800E5CFC 00000000 */ nop +/* 7F1AC 800E5CFC 00000000 */ nop /* 7F1B0 800E5D00 8C840004 */ lw $a0, 4($a0) /* 7F1B4 800E5D04 1080000B */ beqz $a0, .L800E5D34 -/* 7F1B8 800E5D08 00000000 */ nop +/* 7F1B8 800E5D08 00000000 */ nop /* 7F1BC 800E5D0C 8E420000 */ lw $v0, ($s2) /* 7F1C0 800E5D10 10820008 */ beq $a0, $v0, .L800E5D34 /* 7F1C4 800E5D14 3C06802B */ lui $a2, 0x802b @@ -57,23 +57,23 @@ glabel func_800E5C78 /* 7F1EC 800E5D3C 00511821 */ addu $v1, $v0, $s1 /* 7F1F0 800E5D40 8062000C */ lb $v0, 0xc($v1) /* 7F1F4 800E5D44 10400004 */ beqz $v0, .L800E5D58 -/* 7F1F8 800E5D48 00000000 */ nop +/* 7F1F8 800E5D48 00000000 */ nop /* 7F1FC 800E5D4C 8C620000 */ lw $v0, ($v1) /* 7F200 800E5D50 0040F809 */ jalr $v0 -/* 7F204 800E5D54 00000000 */ nop +/* 7F204 800E5D54 00000000 */ nop .L800E5D58: /* 7F208 800E5D58 8E020000 */ lw $v0, ($s0) /* 7F20C 800E5D5C 00531024 */ and $v0, $v0, $s3 /* 7F210 800E5D60 1440FFD3 */ bnez $v0, .L800E5CB0 -/* 7F214 800E5D64 00000000 */ nop +/* 7F214 800E5D64 00000000 */ nop /* 7F218 800E5D68 0C03990A */ jal func_800E6428 -/* 7F21C 800E5D6C 00000000 */ nop +/* 7F21C 800E5D6C 00000000 */ nop /* 7F220 800E5D70 8E020004 */ lw $v0, 4($s0) /* 7F224 800E5D74 30422000 */ andi $v0, $v0, 0x2000 /* 7F228 800E5D78 10400003 */ beqz $v0, .L800E5D88 -/* 7F22C 800E5D7C 00000000 */ nop +/* 7F22C 800E5D7C 00000000 */ nop /* 7F230 800E5D80 0C039940 */ jal func_800E6500 -/* 7F234 800E5D84 00000000 */ nop +/* 7F234 800E5D84 00000000 */ nop .L800E5D88: /* 7F238 800E5D88 8FBF0020 */ lw $ra, 0x20($sp) /* 7F23C 800E5D8C 8FB3001C */ lw $s3, 0x1c($sp) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E63A4.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E63A4.s index 1b4e3f1ed0..c1f09ada26 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E63A4.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E63A4.s @@ -11,7 +11,7 @@ glabel func_800E63A4 /* 7F86C 800E63BC 0C039769 */ jal set_action_state /* 7F870 800E63C0 24040019 */ addiu $a0, $zero, 0x19 /* 7F874 800E63C4 08039906 */ j .L800E6418 -/* 7F878 800E63C8 00000000 */ nop +/* 7F878 800E63C8 00000000 */ nop .L800E63CC: /* 7F87C 800E63CC 2403DFFF */ addiu $v1, $zero, -0x2001 /* 7F880 800E63D0 8E020004 */ lw $v0, 4($s0) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E6428.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E6428.s index a47fc42907..60dde93c2f 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E6428.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E6428.s @@ -23,7 +23,7 @@ glabel func_800E6428 /* 7F920 800E6470 9062007E */ lbu $v0, 0x7e($v1) /* 7F924 800E6474 30420002 */ andi $v0, $v0, 2 /* 7F928 800E6478 1040001E */ beqz $v0, .L800E64F4 -/* 7F92C 800E647C 00000000 */ nop +/* 7F92C 800E647C 00000000 */ nop /* 7F930 800E6480 8C820004 */ lw $v0, 4($a0) /* 7F934 800E6484 34422000 */ ori $v0, $v0, 0x2000 /* 7F938 800E6488 AC820004 */ sw $v0, 4($a0) @@ -47,11 +47,11 @@ glabel func_800E6428 /* 7F97C 800E64CC 9042007E */ lbu $v0, 0x7e($v0) /* 7F980 800E64D0 30420004 */ andi $v0, $v0, 4 /* 7F984 800E64D4 10400007 */ beqz $v0, .L800E64F4 -/* 7F988 800E64D8 00000000 */ nop +/* 7F988 800E64D8 00000000 */ nop /* 7F98C 800E64DC 8CA200E0 */ lw $v0, 0xe0($a1) /* 7F990 800E64E0 30424000 */ andi $v0, $v0, 0x4000 /* 7F994 800E64E4 10400003 */ beqz $v0, .L800E64F4 -/* 7F998 800E64E8 00000000 */ nop +/* 7F998 800E64E8 00000000 */ nop /* 7F99C 800E64EC 0C039769 */ jal set_action_state /* 7F9A0 800E64F0 24040019 */ addiu $a0, $zero, 0x19 .L800E64F4: diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E6500.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E6500.s index 02520bf405..7162d1a3c4 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E6500.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E6500.s @@ -11,13 +11,13 @@ glabel func_800E6500 /* 7F9C8 800E6518 04800014 */ bltz $a0, .L800E656C /* 7F9CC 800E651C AFBF0014 */ sw $ra, 0x14($sp) /* 7F9D0 800E6520 0C00E2B7 */ jal get_npc_by_index -/* 7F9D4 800E6524 00000000 */ nop +/* 7F9D4 800E6524 00000000 */ nop /* 7F9D8 800E6528 0040202D */ daddu $a0, $v0, $zero /* 7F9DC 800E652C 8C820000 */ lw $v0, ($a0) /* 7F9E0 800E6530 3C030004 */ lui $v1, 4 /* 7F9E4 800E6534 00431024 */ and $v0, $v0, $v1 /* 7F9E8 800E6538 10400004 */ beqz $v0, .L800E654C -/* 7F9EC 800E653C 00000000 */ nop +/* 7F9EC 800E653C 00000000 */ nop /* 7F9F0 800E6540 C60000A8 */ lwc1 $f0, 0xa8($s0) /* 7F9F4 800E6544 08039955 */ j .L800E6554 /* 7F9F8 800E6548 E4800034 */ swc1 $f0, 0x34($a0) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/func_800E66C4.s b/asm/nonmatchings/code_7bb60_len_41b0/func_800E66C4.s index 817fdb0b4e..f47ebf7e61 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/func_800E66C4.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/func_800E66C4.s @@ -27,16 +27,16 @@ glabel func_800E66C4 /* 7FBCC 800E671C 00431021 */ addu $v0, $v0, $v1 /* 7FBD0 800E6720 000210C0 */ sll $v0, $v0, 3 /* 7FBD4 800E6724 4604003E */ c.le.s $f0, $f4 -/* 7FBD8 800E6728 00000000 */ nop +/* 7FBD8 800E6728 00000000 */ nop /* 7FBDC 800E672C 4500000B */ bc1f .L800E675C /* 7FBE0 800E6730 00441021 */ addu $v0, $v0, $a0 /* 7FBE4 800E6734 3C014387 */ lui $at, 0x4387 /* 7FBE8 800E6738 44811000 */ mtc1 $at, $f2 -/* 7FBEC 800E673C 00000000 */ nop +/* 7FBEC 800E673C 00000000 */ nop /* 7FBF0 800E6740 4602203C */ c.lt.s $f4, $f2 -/* 7FBF4 800E6744 00000000 */ nop +/* 7FBF4 800E6744 00000000 */ nop /* 7FBF8 800E6748 45000004 */ bc1f .L800E675C -/* 7FBFC 800E674C 00000000 */ nop +/* 7FBFC 800E674C 00000000 */ nop /* 7FC00 800E6750 C440006C */ lwc1 $f0, 0x6c($v0) /* 7FC04 800E6754 080399DC */ j .L800E6770 /* 7FC08 800E6758 46020501 */ sub.s $f20, $f0, $f2 @@ -44,7 +44,7 @@ glabel func_800E66C4 /* 7FC0C 800E675C C442006C */ lwc1 $f2, 0x6c($v0) /* 7FC10 800E6760 3C0142B4 */ lui $at, 0x42b4 /* 7FC14 800E6764 44810000 */ mtc1 $at, $f0 -/* 7FC18 800E6768 00000000 */ nop +/* 7FC18 800E6768 00000000 */ nop /* 7FC1C 800E676C 46001501 */ sub.s $f20, $f2, $f0 .L800E6770: /* 7FC20 800E6770 0C00A6C9 */ jal clamp_angle @@ -56,7 +56,7 @@ glabel func_800E66C4 /* 7FC38 800E6788 44811000 */ mtc1 $at, $f2 /* 7FC3C 800E678C 24110002 */ addiu $s1, $zero, 2 /* 7FC40 800E6790 46020002 */ mul.s $f0, $f0, $f2 -/* 7FC44 800E6794 00000000 */ nop +/* 7FC44 800E6794 00000000 */ nop /* 7FC48 800E6798 0220802D */ daddu $s0, $s1, $zero /* 7FC4C 800E679C 27B30030 */ addiu $s3, $sp, 0x30 /* 7FC50 800E67A0 3C0143B4 */ lui $at, 0x43b4 @@ -68,13 +68,13 @@ glabel func_800E66C4 .L800E67B8: /* 7FC68 800E67B8 C7A00020 */ lwc1 $f0, 0x20($sp) /* 7FC6C 800E67BC 44911000 */ mtc1 $s1, $f2 -/* 7FC70 800E67C0 00000000 */ nop +/* 7FC70 800E67C0 00000000 */ nop /* 7FC74 800E67C4 468010A0 */ cvt.s.w $f2, $f2 /* 7FC78 800E67C8 46020002 */ mul.s $f0, $f0, $f2 -/* 7FC7C 800E67CC 00000000 */ nop +/* 7FC7C 800E67CC 00000000 */ nop /* 7FC80 800E67D0 C7A40024 */ lwc1 $f4, 0x24($sp) /* 7FC84 800E67D4 46022102 */ mul.s $f4, $f4, $f2 -/* 7FC88 800E67D8 00000000 */ nop +/* 7FC88 800E67D8 00000000 */ nop /* 7FC8C 800E67DC 0240282D */ daddu $a1, $s2, $zero /* 7FC90 800E67E0 C642002C */ lwc1 $f2, 0x2c($s2) /* 7FC94 800E67E4 27A60028 */ addiu $a2, $sp, 0x28 @@ -106,6 +106,6 @@ glabel func_800E66C4 /* 7FCF8 800E6848 D7B40050 */ ldc1 $f20, 0x50($sp) /* 7FCFC 800E684C 03E00008 */ jr $ra /* 7FD00 800E6850 27BD0060 */ addiu $sp, $sp, 0x60 -/* 7FD04 800E6854 00000000 */ nop -/* 7FD08 800E6858 00000000 */ nop -/* 7FD0C 800E685C 00000000 */ nop +/* 7FD04 800E6854 00000000 */ nop +/* 7FD08 800E6858 00000000 */ nop +/* 7FD0C 800E685C 00000000 */ nop diff --git a/asm/nonmatchings/code_7bb60_len_41b0/make_disguise_npc.s b/asm/nonmatchings/code_7bb60_len_41b0/make_disguise_npc.s index d3bd78b068..99dacff01b 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/make_disguise_npc.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/make_disguise_npc.s @@ -45,33 +45,33 @@ glabel make_disguise_npc /* 7FAC8 800E6618 3C018011 */ lui $at, %hi(D_8010C96C) /* 7FACC 800E661C AC24C96C */ sw $a0, %lo(D_8010C96C)($at) /* 7FAD0 800E6620 0C00E2B7 */ jal get_npc_by_index -/* 7FAD4 800E6624 00000000 */ nop +/* 7FAD4 800E6624 00000000 */ nop /* 7FAD8 800E6628 0040802D */ daddu $s0, $v0, $zero /* 7FADC 800E662C 0C00EAFF */ jal disable_npc_shadow /* 7FAE0 800E6630 0200202D */ daddu $a0, $s0, $zero /* 7FAE4 800E6634 C62200A8 */ lwc1 $f2, 0xa8($s1) /* 7FAE8 800E6638 3C0142B4 */ lui $at, 0x42b4 /* 7FAEC 800E663C 44810000 */ mtc1 $at, $f0 -/* 7FAF0 800E6640 00000000 */ nop +/* 7FAF0 800E6640 00000000 */ nop /* 7FAF4 800E6644 4602003E */ c.le.s $f0, $f2 -/* 7FAF8 800E6648 00000000 */ nop +/* 7FAF8 800E6648 00000000 */ nop /* 7FAFC 800E664C 45000008 */ bc1f .L800E6670 -/* 7FB00 800E6650 00000000 */ nop +/* 7FB00 800E6650 00000000 */ nop /* 7FB04 800E6654 3C014387 */ lui $at, 0x4387 /* 7FB08 800E6658 44810000 */ mtc1 $at, $f0 -/* 7FB0C 800E665C 00000000 */ nop +/* 7FB0C 800E665C 00000000 */ nop /* 7FB10 800E6660 4600103C */ c.lt.s $f2, $f0 -/* 7FB14 800E6664 00000000 */ nop +/* 7FB14 800E6664 00000000 */ nop /* 7FB18 800E6668 45010005 */ bc1t .L800E6680 -/* 7FB1C 800E666C 00000000 */ nop +/* 7FB1C 800E666C 00000000 */ nop .L800E6670: /* 7FB20 800E6670 3C014334 */ lui $at, 0x4334 /* 7FB24 800E6674 44810000 */ mtc1 $at, $f0 /* 7FB28 800E6678 080399A2 */ j .L800E6688 -/* 7FB2C 800E667C 00000000 */ nop +/* 7FB2C 800E667C 00000000 */ nop .L800E6680: /* 7FB30 800E6680 44800000 */ mtc1 $zero, $f0 -/* 7FB34 800E6684 00000000 */ nop +/* 7FB34 800E6684 00000000 */ nop .L800E6688: /* 7FB38 800E6688 44050000 */ mfc1 $a1, $f0 /* 7FB3C 800E668C 0C00ECD0 */ jal set_npc_yaw diff --git a/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s b/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s index 48dff095ef..8faf4a36f0 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/phys_player_land.s @@ -32,7 +32,7 @@ glabel phys_player_land /* 7C794 800E32E4 14400003 */ bnez $v0, .L800E32F4 /* 7C798 800E32E8 0060882D */ daddu $s1, $v1, $zero /* 7C79C 800E32EC 0C03954C */ jal func_800E5530 -/* 7C7A0 800E32F0 00000000 */ nop +/* 7C7A0 800E32F0 00000000 */ nop .L800E32F4: /* 7C7A4 800E32F4 96240002 */ lhu $a0, 2($s1) /* 7C7A8 800E32F8 2402FFFF */ addiu $v0, $zero, -1 @@ -47,7 +47,7 @@ glabel phys_player_land /* 7C7CC 800E331C 1040001C */ beqz $v0, .L800E3390 /* 7C7D0 800E3320 28620007 */ slti $v0, $v1, 7 /* 7C7D4 800E3324 1440001A */ bnez $v0, .L800E3390 -/* 7C7D8 800E3328 00000000 */ nop +/* 7C7D8 800E3328 00000000 */ nop /* 7C7DC 800E332C 0C04417A */ jal get_entity_by_index /* 7C7E0 800E3330 86240002 */ lh $a0, 2($s1) /* 7C7E4 800E3334 90430006 */ lbu $v1, 6($v0) @@ -63,14 +63,14 @@ glabel phys_player_land /* 7C80C 800E335C 10620007 */ beq $v1, $v0, .L800E337C /* 7C810 800E3360 2402000E */ addiu $v0, $zero, 0xe /* 7C814 800E3364 10620005 */ beq $v1, $v0, .L800E337C -/* 7C818 800E3368 00000000 */ nop +/* 7C818 800E3368 00000000 */ nop /* 7C81C 800E336C 0C039769 */ jal set_action_state /* 7C820 800E3370 24040007 */ addiu $a0, $zero, 7 /* 7C824 800E3374 08038D0D */ j .L800E3434 -/* 7C828 800E3378 00000000 */ nop +/* 7C828 800E3378 00000000 */ nop .L800E337C: /* 7C82C 800E337C 0C03805E */ jal disable_player_input -/* 7C830 800E3380 00000000 */ nop +/* 7C830 800E3380 00000000 */ nop /* 7C834 800E3384 2402000B */ addiu $v0, $zero, 0xb /* 7C838 800E3388 08038D0D */ j .L800E3434 /* 7C83C 800E338C A20200B6 */ sb $v0, 0xb6($s0) @@ -82,7 +82,7 @@ glabel phys_player_land /* 7C850 800E33A0 0C039769 */ jal set_action_state /* 7C854 800E33A4 24040002 */ addiu $a0, $zero, 2 /* 7C858 800E33A8 08038D0D */ j .L800E3434 -/* 7C85C 800E33AC 00000000 */ nop +/* 7C85C 800E33AC 00000000 */ nop .L800E33B0: /* 7C860 800E33B0 820300B4 */ lb $v1, 0xb4($s0) /* 7C864 800E33B4 14620005 */ bne $v1, $v0, .L800E33CC @@ -90,37 +90,37 @@ glabel phys_player_land /* 7C86C 800E33BC 0C039769 */ jal set_action_state /* 7C870 800E33C0 24040020 */ addiu $a0, $zero, 0x20 /* 7C874 800E33C4 08038D0D */ j .L800E3434 -/* 7C878 800E33C8 00000000 */ nop +/* 7C878 800E33C8 00000000 */ nop .L800E33CC: /* 7C87C 800E33CC 0C0388C1 */ jal input_to_move_vector /* 7C880 800E33D0 27A50014 */ addiu $a1, $sp, 0x14 /* 7C884 800E33D4 C7A00014 */ lwc1 $f0, 0x14($sp) /* 7C888 800E33D8 44801000 */ mtc1 $zero, $f2 -/* 7C88C 800E33DC 00000000 */ nop +/* 7C88C 800E33DC 00000000 */ nop /* 7C890 800E33E0 46020032 */ c.eq.s $f0, $f2 -/* 7C894 800E33E4 00000000 */ nop +/* 7C894 800E33E4 00000000 */ nop /* 7C898 800E33E8 4500000C */ bc1f .L800E341C /* 7C89C 800E33EC 24020009 */ addiu $v0, $zero, 9 /* 7C8A0 800E33F0 820300B4 */ lb $v1, 0xb4($s0) /* 7C8A4 800E33F4 10620005 */ beq $v1, $v0, .L800E340C -/* 7C8A8 800E33F8 00000000 */ nop +/* 7C8A8 800E33F8 00000000 */ nop /* 7C8AC 800E33FC 0C039769 */ jal set_action_state /* 7C8B0 800E3400 2404000A */ addiu $a0, $zero, 0xa /* 7C8B4 800E3404 08038D0D */ j .L800E3434 -/* 7C8B8 800E3408 00000000 */ nop +/* 7C8B8 800E3408 00000000 */ nop .L800E340C: /* 7C8BC 800E340C 0C039769 */ jal set_action_state /* 7C8C0 800E3410 2404000B */ addiu $a0, $zero, 0xb /* 7C8C4 800E3414 08038D0D */ j .L800E3434 -/* 7C8C8 800E3418 00000000 */ nop +/* 7C8C8 800E3418 00000000 */ nop .L800E341C: /* 7C8CC 800E341C 45010003 */ bc1t .L800E342C -/* 7C8D0 800E3420 00000000 */ nop +/* 7C8D0 800E3420 00000000 */ nop /* 7C8D4 800E3424 C7A00010 */ lwc1 $f0, 0x10($sp) /* 7C8D8 800E3428 E6000080 */ swc1 $f0, 0x80($s0) .L800E342C: /* 7C8DC 800E342C 0C0397DA */ jal update_locomotion_state -/* 7C8E0 800E3430 00000000 */ nop +/* 7C8E0 800E3430 00000000 */ nop .L800E3434: /* 7C8E4 800E3434 8FBF0020 */ lw $ra, 0x20($sp) /* 7C8E8 800E3438 8FB1001C */ lw $s1, 0x1c($sp) diff --git a/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s b/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s index 657b5480c8..a17fb3dc6d 100644 --- a/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s +++ b/asm/nonmatchings/code_7bb60_len_41b0/update_fall_state.s @@ -10,7 +10,7 @@ glabel update_fall_state /* 7C1DC 800E2D2C F7B40018 */ sdc1 $f20, 0x18($sp) /* 7C1E0 800E2D30 860200C0 */ lh $v0, 0xc0($s0) /* 7C1E4 800E2D34 1040006A */ beqz $v0, .L800E2EE0 -/* 7C1E8 800E2D38 00000000 */ nop +/* 7C1E8 800E2D38 00000000 */ nop /* 7C1EC 800E2D3C 920200B4 */ lbu $v0, 0xb4($s0) /* 7C1F0 800E2D40 2442FFFC */ addiu $v0, $v0, -4 /* 7C1F4 800E2D44 00021600 */ sll $v0, $v0, 0x18 @@ -22,32 +22,32 @@ glabel update_fall_state /* 7C20C 800E2D5C 00220821 */ addu $at, $at, $v0 /* 7C210 800E2D60 8C22BD98 */ lw $v0, %lo(D_8010BD98)($at) /* 7C214 800E2D64 00400008 */ jr $v0 -/* 7C218 800E2D68 00000000 */ nop +/* 7C218 800E2D68 00000000 */ nop /* 7C21C 800E2D6C 0C038AEC */ jal func_800E2BB0 -/* 7C220 800E2D70 00000000 */ nop +/* 7C220 800E2D70 00000000 */ nop /* 7C224 800E2D74 08038BD3 */ j .L800E2F4C -/* 7C228 800E2D78 00000000 */ nop +/* 7C228 800E2D78 00000000 */ nop /* 7C22C 800E2D7C 0C038A72 */ jal func_800E29C8 -/* 7C230 800E2D80 00000000 */ nop +/* 7C230 800E2D80 00000000 */ nop /* 7C234 800E2D84 08038BD3 */ j .L800E2F4C -/* 7C238 800E2D88 00000000 */ nop +/* 7C238 800E2D88 00000000 */ nop /* 7C23C 800E2D8C 0C038D12 */ jal integrate_gravity -/* 7C240 800E2D90 00000000 */ nop +/* 7C240 800E2D90 00000000 */ nop /* 7C244 800E2D94 C600002C */ lwc1 $f0, 0x2c($s0) /* 7C248 800E2D98 C6020070 */ lwc1 $f2, 0x70($s0) /* 7C24C 800E2D9C 46020000 */ add.s $f0, $f0, $f2 /* 7C250 800E2DA0 4480A000 */ mtc1 $zero, $f20 -/* 7C254 800E2DA4 00000000 */ nop +/* 7C254 800E2DA4 00000000 */ nop /* 7C258 800E2DA8 4614103E */ c.le.s $f2, $f20 -/* 7C25C 800E2DAC 00000000 */ nop +/* 7C25C 800E2DAC 00000000 */ nop /* 7C260 800E2DB0 45000066 */ bc1f .L800E2F4C /* 7C264 800E2DB4 E600002C */ swc1 $f0, 0x2c($s0) /* 7C268 800E2DB8 0C0389AC */ jal func_800E26B0 -/* 7C26C 800E2DBC 00000000 */ nop +/* 7C26C 800E2DBC 00000000 */ nop /* 7C270 800E2DC0 0C011052 */ jal func_80044148 -/* 7C274 800E2DC4 00000000 */ nop +/* 7C274 800E2DC4 00000000 */ nop /* 7C278 800E2DC8 1040001F */ beqz $v0, .L800E2E48 -/* 7C27C 800E2DCC 00000000 */ nop +/* 7C27C 800E2DCC 00000000 */ nop /* 7C280 800E2DD0 3C013E1E */ lui $at, 0x3e1e /* 7C284 800E2DD4 34210C17 */ ori $at, $at, 0xc17 /* 7C288 800E2DD8 44810000 */ mtc1 $at, $f0 @@ -71,77 +71,77 @@ glabel update_fall_state /* 7C2D0 800E2E20 46000106 */ mov.s $f4, $f0 /* 7C2D4 800E2E24 46001080 */ add.s $f2, $f2, $f0 /* 7C2D8 800E2E28 44800000 */ mtc1 $zero, $f0 -/* 7C2DC 800E2E2C 00000000 */ nop +/* 7C2DC 800E2E2C 00000000 */ nop /* 7C2E0 800E2E30 4600203E */ c.le.s $f4, $f0 -/* 7C2E4 800E2E34 00000000 */ nop +/* 7C2E4 800E2E34 00000000 */ nop /* 7C2E8 800E2E38 45000044 */ bc1f .L800E2F4C /* 7C2EC 800E2E3C E602002C */ swc1 $f2, 0x2c($s0) /* 7C2F0 800E2E40 0C0389AC */ jal func_800E26B0 -/* 7C2F4 800E2E44 00000000 */ nop +/* 7C2F4 800E2E44 00000000 */ nop .L800E2E48: /* 7C2F8 800E2E48 0C038C1B */ jal gravity_use_fall_parms -/* 7C2FC 800E2E4C 00000000 */ nop +/* 7C2FC 800E2E4C 00000000 */ nop .L800E2E50: /* 7C300 800E2E50 0C038D12 */ jal integrate_gravity -/* 7C304 800E2E54 00000000 */ nop +/* 7C304 800E2E54 00000000 */ nop /* 7C308 800E2E58 0C039769 */ jal set_action_state /* 7C30C 800E2E5C 24040008 */ addiu $a0, $zero, 8 /* 7C310 800E2E60 08038BD3 */ j .L800E2F4C -/* 7C314 800E2E64 00000000 */ nop +/* 7C314 800E2E64 00000000 */ nop .L800E2E68: /* 7C318 800E2E68 8E0200DC */ lw $v0, 0xdc($s0) /* 7C31C 800E2E6C 30428000 */ andi $v0, $v0, 0x8000 /* 7C320 800E2E70 1440001B */ bnez $v0, .L800E2EE0 -/* 7C324 800E2E74 00000000 */ nop +/* 7C324 800E2E74 00000000 */ nop /* 7C328 800E2E78 0C0389AC */ jal func_800E26B0 -/* 7C32C 800E2E7C 00000000 */ nop +/* 7C32C 800E2E7C 00000000 */ nop /* 7C330 800E2E80 0C039769 */ jal set_action_state /* 7C334 800E2E84 24040005 */ addiu $a0, $zero, 5 /* 7C338 800E2E88 0C038D12 */ jal integrate_gravity -/* 7C33C 800E2E8C 00000000 */ nop +/* 7C33C 800E2E8C 00000000 */ nop /* 7C340 800E2E90 8E020000 */ lw $v0, ($s0) /* 7C344 800E2E94 3C030004 */ lui $v1, 4 /* 7C348 800E2E98 00431024 */ and $v0, $v0, $v1 /* 7C34C 800E2E9C 10400010 */ beqz $v0, .L800E2EE0 -/* 7C350 800E2EA0 00000000 */ nop +/* 7C350 800E2EA0 00000000 */ nop /* 7C354 800E2EA4 C6060074 */ lwc1 $f6, 0x74($s0) /* 7C358 800E2EA8 3C013F00 */ lui $at, 0x3f00 /* 7C35C 800E2EAC 44811000 */ mtc1 $at, $f2 -/* 7C360 800E2EB0 00000000 */ nop +/* 7C360 800E2EB0 00000000 */ nop /* 7C364 800E2EB4 46023182 */ mul.s $f6, $f6, $f2 -/* 7C368 800E2EB8 00000000 */ nop +/* 7C368 800E2EB8 00000000 */ nop /* 7C36C 800E2EBC C6040078 */ lwc1 $f4, 0x78($s0) /* 7C370 800E2EC0 46022102 */ mul.s $f4, $f4, $f2 -/* 7C374 800E2EC4 00000000 */ nop +/* 7C374 800E2EC4 00000000 */ nop /* 7C378 800E2EC8 C600007C */ lwc1 $f0, 0x7c($s0) /* 7C37C 800E2ECC 46020002 */ mul.s $f0, $f0, $f2 -/* 7C380 800E2ED0 00000000 */ nop +/* 7C380 800E2ED0 00000000 */ nop /* 7C384 800E2ED4 E6060074 */ swc1 $f6, 0x74($s0) /* 7C388 800E2ED8 E6040078 */ swc1 $f4, 0x78($s0) /* 7C38C 800E2EDC E600007C */ swc1 $f0, 0x7c($s0) .L800E2EE0: /* 7C390 800E2EE0 0C038D12 */ jal integrate_gravity -/* 7C394 800E2EE4 00000000 */ nop +/* 7C394 800E2EE4 00000000 */ nop /* 7C398 800E2EE8 C6020070 */ lwc1 $f2, 0x70($s0) /* 7C39C 800E2EEC 44800000 */ mtc1 $zero, $f0 -/* 7C3A0 800E2EF0 00000000 */ nop +/* 7C3A0 800E2EF0 00000000 */ nop /* 7C3A4 800E2EF4 4600103E */ c.le.s $f2, $f0 -/* 7C3A8 800E2EF8 00000000 */ nop +/* 7C3A8 800E2EF8 00000000 */ nop /* 7C3AC 800E2EFC 45000009 */ bc1f .L800E2F24 -/* 7C3B0 800E2F00 00000000 */ nop +/* 7C3B0 800E2F00 00000000 */ nop /* 7C3B4 800E2F04 0C0389AC */ jal func_800E26B0 -/* 7C3B8 800E2F08 00000000 */ nop +/* 7C3B8 800E2F08 00000000 */ nop /* 7C3BC 800E2F0C 0C038C1B */ jal gravity_use_fall_parms -/* 7C3C0 800E2F10 00000000 */ nop +/* 7C3C0 800E2F10 00000000 */ nop /* 7C3C4 800E2F14 0C038D12 */ jal integrate_gravity -/* 7C3C8 800E2F18 00000000 */ nop +/* 7C3C8 800E2F18 00000000 */ nop /* 7C3CC 800E2F1C 0C039769 */ jal set_action_state /* 7C3D0 800E2F20 24040008 */ addiu $a0, $zero, 8 .L800E2F24: /* 7C3D4 800E2F24 C6000070 */ lwc1 $f0, 0x70($s0) /* 7C3D8 800E2F28 C602006C */ lwc1 $f2, 0x6c($s0) /* 7C3DC 800E2F2C 4600103C */ c.lt.s $f2, $f0 -/* 7C3E0 800E2F30 00000000 */ nop +/* 7C3E0 800E2F30 00000000 */ nop /* 7C3E4 800E2F34 45030001 */ bc1tl .L800E2F3C /* 7C3E8 800E2F38 E6020070 */ swc1 $f2, 0x70($s0) .L800E2F3C: diff --git a/asm/nonmatchings/code_7fd10_len_b40/can_pause.s b/asm/nonmatchings/code_7fd10_len_b40/can_pause.s index 6e6606fa02..264e4222eb 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/can_pause.s +++ b/asm/nonmatchings/code_7fd10_len_b40/can_pause.s @@ -31,7 +31,7 @@ glabel can_pause /* 7FEF4 800E6A44 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 7FEF8 800E6A48 8C420144 */ lw $v0, 0x144($v0) /* 7FEFC 800E6A4C 10400005 */ beqz $v0, .L800E6A64 -/* 7FF00 800E6A50 00000000 */ nop +/* 7FF00 800E6A50 00000000 */ nop /* 7FF04 800E6A54 94420000 */ lhu $v0, ($v0) /* 7FF08 800E6A58 30420001 */ andi $v0, $v0, 1 /* 7FF0C 800E6A5C 1440003C */ bnez $v0, .L800E6B50 @@ -44,16 +44,16 @@ glabel can_pause /* 7FF24 800E6A74 14400036 */ bnez $v0, .L800E6B50 /* 7FF28 800E6A78 0000102D */ daddu $v0, $zero, $zero /* 7FF2C 800E6A7C 0C04D07A */ jal func_801341E8 -/* 7FF30 800E6A80 00000000 */ nop +/* 7FF30 800E6A80 00000000 */ nop /* 7FF34 800E6A84 14400032 */ bnez $v0, .L800E6B50 /* 7FF38 800E6A88 0000102D */ daddu $v0, $zero, $zero /* 7FF3C 800E6A8C 8E220004 */ lw $v0, 4($s1) /* 7FF40 800E6A90 30424000 */ andi $v0, $v0, 0x4000 /* 7FF44 800E6A94 1440002B */ bnez $v0, .L800E6B44 -/* 7FF48 800E6A98 00000000 */ nop +/* 7FF48 800E6A98 00000000 */ nop /* 7FF4C 800E6A9C 82420000 */ lb $v0, ($s2) /* 7FF50 800E6AA0 1440000A */ bnez $v0, .L800E6ACC -/* 7FF54 800E6AA4 00000000 */ nop +/* 7FF54 800E6AA4 00000000 */ nop /* 7FF58 800E6AA8 8E220000 */ lw $v0, ($s1) /* 7FF5C 800E6AAC 30421000 */ andi $v0, $v0, 0x1000 /* 7FF60 800E6AB0 14400027 */ bnez $v0, .L800E6B50 @@ -62,10 +62,10 @@ glabel can_pause /* 7FF6C 800E6ABC 10400023 */ beqz $v0, .L800E6B4C /* 7FF70 800E6AC0 24020001 */ addiu $v0, $zero, 1 /* 7FF74 800E6AC4 08039AD4 */ j .L800E6B50 -/* 7FF78 800E6AC8 00000000 */ nop +/* 7FF78 800E6AC8 00000000 */ nop .L800E6ACC: /* 7FF7C 800E6ACC 0C03ACF8 */ jal partner_player_can_pause -/* 7FF80 800E6AD0 00000000 */ nop +/* 7FF80 800E6AD0 00000000 */ nop /* 7FF84 800E6AD4 1040001D */ beqz $v0, .L800E6B4C /* 7FF88 800E6AD8 24020006 */ addiu $v0, $zero, 6 /* 7FF8C 800E6ADC 82430003 */ lb $v1, 3($s2) @@ -89,11 +89,11 @@ glabel can_pause /* 7FFCC 800E6B1C 1602000C */ bne $s0, $v0, .L800E6B50 /* 7FFD0 800E6B20 0000102D */ daddu $v0, $zero, $zero /* 7FFD4 800E6B24 0C0AF5F7 */ jal func_802BD7DC -/* 7FFD8 800E6B28 00000000 */ nop +/* 7FFD8 800E6B28 00000000 */ nop /* 7FFDC 800E6B2C 14400008 */ bnez $v0, .L800E6B50 /* 7FFE0 800E6B30 24020001 */ addiu $v0, $zero, 1 /* 7FFE4 800E6B34 08039AD1 */ j .L800E6B44 -/* 7FFE8 800E6B38 00000000 */ nop +/* 7FFE8 800E6B38 00000000 */ nop .L800E6B3C: /* 7FFEC 800E6B3C 14620004 */ bne $v1, $v0, .L800E6B50 /* 7FFF0 800E6B40 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s b/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s index 797f71e94e..895d815e93 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s +++ b/asm/nonmatchings/code_7fd10_len_b40/check_input_open_menus.s @@ -19,7 +19,7 @@ glabel check_input_open_menus /* 801CC 800E6D1C 3C128011 */ lui $s2, %hi(D_8010C9C8) /* 801D0 800E6D20 2652C9C8 */ addiu $s2, $s2, %lo(D_8010C9C8) /* 801D4 800E6D24 14400151 */ bnez $v0, .L800E726C -/* 801D8 800E6D28 00000000 */ nop +/* 801D8 800E6D28 00000000 */ nop /* 801DC 800E6D2C 9062007E */ lbu $v0, 0x7e($v1) /* 801E0 800E6D30 30420001 */ andi $v0, $v0, 1 /* 801E4 800E6D34 1440014D */ bnez $v0, .L800E726C @@ -29,10 +29,10 @@ glabel check_input_open_menus /* 801F4 800E6D44 34A50180 */ ori $a1, $a1, 0x180 /* 801F8 800E6D48 2403FF80 */ addiu $v1, $zero, -0x80 /* 801FC 800E6D4C 10430147 */ beq $v0, $v1, .L800E726C -/* 80200 800E6D50 00000000 */ nop +/* 80200 800E6D50 00000000 */ nop /* 80204 800E6D54 82620000 */ lb $v0, ($s3) /* 80208 800E6D58 1040000A */ beqz $v0, .L800E6D84 -/* 8020C 800E6D5C 00000000 */ nop +/* 8020C 800E6D5C 00000000 */ nop /* 80210 800E6D60 92620003 */ lbu $v0, 3($s3) /* 80214 800E6D64 2442FFF9 */ addiu $v0, $v0, -7 /* 80218 800E6D68 2C420003 */ sltiu $v0, $v0, 3 @@ -65,7 +65,7 @@ glabel check_input_open_menus /* 80278 800E6DC8 00220821 */ addu $at, $at, $v0 /* 8027C 800E6DCC 8C22BF30 */ lw $v0, %lo(D_8010BF30)($at) /* 80280 800E6DD0 00400008 */ jr $v0 -/* 80284 800E6DD4 00000000 */ nop +/* 80284 800E6DD4 00000000 */ nop /* 80288 800E6DD8 0220202D */ daddu $a0, $s1, $zero /* 8028C 800E6DDC 0C039A77 */ jal can_pause /* 80290 800E6DE0 0200282D */ daddu $a1, $s0, $zero @@ -91,22 +91,22 @@ glabel check_input_open_menus /* 802D4 800E6E24 10600005 */ beqz $v1, .L800E6E3C /* 802D8 800E6E28 24020001 */ addiu $v0, $zero, 1 /* 802DC 800E6E2C 1062001F */ beq $v1, $v0, .L800E6EAC -/* 802E0 800E6E30 00000000 */ nop +/* 802E0 800E6E30 00000000 */ nop /* 802E4 800E6E34 08039BB2 */ j .L800E6EC8 -/* 802E8 800E6E38 00000000 */ nop +/* 802E8 800E6E38 00000000 */ nop .L800E6E3C: /* 802EC 800E6E3C 8E820000 */ lw $v0, ($s4) /* 802F0 800E6E40 30420040 */ andi $v0, $v0, 0x40 /* 802F4 800E6E44 10400009 */ beqz $v0, .L800E6E6C -/* 802F8 800E6E48 00000000 */ nop +/* 802F8 800E6E48 00000000 */ nop /* 802FC 800E6E4C 0C05272D */ jal play_sound /* 80300 800E6E50 2404021D */ addiu $a0, $zero, 0x21d /* 80304 800E6E54 3C028011 */ lui $v0, %hi(D_8010C9C0) /* 80308 800E6E58 8442C9C0 */ lh $v0, %lo(D_8010C9C0)($v0) /* 8030C 800E6E5C 10400103 */ beqz $v0, .L800E726C -/* 80310 800E6E60 00000000 */ nop +/* 80310 800E6E60 00000000 */ nop /* 80314 800E6E64 08039C72 */ j .L800E71C8 -/* 80318 800E6E68 00000000 */ nop +/* 80318 800E6E68 00000000 */ nop .L800E6E6C: /* 8031C 800E6E6C 0C039ADE */ jal setup_partner_popup /* 80320 800E6E70 0240202D */ daddu $a0, $s2, $zero @@ -128,7 +128,7 @@ glabel check_input_open_menus /* 8035C 800E6EAC 0C039B11 */ jal setup_item_popup /* 80360 800E6EB0 0240202D */ daddu $a0, $s2, $zero /* 80364 800E6EB4 104000ED */ beqz $v0, .L800E726C -/* 80368 800E6EB8 00000000 */ nop +/* 80368 800E6EB8 00000000 */ nop /* 8036C 800E6EBC AE400318 */ sw $zero, 0x318($s2) /* 80370 800E6EC0 AE420324 */ sw $v0, 0x324($s2) /* 80374 800E6EC4 AE400328 */ sw $zero, 0x328($s2) @@ -138,7 +138,7 @@ glabel check_input_open_menus /* 80380 800E6ED0 0C03805E */ jal disable_player_input /* 80384 800E6ED4 AE820000 */ sw $v0, ($s4) /* 80388 800E6ED8 0C03BD8A */ jal func_800EF628 -/* 8038C 800E6EDC 00000000 */ nop +/* 8038C 800E6EDC 00000000 */ nop /* 80390 800E6EE0 24020003 */ addiu $v0, $zero, 3 /* 80394 800E6EE4 3C018011 */ lui $at, %hi(D_8010CCFA) /* 80398 800E6EE8 A422CCFA */ sh $v0, %lo(D_8010CCFA)($at) @@ -151,21 +151,21 @@ glabel check_input_open_menus /* 803B4 800E6F04 3C018011 */ lui $at, %hi(D_8010CCFE) /* 803B8 800E6F08 A422CCFE */ sh $v0, %lo(D_8010CCFE)($at) /* 803BC 800E6F0C 08039C9B */ j .L800E726C -/* 803C0 800E6F10 00000000 */ nop +/* 803C0 800E6F10 00000000 */ nop /* 803C4 800E6F14 0C039A41 */ jal func_800E6904 -/* 803C8 800E6F18 00000000 */ nop +/* 803C8 800E6F18 00000000 */ nop /* 803CC 800E6F1C 1040000B */ beqz $v0, .L800E6F4C -/* 803D0 800E6F20 00000000 */ nop +/* 803D0 800E6F20 00000000 */ nop /* 803D4 800E6F24 0C04D07A */ jal func_801341E8 -/* 803D8 800E6F28 00000000 */ nop +/* 803D8 800E6F28 00000000 */ nop /* 803DC 800E6F2C 14400007 */ bnez $v0, .L800E6F4C -/* 803E0 800E6F30 00000000 */ nop +/* 803E0 800E6F30 00000000 */ nop /* 803E4 800E6F34 3C028011 */ lui $v0, %hi(D_8010CCFE) /* 803E8 800E6F38 8442CCFE */ lh $v0, %lo(D_8010CCFE)($v0) /* 803EC 800E6F3C 82830015 */ lb $v1, 0x15($s4) /* 803F0 800E6F40 0043102A */ slt $v0, $v0, $v1 /* 803F4 800E6F44 10400010 */ beqz $v0, .L800E6F88 -/* 803F8 800E6F48 00000000 */ nop +/* 803F8 800E6F48 00000000 */ nop .L800E6F4C: /* 803FC 800E6F4C 8E820000 */ lw $v0, ($s4) /* 80400 800E6F50 2403FFDF */ addiu $v1, $zero, -0x21 @@ -173,15 +173,15 @@ glabel check_input_open_menus /* 80408 800E6F58 0C038069 */ jal enable_player_input /* 8040C 800E6F5C AE820000 */ sw $v0, ($s4) /* 80410 800E6F60 0C03BD80 */ jal func_800EF600 -/* 80414 800E6F64 00000000 */ nop +/* 80414 800E6F64 00000000 */ nop /* 80418 800E6F68 3C028011 */ lui $v0, %hi(D_8010C9C0) /* 8041C 800E6F6C 8442C9C0 */ lh $v0, %lo(D_8010C9C0)($v0) /* 80420 800E6F70 3C018011 */ lui $at, %hi(D_8010CD00) /* 80424 800E6F74 A420CD00 */ sh $zero, %lo(D_8010CD00)($at) /* 80428 800E6F78 104000BC */ beqz $v0, .L800E726C -/* 8042C 800E6F7C 00000000 */ nop +/* 8042C 800E6F7C 00000000 */ nop /* 80430 800E6F80 08039C72 */ j .L800E71C8 -/* 80434 800E6F84 00000000 */ nop +/* 80434 800E6F84 00000000 */ nop .L800E6F88: /* 80438 800E6F88 3C038011 */ lui $v1, %hi(D_8010CCFA) /* 8043C 800E6F8C 2463CCFA */ addiu $v1, $v1, %lo(D_8010CCFA) @@ -203,7 +203,7 @@ glabel check_input_open_menus /* 8047C 800E6FCC 8463CCF8 */ lh $v1, %lo(D_8010CCF8)($v1) /* 80480 800E6FD0 24020002 */ addiu $v0, $zero, 2 /* 80484 800E6FD4 1462000C */ bne $v1, $v0, .L800E7008 -/* 80488 800E6FD8 00000000 */ nop +/* 80488 800E6FD8 00000000 */ nop /* 8048C 800E6FDC 0C00CD3C */ jal set_game_mode /* 80490 800E6FE0 2404000A */ addiu $a0, $zero, 0xa /* 80494 800E6FE4 0C05272D */ jal play_sound @@ -214,7 +214,7 @@ glabel check_input_open_menus /* 804A8 800E6FF8 3C018011 */ lui $at, %hi(D_8010CD00) /* 804AC 800E6FFC A422CD00 */ sh $v0, %lo(D_8010CD00)($at) /* 804B0 800E7000 08039C9B */ j .L800E726C -/* 804B4 800E7004 00000000 */ nop +/* 804B4 800E7004 00000000 */ nop .L800E7008: /* 804B8 800E7008 0C03D390 */ jal func_800F4E40 /* 804BC 800E700C 0240202D */ daddu $a0, $s2, $zero @@ -222,7 +222,7 @@ glabel check_input_open_menus /* 804C4 800E7014 24040003 */ addiu $a0, $zero, 3 /* 804C8 800E7018 82620000 */ lb $v0, ($s3) /* 804CC 800E701C 14400003 */ bnez $v0, .L800E702C -/* 804D0 800E7020 00000000 */ nop +/* 804D0 800E7020 00000000 */ nop /* 804D4 800E7024 0C039769 */ jal set_action_state /* 804D8 800E7028 0000202D */ daddu $a0, $zero, $zero .L800E702C: @@ -239,9 +239,9 @@ glabel check_input_open_menus /* 80504 800E7054 3C018011 */ lui $at, %hi(D_8010CCFC) /* 80508 800E7058 A424CCFC */ sh $a0, %lo(D_8010CCFC)($at) /* 8050C 800E705C 10600083 */ beqz $v1, .L800E726C -/* 80510 800E7060 00000000 */ nop +/* 80510 800E7060 00000000 */ nop /* 80514 800E7064 0C03C4EC */ jal func_800F13B0 -/* 80518 800E7068 00000000 */ nop +/* 80518 800E7068 00000000 */ nop /* 8051C 800E706C 3C028011 */ lui $v0, %hi(D_8010CD00) /* 80520 800E7070 2442CD00 */ addiu $v0, $v0, %lo(D_8010CD00) /* 80524 800E7074 94430000 */ lhu $v1, ($v0) @@ -258,21 +258,21 @@ glabel check_input_open_menus /* 80550 800E70A0 A4620000 */ sh $v0, ($v1) /* 80554 800E70A4 00021400 */ sll $v0, $v0, 0x10 /* 80558 800E70A8 14400070 */ bnez $v0, .L800E726C -/* 8055C 800E70AC 00000000 */ nop +/* 8055C 800E70AC 00000000 */ nop /* 80560 800E70B0 0C03C54E */ jal func_800F1538 -/* 80564 800E70B4 00000000 */ nop +/* 80564 800E70B4 00000000 */ nop /* 80568 800E70B8 3C018011 */ lui $at, %hi(D_8010CD00) /* 8056C 800E70BC A420CD00 */ sh $zero, %lo(D_8010CD00)($at) /* 80570 800E70C0 0C038069 */ jal enable_player_input -/* 80574 800E70C4 00000000 */ nop +/* 80574 800E70C4 00000000 */ nop /* 80578 800E70C8 0C03BD80 */ jal func_800EF600 -/* 8057C 800E70CC 00000000 */ nop +/* 8057C 800E70CC 00000000 */ nop /* 80580 800E70D0 3C108011 */ lui $s0, %hi(D_8010CCFC) /* 80584 800E70D4 2610CCFC */ addiu $s0, $s0, %lo(D_8010CCFC) /* 80588 800E70D8 86030000 */ lh $v1, ($s0) /* 8058C 800E70DC 2402FFFE */ addiu $v0, $zero, -2 /* 80590 800E70E0 1462001B */ bne $v1, $v0, .L800E7150 -/* 80594 800E70E4 00000000 */ nop +/* 80594 800E70E4 00000000 */ nop /* 80598 800E70E8 0C039ADE */ jal setup_partner_popup /* 8059C 800E70EC 0240202D */ daddu $a0, $s2, $zero /* 805A0 800E70F0 10400005 */ beqz $v0, .L800E7108 @@ -293,7 +293,7 @@ glabel check_input_open_menus /* 805D4 800E7124 10620006 */ beq $v1, $v0, .L800E7140 /* 805D8 800E7128 24020001 */ addiu $v0, $zero, 1 /* 805DC 800E712C 08039C51 */ j .L800E7144 -/* 805E0 800E7130 00000000 */ nop +/* 805E0 800E7130 00000000 */ nop .L800E7134: /* 805E4 800E7134 24020001 */ addiu $v0, $zero, 1 /* 805E8 800E7138 08039C51 */ j .L800E7144 @@ -309,7 +309,7 @@ glabel check_input_open_menus /* 80604 800E7154 8463CCFC */ lh $v1, %lo(D_8010CCFC)($v1) /* 80608 800E7158 240200FF */ addiu $v0, $zero, 0xff /* 8060C 800E715C 1062001A */ beq $v1, $v0, .L800E71C8 -/* 80610 800E7160 00000000 */ nop +/* 80610 800E7160 00000000 */ nop /* 80614 800E7164 3C048011 */ lui $a0, %hi(D_8010CCF8) /* 80618 800E7168 8484CCF8 */ lh $a0, %lo(D_8010CCF8)($a0) /* 8061C 800E716C 10800005 */ beqz $a0, .L800E7184 @@ -317,7 +317,7 @@ glabel check_input_open_menus /* 80624 800E7174 1082000A */ beq $a0, $v0, .L800E71A0 /* 80628 800E7178 2462FFFF */ addiu $v0, $v1, -1 /* 8062C 800E717C 08039C72 */ j .L800E71C8 -/* 80630 800E7180 00000000 */ nop +/* 80630 800E7180 00000000 */ nop .L800E7184: /* 80634 800E7184 2462FFFF */ addiu $v0, $v1, -1 /* 80638 800E7188 00021080 */ sll $v0, $v0, 2 @@ -325,7 +325,7 @@ glabel check_input_open_menus /* 80640 800E7190 0C03AC5A */ jal func_800EB168 /* 80644 800E7194 8C440108 */ lw $a0, 0x108($v0) /* 80648 800E7198 08039C72 */ j .L800E71C8 -/* 8064C 800E719C 00000000 */ nop +/* 8064C 800E719C 00000000 */ nop .L800E71A0: /* 80650 800E71A0 00021080 */ sll $v0, $v0, 2 /* 80654 800E71A4 02421021 */ addu $v0, $s2, $v0 @@ -339,7 +339,7 @@ glabel check_input_open_menus /* 80674 800E71C4 AC820000 */ sw $v0, ($a0) .L800E71C8: /* 80678 800E71C8 0C039A18 */ jal func_800E6860 -/* 8067C 800E71CC 00000000 */ nop +/* 8067C 800E71CC 00000000 */ nop /* 80680 800E71D0 0000202D */ daddu $a0, $zero, $zero /* 80684 800E71D4 2403FFDF */ addiu $v1, $zero, -0x21 /* 80688 800E71D8 8E820000 */ lw $v0, ($s4) @@ -353,7 +353,7 @@ glabel check_input_open_menus /* 806A8 800E71F8 0C009C22 */ jal func_80027088 /* 806AC 800E71FC ACA20000 */ sw $v0, ($a1) /* 806B0 800E7200 08039C9B */ j .L800E726C -/* 806B4 800E7204 00000000 */ nop +/* 806B4 800E7204 00000000 */ nop /* 806B8 800E7208 3C038011 */ lui $v1, %hi(D_8010CCFA) /* 806BC 800E720C 2463CCFA */ addiu $v1, $v1, %lo(D_8010CCFA) /* 806C0 800E7210 94620000 */ lhu $v0, ($v1) @@ -361,9 +361,9 @@ glabel check_input_open_menus /* 806C8 800E7218 A4620000 */ sh $v0, ($v1) /* 806CC 800E721C 00021400 */ sll $v0, $v0, 0x10 /* 806D0 800E7220 14400012 */ bnez $v0, .L800E726C -/* 806D4 800E7224 00000000 */ nop +/* 806D4 800E7224 00000000 */ nop /* 806D8 800E7228 0C039A18 */ jal func_800E6860 -/* 806DC 800E722C 00000000 */ nop +/* 806DC 800E722C 00000000 */ nop /* 806E0 800E7230 2403FFDF */ addiu $v1, $zero, -0x21 /* 806E4 800E7234 8E820000 */ lw $v0, ($s4) /* 806E8 800E7238 3C04800A */ lui $a0, %hi(D_8009A650) @@ -378,7 +378,7 @@ glabel check_input_open_menus /* 8070C 800E725C 0C038069 */ jal enable_player_input /* 80710 800E7260 AC820000 */ sw $v0, ($a0) /* 80714 800E7264 0C03BD80 */ jal func_800EF600 -/* 80718 800E7268 00000000 */ nop +/* 80718 800E7268 00000000 */ nop .L800E726C: /* 8071C 800E726C 8FBF0024 */ lw $ra, 0x24($sp) /* 80720 800E7270 8FB40020 */ lw $s4, 0x20($sp) diff --git a/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s b/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s index 71268c62eb..9719cc6c8e 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s +++ b/asm/nonmatchings/code_7fd10_len_b40/check_input_status_menu.s @@ -17,7 +17,7 @@ glabel check_input_status_menu /* 8076C 800E72BC 24020021 */ addiu $v0, $zero, 0x21 /* 80770 800E72C0 822300B4 */ lb $v1, 0xb4($s1) /* 80774 800E72C4 10620003 */ beq $v1, $v0, .L800E72D4 -/* 80778 800E72C8 00000000 */ nop +/* 80778 800E72C8 00000000 */ nop /* 8077C 800E72CC 08039CB8 */ j .L800E72E0 /* 80780 800E72D0 8E3000E0 */ lw $s0, 0xe0($s1) .L800E72D4: @@ -26,53 +26,53 @@ glabel check_input_status_menu /* 8078C 800E72DC 8C500010 */ lw $s0, 0x10($v0) .L800E72E0: /* 80790 800E72E0 0C03A644 */ jal is_status_menu_visible -/* 80794 800E72E4 00000000 */ nop +/* 80794 800E72E4 00000000 */ nop /* 80798 800E72E8 14400013 */ bnez $v0, .L800E7338 -/* 8079C 800E72EC 00000000 */ nop +/* 8079C 800E72EC 00000000 */ nop /* 807A0 800E72F0 8E2200DC */ lw $v0, 0xdc($s1) /* 807A4 800E72F4 30422010 */ andi $v0, $v0, 0x2010 /* 807A8 800E72F8 14400021 */ bnez $v0, .L800E7380 /* 807AC 800E72FC 32020008 */ andi $v0, $s0, 8 /* 807B0 800E7300 1040001F */ beqz $v0, .L800E7380 -/* 807B4 800E7304 00000000 */ nop +/* 807B4 800E7304 00000000 */ nop /* 807B8 800E7308 0C03A618 */ jal func_800E9860 -/* 807BC 800E730C 00000000 */ nop +/* 807BC 800E730C 00000000 */ nop /* 807C0 800E7310 1040001B */ beqz $v0, .L800E7380 -/* 807C4 800E7314 00000000 */ nop +/* 807C4 800E7314 00000000 */ nop /* 807C8 800E7318 0C03A5D8 */ jal open_status_menu_long -/* 807CC 800E731C 00000000 */ nop +/* 807CC 800E731C 00000000 */ nop /* 807D0 800E7320 0C04D07A */ jal func_801341E8 -/* 807D4 800E7324 00000000 */ nop +/* 807D4 800E7324 00000000 */ nop /* 807D8 800E7328 14400015 */ bnez $v0, .L800E7380 /* 807DC 800E732C 24040003 */ addiu $a0, $zero, 3 /* 807E0 800E7330 08039CDE */ j .L800E7378 -/* 807E4 800E7334 00000000 */ nop +/* 807E4 800E7334 00000000 */ nop .L800E7338: /* 807E8 800E7338 8E2200DC */ lw $v0, 0xdc($s1) /* 807EC 800E733C 30422010 */ andi $v0, $v0, 0x2010 /* 807F0 800E7340 1440000F */ bnez $v0, .L800E7380 /* 807F4 800E7344 32020008 */ andi $v0, $s0, 8 /* 807F8 800E7348 1040000D */ beqz $v0, .L800E7380 -/* 807FC 800E734C 00000000 */ nop +/* 807FC 800E734C 00000000 */ nop /* 80800 800E7350 0C03A618 */ jal func_800E9860 -/* 80804 800E7354 00000000 */ nop +/* 80804 800E7354 00000000 */ nop /* 80808 800E7358 10400009 */ beqz $v0, .L800E7380 -/* 8080C 800E735C 00000000 */ nop +/* 8080C 800E735C 00000000 */ nop /* 80810 800E7360 0C03A5EE */ jal func_800E97B8 -/* 80814 800E7364 00000000 */ nop +/* 80814 800E7364 00000000 */ nop /* 80818 800E7368 0C04D07A */ jal func_801341E8 -/* 8081C 800E736C 00000000 */ nop +/* 8081C 800E736C 00000000 */ nop /* 80820 800E7370 14400003 */ bnez $v0, .L800E7380 /* 80824 800E7374 24040004 */ addiu $a0, $zero, 4 .L800E7378: /* 80828 800E7378 0C05272D */ jal play_sound -/* 8082C 800E737C 00000000 */ nop +/* 8082C 800E737C 00000000 */ nop .L800E7380: /* 80830 800E7380 8FBF0018 */ lw $ra, 0x18($sp) /* 80834 800E7384 8FB10014 */ lw $s1, 0x14($sp) /* 80838 800E7388 8FB00010 */ lw $s0, 0x10($sp) /* 8083C 800E738C 03E00008 */ jr $ra /* 80840 800E7390 27BD0020 */ addiu $sp, $sp, 0x20 -/* 80844 800E7394 00000000 */ nop -/* 80848 800E7398 00000000 */ nop -/* 8084C 800E739C 00000000 */ nop +/* 80844 800E7394 00000000 */ nop +/* 80848 800E7398 00000000 */ nop +/* 8084C 800E739C 00000000 */ nop diff --git a/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s b/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s index e4806e3230..622bb8e506 100644 --- a/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s +++ b/asm/nonmatchings/code_7fd10_len_b40/func_800E6904.s @@ -19,7 +19,7 @@ glabel func_800E6904 /* 7FDEC 800E693C 0000102D */ daddu $v0, $zero, $zero /* 7FDF0 800E6940 82220000 */ lb $v0, ($s1) /* 7FDF4 800E6944 1440000A */ bnez $v0, .L800E6970 -/* 7FDF8 800E6948 00000000 */ nop +/* 7FDF8 800E6948 00000000 */ nop /* 7FDFC 800E694C 8C820000 */ lw $v0, ($a0) /* 7FE00 800E6950 30421000 */ andi $v0, $v0, 0x1000 /* 7FE04 800E6954 1440001C */ bnez $v0, .L800E69C8 @@ -32,7 +32,7 @@ glabel func_800E6904 /* 7FE1C 800E696C 24020001 */ addiu $v0, $zero, 1 .L800E6970: /* 7FE20 800E6970 0C03ACF8 */ jal partner_player_can_pause -/* 7FE24 800E6974 00000000 */ nop +/* 7FE24 800E6974 00000000 */ nop /* 7FE28 800E6978 10400012 */ beqz $v0, .L800E69C4 /* 7FE2C 800E697C 24020006 */ addiu $v0, $zero, 6 /* 7FE30 800E6980 82230003 */ lb $v1, 3($s1) diff --git a/asm/nonmatchings/code_80850_len_3060/is_ability_active.s b/asm/nonmatchings/code_80850_len_3060/is_ability_active.s index 5c50665085..49afde2639 100644 --- a/asm/nonmatchings/code_80850_len_3060/is_ability_active.s +++ b/asm/nonmatchings/code_80850_len_3060/is_ability_active.s @@ -45,7 +45,7 @@ glabel is_ability_active /* 8328C 800E9DDC 24E70001 */ addiu $a3, $a3, 1 /* 83290 800E9DE0 8D420000 */ lw $v0, ($t2) /* 83294 800E9DE4 00400008 */ jr $v0 -/* 83298 800E9DE8 00000000 */ nop +/* 83298 800E9DE8 00000000 */ nop /* 8329C 800E9DEC 0803A81D */ j .L800EA074 /* 832A0 800E9DF0 2402004C */ addiu $v0, $zero, 0x4c /* 832A4 800E9DF4 0803A81D */ j .L800EA074 diff --git a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s index 82056a4cf5..f1d78477d7 100644 --- a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s +++ b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s @@ -22,10 +22,10 @@ glabel update_status_menu /* 815A8 800E80F8 3C118011 */ lui $s1, %hi(gPlayerStatus) /* 815AC 800E80FC 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) /* 815B0 800E8100 04410469 */ bgez $v0, .L800E92A8 -/* 815B4 800E8104 00000000 */ nop +/* 815B4 800E8104 00000000 */ nop /* 815B8 800E8108 80620071 */ lb $v0, 0x71($v1) /* 815BC 800E810C 14400466 */ bnez $v0, .L800E92A8 -/* 815C0 800E8110 00000000 */ nop +/* 815C0 800E8110 00000000 */ nop /* 815C4 800E8114 9062007E */ lbu $v0, 0x7e($v1) /* 815C8 800E8118 30420001 */ andi $v0, $v0, 1 /* 815CC 800E811C 14400462 */ bnez $v0, .L800E92A8 @@ -35,18 +35,18 @@ glabel update_status_menu /* 815DC 800E812C 34A50180 */ ori $a1, $a1, 0x180 /* 815E0 800E8130 28420060 */ slti $v0, $v0, 0x60 /* 815E4 800E8134 1040045C */ beqz $v0, .L800E92A8 -/* 815E8 800E8138 00000000 */ nop +/* 815E8 800E8138 00000000 */ nop /* 815EC 800E813C 8E020000 */ lw $v0, ($s0) /* 815F0 800E8140 80420070 */ lb $v0, 0x70($v0) /* 815F4 800E8144 14400008 */ bnez $v0, .L800E8168 -/* 815F8 800E8148 00000000 */ nop +/* 815F8 800E8148 00000000 */ nop /* 815FC 800E814C 3C038011 */ lui $v1, %hi(gPlayerData+0xC) /* 81600 800E8150 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* 81604 800E8154 86620040 */ lh $v0, 0x40($s3) /* 81608 800E8158 10620007 */ beq $v1, $v0, .L800E8178 /* 8160C 800E815C 00628023 */ subu $s0, $v1, $v0 /* 81610 800E8160 0C03A67D */ jal status_menu_start_blinking_coins -/* 81614 800E8164 00000000 */ nop +/* 81614 800E8164 00000000 */ nop .L800E8168: /* 81618 800E8168 3C038011 */ lui $v1, %hi(gPlayerData+0xC) /* 8161C 800E816C 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) @@ -76,7 +76,7 @@ glabel update_status_menu /* 81670 800E81C0 A6620040 */ sh $v0, 0x40($s3) /* 81674 800E81C4 82620044 */ lb $v0, 0x44($s3) /* 81678 800E81C8 14400009 */ bnez $v0, .L800E81F0 -/* 8167C 800E81CC 00000000 */ nop +/* 8167C 800E81CC 00000000 */ nop /* 81680 800E81D0 8262003A */ lb $v0, 0x3a($s3) /* 81684 800E81D4 10400005 */ beqz $v0, .L800E81EC /* 81688 800E81D8 24020046 */ addiu $v0, $zero, 0x46 @@ -91,10 +91,10 @@ glabel update_status_menu /* 816A4 800E81F4 3C028011 */ lui $v0, %hi(gPlayerData+0x5) /* 816A8 800E81F8 8042F295 */ lb $v0, %lo(gPlayerData+0x5)($v0) /* 816AC 800E81FC 1062000C */ beq $v1, $v0, .L800E8230 -/* 816B0 800E8200 00000000 */ nop +/* 816B0 800E8200 00000000 */ nop /* 816B4 800E8204 82620044 */ lb $v0, 0x44($s3) /* 816B8 800E8208 14400009 */ bnez $v0, .L800E8230 -/* 816BC 800E820C 00000000 */ nop +/* 816BC 800E820C 00000000 */ nop /* 816C0 800E8210 8262003A */ lb $v0, 0x3a($s3) /* 816C4 800E8214 10400005 */ beqz $v0, .L800E822C /* 816C8 800E8218 24020046 */ addiu $v0, $zero, 0x46 @@ -109,10 +109,10 @@ glabel update_status_menu /* 816E4 800E8234 3C028011 */ lui $v0, %hi(gPlayerData+0x290) /* 816E8 800E8238 8442F520 */ lh $v0, %lo(gPlayerData+0x290)($v0) /* 816EC 800E823C 1062000C */ beq $v1, $v0, .L800E8270 -/* 816F0 800E8240 00000000 */ nop +/* 816F0 800E8240 00000000 */ nop /* 816F4 800E8244 82620044 */ lb $v0, 0x44($s3) /* 816F8 800E8248 14400009 */ bnez $v0, .L800E8270 -/* 816FC 800E824C 00000000 */ nop +/* 816FC 800E824C 00000000 */ nop /* 81700 800E8250 8262003A */ lb $v0, 0x3a($s3) /* 81704 800E8254 10400005 */ beqz $v0, .L800E826C /* 81708 800E8258 24020046 */ addiu $v0, $zero, 0x46 @@ -127,16 +127,16 @@ glabel update_status_menu /* 81724 800E8274 3C038011 */ lui $v1, %hi(gPlayerData+0x2) /* 81728 800E8278 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 8172C 800E827C 1083002E */ beq $a0, $v1, .L800E8338 -/* 81730 800E8280 00000000 */ nop +/* 81730 800E8280 00000000 */ nop /* 81734 800E8284 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 81738 800E8288 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 8173C 800E828C 80420070 */ lb $v0, 0x70($v0) /* 81740 800E8290 14400005 */ bnez $v0, .L800E82A8 /* 81744 800E8294 0064102A */ slt $v0, $v1, $a0 /* 81748 800E8298 10400003 */ beqz $v0, .L800E82A8 -/* 8174C 800E829C 00000000 */ nop +/* 8174C 800E829C 00000000 */ nop /* 81750 800E82A0 0C03A648 */ jal status_menu_start_blinking_hp -/* 81754 800E82A4 00000000 */ nop +/* 81754 800E82A4 00000000 */ nop .L800E82A8: /* 81758 800E82A8 8262003D */ lb $v0, 0x3d($s3) /* 8175C 800E82AC 3C038011 */ lui $v1, %hi(gPlayerData+0x2) @@ -147,7 +147,7 @@ glabel update_status_menu /* 81770 800E82C0 86620036 */ lh $v0, 0x36($s3) /* 81774 800E82C4 28420012 */ slti $v0, $v0, 0x12 /* 81778 800E82C8 1440000C */ bnez $v0, .L800E82FC -/* 8177C 800E82CC 00000000 */ nop +/* 8177C 800E82CC 00000000 */ nop /* 81780 800E82D0 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 81784 800E82D4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 81788 800E82D8 94420134 */ lhu $v0, 0x134($v0) @@ -158,7 +158,7 @@ glabel update_status_menu /* 8179C 800E82EC 0C05272D */ jal play_sound /* 817A0 800E82F0 24040213 */ addiu $a0, $zero, 0x213 /* 817A4 800E82F4 0803A0CE */ j .L800E8338 -/* 817A8 800E82F8 00000000 */ nop +/* 817A8 800E82F8 00000000 */ nop .L800E82FC: /* 817AC 800E82FC 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 817B0 800E8300 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -181,16 +181,16 @@ glabel update_status_menu /* 817EC 800E833C 3C038011 */ lui $v1, %hi(gPlayerData+0x5) /* 817F0 800E8340 8063F295 */ lb $v1, %lo(gPlayerData+0x5)($v1) /* 817F4 800E8344 1083002E */ beq $a0, $v1, .L800E8400 -/* 817F8 800E8348 00000000 */ nop +/* 817F8 800E8348 00000000 */ nop /* 817FC 800E834C 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 81800 800E8350 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 81804 800E8354 80420070 */ lb $v0, 0x70($v0) /* 81808 800E8358 14400005 */ bnez $v0, .L800E8370 /* 8180C 800E835C 0064102A */ slt $v0, $v1, $a0 /* 81810 800E8360 10400003 */ beqz $v0, .L800E8370 -/* 81814 800E8364 00000000 */ nop +/* 81814 800E8364 00000000 */ nop /* 81818 800E8368 0C03A663 */ jal status_menu_start_blinking_fp -/* 8181C 800E836C 00000000 */ nop +/* 8181C 800E836C 00000000 */ nop .L800E8370: /* 81820 800E8370 8262003E */ lb $v0, 0x3e($s3) /* 81824 800E8374 3C038011 */ lui $v1, %hi(gPlayerData+0x5) @@ -201,7 +201,7 @@ glabel update_status_menu /* 81838 800E8388 86620036 */ lh $v0, 0x36($s3) /* 8183C 800E838C 28420012 */ slti $v0, $v0, 0x12 /* 81840 800E8390 1440000C */ bnez $v0, .L800E83C4 -/* 81844 800E8394 00000000 */ nop +/* 81844 800E8394 00000000 */ nop /* 81848 800E8398 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 8184C 800E839C 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 81850 800E83A0 94420134 */ lhu $v0, 0x134($v0) @@ -212,7 +212,7 @@ glabel update_status_menu /* 81864 800E83B4 0C05272D */ jal play_sound /* 81868 800E83B8 24040217 */ addiu $a0, $zero, 0x217 /* 8186C 800E83BC 0803A100 */ j .L800E8400 -/* 81870 800E83C0 00000000 */ nop +/* 81870 800E83C0 00000000 */ nop .L800E83C4: /* 81874 800E83C4 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* 81878 800E83C8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) @@ -250,7 +250,7 @@ glabel update_status_menu /* 818F0 800E8440 5460000E */ bnel $v1, $zero, .L800E847C /* 818F4 800E8444 A6620048 */ sh $v0, 0x48($s3) /* 818F8 800E8448 0803A11F */ j .L800E847C -/* 818FC 800E844C 00000000 */ nop +/* 818FC 800E844C 00000000 */ nop .L800E8450: /* 81900 800E8450 2462FFF6 */ addiu $v0, $v1, -0xa /* 81904 800E8454 A6620048 */ sh $v0, 0x48($s3) @@ -266,13 +266,13 @@ glabel update_status_menu .L800E847C: /* 8192C 800E847C 82620047 */ lb $v0, 0x47($s3) /* 81930 800E8480 14400389 */ bnez $v0, .L800E92A8 -/* 81934 800E8484 00000000 */ nop +/* 81934 800E8484 00000000 */ nop /* 81938 800E8488 82620046 */ lb $v0, 0x46($s3) /* 8193C 800E848C 1040000A */ beqz $v0, .L800E84B8 -/* 81940 800E8490 00000000 */ nop +/* 81940 800E8490 00000000 */ nop /* 81944 800E8494 8262003A */ lb $v0, 0x3a($s3) /* 81948 800E8498 10400007 */ beqz $v0, .L800E84B8 -/* 8194C 800E849C 00000000 */ nop +/* 8194C 800E849C 00000000 */ nop /* 81950 800E84A0 82220015 */ lb $v0, 0x15($s1) /* 81954 800E84A4 14400004 */ bnez $v0, .L800E84B8 /* 81958 800E84A8 2402002A */ addiu $v0, $zero, 0x2a @@ -302,7 +302,7 @@ glabel update_status_menu /* 819B0 800E8500 A6620036 */ sh $v0, 0x36($s3) /* 819B4 800E8504 8262003B */ lb $v0, 0x3b($s3) /* 819B8 800E8508 10400004 */ beqz $v0, .L800E851C -/* 819BC 800E850C 00000000 */ nop +/* 819BC 800E850C 00000000 */ nop /* 819C0 800E8510 822200B4 */ lb $v0, 0xb4($s1) /* 819C4 800E8514 54400001 */ bnel $v0, $zero, .L800E851C /* 819C8 800E8518 A6600038 */ sh $zero, 0x38($s3) @@ -319,7 +319,7 @@ glabel update_status_menu /* 819EC 800E853C 3C08ED03 */ lui $t0, 0xed03 /* 819F0 800E8540 8262003B */ lb $v0, 0x3b($s3) /* 819F4 800E8544 10400004 */ beqz $v0, .L800E8558 -/* 819F8 800E8548 00000000 */ nop +/* 819F8 800E8548 00000000 */ nop /* 819FC 800E854C 822200B4 */ lb $v0, 0xb4($s1) /* 81A00 800E8550 10400033 */ beqz $v0, .L800E8620 /* 81A04 800E8554 35080050 */ ori $t0, $t0, 0x50 @@ -352,7 +352,7 @@ glabel update_status_menu /* 81A68 800E85B8 8E220000 */ lw $v0, ($s1) /* 81A6C 800E85BC 30423000 */ andi $v0, $v0, 0x3000 /* 81A70 800E85C0 10400003 */ beqz $v0, .L800E85D0 -/* 81A74 800E85C4 00000000 */ nop +/* 81A74 800E85C4 00000000 */ nop /* 81A78 800E85C8 0803A177 */ j .L800E85DC /* 81A7C 800E85CC A6600038 */ sh $zero, 0x38($s3) .L800E85D0: @@ -448,9 +448,9 @@ glabel update_status_menu /* 81BD4 800E8724 A262004C */ sb $v0, 0x4c($s3) /* 81BD8 800E8728 00021600 */ sll $v0, $v0, 0x18 /* 81BDC 800E872C 14400003 */ bnez $v0, .L800E873C -/* 81BE0 800E8730 00000000 */ nop +/* 81BE0 800E8730 00000000 */ nop /* 81BE4 800E8734 0C03A659 */ jal status_menu_stop_blinking_hp -/* 81BE8 800E8738 00000000 */ nop +/* 81BE8 800E8738 00000000 */ nop .L800E873C: /* 81BEC 800E873C 8262004A */ lb $v0, 0x4a($s3) /* 81BF0 800E8740 1040000C */ beqz $v0, .L800E8774 @@ -469,7 +469,7 @@ glabel update_status_menu /* 81C20 800E8770 A262004B */ sb $v0, 0x4b($s3) .L800E8774: /* 81C24 800E8774 12C0001D */ beqz $s6, .L800E87EC -/* 81C28 800E8778 00000000 */ nop +/* 81C28 800E8778 00000000 */ nop /* 81C2C 800E877C 8E720000 */ lw $s2, ($s3) /* 81C30 800E8780 86650034 */ lh $a1, 0x34($s3) /* 81C34 800E8784 86660036 */ lh $a2, 0x36($s3) @@ -506,9 +506,9 @@ glabel update_status_menu /* 81CAC 800E87FC A262004F */ sb $v0, 0x4f($s3) /* 81CB0 800E8800 00021600 */ sll $v0, $v0, 0x18 /* 81CB4 800E8804 14400003 */ bnez $v0, .L800E8814 -/* 81CB8 800E8808 00000000 */ nop +/* 81CB8 800E8808 00000000 */ nop /* 81CBC 800E880C 0C03A674 */ jal status_menu_stop_blinking_fp -/* 81CC0 800E8810 00000000 */ nop +/* 81CC0 800E8810 00000000 */ nop .L800E8814: /* 81CC4 800E8814 8262004D */ lb $v0, 0x4d($s3) /* 81CC8 800E8818 1040000C */ beqz $v0, .L800E884C @@ -527,7 +527,7 @@ glabel update_status_menu /* 81CF8 800E8848 A262004E */ sb $v0, 0x4e($s3) .L800E884C: /* 81CFC 800E884C 12C0001D */ beqz $s6, .L800E88C4 -/* 81D00 800E8850 00000000 */ nop +/* 81D00 800E8850 00000000 */ nop /* 81D04 800E8854 8E720008 */ lw $s2, 8($s3) /* 81D08 800E8858 86650034 */ lh $a1, 0x34($s3) /* 81D0C 800E885C 86660036 */ lh $a2, 0x36($s3) @@ -561,7 +561,7 @@ glabel update_status_menu /* 81D78 800E88C8 8042F299 */ lb $v0, %lo(gPlayerData+0x9)($v0) /* 81D7C 800E88CC 2842001B */ slti $v0, $v0, 0x1b /* 81D80 800E88D0 14400003 */ bnez $v0, .L800E88E0 -/* 81D84 800E88D4 00000000 */ nop +/* 81D84 800E88D4 00000000 */ nop /* 81D88 800E88D8 3C018011 */ lui $at, %hi(gPlayerData+0x10) /* 81D8C 800E88DC A020F2A0 */ sb $zero, %lo(gPlayerData+0x10)($at) .L800E88E0: @@ -581,7 +581,7 @@ glabel update_status_menu /* 81DC0 800E8910 A2620053 */ sb $v0, 0x53($s3) .L800E8914: /* 81DC4 800E8914 12C0001D */ beqz $s6, .L800E898C -/* 81DC8 800E8918 00000000 */ nop +/* 81DC8 800E8918 00000000 */ nop /* 81DCC 800E891C 8E720018 */ lw $s2, 0x18($s3) /* 81DD0 800E8920 86650034 */ lh $a1, 0x34($s3) /* 81DD4 800E8924 86660036 */ lh $a2, 0x36($s3) @@ -618,9 +618,9 @@ glabel update_status_menu /* 81E4C 800E899C A2620056 */ sb $v0, 0x56($s3) /* 81E50 800E89A0 00021600 */ sll $v0, $v0, 0x18 /* 81E54 800E89A4 14400003 */ bnez $v0, .L800E89B4 -/* 81E58 800E89A8 00000000 */ nop +/* 81E58 800E89A8 00000000 */ nop /* 81E5C 800E89AC 0C03A68E */ jal status_menu_stop_blinking_coins -/* 81E60 800E89B0 00000000 */ nop +/* 81E60 800E89B0 00000000 */ nop .L800E89B4: /* 81E64 800E89B4 82620054 */ lb $v0, 0x54($s3) /* 81E68 800E89B8 1040000C */ beqz $v0, .L800E89EC @@ -639,7 +639,7 @@ glabel update_status_menu /* 81E98 800E89E8 A2620055 */ sb $v0, 0x55($s3) .L800E89EC: /* 81E9C 800E89EC 12C0001C */ beqz $s6, .L800E8A60 -/* 81EA0 800E89F0 00000000 */ nop +/* 81EA0 800E89F0 00000000 */ nop /* 81EA4 800E89F4 8E720010 */ lw $s2, 0x10($s3) /* 81EA8 800E89F8 86650034 */ lh $a1, 0x34($s3) /* 81EAC 800E89FC 86660036 */ lh $a2, 0x36($s3) @@ -675,7 +675,7 @@ glabel update_status_menu /* 81F20 800E8A70 82630051 */ lb $v1, 0x51($s3) /* 81F24 800E8A74 28620006 */ slti $v0, $v1, 6 /* 81F28 800E8A78 14400005 */ bnez $v0, .L800E8A90 -/* 81F2C 800E8A7C 00000000 */ nop +/* 81F2C 800E8A7C 00000000 */ nop /* 81F30 800E8A80 28620009 */ slti $v0, $v1, 9 /* 81F34 800E8A84 50400002 */ beql $v0, $zero, .L800E8A90 /* 81F38 800E8A88 A2600051 */ sb $zero, 0x51($s3) @@ -710,7 +710,7 @@ glabel update_status_menu /* 81F9C 800E8AEC 82630057 */ lb $v1, 0x57($s3) /* 81FA0 800E8AF0 24020001 */ addiu $v0, $zero, 1 /* 81FA4 800E8AF4 1462002B */ bne $v1, $v0, .L800E8BA4 -/* 81FA8 800E8AF8 00000000 */ nop +/* 81FA8 800E8AF8 00000000 */ nop /* 81FAC 800E8AFC 3C038011 */ lui $v1, %hi(gPlayerData+0x290) /* 81FB0 800E8B00 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 81FB4 800E8B04 04610002 */ bgez $v1, .L800E8B10 @@ -738,7 +738,7 @@ glabel update_status_menu /* 82004 800E8B54 00541021 */ addu $v0, $v0, $s4 /* 82008 800E8B58 00430018 */ mult $v0, $v1 /* 8200C 800E8B5C 44950000 */ mtc1 $s5, $f0 -/* 82010 800E8B60 00000000 */ nop +/* 82010 800E8B60 00000000 */ nop /* 82014 800E8B64 46800020 */ cvt.s.w $f0, $f0 /* 82018 800E8B68 000217C3 */ sra $v0, $v0, 0x1f /* 8201C 800E8B6C 44060000 */ mfc1 $a2, $f0 @@ -748,7 +748,7 @@ glabel update_status_menu /* 8202C 800E8B7C 00621823 */ subu $v1, $v1, $v0 /* 82030 800E8B80 03C31821 */ addu $v1, $fp, $v1 /* 82034 800E8B84 44830000 */ mtc1 $v1, $f0 -/* 82038 800E8B88 00000000 */ nop +/* 82038 800E8B88 00000000 */ nop /* 8203C 800E8B8C 46800020 */ cvt.s.w $f0, $f0 /* 82040 800E8B90 44050000 */ mfc1 $a1, $f0 /* 82044 800E8B94 0C03C32C */ jal func_800F0CB0 @@ -867,7 +867,7 @@ glabel update_status_menu /* 821D8 800E8D28 26100001 */ addiu $s0, $s0, 1 /* 821DC 800E8D2C 8FA90054 */ lw $t1, 0x54($sp) /* 821E0 800E8D30 112000B9 */ beqz $t1, .L800E9018 -/* 821E4 800E8D34 00000000 */ nop +/* 821E4 800E8D34 00000000 */ nop /* 821E8 800E8D38 26100001 */ addiu $s0, $s0, 1 .L800E8D3C: /* 821EC 800E8D3C 0240202D */ daddu $a0, $s2, $zero @@ -895,7 +895,7 @@ glabel update_status_menu /* 82244 800E8D94 26100001 */ addiu $s0, $s0, 1 /* 82248 800E8D98 8FA90054 */ lw $t1, 0x54($sp) /* 8224C 800E8D9C 1120009E */ beqz $t1, .L800E9018 -/* 82250 800E8DA0 00000000 */ nop +/* 82250 800E8DA0 00000000 */ nop /* 82254 800E8DA4 26100001 */ addiu $s0, $s0, 1 .L800E8DA8: /* 82258 800E8DA8 0240202D */ daddu $a0, $s2, $zero @@ -917,7 +917,7 @@ glabel update_status_menu /* 82298 800E8DE8 26100001 */ addiu $s0, $s0, 1 /* 8229C 800E8DEC 8FA90054 */ lw $t1, 0x54($sp) /* 822A0 800E8DF0 11200089 */ beqz $t1, .L800E9018 -/* 822A4 800E8DF4 00000000 */ nop +/* 822A4 800E8DF4 00000000 */ nop /* 822A8 800E8DF8 26100001 */ addiu $s0, $s0, 1 .L800E8DFC: /* 822AC 800E8DFC 0240202D */ daddu $a0, $s2, $zero @@ -939,7 +939,7 @@ glabel update_status_menu /* 822EC 800E8E3C 26100001 */ addiu $s0, $s0, 1 /* 822F0 800E8E40 8FA90054 */ lw $t1, 0x54($sp) /* 822F4 800E8E44 11200074 */ beqz $t1, .L800E9018 -/* 822F8 800E8E48 00000000 */ nop +/* 822F8 800E8E48 00000000 */ nop /* 822FC 800E8E4C 26100001 */ addiu $s0, $s0, 1 .L800E8E50: /* 82300 800E8E50 0240202D */ daddu $a0, $s2, $zero @@ -961,7 +961,7 @@ glabel update_status_menu /* 82340 800E8E90 26100001 */ addiu $s0, $s0, 1 /* 82344 800E8E94 8FA90054 */ lw $t1, 0x54($sp) /* 82348 800E8E98 1120005F */ beqz $t1, .L800E9018 -/* 8234C 800E8E9C 00000000 */ nop +/* 8234C 800E8E9C 00000000 */ nop /* 82350 800E8EA0 26100001 */ addiu $s0, $s0, 1 .L800E8EA4: /* 82354 800E8EA4 0240202D */ daddu $a0, $s2, $zero @@ -983,7 +983,7 @@ glabel update_status_menu /* 82394 800E8EE4 26100001 */ addiu $s0, $s0, 1 /* 82398 800E8EE8 8FA90054 */ lw $t1, 0x54($sp) /* 8239C 800E8EEC 1120004A */ beqz $t1, .L800E9018 -/* 823A0 800E8EF0 00000000 */ nop +/* 823A0 800E8EF0 00000000 */ nop /* 823A4 800E8EF4 26100001 */ addiu $s0, $s0, 1 .L800E8EF8: /* 823A8 800E8EF8 0240202D */ daddu $a0, $s2, $zero @@ -1005,7 +1005,7 @@ glabel update_status_menu /* 823E8 800E8F38 26100001 */ addiu $s0, $s0, 1 /* 823EC 800E8F3C 8FA90054 */ lw $t1, 0x54($sp) /* 823F0 800E8F40 11200035 */ beqz $t1, .L800E9018 -/* 823F4 800E8F44 00000000 */ nop +/* 823F4 800E8F44 00000000 */ nop /* 823F8 800E8F48 26100001 */ addiu $s0, $s0, 1 .L800E8F4C: /* 823FC 800E8F4C 0240202D */ daddu $a0, $s2, $zero @@ -1027,7 +1027,7 @@ glabel update_status_menu /* 8243C 800E8F8C 26100001 */ addiu $s0, $s0, 1 /* 82440 800E8F90 8FA90054 */ lw $t1, 0x54($sp) /* 82444 800E8F94 11200020 */ beqz $t1, .L800E9018 -/* 82448 800E8F98 00000000 */ nop +/* 82448 800E8F98 00000000 */ nop /* 8244C 800E8F9C 26100001 */ addiu $s0, $s0, 1 .L800E8FA0: /* 82450 800E8FA0 0240202D */ daddu $a0, $s2, $zero @@ -1059,7 +1059,7 @@ glabel update_status_menu /* 824B8 800E9008 0214102A */ slt $v0, $s0, $s4 /* 824BC 800E900C 8FA90054 */ lw $t1, 0x54($sp) /* 824C0 800E9010 1520FF41 */ bnez $t1, .L800E8D18 -/* 824C4 800E9014 00000000 */ nop +/* 824C4 800E9014 00000000 */ nop .L800E9018: /* 824C8 800E9018 3C16800F */ lui $s6, %hi(D_800F7FE8) /* 824CC 800E901C 26D67FE8 */ addiu $s6, $s6, %lo(D_800F7FE8) @@ -1075,7 +1075,7 @@ glabel update_status_menu .L800E9044: /* 824F4 800E9044 0214102A */ slt $v0, $s0, $s4 /* 824F8 800E9048 10400093 */ beqz $v0, .L800E9298 -/* 824FC 800E904C 00000000 */ nop +/* 824FC 800E904C 00000000 */ nop /* 82500 800E9050 16200012 */ bnez $s1, .L800E909C /* 82504 800E9054 24020001 */ addiu $v0, $zero, 1 /* 82508 800E9058 26100001 */ addiu $s0, $s0, 1 @@ -1232,9 +1232,9 @@ glabel update_status_menu /* 82744 800E9294 26730014 */ addiu $s3, $s3, 0x14 .L800E9298: /* 82748 800E9298 0C03C360 */ jal func_800F0D80 -/* 8274C 800E929C 00000000 */ nop +/* 8274C 800E929C 00000000 */ nop /* 82750 800E92A0 0C03C40B */ jal func_800F102C -/* 82754 800E92A4 00000000 */ nop +/* 82754 800E92A4 00000000 */ nop .L800E92A8: /* 82758 800E92A8 8FBF008C */ lw $ra, 0x8c($sp) /* 8275C 800E92AC 8FBE0088 */ lw $fp, 0x88($sp) diff --git a/asm/nonmatchings/code_838b0_len_5900/clear_partner_move_history.s b/asm/nonmatchings/code_838b0_len_5900/clear_partner_move_history.s index 6056a873bb..76824f28df 100644 --- a/asm/nonmatchings/code_838b0_len_5900/clear_partner_move_history.s +++ b/asm/nonmatchings/code_838b0_len_5900/clear_partner_move_history.s @@ -35,4 +35,4 @@ glabel clear_partner_move_history /* 88980 800EF4D0 1440FFF5 */ bnez $v0, .L800EF4A8 /* 88984 800EF4D4 24A50010 */ addiu $a1, $a1, 0x10 /* 88988 800EF4D8 03E00008 */ jr $ra -/* 8898C 800EF4DC 00000000 */ nop +/* 8898C 800EF4DC 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/enable_partner_ai.s b/asm/nonmatchings/code_838b0_len_5900/enable_partner_ai.s index 66b011e0fa..b0ddacbb22 100644 --- a/asm/nonmatchings/code_838b0_len_5900/enable_partner_ai.s +++ b/asm/nonmatchings/code_838b0_len_5900/enable_partner_ai.s @@ -11,17 +11,17 @@ glabel enable_partner_ai /* 887F0 800EF340 3C018011 */ lui $at, %hi(D_8010CFC8) /* 887F4 800EF344 A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) /* 887F8 800EF348 0C03BD17 */ jal clear_partner_move_history -/* 887FC 800EF34C 00000000 */ nop +/* 887FC 800EF34C 00000000 */ nop /* 88800 800EF350 3C028011 */ lui $v0, %hi(D_8010CFEC) /* 88804 800EF354 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) /* 88808 800EF358 8C42000C */ lw $v0, 0xc($v0) /* 8880C 800EF35C 14400006 */ bnez $v0, .L800EF378 -/* 88810 800EF360 00000000 */ nop +/* 88810 800EF360 00000000 */ nop /* 88814 800EF364 8E040000 */ lw $a0, ($s0) /* 88818 800EF368 0C03AE2A */ jal enable_partner_walking /* 8881C 800EF36C 0000282D */ daddu $a1, $zero, $zero /* 88820 800EF370 0803BCE1 */ j .L800EF384 -/* 88824 800EF374 00000000 */ nop +/* 88824 800EF374 00000000 */ nop .L800EF378: /* 88828 800EF378 8E040000 */ lw $a0, ($s0) /* 8882C 800EF37C 0C03B4C4 */ jal enable_partner_flying diff --git a/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s b/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s index d0d0c1eac0..30b50859af 100644 --- a/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s +++ b/asm/nonmatchings/code_838b0_len_5900/enable_partner_flying.s @@ -43,11 +43,11 @@ glabel enable_partner_flying /* 86854 800ED3A4 3C018011 */ lui $at, %hi(D_8010CFBC) /* 86858 800ED3A8 AC20CFBC */ sw $zero, %lo(D_8010CFBC)($at) /* 8685C 800ED3AC 14A00005 */ bnez $a1, .L800ED3C4 -/* 86860 800ED3B0 00000000 */ nop +/* 86860 800ED3B0 00000000 */ nop /* 86864 800ED3B4 3C018011 */ lui $at, %hi(D_8010CFC8) /* 86868 800ED3B8 A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) /* 8686C 800ED3BC 0803B50B */ j .L800ED42C -/* 86870 800ED3C0 00000000 */ nop +/* 86870 800ED3C0 00000000 */ nop .L800ED3C4: /* 86874 800ED3C4 3C048011 */ lui $a0, %hi(D_8010CFC4) /* 86878 800ED3C8 2484CFC4 */ addiu $a0, $a0, %lo(D_8010CFC4) @@ -61,7 +61,7 @@ glabel enable_partner_flying /* 86898 800ED3E8 3C018011 */ lui $at, %hi(D_8010CFCA) /* 8689C 800ED3EC A422CFCA */ sh $v0, %lo(D_8010CFCA)($at) /* 868A0 800ED3F0 0803B50D */ j .L800ED434 -/* 868A4 800ED3F4 00000000 */ nop +/* 868A4 800ED3F4 00000000 */ nop .L800ED3F8: /* 868A8 800ED3F8 10620003 */ beq $v1, $v0, .L800ED408 /* 868AC 800ED3FC 24020003 */ addiu $v0, $zero, 3 @@ -72,7 +72,7 @@ glabel enable_partner_flying /* 868BC 800ED40C 3C018011 */ lui $at, %hi(D_8010CFC8) /* 868C0 800ED410 A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) /* 868C4 800ED414 0803B50B */ j .L800ED42C -/* 868C8 800ED418 00000000 */ nop +/* 868C8 800ED418 00000000 */ nop .L800ED41C: /* 868CC 800ED41C 14620005 */ bne $v1, $v0, .L800ED434 /* 868D0 800ED420 24020032 */ addiu $v0, $zero, 0x32 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA4B0.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA4B0.s index 2e4fc0cf6e..84a129a60a 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA4B0.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA4B0.s @@ -8,9 +8,9 @@ glabel func_800EA4B0 /* 8396C 800EA4BC 24030001 */ addiu $v1, $zero, 1 /* 83970 800EA4C0 30824000 */ andi $v0, $a0, 0x4000 /* 83974 800EA4C4 1040000F */ beqz $v0, .L800EA504 -/* 83978 800EA4C8 00000000 */ nop +/* 83978 800EA4C8 00000000 */ nop /* 8397C 800EA4CC 0C0441A9 */ jal get_entity_type -/* 83980 800EA4D0 00000000 */ nop +/* 83980 800EA4D0 00000000 */ nop /* 83984 800EA4D4 2443FFF9 */ addiu $v1, $v0, -7 /* 83988 800EA4D8 2C620036 */ sltiu $v0, $v1, 0x36 /* 8398C 800EA4DC 10400008 */ beqz $v0, .L800EA500 @@ -19,7 +19,7 @@ glabel func_800EA4B0 /* 83998 800EA4E8 00220821 */ addu $at, $at, $v0 /* 8399C 800EA4EC 8C22C040 */ lw $v0, %lo(D_8010C040)($at) /* 839A0 800EA4F0 00400008 */ jr $v0 -/* 839A4 800EA4F4 00000000 */ nop +/* 839A4 800EA4F4 00000000 */ nop /* 839A8 800EA4F8 0803A941 */ j .L800EA504 /* 839AC 800EA4FC 0000182D */ daddu $v1, $zero, $zero .L800EA500: diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA52C.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA52C.s index 5085b5d072..224469d974 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA52C.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA52C.s @@ -32,7 +32,7 @@ glabel func_800EA52C /* 83A3C 800EA58C 24020002 */ addiu $v0, $zero, 2 .L800EA590: /* 83A40 800EA590 14620002 */ bne $v1, $v0, .L800EA59C -/* 83A44 800EA594 00000000 */ nop +/* 83A44 800EA594 00000000 */ nop .L800EA598: /* 83A48 800EA598 24050001 */ addiu $a1, $zero, 1 .L800EA59C: diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s index 28d99fe12b..99eb05739e 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA5D0.s @@ -32,7 +32,7 @@ glabel func_800EA5D0 /* 83AEC 800EA63C 3C018011 */ lui $at, %hi(D_8010CFD0) /* 83AF0 800EA640 AC24CFD0 */ sw $a0, %lo(D_8010CFD0)($at) /* 83AF4 800EA644 0C00E2B7 */ jal get_npc_by_index -/* 83AF8 800EA648 00000000 */ nop +/* 83AF8 800EA648 00000000 */ nop /* 83AFC 800EA64C 3C048011 */ lui $a0, %hi(D_8010C930) /* 83B00 800EA650 2484C930 */ addiu $a0, $a0, %lo(D_8010C930) /* 83B04 800EA654 2403FFFC */ addiu $v1, $zero, -4 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA6A8.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA6A8.s index a1cd3455eb..ac44bb4191 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA6A8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA6A8.s @@ -7,7 +7,7 @@ glabel func_800EA6A8 /* 83B60 800EA6B0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 83B64 800EA6B4 AFBF0010 */ sw $ra, 0x10($sp) /* 83B68 800EA6B8 0C00E228 */ jal free_npc_by_index -/* 83B6C 800EA6BC 00000000 */ nop +/* 83B6C 800EA6BC 00000000 */ nop /* 83B70 800EA6C0 8FBF0010 */ lw $ra, 0x10($sp) /* 83B74 800EA6C4 03E00008 */ jr $ra /* 83B78 800EA6C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s b/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s index 3bf4902b2d..4b59a0107e 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EA6CC.s @@ -71,7 +71,7 @@ glabel func_800EA6CC /* 83C78 800EA7C8 2463CFE8 */ addiu $v1, $v1, %lo(D_8010CFE8) /* 83C7C 800EA7CC 8C620000 */ lw $v0, ($v1) /* 83C80 800EA7D0 10400006 */ beqz $v0, .L800EA7EC -/* 83C84 800EA7D4 00000000 */ nop +/* 83C84 800EA7D4 00000000 */ nop /* 83C88 800EA7D8 3C018011 */ lui $at, %hi(D_8010CD30) /* 83C8C 800EA7DC AC22CD30 */ sw $v0, %lo(D_8010CD30)($at) /* 83C90 800EA7E0 3C018011 */ lui $at, %hi(D_8010CD34) @@ -98,7 +98,7 @@ glabel func_800EA6CC /* 83CDC 800EA82C 00220821 */ addu $at, $at, $v0 /* 83CE0 800EA830 8C22C118 */ lw $v0, %lo(D_8010C118)($at) /* 83CE4 800EA834 00400008 */ jr $v0 -/* 83CE8 800EA838 00000000 */ nop +/* 83CE8 800EA838 00000000 */ nop /* 83CEC 800EA83C 24040003 */ addiu $a0, $zero, 3 /* 83CF0 800EA840 3C118011 */ lui $s1, %hi(D_8010CD34) /* 83CF4 800EA844 2631CD34 */ addiu $s1, $s1, %lo(D_8010CD34) @@ -111,19 +111,19 @@ glabel func_800EA6CC /* 83D10 800EA860 50400005 */ beql $v0, $zero, .L800EA878 /* 83D14 800EA864 24020002 */ addiu $v0, $zero, 2 /* 83D18 800EA868 10600009 */ beqz $v1, .L800EA890 -/* 83D1C 800EA86C 00000000 */ nop +/* 83D1C 800EA86C 00000000 */ nop /* 83D20 800EA870 0803AC53 */ j .L800EB14C -/* 83D24 800EA874 00000000 */ nop +/* 83D24 800EA874 00000000 */ nop .L800EA878: /* 83D28 800EA878 1062003F */ beq $v1, $v0, .L800EA978 -/* 83D2C 800EA87C 00000000 */ nop +/* 83D2C 800EA87C 00000000 */ nop /* 83D30 800EA880 10640056 */ beq $v1, $a0, .L800EA9DC -/* 83D34 800EA884 00000000 */ nop +/* 83D34 800EA884 00000000 */ nop /* 83D38 800EA888 0803AC53 */ j .L800EB14C -/* 83D3C 800EA88C 00000000 */ nop +/* 83D3C 800EA88C 00000000 */ nop .L800EA890: /* 83D40 800EA890 0C03805E */ jal disable_player_input -/* 83D44 800EA894 00000000 */ nop +/* 83D44 800EA894 00000000 */ nop /* 83D48 800EA898 0C05272D */ jal play_sound /* 83D4C 800EA89C 2404000D */ addiu $a0, $zero, 0xd /* 83D50 800EA8A0 3C108011 */ lui $s0, %hi(D_8010CFDC) @@ -151,18 +151,18 @@ glabel func_800EA6CC /* 83DA8 800EA8F8 0C009C22 */ jal func_80027088 /* 83DAC 800EA8FC AE230000 */ sw $v1, ($s1) /* 83DB0 800EA900 0803AC53 */ j .L800EB14C -/* 83DB4 800EA904 00000000 */ nop +/* 83DB4 800EA904 00000000 */ nop .L800EA908: /* 83DB8 800EA908 3C048011 */ lui $a0, %hi(D_8010CFDC) /* 83DBC 800EA90C 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) /* 83DC0 800EA910 0C0B1059 */ jal does_script_exist -/* 83DC4 800EA914 00000000 */ nop +/* 83DC4 800EA914 00000000 */ nop /* 83DC8 800EA918 1440020C */ bnez $v0, .L800EB14C -/* 83DCC 800EA91C 00000000 */ nop +/* 83DCC 800EA91C 00000000 */ nop /* 83DD0 800EA920 0C009C22 */ jal func_80027088 /* 83DD4 800EA924 0000202D */ daddu $a0, $zero, $zero /* 83DD8 800EA928 0C03A9AA */ jal func_800EA6A8 -/* 83DDC 800EA92C 00000000 */ nop +/* 83DDC 800EA92C 00000000 */ nop /* 83DE0 800EA930 3C028011 */ lui $v0, %hi(D_8010CFE4) /* 83DE4 800EA934 8C42CFE4 */ lw $v0, %lo(D_8010CFE4)($v0) /* 83DE8 800EA938 3C018011 */ lui $at, %hi(D_8010CFD8) @@ -177,7 +177,7 @@ glabel func_800EA6CC /* 83E0C 800EA95C 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* 83E10 800EA960 8C420010 */ lw $v0, 0x10($v0) /* 83E14 800EA964 0040F809 */ jalr $v0 -/* 83E18 800EA968 00000000 */ nop +/* 83E18 800EA968 00000000 */ nop /* 83E1C 800EA96C 8E220000 */ lw $v0, ($s1) /* 83E20 800EA970 24420001 */ addiu $v0, $v0, 1 /* 83E24 800EA974 AE220000 */ sw $v0, ($s1) @@ -206,7 +206,7 @@ glabel func_800EA6CC /* 83E7C 800EA9CC 0C009C22 */ jal func_80027088 /* 83E80 800EA9D0 ACA30000 */ sw $v1, ($a1) /* 83E84 800EA9D4 0803AC53 */ j .L800EB14C -/* 83E88 800EA9D8 00000000 */ nop +/* 83E88 800EA9D8 00000000 */ nop .L800EA9DC: /* 83E8C 800EA9DC 3C108011 */ lui $s0, %hi(D_8010CFDC) /* 83E90 800EA9E0 2610CFDC */ addiu $s0, $s0, %lo(D_8010CFDC) @@ -234,7 +234,7 @@ glabel func_800EA6CC /* 83EE8 800EAA38 0C009C22 */ jal func_80027088 /* 83EEC 800EAA3C 0000202D */ daddu $a0, $zero, $zero /* 83EF0 800EAA40 0803AC53 */ j .L800EB14C -/* 83EF4 800EAA44 00000000 */ nop +/* 83EF4 800EAA44 00000000 */ nop /* 83EF8 800EAA48 24040003 */ addiu $a0, $zero, 3 /* 83EFC 800EAA4C 3C108011 */ lui $s0, %hi(D_8010CD34) /* 83F00 800EAA50 2610CD34 */ addiu $s0, $s0, %lo(D_8010CD34) @@ -247,27 +247,27 @@ glabel func_800EA6CC /* 83F1C 800EAA6C 50400005 */ beql $v0, $zero, .L800EAA84 /* 83F20 800EAA70 24020002 */ addiu $v0, $zero, 2 /* 83F24 800EAA74 10600009 */ beqz $v1, .L800EAA9C -/* 83F28 800EAA78 00000000 */ nop +/* 83F28 800EAA78 00000000 */ nop /* 83F2C 800EAA7C 0803AC53 */ j .L800EB14C -/* 83F30 800EAA80 00000000 */ nop +/* 83F30 800EAA80 00000000 */ nop .L800EAA84: /* 83F34 800EAA84 10620170 */ beq $v1, $v0, .L800EB048 -/* 83F38 800EAA88 00000000 */ nop +/* 83F38 800EAA88 00000000 */ nop /* 83F3C 800EAA8C 1064002E */ beq $v1, $a0, .L800EAB48 /* 83F40 800EAA90 24050014 */ addiu $a1, $zero, 0x14 /* 83F44 800EAA94 0803AC53 */ j .L800EB14C -/* 83F48 800EAA98 00000000 */ nop +/* 83F48 800EAA98 00000000 */ nop .L800EAA9C: /* 83F4C 800EAA9C 3C048011 */ lui $a0, %hi(D_8010CFDC) /* 83F50 800EAAA0 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) /* 83F54 800EAAA4 0C0B102B */ jal kill_script_by_ID -/* 83F58 800EAAA8 00000000 */ nop +/* 83F58 800EAAA8 00000000 */ nop /* 83F5C 800EAAAC 8E020000 */ lw $v0, ($s0) /* 83F60 800EAAB0 24420001 */ addiu $v0, $v0, 1 /* 83F64 800EAAB4 AE020000 */ sw $v0, ($s0) .L800EAAB8: /* 83F68 800EAAB8 0C03A9AA */ jal func_800EA6A8 -/* 83F6C 800EAABC 00000000 */ nop +/* 83F6C 800EAABC 00000000 */ nop /* 83F70 800EAAC0 3C028011 */ lui $v0, %hi(D_8010CFE4) /* 83F74 800EAAC4 8C42CFE4 */ lw $v0, %lo(D_8010CFE4)($v0) /* 83F78 800EAAC8 3C018011 */ lui $at, %hi(D_8010CFD8) @@ -295,7 +295,7 @@ glabel func_800EA6CC /* 83FD0 800EAB20 E480005C */ swc1 $f0, 0x5c($a0) /* 83FD4 800EAB24 8C420010 */ lw $v0, 0x10($v0) /* 83FD8 800EAB28 0040F809 */ jalr $v0 -/* 83FDC 800EAB2C 00000000 */ nop +/* 83FDC 800EAB2C 00000000 */ nop /* 83FE0 800EAB30 3C038011 */ lui $v1, %hi(D_8010CD34) /* 83FE4 800EAB34 2463CD34 */ addiu $v1, $v1, %lo(D_8010CD34) /* 83FE8 800EAB38 8C620000 */ lw $v0, ($v1) @@ -327,12 +327,12 @@ glabel func_800EA6CC /* 8404C 800EAB9C 12000005 */ beqz $s0, .L800EABB4 /* 84050 800EABA0 24020001 */ addiu $v0, $zero, 1 /* 84054 800EABA4 12020010 */ beq $s0, $v0, .L800EABE8 -/* 84058 800EABA8 00000000 */ nop +/* 84058 800EABA8 00000000 */ nop /* 8405C 800EABAC 0803AC53 */ j .L800EB14C -/* 84060 800EABB0 00000000 */ nop +/* 84060 800EABB0 00000000 */ nop .L800EABB4: /* 84064 800EABB4 0C03805E */ jal disable_player_input -/* 84068 800EABB8 00000000 */ nop +/* 84068 800EABB8 00000000 */ nop /* 8406C 800EABBC 0C05272D */ jal play_sound /* 84070 800EABC0 2404000D */ addiu $a0, $zero, 0xd /* 84074 800EABC4 3C108011 */ lui $s0, %hi(D_8010CFDC) @@ -348,11 +348,11 @@ glabel func_800EA6CC /* 84098 800EABE8 3C048011 */ lui $a0, %hi(D_8010CFDC) /* 8409C 800EABEC 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) /* 840A0 800EABF0 0C0B1059 */ jal does_script_exist -/* 840A4 800EABF4 00000000 */ nop +/* 840A4 800EABF4 00000000 */ nop /* 840A8 800EABF8 14400154 */ bnez $v0, .L800EB14C -/* 840AC 800EABFC 00000000 */ nop +/* 840AC 800EABFC 00000000 */ nop /* 840B0 800EAC00 0C03A9AA */ jal func_800EA6A8 -/* 840B4 800EAC04 00000000 */ nop +/* 840B4 800EAC04 00000000 */ nop /* 840B8 800EAC08 3C028011 */ lui $v0, %hi(D_8010CFE4) /* 840BC 800EAC0C 8C42CFE4 */ lw $v0, %lo(D_8010CFE4)($v0) /* 840C0 800EAC10 3C018011 */ lui $at, %hi(D_8010CD30) @@ -362,17 +362,17 @@ glabel func_800EA6CC /* 840D0 800EAC20 0C038069 */ jal enable_player_input /* 840D4 800EAC24 A2620012 */ sb $v0, 0x12($s3) /* 840D8 800EAC28 0803AC53 */ j .L800EB14C -/* 840DC 800EAC2C 00000000 */ nop +/* 840DC 800EAC2C 00000000 */ nop /* 840E0 800EAC30 3C028011 */ lui $v0, %hi(D_8010CD34) /* 840E4 800EAC34 8C42CD34 */ lw $v0, %lo(D_8010CD34)($v0) /* 840E8 800EAC38 14400144 */ bnez $v0, .L800EB14C -/* 840EC 800EAC3C 00000000 */ nop +/* 840EC 800EAC3C 00000000 */ nop /* 840F0 800EAC40 3C048011 */ lui $a0, %hi(D_8010CFDC) /* 840F4 800EAC44 8C84CFDC */ lw $a0, %lo(D_8010CFDC)($a0) /* 840F8 800EAC48 0C0B102B */ jal kill_script_by_ID -/* 840FC 800EAC4C 00000000 */ nop +/* 840FC 800EAC4C 00000000 */ nop /* 84100 800EAC50 0C03A9AA */ jal func_800EA6A8 -/* 84104 800EAC54 00000000 */ nop +/* 84104 800EAC54 00000000 */ nop /* 84108 800EAC58 3C038011 */ lui $v1, %hi(D_8010CFE4) /* 8410C 800EAC5C 8C63CFE4 */ lw $v1, %lo(D_8010CFE4)($v1) /* 84110 800EAC60 24020001 */ addiu $v0, $zero, 1 @@ -391,17 +391,17 @@ glabel func_800EA6CC /* 84144 800EAC94 50400005 */ beql $v0, $zero, .L800EACAC /* 84148 800EAC98 24020002 */ addiu $v0, $zero, 2 /* 8414C 800EAC9C 10600007 */ beqz $v1, .L800EACBC -/* 84150 800EACA0 00000000 */ nop +/* 84150 800EACA0 00000000 */ nop /* 84154 800EACA4 0803AC53 */ j .L800EB14C -/* 84158 800EACA8 00000000 */ nop +/* 84158 800EACA8 00000000 */ nop .L800EACAC: /* 8415C 800EACAC 1062002B */ beq $v1, $v0, .L800EAD5C -/* 84160 800EACB0 00000000 */ nop +/* 84160 800EACB0 00000000 */ nop /* 84164 800EACB4 0803AC53 */ j .L800EB14C -/* 84168 800EACB8 00000000 */ nop +/* 84168 800EACB8 00000000 */ nop .L800EACBC: /* 8416C 800EACBC 0C03805E */ jal disable_player_input -/* 84170 800EACC0 00000000 */ nop +/* 84170 800EACC0 00000000 */ nop /* 84174 800EACC4 3C028011 */ lui $v0, %hi(D_8010CFE4) /* 84178 800EACC8 8C42CFE4 */ lw $v0, %lo(D_8010CFE4)($v0) /* 8417C 800EACCC 3C018011 */ lui $at, %hi(D_8010CFD8) @@ -414,7 +414,7 @@ glabel func_800EA6CC /* 84198 800EACE8 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* 8419C 800EACEC 8C420010 */ lw $v0, 0x10($v0) /* 841A0 800EACF0 0040F809 */ jalr $v0 -/* 841A4 800EACF4 00000000 */ nop +/* 841A4 800EACF4 00000000 */ nop /* 841A8 800EACF8 8E020000 */ lw $v0, ($s0) /* 841AC 800EACFC 24420001 */ addiu $v0, $v0, 1 /* 841B0 800EAD00 AE020000 */ sw $v0, ($s0) @@ -466,7 +466,7 @@ glabel func_800EA6CC /* 84260 800EADB0 0C038069 */ jal enable_player_input /* 84264 800EADB4 AC31CD30 */ sw $s1, %lo(D_8010CD30)($at) /* 84268 800EADB8 0803AC53 */ j .L800EB14C -/* 8426C 800EADBC 00000000 */ nop +/* 8426C 800EADBC 00000000 */ nop /* 84270 800EADC0 3C118011 */ lui $s1, %hi(D_8010CD34) /* 84274 800EADC4 2631CD34 */ addiu $s1, $s1, %lo(D_8010CD34) /* 84278 800EADC8 8E300000 */ lw $s0, ($s1) @@ -478,10 +478,10 @@ glabel func_800EA6CC /* 84290 800EADE0 12020025 */ beq $s0, $v0, .L800EAE78 /* 84294 800EADE4 24050014 */ addiu $a1, $zero, 0x14 /* 84298 800EADE8 0803AC53 */ j .L800EB14C -/* 8429C 800EADEC 00000000 */ nop +/* 8429C 800EADEC 00000000 */ nop .L800EADF0: /* 842A0 800EADF0 0C03805E */ jal disable_player_input -/* 842A4 800EADF4 00000000 */ nop +/* 842A4 800EADF4 00000000 */ nop /* 842A8 800EADF8 3C028011 */ lui $v0, %hi(D_8010CFE4) /* 842AC 800EADFC 8C42CFE4 */ lw $v0, %lo(D_8010CFE4)($v0) /* 842B0 800EAE00 3C018011 */ lui $at, %hi(D_8010CFD8) @@ -509,7 +509,7 @@ glabel func_800EA6CC /* 84308 800EAE58 E480005C */ swc1 $f0, 0x5c($a0) /* 8430C 800EAE5C 8C420010 */ lw $v0, 0x10($v0) /* 84310 800EAE60 0040F809 */ jalr $v0 -/* 84314 800EAE64 00000000 */ nop +/* 84314 800EAE64 00000000 */ nop /* 84318 800EAE68 8E220000 */ lw $v0, ($s1) /* 8431C 800EAE6C 24420001 */ addiu $v0, $v0, 1 /* 84320 800EAE70 0803AC53 */ j .L800EB14C @@ -545,16 +545,16 @@ glabel func_800EA6CC /* 84394 800EAEE4 0C038069 */ jal enable_player_input /* 84398 800EAEE8 AC620028 */ sw $v0, 0x28($v1) /* 8439C 800EAEEC 0803AC53 */ j .L800EB14C -/* 843A0 800EAEF0 00000000 */ nop +/* 843A0 800EAEF0 00000000 */ nop /* 843A4 800EAEF4 3C118011 */ lui $s1, %hi(D_8010CD34) /* 843A8 800EAEF8 2631CD34 */ addiu $s1, $s1, %lo(D_8010CD34) /* 843AC 800EAEFC 8E300000 */ lw $s0, ($s1) /* 843B0 800EAF00 12000005 */ beqz $s0, .L800EAF18 /* 843B4 800EAF04 24020001 */ addiu $v0, $zero, 1 /* 843B8 800EAF08 1202001A */ beq $s0, $v0, .L800EAF74 -/* 843BC 800EAF0C 00000000 */ nop +/* 843BC 800EAF0C 00000000 */ nop /* 843C0 800EAF10 0803AC53 */ j .L800EB14C -/* 843C4 800EAF14 00000000 */ nop +/* 843C4 800EAF14 00000000 */ nop .L800EAF18: /* 843C8 800EAF18 3C108011 */ lui $s0, %hi(D_8010CFDC) /* 843CC 800EAF1C 2610CFDC */ addiu $s0, $s0, %lo(D_8010CFDC) @@ -615,24 +615,24 @@ glabel func_800EA6CC /* 844A0 800EAFF0 50400005 */ beql $v0, $zero, .L800EB008 /* 844A4 800EAFF4 24020002 */ addiu $v0, $zero, 2 /* 844A8 800EAFF8 10600007 */ beqz $v1, .L800EB018 -/* 844AC 800EAFFC 00000000 */ nop +/* 844AC 800EAFFC 00000000 */ nop /* 844B0 800EB000 0803AC53 */ j .L800EB14C -/* 844B4 800EB004 00000000 */ nop +/* 844B4 800EB004 00000000 */ nop .L800EB008: /* 844B8 800EB008 10620015 */ beq $v1, $v0, .L800EB060 -/* 844BC 800EB00C 00000000 */ nop +/* 844BC 800EB00C 00000000 */ nop /* 844C0 800EB010 0803AC53 */ j .L800EB14C -/* 844C4 800EB014 00000000 */ nop +/* 844C4 800EB014 00000000 */ nop .L800EB018: /* 844C8 800EB018 0C03805E */ jal disable_player_input -/* 844CC 800EB01C 00000000 */ nop +/* 844CC 800EB01C 00000000 */ nop /* 844D0 800EB020 3C028011 */ lui $v0, %hi(D_8010CFEC) /* 844D4 800EB024 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) /* 844D8 800EB028 3C048011 */ lui $a0, %hi(D_8010C930) /* 844DC 800EB02C 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* 844E0 800EB030 8C420010 */ lw $v0, 0x10($v0) /* 844E4 800EB034 0040F809 */ jalr $v0 -/* 844E8 800EB038 00000000 */ nop +/* 844E8 800EB038 00000000 */ nop /* 844EC 800EB03C 8E020000 */ lw $v0, ($s0) /* 844F0 800EB040 24420001 */ addiu $v0, $v0, 1 /* 844F4 800EB044 AE020000 */ sw $v0, ($s0) @@ -674,7 +674,7 @@ glabel func_800EA6CC /* 84578 800EB0C8 A0430004 */ sb $v1, 4($v0) .L800EB0CC: /* 8457C 800EB0CC 0C038069 */ jal enable_player_input -/* 84580 800EB0D0 00000000 */ nop +/* 84580 800EB0D0 00000000 */ nop /* 84584 800EB0D4 3C018011 */ lui $at, %hi(D_8010CD30) /* 84588 800EB0D8 0803AC53 */ j .L800EB14C /* 8458C 800EB0DC AC31CD30 */ sw $s1, %lo(D_8010CD30)($at) @@ -682,13 +682,13 @@ glabel func_800EA6CC /* 84594 800EB0E4 2610CD34 */ addiu $s0, $s0, %lo(D_8010CD34) /* 84598 800EB0E8 8E020000 */ lw $v0, ($s0) /* 8459C 800EB0EC 14400017 */ bnez $v0, .L800EB14C -/* 845A0 800EB0F0 00000000 */ nop +/* 845A0 800EB0F0 00000000 */ nop /* 845A4 800EB0F4 3C118011 */ lui $s1, %hi(D_8010CFDC) /* 845A8 800EB0F8 2631CFDC */ addiu $s1, $s1, %lo(D_8010CFDC) /* 845AC 800EB0FC 0C0B1059 */ jal does_script_exist /* 845B0 800EB100 8E240000 */ lw $a0, ($s1) /* 845B4 800EB104 10400003 */ beqz $v0, .L800EB114 -/* 845B8 800EB108 00000000 */ nop +/* 845B8 800EB108 00000000 */ nop /* 845BC 800EB10C 0C0B102B */ jal kill_script_by_ID /* 845C0 800EB110 8E240000 */ lw $a0, ($s1) .L800EB114: diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB168.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB168.s index f663d3aa76..3ace714dce 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB168.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB168.s @@ -13,7 +13,7 @@ glabel func_800EB168 /* 84638 800EB188 3C018011 */ lui $at, %hi(D_8010CFE4) /* 8463C 800EB18C AC24CFE4 */ sw $a0, %lo(D_8010CFE4)($at) /* 84640 800EB190 10600008 */ beqz $v1, .L800EB1B4 -/* 84644 800EB194 00000000 */ nop +/* 84644 800EB194 00000000 */ nop /* 84648 800EB198 10800009 */ beqz $a0, .L800EB1C0 /* 8464C 800EB19C 24020004 */ addiu $v0, $zero, 4 /* 84650 800EB1A0 24020003 */ addiu $v0, $zero, 3 @@ -21,7 +21,7 @@ glabel func_800EB168 /* 84658 800EB1A8 AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) .L800EB1AC: /* 8465C 800EB1AC 03E00008 */ jr $ra -/* 84660 800EB1B0 00000000 */ nop +/* 84660 800EB1B0 00000000 */ nop .L800EB1B4: /* 84664 800EB1B4 14800006 */ bnez $a0, .L800EB1D0 /* 84668 800EB1B8 24020006 */ addiu $v0, $zero, 6 @@ -30,7 +30,7 @@ glabel func_800EB168 /* 84670 800EB1C0 3C018011 */ lui $at, %hi(D_8010CFE8) /* 84674 800EB1C4 AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) /* 84678 800EB1C8 03E00008 */ jr $ra -/* 8467C 800EB1CC 00000000 */ nop +/* 8467C 800EB1CC 00000000 */ nop .L800EB1D0: /* 84680 800EB1D0 C4A00028 */ lwc1 $f0, 0x28($a1) /* 84684 800EB1D4 C4A2002C */ lwc1 $f2, 0x2c($a1) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB200.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB200.s index 90cf5f95c0..980c7e294b 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB200.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB200.s @@ -24,7 +24,7 @@ glabel func_800EB200 /* 846FC 800EB24C AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) .L800EB250: /* 84700 800EB250 03E00008 */ jr $ra -/* 84704 800EB254 00000000 */ nop +/* 84704 800EB254 00000000 */ nop .L800EB258: /* 84708 800EB258 14800006 */ bnez $a0, .L800EB274 /* 8470C 800EB25C 24020006 */ addiu $v0, $zero, 6 @@ -33,7 +33,7 @@ glabel func_800EB200 /* 84714 800EB264 3C018011 */ lui $at, %hi(D_8010CFE8) /* 84718 800EB268 AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) /* 8471C 800EB26C 03E00008 */ jr $ra -/* 84720 800EB270 00000000 */ nop +/* 84720 800EB270 00000000 */ nop .L800EB274: /* 84724 800EB274 C4A00028 */ lwc1 $f0, 0x28($a1) /* 84728 800EB278 C4A2002C */ lwc1 $f2, 0x2c($a1) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EB2A4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EB2A4.s index 5c3d3ff2e9..0180591164 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EB2A4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EB2A4.s @@ -11,7 +11,7 @@ glabel func_800EB2A4 /* 8476C 800EB2BC 3C018011 */ lui $at, %hi(D_8010CFE4) /* 84770 800EB2C0 AC24CFE4 */ sw $a0, %lo(D_8010CFE4)($at) /* 84774 800EB2C4 10600008 */ beqz $v1, .L800EB2E8 -/* 84778 800EB2C8 00000000 */ nop +/* 84778 800EB2C8 00000000 */ nop /* 8477C 800EB2CC 10800009 */ beqz $a0, .L800EB2F4 /* 84780 800EB2D0 24020005 */ addiu $v0, $zero, 5 /* 84784 800EB2D4 24020003 */ addiu $v0, $zero, 3 @@ -19,7 +19,7 @@ glabel func_800EB2A4 /* 8478C 800EB2DC AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) .L800EB2E0: /* 84790 800EB2E0 03E00008 */ jr $ra -/* 84794 800EB2E4 00000000 */ nop +/* 84794 800EB2E4 00000000 */ nop .L800EB2E8: /* 84798 800EB2E8 14800006 */ bnez $a0, .L800EB304 /* 8479C 800EB2EC 24020007 */ addiu $v0, $zero, 7 @@ -28,9 +28,9 @@ glabel func_800EB2A4 /* 847A4 800EB2F4 3C018011 */ lui $at, %hi(D_8010CFE8) /* 847A8 800EB2F8 AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) /* 847AC 800EB2FC 03E00008 */ jr $ra -/* 847B0 800EB300 00000000 */ nop +/* 847B0 800EB300 00000000 */ nop .L800EB304: /* 847B4 800EB304 3C018011 */ lui $at, %hi(D_8010CFE8) /* 847B8 800EB308 AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) /* 847BC 800EB30C 03E00008 */ jr $ra -/* 847C0 800EB310 00000000 */ nop +/* 847C0 800EB310 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EBA3C.s b/asm/nonmatchings/code_838b0_len_5900/func_800EBA3C.s index ded19ae7b6..98fdb81aa7 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EBA3C.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EBA3C.s @@ -21,28 +21,28 @@ glabel func_800EBA3C /* 84F28 800EBA78 00431821 */ addu $v1, $v0, $v1 /* 84F2C 800EBA7C 80620000 */ lb $v0, ($v1) /* 84F30 800EBA80 10400003 */ beqz $v0, .L800EBA90 -/* 84F34 800EBA84 00000000 */ nop +/* 84F34 800EBA84 00000000 */ nop /* 84F38 800EBA88 14C0002B */ bnez $a2, .L800EBB38 -/* 84F3C 800EBA8C 00000000 */ nop +/* 84F3C 800EBA8C 00000000 */ nop .L800EBA90: /* 84F40 800EBA90 C4620004 */ lwc1 $f2, 4($v1) /* 84F44 800EBA94 C4A00028 */ lwc1 $f0, 0x28($a1) /* 84F48 800EBA98 46001032 */ c.eq.s $f2, $f0 -/* 84F4C 800EBA9C 00000000 */ nop +/* 84F4C 800EBA9C 00000000 */ nop /* 84F50 800EBAA0 4500000D */ bc1f .L800EBAD8 -/* 84F54 800EBAA4 00000000 */ nop +/* 84F54 800EBAA4 00000000 */ nop /* 84F58 800EBAA8 C4620008 */ lwc1 $f2, 8($v1) /* 84F5C 800EBAAC C4A0002C */ lwc1 $f0, 0x2c($a1) /* 84F60 800EBAB0 46001032 */ c.eq.s $f2, $f0 -/* 84F64 800EBAB4 00000000 */ nop +/* 84F64 800EBAB4 00000000 */ nop /* 84F68 800EBAB8 45000007 */ bc1f .L800EBAD8 -/* 84F6C 800EBABC 00000000 */ nop +/* 84F6C 800EBABC 00000000 */ nop /* 84F70 800EBAC0 C462000C */ lwc1 $f2, 0xc($v1) /* 84F74 800EBAC4 C4A00030 */ lwc1 $f0, 0x30($a1) /* 84F78 800EBAC8 46001032 */ c.eq.s $f2, $f0 -/* 84F7C 800EBACC 00000000 */ nop +/* 84F7C 800EBACC 00000000 */ nop /* 84F80 800EBAD0 45010019 */ bc1t .L800EBB38 -/* 84F84 800EBAD4 00000000 */ nop +/* 84F84 800EBAD4 00000000 */ nop .L800EBAD8: /* 84F88 800EBAD8 3C048011 */ lui $a0, %hi(D_8010CFB8) /* 84F8C 800EBADC 2484CFB8 */ addiu $a0, $a0, %lo(D_8010CFB8) @@ -51,7 +51,7 @@ glabel func_800EBA3C /* 84F98 800EBAE8 8C63CFBC */ lw $v1, %lo(D_8010CFBC)($v1) /* 84F9C 800EBAEC 24420001 */ addiu $v0, $v0, 1 /* 84FA0 800EBAF0 10620011 */ beq $v1, $v0, .L800EBB38 -/* 84FA4 800EBAF4 00000000 */ nop +/* 84FA4 800EBAF4 00000000 */ nop /* 84FA8 800EBAF8 AC820000 */ sw $v0, ($a0) /* 84FAC 800EBAFC 28420028 */ slti $v0, $v0, 0x28 /* 84FB0 800EBB00 50400001 */ beql $v0, $zero, .L800EBB08 @@ -71,4 +71,4 @@ glabel func_800EBA3C /* 84FE4 800EBB34 E460000C */ swc1 $f0, 0xc($v1) .L800EBB38: /* 84FE8 800EBB38 03E00008 */ jr $ra -/* 84FEC 800EBB3C 00000000 */ nop +/* 84FEC 800EBB3C 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EBB40.s b/asm/nonmatchings/code_838b0_len_5900/func_800EBB40.s index c47ab4911f..19b09141fd 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EBB40.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EBB40.s @@ -19,18 +19,18 @@ glabel func_800EBB40 /* 85028 800EBB78 8E420000 */ lw $v0, ($s2) /* 8502C 800EBB7C 30423000 */ andi $v0, $v0, 0x3000 /* 85030 800EBB80 14400007 */ bnez $v0, .L800EBBA0 -/* 85034 800EBB84 00000000 */ nop +/* 85034 800EBB84 00000000 */ nop /* 85038 800EBB88 82220014 */ lb $v0, 0x14($s1) /* 8503C 800EBB8C 14400004 */ bnez $v0, .L800EBBA0 -/* 85040 800EBB90 00000000 */ nop +/* 85040 800EBB90 00000000 */ nop /* 85044 800EBB94 82220002 */ lb $v0, 2($s1) /* 85048 800EBB98 1040000B */ beqz $v0, .L800EBBC8 -/* 8504C 800EBB9C 00000000 */ nop +/* 8504C 800EBB9C 00000000 */ nop .L800EBBA0: /* 85050 800EBBA0 8E420004 */ lw $v0, 4($s2) /* 85054 800EBBA4 30420800 */ andi $v0, $v0, 0x800 /* 85058 800EBBA8 14400003 */ bnez $v0, .L800EBBB8 -/* 8505C 800EBBAC 00000000 */ nop +/* 8505C 800EBBAC 00000000 */ nop /* 85060 800EBBB0 0C03AF1D */ jal func_800EBC74 /* 85064 800EBBB4 0200202D */ daddu $a0, $s0, $zero .L800EBBB8: @@ -43,7 +43,7 @@ glabel func_800EBB40 /* 8507C 800EBBCC 8463CFC8 */ lh $v1, %lo(D_8010CFC8)($v1) /* 85080 800EBBD0 24020032 */ addiu $v0, $zero, 0x32 /* 85084 800EBBD4 10620016 */ beq $v1, $v0, .L800EBC30 -/* 85088 800EBBD8 00000000 */ nop +/* 85088 800EBBD8 00000000 */ nop /* 8508C 800EBBDC C600003C */ lwc1 $f0, 0x3c($s0) /* 85090 800EBBE0 C642002C */ lwc1 $f2, 0x2c($s2) /* 85094 800EBBE4 46020001 */ sub.s $f0, $f0, $f2 @@ -51,7 +51,7 @@ glabel func_800EBB40 /* 8509C 800EBBEC 44811000 */ mtc1 $at, $f2 /* 850A0 800EBBF0 46000005 */ abs.s $f0, $f0 /* 850A4 800EBBF4 4600103C */ c.lt.s $f2, $f0 -/* 850A8 800EBBF8 00000000 */ nop +/* 850A8 800EBBF8 00000000 */ nop /* 850AC 800EBBFC 4500000C */ bc1f .L800EBC30 /* 850B0 800EBC00 2403F7FF */ addiu $v1, $zero, -0x801 /* 850B4 800EBC04 C6400028 */ lwc1 $f0, 0x28($s2) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s b/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s index bde3dd2a4d..ee0ed02fb9 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EBC74.s @@ -26,7 +26,7 @@ glabel func_800EBC74 /* 85178 800EBCC8 00220821 */ addu $at, $at, $v0 /* 8517C 800EBCCC 8C22C148 */ lw $v0, %lo(D_8010C148)($at) /* 85180 800EBCD0 00400008 */ jr $v0 -/* 85184 800EBCD4 00000000 */ nop +/* 85184 800EBCD4 00000000 */ nop .L800EBCD8: /* 85188 800EBCD8 C634000C */ lwc1 $f20, 0xc($s1) /* 8518C 800EBCDC 3C038011 */ lui $v1, %hi(D_8010CFD8) @@ -74,7 +74,7 @@ glabel func_800EBC74 /* 85234 800EBD84 E7A00034 */ swc1 $f0, 0x34($sp) /* 85238 800EBD88 46000021 */ cvt.d.s $f0, $f0 /* 8523C 800EBD8C 4620103E */ c.le.d $f2, $f0 -/* 85240 800EBD90 00000000 */ nop +/* 85240 800EBD90 00000000 */ nop /* 85244 800EBD94 4500000B */ bc1f .L800EBDC4 /* 85248 800EBD98 3C030001 */ lui $v1, 1 /* 8524C 800EBD9C 8E620004 */ lw $v0, 4($s3) @@ -85,7 +85,7 @@ glabel func_800EBC74 /* 85260 800EBDB0 E6200018 */ swc1 $f0, 0x18($s1) /* 85264 800EBDB4 3C0140A0 */ lui $at, 0x40a0 /* 85268 800EBDB8 44810000 */ mtc1 $at, $f0 -/* 8526C 800EBDBC 00000000 */ nop +/* 8526C 800EBDBC 00000000 */ nop /* 85270 800EBDC0 E6200018 */ swc1 $f0, 0x18($s1) .L800EBDC4: /* 85274 800EBDC4 3C018011 */ lui $at, %hi(D_8010CFC0) @@ -95,12 +95,12 @@ glabel func_800EBC74 /* 85284 800EBDD4 44801000 */ mtc1 $zero, $f2 /* 85288 800EBDD8 46000021 */ cvt.d.s $f0, $f0 /* 8528C 800EBDDC 4622003C */ c.lt.d $f0, $f2 -/* 85290 800EBDE0 00000000 */ nop +/* 85290 800EBDE0 00000000 */ nop /* 85294 800EBDE4 45000005 */ bc1f .L800EBDFC -/* 85298 800EBDE8 00000000 */ nop +/* 85298 800EBDE8 00000000 */ nop /* 8529C 800EBDEC 3C014080 */ lui $at, 0x4080 /* 852A0 800EBDF0 44810000 */ mtc1 $at, $f0 -/* 852A4 800EBDF4 00000000 */ nop +/* 852A4 800EBDF4 00000000 */ nop /* 852A8 800EBDF8 E6200018 */ swc1 $f0, 0x18($s1) .L800EBDFC: /* 852AC 800EBDFC 3C038011 */ lui $v1, %hi(D_8010CFD8) @@ -138,7 +138,7 @@ glabel func_800EBC74 /* 85324 800EBE74 C6240018 */ lwc1 $f4, 0x18($s1) /* 85328 800EBE78 C7A20034 */ lwc1 $f2, 0x34($sp) /* 8532C 800EBE7C 4602203C */ c.lt.s $f4, $f2 -/* 85330 800EBE80 00000000 */ nop +/* 85330 800EBE80 00000000 */ nop /* 85334 800EBE84 4500003B */ bc1f .L800EBF74 /* 85338 800EBE88 46000506 */ mov.s $f20, $f0 /* 8533C 800EBE8C C7AC0028 */ lwc1 $f12, 0x28($sp) @@ -153,15 +153,15 @@ glabel func_800EBC74 /* 85360 800EBEB0 E7A00034 */ swc1 $f0, 0x34($sp) /* 85364 800EBEB4 46002021 */ cvt.d.s $f0, $f4 /* 85368 800EBEB8 4620103E */ c.le.d $f2, $f0 -/* 8536C 800EBEBC 00000000 */ nop +/* 8536C 800EBEBC 00000000 */ nop /* 85370 800EBEC0 45010054 */ bc1t .L800EC014 -/* 85374 800EBEC4 00000000 */ nop +/* 85374 800EBEC4 00000000 */ nop /* 85378 800EBEC8 3C018011 */ lui $at, %hi(D_8010CFC0) /* 8537C 800EBECC C426CFC0 */ lwc1 $f6, %lo(D_8010CFC0)($at) /* 85380 800EBED0 4604303C */ c.lt.s $f6, $f4 -/* 85384 800EBED4 00000000 */ nop +/* 85384 800EBED4 00000000 */ nop /* 85388 800EBED8 4500001F */ bc1f .L800EBF58 -/* 8538C 800EBEDC 00000000 */ nop +/* 8538C 800EBEDC 00000000 */ nop /* 85390 800EBEE0 46062081 */ sub.s $f2, $f4, $f6 /* 85394 800EBEE4 3C014008 */ lui $at, 0x4008 /* 85398 800EBEE8 44810800 */ mtc1 $at, $f1 @@ -169,15 +169,15 @@ glabel func_800EBC74 /* 853A0 800EBEF0 E6220018 */ swc1 $f2, 0x18($s1) /* 853A4 800EBEF4 460010A1 */ cvt.d.s $f2, $f2 /* 853A8 800EBEF8 4622003C */ c.lt.d $f0, $f2 -/* 853AC 800EBEFC 00000000 */ nop +/* 853AC 800EBEFC 00000000 */ nop /* 853B0 800EBF00 4500000D */ bc1f .L800EBF38 -/* 853B4 800EBF04 00000000 */ nop +/* 853B4 800EBF04 00000000 */ nop /* 853B8 800EBF08 3C0141A0 */ lui $at, 0x41a0 /* 853BC 800EBF0C 44810000 */ mtc1 $at, $f0 /* 853C0 800EBF10 3C014040 */ lui $at, 0x4040 /* 853C4 800EBF14 44811000 */ mtc1 $at, $f2 /* 853C8 800EBF18 4600303C */ c.lt.s $f6, $f0 -/* 853CC 800EBF1C 00000000 */ nop +/* 853CC 800EBF1C 00000000 */ nop /* 853D0 800EBF20 4500003C */ bc1f .L800EC014 /* 853D4 800EBF24 E6220018 */ swc1 $f2, 0x18($s1) /* 853D8 800EBF28 3C014080 */ lui $at, 0x4080 @@ -188,7 +188,7 @@ glabel func_800EBC74 /* 853E8 800EBF38 3C013FF0 */ lui $at, 0x3ff0 /* 853EC 800EBF3C 44810800 */ mtc1 $at, $f1 /* 853F0 800EBF40 44800000 */ mtc1 $zero, $f0 -/* 853F4 800EBF44 00000000 */ nop +/* 853F4 800EBF44 00000000 */ nop /* 853F8 800EBF48 46201000 */ add.d $f0, $f2, $f0 /* 853FC 800EBF4C 46200020 */ cvt.s.d $f0, $f0 /* 85400 800EBF50 0803B005 */ j .L800EC014 @@ -231,13 +231,13 @@ glabel func_800EBC74 /* 85488 800EBFD8 44811000 */ mtc1 $at, $f2 /* 8548C 800EBFDC 46000005 */ abs.s $f0, $f0 /* 85490 800EBFE0 4600103C */ c.lt.s $f2, $f0 -/* 85494 800EBFE4 00000000 */ nop +/* 85494 800EBFE4 00000000 */ nop /* 85498 800EBFE8 45010008 */ bc1t .L800EC00C /* 8549C 800EBFEC 24020005 */ addiu $v0, $zero, 5 /* 854A0 800EBFF0 8E220000 */ lw $v0, ($s1) /* 854A4 800EBFF4 30421000 */ andi $v0, $v0, 0x1000 /* 854A8 800EBFF8 1040FF93 */ beqz $v0, .L800EBE48 -/* 854AC 800EBFFC 00000000 */ nop +/* 854AC 800EBFFC 00000000 */ nop /* 854B0 800EC000 82020000 */ lb $v0, ($s0) /* 854B4 800EC004 1040FF90 */ beqz $v0, .L800EBE48 /* 854B8 800EC008 24020001 */ addiu $v0, $zero, 1 @@ -248,13 +248,13 @@ glabel func_800EBC74 /* 854C4 800EC014 8E220000 */ lw $v0, ($s1) /* 854C8 800EC018 30421000 */ andi $v0, $v0, 0x1000 /* 854CC 800EC01C 14400008 */ bnez $v0, .L800EC040 -/* 854D0 800EC020 00000000 */ nop +/* 854D0 800EC020 00000000 */ nop /* 854D4 800EC024 C6200018 */ lwc1 $f0, 0x18($s1) /* 854D8 800EC028 3C013F00 */ lui $at, 0x3f00 /* 854DC 800EC02C 44811000 */ mtc1 $at, $f2 -/* 854E0 800EC030 00000000 */ nop +/* 854E0 800EC030 00000000 */ nop /* 854E4 800EC034 46020002 */ mul.s $f0, $f0, $f2 -/* 854E8 800EC038 00000000 */ nop +/* 854E8 800EC038 00000000 */ nop /* 854EC 800EC03C E6200018 */ swc1 $f0, 0x18($s1) .L800EC040: /* 854F0 800EC040 8E250018 */ lw $a1, 0x18($s1) @@ -268,7 +268,7 @@ glabel func_800EBC74 /* 85510 800EC060 44801000 */ mtc1 $zero, $f2 /* 85514 800EC064 46000021 */ cvt.d.s $f0, $f0 /* 85518 800EC068 4622003C */ c.lt.d $f0, $f2 -/* 8551C 800EC06C 00000000 */ nop +/* 8551C 800EC06C 00000000 */ nop /* 85520 800EC070 45000002 */ bc1f .L800EC07C /* 85524 800EC074 24050001 */ addiu $a1, $zero, 1 /* 85528 800EC078 0000282D */ daddu $a1, $zero, $zero @@ -277,7 +277,7 @@ glabel func_800EBC74 /* 85530 800EC080 0220202D */ daddu $a0, $s1, $zero /* 85534 800EC084 86240084 */ lh $a0, 0x84($s1) /* 85538 800EC088 0C016F6A */ jal get_collider_type_by_id -/* 8553C 800EC08C 00000000 */ nop +/* 8553C 800EC08C 00000000 */ nop /* 85540 800EC090 2442FFFE */ addiu $v0, $v0, -2 /* 85544 800EC094 2C420002 */ sltiu $v0, $v0, 2 /* 85548 800EC098 14400005 */ bnez $v0, .L800EC0B0 @@ -285,7 +285,7 @@ glabel func_800EBC74 /* 85550 800EC0A0 8E220000 */ lw $v0, ($s1) /* 85554 800EC0A4 30425000 */ andi $v0, $v0, 0x5000 /* 85558 800EC0A8 1443048E */ bne $v0, $v1, .L800ED2E4 -/* 8555C 800EC0AC 00000000 */ nop +/* 8555C 800EC0AC 00000000 */ nop .L800EC0B0: /* 85560 800EC0B0 0C03A92C */ jal func_800EA4B0 /* 85564 800EC0B4 86240086 */ lh $a0, 0x86($s1) @@ -321,11 +321,11 @@ glabel func_800EBC74 /* 855D8 800EC128 44811000 */ mtc1 $at, $f2 /* 855DC 800EC12C 46000005 */ abs.s $f0, $f0 /* 855E0 800EC130 4600103C */ c.lt.s $f2, $f0 -/* 855E4 800EC134 00000000 */ nop +/* 855E4 800EC134 00000000 */ nop /* 855E8 800EC138 4500046A */ bc1f .L800ED2E4 /* 855EC 800EC13C 24020005 */ addiu $v0, $zero, 5 /* 855F0 800EC140 0803B4B7 */ j .L800ED2DC -/* 855F4 800EC144 00000000 */ nop +/* 855F4 800EC144 00000000 */ nop /* 855F8 800EC148 0C016F6A */ jal get_collider_type_by_id /* 855FC 800EC14C 86240084 */ lh $a0, 0x84($s1) /* 85600 800EC150 3C058011 */ lui $a1, %hi(D_8010CFBC) @@ -338,7 +338,7 @@ glabel func_800EBC74 /* 8561C 800EC16C 2642FFFE */ addiu $v0, $s2, -2 /* 85620 800EC170 2C420002 */ sltiu $v0, $v0, 2 /* 85624 800EC174 1040045B */ beqz $v0, .L800ED2E4 -/* 85628 800EC178 00000000 */ nop +/* 85628 800EC178 00000000 */ nop /* 8562C 800EC17C C674002C */ lwc1 $f20, 0x2c($s3) /* 85630 800EC180 C62C0038 */ lwc1 $f12, 0x38($s1) /* 85634 800EC184 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -355,7 +355,7 @@ glabel func_800EBC74 /* 85660 800EC1B0 0C00A7E7 */ jal add_vec2D_polar /* 85664 800EC1B4 27A50024 */ addiu $a1, $sp, 0x24 /* 85668 800EC1B8 0803B07F */ j .L800EC1FC -/* 8566C 800EC1BC 00000000 */ nop +/* 8566C 800EC1BC 00000000 */ nop .L800EC1C0: /* 85670 800EC1C0 24820001 */ addiu $v0, $a0, 1 /* 85674 800EC1C4 ACA20000 */ sw $v0, ($a1) @@ -404,12 +404,12 @@ glabel func_800EBC74 /* 85718 800EC268 44801000 */ mtc1 $zero, $f2 /* 8571C 800EC26C 46000021 */ cvt.d.s $f0, $f0 /* 85720 800EC270 4620103C */ c.lt.d $f2, $f0 -/* 85724 800EC274 00000000 */ nop +/* 85724 800EC274 00000000 */ nop /* 85728 800EC278 45000005 */ bc1f .L800EC290 -/* 8572C 800EC27C 00000000 */ nop +/* 8572C 800EC27C 00000000 */ nop /* 85730 800EC280 3C014248 */ lui $at, 0x4248 /* 85734 800EC284 44810000 */ mtc1 $at, $f0 -/* 85738 800EC288 00000000 */ nop +/* 85738 800EC288 00000000 */ nop /* 8573C 800EC28C E6200010 */ swc1 $f0, 0x10($s1) .L800EC290: /* 85740 800EC290 C6220064 */ lwc1 $f2, 0x64($s1) @@ -420,13 +420,13 @@ glabel func_800EBC74 /* 85754 800EC2A4 C420CFC0 */ lwc1 $f0, %lo(D_8010CFC0)($at) /* 85758 800EC2A8 E7A40034 */ swc1 $f4, 0x34($sp) /* 8575C 800EC2AC 4600203C */ c.lt.s $f4, $f0 -/* 85760 800EC2B0 00000000 */ nop +/* 85760 800EC2B0 00000000 */ nop /* 85764 800EC2B4 45000010 */ bc1f .L800EC2F8 /* 85768 800EC2B8 E7A2002C */ swc1 $f2, 0x2c($sp) /* 8576C 800EC2BC 2642FFFE */ addiu $v0, $s2, -2 /* 85770 800EC2C0 2C420002 */ sltiu $v0, $v0, 2 /* 85774 800EC2C4 1440000C */ bnez $v0, .L800EC2F8 -/* 85778 800EC2C8 00000000 */ nop +/* 85778 800EC2C8 00000000 */ nop /* 8577C 800EC2CC C62C0038 */ lwc1 $f12, 0x38($s1) /* 85780 800EC2D0 C62E0040 */ lwc1 $f14, 0x40($s1) /* 85784 800EC2D4 AE20001C */ sw $zero, 0x1c($s1) @@ -438,14 +438,14 @@ glabel func_800EBC74 /* 85798 800EC2E8 3C018011 */ lui $at, %hi(D_8010CFC8) /* 8579C 800EC2EC A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) /* 857A0 800EC2F0 0803B4B9 */ j .L800ED2E4 -/* 857A4 800EC2F4 00000000 */ nop +/* 857A4 800EC2F4 00000000 */ nop .L800EC2F8: /* 857A8 800EC2F8 C6220018 */ lwc1 $f2, 0x18($s1) /* 857AC 800EC2FC C7A00034 */ lwc1 $f0, 0x34($sp) /* 857B0 800EC300 46020003 */ div.s $f0, $f0, $f2 /* 857B4 800EC304 4600028D */ trunc.w.s $f10, $f0 /* 857B8 800EC308 44025000 */ mfc1 $v0, $f10 -/* 857BC 800EC30C 00000000 */ nop +/* 857BC 800EC30C 00000000 */ nop /* 857C0 800EC310 A622008E */ sh $v0, 0x8e($s1) /* 857C4 800EC314 00021400 */ sll $v0, $v0, 0x10 /* 857C8 800EC318 00021403 */ sra $v0, $v0, 0x10 @@ -457,17 +457,17 @@ glabel func_800EBC74 /* 857DC 800EC32C 8622008E */ lh $v0, 0x8e($s1) /* 857E0 800EC330 C6220014 */ lwc1 $f2, 0x14($s1) /* 857E4 800EC334 44823000 */ mtc1 $v0, $f6 -/* 857E8 800EC338 00000000 */ nop +/* 857E8 800EC338 00000000 */ nop /* 857EC 800EC33C 468031A0 */ cvt.s.w $f6, $f6 /* 857F0 800EC340 46061082 */ mul.s $f2, $f2, $f6 -/* 857F4 800EC344 00000000 */ nop +/* 857F4 800EC344 00000000 */ nop /* 857F8 800EC348 46061082 */ mul.s $f2, $f2, $f6 -/* 857FC 800EC34C 00000000 */ nop +/* 857FC 800EC34C 00000000 */ nop /* 85800 800EC350 3C013F00 */ lui $at, 0x3f00 /* 85804 800EC354 44810000 */ mtc1 $at, $f0 -/* 85808 800EC358 00000000 */ nop +/* 85808 800EC358 00000000 */ nop /* 8580C 800EC35C 46001082 */ mul.s $f2, $f2, $f0 -/* 85810 800EC360 00000000 */ nop +/* 85810 800EC360 00000000 */ nop /* 85814 800EC364 C7A4002C */ lwc1 $f4, 0x2c($sp) /* 85818 800EC368 C6200010 */ lwc1 $f0, 0x10($s1) /* 8581C 800EC36C 46003206 */ mov.s $f8, $f6 @@ -480,12 +480,12 @@ glabel func_800EBC74 /* 85838 800EC388 46062103 */ div.s $f4, $f4, $f6 /* 8583C 800EC38C 46002021 */ cvt.d.s $f0, $f4 /* 85840 800EC390 4620103C */ c.lt.d $f2, $f0 -/* 85844 800EC394 00000000 */ nop +/* 85844 800EC394 00000000 */ nop /* 85848 800EC398 45000005 */ bc1f .L800EC3B0 /* 8584C 800EC39C E624001C */ swc1 $f4, 0x1c($s1) /* 85850 800EC3A0 3C0141A0 */ lui $at, 0x41a0 /* 85854 800EC3A4 44810000 */ mtc1 $at, $f0 -/* 85858 800EC3A8 00000000 */ nop +/* 85858 800EC3A8 00000000 */ nop /* 8585C 800EC3AC E620001C */ swc1 $f0, 0x1c($s1) .L800EC3B0: /* 85860 800EC3B0 C620001C */ lwc1 $f0, 0x1c($s1) @@ -493,14 +493,14 @@ glabel func_800EBC74 /* 85868 800EC3B8 44801800 */ mtc1 $zero, $f3 /* 8586C 800EC3BC 46000021 */ cvt.d.s $f0, $f0 /* 85870 800EC3C0 4622003C */ c.lt.d $f0, $f2 -/* 85874 800EC3C4 00000000 */ nop +/* 85874 800EC3C4 00000000 */ nop /* 85878 800EC3C8 45030001 */ bc1tl .L800EC3D0 /* 8587C 800EC3CC AE20001C */ sw $zero, 0x1c($s1) .L800EC3D0: /* 85880 800EC3D0 2642FFFE */ addiu $v0, $s2, -2 /* 85884 800EC3D4 2C420002 */ sltiu $v0, $v0, 2 /* 85888 800EC3D8 1440000B */ bnez $v0, .L800EC408 -/* 8588C 800EC3DC 00000000 */ nop +/* 8588C 800EC3DC 00000000 */ nop /* 85890 800EC3E0 3C028011 */ lui $v0, %hi(D_8010CFD8) /* 85894 800EC3E4 8C42CFD8 */ lw $v0, %lo(D_8010CFD8)($v0) /* 85898 800EC3E8 000218C0 */ sll $v1, $v0, 3 @@ -540,7 +540,7 @@ glabel func_800EBC74 /* 85918 800EC468 C622003C */ lwc1 $f2, 0x3c($s1) /* 8591C 800EC46C 46001080 */ add.s $f2, $f2, $f0 /* 85920 800EC470 4480A000 */ mtc1 $zero, $f20 -/* 85924 800EC474 00000000 */ nop +/* 85924 800EC474 00000000 */ nop /* 85928 800EC478 4614003E */ c.le.s $f0, $f20 /* 8592C 800EC47C E620001C */ swc1 $f0, 0x1c($s1) /* 85930 800EC480 4500000A */ bc1f .L800EC4AC @@ -558,9 +558,9 @@ glabel func_800EBC74 /* 8595C 800EC4AC C622003C */ lwc1 $f2, 0x3c($s1) /* 85960 800EC4B0 3C01C4FA */ lui $at, 0xc4fa /* 85964 800EC4B4 44810000 */ mtc1 $at, $f0 -/* 85968 800EC4B8 00000000 */ nop +/* 85968 800EC4B8 00000000 */ nop /* 8596C 800EC4BC 4600103C */ c.lt.s $f2, $f0 -/* 85970 800EC4C0 00000000 */ nop +/* 85970 800EC4C0 00000000 */ nop /* 85974 800EC4C4 4500001B */ bc1f .L800EC534 /* 85978 800EC4C8 2404F7FF */ addiu $a0, $zero, -0x801 /* 8597C 800EC4CC C62C0038 */ lwc1 $f12, 0x38($s1) @@ -592,7 +592,7 @@ glabel func_800EBC74 .L800EC534: /* 859E4 800EC534 C624001C */ lwc1 $f4, 0x1c($s1) /* 859E8 800EC538 4614203E */ c.le.s $f4, $f20 -/* 859EC 800EC53C 00000000 */ nop +/* 859EC 800EC53C 00000000 */ nop /* 859F0 800EC540 45000068 */ bc1f .L800EC6E4 /* 859F4 800EC544 27A50028 */ addiu $a1, $sp, 0x28 /* 859F8 800EC548 27A20034 */ addiu $v0, $sp, 0x34 @@ -616,14 +616,14 @@ glabel func_800EBC74 /* 85A40 800EC590 862200A6 */ lh $v0, 0xa6($s1) /* 85A44 800EC594 26320038 */ addiu $s2, $s1, 0x38 /* 85A48 800EC598 44820000 */ mtc1 $v0, $f0 -/* 85A4C 800EC59C 00000000 */ nop +/* 85A4C 800EC59C 00000000 */ nop /* 85A50 800EC5A0 46800020 */ cvt.s.w $f0, $f0 /* 85A54 800EC5A4 E7A00018 */ swc1 $f0, 0x18($sp) /* 85A58 800EC5A8 8E240080 */ lw $a0, 0x80($s1) /* 85A5C 800EC5AC 0C0371DE */ jal func_800DC778 /* 85A60 800EC5B0 26340040 */ addiu $s4, $s1, 0x40 /* 85A64 800EC5B4 1040004B */ beqz $v0, .L800EC6E4 -/* 85A68 800EC5B8 00000000 */ nop +/* 85A68 800EC5B8 00000000 */ nop /* 85A6C 800EC5BC C620001C */ lwc1 $f0, 0x1c($s1) /* 85A70 800EC5C0 3C0141B0 */ lui $at, 0x41b0 /* 85A74 800EC5C4 44811000 */ mtc1 $at, $f2 @@ -631,9 +631,9 @@ glabel func_800EBC74 /* 85A7C 800EC5CC 46020000 */ add.s $f0, $f0, $f2 /* 85A80 800EC5D0 C7A20034 */ lwc1 $f2, 0x34($sp) /* 85A84 800EC5D4 4600103E */ c.le.s $f2, $f0 -/* 85A88 800EC5D8 00000000 */ nop +/* 85A88 800EC5D8 00000000 */ nop /* 85A8C 800EC5DC 45000041 */ bc1f .L800EC6E4 -/* 85A90 800EC5E0 00000000 */ nop +/* 85A90 800EC5E0 00000000 */ nop /* 85A94 800EC5E4 C7AC0028 */ lwc1 $f12, 0x28($sp) /* 85A98 800EC5E8 3C038011 */ lui $v1, %hi(D_8010CFD8) /* 85A9C 800EC5EC 8C63CFD8 */ lw $v1, %lo(D_8010CFD8)($v1) @@ -673,9 +673,9 @@ glabel func_800EBC74 /* 85B24 800EC674 E7A00034 */ swc1 $f0, 0x34($sp) /* 85B28 800EC678 46000021 */ cvt.d.s $f0, $f0 /* 85B2C 800EC67C 4622003C */ c.lt.d $f0, $f2 -/* 85B30 800EC680 00000000 */ nop +/* 85B30 800EC680 00000000 */ nop /* 85B34 800EC684 45000317 */ bc1f .L800ED2E4 -/* 85B38 800EC688 00000000 */ nop +/* 85B38 800EC688 00000000 */ nop /* 85B3C 800EC68C C6600028 */ lwc1 $f0, 0x28($s3) /* 85B40 800EC690 E6200038 */ swc1 $f0, 0x38($s1) /* 85B44 800EC694 C660002C */ lwc1 $f0, 0x2c($s3) @@ -685,7 +685,7 @@ glabel func_800EBC74 /* 85B54 800EC6A4 C6AC006C */ lwc1 $f12, 0x6c($s5) /* 85B58 800EC6A8 3C0142B4 */ lui $at, 0x42b4 /* 85B5C 800EC6AC 44810000 */ mtc1 $at, $f0 -/* 85B60 800EC6B0 00000000 */ nop +/* 85B60 800EC6B0 00000000 */ nop /* 85B64 800EC6B4 46006300 */ add.s $f12, $f12, $f0 /* 85B68 800EC6B8 C66000A8 */ lwc1 $f0, 0xa8($s3) /* 85B6C 800EC6BC 0C00A6C9 */ jal clamp_angle @@ -704,7 +704,7 @@ glabel func_800EBC74 /* 85B9C 800EC6EC 0C00EA95 */ jal npc_move_heading /* 85BA0 800EC6F0 0220202D */ daddu $a0, $s1, $zero /* 85BA4 800EC6F4 0803B4B9 */ j .L800ED2E4 -/* 85BA8 800EC6F8 00000000 */ nop +/* 85BA8 800EC6F8 00000000 */ nop /* 85BAC 800EC6FC 3C038011 */ lui $v1, %hi(D_8010CD38) /* 85BB0 800EC700 2463CD38 */ addiu $v1, $v1, %lo(D_8010CD38) /* 85BB4 800EC704 C62C0038 */ lwc1 $f12, 0x38($s1) @@ -729,14 +729,14 @@ glabel func_800EBC74 /* 85C00 800EC750 3C018011 */ lui $at, %hi(D_8010CFC0) /* 85C04 800EC754 C422CFC0 */ lwc1 $f2, %lo(D_8010CFC0)($at) /* 85C08 800EC758 4602003E */ c.le.s $f0, $f2 -/* 85C0C 800EC75C 00000000 */ nop +/* 85C0C 800EC75C 00000000 */ nop /* 85C10 800EC760 450000E3 */ bc1f .L800ECAF0 /* 85C14 800EC764 E7A00034 */ swc1 $f0, 0x34($sp) /* 85C18 800EC768 3C048011 */ lui $a0, %hi(D_8010CFCA) /* 85C1C 800EC76C 2484CFCA */ addiu $a0, $a0, %lo(D_8010CFCA) /* 85C20 800EC770 84820000 */ lh $v0, ($a0) /* 85C24 800EC774 14400019 */ bnez $v0, .L800EC7DC -/* 85C28 800EC778 00000000 */ nop +/* 85C28 800EC778 00000000 */ nop /* 85C2C 800EC77C 3C038011 */ lui $v1, %hi(D_8010CFD8) /* 85C30 800EC780 8C63CFD8 */ lw $v1, %lo(D_8010CFD8)($v1) /* 85C34 800EC784 AE200018 */ sw $zero, 0x18($s1) @@ -755,13 +755,13 @@ glabel func_800EBC74 .L800EC7B8: /* 85C68 800EC7B8 86240084 */ lh $a0, 0x84($s1) /* 85C6C 800EC7BC 0C016F6A */ jal get_collider_type_by_id -/* 85C70 800EC7C0 00000000 */ nop +/* 85C70 800EC7C0 00000000 */ nop /* 85C74 800EC7C4 2442FFFE */ addiu $v0, $v0, -2 /* 85C78 800EC7C8 2C420002 */ sltiu $v0, $v0, 2 /* 85C7C 800EC7CC 104000C8 */ beqz $v0, .L800ECAF0 -/* 85C80 800EC7D0 00000000 */ nop +/* 85C80 800EC7D0 00000000 */ nop /* 85C84 800EC7D4 0803B0BA */ j .L800EC2E8 -/* 85C88 800EC7D8 00000000 */ nop +/* 85C88 800EC7D8 00000000 */ nop .L800EC7DC: /* 85C8C 800EC7DC C66200A8 */ lwc1 $f2, 0xa8($s3) /* 85C90 800EC7E0 3C014334 */ lui $at, 0x4334 @@ -771,7 +771,7 @@ glabel func_800EBC74 /* 85CA0 800EC7F0 3C01C2B4 */ lui $at, 0xc2b4 /* 85CA4 800EC7F4 44810000 */ mtc1 $at, $f0 /* 85CA8 800EC7F8 45000003 */ bc1f .L800EC808 -/* 85CAC 800EC7FC 00000000 */ nop +/* 85CAC 800EC7FC 00000000 */ nop /* 85CB0 800EC800 3C0142B4 */ lui $at, 0x42b4 /* 85CB4 800EC804 44810000 */ mtc1 $at, $f0 .L800EC808: @@ -808,7 +808,7 @@ glabel func_800EBC74 /* 85D30 800EC880 44811000 */ mtc1 $at, $f2 /* 85D34 800EC884 E7A00034 */ swc1 $f0, 0x34($sp) /* 85D38 800EC888 4600103C */ c.lt.s $f2, $f0 -/* 85D3C 800EC88C 00000000 */ nop +/* 85D3C 800EC88C 00000000 */ nop /* 85D40 800EC890 45000022 */ bc1f .L800EC91C /* 85D44 800EC894 E6220018 */ swc1 $f2, 0x18($s1) /* 85D48 800EC898 3C038011 */ lui $v1, %hi(D_8010CFD8) @@ -838,7 +838,7 @@ glabel func_800EBC74 /* 85DA4 800EC8F4 00021403 */ sra $v0, $v0, 0x10 /* 85DA8 800EC8F8 2842000B */ slti $v0, $v0, 0xb /* 85DAC 800EC8FC 14400023 */ bnez $v0, .L800EC98C -/* 85DB0 800EC900 00000000 */ nop +/* 85DB0 800EC900 00000000 */ nop /* 85DB4 800EC904 C6740080 */ lwc1 $f20, 0x80($s3) /* 85DB8 800EC908 AE200018 */ sw $zero, 0x18($s1) /* 85DBC 800EC90C AE200014 */ sw $zero, 0x14($s1) @@ -873,7 +873,7 @@ glabel func_800EBC74 /* 85E28 800EC978 2402000C */ addiu $v0, $zero, 0xc /* 85E2C 800EC97C 826300B4 */ lb $v1, 0xb4($s3) /* 85E30 800EC980 14620002 */ bne $v1, $v0, .L800EC98C -/* 85E34 800EC984 00000000 */ nop +/* 85E34 800EC984 00000000 */ nop .L800EC988: /* 85E38 800EC988 A4800000 */ sh $zero, ($a0) .L800EC98C: @@ -888,7 +888,7 @@ glabel func_800EBC74 /* 85E5C 800EC9AC 44801000 */ mtc1 $zero, $f2 /* 85E60 800EC9B0 46000021 */ cvt.d.s $f0, $f0 /* 85E64 800EC9B4 4622003C */ c.lt.d $f0, $f2 -/* 85E68 800EC9B8 00000000 */ nop +/* 85E68 800EC9B8 00000000 */ nop /* 85E6C 800EC9BC 45000002 */ bc1f .L800EC9C8 /* 85E70 800EC9C0 24050001 */ addiu $a1, $zero, 1 /* 85E74 800EC9C4 0000282D */ daddu $a1, $zero, $zero @@ -899,7 +899,7 @@ glabel func_800EBC74 /* 85E84 800EC9D4 3C01447A */ lui $at, 0x447a /* 85E88 800EC9D8 44810000 */ mtc1 $at, $f0 /* 85E8C 800EC9DC 44822000 */ mtc1 $v0, $f4 -/* 85E90 800EC9E0 00000000 */ nop +/* 85E90 800EC9E0 00000000 */ nop /* 85E94 800EC9E4 46802120 */ cvt.s.w $f4, $f4 /* 85E98 800EC9E8 27A20034 */ addiu $v0, $sp, 0x34 /* 85E9C 800EC9EC E7A00034 */ swc1 $f0, 0x34($sp) @@ -917,14 +917,14 @@ glabel func_800EBC74 /* 85ECC 800ECA1C 862200A6 */ lh $v0, 0xa6($s1) /* 85ED0 800ECA20 27A6002C */ addiu $a2, $sp, 0x2c /* 85ED4 800ECA24 44820000 */ mtc1 $v0, $f0 -/* 85ED8 800ECA28 00000000 */ nop +/* 85ED8 800ECA28 00000000 */ nop /* 85EDC 800ECA2C 46800020 */ cvt.s.w $f0, $f0 /* 85EE0 800ECA30 E7A00018 */ swc1 $f0, 0x18($sp) /* 85EE4 800ECA34 8E240080 */ lw $a0, 0x80($s1) /* 85EE8 800ECA38 0C0371DE */ jal func_800DC778 /* 85EEC 800ECA3C 27A70030 */ addiu $a3, $sp, 0x30 /* 85EF0 800ECA40 10400228 */ beqz $v0, .L800ED2E4 -/* 85EF4 800ECA44 00000000 */ nop +/* 85EF4 800ECA44 00000000 */ nop /* 85EF8 800ECA48 3C108011 */ lui $s0, %hi(D_8010C978) /* 85EFC 800ECA4C 2610C978 */ addiu $s0, $s0, %lo(D_8010C978) /* 85F00 800ECA50 0C016F6A */ jal get_collider_type_by_id @@ -932,7 +932,7 @@ glabel func_800EBC74 /* 85F08 800ECA58 2442FFFE */ addiu $v0, $v0, -2 /* 85F0C 800ECA5C 2C420002 */ sltiu $v0, $v0, 2 /* 85F10 800ECA60 10400020 */ beqz $v0, .L800ECAE4 -/* 85F14 800ECA64 00000000 */ nop +/* 85F14 800ECA64 00000000 */ nop /* 85F18 800ECA68 3C014334 */ lui $at, 0x4334 /* 85F1C 800ECA6C 44816000 */ mtc1 $at, $f12 /* 85F20 800ECA70 0C00A6C9 */ jal clamp_angle @@ -961,13 +961,13 @@ glabel func_800EBC74 /* 85F7C 800ECACC 2402000C */ addiu $v0, $zero, 0xc /* 85F80 800ECAD0 826300B4 */ lb $v1, 0xb4($s3) /* 85F84 800ECAD4 14620203 */ bne $v1, $v0, .L800ED2E4 -/* 85F88 800ECAD8 00000000 */ nop +/* 85F88 800ECAD8 00000000 */ nop /* 85F8C 800ECADC 0803B4B9 */ j .L800ED2E4 /* 85F90 800ECAE0 A4800000 */ sh $zero, ($a0) .L800ECAE4: /* 85F94 800ECAE4 8E040000 */ lw $a0, ($s0) /* 85F98 800ECAE8 0803B2C9 */ j .L800ECB24 -/* 85F9C 800ECAEC 00000000 */ nop +/* 85F9C 800ECAEC 00000000 */ nop .L800ECAF0: /* 85FA0 800ECAF0 C62C0038 */ lwc1 $f12, 0x38($s1) /* 85FA4 800ECAF4 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -977,20 +977,20 @@ glabel func_800EBC74 /* 85FB4 800ECB04 3C018011 */ lui $at, %hi(D_8010CFC0) /* 85FB8 800ECB08 C422CFC0 */ lwc1 $f2, %lo(D_8010CFC0)($at) /* 85FBC 800ECB0C 4602003E */ c.le.s $f0, $f2 -/* 85FC0 800ECB10 00000000 */ nop +/* 85FC0 800ECB10 00000000 */ nop /* 85FC4 800ECB14 4500000B */ bc1f .L800ECB44 /* 85FC8 800ECB18 E7A00034 */ swc1 $f0, 0x34($sp) /* 85FCC 800ECB1C 3C048011 */ lui $a0, %hi(D_8010C978) /* 85FD0 800ECB20 8C84C978 */ lw $a0, %lo(D_8010C978)($a0) .L800ECB24: /* 85FD4 800ECB24 0C03A92C */ jal func_800EA4B0 -/* 85FD8 800ECB28 00000000 */ nop +/* 85FD8 800ECB28 00000000 */ nop /* 85FDC 800ECB2C 144001ED */ bnez $v0, .L800ED2E4 /* 85FE0 800ECB30 24020002 */ addiu $v0, $zero, 2 /* 85FE4 800ECB34 3C018011 */ lui $at, %hi(D_8010CFCA) /* 85FE8 800ECB38 A422CFCA */ sh $v0, %lo(D_8010CFCA)($at) /* 85FEC 800ECB3C 0803B4B9 */ j .L800ED2E4 -/* 85FF0 800ECB40 00000000 */ nop +/* 85FF0 800ECB40 00000000 */ nop .L800ECB44: /* 85FF4 800ECB44 3C0142B4 */ lui $at, 0x42b4 /* 85FF8 800ECB48 4481B000 */ mtc1 $at, $f22 @@ -1001,7 +1001,7 @@ glabel func_800EBC74 .L800ECB5C: /* 8600C 800ECB5C 82020000 */ lb $v0, ($s0) /* 86010 800ECB60 14400028 */ bnez $v0, .L800ECC04 -/* 86014 800ECB64 00000000 */ nop +/* 86014 800ECB64 00000000 */ nop /* 86018 800ECB68 C62C0038 */ lwc1 $f12, 0x38($s1) /* 8601C 800ECB6C C62E0040 */ lwc1 $f14, 0x40($s1) /* 86020 800ECB70 8FA60020 */ lw $a2, 0x20($sp) @@ -1018,9 +1018,9 @@ glabel func_800EBC74 /* 8604C 800ECB9C 46000386 */ mov.s $f14, $f0 /* 86050 800ECBA0 46000005 */ abs.s $f0, $f0 /* 86054 800ECBA4 4616003C */ c.lt.s $f0, $f22 -/* 86058 800ECBA8 00000000 */ nop +/* 86058 800ECBA8 00000000 */ nop /* 8605C 800ECBAC 45010012 */ bc1t .L800ECBF8 -/* 86060 800ECBB0 00000000 */ nop +/* 86060 800ECBB0 00000000 */ nop /* 86064 800ECBB4 8E430000 */ lw $v1, ($s2) /* 86068 800ECBB8 3C028011 */ lui $v0, %hi(D_8010CFB8) /* 8606C 800ECBBC 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) @@ -1042,7 +1042,7 @@ glabel func_800EBC74 .L800ECBF8: /* 860A8 800ECBF8 82020000 */ lb $v0, ($s0) /* 860AC 800ECBFC 1040FDBA */ beqz $v0, .L800EC2E8 -/* 860B0 800ECC00 00000000 */ nop +/* 860B0 800ECC00 00000000 */ nop .L800ECC04: /* 860B4 800ECC04 3C0142B4 */ lui $at, 0x42b4 /* 860B8 800ECC08 4481B000 */ mtc1 $at, $f22 @@ -1070,7 +1070,7 @@ glabel func_800EBC74 /* 8610C 800ECC5C 46000386 */ mov.s $f14, $f0 /* 86110 800ECC60 46000005 */ abs.s $f0, $f0 /* 86114 800ECC64 4616003C */ c.lt.s $f0, $f22 -/* 86118 800ECC68 00000000 */ nop +/* 86118 800ECC68 00000000 */ nop /* 8611C 800ECC6C 4501019B */ bc1t .L800ED2DC /* 86120 800ECC70 24020001 */ addiu $v0, $zero, 1 /* 86124 800ECC74 8E430000 */ lw $v1, ($s2) @@ -1103,17 +1103,17 @@ glabel func_800EBC74 /* 86188 800ECCD8 50400005 */ beql $v0, $zero, .L800ECCF0 /* 8618C 800ECCDC 24020002 */ addiu $v0, $zero, 2 /* 86190 800ECCE0 10600007 */ beqz $v1, .L800ECD00 -/* 86194 800ECCE4 00000000 */ nop +/* 86194 800ECCE4 00000000 */ nop /* 86198 800ECCE8 0803B4B9 */ j .L800ED2E4 -/* 8619C 800ECCEC 00000000 */ nop +/* 8619C 800ECCEC 00000000 */ nop .L800ECCF0: /* 861A0 800ECCF0 106200E2 */ beq $v1, $v0, .L800ED07C -/* 861A4 800ECCF4 00000000 */ nop +/* 861A4 800ECCF4 00000000 */ nop /* 861A8 800ECCF8 0803B4B9 */ j .L800ED2E4 -/* 861AC 800ECCFC 00000000 */ nop +/* 861AC 800ECCFC 00000000 */ nop .L800ECD00: /* 861B0 800ECD00 0C0394D2 */ jal func_800E5348 -/* 861B4 800ECD04 00000000 */ nop +/* 861B4 800ECD04 00000000 */ nop /* 861B8 800ECD08 3C014334 */ lui $at, 0x4334 /* 861BC 800ECD0C 44816000 */ mtc1 $at, $f12 /* 861C0 800ECD10 0C00A6C9 */ jal clamp_angle @@ -1128,7 +1128,7 @@ glabel func_800EBC74 /* 861E4 800ECD34 866200B2 */ lh $v0, 0xb2($s3) /* 861E8 800ECD38 44070000 */ mfc1 $a3, $f0 /* 861EC 800ECD3C 44825000 */ mtc1 $v0, $f10 -/* 861F0 800ECD40 00000000 */ nop +/* 861F0 800ECD40 00000000 */ nop /* 861F4 800ECD44 468052A0 */ cvt.s.w $f10, $f10 /* 861F8 800ECD48 44065000 */ mfc1 $a2, $f10 /* 861FC 800ECD4C 0C00A7E7 */ jal add_vec2D_polar @@ -1156,7 +1156,7 @@ glabel func_800EBC74 /* 86254 800ECDA4 000310C0 */ sll $v0, $v1, 3 /* 86258 800ECDA8 00431021 */ addu $v0, $v0, $v1 /* 8625C 800ECDAC 4620103E */ c.le.d $f2, $f0 -/* 86260 800ECDB0 00000000 */ nop +/* 86260 800ECDB0 00000000 */ nop /* 86264 800ECDB4 45000003 */ bc1f .L800ECDC4 /* 86268 800ECDB8 00021080 */ sll $v0, $v0, 2 /* 8626C 800ECDBC 0803B372 */ j .L800ECDC8 @@ -1191,9 +1191,9 @@ glabel func_800EBC74 /* 862D4 800ECE24 2442FFFF */ addiu $v0, $v0, -1 /* 862D8 800ECE28 C6220014 */ lwc1 $f2, 0x14($s1) /* 862DC 800ECE2C 44803000 */ mtc1 $zero, $f6 -/* 862E0 800ECE30 00000000 */ nop +/* 862E0 800ECE30 00000000 */ nop /* 862E4 800ECE34 46061032 */ c.eq.s $f2, $f6 -/* 862E8 800ECE38 00000000 */ nop +/* 862E8 800ECE38 00000000 */ nop /* 862EC 800ECE3C 4501005A */ bc1t .L800ECFA8 /* 862F0 800ECE40 AE020000 */ sw $v0, ($s0) /* 862F4 800ECE44 C620001C */ lwc1 $f0, 0x1c($s1) @@ -1202,7 +1202,7 @@ glabel func_800EBC74 /* 86300 800ECE50 46001080 */ add.s $f2, $f2, $f0 /* 86304 800ECE54 E620001C */ swc1 $f0, 0x1c($s1) /* 86308 800ECE58 4606003E */ c.le.s $f0, $f6 -/* 8630C 800ECE5C 00000000 */ nop +/* 8630C 800ECE5C 00000000 */ nop /* 86310 800ECE60 4500000A */ bc1f .L800ECE8C /* 86314 800ECE64 E622003C */ swc1 $f2, 0x3c($s1) /* 86318 800ECE68 3C028011 */ lui $v0, %hi(D_8010CFD8) @@ -1217,7 +1217,7 @@ glabel func_800EBC74 .L800ECE8C: /* 8633C 800ECE8C C624001C */ lwc1 $f4, 0x1c($s1) /* 86340 800ECE90 4606203E */ c.le.s $f4, $f6 -/* 86344 800ECE94 00000000 */ nop +/* 86344 800ECE94 00000000 */ nop /* 86348 800ECE98 45000043 */ bc1f .L800ECFA8 /* 8634C 800ECE9C 27A20034 */ addiu $v0, $sp, 0x34 /* 86350 800ECEA0 C6200038 */ lwc1 $f0, 0x38($s1) @@ -1239,14 +1239,14 @@ glabel func_800EBC74 /* 86390 800ECEE0 862200A6 */ lh $v0, 0xa6($s1) /* 86394 800ECEE4 27A6002C */ addiu $a2, $sp, 0x2c /* 86398 800ECEE8 44820000 */ mtc1 $v0, $f0 -/* 8639C 800ECEEC 00000000 */ nop +/* 8639C 800ECEEC 00000000 */ nop /* 863A0 800ECEF0 46800020 */ cvt.s.w $f0, $f0 /* 863A4 800ECEF4 E7A00018 */ swc1 $f0, 0x18($sp) /* 863A8 800ECEF8 8E240080 */ lw $a0, 0x80($s1) /* 863AC 800ECEFC 0C0371DE */ jal func_800DC778 /* 863B0 800ECF00 27A70030 */ addiu $a3, $sp, 0x30 /* 863B4 800ECF04 10400028 */ beqz $v0, .L800ECFA8 -/* 863B8 800ECF08 00000000 */ nop +/* 863B8 800ECF08 00000000 */ nop /* 863BC 800ECF0C C620001C */ lwc1 $f0, 0x1c($s1) /* 863C0 800ECF10 3C0141B0 */ lui $at, 0x41b0 /* 863C4 800ECF14 44811000 */ mtc1 $at, $f2 @@ -1254,7 +1254,7 @@ glabel func_800EBC74 /* 863CC 800ECF1C 46020000 */ add.s $f0, $f0, $f2 /* 863D0 800ECF20 C7A20034 */ lwc1 $f2, 0x34($sp) /* 863D4 800ECF24 4600103E */ c.le.s $f2, $f0 -/* 863D8 800ECF28 00000000 */ nop +/* 863D8 800ECF28 00000000 */ nop /* 863DC 800ECF2C 4500001E */ bc1f .L800ECFA8 /* 863E0 800ECF30 26240028 */ addiu $a0, $s1, 0x28 /* 863E4 800ECF34 C6200018 */ lwc1 $f0, 0x18($s1) @@ -1267,7 +1267,7 @@ glabel func_800EBC74 /* 86400 800ECF50 000310C0 */ sll $v0, $v1, 3 /* 86404 800ECF54 00431021 */ addu $v0, $v0, $v1 /* 86408 800ECF58 4620103E */ c.le.d $f2, $f0 -/* 8640C 800ECF5C 00000000 */ nop +/* 8640C 800ECF5C 00000000 */ nop /* 86410 800ECF60 45000003 */ bc1f .L800ECF70 /* 86414 800ECF64 00021080 */ sll $v0, $v0, 2 /* 86418 800ECF68 0803B3DD */ j .L800ECF74 @@ -1305,7 +1305,7 @@ glabel func_800EBC74 /* 8648C 800ECFDC 44801000 */ mtc1 $zero, $f2 /* 86490 800ECFE0 46000021 */ cvt.d.s $f0, $f0 /* 86494 800ECFE4 4622003C */ c.lt.d $f0, $f2 -/* 86498 800ECFE8 00000000 */ nop +/* 86498 800ECFE8 00000000 */ nop /* 8649C 800ECFEC 45000002 */ bc1f .L800ECFF8 /* 864A0 800ECFF0 24050001 */ addiu $a1, $zero, 1 /* 864A4 800ECFF4 0000282D */ daddu $a1, $zero, $zero @@ -1313,7 +1313,7 @@ glabel func_800EBC74 /* 864A8 800ECFF8 0C00F598 */ jal func_8003D660 /* 864AC 800ECFFC 0220202D */ daddu $a0, $s1, $zero /* 864B0 800ED000 0803B4B9 */ j .L800ED2E4 -/* 864B4 800ED004 00000000 */ nop +/* 864B4 800ED004 00000000 */ nop .L800ED008: /* 864B8 800ED008 0C03BD17 */ jal clear_partner_move_history /* 864BC 800ED00C 0220202D */ daddu $a0, $s1, $zero @@ -1364,11 +1364,11 @@ glabel func_800EBC74 /* 86564 800ED0B4 0C03BE0B */ jal func_800EF82C /* 86568 800ED0B8 0000282D */ daddu $a1, $zero, $zero /* 8656C 800ED0BC 0803B4B9 */ j .L800ED2E4 -/* 86570 800ED0C0 00000000 */ nop +/* 86570 800ED0C0 00000000 */ nop /* 86574 800ED0C4 8E220000 */ lw $v0, ($s1) /* 86578 800ED0C8 30421000 */ andi $v0, $v0, 0x1000 /* 8657C 800ED0CC 10400012 */ beqz $v0, .L800ED118 -/* 86580 800ED0D0 00000000 */ nop +/* 86580 800ED0D0 00000000 */ nop /* 86584 800ED0D4 0C03A92C */ jal func_800EA4B0 /* 86588 800ED0D8 86240084 */ lh $a0, 0x84($s1) /* 8658C 800ED0DC 1040007F */ beqz $v0, .L800ED2DC @@ -1412,9 +1412,9 @@ glabel func_800EBC74 /* 8661C 800ED16C C622003C */ lwc1 $f2, 0x3c($s1) /* 86620 800ED170 3C01C4FA */ lui $at, 0xc4fa /* 86624 800ED174 44810000 */ mtc1 $at, $f0 -/* 86628 800ED178 00000000 */ nop +/* 86628 800ED178 00000000 */ nop /* 8662C 800ED17C 4600103C */ c.lt.s $f2, $f0 -/* 86630 800ED180 00000000 */ nop +/* 86630 800ED180 00000000 */ nop /* 86634 800ED184 4500001E */ bc1f .L800ED200 /* 86638 800ED188 2404F7FF */ addiu $a0, $zero, -0x801 /* 8663C 800ED18C C62C0038 */ lwc1 $f12, 0x38($s1) @@ -1469,14 +1469,14 @@ glabel func_800EBC74 /* 866F8 800ED248 862200A6 */ lh $v0, 0xa6($s1) /* 866FC 800ED24C 27A6002C */ addiu $a2, $sp, 0x2c /* 86700 800ED250 44820000 */ mtc1 $v0, $f0 -/* 86704 800ED254 00000000 */ nop +/* 86704 800ED254 00000000 */ nop /* 86708 800ED258 46800020 */ cvt.s.w $f0, $f0 /* 8670C 800ED25C E7A00018 */ swc1 $f0, 0x18($sp) /* 86710 800ED260 8E240080 */ lw $a0, 0x80($s1) /* 86714 800ED264 0C0371DE */ jal func_800DC778 /* 86718 800ED268 27A70030 */ addiu $a3, $sp, 0x30 /* 8671C 800ED26C 1040001D */ beqz $v0, .L800ED2E4 -/* 86720 800ED270 00000000 */ nop +/* 86720 800ED270 00000000 */ nop /* 86724 800ED274 C7AC0028 */ lwc1 $f12, 0x28($sp) /* 86728 800ED278 3C038011 */ lui $v1, %hi(D_8010CFD8) /* 8672C 800ED27C 8C63CFD8 */ lw $v1, %lo(D_8010CFD8)($v1) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800ED5D0.s b/asm/nonmatchings/code_838b0_len_5900/func_800ED5D0.s index d887b91c6a..dfe8e3541b 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800ED5D0.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800ED5D0.s @@ -23,22 +23,22 @@ glabel func_800ED5D0 /* 86AC8 800ED618 8E420000 */ lw $v0, ($s2) /* 86ACC 800ED61C 30423000 */ andi $v0, $v0, 0x3000 /* 86AD0 800ED620 14400007 */ bnez $v0, .L800ED640 -/* 86AD4 800ED624 00000000 */ nop +/* 86AD4 800ED624 00000000 */ nop /* 86AD8 800ED628 82220014 */ lb $v0, 0x14($s1) /* 86ADC 800ED62C 14400004 */ bnez $v0, .L800ED640 -/* 86AE0 800ED630 00000000 */ nop +/* 86AE0 800ED630 00000000 */ nop /* 86AE4 800ED634 82220002 */ lb $v0, 2($s1) /* 86AE8 800ED638 1040000F */ beqz $v0, .L800ED678 -/* 86AEC 800ED63C 00000000 */ nop +/* 86AEC 800ED63C 00000000 */ nop .L800ED640: /* 86AF0 800ED640 8E420004 */ lw $v0, 4($s2) /* 86AF4 800ED644 30420800 */ andi $v0, $v0, 0x800 /* 86AF8 800ED648 10400005 */ beqz $v0, .L800ED660 -/* 86AFC 800ED64C 00000000 */ nop +/* 86AFC 800ED64C 00000000 */ nop /* 86B00 800ED650 3C028010 */ lui $v0, %hi(D_800F8020) /* 86B04 800ED654 8C428020 */ lw $v0, %lo(D_800F8020)($v0) /* 86B08 800ED658 14400003 */ bnez $v0, .L800ED668 -/* 86B0C 800ED65C 00000000 */ nop +/* 86B0C 800ED65C 00000000 */ nop .L800ED660: /* 86B10 800ED660 0C03B67E */ jal func_800ED9F8 /* 86B14 800ED664 0200202D */ daddu $a0, $s0, $zero @@ -60,7 +60,7 @@ glabel func_800ED5D0 /* 86B4C 800ED69C 44811000 */ mtc1 $at, $f2 /* 86B50 800ED6A0 46000005 */ abs.s $f0, $f0 /* 86B54 800ED6A4 4600103C */ c.lt.s $f2, $f0 -/* 86B58 800ED6A8 00000000 */ nop +/* 86B58 800ED6A8 00000000 */ nop /* 86B5C 800ED6AC 4500000D */ bc1f .L800ED6E4 /* 86B60 800ED6B0 2403F7FF */ addiu $v1, $zero, -0x801 /* 86B64 800ED6B4 C6400028 */ lwc1 $f0, 0x28($s2) @@ -86,19 +86,19 @@ glabel func_800ED5D0 /* 86BB0 800ED700 3C013F00 */ lui $at, 0x3f00 /* 86BB4 800ED704 44811000 */ mtc1 $at, $f2 /* 86BB8 800ED708 44823000 */ mtc1 $v0, $f6 -/* 86BBC 800ED70C 00000000 */ nop +/* 86BBC 800ED70C 00000000 */ nop /* 86BC0 800ED710 468031A0 */ cvt.s.w $f6, $f6 /* 86BC4 800ED714 46023182 */ mul.s $f6, $f6, $f2 -/* 86BC8 800ED718 00000000 */ nop +/* 86BC8 800ED718 00000000 */ nop /* 86BCC 800ED71C 3C148010 */ lui $s4, %hi(D_800F8020) /* 86BD0 800ED720 26948020 */ addiu $s4, $s4, %lo(D_800F8020) /* 86BD4 800ED724 27B1002C */ addiu $s1, $sp, 0x2c /* 86BD8 800ED728 C6000038 */ lwc1 $f0, 0x38($s0) /* 86BDC 800ED72C 44822000 */ mtc1 $v0, $f4 -/* 86BE0 800ED730 00000000 */ nop +/* 86BE0 800ED730 00000000 */ nop /* 86BE4 800ED734 46802120 */ cvt.s.w $f4, $f4 /* 86BE8 800ED738 46022102 */ mul.s $f4, $f4, $f2 -/* 86BEC 800ED73C 00000000 */ nop +/* 86BEC 800ED73C 00000000 */ nop /* 86BF0 800ED740 AE800000 */ sw $zero, ($s4) /* 86BF4 800ED744 E7A00020 */ swc1 $f0, 0x20($sp) /* 86BF8 800ED748 C600003C */ lwc1 $f0, 0x3c($s0) @@ -141,12 +141,12 @@ glabel func_800ED5D0 /* 86C88 800ED7D8 860200A6 */ lh $v0, 0xa6($s0) /* 86C8C 800ED7DC 02C0382D */ daddu $a3, $s6, $zero /* 86C90 800ED7E0 44820000 */ mtc1 $v0, $f0 -/* 86C94 800ED7E4 00000000 */ nop +/* 86C94 800ED7E4 00000000 */ nop /* 86C98 800ED7E8 46800020 */ cvt.s.w $f0, $f0 /* 86C9C 800ED7EC 0C0371DE */ jal func_800DC778 /* 86CA0 800ED7F0 E7A00018 */ swc1 $f0, 0x18($sp) /* 86CA4 800ED7F4 14400003 */ bnez $v0, .L800ED804 -/* 86CA8 800ED7F8 00000000 */ nop +/* 86CA8 800ED7F8 00000000 */ nop /* 86CAC 800ED7FC C640002C */ lwc1 $f0, 0x2c($s2) /* 86CB0 800ED800 E7A00024 */ swc1 $f0, 0x24($sp) .L800ED804: @@ -155,29 +155,29 @@ glabel func_800ED5D0 /* 86CBC 800ED80C 00021400 */ sll $v0, $v0, 0x10 /* 86CC0 800ED810 00021C03 */ sra $v1, $v0, 0x10 /* 86CC4 800ED814 44830000 */ mtc1 $v1, $f0 -/* 86CC8 800ED818 00000000 */ nop +/* 86CC8 800ED818 00000000 */ nop /* 86CCC 800ED81C 46800020 */ cvt.s.w $f0, $f0 /* 86CD0 800ED820 46003200 */ add.s $f8, $f6, $f0 /* 86CD4 800ED824 3C014000 */ lui $at, 0x4000 /* 86CD8 800ED828 44815000 */ mtc1 $at, $f10 -/* 86CDC 800ED82C 00000000 */ nop +/* 86CDC 800ED82C 00000000 */ nop /* 86CE0 800ED830 460A4000 */ add.s $f0, $f8, $f10 /* 86CE4 800ED834 C604003C */ lwc1 $f4, 0x3c($s0) /* 86CE8 800ED838 4600203E */ c.le.s $f4, $f0 -/* 86CEC 800ED83C 00000000 */ nop +/* 86CEC 800ED83C 00000000 */ nop /* 86CF0 800ED840 45000024 */ bc1f .L800ED8D4 -/* 86CF4 800ED844 00000000 */ nop +/* 86CF4 800ED844 00000000 */ nop /* 86CF8 800ED848 C6420054 */ lwc1 $f2, 0x54($s2) /* 86CFC 800ED84C 44800000 */ mtc1 $zero, $f0 -/* 86D00 800ED850 00000000 */ nop +/* 86D00 800ED850 00000000 */ nop /* 86D04 800ED854 46001032 */ c.eq.s $f2, $f0 -/* 86D08 800ED858 00000000 */ nop +/* 86D08 800ED858 00000000 */ nop /* 86D0C 800ED85C 4501000C */ bc1t .L800ED890 /* 86D10 800ED860 000217C2 */ srl $v0, $v0, 0x1f /* 86D14 800ED864 00621021 */ addu $v0, $v1, $v0 /* 86D18 800ED868 00021043 */ sra $v0, $v0, 1 /* 86D1C 800ED86C 44820000 */ mtc1 $v0, $f0 -/* 86D20 800ED870 00000000 */ nop +/* 86D20 800ED870 00000000 */ nop /* 86D24 800ED874 46800020 */ cvt.s.w $f0, $f0 /* 86D28 800ED878 46003000 */ add.s $f0, $f6, $f0 /* 86D2C 800ED87C 460A0000 */ add.s $f0, $f0, $f10 @@ -188,9 +188,9 @@ glabel func_800ED5D0 .L800ED890: /* 86D40 800ED890 C642002C */ lwc1 $f2, 0x2c($s2) /* 86D44 800ED894 4602303C */ c.lt.s $f6, $f2 -/* 86D48 800ED898 00000000 */ nop +/* 86D48 800ED898 00000000 */ nop /* 86D4C 800ED89C 45000005 */ bc1f .L800ED8B4 -/* 86D50 800ED8A0 00000000 */ nop +/* 86D50 800ED8A0 00000000 */ nop /* 86D54 800ED8A4 3C014120 */ lui $at, 0x4120 /* 86D58 800ED8A8 44810000 */ mtc1 $at, $f0 /* 86D5C 800ED8AC 0803B631 */ j .L800ED8C4 @@ -198,7 +198,7 @@ glabel func_800ED5D0 .L800ED8B4: /* 86D64 800ED8B4 3C014120 */ lui $at, 0x4120 /* 86D68 800ED8B8 44810000 */ mtc1 $at, $f0 -/* 86D6C 800ED8BC 00000000 */ nop +/* 86D6C 800ED8BC 00000000 */ nop /* 86D70 800ED8C0 46003000 */ add.s $f0, $f6, $f0 .L800ED8C4: /* 86D74 800ED8C4 3C013E80 */ lui $at, 0x3e80 @@ -209,22 +209,22 @@ glabel func_800ED5D0 /* 86D84 800ED8D4 864200B0 */ lh $v0, 0xb0($s2) /* 86D88 800ED8D8 C642002C */ lwc1 $f2, 0x2c($s2) /* 86D8C 800ED8DC 44820000 */ mtc1 $v0, $f0 -/* 86D90 800ED8E0 00000000 */ nop +/* 86D90 800ED8E0 00000000 */ nop /* 86D94 800ED8E4 46800020 */ cvt.s.w $f0, $f0 /* 86D98 800ED8E8 46001080 */ add.s $f2, $f2, $f0 /* 86D9C 800ED8EC 4606103C */ c.lt.s $f2, $f6 -/* 86DA0 800ED8F0 00000000 */ nop +/* 86DA0 800ED8F0 00000000 */ nop /* 86DA4 800ED8F4 4500001C */ bc1f .L800ED968 -/* 86DA8 800ED8F8 00000000 */ nop +/* 86DA8 800ED8F8 00000000 */ nop /* 86DAC 800ED8FC 46044081 */ sub.s $f2, $f8, $f4 /* 86DB0 800ED900 3C013E00 */ lui $at, 0x3e00 /* 86DB4 800ED904 44810000 */ mtc1 $at, $f0 -/* 86DB8 800ED908 00000000 */ nop +/* 86DB8 800ED908 00000000 */ nop /* 86DBC 800ED90C 46001082 */ mul.s $f2, $f2, $f0 -/* 86DC0 800ED910 00000000 */ nop +/* 86DC0 800ED910 00000000 */ nop /* 86DC4 800ED914 860200A8 */ lh $v0, 0xa8($s0) /* 86DC8 800ED918 44820000 */ mtc1 $v0, $f0 -/* 86DCC 800ED91C 00000000 */ nop +/* 86DCC 800ED91C 00000000 */ nop /* 86DD0 800ED920 46800020 */ cvt.s.w $f0, $f0 /* 86DD4 800ED924 46003000 */ add.s $f0, $f6, $f0 /* 86DD8 800ED928 C608003C */ lwc1 $f8, 0x3c($s0) @@ -232,29 +232,29 @@ glabel func_800ED5D0 /* 86DE0 800ED930 3C028010 */ lui $v0, %hi(D_800F84F8) /* 86DE4 800ED934 244284F8 */ addiu $v0, $v0, %lo(D_800F84F8) /* 86DE8 800ED938 4600203E */ c.le.s $f4, $f0 -/* 86DEC 800ED93C 00000000 */ nop +/* 86DEC 800ED93C 00000000 */ nop /* 86DF0 800ED940 45000015 */ bc1f .L800ED998 /* 86DF4 800ED944 E4420000 */ swc1 $f2, ($v0) /* 86DF8 800ED948 46080001 */ sub.s $f0, $f0, $f8 /* 86DFC 800ED94C 3C013E80 */ lui $at, 0x3e80 /* 86E00 800ED950 44811000 */ mtc1 $at, $f2 -/* 86E04 800ED954 00000000 */ nop +/* 86E04 800ED954 00000000 */ nop /* 86E08 800ED958 46020002 */ mul.s $f0, $f0, $f2 -/* 86E0C 800ED95C 00000000 */ nop +/* 86E0C 800ED95C 00000000 */ nop /* 86E10 800ED960 0803B666 */ j .L800ED998 /* 86E14 800ED964 E4400000 */ swc1 $f0, ($v0) .L800ED968: /* 86E18 800ED968 3C0140A0 */ lui $at, 0x40a0 /* 86E1C 800ED96C 44810000 */ mtc1 $at, $f0 -/* 86E20 800ED970 00000000 */ nop +/* 86E20 800ED970 00000000 */ nop /* 86E24 800ED974 46001000 */ add.s $f0, $f2, $f0 /* 86E28 800ED978 46040001 */ sub.s $f0, $f0, $f4 /* 86E2C 800ED97C 3C013D80 */ lui $at, 0x3d80 /* 86E30 800ED980 44811000 */ mtc1 $at, $f2 -/* 86E34 800ED984 00000000 */ nop +/* 86E34 800ED984 00000000 */ nop .L800ED988: /* 86E38 800ED988 46020002 */ mul.s $f0, $f0, $f2 -/* 86E3C 800ED98C 00000000 */ nop +/* 86E3C 800ED98C 00000000 */ nop /* 86E40 800ED990 3C018010 */ lui $at, %hi(D_800F84F8) /* 86E44 800ED994 E42084F8 */ swc1 $f0, %lo(D_800F84F8)($at) .L800ED998: diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s b/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s index d5f452c226..68b32168e9 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800ED9F8.s @@ -26,7 +26,7 @@ glabel func_800ED9F8 /* 86EFC 800EDA4C 00220821 */ addu $at, $at, $v0 /* 86F00 800EDA50 8C22C218 */ lw $v0, %lo(D_8010C218)($at) /* 86F04 800EDA54 00400008 */ jr $v0 -/* 86F08 800EDA58 00000000 */ nop +/* 86F08 800EDA58 00000000 */ nop /* 86F0C 800EDA5C 3C038011 */ lui $v1, %hi(D_8010CD38) /* 86F10 800EDA60 2463CD38 */ addiu $v1, $v1, %lo(D_8010CD38) /* 86F14 800EDA64 44806000 */ mtc1 $zero, $f12 @@ -59,18 +59,18 @@ glabel func_800ED9F8 /* 86F80 800EDAD0 460A4081 */ sub.s $f2, $f8, $f10 /* 86F84 800EDAD4 3C013F00 */ lui $at, 0x3f00 /* 86F88 800EDAD8 44810000 */ mtc1 $at, $f0 -/* 86F8C 800EDADC 00000000 */ nop +/* 86F8C 800EDADC 00000000 */ nop /* 86F90 800EDAE0 46001302 */ mul.s $f12, $f2, $f0 -/* 86F94 800EDAE4 00000000 */ nop +/* 86F94 800EDAE4 00000000 */ nop /* 86F98 800EDAE8 46083000 */ add.s $f0, $f6, $f8 .L800EDAEC: /* 86F9C 800EDAEC 460C0000 */ add.s $f0, $f0, $f12 /* 86FA0 800EDAF0 46040001 */ sub.s $f0, $f0, $f4 /* 86FA4 800EDAF4 3C013E00 */ lui $at, 0x3e00 /* 86FA8 800EDAF8 44811000 */ mtc1 $at, $f2 -/* 86FAC 800EDAFC 00000000 */ nop +/* 86FAC 800EDAFC 00000000 */ nop /* 86FB0 800EDB00 46020002 */ mul.s $f0, $f0, $f2 -/* 86FB4 800EDB04 00000000 */ nop +/* 86FB4 800EDB04 00000000 */ nop /* 86FB8 800EDB08 C62E0040 */ lwc1 $f14, 0x40($s1) /* 86FBC 800EDB0C C62C0038 */ lwc1 $f12, 0x38($s1) /* 86FC0 800EDB10 3C014040 */ lui $at, 0x4040 @@ -89,20 +89,20 @@ glabel func_800ED9F8 /* 86FF4 800EDB44 E7A0002C */ swc1 $f0, 0x2c($sp) /* 86FF8 800EDB48 46002021 */ cvt.d.s $f0, $f4 /* 86FFC 800EDB4C 4620103E */ c.le.d $f2, $f0 -/* 87000 800EDB50 00000000 */ nop +/* 87000 800EDB50 00000000 */ nop /* 87004 800EDB54 45000033 */ bc1f .L800EDC24 -/* 87008 800EDB58 00000000 */ nop +/* 87008 800EDB58 00000000 */ nop /* 8700C 800EDB5C C622003C */ lwc1 $f2, 0x3c($s1) /* 87010 800EDB60 C660002C */ lwc1 $f0, 0x2c($s3) /* 87014 800EDB64 4602003E */ c.le.s $f0, $f2 -/* 87018 800EDB68 00000000 */ nop +/* 87018 800EDB68 00000000 */ nop /* 8701C 800EDB6C 45000029 */ bc1f .L800EDC14 -/* 87020 800EDB70 00000000 */ nop +/* 87020 800EDB70 00000000 */ nop /* 87024 800EDB74 3C013E80 */ lui $at, 0x3e80 /* 87028 800EDB78 44810000 */ mtc1 $at, $f0 -/* 8702C 800EDB7C 00000000 */ nop +/* 8702C 800EDB7C 00000000 */ nop /* 87030 800EDB80 46002002 */ mul.s $f0, $f4, $f0 -/* 87034 800EDB84 00000000 */ nop +/* 87034 800EDB84 00000000 */ nop /* 87038 800EDB88 0803B709 */ j .L800EDC24 /* 8703C 800EDB8C E6200018 */ swc1 $f0, 0x18($s1) .L800EDB90: @@ -145,21 +145,21 @@ glabel func_800ED9F8 .L800EDC14: /* 870C4 800EDC14 3C014100 */ lui $at, 0x4100 /* 870C8 800EDC18 44810000 */ mtc1 $at, $f0 -/* 870CC 800EDC1C 00000000 */ nop +/* 870CC 800EDC1C 00000000 */ nop /* 870D0 800EDC20 E6200018 */ swc1 $f0, 0x18($s1) .L800EDC24: /* 870D4 800EDC24 3C018011 */ lui $at, %hi(D_8010CFC0) /* 870D8 800EDC28 C422CFC0 */ lwc1 $f2, %lo(D_8010CFC0)($at) /* 870DC 800EDC2C 3C0141A0 */ lui $at, 0x41a0 /* 870E0 800EDC30 44810000 */ mtc1 $at, $f0 -/* 870E4 800EDC34 00000000 */ nop +/* 870E4 800EDC34 00000000 */ nop /* 870E8 800EDC38 4600103C */ c.lt.s $f2, $f0 -/* 870EC 800EDC3C 00000000 */ nop +/* 870EC 800EDC3C 00000000 */ nop /* 870F0 800EDC40 45000005 */ bc1f .L800EDC58 -/* 870F4 800EDC44 00000000 */ nop +/* 870F4 800EDC44 00000000 */ nop /* 870F8 800EDC48 3C014080 */ lui $at, 0x4080 /* 870FC 800EDC4C 44810000 */ mtc1 $at, $f0 -/* 87100 800EDC50 00000000 */ nop +/* 87100 800EDC50 00000000 */ nop /* 87104 800EDC54 E6200018 */ swc1 $f0, 0x18($s1) .L800EDC58: /* 87108 800EDC58 3C128011 */ lui $s2, %hi(D_8010CFBC) @@ -172,7 +172,7 @@ glabel func_800ED9F8 /* 87120 800EDC70 4406B000 */ mfc1 $a2, $f22 /* 87124 800EDC74 4407A000 */ mfc1 $a3, $f20 /* 87128 800EDC78 0C00A720 */ jal atan2 -/* 8712C 800EDC7C 00000000 */ nop +/* 8712C 800EDC7C 00000000 */ nop /* 87130 800EDC80 C7AC0020 */ lwc1 $f12, 0x20($sp) /* 87134 800EDC84 C7AE0028 */ lwc1 $f14, 0x28($sp) /* 87138 800EDC88 4406B000 */ mfc1 $a2, $f22 @@ -183,44 +183,44 @@ glabel func_800ED9F8 /* 8714C 800EDC9C C6260018 */ lwc1 $f6, 0x18($s1) /* 87150 800EDCA0 46000106 */ mov.s $f4, $f0 /* 87154 800EDCA4 4604303C */ c.lt.s $f6, $f4 -/* 87158 800EDCA8 00000000 */ nop +/* 87158 800EDCA8 00000000 */ nop /* 8715C 800EDCAC 45000026 */ bc1f .L800EDD48 -/* 87160 800EDCB0 00000000 */ nop +/* 87160 800EDCB0 00000000 */ nop /* 87164 800EDCB4 C622003C */ lwc1 $f2, 0x3c($s1) /* 87168 800EDCB8 C660002C */ lwc1 $f0, 0x2c($s3) /* 8716C 800EDCBC 4602003E */ c.le.s $f0, $f2 -/* 87170 800EDCC0 00000000 */ nop +/* 87170 800EDCC0 00000000 */ nop /* 87174 800EDCC4 45020011 */ bc1fl .L800EDD0C /* 87178 800EDCC8 460030A1 */ cvt.d.s $f2, $f6 /* 8717C 800EDCCC 3C013E80 */ lui $at, 0x3e80 /* 87180 800EDCD0 44810000 */ mtc1 $at, $f0 -/* 87184 800EDCD4 00000000 */ nop +/* 87184 800EDCD4 00000000 */ nop /* 87188 800EDCD8 46002002 */ mul.s $f0, $f4, $f0 -/* 8718C 800EDCDC 00000000 */ nop +/* 8718C 800EDCDC 00000000 */ nop /* 87190 800EDCE0 4606003E */ c.le.s $f0, $f6 -/* 87194 800EDCE4 00000000 */ nop +/* 87194 800EDCE4 00000000 */ nop /* 87198 800EDCE8 45030033 */ bc1tl .L800EDDB8 /* 8719C 800EDCEC E6200018 */ swc1 $f0, 0x18($s1) /* 871A0 800EDCF0 3C013D80 */ lui $at, 0x3d80 /* 871A4 800EDCF4 44810000 */ mtc1 $at, $f0 -/* 871A8 800EDCF8 00000000 */ nop +/* 871A8 800EDCF8 00000000 */ nop /* 871AC 800EDCFC 46002002 */ mul.s $f0, $f4, $f0 -/* 871B0 800EDD00 00000000 */ nop +/* 871B0 800EDD00 00000000 */ nop /* 871B4 800EDD04 0803B6E6 */ j .L800EDB98 /* 871B8 800EDD08 46003000 */ add.s $f0, $f6, $f0 .L800EDD0C: /* 871BC 800EDD0C 3C014018 */ lui $at, 0x4018 /* 871C0 800EDD10 44810800 */ mtc1 $at, $f1 /* 871C4 800EDD14 44800000 */ mtc1 $zero, $f0 -/* 871C8 800EDD18 00000000 */ nop +/* 871C8 800EDD18 00000000 */ nop /* 871CC 800EDD1C 4622003C */ c.lt.d $f0, $f2 -/* 871D0 800EDD20 00000000 */ nop +/* 871D0 800EDD20 00000000 */ nop /* 871D4 800EDD24 4501FF9A */ bc1t .L800EDB90 -/* 871D8 800EDD28 00000000 */ nop +/* 871D8 800EDD28 00000000 */ nop /* 871DC 800EDD2C 3C013FF0 */ lui $at, 0x3ff0 /* 871E0 800EDD30 44810800 */ mtc1 $at, $f1 /* 871E4 800EDD34 44800000 */ mtc1 $zero, $f0 -/* 871E8 800EDD38 00000000 */ nop +/* 871E8 800EDD38 00000000 */ nop /* 871EC 800EDD3C 46201000 */ add.d $f0, $f2, $f0 /* 871F0 800EDD40 0803B6E6 */ j .L800EDB98 /* 871F4 800EDD44 46200020 */ cvt.s.d $f0, $f0 @@ -229,7 +229,7 @@ glabel func_800ED9F8 /* 871FC 800EDD4C 3C028011 */ lui $v0, %hi(D_8010CFB8) /* 87200 800EDD50 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) /* 87204 800EDD54 1062FF92 */ beq $v1, $v0, .L800EDBA0 -/* 87208 800EDD58 00000000 */ nop +/* 87208 800EDD58 00000000 */ nop /* 8720C 800EDD5C C62C0038 */ lwc1 $f12, 0x38($s1) /* 87210 800EDD60 C62E0040 */ lwc1 $f14, 0x40($s1) /* 87214 800EDD64 8E660028 */ lw $a2, 0x28($s3) @@ -238,7 +238,7 @@ glabel func_800ED9F8 /* 87220 800EDD70 3C018011 */ lui $at, %hi(D_8010CFC0) /* 87224 800EDD74 C422CFC0 */ lwc1 $f2, %lo(D_8010CFC0)($at) /* 87228 800EDD78 4602003E */ c.le.s $f0, $f2 -/* 8722C 800EDD7C 00000000 */ nop +/* 8722C 800EDD7C 00000000 */ nop /* 87230 800EDD80 4501FF94 */ bc1t .L800EDBD4 /* 87234 800EDD84 E7A0002C */ swc1 $f0, 0x2c($sp) /* 87238 800EDD88 8E420000 */ lw $v0, ($s2) @@ -267,7 +267,7 @@ glabel func_800ED9F8 /* 8728C 800EDDDC 3C018011 */ lui $at, %hi(D_8010CFC8) /* 87290 800EDDE0 A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) /* 87294 800EDDE4 0803BA5A */ j .L800EE968 -/* 87298 800EDDE8 00000000 */ nop +/* 87298 800EDDE8 00000000 */ nop /* 8729C 800EDDEC 3C048011 */ lui $a0, %hi(D_8010CFBC) /* 872A0 800EDDF0 2484CFBC */ addiu $a0, $a0, %lo(D_8010CFBC) /* 872A4 800EDDF4 8C830000 */ lw $v1, ($a0) @@ -301,10 +301,10 @@ glabel func_800ED9F8 /* 87310 800EDE60 86020000 */ lh $v0, ($s0) /* 87314 800EDE64 24120001 */ addiu $s2, $zero, 1 /* 87318 800EDE68 14520005 */ bne $v0, $s2, .L800EDE80 -/* 8731C 800EDE6C 00000000 */ nop +/* 8731C 800EDE6C 00000000 */ nop /* 87320 800EDE70 3C0140C0 */ lui $at, 0x40c0 /* 87324 800EDE74 44810000 */ mtc1 $at, $f0 -/* 87328 800EDE78 00000000 */ nop +/* 87328 800EDE78 00000000 */ nop /* 8732C 800EDE7C E6200018 */ swc1 $f0, 0x18($s1) .L800EDE80: /* 87330 800EDE80 C62C0038 */ lwc1 $f12, 0x38($s1) @@ -325,12 +325,12 @@ glabel func_800ED9F8 /* 8736C 800EDEBC 44801000 */ mtc1 $zero, $f2 /* 87370 800EDEC0 46000021 */ cvt.d.s $f0, $f0 /* 87374 800EDEC4 4620103C */ c.lt.d $f2, $f0 -/* 87378 800EDEC8 00000000 */ nop +/* 87378 800EDEC8 00000000 */ nop /* 8737C 800EDECC 45000005 */ bc1f .L800EDEE4 -/* 87380 800EDED0 00000000 */ nop +/* 87380 800EDED0 00000000 */ nop /* 87384 800EDED4 3C014248 */ lui $at, 0x4248 /* 87388 800EDED8 44810000 */ mtc1 $at, $f0 -/* 8738C 800EDEDC 00000000 */ nop +/* 8738C 800EDEDC 00000000 */ nop /* 87390 800EDEE0 E6200010 */ swc1 $f0, 0x10($s1) .L800EDEE4: /* 87394 800EDEE4 C6220064 */ lwc1 $f2, 0x64($s1) @@ -340,7 +340,7 @@ glabel func_800ED9F8 /* 873A4 800EDEF4 46000086 */ mov.s $f2, $f0 /* 873A8 800EDEF8 E7A0002C */ swc1 $f0, 0x2c($sp) /* 873AC 800EDEFC 4604103C */ c.lt.s $f2, $f4 -/* 873B0 800EDF00 00000000 */ nop +/* 873B0 800EDF00 00000000 */ nop /* 873B4 800EDF04 45000002 */ bc1f .L800EDF10 /* 873B8 800EDF08 E7A40024 */ swc1 $f4, 0x24($sp) /* 873BC 800EDF0C E7A4002C */ swc1 $f4, 0x2c($sp) @@ -352,9 +352,9 @@ glabel func_800ED9F8 /* 873D0 800EDF20 C420CFC0 */ lwc1 $f0, %lo(D_8010CFC0)($at) /* 873D4 800EDF24 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 873D8 800EDF28 4600103C */ c.lt.s $f2, $f0 -/* 873DC 800EDF2C 00000000 */ nop +/* 873DC 800EDF2C 00000000 */ nop /* 873E0 800EDF30 4500000B */ bc1f .L800EDF60 -/* 873E4 800EDF34 00000000 */ nop +/* 873E4 800EDF34 00000000 */ nop /* 873E8 800EDF38 C62C0038 */ lwc1 $f12, 0x38($s1) /* 873EC 800EDF3C C62E0040 */ lwc1 $f14, 0x40($s1) /* 873F0 800EDF40 AE20001C */ sw $zero, 0x1c($s1) @@ -370,7 +370,7 @@ glabel func_800ED9F8 /* 87414 800EDF64 46001003 */ div.s $f0, $f2, $f0 /* 87418 800EDF68 4600040D */ trunc.w.s $f16, $f0 /* 8741C 800EDF6C 44028000 */ mfc1 $v0, $f16 -/* 87420 800EDF70 00000000 */ nop +/* 87420 800EDF70 00000000 */ nop /* 87424 800EDF74 A622008E */ sh $v0, 0x8e($s1) /* 87428 800EDF78 00021400 */ sll $v0, $v0, 0x10 /* 8742C 800EDF7C 00021403 */ sra $v0, $v0, 0x10 @@ -382,7 +382,7 @@ glabel func_800ED9F8 /* 87440 800EDF90 8622008E */ lh $v0, 0x8e($s1) /* 87444 800EDF94 C6200010 */ lwc1 $f0, 0x10($s1) /* 87448 800EDF98 44821000 */ mtc1 $v0, $f2 -/* 8744C 800EDF9C 00000000 */ nop +/* 8744C 800EDF9C 00000000 */ nop /* 87450 800EDFA0 468010A0 */ cvt.s.w $f2, $f2 /* 87454 800EDFA4 46020003 */ div.s $f0, $f0, $f2 /* 87458 800EDFA8 0803B7ED */ j .L800EDFB4 @@ -393,17 +393,17 @@ glabel func_800ED9F8 /* 87464 800EDFB4 8622008E */ lh $v0, 0x8e($s1) /* 87468 800EDFB8 C6220014 */ lwc1 $f2, 0x14($s1) /* 8746C 800EDFBC 44822000 */ mtc1 $v0, $f4 -/* 87470 800EDFC0 00000000 */ nop +/* 87470 800EDFC0 00000000 */ nop /* 87474 800EDFC4 46802120 */ cvt.s.w $f4, $f4 /* 87478 800EDFC8 46041082 */ mul.s $f2, $f2, $f4 -/* 8747C 800EDFCC 00000000 */ nop +/* 8747C 800EDFCC 00000000 */ nop /* 87480 800EDFD0 46041082 */ mul.s $f2, $f2, $f4 -/* 87484 800EDFD4 00000000 */ nop +/* 87484 800EDFD4 00000000 */ nop /* 87488 800EDFD8 3C013F00 */ lui $at, 0x3f00 /* 8748C 800EDFDC 44810000 */ mtc1 $at, $f0 -/* 87490 800EDFE0 00000000 */ nop +/* 87490 800EDFE0 00000000 */ nop /* 87494 800EDFE4 46001082 */ mul.s $f2, $f2, $f0 -/* 87498 800EDFE8 00000000 */ nop +/* 87498 800EDFE8 00000000 */ nop /* 8749C 800EDFEC C7A00024 */ lwc1 $f0, 0x24($sp) /* 874A0 800EDFF0 46020000 */ add.s $f0, $f0, $f2 /* 874A4 800EDFF4 3C014034 */ lui $at, 0x4034 @@ -413,12 +413,12 @@ glabel func_800ED9F8 /* 874B4 800EE004 E620001C */ swc1 $f0, 0x1c($s1) /* 874B8 800EE008 46000021 */ cvt.d.s $f0, $f0 /* 874BC 800EE00C 4620103C */ c.lt.d $f2, $f0 -/* 874C0 800EE010 00000000 */ nop +/* 874C0 800EE010 00000000 */ nop /* 874C4 800EE014 45000005 */ bc1f .L800EE02C -/* 874C8 800EE018 00000000 */ nop +/* 874C8 800EE018 00000000 */ nop /* 874CC 800EE01C 3C0141A0 */ lui $at, 0x41a0 /* 874D0 800EE020 44810000 */ mtc1 $at, $f0 -/* 874D4 800EE024 00000000 */ nop +/* 874D4 800EE024 00000000 */ nop /* 874D8 800EE028 E620001C */ swc1 $f0, 0x1c($s1) .L800EE02C: /* 874DC 800EE02C 3C038011 */ lui $v1, %hi(D_8010CFD8) @@ -446,7 +446,7 @@ glabel func_800ED9F8 /* 87534 800EE084 C622003C */ lwc1 $f2, 0x3c($s1) /* 87538 800EE088 46001080 */ add.s $f2, $f2, $f0 /* 8753C 800EE08C 4480A000 */ mtc1 $zero, $f20 -/* 87540 800EE090 00000000 */ nop +/* 87540 800EE090 00000000 */ nop /* 87544 800EE094 4614003E */ c.le.s $f0, $f20 /* 87548 800EE098 E620001C */ swc1 $f0, 0x1c($s1) /* 8754C 800EE09C 4500000A */ bc1f .L800EE0C8 @@ -467,15 +467,15 @@ glabel func_800ED9F8 /* 87584 800EE0D4 0220202D */ daddu $a0, $s1, $zero /* 87588 800EE0D8 C620001C */ lwc1 $f0, 0x1c($s1) /* 8758C 800EE0DC 4614003E */ c.le.s $f0, $f20 -/* 87590 800EE0E0 00000000 */ nop +/* 87590 800EE0E0 00000000 */ nop /* 87594 800EE0E4 45000220 */ bc1f .L800EE968 -/* 87598 800EE0E8 00000000 */ nop +/* 87598 800EE0E8 00000000 */ nop /* 8759C 800EE0EC C622003C */ lwc1 $f2, 0x3c($s1) /* 875A0 800EE0F0 C6200064 */ lwc1 $f0, 0x64($s1) /* 875A4 800EE0F4 4600103C */ c.lt.s $f2, $f0 -/* 875A8 800EE0F8 00000000 */ nop +/* 875A8 800EE0F8 00000000 */ nop /* 875AC 800EE0FC 4500021A */ bc1f .L800EE968 -/* 875B0 800EE100 00000000 */ nop +/* 875B0 800EE100 00000000 */ nop /* 875B4 800EE104 C62C0038 */ lwc1 $f12, 0x38($s1) /* 875B8 800EE108 3C038011 */ lui $v1, %hi(D_8010CFD8) /* 875BC 800EE10C 8C63CFD8 */ lw $v1, %lo(D_8010CFD8)($v1) @@ -504,7 +504,7 @@ glabel func_800ED9F8 /* 87618 800EE168 3C018011 */ lui $at, %hi(D_8010CFC0) /* 8761C 800EE16C C422CFC0 */ lwc1 $f2, %lo(D_8010CFC0)($at) /* 87620 800EE170 4602003C */ c.lt.s $f0, $f2 -/* 87624 800EE174 00000000 */ nop +/* 87624 800EE174 00000000 */ nop /* 87628 800EE178 450001FB */ bc1f .L800EE968 /* 8762C 800EE17C E7A0002C */ swc1 $f0, 0x2c($sp) /* 87630 800EE180 2402000F */ addiu $v0, $zero, 0xf @@ -532,14 +532,14 @@ glabel func_800ED9F8 /* 87688 800EE1D8 3C018011 */ lui $at, %hi(D_8010CFC0) /* 8768C 800EE1DC C422CFC0 */ lwc1 $f2, %lo(D_8010CFC0)($at) /* 87690 800EE1E0 4602003E */ c.le.s $f0, $f2 -/* 87694 800EE1E4 00000000 */ nop +/* 87694 800EE1E4 00000000 */ nop /* 87698 800EE1E8 450000A5 */ bc1f .L800EE480 /* 8769C 800EE1EC E7A0002C */ swc1 $f0, 0x2c($sp) /* 876A0 800EE1F0 3C048011 */ lui $a0, %hi(D_8010CFCA) /* 876A4 800EE1F4 2484CFCA */ addiu $a0, $a0, %lo(D_8010CFCA) /* 876A8 800EE1F8 84820000 */ lh $v0, ($a0) /* 876AC 800EE1FC 1440002D */ bnez $v0, .L800EE2B4 -/* 876B0 800EE200 00000000 */ nop +/* 876B0 800EE200 00000000 */ nop /* 876B4 800EE204 962200A8 */ lhu $v0, 0xa8($s1) /* 876B8 800EE208 C660002C */ lwc1 $f0, 0x2c($s3) /* 876BC 800EE20C 00021400 */ sll $v0, $v0, 0x10 @@ -550,7 +550,7 @@ glabel func_800ED9F8 /* 876D0 800EE220 00031843 */ sra $v1, $v1, 1 /* 876D4 800EE224 00431023 */ subu $v0, $v0, $v1 /* 876D8 800EE228 44821000 */ mtc1 $v0, $f2 -/* 876DC 800EE22C 00000000 */ nop +/* 876DC 800EE22C 00000000 */ nop /* 876E0 800EE230 468010A0 */ cvt.s.w $f2, $f2 /* 876E4 800EE234 46020000 */ add.s $f0, $f0, $f2 /* 876E8 800EE238 C622003C */ lwc1 $f2, 0x3c($s1) @@ -560,7 +560,7 @@ glabel func_800ED9F8 /* 876F8 800EE248 44801000 */ mtc1 $zero, $f2 /* 876FC 800EE24C 46000021 */ cvt.d.s $f0, $f0 /* 87700 800EE250 46220002 */ mul.d $f0, $f0, $f2 -/* 87704 800EE254 00000000 */ nop +/* 87704 800EE254 00000000 */ nop /* 87708 800EE258 3C038011 */ lui $v1, %hi(D_8010CFD8) /* 8770C 800EE25C 8C63CFD8 */ lw $v1, %lo(D_8010CFD8)($v1) /* 87710 800EE260 000310C0 */ sll $v0, $v1, 3 @@ -583,7 +583,7 @@ glabel func_800ED9F8 /* 87754 800EE2A4 50620076 */ beql $v1, $v0, .L800EE480 /* 87758 800EE2A8 A4800000 */ sh $zero, ($a0) /* 8775C 800EE2AC 0803B920 */ j .L800EE480 -/* 87760 800EE2B0 00000000 */ nop +/* 87760 800EE2B0 00000000 */ nop .L800EE2B4: /* 87764 800EE2B4 C66200A8 */ lwc1 $f2, 0xa8($s3) /* 87768 800EE2B8 3C014334 */ lui $at, 0x4334 @@ -593,7 +593,7 @@ glabel func_800ED9F8 /* 87778 800EE2C8 3C01C2B4 */ lui $at, 0xc2b4 /* 8777C 800EE2CC 44810000 */ mtc1 $at, $f0 /* 87780 800EE2D0 45000003 */ bc1f .L800EE2E0 -/* 87784 800EE2D4 00000000 */ nop +/* 87784 800EE2D4 00000000 */ nop /* 87788 800EE2D8 3C0142B4 */ lui $at, 0x42b4 /* 8778C 800EE2DC 44810000 */ mtc1 $at, $f0 .L800EE2E0: @@ -630,7 +630,7 @@ glabel func_800ED9F8 /* 87808 800EE358 44811000 */ mtc1 $at, $f2 /* 8780C 800EE35C E7A0002C */ swc1 $f0, 0x2c($sp) /* 87810 800EE360 4600103C */ c.lt.s $f2, $f0 -/* 87814 800EE364 00000000 */ nop +/* 87814 800EE364 00000000 */ nop /* 87818 800EE368 45000022 */ bc1f .L800EE3F4 /* 8781C 800EE36C E6220018 */ swc1 $f2, 0x18($s1) /* 87820 800EE370 3C038011 */ lui $v1, %hi(D_8010CFD8) @@ -660,7 +660,7 @@ glabel func_800ED9F8 /* 8787C 800EE3CC 00021403 */ sra $v0, $v0, 0x10 /* 87880 800EE3D0 2842000B */ slti $v0, $v0, 0xb /* 87884 800EE3D4 14400023 */ bnez $v0, .L800EE464 -/* 87888 800EE3D8 00000000 */ nop +/* 87888 800EE3D8 00000000 */ nop /* 8788C 800EE3DC C6740080 */ lwc1 $f20, 0x80($s3) /* 87890 800EE3E0 AE200018 */ sw $zero, 0x18($s1) /* 87894 800EE3E4 AE200014 */ sw $zero, 0x14($s1) @@ -695,7 +695,7 @@ glabel func_800ED9F8 /* 87900 800EE450 2402000C */ addiu $v0, $zero, 0xc /* 87904 800EE454 826300B4 */ lb $v1, 0xb4($s3) /* 87908 800EE458 14620002 */ bne $v1, $v0, .L800EE464 -/* 8790C 800EE45C 00000000 */ nop +/* 8790C 800EE45C 00000000 */ nop .L800EE460: /* 87910 800EE460 A4800000 */ sh $zero, ($a0) .L800EE464: @@ -705,7 +705,7 @@ glabel func_800ED9F8 /* 87920 800EE470 0C00EA95 */ jal npc_move_heading /* 87924 800EE474 AC86000C */ sw $a2, 0xc($a0) /* 87928 800EE478 0803BA5A */ j .L800EE968 -/* 8792C 800EE47C 00000000 */ nop +/* 8792C 800EE47C 00000000 */ nop .L800EE480: /* 87930 800EE480 C62C0038 */ lwc1 $f12, 0x38($s1) /* 87934 800EE484 C62E0040 */ lwc1 $f14, 0x40($s1) @@ -715,7 +715,7 @@ glabel func_800ED9F8 /* 87944 800EE494 3C018011 */ lui $at, %hi(D_8010CFC0) /* 87948 800EE498 C422CFC0 */ lwc1 $f2, %lo(D_8010CFC0)($at) /* 8794C 800EE49C 4602003E */ c.le.s $f0, $f2 -/* 87950 800EE4A0 00000000 */ nop +/* 87950 800EE4A0 00000000 */ nop /* 87954 800EE4A4 45010130 */ bc1t .L800EE968 /* 87958 800EE4A8 E7A0002C */ swc1 $f0, 0x2c($sp) /* 8795C 800EE4AC 3C0142B4 */ lui $at, 0x42b4 @@ -727,13 +727,13 @@ glabel func_800ED9F8 .L800EE4C4: /* 87974 800EE4C4 82020000 */ lb $v0, ($s0) /* 87978 800EE4C8 14400024 */ bnez $v0, .L800EE55C -/* 8797C 800EE4CC 00000000 */ nop +/* 8797C 800EE4CC 00000000 */ nop /* 87980 800EE4D0 C62C0038 */ lwc1 $f12, 0x38($s1) /* 87984 800EE4D4 C62E0040 */ lwc1 $f14, 0x40($s1) /* 87988 800EE4D8 4406B000 */ mfc1 $a2, $f22 /* 8798C 800EE4DC 4407A000 */ mfc1 $a3, $f20 /* 87990 800EE4E0 0C00A720 */ jal atan2 -/* 87994 800EE4E4 00000000 */ nop +/* 87994 800EE4E4 00000000 */ nop /* 87998 800EE4E8 C62C0038 */ lwc1 $f12, 0x38($s1) /* 8799C 800EE4EC C62E0040 */ lwc1 $f14, 0x40($s1) /* 879A0 800EE4F0 8E660028 */ lw $a2, 0x28($s3) @@ -745,9 +745,9 @@ glabel func_800ED9F8 /* 879B8 800EE508 46000386 */ mov.s $f14, $f0 /* 879BC 800EE50C 46000005 */ abs.s $f0, $f0 /* 879C0 800EE510 4618003C */ c.lt.s $f0, $f24 -/* 879C4 800EE514 00000000 */ nop +/* 879C4 800EE514 00000000 */ nop /* 879C8 800EE518 45010010 */ bc1t .L800EE55C -/* 879CC 800EE51C 00000000 */ nop +/* 879CC 800EE51C 00000000 */ nop /* 879D0 800EE520 8E430000 */ lw $v1, ($s2) /* 879D4 800EE524 3C028011 */ lui $v0, %hi(D_8010CFB8) /* 879D8 800EE528 8C42CFB8 */ lw $v0, %lo(D_8010CFB8)($v0) @@ -768,24 +768,24 @@ glabel func_800ED9F8 /* 87A0C 800EE55C 3C018011 */ lui $at, %hi(D_8010CFC8) /* 87A10 800EE560 A420CFC8 */ sh $zero, %lo(D_8010CFC8)($at) /* 87A14 800EE564 0803BA5A */ j .L800EE968 -/* 87A18 800EE568 00000000 */ nop +/* 87A18 800EE568 00000000 */ nop /* 87A1C 800EE56C 8E620004 */ lw $v0, 4($s3) /* 87A20 800EE570 3C030010 */ lui $v1, 0x10 /* 87A24 800EE574 00431024 */ and $v0, $v0, $v1 /* 87A28 800EE578 144000FB */ bnez $v0, .L800EE968 -/* 87A2C 800EE57C 00000000 */ nop +/* 87A2C 800EE57C 00000000 */ nop /* 87A30 800EE580 3C038011 */ lui $v1, %hi(D_8010CFCE) /* 87A34 800EE584 8463CFCE */ lh $v1, %lo(D_8010CFCE)($v1) /* 87A38 800EE588 10600006 */ beqz $v1, .L800EE5A4 -/* 87A3C 800EE58C 00000000 */ nop +/* 87A3C 800EE58C 00000000 */ nop /* 87A40 800EE590 24020001 */ addiu $v0, $zero, 1 /* 87A44 800EE594 10620048 */ beq $v1, $v0, .L800EE6B8 -/* 87A48 800EE598 00000000 */ nop +/* 87A48 800EE598 00000000 */ nop /* 87A4C 800EE59C 0803BA5A */ j .L800EE968 -/* 87A50 800EE5A0 00000000 */ nop +/* 87A50 800EE5A0 00000000 */ nop .L800EE5A4: /* 87A54 800EE5A4 0C0394D2 */ jal func_800E5348 -/* 87A58 800EE5A8 00000000 */ nop +/* 87A58 800EE5A8 00000000 */ nop /* 87A5C 800EE5AC 3C014334 */ lui $at, 0x4334 /* 87A60 800EE5B0 44816000 */ mtc1 $at, $f12 /* 87A64 800EE5B4 0C00A6C9 */ jal clamp_angle @@ -800,7 +800,7 @@ glabel func_800ED9F8 /* 87A88 800EE5D8 866200B2 */ lh $v0, 0xb2($s3) /* 87A8C 800EE5DC 44070000 */ mfc1 $a3, $f0 /* 87A90 800EE5E0 44828000 */ mtc1 $v0, $f16 -/* 87A94 800EE5E4 00000000 */ nop +/* 87A94 800EE5E4 00000000 */ nop /* 87A98 800EE5E8 46808420 */ cvt.s.w $f16, $f16 /* 87A9C 800EE5EC 44068000 */ mfc1 $a2, $f16 /* 87AA0 800EE5F0 0C00A7E7 */ jal add_vec2D_polar @@ -828,7 +828,7 @@ glabel func_800ED9F8 /* 87AF8 800EE648 000310C0 */ sll $v0, $v1, 3 /* 87AFC 800EE64C 00431021 */ addu $v0, $v0, $v1 /* 87B00 800EE650 4622003C */ c.lt.d $f0, $f2 -/* 87B04 800EE654 00000000 */ nop +/* 87B04 800EE654 00000000 */ nop /* 87B08 800EE658 45000003 */ bc1f .L800EE668 /* 87B0C 800EE65C 00021080 */ sll $v0, $v0, 2 /* 87B10 800EE660 0803B99B */ j .L800EE66C @@ -868,7 +868,7 @@ glabel func_800ED9F8 /* 87B8C 800EE6DC 27A60024 */ addiu $a2, $sp, 0x24 /* 87B90 800EE6E0 E7A00028 */ swc1 $f0, 0x28($sp) /* 87B94 800EE6E4 44820000 */ mtc1 $v0, $f0 -/* 87B98 800EE6E8 00000000 */ nop +/* 87B98 800EE6E8 00000000 */ nop /* 87B9C 800EE6EC 46800020 */ cvt.s.w $f0, $f0 /* 87BA0 800EE6F0 E7A20020 */ swc1 $f2, 0x20($sp) /* 87BA4 800EE6F4 862200A8 */ lh $v0, 0xa8($s1) @@ -876,7 +876,7 @@ glabel func_800ED9F8 /* 87BAC 800EE6FC 24420001 */ addiu $v0, $v0, 1 /* 87BB0 800EE700 46001080 */ add.s $f2, $f2, $f0 /* 87BB4 800EE704 44820000 */ mtc1 $v0, $f0 -/* 87BB8 800EE708 00000000 */ nop +/* 87BB8 800EE708 00000000 */ nop /* 87BBC 800EE70C 46800020 */ cvt.s.w $f0, $f0 /* 87BC0 800EE710 27A2002C */ addiu $v0, $sp, 0x2c /* 87BC4 800EE714 E7A0002C */ swc1 $f0, 0x2c($sp) @@ -889,30 +889,30 @@ glabel func_800ED9F8 /* 87BE0 800EE730 2502FFFF */ addiu $v0, $t0, -1 /* 87BE4 800EE734 AD220000 */ sw $v0, ($t1) /* 87BE8 800EE738 44830000 */ mtc1 $v1, $f0 -/* 87BEC 800EE73C 00000000 */ nop +/* 87BEC 800EE73C 00000000 */ nop /* 87BF0 800EE740 46800020 */ cvt.s.w $f0, $f0 /* 87BF4 800EE744 0C0371DE */ jal func_800DC778 /* 87BF8 800EE748 E7A00018 */ swc1 $f0, 0x18($sp) /* 87BFC 800EE74C 14400017 */ bnez $v0, .L800EE7AC -/* 87C00 800EE750 00000000 */ nop +/* 87C00 800EE750 00000000 */ nop /* 87C04 800EE754 C624003C */ lwc1 $f4, 0x3c($s1) /* 87C08 800EE758 C666002C */ lwc1 $f6, 0x2c($s3) /* 87C0C 800EE75C 862200A8 */ lh $v0, 0xa8($s1) /* 87C10 800EE760 46062001 */ sub.s $f0, $f4, $f6 /* 87C14 800EE764 24420005 */ addiu $v0, $v0, 5 /* 87C18 800EE768 44821000 */ mtc1 $v0, $f2 -/* 87C1C 800EE76C 00000000 */ nop +/* 87C1C 800EE76C 00000000 */ nop /* 87C20 800EE770 468010A1 */ cvt.d.w $f2, $f2 /* 87C24 800EE774 46000021 */ cvt.d.s $f0, $f0 /* 87C28 800EE778 46200005 */ abs.d $f0, $f0 /* 87C2C 800EE77C 4620103C */ c.lt.d $f2, $f0 -/* 87C30 800EE780 00000000 */ nop +/* 87C30 800EE780 00000000 */ nop /* 87C34 800EE784 45000018 */ bc1f .L800EE7E8 -/* 87C38 800EE788 00000000 */ nop +/* 87C38 800EE788 00000000 */ nop /* 87C3C 800EE78C 46043001 */ sub.s $f0, $f6, $f4 /* 87C40 800EE790 3C014120 */ lui $at, 0x4120 /* 87C44 800EE794 44811000 */ mtc1 $at, $f2 -/* 87C48 800EE798 00000000 */ nop +/* 87C48 800EE798 00000000 */ nop /* 87C4C 800EE79C 46020003 */ div.s $f0, $f0, $f2 /* 87C50 800EE7A0 46002000 */ add.s $f0, $f4, $f0 /* 87C54 800EE7A4 0803B9FA */ j .L800EE7E8 @@ -921,16 +921,16 @@ glabel func_800ED9F8 /* 87C5C 800EE7AC 866200B0 */ lh $v0, 0xb0($s3) /* 87C60 800EE7B0 C660002C */ lwc1 $f0, 0x2c($s3) /* 87C64 800EE7B4 44821000 */ mtc1 $v0, $f2 -/* 87C68 800EE7B8 00000000 */ nop +/* 87C68 800EE7B8 00000000 */ nop /* 87C6C 800EE7BC 468010A0 */ cvt.s.w $f2, $f2 /* 87C70 800EE7C0 46020000 */ add.s $f0, $f0, $f2 /* 87C74 800EE7C4 C622003C */ lwc1 $f2, 0x3c($s1) /* 87C78 800EE7C8 46020001 */ sub.s $f0, $f0, $f2 /* 87C7C 800EE7CC 3C013E00 */ lui $at, 0x3e00 /* 87C80 800EE7D0 44812000 */ mtc1 $at, $f4 -/* 87C84 800EE7D4 00000000 */ nop +/* 87C84 800EE7D4 00000000 */ nop /* 87C88 800EE7D8 46040002 */ mul.s $f0, $f0, $f4 -/* 87C8C 800EE7DC 00000000 */ nop +/* 87C8C 800EE7DC 00000000 */ nop /* 87C90 800EE7E0 46001080 */ add.s $f2, $f2, $f0 /* 87C94 800EE7E4 E622003C */ swc1 $f2, 0x3c($s1) .L800EE7E8: @@ -955,18 +955,18 @@ glabel func_800ED9F8 /* 87CE0 800EE830 862200A8 */ lh $v0, 0xa8($s1) /* 87CE4 800EE834 27A60024 */ addiu $a2, $sp, 0x24 /* 87CE8 800EE838 44820000 */ mtc1 $v0, $f0 -/* 87CEC 800EE83C 00000000 */ nop +/* 87CEC 800EE83C 00000000 */ nop /* 87CF0 800EE840 46800020 */ cvt.s.w $f0, $f0 /* 87CF4 800EE844 E7A00018 */ swc1 $f0, 0x18($sp) /* 87CF8 800EE848 862200A6 */ lh $v0, 0xa6($s1) /* 87CFC 800EE84C 27A70028 */ addiu $a3, $sp, 0x28 /* 87D00 800EE850 44820000 */ mtc1 $v0, $f0 -/* 87D04 800EE854 00000000 */ nop +/* 87D04 800EE854 00000000 */ nop /* 87D08 800EE858 46800020 */ cvt.s.w $f0, $f0 /* 87D0C 800EE85C 0C0376B9 */ jal func_800DDAE4 /* 87D10 800EE860 E7A0001C */ swc1 $f0, 0x1c($sp) /* 87D14 800EE864 10400010 */ beqz $v0, .L800EE8A8 -/* 87D18 800EE868 00000000 */ nop +/* 87D18 800EE868 00000000 */ nop /* 87D1C 800EE86C C7A00020 */ lwc1 $f0, 0x20($sp) /* 87D20 800EE870 C6260038 */ lwc1 $f6, 0x38($s1) /* 87D24 800EE874 C7A20028 */ lwc1 $f2, 0x28($sp) @@ -988,7 +988,7 @@ glabel func_800ED9F8 /* 87D60 800EE8B0 0C00EA95 */ jal npc_move_heading /* 87D64 800EE8B4 0220202D */ daddu $a0, $s1, $zero /* 87D68 800EE8B8 0803BA5A */ j .L800EE968 -/* 87D6C 800EE8BC 00000000 */ nop +/* 87D6C 800EE8BC 00000000 */ nop .L800EE8C0: /* 87D70 800EE8C0 0C03BD17 */ jal clear_partner_move_history /* 87D74 800EE8C4 0220202D */ daddu $a0, $s1, $zero @@ -1022,7 +1022,7 @@ glabel func_800ED9F8 /* 87DE4 800EE934 0C03BE0B */ jal func_800EF82C /* 87DE8 800EE938 24050001 */ addiu $a1, $zero, 1 /* 87DEC 800EE93C 0803BA5A */ j .L800EE968 -/* 87DF0 800EE940 00000000 */ nop +/* 87DF0 800EE940 00000000 */ nop /* 87DF4 800EE944 3C028011 */ lui $v0, %hi(D_8010CFD8) /* 87DF8 800EE948 8C42CFD8 */ lw $v0, %lo(D_8010CFD8)($v0) /* 87DFC 800EE94C 000218C0 */ sll $v1, $v0, 3 diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EE9B8.s b/asm/nonmatchings/code_838b0_len_5900/func_800EE9B8.s index aea8fb4a95..4a0a04d5af 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EE9B8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EE9B8.s @@ -27,7 +27,7 @@ glabel func_800EE9B8 /* 87EC0 800EEA10 10600007 */ beqz $v1, .L800EEA30 /* 87EC4 800EEA14 0000102D */ daddu $v0, $zero, $zero /* 87EC8 800EEA18 0803BB25 */ j .L800EEC94 -/* 87ECC 800EEA1C 00000000 */ nop +/* 87ECC 800EEA1C 00000000 */ nop .L800EEA20: /* 87ED0 800EEA20 1062008C */ beq $v1, $v0, .L800EEC54 /* 87ED4 800EEA24 0200202D */ daddu $a0, $s0, $zero @@ -56,7 +56,7 @@ glabel func_800EE9B8 /* 87F2C 800EEA7C 00621821 */ addu $v1, $v1, $v0 /* 87F30 800EEA80 00031843 */ sra $v1, $v1, 1 /* 87F34 800EEA84 44830000 */ mtc1 $v1, $f0 -/* 87F38 800EEA88 00000000 */ nop +/* 87F38 800EEA88 00000000 */ nop /* 87F3C 800EEA8C 46800020 */ cvt.s.w $f0, $f0 /* 87F40 800EEA90 4600F780 */ add.s $f30, $f30, $f0 /* 87F44 800EEA94 4406E000 */ mfc1 $a2, $f28 @@ -88,22 +88,22 @@ glabel func_800EE9B8 /* 87FAC 800EEAFC 8602008E */ lh $v0, 0x8e($s0) /* 87FB0 800EEB00 C6020014 */ lwc1 $f2, 0x14($s0) /* 87FB4 800EEB04 44823000 */ mtc1 $v0, $f6 -/* 87FB8 800EEB08 00000000 */ nop +/* 87FB8 800EEB08 00000000 */ nop /* 87FBC 800EEB0C 468031A0 */ cvt.s.w $f6, $f6 /* 87FC0 800EEB10 46061082 */ mul.s $f2, $f2, $f6 -/* 87FC4 800EEB14 00000000 */ nop +/* 87FC4 800EEB14 00000000 */ nop /* 87FC8 800EEB18 4614F501 */ sub.s $f20, $f30, $f20 /* 87FCC 800EEB1C 3C013F00 */ lui $at, 0x3f00 /* 87FD0 800EEB20 44812000 */ mtc1 $at, $f4 /* 87FD4 800EEB24 46061082 */ mul.s $f2, $f2, $f6 -/* 87FD8 800EEB28 00000000 */ nop +/* 87FD8 800EEB28 00000000 */ nop /* 87FDC 800EEB2C 3C014170 */ lui $at, 0x4170 /* 87FE0 800EEB30 44814000 */ mtc1 $at, $f8 /* 87FE4 800EEB34 3C038011 */ lui $v1, %hi(D_8010CFD8) /* 87FE8 800EEB38 8C63CFD8 */ lw $v1, %lo(D_8010CFD8)($v1) /* 87FEC 800EEB3C E600000C */ swc1 $f0, 0xc($s0) /* 87FF0 800EEB40 46041082 */ mul.s $f2, $f2, $f4 -/* 87FF4 800EEB44 00000000 */ nop +/* 87FF4 800EEB44 00000000 */ nop /* 87FF8 800EEB48 000310C0 */ sll $v0, $v1, 3 /* 87FFC 800EEB4C 00431021 */ addu $v0, $v0, $v1 /* 88000 800EEB50 00021080 */ sll $v0, $v0, 2 @@ -130,9 +130,9 @@ glabel func_800EE9B8 /* 88050 800EEBA0 46000106 */ mov.s $f4, $f0 /* 88054 800EEBA4 46001080 */ add.s $f2, $f2, $f0 /* 88058 800EEBA8 44800000 */ mtc1 $zero, $f0 -/* 8805C 800EEBAC 00000000 */ nop +/* 8805C 800EEBAC 00000000 */ nop /* 88060 800EEBB0 4600203E */ c.le.s $f4, $f0 -/* 88064 800EEBB4 00000000 */ nop +/* 88064 800EEBB4 00000000 */ nop /* 88068 800EEBB8 4500000A */ bc1f .L800EEBE4 /* 8806C 800EEBBC E602003C */ swc1 $f2, 0x3c($s0) /* 88070 800EEBC0 3C028011 */ lui $v0, %hi(D_8010CFD8) @@ -153,10 +153,10 @@ glabel func_800EE9B8 /* 880A8 800EEBF8 3C014120 */ lui $at, 0x4120 /* 880AC 800EEBFC 44811000 */ mtc1 $at, $f2 /* 880B0 800EEC00 44820000 */ mtc1 $v0, $f0 -/* 880B4 800EEC04 00000000 */ nop +/* 880B4 800EEC04 00000000 */ nop /* 880B8 800EEC08 46800020 */ cvt.s.w $f0, $f0 /* 880BC 800EEC0C 4600103C */ c.lt.s $f2, $f0 -/* 880C0 800EEC10 00000000 */ nop +/* 880C0 800EEC10 00000000 */ nop /* 880C4 800EEC14 45030001 */ bc1tl .L800EEC1C /* 880C8 800EEC18 46001006 */ mov.s $f0, $f2 .L800EEC1C: diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EECE8.s b/asm/nonmatchings/code_838b0_len_5900/func_800EECE8.s index 65d5194d14..d1a9b327a2 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EECE8.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EECE8.s @@ -40,22 +40,22 @@ glabel func_800EECE8 /* 88224 800EED74 10600007 */ beqz $v1, .L800EED94 /* 88228 800EED78 0000102D */ daddu $v0, $zero, $zero /* 8822C 800EED7C 0803BCB3 */ j .L800EF2CC -/* 88230 800EED80 00000000 */ nop +/* 88230 800EED80 00000000 */ nop .L800EED84: /* 88234 800EED84 10620123 */ beq $v1, $v0, .L800EF214 /* 88238 800EED88 0000102D */ daddu $v0, $zero, $zero /* 8823C 800EED8C 0803BCB3 */ j .L800EF2CC -/* 88240 800EED90 00000000 */ nop +/* 88240 800EED90 00000000 */ nop .L800EED94: /* 88244 800EED94 0C00A6C9 */ jal clamp_angle /* 88248 800EED98 C62C00A8 */ lwc1 $f12, 0xa8($s1) /* 8824C 800EED9C 3C014334 */ lui $at, 0x4334 /* 88250 800EEDA0 44811000 */ mtc1 $at, $f2 -/* 88254 800EEDA4 00000000 */ nop +/* 88254 800EEDA4 00000000 */ nop /* 88258 800EEDA8 4602003C */ c.lt.s $f0, $f2 -/* 8825C 800EEDAC 00000000 */ nop +/* 8825C 800EEDAC 00000000 */ nop /* 88260 800EEDB0 45000006 */ bc1f .L800EEDCC -/* 88264 800EEDB4 00000000 */ nop +/* 88264 800EEDB4 00000000 */ nop /* 88268 800EEDB8 C640006C */ lwc1 $f0, 0x6c($s2) /* 8826C 800EEDBC 3C0142B4 */ lui $at, 0x42b4 /* 88270 800EEDC0 44816000 */ mtc1 $at, $f12 @@ -65,11 +65,11 @@ glabel func_800EECE8 /* 8827C 800EEDCC C640006C */ lwc1 $f0, 0x6c($s2) /* 88280 800EEDD0 3C0142B4 */ lui $at, 0x42b4 /* 88284 800EEDD4 44816000 */ mtc1 $at, $f12 -/* 88288 800EEDD8 00000000 */ nop +/* 88288 800EEDD8 00000000 */ nop /* 8828C 800EEDDC 460C0301 */ sub.s $f12, $f0, $f12 .L800EEDE0: /* 88290 800EEDE0 0C00A6C9 */ jal clamp_angle -/* 88294 800EEDE4 00000000 */ nop +/* 88294 800EEDE4 00000000 */ nop /* 88298 800EEDE8 E600000C */ swc1 $f0, 0xc($s0) /* 8829C 800EEDEC C6200028 */ lwc1 $f0, 0x28($s1) /* 882A0 800EEDF0 3C128011 */ lui $s2, %hi(D_8010CFEC) @@ -89,7 +89,7 @@ glabel func_800EECE8 /* 882D4 800EEE24 862200B2 */ lh $v0, 0xb2($s1) /* 882D8 800EEE28 8E07000C */ lw $a3, 0xc($s0) /* 882DC 800EEE2C 44825000 */ mtc1 $v0, $f10 -/* 882E0 800EEE30 00000000 */ nop +/* 882E0 800EEE30 00000000 */ nop /* 882E4 800EEE34 468052A0 */ cvt.s.w $f10, $f10 /* 882E8 800EEE38 44065000 */ mfc1 $a2, $f10 /* 882EC 800EEE3C 0C00A7E7 */ jal add_vec2D_polar @@ -122,7 +122,7 @@ glabel func_800EECE8 /* 88358 800EEEA8 00E23821 */ addu $a3, $a3, $v0 /* 8835C 800EEEAC 8CE71DEC */ lw $a3, %lo(D_800B1DEC)($a3) /* 88360 800EEEB0 44830000 */ mtc1 $v1, $f0 -/* 88364 800EEEB4 00000000 */ nop +/* 88364 800EEEB4 00000000 */ nop /* 88368 800EEEB8 46800020 */ cvt.s.w $f0, $f0 /* 8836C 800EEEBC 4600D000 */ add.s $f0, $f26, $f0 /* 88370 800EEEC0 E7B60020 */ swc1 $f22, 0x20($sp) @@ -144,7 +144,7 @@ glabel func_800EECE8 /* 883B0 800EEF00 3C14800B */ lui $s4, %hi(gCameras) /* 883B4 800EEF04 26941D80 */ addiu $s4, $s4, %lo(gCameras) /* 883B8 800EEF08 44820000 */ mtc1 $v0, $f0 -/* 883BC 800EEF0C 00000000 */ nop +/* 883BC 800EEF0C 00000000 */ nop /* 883C0 800EEF10 46800020 */ cvt.s.w $f0, $f0 /* 883C4 800EEF14 0C0371DE */ jal func_800DC778 /* 883C8 800EEF18 E7A00018 */ swc1 $f0, 0x18($sp) @@ -153,7 +153,7 @@ glabel func_800EECE8 /* 883D4 800EEF24 3C048011 */ lui $a0, %hi(D_8010C978) /* 883D8 800EEF28 8C84C978 */ lw $a0, %lo(D_8010C978)($a0) /* 883DC 800EEF2C 0C016F6A */ jal get_collider_type_by_id -/* 883E0 800EEF30 00000000 */ nop +/* 883E0 800EEF30 00000000 */ nop /* 883E4 800EEF34 2442FFFE */ addiu $v0, $v0, -2 /* 883E8 800EEF38 2C420002 */ sltiu $v0, $v0, 2 /* 883EC 800EEF3C 14400009 */ bnez $v0, .L800EEF64 @@ -161,11 +161,11 @@ glabel func_800EECE8 /* 883F4 800EEF44 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 883F8 800EEF48 3C0142C8 */ lui $at, 0x42c8 /* 883FC 800EEF4C 44810000 */ mtc1 $at, $f0 -/* 88400 800EEF50 00000000 */ nop +/* 88400 800EEF50 00000000 */ nop /* 88404 800EEF54 4602003C */ c.lt.s $f0, $f2 -/* 88408 800EEF58 00000000 */ nop +/* 88408 800EEF58 00000000 */ nop /* 8840C 800EEF5C 45000011 */ bc1f .L800EEFA4 -/* 88410 800EEF60 00000000 */ nop +/* 88410 800EEF60 00000000 */ nop .L800EEF64: /* 88414 800EEF64 C6360028 */ lwc1 $f22, 0x28($s1) /* 88418 800EEF68 C63A002C */ lwc1 $f26, 0x2c($s1) @@ -199,7 +199,7 @@ glabel func_800EECE8 /* 88484 800EEFD4 00621821 */ addu $v1, $v1, $v0 /* 88488 800EEFD8 00031843 */ sra $v1, $v1, 1 /* 8848C 800EEFDC 44830000 */ mtc1 $v1, $f0 -/* 88490 800EEFE0 00000000 */ nop +/* 88490 800EEFE0 00000000 */ nop /* 88494 800EEFE4 46800020 */ cvt.s.w $f0, $f0 /* 88498 800EEFE8 46001080 */ add.s $f2, $f2, $f0 /* 8849C 800EEFEC 3C014080 */ lui $at, 0x4080 @@ -225,7 +225,7 @@ glabel func_800EECE8 /* 884EC 800EF03C 46041083 */ div.s $f2, $f2, $f4 /* 884F0 800EF040 4600128D */ trunc.w.s $f10, $f2 /* 884F4 800EF044 44025000 */ mfc1 $v0, $f10 -/* 884F8 800EF048 00000000 */ nop +/* 884F8 800EF048 00000000 */ nop /* 884FC 800EF04C A602008E */ sh $v0, 0x8e($s0) /* 88500 800EF050 00021400 */ sll $v0, $v0, 0x10 /* 88504 800EF054 00021403 */ sra $v0, $v0, 0x10 @@ -242,17 +242,17 @@ glabel func_800EECE8 /* 8852C 800EF07C 8602008E */ lh $v0, 0x8e($s0) /* 88530 800EF080 C6000014 */ lwc1 $f0, 0x14($s0) /* 88534 800EF084 44822000 */ mtc1 $v0, $f4 -/* 88538 800EF088 00000000 */ nop +/* 88538 800EF088 00000000 */ nop /* 8853C 800EF08C 46802120 */ cvt.s.w $f4, $f4 /* 88540 800EF090 46040002 */ mul.s $f0, $f0, $f4 -/* 88544 800EF094 00000000 */ nop +/* 88544 800EF094 00000000 */ nop /* 88548 800EF098 46040002 */ mul.s $f0, $f0, $f4 -/* 8854C 800EF09C 00000000 */ nop +/* 8854C 800EF09C 00000000 */ nop /* 88550 800EF0A0 3C013F00 */ lui $at, 0x3f00 /* 88554 800EF0A4 44811000 */ mtc1 $at, $f2 -/* 88558 800EF0A8 00000000 */ nop +/* 88558 800EF0A8 00000000 */ nop /* 8855C 800EF0AC 46020002 */ mul.s $f0, $f0, $f2 -/* 88560 800EF0B0 00000000 */ nop +/* 88560 800EF0B0 00000000 */ nop /* 88564 800EF0B4 C7A20028 */ lwc1 $f2, 0x28($sp) /* 88568 800EF0B8 3C038011 */ lui $v1, %hi(D_8010CFD8) /* 8856C 800EF0BC 8C63CFD8 */ lw $v1, %lo(D_8010CFD8)($v1) @@ -275,11 +275,11 @@ glabel func_800EECE8 .L800EF100: /* 885B0 800EF100 C602001C */ lwc1 $f2, 0x1c($s0) /* 885B4 800EF104 44800000 */ mtc1 $zero, $f0 -/* 885B8 800EF108 00000000 */ nop +/* 885B8 800EF108 00000000 */ nop /* 885BC 800EF10C 4600103C */ c.lt.s $f2, $f0 -/* 885C0 800EF110 00000000 */ nop +/* 885C0 800EF110 00000000 */ nop /* 885C4 800EF114 45000009 */ bc1f .L800EF13C -/* 885C8 800EF118 00000000 */ nop +/* 885C8 800EF118 00000000 */ nop /* 885CC 800EF11C 46001085 */ abs.s $f2, $f2 /* 885D0 800EF120 44051000 */ mfc1 $a1, $f2 /* 885D4 800EF124 0C00E5FA */ jal func_800397E8 @@ -297,9 +297,9 @@ glabel func_800EECE8 /* 88600 800EF150 46000106 */ mov.s $f4, $f0 /* 88604 800EF154 46001080 */ add.s $f2, $f2, $f0 /* 88608 800EF158 44800000 */ mtc1 $zero, $f0 -/* 8860C 800EF15C 00000000 */ nop +/* 8860C 800EF15C 00000000 */ nop /* 88610 800EF160 4600203E */ c.le.s $f4, $f0 -/* 88614 800EF164 00000000 */ nop +/* 88614 800EF164 00000000 */ nop /* 88618 800EF168 4500000A */ bc1f .L800EF194 /* 8861C 800EF16C E602003C */ swc1 $f2, 0x3c($s0) /* 88620 800EF170 3C028011 */ lui $v0, %hi(D_8010CFD8) @@ -322,10 +322,10 @@ glabel func_800EECE8 /* 88660 800EF1B0 3C014120 */ lui $at, 0x4120 /* 88664 800EF1B4 44811000 */ mtc1 $at, $f2 /* 88668 800EF1B8 44820000 */ mtc1 $v0, $f0 -/* 8866C 800EF1BC 00000000 */ nop +/* 8866C 800EF1BC 00000000 */ nop /* 88670 800EF1C0 46800020 */ cvt.s.w $f0, $f0 /* 88674 800EF1C4 4600103C */ c.lt.s $f2, $f0 -/* 88678 800EF1C8 00000000 */ nop +/* 88678 800EF1C8 00000000 */ nop /* 8867C 800EF1CC 45030001 */ bc1tl .L800EF1D4 /* 88680 800EF1D0 46001006 */ mov.s $f0, $f2 .L800EF1D4: diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF300.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF300.s index de046da135..d9853c68d5 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF300.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF300.s @@ -6,4 +6,4 @@ glabel func_800EF300 /* 887B4 800EF304 3C018011 */ lui $at, %hi(D_8010CFC8) /* 887B8 800EF308 A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) /* 887BC 800EF30C 03E00008 */ jr $ra -/* 887C0 800EF310 00000000 */ nop +/* 887C0 800EF310 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF314.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF314.s index beb764e05e..a3452c7ebc 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF314.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF314.s @@ -6,4 +6,4 @@ glabel func_800EF314 /* 887C8 800EF318 3C018011 */ lui $at, %hi(D_8010CFC8) /* 887CC 800EF31C A422CFC8 */ sh $v0, %lo(D_8010CFC8)($at) /* 887D0 800EF320 03E00008 */ jr $ra -/* 887D4 800EF324 00000000 */ nop +/* 887D4 800EF324 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s index e07404ff2f..64e92c7e5f 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF394.s @@ -5,4 +5,4 @@ glabel func_800EF394 /* 88844 800EF394 3C018011 */ lui $at, %hi(D_8010CFC0) /* 88848 800EF398 E42CCFC0 */ swc1 $f12, %lo(D_8010CFC0)($at) /* 8884C 800EF39C 03E00008 */ jr $ra -/* 88850 800EF3A0 00000000 */ nop +/* 88850 800EF3A0 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s index 50e53f7b12..442f090a2c 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF3A4.s @@ -4,8 +4,8 @@ glabel func_800EF3A4 /* 88854 800EF3A4 3C014220 */ lui $at, 0x4220 /* 88858 800EF3A8 44810000 */ mtc1 $at, $f0 -/* 8885C 800EF3AC 00000000 */ nop +/* 8885C 800EF3AC 00000000 */ nop /* 88860 800EF3B0 3C018011 */ lui $at, %hi(D_8010CFC0) /* 88864 800EF3B4 E420CFC0 */ swc1 $f0, %lo(D_8010CFC0)($at) /* 88868 800EF3B8 03E00008 */ jr $ra -/* 8886C 800EF3BC 00000000 */ nop +/* 8886C 800EF3BC 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF3D4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF3D4.s index 4856deab59..774aaf5d10 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF3D4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF3D4.s @@ -5,4 +5,4 @@ glabel func_800EF3D4 /* 88884 800EF3D4 3C018011 */ lui $at, %hi(D_8010CFCA) /* 88888 800EF3D8 A424CFCA */ sh $a0, %lo(D_8010CFCA)($at) /* 8888C 800EF3DC 03E00008 */ jr $ra -/* 88890 800EF3E0 00000000 */ nop +/* 88890 800EF3E0 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF3E4.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF3E4.s index bcc68945c5..1d6762502e 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF3E4.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF3E4.s @@ -13,4 +13,4 @@ glabel func_800EF3E4 /* 888B4 800EF404 3C018011 */ lui $at, %hi(D_8010CFCE) /* 888B8 800EF408 A420CFCE */ sh $zero, %lo(D_8010CFCE)($at) /* 888BC 800EF40C 03E00008 */ jr $ra -/* 888C0 800EF410 00000000 */ nop +/* 888C0 800EF410 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF414.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF414.s index df53712e44..241083b871 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF414.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF414.s @@ -5,7 +5,7 @@ glabel func_800EF414 /* 888C4 800EF414 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 888C8 800EF418 AFBF0010 */ sw $ra, 0x10($sp) /* 888CC 800EF41C 0C03BCF0 */ jal func_800EF3C0 -/* 888D0 800EF420 00000000 */ nop +/* 888D0 800EF420 00000000 */ nop /* 888D4 800EF424 8FBF0010 */ lw $ra, 0x10($sp) /* 888D8 800EF428 24020014 */ addiu $v0, $zero, 0x14 /* 888DC 800EF42C 3C018011 */ lui $at, %hi(D_8010CFC8) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF43C.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF43C.s index 284aee750a..2a17e18ecf 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF43C.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF43C.s @@ -9,4 +9,4 @@ glabel func_800EF43C /* 888FC 800EF44C 3C018011 */ lui $at, %hi(D_8010CFCE) /* 88900 800EF450 A420CFCE */ sh $zero, %lo(D_8010CFCE)($at) /* 88904 800EF454 03E00008 */ jr $ra -/* 88908 800EF458 00000000 */ nop +/* 88908 800EF458 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF4E0.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF4E0.s index b6f369c1cb..72f0156815 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF4E0.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF4E0.s @@ -14,26 +14,26 @@ glabel func_800EF4E0 /* 889B4 800EF504 F7B40020 */ sdc1 $f20, 0x20($sp) /* 889B8 800EF508 C6200090 */ lwc1 $f0, 0x90($s1) /* 889BC 800EF50C 4480A000 */ mtc1 $zero, $f20 -/* 889C0 800EF510 00000000 */ nop +/* 889C0 800EF510 00000000 */ nop /* 889C4 800EF514 46140032 */ c.eq.s $f0, $f20 -/* 889C8 800EF518 00000000 */ nop +/* 889C8 800EF518 00000000 */ nop /* 889CC 800EF51C 45000017 */ bc1f .L800EF57C /* 889D0 800EF520 0200902D */ daddu $s2, $s0, $zero /* 889D4 800EF524 C62200A8 */ lwc1 $f2, 0xa8($s1) /* 889D8 800EF528 3C0142B4 */ lui $at, 0x42b4 /* 889DC 800EF52C 44812000 */ mtc1 $at, $f4 -/* 889E0 800EF530 00000000 */ nop +/* 889E0 800EF530 00000000 */ nop /* 889E4 800EF534 4602203E */ c.le.s $f4, $f2 -/* 889E8 800EF538 00000000 */ nop +/* 889E8 800EF538 00000000 */ nop /* 889EC 800EF53C 45000008 */ bc1f .L800EF560 -/* 889F0 800EF540 00000000 */ nop +/* 889F0 800EF540 00000000 */ nop /* 889F4 800EF544 3C014387 */ lui $at, 0x4387 /* 889F8 800EF548 44810000 */ mtc1 $at, $f0 -/* 889FC 800EF54C 00000000 */ nop +/* 889FC 800EF54C 00000000 */ nop /* 88A00 800EF550 4600103C */ c.lt.s $f2, $f0 -/* 88A04 800EF554 00000000 */ nop +/* 88A04 800EF554 00000000 */ nop /* 88A08 800EF558 45010005 */ bc1t .L800EF570 -/* 88A0C 800EF55C 00000000 */ nop +/* 88A0C 800EF55C 00000000 */ nop .L800EF560: /* 88A10 800EF560 C60C006C */ lwc1 $f12, 0x6c($s0) /* 88A14 800EF564 46046301 */ sub.s $f12, $f12, $f4 @@ -48,13 +48,13 @@ glabel func_800EF4E0 /* 88A30 800EF580 0C00A70A */ jal get_clamped_angle_diff /* 88A34 800EF584 C62E0080 */ lwc1 $f14, 0x80($s1) /* 88A38 800EF588 4614003C */ c.lt.s $f0, $f20 -/* 88A3C 800EF58C 00000000 */ nop +/* 88A3C 800EF58C 00000000 */ nop /* 88A40 800EF590 45000008 */ bc1f .L800EF5B4 -/* 88A44 800EF594 00000000 */ nop +/* 88A44 800EF594 00000000 */ nop /* 88A48 800EF598 C600006C */ lwc1 $f0, 0x6c($s0) /* 88A4C 800EF59C 3C0142B4 */ lui $at, 0x42b4 /* 88A50 800EF5A0 44816000 */ mtc1 $at, $f12 -/* 88A54 800EF5A4 00000000 */ nop +/* 88A54 800EF5A4 00000000 */ nop /* 88A58 800EF5A8 460C0301 */ sub.s $f12, $f0, $f12 /* 88A5C 800EF5AC 0803BD73 */ j .L800EF5CC /* 88A60 800EF5B0 24100001 */ addiu $s0, $zero, 1 @@ -62,13 +62,13 @@ glabel func_800EF4E0 /* 88A64 800EF5B4 C640006C */ lwc1 $f0, 0x6c($s2) /* 88A68 800EF5B8 3C0142B4 */ lui $at, 0x42b4 /* 88A6C 800EF5BC 44816000 */ mtc1 $at, $f12 -/* 88A70 800EF5C0 00000000 */ nop +/* 88A70 800EF5C0 00000000 */ nop /* 88A74 800EF5C4 460C0300 */ add.s $f12, $f0, $f12 .L800EF5C8: /* 88A78 800EF5C8 0000802D */ daddu $s0, $zero, $zero .L800EF5CC: /* 88A7C 800EF5CC 0C00A6C9 */ jal clamp_angle -/* 88A80 800EF5D0 00000000 */ nop +/* 88A80 800EF5D0 00000000 */ nop /* 88A84 800EF5D4 E6200080 */ swc1 $f0, 0x80($s1) /* 88A88 800EF5D8 C6200080 */ lwc1 $f0, 0x80($s1) /* 88A8C 800EF5DC 0200102D */ daddu $v0, $s0, $zero diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF600.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF600.s index 052613e152..110396174c 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF600.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF600.s @@ -12,4 +12,4 @@ glabel func_800EF600 /* 88ACC 800EF61C A0600014 */ sb $zero, 0x14($v1) .L800EF620: /* 88AD0 800EF620 03E00008 */ jr $ra -/* 88AD4 800EF624 00000000 */ nop +/* 88AD4 800EF624 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF640.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF640.s index e54b29f90b..8c457cc900 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF640.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF640.s @@ -53,10 +53,10 @@ glabel func_800EF640 /* 88BB0 800EF700 44810000 */ mtc1 $at, $f0 /* 88BB4 800EF704 00431021 */ addu $v0, $v0, $v1 /* 88BB8 800EF708 44824000 */ mtc1 $v0, $f8 -/* 88BBC 800EF70C 00000000 */ nop +/* 88BBC 800EF70C 00000000 */ nop /* 88BC0 800EF710 46804220 */ cvt.s.w $f8, $f8 /* 88BC4 800EF714 46004202 */ mul.s $f8, $f8, $f0 -/* 88BC8 800EF718 00000000 */ nop +/* 88BC8 800EF718 00000000 */ nop /* 88BCC 800EF71C C7A60028 */ lwc1 $f6, 0x28($sp) /* 88BD0 800EF720 C7A00038 */ lwc1 $f0, 0x38($sp) /* 88BD4 800EF724 C7A4002C */ lwc1 $f4, 0x2c($sp) @@ -78,20 +78,20 @@ glabel func_800EF640 /* 88C14 800EF764 864300B0 */ lh $v1, 0xb0($s2) /* 88C18 800EF768 00431021 */ addu $v0, $v0, $v1 /* 88C1C 800EF76C 44820000 */ mtc1 $v0, $f0 -/* 88C20 800EF770 00000000 */ nop +/* 88C20 800EF770 00000000 */ nop /* 88C24 800EF774 46800020 */ cvt.s.w $f0, $f0 /* 88C28 800EF778 4600203E */ c.le.s $f4, $f0 -/* 88C2C 800EF77C 00000000 */ nop +/* 88C2C 800EF77C 00000000 */ nop /* 88C30 800EF780 45000021 */ bc1f .L800EF808 -/* 88C34 800EF784 00000000 */ nop +/* 88C34 800EF784 00000000 */ nop /* 88C38 800EF788 3C014010 */ lui $at, 0x4010 /* 88C3C 800EF78C 44811800 */ mtc1 $at, $f3 /* 88C40 800EF790 44801000 */ mtc1 $zero, $f2 /* 88C44 800EF794 46005021 */ cvt.d.s $f0, $f10 /* 88C48 800EF798 4622003E */ c.le.d $f0, $f2 -/* 88C4C 800EF79C 00000000 */ nop +/* 88C4C 800EF79C 00000000 */ nop /* 88C50 800EF7A0 45000019 */ bc1f .L800EF808 -/* 88C54 800EF7A4 00000000 */ nop +/* 88C54 800EF7A4 00000000 */ nop /* 88C58 800EF7A8 8E260038 */ lw $a2, 0x38($s1) /* 88C5C 800EF7AC 8E270040 */ lw $a3, 0x40($s1) /* 88C60 800EF7B0 C64C0028 */ lwc1 $f12, 0x28($s2) diff --git a/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s b/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s index 09156301dc..4ce1850885 100644 --- a/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s +++ b/asm/nonmatchings/code_838b0_len_5900/func_800EF82C.s @@ -21,7 +21,7 @@ glabel func_800EF82C /* 88D1C 800EF86C 10620044 */ beq $v1, $v0, .L800EF980 /* 88D20 800EF870 28620002 */ slti $v0, $v1, 2 /* 88D24 800EF874 10400118 */ beqz $v0, .L800EFCD8 -/* 88D28 800EF878 00000000 */ nop +/* 88D28 800EF878 00000000 */ nop /* 88D2C 800EF87C 14600116 */ bnez $v1, .L800EFCD8 /* 88D30 800EF880 24820001 */ addiu $v0, $a0, 1 /* 88D34 800EF884 C662002C */ lwc1 $f2, 0x2c($s3) @@ -76,7 +76,7 @@ glabel func_800EF82C /* 88DF8 800EF948 000310C0 */ sll $v0, $v1, 3 /* 88DFC 800EF94C 00431021 */ addu $v0, $v0, $v1 /* 88E00 800EF950 4620103E */ c.le.d $f2, $f0 -/* 88E04 800EF954 00000000 */ nop +/* 88E04 800EF954 00000000 */ nop /* 88E08 800EF958 45000003 */ bc1f .L800EF968 /* 88E0C 800EF95C 00021080 */ sll $v0, $v0, 2 /* 88E10 800EF960 0803BE5B */ j .L800EF96C @@ -100,24 +100,24 @@ glabel func_800EF82C /* 88E4C 800EF99C 8E420000 */ lw $v0, ($s2) /* 88E50 800EF9A0 30421000 */ andi $v0, $v0, 0x1000 /* 88E54 800EF9A4 14400003 */ bnez $v0, .L800EF9B4 -/* 88E58 800EF9A8 00000000 */ nop +/* 88E58 800EF9A8 00000000 */ nop /* 88E5C 800EF9AC C660002C */ lwc1 $f0, 0x2c($s3) /* 88E60 800EF9B0 E640003C */ swc1 $f0, 0x3c($s2) .L800EF9B4: /* 88E64 800EF9B4 C642001C */ lwc1 $f2, 0x1c($s2) /* 88E68 800EF9B8 44802000 */ mtc1 $zero, $f4 -/* 88E6C 800EF9BC 00000000 */ nop +/* 88E6C 800EF9BC 00000000 */ nop /* 88E70 800EF9C0 46041032 */ c.eq.s $f2, $f4 -/* 88E74 800EF9C4 00000000 */ nop +/* 88E74 800EF9C4 00000000 */ nop /* 88E78 800EF9C8 45010060 */ bc1t .L800EFB4C -/* 88E7C 800EF9CC 00000000 */ nop +/* 88E7C 800EF9CC 00000000 */ nop /* 88E80 800EF9D0 C6400014 */ lwc1 $f0, 0x14($s2) /* 88E84 800EF9D4 46001001 */ sub.s $f0, $f2, $f0 /* 88E88 800EF9D8 C642003C */ lwc1 $f2, 0x3c($s2) /* 88E8C 800EF9DC 46001080 */ add.s $f2, $f2, $f0 /* 88E90 800EF9E0 E640001C */ swc1 $f0, 0x1c($s2) /* 88E94 800EF9E4 4604003E */ c.le.s $f0, $f4 -/* 88E98 800EF9E8 00000000 */ nop +/* 88E98 800EF9E8 00000000 */ nop /* 88E9C 800EF9EC 4500000A */ bc1f .L800EFA18 /* 88EA0 800EF9F0 E642003C */ swc1 $f2, 0x3c($s2) /* 88EA4 800EF9F4 3C028011 */ lui $v0, %hi(D_8010CFD8) @@ -132,7 +132,7 @@ glabel func_800EF82C .L800EFA18: /* 88EC8 800EFA18 C642001C */ lwc1 $f2, 0x1c($s2) /* 88ECC 800EFA1C 4604103E */ c.le.s $f2, $f4 -/* 88ED0 800EFA20 00000000 */ nop +/* 88ED0 800EFA20 00000000 */ nop /* 88ED4 800EFA24 45000049 */ bc1f .L800EFB4C /* 88ED8 800EFA28 27A50020 */ addiu $a1, $sp, 0x20 /* 88EDC 800EFA2C C6400038 */ lwc1 $f0, 0x38($s2) @@ -142,10 +142,10 @@ glabel func_800EF82C /* 88EEC 800EFA3C C6440040 */ lwc1 $f4, 0x40($s2) /* 88EF0 800EFA40 0040182D */ daddu $v1, $v0, $zero /* 88EF4 800EFA44 44820000 */ mtc1 $v0, $f0 -/* 88EF8 800EFA48 00000000 */ nop +/* 88EF8 800EFA48 00000000 */ nop /* 88EFC 800EFA4C 46800020 */ cvt.s.w $f0, $f0 /* 88F00 800EFA50 44833000 */ mtc1 $v1, $f6 -/* 88F04 800EFA54 00000000 */ nop +/* 88F04 800EFA54 00000000 */ nop /* 88F08 800EFA58 468031A0 */ cvt.s.w $f6, $f6 /* 88F0C 800EFA5C 46001080 */ add.s $f2, $f2, $f0 /* 88F10 800EFA60 C640003C */ lwc1 $f0, 0x3c($s2) @@ -160,14 +160,14 @@ glabel func_800EF82C /* 88F34 800EFA84 864200A6 */ lh $v0, 0xa6($s2) /* 88F38 800EFA88 27A60024 */ addiu $a2, $sp, 0x24 /* 88F3C 800EFA8C 44820000 */ mtc1 $v0, $f0 -/* 88F40 800EFA90 00000000 */ nop +/* 88F40 800EFA90 00000000 */ nop /* 88F44 800EFA94 46800020 */ cvt.s.w $f0, $f0 /* 88F48 800EFA98 E7A00018 */ swc1 $f0, 0x18($sp) /* 88F4C 800EFA9C 8E440080 */ lw $a0, 0x80($s2) /* 88F50 800EFAA0 0C0371DE */ jal func_800DC778 /* 88F54 800EFAA4 27A70028 */ addiu $a3, $sp, 0x28 /* 88F58 800EFAA8 10400028 */ beqz $v0, .L800EFB4C -/* 88F5C 800EFAAC 00000000 */ nop +/* 88F5C 800EFAAC 00000000 */ nop /* 88F60 800EFAB0 C640001C */ lwc1 $f0, 0x1c($s2) /* 88F64 800EFAB4 3C0141B0 */ lui $at, 0x41b0 /* 88F68 800EFAB8 44811000 */ mtc1 $at, $f2 @@ -175,7 +175,7 @@ glabel func_800EF82C /* 88F70 800EFAC0 46020000 */ add.s $f0, $f0, $f2 /* 88F74 800EFAC4 C7A2002C */ lwc1 $f2, 0x2c($sp) /* 88F78 800EFAC8 4600103E */ c.le.s $f2, $f0 -/* 88F7C 800EFACC 00000000 */ nop +/* 88F7C 800EFACC 00000000 */ nop /* 88F80 800EFAD0 4500001E */ bc1f .L800EFB4C /* 88F84 800EFAD4 26440028 */ addiu $a0, $s2, 0x28 /* 88F88 800EFAD8 C6400018 */ lwc1 $f0, 0x18($s2) @@ -188,7 +188,7 @@ glabel func_800EF82C /* 88FA4 800EFAF4 000310C0 */ sll $v0, $v1, 3 /* 88FA8 800EFAF8 00431021 */ addu $v0, $v0, $v1 /* 88FAC 800EFAFC 4620103E */ c.le.d $f2, $f0 -/* 88FB0 800EFB00 00000000 */ nop +/* 88FB0 800EFB00 00000000 */ nop /* 88FB4 800EFB04 45000003 */ bc1f .L800EFB14 /* 88FB8 800EFB08 00021080 */ sll $v0, $v0, 2 /* 88FBC 800EFB0C 0803BEC6 */ j .L800EFB18 @@ -232,7 +232,7 @@ glabel func_800EF82C /* 89048 800EFB98 00431021 */ addu $v0, $v0, $v1 /* 8904C 800EFB9C 00021080 */ sll $v0, $v0, 2 /* 89050 800EFBA0 4620103E */ c.le.d $f2, $f0 -/* 89054 800EFBA4 00000000 */ nop +/* 89054 800EFBA4 00000000 */ nop /* 89058 800EFBA8 45000003 */ bc1f .L800EFBB8 /* 8905C 800EFBAC 0040182D */ daddu $v1, $v0, $zero /* 89060 800EFBB0 0803BEEF */ j .L800EFBBC @@ -259,15 +259,15 @@ glabel func_800EF82C /* 890A8 800EFBF8 46000021 */ cvt.d.s $f0, $f0 /* 890AC 800EFBFC 46200005 */ abs.d $f0, $f0 /* 890B0 800EFC00 4620103C */ c.lt.d $f2, $f0 -/* 890B4 800EFC04 00000000 */ nop +/* 890B4 800EFC04 00000000 */ nop /* 890B8 800EFC08 45000009 */ bc1f .L800EFC30 -/* 890BC 800EFC0C 00000000 */ nop +/* 890BC 800EFC0C 00000000 */ nop /* 890C0 800EFC10 46043001 */ sub.s $f0, $f6, $f4 /* 890C4 800EFC14 3C013F00 */ lui $at, 0x3f00 /* 890C8 800EFC18 44811000 */ mtc1 $at, $f2 -/* 890CC 800EFC1C 00000000 */ nop +/* 890CC 800EFC1C 00000000 */ nop /* 890D0 800EFC20 46020002 */ mul.s $f0, $f0, $f2 -/* 890D4 800EFC24 00000000 */ nop +/* 890D4 800EFC24 00000000 */ nop /* 890D8 800EFC28 46002000 */ add.s $f0, $f4, $f0 /* 890DC 800EFC2C E640003C */ swc1 $f0, 0x3c($s2) .L800EFC30: @@ -289,14 +289,14 @@ glabel func_800EF82C /* 89118 800EFC68 44801000 */ mtc1 $zero, $f2 /* 8911C 800EFC6C 46000021 */ cvt.d.s $f0, $f0 /* 89120 800EFC70 4622003C */ c.lt.d $f0, $f2 -/* 89124 800EFC74 00000000 */ nop +/* 89124 800EFC74 00000000 */ nop /* 89128 800EFC78 45030001 */ bc1tl .L800EFC80 /* 8912C 800EFC7C 0000282D */ daddu $a1, $zero, $zero .L800EFC80: /* 89130 800EFC80 0C00F598 */ jal func_8003D660 /* 89134 800EFC84 0240202D */ daddu $a0, $s2, $zero /* 89138 800EFC88 0803BF36 */ j .L800EFCD8 -/* 8913C 800EFC8C 00000000 */ nop +/* 8913C 800EFC8C 00000000 */ nop .L800EFC90: /* 89140 800EFC90 2403FFBF */ addiu $v1, $zero, -0x41 /* 89144 800EFC94 8E420000 */ lw $v0, ($s2) @@ -325,5 +325,5 @@ glabel func_800EF82C /* 8919C 800EFCEC 8FB00030 */ lw $s0, 0x30($sp) /* 891A0 800EFCF0 03E00008 */ jr $ra /* 891A4 800EFCF4 27BD0048 */ addiu $sp, $sp, 0x48 -/* 891A8 800EFCF8 00000000 */ nop -/* 891AC 800EFCFC 00000000 */ nop +/* 891A8 800EFCF8 00000000 */ nop +/* 891AC 800EFCFC 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_can_use_ability.s b/asm/nonmatchings/code_838b0_len_5900/partner_can_use_ability.s index 85b3eda033..42bd2f31ff 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_can_use_ability.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_can_use_ability.s @@ -12,7 +12,7 @@ glabel partner_can_use_ability /* 848F8 800EB448 3C048011 */ lui $a0, %hi(D_8010C930) /* 848FC 800EB44C 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* 84900 800EB450 0040F809 */ jalr $v0 -/* 84904 800EB454 00000000 */ nop +/* 84904 800EB454 00000000 */ nop /* 84908 800EB458 0040182D */ daddu $v1, $v0, $zero /* 8490C 800EB45C 10600002 */ beqz $v1, .L800EB468 /* 84910 800EB460 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_get_ride_script.s b/asm/nonmatchings/code_838b0_len_5900/partner_get_ride_script.s index 3c99d5ccd9..650d2fceb0 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_get_ride_script.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_get_ride_script.s @@ -5,7 +5,7 @@ glabel partner_get_ride_script /* 84AE8 800EB638 3C028011 */ lui $v0, %hi(D_8010CFEC) /* 84AEC 800EB63C 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) /* 84AF0 800EB640 10400003 */ beqz $v0, .L800EB650 -/* 84AF4 800EB644 00000000 */ nop +/* 84AF4 800EB644 00000000 */ nop /* 84AF8 800EB648 03E00008 */ jr $ra /* 84AFC 800EB64C 8C42003C */ lw $v0, 0x3c($v0) .L800EB650: diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_handle_after_battle.s b/asm/nonmatchings/code_838b0_len_5900/partner_handle_after_battle.s index f3c9c05555..955e67c4e9 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_handle_after_battle.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_handle_after_battle.s @@ -16,7 +16,7 @@ glabel partner_handle_after_battle /* 84BA0 800EB6F0 0C0B1059 */ jal does_script_exist /* 84BA4 800EB6F4 8E040000 */ lw $a0, ($s0) /* 84BA8 800EB6F8 10400003 */ beqz $v0, .L800EB708 -/* 84BAC 800EB6FC 00000000 */ nop +/* 84BAC 800EB6FC 00000000 */ nop /* 84BB0 800EB700 0C0B102B */ jal kill_script_by_ID /* 84BB4 800EB704 8E040000 */ lw $a0, ($s0) .L800EB708: @@ -43,7 +43,7 @@ glabel partner_handle_after_battle /* 84C08 800EB758 80420012 */ lb $v0, 0x12($v0) /* 84C0C 800EB75C 24030006 */ addiu $v1, $zero, 6 /* 84C10 800EB760 1043000C */ beq $v0, $v1, .L800EB794 -/* 84C14 800EB764 00000000 */ nop +/* 84C14 800EB764 00000000 */ nop /* 84C18 800EB768 82220003 */ lb $v0, 3($s1) /* 84C1C 800EB76C 14430009 */ bne $v0, $v1, .L800EB794 /* 84C20 800EB770 2403FFFE */ addiu $v1, $zero, -2 @@ -60,11 +60,11 @@ glabel partner_handle_after_battle /* 84C48 800EB798 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) /* 84C4C 800EB79C 8C420038 */ lw $v0, 0x38($v0) /* 84C50 800EB7A0 10400005 */ beqz $v0, .L800EB7B8 -/* 84C54 800EB7A4 00000000 */ nop +/* 84C54 800EB7A4 00000000 */ nop /* 84C58 800EB7A8 3C048011 */ lui $a0, %hi(D_8010C930) /* 84C5C 800EB7AC 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* 84C60 800EB7B0 0040F809 */ jalr $v0 -/* 84C64 800EB7B4 00000000 */ nop +/* 84C64 800EB7B4 00000000 */ nop .L800EB7B8: /* 84C68 800EB7B8 8FBF0018 */ lw $ra, 0x18($sp) /* 84C6C 800EB7BC 8FB10014 */ lw $s1, 0x14($sp) diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_handle_before_battle.s b/asm/nonmatchings/code_838b0_len_5900/partner_handle_before_battle.s index 6d01d6f18b..da9c05296b 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_handle_before_battle.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_handle_before_battle.s @@ -13,7 +13,7 @@ glabel partner_handle_before_battle /* 84B28 800EB678 0C0B1059 */ jal does_script_exist /* 84B2C 800EB67C 8E040000 */ lw $a0, ($s0) /* 84B30 800EB680 10400003 */ beqz $v0, .L800EB690 -/* 84B34 800EB684 00000000 */ nop +/* 84B34 800EB684 00000000 */ nop /* 84B38 800EB688 0C0B102B */ jal kill_script_by_ID /* 84B3C 800EB68C 8E040000 */ lw $a0, ($s0) .L800EB690: @@ -21,11 +21,11 @@ glabel partner_handle_before_battle /* 84B44 800EB694 8C42CFEC */ lw $v0, %lo(D_8010CFEC)($v0) /* 84B48 800EB698 8C420034 */ lw $v0, 0x34($v0) /* 84B4C 800EB69C 10400005 */ beqz $v0, .L800EB6B4 -/* 84B50 800EB6A0 00000000 */ nop +/* 84B50 800EB6A0 00000000 */ nop /* 84B54 800EB6A4 3C048011 */ lui $a0, %hi(D_8010C930) /* 84B58 800EB6A8 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* 84B5C 800EB6AC 0040F809 */ jalr $v0 -/* 84B60 800EB6B0 00000000 */ nop +/* 84B60 800EB6B0 00000000 */ nop .L800EB6B4: /* 84B64 800EB6B4 8FBF0014 */ lw $ra, 0x14($sp) /* 84B68 800EB6B8 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_kill_ability_script.s b/asm/nonmatchings/code_838b0_len_5900/partner_kill_ability_script.s index 6d776b0ec4..8eb14a29d5 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_kill_ability_script.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_kill_ability_script.s @@ -12,9 +12,9 @@ glabel partner_kill_ability_script /* 84C98 800EB7E8 3C018011 */ lui $at, %hi(D_8010CFE8) /* 84C9C 800EB7EC AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) /* 84CA0 800EB7F0 0C0B1059 */ jal does_script_exist -/* 84CA4 800EB7F4 00000000 */ nop +/* 84CA4 800EB7F4 00000000 */ nop /* 84CA8 800EB7F8 10400003 */ beqz $v0, .L800EB808 -/* 84CAC 800EB7FC 00000000 */ nop +/* 84CAC 800EB7FC 00000000 */ nop /* 84CB0 800EB800 0C0B102B */ jal kill_script_by_ID /* 84CB4 800EB804 8E040000 */ lw $a0, ($s0) .L800EB808: diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_player_can_pause.s b/asm/nonmatchings/code_838b0_len_5900/partner_player_can_pause.s index 3647fbbc91..364d10016b 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_player_can_pause.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_player_can_pause.s @@ -13,7 +13,7 @@ glabel partner_player_can_pause /* 848B0 800EB400 3C048011 */ lui $a0, %hi(D_8010C930) /* 848B4 800EB404 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* 848B8 800EB408 0040F809 */ jalr $v0 -/* 848BC 800EB40C 00000000 */ nop +/* 848BC 800EB40C 00000000 */ nop /* 848C0 800EB410 0040182D */ daddu $v1, $v0, $zero /* 848C4 800EB414 10600002 */ beqz $v1, .L800EB420 /* 848C8 800EB418 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s index eef204eb14..8c66dc46b5 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s @@ -35,7 +35,7 @@ glabel partner_reset_data /* 8499C 800EB4EC 3C108011 */ lui $s0, %hi(gPlayerStatus) /* 849A0 800EB4F0 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* 849A4 800EB4F4 10400003 */ beqz $v0, .L800EB504 -/* 849A8 800EB4F8 00000000 */ nop +/* 849A8 800EB4F8 00000000 */ nop /* 849AC 800EB4FC A2240000 */ sb $a0, ($s1) /* 849B0 800EB500 A060007D */ sb $zero, 0x7d($v1) .L800EB504: @@ -56,12 +56,12 @@ glabel partner_reset_data /* 849EC 800EB53C ACC40000 */ sw $a0, ($a2) .L800EB540: /* 849F0 800EB540 0C03A974 */ jal func_800EA5D0 -/* 849F4 800EB544 00000000 */ nop +/* 849F4 800EB544 00000000 */ nop /* 849F8 800EB548 3C028011 */ lui $v0, %hi(D_8010C930) /* 849FC 800EB54C 8C42C930 */ lw $v0, %lo(D_8010C930)($v0) /* 84A00 800EB550 3C013F80 */ lui $at, 0x3f80 /* 84A04 800EB554 44810000 */ mtc1 $at, $f0 -/* 84A08 800EB558 00000000 */ nop +/* 84A08 800EB558 00000000 */ nop /* 84A0C 800EB55C E4400054 */ swc1 $f0, 0x54($v0) /* 84A10 800EB560 E4400058 */ swc1 $f0, 0x58($v0) /* 84A14 800EB564 0C03A9B3 */ jal func_800EA6CC diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_resume_ability_script.s b/asm/nonmatchings/code_838b0_len_5900/partner_resume_ability_script.s index c208c01219..8617cf60b2 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_resume_ability_script.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_resume_ability_script.s @@ -13,7 +13,7 @@ glabel partner_resume_ability_script /* 84D30 800EB880 0C0B1059 */ jal does_script_exist /* 84D34 800EB884 8E040000 */ lw $a0, ($s0) /* 84D38 800EB888 10400003 */ beqz $v0, .L800EB898 -/* 84D3C 800EB88C 00000000 */ nop +/* 84D3C 800EB88C 00000000 */ nop /* 84D40 800EB890 0C0B1123 */ jal resume_all_script /* 84D44 800EB894 8E040000 */ lw $a0, ($s0) .L800EB898: diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_suspend_ability_script.s b/asm/nonmatchings/code_838b0_len_5900/partner_suspend_ability_script.s index 5f1315ca46..2c34b6170c 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_suspend_ability_script.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_suspend_ability_script.s @@ -13,7 +13,7 @@ glabel partner_suspend_ability_script /* 84CE8 800EB838 0C0B1059 */ jal does_script_exist /* 84CEC 800EB83C 8E040000 */ lw $a0, ($s0) /* 84CF0 800EB840 10400003 */ beqz $v0, .L800EB850 -/* 84CF4 800EB844 00000000 */ nop +/* 84CF4 800EB844 00000000 */ nop /* 84CF8 800EB848 0C0B1108 */ jal suspend_all_script /* 84CFC 800EB84C 8E040000 */ lw $a0, ($s0) .L800EB850: diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_test_enemy_collision.s b/asm/nonmatchings/code_838b0_len_5900/partner_test_enemy_collision.s index dc3a7d4a36..e811f8848c 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_test_enemy_collision.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_test_enemy_collision.s @@ -16,9 +16,9 @@ glabel partner_test_enemy_collision /* 84AC0 800EB610 3C048011 */ lui $a0, %hi(D_8010C930) /* 84AC4 800EB614 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* 84AC8 800EB618 0040F809 */ jalr $v0 -/* 84ACC 800EB61C 00000000 */ nop +/* 84ACC 800EB61C 00000000 */ nop /* 84AD0 800EB620 0803AD8B */ j .L800EB62C -/* 84AD4 800EB624 00000000 */ nop +/* 84AD4 800EB624 00000000 */ nop .L800EB628: /* 84AD8 800EB628 0000102D */ daddu $v0, $zero, $zero .L800EB62C: diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_use_ability.s b/asm/nonmatchings/code_838b0_len_5900/partner_use_ability.s index 9a8b7b7be4..badab2975c 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_use_ability.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_use_ability.s @@ -5,7 +5,7 @@ glabel partner_use_ability /* 847C4 800EB314 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 847C8 800EB318 AFBF0010 */ sw $ra, 0x10($sp) /* 847CC 800EB31C 0C011052 */ jal func_80044148 -/* 847D0 800EB320 00000000 */ nop +/* 847D0 800EB320 00000000 */ nop /* 847D4 800EB324 1440002B */ bnez $v0, .L800EB3D4 /* 847D8 800EB328 0000102D */ daddu $v0, $zero, $zero /* 847DC 800EB32C 3C028011 */ lui $v0, %hi(D_8010CFEC) @@ -14,11 +14,11 @@ glabel partner_use_ability /* 847E8 800EB338 0000102D */ daddu $v0, $zero, $zero /* 847EC 800EB33C 8C42002C */ lw $v0, 0x2c($v0) /* 847F0 800EB340 10400007 */ beqz $v0, .L800EB360 -/* 847F4 800EB344 00000000 */ nop +/* 847F4 800EB344 00000000 */ nop /* 847F8 800EB348 3C048011 */ lui $a0, %hi(D_8010C930) /* 847FC 800EB34C 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* 84800 800EB350 0040F809 */ jalr $v0 -/* 84804 800EB354 00000000 */ nop +/* 84804 800EB354 00000000 */ nop /* 84808 800EB358 1040001E */ beqz $v0, .L800EB3D4 /* 8480C 800EB35C 0000102D */ daddu $v0, $zero, $zero .L800EB360: @@ -26,13 +26,13 @@ glabel partner_use_ability /* 84814 800EB364 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* 84818 800EB368 80420081 */ lb $v0, 0x81($v0) /* 8481C 800EB36C 1040000B */ beqz $v0, .L800EB39C -/* 84820 800EB370 00000000 */ nop +/* 84820 800EB370 00000000 */ nop /* 84824 800EB374 3C028011 */ lui $v0, %hi(D_8010EBB0) /* 84828 800EB378 2442EBB0 */ addiu $v0, $v0, %lo(D_8010EBB0) /* 8482C 800EB37C 8C420008 */ lw $v0, 8($v0) /* 84830 800EB380 30424000 */ andi $v0, $v0, 0x4000 /* 84834 800EB384 10400005 */ beqz $v0, .L800EB39C -/* 84838 800EB388 00000000 */ nop +/* 84838 800EB388 00000000 */ nop /* 8483C 800EB38C 0C05272D */ jal play_sound /* 84840 800EB390 2404021D */ addiu $a0, $zero, 0x21d /* 84844 800EB394 0803ACF5 */ j .L800EB3D4 @@ -48,7 +48,7 @@ glabel partner_use_ability /* 84868 800EB3B8 3C018011 */ lui $at, %hi(D_8010CFE8) /* 8486C 800EB3BC AC22CFE8 */ sw $v0, %lo(D_8010CFE8)($at) /* 84870 800EB3C0 0C03A9B3 */ jal func_800EA6CC -/* 84874 800EB3C4 00000000 */ nop +/* 84874 800EB3C4 00000000 */ nop /* 84878 800EB3C8 0803ACF5 */ j .L800EB3D4 /* 8487C 800EB3CC 24020001 */ addiu $v0, $zero, 1 .L800EB3D0: diff --git a/asm/nonmatchings/code_838b0_len_5900/update_player_move_history.s b/asm/nonmatchings/code_838b0_len_5900/update_player_move_history.s index ed47b87be1..2c5a5e6698 100644 --- a/asm/nonmatchings/code_838b0_len_5900/update_player_move_history.s +++ b/asm/nonmatchings/code_838b0_len_5900/update_player_move_history.s @@ -11,14 +11,14 @@ glabel update_player_move_history /* 86980 800ED4D0 0000302D */ daddu $a2, $zero, $zero /* 86984 800ED4D4 24020015 */ addiu $v0, $zero, 0x15 /* 86988 800ED4D8 14620008 */ bne $v1, $v0, .L800ED4FC -/* 8698C 800ED4DC 00000000 */ nop +/* 8698C 800ED4DC 00000000 */ nop .L800ED4E0: /* 86990 800ED4E0 84A20018 */ lh $v0, 0x18($a1) /* 86994 800ED4E4 848300A8 */ lh $v1, 0xa8($a0) /* 86998 800ED4E8 00431021 */ addu $v0, $v0, $v1 /* 8699C 800ED4EC 24420005 */ addiu $v0, $v0, 5 /* 869A0 800ED4F0 44822000 */ mtc1 $v0, $f4 -/* 869A4 800ED4F4 00000000 */ nop +/* 869A4 800ED4F4 00000000 */ nop /* 869A8 800ED4F8 46802120 */ cvt.s.w $f4, $f4 .L800ED4FC: /* 869AC 800ED4FC 3C028011 */ lui $v0, %hi(D_8010CFB8) @@ -29,27 +29,27 @@ glabel update_player_move_history /* 869C0 800ED510 00431821 */ addu $v1, $v0, $v1 /* 869C4 800ED514 80620000 */ lb $v0, ($v1) /* 869C8 800ED518 10400003 */ beqz $v0, .L800ED528 -/* 869CC 800ED51C 00000000 */ nop +/* 869CC 800ED51C 00000000 */ nop /* 869D0 800ED520 14C00029 */ bnez $a2, .L800ED5C8 -/* 869D4 800ED524 00000000 */ nop +/* 869D4 800ED524 00000000 */ nop .L800ED528: /* 869D8 800ED528 C4620004 */ lwc1 $f2, 4($v1) /* 869DC 800ED52C C4A00028 */ lwc1 $f0, 0x28($a1) /* 869E0 800ED530 46001032 */ c.eq.s $f2, $f0 -/* 869E4 800ED534 00000000 */ nop +/* 869E4 800ED534 00000000 */ nop /* 869E8 800ED538 4500000C */ bc1f .L800ED56C -/* 869EC 800ED53C 00000000 */ nop +/* 869EC 800ED53C 00000000 */ nop /* 869F0 800ED540 C4600008 */ lwc1 $f0, 8($v1) /* 869F4 800ED544 46040032 */ c.eq.s $f0, $f4 -/* 869F8 800ED548 00000000 */ nop +/* 869F8 800ED548 00000000 */ nop /* 869FC 800ED54C 45000007 */ bc1f .L800ED56C -/* 86A00 800ED550 00000000 */ nop +/* 86A00 800ED550 00000000 */ nop /* 86A04 800ED554 C462000C */ lwc1 $f2, 0xc($v1) /* 86A08 800ED558 C4A00030 */ lwc1 $f0, 0x30($a1) /* 86A0C 800ED55C 46001032 */ c.eq.s $f2, $f0 -/* 86A10 800ED560 00000000 */ nop +/* 86A10 800ED560 00000000 */ nop /* 86A14 800ED564 45010018 */ bc1t .L800ED5C8 -/* 86A18 800ED568 00000000 */ nop +/* 86A18 800ED568 00000000 */ nop .L800ED56C: /* 86A1C 800ED56C 3C048011 */ lui $a0, %hi(D_8010CFB8) /* 86A20 800ED570 2484CFB8 */ addiu $a0, $a0, %lo(D_8010CFB8) @@ -58,7 +58,7 @@ glabel update_player_move_history /* 86A2C 800ED57C 8C63CFBC */ lw $v1, %lo(D_8010CFBC)($v1) /* 86A30 800ED580 24420001 */ addiu $v0, $v0, 1 /* 86A34 800ED584 10620010 */ beq $v1, $v0, .L800ED5C8 -/* 86A38 800ED588 00000000 */ nop +/* 86A38 800ED588 00000000 */ nop /* 86A3C 800ED58C AC820000 */ sw $v0, ($a0) /* 86A40 800ED590 28420028 */ slti $v0, $v0, 0x28 /* 86A44 800ED594 50400001 */ beql $v0, $zero, .L800ED59C @@ -77,4 +77,4 @@ glabel update_player_move_history /* 86A74 800ED5C4 E460000C */ swc1 $f0, 0xc($v1) .L800ED5C8: /* 86A78 800ED5C8 03E00008 */ jr $ra -/* 86A7C 800ED5CC 00000000 */ nop +/* 86A7C 800ED5CC 00000000 */ nop diff --git a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s index 478c3a03ed..636309a387 100644 --- a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s +++ b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s @@ -20,7 +20,7 @@ glabel use_consumable /* 838EC 800EA43C 02228821 */ addu $s1, $s1, $v0 /* 838F0 800EA440 8631F444 */ lh $s1, %lo(gPlayerData+0x1B4)($s1) /* 838F4 800EA444 0C00A5CF */ jal dma_copy -/* 838F8 800EA448 00000000 */ nop +/* 838F8 800EA448 00000000 */ nop /* 838FC 800EA44C 24050001 */ addiu $a1, $zero, 1 /* 83900 800EA450 8E040008 */ lw $a0, 8($s0) /* 83904 800EA454 0C0B0CF8 */ jal start_script diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s b/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s index 282cd5b4e5..d2991a81ed 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800EFD08.s @@ -19,7 +19,7 @@ glabel func_800EFD08 /* 891EC 800EFD3C 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2) /* 891F0 800EFD40 9484A552 */ lhu $a0, %lo(gCollisionStatus+0x2)($a0) /* 891F4 800EFD44 0C016F6A */ jal get_collider_type_by_id -/* 891F8 800EFD48 00000000 */ nop +/* 891F8 800EFD48 00000000 */ nop /* 891FC 800EFD4C 822300B4 */ lb $v1, 0xb4($s1) /* 89200 800EFD50 304200FF */ andi $v0, $v0, 0xff /* 89204 800EFD54 3C018011 */ lui $at, %hi(D_80109480) @@ -29,10 +29,10 @@ glabel func_800EFD08 .L800EFD64: /* 89214 800EFD64 2402000A */ addiu $v0, $zero, 0xa /* 89218 800EFD68 14620008 */ bne $v1, $v0, .L800EFD8C -/* 8921C 800EFD6C 00000000 */ nop +/* 8921C 800EFD6C 00000000 */ nop /* 89220 800EFD70 8E220000 */ lw $v0, ($s1) /* 89224 800EFD74 04410005 */ bgez $v0, .L800EFD8C -/* 89228 800EFD78 00000000 */ nop +/* 89228 800EFD78 00000000 */ nop /* 8922C 800EFD7C 3C028011 */ lui $v0, %hi(D_8010CFF0) /* 89230 800EFD80 8C42CFF0 */ lw $v0, %lo(D_8010CFF0)($v0) /* 89234 800EFD84 3C018011 */ lui $at, %hi(D_8010CFF4) @@ -49,30 +49,30 @@ glabel func_800EFD08 /* 8925C 800EFDAC 00220821 */ addu $at, $at, $v0 /* 89260 800EFDB0 8C22C2E8 */ lw $v0, %lo(D_8010C2E8)($at) /* 89264 800EFDB4 00400008 */ jr $v0 -/* 89268 800EFDB8 00000000 */ nop +/* 89268 800EFDB8 00000000 */ nop /* 8926C 800EFDBC 0C03C092 */ jal func_800F0248 -/* 89270 800EFDC0 00000000 */ nop +/* 89270 800EFDC0 00000000 */ nop /* 89274 800EFDC4 0803BF85 */ j .L800EFE14 -/* 89278 800EFDC8 00000000 */ nop +/* 89278 800EFDC8 00000000 */ nop /* 8927C 800EFDCC 0C03C124 */ jal func_800F0490 -/* 89280 800EFDD0 00000000 */ nop +/* 89280 800EFDD0 00000000 */ nop /* 89284 800EFDD4 0803BF85 */ j .L800EFE14 -/* 89288 800EFDD8 00000000 */ nop +/* 89288 800EFDD8 00000000 */ nop /* 8928C 800EFDDC 0C03C219 */ jal func_800F0864 -/* 89290 800EFDE0 00000000 */ nop +/* 89290 800EFDE0 00000000 */ nop /* 89294 800EFDE4 0803BF85 */ j .L800EFE14 -/* 89298 800EFDE8 00000000 */ nop +/* 89298 800EFDE8 00000000 */ nop /* 8929C 800EFDEC 0C03C27B */ jal func_800F09EC -/* 892A0 800EFDF0 00000000 */ nop +/* 892A0 800EFDF0 00000000 */ nop /* 892A4 800EFDF4 0803BF85 */ j .L800EFE14 -/* 892A8 800EFDF8 00000000 */ nop +/* 892A8 800EFDF8 00000000 */ nop /* 892AC 800EFDFC 0C03C2CF */ jal func_800F0B3C -/* 892B0 800EFE00 00000000 */ nop +/* 892B0 800EFE00 00000000 */ nop /* 892B4 800EFE04 0803BF85 */ j .L800EFE14 -/* 892B8 800EFE08 00000000 */ nop +/* 892B8 800EFE08 00000000 */ nop .L800EFE0C: /* 892BC 800EFE0C 0C03BF8B */ jal func_800EFE2C -/* 892C0 800EFE10 00000000 */ nop +/* 892C0 800EFE10 00000000 */ nop .L800EFE14: /* 892C4 800EFE14 8FBF001C */ lw $ra, 0x1c($sp) /* 892C8 800EFE18 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s b/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s index 7ccf6d0671..4832ac1f28 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800EFE2C.s @@ -56,12 +56,12 @@ glabel func_800EFE2C /* 893A0 800EFEF0 10620003 */ beq $v1, $v0, .L800EFF00 /* 893A4 800EFEF4 24020010 */ addiu $v0, $zero, 0x10 /* 893A8 800EFEF8 14620029 */ bne $v1, $v0, .L800EFFA0 -/* 893AC 800EFEFC 00000000 */ nop +/* 893AC 800EFEFC 00000000 */ nop .L800EFF00: /* 893B0 800EFF00 8E020000 */ lw $v0, ($s0) /* 893B4 800EFF04 30420400 */ andi $v0, $v0, 0x400 /* 893B8 800EFF08 10400025 */ beqz $v0, .L800EFFA0 -/* 893BC 800EFF0C 00000000 */ nop +/* 893BC 800EFF0C 00000000 */ nop /* 893C0 800EFF10 C6040028 */ lwc1 $f4, 0x28($s0) /* 893C4 800EFF14 C602002C */ lwc1 $f2, 0x2c($s0) /* 893C8 800EFF18 44800000 */ mtc1 $zero, $f0 @@ -78,7 +78,7 @@ glabel func_800EFE2C /* 893F0 800EFF40 0C01BEB4 */ jal fx_walk_large /* 893F4 800EFF44 E7A00010 */ swc1 $f0, 0x10($sp) /* 893F8 800EFF48 0803C08E */ j .L800F0238 -/* 893FC 800EFF4C 00000000 */ nop +/* 893FC 800EFF4C 00000000 */ nop .L800EFF50: /* 89400 800EFF50 24040003 */ addiu $a0, $zero, 3 /* 89404 800EFF54 44052000 */ mfc1 $a1, $f4 @@ -94,7 +94,7 @@ glabel func_800EFE2C /* 8942C 800EFF7C 3C013F80 */ lui $at, 0x3f80 /* 89430 800EFF80 44812000 */ mtc1 $at, $f4 /* 89434 800EFF84 44820000 */ mtc1 $v0, $f0 -/* 89438 800EFF88 00000000 */ nop +/* 89438 800EFF88 00000000 */ nop /* 8943C 800EFF8C 46800020 */ cvt.s.w $f0, $f0 /* 89440 800EFF90 E7A00010 */ swc1 $f0, 0x10($sp) /* 89444 800EFF94 E7A20014 */ swc1 $f2, 0x14($sp) @@ -107,11 +107,11 @@ glabel func_800EFE2C /* 8945C 800EFFAC 24020002 */ addiu $v0, $zero, 2 /* 89460 800EFFB0 C6020054 */ lwc1 $f2, 0x54($s0) /* 89464 800EFFB4 44800000 */ mtc1 $zero, $f0 -/* 89468 800EFFB8 00000000 */ nop +/* 89468 800EFFB8 00000000 */ nop /* 8946C 800EFFBC 46001032 */ c.eq.s $f2, $f0 -/* 89470 800EFFC0 00000000 */ nop +/* 89470 800EFFC0 00000000 */ nop /* 89474 800EFFC4 45010022 */ bc1t .L800F0050 -/* 89478 800EFFC8 00000000 */ nop +/* 89478 800EFFC8 00000000 */ nop /* 8947C 800EFFCC 3C048011 */ lui $a0, %hi(D_80109488) /* 89480 800EFFD0 24849488 */ addiu $a0, $a0, %lo(D_80109488) /* 89484 800EFFD4 94820000 */ lhu $v0, ($a0) @@ -126,13 +126,13 @@ glabel func_800EFE2C /* 894A8 800EFFF8 A4820000 */ sh $v0, ($a0) /* 894AC 800EFFFC C60C0080 */ lwc1 $f12, 0x80($s0) /* 894B0 800F0000 0C00A6C9 */ jal clamp_angle -/* 894B4 800F0004 00000000 */ nop +/* 894B4 800F0004 00000000 */ nop /* 894B8 800F0008 3C0140C9 */ lui $at, 0x40c9 /* 894BC 800F000C 34210FD0 */ ori $at, $at, 0xfd0 /* 894C0 800F0010 44811000 */ mtc1 $at, $f2 -/* 894C4 800F0014 00000000 */ nop +/* 894C4 800F0014 00000000 */ nop /* 894C8 800F0018 46020002 */ mul.s $f0, $f0, $f2 -/* 894CC 800F001C 00000000 */ nop +/* 894CC 800F001C 00000000 */ nop /* 894D0 800F0020 27A50028 */ addiu $a1, $sp, 0x28 /* 894D4 800F0024 3C0143B4 */ lui $at, 0x43b4 /* 894D8 800F0028 44816000 */ mtc1 $at, $f12 @@ -142,7 +142,7 @@ glabel func_800EFE2C /* 894E8 800F0038 860200B2 */ lh $v0, 0xb2($s0) /* 894EC 800F003C C7A40028 */ lwc1 $f4, 0x28($sp) /* 894F0 800F0040 44823000 */ mtc1 $v0, $f6 -/* 894F4 800F0044 00000000 */ nop +/* 894F4 800F0044 00000000 */ nop /* 894F8 800F0048 0803C06D */ j .L800F01B4 /* 894FC 800F004C 468031A0 */ cvt.s.w $f6, $f6 .L800F0050: @@ -176,9 +176,9 @@ glabel func_800EFE2C /* 89564 800F00B4 3C0140C9 */ lui $at, 0x40c9 /* 89568 800F00B8 34210FD0 */ ori $at, $at, 0xfd0 /* 8956C 800F00BC 44811000 */ mtc1 $at, $f2 -/* 89570 800F00C0 00000000 */ nop +/* 89570 800F00C0 00000000 */ nop /* 89574 800F00C4 46020002 */ mul.s $f0, $f0, $f2 -/* 89578 800F00C8 00000000 */ nop +/* 89578 800F00C8 00000000 */ nop /* 8957C 800F00CC 27A50028 */ addiu $a1, $sp, 0x28 /* 89580 800F00D0 3C0143B4 */ lui $at, 0x43b4 /* 89584 800F00D4 44816000 */ mtc1 $at, $f12 @@ -188,25 +188,25 @@ glabel func_800EFE2C /* 89594 800F00E4 860200B2 */ lh $v0, 0xb2($s0) /* 89598 800F00E8 C7AA0028 */ lwc1 $f10, 0x28($sp) /* 8959C 800F00EC 44821000 */ mtc1 $v0, $f2 -/* 895A0 800F00F0 00000000 */ nop +/* 895A0 800F00F0 00000000 */ nop /* 895A4 800F00F4 468010A0 */ cvt.s.w $f2, $f2 /* 895A8 800F00F8 460A1182 */ mul.s $f6, $f2, $f10 -/* 895AC 800F00FC 00000000 */ nop +/* 895AC 800F00FC 00000000 */ nop /* 895B0 800F0100 C7A8002C */ lwc1 $f8, 0x2c($sp) /* 895B4 800F0104 46081082 */ mul.s $f2, $f2, $f8 -/* 895B8 800F0108 00000000 */ nop +/* 895B8 800F0108 00000000 */ nop /* 895BC 800F010C 3C013E4C */ lui $at, 0x3e4c /* 895C0 800F0110 3421CCCD */ ori $at, $at, 0xcccd /* 895C4 800F0114 44810000 */ mtc1 $at, $f0 -/* 895C8 800F0118 00000000 */ nop +/* 895C8 800F0118 00000000 */ nop /* 895CC 800F011C 46003182 */ mul.s $f6, $f6, $f0 -/* 895D0 800F0120 00000000 */ nop +/* 895D0 800F0120 00000000 */ nop /* 895D4 800F0124 46001082 */ mul.s $f2, $f2, $f0 -/* 895D8 800F0128 00000000 */ nop +/* 895D8 800F0128 00000000 */ nop /* 895DC 800F012C C604002C */ lwc1 $f4, 0x2c($s0) /* 895E0 800F0130 3C013FC0 */ lui $at, 0x3fc0 /* 895E4 800F0134 44810000 */ mtc1 $at, $f0 -/* 895E8 800F0138 00000000 */ nop +/* 895E8 800F0138 00000000 */ nop /* 895EC 800F013C 46002100 */ add.s $f4, $f4, $f0 /* 895F0 800F0140 C6000028 */ lwc1 $f0, 0x28($s0) /* 895F4 800F0144 46060000 */ add.s $f0, $f0, $f6 @@ -220,16 +220,16 @@ glabel func_800EFE2C /* 89614 800F0164 0C01BECC */ jal fx_walk_normal /* 89618 800F0168 E7A80014 */ swc1 $f8, 0x14($sp) /* 8961C 800F016C 0803C08E */ j .L800F0238 -/* 89620 800F0170 00000000 */ nop +/* 89620 800F0170 00000000 */ nop .L800F0174: /* 89624 800F0174 0C00A6C9 */ jal clamp_angle /* 89628 800F0178 C60C0080 */ lwc1 $f12, 0x80($s0) /* 8962C 800F017C 3C0140C9 */ lui $at, 0x40c9 /* 89630 800F0180 34210FD0 */ ori $at, $at, 0xfd0 /* 89634 800F0184 44811000 */ mtc1 $at, $f2 -/* 89638 800F0188 00000000 */ nop +/* 89638 800F0188 00000000 */ nop /* 8963C 800F018C 46020002 */ mul.s $f0, $f0, $f2 -/* 89640 800F0190 00000000 */ nop +/* 89640 800F0190 00000000 */ nop /* 89644 800F0194 27A50028 */ addiu $a1, $sp, 0x28 /* 89648 800F0198 3C0143B4 */ lui $at, 0x43b4 /* 8964C 800F019C 44816000 */ mtc1 $at, $f12 @@ -240,17 +240,17 @@ glabel func_800EFE2C /* 89660 800F01B0 C7A40028 */ lwc1 $f4, 0x28($sp) .L800F01B4: /* 89664 800F01B4 46043102 */ mul.s $f4, $f6, $f4 -/* 89668 800F01B8 00000000 */ nop +/* 89668 800F01B8 00000000 */ nop /* 8966C 800F01BC C602002C */ lwc1 $f2, 0x2c($s0) /* 89670 800F01C0 3C013FC0 */ lui $at, 0x3fc0 /* 89674 800F01C4 44810000 */ mtc1 $at, $f0 -/* 89678 800F01C8 00000000 */ nop +/* 89678 800F01C8 00000000 */ nop /* 8967C 800F01CC 46001080 */ add.s $f2, $f2, $f0 /* 89680 800F01D0 C7A0002C */ lwc1 $f0, 0x2c($sp) /* 89684 800F01D4 24020005 */ addiu $v0, $zero, 5 /* 89688 800F01D8 AFA2001C */ sw $v0, 0x1c($sp) /* 8968C 800F01DC 46003182 */ mul.s $f6, $f6, $f0 -/* 89690 800F01E0 00000000 */ nop +/* 89690 800F01E0 00000000 */ nop /* 89694 800F01E4 3C014150 */ lui $at, 0x4150 /* 89698 800F01E8 44810000 */ mtc1 $at, $f0 /* 8969C 800F01EC 44061000 */ mfc1 $a2, $f2 @@ -272,7 +272,7 @@ glabel func_800EFE2C /* 896DC 800F022C E7A20014 */ swc1 $f2, 0x14($sp) .L800F0230: /* 896E0 800F0230 0C01C8D4 */ jal func_80072350 -/* 896E4 800F0234 00000000 */ nop +/* 896E4 800F0234 00000000 */ nop .L800F0238: /* 896E8 800F0238 8FBF0034 */ lw $ra, 0x34($sp) /* 896EC 800F023C 8FB00030 */ lw $s0, 0x30($sp) diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s index e1dfe16a63..a5a00fda84 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0248.s @@ -22,7 +22,7 @@ glabel func_800F0248 /* 8973C 800F028C 26319492 */ addiu $s1, $s1, %lo(D_80109492) /* 89740 800F0290 86230000 */ lh $v1, ($s1) /* 89744 800F0294 14620013 */ bne $v1, $v0, .L800F02E4 -/* 89748 800F0298 00000000 */ nop +/* 89748 800F0298 00000000 */ nop /* 8974C 800F029C C60C0028 */ lwc1 $f12, 0x28($s0) /* 89750 800F02A0 8E060030 */ lw $a2, 0x30($s0) /* 89754 800F02A4 C600002C */ lwc1 $f0, 0x2c($s0) @@ -64,7 +64,7 @@ glabel func_800F0248 /* 897DC 800F032C 00621824 */ and $v1, $v1, $v0 /* 897E0 800F0330 3C021A00 */ lui $v0, 0x1a00 /* 897E4 800F0334 10620004 */ beq $v1, $v0, .L800F0348 -/* 897E8 800F0338 00000000 */ nop +/* 897E8 800F0338 00000000 */ nop /* 897EC 800F033C 3C018011 */ lui $at, %hi(D_80109490) /* 897F0 800F0340 0803C11C */ j .L800F0470 /* 897F4 800F0344 A4209490 */ sh $zero, %lo(D_80109490)($at) @@ -83,9 +83,9 @@ glabel func_800F0248 /* 89824 800F0374 3C0140C9 */ lui $at, 0x40c9 /* 89828 800F0378 34210FD0 */ ori $at, $at, 0xfd0 /* 8982C 800F037C 44811000 */ mtc1 $at, $f2 -/* 89830 800F0380 00000000 */ nop +/* 89830 800F0380 00000000 */ nop /* 89834 800F0384 46020002 */ mul.s $f0, $f0, $f2 -/* 89838 800F0388 00000000 */ nop +/* 89838 800F0388 00000000 */ nop /* 8983C 800F038C 27A50018 */ addiu $a1, $sp, 0x18 /* 89840 800F0390 3C0143B4 */ lui $at, 0x43b4 /* 89844 800F0394 44816000 */ mtc1 $at, $f12 @@ -95,21 +95,21 @@ glabel func_800F0248 /* 89854 800F03A4 860200B2 */ lh $v0, 0xb2($s0) /* 89858 800F03A8 C7A20018 */ lwc1 $f2, 0x18($sp) /* 8985C 800F03AC 44822000 */ mtc1 $v0, $f4 -/* 89860 800F03B0 00000000 */ nop +/* 89860 800F03B0 00000000 */ nop /* 89864 800F03B4 46802120 */ cvt.s.w $f4, $f4 /* 89868 800F03B8 46022082 */ mul.s $f2, $f4, $f2 -/* 8986C 800F03BC 00000000 */ nop +/* 8986C 800F03BC 00000000 */ nop /* 89870 800F03C0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 89874 800F03C4 46002102 */ mul.s $f4, $f4, $f0 -/* 89878 800F03C8 00000000 */ nop +/* 89878 800F03C8 00000000 */ nop /* 8987C 800F03CC 3C01BECC */ lui $at, 0xbecc /* 89880 800F03D0 3421CCCD */ ori $at, $at, 0xcccd /* 89884 800F03D4 44810000 */ mtc1 $at, $f0 -/* 89888 800F03D8 00000000 */ nop +/* 89888 800F03D8 00000000 */ nop /* 8988C 800F03DC 46001082 */ mul.s $f2, $f2, $f0 -/* 89890 800F03E0 00000000 */ nop +/* 89890 800F03E0 00000000 */ nop /* 89894 800F03E4 46002102 */ mul.s $f4, $f4, $f0 -/* 89898 800F03E8 00000000 */ nop +/* 89898 800F03E8 00000000 */ nop /* 8989C 800F03EC C6000028 */ lwc1 $f0, 0x28($s0) /* 898A0 800F03F0 46020600 */ add.s $f24, $f0, $f2 /* 898A4 800F03F4 C6000030 */ lwc1 $f0, 0x30($s0) @@ -122,7 +122,7 @@ glabel func_800F0248 /* 898C0 800F0410 46001500 */ add.s $f20, $f2, $f0 /* 898C4 800F0414 0000202D */ daddu $a0, $zero, $zero /* 898C8 800F0418 44821000 */ mtc1 $v0, $f2 -/* 898CC 800F041C 00000000 */ nop +/* 898CC 800F041C 00000000 */ nop /* 898D0 800F0420 468010A0 */ cvt.s.w $f2, $f2 /* 898D4 800F0424 C6000084 */ lwc1 $f0, 0x84($s0) /* 898D8 800F0428 3C108011 */ lui $s0, %hi(D_80109494) diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s index cb6e4d4f97..598c000592 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0490.s @@ -18,7 +18,7 @@ glabel func_800F0490 /* 89974 800F04C4 3C013DCC */ lui $at, 0x3dcc /* 89978 800F04C8 3421CCCD */ ori $at, $at, 0xcccd /* 8997C 800F04CC 44811000 */ mtc1 $at, $f2 -/* 89980 800F04D0 00000000 */ nop +/* 89980 800F04D0 00000000 */ nop /* 89984 800F04D4 46020000 */ add.s $f0, $f0, $f2 /* 89988 800F04D8 3C118011 */ lui $s1, %hi(gPlayerStatus) /* 8998C 800F04DC 2631EFC8 */ addiu $s1, $s1, %lo(gPlayerStatus) @@ -34,18 +34,18 @@ glabel func_800F0490 /* 899B0 800F0500 10620003 */ beq $v1, $v0, .L800F0510 /* 899B4 800F0504 24020010 */ addiu $v0, $zero, 0x10 /* 899B8 800F0508 14620073 */ bne $v1, $v0, .L800F06D8 -/* 899BC 800F050C 00000000 */ nop +/* 899BC 800F050C 00000000 */ nop .L800F0510: /* 899C0 800F0510 8E220000 */ lw $v0, ($s1) /* 899C4 800F0514 30420400 */ andi $v0, $v0, 0x400 /* 899C8 800F0518 1040006F */ beqz $v0, .L800F06D8 -/* 899CC 800F051C 00000000 */ nop +/* 899CC 800F051C 00000000 */ nop .L800F0520: /* 899D0 800F0520 3C028011 */ lui $v0, %hi(D_8010CFF4) /* 899D4 800F0524 8C42CFF4 */ lw $v0, %lo(D_8010CFF4)($v0) /* 899D8 800F0528 2842000A */ slti $v0, $v0, 0xa /* 899DC 800F052C 1440006A */ bnez $v0, .L800F06D8 -/* 899E0 800F0530 00000000 */ nop +/* 899E0 800F0530 00000000 */ nop /* 899E4 800F0534 3C108011 */ lui $s0, %hi(D_80109498) /* 899E8 800F0538 26109498 */ addiu $s0, $s0, %lo(D_80109498) /* 899EC 800F053C C62E002C */ lwc1 $f14, 0x2c($s1) @@ -75,21 +75,21 @@ glabel func_800F0490 /* 89A48 800F0598 2404000A */ addiu $a0, $zero, 0xa /* 89A4C 800F059C 2442FFFB */ addiu $v0, $v0, -5 /* 89A50 800F05A0 4482B000 */ mtc1 $v0, $f22 -/* 89A54 800F05A4 00000000 */ nop +/* 89A54 800F05A4 00000000 */ nop /* 89A58 800F05A8 4680B5A0 */ cvt.s.w $f22, $f22 /* 89A5C 800F05AC 0C00A67F */ jal rand_int /* 89A60 800F05B0 2404000A */ addiu $a0, $zero, 0xa /* 89A64 800F05B4 4616B082 */ mul.s $f2, $f22, $f22 -/* 89A68 800F05B8 00000000 */ nop +/* 89A68 800F05B8 00000000 */ nop /* 89A6C 800F05BC 2442FFFB */ addiu $v0, $v0, -5 /* 89A70 800F05C0 4482C000 */ mtc1 $v0, $f24 -/* 89A74 800F05C4 00000000 */ nop +/* 89A74 800F05C4 00000000 */ nop /* 89A78 800F05C8 4680C620 */ cvt.s.w $f24, $f24 /* 89A7C 800F05CC 4618C102 */ mul.s $f4, $f24, $f24 -/* 89A80 800F05D0 00000000 */ nop +/* 89A80 800F05D0 00000000 */ nop /* 89A84 800F05D4 C62C0084 */ lwc1 $f12, 0x84($s1) /* 89A88 800F05D8 44920000 */ mtc1 $s2, $f0 -/* 89A8C 800F05DC 00000000 */ nop +/* 89A8C 800F05DC 00000000 */ nop /* 89A90 800F05E0 46800020 */ cvt.s.w $f0, $f0 /* 89A94 800F05E4 46006307 */ neg.s $f12, $f12 /* 89A98 800F05E8 46006300 */ add.s $f12, $f12, $f0 @@ -106,9 +106,9 @@ glabel func_800F0490 /* 89AC4 800F0614 3C0140C9 */ lui $at, 0x40c9 /* 89AC8 800F0618 34210FD0 */ ori $at, $at, 0xfd0 /* 89ACC 800F061C 44811000 */ mtc1 $at, $f2 -/* 89AD0 800F0620 00000000 */ nop +/* 89AD0 800F0620 00000000 */ nop /* 89AD4 800F0624 46020002 */ mul.s $f0, $f0, $f2 -/* 89AD8 800F0628 00000000 */ nop +/* 89AD8 800F0628 00000000 */ nop /* 89ADC 800F062C 27A50010 */ addiu $a1, $sp, 0x10 /* 89AE0 800F0630 3C0143B4 */ lui $at, 0x43b4 /* 89AE4 800F0634 44816000 */ mtc1 $at, $f12 @@ -118,26 +118,26 @@ glabel func_800F0490 /* 89AF4 800F0644 862200B2 */ lh $v0, 0xb2($s1) /* 89AF8 800F0648 C7A40010 */ lwc1 $f4, 0x10($sp) /* 89AFC 800F064C 44823000 */ mtc1 $v0, $f6 -/* 89B00 800F0650 00000000 */ nop +/* 89B00 800F0650 00000000 */ nop /* 89B04 800F0654 468031A0 */ cvt.s.w $f6, $f6 /* 89B08 800F0658 46043102 */ mul.s $f4, $f6, $f4 -/* 89B0C 800F065C 00000000 */ nop +/* 89B0C 800F065C 00000000 */ nop /* 89B10 800F0660 C7A00014 */ lwc1 $f0, 0x14($sp) /* 89B14 800F0664 46003182 */ mul.s $f6, $f6, $f0 -/* 89B18 800F0668 00000000 */ nop +/* 89B18 800F0668 00000000 */ nop /* 89B1C 800F066C 3C014178 */ lui $at, 0x4178 /* 89B20 800F0670 44811000 */ mtc1 $at, $f2 /* 89B24 800F0674 C620002C */ lwc1 $f0, 0x2c($s1) /* 89B28 800F0678 46020000 */ add.s $f0, $f0, $f2 /* 89B2C 800F067C 46140000 */ add.s $f0, $f0, $f20 /* 89B30 800F0680 461A2102 */ mul.s $f4, $f4, $f26 -/* 89B34 800F0684 00000000 */ nop +/* 89B34 800F0684 00000000 */ nop /* 89B38 800F0688 44060000 */ mfc1 $a2, $f0 /* 89B3C 800F068C C6200028 */ lwc1 $f0, 0x28($s1) /* 89B40 800F0690 46040000 */ add.s $f0, $f0, $f4 /* 89B44 800F0694 46160000 */ add.s $f0, $f0, $f22 /* 89B48 800F0698 461A3182 */ mul.s $f6, $f6, $f26 -/* 89B4C 800F069C 00000000 */ nop +/* 89B4C 800F069C 00000000 */ nop /* 89B50 800F06A0 44050000 */ mfc1 $a1, $f0 /* 89B54 800F06A4 C6200030 */ lwc1 $f0, 0x30($s1) /* 89B58 800F06A8 46060000 */ add.s $f0, $f0, $f6 @@ -149,9 +149,9 @@ glabel func_800F0490 /* 89B70 800F06C0 0000202D */ daddu $a0, $zero, $zero /* 89B74 800F06C4 2A620004 */ slti $v0, $s3, 4 /* 89B78 800F06C8 1040005B */ beqz $v0, .L800F0838 -/* 89B7C 800F06CC 00000000 */ nop +/* 89B7C 800F06CC 00000000 */ nop /* 89B80 800F06D0 0803C165 */ j .L800F0594 -/* 89B84 800F06D4 00000000 */ nop +/* 89B84 800F06D4 00000000 */ nop .L800F06D8: /* 89B88 800F06D8 922200B4 */ lbu $v0, 0xb4($s1) /* 89B8C 800F06DC 2442FFFF */ addiu $v0, $v0, -1 @@ -163,7 +163,7 @@ glabel func_800F0490 /* 89BA4 800F06F4 00621824 */ and $v1, $v1, $v0 /* 89BA8 800F06F8 3C021A00 */ lui $v0, 0x1a00 /* 89BAC 800F06FC 10620004 */ beq $v1, $v0, .L800F0710 -/* 89BB0 800F0700 00000000 */ nop +/* 89BB0 800F0700 00000000 */ nop /* 89BB4 800F0704 3C018011 */ lui $at, %hi(D_8010949C) /* 89BB8 800F0708 0803C20E */ j .L800F0838 /* 89BBC 800F070C A420949C */ sh $zero, %lo(D_8010949C)($at) @@ -172,18 +172,18 @@ glabel func_800F0490 /* 89BC4 800F0714 2404000A */ addiu $a0, $zero, 0xa /* 89BC8 800F0718 2442FFFB */ addiu $v0, $v0, -5 /* 89BCC 800F071C 4482C000 */ mtc1 $v0, $f24 -/* 89BD0 800F0720 00000000 */ nop +/* 89BD0 800F0720 00000000 */ nop /* 89BD4 800F0724 4680C620 */ cvt.s.w $f24, $f24 /* 89BD8 800F0728 0C00A67F */ jal rand_int /* 89BDC 800F072C 2404000A */ addiu $a0, $zero, 0xa /* 89BE0 800F0730 4618C002 */ mul.s $f0, $f24, $f24 -/* 89BE4 800F0734 00000000 */ nop +/* 89BE4 800F0734 00000000 */ nop /* 89BE8 800F0738 2442FFFB */ addiu $v0, $v0, -5 /* 89BEC 800F073C 4482B000 */ mtc1 $v0, $f22 -/* 89BF0 800F0740 00000000 */ nop +/* 89BF0 800F0740 00000000 */ nop /* 89BF4 800F0744 4680B5A0 */ cvt.s.w $f22, $f22 /* 89BF8 800F0748 4616B082 */ mul.s $f2, $f22, $f22 -/* 89BFC 800F074C 00000000 */ nop +/* 89BFC 800F074C 00000000 */ nop /* 89C00 800F0750 C62C0084 */ lwc1 $f12, 0x84($s1) /* 89C04 800F0754 3C01C000 */ lui $at, 0xc000 /* 89C08 800F0758 4481A000 */ mtc1 $at, $f20 @@ -199,9 +199,9 @@ glabel func_800F0490 /* 89C30 800F0780 3C0140C9 */ lui $at, 0x40c9 /* 89C34 800F0784 34210FD0 */ ori $at, $at, 0xfd0 /* 89C38 800F0788 44811000 */ mtc1 $at, $f2 -/* 89C3C 800F078C 00000000 */ nop +/* 89C3C 800F078C 00000000 */ nop /* 89C40 800F0790 46020002 */ mul.s $f0, $f0, $f2 -/* 89C44 800F0794 00000000 */ nop +/* 89C44 800F0794 00000000 */ nop /* 89C48 800F0798 27A50010 */ addiu $a1, $sp, 0x10 /* 89C4C 800F079C 3C0143B4 */ lui $at, 0x43b4 /* 89C50 800F07A0 44816000 */ mtc1 $at, $f12 @@ -211,21 +211,21 @@ glabel func_800F0490 /* 89C60 800F07B0 862200B2 */ lh $v0, 0xb2($s1) /* 89C64 800F07B4 C7A60010 */ lwc1 $f6, 0x10($sp) /* 89C68 800F07B8 44822000 */ mtc1 $v0, $f4 -/* 89C6C 800F07BC 00000000 */ nop +/* 89C6C 800F07BC 00000000 */ nop /* 89C70 800F07C0 46802120 */ cvt.s.w $f4, $f4 /* 89C74 800F07C4 46062182 */ mul.s $f6, $f4, $f6 -/* 89C78 800F07C8 00000000 */ nop +/* 89C78 800F07C8 00000000 */ nop /* 89C7C 800F07CC C7A00014 */ lwc1 $f0, 0x14($sp) /* 89C80 800F07D0 46002102 */ mul.s $f4, $f4, $f0 -/* 89C84 800F07D4 00000000 */ nop +/* 89C84 800F07D4 00000000 */ nop /* 89C88 800F07D8 3C01BE99 */ lui $at, 0xbe99 /* 89C8C 800F07DC 3421999A */ ori $at, $at, 0x999a /* 89C90 800F07E0 44810000 */ mtc1 $at, $f0 -/* 89C94 800F07E4 00000000 */ nop +/* 89C94 800F07E4 00000000 */ nop /* 89C98 800F07E8 46003182 */ mul.s $f6, $f6, $f0 -/* 89C9C 800F07EC 00000000 */ nop +/* 89C9C 800F07EC 00000000 */ nop /* 89CA0 800F07F0 46002102 */ mul.s $f4, $f4, $f0 -/* 89CA4 800F07F4 00000000 */ nop +/* 89CA4 800F07F4 00000000 */ nop /* 89CA8 800F07F8 3C014178 */ lui $at, 0x4178 /* 89CAC 800F07FC 44811000 */ mtc1 $at, $f2 /* 89CB0 800F0800 C620002C */ lwc1 $f0, 0x2c($s1) diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s index 579c43ac7e..18c44cc439 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0864.s @@ -22,7 +22,7 @@ glabel func_800F0864 /* 89D58 800F08A8 00021E03 */ sra $v1, $v0, 0x18 /* 89D5C 800F08AC 2402000A */ addiu $v0, $zero, 0xa /* 89D60 800F08B0 10620003 */ beq $v1, $v0, .L800F08C0 -/* 89D64 800F08B4 00000000 */ nop +/* 89D64 800F08B4 00000000 */ nop /* 89D68 800F08B8 14600004 */ bnez $v1, .L800F08CC /* 89D6C 800F08BC 24020004 */ addiu $v0, $zero, 4 .L800F08C0: @@ -50,9 +50,9 @@ glabel func_800F0864 /* 89DBC 800F090C 3C0140C9 */ lui $at, 0x40c9 /* 89DC0 800F0910 34210FD0 */ ori $at, $at, 0xfd0 /* 89DC4 800F0914 44811000 */ mtc1 $at, $f2 -/* 89DC8 800F0918 00000000 */ nop +/* 89DC8 800F0918 00000000 */ nop /* 89DCC 800F091C 46020002 */ mul.s $f0, $f0, $f2 -/* 89DD0 800F0920 00000000 */ nop +/* 89DD0 800F0920 00000000 */ nop /* 89DD4 800F0924 27A6001C */ addiu $a2, $sp, 0x1c /* 89DD8 800F0928 3C0143B4 */ lui $at, 0x43b4 /* 89DDC 800F092C 44816000 */ mtc1 $at, $f12 @@ -62,21 +62,21 @@ glabel func_800F0864 /* 89DEC 800F093C 862200B2 */ lh $v0, 0xb2($s1) /* 89DF0 800F0940 C7A40018 */ lwc1 $f4, 0x18($sp) /* 89DF4 800F0944 44821000 */ mtc1 $v0, $f2 -/* 89DF8 800F0948 00000000 */ nop +/* 89DF8 800F0948 00000000 */ nop /* 89DFC 800F094C 468010A0 */ cvt.s.w $f2, $f2 /* 89E00 800F0950 46041102 */ mul.s $f4, $f2, $f4 -/* 89E04 800F0954 00000000 */ nop +/* 89E04 800F0954 00000000 */ nop /* 89E08 800F0958 C7A0001C */ lwc1 $f0, 0x1c($sp) /* 89E0C 800F095C 46001082 */ mul.s $f2, $f2, $f0 -/* 89E10 800F0960 00000000 */ nop +/* 89E10 800F0960 00000000 */ nop /* 89E14 800F0964 3C013E4C */ lui $at, 0x3e4c /* 89E18 800F0968 3421CCCD */ ori $at, $at, 0xcccd /* 89E1C 800F096C 44810000 */ mtc1 $at, $f0 -/* 89E20 800F0970 00000000 */ nop +/* 89E20 800F0970 00000000 */ nop /* 89E24 800F0974 46002102 */ mul.s $f4, $f4, $f0 -/* 89E28 800F0978 00000000 */ nop +/* 89E28 800F0978 00000000 */ nop /* 89E2C 800F097C 46001082 */ mul.s $f2, $f2, $f0 -/* 89E30 800F0980 00000000 */ nop +/* 89E30 800F0980 00000000 */ nop /* 89E34 800F0984 C62C0028 */ lwc1 $f12, 0x28($s1) /* 89E38 800F0988 46046300 */ add.s $f12, $f12, $f4 /* 89E3C 800F098C C6200030 */ lwc1 $f0, 0x30($s1) diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s index d938122153..fd27154d30 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F09EC.s @@ -21,7 +21,7 @@ glabel func_800F09EC /* 89EDC 800F0A2C 00021E03 */ sra $v1, $v0, 0x18 /* 89EE0 800F0A30 2402000A */ addiu $v0, $zero, 0xa /* 89EE4 800F0A34 10620003 */ beq $v1, $v0, .L800F0A44 -/* 89EE8 800F0A38 00000000 */ nop +/* 89EE8 800F0A38 00000000 */ nop /* 89EEC 800F0A3C 14600004 */ bnez $v1, .L800F0A50 /* 89EF0 800F0A40 24020004 */ addiu $v0, $zero, 4 .L800F0A44: @@ -49,9 +49,9 @@ glabel func_800F09EC /* 89F40 800F0A90 3C0140C9 */ lui $at, 0x40c9 /* 89F44 800F0A94 34210FD0 */ ori $at, $at, 0xfd0 /* 89F48 800F0A98 44811000 */ mtc1 $at, $f2 -/* 89F4C 800F0A9C 00000000 */ nop +/* 89F4C 800F0A9C 00000000 */ nop /* 89F50 800F0AA0 46020002 */ mul.s $f0, $f0, $f2 -/* 89F54 800F0AA4 00000000 */ nop +/* 89F54 800F0AA4 00000000 */ nop /* 89F58 800F0AA8 27A50010 */ addiu $a1, $sp, 0x10 /* 89F5C 800F0AAC 3C0143B4 */ lui $at, 0x43b4 /* 89F60 800F0AB0 44816000 */ mtc1 $at, $f12 @@ -61,21 +61,21 @@ glabel func_800F09EC /* 89F70 800F0AC0 860200B2 */ lh $v0, 0xb2($s0) /* 89F74 800F0AC4 C7A40010 */ lwc1 $f4, 0x10($sp) /* 89F78 800F0AC8 44821000 */ mtc1 $v0, $f2 -/* 89F7C 800F0ACC 00000000 */ nop +/* 89F7C 800F0ACC 00000000 */ nop /* 89F80 800F0AD0 468010A0 */ cvt.s.w $f2, $f2 /* 89F84 800F0AD4 46041102 */ mul.s $f4, $f2, $f4 -/* 89F88 800F0AD8 00000000 */ nop +/* 89F88 800F0AD8 00000000 */ nop /* 89F8C 800F0ADC C7A00014 */ lwc1 $f0, 0x14($sp) /* 89F90 800F0AE0 46001082 */ mul.s $f2, $f2, $f0 -/* 89F94 800F0AE4 00000000 */ nop +/* 89F94 800F0AE4 00000000 */ nop /* 89F98 800F0AE8 3C013E4C */ lui $at, 0x3e4c /* 89F9C 800F0AEC 3421CCCD */ ori $at, $at, 0xcccd /* 89FA0 800F0AF0 44810000 */ mtc1 $at, $f0 -/* 89FA4 800F0AF4 00000000 */ nop +/* 89FA4 800F0AF4 00000000 */ nop /* 89FA8 800F0AF8 46002102 */ mul.s $f4, $f4, $f0 -/* 89FAC 800F0AFC 00000000 */ nop +/* 89FAC 800F0AFC 00000000 */ nop /* 89FB0 800F0B00 46001082 */ mul.s $f2, $f2, $f0 -/* 89FB4 800F0B04 00000000 */ nop +/* 89FB4 800F0B04 00000000 */ nop /* 89FB8 800F0B08 C6000028 */ lwc1 $f0, 0x28($s0) /* 89FBC 800F0B0C 46040000 */ add.s $f0, $f0, $f4 /* 89FC0 800F0B10 44050000 */ mfc1 $a1, $f0 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s index 2c93d2c272..a42522b6dd 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0B3C.s @@ -21,7 +21,7 @@ glabel func_800F0B3C /* 8A02C 800F0B7C 00021E03 */ sra $v1, $v0, 0x18 /* 8A030 800F0B80 2402000A */ addiu $v0, $zero, 0xa /* 8A034 800F0B84 10620003 */ beq $v1, $v0, .L800F0B94 -/* 8A038 800F0B88 00000000 */ nop +/* 8A038 800F0B88 00000000 */ nop /* 8A03C 800F0B8C 14600004 */ bnez $v1, .L800F0BA0 /* 8A040 800F0B90 24020004 */ addiu $v0, $zero, 4 .L800F0B94: @@ -49,9 +49,9 @@ glabel func_800F0B3C /* 8A090 800F0BE0 3C0140C9 */ lui $at, 0x40c9 /* 8A094 800F0BE4 34210FD0 */ ori $at, $at, 0xfd0 /* 8A098 800F0BE8 44811000 */ mtc1 $at, $f2 -/* 8A09C 800F0BEC 00000000 */ nop +/* 8A09C 800F0BEC 00000000 */ nop /* 8A0A0 800F0BF0 46020002 */ mul.s $f0, $f0, $f2 -/* 8A0A4 800F0BF4 00000000 */ nop +/* 8A0A4 800F0BF4 00000000 */ nop /* 8A0A8 800F0BF8 27A50018 */ addiu $a1, $sp, 0x18 /* 8A0AC 800F0BFC 3C0143B4 */ lui $at, 0x43b4 /* 8A0B0 800F0C00 44816000 */ mtc1 $at, $f12 @@ -61,21 +61,21 @@ glabel func_800F0B3C /* 8A0C0 800F0C10 860200B2 */ lh $v0, 0xb2($s0) /* 8A0C4 800F0C14 C7A40018 */ lwc1 $f4, 0x18($sp) /* 8A0C8 800F0C18 44821000 */ mtc1 $v0, $f2 -/* 8A0CC 800F0C1C 00000000 */ nop +/* 8A0CC 800F0C1C 00000000 */ nop /* 8A0D0 800F0C20 468010A0 */ cvt.s.w $f2, $f2 /* 8A0D4 800F0C24 46041102 */ mul.s $f4, $f2, $f4 -/* 8A0D8 800F0C28 00000000 */ nop +/* 8A0D8 800F0C28 00000000 */ nop /* 8A0DC 800F0C2C C7A0001C */ lwc1 $f0, 0x1c($sp) /* 8A0E0 800F0C30 46001082 */ mul.s $f2, $f2, $f0 -/* 8A0E4 800F0C34 00000000 */ nop +/* 8A0E4 800F0C34 00000000 */ nop /* 8A0E8 800F0C38 3C013E4C */ lui $at, 0x3e4c /* 8A0EC 800F0C3C 3421CCCD */ ori $at, $at, 0xcccd /* 8A0F0 800F0C40 44810000 */ mtc1 $at, $f0 -/* 8A0F4 800F0C44 00000000 */ nop +/* 8A0F4 800F0C44 00000000 */ nop /* 8A0F8 800F0C48 46002102 */ mul.s $f4, $f4, $f0 -/* 8A0FC 800F0C4C 00000000 */ nop +/* 8A0FC 800F0C4C 00000000 */ nop /* 8A100 800F0C50 46001082 */ mul.s $f2, $f2, $f0 -/* 8A104 800F0C54 00000000 */ nop +/* 8A104 800F0C54 00000000 */ nop /* 8A108 800F0C58 44803000 */ mtc1 $zero, $f6 /* 8A10C 800F0C5C C600002C */ lwc1 $f0, 0x2c($s0) /* 8A110 800F0C60 46060000 */ add.s $f0, $f0, $f6 diff --git a/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s b/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s index 3198b3ddf0..9678dd44c4 100644 --- a/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s +++ b/asm/nonmatchings/code_891b0_len_fb0/func_800F0C9C.s @@ -3,7 +3,7 @@ glabel func_800F0C9C /* 8A14C 800F0C9C 03E00008 */ jr $ra -/* 8A150 800F0CA0 00000000 */ nop -/* 8A154 800F0CA4 00000000 */ nop -/* 8A158 800F0CA8 00000000 */ nop -/* 8A15C 800F0CAC 00000000 */ nop +/* 8A150 800F0CA0 00000000 */ nop +/* 8A154 800F0CA4 00000000 */ nop +/* 8A158 800F0CA8 00000000 */ nop +/* 8A15C 800F0CAC 00000000 */ nop diff --git a/asm/nonmatchings/code_8e790_len_2850/draw_box.s b/asm/nonmatchings/code_8e790_len_2850/draw_box.s index 812166faaa..5e01c54421 100644 --- a/asm/nonmatchings/code_8e790_len_2850/draw_box.s +++ b/asm/nonmatchings/code_8e790_len_2850/draw_box.s @@ -217,7 +217,7 @@ glabel draw_box /* 8EAB0 800F5600 24020001 */ addiu $v0, $zero, 1 /* 8EAB4 800F5604 93B900E7 */ lbu $t9, 0xe7($sp) /* 8EAB8 800F5608 13200938 */ beqz $t9, .L800F7AEC -/* 8EABC 800F560C 00000000 */ nop +/* 8EABC 800F560C 00000000 */ nop /* 8EAC0 800F5610 8FAE01F8 */ lw $t6, 0x1f8($sp) /* 8EAC4 800F5614 29C2FD01 */ slti $v0, $t6, -0x2ff /* 8EAC8 800F5618 14400934 */ bnez $v0, .L800F7AEC @@ -246,9 +246,9 @@ glabel draw_box /* 8EB24 800F5674 1040091D */ beqz $v0, .L800F7AEC /* 8EB28 800F5678 24020001 */ addiu $v0, $zero, 1 /* 8EB2C 800F567C 1880091B */ blez $a0, .L800F7AEC -/* 8EB30 800F5680 00000000 */ nop +/* 8EB30 800F5680 00000000 */ nop /* 8EB34 800F5684 1C600003 */ bgtz $v1, .L800F5694 -/* 8EB38 800F5688 00000000 */ nop +/* 8EB38 800F5688 00000000 */ nop .L800F568C: /* 8EB3C 800F568C 0803DEBB */ j .L800F7AEC /* 8EB40 800F5690 24020001 */ addiu $v0, $zero, 1 @@ -437,7 +437,7 @@ glabel draw_box /* 8EDF4 800F5944 00021043 */ sra $v0, $v0, 1 /* 8EDF8 800F5948 01C21021 */ addu $v0, $t6, $v0 /* 8EDFC 800F594C 44820000 */ mtc1 $v0, $f0 -/* 8EE00 800F5950 00000000 */ nop +/* 8EE00 800F5950 00000000 */ nop /* 8EE04 800F5954 46800020 */ cvt.s.w $f0, $f0 /* 8EE08 800F5958 000F17C2 */ srl $v0, $t7, 0x1f /* 8EE0C 800F595C 01E21021 */ addu $v0, $t7, $v0 @@ -445,7 +445,7 @@ glabel draw_box /* 8EE14 800F5964 02421021 */ addu $v0, $s2, $v0 /* 8EE18 800F5968 E7A00014 */ swc1 $f0, 0x14($sp) /* 8EE1C 800F596C 44820000 */ mtc1 $v0, $f0 -/* 8EE20 800F5970 00000000 */ nop +/* 8EE20 800F5970 00000000 */ nop /* 8EE24 800F5974 46800020 */ cvt.s.w $f0, $f0 /* 8EE28 800F5978 E7A00018 */ swc1 $f0, 0x18($sp) /* 8EE2C 800F597C C7A00200 */ lwc1 $f0, 0x200($sp) @@ -453,13 +453,13 @@ glabel draw_box /* 8EE34 800F5984 0C018FC4 */ jal guPositionF /* 8EE38 800F5988 E7A0001C */ swc1 $f0, 0x1c($sp) /* 8EE3C 800F598C 4614B032 */ c.eq.s $f22, $f20 -/* 8EE40 800F5990 00000000 */ nop +/* 8EE40 800F5990 00000000 */ nop /* 8EE44 800F5994 45000005 */ bc1f .L800F59AC /* 8EE48 800F5998 27B00060 */ addiu $s0, $sp, 0x60 /* 8EE4C 800F599C 4614C032 */ c.eq.s $f24, $f20 -/* 8EE50 800F59A0 00000000 */ nop +/* 8EE50 800F59A0 00000000 */ nop /* 8EE54 800F59A4 4501000A */ bc1t .L800F59D0 -/* 8EE58 800F59A8 00000000 */ nop +/* 8EE58 800F59A8 00000000 */ nop .L800F59AC: /* 8EE5C 800F59AC 4405B000 */ mfc1 $a1, $f22 /* 8EE60 800F59B0 4406C000 */ mfc1 $a2, $f24 @@ -481,7 +481,7 @@ glabel draw_box /* 8EE9C 800F59EC 00431021 */ addu $v0, $v0, $v1 /* 8EEA0 800F59F0 00021043 */ sra $v0, $v0, 1 /* 8EEA4 800F59F4 44823000 */ mtc1 $v0, $f6 -/* 8EEA8 800F59F8 00000000 */ nop +/* 8EEA8 800F59F8 00000000 */ nop /* 8EEAC 800F59FC 468031A0 */ cvt.s.w $f6, $f6 /* 8EEB0 800F5A00 8FA20238 */ lw $v0, 0x238($sp) /* 8EEB4 800F5A04 44053000 */ mfc1 $a1, $f6 @@ -490,7 +490,7 @@ glabel draw_box /* 8EEC0 800F5A10 00431021 */ addu $v0, $v0, $v1 /* 8EEC4 800F5A14 00021043 */ sra $v0, $v0, 1 /* 8EEC8 800F5A18 44823000 */ mtc1 $v0, $f6 -/* 8EECC 800F5A1C 00000000 */ nop +/* 8EECC 800F5A1C 00000000 */ nop /* 8EED0 800F5A20 468031A0 */ cvt.s.w $f6, $f6 /* 8EED4 800F5A24 44063000 */ mfc1 $a2, $f6 /* 8EED8 800F5A28 0C019E40 */ jal guTranslateF @@ -670,7 +670,7 @@ glabel draw_box /* 8F174 800F5CC4 AD420024 */ sw $v0, 0x24($t2) /* 8F178 800F5CC8 8FAF0138 */ lw $t7, 0x138($sp) /* 8F17C 800F5CCC 11E0012E */ beqz $t7, .L800F6188 -/* 8F180 800F5CD0 00000000 */ nop +/* 8F180 800F5CD0 00000000 */ nop /* 8F184 800F5CD4 92820004 */ lbu $v0, 4($s4) /* 8F188 800F5CD8 3043000F */ andi $v1, $v0, 0xf /* 8F18C 800F5CDC 24020001 */ addiu $v0, $zero, 1 @@ -681,14 +681,14 @@ glabel draw_box /* 8F1A0 800F5CF0 10600009 */ beqz $v1, .L800F5D18 /* 8F1A4 800F5CF4 25420030 */ addiu $v0, $t2, 0x30 /* 8F1A8 800F5CF8 0803D80F */ j .L800F603C -/* 8F1AC 800F5CFC 00000000 */ nop +/* 8F1AC 800F5CFC 00000000 */ nop .L800F5D00: /* 8F1B0 800F5D00 1062006D */ beq $v1, $v0, .L800F5EB8 /* 8F1B4 800F5D04 24020003 */ addiu $v0, $zero, 3 /* 8F1B8 800F5D08 1062008D */ beq $v1, $v0, .L800F5F40 /* 8F1BC 800F5D0C 25420030 */ addiu $v0, $t2, 0x30 /* 8F1C0 800F5D10 0803D80F */ j .L800F603C -/* 8F1C4 800F5D14 00000000 */ nop +/* 8F1C4 800F5D14 00000000 */ nop .L800F5D18: /* 8F1C8 800F5D18 00152042 */ srl $a0, $s5, 1 /* 8F1CC 800F5D1C AD620000 */ sw $v0, ($t3) @@ -1124,7 +1124,7 @@ glabel draw_box /* 8F85C 800F63AC 11D900E6 */ beq $t6, $t9, .L800F6748 /* 8F860 800F63B0 240E0002 */ addiu $t6, $zero, 2 /* 8F864 800F63B4 0803DA1C */ j .L800F6870 -/* 8F868 800F63B8 00000000 */ nop +/* 8F868 800F63B8 00000000 */ nop .L800F63BC: /* 8F86C 800F63BC 000A2842 */ srl $a1, $t2, 1 /* 8F870 800F63C0 24A2FFFF */ addiu $v0, $a1, -1 @@ -1440,13 +1440,13 @@ glabel draw_box /* 8FD30 800F6880 11AF0008 */ beq $t5, $t7, .L800F68A4 /* 8FD34 800F6884 3C0EF200 */ lui $t6, 0xf200 /* 8FD38 800F6888 0803DA6C */ j .L800F69B0 -/* 8FD3C 800F688C 00000000 */ nop +/* 8FD3C 800F688C 00000000 */ nop .L800F6890: /* 8FD40 800F6890 24120003 */ addiu $s2, $zero, 3 /* 8FD44 800F6894 11B2002E */ beq $t5, $s2, .L800F6950 /* 8FD48 800F6898 3C0EF200 */ lui $t6, 0xf200 /* 8FD4C 800F689C 0803DA6C */ j .L800F69B0 -/* 8FD50 800F68A0 00000000 */ nop +/* 8FD50 800F68A0 00000000 */ nop .L800F68A4: /* 8FD54 800F68A4 8D820000 */ lw $v0, ($t4) /* 8FD58 800F68A8 0040182D */ daddu $v1, $v0, $zero @@ -1680,16 +1680,16 @@ glabel draw_box /* 900BC 800F6C0C 10400005 */ beqz $v0, .L800F6C24 /* 900C0 800F6C10 24190002 */ addiu $t9, $zero, 2 /* 900C4 800F6C14 11A00009 */ beqz $t5, .L800F6C3C -/* 900C8 800F6C18 00000000 */ nop +/* 900C8 800F6C18 00000000 */ nop /* 900CC 800F6C1C 0803DC1C */ j .L800F7070 -/* 900D0 800F6C20 00000000 */ nop +/* 900D0 800F6C20 00000000 */ nop .L800F6C24: /* 900D4 800F6C24 11B90082 */ beq $t5, $t9, .L800F6E30 /* 900D8 800F6C28 240E0003 */ addiu $t6, $zero, 3 /* 900DC 800F6C2C 11AE00C3 */ beq $t5, $t6, .L800F6F3C -/* 900E0 800F6C30 00000000 */ nop +/* 900E0 800F6C30 00000000 */ nop /* 900E4 800F6C34 0803DC1C */ j .L800F7070 -/* 900E8 800F6C38 00000000 */ nop +/* 900E8 800F6C38 00000000 */ nop .L800F6C3C: /* 900EC 800F6C3C 8D830000 */ lw $v1, ($t4) /* 900F0 800F6C40 24620008 */ addiu $v0, $v1, 8 @@ -1900,7 +1900,7 @@ glabel draw_box /* 903AC 800F6EFC 8FB20168 */ lw $s2, 0x168($sp) /* 903B0 800F6F00 00121080 */ sll $v0, $s2, 2 /* 903B4 800F6F04 0441000A */ bgez $v0, .L800F6F30 -/* 903B8 800F6F08 00000000 */ nop +/* 903B8 800F6F08 00000000 */ nop /* 903BC 800F6F0C 8FB90174 */ lw $t9, 0x174($sp) /* 903C0 800F6F10 001911C3 */ sra $v0, $t9, 7 /* 903C4 800F6F14 5C400001 */ bgtzl $v0, .L800F6F1C @@ -1979,7 +1979,7 @@ glabel draw_box /* 904BC 800F700C 8FB90168 */ lw $t9, 0x168($sp) /* 904C0 800F7010 00191080 */ sll $v0, $t9, 2 /* 904C4 800F7014 0441000A */ bgez $v0, .L800F7040 -/* 904C8 800F7018 00000000 */ nop +/* 904C8 800F7018 00000000 */ nop /* 904CC 800F701C 8FAE0174 */ lw $t6, 0x174($sp) /* 904D0 800F7020 000E11C3 */ sra $v0, $t6, 7 /* 904D4 800F7024 5C400001 */ bgtzl $v0, .L800F702C @@ -2208,9 +2208,9 @@ glabel draw_box /* 90800 800F7350 AC400004 */ sw $zero, 4($v0) /* 90804 800F7354 8FAF0228 */ lw $t7, 0x228($sp) /* 90808 800F7358 11E001CC */ beqz $t7, .L800F7A8C -/* 9080C 800F735C 00000000 */ nop +/* 9080C 800F735C 00000000 */ nop /* 90810 800F7360 13C001BE */ beqz $fp, .L800F7A5C -/* 90814 800F7364 00000000 */ nop +/* 90814 800F7364 00000000 */ nop /* 90818 800F7368 8FAE0204 */ lw $t6, 0x204($sp) /* 9081C 800F736C 8FAF0208 */ lw $t7, 0x208($sp) /* 90820 800F7370 01CF0018 */ mult $t6, $t7 @@ -2306,7 +2306,7 @@ glabel draw_box /* 90988 800F74D8 468010A0 */ cvt.s.w $f2, $f2 /* 9098C 800F74DC 25220040 */ addiu $v0, $t1, 0x40 /* 90990 800F74E0 46041082 */ mul.s $f2, $f2, $f4 -/* 90994 800F74E4 00000000 */ nop +/* 90994 800F74E4 00000000 */ nop /* 90998 800F74E8 AF020000 */ sw $v0, ($t8) /* 9099C 800F74EC 8FAE0180 */ lw $t6, 0x180($sp) /* 909A0 800F74F0 AD20003C */ sw $zero, 0x3c($t1) @@ -2314,35 +2314,35 @@ glabel draw_box /* 909A8 800F74F8 C7A00208 */ lwc1 $f0, 0x208($sp) /* 909AC 800F74FC 46800020 */ cvt.s.w $f0, $f0 /* 909B0 800F7500 46040002 */ mul.s $f0, $f0, $f4 -/* 909B4 800F7504 00000000 */ nop +/* 909B4 800F7504 00000000 */ nop /* 909B8 800F7508 4600118D */ trunc.w.s $f6, $f2 /* 909BC 800F750C 44033000 */ mfc1 $v1, $f6 -/* 909C0 800F7510 00000000 */ nop +/* 909C0 800F7510 00000000 */ nop /* 909C4 800F7514 30630FFF */ andi $v1, $v1, 0xfff /* 909C8 800F7518 00031B00 */ sll $v1, $v1, 0xc /* 909CC 800F751C C7A20184 */ lwc1 $f2, 0x184($sp) /* 909D0 800F7520 468010A0 */ cvt.s.w $f2, $f2 /* 909D4 800F7524 46041082 */ mul.s $f2, $f2, $f4 -/* 909D8 800F7528 00000000 */ nop +/* 909D8 800F7528 00000000 */ nop /* 909DC 800F752C 4600018D */ trunc.w.s $f6, $f0 /* 909E0 800F7530 44023000 */ mfc1 $v0, $f6 -/* 909E4 800F7534 00000000 */ nop +/* 909E4 800F7534 00000000 */ nop /* 909E8 800F7538 30420FFF */ andi $v0, $v0, 0xfff /* 909EC 800F753C 00621825 */ or $v1, $v1, $v0 /* 909F0 800F7540 448A0000 */ mtc1 $t2, $f0 -/* 909F4 800F7544 00000000 */ nop +/* 909F4 800F7544 00000000 */ nop /* 909F8 800F7548 46800020 */ cvt.s.w $f0, $f0 /* 909FC 800F754C 46040002 */ mul.s $f0, $f0, $f4 -/* 90A00 800F7550 00000000 */ nop +/* 90A00 800F7550 00000000 */ nop /* 90A04 800F7554 AD230004 */ sw $v1, 4($t1) /* 90A08 800F7558 4600118D */ trunc.w.s $f6, $f2 /* 90A0C 800F755C 44023000 */ mfc1 $v0, $f6 -/* 90A10 800F7560 00000000 */ nop +/* 90A10 800F7560 00000000 */ nop /* 90A14 800F7564 30420FFF */ andi $v0, $v0, 0xfff /* 90A18 800F7568 00021300 */ sll $v0, $v0, 0xc /* 90A1C 800F756C 4600018D */ trunc.w.s $f6, $f0 /* 90A20 800F7570 44033000 */ mfc1 $v1, $f6 -/* 90A24 800F7574 00000000 */ nop +/* 90A24 800F7574 00000000 */ nop /* 90A28 800F7578 30630FFF */ andi $v1, $v1, 0xfff /* 90A2C 800F757C 00431025 */ or $v0, $v0, $v1 /* 90A30 800F7580 AD220034 */ sw $v0, 0x34($t1) @@ -2463,7 +2463,7 @@ glabel draw_box /* 90BFC 800F774C 00431021 */ addu $v0, $v0, $v1 /* 90C00 800F7750 00021043 */ sra $v0, $v0, 1 /* 90C04 800F7754 44823000 */ mtc1 $v0, $f6 -/* 90C08 800F7758 00000000 */ nop +/* 90C08 800F7758 00000000 */ nop /* 90C0C 800F775C 468031A0 */ cvt.s.w $f6, $f6 /* 90C10 800F7760 44063000 */ mfc1 $a2, $f6 /* 90C14 800F7764 0C019E40 */ jal guTranslateF @@ -2657,7 +2657,7 @@ glabel draw_box /* 90EFC 800F7A4C 1440FF92 */ bnez $v0, .L800F7898 /* 90F00 800F7A50 AC6B0050 */ sw $t3, 0x50($v1) /* 90F04 800F7A54 0803DEA3 */ j .L800F7A8C -/* 90F08 800F7A58 00000000 */ nop +/* 90F08 800F7A58 00000000 */ nop .L800F7A5C: /* 90F0C 800F7A5C 93A200E7 */ lbu $v0, 0xe7($sp) /* 90F10 800F7A60 8FA4022C */ lw $a0, 0x22c($sp) @@ -2713,5 +2713,5 @@ glabel draw_box /* 90FCC 800F7B1C D7B401D8 */ ldc1 $f20, 0x1d8($sp) /* 90FD0 800F7B20 03E00008 */ jr $ra /* 90FD4 800F7B24 27BD01F0 */ addiu $sp, $sp, 0x1f0 -/* 90FD8 800F7B28 00000000 */ nop -/* 90FDC 800F7B2C 00000000 */ nop +/* 90FD8 800F7B28 00000000 */ nop +/* 90FDC 800F7B2C 00000000 */ nop diff --git a/asm/nonmatchings/code_E21870/func_802B704C.s b/asm/nonmatchings/code_E21870/func_802B704C.s index 55faab2529..c09a31f061 100644 --- a/asm/nonmatchings/code_E21870/func_802B704C.s +++ b/asm/nonmatchings/code_E21870/func_802B704C.s @@ -8,7 +8,7 @@ glabel func_802B704C /* E218C8 802B7058 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) /* E218CC 802B705C AFBF0014 */ sw $ra, 0x14($sp) /* E218D0 802B7060 0C011052 */ jal func_80044148 -/* E218D4 802B7064 00000000 */ nop +/* E218D4 802B7064 00000000 */ nop /* E218D8 802B7068 14400031 */ bnez $v0, .L802B7130 /* E218DC 802B706C 0000102D */ daddu $v0, $zero, $zero /* E218E0 802B7070 8E020000 */ lw $v0, ($s0) @@ -20,11 +20,11 @@ glabel func_802B704C /* E218F8 802B7088 10400029 */ beqz $v0, .L802B7130 /* E218FC 802B708C 0000102D */ daddu $v0, $zero, $zero /* E21900 802B7090 0C03814E */ jal func_800E0538 -/* E21904 802B7094 00000000 */ nop +/* E21904 802B7094 00000000 */ nop /* E21908 802B7098 14400025 */ bnez $v0, .L802B7130 /* E2190C 802B709C 0000102D */ daddu $v0, $zero, $zero /* E21910 802B70A0 0C0381B6 */ jal func_800E06D8 -/* E21914 802B70A4 00000000 */ nop +/* E21914 802B70A4 00000000 */ nop /* E21918 802B70A8 14400021 */ bnez $v0, .L802B7130 /* E2191C 802B70AC 0000102D */ daddu $v0, $zero, $zero /* E21920 802B70B0 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -56,7 +56,7 @@ glabel func_802B704C /* E21984 802B7114 10400006 */ beqz $v0, .L802B7130 /* E21988 802B7118 0000102D */ daddu $v0, $zero, $zero /* E2198C 802B711C 0C0ADC00 */ jal func_802B7000_2 -/* E21990 802B7120 00000000 */ nop +/* E21990 802B7120 00000000 */ nop /* E21994 802B7124 14400002 */ bnez $v0, .L802B7130 /* E21998 802B7128 0000102D */ daddu $v0, $zero, $zero /* E2199C 802B712C 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_E21870/func_802B7140.s b/asm/nonmatchings/code_E21870/func_802B7140.s index 8501e7e930..a8d3808d2e 100644 --- a/asm/nonmatchings/code_E21870/func_802B7140.s +++ b/asm/nonmatchings/code_E21870/func_802B7140.s @@ -18,12 +18,12 @@ glabel func_802B7140 /* E219E4 802B7174 848200B0 */ lh $v0, 0xb0($a0) /* E219E8 802B7178 C480002C */ lwc1 $f0, 0x2c($a0) /* E219EC 802B717C 44821000 */ mtc1 $v0, $f2 -/* E219F0 802B7180 00000000 */ nop +/* E219F0 802B7180 00000000 */ nop /* E219F4 802B7184 468010A0 */ cvt.s.w $f2, $f2 /* E219F8 802B7188 46020000 */ add.s $f0, $f0, $f2 /* E219FC 802B718C 3C014100 */ lui $at, 0x4100 /* E21A00 802B7190 44811000 */ mtc1 $at, $f2 -/* E21A04 802B7194 00000000 */ nop +/* E21A04 802B7194 00000000 */ nop /* E21A08 802B7198 46020000 */ add.s $f0, $f0, $f2 /* E21A0C 802B719C E4600004 */ swc1 $f0, 4($v1) /* E21A10 802B71A0 C4800030 */ lwc1 $f0, 0x30($a0) diff --git a/asm/nonmatchings/code_E21870/func_802B71D4.s b/asm/nonmatchings/code_E21870/func_802B71D4.s index 2c9f505215..09641a5ee2 100644 --- a/asm/nonmatchings/code_E21870/func_802B71D4.s +++ b/asm/nonmatchings/code_E21870/func_802B71D4.s @@ -125,7 +125,7 @@ glabel func_802B71D4 /* E21C20 802B73B0 00220821 */ addu $at, $at, $v0 /* E21C24 802B73B4 8C227D20 */ lw $v0, 0x7d20($at) /* E21C28 802B73B8 00400008 */ jr $v0 -/* E21C2C 802B73BC 00000000 */ nop +/* E21C2C 802B73BC 00000000 */ nop /* E21C30 802B73C0 080ADCFF */ j .L802B73FC /* E21C34 802B73C4 24030004 */ addiu $v1, $zero, 4 /* E21C38 802B73C8 080ADCFF */ j .L802B73FC @@ -156,7 +156,7 @@ glabel func_802B71D4 /* E21C94 802B7424 AC820020 */ sw $v0, 0x20($a0) /* E21C98 802B7428 0043102A */ slt $v0, $v0, $v1 /* E21C9C 802B742C 14400005 */ bnez $v0, .L802B7444 -/* E21CA0 802B7430 00000000 */ nop +/* E21CA0 802B7430 00000000 */ nop /* E21CA4 802B7434 AC800020 */ sw $zero, 0x20($a0) /* E21CA8 802B7438 2404007D */ addiu $a0, $zero, 0x7d /* E21CAC 802B743C 0C052736 */ jal play_sound_at_player diff --git a/asm/nonmatchings/code_E21870/func_802B74F0.s b/asm/nonmatchings/code_E21870/func_802B74F0.s index b701d79475..f5f3f2cc32 100644 --- a/asm/nonmatchings/code_E21870/func_802B74F0.s +++ b/asm/nonmatchings/code_E21870/func_802B74F0.s @@ -13,7 +13,7 @@ glabel func_802B74F0 /* E21D80 802B7510 860200B0 */ lh $v0, 0xb0($s0) /* E21D84 802B7514 C600002C */ lwc1 $f0, 0x2c($s0) /* E21D88 802B7518 44821000 */ mtc1 $v0, $f2 -/* E21D8C 802B751C 00000000 */ nop +/* E21D8C 802B751C 00000000 */ nop /* E21D90 802B7520 468010A0 */ cvt.s.w $f2, $f2 /* E21D94 802B7524 46020000 */ add.s $f0, $f0, $f2 /* E21D98 802B7528 3C014120 */ lui $at, 0x4120 @@ -24,7 +24,7 @@ glabel func_802B74F0 /* E21DAC 802B753C 46020001 */ sub.s $f0, $f0, $f2 /* E21DB0 802B7540 3C013FC0 */ lui $at, 0x3fc0 /* E21DB4 802B7544 44812000 */ mtc1 $at, $f4 -/* E21DB8 802B7548 00000000 */ nop +/* E21DB8 802B7548 00000000 */ nop /* E21DBC 802B754C 46040003 */ div.s $f0, $f0, $f4 /* E21DC0 802B7550 46001080 */ add.s $f2, $f2, $f0 /* E21DC4 802B7554 E4420004 */ swc1 $f2, 4($v0) @@ -50,14 +50,14 @@ glabel func_802B74F0 /* E21E10 802B75A0 50400005 */ beql $v0, $zero, .L802B75B8 /* E21E14 802B75A4 24020002 */ addiu $v0, $zero, 2 /* E21E18 802B75A8 10600007 */ beqz $v1, .L802B75C8 -/* E21E1C 802B75AC 00000000 */ nop +/* E21E1C 802B75AC 00000000 */ nop /* E21E20 802B75B0 080ADD8B */ j .L802B762C -/* E21E24 802B75B4 00000000 */ nop +/* E21E24 802B75B4 00000000 */ nop .L802B75B8: /* E21E28 802B75B8 10620015 */ beq $v1, $v0, .L802B7610 -/* E21E2C 802B75BC 00000000 */ nop +/* E21E2C 802B75BC 00000000 */ nop /* E21E30 802B75C0 080ADD8B */ j .L802B762C -/* E21E34 802B75C4 00000000 */ nop +/* E21E34 802B75C4 00000000 */ nop .L802B75C8: /* E21E38 802B75C8 8C820018 */ lw $v0, 0x18($a0) /* E21E3C 802B75CC 0040182D */ daddu $v1, $v0, $zero diff --git a/asm/nonmatchings/code_E23260/func_802B6000_E23260.s b/asm/nonmatchings/code_E23260/func_802B6000_E23260.s index 0adb41856f..058c329cff 100644 --- a/asm/nonmatchings/code_E23260/func_802B6000_E23260.s +++ b/asm/nonmatchings/code_E23260/func_802B6000_E23260.s @@ -17,9 +17,9 @@ glabel func_802B6000_E23260 /* E23290 802B6030 10400005 */ beqz $v0, .L802B6048 /* E23294 802B6034 0000882D */ daddu $s1, $zero, $zero /* E23298 802B6038 0C0AD879 */ jal func_802B61E4_E23444 -/* E2329C 802B603C 00000000 */ nop +/* E2329C 802B603C 00000000 */ nop /* E232A0 802B6040 080AD872 */ j .L802B61C8 -/* E232A4 802B6044 00000000 */ nop +/* E232A4 802B6044 00000000 */ nop .L802B6048: /* E232A8 802B6048 96020008 */ lhu $v0, 8($s0) /* E232AC 802B604C 8E030000 */ lw $v1, ($s0) @@ -57,7 +57,7 @@ glabel func_802B6000_E23260 /* E23324 802B60C4 34840005 */ ori $a0, $a0, 5 .L802B60C8: /* E23328 802B60C8 0C037FBF */ jal func_800DFEFC -/* E2332C 802B60CC 00000000 */ nop +/* E2332C 802B60CC 00000000 */ nop .L802B60D0: /* E23330 802B60D0 8E020004 */ lw $v0, 4($s0) /* E23334 802B60D4 30420200 */ andi $v0, $v0, 0x200 @@ -66,46 +66,46 @@ glabel func_802B6000_E23260 /* E23340 802B60E0 0C039769 */ jal set_action_state /* E23344 802B60E4 2404001C */ addiu $a0, $zero, 0x1c /* E23348 802B60E8 080AD872 */ j .L802B61C8 -/* E2334C 802B60EC 00000000 */ nop +/* E2334C 802B60EC 00000000 */ nop .L802B60F0: /* E23350 802B60F0 0C0388C1 */ jal input_to_move_vector /* E23354 802B60F4 27A50014 */ addiu $a1, $sp, 0x14 /* E23358 802B60F8 0C039454 */ jal func_800E5150 -/* E2335C 802B60FC 00000000 */ nop +/* E2335C 802B60FC 00000000 */ nop /* E23360 802B6100 0C039858 */ jal check_input_jump -/* E23364 802B6104 00000000 */ nop +/* E23364 802B6104 00000000 */ nop /* E23368 802B6108 10400011 */ beqz $v0, .L802B6150 -/* E2336C 802B610C 00000000 */ nop +/* E2336C 802B610C 00000000 */ nop /* E23370 802B6110 C7A20014 */ lwc1 $f2, 0x14($sp) /* E23374 802B6114 44800000 */ mtc1 $zero, $f0 -/* E23378 802B6118 00000000 */ nop +/* E23378 802B6118 00000000 */ nop /* E2337C 802B611C 46001032 */ c.eq.s $f2, $f0 -/* E23380 802B6120 00000000 */ nop +/* E23380 802B6120 00000000 */ nop /* E23384 802B6124 45000007 */ bc1f .L802B6144 -/* E23388 802B6128 00000000 */ nop +/* E23388 802B6128 00000000 */ nop /* E2338C 802B612C C6020080 */ lwc1 $f2, 0x80($s0) /* E23390 802B6130 C7A00010 */ lwc1 $f0, 0x10($sp) /* E23394 802B6134 46001032 */ c.eq.s $f2, $f0 -/* E23398 802B6138 00000000 */ nop +/* E23398 802B6138 00000000 */ nop /* E2339C 802B613C 45010022 */ bc1t .L802B61C8 -/* E233A0 802B6140 00000000 */ nop +/* E233A0 802B6140 00000000 */ nop .L802B6144: /* E233A4 802B6144 C7A00010 */ lwc1 $f0, 0x10($sp) /* E233A8 802B6148 080AD872 */ j .L802B61C8 /* E233AC 802B614C E6000080 */ swc1 $f0, 0x80($s0) .L802B6150: /* E233B0 802B6150 16200005 */ bnez $s1, .L802B6168 -/* E233B4 802B6154 00000000 */ nop +/* E233B4 802B6154 00000000 */ nop /* E233B8 802B6158 0C039838 */ jal check_input_hammer -/* E233BC 802B615C 00000000 */ nop +/* E233BC 802B615C 00000000 */ nop /* E233C0 802B6160 14400019 */ bnez $v0, .L802B61C8 -/* E233C4 802B6164 00000000 */ nop +/* E233C4 802B6164 00000000 */ nop .L802B6168: /* E233C8 802B6168 C7A00014 */ lwc1 $f0, 0x14($sp) /* E233CC 802B616C 4480A000 */ mtc1 $zero, $f20 -/* E233D0 802B6170 00000000 */ nop +/* E233D0 802B6170 00000000 */ nop /* E233D4 802B6174 46140032 */ c.eq.s $f0, $f20 -/* E233D8 802B6178 00000000 */ nop +/* E233D8 802B6178 00000000 */ nop /* E233DC 802B617C 45000005 */ bc1f .L802B6194 /* E233E0 802B6180 24040001 */ addiu $a0, $zero, 1 /* E233E4 802B6184 964202B8 */ lhu $v0, 0x2b8($s2) @@ -117,7 +117,7 @@ glabel func_802B6000_E23260 /* E233F8 802B6198 A6000008 */ sh $zero, 8($s0) /* E233FC 802B619C C7A00014 */ lwc1 $f0, 0x14($sp) /* E23400 802B61A0 46140032 */ c.eq.s $f0, $f20 -/* E23404 802B61A4 00000000 */ nop +/* E23404 802B61A4 00000000 */ nop /* E23408 802B61A8 45010007 */ bc1t .L802B61C8 /* E2340C 802B61AC 3C037FFF */ lui $v1, 0x7fff /* E23410 802B61B0 3463FFFF */ ori $v1, $v1, 0xffff diff --git a/asm/nonmatchings/code_E23260/func_802B61E4_E23444.s b/asm/nonmatchings/code_E23260/func_802B61E4_E23444.s index 1add518e57..785f193770 100644 --- a/asm/nonmatchings/code_E23260/func_802B61E4_E23444.s +++ b/asm/nonmatchings/code_E23260/func_802B61E4_E23444.s @@ -37,12 +37,12 @@ glabel func_802B61E4_E23444 /* E234C4 802B6264 0C037FBF */ jal func_800DFEFC /* E234C8 802B6268 8C846430 */ lw $a0, %lo(D_802B6430)($a0) /* E234CC 802B626C 080AD8AA */ j .L802B62A8 -/* E234D0 802B6270 00000000 */ nop +/* E234D0 802B6270 00000000 */ nop .L802B6274: /* E234D4 802B6274 0C037FBF */ jal func_800DFEFC /* E234D8 802B6278 3484000E */ ori $a0, $a0, 0xe /* E234DC 802B627C 080AD8AA */ j .L802B62A8 -/* E234E0 802B6280 00000000 */ nop +/* E234E0 802B6280 00000000 */ nop .L802B6284: /* E234E4 802B6284 8203000C */ lb $v1, 0xc($s0) /* E234E8 802B6288 00031040 */ sll $v0, $v1, 1 @@ -52,7 +52,7 @@ glabel func_802B61E4_E23444 /* E234F8 802B6298 00822021 */ addu $a0, $a0, $v0 /* E234FC 802B629C 8C847C1C */ lw $a0, %lo(D_800F7C1C)($a0) /* E23500 802B62A0 0C0398DB */ jal func_800E636C -/* E23504 802B62A4 00000000 */ nop +/* E23504 802B62A4 00000000 */ nop .L802B62A8: /* E23508 802B62A8 8E020004 */ lw $v0, 4($s0) /* E2350C 802B62AC 30422000 */ andi $v0, $v0, 0x2000 @@ -66,16 +66,16 @@ glabel func_802B61E4_E23444 /* E2352C 802B62CC 10400005 */ beqz $v0, .L802B62E4 /* E23530 802B62D0 24020002 */ addiu $v0, $zero, 2 /* E23534 802B62D4 10600009 */ beqz $v1, .L802B62FC -/* E23538 802B62D8 00000000 */ nop +/* E23538 802B62D8 00000000 */ nop /* E2353C 802B62DC 080AD8F9 */ j .L802B63E4 -/* E23540 802B62E0 00000000 */ nop +/* E23540 802B62E0 00000000 */ nop .L802B62E4: /* E23544 802B62E4 10620022 */ beq $v1, $v0, .L802B6370 /* E23548 802B62E8 24020003 */ addiu $v0, $zero, 3 /* E2354C 802B62EC 1062002E */ beq $v1, $v0, .L802B63A8 /* E23550 802B62F0 27A40010 */ addiu $a0, $sp, 0x10 /* E23554 802B62F4 080AD8F9 */ j .L802B63E4 -/* E23558 802B62F8 00000000 */ nop +/* E23558 802B62F8 00000000 */ nop .L802B62FC: /* E2355C 802B62FC 8E020000 */ lw $v0, ($s0) /* E23560 802B6300 30423000 */ andi $v0, $v0, 0x3000 @@ -83,7 +83,7 @@ glabel func_802B61E4_E23444 /* E23568 802B6308 27A40010 */ addiu $a0, $sp, 0x10 /* E2356C 802B630C 820200C4 */ lb $v0, 0xc4($s0) /* E23570 802B6310 14400034 */ bnez $v0, .L802B63E4 -/* E23574 802B6314 00000000 */ nop +/* E23574 802B6314 00000000 */ nop /* E23578 802B6318 86020008 */ lh $v0, 8($s0) /* E2357C 802B631C 96030008 */ lhu $v1, 8($s0) /* E23580 802B6320 28420709 */ slti $v0, $v0, 0x709 @@ -95,7 +95,7 @@ glabel func_802B61E4_E23444 /* E23598 802B6338 0C037FBF */ jal func_800DFEFC /* E2359C 802B633C 34840003 */ ori $a0, $a0, 3 /* E235A0 802B6340 080AD908 */ j .L802B6420 -/* E235A4 802B6344 00000000 */ nop +/* E235A4 802B6344 00000000 */ nop .L802B6348: /* E235A8 802B6348 080AD8F8 */ j .L802B63E0 /* E235AC 802B634C A6020008 */ sh $v0, 8($s0) @@ -139,19 +139,19 @@ glabel func_802B61E4_E23444 /* E23634 802B63D4 34840004 */ ori $a0, $a0, 4 .L802B63D8: /* E23638 802B63D8 0C037FBF */ jal func_800DFEFC -/* E2363C 802B63DC 00000000 */ nop +/* E2363C 802B63DC 00000000 */ nop .L802B63E0: /* E23640 802B63E0 27A40010 */ addiu $a0, $sp, 0x10 .L802B63E4: /* E23644 802B63E4 0C0388C1 */ jal input_to_move_vector /* E23648 802B63E8 27A50014 */ addiu $a1, $sp, 0x14 /* E2364C 802B63EC 0C039454 */ jal func_800E5150 -/* E23650 802B63F0 00000000 */ nop +/* E23650 802B63F0 00000000 */ nop /* E23654 802B63F4 C7A20014 */ lwc1 $f2, 0x14($sp) /* E23658 802B63F8 44800000 */ mtc1 $zero, $f0 -/* E2365C 802B63FC 00000000 */ nop +/* E2365C 802B63FC 00000000 */ nop /* E23660 802B6400 46001032 */ c.eq.s $f2, $f0 -/* E23664 802B6404 00000000 */ nop +/* E23664 802B6404 00000000 */ nop /* E23668 802B6408 45010005 */ bc1t .L802B6420 /* E2366C 802B640C 24040001 */ addiu $a0, $zero, 1 /* E23670 802B6410 C7A00010 */ lwc1 $f0, 0x10($sp) diff --git a/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s b/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s index bac32c2463..2bbcfe1235 100644 --- a/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s +++ b/asm/nonmatchings/code_E25D60/func_802B6000_E25D60.s @@ -158,9 +158,9 @@ glabel func_802B6000_E25D60 /* E25FA0 802B6240 460C0301 */ sub.s $f12, $f0, $f12 /* E25FA4 802B6244 3C014334 */ lui $at, 0x4334 /* E25FA8 802B6248 44811000 */ mtc1 $at, $f2 -/* E25FAC 802B624C 00000000 */ nop +/* E25FAC 802B624C 00000000 */ nop /* E25FB0 802B6250 4602003E */ c.le.s $f0, $f2 -/* E25FB4 802B6254 00000000 */ nop +/* E25FB4 802B6254 00000000 */ nop /* E25FB8 802B6258 45020004 */ bc1fl .L802B626C /* E25FBC 802B625C 26940001 */ addiu $s4, $s4, 1 /* E25FC0 802B6260 C6000020 */ lwc1 $f0, 0x20($s0) @@ -180,7 +180,7 @@ glabel func_802B6000_E25D60 /* E25FF0 802B6290 AE2200D8 */ sw $v0, 0xd8($s1) .L802B6294: /* E25FF4 802B6294 0C03963C */ jal func_800E58F0 -/* E25FF8 802B6298 00000000 */ nop +/* E25FF8 802B6298 00000000 */ nop /* E25FFC 802B629C 27A40010 */ addiu $a0, $sp, 0x10 /* E26000 802B62A0 0C0388C1 */ jal input_to_move_vector /* E26004 802B62A4 27A50014 */ addiu $a1, $sp, 0x14 @@ -237,13 +237,13 @@ glabel func_802B6000_E25D60 /* E260C8 802B6368 ACA00000 */ sw $zero, ($a1) .L802B636C: /* E260CC 802B636C 16A0001A */ bnez $s5, .L802B63D8 -/* E260D0 802B6370 00000000 */ nop +/* E260D0 802B6370 00000000 */ nop /* E260D4 802B6374 0C039838 */ jal check_input_hammer -/* E260D8 802B6378 00000000 */ nop +/* E260D8 802B6378 00000000 */ nop /* E260DC 802B637C 14400005 */ bnez $v0, .L802B6394 /* E260E0 802B6380 3C05FFFE */ lui $a1, 0xfffe /* E260E4 802B6384 0C039858 */ jal check_input_jump -/* E260E8 802B6388 00000000 */ nop +/* E260E8 802B6388 00000000 */ nop /* E260EC 802B638C 10400012 */ beqz $v0, .L802B63D8 /* E260F0 802B6390 3C05FFFE */ lui $a1, 0xfffe .L802B6394: @@ -268,7 +268,7 @@ glabel func_802B6000_E25D60 /* E26138 802B63D8 82020003 */ lb $v0, 3($s0) /* E2613C 802B63DC 2842000B */ slti $v0, $v0, 0xb /* E26140 802B63E0 1040000C */ beqz $v0, .L802B6414 -/* E26144 802B63E4 00000000 */ nop +/* E26144 802B63E4 00000000 */ nop /* E26148 802B63E8 8E2200E0 */ lw $v0, 0xe0($s1) /* E2614C 802B63EC 30422000 */ andi $v0, $v0, 0x2000 /* E26150 802B63F0 10400008 */ beqz $v0, .L802B6414 @@ -284,16 +284,16 @@ glabel func_802B6000_E25D60 /* E26174 802B6414 822300B6 */ lb $v1, 0xb6($s1) /* E26178 802B6418 28620002 */ slti $v0, $v1, 2 /* E2617C 802B641C 1440004C */ bnez $v0, .L802B6550 -/* E26180 802B6420 00000000 */ nop +/* E26180 802B6420 00000000 */ nop /* E26184 802B6424 C6000010 */ lwc1 $f0, 0x10($s0) /* E26188 802B6428 3C013F80 */ lui $at, 0x3f80 /* E2618C 802B642C 44811000 */ mtc1 $at, $f2 -/* E26190 802B6430 00000000 */ nop +/* E26190 802B6430 00000000 */ nop /* E26194 802B6434 46020001 */ sub.s $f0, $f0, $f2 /* E26198 802B6438 4480C000 */ mtc1 $zero, $f24 -/* E2619C 802B643C 00000000 */ nop +/* E2619C 802B643C 00000000 */ nop /* E261A0 802B6440 4618003C */ c.lt.s $f0, $f24 -/* E261A4 802B6444 00000000 */ nop +/* E261A4 802B6444 00000000 */ nop /* E261A8 802B6448 45000002 */ bc1f .L802B6454 /* E261AC 802B644C E6000010 */ swc1 $f0, 0x10($s0) /* E261B0 802B6450 E6180010 */ swc1 $f24, 0x10($s0) @@ -316,9 +316,9 @@ glabel func_802B6000_E25D60 /* E261F0 802B6490 3C0140C9 */ lui $at, 0x40c9 /* E261F4 802B6494 34210FD0 */ ori $at, $at, 0xfd0 /* E261F8 802B6498 4481A000 */ mtc1 $at, $f20 -/* E261FC 802B649C 00000000 */ nop +/* E261FC 802B649C 00000000 */ nop /* E26200 802B64A0 46140302 */ mul.s $f12, $f0, $f20 -/* E26204 802B64A4 00000000 */ nop +/* E26204 802B64A4 00000000 */ nop /* E26208 802B64A8 3C0143B4 */ lui $at, 0x43b4 /* E2620C 802B64AC 4481B000 */ mtc1 $at, $f22 /* E26210 802B64B0 E7A00010 */ swc1 $f0, 0x10($sp) @@ -326,10 +326,10 @@ glabel func_802B6000_E25D60 /* E26218 802B64B8 46166303 */ div.s $f12, $f12, $f22 /* E2621C 802B64BC C7AC0010 */ lwc1 $f12, 0x10($sp) /* E26220 802B64C0 46146302 */ mul.s $f12, $f12, $f20 -/* E26224 802B64C4 00000000 */ nop +/* E26224 802B64C4 00000000 */ nop /* E26228 802B64C8 C6020010 */ lwc1 $f2, 0x10($s0) /* E2622C 802B64CC 46020002 */ mul.s $f0, $f0, $f2 -/* E26230 802B64D0 00000000 */ nop +/* E26230 802B64D0 00000000 */ nop /* E26234 802B64D4 46166303 */ div.s $f12, $f12, $f22 /* E26238 802B64D8 0C00A874 */ jal cos_rad /* E2623C 802B64DC E6000014 */ swc1 $f0, 0x14($s0) @@ -337,7 +337,7 @@ glabel func_802B6000_E25D60 /* E26244 802B64E4 C6020010 */ lwc1 $f2, 0x10($s0) /* E26248 802B64E8 96220008 */ lhu $v0, 8($s1) /* E2624C 802B64EC 46020002 */ mul.s $f0, $f0, $f2 -/* E26250 802B64F0 00000000 */ nop +/* E26250 802B64F0 00000000 */ nop /* E26254 802B64F4 2442FFFF */ addiu $v0, $v0, -1 /* E26258 802B64F8 A6220008 */ sh $v0, 8($s1) /* E2625C 802B64FC 00021400 */ sll $v0, $v0, 0x10 @@ -372,7 +372,7 @@ glabel func_802B6000_E25D60 /* E262C8 802B6568 3C028016 */ lui $v0, %hi(gCollisionStatus) /* E262CC 802B656C 8442A550 */ lh $v0, %lo(gCollisionStatus)($v0) /* E262D0 802B6570 0440000A */ bltz $v0, .L802B659C -/* E262D4 802B6574 00000000 */ nop +/* E262D4 802B6574 00000000 */ nop /* E262D8 802B6578 92020002 */ lbu $v0, 2($s0) /* E262DC 802B657C 24420001 */ addiu $v0, $v0, 1 /* E262E0 802B6580 A2020002 */ sb $v0, 2($s0) @@ -391,9 +391,9 @@ glabel func_802B6000_E25D60 /* E2630C 802B65AC 00831023 */ subu $v0, $a0, $v1 /* E26310 802B65B0 C600001C */ lwc1 $f0, 0x1c($s0) /* E26314 802B65B4 44801000 */ mtc1 $zero, $f2 -/* E26318 802B65B8 00000000 */ nop +/* E26318 802B65B8 00000000 */ nop /* E2631C 802B65BC 46020032 */ c.eq.s $f0, $f2 -/* E26320 802B65C0 00000000 */ nop +/* E26320 802B65C0 00000000 */ nop /* E26324 802B65C4 45010002 */ bc1t .L802B65D0 /* E26328 802B65C8 46001606 */ mov.s $f24, $f2 /* E2632C 802B65CC C6180024 */ lwc1 $f24, 0x24($s0) @@ -407,7 +407,7 @@ glabel func_802B6000_E25D60 /* E26348 802B65E8 44811000 */ mtc1 $at, $f2 /* E2634C 802B65EC 46200020 */ cvt.s.d $f0, $f0 /* E26350 802B65F0 4600103C */ c.lt.s $f2, $f0 -/* E26354 802B65F4 00000000 */ nop +/* E26354 802B65F4 00000000 */ nop /* E26358 802B65F8 45000002 */ bc1f .L802B6604 /* E2635C 802B65FC E6000010 */ swc1 $f0, 0x10($s0) /* E26360 802B6600 E6020010 */ swc1 $f2, 0x10($s0) @@ -430,9 +430,9 @@ glabel func_802B6000_E25D60 /* E263A0 802B6640 3C0140C9 */ lui $at, 0x40c9 /* E263A4 802B6644 34210FD0 */ ori $at, $at, 0xfd0 /* E263A8 802B6648 4481A000 */ mtc1 $at, $f20 -/* E263AC 802B664C 00000000 */ nop +/* E263AC 802B664C 00000000 */ nop /* E263B0 802B6650 46140302 */ mul.s $f12, $f0, $f20 -/* E263B4 802B6654 00000000 */ nop +/* E263B4 802B6654 00000000 */ nop /* E263B8 802B6658 3C0143B4 */ lui $at, 0x43b4 /* E263BC 802B665C 4481B000 */ mtc1 $at, $f22 /* E263C0 802B6660 E7A00010 */ swc1 $f0, 0x10($sp) @@ -440,55 +440,55 @@ glabel func_802B6000_E25D60 /* E263C8 802B6668 46166303 */ div.s $f12, $f12, $f22 /* E263CC 802B666C C7AC0010 */ lwc1 $f12, 0x10($sp) /* E263D0 802B6670 46146302 */ mul.s $f12, $f12, $f20 -/* E263D4 802B6674 00000000 */ nop +/* E263D4 802B6674 00000000 */ nop /* E263D8 802B6678 C6020010 */ lwc1 $f2, 0x10($s0) /* E263DC 802B667C 46020002 */ mul.s $f0, $f0, $f2 -/* E263E0 802B6680 00000000 */ nop +/* E263E0 802B6680 00000000 */ nop /* E263E4 802B6684 46166303 */ div.s $f12, $f12, $f22 /* E263E8 802B6688 0C00A874 */ jal cos_rad /* E263EC 802B668C E6000014 */ swc1 $f0, 0x14($s0) /* E263F0 802B6690 C6020010 */ lwc1 $f2, 0x10($s0) /* E263F4 802B6694 46000007 */ neg.s $f0, $f0 /* E263F8 802B6698 46020002 */ mul.s $f0, $f0, $f2 -/* E263FC 802B669C 00000000 */ nop +/* E263FC 802B669C 00000000 */ nop /* E26400 802B66A0 080AD9CE */ j .L802B6738 /* E26404 802B66A4 E6000018 */ swc1 $f0, 0x18($s0) .L802B66A8: /* E26408 802B66A8 2442FFFF */ addiu $v0, $v0, -1 /* E2640C 802B66AC C6020028 */ lwc1 $f2, 0x28($s0) /* E26410 802B66B0 44820000 */ mtc1 $v0, $f0 -/* E26414 802B66B4 00000000 */ nop +/* E26414 802B66B4 00000000 */ nop /* E26418 802B66B8 46800020 */ cvt.s.w $f0, $f0 /* E2641C 802B66BC 46020002 */ mul.s $f0, $f0, $f2 -/* E26420 802B66C0 00000000 */ nop +/* E26420 802B66C0 00000000 */ nop /* E26424 802B66C4 C6020024 */ lwc1 $f2, 0x24($s0) /* E26428 802B66C8 46001601 */ sub.s $f24, $f2, $f0 /* E2642C 802B66CC 3C01802B */ lui $at, %hi(D_802B69A8) /* E26430 802B66D0 D42269A8 */ ldc1 $f2, %lo(D_802B69A8)($at) /* E26434 802B66D4 4600C021 */ cvt.d.s $f0, $f24 /* E26438 802B66D8 4622003C */ c.lt.d $f0, $f2 -/* E2643C 802B66DC 00000000 */ nop +/* E2643C 802B66DC 00000000 */ nop /* E26440 802B66E0 45000004 */ bc1f .L802B66F4 -/* E26444 802B66E4 00000000 */ nop +/* E26444 802B66E4 00000000 */ nop /* E26448 802B66E8 3C013DCC */ lui $at, 0x3dcc /* E2644C 802B66EC 3421CCCD */ ori $at, $at, 0xcccd /* E26450 802B66F0 4481C000 */ mtc1 $at, $f24 .L802B66F4: /* E26454 802B66F4 C600001C */ lwc1 $f0, 0x1c($s0) /* E26458 802B66F8 44802000 */ mtc1 $zero, $f4 -/* E2645C 802B66FC 00000000 */ nop +/* E2645C 802B66FC 00000000 */ nop /* E26460 802B6700 46040032 */ c.eq.s $f0, $f4 -/* E26464 802B6704 00000000 */ nop +/* E26464 802B6704 00000000 */ nop /* E26468 802B6708 45030001 */ bc1tl .L802B6710 /* E2646C 802B670C 46002606 */ mov.s $f24, $f4 .L802B6710: /* E26470 802B6710 C6000010 */ lwc1 $f0, 0x10($s0) /* E26474 802B6714 3C013F80 */ lui $at, 0x3f80 /* E26478 802B6718 44811000 */ mtc1 $at, $f2 -/* E2647C 802B671C 00000000 */ nop +/* E2647C 802B671C 00000000 */ nop /* E26480 802B6720 46020001 */ sub.s $f0, $f0, $f2 /* E26484 802B6724 4604003C */ c.lt.s $f0, $f4 -/* E26488 802B6728 00000000 */ nop +/* E26488 802B6728 00000000 */ nop /* E2648C 802B672C 45000002 */ bc1f .L802B6738 /* E26490 802B6730 E6000010 */ swc1 $f0, 0x10($s0) /* E26494 802B6734 E6040010 */ swc1 $f4, 0x10($s0) @@ -501,46 +501,46 @@ glabel func_802B6000_E25D60 /* E264AC 802B674C 04600030 */ bltz $v1, .L802B6810 /* E264B0 802B6750 28620003 */ slti $v0, $v1, 3 /* E264B4 802B6754 1040002E */ beqz $v0, .L802B6810 -/* E264B8 802B6758 00000000 */ nop +/* E264B8 802B6758 00000000 */ nop /* E264BC 802B675C 080ADA00 */ j .L802B6800 -/* E264C0 802B6760 00000000 */ nop +/* E264C0 802B6760 00000000 */ nop .L802B6764: /* E264C4 802B6764 27A40010 */ addiu $a0, $sp, 0x10 /* E264C8 802B6768 0C0388C1 */ jal input_to_move_vector /* E264CC 802B676C 27A50014 */ addiu $a1, $sp, 0x14 /* E264D0 802B6770 0C039454 */ jal func_800E5150 -/* E264D4 802B6774 00000000 */ nop +/* E264D4 802B6774 00000000 */ nop /* E264D8 802B6778 0C039858 */ jal check_input_jump -/* E264DC 802B677C 00000000 */ nop +/* E264DC 802B677C 00000000 */ nop /* E264E0 802B6780 10400010 */ beqz $v0, .L802B67C4 -/* E264E4 802B6784 00000000 */ nop +/* E264E4 802B6784 00000000 */ nop /* E264E8 802B6788 C7A20014 */ lwc1 $f2, 0x14($sp) /* E264EC 802B678C 44800000 */ mtc1 $zero, $f0 -/* E264F0 802B6790 00000000 */ nop +/* E264F0 802B6790 00000000 */ nop /* E264F4 802B6794 46001032 */ c.eq.s $f2, $f0 -/* E264F8 802B6798 00000000 */ nop +/* E264F8 802B6798 00000000 */ nop /* E264FC 802B679C 45000007 */ bc1f .L802B67BC -/* E26500 802B67A0 00000000 */ nop +/* E26500 802B67A0 00000000 */ nop /* E26504 802B67A4 C6220080 */ lwc1 $f2, 0x80($s1) /* E26508 802B67A8 C7A00010 */ lwc1 $f0, 0x10($sp) /* E2650C 802B67AC 46001032 */ c.eq.s $f2, $f0 -/* E26510 802B67B0 00000000 */ nop +/* E26510 802B67B0 00000000 */ nop /* E26514 802B67B4 45010003 */ bc1t .L802B67C4 -/* E26518 802B67B8 00000000 */ nop +/* E26518 802B67B8 00000000 */ nop .L802B67BC: /* E2651C 802B67BC C7A00010 */ lwc1 $f0, 0x10($sp) /* E26520 802B67C0 E6200080 */ swc1 $f0, 0x80($s1) .L802B67C4: /* E26524 802B67C4 C7A00014 */ lwc1 $f0, 0x14($sp) /* E26528 802B67C8 44801000 */ mtc1 $zero, $f2 -/* E2652C 802B67CC 00000000 */ nop +/* E2652C 802B67CC 00000000 */ nop /* E26530 802B67D0 46020032 */ c.eq.s $f0, $f2 -/* E26534 802B67D4 00000000 */ nop +/* E26534 802B67D4 00000000 */ nop /* E26538 802B67D8 45010006 */ bc1t .L802B67F4 /* E2653C 802B67DC 26220054 */ addiu $v0, $s1, 0x54 /* E26540 802B67E0 C620005C */ lwc1 $f0, 0x5c($s1) /* E26544 802B67E4 46180002 */ mul.s $f0, $f0, $f24 -/* E26548 802B67E8 00000000 */ nop +/* E26548 802B67E8 00000000 */ nop /* E2654C 802B67EC 080ADA04 */ j .L802B6810 /* E26550 802B67F0 E4400000 */ swc1 $f0, ($v0) .L802B67F4: @@ -550,12 +550,12 @@ glabel func_802B6000_E25D60 .L802B6800: /* E26560 802B6800 C620005C */ lwc1 $f0, 0x5c($s1) /* E26564 802B6804 46180002 */ mul.s $f0, $f0, $f24 -/* E26568 802B6808 00000000 */ nop +/* E26568 802B6808 00000000 */ nop /* E2656C 802B680C E6200054 */ swc1 $f0, 0x54($s1) .L802B6810: /* E26570 802B6810 822200B6 */ lb $v0, 0xb6($s1) /* E26574 802B6814 14400010 */ bnez $v0, .L802B6858 -/* E26578 802B6818 00000000 */ nop +/* E26578 802B6818 00000000 */ nop /* E2657C 802B681C 92020003 */ lbu $v0, 3($s0) /* E26580 802B6820 2442FFFF */ addiu $v0, $v0, -1 /* E26584 802B6824 A2020003 */ sb $v0, 3($s0) @@ -565,7 +565,7 @@ glabel func_802B6000_E25D60 /* E26594 802B6834 86220008 */ lh $v0, 8($s1) /* E26598 802B6838 28420002 */ slti $v0, $v0, 2 /* E2659C 802B683C 1440004B */ bnez $v0, .L802B696C -/* E265A0 802B6840 00000000 */ nop +/* E265A0 802B6840 00000000 */ nop /* E265A4 802B6844 C62000A8 */ lwc1 $f0, 0xa8($s1) /* E265A8 802B6848 C62C00D4 */ lwc1 $f12, 0xd4($s1) /* E265AC 802B684C 080ADA58 */ j .L802B6960 @@ -576,7 +576,7 @@ glabel func_802B6000_E25D60 /* E265B8 802B6858 822300B6 */ lb $v1, 0xb6($s1) /* E265BC 802B685C 24020001 */ addiu $v0, $zero, 1 /* E265C0 802B6860 14620042 */ bne $v1, $v0, .L802B696C -/* E265C4 802B6864 00000000 */ nop +/* E265C4 802B6864 00000000 */ nop /* E265C8 802B6868 C62200A8 */ lwc1 $f2, 0xa8($s1) /* E265CC 802B686C C62000D4 */ lwc1 $f0, 0xd4($s1) /* E265D0 802B6870 82020001 */ lb $v0, 1($s0) @@ -594,18 +594,18 @@ glabel func_802B6000_E25D60 .L802B68A0: /* E26600 802B68A0 46001106 */ mov.s $f4, $f2 /* E26604 802B68A4 4600203C */ c.lt.s $f4, $f0 -/* E26608 802B68A8 00000000 */ nop +/* E26608 802B68A8 00000000 */ nop /* E2660C 802B68AC 45000013 */ bc1f .L802B68FC -/* E26610 802B68B0 00000000 */ nop +/* E26610 802B68B0 00000000 */ nop /* E26614 802B68B4 3C014334 */ lui $at, 0x4334 /* E26618 802B68B8 44811000 */ mtc1 $at, $f2 -/* E2661C 802B68BC 00000000 */ nop +/* E2661C 802B68BC 00000000 */ nop /* E26620 802B68C0 4600103E */ c.le.s $f2, $f0 -/* E26624 802B68C4 00000000 */ nop +/* E26624 802B68C4 00000000 */ nop /* E26628 802B68C8 45000024 */ bc1f .L802B695C -/* E2662C 802B68CC 00000000 */ nop +/* E2662C 802B68CC 00000000 */ nop /* E26630 802B68D0 4602203C */ c.lt.s $f4, $f2 -/* E26634 802B68D4 00000000 */ nop +/* E26634 802B68D4 00000000 */ nop /* E26638 802B68D8 45000020 */ bc1f .L802B695C /* E2663C 802B68DC 3C02FFFD */ lui $v0, 0xfffd /* E26640 802B68E0 3442FFFF */ ori $v0, $v0, 0xffff @@ -617,16 +617,16 @@ glabel func_802B6000_E25D60 /* E26658 802B68F8 E62200A8 */ swc1 $f2, 0xa8($s1) .L802B68FC: /* E2665C 802B68FC 44802000 */ mtc1 $zero, $f4 -/* E26660 802B6900 00000000 */ nop +/* E26660 802B6900 00000000 */ nop /* E26664 802B6904 4604003E */ c.le.s $f0, $f4 -/* E26668 802B6908 00000000 */ nop +/* E26668 802B6908 00000000 */ nop /* E2666C 802B690C 45000013 */ bc1f .L802B695C -/* E26670 802B6910 00000000 */ nop +/* E26670 802B6910 00000000 */ nop /* E26674 802B6914 3C0142B4 */ lui $at, 0x42b4 /* E26678 802B6918 44810000 */ mtc1 $at, $f0 -/* E2667C 802B691C 00000000 */ nop +/* E2667C 802B691C 00000000 */ nop /* E26680 802B6920 4600103C */ c.lt.s $f2, $f0 -/* E26684 802B6924 00000000 */ nop +/* E26684 802B6924 00000000 */ nop /* E26688 802B6928 4500000C */ bc1f .L802B695C /* E2668C 802B692C 3C02FFFD */ lui $v0, 0xfffd /* E26690 802B6930 3442FFFF */ ori $v0, $v0, 0xffff @@ -645,7 +645,7 @@ glabel func_802B6000_E25D60 /* E266BC 802B695C C62C00A8 */ lwc1 $f12, 0xa8($s1) .L802B6960: /* E266C0 802B6960 0C00A6C9 */ jal clamp_angle -/* E266C4 802B6964 00000000 */ nop +/* E266C4 802B6964 00000000 */ nop /* E266C8 802B6968 E62000A8 */ swc1 $f0, 0xa8($s1) .L802B696C: /* E266CC 802B696C 8FBF0030 */ lw $ra, 0x30($sp) @@ -660,4 +660,4 @@ glabel func_802B6000_E25D60 /* E266F0 802B6990 D7B40038 */ ldc1 $f20, 0x38($sp) /* E266F4 802B6994 03E00008 */ jr $ra /* E266F8 802B6998 27BD0050 */ addiu $sp, $sp, 0x50 -/* E266FC 802B699C 00000000 */ nop +/* E266FC 802B699C 00000000 */ nop diff --git a/asm/nonmatchings/code_E27510/func_802B6000_E27510.s b/asm/nonmatchings/code_E27510/func_802B6000_E27510.s index 5e8355d0fa..efee383a62 100644 --- a/asm/nonmatchings/code_E27510/func_802B6000_E27510.s +++ b/asm/nonmatchings/code_E27510/func_802B6000_E27510.s @@ -25,4 +25,4 @@ glabel func_802B6000_E27510 /* E27560 802B6050 3C01802B */ lui $at, %hi(D_802B6788) /* E27564 802B6054 E4246788 */ swc1 $f4, %lo(D_802B6788)($at) /* E27568 802B6058 03E00008 */ jr $ra -/* E2756C 802B605C 00000000 */ nop +/* E2756C 802B605C 00000000 */ nop diff --git a/asm/nonmatchings/code_E27510/func_802B6060_E27570.s b/asm/nonmatchings/code_E27510/func_802B6060_E27570.s index bc4334ebb3..9f1f68e911 100644 --- a/asm/nonmatchings/code_E27510/func_802B6060_E27570.s +++ b/asm/nonmatchings/code_E27510/func_802B6060_E27570.s @@ -75,7 +75,7 @@ glabel func_802B6060_E27570 /* E27684 802B6174 00220821 */ addu $at, $at, $v0 /* E27688 802B6178 8C226740 */ lw $v0, %lo(D_802B6740)($at) /* E2768C 802B617C 00400008 */ jr $v0 -/* E27690 802B6180 00000000 */ nop +/* E27690 802B6180 00000000 */ nop /* E27694 802B6184 3C02802B */ lui $v0, %hi(D_802B6780) /* E27698 802B6188 24426780 */ addiu $v0, $v0, %lo(D_802B6780) /* E2769C 802B618C C4400000 */ lwc1 $f0, ($v0) @@ -87,7 +87,7 @@ glabel func_802B6060_E27570 /* E276B4 802B61A4 C4226784 */ lwc1 $f2, %lo(D_802B6784)($at) /* E276B8 802B61A8 46200020 */ cvt.s.d $f0, $f0 /* E276BC 802B61AC 4600103E */ c.le.s $f2, $f0 -/* E276C0 802B61B0 00000000 */ nop +/* E276C0 802B61B0 00000000 */ nop /* E276C4 802B61B4 45000002 */ bc1f .L802B61C0 /* E276C8 802B61B8 E4400000 */ swc1 $f0, ($v0) /* E276CC 802B61BC E4420000 */ swc1 $f2, ($v0) @@ -98,7 +98,7 @@ glabel func_802B6060_E27570 /* E276DC 802B61CC 3C01802B */ lui $at, %hi(D_802B6788) /* E276E0 802B61D0 C4226788 */ lwc1 $f2, %lo(D_802B6788)($at) /* E276E4 802B61D4 4600103E */ c.le.s $f2, $f0 -/* E276E8 802B61D8 00000000 */ nop +/* E276E8 802B61D8 00000000 */ nop /* E276EC 802B61DC 45000002 */ bc1f .L802B61E8 /* E276F0 802B61E0 E6000054 */ swc1 $f0, 0x54($s0) /* E276F4 802B61E4 E6020054 */ swc1 $f2, 0x54($s0) @@ -114,14 +114,14 @@ glabel func_802B6060_E27570 /* E27718 802B6208 3C0142C8 */ lui $at, 0x42c8 /* E2771C 802B620C 44813000 */ mtc1 $at, $f6 /* E27720 802B6210 44821000 */ mtc1 $v0, $f2 -/* E27724 802B6214 00000000 */ nop +/* E27724 802B6214 00000000 */ nop /* E27728 802B6218 468010A0 */ cvt.s.w $f2, $f2 /* E2772C 802B621C E7A00028 */ swc1 $f0, 0x28($sp) /* E27730 802B6220 3C013F00 */ lui $at, 0x3f00 /* E27734 802B6224 44810000 */ mtc1 $at, $f0 /* E27738 802B6228 C6040030 */ lwc1 $f4, 0x30($s0) /* E2773C 802B622C 46001082 */ mul.s $f2, $f2, $f0 -/* E27740 802B6230 00000000 */ nop +/* E27740 802B6230 00000000 */ nop /* E27744 802B6234 E7A60034 */ swc1 $f6, 0x34($sp) /* E27748 802B6238 E7A40030 */ swc1 $f4, 0x30($sp) /* E2774C 802B623C C600002C */ lwc1 $f0, 0x2c($s0) @@ -151,7 +151,7 @@ glabel func_802B6060_E27570 /* E277AC 802B629C 304200FF */ andi $v0, $v0, 0xff /* E277B0 802B62A0 24030005 */ addiu $v1, $zero, 5 /* E277B4 802B62A4 1443000F */ bne $v0, $v1, .L802B62E4 -/* E277B8 802B62A8 00000000 */ nop +/* E277B8 802B62A8 00000000 */ nop /* E277BC 802B62AC 3C028016 */ lui $v0, %hi(gCollisionStatus) /* E277C0 802B62B0 2442A550 */ addiu $v0, $v0, %lo(gCollisionStatus) /* E277C4 802B62B4 97A3004A */ lhu $v1, 0x4a($sp) @@ -165,7 +165,7 @@ glabel func_802B6060_E27570 /* E277E4 802B62D4 3C01802B */ lui $at, %hi(D_802B6790) /* E277E8 802B62D8 E4206790 */ swc1 $f0, %lo(D_802B6790)($at) /* E277EC 802B62DC 080AD9C7 */ j .L802B671C -/* E277F0 802B62E0 00000000 */ nop +/* E277F0 802B62E0 00000000 */ nop .L802B62E4: /* E277F4 802B62E4 C6400000 */ lwc1 $f0, ($s2) /* E277F8 802B62E8 C6220000 */ lwc1 $f2, ($s1) @@ -176,7 +176,7 @@ glabel func_802B6060_E27570 /* E2780C 802B62FC 46000021 */ cvt.d.s $f0, $f0 /* E27810 802B6300 46200005 */ abs.d $f0, $f0 /* E27814 802B6304 4620103E */ c.le.d $f2, $f0 -/* E27818 802B6308 00000000 */ nop +/* E27818 802B6308 00000000 */ nop /* E2781C 802B630C 45010004 */ bc1t .L802B6320 /* E27820 802B6310 24020002 */ addiu $v0, $zero, 2 /* E27824 802B6314 080AD8C8 */ j .L802B6320 @@ -190,9 +190,9 @@ glabel func_802B6060_E27570 /* E2783C 802B632C 3C0140C9 */ lui $at, 0x40c9 /* E27840 802B6330 34210FD0 */ ori $at, $at, 0xfd0 /* E27844 802B6334 44810000 */ mtc1 $at, $f0 -/* E27848 802B6338 00000000 */ nop +/* E27848 802B6338 00000000 */ nop /* E2784C 802B633C 46006302 */ mul.s $f12, $f12, $f0 -/* E27850 802B6340 00000000 */ nop +/* E27850 802B6340 00000000 */ nop /* E27854 802B6344 27A5004C */ addiu $a1, $sp, 0x4c /* E27858 802B6348 3C0143B4 */ lui $at, 0x43b4 /* E2785C 802B634C 44810000 */ mtc1 $at, $f0 @@ -204,7 +204,7 @@ glabel func_802B6060_E27570 /* E27874 802B6364 C6040054 */ lwc1 $f4, 0x54($s0) /* E27878 802B6368 46020003 */ div.s $f0, $f0, $f2 /* E2787C 802B636C 46040002 */ mul.s $f0, $f0, $f4 -/* E27880 802B6370 00000000 */ nop +/* E27880 802B6370 00000000 */ nop /* E27884 802B6374 C602002C */ lwc1 $f2, 0x2c($s0) /* E27888 802B6378 46000005 */ abs.s $f0, $f0 /* E2788C 802B637C 46001080 */ add.s $f2, $f2, $f0 @@ -212,7 +212,7 @@ glabel func_802B6060_E27570 /* E27894 802B6384 0C0154F0 */ jal func_800553C0 /* E27898 802B6388 E602002C */ swc1 $f2, 0x2c($s0) /* E2789C 802B638C 080AD9C7 */ j .L802B671C -/* E278A0 802B6390 00000000 */ nop +/* E278A0 802B6390 00000000 */ nop /* E278A4 802B6394 0200202D */ daddu $a0, $s0, $zero /* E278A8 802B6398 27A50028 */ addiu $a1, $sp, 0x28 /* E278AC 802B639C 27A6002C */ addiu $a2, $sp, 0x2c @@ -224,10 +224,10 @@ glabel func_802B6060_E27570 /* E278C4 802B63B4 3C014248 */ lui $at, 0x4248 /* E278C8 802B63B8 44813000 */ mtc1 $at, $f6 /* E278CC 802B63BC 44821000 */ mtc1 $v0, $f2 -/* E278D0 802B63C0 00000000 */ nop +/* E278D0 802B63C0 00000000 */ nop /* E278D4 802B63C4 468010A0 */ cvt.s.w $f2, $f2 /* E278D8 802B63C8 46001082 */ mul.s $f2, $f2, $f0 -/* E278DC 802B63CC 00000000 */ nop +/* E278DC 802B63CC 00000000 */ nop /* E278E0 802B63D0 27A20034 */ addiu $v0, $sp, 0x34 /* E278E4 802B63D4 E7A40028 */ swc1 $f4, 0x28($sp) /* E278E8 802B63D8 C600002C */ lwc1 $f0, 0x2c($s0) @@ -251,22 +251,22 @@ glabel func_802B6060_E27570 /* E27930 802B6420 C6020054 */ lwc1 $f2, 0x54($s0) /* E27934 802B6424 3C014040 */ lui $at, 0x4040 /* E27938 802B6428 44810000 */ mtc1 $at, $f0 -/* E2793C 802B642C 00000000 */ nop +/* E2793C 802B642C 00000000 */ nop /* E27940 802B6430 46001203 */ div.s $f8, $f2, $f0 /* E27944 802B6434 3C01802B */ lui $at, %hi(D_802B6768) /* E27948 802B6438 D4226768 */ ldc1 $f2, %lo(D_802B6768)($at) /* E2794C 802B643C 46004021 */ cvt.d.s $f0, $f8 /* E27950 802B6440 4622003C */ c.lt.d $f0, $f2 -/* E27954 802B6444 00000000 */ nop +/* E27954 802B6444 00000000 */ nop /* E27958 802B6448 45030001 */ bc1tl .L802B6450 /* E2795C 802B644C AE000054 */ sw $zero, 0x54($s0) .L802B6450: /* E27960 802B6450 C6000054 */ lwc1 $f0, 0x54($s0) /* E27964 802B6454 46080001 */ sub.s $f0, $f0, $f8 /* E27968 802B6458 4480A000 */ mtc1 $zero, $f20 -/* E2796C 802B645C 00000000 */ nop +/* E2796C 802B645C 00000000 */ nop /* E27970 802B6460 4614003E */ c.le.s $f0, $f20 -/* E27974 802B6464 00000000 */ nop +/* E27974 802B6464 00000000 */ nop /* E27978 802B6468 450000AC */ bc1f .L802B671C /* E2797C 802B646C E6000054 */ swc1 $f0, 0x54($s0) /* E27980 802B6470 24040172 */ addiu $a0, $zero, 0x172 @@ -289,9 +289,9 @@ glabel func_802B6060_E27570 /* E279C0 802B64B0 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) /* E279C4 802B64B4 46020000 */ add.s $f0, $f0, $f2 /* E279C8 802B64B8 44802000 */ mtc1 $zero, $f4 -/* E279CC 802B64BC 00000000 */ nop +/* E279CC 802B64BC 00000000 */ nop /* E279D0 802B64C0 4604003E */ c.le.s $f0, $f4 -/* E279D4 802B64C4 00000000 */ nop +/* E279D4 802B64C4 00000000 */ nop /* E279D8 802B64C8 45000002 */ bc1f .L802B64D4 /* E279DC 802B64CC E6000054 */ swc1 $f0, 0x54($s0) /* E279E0 802B64D0 E6040054 */ swc1 $f4, 0x54($s0) @@ -330,15 +330,15 @@ glabel func_802B6060_E27570 /* E27A60 802B6550 C6220000 */ lwc1 $f2, ($s1) /* E27A64 802B6554 46020000 */ add.s $f0, $f0, $f2 /* E27A68 802B6558 44801000 */ mtc1 $zero, $f2 -/* E27A6C 802B655C 00000000 */ nop +/* E27A6C 802B655C 00000000 */ nop /* E27A70 802B6560 4602003E */ c.le.s $f0, $f2 -/* E27A74 802B6564 00000000 */ nop +/* E27A74 802B6564 00000000 */ nop /* E27A78 802B6568 45000002 */ bc1f .L802B6574 /* E27A7C 802B656C E6000054 */ swc1 $f0, 0x54($s0) /* E27A80 802B6570 E6020054 */ swc1 $f2, 0x54($s0) .L802B6574: /* E27A84 802B6574 0C038D36 */ jal func_800E34D8 -/* E27A88 802B6578 00000000 */ nop +/* E27A88 802B6578 00000000 */ nop /* E27A8C 802B657C 46000306 */ mov.s $f12, $f0 /* E27A90 802B6580 0C038D45 */ jal func_800E3514 /* E27A94 802B6584 27A50048 */ addiu $a1, $sp, 0x48 @@ -355,42 +355,42 @@ glabel func_802B6060_E27570 /* E27AC0 802B65B0 0C052736 */ jal play_sound_at_player /* E27AC4 802B65B4 0000282D */ daddu $a1, $zero, $zero /* E27AC8 802B65B8 080AD9AC */ j .L802B66B0 -/* E27ACC 802B65BC 00000000 */ nop +/* E27ACC 802B65BC 00000000 */ nop /* E27AD0 802B65C0 C6000054 */ lwc1 $f0, 0x54($s0) /* E27AD4 802B65C4 3C01802B */ lui $at, %hi(D_802B678C) /* E27AD8 802B65C8 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) /* E27ADC 802B65CC 46020000 */ add.s $f0, $f0, $f2 /* E27AE0 802B65D0 44801000 */ mtc1 $zero, $f2 -/* E27AE4 802B65D4 00000000 */ nop +/* E27AE4 802B65D4 00000000 */ nop /* E27AE8 802B65D8 4602003E */ c.le.s $f0, $f2 -/* E27AEC 802B65DC 00000000 */ nop +/* E27AEC 802B65DC 00000000 */ nop /* E27AF0 802B65E0 45000002 */ bc1f .L802B65EC /* E27AF4 802B65E4 E6000054 */ swc1 $f0, 0x54($s0) /* E27AF8 802B65E8 E6020054 */ swc1 $f2, 0x54($s0) .L802B65EC: /* E27AFC 802B65EC 960200BC */ lhu $v0, 0xbc($s0) /* E27B00 802B65F0 1040004A */ beqz $v0, .L802B671C -/* E27B04 802B65F4 00000000 */ nop +/* E27B04 802B65F4 00000000 */ nop /* E27B08 802B65F8 3C040001 */ lui $a0, 1 /* E27B0C 802B65FC 0C037FDE */ jal func_800DFF78 /* E27B10 802B6600 34840030 */ ori $a0, $a0, 0x30 /* E27B14 802B6604 080AD9AC */ j .L802B66B0 -/* E27B18 802B6608 00000000 */ nop +/* E27B18 802B6608 00000000 */ nop /* E27B1C 802B660C C6000054 */ lwc1 $f0, 0x54($s0) /* E27B20 802B6610 3C01802B */ lui $at, %hi(D_802B678C) /* E27B24 802B6614 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) /* E27B28 802B6618 46020000 */ add.s $f0, $f0, $f2 /* E27B2C 802B661C 44801000 */ mtc1 $zero, $f2 -/* E27B30 802B6620 00000000 */ nop +/* E27B30 802B6620 00000000 */ nop /* E27B34 802B6624 4602003E */ c.le.s $f0, $f2 -/* E27B38 802B6628 00000000 */ nop +/* E27B38 802B6628 00000000 */ nop /* E27B3C 802B662C 45000002 */ bc1f .L802B6638 /* E27B40 802B6630 E6000054 */ swc1 $f0, 0x54($s0) /* E27B44 802B6634 E6020054 */ swc1 $f2, 0x54($s0) .L802B6638: /* E27B48 802B6638 960200BC */ lhu $v0, 0xbc($s0) /* E27B4C 802B663C 10400037 */ beqz $v0, .L802B671C -/* E27B50 802B6640 00000000 */ nop +/* E27B50 802B6640 00000000 */ nop /* E27B54 802B6644 3C040001 */ lui $a0, 1 /* E27B58 802B6648 0C037FDE */ jal func_800DFF78 /* E27B5C 802B664C 34840031 */ ori $a0, $a0, 0x31 @@ -406,9 +406,9 @@ glabel func_802B6060_E27570 /* E27B84 802B6674 C422678C */ lwc1 $f2, %lo(D_802B678C)($at) /* E27B88 802B6678 46020000 */ add.s $f0, $f0, $f2 /* E27B8C 802B667C 44801000 */ mtc1 $zero, $f2 -/* E27B90 802B6680 00000000 */ nop +/* E27B90 802B6680 00000000 */ nop /* E27B94 802B6684 4602003E */ c.le.s $f0, $f2 -/* E27B98 802B6688 00000000 */ nop +/* E27B98 802B6688 00000000 */ nop /* E27B9C 802B668C 45000002 */ bc1f .L802B6698 /* E27BA0 802B6690 E6000054 */ swc1 $f0, 0x54($s0) /* E27BA4 802B6694 E6020054 */ swc1 $f2, 0x54($s0) @@ -418,7 +418,7 @@ glabel func_802B6060_E27570 /* E27BB0 802B66A0 A6020008 */ sh $v0, 8($s0) /* E27BB4 802B66A4 00021400 */ sll $v0, $v0, 0x10 /* E27BB8 802B66A8 1440001C */ bnez $v0, .L802B671C -/* E27BBC 802B66AC 00000000 */ nop +/* E27BBC 802B66AC 00000000 */ nop .L802B66B0: /* E27BC0 802B66B0 920200B6 */ lbu $v0, 0xb6($s0) .L802B66B4: @@ -428,22 +428,22 @@ glabel func_802B6060_E27570 /* E27BD0 802B66C0 C6020054 */ lwc1 $f2, 0x54($s0) /* E27BD4 802B66C4 3C014040 */ lui $at, 0x4040 /* E27BD8 802B66C8 44810000 */ mtc1 $at, $f0 -/* E27BDC 802B66CC 00000000 */ nop +/* E27BDC 802B66CC 00000000 */ nop /* E27BE0 802B66D0 46001203 */ div.s $f8, $f2, $f0 /* E27BE4 802B66D4 3C01802B */ lui $at, %hi(D_802B6770) /* E27BE8 802B66D8 D4226770 */ ldc1 $f2, %lo(D_802B6770)($at) /* E27BEC 802B66DC 46004021 */ cvt.d.s $f0, $f8 /* E27BF0 802B66E0 4622003C */ c.lt.d $f0, $f2 -/* E27BF4 802B66E4 00000000 */ nop +/* E27BF4 802B66E4 00000000 */ nop /* E27BF8 802B66E8 45030001 */ bc1tl .L802B66F0 /* E27BFC 802B66EC AE000054 */ sw $zero, 0x54($s0) .L802B66F0: /* E27C00 802B66F0 C6000054 */ lwc1 $f0, 0x54($s0) /* E27C04 802B66F4 46080001 */ sub.s $f0, $f0, $f8 /* E27C08 802B66F8 44801000 */ mtc1 $zero, $f2 -/* E27C0C 802B66FC 00000000 */ nop +/* E27C0C 802B66FC 00000000 */ nop /* E27C10 802B6700 4602003E */ c.le.s $f0, $f2 -/* E27C14 802B6704 00000000 */ nop +/* E27C14 802B6704 00000000 */ nop /* E27C18 802B6708 45000004 */ bc1f .L802B671C /* E27C1C 802B670C E6000054 */ swc1 $f0, 0x54($s0) /* E27C20 802B6710 E6020054 */ swc1 $f2, 0x54($s0) @@ -457,5 +457,5 @@ glabel func_802B6060_E27570 /* E27C3C 802B672C D7B40068 */ ldc1 $f20, 0x68($sp) /* E27C40 802B6730 03E00008 */ jr $ra /* E27C44 802B6734 27BD0070 */ addiu $sp, $sp, 0x70 -/* E27C48 802B6738 00000000 */ nop -/* E27C4C 802B673C 00000000 */ nop +/* E27C48 802B6738 00000000 */ nop +/* E27C4C 802B673C 00000000 */ nop diff --git a/asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s b/asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s index 1cfbc678d8..1a610776b1 100644 --- a/asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s +++ b/asm/nonmatchings/code_E27C90/func_802B6000_E27C90.s @@ -43,11 +43,11 @@ glabel func_802B6000_E27C90 /* E27D28 802B6098 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* E27D2C 802B609C A20000B6 */ sb $zero, 0xb6($s0) /* E27D30 802B60A0 44824000 */ mtc1 $v0, $f8 -/* E27D34 802B60A4 00000000 */ nop +/* E27D34 802B60A4 00000000 */ nop /* E27D38 802B60A8 46804220 */ cvt.s.w $f8, $f8 /* E27D3C 802B60AC 44064000 */ mfc1 $a2, $f8 /* E27D40 802B60B0 44844000 */ mtc1 $a0, $f8 -/* E27D44 802B60B4 00000000 */ nop +/* E27D44 802B60B4 00000000 */ nop /* E27D48 802B60B8 46804220 */ cvt.s.w $f8, $f8 /* E27D4C 802B60BC E6020070 */ swc1 $f2, 0x70($s0) /* E27D50 802B60C0 E6040074 */ swc1 $f4, 0x74($s0) @@ -63,10 +63,10 @@ glabel func_802B6000_E27C90 /* E27D78 802B60E8 3C01802B */ lui $at, %hi(D_802B62B0) /* E27D7C 802B60EC E42062B0 */ swc1 $f0, %lo(D_802B62B0)($at) /* E27D80 802B60F0 44826000 */ mtc1 $v0, $f12 -/* E27D84 802B60F4 00000000 */ nop +/* E27D84 802B60F4 00000000 */ nop /* E27D88 802B60F8 46806320 */ cvt.s.w $f12, $f12 /* E27D8C 802B60FC 44837000 */ mtc1 $v1, $f14 -/* E27D90 802B6100 00000000 */ nop +/* E27D90 802B6100 00000000 */ nop /* E27D94 802B6104 0C038022 */ jal func_800E0088 /* E27D98 802B6108 468073A0 */ cvt.s.w $f14, $f14 /* E27D9C 802B610C 3C014190 */ lui $at, 0x4190 @@ -76,7 +76,7 @@ glabel func_802B6000_E27C90 /* E27DAC 802B611C 0C03A8CD */ jal subtract_hp /* E27DB0 802B6120 E6000054 */ swc1 $f0, 0x54($s0) /* E27DB4 802B6124 0C03A5D8 */ jal open_status_menu_long -/* E27DB8 802B6128 00000000 */ nop +/* E27DB8 802B6128 00000000 */ nop /* E27DBC 802B612C 3C03800A */ lui $v1, %hi(D_8009A650) /* E27DC0 802B6130 2463A650 */ addiu $v1, $v1, %lo(D_8009A650) /* E27DC4 802B6134 8C620000 */ lw $v0, ($v1) @@ -88,9 +88,9 @@ glabel func_802B6000_E27C90 /* E27DD8 802B6148 3C0140C9 */ lui $at, 0x40c9 /* E27DDC 802B614C 34210FD0 */ ori $at, $at, 0xfd0 /* E27DE0 802B6150 44810000 */ mtc1 $at, $f0 -/* E27DE4 802B6154 00000000 */ nop +/* E27DE4 802B6154 00000000 */ nop /* E27DE8 802B6158 46006302 */ mul.s $f12, $f12, $f0 -/* E27DEC 802B615C 00000000 */ nop +/* E27DEC 802B615C 00000000 */ nop /* E27DF0 802B6160 27A50010 */ addiu $a1, $sp, 0x10 /* E27DF4 802B6164 3C0143B4 */ lui $at, 0x43b4 /* E27DF8 802B6168 44810000 */ mtc1 $at, $f0 @@ -102,21 +102,21 @@ glabel func_802B6000_E27C90 /* E27E10 802B6180 C6060054 */ lwc1 $f6, 0x54($s0) /* E27E14 802B6184 00431024 */ and $v0, $v0, $v1 /* E27E18 802B6188 10400008 */ beqz $v0, .L802B61AC -/* E27E1C 802B618C 00000000 */ nop +/* E27E1C 802B618C 00000000 */ nop /* E27E20 802B6190 3C013FE0 */ lui $at, 0x3fe0 /* E27E24 802B6194 44811800 */ mtc1 $at, $f3 /* E27E28 802B6198 44801000 */ mtc1 $zero, $f2 /* E27E2C 802B619C 46003021 */ cvt.d.s $f0, $f6 /* E27E30 802B61A0 46220002 */ mul.d $f0, $f0, $f2 -/* E27E34 802B61A4 00000000 */ nop +/* E27E34 802B61A4 00000000 */ nop /* E27E38 802B61A8 462001A0 */ cvt.s.d $f6, $f0 .L802B61AC: /* E27E3C 802B61AC C7A00010 */ lwc1 $f0, 0x10($sp) /* E27E40 802B61B0 46003002 */ mul.s $f0, $f6, $f0 -/* E27E44 802B61B4 00000000 */ nop +/* E27E44 802B61B4 00000000 */ nop /* E27E48 802B61B8 C7A40014 */ lwc1 $f4, 0x14($sp) /* E27E4C 802B61BC 46043102 */ mul.s $f4, $f6, $f4 -/* E27E50 802B61C0 00000000 */ nop +/* E27E50 802B61C0 00000000 */ nop /* E27E54 802B61C4 C6020028 */ lwc1 $f2, 0x28($s0) /* E27E58 802B61C8 46001080 */ add.s $f2, $f2, $f0 /* E27E5C 802B61CC C6000030 */ lwc1 $f0, 0x30($s0) @@ -126,14 +126,14 @@ glabel func_802B6000_E27C90 /* E27E6C 802B61DC 14400012 */ bnez $v0, .L802B6228 /* E27E70 802B61E0 E6000030 */ swc1 $f0, 0x30($s0) /* E27E74 802B61E4 0C038D12 */ jal integrate_gravity -/* E27E78 802B61E8 00000000 */ nop +/* E27E78 802B61E8 00000000 */ nop /* E27E7C 802B61EC C600002C */ lwc1 $f0, 0x2c($s0) /* E27E80 802B61F0 C6040070 */ lwc1 $f4, 0x70($s0) /* E27E84 802B61F4 46040000 */ add.s $f0, $f0, $f4 /* E27E88 802B61F8 44801000 */ mtc1 $zero, $f2 -/* E27E8C 802B61FC 00000000 */ nop +/* E27E8C 802B61FC 00000000 */ nop /* E27E90 802B6200 4602203C */ c.lt.s $f4, $f2 -/* E27E94 802B6204 00000000 */ nop +/* E27E94 802B6204 00000000 */ nop /* E27E98 802B6208 45000021 */ bc1f .L802B6290 /* E27E9C 802B620C E600002C */ swc1 $f0, 0x2c($s0) /* E27EA0 802B6210 8E020000 */ lw $v0, ($s0) @@ -144,7 +144,7 @@ glabel func_802B6000_E27C90 /* E27EB4 802B6224 AE020000 */ sw $v0, ($s0) .L802B6228: /* E27EB8 802B6228 0C038D36 */ jal func_800E34D8 -/* E27EBC 802B622C 00000000 */ nop +/* E27EBC 802B622C 00000000 */ nop /* E27EC0 802B6230 46000306 */ mov.s $f12, $f0 /* E27EC4 802B6234 0C038D45 */ jal func_800E3514 /* E27EC8 802B6238 27A50018 */ addiu $a1, $sp, 0x18 @@ -152,7 +152,7 @@ glabel func_802B6000_E27C90 /* E27ED0 802B6240 04800013 */ bltz $a0, .L802B6290 /* E27ED4 802B6244 E620002C */ swc1 $f0, 0x2c($s1) /* E27ED8 802B6248 0C016F6A */ jal get_collider_type_by_id -/* E27EDC 802B624C 00000000 */ nop +/* E27EDC 802B624C 00000000 */ nop /* E27EE0 802B6250 2404000A */ addiu $a0, $zero, 0xa /* E27EE4 802B6254 0C039769 */ jal set_action_state /* E27EE8 802B6258 AFA20018 */ sw $v0, 0x18($sp) @@ -175,6 +175,6 @@ glabel func_802B6000_E27C90 /* E27F28 802B6298 8FB00020 */ lw $s0, 0x20($sp) /* E27F2C 802B629C 03E00008 */ jr $ra /* E27F30 802B62A0 27BD0030 */ addiu $sp, $sp, 0x30 -/* E27F34 802B62A4 00000000 */ nop -/* E27F38 802B62A8 00000000 */ nop -/* E27F3C 802B62AC 00000000 */ nop +/* E27F34 802B62A4 00000000 */ nop +/* E27F38 802B62A8 00000000 */ nop +/* E27F3C 802B62AC 00000000 */ nop diff --git a/asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s b/asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s index 3d264212ac..8f46fff7f2 100644 --- a/asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s +++ b/asm/nonmatchings/code_E287F0/func_802B6000_E287F0.s @@ -38,12 +38,12 @@ glabel func_802B6000_E287F0 /* E28874 802B6084 24631D80 */ addiu $v1, $v1, %lo(gCameras) /* E28878 802B6088 A20000B6 */ sb $zero, 0xb6($s0) /* E2887C 802B608C 44824000 */ mtc1 $v0, $f8 -/* E28880 802B6090 00000000 */ nop +/* E28880 802B6090 00000000 */ nop /* E28884 802B6094 46804220 */ cvt.s.w $f8, $f8 /* E28888 802B6098 44064000 */ mfc1 $a2, $f8 /* E2888C 802B609C 8E020000 */ lw $v0, ($s0) /* E28890 802B60A0 44844000 */ mtc1 $a0, $f8 -/* E28894 802B60A4 00000000 */ nop +/* E28894 802B60A4 00000000 */ nop /* E28898 802B60A8 46804220 */ cvt.s.w $f8, $f8 /* E2889C 802B60AC E6000070 */ swc1 $f0, 0x70($s0) /* E288A0 802B60B0 E6020074 */ swc1 $f2, 0x74($s0) @@ -61,15 +61,15 @@ glabel func_802B6000_E287F0 /* E288D0 802B60E0 3C01802B */ lui $at, %hi(D_802B6240) /* E288D4 802B60E4 E4206240 */ swc1 $f0, %lo(D_802B6240)($at) /* E288D8 802B60E8 44826000 */ mtc1 $v0, $f12 -/* E288DC 802B60EC 00000000 */ nop +/* E288DC 802B60EC 00000000 */ nop /* E288E0 802B60F0 46806320 */ cvt.s.w $f12, $f12 /* E288E4 802B60F4 44837000 */ mtc1 $v1, $f14 -/* E288E8 802B60F8 00000000 */ nop +/* E288E8 802B60F8 00000000 */ nop /* E288EC 802B60FC 0C038022 */ jal func_800E0088 /* E288F0 802B6100 468073A0 */ cvt.s.w $f14, $f14 /* E288F4 802B6104 3C014190 */ lui $at, 0x4190 /* E288F8 802B6108 44811000 */ mtc1 $at, $f2 -/* E288FC 802B610C 00000000 */ nop +/* E288FC 802B610C 00000000 */ nop /* E28900 802B6110 46020003 */ div.s $f0, $f0, $f2 /* E28904 802B6114 E6000054 */ swc1 $f0, 0x54($s0) .L802B6118: @@ -78,9 +78,9 @@ glabel func_802B6000_E287F0 /* E28910 802B6120 3C0140C9 */ lui $at, 0x40c9 /* E28914 802B6124 34210FD0 */ ori $at, $at, 0xfd0 /* E28918 802B6128 44810000 */ mtc1 $at, $f0 -/* E2891C 802B612C 00000000 */ nop +/* E2891C 802B612C 00000000 */ nop /* E28920 802B6130 46006302 */ mul.s $f12, $f12, $f0 -/* E28924 802B6134 00000000 */ nop +/* E28924 802B6134 00000000 */ nop /* E28928 802B6138 27A50010 */ addiu $a1, $sp, 0x10 /* E2892C 802B613C 3C0143B4 */ lui $at, 0x43b4 /* E28930 802B6140 44810000 */ mtc1 $at, $f0 @@ -92,19 +92,19 @@ glabel func_802B6000_E287F0 /* E28948 802B6158 C6020054 */ lwc1 $f2, 0x54($s0) /* E2894C 802B615C 00431024 */ and $v0, $v0, $v1 /* E28950 802B6160 10400006 */ beqz $v0, .L802B617C -/* E28954 802B6164 00000000 */ nop +/* E28954 802B6164 00000000 */ nop /* E28958 802B6168 3C013F00 */ lui $at, 0x3f00 /* E2895C 802B616C 44810000 */ mtc1 $at, $f0 -/* E28960 802B6170 00000000 */ nop +/* E28960 802B6170 00000000 */ nop /* E28964 802B6174 46001082 */ mul.s $f2, $f2, $f0 -/* E28968 802B6178 00000000 */ nop +/* E28968 802B6178 00000000 */ nop .L802B617C: /* E2896C 802B617C C7A00010 */ lwc1 $f0, 0x10($sp) /* E28970 802B6180 46001002 */ mul.s $f0, $f2, $f0 -/* E28974 802B6184 00000000 */ nop +/* E28974 802B6184 00000000 */ nop /* E28978 802B6188 C7A40014 */ lwc1 $f4, 0x14($sp) /* E2897C 802B618C 46041102 */ mul.s $f4, $f2, $f4 -/* E28980 802B6190 00000000 */ nop +/* E28980 802B6190 00000000 */ nop /* E28984 802B6194 C6020028 */ lwc1 $f2, 0x28($s0) /* E28988 802B6198 46001080 */ add.s $f2, $f2, $f0 /* E2898C 802B619C C6000030 */ lwc1 $f0, 0x30($s0) @@ -114,14 +114,14 @@ glabel func_802B6000_E287F0 /* E2899C 802B61AC 14400012 */ bnez $v0, .L802B61F8 /* E289A0 802B61B0 E6000030 */ swc1 $f0, 0x30($s0) /* E289A4 802B61B4 0C038D12 */ jal integrate_gravity -/* E289A8 802B61B8 00000000 */ nop +/* E289A8 802B61B8 00000000 */ nop /* E289AC 802B61BC C600002C */ lwc1 $f0, 0x2c($s0) /* E289B0 802B61C0 C6040070 */ lwc1 $f4, 0x70($s0) /* E289B4 802B61C4 46040000 */ add.s $f0, $f0, $f4 /* E289B8 802B61C8 44801000 */ mtc1 $zero, $f2 -/* E289BC 802B61CC 00000000 */ nop +/* E289BC 802B61CC 00000000 */ nop /* E289C0 802B61D0 4602203C */ c.lt.s $f4, $f2 -/* E289C4 802B61D4 00000000 */ nop +/* E289C4 802B61D4 00000000 */ nop /* E289C8 802B61D8 45000014 */ bc1f .L802B622C /* E289CC 802B61DC E600002C */ swc1 $f0, 0x2c($s0) /* E289D0 802B61E0 8E020000 */ lw $v0, ($s0) @@ -132,7 +132,7 @@ glabel func_802B6000_E287F0 /* E289E4 802B61F4 AE020000 */ sw $v0, ($s0) .L802B61F8: /* E289E8 802B61F8 0C038D36 */ jal func_800E34D8 -/* E289EC 802B61FC 00000000 */ nop +/* E289EC 802B61FC 00000000 */ nop /* E289F0 802B6200 46000306 */ mov.s $f12, $f0 /* E289F4 802B6204 0C038D45 */ jal func_800E3514 /* E289F8 802B6208 27A50018 */ addiu $a1, $sp, 0x18 @@ -140,7 +140,7 @@ glabel func_802B6000_E287F0 /* E28A00 802B6210 04800006 */ bltz $a0, .L802B622C /* E28A04 802B6214 E620002C */ swc1 $f0, 0x2c($s1) /* E28A08 802B6218 0C016F6A */ jal get_collider_type_by_id -/* E28A0C 802B621C 00000000 */ nop +/* E28A0C 802B621C 00000000 */ nop /* E28A10 802B6220 AFA20018 */ sw $v0, 0x18($sp) /* E28A14 802B6224 0C039769 */ jal set_action_state /* E28A18 802B6228 2404000A */ addiu $a0, $zero, 0xa diff --git a/asm/nonmatchings/code_E29470/func_802B6000_E29470.s b/asm/nonmatchings/code_E29470/func_802B6000_E29470.s index 91c13fa019..25846723c3 100644 --- a/asm/nonmatchings/code_E29470/func_802B6000_E29470.s +++ b/asm/nonmatchings/code_E29470/func_802B6000_E29470.s @@ -13,11 +13,11 @@ glabel func_802B6000_E29470 /* E29490 802B6020 44810800 */ mtc1 $at, $f1 /* E29494 802B6024 44800000 */ mtc1 $zero, $f0 /* E29498 802B6028 44823000 */ mtc1 $v0, $f6 -/* E2949C 802B602C 00000000 */ nop +/* E2949C 802B602C 00000000 */ nop /* E294A0 802B6030 468031A0 */ cvt.s.w $f6, $f6 /* E294A4 802B6034 460030A1 */ cvt.d.s $f2, $f6 /* E294A8 802B6038 46201082 */ mul.d $f2, $f2, $f0 -/* E294AC 802B603C 00000000 */ nop +/* E294AC 802B603C 00000000 */ nop /* E294B0 802B6040 27A70030 */ addiu $a3, $sp, 0x30 /* E294B4 802B6044 C4840028 */ lwc1 $f4, 0x28($a0) /* E294B8 802B6048 C480002C */ lwc1 $f0, 0x2c($a0) diff --git a/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s b/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s index 523e586a10..4473cce51f 100644 --- a/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s +++ b/asm/nonmatchings/code_E29470/func_802B60A4_E29514.s @@ -43,9 +43,9 @@ glabel func_802B60A4_E29514 /* E295AC 802B613C 3C01802B */ lui $at, %hi(D_802B6EDC) /* E295B0 802B6140 E4226EDC */ swc1 $f2, %lo(D_802B6EDC)($at) /* E295B4 802B6144 0C038045 */ jal disable_player_static_collisions -/* E295B8 802B6148 00000000 */ nop +/* E295B8 802B6148 00000000 */ nop /* E295BC 802B614C 0C03805E */ jal disable_player_input -/* E295C0 802B6150 00000000 */ nop +/* E295C0 802B6150 00000000 */ nop /* E295C4 802B6154 3C030010 */ lui $v1, 0x10 /* E295C8 802B6158 8E620000 */ lw $v0, ($s3) /* E295CC 802B615C 3C048016 */ lui $a0, %hi(gCollisionStatus+0x2) @@ -66,7 +66,7 @@ glabel func_802B60A4_E29514 /* E29600 802B6190 8E620004 */ lw $v0, 4($s3) /* E29604 802B6194 30420003 */ andi $v0, $v0, 3 /* E29608 802B6198 14400004 */ bnez $v0, .L802B61AC -/* E2960C 802B619C 00000000 */ nop +/* E2960C 802B619C 00000000 */ nop /* E29610 802B61A0 3C040001 */ lui $a0, 1 /* E29614 802B61A4 0C037FBF */ jal func_800DFEFC /* E29618 802B61A8 3484002B */ ori $a0, $a0, 0x2b @@ -76,9 +76,9 @@ glabel func_802B60A4_E29514 /* E29624 802B61B4 10620005 */ beq $v1, $v0, .L802B61CC /* E29628 802B61B8 24020002 */ addiu $v0, $zero, 2 /* E2962C 802B61BC 106200F6 */ beq $v1, $v0, .L802B6598 -/* E29630 802B61C0 00000000 */ nop +/* E29630 802B61C0 00000000 */ nop /* E29634 802B61C4 080AD9D6 */ j .L802B6758 -/* E29638 802B61C8 00000000 */ nop +/* E29638 802B61C8 00000000 */ nop .L802B61CC: /* E2963C 802B61CC 3C04802B */ lui $a0, %hi(D_802B6EE4) /* E29640 802B61D0 24846EE4 */ addiu $a0, $a0, %lo(D_802B6EE4) @@ -94,7 +94,7 @@ glabel func_802B60A4_E29514 /* E29668 802B61F8 34420040 */ ori $v0, $v0, 0x40 /* E2966C 802B61FC AC620000 */ sw $v0, ($v1) /* E29670 802B6200 4600103E */ c.le.s $f2, $f0 -/* E29674 802B6204 00000000 */ nop +/* E29674 802B6204 00000000 */ nop /* E29678 802B6208 45000002 */ bc1f .L802B6214 /* E2967C 802B620C E4800000 */ swc1 $f0, ($a0) /* E29680 802B6210 E4820000 */ swc1 $f2, ($a0) @@ -121,7 +121,7 @@ glabel func_802B60A4_E29514 /* E296CC 802B625C C44C0000 */ lwc1 $f12, ($v0) /* E296D0 802B6260 3C014100 */ lui $at, 0x4100 /* E296D4 802B6264 44810000 */ mtc1 $at, $f0 -/* E296D8 802B6268 00000000 */ nop +/* E296D8 802B6268 00000000 */ nop /* E296DC 802B626C 46006300 */ add.s $f12, $f12, $f0 /* E296E0 802B6270 3C0140C9 */ lui $at, 0x40c9 /* E296E4 802B6274 34210FD0 */ ori $at, $at, 0xfd0 @@ -129,7 +129,7 @@ glabel func_802B60A4_E29514 /* E296EC 802B627C 0C00A6C9 */ jal clamp_angle /* E296F0 802B6280 E44C0000 */ swc1 $f12, ($v0) /* E296F4 802B6284 46140002 */ mul.s $f0, $f0, $f20 -/* E296F8 802B6288 00000000 */ nop +/* E296F8 802B6288 00000000 */ nop /* E296FC 802B628C 3C0143B4 */ lui $at, 0x43b4 /* E29700 802B6290 4481B000 */ mtc1 $at, $f22 /* E29704 802B6294 3C014080 */ lui $at, 0x4080 @@ -137,7 +137,7 @@ glabel func_802B60A4_E29514 /* E2970C 802B629C 0C00A85B */ jal sin_rad /* E29710 802B62A0 46160303 */ div.s $f12, $f0, $f22 /* E29714 802B62A4 461A0002 */ mul.s $f0, $f0, $f26 -/* E29718 802B62A8 00000000 */ nop +/* E29718 802B62A8 00000000 */ nop /* E2971C 802B62AC 3C01802B */ lui $at, %hi(D_802B6EF4) /* E29720 802B62B0 C4226EF4 */ lwc1 $f2, %lo(D_802B6EF4)($at) /* E29724 802B62B4 46001080 */ add.s $f2, $f2, $f0 @@ -146,7 +146,7 @@ glabel func_802B60A4_E29514 /* E29730 802B62C0 04800042 */ bltz $a0, .L802B63CC /* E29734 802B62C4 E662002C */ swc1 $f2, 0x2c($s3) /* E29738 802B62C8 0C04417A */ jal get_entity_by_index -/* E2973C 802B62CC 00000000 */ nop +/* E2973C 802B62CC 00000000 */ nop /* E29740 802B62D0 0040902D */ daddu $s2, $v0, $zero /* E29744 802B62D4 C64C0048 */ lwc1 $f12, 0x48($s2) /* E29748 802B62D8 C64E0050 */ lwc1 $f14, 0x50($s2) @@ -162,13 +162,13 @@ glabel func_802B60A4_E29514 /* E29770 802B6300 3C14802B */ lui $s4, %hi(D_802B6EEC) /* E29774 802B6304 26946EEC */ addiu $s4, $s4, %lo(D_802B6EEC) /* E29778 802B6308 4618D03C */ c.lt.s $f26, $f24 -/* E2977C 802B630C 00000000 */ nop +/* E2977C 802B630C 00000000 */ nop /* E29780 802B6310 45000002 */ bc1f .L802B631C /* E29784 802B6314 E6800000 */ swc1 $f0, ($s4) /* E29788 802B6318 461CC601 */ sub.s $f24, $f24, $f28 .L802B631C: /* E2978C 802B631C 46140302 */ mul.s $f12, $f0, $f20 -/* E29790 802B6320 00000000 */ nop +/* E29790 802B6320 00000000 */ nop /* E29794 802B6324 27B00010 */ addiu $s0, $sp, 0x10 /* E29798 802B6328 0200282D */ daddu $a1, $s0, $zero /* E2979C 802B632C 27B10014 */ addiu $s1, $sp, 0x14 @@ -177,19 +177,19 @@ glabel func_802B60A4_E29514 /* E297A8 802B6338 46166303 */ div.s $f12, $f12, $f22 /* E297AC 802B633C C7A20010 */ lwc1 $f2, 0x10($sp) /* E297B0 802B6340 46181082 */ mul.s $f2, $f2, $f24 -/* E297B4 802B6344 00000000 */ nop +/* E297B4 802B6344 00000000 */ nop /* E297B8 802B6348 C7A40014 */ lwc1 $f4, 0x14($sp) /* E297BC 802B634C 46182102 */ mul.s $f4, $f4, $f24 -/* E297C0 802B6350 00000000 */ nop +/* E297C0 802B6350 00000000 */ nop /* E297C4 802B6354 C68C0000 */ lwc1 $f12, ($s4) /* E297C8 802B6358 3C0142B6 */ lui $at, 0x42b6 /* E297CC 802B635C 44810000 */ mtc1 $at, $f0 -/* E297D0 802B6360 00000000 */ nop +/* E297D0 802B6360 00000000 */ nop /* E297D4 802B6364 46006301 */ sub.s $f12, $f12, $f0 /* E297D8 802B6368 C6400048 */ lwc1 $f0, 0x48($s2) /* E297DC 802B636C 46020000 */ add.s $f0, $f0, $f2 /* E297E0 802B6370 46146302 */ mul.s $f12, $f12, $f20 -/* E297E4 802B6374 00000000 */ nop +/* E297E4 802B6374 00000000 */ nop /* E297E8 802B6378 E6600028 */ swc1 $f0, 0x28($s3) /* E297EC 802B637C C6400050 */ lwc1 $f0, 0x50($s2) /* E297F0 802B6380 0200282D */ daddu $a1, $s0, $zero @@ -202,11 +202,11 @@ glabel func_802B60A4_E29514 /* E2980C 802B639C 3C01802B */ lui $at, %hi(D_802B6EDC) /* E29810 802B63A0 C4246EDC */ lwc1 $f4, %lo(D_802B6EDC)($at) /* E29814 802B63A4 46041082 */ mul.s $f2, $f2, $f4 -/* E29818 802B63A8 00000000 */ nop +/* E29818 802B63A8 00000000 */ nop /* E2981C 802B63AC C7A00014 */ lwc1 $f0, 0x14($sp) /* E29820 802B63B0 46000007 */ neg.s $f0, $f0 /* E29824 802B63B4 46040002 */ mul.s $f0, $f0, $f4 -/* E29828 802B63B8 00000000 */ nop +/* E29828 802B63B8 00000000 */ nop /* E2982C 802B63BC 3C01802B */ lui $at, %hi(D_802B6ED4) /* E29830 802B63C0 E4226ED4 */ swc1 $f2, %lo(D_802B6ED4)($at) /* E29834 802B63C4 3C01802B */ lui $at, %hi(D_802B6ED8) @@ -217,18 +217,18 @@ glabel func_802B60A4_E29514 /* E29844 802B63D4 27A5001C */ addiu $a1, $sp, 0x1c /* E29848 802B63D8 C7A2001C */ lwc1 $f2, 0x1c($sp) /* E2984C 802B63DC 44800000 */ mtc1 $zero, $f0 -/* E29850 802B63E0 00000000 */ nop +/* E29850 802B63E0 00000000 */ nop /* E29854 802B63E4 46001032 */ c.eq.s $f2, $f0 -/* E29858 802B63E8 00000000 */ nop +/* E29858 802B63E8 00000000 */ nop /* E2985C 802B63EC 4501002C */ bc1t .L802B64A0 /* E29860 802B63F0 27A50010 */ addiu $a1, $sp, 0x10 /* E29864 802B63F4 C7AC0018 */ lwc1 $f12, 0x18($sp) /* E29868 802B63F8 3C0140C9 */ lui $at, 0x40c9 /* E2986C 802B63FC 34210FD0 */ ori $at, $at, 0xfd0 /* E29870 802B6400 44810000 */ mtc1 $at, $f0 -/* E29874 802B6404 00000000 */ nop +/* E29874 802B6404 00000000 */ nop /* E29878 802B6408 46006302 */ mul.s $f12, $f12, $f0 -/* E2987C 802B640C 00000000 */ nop +/* E2987C 802B640C 00000000 */ nop /* E29880 802B6410 3C0143B4 */ lui $at, 0x43b4 /* E29884 802B6414 44810000 */ mtc1 $at, $f0 /* E29888 802B6418 27A60014 */ addiu $a2, $sp, 0x14 @@ -237,29 +237,29 @@ glabel func_802B60A4_E29514 /* E29894 802B6424 C7A4001C */ lwc1 $f4, 0x1c($sp) /* E29898 802B6428 3C013D00 */ lui $at, 0x3d00 /* E2989C 802B642C 44810000 */ mtc1 $at, $f0 -/* E298A0 802B6430 00000000 */ nop +/* E298A0 802B6430 00000000 */ nop /* E298A4 802B6434 46002102 */ mul.s $f4, $f4, $f0 -/* E298A8 802B6438 00000000 */ nop +/* E298A8 802B6438 00000000 */ nop /* E298AC 802B643C 3C01802B */ lui $at, %hi(D_802B6E90) /* E298B0 802B6440 D4226E90 */ ldc1 $f2, %lo(D_802B6E90)($at) /* E298B4 802B6444 46002021 */ cvt.d.s $f0, $f4 /* E298B8 802B6448 4622003C */ c.lt.d $f0, $f2 -/* E298BC 802B644C 00000000 */ nop +/* E298BC 802B644C 00000000 */ nop /* E298C0 802B6450 45000006 */ bc1f .L802B646C /* E298C4 802B6454 E7A4001C */ swc1 $f4, 0x1c($sp) /* E298C8 802B6458 3C013DCC */ lui $at, 0x3dcc /* E298CC 802B645C 3421CCCD */ ori $at, $at, 0xcccd /* E298D0 802B6460 44810000 */ mtc1 $at, $f0 -/* E298D4 802B6464 00000000 */ nop +/* E298D4 802B6464 00000000 */ nop /* E298D8 802B6468 E7A0001C */ swc1 $f0, 0x1c($sp) .L802B646C: /* E298DC 802B646C C7A00010 */ lwc1 $f0, 0x10($sp) /* E298E0 802B6470 C7A2001C */ lwc1 $f2, 0x1c($sp) /* E298E4 802B6474 46020002 */ mul.s $f0, $f0, $f2 -/* E298E8 802B6478 00000000 */ nop +/* E298E8 802B6478 00000000 */ nop /* E298EC 802B647C C7A40014 */ lwc1 $f4, 0x14($sp) /* E298F0 802B6480 46022102 */ mul.s $f4, $f4, $f2 -/* E298F4 802B6484 00000000 */ nop +/* E298F4 802B6484 00000000 */ nop /* E298F8 802B6488 C6620028 */ lwc1 $f2, 0x28($s3) /* E298FC 802B648C 46001080 */ add.s $f2, $f2, $f0 /* E29900 802B6490 C6600030 */ lwc1 $f0, 0x30($s3) @@ -280,7 +280,7 @@ glabel func_802B60A4_E29514 /* E29938 802B64C8 AFA20020 */ sw $v0, 0x20($sp) /* E2993C 802B64CC 30424000 */ andi $v0, $v0, 0x4000 /* E29940 802B64D0 14400014 */ bnez $v0, .L802B6524 -/* E29944 802B64D4 00000000 */ nop +/* E29944 802B64D4 00000000 */ nop .L802B64D8: /* E29948 802B64D8 C660002C */ lwc1 $f0, 0x2c($s3) /* E2994C 802B64DC 24020014 */ addiu $v0, $zero, 0x14 @@ -307,7 +307,7 @@ glabel func_802B60A4_E29514 /* E2999C 802B652C 8C420010 */ lw $v0, 0x10($v0) /* E299A0 802B6530 30422000 */ andi $v0, $v0, 0x2000 /* E299A4 802B6534 10400088 */ beqz $v0, .L802B6758 -/* E299A8 802B6538 00000000 */ nop +/* E299A8 802B6538 00000000 */ nop /* E299AC 802B653C 8E620004 */ lw $v0, 4($s3) /* E299B0 802B6540 30420003 */ andi $v0, $v0, 3 /* E299B4 802B6544 14400084 */ bnez $v0, .L802B6758 @@ -326,11 +326,11 @@ glabel func_802B60A4_E29514 /* E299E8 802B6578 3C018016 */ lui $at, %hi(gCollisionStatus+0x2) /* E299EC 802B657C A422A552 */ sh $v0, %lo(gCollisionStatus+0x2)($at) /* E299F0 802B6580 0C04417A */ jal get_entity_by_index -/* E299F4 802B6584 00000000 */ nop +/* E299F4 802B6584 00000000 */ nop /* E299F8 802B6588 0C043F5A */ jal func_8010FD68 /* E299FC 802B658C 0040202D */ daddu $a0, $v0, $zero /* E29A00 802B6590 080AD9D6 */ j .L802B6758 -/* E29A04 802B6594 00000000 */ nop +/* E29A04 802B6594 00000000 */ nop .L802B6598: /* E29A08 802B6598 3C04802B */ lui $a0, %hi(D_802B6EE4) /* E29A0C 802B659C 24846EE4 */ addiu $a0, $a0, %lo(D_802B6EE4) @@ -345,7 +345,7 @@ glabel func_802B60A4_E29514 /* E29A30 802B65C0 34420040 */ ori $v0, $v0, 0x40 /* E29A34 802B65C4 AE220000 */ sw $v0, ($s1) /* E29A38 802B65C8 4602003C */ c.lt.s $f0, $f2 -/* E29A3C 802B65CC 00000000 */ nop +/* E29A3C 802B65CC 00000000 */ nop /* E29A40 802B65D0 45000007 */ bc1f .L802B65F0 /* E29A44 802B65D4 E4800000 */ swc1 $f0, ($a0) /* E29A48 802B65D8 3C03FFEF */ lui $v1, 0xffef @@ -363,14 +363,14 @@ glabel func_802B60A4_E29514 /* E29A74 802B6604 C42C6EEC */ lwc1 $f12, %lo(D_802B6EEC)($at) /* E29A78 802B6608 3C014270 */ lui $at, 0x4270 /* E29A7C 802B660C 44811000 */ mtc1 $at, $f2 -/* E29A80 802B6610 00000000 */ nop +/* E29A80 802B6610 00000000 */ nop /* E29A84 802B6614 46026301 */ sub.s $f12, $f12, $f2 /* E29A88 802B6618 3C0140C9 */ lui $at, 0x40c9 /* E29A8C 802B661C 34210FD0 */ ori $at, $at, 0xfd0 /* E29A90 802B6620 44811000 */ mtc1 $at, $f2 -/* E29A94 802B6624 00000000 */ nop +/* E29A94 802B6624 00000000 */ nop /* E29A98 802B6628 46026302 */ mul.s $f12, $f12, $f2 -/* E29A9C 802B662C 00000000 */ nop +/* E29A9C 802B662C 00000000 */ nop /* E29AA0 802B6630 27A50010 */ addiu $a1, $sp, 0x10 /* E29AA4 802B6634 3C0143B4 */ lui $at, 0x43b4 /* E29AA8 802B6638 44811000 */ mtc1 $at, $f2 @@ -388,7 +388,7 @@ glabel func_802B60A4_E29514 /* E29AD8 802B6668 C7A80010 */ lwc1 $f8, 0x10($sp) /* E29ADC 802B666C 46200020 */ cvt.s.d $f0, $f0 /* E29AE0 802B6670 46004202 */ mul.s $f8, $f8, $f0 -/* E29AE4 802B6674 00000000 */ nop +/* E29AE4 802B6674 00000000 */ nop /* E29AE8 802B6678 3C10802B */ lui $s0, %hi(D_802B6EF0) /* E29AEC 802B667C 26106EF0 */ addiu $s0, $s0, %lo(D_802B6EF0) /* E29AF0 802B6680 C6020000 */ lwc1 $f2, ($s0) @@ -399,7 +399,7 @@ glabel func_802B60A4_E29514 /* E29B04 802B6694 C7A40014 */ lwc1 $f4, 0x14($sp) /* E29B08 802B6698 46002107 */ neg.s $f4, $f4 /* E29B0C 802B669C 46002102 */ mul.s $f4, $f4, $f0 -/* E29B10 802B66A0 00000000 */ nop +/* E29B10 802B66A0 00000000 */ nop /* E29B14 802B66A4 E4400000 */ swc1 $f0, ($v0) /* E29B18 802B66A8 C6600028 */ lwc1 $f0, 0x28($s3) /* E29B1C 802B66AC C6660030 */ lwc1 $f6, 0x30($s3) @@ -435,11 +435,11 @@ glabel func_802B60A4_E29514 /* E29B94 802B6724 0C038069 */ jal enable_player_input /* E29B98 802B6728 AE620000 */ sw $v0, ($s3) /* E29B9C 802B672C 0C038050 */ jal enable_player_static_collisions -/* E29BA0 802B6730 00000000 */ nop +/* E29BA0 802B6730 00000000 */ nop /* E29BA4 802B6734 0C039769 */ jal set_action_state /* E29BA8 802B6738 2404000A */ addiu $a0, $zero, 0xa /* E29BAC 802B673C 0C03BCCA */ jal enable_partner_ai -/* E29BB0 802B6740 00000000 */ nop +/* E29BB0 802B6740 00000000 */ nop /* E29BB4 802B6744 8E220000 */ lw $v0, ($s1) /* E29BB8 802B6748 2403FFBF */ addiu $v1, $zero, -0x41 /* E29BBC 802B674C 00431024 */ and $v0, $v0, $v1 @@ -457,13 +457,13 @@ glabel func_802B60A4_E29514 /* E29BE8 802B6778 00220821 */ addu $at, $at, $v0 /* E29BEC 802B677C 8C226EA8 */ lw $v0, %lo(D_802B6EA8)($at) /* E29BF0 802B6780 00400008 */ jr $v0 -/* E29BF4 802B6784 00000000 */ nop +/* E29BF4 802B6784 00000000 */ nop /* E29BF8 802B6788 3C04802B */ lui $a0, %hi(D_802B6ED0) /* E29BFC 802B678C 8C846ED0 */ lw $a0, %lo(D_802B6ED0)($a0) /* E29C00 802B6790 0480004D */ bltz $a0, .L802B68C8 -/* E29C04 802B6794 00000000 */ nop +/* E29C04 802B6794 00000000 */ nop /* E29C08 802B6798 0C04417A */ jal get_entity_by_index -/* E29C0C 802B679C 00000000 */ nop +/* E29C0C 802B679C 00000000 */ nop /* E29C10 802B67A0 0040902D */ daddu $s2, $v0, $zero /* E29C14 802B67A4 C44C0048 */ lwc1 $f12, 0x48($v0) /* E29C18 802B67A8 C64E0050 */ lwc1 $f14, 0x50($s2) @@ -482,12 +482,12 @@ glabel func_802B60A4_E29514 /* E29C4C 802B67DC 3C14802B */ lui $s4, %hi(D_802B6EEC) /* E29C50 802B67E0 26946EEC */ addiu $s4, $s4, %lo(D_802B6EEC) /* E29C54 802B67E4 4618003C */ c.lt.s $f0, $f24 -/* E29C58 802B67E8 00000000 */ nop +/* E29C58 802B67E8 00000000 */ nop /* E29C5C 802B67EC 45000005 */ bc1f .L802B6804 /* E29C60 802B67F0 E68C0000 */ swc1 $f12, ($s4) /* E29C64 802B67F4 3C013F80 */ lui $at, 0x3f80 /* E29C68 802B67F8 44810000 */ mtc1 $at, $f0 -/* E29C6C 802B67FC 00000000 */ nop +/* E29C6C 802B67FC 00000000 */ nop /* E29C70 802B6800 4600C601 */ sub.s $f24, $f24, $f0 .L802B6804: /* E29C74 802B6804 3C0140C9 */ lui $at, 0x40c9 @@ -495,7 +495,7 @@ glabel func_802B60A4_E29514 /* E29C7C 802B680C 4481A000 */ mtc1 $at, $f20 /* E29C80 802B6810 27B10010 */ addiu $s1, $sp, 0x10 /* E29C84 802B6814 46146302 */ mul.s $f12, $f12, $f20 -/* E29C88 802B6818 00000000 */ nop +/* E29C88 802B6818 00000000 */ nop /* E29C8C 802B681C 0220282D */ daddu $a1, $s1, $zero /* E29C90 802B6820 27B00014 */ addiu $s0, $sp, 0x14 /* E29C94 802B6824 3C0143B4 */ lui $at, 0x43b4 @@ -505,19 +505,19 @@ glabel func_802B60A4_E29514 /* E29CA4 802B6834 46166303 */ div.s $f12, $f12, $f22 /* E29CA8 802B6838 C7A20010 */ lwc1 $f2, 0x10($sp) /* E29CAC 802B683C 46181082 */ mul.s $f2, $f2, $f24 -/* E29CB0 802B6840 00000000 */ nop +/* E29CB0 802B6840 00000000 */ nop /* E29CB4 802B6844 C7A40014 */ lwc1 $f4, 0x14($sp) /* E29CB8 802B6848 46182102 */ mul.s $f4, $f4, $f24 -/* E29CBC 802B684C 00000000 */ nop +/* E29CBC 802B684C 00000000 */ nop /* E29CC0 802B6850 C68C0000 */ lwc1 $f12, ($s4) /* E29CC4 802B6854 3C0142B6 */ lui $at, 0x42b6 /* E29CC8 802B6858 44810000 */ mtc1 $at, $f0 -/* E29CCC 802B685C 00000000 */ nop +/* E29CCC 802B685C 00000000 */ nop /* E29CD0 802B6860 46006301 */ sub.s $f12, $f12, $f0 /* E29CD4 802B6864 C6400048 */ lwc1 $f0, 0x48($s2) /* E29CD8 802B6868 46020000 */ add.s $f0, $f0, $f2 /* E29CDC 802B686C 46146302 */ mul.s $f12, $f12, $f20 -/* E29CE0 802B6870 00000000 */ nop +/* E29CE0 802B6870 00000000 */ nop /* E29CE4 802B6874 E6600028 */ swc1 $f0, 0x28($s3) /* E29CE8 802B6878 C6400050 */ lwc1 $f0, 0x50($s2) /* E29CEC 802B687C 0220282D */ daddu $a1, $s1, $zero @@ -530,11 +530,11 @@ glabel func_802B60A4_E29514 /* E29D08 802B6898 3C01802B */ lui $at, %hi(D_802B6EDC) /* E29D0C 802B689C C4246EDC */ lwc1 $f4, %lo(D_802B6EDC)($at) /* E29D10 802B68A0 46041082 */ mul.s $f2, $f2, $f4 -/* E29D14 802B68A4 00000000 */ nop +/* E29D14 802B68A4 00000000 */ nop /* E29D18 802B68A8 C7A00014 */ lwc1 $f0, 0x14($sp) /* E29D1C 802B68AC 46000007 */ neg.s $f0, $f0 /* E29D20 802B68B0 46040002 */ mul.s $f0, $f0, $f4 -/* E29D24 802B68B4 00000000 */ nop +/* E29D24 802B68B4 00000000 */ nop /* E29D28 802B68B8 3C01802B */ lui $at, %hi(D_802B6ED4) /* E29D2C 802B68BC E4226ED4 */ swc1 $f2, %lo(D_802B6ED4)($at) /* E29D30 802B68C0 3C01802B */ lui $at, %hi(D_802B6ED8) @@ -545,25 +545,25 @@ glabel func_802B60A4_E29514 /* E29D40 802B68D0 C44C0000 */ lwc1 $f12, ($v0) /* E29D44 802B68D4 3C014100 */ lui $at, 0x4100 /* E29D48 802B68D8 44810000 */ mtc1 $at, $f0 -/* E29D4C 802B68DC 00000000 */ nop +/* E29D4C 802B68DC 00000000 */ nop /* E29D50 802B68E0 46006300 */ add.s $f12, $f12, $f0 /* E29D54 802B68E4 0C00A6C9 */ jal clamp_angle /* E29D58 802B68E8 E44C0000 */ swc1 $f12, ($v0) /* E29D5C 802B68EC 3C0140C9 */ lui $at, 0x40c9 /* E29D60 802B68F0 34210FD0 */ ori $at, $at, 0xfd0 /* E29D64 802B68F4 44811000 */ mtc1 $at, $f2 -/* E29D68 802B68F8 00000000 */ nop +/* E29D68 802B68F8 00000000 */ nop /* E29D6C 802B68FC 46020002 */ mul.s $f0, $f0, $f2 -/* E29D70 802B6900 00000000 */ nop +/* E29D70 802B6900 00000000 */ nop /* E29D74 802B6904 3C0143B4 */ lui $at, 0x43b4 /* E29D78 802B6908 44816000 */ mtc1 $at, $f12 /* E29D7C 802B690C 0C00A85B */ jal sin_rad /* E29D80 802B6910 460C0303 */ div.s $f12, $f0, $f12 /* E29D84 802B6914 3C014080 */ lui $at, 0x4080 /* E29D88 802B6918 44811000 */ mtc1 $at, $f2 -/* E29D8C 802B691C 00000000 */ nop +/* E29D8C 802B691C 00000000 */ nop /* E29D90 802B6920 46020002 */ mul.s $f0, $f0, $f2 -/* E29D94 802B6924 00000000 */ nop +/* E29D94 802B6924 00000000 */ nop /* E29D98 802B6928 3C01802B */ lui $at, %hi(D_802B6EF4) /* E29D9C 802B692C C4226EF4 */ lwc1 $f2, %lo(D_802B6EF4)($at) /* E29DA0 802B6930 46001080 */ add.s $f2, $f2, $f0 @@ -585,13 +585,13 @@ glabel func_802B60A4_E29514 /* E29DE0 802B6970 C4600000 */ lwc1 $f0, ($v1) /* E29DE4 802B6974 3C014000 */ lui $at, 0x4000 /* E29DE8 802B6978 44811000 */ mtc1 $at, $f2 -/* E29DEC 802B697C 00000000 */ nop +/* E29DEC 802B697C 00000000 */ nop /* E29DF0 802B6980 46020000 */ add.s $f0, $f0, $f2 /* E29DF4 802B6984 3C014234 */ lui $at, 0x4234 /* E29DF8 802B6988 44811000 */ mtc1 $at, $f2 /* E29DFC 802B698C A6620008 */ sh $v0, 8($s3) /* E29E00 802B6990 4600103E */ c.le.s $f2, $f0 -/* E29E04 802B6994 00000000 */ nop +/* E29E04 802B6994 00000000 */ nop /* E29E08 802B6998 45000002 */ bc1f .L802B69A4 /* E29E0C 802B699C E4600000 */ swc1 $f0, ($v1) /* E29E10 802B69A0 E4620000 */ swc1 $f2, ($v1) @@ -610,19 +610,19 @@ glabel func_802B60A4_E29514 /* E29E3C 802B69CC 0C03954C */ jal func_800E5530 /* E29E40 802B69D0 A26200B6 */ sb $v0, 0xb6($s3) /* E29E44 802B69D4 080ADB96 */ j .L802B6E58 -/* E29E48 802B69D8 00000000 */ nop +/* E29E48 802B69D8 00000000 */ nop /* E29E4C 802B69DC 3C02802B */ lui $v0, %hi(D_802B6EE4) /* E29E50 802B69E0 24426EE4 */ addiu $v0, $v0, %lo(D_802B6EE4) /* E29E54 802B69E4 C4400000 */ lwc1 $f0, ($v0) /* E29E58 802B69E8 3C014000 */ lui $at, 0x4000 /* E29E5C 802B69EC 4481B000 */ mtc1 $at, $f22 -/* E29E60 802B69F0 00000000 */ nop +/* E29E60 802B69F0 00000000 */ nop /* E29E64 802B69F4 46160000 */ add.s $f0, $f0, $f22 /* E29E68 802B69F8 3C014234 */ lui $at, 0x4234 /* E29E6C 802B69FC 4481A000 */ mtc1 $at, $f20 -/* E29E70 802B6A00 00000000 */ nop +/* E29E70 802B6A00 00000000 */ nop /* E29E74 802B6A04 4600A03E */ c.le.s $f20, $f0 -/* E29E78 802B6A08 00000000 */ nop +/* E29E78 802B6A08 00000000 */ nop /* E29E7C 802B6A0C 45000002 */ bc1f .L802B6A18 /* E29E80 802B6A10 E4400000 */ swc1 $f0, ($v0) /* E29E84 802B6A14 E4540000 */ swc1 $f20, ($v0) @@ -637,7 +637,7 @@ glabel func_802B60A4_E29514 /* E29EA4 802B6A34 46161080 */ add.s $f2, $f2, $f22 /* E29EA8 802B6A38 E66000A8 */ swc1 $f0, 0xa8($s3) /* E29EAC 802B6A3C 4602A03C */ c.lt.s $f20, $f2 -/* E29EB0 802B6A40 00000000 */ nop +/* E29EB0 802B6A40 00000000 */ nop /* E29EB4 802B6A44 45000002 */ bc1f .L802B6A50 /* E29EB8 802B6A48 E4420000 */ swc1 $f2, ($v0) /* E29EBC 802B6A4C E4540000 */ swc1 $f20, ($v0) @@ -646,9 +646,9 @@ glabel func_802B60A4_E29514 /* E29EC4 802B6A54 3C0140C9 */ lui $at, 0x40c9 /* E29EC8 802B6A58 34210FD0 */ ori $at, $at, 0xfd0 /* E29ECC 802B6A5C 4481A000 */ mtc1 $at, $f20 -/* E29ED0 802B6A60 00000000 */ nop +/* E29ED0 802B6A60 00000000 */ nop /* E29ED4 802B6A64 46146302 */ mul.s $f12, $f12, $f20 -/* E29ED8 802B6A68 00000000 */ nop +/* E29ED8 802B6A68 00000000 */ nop /* E29EDC 802B6A6C 3C0143B4 */ lui $at, 0x43b4 /* E29EE0 802B6A70 4481B000 */ mtc1 $at, $f22 /* E29EE4 802B6A74 0C00A85B */ jal sin_rad @@ -662,17 +662,17 @@ glabel func_802B60A4_E29514 /* E29F04 802B6A94 8E660028 */ lw $a2, 0x28($s3) /* E29F08 802B6A98 8E670030 */ lw $a3, 0x30($s3) /* E29F0C 802B6A9C 46020182 */ mul.s $f6, $f0, $f2 -/* E29F10 802B6AA0 00000000 */ nop +/* E29F10 802B6AA0 00000000 */ nop /* E29F14 802B6AA4 86020000 */ lh $v0, ($s0) /* E29F18 802B6AA8 86230000 */ lh $v1, ($s1) /* E29F1C 802B6AAC C660002C */ lwc1 $f0, 0x2c($s3) /* E29F20 802B6AB0 44826000 */ mtc1 $v0, $f12 -/* E29F24 802B6AB4 00000000 */ nop +/* E29F24 802B6AB4 00000000 */ nop /* E29F28 802B6AB8 46806320 */ cvt.s.w $f12, $f12 /* E29F2C 802B6ABC 46060000 */ add.s $f0, $f0, $f6 /* E29F30 802B6AC0 C6620028 */ lwc1 $f2, 0x28($s3) /* E29F34 802B6AC4 44837000 */ mtc1 $v1, $f14 -/* E29F38 802B6AC8 00000000 */ nop +/* E29F38 802B6AC8 00000000 */ nop /* E29F3C 802B6ACC 468073A0 */ cvt.s.w $f14, $f14 /* E29F40 802B6AD0 E660002C */ swc1 $f0, 0x2c($s3) /* E29F44 802B6AD4 46000106 */ mov.s $f4, $f0 @@ -687,30 +687,30 @@ glabel func_802B60A4_E29514 /* E29F68 802B6AF8 44811000 */ mtc1 $at, $f2 /* E29F6C 802B6AFC 46000605 */ abs.s $f24, $f0 /* E29F70 802B6B00 4618103C */ c.lt.s $f2, $f24 -/* E29F74 802B6B04 00000000 */ nop +/* E29F74 802B6B04 00000000 */ nop /* E29F78 802B6B08 45000040 */ bc1f .L802B6C0C -/* E29F7C 802B6B0C 00000000 */ nop +/* E29F7C 802B6B0C 00000000 */ nop /* E29F80 802B6B10 3C02802C */ lui $v0, %hi(D_802BCE30) /* E29F84 802B6B14 8442CE30 */ lh $v0, %lo(D_802BCE30)($v0) /* E29F88 802B6B18 C662002C */ lwc1 $f2, 0x2c($s3) /* E29F8C 802B6B1C 2442001E */ addiu $v0, $v0, 0x1e /* E29F90 802B6B20 44820000 */ mtc1 $v0, $f0 -/* E29F94 802B6B24 00000000 */ nop +/* E29F94 802B6B24 00000000 */ nop /* E29F98 802B6B28 46800020 */ cvt.s.w $f0, $f0 /* E29F9C 802B6B2C 4602003C */ c.lt.s $f0, $f2 -/* E29FA0 802B6B30 00000000 */ nop +/* E29FA0 802B6B30 00000000 */ nop /* E29FA4 802B6B34 450000C8 */ bc1f .L802B6E58 -/* E29FA8 802B6B38 00000000 */ nop +/* E29FA8 802B6B38 00000000 */ nop /* E29FAC 802B6B3C C66C0028 */ lwc1 $f12, 0x28($s3) /* E29FB0 802B6B40 86020000 */ lh $v0, ($s0) /* E29FB4 802B6B44 C66E0030 */ lwc1 $f14, 0x30($s3) /* E29FB8 802B6B48 86230000 */ lh $v1, ($s1) /* E29FBC 802B6B4C 44825000 */ mtc1 $v0, $f10 -/* E29FC0 802B6B50 00000000 */ nop +/* E29FC0 802B6B50 00000000 */ nop /* E29FC4 802B6B54 468052A0 */ cvt.s.w $f10, $f10 /* E29FC8 802B6B58 44065000 */ mfc1 $a2, $f10 /* E29FCC 802B6B5C 44835000 */ mtc1 $v1, $f10 -/* E29FD0 802B6B60 00000000 */ nop +/* E29FD0 802B6B60 00000000 */ nop /* E29FD4 802B6B64 468052A0 */ cvt.s.w $f10, $f10 /* E29FD8 802B6B68 926200B6 */ lbu $v0, 0xb6($s3) /* E29FDC 802B6B6C 44075000 */ mfc1 $a3, $f10 @@ -718,7 +718,7 @@ glabel func_802B60A4_E29514 /* E29FE4 802B6B74 0C00A720 */ jal atan2 /* E29FE8 802B6B78 A26200B6 */ sb $v0, 0xb6($s3) /* E29FEC 802B6B7C 46140302 */ mul.s $f12, $f0, $f20 -/* E29FF0 802B6B80 00000000 */ nop +/* E29FF0 802B6B80 00000000 */ nop /* E29FF4 802B6B84 27A50010 */ addiu $a1, $sp, 0x10 /* E29FF8 802B6B88 27A60014 */ addiu $a2, $sp, 0x14 /* E29FFC 802B6B8C E7A00018 */ swc1 $f0, 0x18($sp) @@ -726,20 +726,20 @@ glabel func_802B60A4_E29514 /* E2A004 802B6B94 46166303 */ div.s $f12, $f12, $f22 /* E2A008 802B6B98 C7A20010 */ lwc1 $f2, 0x10($sp) /* E2A00C 802B6B9C 46181082 */ mul.s $f2, $f2, $f24 -/* E2A010 802B6BA0 00000000 */ nop +/* E2A010 802B6BA0 00000000 */ nop /* E2A014 802B6BA4 3C013F90 */ lui $at, 0x3f90 /* E2A018 802B6BA8 44812800 */ mtc1 $at, $f5 /* E2A01C 802B6BAC 44802000 */ mtc1 $zero, $f4 /* E2A020 802B6BB0 460010A1 */ cvt.d.s $f2, $f2 /* E2A024 802B6BB4 46241082 */ mul.d $f2, $f2, $f4 -/* E2A028 802B6BB8 00000000 */ nop +/* E2A028 802B6BB8 00000000 */ nop /* E2A02C 802B6BBC C7A00014 */ lwc1 $f0, 0x14($sp) /* E2A030 802B6BC0 46000007 */ neg.s $f0, $f0 /* E2A034 802B6BC4 46180002 */ mul.s $f0, $f0, $f24 -/* E2A038 802B6BC8 00000000 */ nop +/* E2A038 802B6BC8 00000000 */ nop /* E2A03C 802B6BCC 46000021 */ cvt.d.s $f0, $f0 /* E2A040 802B6BD0 46240002 */ mul.d $f0, $f0, $f4 -/* E2A044 802B6BD4 00000000 */ nop +/* E2A044 802B6BD4 00000000 */ nop /* E2A048 802B6BD8 C7A40018 */ lwc1 $f4, 0x18($sp) /* E2A04C 802B6BDC 24020040 */ addiu $v0, $zero, 0x40 /* E2A050 802B6BE0 A6620008 */ sh $v0, 8($s3) @@ -752,7 +752,7 @@ glabel func_802B60A4_E29514 /* E2A06C 802B6BFC 3C01802B */ lui $at, %hi(D_802B6ED8) /* E2A070 802B6C00 E4206ED8 */ swc1 $f0, %lo(D_802B6ED8)($at) /* E2A074 802B6C04 080ADB96 */ j .L802B6E58 -/* E2A078 802B6C08 00000000 */ nop +/* E2A078 802B6C08 00000000 */ nop .L802B6C0C: /* E2A07C 802B6C0C 86620008 */ lh $v0, 8($s3) /* E2A080 802B6C10 96630008 */ lhu $v1, 8($s3) @@ -783,7 +783,7 @@ glabel func_802B60A4_E29514 /* E2A0E4 802B6C74 2482FFFF */ addiu $v0, $a0, -1 /* E2A0E8 802B6C78 A6620008 */ sh $v0, 8($s3) /* E2A0EC 802B6C7C 4602203C */ c.lt.s $f4, $f2 -/* E2A0F0 802B6C80 00000000 */ nop +/* E2A0F0 802B6C80 00000000 */ nop /* E2A0F4 802B6C84 45000002 */ bc1f .L802B6C90 /* E2A0F8 802B6C88 E4600000 */ swc1 $f0, ($v1) /* E2A0FC 802B6C8C E4620000 */ swc1 $f2, ($v1) @@ -792,9 +792,9 @@ glabel func_802B60A4_E29514 /* E2A104 802B6C94 3C0140C9 */ lui $at, 0x40c9 /* E2A108 802B6C98 34210FD0 */ ori $at, $at, 0xfd0 /* E2A10C 802B6C9C 44810000 */ mtc1 $at, $f0 -/* E2A110 802B6CA0 00000000 */ nop +/* E2A110 802B6CA0 00000000 */ nop /* E2A114 802B6CA4 46006302 */ mul.s $f12, $f12, $f0 -/* E2A118 802B6CA8 00000000 */ nop +/* E2A118 802B6CA8 00000000 */ nop /* E2A11C 802B6CAC 3C0143B4 */ lui $at, 0x43b4 /* E2A120 802B6CB0 44810000 */ mtc1 $at, $f0 /* E2A124 802B6CB4 0C00A85B */ jal sin_rad @@ -832,13 +832,13 @@ glabel func_802B60A4_E29514 /* E2A19C 802B6D2C C4400000 */ lwc1 $f0, ($v0) /* E2A1A0 802B6D30 3C013F80 */ lui $at, 0x3f80 /* E2A1A4 802B6D34 44811000 */ mtc1 $at, $f2 -/* E2A1A8 802B6D38 00000000 */ nop +/* E2A1A8 802B6D38 00000000 */ nop /* E2A1AC 802B6D3C 46020000 */ add.s $f0, $f0, $f2 /* E2A1B0 802B6D40 3C014234 */ lui $at, 0x4234 /* E2A1B4 802B6D44 4481A000 */ mtc1 $at, $f20 -/* E2A1B8 802B6D48 00000000 */ nop +/* E2A1B8 802B6D48 00000000 */ nop /* E2A1BC 802B6D4C 4600A03E */ c.le.s $f20, $f0 -/* E2A1C0 802B6D50 00000000 */ nop +/* E2A1C0 802B6D50 00000000 */ nop /* E2A1C4 802B6D54 45000002 */ bc1f .L802B6D60 /* E2A1C8 802B6D58 E4400000 */ swc1 $f0, ($v0) /* E2A1CC 802B6D5C E4540000 */ swc1 $f20, ($v0) @@ -852,11 +852,11 @@ glabel func_802B60A4_E29514 /* E2A1E8 802B6D78 C4420000 */ lwc1 $f2, ($v0) /* E2A1EC 802B6D7C 3C014000 */ lui $at, 0x4000 /* E2A1F0 802B6D80 44812000 */ mtc1 $at, $f4 -/* E2A1F4 802B6D84 00000000 */ nop +/* E2A1F4 802B6D84 00000000 */ nop /* E2A1F8 802B6D88 46041080 */ add.s $f2, $f2, $f4 /* E2A1FC 802B6D8C E66000A8 */ swc1 $f0, 0xa8($s3) /* E2A200 802B6D90 4602A03C */ c.lt.s $f20, $f2 -/* E2A204 802B6D94 00000000 */ nop +/* E2A204 802B6D94 00000000 */ nop /* E2A208 802B6D98 45000002 */ bc1f .L802B6DA4 /* E2A20C 802B6D9C E4420000 */ swc1 $f2, ($v0) /* E2A210 802B6DA0 E4540000 */ swc1 $f20, ($v0) @@ -865,18 +865,18 @@ glabel func_802B60A4_E29514 /* E2A218 802B6DA8 3C0140C9 */ lui $at, 0x40c9 /* E2A21C 802B6DAC 34210FD0 */ ori $at, $at, 0xfd0 /* E2A220 802B6DB0 44810000 */ mtc1 $at, $f0 -/* E2A224 802B6DB4 00000000 */ nop +/* E2A224 802B6DB4 00000000 */ nop /* E2A228 802B6DB8 46006302 */ mul.s $f12, $f12, $f0 -/* E2A22C 802B6DBC 00000000 */ nop +/* E2A22C 802B6DBC 00000000 */ nop /* E2A230 802B6DC0 3C0143B4 */ lui $at, 0x43b4 /* E2A234 802B6DC4 44810000 */ mtc1 $at, $f0 /* E2A238 802B6DC8 0C00A85B */ jal sin_rad /* E2A23C 802B6DCC 46006303 */ div.s $f12, $f12, $f0 /* E2A240 802B6DD0 3C014040 */ lui $at, 0x4040 /* E2A244 802B6DD4 44811000 */ mtc1 $at, $f2 -/* E2A248 802B6DD8 00000000 */ nop +/* E2A248 802B6DD8 00000000 */ nop /* E2A24C 802B6DDC 46020182 */ mul.s $f6, $f0, $f2 -/* E2A250 802B6DE0 00000000 */ nop +/* E2A250 802B6DE0 00000000 */ nop /* E2A254 802B6DE4 C660002C */ lwc1 $f0, 0x2c($s3) /* E2A258 802B6DE8 86620008 */ lh $v0, 8($s3) /* E2A25C 802B6DEC 46060000 */ add.s $f0, $f0, $f6 @@ -889,9 +889,9 @@ glabel func_802B60A4_E29514 /* E2A274 802B6E04 A6620008 */ sh $v0, 8($s3) .L802B6E08: /* E2A278 802B6E08 0C038050 */ jal enable_player_static_collisions -/* E2A27C 802B6E0C 00000000 */ nop +/* E2A27C 802B6E0C 00000000 */ nop /* E2A280 802B6E10 0C038069 */ jal enable_player_input -/* E2A284 802B6E14 00000000 */ nop +/* E2A284 802B6E14 00000000 */ nop /* E2A288 802B6E18 3C03FFEF */ lui $v1, 0xffef /* E2A28C 802B6E1C 8E620000 */ lw $v0, ($s3) /* E2A290 802B6E20 3463FFFF */ ori $v1, $v1, 0xffff @@ -901,7 +901,7 @@ glabel func_802B60A4_E29514 /* E2A2A0 802B6E30 0C0397F4 */ jal start_falling /* E2A2A4 802B6E34 AE620000 */ sw $v0, ($s3) /* E2A2A8 802B6E38 0C03BCCA */ jal enable_partner_ai -/* E2A2AC 802B6E3C 00000000 */ nop +/* E2A2AC 802B6E3C 00000000 */ nop /* E2A2B0 802B6E40 3C04800A */ lui $a0, %hi(D_8009A650) /* E2A2B4 802B6E44 2484A650 */ addiu $a0, $a0, %lo(D_8009A650) /* E2A2B8 802B6E48 8C820000 */ lw $v0, ($a0) @@ -922,4 +922,4 @@ glabel func_802B60A4_E29514 /* E2A2F0 802B6E80 D7B40040 */ ldc1 $f20, 0x40($sp) /* E2A2F4 802B6E84 03E00008 */ jr $ra /* E2A2F8 802B6E88 27BD0068 */ addiu $sp, $sp, 0x68 -/* E2A2FC 802B6E8C 00000000 */ nop +/* E2A2FC 802B6E8C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s b/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s index 29e12bc3ef..f43423a0ba 100644 --- a/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s +++ b/asm/nonmatchings/code_E2A340/func_802B6000_E2A340.s @@ -20,7 +20,7 @@ glabel func_802B6000_E2A340 /* E2A37C 802B603C 0C038045 */ jal disable_player_static_collisions /* E2A380 802B6040 AE220000 */ sw $v0, ($s1) /* E2A384 802B6044 0C03805E */ jal disable_player_input -/* E2A388 802B6048 00000000 */ nop +/* E2A388 802B6048 00000000 */ nop /* E2A38C 802B604C 3C030010 */ lui $v1, 0x10 /* E2A390 802B6050 34630008 */ ori $v1, $v1, 8 /* E2A394 802B6054 3C040008 */ lui $a0, 8 @@ -66,9 +66,9 @@ glabel func_802B6000_E2A340 /* E2A430 802B60F0 10600005 */ beqz $v1, .L802B6108 /* E2A434 802B60F4 24020001 */ addiu $v0, $zero, 1 /* E2A438 802B60F8 1062007A */ beq $v1, $v0, .L802B62E4 -/* E2A43C 802B60FC 00000000 */ nop +/* E2A43C 802B60FC 00000000 */ nop /* E2A440 802B6100 080AD8CB */ j .L802B632C -/* E2A444 802B6104 00000000 */ nop +/* E2A444 802B6104 00000000 */ nop .L802B6108: /* E2A448 802B6108 3C10802B */ lui $s0, %hi(func_802B6350_E28D80) /* E2A44C 802B610C 26106350 */ addiu $s0, $s0, %lo(func_802B6350_E28D80) @@ -78,7 +78,7 @@ glabel func_802B6000_E2A340 /* E2A45C 802B611C 44810000 */ mtc1 $at, $f0 /* E2A460 802B6120 C44C0010 */ lwc1 $f12, 0x10($v0) /* E2A464 802B6124 46006302 */ mul.s $f12, $f12, $f0 -/* E2A468 802B6128 00000000 */ nop +/* E2A468 802B6128 00000000 */ nop /* E2A46C 802B612C 27A50010 */ addiu $a1, $sp, 0x10 /* E2A470 802B6130 3C0143B4 */ lui $at, 0x43b4 /* E2A474 802B6134 44810000 */ mtc1 $at, $f0 @@ -89,14 +89,14 @@ glabel func_802B6000_E2A340 /* E2A488 802B6148 C7A20010 */ lwc1 $f2, 0x10($sp) /* E2A48C 802B614C C440000C */ lwc1 $f0, 0xc($v0) /* E2A490 802B6150 46001082 */ mul.s $f2, $f2, $f0 -/* E2A494 802B6154 00000000 */ nop +/* E2A494 802B6154 00000000 */ nop /* E2A498 802B6158 C6400048 */ lwc1 $f0, 0x48($s2) /* E2A49C 802B615C 46020000 */ add.s $f0, $f0, $f2 /* E2A4A0 802B6160 E6200028 */ swc1 $f0, 0x28($s1) /* E2A4A4 802B6164 C7A20014 */ lwc1 $f2, 0x14($sp) /* E2A4A8 802B6168 C440000C */ lwc1 $f0, 0xc($v0) /* E2A4AC 802B616C 46001082 */ mul.s $f2, $f2, $f0 -/* E2A4B0 802B6170 00000000 */ nop +/* E2A4B0 802B6170 00000000 */ nop /* E2A4B4 802B6174 C6400050 */ lwc1 $f0, 0x50($s2) /* E2A4B8 802B6178 46020001 */ sub.s $f0, $f0, $f2 /* E2A4BC 802B617C E6200030 */ swc1 $f0, 0x30($s1) @@ -109,7 +109,7 @@ glabel func_802B6000_E2A340 /* E2A4D8 802B6198 44811000 */ mtc1 $at, $f2 /* E2A4DC 802B619C C604000C */ lwc1 $f4, 0xc($s0) /* E2A4E0 802B61A0 4604103C */ c.lt.s $f2, $f4 -/* E2A4E4 802B61A4 00000000 */ nop +/* E2A4E4 802B61A4 00000000 */ nop /* E2A4E8 802B61A8 45000005 */ bc1f .L802B61C0 /* E2A4EC 802B61AC E6000010 */ swc1 $f0, 0x10($s0) /* E2A4F0 802B61B0 3C013F80 */ lui $at, 0x3f80 @@ -119,14 +119,14 @@ glabel func_802B6000_E2A340 .L802B61C0: /* E2A500 802B61C0 3C014198 */ lui $at, 0x4198 /* E2A504 802B61C4 44810000 */ mtc1 $at, $f0 -/* E2A508 802B61C8 00000000 */ nop +/* E2A508 802B61C8 00000000 */ nop /* E2A50C 802B61CC 4600203C */ c.lt.s $f4, $f0 -/* E2A510 802B61D0 00000000 */ nop +/* E2A510 802B61D0 00000000 */ nop /* E2A514 802B61D4 45000006 */ bc1f .L802B61F0 -/* E2A518 802B61D8 00000000 */ nop +/* E2A518 802B61D8 00000000 */ nop /* E2A51C 802B61DC 3C013F80 */ lui $at, 0x3f80 /* E2A520 802B61E0 44810000 */ mtc1 $at, $f0 -/* E2A524 802B61E4 00000000 */ nop +/* E2A524 802B61E4 00000000 */ nop /* E2A528 802B61E8 46002000 */ add.s $f0, $f4, $f0 .L802B61EC: /* E2A52C 802B61EC E600000C */ swc1 $f0, 0xc($s0) @@ -139,7 +139,7 @@ glabel func_802B6000_E2A340 /* E2A544 802B6204 44810000 */ mtc1 $at, $f0 /* E2A548 802B6208 C44C0018 */ lwc1 $f12, 0x18($v0) /* E2A54C 802B620C 46006302 */ mul.s $f12, $f12, $f0 -/* E2A550 802B6210 00000000 */ nop +/* E2A550 802B6210 00000000 */ nop /* E2A554 802B6214 3C0143B4 */ lui $at, 0x43b4 /* E2A558 802B6218 4481A000 */ mtc1 $at, $f20 /* E2A55C 802B621C 0C00A85B */ jal sin_rad @@ -151,11 +151,11 @@ glabel func_802B6000_E2A340 /* E2A574 802B6234 46041080 */ add.s $f2, $f2, $f4 /* E2A578 802B6238 3C014316 */ lui $at, 0x4316 /* E2A57C 802B623C 44813000 */ mtc1 $at, $f6 -/* E2A580 802B6240 00000000 */ nop +/* E2A580 802B6240 00000000 */ nop /* E2A584 802B6244 4602303C */ c.lt.s $f6, $f2 /* E2A588 802B6248 E4420018 */ swc1 $f2, 0x18($v0) /* E2A58C 802B624C 46040082 */ mul.s $f2, $f0, $f4 -/* E2A590 802B6250 00000000 */ nop +/* E2A590 802B6250 00000000 */ nop /* E2A594 802B6254 45030001 */ bc1tl .L802B625C /* E2A598 802B6258 E4460018 */ swc1 $f6, 0x18($v0) .L802B625C: @@ -177,7 +177,7 @@ glabel func_802B6000_E2A340 /* E2A5D8 802B6298 44811000 */ mtc1 $at, $f2 /* E2A5DC 802B629C 46200020 */ cvt.s.d $f0, $f0 /* E2A5E0 802B62A0 4600103C */ c.lt.s $f2, $f0 -/* E2A5E4 802B62A4 00000000 */ nop +/* E2A5E4 802B62A4 00000000 */ nop /* E2A5E8 802B62A8 45000002 */ bc1f .L802B62B4 /* E2A5EC 802B62AC E4400014 */ swc1 $f0, 0x14($v0) /* E2A5F0 802B62B0 E4420014 */ swc1 $f2, 0x14($v0) @@ -193,19 +193,19 @@ glabel func_802B6000_E2A340 /* E2A614 802B62D4 0C04419E */ jal func_80110678 /* E2A618 802B62D8 A22200B6 */ sb $v0, 0xb6($s1) /* E2A61C 802B62DC 080AD8CB */ j .L802B632C -/* E2A620 802B62E0 00000000 */ nop +/* E2A620 802B62E0 00000000 */ nop .L802B62E4: /* E2A624 802B62E4 0C038039 */ jal disable_player_shadow -/* E2A628 802B62E8 00000000 */ nop +/* E2A628 802B62E8 00000000 */ nop /* E2A62C 802B62EC 3C048011 */ lui $a0, %hi(D_8010C930) /* E2A630 802B62F0 8C84C930 */ lw $a0, %lo(D_8010C930)($a0) /* E2A634 802B62F4 0C00EAFF */ jal disable_npc_shadow -/* E2A638 802B62F8 00000000 */ nop +/* E2A638 802B62F8 00000000 */ nop /* E2A63C 802B62FC 24020032 */ addiu $v0, $zero, 0x32 /* E2A640 802B6300 0C038050 */ jal enable_player_static_collisions /* E2A644 802B6304 A6220010 */ sh $v0, 0x10($s1) /* E2A648 802B6308 0C038069 */ jal enable_player_input -/* E2A64C 802B630C 00000000 */ nop +/* E2A64C 802B630C 00000000 */ nop /* E2A650 802B6310 3C03FFEF */ lui $v1, 0xffef /* E2A654 802B6314 3463FFF7 */ ori $v1, $v1, 0xfff7 /* E2A658 802B6318 8E220000 */ lw $v0, ($s1) @@ -221,5 +221,5 @@ glabel func_802B6000_E2A340 /* E2A67C 802B633C D7B40028 */ ldc1 $f20, 0x28($sp) /* E2A680 802B6340 03E00008 */ jr $ra /* E2A684 802B6344 27BD0030 */ addiu $sp, $sp, 0x30 -/* E2A688 802B6348 00000000 */ nop -/* E2A68C 802B634C 00000000 */ nop +/* E2A688 802B6348 00000000 */ nop +/* E2A68C 802B634C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s b/asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s index ef1dc5c195..cb3f84f704 100644 --- a/asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s +++ b/asm/nonmatchings/code_E2B530/func_802BB044_E2B774.s @@ -19,12 +19,12 @@ glabel func_802BB044_E2B774 /* E2B7AC 802BB07C 46020001 */ sub.s $f0, $f0, $f2 /* E2B7B0 802BB080 8E300040 */ lw $s0, 0x40($s1) /* E2B7B4 802BB084 44821000 */ mtc1 $v0, $f2 -/* E2B7B8 802BB088 00000000 */ nop +/* E2B7B8 802BB088 00000000 */ nop /* E2B7BC 802BB08C 468010A1 */ cvt.d.w $f2, $f2 /* E2B7C0 802BB090 46000021 */ cvt.d.s $f0, $f0 /* E2B7C4 802BB094 46200005 */ abs.d $f0, $f0 /* E2B7C8 802BB098 4620103C */ c.lt.d $f2, $f0 -/* E2B7CC 802BB09C 00000000 */ nop +/* E2B7CC 802BB09C 00000000 */ nop /* E2B7D0 802BB0A0 45000004 */ bc1f .L802BB0B4 /* E2B7D4 802BB0A4 2403FFDF */ addiu $v1, $zero, -0x21 /* E2B7D8 802BB0A8 8E220000 */ lw $v0, ($s1) @@ -41,9 +41,9 @@ glabel func_802BB044_E2B774 /* E2B7FC 802BB0CC AE000000 */ sw $zero, ($s0) /* E2B800 802BB0D0 C6020000 */ lwc1 $f2, ($s0) /* E2B804 802BB0D4 44800000 */ mtc1 $zero, $f0 -/* E2B808 802BB0D8 00000000 */ nop +/* E2B808 802BB0D8 00000000 */ nop /* E2B80C 802BB0DC 46001032 */ c.eq.s $f2, $f0 -/* E2B810 802BB0E0 00000000 */ nop +/* E2B810 802BB0E0 00000000 */ nop /* E2B814 802BB0E4 45000003 */ bc1f .L802BB0F4 /* E2B818 802BB0E8 3C040001 */ lui $a0, 1 /* E2B81C 802BB0EC 0C037FBF */ jal func_800DFEFC @@ -61,25 +61,25 @@ glabel func_802BB044_E2B774 /* E2B848 802BB118 46200020 */ cvt.s.d $f0, $f0 /* E2B84C 802BB11C 460000A1 */ cvt.d.s $f2, $f0 /* E2B850 802BB120 4622203E */ c.le.d $f4, $f2 -/* E2B854 802BB124 00000000 */ nop +/* E2B854 802BB124 00000000 */ nop /* E2B858 802BB128 45000005 */ bc1f .L802BB140 /* E2B85C 802BB12C E6000000 */ swc1 $f0, ($s0) /* E2B860 802BB130 3C014020 */ lui $at, 0x4020 /* E2B864 802BB134 44810000 */ mtc1 $at, $f0 -/* E2B868 802BB138 00000000 */ nop +/* E2B868 802BB138 00000000 */ nop /* E2B86C 802BB13C E6000000 */ swc1 $f0, ($s0) .L802BB140: /* E2B870 802BB140 C62C0064 */ lwc1 $f12, 0x64($s1) /* E2B874 802BB144 3C014334 */ lui $at, 0x4334 /* E2B878 802BB148 4481A000 */ mtc1 $at, $f20 -/* E2B87C 802BB14C 00000000 */ nop +/* E2B87C 802BB14C 00000000 */ nop /* E2B880 802BB150 460CA301 */ sub.s $f12, $f20, $f12 /* E2B884 802BB154 3C0140C9 */ lui $at, 0x40c9 /* E2B888 802BB158 34210FD0 */ ori $at, $at, 0xfd0 /* E2B88C 802BB15C 4481B000 */ mtc1 $at, $f22 -/* E2B890 802BB160 00000000 */ nop +/* E2B890 802BB160 00000000 */ nop /* E2B894 802BB164 46166302 */ mul.s $f12, $f12, $f22 -/* E2B898 802BB168 00000000 */ nop +/* E2B898 802BB168 00000000 */ nop /* E2B89C 802BB16C 3C0143B4 */ lui $at, 0x43b4 /* E2B8A0 802BB170 4481C000 */ mtc1 $at, $f24 /* E2B8A4 802BB174 0C00A85B */ jal sin_rad @@ -87,15 +87,15 @@ glabel func_802BB044_E2B774 /* E2B8AC 802BB17C C6220064 */ lwc1 $f2, 0x64($s1) /* E2B8B0 802BB180 4602A501 */ sub.s $f20, $f20, $f2 /* E2B8B4 802BB184 4616A502 */ mul.s $f20, $f20, $f22 -/* E2B8B8 802BB188 00000000 */ nop +/* E2B8B8 802BB188 00000000 */ nop /* E2B8BC 802BB18C C6160000 */ lwc1 $f22, ($s0) /* E2B8C0 802BB190 4600B582 */ mul.s $f22, $f22, $f0 -/* E2B8C4 802BB194 00000000 */ nop +/* E2B8C4 802BB194 00000000 */ nop /* E2B8C8 802BB198 0C00A874 */ jal cos_rad /* E2B8CC 802BB19C 4618A303 */ div.s $f12, $f20, $f24 /* E2B8D0 802BB1A0 C6040000 */ lwc1 $f4, ($s0) /* E2B8D4 802BB1A4 46002102 */ mul.s $f4, $f4, $f0 -/* E2B8D8 802BB1A8 00000000 */ nop +/* E2B8D8 802BB1A8 00000000 */ nop /* E2B8DC 802BB1AC C6420028 */ lwc1 $f2, 0x28($s2) /* E2B8E0 802BB1B0 46161080 */ add.s $f2, $f2, $f22 /* E2B8E4 802BB1B4 C6400030 */ lwc1 $f0, 0x30($s2) diff --git a/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s b/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s index 5e238bb4da..0ae5eeaf23 100644 --- a/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s +++ b/asm/nonmatchings/code_E2B530/func_802BB1E8_E2B918.s @@ -16,7 +16,7 @@ glabel func_802BB1E8_E2B918 /* E2B944 802BB214 00220821 */ addu $at, $at, $v0 /* E2B948 802BB218 8C22CF50 */ lw $v0, %lo(D_802BCF50)($at) /* E2B94C 802BB21C 00400008 */ jr $v0 -/* E2B950 802BB220 00000000 */ nop +/* E2B950 802BB220 00000000 */ nop /* E2B954 802BB224 0C0AEC11 */ jal func_802BB044_E2B774 /* E2B958 802BB228 0220202D */ daddu $a0, $s1, $zero /* E2B95C 802BB22C 8E220000 */ lw $v0, ($s1) @@ -30,13 +30,13 @@ glabel func_802BB1E8_E2B918 /* E2B97C 802BB24C C6000004 */ lwc1 $f0, 4($s0) /* E2B980 802BB250 3C0140A0 */ lui $at, 0x40a0 /* E2B984 802BB254 44811000 */ mtc1 $at, $f2 -/* E2B988 802BB258 00000000 */ nop +/* E2B988 802BB258 00000000 */ nop /* E2B98C 802BB25C 46020000 */ add.s $f0, $f0, $f2 /* E2B990 802BB260 3C0141A0 */ lui $at, 0x41a0 /* E2B994 802BB264 44811000 */ mtc1 $at, $f2 -/* E2B998 802BB268 00000000 */ nop +/* E2B998 802BB268 00000000 */ nop /* E2B99C 802BB26C 4600103E */ c.le.s $f2, $f0 -/* E2B9A0 802BB270 00000000 */ nop +/* E2B9A0 802BB270 00000000 */ nop /* E2B9A4 802BB274 450000D7 */ bc1f .L802BB5D4 /* E2B9A8 802BB278 E6000004 */ swc1 $f0, 4($s0) /* E2B9AC 802BB27C 92020012 */ lbu $v0, 0x12($s0) @@ -81,7 +81,7 @@ glabel func_802BB1E8_E2B918 /* E2BA48 802BB318 46001080 */ add.s $f2, $f2, $f0 /* E2BA4C 802BB31C C620006C */ lwc1 $f0, 0x6c($s1) /* E2BA50 802BB320 4600103E */ c.le.s $f2, $f0 -/* E2BA54 802BB324 00000000 */ nop +/* E2BA54 802BB324 00000000 */ nop /* E2BA58 802BB328 450000AA */ bc1f .L802BB5D4 /* E2BA5C 802BB32C E622004C */ swc1 $f2, 0x4c($s1) /* E2BA60 802BB330 E620004C */ swc1 $f0, 0x4c($s1) @@ -132,7 +132,7 @@ glabel func_802BB1E8_E2B918 /* E2BB14 802BB3E4 46001080 */ add.s $f2, $f2, $f0 /* E2BB18 802BB3E8 C620006C */ lwc1 $f0, 0x6c($s1) /* E2BB1C 802BB3EC 4600103E */ c.le.s $f2, $f0 -/* E2BB20 802BB3F0 00000000 */ nop +/* E2BB20 802BB3F0 00000000 */ nop /* E2BB24 802BB3F4 45000077 */ bc1f .L802BB5D4 /* E2BB28 802BB3F8 E622004C */ swc1 $f2, 0x4c($s1) /* E2BB2C 802BB3FC 2404026A */ addiu $a0, $zero, 0x26a @@ -151,13 +151,13 @@ glabel func_802BB1E8_E2B918 /* E2BB60 802BB430 0C05272D */ jal play_sound /* E2BB64 802BB434 A2030012 */ sb $v1, 0x12($s0) /* E2BB68 802BB438 080AED75 */ j .L802BB5D4 -/* E2BB6C 802BB43C 00000000 */ nop +/* E2BB6C 802BB43C 00000000 */ nop /* E2BB70 802BB440 92020011 */ lbu $v0, 0x11($s0) /* E2BB74 802BB444 2442FFFF */ addiu $v0, $v0, -1 /* E2BB78 802BB448 A2020011 */ sb $v0, 0x11($s0) /* E2BB7C 802BB44C 00021600 */ sll $v0, $v0, 0x18 /* E2BB80 802BB450 1C400060 */ bgtz $v0, .L802BB5D4 -/* E2BB84 802BB454 00000000 */ nop +/* E2BB84 802BB454 00000000 */ nop /* E2BB88 802BB458 92020012 */ lbu $v0, 0x12($s0) /* E2BB8C 802BB45C 24420001 */ addiu $v0, $v0, 1 /* E2BB90 802BB460 080AED75 */ j .L802BB5D4 @@ -166,9 +166,9 @@ glabel func_802BB1E8_E2B918 /* E2BB9C 802BB46C 46000000 */ add.s $f0, $f0, $f0 /* E2BBA0 802BB470 3C0141F0 */ lui $at, 0x41f0 /* E2BBA4 802BB474 44811000 */ mtc1 $at, $f2 -/* E2BBA8 802BB478 00000000 */ nop +/* E2BBA8 802BB478 00000000 */ nop /* E2BBAC 802BB47C 4600103C */ c.lt.s $f2, $f0 -/* E2BBB0 802BB480 00000000 */ nop +/* E2BBB0 802BB480 00000000 */ nop /* E2BBB4 802BB484 45000002 */ bc1f .L802BB490 /* E2BBB8 802BB488 E600000C */ swc1 $f0, 0xc($s0) /* E2BBBC 802BB48C E602000C */ swc1 $f2, 0xc($s0) @@ -180,7 +180,7 @@ glabel func_802BB1E8_E2B918 /* E2BBD0 802BB4A0 D422CF88 */ ldc1 $f2, %lo(D_802BCF88)($at) /* E2BBD4 802BB4A4 46002021 */ cvt.d.s $f0, $f4 /* E2BBD8 802BB4A8 4620103E */ c.le.d $f2, $f0 -/* E2BBDC 802BB4AC 00000000 */ nop +/* E2BBDC 802BB4AC 00000000 */ nop /* E2BBE0 802BB4B0 45000048 */ bc1f .L802BB5D4 /* E2BBE4 802BB4B4 E6240060 */ swc1 $f4, 0x60($s1) /* E2BBE8 802BB4B8 3C0142B4 */ lui $at, 0x42b4 @@ -196,13 +196,13 @@ glabel func_802BB1E8_E2B918 /* E2BC10 802BB4E0 C600000C */ lwc1 $f0, 0xc($s0) /* E2BC14 802BB4E4 3C014120 */ lui $at, 0x4120 /* E2BC18 802BB4E8 44811000 */ mtc1 $at, $f2 -/* E2BC1C 802BB4EC 00000000 */ nop +/* E2BC1C 802BB4EC 00000000 */ nop /* E2BC20 802BB4F0 46020000 */ add.s $f0, $f0, $f2 /* E2BC24 802BB4F4 3C0141F0 */ lui $at, 0x41f0 /* E2BC28 802BB4F8 44811000 */ mtc1 $at, $f2 -/* E2BC2C 802BB4FC 00000000 */ nop +/* E2BC2C 802BB4FC 00000000 */ nop /* E2BC30 802BB500 4600103C */ c.lt.s $f2, $f0 -/* E2BC34 802BB504 00000000 */ nop +/* E2BC34 802BB504 00000000 */ nop /* E2BC38 802BB508 45000002 */ bc1f .L802BB514 /* E2BC3C 802BB50C E600000C */ swc1 $f0, 0xc($s0) /* E2BC40 802BB510 E602000C */ swc1 $f2, 0xc($s0) @@ -214,7 +214,7 @@ glabel func_802BB1E8_E2B918 /* E2BC54 802BB524 D422CF90 */ ldc1 $f2, %lo(D_802BCF90)($at) /* E2BC58 802BB528 46002021 */ cvt.d.s $f0, $f4 /* E2BC5C 802BB52C 4620103E */ c.le.d $f2, $f0 -/* E2BC60 802BB530 00000000 */ nop +/* E2BC60 802BB530 00000000 */ nop /* E2BC64 802BB534 45000027 */ bc1f .L802BB5D4 /* E2BC68 802BB538 E6240060 */ swc1 $f4, 0x60($s1) /* E2BC6C 802BB53C 3C0142B4 */ lui $at, 0x42b4 @@ -229,7 +229,7 @@ glabel func_802BB1E8_E2B918 /* E2BC8C 802BB55C 0C05272D */ jal play_sound /* E2BC90 802BB560 A2020012 */ sb $v0, 0x12($s0) /* E2BC94 802BB564 080AED75 */ j .L802BB5D4 -/* E2BC98 802BB568 00000000 */ nop +/* E2BC98 802BB568 00000000 */ nop /* E2BC9C 802BB56C 92020011 */ lbu $v0, 0x11($s0) /* E2BCA0 802BB570 2442FFFF */ addiu $v0, $v0, -1 /* E2BCA4 802BB574 A2020011 */ sb $v0, 0x11($s0) @@ -261,7 +261,7 @@ glabel func_802BB1E8_E2B918 /* E2BD08 802BB5D8 2442FFFE */ addiu $v0, $v0, -2 /* E2BD0C 802BB5DC 2C420007 */ sltiu $v0, $v0, 7 /* E2BD10 802BB5E0 1040000D */ beqz $v0, .L802BB618 -/* E2BD14 802BB5E4 00000000 */ nop +/* E2BD14 802BB5E4 00000000 */ nop /* E2BD18 802BB5E8 92020010 */ lbu $v0, 0x10($s0) /* E2BD1C 802BB5EC 24420001 */ addiu $v0, $v0, 1 /* E2BD20 802BB5F0 A2020010 */ sb $v0, 0x10($s0) diff --git a/asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s b/asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s index d9246b20a9..a9a8a4cd08 100644 --- a/asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s +++ b/asm/nonmatchings/code_E2B530/func_802BB6D4_E2BE04.s @@ -16,4 +16,4 @@ glabel func_802BB6D4_E2BE04 /* E2BE30 802BB700 24421B70 */ addiu $v0, $v0, 0x1b70 /* E2BE34 802BB704 03E00008 */ jr $ra /* E2BE38 802BB708 AC820018 */ sw $v0, 0x18($a0) -/* E2BE3C 802BB70C 00000000 */ nop +/* E2BE3C 802BB70C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2F750/func_802BB704_E30054.s b/asm/nonmatchings/code_E2F750/func_802BB704_E30054.s index b2e2f3d71a..987b02d9e2 100644 --- a/asm/nonmatchings/code_E2F750/func_802BB704_E30054.s +++ b/asm/nonmatchings/code_E2F750/func_802BB704_E30054.s @@ -29,4 +29,4 @@ glabel func_802BB704_E30054 /* E300B0 802BB760 A0C20002 */ sb $v0, 2($a2) .L802BB764: /* E300B4 802BB764 03E00008 */ jr $ra -/* E300B8 802BB768 00000000 */ nop +/* E300B8 802BB768 00000000 */ nop diff --git a/asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s b/asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s index 90168597a7..99b1e48264 100644 --- a/asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s +++ b/asm/nonmatchings/code_E2F750/func_802BB76C_E300BC.s @@ -6,13 +6,13 @@ glabel func_802BB76C_E300BC /* E300C0 802BB770 846200A4 */ lh $v0, 0xa4($v1) /* E300C4 802BB774 C4800048 */ lwc1 $f0, 0x48($a0) /* E300C8 802BB778 44821000 */ mtc1 $v0, $f2 -/* E300CC 802BB77C 00000000 */ nop +/* E300CC 802BB77C 00000000 */ nop /* E300D0 802BB780 468010A0 */ cvt.s.w $f2, $f2 /* E300D4 802BB784 846200A8 */ lh $v0, 0xa8($v1) /* E300D8 802BB788 46001081 */ sub.s $f2, $f2, $f0 /* E300DC 802BB78C C4840050 */ lwc1 $f4, 0x50($a0) /* E300E0 802BB790 44820000 */ mtc1 $v0, $f0 -/* E300E4 802BB794 00000000 */ nop +/* E300E4 802BB794 00000000 */ nop /* E300E8 802BB798 46800020 */ cvt.s.w $f0, $f0 /* E300EC 802BB79C 46040001 */ sub.s $f0, $f0, $f4 /* E300F0 802BB7A0 0000102D */ daddu $v0, $zero, $zero @@ -20,13 +20,13 @@ glabel func_802BB76C_E300BC /* E300F8 802BB7A8 44812000 */ mtc1 $at, $f4 /* E300FC 802BB7AC 46001085 */ abs.s $f2, $f2 /* E30100 802BB7B0 4604103E */ c.le.s $f2, $f4 -/* E30104 802BB7B4 00000000 */ nop +/* E30104 802BB7B4 00000000 */ nop /* E30108 802BB7B8 45000002 */ bc1f .L802BB7C4 /* E3010C 802BB7BC 46000005 */ abs.s $f0, $f0 /* E30110 802BB7C0 24020001 */ addiu $v0, $zero, 1 .L802BB7C4: /* E30114 802BB7C4 4604003E */ c.le.s $f0, $f4 -/* E30118 802BB7C8 00000000 */ nop +/* E30118 802BB7C8 00000000 */ nop /* E3011C 802BB7CC 45030001 */ bc1tl .L802BB7D4 /* E30120 802BB7D0 24420001 */ addiu $v0, $v0, 1 .L802BB7D4: diff --git a/asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s b/asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s index 9173aaedcd..e6c39afb70 100644 --- a/asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s +++ b/asm/nonmatchings/code_E2F750/func_802BB8E4_E30234.s @@ -13,54 +13,54 @@ glabel func_802BB8E4_E30234 /* E30254 802BB904 860200A4 */ lh $v0, 0xa4($s0) /* E30258 802BB908 C62E0050 */ lwc1 $f14, 0x50($s1) /* E3025C 802BB90C 44823000 */ mtc1 $v0, $f6 -/* E30260 802BB910 00000000 */ nop +/* E30260 802BB910 00000000 */ nop /* E30264 802BB914 468031A0 */ cvt.s.w $f6, $f6 /* E30268 802BB918 860200A8 */ lh $v0, 0xa8($s0) /* E3026C 802BB91C 44063000 */ mfc1 $a2, $f6 /* E30270 802BB920 44823000 */ mtc1 $v0, $f6 -/* E30274 802BB924 00000000 */ nop +/* E30274 802BB924 00000000 */ nop /* E30278 802BB928 468031A0 */ cvt.s.w $f6, $f6 /* E3027C 802BB92C 44073000 */ mfc1 $a3, $f6 /* E30280 802BB930 0C00A720 */ jal atan2 -/* E30284 802BB934 00000000 */ nop +/* E30284 802BB934 00000000 */ nop /* E30288 802BB938 C60200B8 */ lwc1 $f2, 0xb8($s0) /* E3028C 802BB93C 46020001 */ sub.s $f0, $f0, $f2 /* E30290 802BB940 3C013D00 */ lui $at, 0x3d00 /* E30294 802BB944 44811000 */ mtc1 $at, $f2 -/* E30298 802BB948 00000000 */ nop +/* E30298 802BB948 00000000 */ nop /* E3029C 802BB94C 46020102 */ mul.s $f4, $f0, $f2 -/* E302A0 802BB950 00000000 */ nop +/* E302A0 802BB950 00000000 */ nop /* E302A4 802BB954 44800000 */ mtc1 $zero, $f0 -/* E302A8 802BB958 00000000 */ nop +/* E302A8 802BB958 00000000 */ nop /* E302AC 802BB95C 4604003E */ c.le.s $f0, $f4 -/* E302B0 802BB960 00000000 */ nop +/* E302B0 802BB960 00000000 */ nop /* E302B4 802BB964 4500000D */ bc1f .L802BB99C -/* E302B8 802BB968 00000000 */ nop +/* E302B8 802BB968 00000000 */ nop /* E302BC 802BB96C 3C01802C */ lui $at, %hi(D_802BCB70) /* E302C0 802BB970 D422CB70 */ ldc1 $f2, %lo(D_802BCB70)($at) /* E302C4 802BB974 46002021 */ cvt.d.s $f0, $f4 /* E302C8 802BB978 4622003C */ c.lt.d $f0, $f2 -/* E302CC 802BB97C 00000000 */ nop +/* E302CC 802BB97C 00000000 */ nop /* E302D0 802BB980 45000004 */ bc1f .L802BB994 -/* E302D4 802BB984 00000000 */ nop +/* E302D4 802BB984 00000000 */ nop /* E302D8 802BB988 3C013C23 */ lui $at, 0x3c23 /* E302DC 802BB98C 3421D70A */ ori $at, $at, 0xd70a /* E302E0 802BB990 44812000 */ mtc1 $at, $f4 .L802BB994: /* E302E4 802BB994 44800000 */ mtc1 $zero, $f0 -/* E302E8 802BB998 00000000 */ nop +/* E302E8 802BB998 00000000 */ nop .L802BB99C: /* E302EC 802BB99C 4600203C */ c.lt.s $f4, $f0 -/* E302F0 802BB9A0 00000000 */ nop +/* E302F0 802BB9A0 00000000 */ nop /* E302F4 802BB9A4 4500000B */ bc1f .L802BB9D4 -/* E302F8 802BB9A8 00000000 */ nop +/* E302F8 802BB9A8 00000000 */ nop /* E302FC 802BB9AC 3C01802C */ lui $at, %hi(D_802BCB78) /* E30300 802BB9B0 D422CB78 */ ldc1 $f2, %lo(D_802BCB78)($at) /* E30304 802BB9B4 46002021 */ cvt.d.s $f0, $f4 /* E30308 802BB9B8 4620103C */ c.lt.d $f2, $f0 -/* E3030C 802BB9BC 00000000 */ nop +/* E3030C 802BB9BC 00000000 */ nop /* E30310 802BB9C0 45000004 */ bc1f .L802BB9D4 -/* E30314 802BB9C4 00000000 */ nop +/* E30314 802BB9C4 00000000 */ nop /* E30318 802BB9C8 3C01BC23 */ lui $at, 0xbc23 /* E3031C 802BB9CC 3421D70A */ ori $at, $at, 0xd70a /* E30320 802BB9D0 44812000 */ mtc1 $at, $f4 @@ -71,9 +71,9 @@ glabel func_802BB8E4_E30234 /* E30330 802BB9E0 3C0140C9 */ lui $at, 0x40c9 /* E30334 802BB9E4 34210FD0 */ ori $at, $at, 0xfd0 /* E30338 802BB9E8 4481A000 */ mtc1 $at, $f20 -/* E3033C 802BB9EC 00000000 */ nop +/* E3033C 802BB9EC 00000000 */ nop /* E30340 802BB9F0 46140502 */ mul.s $f20, $f0, $f20 -/* E30344 802BB9F4 00000000 */ nop +/* E30344 802BB9F4 00000000 */ nop /* E30348 802BB9F8 3C0143B4 */ lui $at, 0x43b4 /* E3034C 802BB9FC 44811000 */ mtc1 $at, $f2 /* E30350 802BBA00 E60000B8 */ swc1 $f0, 0xb8($s0) @@ -91,7 +91,7 @@ glabel func_802BB8E4_E30234 /* E30380 802BBA30 0C0AEDDB */ jal func_802BB76C_E300BC /* E30384 802BBA34 E6220050 */ swc1 $f2, 0x50($s1) /* E30388 802BBA38 10400003 */ beqz $v0, .L802BBA48 -/* E3038C 802BBA3C 00000000 */ nop +/* E3038C 802BBA3C 00000000 */ nop /* E30390 802BBA40 0C0AEDF8 */ jal func_802BB7E0_E30130 /* E30394 802BBA44 0220202D */ daddu $a0, $s1, $zero .L802BBA48: diff --git a/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s b/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s index 17fba4305d..1b926c6d11 100644 --- a/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s +++ b/asm/nonmatchings/code_E2F750/func_802BBA60_E303B0.s @@ -16,27 +16,27 @@ glabel func_802BBA60_E303B0 /* E303DC 802BBA8C 0C009C64 */ jal func_80027190 /* E303E0 802BBA90 8E300040 */ lw $s0, 0x40($s1) /* E303E4 802BBA94 14400017 */ bnez $v0, .L802BBAF4 -/* E303E8 802BBA98 00000000 */ nop +/* E303E8 802BBA98 00000000 */ nop /* E303EC 802BBA9C 0C04D07A */ jal func_801341E8 -/* E303F0 802BBAA0 00000000 */ nop +/* E303F0 802BBAA0 00000000 */ nop /* E303F4 802BBAA4 14400013 */ bnez $v0, .L802BBAF4 -/* E303F8 802BBAA8 00000000 */ nop +/* E303F8 802BBAA8 00000000 */ nop /* E303FC 802BBAAC 8E420000 */ lw $v0, ($s2) /* E30400 802BBAB0 30420020 */ andi $v0, $v0, 0x20 /* E30404 802BBAB4 1440000F */ bnez $v0, .L802BBAF4 -/* E30408 802BBAB8 00000000 */ nop +/* E30408 802BBAB8 00000000 */ nop /* E3040C 802BBABC 3C028011 */ lui $v0, %hi(gPlayerData) /* E30410 802BBAC0 2442F290 */ addiu $v0, $v0, %lo(gPlayerData) /* E30414 802BBAC4 80430012 */ lb $v1, 0x12($v0) /* E30418 802BBAC8 24020001 */ addiu $v0, $zero, 1 /* E3041C 802BBACC 14620007 */ bne $v1, $v0, .L802BBAEC -/* E30420 802BBAD0 00000000 */ nop +/* E30420 802BBAD0 00000000 */ nop /* E30424 802BBAD4 82420015 */ lb $v0, 0x15($s2) /* E30428 802BBAD8 10400004 */ beqz $v0, .L802BBAEC /* E3042C 802BBADC 2402001F */ addiu $v0, $zero, 0x1f /* E30430 802BBAE0 824300B4 */ lb $v1, 0xb4($s2) /* E30434 802BBAE4 14620003 */ bne $v1, $v0, .L802BBAF4 -/* E30438 802BBAE8 00000000 */ nop +/* E30438 802BBAE8 00000000 */ nop .L802BBAEC: /* E3043C 802BBAEC 0C0AEE39 */ jal func_802BB8E4_E30234 /* E30440 802BBAF0 0220202D */ daddu $a0, $s1, $zero @@ -50,30 +50,30 @@ glabel func_802BBA60_E303B0 /* E3045C 802BBB0C 00021403 */ sra $v0, $v0, 0x10 /* E30460 802BBB10 28420064 */ slti $v0, $v0, 0x64 /* E30464 802BBB14 1040001B */ beqz $v0, .L802BBB84 -/* E30468 802BBB18 00000000 */ nop +/* E30468 802BBB18 00000000 */ nop /* E3046C 802BBB1C 3C014060 */ lui $at, 0x4060 /* E30470 802BBB20 44813000 */ mtc1 $at, $f6 /* E30474 802BBB24 C6080004 */ lwc1 $f8, 4($s0) /* E30478 802BBB28 46083081 */ sub.s $f2, $f6, $f8 /* E3047C 802BBB2C 3C0141E0 */ lui $at, 0x41e0 /* E30480 802BBB30 44810000 */ mtc1 $at, $f0 -/* E30484 802BBB34 00000000 */ nop +/* E30484 802BBB34 00000000 */ nop /* E30488 802BBB38 46001103 */ div.s $f4, $f2, $f0 /* E3048C 802BBB3C 3C01802C */ lui $at, %hi(D_802BCB80) /* E30490 802BBB40 D422CB80 */ ldc1 $f2, %lo(D_802BCB80)($at) /* E30494 802BBB44 46002021 */ cvt.d.s $f0, $f4 /* E30498 802BBB48 4622003C */ c.lt.d $f0, $f2 -/* E3049C 802BBB4C 00000000 */ nop +/* E3049C 802BBB4C 00000000 */ nop /* E304A0 802BBB50 45020006 */ bc1fl .L802BBB6C /* E304A4 802BBB54 46044000 */ add.s $f0, $f8, $f4 /* E304A8 802BBB58 3C013CA3 */ lui $at, 0x3ca3 /* E304AC 802BBB5C 3421D70A */ ori $at, $at, 0xd70a /* E304B0 802BBB60 44812000 */ mtc1 $at, $f4 -/* E304B4 802BBB64 00000000 */ nop +/* E304B4 802BBB64 00000000 */ nop /* E304B8 802BBB68 46044000 */ add.s $f0, $f8, $f4 .L802BBB6C: /* E304BC 802BBB6C 4600303E */ c.le.s $f6, $f0 -/* E304C0 802BBB70 00000000 */ nop +/* E304C0 802BBB70 00000000 */ nop /* E304C4 802BBB74 4500001F */ bc1f .L802BBBF4 /* E304C8 802BBB78 E6000004 */ swc1 $f0, 4($s0) /* E304CC 802BBB7C 080AEEFD */ j .L802BBBF4 @@ -86,24 +86,24 @@ glabel func_802BBA60_E303B0 /* E304E4 802BBB94 46083081 */ sub.s $f2, $f6, $f8 /* E304E8 802BBB98 3C013D80 */ lui $at, 0x3d80 /* E304EC 802BBB9C 44810000 */ mtc1 $at, $f0 -/* E304F0 802BBBA0 00000000 */ nop +/* E304F0 802BBBA0 00000000 */ nop /* E304F4 802BBBA4 46001102 */ mul.s $f4, $f2, $f0 -/* E304F8 802BBBA8 00000000 */ nop +/* E304F8 802BBBA8 00000000 */ nop /* E304FC 802BBBAC 3C01802C */ lui $at, %hi(D_802BCB88) /* E30500 802BBBB0 D422CB88 */ ldc1 $f2, %lo(D_802BCB88)($at) /* E30504 802BBBB4 46002021 */ cvt.d.s $f0, $f4 /* E30508 802BBBB8 4620103C */ c.lt.d $f2, $f0 -/* E3050C 802BBBBC 00000000 */ nop +/* E3050C 802BBBBC 00000000 */ nop /* E30510 802BBBC0 45020006 */ bc1fl .L802BBBDC /* E30514 802BBBC4 46044000 */ add.s $f0, $f8, $f4 /* E30518 802BBBC8 3C01BCA3 */ lui $at, 0xbca3 /* E3051C 802BBBCC 3421D70A */ ori $at, $at, 0xd70a /* E30520 802BBBD0 44812000 */ mtc1 $at, $f4 -/* E30524 802BBBD4 00000000 */ nop +/* E30524 802BBBD4 00000000 */ nop /* E30528 802BBBD8 46044000 */ add.s $f0, $f8, $f4 .L802BBBDC: /* E3052C 802BBBDC 4606003E */ c.le.s $f0, $f6 -/* E30530 802BBBE0 00000000 */ nop +/* E30530 802BBBE0 00000000 */ nop /* E30534 802BBBE4 45000003 */ bc1f .L802BBBF4 /* E30538 802BBBE8 E6000004 */ swc1 $f0, 4($s0) /* E3053C 802BBBEC E6060004 */ swc1 $f6, 4($s0) @@ -114,9 +114,9 @@ glabel func_802BBA60_E303B0 /* E3054C 802BBBFC 46020000 */ add.s $f0, $f0, $f2 /* E30550 802BBC00 3C0143B4 */ lui $at, 0x43b4 /* E30554 802BBC04 44814000 */ mtc1 $at, $f8 -/* E30558 802BBC08 00000000 */ nop +/* E30558 802BBC08 00000000 */ nop /* E3055C 802BBC0C 4600403C */ c.lt.s $f8, $f0 -/* E30560 802BBC10 00000000 */ nop +/* E30560 802BBC10 00000000 */ nop /* E30564 802BBC14 45000002 */ bc1f .L802BBC20 /* E30568 802BBC18 E6000008 */ swc1 $f0, 8($s0) /* E3056C 802BBC1C AE000008 */ sw $zero, 8($s0) @@ -125,9 +125,9 @@ glabel func_802BBA60_E303B0 /* E30574 802BBC24 C606000C */ lwc1 $f6, 0xc($s0) /* E30578 802BBC28 46060101 */ sub.s $f4, $f0, $f6 /* E3057C 802BBC2C 44805000 */ mtc1 $zero, $f10 -/* E30580 802BBC30 00000000 */ nop +/* E30580 802BBC30 00000000 */ nop /* E30584 802BBC34 460A203C */ c.lt.s $f4, $f10 -/* E30588 802BBC38 00000000 */ nop +/* E30588 802BBC38 00000000 */ nop /* E3058C 802BBC3C 45030001 */ bc1tl .L802BBC44 /* E30590 802BBC40 46082100 */ add.s $f4, $f4, $f8 .L802BBC44: @@ -136,11 +136,11 @@ glabel func_802BBA60_E303B0 /* E3059C 802BBC4C 44800000 */ mtc1 $zero, $f0 /* E305A0 802BBC50 460020A1 */ cvt.d.s $f2, $f4 /* E305A4 802BBC54 46201082 */ mul.d $f2, $f2, $f0 -/* E305A8 802BBC58 00000000 */ nop +/* E305A8 802BBC58 00000000 */ nop /* E305AC 802BBC5C 46201120 */ cvt.s.d $f4, $f2 /* E305B0 802BBC60 46043000 */ add.s $f0, $f6, $f4 /* E305B4 802BBC64 4600403C */ c.lt.s $f8, $f0 -/* E305B8 802BBC68 00000000 */ nop +/* E305B8 802BBC68 00000000 */ nop /* E305BC 802BBC6C 45000002 */ bc1f .L802BBC78 /* E305C0 802BBC70 E600000C */ swc1 $f0, 0xc($s0) /* E305C4 802BBC74 E60A000C */ swc1 $f10, 0xc($s0) @@ -166,12 +166,12 @@ glabel func_802BBA60_E303B0 /* E30610 802BBCC0 24020009 */ addiu $v0, $zero, 9 /* E30614 802BBCC4 82630003 */ lb $v1, 3($s3) /* E30618 802BBCC8 10620034 */ beq $v1, $v0, .L802BBD9C -/* E3061C 802BBCCC 00000000 */ nop +/* E3061C 802BBCCC 00000000 */ nop .L802BBCD0: /* E30620 802BBCD0 824300B4 */ lb $v1, 0xb4($s2) /* E30624 802BBCD4 2402001F */ addiu $v0, $zero, 0x1f /* E30628 802BBCD8 1462000E */ bne $v1, $v0, .L802BBD14 -/* E3062C 802BBCDC 00000000 */ nop +/* E3062C 802BBCDC 00000000 */ nop /* E30630 802BBCE0 C62C0048 */ lwc1 $f12, 0x48($s1) /* E30634 802BBCE4 C62E004C */ lwc1 $f14, 0x4c($s1) /* E30638 802BBCE8 8E260050 */ lw $a2, 0x50($s1) @@ -182,24 +182,24 @@ glabel func_802BBA60_E303B0 /* E3064C 802BBCFC 8C420000 */ lw $v0, ($v0) /* E30650 802BBD00 00431024 */ and $v0, $v0, $v1 /* E30654 802BBD04 10400003 */ beqz $v0, .L802BBD14 -/* E30658 802BBD08 00000000 */ nop +/* E30658 802BBD08 00000000 */ nop /* E3065C 802BBD0C 3C018011 */ lui $at, %hi(D_8010C954) /* E30660 802BBD10 AC31C954 */ sw $s1, %lo(D_8010C954)($at) .L802BBD14: /* E30664 802BBD14 0C04D07A */ jal func_801341E8 -/* E30668 802BBD18 00000000 */ nop +/* E30668 802BBD18 00000000 */ nop /* E3066C 802BBD1C 1440001F */ bnez $v0, .L802BBD9C -/* E30670 802BBD20 00000000 */ nop +/* E30670 802BBD20 00000000 */ nop /* E30674 802BBD24 8E420000 */ lw $v0, ($s2) /* E30678 802BBD28 30420020 */ andi $v0, $v0, 0x20 /* E3067C 802BBD2C 1440001B */ bnez $v0, .L802BBD9C /* E30680 802BBD30 2402001F */ addiu $v0, $zero, 0x1f /* E30684 802BBD34 824300B4 */ lb $v1, 0xb4($s2) /* E30688 802BBD38 10620018 */ beq $v1, $v0, .L802BBD9C -/* E3068C 802BBD3C 00000000 */ nop +/* E3068C 802BBD3C 00000000 */ nop /* E30690 802BBD40 86420010 */ lh $v0, 0x10($s2) /* E30694 802BBD44 14400015 */ bnez $v0, .L802BBD9C -/* E30698 802BBD48 00000000 */ nop +/* E30698 802BBD48 00000000 */ nop /* E3069C 802BBD4C C62C0048 */ lwc1 $f12, 0x48($s1) /* E306A0 802BBD50 C62E0050 */ lwc1 $f14, 0x50($s1) /* E306A4 802BBD54 8E460028 */ lw $a2, 0x28($s2) @@ -211,7 +211,7 @@ glabel func_802BBA60_E303B0 /* E306BC 802BBD6C 44801000 */ mtc1 $zero, $f2 /* E306C0 802BBD70 46200005 */ abs.d $f0, $f0 /* E306C4 802BBD74 4622003E */ c.le.d $f0, $f2 -/* E306C8 802BBD78 00000000 */ nop +/* E306C8 802BBD78 00000000 */ nop /* E306CC 802BBD7C 45000007 */ bc1f .L802BBD9C /* E306D0 802BBD80 2404001F */ addiu $a0, $zero, 0x1f /* E306D4 802BBD84 8E420004 */ lw $v0, 4($s2) diff --git a/asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s b/asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s index b95017b536..0cb3c8b6d2 100644 --- a/asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s +++ b/asm/nonmatchings/code_E2F750/func_802BBDB8_E30708.s @@ -14,12 +14,12 @@ glabel func_802BBDB8_E30708 /* E3072C 802BBDDC E4800054 */ swc1 $f0, 0x54($a0) /* E30730 802BBDE0 46000021 */ cvt.d.s $f0, $f0 /* E30734 802BBDE4 4620103E */ c.le.d $f2, $f0 -/* E30738 802BBDE8 00000000 */ nop +/* E30738 802BBDE8 00000000 */ nop /* E3073C 802BBDEC 45000005 */ bc1f .L802BBE04 -/* E30740 802BBDF0 00000000 */ nop +/* E30740 802BBDF0 00000000 */ nop /* E30744 802BBDF4 3C013F80 */ lui $at, 0x3f80 /* E30748 802BBDF8 44810000 */ mtc1 $at, $f0 -/* E3074C 802BBDFC 00000000 */ nop +/* E3074C 802BBDFC 00000000 */ nop /* E30750 802BBE00 E4800054 */ swc1 $f0, 0x54($a0) .L802BBE04: /* E30754 802BBE04 C4800054 */ lwc1 $f0, 0x54($a0) diff --git a/asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s b/asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s index 856a6b4511..551f8865ce 100644 --- a/asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s +++ b/asm/nonmatchings/code_E2F750/func_802BBE14_E30764.s @@ -24,4 +24,4 @@ glabel func_802BBE14_E30764 /* E307B0 802BBE60 8FB00010 */ lw $s0, 0x10($sp) /* E307B4 802BBE64 03E00008 */ jr $ra /* E307B8 802BBE68 27BD0020 */ addiu $sp, $sp, 0x20 -/* E307BC 802BBE6C 00000000 */ nop +/* E307BC 802BBE6C 00000000 */ nop diff --git a/asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s b/asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s index 97d8d9af00..10ac854046 100644 --- a/asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s +++ b/asm/nonmatchings/code_E2F750/func_802BC2BC_E30C0C.s @@ -26,7 +26,7 @@ glabel func_802BC2BC_E30C0C /* E30C60 802BC310 1443002A */ bne $v0, $v1, .L802BC3BC /* E30C64 802BC314 24020012 */ addiu $v0, $zero, 0x12 /* E30C68 802BC318 14820028 */ bne $a0, $v0, .L802BC3BC -/* E30C6C 802BC31C 00000000 */ nop +/* E30C6C 802BC31C 00000000 */ nop /* E30C70 802BC320 C6A00028 */ lwc1 $f0, 0x28($s5) /* E30C74 802BC324 3C0140A0 */ lui $at, 0x40a0 /* E30C78 802BC328 44811000 */ mtc1 $at, $f2 @@ -55,14 +55,14 @@ glabel func_802BC2BC_E30C0C /* E30CD4 802BC384 0C0372DF */ jal func_800DCB7C /* E30CD8 802BC388 AFA20010 */ sw $v0, 0x10($sp) /* E30CDC 802BC38C 10400019 */ beqz $v0, .L802BC3F4 -/* E30CE0 802BC390 00000000 */ nop +/* E30CE0 802BC390 00000000 */ nop /* E30CE4 802BC394 3C048011 */ lui $a0, %hi(D_8010C978) /* E30CE8 802BC398 8C84C978 */ lw $a0, %lo(D_8010C978)($a0) /* E30CEC 802BC39C 30824000 */ andi $v0, $a0, 0x4000 /* E30CF0 802BC3A0 10400014 */ beqz $v0, .L802BC3F4 -/* E30CF4 802BC3A4 00000000 */ nop +/* E30CF4 802BC3A4 00000000 */ nop /* E30CF8 802BC3A8 0C0441A9 */ jal get_entity_type -/* E30CFC 802BC3AC 00000000 */ nop +/* E30CFC 802BC3AC 00000000 */ nop /* E30D00 802BC3B0 38420031 */ xori $v0, $v0, 0x31 /* E30D04 802BC3B4 080AF0FD */ j .L802BC3F4 /* E30D08 802BC3B8 2C530001 */ sltiu $s3, $v0, 1 @@ -74,7 +74,7 @@ glabel func_802BC2BC_E30C0C /* E30D1C 802BC3CC 10820003 */ beq $a0, $v0, .L802BC3DC /* E30D20 802BC3D0 24020010 */ addiu $v0, $zero, 0x10 /* E30D24 802BC3D4 14820003 */ bne $a0, $v0, .L802BC3E4 -/* E30D28 802BC3D8 00000000 */ nop +/* E30D28 802BC3D8 00000000 */ nop .L802BC3DC: /* E30D2C 802BC3DC 080AF0FD */ j .L802BC3F4 /* E30D30 802BC3E0 24130001 */ addiu $s3, $zero, 1 @@ -85,7 +85,7 @@ glabel func_802BC2BC_E30C0C /* E30D40 802BC3F0 2413FFFF */ addiu $s3, $zero, -1 .L802BC3F4: /* E30D44 802BC3F4 12600026 */ beqz $s3, .L802BC490 -/* E30D48 802BC3F8 00000000 */ nop +/* E30D48 802BC3F8 00000000 */ nop /* E30D4C 802BC3FC 92820002 */ lbu $v0, 2($s4) /* E30D50 802BC400 3C01BF80 */ lui $at, 0xbf80 /* E30D54 802BC404 44810000 */ mtc1 $at, $f0 @@ -106,7 +106,7 @@ glabel func_802BC2BC_E30C0C /* E30D90 802BC440 0C01C064 */ jal func_80070190 /* E30D94 802BC444 0040202D */ daddu $a0, $v0, $zero /* E30D98 802BC448 1A600004 */ blez $s3, .L802BC45C -/* E30D9C 802BC44C 00000000 */ nop +/* E30D9C 802BC44C 00000000 */ nop /* E30DA0 802BC450 92820002 */ lbu $v0, 2($s4) /* E30DA4 802BC454 34420001 */ ori $v0, $v0, 1 /* E30DA8 802BC458 A2820002 */ sb $v0, 2($s4) @@ -114,7 +114,7 @@ glabel func_802BC2BC_E30C0C /* E30DAC 802BC45C C640004C */ lwc1 $f0, 0x4c($s2) /* E30DB0 802BC460 3C014000 */ lui $at, 0x4000 /* E30DB4 802BC464 44811000 */ mtc1 $at, $f2 -/* E30DB8 802BC468 00000000 */ nop +/* E30DB8 802BC468 00000000 */ nop /* E30DBC 802BC46C 46020001 */ sub.s $f0, $f0, $f2 /* E30DC0 802BC470 0240202D */ daddu $a0, $s2, $zero /* E30DC4 802BC474 0C043F5A */ jal func_8010FD68 diff --git a/asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s b/asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s index 95ae6ebe59..46be05bd7e 100644 --- a/asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s +++ b/asm/nonmatchings/code_E2F750/func_802BC4B8_E30E08.s @@ -25,4 +25,4 @@ glabel func_802BC4B8_E30E08 /* E30E58 802BC508 A0820004 */ sb $v0, 4($a0) .L802BC50C: /* E30E5C 802BC50C 03E00008 */ jr $ra -/* E30E60 802BC510 00000000 */ nop +/* E30E60 802BC510 00000000 */ nop diff --git a/asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s b/asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s index 89d581a56b..a67fb5e48f 100644 --- a/asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s +++ b/asm/nonmatchings/code_E2F750/func_802BC514_E30E64.s @@ -12,7 +12,7 @@ glabel func_802BC514_E30E64 /* E30E80 802BC530 24840048 */ addiu $a0, $a0, 0x48 /* E30E84 802BC534 3C013F80 */ lui $at, 0x3f80 /* E30E88 802BC538 44810000 */ mtc1 $at, $f0 -/* E30E8C 802BC53C 00000000 */ nop +/* E30E8C 802BC53C 00000000 */ nop .L802BC540: /* E30E90 802BC540 46001000 */ add.s $f0, $f2, $f0 /* E30E94 802BC544 E4800000 */ swc1 $f0, ($a0) diff --git a/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s b/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s index 216cc5690e..77309315bb 100644 --- a/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s +++ b/asm/nonmatchings/code_E2F750/func_802BC570_E30EC0.s @@ -20,7 +20,7 @@ glabel func_802BC570_E30EC0 /* E30EFC 802BC5AC 00220821 */ addu $at, $at, $v0 /* E30F00 802BC5B0 8C22CBA0 */ lw $v0, %lo(D_802BCBA0)($at) /* E30F04 802BC5B4 00400008 */ jr $v0 -/* E30F08 802BC5B8 00000000 */ nop +/* E30F08 802BC5B8 00000000 */ nop /* E30F0C 802BC5BC 92020000 */ lbu $v0, ($s0) /* E30F10 802BC5C0 3C0142B4 */ lui $at, 0x42b4 /* E30F14 802BC5C4 44810000 */ mtc1 $at, $f0 @@ -41,9 +41,9 @@ glabel func_802BC570_E30EC0 /* E30F50 802BC600 3C0140C9 */ lui $at, 0x40c9 /* E30F54 802BC604 34210FD0 */ ori $at, $at, 0xfd0 /* E30F58 802BC608 44810000 */ mtc1 $at, $f0 -/* E30F5C 802BC60C 00000000 */ nop +/* E30F5C 802BC60C 00000000 */ nop /* E30F60 802BC610 46006302 */ mul.s $f12, $f12, $f0 -/* E30F64 802BC614 00000000 */ nop +/* E30F64 802BC614 00000000 */ nop /* E30F68 802BC618 C634004C */ lwc1 $f20, 0x4c($s1) /* E30F6C 802BC61C 3C0143B4 */ lui $at, 0x43b4 /* E30F70 802BC620 44810000 */ mtc1 $at, $f0 @@ -55,7 +55,7 @@ glabel func_802BC570_E30EC0 /* E30F88 802BC638 44801000 */ mtc1 $zero, $f2 /* E30F8C 802BC63C 46000021 */ cvt.d.s $f0, $f0 /* E30F90 802BC640 46220002 */ mul.d $f0, $f0, $f2 -/* E30F94 802BC644 00000000 */ nop +/* E30F94 802BC644 00000000 */ nop /* E30F98 802BC648 4620A500 */ add.d $f20, $f20, $f0 /* E30F9C 802BC64C 3C014000 */ lui $at, 0x4000 /* E30FA0 802BC650 44812000 */ mtc1 $at, $f4 @@ -65,9 +65,9 @@ glabel func_802BC570_E30EC0 /* E30FB0 802BC660 46040000 */ add.s $f0, $f0, $f4 /* E30FB4 802BC664 3C014334 */ lui $at, 0x4334 /* E30FB8 802BC668 44811000 */ mtc1 $at, $f2 -/* E30FBC 802BC66C 00000000 */ nop +/* E30FBC 802BC66C 00000000 */ nop /* E30FC0 802BC670 4600103E */ c.le.s $f2, $f0 -/* E30FC4 802BC674 00000000 */ nop +/* E30FC4 802BC674 00000000 */ nop /* E30FC8 802BC678 45000002 */ bc1f .L802BC684 /* E30FCC 802BC67C E6000014 */ swc1 $f0, 0x14($s0) /* E30FD0 802BC680 E6020014 */ swc1 $f2, 0x14($s0) @@ -75,13 +75,13 @@ glabel func_802BC570_E30EC0 /* E30FD4 802BC684 C6000010 */ lwc1 $f0, 0x10($s0) /* E30FD8 802BC688 3C014248 */ lui $at, 0x4248 /* E30FDC 802BC68C 44811000 */ mtc1 $at, $f2 -/* E30FE0 802BC690 00000000 */ nop +/* E30FE0 802BC690 00000000 */ nop /* E30FE4 802BC694 46020080 */ add.s $f2, $f0, $f2 /* E30FE8 802BC698 C620004C */ lwc1 $f0, 0x4c($s1) /* E30FEC 802BC69C 4600103C */ c.lt.s $f2, $f0 -/* E30FF0 802BC6A0 00000000 */ nop +/* E30FF0 802BC6A0 00000000 */ nop /* E30FF4 802BC6A4 450000B4 */ bc1f .L802BC978 -/* E30FF8 802BC6A8 00000000 */ nop +/* E30FF8 802BC6A8 00000000 */ nop /* E30FFC 802BC6AC E622004C */ swc1 $f2, 0x4c($s1) /* E31000 802BC6B0 92020000 */ lbu $v0, ($s0) /* E31004 802BC6B4 3C014040 */ lui $at, 0x4040 @@ -98,25 +98,25 @@ glabel func_802BC570_E30EC0 /* E31030 802BC6E0 3C0140C9 */ lui $at, 0x40c9 /* E31034 802BC6E4 34210FD0 */ ori $at, $at, 0xfd0 /* E31038 802BC6E8 4481C000 */ mtc1 $at, $f24 -/* E3103C 802BC6EC 00000000 */ nop +/* E3103C 802BC6EC 00000000 */ nop /* E31040 802BC6F0 46186302 */ mul.s $f12, $f12, $f24 -/* E31044 802BC6F4 00000000 */ nop +/* E31044 802BC6F4 00000000 */ nop /* E31048 802BC6F8 3C0143B4 */ lui $at, 0x43b4 /* E3104C 802BC6FC 4481A000 */ mtc1 $at, $f20 /* E31050 802BC700 0C00A85B */ jal sin_rad /* E31054 802BC704 46146303 */ div.s $f12, $f12, $f20 /* E31058 802BC708 C60C0020 */ lwc1 $f12, 0x20($s0) /* E3105C 802BC70C 46006302 */ mul.s $f12, $f12, $f0 -/* E31060 802BC710 00000000 */ nop +/* E31060 802BC710 00000000 */ nop /* E31064 802BC714 0C00A6C9 */ jal clamp_angle /* E31068 802BC718 E62C0068 */ swc1 $f12, 0x68($s1) /* E3106C 802BC71C C600001C */ lwc1 $f0, 0x1c($s0) /* E31070 802BC720 3C0141F0 */ lui $at, 0x41f0 /* E31074 802BC724 4481B000 */ mtc1 $at, $f22 -/* E31078 802BC728 00000000 */ nop +/* E31078 802BC728 00000000 */ nop /* E3107C 802BC72C 46160000 */ add.s $f0, $f0, $f22 /* E31080 802BC730 4600A03E */ c.le.s $f20, $f0 -/* E31084 802BC734 00000000 */ nop +/* E31084 802BC734 00000000 */ nop /* E31088 802BC738 45000003 */ bc1f .L802BC748 /* E3108C 802BC73C E600001C */ swc1 $f0, 0x1c($s0) /* E31090 802BC740 46140001 */ sub.s $f0, $f0, $f20 @@ -124,19 +124,19 @@ glabel func_802BC570_E30EC0 .L802BC748: /* E31098 802BC748 C60C0014 */ lwc1 $f12, 0x14($s0) /* E3109C 802BC74C 46186302 */ mul.s $f12, $f12, $f24 -/* E310A0 802BC750 00000000 */ nop +/* E310A0 802BC750 00000000 */ nop /* E310A4 802BC754 0C00A874 */ jal cos_rad /* E310A8 802BC758 46146303 */ div.s $f12, $f12, $f20 /* E310AC 802BC75C C6020018 */ lwc1 $f2, 0x18($s0) /* E310B0 802BC760 46001082 */ mul.s $f2, $f2, $f0 -/* E310B4 802BC764 00000000 */ nop +/* E310B4 802BC764 00000000 */ nop /* E310B8 802BC768 C620004C */ lwc1 $f0, 0x4c($s1) /* E310BC 802BC76C 46020000 */ add.s $f0, $f0, $f2 /* E310C0 802BC770 E620004C */ swc1 $f0, 0x4c($s1) /* E310C4 802BC774 C6000014 */ lwc1 $f0, 0x14($s0) /* E310C8 802BC778 46160000 */ add.s $f0, $f0, $f22 /* E310CC 802BC77C 4600A03E */ c.le.s $f20, $f0 -/* E310D0 802BC780 00000000 */ nop +/* E310D0 802BC780 00000000 */ nop /* E310D4 802BC784 45000003 */ bc1f .L802BC794 /* E310D8 802BC788 E6000014 */ swc1 $f0, 0x14($s0) /* E310DC 802BC78C 46140001 */ sub.s $f0, $f0, $f20 @@ -152,11 +152,11 @@ glabel func_802BC570_E30EC0 /* E31100 802BC7B0 46200020 */ cvt.s.d $f0, $f0 /* E31104 802BC7B4 460000A1 */ cvt.d.s $f2, $f0 /* E31108 802BC7B8 4624103C */ c.lt.d $f2, $f4 -/* E3110C 802BC7BC 00000000 */ nop +/* E3110C 802BC7BC 00000000 */ nop /* E31110 802BC7C0 4500006D */ bc1f .L802BC978 /* E31114 802BC7C4 E6000018 */ swc1 $f0, 0x18($s0) /* E31118 802BC7C8 080AF256 */ j .L802BC958 -/* E3111C 802BC7CC 00000000 */ nop +/* E3111C 802BC7CC 00000000 */ nop /* E31120 802BC7D0 C6000020 */ lwc1 $f0, 0x20($s0) /* E31124 802BC7D4 3C01802C */ lui $at, %hi(D_802BCBD0) /* E31128 802BC7D8 D422CBD0 */ ldc1 $f2, %lo(D_802BCBD0)($at) @@ -165,7 +165,7 @@ glabel func_802BC570_E30EC0 /* E31134 802BC7E4 4480B000 */ mtc1 $zero, $f22 /* E31138 802BC7E8 46200020 */ cvt.s.d $f0, $f0 /* E3113C 802BC7EC 4616003E */ c.le.s $f0, $f22 -/* E31140 802BC7F0 00000000 */ nop +/* E31140 802BC7F0 00000000 */ nop /* E31144 802BC7F4 45000002 */ bc1f .L802BC800 /* E31148 802BC7F8 E6000020 */ swc1 $f0, 0x20($s0) /* E3114C 802BC7FC E6160020 */ swc1 $f22, 0x20($s0) @@ -174,25 +174,25 @@ glabel func_802BC570_E30EC0 /* E31154 802BC804 3C0140C9 */ lui $at, 0x40c9 /* E31158 802BC808 34210FD0 */ ori $at, $at, 0xfd0 /* E3115C 802BC80C 4481D000 */ mtc1 $at, $f26 -/* E31160 802BC810 00000000 */ nop +/* E31160 802BC810 00000000 */ nop /* E31164 802BC814 461A6302 */ mul.s $f12, $f12, $f26 -/* E31168 802BC818 00000000 */ nop +/* E31168 802BC818 00000000 */ nop /* E3116C 802BC81C 3C0143B4 */ lui $at, 0x43b4 /* E31170 802BC820 4481A000 */ mtc1 $at, $f20 /* E31174 802BC824 0C00A85B */ jal sin_rad /* E31178 802BC828 46146303 */ div.s $f12, $f12, $f20 /* E3117C 802BC82C C60C0020 */ lwc1 $f12, 0x20($s0) /* E31180 802BC830 46006302 */ mul.s $f12, $f12, $f0 -/* E31184 802BC834 00000000 */ nop +/* E31184 802BC834 00000000 */ nop /* E31188 802BC838 0C00A6C9 */ jal clamp_angle /* E3118C 802BC83C E62C0068 */ swc1 $f12, 0x68($s1) /* E31190 802BC840 C600001C */ lwc1 $f0, 0x1c($s0) /* E31194 802BC844 3C0141F0 */ lui $at, 0x41f0 /* E31198 802BC848 4481C000 */ mtc1 $at, $f24 -/* E3119C 802BC84C 00000000 */ nop +/* E3119C 802BC84C 00000000 */ nop /* E311A0 802BC850 46180000 */ add.s $f0, $f0, $f24 /* E311A4 802BC854 4600A03E */ c.le.s $f20, $f0 -/* E311A8 802BC858 00000000 */ nop +/* E311A8 802BC858 00000000 */ nop /* E311AC 802BC85C 45000003 */ bc1f .L802BC86C /* E311B0 802BC860 E600001C */ swc1 $f0, 0x1c($s0) /* E311B4 802BC864 46140001 */ sub.s $f0, $f0, $f20 @@ -202,19 +202,19 @@ glabel func_802BC570_E30EC0 /* E311C0 802BC870 0220202D */ daddu $a0, $s1, $zero /* E311C4 802BC874 C60C0014 */ lwc1 $f12, 0x14($s0) /* E311C8 802BC878 461A6302 */ mul.s $f12, $f12, $f26 -/* E311CC 802BC87C 00000000 */ nop +/* E311CC 802BC87C 00000000 */ nop /* E311D0 802BC880 0C00A874 */ jal cos_rad /* E311D4 802BC884 46146303 */ div.s $f12, $f12, $f20 /* E311D8 802BC888 C6020018 */ lwc1 $f2, 0x18($s0) /* E311DC 802BC88C 46001082 */ mul.s $f2, $f2, $f0 -/* E311E0 802BC890 00000000 */ nop +/* E311E0 802BC890 00000000 */ nop /* E311E4 802BC894 C620004C */ lwc1 $f0, 0x4c($s1) /* E311E8 802BC898 46020000 */ add.s $f0, $f0, $f2 /* E311EC 802BC89C E620004C */ swc1 $f0, 0x4c($s1) /* E311F0 802BC8A0 C6000014 */ lwc1 $f0, 0x14($s0) /* E311F4 802BC8A4 46180000 */ add.s $f0, $f0, $f24 /* E311F8 802BC8A8 4600A03E */ c.le.s $f20, $f0 -/* E311FC 802BC8AC 00000000 */ nop +/* E311FC 802BC8AC 00000000 */ nop /* E31200 802BC8B0 45000003 */ bc1f .L802BC8C0 /* E31204 802BC8B4 E6000014 */ swc1 $f0, 0x14($s0) /* E31208 802BC8B8 46140001 */ sub.s $f0, $f0, $f20 @@ -227,7 +227,7 @@ glabel func_802BC570_E30EC0 /* E31220 802BC8D0 46220001 */ sub.d $f0, $f0, $f2 /* E31224 802BC8D4 46200020 */ cvt.s.d $f0, $f0 /* E31228 802BC8D8 4616003E */ c.le.s $f0, $f22 -/* E3122C 802BC8DC 00000000 */ nop +/* E3122C 802BC8DC 00000000 */ nop /* E31230 802BC8E0 45000025 */ bc1f .L802BC978 /* E31234 802BC8E4 E6000018 */ swc1 $f0, 0x18($s0) /* E31238 802BC8E8 92020000 */ lbu $v0, ($s0) @@ -243,20 +243,20 @@ glabel func_802BC570_E30EC0 /* E31260 802BC910 A2020001 */ sb $v0, 1($s0) /* E31264 802BC914 00021600 */ sll $v0, $v0, 0x18 /* E31268 802BC918 1040000F */ beqz $v0, .L802BC958 -/* E3126C 802BC91C 00000000 */ nop +/* E3126C 802BC91C 00000000 */ nop /* E31270 802BC920 080AF25E */ j .L802BC978 -/* E31274 802BC924 00000000 */ nop +/* E31274 802BC924 00000000 */ nop /* E31278 802BC928 C620004C */ lwc1 $f0, 0x4c($s1) /* E3127C 802BC92C 3C014100 */ lui $at, 0x4100 /* E31280 802BC930 44811000 */ mtc1 $at, $f2 -/* E31284 802BC934 00000000 */ nop +/* E31284 802BC934 00000000 */ nop /* E31288 802BC938 46020001 */ sub.s $f0, $f0, $f2 /* E3128C 802BC93C E620004C */ swc1 $f0, 0x4c($s1) /* E31290 802BC940 C6020010 */ lwc1 $f2, 0x10($s0) /* E31294 802BC944 4602003E */ c.le.s $f0, $f2 -/* E31298 802BC948 00000000 */ nop +/* E31298 802BC948 00000000 */ nop /* E3129C 802BC94C 4500000A */ bc1f .L802BC978 -/* E312A0 802BC950 00000000 */ nop +/* E312A0 802BC950 00000000 */ nop /* E312A4 802BC954 E622004C */ swc1 $f2, 0x4c($s1) .L802BC958: /* E312A8 802BC958 92020000 */ lbu $v0, ($s0) diff --git a/asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s b/asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s index bc066bb5f1..9a5dc8dafe 100644 --- a/asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s +++ b/asm/nonmatchings/code_E2F750/func_802BC99C_E312EC.s @@ -8,9 +8,9 @@ glabel func_802BC99C_E312EC /* E312F8 802BC9A8 3C030200 */ lui $v1, 0x200 /* E312FC 802BC9AC 00431024 */ and $v0, $v0, $v1 /* E31300 802BC9B0 14400003 */ bnez $v0, .L802BC9C0 -/* E31304 802BC9B4 00000000 */ nop +/* E31304 802BC9B4 00000000 */ nop /* E31308 802BC9B8 0C043F5A */ jal func_8010FD68 -/* E3130C 802BC9BC 00000000 */ nop +/* E3130C 802BC9BC 00000000 */ nop .L802BC9C0: /* E31310 802BC9C0 8FBF0010 */ lw $ra, 0x10($sp) /* E31314 802BC9C4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s b/asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s index 125ac08993..4a89290ee2 100644 --- a/asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s +++ b/asm/nonmatchings/code_E2F750/func_802BC9CC_E3131C.s @@ -8,9 +8,9 @@ glabel func_802BC9CC_E3131C /* E31328 802BC9D8 90420002 */ lbu $v0, 2($v0) /* E3132C 802BC9DC 30420001 */ andi $v0, $v0, 1 /* E31330 802BC9E0 10400003 */ beqz $v0, .L802BC9F0 -/* E31334 802BC9E4 00000000 */ nop +/* E31334 802BC9E4 00000000 */ nop /* E31338 802BC9E8 0C04419E */ jal func_80110678 -/* E3133C 802BC9EC 00000000 */ nop +/* E3133C 802BC9EC 00000000 */ nop .L802BC9F0: /* E31340 802BC9F0 8FBF0010 */ lw $ra, 0x10($sp) /* E31344 802BC9F4 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s b/asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s index d4bce302a7..9285905c9a 100644 --- a/asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s +++ b/asm/nonmatchings/code_E2F750/func_802BC9FC_E3134C.s @@ -13,5 +13,5 @@ glabel func_802BC9FC_E3134C /* E3136C 802BCA1C C4800050 */ lwc1 $f0, 0x50($a0) /* E31370 802BCA20 03E00008 */ jr $ra /* E31374 802BCA24 E460000C */ swc1 $f0, 0xc($v1) -/* E31378 802BCA28 00000000 */ nop -/* E3137C 802BCA2C 00000000 */ nop +/* E31378 802BCA28 00000000 */ nop +/* E3137C 802BCA2C 00000000 */ nop diff --git a/asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s b/asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s index b59f1dfa7e..adb92517cb 100644 --- a/asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s +++ b/asm/nonmatchings/code_EA6FD0/func_80240000_EA6FD0.s @@ -18,4 +18,4 @@ glabel func_80240000_EA6FD0 /* EA7000 80240030 8FBF0010 */ lw $ra, 0x10($sp) /* EA7004 80240034 03E00008 */ jr $ra /* EA7008 80240038 27BD0018 */ addiu $sp, $sp, 0x18 -/* EA700C 8024003C 00000000 */ nop +/* EA700C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB5130/func_80240124_EB5254.s b/asm/nonmatchings/code_EB5130/func_80240124_EB5254.s index f44e380db0..f79394b4e7 100644 --- a/asm/nonmatchings/code_EB5130/func_80240124_EB5254.s +++ b/asm/nonmatchings/code_EB5130/func_80240124_EB5254.s @@ -14,7 +14,7 @@ glabel func_80240124_EB5254 .L80240148: /* EB5278 80240148 8E020070 */ lw $v0, 0x70($s0) /* EB527C 8024014C 1440000E */ bnez $v0, .L80240188 -/* EB5280 80240150 00000000 */ nop +/* EB5280 80240150 00000000 */ nop /* EB5284 80240154 8E0300A8 */ lw $v1, 0xa8($s0) /* EB5288 80240158 8E020088 */ lw $v0, 0x88($s0) /* EB528C 8024015C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240124_EB5254 .L80240188: /* EB52B8 80240188 8E020074 */ lw $v0, 0x74($s0) /* EB52BC 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EB52C0 80240190 00000000 */ nop +/* EB52C0 80240190 00000000 */ nop /* EB52C4 80240194 8E0300AC */ lw $v1, 0xac($s0) /* EB52C8 80240198 8E02008C */ lw $v0, 0x8c($s0) /* EB52CC 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240124_EB5254 .L802401C8: /* EB52F8 802401C8 8E020078 */ lw $v0, 0x78($s0) /* EB52FC 802401CC 1440000E */ bnez $v0, .L80240208 -/* EB5300 802401D0 00000000 */ nop +/* EB5300 802401D0 00000000 */ nop /* EB5304 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) /* EB5308 802401D8 8E020090 */ lw $v0, 0x90($s0) /* EB530C 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240124_EB5254 .L80240208: /* EB5338 80240208 8E02007C */ lw $v0, 0x7c($s0) /* EB533C 8024020C 1440000E */ bnez $v0, .L80240248 -/* EB5340 80240210 00000000 */ nop +/* EB5340 80240210 00000000 */ nop /* EB5344 80240214 8E0300B4 */ lw $v1, 0xb4($s0) /* EB5348 80240218 8E020094 */ lw $v0, 0x94($s0) /* EB534C 8024021C 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s b/asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s index 3a5e7dafca..1e8dfafa7a 100644 --- a/asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s +++ b/asm/nonmatchings/code_EB5130/func_8024030C_EB543C.s @@ -13,5 +13,5 @@ glabel func_8024030C_EB543C /* EB545C 8024032C 24020002 */ addiu $v0, $zero, 2 /* EB5460 80240330 03E00008 */ jr $ra /* EB5464 80240334 27BD0018 */ addiu $sp, $sp, 0x18 -/* EB5468 80240338 00000000 */ nop -/* EB546C 8024033C 00000000 */ nop +/* EB5468 80240338 00000000 */ nop +/* EB546C 8024033C 00000000 */ nop diff --git a/asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s b/asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s index 5b521e69ea..884c7e915f 100644 --- a/asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s +++ b/asm/nonmatchings/code_EB8E50/func_80240000_EB8E50.s @@ -15,6 +15,6 @@ glabel func_80240000_EB8E50 /* EB8E78 80240028 24020002 */ addiu $v0, $zero, 2 /* EB8E7C 8024002C 03E00008 */ jr $ra /* EB8E80 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* EB8E84 80240034 00000000 */ nop -/* EB8E88 80240038 00000000 */ nop -/* EB8E8C 8024003C 00000000 */ nop +/* EB8E84 80240034 00000000 */ nop +/* EB8E88 80240038 00000000 */ nop +/* EB8E8C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EC2610/func_80240410_EC2610.s b/asm/nonmatchings/code_EC2610/func_80240410_EC2610.s index 44e7bfbd73..e87d2c5ad8 100644 --- a/asm/nonmatchings/code_EC2610/func_80240410_EC2610.s +++ b/asm/nonmatchings/code_EC2610/func_80240410_EC2610.s @@ -14,12 +14,12 @@ glabel func_80240410_EC2610 /* EC2634 80240434 0C01B198 */ jal osGetCause /* EC2638 80240438 0080802D */ daddu $s0, $a0, $zero /* EC263C 8024043C 4616A582 */ mul.s $f22, $f20, $f22 -/* EC2640 80240440 00000000 */ nop +/* EC2640 80240440 00000000 */ nop /* EC2644 80240444 4618A502 */ mul.s $f20, $f20, $f24 -/* EC2648 80240448 00000000 */ nop +/* EC2648 80240448 00000000 */ nop /* EC264C 8024044C 3C013F80 */ lui $at, 0x3f80 /* EC2650 80240450 44810000 */ mtc1 $at, $f0 -/* EC2654 80240454 00000000 */ nop +/* EC2654 80240454 00000000 */ nop /* EC2658 80240458 E6000014 */ swc1 $f0, 0x14($s0) /* EC265C 8024045C E6160010 */ swc1 $f22, 0x10($s0) /* EC2660 80240460 E6140018 */ swc1 $f20, 0x18($s0) diff --git a/asm/nonmatchings/code_EC2610/func_80240480_EC2680.s b/asm/nonmatchings/code_EC2610/func_80240480_EC2680.s index fec61707e1..96f645b9c9 100644 --- a/asm/nonmatchings/code_EC2610/func_80240480_EC2680.s +++ b/asm/nonmatchings/code_EC2610/func_80240480_EC2680.s @@ -119,4 +119,4 @@ glabel func_80240480_EC2680 /* EC2840 80240640 24020002 */ addiu $v0, $zero, 2 /* EC2844 80240644 03E00008 */ jr $ra /* EC2848 80240648 27BD0088 */ addiu $sp, $sp, 0x88 -/* EC284C 8024064C 00000000 */ nop +/* EC284C 8024064C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s b/asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s index 8483c2025a..f9ea301c63 100644 --- a/asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s +++ b/asm/nonmatchings/code_ECAA80/func_80240D80_ECAA80.s @@ -61,20 +61,20 @@ glabel func_80240D80_ECAA80 /* ECAB60 80240E60 8E22001C */ lw $v0, 0x1c($s1) /* ECAB64 80240E64 46001005 */ abs.s $f0, $f2 /* ECAB68 80240E68 44822000 */ mtc1 $v0, $f4 -/* ECAB6C 80240E6C 00000000 */ nop +/* ECAB6C 80240E6C 00000000 */ nop /* ECAB70 80240E70 46802120 */ cvt.s.w $f4, $f4 /* ECAB74 80240E74 4600203C */ c.lt.s $f4, $f0 -/* ECAB78 80240E78 00000000 */ nop +/* ECAB78 80240E78 00000000 */ nop /* ECAB7C 80240E7C 4500000D */ bc1f .L80240EB4 -/* ECAB80 80240E80 00000000 */ nop +/* ECAB80 80240E80 00000000 */ nop /* ECAB84 80240E84 44800000 */ mtc1 $zero, $f0 /* ECAB88 80240E88 C614000C */ lwc1 $f20, 0xc($s0) /* ECAB8C 80240E8C 4600103C */ c.lt.s $f2, $f0 -/* ECAB90 80240E90 00000000 */ nop +/* ECAB90 80240E90 00000000 */ nop /* ECAB94 80240E94 45000006 */ bc1f .L80240EB0 /* ECAB98 80240E98 00021023 */ negu $v0, $v0 /* ECAB9C 80240E9C 44820000 */ mtc1 $v0, $f0 -/* ECABA0 80240EA0 00000000 */ nop +/* ECABA0 80240EA0 00000000 */ nop /* ECABA4 80240EA4 46800020 */ cvt.s.w $f0, $f0 /* ECABA8 80240EA8 080903AD */ j .L80240EB4 /* ECABAC 80240EAC 4600A500 */ add.s $f20, $f20, $f0 @@ -108,7 +108,7 @@ glabel func_80240D80_ECAA80 /* ECAC14 80240F14 4480E000 */ mtc1 $zero, $f28 /* ECAC18 80240F18 460010A1 */ cvt.d.s $f2, $f2 /* ECAC1C 80240F1C 463C1082 */ mul.d $f2, $f2, $f28 -/* ECAC20 80240F20 00000000 */ nop +/* ECAC20 80240F20 00000000 */ nop /* ECAC24 80240F24 46000506 */ mov.s $f20, $f0 /* ECAC28 80240F28 27A50020 */ addiu $a1, $sp, 0x20 /* ECAC2C 80240F2C 27A60024 */ addiu $a2, $sp, 0x24 @@ -119,20 +119,20 @@ glabel func_80240D80_ECAA80 /* ECAC40 80240F40 860200A8 */ lh $v0, 0xa8($s0) /* ECAC44 80240F44 4480B000 */ mtc1 $zero, $f22 /* ECAC48 80240F48 44820000 */ mtc1 $v0, $f0 -/* ECAC4C 80240F4C 00000000 */ nop +/* ECAC4C 80240F4C 00000000 */ nop /* ECAC50 80240F50 46800020 */ cvt.s.w $f0, $f0 /* ECAC54 80240F54 E7A00018 */ swc1 $f0, 0x18($sp) /* ECAC58 80240F58 860200A6 */ lh $v0, 0xa6($s0) /* ECAC5C 80240F5C 4600B606 */ mov.s $f24, $f22 /* ECAC60 80240F60 44820000 */ mtc1 $v0, $f0 -/* ECAC64 80240F64 00000000 */ nop +/* ECAC64 80240F64 00000000 */ nop /* ECAC68 80240F68 46800020 */ cvt.s.w $f0, $f0 /* ECAC6C 80240F6C E7A0001C */ swc1 $f0, 0x1c($sp) /* ECAC70 80240F70 8E040080 */ lw $a0, 0x80($s0) /* ECAC74 80240F74 0C0394EB */ jal func_800E53AC /* ECAC78 80240F78 4600C686 */ mov.s $f26, $f24 /* ECAC7C 80240F7C 104000E1 */ beqz $v0, .L80241304 -/* ECAC80 80240F80 00000000 */ nop +/* ECAC80 80240F80 00000000 */ nop /* ECAC84 80240F84 C60C0038 */ lwc1 $f12, 0x38($s0) /* ECAC88 80240F88 C60E0040 */ lwc1 $f14, 0x40($s0) /* ECAC8C 80240F8C 8FA60020 */ lw $a2, 0x20($sp) @@ -152,27 +152,27 @@ glabel func_80240D80_ECAA80 /* ECACC4 80240FC4 C6020018 */ lwc1 $f2, 0x18($s0) /* ECACC8 80240FC8 460010A1 */ cvt.d.s $f2, $f2 /* ECACCC 80240FCC 463C1082 */ mul.d $f2, $f2, $f28 -/* ECACD0 80240FD0 00000000 */ nop +/* ECACD0 80240FD0 00000000 */ nop /* ECACD4 80240FD4 E7A00014 */ swc1 $f0, 0x14($sp) /* ECACD8 80240FD8 462010A0 */ cvt.s.d $f2, $f2 /* ECACDC 80240FDC E7A20010 */ swc1 $f2, 0x10($sp) /* ECACE0 80240FE0 860200A8 */ lh $v0, 0xa8($s0) /* ECACE4 80240FE4 27A5002C */ addiu $a1, $sp, 0x2c /* ECACE8 80240FE8 44820000 */ mtc1 $v0, $f0 -/* ECACEC 80240FEC 00000000 */ nop +/* ECACEC 80240FEC 00000000 */ nop /* ECACF0 80240FF0 46800020 */ cvt.s.w $f0, $f0 /* ECACF4 80240FF4 E7A00018 */ swc1 $f0, 0x18($sp) /* ECACF8 80240FF8 860200A6 */ lh $v0, 0xa6($s0) /* ECACFC 80240FFC 27A60030 */ addiu $a2, $sp, 0x30 /* ECAD00 80241000 44820000 */ mtc1 $v0, $f0 -/* ECAD04 80241004 00000000 */ nop +/* ECAD04 80241004 00000000 */ nop /* ECAD08 80241008 46800020 */ cvt.s.w $f0, $f0 /* ECAD0C 8024100C E7A0001C */ swc1 $f0, 0x1c($sp) /* ECAD10 80241010 8E040080 */ lw $a0, 0x80($s0) /* ECAD14 80241014 0C0394EB */ jal func_800E53AC /* ECAD18 80241018 27A70034 */ addiu $a3, $sp, 0x34 /* ECAD1C 8024101C 10400007 */ beqz $v0, .L8024103C -/* ECAD20 80241020 00000000 */ nop +/* ECAD20 80241020 00000000 */ nop /* ECAD24 80241024 C60C0038 */ lwc1 $f12, 0x38($s0) /* ECAD28 80241028 C60E0040 */ lwc1 $f14, 0x40($s0) /* ECAD2C 8024102C 8FA6002C */ lw $a2, 0x2c($sp) @@ -191,27 +191,27 @@ glabel func_80240D80_ECAA80 /* ECAD5C 8024105C C6020018 */ lwc1 $f2, 0x18($s0) /* ECAD60 80241060 460010A1 */ cvt.d.s $f2, $f2 /* ECAD64 80241064 463C1082 */ mul.d $f2, $f2, $f28 -/* ECAD68 80241068 00000000 */ nop +/* ECAD68 80241068 00000000 */ nop /* ECAD6C 8024106C E7A00014 */ swc1 $f0, 0x14($sp) /* ECAD70 80241070 462010A0 */ cvt.s.d $f2, $f2 /* ECAD74 80241074 E7A20010 */ swc1 $f2, 0x10($sp) /* ECAD78 80241078 860200A8 */ lh $v0, 0xa8($s0) /* ECAD7C 8024107C 27A50038 */ addiu $a1, $sp, 0x38 /* ECAD80 80241080 44820000 */ mtc1 $v0, $f0 -/* ECAD84 80241084 00000000 */ nop +/* ECAD84 80241084 00000000 */ nop /* ECAD88 80241088 46800020 */ cvt.s.w $f0, $f0 /* ECAD8C 8024108C E7A00018 */ swc1 $f0, 0x18($sp) /* ECAD90 80241090 860200A6 */ lh $v0, 0xa6($s0) /* ECAD94 80241094 27A6003C */ addiu $a2, $sp, 0x3c /* ECAD98 80241098 44820000 */ mtc1 $v0, $f0 -/* ECAD9C 8024109C 00000000 */ nop +/* ECAD9C 8024109C 00000000 */ nop /* ECADA0 802410A0 46800020 */ cvt.s.w $f0, $f0 /* ECADA4 802410A4 E7A0001C */ swc1 $f0, 0x1c($sp) /* ECADA8 802410A8 8E040080 */ lw $a0, 0x80($s0) /* ECADAC 802410AC 0C0394EB */ jal func_800E53AC /* ECADB0 802410B0 27A70040 */ addiu $a3, $sp, 0x40 /* ECADB4 802410B4 10400007 */ beqz $v0, .L802410D4 -/* ECADB8 802410B8 00000000 */ nop +/* ECADB8 802410B8 00000000 */ nop /* ECADBC 802410BC C60C0038 */ lwc1 $f12, 0x38($s0) /* ECADC0 802410C0 C60E0040 */ lwc1 $f14, 0x40($s0) /* ECADC4 802410C4 8FA60038 */ lw $a2, 0x38($sp) @@ -231,20 +231,20 @@ glabel func_80240D80_ECAA80 /* ECADF8 802410F8 44801000 */ mtc1 $zero, $f2 /* ECADFC 802410FC 46000021 */ cvt.d.s $f0, $f0 /* ECAE00 80241100 46220082 */ mul.d $f2, $f0, $f2 -/* ECAE04 80241104 00000000 */ nop +/* ECAE04 80241104 00000000 */ nop /* ECAE08 80241108 4600B021 */ cvt.d.s $f0, $f22 /* ECAE0C 8024110C 4622003C */ c.lt.d $f0, $f2 -/* ECAE10 80241110 00000000 */ nop +/* ECAE10 80241110 00000000 */ nop /* ECAE14 80241114 45000012 */ bc1f .L80241160 -/* ECAE18 80241118 00000000 */ nop +/* ECAE18 80241118 00000000 */ nop /* ECAE1C 8024111C 4600C021 */ cvt.d.s $f0, $f24 /* ECAE20 80241120 4622003C */ c.lt.d $f0, $f2 -/* ECAE24 80241124 00000000 */ nop +/* ECAE24 80241124 00000000 */ nop /* ECAE28 80241128 4500000D */ bc1f .L80241160 -/* ECAE2C 8024112C 00000000 */ nop +/* ECAE2C 8024112C 00000000 */ nop /* ECAE30 80241130 4600D021 */ cvt.d.s $f0, $f26 /* ECAE34 80241134 4622003C */ c.lt.d $f0, $f2 -/* ECAE38 80241138 00000000 */ nop +/* ECAE38 80241138 00000000 */ nop /* ECAE3C 8024113C 45000008 */ bc1f .L80241160 /* ECAE40 80241140 02A0202D */ daddu $a0, $s5, $zero /* ECAE44 80241144 AFA00010 */ sw $zero, 0x10($sp) @@ -258,13 +258,13 @@ glabel func_80240D80_ECAA80 /* ECAE60 80241160 1660006A */ bnez $s3, .L8024130C /* ECAE64 80241164 2402000A */ addiu $v0, $zero, 0xa /* ECAE68 80241168 4616C03C */ c.lt.s $f24, $f22 -/* ECAE6C 8024116C 00000000 */ nop +/* ECAE6C 8024116C 00000000 */ nop /* ECAE70 80241170 4500000C */ bc1f .L802411A4 -/* ECAE74 80241174 00000000 */ nop +/* ECAE74 80241174 00000000 */ nop /* ECAE78 80241178 4618D03C */ c.lt.s $f26, $f24 -/* ECAE7C 8024117C 00000000 */ nop +/* ECAE7C 8024117C 00000000 */ nop /* ECAE80 80241180 45000006 */ bc1f .L8024119C -/* ECAE84 80241184 00000000 */ nop +/* ECAE84 80241184 00000000 */ nop /* ECAE88 80241188 C60C0038 */ lwc1 $f12, 0x38($s0) /* ECAE8C 8024118C C60E0040 */ lwc1 $f14, 0x40($s0) /* ECAE90 80241190 8FA60020 */ lw $a2, 0x20($sp) @@ -272,14 +272,14 @@ glabel func_80240D80_ECAA80 /* ECAE98 80241198 8FA70028 */ lw $a3, 0x28($sp) .L8024119C: /* ECAE9C 8024119C 4616C03C */ c.lt.s $f24, $f22 -/* ECAEA0 802411A0 00000000 */ nop +/* ECAEA0 802411A0 00000000 */ nop .L802411A4: /* ECAEA4 802411A4 4500000A */ bc1f .L802411D0 -/* ECAEA8 802411A8 00000000 */ nop +/* ECAEA8 802411A8 00000000 */ nop /* ECAEAC 802411AC 461AC03C */ c.lt.s $f24, $f26 -/* ECAEB0 802411B0 00000000 */ nop +/* ECAEB0 802411B0 00000000 */ nop /* ECAEB4 802411B4 45000006 */ bc1f .L802411D0 -/* ECAEB8 802411B8 00000000 */ nop +/* ECAEB8 802411B8 00000000 */ nop /* ECAEBC 802411BC C60C0038 */ lwc1 $f12, 0x38($s0) /* ECAEC0 802411C0 C60E0040 */ lwc1 $f14, 0x40($s0) /* ECAEC4 802411C4 8FA60020 */ lw $a2, 0x20($sp) @@ -287,13 +287,13 @@ glabel func_80240D80_ECAA80 /* ECAECC 802411CC 8FA70028 */ lw $a3, 0x28($sp) .L802411D0: /* ECAED0 802411D0 4618B03C */ c.lt.s $f22, $f24 -/* ECAED4 802411D4 00000000 */ nop +/* ECAED4 802411D4 00000000 */ nop /* ECAED8 802411D8 4500000A */ bc1f .L80241204 -/* ECAEDC 802411DC 00000000 */ nop +/* ECAEDC 802411DC 00000000 */ nop /* ECAEE0 802411E0 4616D03C */ c.lt.s $f26, $f22 -/* ECAEE4 802411E4 00000000 */ nop +/* ECAEE4 802411E4 00000000 */ nop /* ECAEE8 802411E8 45000006 */ bc1f .L80241204 -/* ECAEEC 802411EC 00000000 */ nop +/* ECAEEC 802411EC 00000000 */ nop /* ECAEF0 802411F0 C60C0038 */ lwc1 $f12, 0x38($s0) /* ECAEF4 802411F4 C60E0040 */ lwc1 $f14, 0x40($s0) /* ECAEF8 802411F8 8FA6002C */ lw $a2, 0x2c($sp) @@ -301,13 +301,13 @@ glabel func_80240D80_ECAA80 /* ECAF00 80241200 8FA70034 */ lw $a3, 0x34($sp) .L80241204: /* ECAF04 80241204 4618D03C */ c.lt.s $f26, $f24 -/* ECAF08 80241208 00000000 */ nop +/* ECAF08 80241208 00000000 */ nop /* ECAF0C 8024120C 4500000A */ bc1f .L80241238 -/* ECAF10 80241210 00000000 */ nop +/* ECAF10 80241210 00000000 */ nop /* ECAF14 80241214 461AB03C */ c.lt.s $f22, $f26 -/* ECAF18 80241218 00000000 */ nop +/* ECAF18 80241218 00000000 */ nop /* ECAF1C 8024121C 45000008 */ bc1f .L80241240 -/* ECAF20 80241220 00000000 */ nop +/* ECAF20 80241220 00000000 */ nop /* ECAF24 80241224 C60C0038 */ lwc1 $f12, 0x38($s0) /* ECAF28 80241228 C60E0040 */ lwc1 $f14, 0x40($s0) /* ECAF2C 8024122C 8FA6002C */ lw $a2, 0x2c($sp) @@ -315,23 +315,23 @@ glabel func_80240D80_ECAA80 /* ECAF34 80241234 8FA70034 */ lw $a3, 0x34($sp) .L80241238: /* ECAF38 80241238 461AB03C */ c.lt.s $f22, $f26 -/* ECAF3C 8024123C 00000000 */ nop +/* ECAF3C 8024123C 00000000 */ nop .L80241240: /* ECAF40 80241240 45000005 */ bc1f .L80241258 -/* ECAF44 80241244 00000000 */ nop +/* ECAF44 80241244 00000000 */ nop /* ECAF48 80241248 4616C03C */ c.lt.s $f24, $f22 -/* ECAF4C 8024124C 00000000 */ nop +/* ECAF4C 8024124C 00000000 */ nop /* ECAF50 80241250 45010009 */ bc1t .L80241278 -/* ECAF54 80241254 00000000 */ nop +/* ECAF54 80241254 00000000 */ nop .L80241258: /* ECAF58 80241258 461AC03C */ c.lt.s $f24, $f26 -/* ECAF5C 8024125C 00000000 */ nop +/* ECAF5C 8024125C 00000000 */ nop /* ECAF60 80241260 4500000C */ bc1f .L80241294 -/* ECAF64 80241264 00000000 */ nop +/* ECAF64 80241264 00000000 */ nop /* ECAF68 80241268 4618B03C */ c.lt.s $f22, $f24 -/* ECAF6C 8024126C 00000000 */ nop +/* ECAF6C 8024126C 00000000 */ nop /* ECAF70 80241270 45000008 */ bc1f .L80241294 -/* ECAF74 80241274 00000000 */ nop +/* ECAF74 80241274 00000000 */ nop .L80241278: /* ECAF78 80241278 C60C0038 */ lwc1 $f12, 0x38($s0) /* ECAF7C 8024127C C60E0040 */ lwc1 $f14, 0x40($s0) @@ -339,7 +339,7 @@ glabel func_80240D80_ECAA80 /* ECAF84 80241284 8FA70040 */ lw $a3, 0x40($sp) .L80241288: /* ECAF88 80241288 0C00ABDC */ jal fio_validate_header_checksums -/* ECAF8C 8024128C 00000000 */ nop +/* ECAF8C 8024128C 00000000 */ nop /* ECAF90 80241290 46000506 */ mov.s $f20, $f0 .L80241294: /* ECAF94 80241294 C60C000C */ lwc1 $f12, 0xc($s0) @@ -349,20 +349,20 @@ glabel func_80240D80_ECAA80 /* ECAFA4 802412A4 8E22001C */ lw $v0, 0x1c($s1) /* ECAFA8 802412A8 46001005 */ abs.s $f0, $f2 /* ECAFAC 802412AC 44822000 */ mtc1 $v0, $f4 -/* ECAFB0 802412B0 00000000 */ nop +/* ECAFB0 802412B0 00000000 */ nop /* ECAFB4 802412B4 46802120 */ cvt.s.w $f4, $f4 /* ECAFB8 802412B8 4600203C */ c.lt.s $f4, $f0 -/* ECAFBC 802412BC 00000000 */ nop +/* ECAFBC 802412BC 00000000 */ nop /* ECAFC0 802412C0 4500000D */ bc1f .L802412F8 -/* ECAFC4 802412C4 00000000 */ nop +/* ECAFC4 802412C4 00000000 */ nop /* ECAFC8 802412C8 44800000 */ mtc1 $zero, $f0 /* ECAFCC 802412CC C614000C */ lwc1 $f20, 0xc($s0) /* ECAFD0 802412D0 4600103C */ c.lt.s $f2, $f0 -/* ECAFD4 802412D4 00000000 */ nop +/* ECAFD4 802412D4 00000000 */ nop /* ECAFD8 802412D8 45000006 */ bc1f .L802412F4 /* ECAFDC 802412DC 00021023 */ negu $v0, $v0 /* ECAFE0 802412E0 44820000 */ mtc1 $v0, $f0 -/* ECAFE4 802412E4 00000000 */ nop +/* ECAFE4 802412E4 00000000 */ nop /* ECAFE8 802412E8 46800020 */ cvt.s.w $f0, $f0 /* ECAFEC 802412EC 080904BE */ j .L802412F8 /* ECAFF0 802412F0 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s b/asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s index 9fe0b4a40f..4202dc9021 100644 --- a/asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s +++ b/asm/nonmatchings/code_ECAA80/func_80241364_ECB064.s @@ -36,7 +36,7 @@ glabel func_80241364_ECB064 /* ECB0E0 802413E0 2402000F */ addiu $v0, $zero, 0xf /* ECB0E4 802413E4 AFA2001C */ sw $v0, 0x1c($sp) /* ECB0E8 802413E8 44833000 */ mtc1 $v1, $f6 -/* ECB0EC 802413EC 00000000 */ nop +/* ECB0EC 802413EC 00000000 */ nop /* ECB0F0 802413F0 468031A0 */ cvt.s.w $f6, $f6 /* ECB0F4 802413F4 44073000 */ mfc1 $a3, $f6 /* ECB0F8 802413F8 27A20028 */ addiu $v0, $sp, 0x28 @@ -57,14 +57,14 @@ glabel func_80241364_ECB064 /* ECB130 80241430 8E030028 */ lw $v1, 0x28($s0) /* ECB134 80241434 8C420020 */ lw $v0, 0x20($v0) /* ECB138 80241438 10620014 */ beq $v1, $v0, .L8024148C -/* ECB13C 8024143C 00000000 */ nop +/* ECB13C 8024143C 00000000 */ nop /* ECB140 80241440 C6000018 */ lwc1 $f0, 0x18($s0) /* ECB144 80241444 3C014010 */ lui $at, 0x4010 /* ECB148 80241448 44811800 */ mtc1 $at, $f3 /* ECB14C 8024144C 44801000 */ mtc1 $zero, $f2 /* ECB150 80241450 46000021 */ cvt.d.s $f0, $f0 /* ECB154 80241454 4622003C */ c.lt.d $f0, $f2 -/* ECB158 80241458 00000000 */ nop +/* ECB158 80241458 00000000 */ nop /* ECB15C 8024145C 45000003 */ bc1f .L8024146C /* ECB160 80241460 0000282D */ daddu $a1, $zero, $zero /* ECB164 80241464 0809051D */ j .L80241474 @@ -74,7 +74,7 @@ glabel func_80241364_ECB064 /* ECB170 80241470 24050001 */ addiu $a1, $zero, 1 .L80241474: /* ECB174 80241474 0C010420 */ jal func_80041080 -/* ECB178 80241478 00000000 */ nop +/* ECB178 80241478 00000000 */ nop /* ECB17C 8024147C 8E050018 */ lw $a1, 0x18($s0) /* ECB180 80241480 8E06000C */ lw $a2, 0xc($s0) /* ECB184 80241484 0C00F909 */ jal func_8003E424 diff --git a/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s b/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s index c2739d3d5f..9c808edb82 100644 --- a/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s +++ b/asm/nonmatchings/code_ECAA80/func_8024150C_ECB20C.s @@ -57,7 +57,7 @@ glabel func_8024150C_ECB20C /* ECB2DC 802415DC 8E2200B0 */ lw $v0, 0xb0($s1) /* ECB2E0 802415E0 30420004 */ andi $v0, $v0, 4 /* ECB2E4 802415E4 1040001F */ beqz $v0, .L80241664 -/* ECB2E8 802415E8 00000000 */ nop +/* ECB2E8 802415E8 00000000 */ nop .L802415EC: /* ECB2EC 802415EC 2404F7FF */ addiu $a0, $zero, -0x801 /* ECB2F0 802415F0 AEA00070 */ sw $zero, 0x70($s5) @@ -100,7 +100,7 @@ glabel func_8024150C_ECB20C /* ECB378 80241678 00220821 */ addu $at, $at, $v0 /* ECB37C 8024167C 8C226160 */ lw $v0, %lo(D_80246160)($at) /* ECB380 80241680 00400008 */ jr $v0 -/* ECB384 80241684 00000000 */ nop +/* ECB384 80241684 00000000 */ nop /* ECB388 80241688 02A0202D */ daddu $a0, $s5, $zero /* ECB38C 8024168C 0260282D */ daddu $a1, $s3, $zero /* ECB390 80241690 0C013670 */ jal func_8004D9C0 @@ -110,7 +110,7 @@ glabel func_8024150C_ECB20C /* ECB3A0 802416A0 0C0136B6 */ jal func_8004DAD8 /* ECB3A4 802416A4 0280302D */ daddu $a2, $s4, $zero /* ECB3A8 802416A8 080905D2 */ j .L80241748 -/* ECB3AC 802416AC 00000000 */ nop +/* ECB3AC 802416AC 00000000 */ nop /* ECB3B0 802416B0 02A0202D */ daddu $a0, $s5, $zero /* ECB3B4 802416B4 0260282D */ daddu $a1, $s3, $zero /* ECB3B8 802416B8 0C0137D9 */ jal func_8004DF64 @@ -120,7 +120,7 @@ glabel func_8024150C_ECB20C /* ECB3C8 802416C8 0C013809 */ jal func_8004E024 /* ECB3CC 802416CC 0280302D */ daddu $a2, $s4, $zero /* ECB3D0 802416D0 080905D2 */ j .L80241748 -/* ECB3D4 802416D4 00000000 */ nop +/* ECB3D4 802416D4 00000000 */ nop /* ECB3D8 802416D8 02A0202D */ daddu $a0, $s5, $zero /* ECB3DC 802416DC 0260282D */ daddu $a1, $s3, $zero /* ECB3E0 802416E0 0C013897 */ jal func_8004E25C @@ -130,7 +130,7 @@ glabel func_8024150C_ECB20C /* ECB3F0 802416F0 0C0138BB */ jal func_8004E2EC /* ECB3F4 802416F4 0280302D */ daddu $a2, $s4, $zero /* ECB3F8 802416F8 080905D2 */ j .L80241748 -/* ECB3FC 802416FC 00000000 */ nop +/* ECB3FC 802416FC 00000000 */ nop /* ECB400 80241700 02A0202D */ daddu $a0, $s5, $zero /* ECB404 80241704 0260282D */ daddu $a1, $s3, $zero /* ECB408 80241708 0C090360 */ jal func_80240D80_ECAA80 @@ -140,13 +140,13 @@ glabel func_8024150C_ECB20C /* ECB418 80241718 0C0904D9 */ jal func_80241364_ECB064 /* ECB41C 8024171C 0280302D */ daddu $a2, $s4, $zero /* ECB420 80241720 080905D2 */ j .L80241748 -/* ECB424 80241724 00000000 */ nop +/* ECB424 80241724 00000000 */ nop /* 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 +/* ECB43C 8024173C 00000000 */ nop /* ECB440 80241740 0C013AE3 */ jal func_8004EB8C /* ECB444 80241744 02A0202D */ daddu $a0, $s5, $zero .L80241748: diff --git a/asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s b/asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s index 25da94c706..a6b4aaa3a1 100644 --- a/asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s +++ b/asm/nonmatchings/code_ECAA80/func_80241770_ECB470.s @@ -14,7 +14,7 @@ glabel func_80241770_ECB470 /* ECB494 80241794 0C00F94D */ jal func_8003E534 /* ECB498 80241798 0040202D */ daddu $a0, $v0, $zero /* ECB49C 8024179C 10400005 */ beqz $v0, .L802417B4 -/* ECB4A0 802417A0 00000000 */ nop +/* ECB4A0 802417A0 00000000 */ nop /* ECB4A4 802417A4 8E050000 */ lw $a1, ($s0) /* ECB4A8 802417A8 844600A8 */ lh $a2, 0xa8($v0) /* ECB4AC 802417AC 0C0B551A */ jal func_802D5468 diff --git a/asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s b/asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s index b94e84127f..51e13ce872 100644 --- a/asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s +++ b/asm/nonmatchings/code_ECAA80/func_802417CC_ECB4CC.s @@ -21,7 +21,7 @@ glabel func_802417CC_ECB4CC /* ECB50C 8024180C 0C0B53A3 */ jal func_802D4E8C /* ECB510 80241810 0260282D */ daddu $a1, $s3, $zero /* ECB514 80241814 4482E000 */ mtc1 $v0, $f28 -/* ECB518 80241818 00000000 */ nop +/* ECB518 80241818 00000000 */ nop /* ECB51C 8024181C 4680E720 */ cvt.s.w $f28, $f28 /* ECB520 80241820 8E140000 */ lw $s4, ($s0) /* ECB524 80241824 26100004 */ addiu $s0, $s0, 4 @@ -29,14 +29,14 @@ glabel func_802417CC_ECB4CC /* ECB52C 8024182C 0C0B53A3 */ jal func_802D4E8C /* ECB530 80241830 0280282D */ daddu $a1, $s4, $zero /* ECB534 80241834 4482D000 */ mtc1 $v0, $f26 -/* ECB538 80241838 00000000 */ nop +/* ECB538 80241838 00000000 */ nop /* ECB53C 8024183C 4680D6A0 */ cvt.s.w $f26, $f26 /* ECB540 80241840 8E100000 */ lw $s0, ($s0) /* ECB544 80241844 0220202D */ daddu $a0, $s1, $zero /* ECB548 80241848 0C0B53A3 */ jal func_802D4E8C /* ECB54C 8024184C 0200282D */ daddu $a1, $s0, $zero /* ECB550 80241850 4482C000 */ mtc1 $v0, $f24 -/* ECB554 80241854 00000000 */ nop +/* ECB554 80241854 00000000 */ nop /* ECB558 80241858 4680C620 */ cvt.s.w $f24, $f24 /* ECB55C 8024185C 3C128011 */ lui $s2, %hi(D_80117578) /* ECB560 80241860 26527578 */ addiu $s2, $s2, %lo(D_80117578) @@ -56,7 +56,7 @@ glabel func_802417CC_ECB4CC /* ECB598 80241898 00220821 */ addu $at, $at, $v0 /* ECB59C 8024189C C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) /* ECB5A0 802418A0 45000005 */ bc1f .L802418B8 -/* ECB5A4 802418A4 00000000 */ nop +/* ECB5A4 802418A4 00000000 */ nop /* ECB5A8 802418A8 3C0142C8 */ lui $at, 0x42c8 /* ECB5AC 802418AC 44810000 */ mtc1 $at, $f0 /* ECB5B0 802418B0 08090632 */ j .L802418C8 @@ -64,7 +64,7 @@ glabel func_802417CC_ECB4CC .L802418B8: /* ECB5B8 802418B8 3C0142C8 */ lui $at, 0x42c8 /* ECB5BC 802418BC 44810000 */ mtc1 $at, $f0 -/* ECB5C0 802418C0 00000000 */ nop +/* ECB5C0 802418C0 00000000 */ nop /* ECB5C4 802418C4 4600B580 */ add.s $f22, $f22, $f0 .L802418C8: /* ECB5C8 802418C8 0C00AB85 */ jal func_8002AE14 @@ -75,21 +75,21 @@ glabel func_802417CC_ECB4CC /* ECB5DC 802418DC 0C00AD77 */ jal func_8002B5DC /* ECB5E0 802418E0 4600B306 */ mov.s $f12, $f22 /* ECB5E4 802418E4 46140002 */ mul.s $f0, $f0, $f20 -/* ECB5E8 802418E8 00000000 */ nop +/* ECB5E8 802418E8 00000000 */ nop /* ECB5EC 802418EC 864200B0 */ lh $v0, 0xb0($s2) /* ECB5F0 802418F0 3C013F00 */ lui $at, 0x3f00 /* ECB5F4 802418F4 44812000 */ mtc1 $at, $f4 /* ECB5F8 802418F8 44821000 */ mtc1 $v0, $f2 -/* ECB5FC 802418FC 00000000 */ nop +/* ECB5FC 802418FC 00000000 */ nop /* ECB600 80241900 468010A0 */ cvt.s.w $f2, $f2 /* ECB604 80241904 46041082 */ mul.s $f2, $f2, $f4 -/* ECB608 80241908 00000000 */ nop +/* ECB608 80241908 00000000 */ nop /* ECB60C 8024190C 4600E700 */ add.s $f28, $f28, $f0 /* ECB610 80241910 4602D680 */ add.s $f26, $f26, $f2 /* ECB614 80241914 0C00AD90 */ jal func_8002B640 /* ECB618 80241918 4600B306 */ mov.s $f12, $f22 /* ECB61C 8024191C 46140002 */ mul.s $f0, $f0, $f20 -/* ECB620 80241920 00000000 */ nop +/* ECB620 80241920 00000000 */ nop /* ECB624 80241924 0220202D */ daddu $a0, $s1, $zero /* ECB628 80241928 0260282D */ daddu $a1, $s3, $zero /* ECB62C 8024192C 4600E18D */ trunc.w.s $f6, $f28 diff --git a/asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s b/asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s index c34bb073a5..a5d79b1f9d 100644 --- a/asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s +++ b/asm/nonmatchings/code_ECAA80/func_80241A28_ECB728.s @@ -28,7 +28,7 @@ glabel func_80241A28_ECB728 /* ECB77C 80241A7C 00220821 */ addu $at, $at, $v0 /* ECB780 80241A80 AC2062F0 */ sw $zero, %lo(D_802462F0)($at) /* ECB784 80241A84 080906AD */ j .L80241AB4 -/* ECB788 80241A88 00000000 */ nop +/* ECB788 80241A88 00000000 */ nop .L80241A8C: /* ECB78C 80241A8C 3C038024 */ lui $v1, %hi(D_802462F0) /* ECB790 80241A90 246362F0 */ addiu $v1, $v1, %lo(D_802462F0) diff --git a/asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s b/asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s index 3fbefdb854..c3e774f5a9 100644 --- a/asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s +++ b/asm/nonmatchings/code_ECAA80/func_80241AC4_ECB7C4.s @@ -32,15 +32,15 @@ glabel func_80241AC4_ECB7C4 /* ECB830 80241B30 0040802D */ daddu $s0, $v0, $zero /* ECB834 80241B34 0040182D */ daddu $v1, $v0, $zero /* ECB838 80241B38 44920000 */ mtc1 $s2, $f0 -/* ECB83C 80241B3C 00000000 */ nop +/* ECB83C 80241B3C 00000000 */ nop /* ECB840 80241B40 46800020 */ cvt.s.w $f0, $f0 /* ECB844 80241B44 E4600008 */ swc1 $f0, 8($v1) /* ECB848 80241B48 44910000 */ mtc1 $s1, $f0 -/* ECB84C 80241B4C 00000000 */ nop +/* ECB84C 80241B4C 00000000 */ nop /* ECB850 80241B50 46800020 */ cvt.s.w $f0, $f0 /* ECB854 80241B54 E460000C */ swc1 $f0, 0xc($v1) /* ECB858 80241B58 44900000 */ mtc1 $s0, $f0 -/* ECB85C 80241B5C 00000000 */ nop +/* ECB85C 80241B5C 00000000 */ nop /* ECB860 80241B60 46800020 */ cvt.s.w $f0, $f0 /* ECB864 80241B64 E4600010 */ swc1 $f0, 0x10($v1) /* ECB868 80241B68 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s b/asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s index d7ead90b79..c377d08363 100644 --- a/asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s +++ b/asm/nonmatchings/code_ECAA80/func_80241BF8_ECB8F8.s @@ -16,4 +16,4 @@ glabel func_80241BF8_ECB8F8 /* ECB920 80241C20 AC2065CC */ sw $zero, %lo(D_802465CC)($at) /* ECB924 80241C24 03E00008 */ jr $ra /* ECB928 80241C28 24020002 */ addiu $v0, $zero, 2 -/* ECB92C 80241C2C 00000000 */ nop +/* ECB92C 80241C2C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s b/asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s index 8a19a263bd..278ea15a0c 100644 --- a/asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s +++ b/asm/nonmatchings/code_ECBB70/func_80241E70_ECBB70.s @@ -6,33 +6,33 @@ glabel func_80241E70_ECBB70 /* ECBB74 80241E74 8C830090 */ lw $v1, 0x90($a0) /* ECBB78 80241E78 00431023 */ subu $v0, $v0, $v1 /* ECBB7C 80241E7C 44821000 */ mtc1 $v0, $f2 -/* ECBB80 80241E80 00000000 */ nop +/* ECBB80 80241E80 00000000 */ nop /* ECBB84 80241E84 468010A0 */ cvt.s.w $f2, $f2 /* ECBB88 80241E88 8C820088 */ lw $v0, 0x88($a0) /* ECBB8C 80241E8C 8C830094 */ lw $v1, 0x94($a0) /* ECBB90 80241E90 46021082 */ mul.s $f2, $f2, $f2 -/* ECBB94 80241E94 00000000 */ nop +/* ECBB94 80241E94 00000000 */ nop /* ECBB98 80241E98 00431023 */ subu $v0, $v0, $v1 /* ECBB9C 80241E9C 44822000 */ mtc1 $v0, $f4 -/* ECBBA0 80241EA0 00000000 */ nop +/* ECBBA0 80241EA0 00000000 */ nop /* ECBBA4 80241EA4 46802120 */ cvt.s.w $f4, $f4 /* ECBBA8 80241EA8 8C82008C */ lw $v0, 0x8c($a0) /* ECBBAC 80241EAC 46042102 */ mul.s $f4, $f4, $f4 -/* ECBBB0 80241EB0 00000000 */ nop +/* ECBBB0 80241EB0 00000000 */ nop /* ECBBB4 80241EB4 8C830098 */ lw $v1, 0x98($a0) /* ECBBB8 80241EB8 00431023 */ subu $v0, $v0, $v1 /* ECBBBC 80241EBC 44820000 */ mtc1 $v0, $f0 -/* ECBBC0 80241EC0 00000000 */ nop +/* ECBBC0 80241EC0 00000000 */ nop /* ECBBC4 80241EC4 46800020 */ cvt.s.w $f0, $f0 /* ECBBC8 80241EC8 46000002 */ mul.s $f0, $f0, $f0 -/* ECBBCC 80241ECC 00000000 */ nop +/* ECBBCC 80241ECC 00000000 */ nop /* ECBBD0 80241ED0 46041080 */ add.s $f2, $f2, $f4 /* ECBBD4 80241ED4 46001080 */ add.s $f2, $f2, $f0 /* ECBBD8 80241ED8 3C014561 */ lui $at, 0x4561 /* ECBBDC 80241EDC 44810000 */ mtc1 $at, $f0 -/* ECBBE0 80241EE0 00000000 */ nop +/* ECBBE0 80241EE0 00000000 */ nop /* ECBBE4 80241EE4 4600103C */ c.lt.s $f2, $f0 -/* ECBBE8 80241EE8 00000000 */ nop +/* ECBBE8 80241EE8 00000000 */ nop /* ECBBEC 80241EEC 45010002 */ bc1t .L80241EF8 /* ECBBF0 80241EF0 24020001 */ addiu $v0, $zero, 1 /* ECBBF4 80241EF4 0000102D */ daddu $v0, $zero, $zero @@ -40,6 +40,6 @@ glabel func_80241E70_ECBB70 /* ECBBF8 80241EF8 AC820084 */ sw $v0, 0x84($a0) /* ECBBFC 80241EFC 03E00008 */ jr $ra /* ECBC00 80241F00 24020002 */ addiu $v0, $zero, 2 -/* ECBC04 80241F04 00000000 */ nop -/* ECBC08 80241F08 00000000 */ nop -/* ECBC0C 80241F0C 00000000 */ nop +/* ECBC04 80241F04 00000000 */ nop +/* ECBC08 80241F08 00000000 */ nop +/* ECBC0C 80241F0C 00000000 */ nop diff --git a/asm/nonmatchings/code_ECFFF0/func_80240000_ECFFF0.s b/asm/nonmatchings/code_ECFFF0/func_80240000_ECFFF0.s index 83e0ec1f1b..ae3c512f51 100644 --- a/asm/nonmatchings/code_ECFFF0/func_80240000_ECFFF0.s +++ b/asm/nonmatchings/code_ECFFF0/func_80240000_ECFFF0.s @@ -15,6 +15,6 @@ glabel func_80240000_ECFFF0 /* ED0018 80240028 24020002 */ addiu $v0, $zero, 2 /* ED001C 8024002C 03E00008 */ jr $ra /* ED0020 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* ED0024 80240034 00000000 */ nop -/* ED0028 80240038 00000000 */ nop -/* ED002C 8024003C 00000000 */ nop +/* ED0024 80240034 00000000 */ nop +/* ED0028 80240038 00000000 */ nop +/* ED002C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_ED5540/func_80241320_ED5540.s b/asm/nonmatchings/code_ED5540/func_80241320_ED5540.s index e55e481f0e..1fa03b9c17 100644 --- a/asm/nonmatchings/code_ED5540/func_80241320_ED5540.s +++ b/asm/nonmatchings/code_ED5540/func_80241320_ED5540.s @@ -14,12 +14,12 @@ glabel func_80241320_ED5540 /* ED5564 80241344 0C01B198 */ jal osGetCause /* ED5568 80241348 0080802D */ daddu $s0, $a0, $zero /* ED556C 8024134C 4616A582 */ mul.s $f22, $f20, $f22 -/* ED5570 80241350 00000000 */ nop +/* ED5570 80241350 00000000 */ nop /* ED5574 80241354 4618A502 */ mul.s $f20, $f20, $f24 -/* ED5578 80241358 00000000 */ nop +/* ED5578 80241358 00000000 */ nop /* ED557C 8024135C 3C013F80 */ lui $at, 0x3f80 /* ED5580 80241360 44810000 */ mtc1 $at, $f0 -/* ED5584 80241364 00000000 */ nop +/* ED5584 80241364 00000000 */ nop /* ED5588 80241368 E6000014 */ swc1 $f0, 0x14($s0) /* ED558C 8024136C E6160010 */ swc1 $f22, 0x10($s0) /* ED5590 80241370 E6140018 */ swc1 $f20, 0x18($s0) diff --git a/asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s b/asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s index bff184dc21..430466ce6a 100644 --- a/asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s +++ b/asm/nonmatchings/code_ED5540/func_80241390_ED55B0.s @@ -119,4 +119,4 @@ glabel func_80241390_ED55B0 /* ED5770 80241550 24020002 */ addiu $v0, $zero, 2 /* ED5774 80241554 03E00008 */ jr $ra /* ED5778 80241558 27BD0088 */ addiu $sp, $sp, 0x88 -/* ED577C 8024155C 00000000 */ nop +/* ED577C 8024155C 00000000 */ nop diff --git a/asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s b/asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s index ea020a0215..56eb1bbea8 100644 --- a/asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s +++ b/asm/nonmatchings/code_EDBFE0/func_80240000_EDBFE0.s @@ -15,6 +15,6 @@ glabel func_80240000_EDBFE0 /* EDC008 80240028 24020002 */ addiu $v0, $zero, 2 /* EDC00C 8024002C 03E00008 */ jr $ra /* EDC010 80240030 27BD0020 */ addiu $sp, $sp, 0x20 -/* EDC014 80240034 00000000 */ nop -/* EDC018 80240038 00000000 */ nop -/* EDC01C 8024003C 00000000 */ nop +/* EDC014 80240034 00000000 */ nop +/* EDC018 80240038 00000000 */ nop +/* EDC01C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/code_EDC020/func_80240040_EDC020.s b/asm/nonmatchings/code_EDC020/func_80240040_EDC020.s index 35bb782299..122ff36cad 100644 --- a/asm/nonmatchings/code_EDC020/func_80240040_EDC020.s +++ b/asm/nonmatchings/code_EDC020/func_80240040_EDC020.s @@ -14,12 +14,12 @@ glabel func_80240040_EDC020 /* EDC044 80240064 0C01B198 */ jal osGetCause /* EDC048 80240068 0080802D */ daddu $s0, $a0, $zero /* EDC04C 8024006C 4616A582 */ mul.s $f22, $f20, $f22 -/* EDC050 80240070 00000000 */ nop +/* EDC050 80240070 00000000 */ nop /* EDC054 80240074 4618A502 */ mul.s $f20, $f20, $f24 -/* EDC058 80240078 00000000 */ nop +/* EDC058 80240078 00000000 */ nop /* EDC05C 8024007C 3C013F80 */ lui $at, 0x3f80 /* EDC060 80240080 44810000 */ mtc1 $at, $f0 -/* EDC064 80240084 00000000 */ nop +/* EDC064 80240084 00000000 */ nop /* EDC068 80240088 E6000014 */ swc1 $f0, 0x14($s0) /* EDC06C 8024008C E6160010 */ swc1 $f22, 0x10($s0) /* EDC070 80240090 E6140018 */ swc1 $f20, 0x18($s0) diff --git a/asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s b/asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s index 25115d9f9f..fd1b8522e2 100644 --- a/asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s +++ b/asm/nonmatchings/code_EDC020/func_8024027C_EDC25C.s @@ -26,7 +26,7 @@ glabel func_8024027C_EDC25C /* EDC2AC 802402CC 1440FFFA */ bnez $v0, .L802402B8 /* EDC2B0 802402D0 24A50004 */ addiu $a1, $a1, 4 /* EDC2B4 802402D4 080900C6 */ j .L80240318 -/* EDC2B8 802402D8 00000000 */ nop +/* EDC2B8 802402D8 00000000 */ nop .L802402DC: /* EDC2BC 802402DC 0000182D */ daddu $v1, $zero, $zero /* EDC2C0 802402E0 0040282D */ daddu $a1, $v0, $zero diff --git a/asm/nonmatchings/code_EDC020/func_80240394_EDC374.s b/asm/nonmatchings/code_EDC020/func_80240394_EDC374.s index a285297a9a..ff7bf5a11d 100644 --- a/asm/nonmatchings/code_EDC020/func_80240394_EDC374.s +++ b/asm/nonmatchings/code_EDC020/func_80240394_EDC374.s @@ -14,7 +14,7 @@ glabel func_80240394_EDC374 /* EDC398 802403B8 0C00F94D */ jal func_8003E534 /* EDC39C 802403BC 0040202D */ daddu $a0, $v0, $zero /* EDC3A0 802403C0 10400005 */ beqz $v0, .L802403D8 -/* EDC3A4 802403C4 00000000 */ nop +/* EDC3A4 802403C4 00000000 */ nop /* EDC3A8 802403C8 8E050000 */ lw $a1, ($s0) /* EDC3AC 802403CC 844600A8 */ lh $a2, 0xa8($v0) /* EDC3B0 802403D0 0C0B551A */ jal func_802D5468 diff --git a/asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s b/asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s index fc5079fdac..1d5ee6f48b 100644 --- a/asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s +++ b/asm/nonmatchings/code_EDC020/func_802403F0_EDC3D0.s @@ -21,7 +21,7 @@ glabel func_802403F0_EDC3D0 /* EDC410 80240430 0C0B53A3 */ jal func_802D4E8C /* EDC414 80240434 0260282D */ daddu $a1, $s3, $zero /* EDC418 80240438 4482E000 */ mtc1 $v0, $f28 -/* EDC41C 8024043C 00000000 */ nop +/* EDC41C 8024043C 00000000 */ nop /* EDC420 80240440 4680E720 */ cvt.s.w $f28, $f28 /* EDC424 80240444 8E140000 */ lw $s4, ($s0) /* EDC428 80240448 26100004 */ addiu $s0, $s0, 4 @@ -29,14 +29,14 @@ glabel func_802403F0_EDC3D0 /* EDC430 80240450 0C0B53A3 */ jal func_802D4E8C /* EDC434 80240454 0280282D */ daddu $a1, $s4, $zero /* EDC438 80240458 4482D000 */ mtc1 $v0, $f26 -/* EDC43C 8024045C 00000000 */ nop +/* EDC43C 8024045C 00000000 */ nop /* EDC440 80240460 4680D6A0 */ cvt.s.w $f26, $f26 /* EDC444 80240464 8E100000 */ lw $s0, ($s0) /* EDC448 80240468 0220202D */ daddu $a0, $s1, $zero /* EDC44C 8024046C 0C0B53A3 */ jal func_802D4E8C /* EDC450 80240470 0200282D */ daddu $a1, $s0, $zero /* EDC454 80240474 4482C000 */ mtc1 $v0, $f24 -/* EDC458 80240478 00000000 */ nop +/* EDC458 80240478 00000000 */ nop /* EDC45C 8024047C 4680C620 */ cvt.s.w $f24, $f24 /* EDC460 80240480 3C128011 */ lui $s2, %hi(D_80117578) /* EDC464 80240484 26527578 */ addiu $s2, $s2, %lo(D_80117578) @@ -56,7 +56,7 @@ glabel func_802403F0_EDC3D0 /* EDC49C 802404BC 00220821 */ addu $at, $at, $v0 /* EDC4A0 802404C0 C4368DEC */ lwc1 $f22, %lo(D_800B8DEC)($at) /* EDC4A4 802404C4 45000005 */ bc1f .L802404DC -/* EDC4A8 802404C8 00000000 */ nop +/* EDC4A8 802404C8 00000000 */ nop /* EDC4AC 802404CC 3C0142C8 */ lui $at, 0x42c8 /* EDC4B0 802404D0 44810000 */ mtc1 $at, $f0 /* EDC4B4 802404D4 0809013B */ j .L802404EC @@ -64,7 +64,7 @@ glabel func_802403F0_EDC3D0 .L802404DC: /* EDC4BC 802404DC 3C0142C8 */ lui $at, 0x42c8 /* EDC4C0 802404E0 44810000 */ mtc1 $at, $f0 -/* EDC4C4 802404E4 00000000 */ nop +/* EDC4C4 802404E4 00000000 */ nop /* EDC4C8 802404E8 4600B580 */ add.s $f22, $f22, $f0 .L802404EC: /* EDC4CC 802404EC 0C00AB85 */ jal func_8002AE14 @@ -75,21 +75,21 @@ glabel func_802403F0_EDC3D0 /* EDC4E0 80240500 0C00AD77 */ jal func_8002B5DC /* EDC4E4 80240504 4600B306 */ mov.s $f12, $f22 /* EDC4E8 80240508 46140002 */ mul.s $f0, $f0, $f20 -/* EDC4EC 8024050C 00000000 */ nop +/* EDC4EC 8024050C 00000000 */ nop /* EDC4F0 80240510 864200B0 */ lh $v0, 0xb0($s2) /* EDC4F4 80240514 3C013F00 */ lui $at, 0x3f00 /* EDC4F8 80240518 44812000 */ mtc1 $at, $f4 /* EDC4FC 8024051C 44821000 */ mtc1 $v0, $f2 -/* EDC500 80240520 00000000 */ nop +/* EDC500 80240520 00000000 */ nop /* EDC504 80240524 468010A0 */ cvt.s.w $f2, $f2 /* EDC508 80240528 46041082 */ mul.s $f2, $f2, $f4 -/* EDC50C 8024052C 00000000 */ nop +/* EDC50C 8024052C 00000000 */ nop /* EDC510 80240530 4600E700 */ add.s $f28, $f28, $f0 /* EDC514 80240534 4602D680 */ add.s $f26, $f26, $f2 /* EDC518 80240538 0C00AD90 */ jal func_8002B640 /* EDC51C 8024053C 4600B306 */ mov.s $f12, $f22 /* EDC520 80240540 46140002 */ mul.s $f0, $f0, $f20 -/* EDC524 80240544 00000000 */ nop +/* EDC524 80240544 00000000 */ nop /* EDC528 80240548 0220202D */ daddu $a0, $s1, $zero /* EDC52C 8024054C 0260282D */ daddu $a1, $s3, $zero /* EDC530 80240550 4600E18D */ trunc.w.s $f6, $f28 diff --git a/asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s b/asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s index e810d22fc9..c842b51990 100644 --- a/asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s +++ b/asm/nonmatchings/code_EDC020/func_8024064C_EDC62C.s @@ -28,7 +28,7 @@ glabel func_8024064C_EDC62C /* EDC680 802406A0 00220821 */ addu $at, $at, $v0 /* EDC684 802406A4 AC2029E0 */ sw $zero, %lo(D_802429E0)($at) /* EDC688 802406A8 080901B6 */ j .L802406D8 -/* EDC68C 802406AC 00000000 */ nop +/* EDC68C 802406AC 00000000 */ nop .L802406B0: /* EDC690 802406B0 3C038024 */ lui $v1, %hi(D_802429E0) /* EDC694 802406B4 246329E0 */ addiu $v1, $v1, %lo(D_802429E0) @@ -46,5 +46,5 @@ glabel func_8024064C_EDC62C /* EDC6BC 802406DC 24020002 */ addiu $v0, $zero, 2 /* EDC6C0 802406E0 03E00008 */ jr $ra /* EDC6C4 802406E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* EDC6C8 802406E8 00000000 */ nop -/* EDC6CC 802406EC 00000000 */ nop +/* EDC6C8 802406E8 00000000 */ nop +/* EDC6CC 802406EC 00000000 */ nop diff --git a/asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s b/asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s index 15690182ee..45d626d704 100644 --- a/asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s +++ b/asm/nonmatchings/code_EEDF50/func_80240E50_EEDF50.s @@ -47,7 +47,7 @@ glabel func_80240E50_EEDF50 /* EEDFF8 80240EF8 0C013431 */ jal func_8004D0C4 /* EEDFFC 80240EFC 8E070038 */ lw $a3, 0x38($s0) /* EEE000 80240F00 1040000E */ beqz $v0, .L80240F3C -/* EEE004 80240F04 00000000 */ nop +/* EEE004 80240F04 00000000 */ nop /* EEE008 80240F08 8E2200D0 */ lw $v0, 0xd0($s1) /* EEE00C 80240F0C C60C0038 */ lwc1 $f12, 0x38($s0) /* EEE010 80240F10 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240E50_EEDF50 /* EEE024 80240F24 468031A0 */ cvt.s.w $f6, $f6 /* EEE028 80240F28 44073000 */ mfc1 $a3, $f6 /* EEE02C 80240F2C 0C00ABDC */ jal fio_validate_header_checksums -/* EEE030 80240F30 00000000 */ nop +/* EEE030 80240F30 00000000 */ nop /* EEE034 80240F34 080903DB */ j .L80240F6C /* EEE038 80240F38 E600000C */ swc1 $f0, 0xc($s0) .L80240F3C: @@ -66,7 +66,7 @@ glabel func_80240E50_EEDF50 /* EEE040 80240F40 2404003C */ addiu $a0, $zero, 0x3c /* EEE044 80240F44 C60C000C */ lwc1 $f12, 0xc($s0) /* EEE048 80240F48 44820000 */ mtc1 $v0, $f0 -/* EEE04C 80240F4C 00000000 */ nop +/* EEE04C 80240F4C 00000000 */ nop /* EEE050 80240F50 46800020 */ cvt.s.w $f0, $f0 /* EEE054 80240F54 46006300 */ add.s $f12, $f12, $f0 /* EEE058 80240F58 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240E50_EEDF50 /* EEE07C 80240F7C 8E2200D0 */ lw $v0, 0xd0($s1) /* EEE080 80240F80 8C420014 */ lw $v0, 0x14($v0) /* EEE084 80240F84 04410004 */ bgez $v0, .L80240F98 -/* EEE088 80240F88 00000000 */ nop +/* EEE088 80240F88 00000000 */ nop /* EEE08C 80240F8C C6400000 */ lwc1 $f0, ($s2) /* EEE090 80240F90 080903EE */ j .L80240FB8 /* EEE094 80240F94 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240E50_EEDF50 /* EEE098 80240F98 3C018024 */ lui $at, %hi(D_80245450) /* EEE09C 80240F9C D4225450 */ ldc1 $f2, %lo(D_80245450)($at) /* EEE0A0 80240FA0 44820000 */ mtc1 $v0, $f0 -/* EEE0A4 80240FA4 00000000 */ nop +/* EEE0A4 80240FA4 00000000 */ nop /* EEE0A8 80240FA8 46800021 */ cvt.d.w $f0, $f0 /* EEE0AC 80240FAC 46220003 */ div.d $f0, $f0, $f2 /* EEE0B0 80240FB0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240E50_EEDF50 /* EEE0C4 80240FC4 44801000 */ mtc1 $zero, $f2 /* EEE0C8 80240FC8 46000021 */ cvt.d.s $f0, $f0 /* EEE0CC 80240FCC 46220002 */ mul.d $f0, $f0, $f2 -/* EEE0D0 80240FD0 00000000 */ nop +/* EEE0D0 80240FD0 00000000 */ nop /* EEE0D4 80240FD4 24020001 */ addiu $v0, $zero, 1 /* EEE0D8 80240FD8 4620018D */ trunc.w.d $f6, $f0 /* EEE0DC 80240FDC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s b/asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s index 6ca5b22b06..31e8e41e6f 100644 --- a/asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s +++ b/asm/nonmatchings/code_EEDF50/func_80241000_EEE100.s @@ -34,7 +34,7 @@ glabel func_80241000_EEE100 /* EEE174 80241074 44803000 */ mtc1 $zero, $f6 /* EEE178 80241078 46000021 */ cvt.d.s $f0, $f0 /* EEE17C 8024107C 46260002 */ mul.d $f0, $f0, $f6 -/* EEE180 80241080 00000000 */ nop +/* EEE180 80241080 00000000 */ nop /* EEE184 80241084 24020001 */ addiu $v0, $zero, 1 /* EEE188 80241088 8E24006C */ lw $a0, 0x6c($s1) /* EEE18C 8024108C 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80241000_EEE100 /* EEE1E8 802410E8 C600003C */ lwc1 $f0, 0x3c($s0) /* EEE1EC 802410EC 4600C001 */ sub.s $f0, $f24, $f0 /* EEE1F0 802410F0 4600B03C */ c.lt.s $f22, $f0 -/* EEE1F4 802410F4 00000000 */ nop +/* EEE1F4 802410F4 00000000 */ nop /* EEE1F8 802410F8 4500001B */ bc1f .L80241168 /* EEE1FC 802410FC 34820010 */ ori $v0, $a0, 0x10 /* EEE200 80241100 0809045A */ j .L80241168 @@ -87,9 +87,9 @@ glabel func_80241000_EEE100 /* EEE244 80241144 C7A00034 */ lwc1 $f0, 0x34($sp) /* EEE248 80241148 4600D001 */ sub.s $f0, $f26, $f0 /* EEE24C 8024114C 4600B03C */ c.lt.s $f22, $f0 -/* EEE250 80241150 00000000 */ nop +/* EEE250 80241150 00000000 */ nop /* EEE254 80241154 45000004 */ bc1f .L80241168 -/* EEE258 80241158 00000000 */ nop +/* EEE258 80241158 00000000 */ nop /* EEE25C 8024115C 8E22006C */ lw $v0, 0x6c($s1) /* EEE260 80241160 34420010 */ ori $v0, $v0, 0x10 /* EEE264 80241164 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80241000_EEE100 /* EEE26C 8024116C 24030011 */ addiu $v1, $zero, 0x11 /* EEE270 80241170 30420011 */ andi $v0, $v0, 0x11 /* EEE274 80241174 14430039 */ bne $v0, $v1, .L8024125C -/* EEE278 80241178 00000000 */ nop +/* EEE278 80241178 00000000 */ nop /* EEE27C 8024117C 8E020000 */ lw $v0, ($s0) /* EEE280 80241180 30420008 */ andi $v0, $v0, 8 /* EEE284 80241184 1040000A */ beqz $v0, .L802411B0 @@ -108,7 +108,7 @@ glabel func_80241000_EEE100 /* EEE294 80241194 D4205458 */ ldc1 $f0, %lo(D_80245458)($at) /* EEE298 80241198 460010A1 */ cvt.d.s $f2, $f2 /* EEE29C 8024119C 46201082 */ mul.d $f2, $f2, $f0 -/* EEE2A0 802411A0 00000000 */ nop +/* EEE2A0 802411A0 00000000 */ nop /* EEE2A4 802411A4 4600A021 */ cvt.d.s $f0, $f20 /* EEE2A8 802411A8 08090485 */ j .L80241214 /* EEE2AC 802411AC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80241000_EEE100 /* EEE2FC 802411FC D4205460 */ ldc1 $f0, %lo(D_80245460)($at) /* EEE300 80241200 460010A1 */ cvt.d.s $f2, $f2 /* EEE304 80241204 46201082 */ mul.d $f2, $f2, $f0 -/* EEE308 80241208 00000000 */ nop +/* EEE308 80241208 00000000 */ nop /* EEE30C 8024120C 4600A021 */ cvt.d.s $f0, $f20 /* EEE310 80241210 46220000 */ add.d $f0, $f0, $f2 .L80241214: @@ -149,7 +149,7 @@ glabel func_80241000_EEE100 /* EEE330 80241230 46000005 */ abs.s $f0, $f0 /* EEE334 80241234 46000021 */ cvt.d.s $f0, $f0 /* EEE338 80241238 4622003C */ c.lt.d $f0, $f2 -/* EEE33C 8024123C 00000000 */ nop +/* EEE33C 8024123C 00000000 */ nop /* EEE340 80241240 45000036 */ bc1f .L8024131C /* EEE344 80241244 2403FFEF */ addiu $v1, $zero, -0x11 /* EEE348 80241248 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80241000_EEE100 .L8024125C: /* EEE35C 8024125C 8E220070 */ lw $v0, 0x70($s1) /* EEE360 80241260 1840002E */ blez $v0, .L8024131C -/* EEE364 80241264 00000000 */ nop +/* EEE364 80241264 00000000 */ nop /* EEE368 80241268 C62C0074 */ lwc1 $f12, 0x74($s1) /* EEE36C 8024126C 0C00AD77 */ jal func_8002B5DC /* EEE370 80241270 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80241000_EEE100 /* EEE3C8 802412C8 27A70030 */ addiu $a3, $sp, 0x30 .L802412CC: /* EEE3CC 802412CC 10400007 */ beqz $v0, .L802412EC -/* EEE3D0 802412D0 00000000 */ nop +/* EEE3D0 802412D0 00000000 */ nop /* EEE3D4 802412D4 4616A082 */ mul.s $f2, $f20, $f22 -/* EEE3D8 802412D8 00000000 */ nop +/* EEE3D8 802412D8 00000000 */ nop /* EEE3DC 802412DC C7A0002C */ lwc1 $f0, 0x2c($sp) /* EEE3E0 802412E0 461A0000 */ add.s $f0, $f0, $f26 /* EEE3E4 802412E4 080904BE */ j .L802412F8 /* EEE3E8 802412E8 46020000 */ add.s $f0, $f0, $f2 .L802412EC: /* EEE3EC 802412EC 4616A002 */ mul.s $f0, $f20, $f22 -/* EEE3F0 802412F0 00000000 */ nop +/* EEE3F0 802412F0 00000000 */ nop /* EEE3F4 802412F4 4600C000 */ add.s $f0, $f24, $f0 .L802412F8: /* EEE3F8 802412F8 E600003C */ swc1 $f0, 0x3c($s0) /* EEE3FC 802412FC 8E220074 */ lw $v0, 0x74($s1) /* EEE400 80241300 2442000A */ addiu $v0, $v0, 0xa /* EEE404 80241304 44826000 */ mtc1 $v0, $f12 -/* EEE408 80241308 00000000 */ nop +/* EEE408 80241308 00000000 */ nop /* EEE40C 8024130C 0C00AB85 */ jal func_8002AE14 /* EEE410 80241310 46806320 */ cvt.s.w $f12, $f12 /* EEE414 80241314 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80241000_EEE100 /* EEE424 80241324 2442FFFF */ addiu $v0, $v0, -1 /* EEE428 80241328 8E430014 */ lw $v1, 0x14($s2) /* EEE42C 8024132C 04600048 */ bltz $v1, .L80241450 -/* EEE430 80241330 00000000 */ nop +/* EEE430 80241330 00000000 */ nop /* EEE434 80241334 8E620074 */ lw $v0, 0x74($s3) /* EEE438 80241338 1C400042 */ bgtz $v0, .L80241444 /* EEE43C 8024133C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80241000_EEE100 /* EEE444 80241344 860200A8 */ lh $v0, 0xa8($s0) /* EEE448 80241348 C602003C */ lwc1 $f2, 0x3c($s0) /* EEE44C 8024134C 44820000 */ mtc1 $v0, $f0 -/* EEE450 80241350 00000000 */ nop +/* EEE450 80241350 00000000 */ nop /* EEE454 80241354 46800020 */ cvt.s.w $f0, $f0 /* EEE458 80241358 46001080 */ add.s $f2, $f2, $f0 /* EEE45C 8024135C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80241000_EEE100 /* EEE478 80241378 C440002C */ lwc1 $f0, 0x2c($v0) /* EEE47C 8024137C 46000021 */ cvt.d.s $f0, $f0 /* EEE480 80241380 4622003C */ c.lt.d $f0, $f2 -/* EEE484 80241384 00000000 */ nop +/* EEE484 80241384 00000000 */ nop /* EEE488 80241388 4500002C */ bc1f .L8024143C /* EEE48C 8024138C 02A0202D */ daddu $a0, $s5, $zero /* EEE490 80241390 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80241000_EEE100 /* EEE4CC 802413CC 3C01C1A0 */ lui $at, 0xc1a0 /* EEE4D0 802413D0 44812000 */ mtc1 $at, $f4 /* EEE4D4 802413D4 44834000 */ mtc1 $v1, $f8 -/* EEE4D8 802413D8 00000000 */ nop +/* EEE4D8 802413D8 00000000 */ nop /* EEE4DC 802413DC 46804220 */ cvt.s.w $f8, $f8 /* EEE4E0 802413E0 44074000 */ mfc1 $a3, $f8 /* EEE4E4 802413E4 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80241000_EEE100 /* EEE598 80241498 0C013431 */ jal func_8004D0C4 /* EEE59C 8024149C 8E070038 */ lw $a3, 0x38($s0) /* EEE5A0 802414A0 1040001A */ beqz $v0, .L8024150C -/* EEE5A4 802414A4 00000000 */ nop +/* EEE5A4 802414A4 00000000 */ nop /* EEE5A8 802414A8 8E060038 */ lw $a2, 0x38($s0) /* EEE5AC 802414AC 8E2200D0 */ lw $v0, 0xd0($s1) /* EEE5B0 802414B0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80241000_EEE100 /* EEE5C4 802414C4 468073A0 */ cvt.s.w $f14, $f14 /* EEE5C8 802414C8 C6020018 */ lwc1 $f2, 0x18($s0) /* EEE5CC 802414CC 4600103C */ c.lt.s $f2, $f0 -/* EEE5D0 802414D0 00000000 */ nop +/* EEE5D0 802414D0 00000000 */ nop /* EEE5D4 802414D4 4500000D */ bc1f .L8024150C /* EEE5D8 802414D8 E7A00034 */ swc1 $f0, 0x34($sp) /* EEE5DC 802414DC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80241000_EEE100 /* EEE618 80241518 00621825 */ or $v1, $v1, $v0 /* EEE61C 8024151C 00741825 */ or $v1, $v1, $s4 /* EEE620 80241520 10600008 */ beqz $v1, .L80241544 -/* EEE624 80241524 00000000 */ nop +/* EEE624 80241524 00000000 */ nop /* EEE628 80241528 8602008C */ lh $v0, 0x8c($s0) /* EEE62C 8024152C 14400031 */ bnez $v0, .L802415F4 -/* EEE630 80241530 00000000 */ nop +/* EEE630 80241530 00000000 */ nop /* EEE634 80241534 8E050018 */ lw $a1, 0x18($s0) /* EEE638 80241538 8E06000C */ lw $a2, 0xc($s0) /* EEE63C 8024153C 0C00F909 */ jal func_8003E424 @@ -362,12 +362,12 @@ glabel func_80241000_EEE100 /* EEE650 80241550 44801000 */ mtc1 $zero, $f2 /* EEE654 80241554 46000021 */ cvt.d.s $f0, $f0 /* EEE658 80241558 46220002 */ mul.d $f0, $f0, $f2 -/* EEE65C 8024155C 00000000 */ nop +/* EEE65C 8024155C 00000000 */ nop /* EEE660 80241560 4620020D */ trunc.w.d $f8, $f0 /* EEE664 80241564 E628007C */ swc1 $f8, 0x7c($s1) /* EEE668 80241568 8E420004 */ lw $v0, 4($s2) /* EEE66C 8024156C 18400021 */ blez $v0, .L802415F4 -/* EEE670 80241570 00000000 */ nop +/* EEE670 80241570 00000000 */ nop /* EEE674 80241574 8602008E */ lh $v0, 0x8e($s0) /* EEE678 80241578 9603008E */ lhu $v1, 0x8e($s0) /* EEE67C 8024157C 18400005 */ blez $v0, .L80241594 @@ -375,7 +375,7 @@ glabel func_80241000_EEE100 /* EEE684 80241584 A602008E */ sh $v0, 0x8e($s0) /* EEE688 80241588 00021400 */ sll $v0, $v0, 0x10 /* EEE68C 8024158C 1C400019 */ bgtz $v0, .L802415F4 -/* EEE690 80241590 00000000 */ nop +/* EEE690 80241590 00000000 */ nop .L80241594: /* EEE694 80241594 240403E8 */ addiu $a0, $zero, 0x3e8 /* EEE698 80241598 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80241000_EEE100 /* EEE6E0 802415E0 18400003 */ blez $v0, .L802415F0 /* EEE6E4 802415E4 28620003 */ slti $v0, $v1, 3 /* EEE6E8 802415E8 10400002 */ beqz $v0, .L802415F4 -/* EEE6EC 802415EC 00000000 */ nop +/* EEE6EC 802415EC 00000000 */ nop .L802415F0: /* EEE6F0 802415F0 AE600070 */ sw $zero, 0x70($s3) .L802415F4: diff --git a/asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s b/asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s index 2328bb7f71..792bce2d23 100644 --- a/asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s +++ b/asm/nonmatchings/code_EEDF50/func_80241628_EEE728.s @@ -30,7 +30,7 @@ glabel func_80241628_EEE728 /* EEE78C 8024168C A603008E */ sh $v1, 0x8e($s0) /* EEE790 80241690 C60C000C */ lwc1 $f12, 0xc($s0) /* EEE794 80241694 44820000 */ mtc1 $v0, $f0 -/* EEE798 80241698 00000000 */ nop +/* EEE798 80241698 00000000 */ nop /* EEE79C 8024169C 46800020 */ cvt.s.w $f0, $f0 /* EEE7A0 802416A0 46006300 */ add.s $f12, $f12, $f0 /* EEE7A4 802416A4 3C0142B4 */ lui $at, 0x42b4 diff --git a/asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s b/asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s index 64df0a5955..bcf9bc9cde 100644 --- a/asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s +++ b/asm/nonmatchings/code_EEDF50/func_802416E8_EEE7E8.s @@ -42,11 +42,11 @@ glabel func_802416E8_EEE7E8 .L8024177C: /* EEE87C 8024177C 8E220070 */ lw $v0, 0x70($s1) /* EEE880 80241780 18400034 */ blez $v0, .L80241854 -/* EEE884 80241784 00000000 */ nop +/* EEE884 80241784 00000000 */ nop /* EEE888 80241788 C62C0074 */ lwc1 $f12, 0x74($s1) /* EEE88C 8024178C 46806320 */ cvt.s.w $f12, $f12 /* EEE890 80241790 44820000 */ mtc1 $v0, $f0 -/* EEE894 80241794 00000000 */ nop +/* EEE894 80241794 00000000 */ nop /* EEE898 80241798 46800020 */ cvt.s.w $f0, $f0 /* EEE89C 8024179C 46000021 */ cvt.d.s $f0, $f0 /* EEE8A0 802417A0 46220003 */ div.d $f0, $f0, $f2 @@ -77,23 +77,23 @@ glabel func_802416E8_EEE7E8 /* EEE900 80241800 27A70030 */ addiu $a3, $sp, 0x30 .L80241804: /* EEE904 80241804 10400007 */ beqz $v0, .L80241824 -/* EEE908 80241808 00000000 */ nop +/* EEE908 80241808 00000000 */ nop /* EEE90C 8024180C 4616A082 */ mul.s $f2, $f20, $f22 -/* EEE910 80241810 00000000 */ nop +/* EEE910 80241810 00000000 */ nop /* EEE914 80241814 C7A0002C */ lwc1 $f0, 0x2c($sp) /* EEE918 80241818 46180000 */ add.s $f0, $f0, $f24 /* EEE91C 8024181C 0809060C */ j .L80241830 /* EEE920 80241820 46020000 */ add.s $f0, $f0, $f2 .L80241824: /* EEE924 80241824 4616A002 */ mul.s $f0, $f20, $f22 -/* EEE928 80241828 00000000 */ nop +/* EEE928 80241828 00000000 */ nop /* EEE92C 8024182C 4600D000 */ add.s $f0, $f26, $f0 .L80241830: /* EEE930 80241830 E600003C */ swc1 $f0, 0x3c($s0) /* EEE934 80241834 8E220074 */ lw $v0, 0x74($s1) /* EEE938 80241838 2442000A */ addiu $v0, $v0, 0xa /* EEE93C 8024183C 44826000 */ mtc1 $v0, $f12 -/* EEE940 80241840 00000000 */ nop +/* EEE940 80241840 00000000 */ nop /* EEE944 80241844 0C00AB85 */ jal func_8002AE14 /* EEE948 80241848 46806320 */ cvt.s.w $f12, $f12 /* EEE94C 8024184C 4600020D */ trunc.w.s $f8, $f0 @@ -105,7 +105,7 @@ glabel func_802416E8_EEE7E8 /* EEE960 80241860 860200A8 */ lh $v0, 0xa8($s0) /* EEE964 80241864 C600003C */ lwc1 $f0, 0x3c($s0) /* EEE968 80241868 44821000 */ mtc1 $v0, $f2 -/* EEE96C 8024186C 00000000 */ nop +/* EEE96C 8024186C 00000000 */ nop /* EEE970 80241870 468010A0 */ cvt.s.w $f2, $f2 /* EEE974 80241874 3C028010 */ lui $v0, %hi(D_800FFC90) /* EEE978 80241878 8C42FC90 */ lw $v0, %lo(D_800FFC90)($v0) @@ -118,7 +118,7 @@ glabel func_802416E8_EEE7E8 /* EEE994 80241894 46240000 */ add.d $f0, $f0, $f4 /* EEE998 80241898 460010A1 */ cvt.d.s $f2, $f2 /* EEE99C 8024189C 4620103C */ c.lt.d $f2, $f0 -/* EEE9A0 802418A0 00000000 */ nop +/* EEE9A0 802418A0 00000000 */ nop /* EEE9A4 802418A4 4500002E */ bc1f .L80241960 /* EEE9A8 802418A8 0280202D */ daddu $a0, $s4, $zero /* EEE9AC 802418AC 24020001 */ addiu $v0, $zero, 1 @@ -140,7 +140,7 @@ glabel func_802416E8_EEE7E8 /* EEE9EC 802418EC 3C01C1A0 */ lui $at, 0xc1a0 /* EEE9F0 802418F0 44812000 */ mtc1 $at, $f4 /* EEE9F4 802418F4 44834000 */ mtc1 $v1, $f8 -/* EEE9F8 802418F8 00000000 */ nop +/* EEE9F8 802418F8 00000000 */ nop /* EEE9FC 802418FC 46804220 */ cvt.s.w $f8, $f8 /* EEEA00 80241900 44074000 */ mfc1 $a3, $f8 /* EEEA04 80241904 27A20038 */ addiu $v0, $sp, 0x38 @@ -171,10 +171,10 @@ glabel func_802416E8_EEE7E8 .L80241960: /* EEEA60 80241960 8602008C */ lh $v0, 0x8c($s0) /* EEEA64 80241964 14400025 */ bnez $v0, .L802419FC -/* EEEA68 80241968 00000000 */ nop +/* EEEA68 80241968 00000000 */ nop /* EEEA6C 8024196C 8602008E */ lh $v0, 0x8e($s0) /* EEEA70 80241970 1C400022 */ bgtz $v0, .L802419FC -/* EEEA74 80241974 00000000 */ nop +/* EEEA74 80241974 00000000 */ nop /* EEEA78 80241978 8E620074 */ lw $v0, 0x74($s3) /* EEEA7C 8024197C 2442FFFF */ addiu $v0, $v0, -1 /* EEEA80 80241980 1840001D */ blez $v0, .L802419F8 @@ -183,7 +183,7 @@ glabel func_802416E8_EEE7E8 /* EEEA8C 8024198C 9442002A */ lhu $v0, 0x2a($v0) /* EEEA90 80241990 30420010 */ andi $v0, $v0, 0x10 /* EEEA94 80241994 14400007 */ bnez $v0, .L802419B4 -/* EEEA98 80241998 00000000 */ nop +/* EEEA98 80241998 00000000 */ nop /* EEEA9C 8024199C C600000C */ lwc1 $f0, 0xc($s0) /* EEEAA0 802419A0 3C014334 */ lui $at, 0x4334 /* EEEAA4 802419A4 44816000 */ mtc1 $at, $f12 diff --git a/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s b/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s index e98b879e11..6e0b1aaad6 100644 --- a/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s +++ b/asm/nonmatchings/code_EEDF50/func_80241B10_EEEC10.s @@ -60,18 +60,18 @@ glabel func_80241B10_EEEC10 /* EEECE8 80241BE8 C6200038 */ lwc1 $f0, 0x38($s1) /* EEECEC 80241BEC 4600018D */ trunc.w.s $f6, $f0 /* EEECF0 80241BF0 44023000 */ mfc1 $v0, $f6 -/* EEECF4 80241BF4 00000000 */ nop +/* EEECF4 80241BF4 00000000 */ nop /* EEECF8 80241BF8 A6420010 */ sh $v0, 0x10($s2) /* EEECFC 80241BFC C620003C */ lwc1 $f0, 0x3c($s1) /* EEED00 80241C00 4600018D */ trunc.w.s $f6, $f0 /* EEED04 80241C04 44023000 */ mfc1 $v0, $f6 -/* EEED08 80241C08 00000000 */ nop +/* EEED08 80241C08 00000000 */ nop /* EEED0C 80241C0C A6420012 */ sh $v0, 0x12($s2) /* EEED10 80241C10 C6200040 */ lwc1 $f0, 0x40($s1) /* EEED14 80241C14 A2430007 */ sb $v1, 7($s2) /* EEED18 80241C18 4600018D */ trunc.w.s $f6, $f0 /* EEED1C 80241C1C 44023000 */ mfc1 $v0, $f6 -/* EEED20 80241C20 00000000 */ nop +/* EEED20 80241C20 00000000 */ nop /* EEED24 80241C24 A6420014 */ sh $v0, 0x14($s2) .L80241C28: /* EEED28 80241C28 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s b/asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s index b119d704e1..a6cc272a6e 100644 --- a/asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s +++ b/asm/nonmatchings/code_EEDF50/func_80241C44_EEED44.s @@ -17,7 +17,7 @@ glabel func_80241C44_EEED44 /* EEED74 80241C74 A482008E */ sh $v0, 0x8e($a0) /* EEED78 80241C78 00021400 */ sll $v0, $v0, 0x10 /* EEED7C 80241C7C 1C400006 */ bgtz $v0, .L80241C98 -/* EEED80 80241C80 00000000 */ nop +/* EEED80 80241C80 00000000 */ nop .L80241C84: /* EEED84 80241C84 8482008C */ lh $v0, 0x8c($a0) /* EEED88 80241C88 14400003 */ bnez $v0, .L80241C98 diff --git a/asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s b/asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s index bc6dc9901c..242621666e 100644 --- a/asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s +++ b/asm/nonmatchings/code_EEDF50/func_80241CA8_EEEDA8.s @@ -42,9 +42,9 @@ glabel func_80241CA8_EEEDA8 /* EEEE3C 80241D3C 44801800 */ mtc1 $zero, $f3 /* EEEE40 80241D40 46002021 */ cvt.d.s $f0, $f4 /* EEEE44 80241D44 4620103E */ c.le.d $f2, $f0 -/* EEEE48 80241D48 00000000 */ nop +/* EEEE48 80241D48 00000000 */ nop /* EEEE4C 80241D4C 45000030 */ bc1f .L80241E10 -/* EEEE50 80241D50 00000000 */ nop +/* EEEE50 80241D50 00000000 */ nop /* EEEE54 80241D54 C600003C */ lwc1 $f0, 0x3c($s0) /* EEEE58 80241D58 46040000 */ add.s $f0, $f0, $f4 /* EEEE5C 80241D5C E600003C */ swc1 $f0, 0x3c($s0) @@ -74,14 +74,14 @@ glabel func_80241CA8_EEEDA8 /* EEEEBC 80241DBC 27A70020 */ addiu $a3, $sp, 0x20 .L80241DC0: /* EEEEC0 80241DC0 1040000B */ beqz $v0, .L80241DF0 -/* EEEEC4 80241DC4 00000000 */ nop +/* EEEEC4 80241DC4 00000000 */ nop /* EEEEC8 80241DC8 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EEEECC 80241DCC 46140080 */ add.s $f2, $f0, $f20 /* EEEED0 80241DD0 C600003C */ lwc1 $f0, 0x3c($s0) /* EEEED4 80241DD4 4600103E */ c.le.s $f2, $f0 -/* EEEED8 80241DD8 00000000 */ nop +/* EEEED8 80241DD8 00000000 */ nop /* EEEEDC 80241DDC 4500008D */ bc1f .L80242014 -/* EEEEE0 80241DE0 00000000 */ nop +/* EEEEE0 80241DE0 00000000 */ nop /* EEEEE4 80241DE4 E602003C */ swc1 $f2, 0x3c($s0) /* EEEEE8 80241DE8 08090805 */ j .L80242014 /* EEEEEC 80241DEC AE400070 */ sw $zero, 0x70($s2) @@ -89,16 +89,16 @@ glabel func_80241CA8_EEEDA8 /* EEEEF0 80241DF0 C602003C */ lwc1 $f2, 0x3c($s0) /* EEEEF4 80241DF4 C6000064 */ lwc1 $f0, 0x64($s0) /* EEEEF8 80241DF8 4602003E */ c.le.s $f0, $f2 -/* EEEEFC 80241DFC 00000000 */ nop +/* EEEEFC 80241DFC 00000000 */ nop /* EEEF00 80241E00 45030084 */ bc1tl .L80242014 /* EEEF04 80241E04 AE400070 */ sw $zero, 0x70($s2) /* EEEF08 80241E08 08090805 */ j .L80242014 -/* EEEF0C 80241E0C 00000000 */ nop +/* EEEF0C 80241E0C 00000000 */ nop .L80241E10: /* EEEF10 80241E10 4622003C */ c.lt.d $f0, $f2 -/* EEEF14 80241E14 00000000 */ nop +/* EEEF14 80241E14 00000000 */ nop /* EEEF18 80241E18 4500007E */ bc1f .L80242014 -/* EEEF1C 80241E1C 00000000 */ nop +/* EEEF1C 80241E1C 00000000 */ nop /* EEEF20 80241E20 9602008E */ lhu $v0, 0x8e($s0) /* EEEF24 80241E24 24420001 */ addiu $v0, $v0, 1 /* EEEF28 80241E28 A602008E */ sh $v0, 0x8e($s0) @@ -107,7 +107,7 @@ glabel func_80241CA8_EEEDA8 /* EEEF34 80241E34 00021403 */ sra $v0, $v0, 0x10 /* EEEF38 80241E38 0043102A */ slt $v0, $v0, $v1 /* EEEF3C 80241E3C 14400026 */ bnez $v0, .L80241ED8 -/* EEEF40 80241E40 00000000 */ nop +/* EEEF40 80241E40 00000000 */ nop /* EEEF44 80241E44 C60C0038 */ lwc1 $f12, 0x38($s0) /* EEEF48 80241E48 C60E0040 */ lwc1 $f14, 0x40($s0) /* EEEF4C 80241E4C 3C028010 */ lui $v0, %hi(D_800FFC90) @@ -124,20 +124,20 @@ glabel func_80241CA8_EEEDA8 /* EEEF78 80241E78 8E62001C */ lw $v0, 0x1c($s3) /* EEEF7C 80241E7C 46001005 */ abs.s $f0, $f2 /* EEEF80 80241E80 44822000 */ mtc1 $v0, $f4 -/* EEEF84 80241E84 00000000 */ nop +/* EEEF84 80241E84 00000000 */ nop /* EEEF88 80241E88 46802120 */ cvt.s.w $f4, $f4 /* EEEF8C 80241E8C 4600203C */ c.lt.s $f4, $f0 -/* EEEF90 80241E90 00000000 */ nop +/* EEEF90 80241E90 00000000 */ nop /* EEEF94 80241E94 4500000D */ bc1f .L80241ECC -/* EEEF98 80241E98 00000000 */ nop +/* EEEF98 80241E98 00000000 */ nop /* EEEF9C 80241E9C 44800000 */ mtc1 $zero, $f0 /* EEEFA0 80241EA0 C614000C */ lwc1 $f20, 0xc($s0) /* EEEFA4 80241EA4 4600103C */ c.lt.s $f2, $f0 -/* EEEFA8 80241EA8 00000000 */ nop +/* EEEFA8 80241EA8 00000000 */ nop /* EEEFAC 80241EAC 45000006 */ bc1f .L80241EC8 /* EEEFB0 80241EB0 00021023 */ negu $v0, $v0 /* EEEFB4 80241EB4 44820000 */ mtc1 $v0, $f0 -/* EEEFB8 80241EB8 00000000 */ nop +/* EEEFB8 80241EB8 00000000 */ nop /* EEEFBC 80241EBC 46800020 */ cvt.s.w $f0, $f0 /* EEEFC0 80241EC0 080907B3 */ j .L80241ECC /* EEEFC4 80241EC4 4600A500 */ add.s $f20, $f20, $f0 @@ -156,7 +156,7 @@ glabel func_80241CA8_EEEDA8 /* EEEFEC 80241EEC C600001C */ lwc1 $f0, 0x1c($s0) /* EEEFF0 80241EF0 46001080 */ add.s $f2, $f2, $f0 /* EEEFF4 80241EF4 4616103C */ c.lt.s $f2, $f22 -/* EEEFF8 80241EF8 00000000 */ nop +/* EEEFF8 80241EF8 00000000 */ nop /* EEEFFC 80241EFC 45020045 */ bc1fl .L80242014 /* EEF000 80241F00 E602003C */ swc1 $f2, 0x3c($s0) /* EEF004 80241F04 08090804 */ j .L80242010 @@ -169,7 +169,7 @@ glabel func_80241CA8_EEEDA8 /* EEF01C 80241F1C C600001C */ lwc1 $f0, 0x1c($s0) /* EEF020 80241F20 C604003C */ lwc1 $f4, 0x3c($s0) /* EEF024 80241F24 44821000 */ mtc1 $v0, $f2 -/* EEF028 80241F28 00000000 */ nop +/* EEF028 80241F28 00000000 */ nop /* EEF02C 80241F2C 468010A0 */ cvt.s.w $f2, $f2 /* EEF030 80241F30 46000005 */ abs.s $f0, $f0 /* EEF034 80241F34 46020000 */ add.s $f0, $f0, $f2 @@ -190,19 +190,19 @@ glabel func_80241CA8_EEEDA8 /* EEF070 80241F70 0C03908F */ jal func_800E423C /* EEF074 80241F74 27A70020 */ addiu $a3, $sp, 0x20 /* EEF078 80241F78 10400015 */ beqz $v0, .L80241FD0 -/* EEF07C 80241F7C 00000000 */ nop +/* EEF07C 80241F7C 00000000 */ nop /* EEF080 80241F80 860200A8 */ lh $v0, 0xa8($s0) /* EEF084 80241F84 C604001C */ lwc1 $f4, 0x1c($s0) /* EEF088 80241F88 44820000 */ mtc1 $v0, $f0 -/* EEF08C 80241F8C 00000000 */ nop +/* EEF08C 80241F8C 00000000 */ nop /* EEF090 80241F90 46800020 */ cvt.s.w $f0, $f0 /* EEF094 80241F94 46002085 */ abs.s $f2, $f4 /* EEF098 80241F98 46020000 */ add.s $f0, $f0, $f2 /* EEF09C 80241F9C C7A20024 */ lwc1 $f2, 0x24($sp) /* EEF0A0 80241FA0 4600103E */ c.le.s $f2, $f0 -/* EEF0A4 80241FA4 00000000 */ nop +/* EEF0A4 80241FA4 00000000 */ nop /* EEF0A8 80241FA8 45000005 */ bc1f .L80241FC0 -/* EEF0AC 80241FAC 00000000 */ nop +/* EEF0AC 80241FAC 00000000 */ nop /* EEF0B0 80241FB0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EEF0B4 80241FB4 AE00001C */ sw $zero, 0x1c($s0) /* EEF0B8 80241FB8 08090805 */ j .L80242014 @@ -217,13 +217,13 @@ glabel func_80241CA8_EEEDA8 /* EEF0D4 80241FD4 860200A8 */ lh $v0, 0xa8($s0) /* EEF0D8 80241FD8 46163081 */ sub.s $f2, $f6, $f22 /* EEF0DC 80241FDC 44820000 */ mtc1 $v0, $f0 -/* EEF0E0 80241FE0 00000000 */ nop +/* EEF0E0 80241FE0 00000000 */ nop /* EEF0E4 80241FE4 46800020 */ cvt.s.w $f0, $f0 /* EEF0E8 80241FE8 46001080 */ add.s $f2, $f2, $f0 /* EEF0EC 80241FEC C604001C */ lwc1 $f4, 0x1c($s0) /* EEF0F0 80241FF0 46002005 */ abs.s $f0, $f4 /* EEF0F4 80241FF4 4602003C */ c.lt.s $f0, $f2 -/* EEF0F8 80241FF8 00000000 */ nop +/* EEF0F8 80241FF8 00000000 */ nop /* EEF0FC 80241FFC 45020005 */ bc1fl .L80242014 /* EEF100 80242000 AE00001C */ sw $zero, 0x1c($s0) /* EEF104 80242004 46043000 */ add.s $f0, $f6, $f4 diff --git a/asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s b/asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s index fd4d73f136..6774eb05b8 100644 --- a/asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s +++ b/asm/nonmatchings/code_EEDF50/func_80242038_EEF138.s @@ -49,15 +49,15 @@ glabel func_80242038_EEF138 /* EEF1E0 802420E0 44802000 */ mtc1 $zero, $f4 /* EEF1E4 802420E4 460010A1 */ cvt.d.s $f2, $f2 /* EEF1E8 802420E8 46241082 */ mul.d $f2, $f2, $f4 -/* EEF1EC 802420EC 00000000 */ nop +/* EEF1EC 802420EC 00000000 */ nop /* EEF1F0 802420F0 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EEF1F4 802420F4 46000021 */ cvt.d.s $f0, $f0 /* EEF1F8 802420F8 46240002 */ mul.d $f0, $f0, $f4 -/* EEF1FC 802420FC 00000000 */ nop +/* EEF1FC 802420FC 00000000 */ nop /* EEF200 80242100 3C013FE0 */ lui $at, 0x3fe0 /* EEF204 80242104 44812800 */ mtc1 $at, $f5 /* EEF208 80242108 44802000 */ mtc1 $zero, $f4 -/* EEF20C 8024210C 00000000 */ nop +/* EEF20C 8024210C 00000000 */ nop /* EEF210 80242110 46241080 */ add.d $f2, $f2, $f4 /* EEF214 80242114 AE000074 */ sw $zero, 0x74($s0) /* EEF218 80242118 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s b/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s index 47e208c36a..6068082ddf 100644 --- a/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s +++ b/asm/nonmatchings/code_EEDF50/func_8024215C_EEF25C.s @@ -65,7 +65,7 @@ glabel func_8024215C_EEF25C /* EEF348 80242248 8E4300B0 */ lw $v1, 0xb0($s2) /* EEF34C 8024224C 30620004 */ andi $v0, $v1, 4 /* EEF350 80242250 10400007 */ beqz $v0, .L80242270 -/* EEF354 80242254 00000000 */ nop +/* EEF354 80242254 00000000 */ nop /* EEF358 80242258 824200B4 */ lb $v0, 0xb4($s2) /* EEF35C 8024225C 1440003C */ bnez $v0, .L80242350 /* EEF360 80242260 0000102D */ daddu $v0, $zero, $zero @@ -81,7 +81,7 @@ glabel func_8024215C_EEF25C /* EEF384 80242284 00220821 */ addu $at, $at, $v0 /* EEF388 80242288 8C225468 */ lw $v0, %lo(D_80245468)($at) /* EEF38C 8024228C 00400008 */ jr $v0 -/* EEF390 80242290 00000000 */ nop +/* EEF390 80242290 00000000 */ nop /* EEF394 80242294 02A0202D */ daddu $a0, $s5, $zero /* EEF398 80242298 0200282D */ daddu $a1, $s0, $zero /* EEF39C 8024229C 0C090394 */ jal func_80240E50_EEDF50 diff --git a/asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s b/asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s index db2716e46a..6e05cfe159 100644 --- a/asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s +++ b/asm/nonmatchings/code_EEDF50/func_80242374_EEF474.s @@ -47,20 +47,20 @@ glabel func_80242374_EEF474 /* EEF51C 8024241C 8E02001C */ lw $v0, 0x1c($s0) /* EEF520 80242420 46001005 */ abs.s $f0, $f2 /* EEF524 80242424 44822000 */ mtc1 $v0, $f4 -/* EEF528 80242428 00000000 */ nop +/* EEF528 80242428 00000000 */ nop /* EEF52C 8024242C 46802120 */ cvt.s.w $f4, $f4 /* EEF530 80242430 4600203C */ c.lt.s $f4, $f0 -/* EEF534 80242434 00000000 */ nop +/* EEF534 80242434 00000000 */ nop /* EEF538 80242438 4500000D */ bc1f .L80242470 -/* EEF53C 8024243C 00000000 */ nop +/* EEF53C 8024243C 00000000 */ nop /* EEF540 80242440 44800000 */ mtc1 $zero, $f0 /* EEF544 80242444 C654000C */ lwc1 $f20, 0xc($s2) /* EEF548 80242448 4600103C */ c.lt.s $f2, $f0 -/* EEF54C 8024244C 00000000 */ nop +/* EEF54C 8024244C 00000000 */ nop /* EEF550 80242450 45000006 */ bc1f .L8024246C /* EEF554 80242454 00021023 */ negu $v0, $v0 /* EEF558 80242458 44820000 */ mtc1 $v0, $f0 -/* EEF55C 8024245C 00000000 */ nop +/* EEF55C 8024245C 00000000 */ nop /* EEF560 80242460 46800020 */ cvt.s.w $f0, $f0 /* EEF564 80242464 0809091C */ j .L80242470 /* EEF568 80242468 4600A500 */ add.s $f20, $f20, $f0 diff --git a/asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s b/asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s index bdb552b586..61757c0806 100644 --- a/asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s +++ b/asm/nonmatchings/code_EEDF50/func_802424A4_EEF5A4.s @@ -36,7 +36,7 @@ glabel func_802424A4_EEF5A4 /* EEF620 80242520 2402000F */ addiu $v0, $zero, 0xf /* EEF624 80242524 AFA2001C */ sw $v0, 0x1c($sp) /* EEF628 80242528 44834000 */ mtc1 $v1, $f8 -/* EEF62C 8024252C 00000000 */ nop +/* EEF62C 8024252C 00000000 */ nop /* EEF630 80242530 46804220 */ cvt.s.w $f8, $f8 /* EEF634 80242534 44074000 */ mfc1 $a3, $f8 /* EEF638 80242538 27A20028 */ addiu $v0, $sp, 0x28 @@ -69,14 +69,14 @@ glabel func_802424A4_EEF5A4 /* EEF6A0 802425A0 860200A8 */ lh $v0, 0xa8($s0) /* EEF6A4 802425A4 C6000038 */ lwc1 $f0, 0x38($s0) /* EEF6A8 802425A8 44821000 */ mtc1 $v0, $f2 -/* EEF6AC 802425AC 00000000 */ nop +/* EEF6AC 802425AC 00000000 */ nop /* EEF6B0 802425B0 468010A0 */ cvt.s.w $f2, $f2 /* EEF6B4 802425B4 E7A0002C */ swc1 $f0, 0x2c($sp) /* EEF6B8 802425B8 860200A8 */ lh $v0, 0xa8($s0) /* EEF6BC 802425BC C604003C */ lwc1 $f4, 0x3c($s0) /* EEF6C0 802425C0 C6060040 */ lwc1 $f6, 0x40($s0) /* EEF6C4 802425C4 44820000 */ mtc1 $v0, $f0 -/* EEF6C8 802425C8 00000000 */ nop +/* EEF6C8 802425C8 00000000 */ nop /* EEF6CC 802425CC 46800021 */ cvt.d.w $f0, $f0 /* EEF6D0 802425D0 46022100 */ add.s $f4, $f4, $f2 /* EEF6D4 802425D4 3C014008 */ lui $at, 0x4008 @@ -93,19 +93,19 @@ glabel func_802424A4_EEF5A4 /* EEF700 80242600 0C03908F */ jal func_800E423C /* EEF704 80242604 27A70034 */ addiu $a3, $sp, 0x34 /* EEF708 80242608 1040000A */ beqz $v0, .L80242634 -/* EEF70C 8024260C 00000000 */ nop +/* EEF70C 8024260C 00000000 */ nop /* EEF710 80242610 860200A8 */ lh $v0, 0xa8($s0) /* EEF714 80242614 C7A20038 */ lwc1 $f2, 0x38($sp) /* EEF718 80242618 44820000 */ mtc1 $v0, $f0 -/* EEF71C 8024261C 00000000 */ nop +/* EEF71C 8024261C 00000000 */ nop /* EEF720 80242620 46800020 */ cvt.s.w $f0, $f0 /* EEF724 80242624 4600103C */ c.lt.s $f2, $f0 -/* EEF728 80242628 00000000 */ nop +/* EEF728 80242628 00000000 */ nop /* EEF72C 8024262C 45030001 */ bc1tl .L80242634 /* EEF730 80242630 24110001 */ addiu $s1, $zero, 1 .L80242634: /* EEF734 80242634 12200008 */ beqz $s1, .L80242658 -/* EEF738 80242638 00000000 */ nop +/* EEF738 80242638 00000000 */ nop /* EEF73C 8024263C C7A00030 */ lwc1 $f0, 0x30($sp) /* EEF740 80242640 3C013FF0 */ lui $at, 0x3ff0 /* EEF744 80242644 44811800 */ mtc1 $at, $f3 @@ -130,24 +130,24 @@ glabel func_802424A4_EEF5A4 /* EEF78C 8024268C 44800800 */ mtc1 $zero, $f1 /* EEF790 80242690 460030A1 */ cvt.d.s $f2, $f6 /* EEF794 80242694 4620103C */ c.lt.d $f2, $f0 -/* EEF798 80242698 00000000 */ nop +/* EEF798 80242698 00000000 */ nop /* EEF79C 8024269C 45010009 */ bc1t .L802426C4 -/* EEF7A0 802426A0 00000000 */ nop +/* EEF7A0 802426A0 00000000 */ nop /* EEF7A4 802426A4 3C014010 */ lui $at, 0x4010 /* EEF7A8 802426A8 44810800 */ mtc1 $at, $f1 /* EEF7AC 802426AC 44800000 */ mtc1 $zero, $f0 -/* EEF7B0 802426B0 00000000 */ nop +/* EEF7B0 802426B0 00000000 */ nop /* EEF7B4 802426B4 4622003C */ c.lt.d $f0, $f2 -/* EEF7B8 802426B8 00000000 */ nop +/* EEF7B8 802426B8 00000000 */ nop /* EEF7BC 802426BC 4500000A */ bc1f .L802426E8 -/* EEF7C0 802426C0 00000000 */ nop +/* EEF7C0 802426C0 00000000 */ nop .L802426C4: /* EEF7C4 802426C4 3C018024 */ lui $at, %hi(D_802454A8) /* EEF7C8 802426C8 D42254A8 */ ldc1 $f2, %lo(D_802454A8)($at) /* EEF7CC 802426CC 46003187 */ neg.s $f6, $f6 /* EEF7D0 802426D0 46003021 */ cvt.d.s $f0, $f6 /* EEF7D4 802426D4 46220002 */ mul.d $f0, $f0, $f2 -/* EEF7D8 802426D8 00000000 */ nop +/* EEF7D8 802426D8 00000000 */ nop /* EEF7DC 802426DC 46202000 */ add.d $f0, $f4, $f0 .L802426E0: /* EEF7E0 802426E0 46200020 */ cvt.s.d $f0, $f0 diff --git a/asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s b/asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s index bf5455e928..4caf127392 100644 --- a/asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s +++ b/asm/nonmatchings/code_EEDF50/func_80242724_EEF824.s @@ -16,7 +16,7 @@ glabel func_80242724_EEF824 /* EEF850 80242750 A462008E */ sh $v0, 0x8e($v1) /* EEF854 80242754 00021400 */ sll $v0, $v0, 0x10 /* EEF858 80242758 1C400004 */ bgtz $v0, .L8024276C -/* EEF85C 8024275C 00000000 */ nop +/* EEF85C 8024275C 00000000 */ nop /* EEF860 80242760 AE000074 */ sw $zero, 0x74($s0) /* EEF864 80242764 A460008E */ sh $zero, 0x8e($v1) /* EEF868 80242768 AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s b/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s index add6dd1d19..cf634aa90c 100644 --- a/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s +++ b/asm/nonmatchings/code_EEDF50/func_80242780_EEF880.s @@ -66,7 +66,7 @@ glabel func_80242780_EEF880 /* EEF970 80242870 8E4300B0 */ lw $v1, 0xb0($s2) /* EEF974 80242874 30620004 */ andi $v0, $v1, 4 /* EEF978 80242878 10400007 */ beqz $v0, .L80242898 -/* EEF97C 8024287C 00000000 */ nop +/* EEF97C 8024287C 00000000 */ nop /* EEF980 80242880 824200B4 */ lb $v0, 0xb4($s2) /* EEF984 80242884 1440003A */ bnez $v0, .L80242970 /* EEF988 80242888 0000102D */ daddu $v0, $zero, $zero @@ -82,7 +82,7 @@ glabel func_80242780_EEF880 /* EEF9AC 802428AC 00220821 */ addu $at, $at, $v0 /* EEF9B0 802428B0 8C2254B0 */ lw $v0, %lo(D_802454B0)($at) /* EEF9B4 802428B4 00400008 */ jr $v0 -/* EEF9B8 802428B8 00000000 */ nop +/* EEF9B8 802428B8 00000000 */ nop /* EEF9BC 802428BC 0280202D */ daddu $a0, $s4, $zero /* EEF9C0 802428C0 0200282D */ daddu $a1, $s0, $zero /* EEF9C4 802428C4 0C090394 */ jal func_80240E50_EEDF50 @@ -139,6 +139,6 @@ glabel func_80242780_EEF880 /* EEFA88 80242988 8FB00030 */ lw $s0, 0x30($sp) /* EEFA8C 8024298C 03E00008 */ jr $ra /* EEFA90 80242990 27BD0050 */ addiu $sp, $sp, 0x50 -/* EEFA94 80242994 00000000 */ nop -/* EEFA98 80242998 00000000 */ nop -/* EEFA9C 8024299C 00000000 */ nop +/* EEFA94 80242994 00000000 */ nop +/* EEFA98 80242998 00000000 */ nop +/* EEFA9C 8024299C 00000000 */ nop diff --git a/asm/nonmatchings/code_EF2650/func_80240040_EF2650.s b/asm/nonmatchings/code_EF2650/func_80240040_EF2650.s index 274355acaa..14d8a4a504 100644 --- a/asm/nonmatchings/code_EF2650/func_80240040_EF2650.s +++ b/asm/nonmatchings/code_EF2650/func_80240040_EF2650.s @@ -13,4 +13,4 @@ glabel func_80240040_EF2650 /* EF2670 80240060 24020002 */ addiu $v0, $zero, 2 /* EF2674 80240064 03E00008 */ jr $ra /* EF2678 80240068 27BD0018 */ addiu $sp, $sp, 0x18 -/* EF267C 8024006C 00000000 */ nop +/* EF267C 8024006C 00000000 */ nop diff --git a/asm/nonmatchings/code_EF2680/func_80240070_EF2680.s b/asm/nonmatchings/code_EF2680/func_80240070_EF2680.s index c51bd7504a..5cda2c4919 100644 --- a/asm/nonmatchings/code_EF2680/func_80240070_EF2680.s +++ b/asm/nonmatchings/code_EF2680/func_80240070_EF2680.s @@ -47,7 +47,7 @@ glabel func_80240070_EF2680 /* EF2728 80240118 0C013431 */ jal func_8004D0C4 /* EF272C 8024011C 8E070038 */ lw $a3, 0x38($s0) /* EF2730 80240120 1040000E */ beqz $v0, .L8024015C -/* EF2734 80240124 00000000 */ nop +/* EF2734 80240124 00000000 */ nop /* EF2738 80240128 8E2200D0 */ lw $v0, 0xd0($s1) /* EF273C 8024012C C60C0038 */ lwc1 $f12, 0x38($s0) /* EF2740 80240130 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -58,7 +58,7 @@ glabel func_80240070_EF2680 /* EF2754 80240144 468031A0 */ cvt.s.w $f6, $f6 /* EF2758 80240148 44073000 */ mfc1 $a3, $f6 /* EF275C 8024014C 0C00ABDC */ jal fio_validate_header_checksums -/* EF2760 80240150 00000000 */ nop +/* EF2760 80240150 00000000 */ nop /* EF2764 80240154 08090063 */ j .L8024018C /* EF2768 80240158 E600000C */ swc1 $f0, 0xc($s0) .L8024015C: @@ -66,7 +66,7 @@ glabel func_80240070_EF2680 /* EF2770 80240160 2404003C */ addiu $a0, $zero, 0x3c /* EF2774 80240164 C60C000C */ lwc1 $f12, 0xc($s0) /* EF2778 80240168 44820000 */ mtc1 $v0, $f0 -/* EF277C 8024016C 00000000 */ nop +/* EF277C 8024016C 00000000 */ nop /* EF2780 80240170 46800020 */ cvt.s.w $f0, $f0 /* EF2784 80240174 46006300 */ add.s $f12, $f12, $f0 /* EF2788 80240178 3C0141F0 */ lui $at, 0x41f0 @@ -82,7 +82,7 @@ glabel func_80240070_EF2680 /* EF27AC 8024019C 8E2200D0 */ lw $v0, 0xd0($s1) /* EF27B0 802401A0 8C420014 */ lw $v0, 0x14($v0) /* EF27B4 802401A4 04410004 */ bgez $v0, .L802401B8 -/* EF27B8 802401A8 00000000 */ nop +/* EF27B8 802401A8 00000000 */ nop /* EF27BC 802401AC C6400000 */ lwc1 $f0, ($s2) /* EF27C0 802401B0 08090076 */ j .L802401D8 /* EF27C4 802401B4 E6000018 */ swc1 $f0, 0x18($s0) @@ -90,7 +90,7 @@ glabel func_80240070_EF2680 /* EF27C8 802401B8 3C018024 */ lui $at, %hi(D_802453B0) /* EF27CC 802401BC D42253B0 */ ldc1 $f2, %lo(D_802453B0)($at) /* EF27D0 802401C0 44820000 */ mtc1 $v0, $f0 -/* EF27D4 802401C4 00000000 */ nop +/* EF27D4 802401C4 00000000 */ nop /* EF27D8 802401C8 46800021 */ cvt.d.w $f0, $f0 /* EF27DC 802401CC 46220003 */ div.d $f0, $f0, $f2 /* EF27E0 802401D0 46200020 */ cvt.s.d $f0, $f0 @@ -102,7 +102,7 @@ glabel func_80240070_EF2680 /* EF27F4 802401E4 44801000 */ mtc1 $zero, $f2 /* EF27F8 802401E8 46000021 */ cvt.d.s $f0, $f0 /* EF27FC 802401EC 46220002 */ mul.d $f0, $f0, $f2 -/* EF2800 802401F0 00000000 */ nop +/* EF2800 802401F0 00000000 */ nop /* EF2804 802401F4 24020001 */ addiu $v0, $zero, 1 /* EF2808 802401F8 4620018D */ trunc.w.d $f6, $f0 /* EF280C 802401FC E626007C */ swc1 $f6, 0x7c($s1) diff --git a/asm/nonmatchings/code_EF2680/func_80240220_EF2830.s b/asm/nonmatchings/code_EF2680/func_80240220_EF2830.s index 704775af35..e8860b508c 100644 --- a/asm/nonmatchings/code_EF2680/func_80240220_EF2830.s +++ b/asm/nonmatchings/code_EF2680/func_80240220_EF2830.s @@ -34,7 +34,7 @@ glabel func_80240220_EF2830 /* EF28A4 80240294 44803000 */ mtc1 $zero, $f6 /* EF28A8 80240298 46000021 */ cvt.d.s $f0, $f0 /* EF28AC 8024029C 46260002 */ mul.d $f0, $f0, $f6 -/* EF28B0 802402A0 00000000 */ nop +/* EF28B0 802402A0 00000000 */ nop /* EF28B4 802402A4 24020001 */ addiu $v0, $zero, 1 /* EF28B8 802402A8 8E24006C */ lw $a0, 0x6c($s1) /* EF28BC 802402AC 46261083 */ div.d $f2, $f2, $f6 @@ -63,7 +63,7 @@ glabel func_80240220_EF2830 /* EF2918 80240308 C600003C */ lwc1 $f0, 0x3c($s0) /* EF291C 8024030C 4600C001 */ sub.s $f0, $f24, $f0 /* EF2920 80240310 4600B03C */ c.lt.s $f22, $f0 -/* EF2924 80240314 00000000 */ nop +/* EF2924 80240314 00000000 */ nop /* EF2928 80240318 4500001B */ bc1f .L80240388 /* EF292C 8024031C 34820010 */ ori $v0, $a0, 0x10 /* EF2930 80240320 080900E2 */ j .L80240388 @@ -87,9 +87,9 @@ glabel func_80240220_EF2830 /* EF2974 80240364 C7A00034 */ lwc1 $f0, 0x34($sp) /* EF2978 80240368 4600D001 */ sub.s $f0, $f26, $f0 /* EF297C 8024036C 4600B03C */ c.lt.s $f22, $f0 -/* EF2980 80240370 00000000 */ nop +/* EF2980 80240370 00000000 */ nop /* EF2984 80240374 45000004 */ bc1f .L80240388 -/* EF2988 80240378 00000000 */ nop +/* EF2988 80240378 00000000 */ nop /* EF298C 8024037C 8E22006C */ lw $v0, 0x6c($s1) /* EF2990 80240380 34420010 */ ori $v0, $v0, 0x10 /* EF2994 80240384 AE22006C */ sw $v0, 0x6c($s1) @@ -98,7 +98,7 @@ glabel func_80240220_EF2830 /* EF299C 8024038C 24030011 */ addiu $v1, $zero, 0x11 /* EF29A0 80240390 30420011 */ andi $v0, $v0, 0x11 /* EF29A4 80240394 14430039 */ bne $v0, $v1, .L8024047C -/* EF29A8 80240398 00000000 */ nop +/* EF29A8 80240398 00000000 */ nop /* EF29AC 8024039C 8E020000 */ lw $v0, ($s0) /* EF29B0 802403A0 30420008 */ andi $v0, $v0, 8 /* EF29B4 802403A4 1040000A */ beqz $v0, .L802403D0 @@ -108,7 +108,7 @@ glabel func_80240220_EF2830 /* EF29C4 802403B4 D42053B8 */ ldc1 $f0, %lo(D_802453B8)($at) /* EF29C8 802403B8 460010A1 */ cvt.d.s $f2, $f2 /* EF29CC 802403BC 46201082 */ mul.d $f2, $f2, $f0 -/* EF29D0 802403C0 00000000 */ nop +/* EF29D0 802403C0 00000000 */ nop /* EF29D4 802403C4 4600A021 */ cvt.d.s $f0, $f20 /* EF29D8 802403C8 0809010D */ j .L80240434 /* EF29DC 802403CC 46220000 */ add.d $f0, $f0, $f2 @@ -135,7 +135,7 @@ glabel func_80240220_EF2830 /* EF2A2C 8024041C D42053C0 */ ldc1 $f0, %lo(D_802453C0)($at) /* EF2A30 80240420 460010A1 */ cvt.d.s $f2, $f2 /* EF2A34 80240424 46201082 */ mul.d $f2, $f2, $f0 -/* EF2A38 80240428 00000000 */ nop +/* EF2A38 80240428 00000000 */ nop /* EF2A3C 8024042C 4600A021 */ cvt.d.s $f0, $f20 /* EF2A40 80240430 46220000 */ add.d $f0, $f0, $f2 .L80240434: @@ -149,7 +149,7 @@ glabel func_80240220_EF2830 /* EF2A60 80240450 46000005 */ abs.s $f0, $f0 /* EF2A64 80240454 46000021 */ cvt.d.s $f0, $f0 /* EF2A68 80240458 4622003C */ c.lt.d $f0, $f2 -/* EF2A6C 8024045C 00000000 */ nop +/* EF2A6C 8024045C 00000000 */ nop /* EF2A70 80240460 45000036 */ bc1f .L8024053C /* EF2A74 80240464 2403FFEF */ addiu $v1, $zero, -0x11 /* EF2A78 80240468 E604003C */ swc1 $f4, 0x3c($s0) @@ -160,7 +160,7 @@ glabel func_80240220_EF2830 .L8024047C: /* EF2A8C 8024047C 8E220070 */ lw $v0, 0x70($s1) /* EF2A90 80240480 1840002E */ blez $v0, .L8024053C -/* EF2A94 80240484 00000000 */ nop +/* EF2A94 80240484 00000000 */ nop /* EF2A98 80240488 C62C0074 */ lwc1 $f12, 0x74($s1) /* EF2A9C 8024048C 0C00AD77 */ jal func_8002B5DC /* EF2AA0 80240490 46806320 */ cvt.s.w $f12, $f12 @@ -189,23 +189,23 @@ glabel func_80240220_EF2830 /* EF2AF8 802404E8 27A70030 */ addiu $a3, $sp, 0x30 .L802404EC: /* EF2AFC 802404EC 10400007 */ beqz $v0, .L8024050C -/* EF2B00 802404F0 00000000 */ nop +/* EF2B00 802404F0 00000000 */ nop /* EF2B04 802404F4 4616A082 */ mul.s $f2, $f20, $f22 -/* EF2B08 802404F8 00000000 */ nop +/* EF2B08 802404F8 00000000 */ nop /* EF2B0C 802404FC C7A0002C */ lwc1 $f0, 0x2c($sp) /* EF2B10 80240500 461A0000 */ add.s $f0, $f0, $f26 /* EF2B14 80240504 08090146 */ j .L80240518 /* EF2B18 80240508 46020000 */ add.s $f0, $f0, $f2 .L8024050C: /* EF2B1C 8024050C 4616A002 */ mul.s $f0, $f20, $f22 -/* EF2B20 80240510 00000000 */ nop +/* EF2B20 80240510 00000000 */ nop /* EF2B24 80240514 4600C000 */ add.s $f0, $f24, $f0 .L80240518: /* EF2B28 80240518 E600003C */ swc1 $f0, 0x3c($s0) /* EF2B2C 8024051C 8E220074 */ lw $v0, 0x74($s1) /* EF2B30 80240520 2442000A */ addiu $v0, $v0, 0xa /* EF2B34 80240524 44826000 */ mtc1 $v0, $f12 -/* EF2B38 80240528 00000000 */ nop +/* EF2B38 80240528 00000000 */ nop /* EF2B3C 8024052C 0C00AB85 */ jal func_8002AE14 /* EF2B40 80240530 46806320 */ cvt.s.w $f12, $f12 /* EF2B44 80240534 4600020D */ trunc.w.s $f8, $f0 @@ -216,7 +216,7 @@ glabel func_80240220_EF2830 /* EF2B54 80240544 2442FFFF */ addiu $v0, $v0, -1 /* EF2B58 80240548 8E430014 */ lw $v1, 0x14($s2) /* EF2B5C 8024054C 04600048 */ bltz $v1, .L80240670 -/* EF2B60 80240550 00000000 */ nop +/* EF2B60 80240550 00000000 */ nop /* EF2B64 80240554 8E620074 */ lw $v0, 0x74($s3) /* EF2B68 80240558 1C400042 */ bgtz $v0, .L80240664 /* EF2B6C 8024055C 2442FFFF */ addiu $v0, $v0, -1 @@ -224,7 +224,7 @@ glabel func_80240220_EF2830 /* EF2B74 80240564 860200A8 */ lh $v0, 0xa8($s0) /* EF2B78 80240568 C602003C */ lwc1 $f2, 0x3c($s0) /* EF2B7C 8024056C 44820000 */ mtc1 $v0, $f0 -/* EF2B80 80240570 00000000 */ nop +/* EF2B80 80240570 00000000 */ nop /* EF2B84 80240574 46800020 */ cvt.s.w $f0, $f0 /* EF2B88 80240578 46001080 */ add.s $f2, $f2, $f0 /* EF2B8C 8024057C 3C014024 */ lui $at, 0x4024 @@ -237,7 +237,7 @@ glabel func_80240220_EF2830 /* EF2BA8 80240598 C440002C */ lwc1 $f0, 0x2c($v0) /* EF2BAC 8024059C 46000021 */ cvt.d.s $f0, $f0 /* EF2BB0 802405A0 4622003C */ c.lt.d $f0, $f2 -/* EF2BB4 802405A4 00000000 */ nop +/* EF2BB4 802405A4 00000000 */ nop /* EF2BB8 802405A8 4500002C */ bc1f .L8024065C /* EF2BBC 802405AC 02A0202D */ daddu $a0, $s5, $zero /* EF2BC0 802405B0 AFA00010 */ sw $zero, 0x10($sp) @@ -258,7 +258,7 @@ glabel func_80240220_EF2830 /* EF2BFC 802405EC 3C01C1A0 */ lui $at, 0xc1a0 /* EF2C00 802405F0 44812000 */ mtc1 $at, $f4 /* EF2C04 802405F4 44834000 */ mtc1 $v1, $f8 -/* EF2C08 802405F8 00000000 */ nop +/* EF2C08 802405F8 00000000 */ nop /* EF2C0C 802405FC 46804220 */ cvt.s.w $f8, $f8 /* EF2C10 80240600 44074000 */ mfc1 $a3, $f8 /* EF2C14 80240604 27A20038 */ addiu $v0, $sp, 0x38 @@ -314,7 +314,7 @@ glabel func_80240220_EF2830 /* EF2CC8 802406B8 0C013431 */ jal func_8004D0C4 /* EF2CCC 802406BC 8E070038 */ lw $a3, 0x38($s0) /* EF2CD0 802406C0 1040001A */ beqz $v0, .L8024072C -/* EF2CD4 802406C4 00000000 */ nop +/* EF2CD4 802406C4 00000000 */ nop /* EF2CD8 802406C8 8E060038 */ lw $a2, 0x38($s0) /* EF2CDC 802406CC 8E2200D0 */ lw $v0, 0xd0($s1) /* EF2CE0 802406D0 8E070040 */ lw $a3, 0x40($s0) @@ -325,7 +325,7 @@ glabel func_80240220_EF2830 /* EF2CF4 802406E4 468073A0 */ cvt.s.w $f14, $f14 /* EF2CF8 802406E8 C6020018 */ lwc1 $f2, 0x18($s0) /* EF2CFC 802406EC 4600103C */ c.lt.s $f2, $f0 -/* EF2D00 802406F0 00000000 */ nop +/* EF2D00 802406F0 00000000 */ nop /* EF2D04 802406F4 4500000D */ bc1f .L8024072C /* EF2D08 802406F8 E7A00034 */ swc1 $f0, 0x34($sp) /* EF2D0C 802406FC C60C0038 */ lwc1 $f12, 0x38($s0) @@ -347,10 +347,10 @@ glabel func_80240220_EF2830 /* EF2D48 80240738 00621825 */ or $v1, $v1, $v0 /* EF2D4C 8024073C 00741825 */ or $v1, $v1, $s4 /* EF2D50 80240740 10600008 */ beqz $v1, .L80240764 -/* EF2D54 80240744 00000000 */ nop +/* EF2D54 80240744 00000000 */ nop /* EF2D58 80240748 8602008C */ lh $v0, 0x8c($s0) /* EF2D5C 8024074C 14400031 */ bnez $v0, .L80240814 -/* EF2D60 80240750 00000000 */ nop +/* EF2D60 80240750 00000000 */ nop /* EF2D64 80240754 8E050018 */ lw $a1, 0x18($s0) /* EF2D68 80240758 8E06000C */ lw $a2, 0xc($s0) /* EF2D6C 8024075C 0C00F909 */ jal func_8003E424 @@ -362,12 +362,12 @@ glabel func_80240220_EF2830 /* EF2D80 80240770 44801000 */ mtc1 $zero, $f2 /* EF2D84 80240774 46000021 */ cvt.d.s $f0, $f0 /* EF2D88 80240778 46220002 */ mul.d $f0, $f0, $f2 -/* EF2D8C 8024077C 00000000 */ nop +/* EF2D8C 8024077C 00000000 */ nop /* EF2D90 80240780 4620020D */ trunc.w.d $f8, $f0 /* EF2D94 80240784 E628007C */ swc1 $f8, 0x7c($s1) /* EF2D98 80240788 8E420004 */ lw $v0, 4($s2) /* EF2D9C 8024078C 18400021 */ blez $v0, .L80240814 -/* EF2DA0 80240790 00000000 */ nop +/* EF2DA0 80240790 00000000 */ nop /* EF2DA4 80240794 8602008E */ lh $v0, 0x8e($s0) /* EF2DA8 80240798 9603008E */ lhu $v1, 0x8e($s0) /* EF2DAC 8024079C 18400005 */ blez $v0, .L802407B4 @@ -375,7 +375,7 @@ glabel func_80240220_EF2830 /* EF2DB4 802407A4 A602008E */ sh $v0, 0x8e($s0) /* EF2DB8 802407A8 00021400 */ sll $v0, $v0, 0x10 /* EF2DBC 802407AC 1C400019 */ bgtz $v0, .L80240814 -/* EF2DC0 802407B0 00000000 */ nop +/* EF2DC0 802407B0 00000000 */ nop .L802407B4: /* EF2DC4 802407B4 240403E8 */ addiu $a0, $zero, 0x3e8 /* EF2DC8 802407B8 24020002 */ addiu $v0, $zero, 2 @@ -399,7 +399,7 @@ glabel func_80240220_EF2830 /* EF2E10 80240800 18400003 */ blez $v0, .L80240810 /* EF2E14 80240804 28620003 */ slti $v0, $v1, 3 /* EF2E18 80240808 10400002 */ beqz $v0, .L80240814 -/* EF2E1C 8024080C 00000000 */ nop +/* EF2E1C 8024080C 00000000 */ nop .L80240810: /* EF2E20 80240810 AE600070 */ sw $zero, 0x70($s3) .L80240814: diff --git a/asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s b/asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s index 54783a0d41..3e38e49614 100644 --- a/asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s +++ b/asm/nonmatchings/code_EF2680/func_80240E64_EF3474.s @@ -17,7 +17,7 @@ glabel func_80240E64_EF3474 /* EF34A4 80240E94 A482008E */ sh $v0, 0x8e($a0) /* EF34A8 80240E98 00021400 */ sll $v0, $v0, 0x10 /* EF34AC 80240E9C 1C400006 */ bgtz $v0, .L80240EB8 -/* EF34B0 80240EA0 00000000 */ nop +/* EF34B0 80240EA0 00000000 */ nop .L80240EA4: /* EF34B4 80240EA4 8482008C */ lh $v0, 0x8c($a0) /* EF34B8 80240EA8 14400003 */ bnez $v0, .L80240EB8 diff --git a/asm/nonmatchings/code_EF2680/func_80241258_EF3868.s b/asm/nonmatchings/code_EF2680/func_80241258_EF3868.s index 5f6d585539..e2e6a0eb48 100644 --- a/asm/nonmatchings/code_EF2680/func_80241258_EF3868.s +++ b/asm/nonmatchings/code_EF2680/func_80241258_EF3868.s @@ -49,15 +49,15 @@ glabel func_80241258_EF3868 /* EF3910 80241300 44802000 */ mtc1 $zero, $f4 /* EF3914 80241304 460010A1 */ cvt.d.s $f2, $f2 /* EF3918 80241308 46241082 */ mul.d $f2, $f2, $f4 -/* EF391C 8024130C 00000000 */ nop +/* EF391C 8024130C 00000000 */ nop /* EF3920 80241310 C7A0001C */ lwc1 $f0, 0x1c($sp) /* EF3924 80241314 46000021 */ cvt.d.s $f0, $f0 /* EF3928 80241318 46240002 */ mul.d $f0, $f0, $f4 -/* EF392C 8024131C 00000000 */ nop +/* EF392C 8024131C 00000000 */ nop /* EF3930 80241320 3C013FE0 */ lui $at, 0x3fe0 /* EF3934 80241324 44812800 */ mtc1 $at, $f5 /* EF3938 80241328 44802000 */ mtc1 $zero, $f4 -/* EF393C 8024132C 00000000 */ nop +/* EF393C 8024132C 00000000 */ nop /* EF3940 80241330 46241080 */ add.d $f2, $f2, $f4 /* EF3944 80241334 AE000074 */ sw $zero, 0x74($s0) /* EF3948 80241338 46240000 */ add.d $f0, $f0, $f4 diff --git a/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s b/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s index 2a8780882c..a958e48762 100644 --- a/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s +++ b/asm/nonmatchings/code_EF2680/func_8024137C_EF398C.s @@ -65,7 +65,7 @@ glabel func_8024137C_EF398C /* EF3A78 80241468 8E4300B0 */ lw $v1, 0xb0($s2) /* EF3A7C 8024146C 30620004 */ andi $v0, $v1, 4 /* EF3A80 80241470 10400007 */ beqz $v0, .L80241490 -/* EF3A84 80241474 00000000 */ nop +/* EF3A84 80241474 00000000 */ nop /* EF3A88 80241478 824200B4 */ lb $v0, 0xb4($s2) /* EF3A8C 8024147C 1440003C */ bnez $v0, .L80241570 /* EF3A90 80241480 0000102D */ daddu $v0, $zero, $zero @@ -81,7 +81,7 @@ glabel func_8024137C_EF398C /* EF3AB4 802414A4 00220821 */ addu $at, $at, $v0 /* EF3AB8 802414A8 8C2253C8 */ lw $v0, %lo(D_802453C8)($at) /* EF3ABC 802414AC 00400008 */ jr $v0 -/* EF3AC0 802414B0 00000000 */ nop +/* EF3AC0 802414B0 00000000 */ nop /* EF3AC4 802414B4 02A0202D */ daddu $a0, $s5, $zero /* EF3AC8 802414B8 0200282D */ daddu $a1, $s0, $zero /* EF3ACC 802414BC 0C09001C */ jal func_80240070_EF2680 diff --git a/asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s b/asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s index 133f380617..c41d0a381b 100644 --- a/asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s +++ b/asm/nonmatchings/code_EF2680/func_802415DC_EF3BEC.s @@ -71,7 +71,7 @@ glabel func_802415DC_EF3BEC /* EF3CF0 802416E0 0C00AD77 */ jal func_8002B5DC /* EF3CF4 802416E4 46806320 */ cvt.s.w $f12, $f12 /* EF3CF8 802416E8 46140002 */ mul.s $f0, $f0, $f20 -/* EF3CFC 802416EC 00000000 */ nop +/* EF3CFC 802416EC 00000000 */ nop /* EF3D00 802416F0 C7A2002C */ lwc1 $f2, 0x2c($sp) /* EF3D04 802416F4 46181080 */ add.s $f2, $f2, $f24 /* EF3D08 802416F8 46001080 */ add.s $f2, $f2, $f0 @@ -79,14 +79,14 @@ glabel func_802415DC_EF3BEC /* EF3D10 80241700 8E220074 */ lw $v0, 0x74($s1) /* EF3D14 80241704 2442000C */ addiu $v0, $v0, 0xc /* EF3D18 80241708 44826000 */ mtc1 $v0, $f12 -/* EF3D1C 8024170C 00000000 */ nop +/* EF3D1C 8024170C 00000000 */ nop /* EF3D20 80241710 0C00AB85 */ jal func_8002AE14 /* EF3D24 80241714 46806320 */ cvt.s.w $f12, $f12 /* EF3D28 80241718 4600020D */ trunc.w.s $f8, $f0 /* EF3D2C 8024171C E6280074 */ swc1 $f8, 0x74($s1) /* EF3D30 80241720 8EE30014 */ lw $v1, 0x14($s7) /* EF3D34 80241724 0460003C */ bltz $v1, .L80241818 -/* EF3D38 80241728 00000000 */ nop +/* EF3D38 80241728 00000000 */ nop /* EF3D3C 8024172C 8E420074 */ lw $v0, 0x74($s2) /* EF3D40 80241730 1C400038 */ bgtz $v0, .L80241814 /* EF3D44 80241734 2442FFFF */ addiu $v0, $v0, -1 @@ -111,7 +111,7 @@ glabel func_802415DC_EF3BEC /* EF3D90 80241780 2402000F */ addiu $v0, $zero, 0xf /* EF3D94 80241784 AFA2001C */ sw $v0, 0x1c($sp) /* EF3D98 80241788 44834000 */ mtc1 $v1, $f8 -/* EF3D9C 8024178C 00000000 */ nop +/* EF3D9C 8024178C 00000000 */ nop /* EF3DA0 80241790 46804220 */ cvt.s.w $f8, $f8 /* EF3DA4 80241794 44074000 */ mfc1 $a3, $f8 /* EF3DA8 80241798 27A20038 */ addiu $v0, $sp, 0x38 @@ -170,7 +170,7 @@ glabel func_802415DC_EF3BEC /* EF3E70 80241860 0C013431 */ jal func_8004D0C4 /* EF3E74 80241864 8E070038 */ lw $a3, 0x38($s0) /* EF3E78 80241868 1040000D */ beqz $v0, .L802418A0 -/* EF3E7C 8024186C 00000000 */ nop +/* EF3E7C 8024186C 00000000 */ nop /* EF3E80 80241870 8E2200D0 */ lw $v0, 0xd0($s1) /* EF3E84 80241874 C60C0038 */ lwc1 $f12, 0x38($s0) /* EF3E88 80241878 C60E0040 */ lwc1 $f14, 0x40($s0) @@ -181,12 +181,12 @@ glabel func_802415DC_EF3BEC /* EF3E9C 8024188C 46804220 */ cvt.s.w $f8, $f8 /* EF3EA0 80241890 44074000 */ mfc1 $a3, $f8 /* EF3EA4 80241894 0C00ABDC */ jal fio_validate_header_checksums -/* EF3EA8 80241898 00000000 */ nop +/* EF3EA8 80241898 00000000 */ nop /* EF3EAC 8024189C E600000C */ swc1 $f0, 0xc($s0) .L802418A0: /* EF3EB0 802418A0 8602008C */ lh $v0, 0x8c($s0) /* EF3EB4 802418A4 14400056 */ bnez $v0, .L80241A00 -/* EF3EB8 802418A8 00000000 */ nop +/* EF3EB8 802418A8 00000000 */ nop /* EF3EBC 802418AC 8602008E */ lh $v0, 0x8e($s0) /* EF3EC0 802418B0 1840003D */ blez $v0, .L802419A8 /* EF3EC4 802418B4 240403E8 */ addiu $a0, $zero, 0x3e8 @@ -221,7 +221,7 @@ glabel func_802415DC_EF3BEC /* EF3F38 80241928 E7A4002C */ swc1 $f4, 0x2c($sp) /* EF3F3C 8024192C 460000A1 */ cvt.d.s $f2, $f0 /* EF3F40 80241930 4622303C */ c.lt.d $f6, $f2 -/* EF3F44 80241934 00000000 */ nop +/* EF3F44 80241934 00000000 */ nop /* EF3F48 80241938 45000005 */ bc1f .L80241950 /* EF3F4C 8024193C E7A00034 */ swc1 $f0, 0x34($sp) /* EF3F50 80241940 4600B021 */ cvt.d.s $f0, $f22 @@ -232,9 +232,9 @@ glabel func_802415DC_EF3BEC /* EF3F60 80241950 3C01C000 */ lui $at, 0xc000 /* EF3F64 80241954 44810800 */ mtc1 $at, $f1 /* EF3F68 80241958 44800000 */ mtc1 $zero, $f0 -/* EF3F6C 8024195C 00000000 */ nop +/* EF3F6C 8024195C 00000000 */ nop /* EF3F70 80241960 4620103C */ c.lt.d $f2, $f0 -/* EF3F74 80241964 00000000 */ nop +/* EF3F74 80241964 00000000 */ nop /* EF3F78 80241968 45020004 */ bc1fl .L8024197C /* EF3F7C 8024196C 46002586 */ mov.s $f22, $f4 /* EF3F80 80241970 4600B021 */ cvt.d.s $f0, $f22 @@ -246,7 +246,7 @@ glabel func_802415DC_EF3BEC /* EF3F94 80241984 44801000 */ mtc1 $zero, $f2 /* EF3F98 80241988 4600B021 */ cvt.d.s $f0, $f22 /* EF3F9C 8024198C 46220002 */ mul.d $f0, $f0, $f2 -/* EF3FA0 80241990 00000000 */ nop +/* EF3FA0 80241990 00000000 */ nop /* EF3FA4 80241994 4620020D */ trunc.w.d $f8, $f0 /* EF3FA8 80241998 E628007C */ swc1 $f8, 0x7c($s1) .L8024199C: diff --git a/asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s b/asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s index 81b4dbb66c..98f2c3a232 100644 --- a/asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s +++ b/asm/nonmatchings/code_EF2680/func_80241A40_EF4050.s @@ -57,7 +57,7 @@ glabel func_80241A40_EF4050 /* EF411C 80241B0C 0C00AD77 */ jal func_8002B5DC /* EF4120 80241B10 46806320 */ cvt.s.w $f12, $f12 /* EF4124 80241B14 46140002 */ mul.s $f0, $f0, $f20 -/* EF4128 80241B18 00000000 */ nop +/* EF4128 80241B18 00000000 */ nop /* EF412C 80241B1C C7A2002C */ lwc1 $f2, 0x2c($sp) /* EF4130 80241B20 46161080 */ add.s $f2, $f2, $f22 /* EF4134 80241B24 46001080 */ add.s $f2, $f2, $f0 @@ -65,7 +65,7 @@ glabel func_80241A40_EF4050 /* EF413C 80241B2C 8E220074 */ lw $v0, 0x74($s1) /* EF4140 80241B30 2442000C */ addiu $v0, $v0, 0xc /* EF4144 80241B34 44826000 */ mtc1 $v0, $f12 -/* EF4148 80241B38 00000000 */ nop +/* EF4148 80241B38 00000000 */ nop /* EF414C 80241B3C 0C00AB85 */ jal func_8002AE14 /* EF4150 80241B40 46806320 */ cvt.s.w $f12, $f12 /* EF4154 80241B44 4600028D */ trunc.w.s $f10, $f0 @@ -91,7 +91,7 @@ glabel func_80241A40_EF4050 /* EF41A4 80241B94 2402000F */ addiu $v0, $zero, 0xf /* EF41A8 80241B98 AFA2001C */ sw $v0, 0x1c($sp) /* EF41AC 80241B9C 44835000 */ mtc1 $v1, $f10 -/* EF41B0 80241BA0 00000000 */ nop +/* EF41B0 80241BA0 00000000 */ nop /* EF41B4 80241BA4 468052A0 */ cvt.s.w $f10, $f10 /* EF41B8 80241BA8 44075000 */ mfc1 $a3, $f10 /* EF41BC 80241BAC 27A20038 */ addiu $v0, $sp, 0x38 @@ -110,10 +110,10 @@ glabel func_80241A40_EF4050 .L80241BE0: /* EF41F0 80241BE0 8602008C */ lh $v0, 0x8c($s0) /* EF41F4 80241BE4 14400020 */ bnez $v0, .L80241C68 -/* EF41F8 80241BE8 00000000 */ nop +/* EF41F8 80241BE8 00000000 */ nop /* EF41FC 80241BEC 8602008E */ lh $v0, 0x8e($s0) /* EF4200 80241BF0 1C40001D */ bgtz $v0, .L80241C68 -/* EF4204 80241BF4 00000000 */ nop +/* EF4204 80241BF4 00000000 */ nop /* EF4208 80241BF8 8E420074 */ lw $v0, 0x74($s2) /* EF420C 80241BFC 2442FFFF */ addiu $v0, $v0, -1 /* EF4210 80241C00 18400018 */ blez $v0, .L80241C64 diff --git a/asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s b/asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s index 8a7779e9a9..3a470d3395 100644 --- a/asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s +++ b/asm/nonmatchings/code_EF2680/func_8024234C_EF495C.s @@ -17,23 +17,23 @@ glabel func_8024234C_EF495C /* EF498C 8024237C 8603008E */ lh $v1, 0x8e($s0) /* EF4990 80242380 2442FFFF */ addiu $v0, $v0, -1 /* EF4994 80242384 14620012 */ bne $v1, $v0, .L802423D0 -/* EF4998 80242388 00000000 */ nop +/* EF4998 80242388 00000000 */ nop /* EF499C 8024238C C6000038 */ lwc1 $f0, 0x38($s0) /* EF49A0 80242390 4600020D */ trunc.w.s $f8, $f0 /* EF49A4 80242394 44024000 */ mfc1 $v0, $f8 -/* EF49A8 80242398 00000000 */ nop +/* EF49A8 80242398 00000000 */ nop /* EF49AC 8024239C A6220010 */ sh $v0, 0x10($s1) /* EF49B0 802423A0 C600003C */ lwc1 $f0, 0x3c($s0) /* EF49B4 802423A4 4600020D */ trunc.w.s $f8, $f0 /* EF49B8 802423A8 44024000 */ mfc1 $v0, $f8 -/* EF49BC 802423AC 00000000 */ nop +/* EF49BC 802423AC 00000000 */ nop /* EF49C0 802423B0 A6220012 */ sh $v0, 0x12($s1) /* EF49C4 802423B4 C6000040 */ lwc1 $f0, 0x40($s0) /* EF49C8 802423B8 24020001 */ addiu $v0, $zero, 1 /* EF49CC 802423BC A2220007 */ sb $v0, 7($s1) /* EF49D0 802423C0 4600020D */ trunc.w.s $f8, $f0 /* EF49D4 802423C4 44024000 */ mfc1 $v0, $f8 -/* EF49D8 802423C8 00000000 */ nop +/* EF49D8 802423C8 00000000 */ nop /* EF49DC 802423CC A6220014 */ sh $v0, 0x14($s1) .L802423D0: /* EF49E0 802423D0 C6000038 */ lwc1 $f0, 0x38($s0) @@ -49,13 +49,13 @@ glabel func_8024234C_EF495C /* EF4A08 802423F8 860200A8 */ lh $v0, 0xa8($s0) /* EF4A0C 802423FC 27A50020 */ addiu $a1, $sp, 0x20 /* EF4A10 80242400 44820000 */ mtc1 $v0, $f0 -/* EF4A14 80242404 00000000 */ nop +/* EF4A14 80242404 00000000 */ nop /* EF4A18 80242408 46800020 */ cvt.s.w $f0, $f0 /* EF4A1C 8024240C E7A00018 */ swc1 $f0, 0x18($sp) /* EF4A20 80242410 860200A6 */ lh $v0, 0xa6($s0) /* EF4A24 80242414 27A60024 */ addiu $a2, $sp, 0x24 /* EF4A28 80242418 44820000 */ mtc1 $v0, $f0 -/* EF4A2C 8024241C 00000000 */ nop +/* EF4A2C 8024241C 00000000 */ nop /* EF4A30 80242420 46800020 */ cvt.s.w $f0, $f0 /* EF4A34 80242424 E7A0001C */ swc1 $f0, 0x1c($sp) /* EF4A38 80242428 8E040080 */ lw $a0, 0x80($s0) @@ -63,7 +63,7 @@ glabel func_8024234C_EF495C /* EF4A40 80242430 27A70028 */ addiu $a3, $sp, 0x28 /* EF4A44 80242434 0040902D */ daddu $s2, $v0, $zero /* EF4A48 80242438 16400005 */ bnez $s2, .L80242450 -/* EF4A4C 8024243C 00000000 */ nop +/* EF4A4C 8024243C 00000000 */ nop /* EF4A50 80242440 8E050018 */ lw $a1, 0x18($s0) /* EF4A54 80242444 8E06000C */ lw $a2, 0xc($s0) /* EF4A58 80242448 0C00F909 */ jal func_8003E424 @@ -76,9 +76,9 @@ glabel func_8024234C_EF495C /* EF4A70 80242460 A602008E */ sh $v0, 0x8e($s0) /* EF4A74 80242464 00021400 */ sll $v0, $v0, 0x10 /* EF4A78 80242468 18400003 */ blez $v0, .L80242478 -/* EF4A7C 8024246C 00000000 */ nop +/* EF4A7C 8024246C 00000000 */ nop /* EF4A80 80242470 12400008 */ beqz $s2, .L80242494 -/* EF4A84 80242474 00000000 */ nop +/* EF4A84 80242474 00000000 */ nop .L80242478: /* EF4A88 80242478 8E2200CC */ lw $v0, 0xcc($s1) /* EF4A8C 8024247C A2200007 */ sb $zero, 7($s1) diff --git a/asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s b/asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s index f79d4731e2..862b98eba2 100644 --- a/asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s +++ b/asm/nonmatchings/code_EF2680/func_802424B0_EF4AC0.s @@ -18,7 +18,7 @@ glabel func_802424B0_EF4AC0 /* EF4AF4 802424E4 00021400 */ sll $v0, $v0, 0x10 /* EF4AF8 802424E8 00021403 */ sra $v0, $v0, 0x10 /* EF4AFC 802424EC 14430003 */ bne $v0, $v1, .L802424FC -/* EF4B00 802424F0 00000000 */ nop +/* EF4B00 802424F0 00000000 */ nop /* EF4B04 802424F4 96020086 */ lhu $v0, 0x86($s0) /* EF4B08 802424F8 A48200A8 */ sh $v0, 0xa8($a0) .L802424FC: @@ -26,7 +26,7 @@ glabel func_802424B0_EF4AC0 /* EF4B10 80242500 8E030080 */ lw $v1, 0x80($s0) /* EF4B14 80242504 0043102A */ slt $v0, $v0, $v1 /* EF4B18 80242508 14400004 */ bnez $v0, .L8024251C -/* EF4B1C 8024250C 00000000 */ nop +/* EF4B1C 8024250C 00000000 */ nop /* EF4B20 80242510 96020086 */ lhu $v0, 0x86($s0) /* EF4B24 80242514 A48200A8 */ sh $v0, 0xa8($a0) /* EF4B28 80242518 AE200070 */ sw $zero, 0x70($s1) diff --git a/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s b/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s index 563ebad22d..d7f891b7b3 100644 --- a/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s +++ b/asm/nonmatchings/code_EF2680/func_80242530_EF4B40.s @@ -66,7 +66,7 @@ glabel func_80242530_EF4B40 /* EF4C30 80242620 8E2200B0 */ lw $v0, 0xb0($s1) /* EF4C34 80242624 30420004 */ andi $v0, $v0, 4 /* EF4C38 80242628 10400047 */ beqz $v0, .L80242748 -/* EF4C3C 8024262C 00000000 */ nop +/* EF4C3C 8024262C 00000000 */ nop .L80242630: /* EF4C40 80242630 AE600070 */ sw $zero, 0x70($s3) /* EF4C44 80242634 A640008E */ sh $zero, 0x8e($s2) @@ -115,7 +115,7 @@ glabel func_80242530_EF4B40 /* EF4CE8 802426D8 24020028 */ addiu $v0, $zero, 0x28 /* EF4CEC 802426DC AFA2001C */ sw $v0, 0x1c($sp) /* EF4CF0 802426E0 44833000 */ mtc1 $v1, $f6 -/* EF4CF4 802426E4 00000000 */ nop +/* EF4CF4 802426E4 00000000 */ nop /* EF4CF8 802426E8 468031A0 */ cvt.s.w $f6, $f6 /* EF4CFC 802426EC 44073000 */ mfc1 $a3, $f6 /* EF4D00 802426F0 27A20048 */ addiu $v0, $sp, 0x48 @@ -170,14 +170,14 @@ glabel func_80242530_EF4B40 /* EF4DB8 802427A8 10600015 */ beqz $v1, .L80242800 /* EF4DBC 802427AC 0260202D */ daddu $a0, $s3, $zero /* EF4DC0 802427B0 08090A42 */ j .L80242908 -/* EF4DC4 802427B4 00000000 */ nop +/* EF4DC4 802427B4 00000000 */ nop .L802427B8: /* EF4DC8 802427B8 1062001C */ beq $v1, $v0, .L8024282C /* EF4DCC 802427BC 24020003 */ addiu $v0, $zero, 3 /* EF4DD0 802427C0 10620035 */ beq $v1, $v0, .L80242898 /* EF4DD4 802427C4 0260202D */ daddu $a0, $s3, $zero /* EF4DD8 802427C8 08090A42 */ j .L80242908 -/* EF4DDC 802427CC 00000000 */ nop +/* EF4DDC 802427CC 00000000 */ nop .L802427D0: /* EF4DE0 802427D0 2402000E */ addiu $v0, $zero, 0xe /* EF4DE4 802427D4 1062003F */ beq $v1, $v0, .L802428D4 @@ -188,9 +188,9 @@ glabel func_80242530_EF4B40 /* EF4DF8 802427E8 10620040 */ beq $v1, $v0, .L802428EC /* EF4DFC 802427EC 24020063 */ addiu $v0, $zero, 0x63 /* EF4E00 802427F0 10620043 */ beq $v1, $v0, .L80242900 -/* EF4E04 802427F4 00000000 */ nop +/* EF4E04 802427F4 00000000 */ nop /* EF4E08 802427F8 08090A42 */ j .L80242908 -/* EF4E0C 802427FC 00000000 */ nop +/* EF4E0C 802427FC 00000000 */ nop .L80242800: /* EF4E10 80242800 0280282D */ daddu $a1, $s4, $zero /* EF4E14 80242804 0C013670 */ jal func_8004D9C0 @@ -203,7 +203,7 @@ glabel func_80242530_EF4B40 /* EF4E2C 8024281C 0C0136B6 */ jal func_8004DAD8 /* EF4E30 80242820 02A0302D */ daddu $a2, $s5, $zero /* EF4E34 80242824 08090A42 */ j .L80242908 -/* EF4E38 80242828 00000000 */ nop +/* EF4E38 80242828 00000000 */ nop .L8024282C: /* EF4E3C 8024282C 0260202D */ daddu $a0, $s3, $zero /* EF4E40 80242830 0280282D */ daddu $a1, $s4, $zero @@ -239,7 +239,7 @@ glabel func_80242530_EF4B40 /* EF4EAC 8024289C 0C013809 */ jal func_8004E024 /* EF4EB0 802428A0 02A0302D */ daddu $a2, $s5, $zero /* EF4EB4 802428A4 08090A42 */ j .L80242908 -/* EF4EB8 802428A8 00000000 */ nop +/* EF4EB8 802428A8 00000000 */ nop .L802428AC: /* EF4EBC 802428AC 0260202D */ daddu $a0, $s3, $zero /* EF4EC0 802428B0 0280282D */ daddu $a1, $s4, $zero @@ -251,20 +251,20 @@ glabel func_80242530_EF4B40 /* EF4ED4 802428C4 0C090886 */ jal func_80242218_EF4828 /* EF4ED8 802428C8 02A0302D */ daddu $a2, $s5, $zero /* EF4EDC 802428CC 08090A42 */ j .L80242908 -/* EF4EE0 802428D0 00000000 */ nop +/* EF4EE0 802428D0 00000000 */ nop .L802428D4: /* EF4EE4 802428D4 0260202D */ daddu $a0, $s3, $zero /* EF4EE8 802428D8 0280282D */ daddu $a1, $s4, $zero /* EF4EEC 802428DC 0C0908D3 */ jal func_8024234C_EF495C /* EF4EF0 802428E0 02A0302D */ daddu $a2, $s5, $zero /* EF4EF4 802428E4 08090A42 */ j .L80242908 -/* EF4EF8 802428E8 00000000 */ nop +/* EF4EF8 802428E8 00000000 */ nop .L802428EC: /* EF4EFC 802428EC 0280282D */ daddu $a1, $s4, $zero /* EF4F00 802428F0 0C09092C */ jal func_802424B0_EF4AC0 /* EF4F04 802428F4 02A0302D */ daddu $a2, $s5, $zero /* EF4F08 802428F8 08090A42 */ j .L80242908 -/* EF4F0C 802428FC 00000000 */ nop +/* EF4F0C 802428FC 00000000 */ nop .L80242900: /* EF4F10 80242900 0C013AE3 */ jal func_8004EB8C /* EF4F14 80242904 0260202D */ daddu $a0, $s3, $zero @@ -294,7 +294,7 @@ glabel func_80242530_EF4B40 /* EF4F68 80242958 00220821 */ addu $at, $at, $v0 /* EF4F6C 8024295C 8C225410 */ lw $v0, %lo(D_80245410)($at) /* EF4F70 80242960 00400008 */ jr $v0 -/* EF4F74 80242964 00000000 */ nop +/* EF4F74 80242964 00000000 */ nop /* EF4F78 80242968 8E420028 */ lw $v0, 0x28($s2) /* EF4F7C 8024296C 24420001 */ addiu $v0, $v0, 1 /* EF4F80 80242970 AE420028 */ sw $v0, 0x28($s2) diff --git a/asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s b/asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s index ee1f0ef834..e0050518c9 100644 --- a/asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s +++ b/asm/nonmatchings/code_EF2680/func_8024299C_EF4FAC.s @@ -66,7 +66,7 @@ glabel func_8024299C_EF4FAC /* EF509C 80242A8C 8E430094 */ lw $v1, 0x94($s2) /* EF50A0 80242A90 24020064 */ addiu $v0, $zero, 0x64 /* EF50A4 80242A94 1462001C */ bne $v1, $v0, .L80242B08 -/* EF50A8 80242A98 00000000 */ nop +/* EF50A8 80242A98 00000000 */ nop .L80242A9C: /* EF50AC 80242A9C 24020064 */ addiu $v0, $zero, 0x64 /* EF50B0 80242AA0 2404F7FF */ addiu $a0, $zero, -0x801 @@ -133,7 +133,7 @@ glabel func_8024299C_EF4FAC /* EF519C 80242B8C 24020028 */ addiu $v0, $zero, 0x28 /* EF51A0 80242B90 AFA2001C */ sw $v0, 0x1c($sp) /* EF51A4 80242B94 44834000 */ mtc1 $v1, $f8 -/* EF51A8 80242B98 00000000 */ nop +/* EF51A8 80242B98 00000000 */ nop /* EF51AC 80242B9C 46804220 */ cvt.s.w $f8, $f8 /* EF51B0 80242BA0 44074000 */ mfc1 $a3, $f8 /* EF51B4 80242BA4 27A20048 */ addiu $v0, $sp, 0x48 @@ -164,7 +164,7 @@ glabel func_8024299C_EF4FAC /* EF5210 80242C00 8EA20070 */ lw $v0, 0x70($s5) /* EF5214 80242C04 28420064 */ slti $v0, $v0, 0x64 /* EF5218 80242C08 10400007 */ beqz $v0, .L80242C28 -/* EF521C 80242C0C 00000000 */ nop +/* EF521C 80242C0C 00000000 */ nop /* EF5220 80242C10 8FA2004C */ lw $v0, 0x4c($sp) /* EF5224 80242C14 24420032 */ addiu $v0, $v0, 0x32 /* EF5228 80242C18 2C4201A5 */ sltiu $v0, $v0, 0x1a5 @@ -189,7 +189,7 @@ glabel func_8024299C_EF4FAC /* EF5270 80242C60 50600027 */ beql $v1, $zero, .L80242D00 /* EF5274 80242C64 02A0202D */ daddu $a0, $s5, $zero /* EF5278 80242C68 08090CA5 */ j .L80243294 -/* EF527C 80242C6C 00000000 */ nop +/* EF527C 80242C6C 00000000 */ nop .L80242C70: /* EF5280 80242C70 2402000D */ addiu $v0, $zero, 0xd /* EF5284 80242C74 1062004D */ beq $v1, $v0, .L80242DAC @@ -199,7 +199,7 @@ glabel func_8024299C_EF4FAC /* EF5294 80242C84 10620046 */ beq $v1, $v0, .L80242DA0 /* EF5298 80242C88 02A0202D */ daddu $a0, $s5, $zero /* EF529C 80242C8C 08090CA5 */ j .L80243294 -/* EF52A0 80242C90 00000000 */ nop +/* EF52A0 80242C90 00000000 */ nop .L80242C94: /* EF52A4 80242C94 24020067 */ addiu $v0, $zero, 0x67 /* EF52A8 80242C98 10620158 */ beq $v1, $v0, .L802431FC @@ -213,7 +213,7 @@ glabel func_8024299C_EF4FAC /* EF52C8 80242CB8 1062004F */ beq $v1, $v0, .L80242DF8 /* EF52CC 80242CBC 24020002 */ addiu $v0, $zero, 2 /* EF52D0 80242CC0 08090CA5 */ j .L80243294 -/* EF52D4 80242CC4 00000000 */ nop +/* EF52D4 80242CC4 00000000 */ nop .L80242CC8: /* EF52D8 80242CC8 2404006F */ addiu $a0, $zero, 0x6f /* EF52DC 80242CCC 10640166 */ beq $v1, $a0, .L80243268 @@ -223,13 +223,13 @@ glabel func_8024299C_EF4FAC /* EF52EC 80242CDC 10620156 */ beq $v1, $v0, .L80243238 /* EF52F0 80242CE0 2402001E */ addiu $v0, $zero, 0x1e /* EF52F4 80242CE4 08090CA5 */ j .L80243294 -/* EF52F8 80242CE8 00000000 */ nop +/* EF52F8 80242CE8 00000000 */ nop .L80242CEC: /* EF52FC 80242CEC 240200C8 */ addiu $v0, $zero, 0xc8 /* EF5300 80242CF0 10620166 */ beq $v1, $v0, .L8024328C -/* EF5304 80242CF4 00000000 */ nop +/* EF5304 80242CF4 00000000 */ nop /* EF5308 80242CF8 08090CA5 */ j .L80243294 -/* EF530C 80242CFC 00000000 */ nop +/* EF530C 80242CFC 00000000 */ nop .L80242D00: /* EF5310 80242D00 0260282D */ daddu $a1, $s3, $zero /* EF5314 80242D04 0C013670 */ jal func_8004D9C0 @@ -244,7 +244,7 @@ glabel func_8024299C_EF4FAC /* EF5338 80242D28 44801800 */ mtc1 $zero, $f3 /* EF533C 80242D2C 46000021 */ cvt.d.s $f0, $f0 /* EF5340 80242D30 4622003E */ c.le.d $f0, $f2 -/* EF5344 80242D34 00000000 */ nop +/* EF5344 80242D34 00000000 */ nop /* EF5348 80242D38 45000005 */ bc1f .L80242D50 /* EF534C 80242D3C 2403FDFF */ addiu $v1, $zero, -0x201 /* EF5350 80242D40 8E220000 */ lw $v0, ($s1) @@ -265,7 +265,7 @@ glabel func_8024299C_EF4FAC /* EF537C 80242D6C 0C0136B6 */ jal func_8004DAD8 /* EF5380 80242D70 0280302D */ daddu $a2, $s4, $zero /* EF5384 80242D74 08090CA5 */ j .L80243294 -/* EF5388 80242D78 00000000 */ nop +/* EF5388 80242D78 00000000 */ nop .L80242D7C: /* EF538C 80242D7C 0260282D */ daddu $a1, $s3, $zero /* EF5390 80242D80 0C0137D9 */ jal func_8004DF64 @@ -276,7 +276,7 @@ glabel func_8024299C_EF4FAC /* EF53A0 80242D90 0C013809 */ jal func_8004E024 /* EF53A4 80242D94 0280302D */ daddu $a2, $s4, $zero /* EF53A8 80242D98 08090CA5 */ j .L80243294 -/* EF53AC 80242D9C 00000000 */ nop +/* EF53AC 80242D9C 00000000 */ nop .L80242DA0: /* EF53B0 80242DA0 0260282D */ daddu $a1, $s3, $zero /* EF53B4 80242DA4 0C090867 */ jal func_8024219C_EF47AC @@ -295,18 +295,18 @@ glabel func_8024299C_EF4FAC /* EF53E0 80242DD0 0C0908D3 */ jal func_8024234C_EF495C /* EF53E4 80242DD4 0280302D */ daddu $a2, $s4, $zero /* EF53E8 80242DD8 08090CA5 */ j .L80243294 -/* EF53EC 80242DDC 00000000 */ nop +/* EF53EC 80242DDC 00000000 */ nop .L80242DE0: /* EF53F0 80242DE0 02A0202D */ daddu $a0, $s5, $zero /* EF53F4 80242DE4 0260282D */ daddu $a1, $s3, $zero /* EF53F8 80242DE8 0C09092C */ jal func_802424B0_EF4AC0 /* EF53FC 80242DEC 0280302D */ daddu $a2, $s4, $zero /* EF5400 80242DF0 08090CA5 */ j .L80243294 -/* EF5404 80242DF4 00000000 */ nop +/* EF5404 80242DF4 00000000 */ nop .L80242DF8: /* EF5408 80242DF8 8E430094 */ lw $v1, 0x94($s2) /* EF540C 80242DFC 14620125 */ bne $v1, $v0, .L80243294 -/* EF5410 80242E00 00000000 */ nop +/* EF5410 80242E00 00000000 */ nop /* EF5414 80242E04 0C010ABD */ jal func_80042AF4 /* EF5418 80242E08 8E440098 */ lw $a0, 0x98($s2) /* EF541C 80242E0C 0C00F92F */ jal func_8003E4BC @@ -316,9 +316,9 @@ glabel func_8024299C_EF4FAC /* EF542C 80242E1C D4225468 */ ldc1 $f2, %lo(D_80245468)($at) /* EF5430 80242E20 46000021 */ cvt.d.s $f0, $f0 /* EF5434 80242E24 4622003C */ c.lt.d $f0, $f2 -/* EF5438 80242E28 00000000 */ nop +/* EF5438 80242E28 00000000 */ nop /* EF543C 80242E2C 45000008 */ bc1f .L80242E50 -/* EF5440 80242E30 00000000 */ nop +/* EF5440 80242E30 00000000 */ nop /* EF5444 80242E34 C4400038 */ lwc1 $f0, 0x38($v0) /* EF5448 80242E38 3C014028 */ lui $at, 0x4028 /* EF544C 80242E3C 44811800 */ mtc1 $at, $f3 @@ -401,7 +401,7 @@ glabel func_8024299C_EF4FAC /* EF5570 80242F60 44801800 */ mtc1 $zero, $f3 /* EF5574 80242F64 46000021 */ cvt.d.s $f0, $f0 /* EF5578 80242F68 4620103C */ c.lt.d $f2, $f0 -/* EF557C 80242F6C 00000000 */ nop +/* EF557C 80242F6C 00000000 */ nop /* EF5580 80242F70 4500001F */ bc1f .L80242FF0 /* EF5584 80242F74 27A50058 */ addiu $a1, $sp, 0x58 /* EF5588 80242F78 C6200038 */ lwc1 $f0, 0x38($s1) @@ -416,13 +416,13 @@ glabel func_8024299C_EF4FAC /* EF55AC 80242F9C E7A00014 */ swc1 $f0, 0x14($sp) /* EF55B0 80242FA0 862200A8 */ lh $v0, 0xa8($s1) /* EF55B4 80242FA4 44820000 */ mtc1 $v0, $f0 -/* EF55B8 80242FA8 00000000 */ nop +/* EF55B8 80242FA8 00000000 */ nop /* EF55BC 80242FAC 46800020 */ cvt.s.w $f0, $f0 /* EF55C0 80242FB0 E7A00018 */ swc1 $f0, 0x18($sp) /* EF55C4 80242FB4 862200A6 */ lh $v0, 0xa6($s1) /* EF55C8 80242FB8 27A6005C */ addiu $a2, $sp, 0x5c /* EF55CC 80242FBC 44820000 */ mtc1 $v0, $f0 -/* EF55D0 80242FC0 00000000 */ nop +/* EF55D0 80242FC0 00000000 */ nop /* EF55D4 80242FC4 46800020 */ cvt.s.w $f0, $f0 /* EF55D8 80242FC8 E7A0001C */ swc1 $f0, 0x1c($sp) /* EF55DC 80242FCC 8E240080 */ lw $a0, 0x80($s1) @@ -440,7 +440,7 @@ glabel func_8024299C_EF4FAC /* EF5608 80242FF8 4480B800 */ mtc1 $zero, $f23 /* EF560C 80242FFC 46000021 */ cvt.d.s $f0, $f0 /* EF5610 80243000 4636003C */ c.lt.d $f0, $f22 -/* EF5614 80243004 00000000 */ nop +/* EF5614 80243004 00000000 */ nop /* EF5618 80243008 45000074 */ bc1f .L802431DC /* EF561C 8024300C 27A50058 */ addiu $a1, $sp, 0x58 /* EF5620 80243010 27A6005C */ addiu $a2, $sp, 0x5c @@ -471,7 +471,7 @@ glabel func_8024299C_EF4FAC /* EF5684 80243074 0C03908F */ jal func_800E423C /* EF5688 80243078 27A70060 */ addiu $a3, $sp, 0x60 /* EF568C 8024307C 10400057 */ beqz $v0, .L802431DC -/* EF5690 80243080 00000000 */ nop +/* EF5690 80243080 00000000 */ nop /* EF5694 80243084 C620001C */ lwc1 $f0, 0x1c($s1) /* EF5698 80243088 C7A20064 */ lwc1 $f2, 0x64($sp) /* EF569C 8024308C 46000005 */ abs.s $f0, $f0 @@ -479,9 +479,9 @@ glabel func_8024299C_EF4FAC /* EF56A4 80243094 46340000 */ add.d $f0, $f0, $f20 /* EF56A8 80243098 460010A1 */ cvt.d.s $f2, $f2 /* EF56AC 8024309C 4620103E */ c.le.d $f2, $f0 -/* EF56B0 802430A0 00000000 */ nop +/* EF56B0 802430A0 00000000 */ nop /* EF56B4 802430A4 4500004D */ bc1f .L802431DC -/* EF56B8 802430A8 00000000 */ nop +/* EF56B8 802430A8 00000000 */ nop /* EF56BC 802430AC C7A0005C */ lwc1 $f0, 0x5c($sp) /* EF56C0 802430B0 E620003C */ swc1 $f0, 0x3c($s1) /* EF56C4 802430B4 8E4200D0 */ lw $v0, 0xd0($s2) @@ -515,7 +515,7 @@ glabel func_8024299C_EF4FAC /* EF5734 80243124 C620003C */ lwc1 $f0, 0x3c($s1) /* EF5738 80243128 46000021 */ cvt.d.s $f0, $f0 /* EF573C 8024312C 4636003E */ c.le.d $f0, $f22 -/* EF5740 80243130 00000000 */ nop +/* EF5740 80243130 00000000 */ nop /* EF5744 80243134 4501000D */ bc1t .L8024316C /* EF5748 80243138 2403FFF7 */ addiu $v1, $zero, -9 /* EF574C 8024313C 8E220000 */ lw $v0, ($s1) @@ -625,6 +625,6 @@ glabel func_8024299C_EF4FAC /* EF58C8 802432B8 0000102D */ daddu $v0, $zero, $zero /* EF58CC 802432BC 03E00008 */ jr $ra /* EF58D0 802432C0 27BD0098 */ addiu $sp, $sp, 0x98 -/* EF58D4 802432C4 00000000 */ nop -/* EF58D8 802432C8 00000000 */ nop -/* EF58DC 802432CC 00000000 */ nop +/* EF58D4 802432C4 00000000 */ nop +/* EF58D8 802432C8 00000000 */ nop +/* EF58DC 802432CC 00000000 */ nop diff --git a/asm/nonmatchings/code_EF7A80/func_80240124_EF7BA4.s b/asm/nonmatchings/code_EF7A80/func_80240124_EF7BA4.s index 62f9c85bef..93b9a9a265 100644 --- a/asm/nonmatchings/code_EF7A80/func_80240124_EF7BA4.s +++ b/asm/nonmatchings/code_EF7A80/func_80240124_EF7BA4.s @@ -14,7 +14,7 @@ glabel func_80240124_EF7BA4 .L80240148: /* EF7BC8 80240148 8E020070 */ lw $v0, 0x70($s0) /* EF7BCC 8024014C 1440000E */ bnez $v0, .L80240188 -/* EF7BD0 80240150 00000000 */ nop +/* EF7BD0 80240150 00000000 */ nop /* EF7BD4 80240154 8E0300A8 */ lw $v1, 0xa8($s0) /* EF7BD8 80240158 8E020088 */ lw $v0, 0x88($s0) /* EF7BDC 8024015C 00621821 */ addu $v1, $v1, $v0 @@ -33,7 +33,7 @@ glabel func_80240124_EF7BA4 .L80240188: /* EF7C08 80240188 8E020074 */ lw $v0, 0x74($s0) /* EF7C0C 8024018C 1440000E */ bnez $v0, .L802401C8 -/* EF7C10 80240190 00000000 */ nop +/* EF7C10 80240190 00000000 */ nop /* EF7C14 80240194 8E0300AC */ lw $v1, 0xac($s0) /* EF7C18 80240198 8E02008C */ lw $v0, 0x8c($s0) /* EF7C1C 8024019C 00621821 */ addu $v1, $v1, $v0 @@ -52,7 +52,7 @@ glabel func_80240124_EF7BA4 .L802401C8: /* EF7C48 802401C8 8E020078 */ lw $v0, 0x78($s0) /* EF7C4C 802401CC 1440000E */ bnez $v0, .L80240208 -/* EF7C50 802401D0 00000000 */ nop +/* EF7C50 802401D0 00000000 */ nop /* EF7C54 802401D4 8E0300B0 */ lw $v1, 0xb0($s0) /* EF7C58 802401D8 8E020090 */ lw $v0, 0x90($s0) /* EF7C5C 802401DC 00621821 */ addu $v1, $v1, $v0 @@ -71,7 +71,7 @@ glabel func_80240124_EF7BA4 .L80240208: /* EF7C88 80240208 8E02007C */ lw $v0, 0x7c($s0) /* EF7C8C 8024020C 1440000E */ bnez $v0, .L80240248 -/* EF7C90 80240210 00000000 */ nop +/* EF7C90 80240210 00000000 */ nop /* EF7C94 80240214 8E0300B4 */ lw $v1, 0xb4($s0) /* EF7C98 80240218 8E020094 */ lw $v0, 0x94($s0) /* EF7C9C 8024021C 00621821 */ addu $v1, $v1, $v0 diff --git a/asm/nonmatchings/code_EF7A80/func_80240394_EF7E14.s b/asm/nonmatchings/code_EF7A80/func_80240394_EF7E14.s index 3f5c5aea2e..a1c2f2fa83 100644 --- a/asm/nonmatchings/code_EF7A80/func_80240394_EF7E14.s +++ b/asm/nonmatchings/code_EF7A80/func_80240394_EF7E14.s @@ -52,13 +52,13 @@ glabel func_80240394_EF7E14 /* EF7ED0 80240450 44812000 */ mtc1 $at, $f4 /* EF7ED4 80240454 46020003 */ div.s $f0, $f0, $f2 /* EF7ED8 80240458 46040582 */ mul.s $f22, $f0, $f4 -/* EF7EDC 8024045C 00000000 */ nop +/* EF7EDC 8024045C 00000000 */ nop /* EF7EE0 80240460 4618A501 */ sub.s $f20, $f20, $f24 /* EF7EE4 80240464 3C013F00 */ lui $at, 0x3f00 /* EF7EE8 80240468 44810000 */ mtc1 $at, $f0 -/* EF7EEC 8024046C 00000000 */ nop +/* EF7EEC 8024046C 00000000 */ nop /* EF7EF0 80240470 4600A502 */ mul.s $f20, $f20, $f0 -/* EF7EF4 80240474 00000000 */ nop +/* EF7EF4 80240474 00000000 */ nop /* EF7EF8 80240478 12000007 */ beqz $s0, .L80240498 /* EF7EFC 8024047C 0233102A */ slt $v0, $s1, $s3 /* EF7F00 80240480 10400005 */ beqz $v0, .L80240498 @@ -72,18 +72,18 @@ glabel func_80240394_EF7E14 /* EF7F1C 8024049C 34210FD8 */ ori $at, $at, 0xfd8 /* EF7F20 802404A0 44810000 */ mtc1 $at, $f0 /* EF7F24 802404A4 44936000 */ mtc1 $s3, $f12 -/* EF7F28 802404A8 00000000 */ nop +/* EF7F28 802404A8 00000000 */ nop /* EF7F2C 802404AC 46806320 */ cvt.s.w $f12, $f12 /* EF7F30 802404B0 46006302 */ mul.s $f12, $f12, $f0 -/* EF7F34 802404B4 00000000 */ nop +/* EF7F34 802404B4 00000000 */ nop /* EF7F38 802404B8 44910000 */ mtc1 $s1, $f0 -/* EF7F3C 802404BC 00000000 */ nop +/* EF7F3C 802404BC 00000000 */ nop /* EF7F40 802404C0 46800020 */ cvt.s.w $f0, $f0 /* EF7F44 802404C4 46006303 */ div.s $f12, $f12, $f0 /* EF7F48 802404C8 0C00AD30 */ jal func_8002B4C0 /* EF7F4C 802404CC 46166300 */ add.s $f12, $f12, $f22 /* EF7F50 802404D0 4600A002 */ mul.s $f0, $f20, $f0 -/* EF7F54 802404D4 00000000 */ nop +/* EF7F54 802404D4 00000000 */ nop /* EF7F58 802404D8 4614C080 */ add.s $f2, $f24, $f20 /* EF7F5C 802404DC 46001081 */ sub.s $f2, $f2, $f0 /* EF7F60 802404E0 0240202D */ daddu $a0, $s2, $zero @@ -103,6 +103,6 @@ glabel func_80240394_EF7E14 /* EF7F98 80240518 24020002 */ addiu $v0, $zero, 2 /* EF7F9C 8024051C 03E00008 */ jr $ra /* EF7FA0 80240520 27BD0048 */ addiu $sp, $sp, 0x48 -/* EF7FA4 80240524 00000000 */ nop -/* EF7FA8 80240528 00000000 */ nop -/* EF7FAC 8024052C 00000000 */ nop +/* EF7FA4 80240524 00000000 */ nop +/* EF7FA8 80240528 00000000 */ nop +/* EF7FAC 8024052C 00000000 */ nop diff --git a/asm/nonmatchings/code_FBE10/PlayEffect.s b/asm/nonmatchings/code_FBE10/PlayEffect.s index f337fb19d8..63eebf4a12 100644 --- a/asm/nonmatchings/code_FBE10/PlayEffect.s +++ b/asm/nonmatchings/code_FBE10/PlayEffect.s @@ -178,7 +178,7 @@ glabel PlayEffect /* FCF00 802D8550 00220821 */ addu $at, $at, $v0 /* FCF04 802D8554 8C22A258 */ lw $v0, %lo(D_802DA258)($at) /* FCF08 802D8558 00400008 */ jr $v0 -/* FCF0C 802D855C 00000000 */ nop +/* FCF0C 802D855C 00000000 */ nop /* FCF10 802D8560 8FA50058 */ lw $a1, 0x58($sp) /* FCF14 802D8564 4406A000 */ mfc1 $a2, $f20 /* FCF18 802D8568 4407B000 */ mfc1 $a3, $f22 @@ -189,20 +189,20 @@ glabel PlayEffect /* FCF2C 802D857C 0C01C3F4 */ jal func_80070FD0 /* FCF30 802D8580 E7A00010 */ swc1 $f0, 0x10($sp) /* FCF34 802D8584 080B65A4 */ j .L802D9690 -/* FCF38 802D8588 00000000 */ nop +/* FCF38 802D8588 00000000 */ nop /* 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 +/* FCF50 802D85A0 00000000 */ nop /* FCF54 802D85A4 4405A000 */ mfc1 $a1, $f20 /* FCF58 802D85A8 4406B000 */ mfc1 $a2, $f22 /* FCF5C 802D85AC 4407C000 */ mfc1 $a3, $f24 /* FCF60 802D85B0 0C01BEB4 */ jal fx_walk_large /* FCF64 802D85B4 E7BA0010 */ swc1 $f26, 0x10($sp) /* FCF68 802D85B8 080B65A4 */ j .L802D9690 -/* FCF6C 802D85BC 00000000 */ nop +/* FCF6C 802D85BC 00000000 */ nop /* FCF70 802D85C0 4405A000 */ mfc1 $a1, $f20 /* FCF74 802D85C4 4406B000 */ mfc1 $a2, $f22 /* FCF78 802D85C8 4407C000 */ mfc1 $a3, $f24 @@ -210,14 +210,14 @@ glabel PlayEffect /* FCF80 802D85D0 0C01BECC */ jal fx_walk_normal /* FCF84 802D85D4 E7BC0014 */ swc1 $f28, 0x14($sp) /* FCF88 802D85D8 080B65A4 */ j .L802D9690 -/* FCF8C 802D85DC 00000000 */ nop +/* FCF8C 802D85DC 00000000 */ nop /* FCF90 802D85E0 C7AC0058 */ lwc1 $f12, 0x58($sp) /* FCF94 802D85E4 4406B000 */ mfc1 $a2, $f22 /* FCF98 802D85E8 4407C000 */ mfc1 $a3, $f24 /* FCF9C 802D85EC 0C01BEE4 */ jal func_8006FB90 /* FCFA0 802D85F0 4600A386 */ mov.s $f14, $f20 /* FCFA4 802D85F4 080B65A4 */ j .L802D9690 -/* FCFA8 802D85F8 00000000 */ nop +/* FCFA8 802D85F8 00000000 */ nop /* FCFAC 802D85FC 4405A000 */ mfc1 $a1, $f20 /* FCFB0 802D8600 4406B000 */ mfc1 $a2, $f22 /* FCFB4 802D8604 4407C000 */ mfc1 $a3, $f24 @@ -225,21 +225,21 @@ glabel PlayEffect /* FCFBC 802D860C 0C01BEFC */ jal func_8006FBF0 /* FCFC0 802D8610 E7BC0014 */ swc1 $f28, 0x14($sp) /* FCFC4 802D8614 080B65A4 */ j .L802D9690 -/* FCFC8 802D8618 00000000 */ nop +/* FCFC8 802D8618 00000000 */ nop /* FCFCC 802D861C C7AC0058 */ lwc1 $f12, 0x58($sp) /* FCFD0 802D8620 4406B000 */ mfc1 $a2, $f22 /* FCFD4 802D8624 4407C000 */ mfc1 $a3, $f24 /* FCFD8 802D8628 0C01BF14 */ jal func_8006FC50 /* FCFDC 802D862C 4600A386 */ mov.s $f14, $f20 /* FCFE0 802D8630 080B65A4 */ j .L802D9690 -/* FCFE4 802D8634 00000000 */ nop +/* FCFE4 802D8634 00000000 */ nop /* FCFE8 802D8638 4405A000 */ mfc1 $a1, $f20 /* FCFEC 802D863C 4406B000 */ mfc1 $a2, $f22 /* FCFF0 802D8640 4407C000 */ mfc1 $a3, $f24 /* FCFF4 802D8644 0C01BF2C */ jal func_8006FCB0 -/* FCFF8 802D8648 00000000 */ nop +/* FCFF8 802D8648 00000000 */ nop /* FCFFC 802D864C 080B65A4 */ j .L802D9690 -/* FD000 802D8650 00000000 */ nop +/* FD000 802D8650 00000000 */ nop /* FD004 802D8654 C7AC0058 */ lwc1 $f12, 0x58($sp) /* FD008 802D8658 4406B000 */ mfc1 $a2, $f22 /* FD00C 802D865C 4407C000 */ mfc1 $a3, $f24 @@ -247,7 +247,7 @@ glabel PlayEffect /* FD014 802D8664 0C01BF44 */ jal func_8006FD10 /* FD018 802D8668 E7BA0010 */ swc1 $f26, 0x10($sp) /* FD01C 802D866C 080B65A4 */ j .L802D9690 -/* FD020 802D8670 00000000 */ nop +/* FD020 802D8670 00000000 */ nop /* FD024 802D8674 8FA50058 */ lw $a1, 0x58($sp) /* FD028 802D8678 4406A000 */ mfc1 $a2, $f20 /* FD02C 802D867C 4407B000 */ mfc1 $a3, $f22 @@ -256,14 +256,14 @@ glabel PlayEffect /* FD038 802D8688 0C01BF5C */ jal func_8006FD70 /* FD03C 802D868C AFA30010 */ sw $v1, 0x10($sp) /* FD040 802D8690 080B65A4 */ j .L802D9690 -/* FD044 802D8694 00000000 */ nop +/* FD044 802D8694 00000000 */ nop /* FD048 802D8698 C7AC0058 */ lwc1 $f12, 0x58($sp) /* FD04C 802D869C 4406B000 */ mfc1 $a2, $f22 /* FD050 802D86A0 8FA7004C */ lw $a3, 0x4c($sp) /* FD054 802D86A4 0C01BF74 */ jal func_8006FDD0 /* FD058 802D86A8 4600A386 */ mov.s $f14, $f20 /* FD05C 802D86AC 080B65A4 */ j .L802D9690 -/* FD060 802D86B0 00000000 */ nop +/* FD060 802D86B0 00000000 */ nop /* FD064 802D86B4 4405A000 */ mfc1 $a1, $f20 /* FD068 802D86B8 4406B000 */ mfc1 $a2, $f22 /* FD06C 802D86BC 4407C000 */ mfc1 $a3, $f24 @@ -274,7 +274,7 @@ glabel PlayEffect /* FD080 802D86D0 0C01BF8C */ jal func_8006FE30 /* FD084 802D86D4 E7A2001C */ swc1 $f2, 0x1c($sp) /* FD088 802D86D8 080B65A4 */ j .L802D9690 -/* FD08C 802D86DC 00000000 */ nop +/* FD08C 802D86DC 00000000 */ nop /* FD090 802D86E0 4406B000 */ mfc1 $a2, $f22 /* FD094 802D86E4 4407C000 */ mfc1 $a3, $f24 /* FD098 802D86E8 27A20030 */ addiu $v0, $sp, 0x30 @@ -285,14 +285,14 @@ glabel PlayEffect /* FD0AC 802D86FC 0C01BFA4 */ jal fx_emote /* FD0B0 802D8700 AFA20020 */ sw $v0, 0x20($sp) /* FD0B4 802D8704 080B6234 */ j .L802D88D0 -/* FD0B8 802D8708 00000000 */ nop +/* FD0B8 802D8708 00000000 */ nop /* FD0BC 802D870C 4405A000 */ mfc1 $a1, $f20 /* FD0C0 802D8710 4406B000 */ mfc1 $a2, $f22 /* FD0C4 802D8714 4407C000 */ mfc1 $a3, $f24 /* FD0C8 802D8718 0C01BFBC */ jal func_8006FEF0 /* FD0CC 802D871C E7BA0010 */ swc1 $f26, 0x10($sp) /* FD0D0 802D8720 080B65A4 */ j .L802D9690 -/* FD0D4 802D8724 00000000 */ nop +/* FD0D4 802D8724 00000000 */ nop /* FD0D8 802D8728 4405A000 */ mfc1 $a1, $f20 /* FD0DC 802D872C 4406B000 */ mfc1 $a2, $f22 /* FD0E0 802D8730 4407C000 */ mfc1 $a3, $f24 @@ -302,7 +302,7 @@ glabel PlayEffect /* FD0F0 802D8740 0C01BFD4 */ jal func_8006FF50 /* FD0F4 802D8744 AFB7001C */ sw $s7, 0x1c($sp) /* FD0F8 802D8748 080B65A4 */ j .L802D9690 -/* FD0FC 802D874C 00000000 */ nop +/* FD0FC 802D874C 00000000 */ nop /* FD100 802D8750 4405A000 */ mfc1 $a1, $f20 /* FD104 802D8754 4406B000 */ mfc1 $a2, $f22 /* FD108 802D8758 4407C000 */ mfc1 $a3, $f24 @@ -310,35 +310,35 @@ glabel PlayEffect /* FD110 802D8760 0C01BFEC */ jal func_8006FFB0 /* FD114 802D8764 AFB40014 */ sw $s4, 0x14($sp) /* FD118 802D8768 080B65A4 */ j .L802D9690 -/* FD11C 802D876C 00000000 */ nop +/* FD11C 802D876C 00000000 */ nop /* FD120 802D8770 4405A000 */ mfc1 $a1, $f20 /* FD124 802D8774 4406B000 */ mfc1 $a2, $f22 /* FD128 802D8778 4407C000 */ mfc1 $a3, $f24 /* FD12C 802D877C 0C01C004 */ jal func_80070010 /* FD130 802D8780 AFB60010 */ sw $s6, 0x10($sp) /* FD134 802D8784 080B65A4 */ j .L802D9690 -/* FD138 802D8788 00000000 */ nop +/* FD138 802D8788 00000000 */ nop /* FD13C 802D878C 4405A000 */ mfc1 $a1, $f20 /* FD140 802D8790 4406B000 */ mfc1 $a2, $f22 /* FD144 802D8794 4407C000 */ mfc1 $a3, $f24 /* FD148 802D8798 0C01C01C */ jal func_80070070 /* FD14C 802D879C AFB60010 */ sw $s6, 0x10($sp) /* FD150 802D87A0 080B65A4 */ j .L802D9690 -/* FD154 802D87A4 00000000 */ nop +/* FD154 802D87A4 00000000 */ nop /* FD158 802D87A8 4405A000 */ mfc1 $a1, $f20 /* FD15C 802D87AC 4406B000 */ mfc1 $a2, $f22 /* FD160 802D87B0 4407C000 */ mfc1 $a3, $f24 /* FD164 802D87B4 0C01C034 */ jal func_800700D0 /* FD168 802D87B8 E7BA0010 */ swc1 $f26, 0x10($sp) /* FD16C 802D87BC 080B65A4 */ j .L802D9690 -/* FD170 802D87C0 00000000 */ nop +/* FD170 802D87C0 00000000 */ nop /* FD174 802D87C4 4405A000 */ mfc1 $a1, $f20 /* FD178 802D87C8 4406B000 */ mfc1 $a2, $f22 /* FD17C 802D87CC 4407C000 */ mfc1 $a3, $f24 /* FD180 802D87D0 0C01C04C */ jal func_80070130 -/* FD184 802D87D4 00000000 */ nop +/* FD184 802D87D4 00000000 */ nop /* FD188 802D87D8 080B65A4 */ j .L802D9690 -/* FD18C 802D87DC 00000000 */ nop +/* FD18C 802D87DC 00000000 */ nop /* FD190 802D87E0 4405A000 */ mfc1 $a1, $f20 /* FD194 802D87E4 4406B000 */ mfc1 $a2, $f22 /* FD198 802D87E8 4407C000 */ mfc1 $a3, $f24 @@ -348,21 +348,21 @@ glabel PlayEffect /* FD1A8 802D87F8 0C01C064 */ jal func_80070190 /* FD1AC 802D87FC AFB7001C */ sw $s7, 0x1c($sp) /* FD1B0 802D8800 080B65A4 */ j .L802D9690 -/* FD1B4 802D8804 00000000 */ nop +/* FD1B4 802D8804 00000000 */ nop /* FD1B8 802D8808 4405A000 */ mfc1 $a1, $f20 /* FD1BC 802D880C 4406B000 */ mfc1 $a2, $f22 /* FD1C0 802D8810 4407C000 */ mfc1 $a3, $f24 /* FD1C4 802D8814 0C01C07C */ jal func_800701F0 -/* FD1C8 802D8818 00000000 */ nop +/* FD1C8 802D8818 00000000 */ nop /* FD1CC 802D881C 080B65A4 */ j .L802D9690 -/* FD1D0 802D8820 00000000 */ nop +/* FD1D0 802D8820 00000000 */ nop /* FD1D4 802D8824 4405A000 */ mfc1 $a1, $f20 /* FD1D8 802D8828 4406B000 */ mfc1 $a2, $f22 /* FD1DC 802D882C 4407C000 */ mfc1 $a3, $f24 /* FD1E0 802D8830 0C01C094 */ jal func_80070250 /* FD1E4 802D8834 AFB60010 */ sw $s6, 0x10($sp) /* FD1E8 802D8838 080B65A4 */ j .L802D9690 -/* FD1EC 802D883C 00000000 */ nop +/* FD1EC 802D883C 00000000 */ nop /* FD1F0 802D8840 4405A000 */ mfc1 $a1, $f20 /* FD1F4 802D8844 4406B000 */ mfc1 $a2, $f22 /* FD1F8 802D8848 4407C000 */ mfc1 $a3, $f24 @@ -371,14 +371,14 @@ glabel PlayEffect /* FD204 802D8854 0C01C0AC */ jal func_800702B0 /* FD208 802D8858 AFA20014 */ sw $v0, 0x14($sp) /* FD20C 802D885C 080B6337 */ j .L802D8CDC -/* FD210 802D8860 00000000 */ nop +/* FD210 802D8860 00000000 */ nop /* FD214 802D8864 4405A000 */ mfc1 $a1, $f20 /* FD218 802D8868 4406B000 */ mfc1 $a2, $f22 /* FD21C 802D886C 4407C000 */ mfc1 $a3, $f24 /* FD220 802D8870 0C01C0C4 */ jal func_80070310 /* FD224 802D8874 AFB60010 */ sw $s6, 0x10($sp) /* FD228 802D8878 080B65A4 */ j .L802D9690 -/* FD22C 802D887C 00000000 */ nop +/* FD22C 802D887C 00000000 */ nop /* FD230 802D8880 4405A000 */ mfc1 $a1, $f20 /* FD234 802D8884 4406B000 */ mfc1 $a2, $f22 /* FD238 802D8888 4407C000 */ mfc1 $a3, $f24 @@ -388,7 +388,7 @@ glabel PlayEffect /* FD248 802D8898 0C01C0DC */ jal func_80070370 /* FD24C 802D889C AFB7001C */ sw $s7, 0x1c($sp) /* FD250 802D88A0 080B65A4 */ j .L802D9690 -/* FD254 802D88A4 00000000 */ nop +/* FD254 802D88A4 00000000 */ nop /* FD258 802D88A8 4405A000 */ mfc1 $a1, $f20 /* FD25C 802D88AC 4406B000 */ mfc1 $a2, $f22 /* FD260 802D88B0 4407C000 */ mfc1 $a3, $f24 @@ -405,7 +405,7 @@ glabel PlayEffect /* FD288 802D88D8 0C0B2026 */ jal set_variable /* FD28C 802D88DC 0260282D */ daddu $a1, $s3, $zero /* FD290 802D88E0 080B65A4 */ j .L802D9690 -/* FD294 802D88E4 00000000 */ nop +/* FD294 802D88E4 00000000 */ nop /* FD298 802D88E8 4405A000 */ mfc1 $a1, $f20 /* FD29C 802D88EC 4406B000 */ mfc1 $a2, $f22 /* FD2A0 802D88F0 4407C000 */ mfc1 $a3, $f24 @@ -416,7 +416,7 @@ glabel PlayEffect /* FD2B4 802D8904 0C01C10C */ jal func_80070430 /* FD2B8 802D8908 E7A2001C */ swc1 $f2, 0x1c($sp) /* FD2BC 802D890C 080B65A4 */ j .L802D9690 -/* FD2C0 802D8910 00000000 */ nop +/* FD2C0 802D8910 00000000 */ nop /* FD2C4 802D8914 4405A000 */ mfc1 $a1, $f20 /* FD2C8 802D8918 4406B000 */ mfc1 $a2, $f22 /* FD2CC 802D891C 4407C000 */ mfc1 $a3, $f24 @@ -426,7 +426,7 @@ glabel PlayEffect /* FD2DC 802D892C 0C01C13C */ jal func_800704F0 /* FD2E0 802D8930 AFA30018 */ sw $v1, 0x18($sp) /* FD2E4 802D8934 080B65A4 */ j .L802D9690 -/* FD2E8 802D8938 00000000 */ nop +/* FD2E8 802D8938 00000000 */ nop /* FD2EC 802D893C 4405A000 */ mfc1 $a1, $f20 /* FD2F0 802D8940 4406B000 */ mfc1 $a2, $f22 /* FD2F4 802D8944 4407C000 */ mfc1 $a3, $f24 @@ -437,14 +437,14 @@ glabel PlayEffect /* FD308 802D8958 0C01C154 */ jal func_80070550 /* FD30C 802D895C AFA30018 */ sw $v1, 0x18($sp) /* FD310 802D8960 080B65A4 */ j .L802D9690 -/* FD314 802D8964 00000000 */ nop +/* FD314 802D8964 00000000 */ nop /* FD318 802D8968 4405A000 */ mfc1 $a1, $f20 /* FD31C 802D896C 4406B000 */ mfc1 $a2, $f22 /* FD320 802D8970 4407C000 */ mfc1 $a3, $f24 /* FD324 802D8974 0C01C16C */ jal func_800705B0 /* FD328 802D8978 E7BA0010 */ swc1 $f26, 0x10($sp) /* FD32C 802D897C 080B65A4 */ j .L802D9690 -/* FD330 802D8980 00000000 */ nop +/* FD330 802D8980 00000000 */ nop /* FD334 802D8984 4405A000 */ mfc1 $a1, $f20 /* FD338 802D8988 4406B000 */ mfc1 $a2, $f22 /* FD33C 802D898C 4407C000 */ mfc1 $a3, $f24 @@ -452,21 +452,21 @@ glabel PlayEffect /* FD344 802D8994 0C01C184 */ jal func_80070610 /* FD348 802D8998 AFB40014 */ sw $s4, 0x14($sp) /* FD34C 802D899C 080B65A4 */ j .L802D9690 -/* FD350 802D89A0 00000000 */ nop +/* FD350 802D89A0 00000000 */ nop /* FD354 802D89A4 4405A000 */ mfc1 $a1, $f20 /* FD358 802D89A8 4406B000 */ mfc1 $a2, $f22 /* FD35C 802D89AC 4407C000 */ mfc1 $a3, $f24 /* FD360 802D89B0 0C01C19C */ jal func_80070670 -/* FD364 802D89B4 00000000 */ nop +/* FD364 802D89B4 00000000 */ nop /* FD368 802D89B8 080B65A4 */ j .L802D9690 -/* FD36C 802D89BC 00000000 */ nop +/* FD36C 802D89BC 00000000 */ nop /* FD370 802D89C0 4405A000 */ mfc1 $a1, $f20 /* FD374 802D89C4 4406B000 */ mfc1 $a2, $f22 /* FD378 802D89C8 4407C000 */ mfc1 $a3, $f24 /* FD37C 802D89CC 0C01C1B4 */ jal func_800706D0 -/* FD380 802D89D0 00000000 */ nop +/* FD380 802D89D0 00000000 */ nop /* FD384 802D89D4 080B65A4 */ j .L802D9690 -/* FD388 802D89D8 00000000 */ nop +/* FD388 802D89D8 00000000 */ nop /* FD38C 802D89DC 4405A000 */ mfc1 $a1, $f20 /* FD390 802D89E0 4406B000 */ mfc1 $a2, $f22 /* FD394 802D89E4 4407C000 */ mfc1 $a3, $f24 @@ -474,7 +474,7 @@ glabel PlayEffect /* FD39C 802D89EC 0C01C1CC */ jal func_80070730 /* FD3A0 802D89F0 AFB40014 */ sw $s4, 0x14($sp) /* FD3A4 802D89F4 080B65A4 */ j .L802D9690 -/* FD3A8 802D89F8 00000000 */ nop +/* FD3A8 802D89F8 00000000 */ nop /* FD3AC 802D89FC 4405A000 */ mfc1 $a1, $f20 /* FD3B0 802D8A00 4406B000 */ mfc1 $a2, $f22 /* FD3B4 802D8A04 4407C000 */ mfc1 $a3, $f24 @@ -484,7 +484,7 @@ glabel PlayEffect /* FD3C4 802D8A14 0C01C1E4 */ jal fx_sweat /* FD3C8 802D8A18 AFA30018 */ sw $v1, 0x18($sp) /* FD3CC 802D8A1C 080B65A4 */ j .L802D9690 -/* FD3D0 802D8A20 00000000 */ nop +/* FD3D0 802D8A20 00000000 */ nop /* FD3D4 802D8A24 4405A000 */ mfc1 $a1, $f20 /* FD3D8 802D8A28 4406B000 */ mfc1 $a2, $f22 /* FD3DC 802D8A2C 4407C000 */ mfc1 $a3, $f24 @@ -494,14 +494,14 @@ glabel PlayEffect /* FD3EC 802D8A3C 0C01C1FC */ jal fx_sleep_bubble /* FD3F0 802D8A40 AFA20018 */ sw $v0, 0x18($sp) /* FD3F4 802D8A44 080B62C2 */ j .L802D8B08 -/* FD3F8 802D8A48 00000000 */ nop +/* FD3F8 802D8A48 00000000 */ nop /* FD3FC 802D8A4C 4405A000 */ mfc1 $a1, $f20 /* FD400 802D8A50 4406B000 */ mfc1 $a2, $f22 /* FD404 802D8A54 4407C000 */ mfc1 $a3, $f24 /* FD408 802D8A58 0C01C22C */ jal func_800708B0 -/* FD40C 802D8A5C 00000000 */ nop +/* FD40C 802D8A5C 00000000 */ nop /* FD410 802D8A60 080B65A4 */ j .L802D9690 -/* FD414 802D8A64 00000000 */ nop +/* FD414 802D8A64 00000000 */ nop /* FD418 802D8A68 4405A000 */ mfc1 $a1, $f20 /* FD41C 802D8A6C 4406B000 */ mfc1 $a2, $f22 /* FD420 802D8A70 4407C000 */ mfc1 $a3, $f24 @@ -510,14 +510,14 @@ glabel PlayEffect /* FD42C 802D8A7C 0C01C124 */ jal func_80070490 /* FD430 802D8A80 AFA20014 */ sw $v0, 0x14($sp) /* FD434 802D8A84 080B6337 */ j .L802D8CDC -/* FD438 802D8A88 00000000 */ nop +/* FD438 802D8A88 00000000 */ nop /* FD43C 802D8A8C 4405A000 */ mfc1 $a1, $f20 /* FD440 802D8A90 4406B000 */ mfc1 $a2, $f22 /* FD444 802D8A94 4407C000 */ mfc1 $a3, $f24 /* FD448 802D8A98 0C01C244 */ jal func_80070910 -/* FD44C 802D8A9C 00000000 */ nop +/* FD44C 802D8A9C 00000000 */ nop /* FD450 802D8AA0 080B65A4 */ j .L802D9690 -/* FD454 802D8AA4 00000000 */ nop +/* FD454 802D8AA4 00000000 */ nop /* FD458 802D8AA8 4405A000 */ mfc1 $a1, $f20 /* FD45C 802D8AAC 4406B000 */ mfc1 $a2, $f22 /* FD460 802D8AB0 4407C000 */ mfc1 $a3, $f24 @@ -525,7 +525,7 @@ glabel PlayEffect /* FD468 802D8AB8 0C01C25C */ jal func_80070970 /* FD46C 802D8ABC AFB40014 */ sw $s4, 0x14($sp) /* FD470 802D8AC0 080B65A4 */ j .L802D9690 -/* FD474 802D8AC4 00000000 */ nop +/* FD474 802D8AC4 00000000 */ nop /* FD478 802D8AC8 4405A000 */ mfc1 $a1, $f20 /* FD47C 802D8ACC 4406B000 */ mfc1 $a2, $f22 /* FD480 802D8AD0 4407C000 */ mfc1 $a3, $f24 @@ -533,7 +533,7 @@ glabel PlayEffect /* FD488 802D8AD8 0C01C274 */ jal func_800709D0 /* FD48C 802D8ADC AFB40014 */ sw $s4, 0x14($sp) /* FD490 802D8AE0 080B65A4 */ j .L802D9690 -/* FD494 802D8AE4 00000000 */ nop +/* FD494 802D8AE4 00000000 */ nop /* FD498 802D8AE8 4405A000 */ mfc1 $a1, $f20 /* FD49C 802D8AEC 4406B000 */ mfc1 $a2, $f22 /* FD4A0 802D8AF0 4407C000 */ mfc1 $a3, $f24 @@ -548,28 +548,28 @@ glabel PlayEffect /* FD4C0 802D8B10 0C0B2026 */ jal set_variable /* FD4C4 802D8B14 8FA5006C */ lw $a1, 0x6c($sp) /* FD4C8 802D8B18 080B65A4 */ j .L802D9690 -/* FD4CC 802D8B1C 00000000 */ nop +/* FD4CC 802D8B1C 00000000 */ nop /* FD4D0 802D8B20 4405A000 */ mfc1 $a1, $f20 /* FD4D4 802D8B24 4406B000 */ mfc1 $a2, $f22 /* FD4D8 802D8B28 4407C000 */ mfc1 $a3, $f24 /* FD4DC 802D8B2C 0C01C2A4 */ jal func_80070A90 -/* FD4E0 802D8B30 00000000 */ nop +/* FD4E0 802D8B30 00000000 */ nop /* FD4E4 802D8B34 080B65A4 */ j .L802D9690 -/* FD4E8 802D8B38 00000000 */ nop +/* FD4E8 802D8B38 00000000 */ nop /* FD4EC 802D8B3C 4405A000 */ mfc1 $a1, $f20 /* FD4F0 802D8B40 4406B000 */ mfc1 $a2, $f22 /* FD4F4 802D8B44 4407C000 */ mfc1 $a3, $f24 /* FD4F8 802D8B48 0C01C2BC */ jal func_80070AF0 -/* FD4FC 802D8B4C 00000000 */ nop +/* FD4FC 802D8B4C 00000000 */ nop /* FD500 802D8B50 080B65A4 */ j .L802D9690 -/* FD504 802D8B54 00000000 */ nop +/* FD504 802D8B54 00000000 */ nop /* FD508 802D8B58 4405A000 */ mfc1 $a1, $f20 /* FD50C 802D8B5C 4406B000 */ mfc1 $a2, $f22 /* FD510 802D8B60 4407C000 */ mfc1 $a3, $f24 /* FD514 802D8B64 0C01C2D4 */ jal func_80070B50 /* FD518 802D8B68 E7BA0010 */ swc1 $f26, 0x10($sp) /* FD51C 802D8B6C 080B65A4 */ j .L802D9690 -/* FD520 802D8B70 00000000 */ nop +/* FD520 802D8B70 00000000 */ nop /* FD524 802D8B74 4405A000 */ mfc1 $a1, $f20 /* FD528 802D8B78 4406B000 */ mfc1 $a2, $f22 /* FD52C 802D8B7C 4407C000 */ mfc1 $a3, $f24 @@ -577,7 +577,7 @@ glabel PlayEffect /* FD534 802D8B84 0C01C2EC */ jal func_80070BB0 /* FD538 802D8B88 AFB40014 */ sw $s4, 0x14($sp) /* FD53C 802D8B8C 080B65A4 */ j .L802D9690 -/* FD540 802D8B90 00000000 */ nop +/* FD540 802D8B90 00000000 */ nop /* FD544 802D8B94 4405A000 */ mfc1 $a1, $f20 /* FD548 802D8B98 4406B000 */ mfc1 $a2, $f22 /* FD54C 802D8B9C 4407C000 */ mfc1 $a3, $f24 @@ -586,7 +586,7 @@ glabel PlayEffect /* FD558 802D8BA8 0C01C304 */ jal func_80070C10 /* FD55C 802D8BAC AFA20014 */ sw $v0, 0x14($sp) /* FD560 802D8BB0 080B6337 */ j .L802D8CDC -/* FD564 802D8BB4 00000000 */ nop +/* FD564 802D8BB4 00000000 */ nop /* FD568 802D8BB8 4405A000 */ mfc1 $a1, $f20 /* FD56C 802D8BBC 4406B000 */ mfc1 $a2, $f22 /* FD570 802D8BC0 4407C000 */ mfc1 $a3, $f24 @@ -595,7 +595,7 @@ glabel PlayEffect /* FD57C 802D8BCC 0C01C31C */ jal func_80070C70 /* FD580 802D8BD0 AFA20014 */ sw $v0, 0x14($sp) /* FD584 802D8BD4 080B6337 */ j .L802D8CDC -/* FD588 802D8BD8 00000000 */ nop +/* FD588 802D8BD8 00000000 */ nop /* FD58C 802D8BDC 4405A000 */ mfc1 $a1, $f20 /* FD590 802D8BE0 4406B000 */ mfc1 $a2, $f22 /* FD594 802D8BE4 4407C000 */ mfc1 $a3, $f24 @@ -624,7 +624,7 @@ glabel PlayEffect /* FD5F0 802D8C40 0C01C364 */ jal func_80070D90 /* FD5F4 802D8C44 AFB40014 */ sw $s4, 0x14($sp) /* FD5F8 802D8C48 080B65A4 */ j .L802D9690 -/* FD5FC 802D8C4C 00000000 */ nop +/* FD5FC 802D8C4C 00000000 */ nop /* FD600 802D8C50 4405A000 */ mfc1 $a1, $f20 /* FD604 802D8C54 4406B000 */ mfc1 $a2, $f22 /* FD608 802D8C58 4407C000 */ mfc1 $a3, $f24 @@ -632,7 +632,7 @@ glabel PlayEffect /* FD610 802D8C60 0C01C37C */ jal func_80070DF0 /* FD614 802D8C64 AFB40014 */ sw $s4, 0x14($sp) /* FD618 802D8C68 080B65A4 */ j .L802D9690 -/* FD61C 802D8C6C 00000000 */ nop +/* FD61C 802D8C6C 00000000 */ nop /* FD620 802D8C70 4405A000 */ mfc1 $a1, $f20 /* FD624 802D8C74 4406B000 */ mfc1 $a2, $f22 /* FD628 802D8C78 4407C000 */ mfc1 $a3, $f24 @@ -643,7 +643,7 @@ glabel PlayEffect /* FD63C 802D8C8C 0C01C394 */ jal func_80070E50 /* FD640 802D8C90 AFA30018 */ sw $v1, 0x18($sp) /* FD644 802D8C94 080B65A4 */ j .L802D9690 -/* FD648 802D8C98 00000000 */ nop +/* FD648 802D8C98 00000000 */ nop /* FD64C 802D8C9C 4405A000 */ mfc1 $a1, $f20 /* FD650 802D8CA0 4406B000 */ mfc1 $a2, $f22 /* FD654 802D8CA4 4407C000 */ mfc1 $a3, $f24 @@ -652,7 +652,7 @@ glabel PlayEffect /* FD660 802D8CB0 0C01C3AC */ jal func_80070EB0 /* FD664 802D8CB4 AFA20014 */ sw $v0, 0x14($sp) /* FD668 802D8CB8 080B6337 */ j .L802D8CDC -/* FD66C 802D8CBC 00000000 */ nop +/* FD66C 802D8CBC 00000000 */ nop /* FD670 802D8CC0 4405A000 */ mfc1 $a1, $f20 /* FD674 802D8CC4 4406B000 */ mfc1 $a2, $f22 /* FD678 802D8CC8 4407C000 */ mfc1 $a3, $f24 @@ -666,7 +666,7 @@ glabel PlayEffect /* FD694 802D8CE4 0C0B2026 */ jal set_variable /* FD698 802D8CE8 0200282D */ daddu $a1, $s0, $zero /* FD69C 802D8CEC 080B65A4 */ j .L802D9690 -/* FD6A0 802D8CF0 00000000 */ nop +/* FD6A0 802D8CF0 00000000 */ nop /* FD6A4 802D8CF4 4405A000 */ mfc1 $a1, $f20 /* FD6A8 802D8CF8 4406B000 */ mfc1 $a2, $f22 /* FD6AC 802D8CFC 4407C000 */ mfc1 $a3, $f24 @@ -682,7 +682,7 @@ glabel PlayEffect /* FD6D4 802D8D24 0C0B2026 */ jal set_variable /* FD6D8 802D8D28 0220282D */ daddu $a1, $s1, $zero /* FD6DC 802D8D2C 080B65A4 */ j .L802D9690 -/* FD6E0 802D8D30 00000000 */ nop +/* FD6E0 802D8D30 00000000 */ nop /* FD6E4 802D8D34 4405A000 */ mfc1 $a1, $f20 /* FD6E8 802D8D38 4406B000 */ mfc1 $a2, $f22 /* FD6EC 802D8D3C 4407C000 */ mfc1 $a3, $f24 @@ -690,7 +690,7 @@ glabel PlayEffect /* FD6F4 802D8D44 0C01C3F4 */ jal func_80070FD0 /* FD6F8 802D8D48 AFB40014 */ sw $s4, 0x14($sp) /* FD6FC 802D8D4C 080B65A4 */ j .L802D9690 -/* FD700 802D8D50 00000000 */ nop +/* FD700 802D8D50 00000000 */ nop /* FD704 802D8D54 4405A000 */ mfc1 $a1, $f20 /* FD708 802D8D58 4406B000 */ mfc1 $a2, $f22 /* FD70C 802D8D5C 4407C000 */ mfc1 $a3, $f24 @@ -738,7 +738,7 @@ glabel PlayEffect /* FD7B4 802D8E04 0040A82D */ daddu $s5, $v0, $zero /* FD7B8 802D8E08 8FA50044 */ lw $a1, 0x44($sp) /* FD7BC 802D8E0C 0C01C49C */ jal func_80071270 -/* FD7C0 802D8E10 00000000 */ nop +/* FD7C0 802D8E10 00000000 */ nop /* FD7C4 802D8E14 080B65A4 */ j .L802D9690 /* FD7C8 802D8E18 0040A82D */ daddu $s5, $v0, $zero /* FD7CC 802D8E1C 4406B000 */ mfc1 $a2, $f22 @@ -819,7 +819,7 @@ glabel PlayEffect /* FD8F8 802D8F48 4406B000 */ mfc1 $a2, $f22 /* FD8FC 802D8F4C 4407C000 */ mfc1 $a3, $f24 /* FD900 802D8F50 0C01C574 */ jal func_800715D0 -/* FD904 802D8F54 00000000 */ nop +/* FD904 802D8F54 00000000 */ nop /* FD908 802D8F58 080B65A4 */ j .L802D9690 /* FD90C 802D8F5C 0040A82D */ daddu $s5, $v0, $zero /* FD910 802D8F60 4405A000 */ mfc1 $a1, $f20 @@ -842,7 +842,7 @@ glabel PlayEffect /* FD954 802D8FA4 4406B000 */ mfc1 $a2, $f22 /* FD958 802D8FA8 4407C000 */ mfc1 $a3, $f24 /* FD95C 802D8FAC 0C01C5EC */ jal func_800717B0 -/* FD960 802D8FB0 00000000 */ nop +/* FD960 802D8FB0 00000000 */ nop /* FD964 802D8FB4 080B65A4 */ j .L802D9690 /* FD968 802D8FB8 0040A82D */ daddu $s5, $v0, $zero /* FD96C 802D8FBC 4405A000 */ mfc1 $a1, $f20 @@ -1162,7 +1162,7 @@ glabel PlayEffect /* FDE54 802D94A4 4406B000 */ mfc1 $a2, $f22 /* FDE58 802D94A8 4407C000 */ mfc1 $a3, $f24 /* FDE5C 802D94AC 0C01C61C */ jal func_80071870 -/* FDE60 802D94B0 00000000 */ nop +/* FDE60 802D94B0 00000000 */ nop /* FDE64 802D94B4 080B65A4 */ j .L802D9690 /* FDE68 802D94B8 0040A82D */ daddu $s5, $v0, $zero /* FDE6C 802D94BC 4405A000 */ mfc1 $a1, $f20 @@ -1257,7 +1257,7 @@ glabel PlayEffect /* FDFD0 802D9620 4406B000 */ mfc1 $a2, $f22 /* FDFD4 802D9624 4407C000 */ mfc1 $a3, $f24 /* FDFD8 802D9628 44940000 */ mtc1 $s4, $f0 -/* FDFDC 802D962C 00000000 */ nop +/* FDFDC 802D962C 00000000 */ nop /* FDFE0 802D9630 46800020 */ cvt.s.w $f0, $f0 /* FDFE4 802D9634 E7BA0010 */ swc1 $f26, 0x10($sp) /* FDFE8 802D9638 0C01CA84 */ jal func_80072A10 @@ -1282,7 +1282,7 @@ glabel PlayEffect /* FE034 802D9684 0040A82D */ daddu $s5, $v0, $zero .L802D9688: /* FE038 802D9688 080B65A2 */ j .L802D9688 -/* FE03C 802D968C 00000000 */ nop +/* FE03C 802D968C 00000000 */ nop .L802D9690: /* FE040 802D9690 12A00005 */ beqz $s5, .L802D96A8 /* FE044 802D9694 3C05FE36 */ lui $a1, 0xfe36 @@ -1310,6 +1310,6 @@ glabel PlayEffect /* FE098 802D96E8 24020002 */ addiu $v0, $zero, 2 /* FE09C 802D96EC 03E00008 */ jr $ra /* FE0A0 802D96F0 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* FE0A4 802D96F4 00000000 */ nop -/* FE0A8 802D96F8 00000000 */ nop -/* FE0AC 802D96FC 00000000 */ nop +/* FE0A4 802D96F4 00000000 */ nop +/* FE0A8 802D96F8 00000000 */ nop +/* FE0AC 802D96FC 00000000 */ nop diff --git a/asm/nonmatchings/code_FBE10/ShowEmote.s b/asm/nonmatchings/code_FBE10/ShowEmote.s index d78e090254..255151f7a0 100644 --- a/asm/nonmatchings/code_FBE10/ShowEmote.s +++ b/asm/nonmatchings/code_FBE10/ShowEmote.s @@ -82,7 +82,7 @@ glabel ShowEmote /* FC380 802D79D0 000217C3 */ sra $v0, $v0, 0x1f /* FC384 802D79D4 00C31823 */ subu $v1, $a2, $v1 /* FC388 802D79D8 44832000 */ mtc1 $v1, $f4 -/* FC38C 802D79DC 00000000 */ nop +/* FC38C 802D79DC 00000000 */ nop /* FC390 802D79E0 46802120 */ cvt.s.w $f4, $f4 /* FC394 802D79E4 00004810 */ mfhi $t1 /* FC398 802D79E8 080B5E97 */ j .L802D7A5C @@ -111,7 +111,7 @@ glabel ShowEmote /* FC3F0 802D7A40 000217C3 */ sra $v0, $v0, 0x1f /* FC3F4 802D7A44 00641823 */ subu $v1, $v1, $a0 /* FC3F8 802D7A48 44832000 */ mtc1 $v1, $f4 -/* FC3FC 802D7A4C 00000000 */ nop +/* FC3FC 802D7A4C 00000000 */ nop /* FC400 802D7A50 46802120 */ cvt.s.w $f4, $f4 /* FC404 802D7A54 00004010 */ mfhi $t0 /* FC408 802D7A58 01021023 */ subu $v0, $t0, $v0 @@ -119,7 +119,7 @@ glabel ShowEmote /* FC40C 802D7A5C 00021400 */ sll $v0, $v0, 0x10 /* FC410 802D7A60 00021403 */ sra $v0, $v0, 0x10 /* FC414 802D7A64 44820000 */ mtc1 $v0, $f0 -/* FC418 802D7A68 00000000 */ nop +/* FC418 802D7A68 00000000 */ nop /* FC41C 802D7A6C 46800020 */ cvt.s.w $f0, $f0 /* FC420 802D7A70 080B5EA1 */ j .L802D7A84 /* FC424 802D7A74 02A0202D */ daddu $a0, $s5, $zero diff --git a/asm/nonmatchings/code_FBE10/ShowSleepBubble.s b/asm/nonmatchings/code_FBE10/ShowSleepBubble.s index c0b33bb147..f4b9b43214 100644 --- a/asm/nonmatchings/code_FBE10/ShowSleepBubble.s +++ b/asm/nonmatchings/code_FBE10/ShowSleepBubble.s @@ -103,13 +103,13 @@ glabel ShowSleepBubble /* FCB54 802D81A4 00021400 */ sll $v0, $v0, 0x10 /* FCB58 802D81A8 00021403 */ sra $v0, $v0, 0x10 /* FCB5C 802D81AC 44822000 */ mtc1 $v0, $f4 -/* FCB60 802D81B0 00000000 */ nop +/* FCB60 802D81B0 00000000 */ nop /* FCB64 802D81B4 46802120 */ cvt.s.w $f4, $f4 /* FCB68 802D81B8 00031FC3 */ sra $v1, $v1, 0x1f /* FCB6C 802D81BC 00004010 */ mfhi $t0 /* FCB70 802D81C0 01031823 */ subu $v1, $t0, $v1 /* FCB74 802D81C4 44830000 */ mtc1 $v1, $f0 -/* FCB78 802D81C8 00000000 */ nop +/* FCB78 802D81C8 00000000 */ nop /* FCB7C 802D81CC 46800020 */ cvt.s.w $f0, $f0 /* FCB80 802D81D0 080B6078 */ j .L802D81E0 /* FCB84 802D81D4 46001000 */ add.s $f0, $f2, $f0 diff --git a/asm/nonmatchings/code_FBE10/func_802D7460.s b/asm/nonmatchings/code_FBE10/func_802D7460.s index a7d880f6d7..b38984d95f 100644 --- a/asm/nonmatchings/code_FBE10/func_802D7460.s +++ b/asm/nonmatchings/code_FBE10/func_802D7460.s @@ -5,7 +5,7 @@ glabel func_802D7460 /* FBE10 802D7460 27BDFFD8 */ addiu $sp, $sp, -0x28 /* FBE14 802D7464 24E2001E */ addiu $v0, $a3, 0x1e /* FBE18 802D7468 44820000 */ mtc1 $v0, $f0 -/* FBE1C 802D746C 00000000 */ nop +/* FBE1C 802D746C 00000000 */ nop /* FBE20 802D7470 46800020 */ cvt.s.w $f0, $f0 /* FBE24 802D7474 000717C2 */ srl $v0, $a3, 0x1f /* FBE28 802D7478 00E23821 */ addu $a3, $a3, $v0 diff --git a/asm/nonmatchings/code_FBE10/func_802D74C0.s b/asm/nonmatchings/code_FBE10/func_802D74C0.s index 3a7037aa26..7b6895c49c 100644 --- a/asm/nonmatchings/code_FBE10/func_802D74C0.s +++ b/asm/nonmatchings/code_FBE10/func_802D74C0.s @@ -5,7 +5,7 @@ glabel func_802D74C0 /* FBE70 802D74C0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* FBE74 802D74C4 24E2001E */ addiu $v0, $a3, 0x1e /* FBE78 802D74C8 44820000 */ mtc1 $v0, $f0 -/* FBE7C 802D74CC 00000000 */ nop +/* FBE7C 802D74CC 00000000 */ nop /* FBE80 802D74D0 46800020 */ cvt.s.w $f0, $f0 /* FBE84 802D74D4 000717C2 */ srl $v0, $a3, 0x1f /* FBE88 802D74D8 00E23821 */ addu $a3, $a3, $v0 diff --git a/asm/nonmatchings/code_FBE10/func_802D7690.s b/asm/nonmatchings/code_FBE10/func_802D7690.s index 5423a1d908..fab40f203c 100644 --- a/asm/nonmatchings/code_FBE10/func_802D7690.s +++ b/asm/nonmatchings/code_FBE10/func_802D7690.s @@ -51,24 +51,24 @@ glabel func_802D7690 /* FC0F4 802D7744 2404000A */ addiu $a0, $zero, 0xa /* FC0F8 802D7748 2442FFFB */ addiu $v0, $v0, -5 /* FC0FC 802D774C 4482D000 */ mtc1 $v0, $f26 -/* FC100 802D7750 00000000 */ nop +/* FC100 802D7750 00000000 */ nop /* FC104 802D7754 4680D6A0 */ cvt.s.w $f26, $f26 /* FC108 802D7758 0C00A67F */ jal rand_int /* FC10C 802D775C 2404000A */ addiu $a0, $zero, 0xa /* FC110 802D7760 461AD082 */ mul.s $f2, $f26, $f26 -/* FC114 802D7764 00000000 */ nop +/* FC114 802D7764 00000000 */ nop /* FC118 802D7768 2442FFFB */ addiu $v0, $v0, -5 /* FC11C 802D776C 4482C000 */ mtc1 $v0, $f24 -/* FC120 802D7770 00000000 */ nop +/* FC120 802D7770 00000000 */ nop /* FC124 802D7774 4680C620 */ cvt.s.w $f24, $f24 /* FC128 802D7778 4618C102 */ mul.s $f4, $f24, $f24 -/* FC12C 802D777C 00000000 */ nop +/* FC12C 802D777C 00000000 */ nop /* FC130 802D7780 3C0140C9 */ lui $at, 0x40c9 /* FC134 802D7784 34210FD0 */ ori $at, $at, 0xfd0 /* FC138 802D7788 4481A000 */ mtc1 $at, $f20 -/* FC13C 802D778C 00000000 */ nop +/* FC13C 802D778C 00000000 */ nop /* FC140 802D7790 4614B502 */ mul.s $f20, $f22, $f20 -/* FC144 802D7794 00000000 */ nop +/* FC144 802D7794 00000000 */ nop /* FC148 802D7798 3C0143B4 */ lui $at, 0x43b4 /* FC14C 802D779C 44810000 */ mtc1 $at, $f0 /* FC150 802D77A0 3C01C000 */ lui $at, 0xc000 @@ -85,25 +85,25 @@ glabel func_802D7690 /* FC17C 802D77CC 0C00A874 */ jal cos_rad /* FC180 802D77D0 46000506 */ mov.s $f20, $f0 /* FC184 802D77D4 461CA502 */ mul.s $f20, $f20, $f28 -/* FC188 802D77D8 00000000 */ nop +/* FC188 802D77D8 00000000 */ nop /* FC18C 802D77DC 46000007 */ neg.s $f0, $f0 /* FC190 802D77E0 461C0002 */ mul.s $f0, $f0, $f28 -/* FC194 802D77E4 00000000 */ nop +/* FC194 802D77E4 00000000 */ nop /* FC198 802D77E8 C6420070 */ lwc1 $f2, 0x70($s2) /* FC19C 802D77EC 468010A0 */ cvt.s.w $f2, $f2 /* FC1A0 802D77F0 4602A502 */ mul.s $f20, $f20, $f2 -/* FC1A4 802D77F4 00000000 */ nop +/* FC1A4 802D77F4 00000000 */ nop /* FC1A8 802D77F8 46020002 */ mul.s $f0, $f0, $f2 -/* FC1AC 802D77FC 00000000 */ nop +/* FC1AC 802D77FC 00000000 */ nop /* FC1B0 802D7800 3C014178 */ lui $at, 0x4178 /* FC1B4 802D7804 44811000 */ mtc1 $at, $f2 -/* FC1B8 802D7808 00000000 */ nop +/* FC1B8 802D7808 00000000 */ nop /* FC1BC 802D780C 4602F080 */ add.s $f2, $f30, $f2 /* FC1C0 802D7810 46161080 */ add.s $f2, $f2, $f22 /* FC1C4 802D7814 C7A60010 */ lwc1 $f6, 0x10($sp) /* FC1C8 802D7818 44051000 */ mfc1 $a1, $f2 /* FC1CC 802D781C 44901000 */ mtc1 $s0, $f2 -/* FC1D0 802D7820 00000000 */ nop +/* FC1D0 802D7820 00000000 */ nop /* FC1D4 802D7824 468010A0 */ cvt.s.w $f2, $f2 /* FC1D8 802D7828 4602A503 */ div.s $f20, $f20, $f2 /* FC1DC 802D782C 46143500 */ add.s $f20, $f6, $f20 diff --git a/asm/nonmatchings/code_FBE10/func_802D7E08.s b/asm/nonmatchings/code_FBE10/func_802D7E08.s index 2f1a060dcd..c6dac1ee6a 100644 --- a/asm/nonmatchings/code_FBE10/func_802D7E08.s +++ b/asm/nonmatchings/code_FBE10/func_802D7E08.s @@ -107,13 +107,13 @@ glabel func_802D7E08 /* FC944 802D7F94 00021400 */ sll $v0, $v0, 0x10 /* FC948 802D7F98 00021403 */ sra $v0, $v0, 0x10 /* FC94C 802D7F9C 44822000 */ mtc1 $v0, $f4 -/* FC950 802D7FA0 00000000 */ nop +/* FC950 802D7FA0 00000000 */ nop /* FC954 802D7FA4 46802120 */ cvt.s.w $f4, $f4 /* FC958 802D7FA8 00031FC3 */ sra $v1, $v1, 0x1f /* FC95C 802D7FAC 00004010 */ mfhi $t0 /* FC960 802D7FB0 01031823 */ subu $v1, $t0, $v1 /* FC964 802D7FB4 44830000 */ mtc1 $v1, $f0 -/* FC968 802D7FB8 00000000 */ nop +/* FC968 802D7FB8 00000000 */ nop /* FC96C 802D7FBC 46800020 */ cvt.s.w $f0, $f0 /* FC970 802D7FC0 080B5FF4 */ j .L802D7FD0 /* FC974 802D7FC4 46001000 */ add.s $f0, $f2, $f0 diff --git a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_3.s b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_3.s index ede7f4b008..de33dabcfa 100644 --- a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_3.s +++ b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_3.s @@ -52,23 +52,23 @@ glabel do_camera_type_3 /* C94C 8003154C AE200498 */ sw $zero, 0x498($s1) /* C950 80031550 C6200494 */ lwc1 $f0, 0x494($s1) /* C954 80031554 461E0032 */ c.eq.s $f0, $f30 -/* C958 80031558 00000000 */ nop +/* C958 80031558 00000000 */ nop /* C95C 8003155C 45010004 */ bc1t .L80031570 -/* C960 80031560 00000000 */ nop +/* C960 80031560 00000000 */ nop /* C964 80031564 E63E0494 */ swc1 $f30, 0x494($s1) /* C968 80031568 AE200498 */ sw $zero, 0x498($s1) .L8003156C: /* C96C 8003156C C6200494 */ lwc1 $f0, 0x494($s1) .L80031570: /* C970 80031570 4600F03C */ c.lt.s $f30, $f0 -/* C974 80031574 00000000 */ nop +/* C974 80031574 00000000 */ nop /* C978 80031578 4500000A */ bc1f .L800315A4 -/* C97C 8003157C 00000000 */ nop +/* C97C 8003157C 00000000 */ nop /* C980 80031580 C62004A0 */ lwc1 $f0, 0x4a0($s1) /* C984 80031584 4600F03E */ c.le.s $f30, $f0 -/* C988 80031588 00000000 */ nop +/* C988 80031588 00000000 */ nop /* C98C 8003158C 45000005 */ bc1f .L800315A4 -/* C990 80031590 00000000 */ nop +/* C990 80031590 00000000 */ nop /* C994 80031594 3C013F80 */ lui $at, 0x3f80 /* C998 80031598 44810000 */ mtc1 $at, $f0 /* C99C 8003159C E63E0494 */ swc1 $f30, 0x494($s1) @@ -89,18 +89,18 @@ glabel do_camera_type_3 /* C9D4 800315D4 462010A0 */ cvt.s.d $f2, $f2 /* C9D8 800315D8 46001021 */ cvt.d.s $f0, $f2 /* C9DC 800315DC 4620203C */ c.lt.d $f4, $f0 -/* C9E0 800315E0 00000000 */ nop +/* C9E0 800315E0 00000000 */ nop /* C9E4 800315E4 45000005 */ bc1f .L800315FC /* C9E8 800315E8 E6220498 */ swc1 $f2, 0x498($s1) /* C9EC 800315EC 3C013F80 */ lui $at, 0x3f80 /* C9F0 800315F0 44810000 */ mtc1 $at, $f0 -/* C9F4 800315F4 00000000 */ nop +/* C9F4 800315F4 00000000 */ nop /* C9F8 800315F8 E6200498 */ swc1 $f0, 0x498($s1) .L800315FC: /* C9FC 800315FC 96220002 */ lhu $v0, 2($s1) /* CA00 80031600 30420004 */ andi $v0, $v0, 4 /* CA04 80031604 10400010 */ beqz $v0, .L80031648 -/* CA08 80031608 00000000 */ nop +/* CA08 80031608 00000000 */ nop /* CA0C 8003160C C6200498 */ lwc1 $f0, 0x498($s1) /* CA10 80031610 3C01800A */ lui $at, %hi(D_80098258) /* CA14 80031614 D4228258 */ ldc1 $f2, %lo(D_80098258)($at) @@ -109,24 +109,24 @@ glabel do_camera_type_3 /* CA20 80031620 46200020 */ cvt.s.d $f0, $f0 /* CA24 80031624 460000A1 */ cvt.d.s $f2, $f0 /* CA28 80031628 4622203E */ c.le.d $f4, $f2 -/* CA2C 8003162C 00000000 */ nop +/* CA2C 8003162C 00000000 */ nop /* CA30 80031630 45000005 */ bc1f .L80031648 /* CA34 80031634 E6200498 */ swc1 $f0, 0x498($s1) /* CA38 80031638 3C013F80 */ lui $at, 0x3f80 /* CA3C 8003163C 44810000 */ mtc1 $at, $f0 -/* CA40 80031640 00000000 */ nop +/* CA40 80031640 00000000 */ nop /* CA44 80031644 E6200498 */ swc1 $f0, 0x498($s1) .L80031648: /* CA48 80031648 96220002 */ lhu $v0, 2($s1) /* CA4C 8003164C 30420002 */ andi $v0, $v0, 2 /* CA50 80031650 14400009 */ bnez $v0, .L80031678 -/* CA54 80031654 00000000 */ nop +/* CA54 80031654 00000000 */ nop /* CA58 80031658 C6200494 */ lwc1 $f0, 0x494($s1) /* CA5C 8003165C C62204A0 */ lwc1 $f2, 0x4a0($s1) /* CA60 80031660 46020001 */ sub.s $f0, $f0, $f2 /* CA64 80031664 C6240498 */ lwc1 $f4, 0x498($s1) /* CA68 80031668 46040002 */ mul.s $f0, $f0, $f4 -/* CA6C 8003166C 00000000 */ nop +/* CA6C 8003166C 00000000 */ nop /* CA70 80031670 46001080 */ add.s $f2, $f2, $f0 /* CA74 80031674 E62204A0 */ swc1 $f2, 0x4a0($s1) .L80031678: @@ -136,22 +136,22 @@ glabel do_camera_type_3 /* CA84 80031684 C62004A4 */ lwc1 $f0, 0x4a4($s1) /* CA88 80031688 C7B00038 */ lwc1 $f16, 0x38($sp) /* CA8C 8003168C 46100032 */ c.eq.s $f0, $f16 -/* CA90 80031690 00000000 */ nop +/* CA90 80031690 00000000 */ nop /* CA94 80031694 4500000E */ bc1f .L800316D0 -/* CA98 80031698 00000000 */ nop +/* CA98 80031698 00000000 */ nop /* CA9C 8003169C C62004A8 */ lwc1 $f0, 0x4a8($s1) /* CAA0 800316A0 461E0032 */ c.eq.s $f0, $f30 -/* CAA4 800316A4 00000000 */ nop +/* CAA4 800316A4 00000000 */ nop /* CAA8 800316A8 45000009 */ bc1f .L800316D0 -/* CAAC 800316AC 00000000 */ nop +/* CAAC 800316AC 00000000 */ nop /* CAB0 800316B0 C62004AC */ lwc1 $f0, 0x4ac($s1) /* CAB4 800316B4 46140032 */ c.eq.s $f0, $f20 -/* CAB8 800316B8 00000000 */ nop +/* CAB8 800316B8 00000000 */ nop /* CABC 800316BC 45000004 */ bc1f .L800316D0 -/* CAC0 800316C0 00000000 */ nop +/* CAC0 800316C0 00000000 */ nop /* CAC4 800316C4 86220008 */ lh $v0, 8($s1) /* CAC8 800316C8 104000C6 */ beqz $v0, .L800319E4 -/* CACC 800316CC 00000000 */ nop +/* CACC 800316CC 00000000 */ nop .L800316D0: /* CAD0 800316D0 96220504 */ lhu $v0, 0x504($s1) /* CAD4 800316D4 14400008 */ bnez $v0, .L800316F8 @@ -169,74 +169,74 @@ glabel do_camera_type_3 /* CB00 80031700 1080007E */ beqz $a0, .L800318FC /* CB04 80031704 0080382D */ daddu $a3, $a0, $zero /* CB08 80031708 1060007C */ beqz $v1, .L800318FC -/* CB0C 8003170C 00000000 */ nop +/* CB0C 8003170C 00000000 */ nop /* CB10 80031710 8C850000 */ lw $a1, ($a0) /* CB14 80031714 8C620000 */ lw $v0, ($v1) /* CB18 80031718 14A20078 */ bne $a1, $v0, .L800318FC -/* CB1C 8003171C 00000000 */ nop +/* CB1C 8003171C 00000000 */ nop /* CB20 80031720 8C860028 */ lw $a2, 0x28($a0) /* CB24 80031724 8C620028 */ lw $v0, 0x28($v1) /* CB28 80031728 14C20074 */ bne $a2, $v0, .L800318FC -/* CB2C 8003172C 00000000 */ nop +/* CB2C 8003172C 00000000 */ nop /* CB30 80031730 C4820004 */ lwc1 $f2, 4($a0) /* CB34 80031734 C4600004 */ lwc1 $f0, 4($v1) /* CB38 80031738 46001032 */ c.eq.s $f2, $f0 -/* CB3C 8003173C 00000000 */ nop +/* CB3C 8003173C 00000000 */ nop /* CB40 80031740 4500006E */ bc1f .L800318FC -/* CB44 80031744 00000000 */ nop +/* CB44 80031744 00000000 */ nop /* CB48 80031748 C4820008 */ lwc1 $f2, 8($a0) /* CB4C 8003174C C4600008 */ lwc1 $f0, 8($v1) /* CB50 80031750 46001032 */ c.eq.s $f2, $f0 -/* CB54 80031754 00000000 */ nop +/* CB54 80031754 00000000 */ nop /* CB58 80031758 45000068 */ bc1f .L800318FC -/* CB5C 8003175C 00000000 */ nop +/* CB5C 8003175C 00000000 */ nop /* CB60 80031760 C4820024 */ lwc1 $f2, 0x24($a0) /* CB64 80031764 C4600024 */ lwc1 $f0, 0x24($v1) /* CB68 80031768 46001032 */ c.eq.s $f2, $f0 -/* CB6C 8003176C 00000000 */ nop +/* CB6C 8003176C 00000000 */ nop /* CB70 80031770 45000062 */ bc1f .L800318FC -/* CB74 80031774 00000000 */ nop +/* CB74 80031774 00000000 */ nop /* CB78 80031778 10A00005 */ beqz $a1, .L80031790 /* CB7C 8003177C 24020001 */ addiu $v0, $zero, 1 /* CB80 80031780 10A20017 */ beq $a1, $v0, .L800317E0 -/* CB84 80031784 00000000 */ nop +/* CB84 80031784 00000000 */ nop /* CB88 80031788 0800C61B */ j .L8003186C -/* CB8C 8003178C 00000000 */ nop +/* CB8C 8003178C 00000000 */ nop .L80031790: /* CB90 80031790 C482000C */ lwc1 $f2, 0xc($a0) /* CB94 80031794 C460000C */ lwc1 $f0, 0xc($v1) /* CB98 80031798 46001032 */ c.eq.s $f2, $f0 -/* CB9C 8003179C 00000000 */ nop +/* CB9C 8003179C 00000000 */ nop /* CBA0 800317A0 45000056 */ bc1f .L800318FC -/* CBA4 800317A4 00000000 */ nop +/* CBA4 800317A4 00000000 */ nop /* CBA8 800317A8 C4820014 */ lwc1 $f2, 0x14($a0) /* CBAC 800317AC C4600014 */ lwc1 $f0, 0x14($v1) /* CBB0 800317B0 46001032 */ c.eq.s $f2, $f0 -/* CBB4 800317B4 00000000 */ nop +/* CBB4 800317B4 00000000 */ nop /* CBB8 800317B8 45000050 */ bc1f .L800318FC -/* CBBC 800317BC 00000000 */ nop +/* CBBC 800317BC 00000000 */ nop /* CBC0 800317C0 C4820018 */ lwc1 $f2, 0x18($a0) /* CBC4 800317C4 C4600018 */ lwc1 $f0, 0x18($v1) /* CBC8 800317C8 46001032 */ c.eq.s $f2, $f0 -/* CBCC 800317CC 00000000 */ nop +/* CBCC 800317CC 00000000 */ nop /* CBD0 800317D0 4500004A */ bc1f .L800318FC -/* CBD4 800317D4 00000000 */ nop +/* CBD4 800317D4 00000000 */ nop /* CBD8 800317D8 0800C63A */ j .L800318E8 /* CBDC 800317DC C4820020 */ lwc1 $f2, 0x20($a0) .L800317E0: /* CBE0 800317E0 10C00005 */ beqz $a2, .L800317F8 -/* CBE4 800317E4 00000000 */ nop +/* CBE4 800317E4 00000000 */ nop /* CBE8 800317E8 10C5000C */ beq $a2, $a1, .L8003181C -/* CBEC 800317EC 00000000 */ nop +/* CBEC 800317EC 00000000 */ nop /* CBF0 800317F0 0800C63F */ j .L800318FC -/* CBF4 800317F4 00000000 */ nop +/* CBF4 800317F4 00000000 */ nop .L800317F8: /* CBF8 800317F8 C482000C */ lwc1 $f2, 0xc($a0) /* CBFC 800317FC C460000C */ lwc1 $f0, 0xc($v1) /* CC00 80031800 46001032 */ c.eq.s $f2, $f0 -/* CC04 80031804 00000000 */ nop +/* CC04 80031804 00000000 */ nop /* CC08 80031808 4500003C */ bc1f .L800318FC -/* CC0C 8003180C 00000000 */ nop +/* CC0C 8003180C 00000000 */ nop /* CC10 80031810 C4820014 */ lwc1 $f2, 0x14($a0) /* CC14 80031814 0800C63B */ j .L800318EC /* CC18 80031818 C4600014 */ lwc1 $f0, 0x14($v1) @@ -244,77 +244,77 @@ glabel do_camera_type_3 /* CC1C 8003181C C482000C */ lwc1 $f2, 0xc($a0) /* CC20 80031820 C460000C */ lwc1 $f0, 0xc($v1) /* CC24 80031824 46001032 */ c.eq.s $f2, $f0 -/* CC28 80031828 00000000 */ nop +/* CC28 80031828 00000000 */ nop /* CC2C 8003182C 45000033 */ bc1f .L800318FC -/* CC30 80031830 00000000 */ nop +/* CC30 80031830 00000000 */ nop /* CC34 80031834 C4820014 */ lwc1 $f2, 0x14($a0) /* CC38 80031838 C4600014 */ lwc1 $f0, 0x14($v1) /* CC3C 8003183C 46001032 */ c.eq.s $f2, $f0 -/* CC40 80031840 00000000 */ nop +/* CC40 80031840 00000000 */ nop /* CC44 80031844 4500002D */ bc1f .L800318FC -/* CC48 80031848 00000000 */ nop +/* CC48 80031848 00000000 */ nop /* CC4C 8003184C C4820018 */ lwc1 $f2, 0x18($a0) /* CC50 80031850 C4600018 */ lwc1 $f0, 0x18($v1) /* CC54 80031854 46001032 */ c.eq.s $f2, $f0 -/* CC58 80031858 00000000 */ nop +/* CC58 80031858 00000000 */ nop /* CC5C 8003185C 45000027 */ bc1f .L800318FC -/* CC60 80031860 00000000 */ nop +/* CC60 80031860 00000000 */ nop /* CC64 80031864 0800C63A */ j .L800318E8 /* CC68 80031868 C4820020 */ lwc1 $f2, 0x20($a0) .L8003186C: /* CC6C 8003186C C4E2000C */ lwc1 $f2, 0xc($a3) /* CC70 80031870 C460000C */ lwc1 $f0, 0xc($v1) /* CC74 80031874 46001032 */ c.eq.s $f2, $f0 -/* CC78 80031878 00000000 */ nop +/* CC78 80031878 00000000 */ nop /* CC7C 8003187C 4500001F */ bc1f .L800318FC -/* CC80 80031880 00000000 */ nop +/* CC80 80031880 00000000 */ nop /* CC84 80031884 C4E20014 */ lwc1 $f2, 0x14($a3) /* CC88 80031888 C4600014 */ lwc1 $f0, 0x14($v1) /* CC8C 8003188C 46001032 */ c.eq.s $f2, $f0 -/* CC90 80031890 00000000 */ nop +/* CC90 80031890 00000000 */ nop /* CC94 80031894 45000019 */ bc1f .L800318FC -/* CC98 80031898 00000000 */ nop +/* CC98 80031898 00000000 */ nop /* CC9C 8003189C C4E20010 */ lwc1 $f2, 0x10($a3) /* CCA0 800318A0 C4600010 */ lwc1 $f0, 0x10($v1) /* CCA4 800318A4 46001032 */ c.eq.s $f2, $f0 -/* CCA8 800318A8 00000000 */ nop +/* CCA8 800318A8 00000000 */ nop /* CCAC 800318AC 45000013 */ bc1f .L800318FC -/* CCB0 800318B0 00000000 */ nop +/* CCB0 800318B0 00000000 */ nop /* CCB4 800318B4 C4E2001C */ lwc1 $f2, 0x1c($a3) /* CCB8 800318B8 C460001C */ lwc1 $f0, 0x1c($v1) /* CCBC 800318BC 46001032 */ c.eq.s $f2, $f0 -/* CCC0 800318C0 00000000 */ nop +/* CCC0 800318C0 00000000 */ nop /* CCC4 800318C4 4500000D */ bc1f .L800318FC -/* CCC8 800318C8 00000000 */ nop +/* CCC8 800318C8 00000000 */ nop /* CCCC 800318CC C4E20018 */ lwc1 $f2, 0x18($a3) /* CCD0 800318D0 C4600018 */ lwc1 $f0, 0x18($v1) /* CCD4 800318D4 46001032 */ c.eq.s $f2, $f0 -/* CCD8 800318D8 00000000 */ nop +/* CCD8 800318D8 00000000 */ nop /* CCDC 800318DC 45000007 */ bc1f .L800318FC -/* CCE0 800318E0 00000000 */ nop +/* CCE0 800318E0 00000000 */ nop /* CCE4 800318E4 C4E20020 */ lwc1 $f2, 0x20($a3) .L800318E8: /* CCE8 800318E8 C4600020 */ lwc1 $f0, 0x20($v1) .L800318EC: /* CCEC 800318EC 46001032 */ c.eq.s $f2, $f0 -/* CCF0 800318F0 00000000 */ nop +/* CCF0 800318F0 00000000 */ nop /* CCF4 800318F4 45030001 */ bc1tl .L800318FC /* CCF8 800318F8 24080001 */ addiu $t0, $zero, 1 .L800318FC: /* CCFC 800318FC 96220506 */ lhu $v0, 0x506($s1) /* CD00 80031900 14400005 */ bnez $v0, .L80031918 -/* CD04 80031904 00000000 */ nop +/* CD04 80031904 00000000 */ nop /* CD08 80031908 15000036 */ bnez $t0, .L800319E4 -/* CD0C 8003190C 00000000 */ nop +/* CD0C 8003190C 00000000 */ nop /* CD10 80031910 10E30034 */ beq $a3, $v1, .L800319E4 -/* CD14 80031914 00000000 */ nop +/* CD14 80031914 00000000 */ nop .L80031918: /* CD18 80031918 C6220484 */ lwc1 $f2, 0x484($s1) /* CD1C 8003191C 3C013F80 */ lui $at, 0x3f80 /* CD20 80031920 44810000 */ mtc1 $at, $f0 -/* CD24 80031924 00000000 */ nop +/* CD24 80031924 00000000 */ nop /* CD28 80031928 46001032 */ c.eq.s $f2, $f0 -/* CD2C 8003192C 00000000 */ nop +/* CD2C 8003192C 00000000 */ nop /* CD30 80031930 45000004 */ bc1f .L80031944 /* CD34 80031934 2402FFFF */ addiu $v0, $zero, -1 /* CD38 80031938 8E220448 */ lw $v0, 0x448($s1) @@ -406,7 +406,7 @@ glabel do_camera_type_3 /* CE74 80031A74 AFA3002C */ sw $v1, 0x2c($sp) /* CE78 80031A78 86220008 */ lh $v0, 8($s1) /* CE7C 80031A7C 10400013 */ beqz $v0, .L80031ACC -/* CE80 80031A80 00000000 */ nop +/* CE80 80031A80 00000000 */ nop /* CE84 80031A84 3C013F80 */ lui $at, 0x3f80 /* CE88 80031A88 44810000 */ mtc1 $at, $f0 /* CE8C 80031A8C 8E290468 */ lw $t1, 0x468($s1) @@ -431,14 +431,14 @@ glabel do_camera_type_3 /* CED4 80031AD4 46001001 */ sub.s $f0, $f2, $f0 /* CED8 80031AD8 3C014334 */ lui $at, 0x4334 /* CEDC 80031ADC 44813000 */ mtc1 $at, $f6 -/* CEE0 80031AE0 00000000 */ nop +/* CEE0 80031AE0 00000000 */ nop /* CEE4 80031AE4 4600303C */ c.lt.s $f6, $f0 -/* CEE8 80031AE8 00000000 */ nop +/* CEE8 80031AE8 00000000 */ nop /* CEEC 80031AEC 45000006 */ bc1f .L80031B08 -/* CEF0 80031AF0 00000000 */ nop +/* CEF0 80031AF0 00000000 */ nop /* CEF4 80031AF4 3C0143B4 */ lui $at, 0x43b4 /* CEF8 80031AF8 44810000 */ mtc1 $at, $f0 -/* CEFC 80031AFC 00000000 */ nop +/* CEFC 80031AFC 00000000 */ nop /* CF00 80031B00 46001001 */ sub.s $f0, $f2, $f0 /* CF04 80031B04 E620044C */ swc1 $f0, 0x44c($s1) .L80031B08: @@ -447,14 +447,14 @@ glabel do_camera_type_3 /* CF10 80031B10 46002001 */ sub.s $f0, $f4, $f0 /* CF14 80031B14 3C01C334 */ lui $at, 0xc334 /* CF18 80031B18 44811000 */ mtc1 $at, $f2 -/* CF1C 80031B1C 00000000 */ nop +/* CF1C 80031B1C 00000000 */ nop /* CF20 80031B20 4602003C */ c.lt.s $f0, $f2 -/* CF24 80031B24 00000000 */ nop +/* CF24 80031B24 00000000 */ nop /* CF28 80031B28 45000006 */ bc1f .L80031B44 -/* CF2C 80031B2C 00000000 */ nop +/* CF2C 80031B2C 00000000 */ nop /* CF30 80031B30 3C0143B4 */ lui $at, 0x43b4 /* CF34 80031B34 44810000 */ mtc1 $at, $f0 -/* CF38 80031B38 00000000 */ nop +/* CF38 80031B38 00000000 */ nop /* CF3C 80031B3C 46002000 */ add.s $f0, $f4, $f0 /* CF40 80031B40 E620044C */ swc1 $f0, 0x44c($s1) .L80031B44: @@ -462,19 +462,19 @@ glabel do_camera_type_3 /* CF48 80031B48 C6200468 */ lwc1 $f0, 0x468($s1) /* CF4C 80031B4C 46001301 */ sub.s $f12, $f2, $f0 /* CF50 80031B50 44804000 */ mtc1 $zero, $f8 -/* CF54 80031B54 00000000 */ nop +/* CF54 80031B54 00000000 */ nop /* CF58 80031B58 4608603C */ c.lt.s $f12, $f8 -/* CF5C 80031B5C 00000000 */ nop +/* CF5C 80031B5C 00000000 */ nop /* CF60 80031B60 45030001 */ bc1tl .L80031B68 /* CF64 80031B64 46006307 */ neg.s $f12, $f12 .L80031B68: /* CF68 80031B68 460C303C */ c.lt.s $f6, $f12 -/* CF6C 80031B6C 00000000 */ nop +/* CF6C 80031B6C 00000000 */ nop /* CF70 80031B70 45000005 */ bc1f .L80031B88 -/* CF74 80031B74 00000000 */ nop +/* CF74 80031B74 00000000 */ nop /* CF78 80031B78 3C0143B4 */ lui $at, 0x43b4 /* CF7C 80031B7C 44810000 */ mtc1 $at, $f0 -/* CF80 80031B80 00000000 */ nop +/* CF80 80031B80 00000000 */ nop /* CF84 80031B84 460C0301 */ sub.s $f12, $f0, $f12 .L80031B88: /* CF88 80031B88 C6220454 */ lwc1 $f2, 0x454($s1) @@ -482,21 +482,21 @@ glabel do_camera_type_3 /* CF90 80031B90 46006506 */ mov.s $f20, $f12 /* CF94 80031B94 46001301 */ sub.s $f12, $f2, $f0 /* CF98 80031B98 4608603C */ c.lt.s $f12, $f8 -/* CF9C 80031B9C 00000000 */ nop +/* CF9C 80031B9C 00000000 */ nop /* CFA0 80031BA0 45030001 */ bc1tl .L80031BA8 /* CFA4 80031BA4 46006307 */ neg.s $f12, $f12 .L80031BA8: /* CFA8 80031BA8 460C303C */ c.lt.s $f6, $f12 -/* CFAC 80031BAC 00000000 */ nop +/* CFAC 80031BAC 00000000 */ nop /* CFB0 80031BB0 45000005 */ bc1f .L80031BC8 -/* CFB4 80031BB4 00000000 */ nop +/* CFB4 80031BB4 00000000 */ nop /* CFB8 80031BB8 3C0143B4 */ lui $at, 0x43b4 /* CFBC 80031BBC 44810000 */ mtc1 $at, $f0 -/* CFC0 80031BC0 00000000 */ nop +/* CFC0 80031BC0 00000000 */ nop /* CFC4 80031BC4 460C0301 */ sub.s $f12, $f0, $f12 .L80031BC8: /* CFC8 80031BC8 460CA03C */ c.lt.s $f20, $f12 -/* CFCC 80031BCC 00000000 */ nop +/* CFCC 80031BCC 00000000 */ nop /* CFD0 80031BD0 45030001 */ bc1tl .L80031BD8 /* CFD4 80031BD4 46006506 */ mov.s $f20, $f12 .L80031BD8: @@ -504,21 +504,21 @@ glabel do_camera_type_3 /* CFDC 80031BDC C6200474 */ lwc1 $f0, 0x474($s1) /* CFE0 80031BE0 46001301 */ sub.s $f12, $f2, $f0 /* CFE4 80031BE4 4608603C */ c.lt.s $f12, $f8 -/* CFE8 80031BE8 00000000 */ nop +/* CFE8 80031BE8 00000000 */ nop /* CFEC 80031BEC 45030001 */ bc1tl .L80031BF4 /* CFF0 80031BF0 46006307 */ neg.s $f12, $f12 .L80031BF4: /* CFF4 80031BF4 460C303C */ c.lt.s $f6, $f12 -/* CFF8 80031BF8 00000000 */ nop +/* CFF8 80031BF8 00000000 */ nop /* CFFC 80031BFC 45000005 */ bc1f .L80031C14 -/* D000 80031C00 00000000 */ nop +/* D000 80031C00 00000000 */ nop /* D004 80031C04 3C0143B4 */ lui $at, 0x43b4 /* D008 80031C08 44810000 */ mtc1 $at, $f0 -/* D00C 80031C0C 00000000 */ nop +/* D00C 80031C0C 00000000 */ nop /* D010 80031C10 460C0301 */ sub.s $f12, $f0, $f12 .L80031C14: /* D014 80031C14 460CA03C */ c.lt.s $f20, $f12 -/* D018 80031C18 00000000 */ nop +/* D018 80031C18 00000000 */ nop /* D01C 80031C1C 45030001 */ bc1tl .L80031C24 /* D020 80031C20 46006506 */ mov.s $f20, $f12 .L80031C24: @@ -526,12 +526,12 @@ glabel do_camera_type_3 /* D028 80031C28 C620046C */ lwc1 $f0, 0x46c($s1) /* D02C 80031C2C 46001301 */ sub.s $f12, $f2, $f0 /* D030 80031C30 4608603C */ c.lt.s $f12, $f8 -/* D034 80031C34 00000000 */ nop +/* D034 80031C34 00000000 */ nop /* D038 80031C38 45030001 */ bc1tl .L80031C40 /* D03C 80031C3C 46006307 */ neg.s $f12, $f12 .L80031C40: /* D040 80031C40 460CA03C */ c.lt.s $f20, $f12 -/* D044 80031C44 00000000 */ nop +/* D044 80031C44 00000000 */ nop /* D048 80031C48 45030001 */ bc1tl .L80031C50 /* D04C 80031C4C 46006506 */ mov.s $f20, $f12 .L80031C50: @@ -539,75 +539,75 @@ glabel do_camera_type_3 /* D054 80031C54 C6220478 */ lwc1 $f2, 0x478($s1) /* D058 80031C58 46020001 */ sub.s $f0, $f0, $f2 /* D05C 80031C5C 46000302 */ mul.s $f12, $f0, $f0 -/* D060 80031C60 00000000 */ nop +/* D060 80031C60 00000000 */ nop /* D064 80031C64 C6240460 */ lwc1 $f4, 0x460($s1) /* D068 80031C68 C620047C */ lwc1 $f0, 0x47c($s1) /* D06C 80031C6C 46002101 */ sub.s $f4, $f4, $f0 /* D070 80031C70 46042102 */ mul.s $f4, $f4, $f4 -/* D074 80031C74 00000000 */ nop +/* D074 80031C74 00000000 */ nop /* D078 80031C78 C6220480 */ lwc1 $f2, 0x480($s1) /* D07C 80031C7C C6200464 */ lwc1 $f0, 0x464($s1) /* D080 80031C80 46020001 */ sub.s $f0, $f0, $f2 /* D084 80031C84 46000002 */ mul.s $f0, $f0, $f0 -/* D088 80031C88 00000000 */ nop +/* D088 80031C88 00000000 */ nop /* D08C 80031C8C 46046300 */ add.s $f12, $f12, $f4 /* D090 80031C90 46006300 */ add.s $f12, $f12, $f0 /* D094 80031C94 46086032 */ c.eq.s $f12, $f8 -/* D098 80031C98 00000000 */ nop +/* D098 80031C98 00000000 */ nop /* D09C 80031C9C 4501000E */ bc1t .L80031CD8 -/* D0A0 80031CA0 00000000 */ nop +/* D0A0 80031CA0 00000000 */ nop /* D0A4 80031CA4 46006004 */ sqrt.s $f0, $f12 /* D0A8 80031CA8 46000032 */ c.eq.s $f0, $f0 -/* D0AC 80031CAC 00000000 */ nop +/* D0AC 80031CAC 00000000 */ nop /* D0B0 80031CB0 45010003 */ bc1t .L80031CC0 -/* D0B4 80031CB4 00000000 */ nop +/* D0B4 80031CB4 00000000 */ nop /* D0B8 80031CB8 0C0187BC */ jal sqrtf -/* D0BC 80031CBC 00000000 */ nop +/* D0BC 80031CBC 00000000 */ nop .L80031CC0: /* D0C0 80031CC0 3C01800A */ lui $at, %hi(D_80098260) /* D0C4 80031CC4 D4228260 */ ldc1 $f2, %lo(D_80098260)($at) /* D0C8 80031CC8 46000021 */ cvt.d.s $f0, $f0 /* D0CC 80031CCC 46220002 */ mul.d $f0, $f0, $f2 -/* D0D0 80031CD0 00000000 */ nop +/* D0D0 80031CD0 00000000 */ nop /* D0D4 80031CD4 46200320 */ cvt.s.d $f12, $f0 .L80031CD8: /* D0D8 80031CD8 460CA03C */ c.lt.s $f20, $f12 -/* D0DC 80031CDC 00000000 */ nop +/* D0DC 80031CDC 00000000 */ nop /* D0E0 80031CE0 45030001 */ bc1tl .L80031CE8 /* D0E4 80031CE4 46006506 */ mov.s $f20, $f12 .L80031CE8: /* D0E8 80031CE8 3C0142B4 */ lui $at, 0x42b4 /* D0EC 80031CEC 44810000 */ mtc1 $at, $f0 -/* D0F0 80031CF0 00000000 */ nop +/* D0F0 80031CF0 00000000 */ nop /* D0F4 80031CF4 4614003C */ c.lt.s $f0, $f20 -/* D0F8 80031CF8 00000000 */ nop +/* D0F8 80031CF8 00000000 */ nop /* D0FC 80031CFC 45030001 */ bc1tl .L80031D04 /* D100 80031D00 46000506 */ mov.s $f20, $f0 .L80031D04: /* D104 80031D04 3C0141A0 */ lui $at, 0x41a0 /* D108 80031D08 44810000 */ mtc1 $at, $f0 -/* D10C 80031D0C 00000000 */ nop +/* D10C 80031D0C 00000000 */ nop /* D110 80031D10 4600A03C */ c.lt.s $f20, $f0 -/* D114 80031D14 00000000 */ nop +/* D114 80031D14 00000000 */ nop /* D118 80031D18 45030001 */ bc1tl .L80031D20 /* D11C 80031D1C 46000506 */ mov.s $f20, $f0 .L80031D20: /* D120 80031D20 44800000 */ mtc1 $zero, $f0 -/* D124 80031D24 00000000 */ nop +/* D124 80031D24 00000000 */ nop /* D128 80031D28 4600A032 */ c.eq.s $f20, $f0 -/* D12C 80031D2C 00000000 */ nop +/* D12C 80031D2C 00000000 */ nop /* D130 80031D30 4501000E */ bc1t .L80031D6C -/* D134 80031D34 00000000 */ nop +/* D134 80031D34 00000000 */ nop /* D138 80031D38 3C013F80 */ lui $at, 0x3f80 /* D13C 80031D3C 44812000 */ mtc1 $at, $f4 /* D140 80031D40 C620048C */ lwc1 $f0, 0x48c($s1) /* D144 80031D44 46142083 */ div.s $f2, $f4, $f20 /* D148 80031D48 46001082 */ mul.s $f2, $f2, $f0 -/* D14C 80031D4C 00000000 */ nop +/* D14C 80031D4C 00000000 */ nop /* D150 80031D50 C6200488 */ lwc1 $f0, 0x488($s1) /* D154 80031D54 46020000 */ add.s $f0, $f0, $f2 /* D158 80031D58 4600203C */ c.lt.s $f4, $f0 -/* D15C 80031D5C 00000000 */ nop +/* D15C 80031D5C 00000000 */ nop /* D160 80031D60 45000002 */ bc1f .L80031D6C /* D164 80031D64 E6200488 */ swc1 $f0, 0x488($s1) /* D168 80031D68 E6240488 */ swc1 $f4, 0x488($s1) @@ -618,29 +618,29 @@ glabel do_camera_type_3 /* D178 80031D78 4480E000 */ mtc1 $zero, $f28 /* D17C 80031D7C 46000021 */ cvt.d.s $f0, $f0 /* D180 80031D80 463C003C */ c.lt.d $f0, $f28 -/* D184 80031D84 00000000 */ nop +/* D184 80031D84 00000000 */ nop /* D188 80031D88 45000036 */ bc1f .L80031E64 -/* D18C 80031D8C 00000000 */ nop +/* D18C 80031D8C 00000000 */ nop /* D190 80031D90 C6340508 */ lwc1 $f20, 0x508($s1) /* D194 80031D94 3C01800A */ lui $at, %hi(D_80098268) /* D198 80031D98 D4388268 */ ldc1 $f24, %lo(D_80098268)($at) /* D19C 80031D9C 4600A5A1 */ cvt.d.s $f22, $f20 /* D1A0 80031DA0 4638B582 */ mul.d $f22, $f22, $f24 -/* D1A4 80031DA4 00000000 */ nop +/* D1A4 80031DA4 00000000 */ nop /* D1A8 80031DA8 4620B5A0 */ cvt.s.d $f22, $f22 /* D1AC 80031DAC 0C00A874 */ jal cos_rad /* D1B0 80031DB0 4600B306 */ mov.s $f12, $f22 /* D1B4 80031DB4 C62C0488 */ lwc1 $f12, 0x488($s1) /* D1B8 80031DB8 46006321 */ cvt.d.s $f12, $f12 /* D1BC 80031DBC 46386302 */ mul.d $f12, $f12, $f24 -/* D1C0 80031DC0 00000000 */ nop +/* D1C0 80031DC0 00000000 */ nop /* D1C4 80031DC4 3C013F80 */ lui $at, 0x3f80 /* D1C8 80031DC8 4481D000 */ mtc1 $at, $f26 -/* D1CC 80031DCC 00000000 */ nop +/* D1CC 80031DCC 00000000 */ nop /* D1D0 80031DD0 4614D501 */ sub.s $f20, $f26, $f20 /* D1D4 80031DD4 4600A521 */ cvt.d.s $f20, $f20 /* D1D8 80031DD8 46346302 */ mul.d $f12, $f12, $f20 -/* D1DC 80031DDC 00000000 */ nop +/* D1DC 80031DDC 00000000 */ nop /* D1E0 80031DE0 461A0600 */ add.s $f24, $f0, $f26 /* D1E4 80031DE4 4600B0A1 */ cvt.d.s $f2, $f22 /* D1E8 80031DE8 3C014000 */ lui $at, 0x4000 @@ -657,13 +657,13 @@ glabel do_camera_type_3 /* D214 80031E14 3C013FE0 */ lui $at, 0x3fe0 /* D218 80031E18 44811800 */ mtc1 $at, $f3 /* D21C 80031E1C 44801000 */ mtc1 $zero, $f2 -/* D220 80031E20 00000000 */ nop +/* D220 80031E20 00000000 */ nop /* D224 80031E24 46220002 */ mul.d $f0, $f0, $f2 -/* D228 80031E28 00000000 */ nop +/* D228 80031E28 00000000 */ nop /* D22C 80031E2C 4620B580 */ add.d $f22, $f22, $f0 /* D230 80031E30 4600C621 */ cvt.d.s $f24, $f24 /* D234 80031E34 4638B582 */ mul.d $f22, $f22, $f24 -/* D238 80031E38 00000000 */ nop +/* D238 80031E38 00000000 */ nop /* D23C 80031E3C 4620B5A0 */ cvt.s.d $f22, $f22 /* D240 80031E40 461AB680 */ add.s $f26, $f22, $f26 /* D244 80031E44 461AA501 */ sub.s $f20, $f20, $f26 @@ -671,30 +671,30 @@ glabel do_camera_type_3 /* D24C 80031E4C D4208270 */ ldc1 $f0, %lo(D_80098270)($at) /* D250 80031E50 4600A521 */ cvt.d.s $f20, $f20 /* D254 80031E54 4620A502 */ mul.d $f20, $f20, $f0 -/* D258 80031E58 00000000 */ nop +/* D258 80031E58 00000000 */ nop /* D25C 80031E5C 4620A5A0 */ cvt.s.d $f22, $f20 /* D260 80031E60 E6360484 */ swc1 $f22, 0x484($s1) .L80031E64: /* D264 80031E64 C6200484 */ lwc1 $f0, 0x484($s1) /* D268 80031E68 3C013F80 */ lui $at, 0x3f80 /* D26C 80031E6C 44814000 */ mtc1 $at, $f8 -/* D270 80031E70 00000000 */ nop +/* D270 80031E70 00000000 */ nop /* D274 80031E74 4600403E */ c.le.s $f8, $f0 -/* D278 80031E78 00000000 */ nop +/* D278 80031E78 00000000 */ nop /* D27C 80031E7C 45000003 */ bc1f .L80031E8C -/* D280 80031E80 00000000 */ nop +/* D280 80031E80 00000000 */ nop /* D284 80031E84 E6280484 */ swc1 $f8, 0x484($s1) /* D288 80031E88 AE200488 */ sw $zero, 0x488($s1) .L80031E8C: /* D28C 80031E8C C6260484 */ lwc1 $f6, 0x484($s1) /* D290 80031E90 C6200468 */ lwc1 $f0, 0x468($s1) /* D294 80031E94 46060002 */ mul.s $f0, $f0, $f6 -/* D298 80031E98 00000000 */ nop +/* D298 80031E98 00000000 */ nop /* D29C 80031E9C 46064201 */ sub.s $f8, $f8, $f6 /* D2A0 80031EA0 C622044C */ lwc1 $f2, 0x44c($s1) /* D2A4 80031EA4 C7B00038 */ lwc1 $f16, 0x38($sp) /* D2A8 80031EA8 46081082 */ mul.s $f2, $f2, $f8 -/* D2AC 80031EAC 00000000 */ nop +/* D2AC 80031EAC 00000000 */ nop /* D2B0 80031EB0 E63004A4 */ swc1 $f16, 0x4a4($s1) /* D2B4 80031EB4 E63E04A8 */ swc1 $f30, 0x4a8($s1) /* D2B8 80031EB8 C7B0003C */ lwc1 $f16, 0x3c($sp) @@ -705,63 +705,63 @@ glabel do_camera_type_3 /* D2CC 80031ECC E6420000 */ swc1 $f2, ($s2) /* D2D0 80031ED0 C6240450 */ lwc1 $f4, 0x450($s1) /* D2D4 80031ED4 46082102 */ mul.s $f4, $f4, $f8 -/* D2D8 80031ED8 00000000 */ nop +/* D2D8 80031ED8 00000000 */ nop /* D2DC 80031EDC C620046C */ lwc1 $f0, 0x46c($s1) /* D2E0 80031EE0 46060002 */ mul.s $f0, $f0, $f6 -/* D2E4 80031EE4 00000000 */ nop +/* D2E4 80031EE4 00000000 */ nop /* D2E8 80031EE8 46002100 */ add.s $f4, $f4, $f0 /* D2EC 80031EEC E6440004 */ swc1 $f4, 4($s2) /* D2F0 80031EF0 C6220454 */ lwc1 $f2, 0x454($s1) /* D2F4 80031EF4 46081082 */ mul.s $f2, $f2, $f8 -/* D2F8 80031EF8 00000000 */ nop +/* D2F8 80031EF8 00000000 */ nop /* D2FC 80031EFC C6200470 */ lwc1 $f0, 0x470($s1) /* D300 80031F00 46060002 */ mul.s $f0, $f0, $f6 -/* D304 80031F04 00000000 */ nop +/* D304 80031F04 00000000 */ nop /* D308 80031F08 46001080 */ add.s $f2, $f2, $f0 /* D30C 80031F0C E6420008 */ swc1 $f2, 8($s2) /* D310 80031F10 C6220458 */ lwc1 $f2, 0x458($s1) /* D314 80031F14 46081082 */ mul.s $f2, $f2, $f8 -/* D318 80031F18 00000000 */ nop +/* D318 80031F18 00000000 */ nop /* D31C 80031F1C C6200474 */ lwc1 $f0, 0x474($s1) /* D320 80031F20 46060002 */ mul.s $f0, $f0, $f6 -/* D324 80031F24 00000000 */ nop +/* D324 80031F24 00000000 */ nop /* D328 80031F28 46001080 */ add.s $f2, $f2, $f0 /* D32C 80031F2C E642000C */ swc1 $f2, 0xc($s2) /* D330 80031F30 C622045C */ lwc1 $f2, 0x45c($s1) /* D334 80031F34 46081082 */ mul.s $f2, $f2, $f8 -/* D338 80031F38 00000000 */ nop +/* D338 80031F38 00000000 */ nop /* D33C 80031F3C C6200478 */ lwc1 $f0, 0x478($s1) /* D340 80031F40 46060002 */ mul.s $f0, $f0, $f6 -/* D344 80031F44 00000000 */ nop +/* D344 80031F44 00000000 */ nop /* D348 80031F48 46001080 */ add.s $f2, $f2, $f0 /* D34C 80031F4C E6420010 */ swc1 $f2, 0x10($s2) /* D350 80031F50 C6220460 */ lwc1 $f2, 0x460($s1) /* D354 80031F54 46081082 */ mul.s $f2, $f2, $f8 -/* D358 80031F58 00000000 */ nop +/* D358 80031F58 00000000 */ nop /* D35C 80031F5C C620047C */ lwc1 $f0, 0x47c($s1) /* D360 80031F60 46060002 */ mul.s $f0, $f0, $f6 -/* D364 80031F64 00000000 */ nop +/* D364 80031F64 00000000 */ nop /* D368 80031F68 46001080 */ add.s $f2, $f2, $f0 /* D36C 80031F6C E6420014 */ swc1 $f2, 0x14($s2) /* D370 80031F70 C6220464 */ lwc1 $f2, 0x464($s1) /* D374 80031F74 46081082 */ mul.s $f2, $f2, $f8 -/* D378 80031F78 00000000 */ nop +/* D378 80031F78 00000000 */ nop /* D37C 80031F7C C6200480 */ lwc1 $f0, 0x480($s1) /* D380 80031F80 46060002 */ mul.s $f0, $f0, $f6 -/* D384 80031F84 00000000 */ nop +/* D384 80031F84 00000000 */ nop /* D388 80031F88 46001080 */ add.s $f2, $f2, $f0 /* D38C 80031F8C E6420018 */ swc1 $f2, 0x18($s2) /* D390 80031F90 8622002A */ lh $v0, 0x2a($s1) /* D394 80031F94 44820000 */ mtc1 $v0, $f0 -/* D398 80031F98 00000000 */ nop +/* D398 80031F98 00000000 */ nop /* D39C 80031F9C 46800020 */ cvt.s.w $f0, $f0 /* D3A0 80031FA0 46002102 */ mul.s $f4, $f4, $f0 -/* D3A4 80031FA4 00000000 */ nop +/* D3A4 80031FA4 00000000 */ nop /* D3A8 80031FA8 3C01800A */ lui $at, %hi(D_80098278) /* D3AC 80031FAC D4208278 */ ldc1 $f0, %lo(D_80098278)($at) /* D3B0 80031FB0 46002121 */ cvt.d.s $f4, $f4 /* D3B4 80031FB4 46202102 */ mul.d $f4, $f4, $f0 -/* D3B8 80031FB8 00000000 */ nop +/* D3B8 80031FB8 00000000 */ nop /* D3BC 80031FBC 0220202D */ daddu $a0, $s1, $zero /* D3C0 80031FC0 46202120 */ cvt.s.d $f4, $f4 /* D3C4 80031FC4 0C00C114 */ jal func_80030450 @@ -793,24 +793,24 @@ glabel do_camera_type_3 /* D42C 8003202C 46000506 */ mov.s $f20, $f0 /* D430 80032030 C6420004 */ lwc1 $f2, 4($s2) /* D434 80032034 46141082 */ mul.s $f2, $f2, $f20 -/* D438 80032038 00000000 */ nop +/* D438 80032038 00000000 */ nop /* D43C 8003203C C6400014 */ lwc1 $f0, 0x14($s2) /* D440 80032040 46020000 */ add.s $f0, $f0, $f2 /* D444 80032044 E6200040 */ swc1 $f0, 0x40($s1) .L80032048: /* D448 80032048 C6420004 */ lwc1 $f2, 4($s2) /* D44C 8003204C 4602D082 */ mul.s $f2, $f26, $f2 -/* D450 80032050 00000000 */ nop +/* D450 80032050 00000000 */ nop /* D454 80032054 46161082 */ mul.s $f2, $f2, $f22 -/* D458 80032058 00000000 */ nop +/* D458 80032058 00000000 */ nop /* D45C 8003205C C6400010 */ lwc1 $f0, 0x10($s2) /* D460 80032060 46020001 */ sub.s $f0, $f0, $f2 /* D464 80032064 E620003C */ swc1 $f0, 0x3c($s1) /* D468 80032068 C6420004 */ lwc1 $f2, 4($s2) /* D46C 8003206C 4602C082 */ mul.s $f2, $f24, $f2 -/* D470 80032070 00000000 */ nop +/* D470 80032070 00000000 */ nop /* D474 80032074 46161082 */ mul.s $f2, $f2, $f22 -/* D478 80032078 00000000 */ nop +/* D478 80032078 00000000 */ nop /* D47C 8003207C C6400018 */ lwc1 $f0, 0x18($s2) /* D480 80032080 46020001 */ sub.s $f0, $f0, $f2 /* D484 80032084 E6200044 */ swc1 $f0, 0x44($s1) @@ -824,18 +824,18 @@ glabel do_camera_type_3 /* D4A4 800320A4 C624003C */ lwc1 $f4, 0x3c($s1) /* D4A8 800320A8 C6420010 */ lwc1 $f2, 0x10($s2) /* D4AC 800320AC 46022032 */ c.eq.s $f4, $f2 -/* D4B0 800320B0 00000000 */ nop +/* D4B0 800320B0 00000000 */ nop /* D4B4 800320B4 4500000A */ bc1f .L800320E0 /* D4B8 800320B8 46000506 */ mov.s $f20, $f0 /* D4BC 800320BC C6220044 */ lwc1 $f2, 0x44($s1) /* D4C0 800320C0 C6400018 */ lwc1 $f0, 0x18($s2) /* D4C4 800320C4 46001032 */ c.eq.s $f2, $f0 -/* D4C8 800320C8 00000000 */ nop +/* D4C8 800320C8 00000000 */ nop /* D4CC 800320CC 45000004 */ bc1f .L800320E0 -/* D4D0 800320D0 00000000 */ nop +/* D4D0 800320D0 00000000 */ nop /* D4D4 800320D4 44802000 */ mtc1 $zero, $f4 /* D4D8 800320D8 0800C840 */ j .L80032100 -/* D4DC 800320DC 00000000 */ nop +/* D4DC 800320DC 00000000 */ nop .L800320E0: /* D4E0 800320E0 3C02800A */ lui $v0, %hi(D_800A08C0) /* D4E4 800320E4 244208C0 */ addiu $v0, $v0, %lo(D_800A08C0) @@ -855,22 +855,22 @@ glabel do_camera_type_3 /* D518 80032118 14400008 */ bnez $v0, .L8003213C /* D51C 8003211C 46060201 */ sub.s $f8, $f0, $f6 /* D520 80032120 46142002 */ mul.s $f0, $f4, $f20 -/* D524 80032124 00000000 */ nop +/* D524 80032124 00000000 */ nop /* D528 80032128 46164082 */ mul.s $f2, $f8, $f22 -/* D52C 8003212C 00000000 */ nop +/* D52C 8003212C 00000000 */ nop /* D530 80032130 46020000 */ add.s $f0, $f0, $f2 /* D534 80032134 46003000 */ add.s $f0, $f6, $f0 /* D538 80032138 E620004C */ swc1 $f0, 0x4c($s1) .L8003213C: /* D53C 8003213C 46162102 */ mul.s $f4, $f4, $f22 -/* D540 80032140 00000000 */ nop +/* D540 80032140 00000000 */ nop /* D544 80032144 46144002 */ mul.s $f0, $f8, $f20 -/* D548 80032148 00000000 */ nop +/* D548 80032148 00000000 */ nop /* D54C 8003214C 46002101 */ sub.s $f4, $f4, $f0 /* D550 80032150 4604D002 */ mul.s $f0, $f26, $f4 -/* D554 80032154 00000000 */ nop +/* D554 80032154 00000000 */ nop /* D558 80032158 4604C102 */ mul.s $f4, $f24, $f4 -/* D55C 8003215C 00000000 */ nop +/* D55C 8003215C 00000000 */ nop /* D560 80032160 C622003C */ lwc1 $f2, 0x3c($s1) /* D564 80032164 46001080 */ add.s $f2, $f2, $f0 /* D568 80032168 C6200044 */ lwc1 $f0, 0x44($s1) @@ -912,6 +912,6 @@ glabel do_camera_type_3 /* D5F8 800321F8 D7B40050 */ ldc1 $f20, 0x50($sp) /* D5FC 800321FC 03E00008 */ jr $ra /* D600 80032200 27BD0080 */ addiu $sp, $sp, 0x80 -/* D604 80032204 00000000 */ nop -/* D608 80032208 00000000 */ nop -/* D60C 8003220C 00000000 */ nop +/* D604 80032204 00000000 */ nop +/* D608 80032208 00000000 */ nop +/* D60C 8003220C 00000000 */ nop diff --git a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_5.s b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_5.s index 5814045266..e5ebe49ab9 100644 --- a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_5.s +++ b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_5.s @@ -46,15 +46,15 @@ glabel do_camera_type_5 /* B4A0 800300A0 C4480054 */ lwc1 $f8, 0x54($v0) /* B4A4 800300A4 3C013FC0 */ lui $at, 0x3fc0 /* B4A8 800300A8 44813000 */ mtc1 $at, $f6 -/* B4AC 800300AC 00000000 */ nop +/* B4AC 800300AC 00000000 */ nop /* B4B0 800300B0 46064182 */ mul.s $f6, $f8, $f6 -/* B4B4 800300B4 00000000 */ nop +/* B4B4 800300B4 00000000 */ nop /* B4B8 800300B8 3C013D4C */ lui $at, 0x3d4c /* B4BC 800300BC 3421CCCD */ ori $at, $at, 0xcccd /* B4C0 800300C0 44816000 */ mtc1 $at, $f12 -/* B4C4 800300C4 00000000 */ nop +/* B4C4 800300C4 00000000 */ nop /* B4C8 800300C8 460C4202 */ mul.s $f8, $f8, $f12 -/* B4CC 800300CC 00000000 */ nop +/* B4CC 800300CC 00000000 */ nop /* B4D0 800300D0 C6040060 */ lwc1 $f4, 0x60($s0) /* B4D4 800300D4 C6000550 */ lwc1 $f0, 0x550($s0) /* B4D8 800300D8 C6020064 */ lwc1 $f2, 0x64($s0) @@ -85,14 +85,14 @@ glabel do_camera_type_5 /* B538 80030138 24070001 */ addiu $a3, $zero, 1 .L8003013C: /* B53C 8003013C 0C00C084 */ jal func_80030210 -/* B540 80030140 00000000 */ nop +/* B540 80030140 00000000 */ nop /* B544 80030144 C60C003C */ lwc1 $f12, 0x3c($s0) /* B548 80030148 C60E0044 */ lwc1 $f14, 0x44($s0) /* B54C 8003014C 8E060048 */ lw $a2, 0x48($s0) /* B550 80030150 8E070050 */ lw $a3, 0x50($s0) /* B554 80030154 4480C000 */ mtc1 $zero, $f24 /* B558 80030158 0C00A720 */ jal atan2 -/* B55C 8003015C 00000000 */ nop +/* B55C 8003015C 00000000 */ nop /* B560 80030160 4600C306 */ mov.s $f12, $f24 /* B564 80030164 4600C386 */ mov.s $f14, $f24 /* B568 80030168 C6040048 */ lwc1 $f4, 0x48($s0) @@ -109,19 +109,19 @@ glabel do_camera_type_5 /* B594 80030194 0C00A720 */ jal atan2 /* B598 80030198 E600006C */ swc1 $f0, 0x6c($s0) /* B59C 8003019C 4616B082 */ mul.s $f2, $f22, $f22 -/* B5A0 800301A0 00000000 */ nop +/* B5A0 800301A0 00000000 */ nop /* B5A4 800301A4 4614A502 */ mul.s $f20, $f20, $f20 -/* B5A8 800301A8 00000000 */ nop +/* B5A8 800301A8 00000000 */ nop /* B5AC 800301AC 46141300 */ add.s $f12, $f2, $f20 /* B5B0 800301B0 46000007 */ neg.s $f0, $f0 /* B5B4 800301B4 E6000090 */ swc1 $f0, 0x90($s0) /* B5B8 800301B8 46006004 */ sqrt.s $f0, $f12 /* B5BC 800301BC 46000032 */ c.eq.s $f0, $f0 -/* B5C0 800301C0 00000000 */ nop +/* B5C0 800301C0 00000000 */ nop /* B5C4 800301C4 45030004 */ bc1tl .L800301D8 /* B5C8 800301C8 4600C306 */ mov.s $f12, $f24 /* B5CC 800301CC 0C0187BC */ jal sqrtf -/* B5D0 800301D0 00000000 */ nop +/* B5D0 800301D0 00000000 */ nop /* B5D4 800301D4 4600C306 */ mov.s $f12, $f24 .L800301D8: /* B5D8 800301D8 46000007 */ neg.s $f0, $f0 diff --git a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s index 3b237a9836..697fcf2836 100644 --- a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s +++ b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_6.s @@ -14,10 +14,10 @@ glabel do_camera_type_6 /* ADB4 8002F9B4 F7B40018 */ sdc1 $f20, 0x18($sp) /* ADB8 8002F9B8 86020006 */ lh $v0, 6($s0) /* ADBC 8002F9BC 14400004 */ bnez $v0, .L8002F9D0 -/* ADC0 8002F9C0 00000000 */ nop +/* ADC0 8002F9C0 00000000 */ nop /* ADC4 8002F9C4 86020008 */ lh $v0, 8($s0) /* ADC8 8002F9C8 10400013 */ beqz $v0, .L8002FA18 -/* ADCC 8002F9CC 00000000 */ nop +/* ADCC 8002F9CC 00000000 */ nop .L8002F9D0: /* ADD0 8002F9D0 C6000054 */ lwc1 $f0, 0x54($s0) /* ADD4 8002F9D4 C6020058 */ lwc1 $f2, 0x58($s0) @@ -50,7 +50,7 @@ glabel do_camera_type_6 /* AE38 8002FA38 14610004 */ bne $v1, $at, .L8002FA4C /* AE3C 8002FA3C 3C018000 */ lui $at, 0x8000 /* AE40 8002FA40 14410002 */ bne $v0, $at, .L8002FA4C -/* AE44 8002FA44 00000000 */ nop +/* AE44 8002FA44 00000000 */ nop /* AE48 8002FA48 0006000D */ break 6 .L8002FA4C: /* AE4C 8002FA4C 00001812 */ mflo $v1 @@ -64,20 +64,20 @@ glabel do_camera_type_6 /* AE6C 8002FA6C 86020026 */ lh $v0, 0x26($s0) /* AE70 8002FA70 46025280 */ add.s $f10, $f10, $f2 /* AE74 8002FA74 44824000 */ mtc1 $v0, $f8 -/* AE78 8002FA78 00000000 */ nop +/* AE78 8002FA78 00000000 */ nop /* AE7C 8002FA7C 46804221 */ cvt.d.w $f8, $f8 /* AE80 8002FA80 86020024 */ lh $v0, 0x24($s0) /* AE84 8002FA84 46204202 */ mul.d $f8, $f8, $f0 -/* AE88 8002FA88 00000000 */ nop +/* AE88 8002FA88 00000000 */ nop /* AE8C 8002FA8C 44820000 */ mtc1 $v0, $f0 -/* AE90 8002FA90 00000000 */ nop +/* AE90 8002FA90 00000000 */ nop /* AE94 8002FA94 46800020 */ cvt.s.w $f0, $f0 /* AE98 8002FA98 E6000084 */ swc1 $f0, 0x84($s0) /* AE9C 8002FA9C C6000058 */ lwc1 $f0, 0x58($s0) /* AEA0 8002FAA0 86020022 */ lh $v0, 0x22($s0) /* AEA4 8002FAA4 E60A0048 */ swc1 $f10, 0x48($s0) /* AEA8 8002FAA8 44821000 */ mtc1 $v0, $f2 -/* AEAC 8002FAAC 00000000 */ nop +/* AEAC 8002FAAC 00000000 */ nop /* AEB0 8002FAB0 468010A0 */ cvt.s.w $f2, $f2 /* AEB4 8002FAB4 46040000 */ add.s $f0, $f0, $f4 /* AEB8 8002FAB8 E6020074 */ swc1 $f2, 0x74($s0) @@ -85,7 +85,7 @@ glabel do_camera_type_6 /* AEC0 8002FAC0 8602001E */ lh $v0, 0x1e($s0) /* AEC4 8002FAC4 46023180 */ add.s $f6, $f6, $f2 /* AEC8 8002FAC8 44822000 */ mtc1 $v0, $f4 -/* AECC 8002FACC 00000000 */ nop +/* AECC 8002FACC 00000000 */ nop /* AED0 8002FAD0 46802120 */ cvt.s.w $f4, $f4 /* AED4 8002FAD4 46000021 */ cvt.d.s $f0, $f0 /* AED8 8002FAD8 46280000 */ add.d $f0, $f0, $f8 @@ -102,12 +102,12 @@ glabel do_camera_type_6 /* AF00 8002FB00 4481A000 */ mtc1 $at, $f20 /* AF04 8002FB04 00031083 */ sra $v0, $v1, 2 /* AF08 8002FB08 46141082 */ mul.s $f2, $f2, $f20 -/* AF0C 8002FB0C 00000000 */ nop +/* AF0C 8002FB0C 00000000 */ nop /* AF10 8002FB10 4480F000 */ mtc1 $zero, $f30 /* AF14 8002FB14 3C0143B4 */ lui $at, 0x43b4 /* AF18 8002FB18 4481B000 */ mtc1 $at, $f22 /* AF1C 8002FB1C 44820000 */ mtc1 $v0, $f0 -/* AF20 8002FB20 00000000 */ nop +/* AF20 8002FB20 00000000 */ nop /* AF24 8002FB24 46800020 */ cvt.s.w $f0, $f0 /* AF28 8002FB28 E6000018 */ swc1 $f0, 0x18($s0) /* AF2C 8002FB2C 46161683 */ div.s $f26, $f2, $f22 @@ -117,18 +117,18 @@ glabel do_camera_type_6 /* AF3C 8002FB3C 0C00A874 */ jal cos_rad /* AF40 8002FB40 4600D306 */ mov.s $f12, $f26 /* AF44 8002FB44 461E0202 */ mul.s $f8, $f0, $f30 -/* AF48 8002FB48 00000000 */ nop +/* AF48 8002FB48 00000000 */ nop /* AF4C 8002FB4C 4600F087 */ neg.s $f2, $f30 /* AF50 8002FB50 4602E082 */ mul.s $f2, $f28, $f2 -/* AF54 8002FB54 00000000 */ nop +/* AF54 8002FB54 00000000 */ nop /* AF58 8002FB58 C6180078 */ lwc1 $f24, 0x78($s0) /* AF5C 8002FB5C 461CC102 */ mul.s $f4, $f24, $f28 -/* AF60 8002FB60 00000000 */ nop +/* AF60 8002FB60 00000000 */ nop /* AF64 8002FB64 4600C182 */ mul.s $f6, $f24, $f0 -/* AF68 8002FB68 00000000 */ nop +/* AF68 8002FB68 00000000 */ nop /* AF6C 8002FB6C C6000084 */ lwc1 $f0, 0x84($s0) /* AF70 8002FB70 46140002 */ mul.s $f0, $f0, $f20 -/* AF74 8002FB74 00000000 */ nop +/* AF74 8002FB74 00000000 */ nop /* AF78 8002FB78 4600F286 */ mov.s $f10, $f30 /* AF7C 8002FB7C 46005506 */ mov.s $f20, $f10 /* AF80 8002FB80 46044780 */ add.s $f30, $f8, $f4 @@ -140,13 +140,13 @@ glabel do_camera_type_6 /* AF98 8002FB98 0C00A874 */ jal cos_rad /* AF9C 8002FB9C 4600D306 */ mov.s $f12, $f26 /* AFA0 8002FBA0 46140182 */ mul.s $f6, $f0, $f20 -/* AFA4 8002FBA4 00000000 */ nop +/* AFA4 8002FBA4 00000000 */ nop /* AFA8 8002FBA8 4614E102 */ mul.s $f4, $f28, $f20 -/* AFAC 8002FBAC 00000000 */ nop +/* AFAC 8002FBAC 00000000 */ nop /* AFB0 8002FBB0 461CC082 */ mul.s $f2, $f24, $f28 -/* AFB4 8002FBB4 00000000 */ nop +/* AFB4 8002FBB4 00000000 */ nop /* AFB8 8002FBB8 4600C002 */ mul.s $f0, $f24, $f0 -/* AFBC 8002FBBC 00000000 */ nop +/* AFBC 8002FBBC 00000000 */ nop /* AFC0 8002FBC0 46023281 */ sub.s $f10, $f6, $f2 /* AFC4 8002FBC4 46002100 */ add.s $f4, $f4, $f0 /* AFC8 8002FBC8 C600004C */ lwc1 $f0, 0x4c($s0) @@ -181,19 +181,19 @@ glabel do_camera_type_6 /* B038 8002FC38 0C00A720 */ jal atan2 /* B03C 8002FC3C 4600B386 */ mov.s $f14, $f22 /* B040 8002FC40 4614A102 */ mul.s $f4, $f20, $f20 -/* B044 8002FC44 00000000 */ nop +/* B044 8002FC44 00000000 */ nop /* B048 8002FC48 4618C082 */ mul.s $f2, $f24, $f24 -/* B04C 8002FC4C 00000000 */ nop +/* B04C 8002FC4C 00000000 */ nop /* B050 8002FC50 46022300 */ add.s $f12, $f4, $f2 /* B054 8002FC54 46000007 */ neg.s $f0, $f0 /* B058 8002FC58 E6000090 */ swc1 $f0, 0x90($s0) /* B05C 8002FC5C 46006004 */ sqrt.s $f0, $f12 /* B060 8002FC60 46000032 */ c.eq.s $f0, $f0 -/* B064 8002FC64 00000000 */ nop +/* B064 8002FC64 00000000 */ nop /* B068 8002FC68 45030004 */ bc1tl .L8002FC7C /* B06C 8002FC6C 4600B306 */ mov.s $f12, $f22 /* B070 8002FC70 0C0187BC */ jal sqrtf -/* B074 8002FC74 00000000 */ nop +/* B074 8002FC74 00000000 */ nop /* B078 8002FC78 4600B306 */ mov.s $f12, $f22 .L8002FC7C: /* B07C 8002FC7C 46000007 */ neg.s $f0, $f0 @@ -220,4 +220,4 @@ glabel do_camera_type_6 /* B0D0 8002FCD0 D7B40018 */ ldc1 $f20, 0x18($sp) /* B0D4 8002FCD4 03E00008 */ jr $ra /* B0D8 8002FCD8 27BD0048 */ addiu $sp, $sp, 0x48 -/* B0DC 8002FCDC 00000000 */ nop +/* B0DC 8002FCDC 00000000 */ nop diff --git a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_unused.s b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_unused.s index b8bbf9f5ea..c9ceed3967 100644 --- a/asm/nonmatchings/code_ad90_len_2880/do_camera_type_unused.s +++ b/asm/nonmatchings/code_ad90_len_2880/do_camera_type_unused.s @@ -16,10 +16,10 @@ glabel do_camera_type_unused /* B10C 8002FD0C 3C038011 */ lui $v1, %hi(gPlayerStatus) /* B110 8002FD10 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) /* B114 8002FD14 14400004 */ bnez $v0, .L8002FD28 -/* B118 8002FD18 00000000 */ nop +/* B118 8002FD18 00000000 */ nop /* B11C 8002FD1C 86020008 */ lh $v0, 8($s0) /* B120 8002FD20 1040000F */ beqz $v0, .L8002FD60 -/* B124 8002FD24 00000000 */ nop +/* B124 8002FD24 00000000 */ nop .L8002FD28: /* B128 8002FD28 C6000054 */ lwc1 $f0, 0x54($s0) /* B12C 8002FD2C C6020058 */ lwc1 $f2, 0x58($s0) @@ -39,11 +39,11 @@ glabel do_camera_type_unused /* B160 8002FD60 8C620000 */ lw $v0, ($v1) /* B164 8002FD64 30420006 */ andi $v0, $v0, 6 /* B168 8002FD68 14400007 */ bnez $v0, .L8002FD88 -/* B16C 8002FD6C 00000000 */ nop +/* B16C 8002FD6C 00000000 */ nop /* B170 8002FD70 C460002C */ lwc1 $f0, 0x2c($v1) /* B174 8002FD74 3C014270 */ lui $at, 0x4270 /* B178 8002FD78 44811000 */ mtc1 $at, $f2 -/* B17C 8002FD7C 00000000 */ nop +/* B17C 8002FD7C 00000000 */ nop /* B180 8002FD80 46020000 */ add.s $f0, $f0, $f2 /* B184 8002FD84 E6000058 */ swc1 $f0, 0x58($s0) .L8002FD88: @@ -66,7 +66,7 @@ glabel do_camera_type_unused /* B1C4 8002FDC4 14610004 */ bne $v1, $at, .L8002FDD8 /* B1C8 8002FDC8 3C018000 */ lui $at, 0x8000 /* B1CC 8002FDCC 14410002 */ bne $v0, $at, .L8002FDD8 -/* B1D0 8002FDD0 00000000 */ nop +/* B1D0 8002FDD0 00000000 */ nop /* B1D4 8002FDD4 0006000D */ break 6 .L8002FDD8: /* B1D8 8002FDD8 00002012 */ mflo $a0 @@ -77,18 +77,18 @@ glabel do_camera_type_unused /* B1EC 8002FDEC 8603001E */ lh $v1, 0x1e($s0) /* B1F0 8002FDF0 E6000048 */ swc1 $f0, 0x48($s0) /* B1F4 8002FDF4 44820000 */ mtc1 $v0, $f0 -/* B1F8 8002FDF8 00000000 */ nop +/* B1F8 8002FDF8 00000000 */ nop /* B1FC 8002FDFC 46800020 */ cvt.s.w $f0, $f0 /* B200 8002FE00 86020022 */ lh $v0, 0x22($s0) /* B204 8002FE04 E602004C */ swc1 $f2, 0x4c($s0) /* B208 8002FE08 E6040050 */ swc1 $f4, 0x50($s0) /* B20C 8002FE0C E6000084 */ swc1 $f0, 0x84($s0) /* B210 8002FE10 44820000 */ mtc1 $v0, $f0 -/* B214 8002FE14 00000000 */ nop +/* B214 8002FE14 00000000 */ nop /* B218 8002FE18 46800020 */ cvt.s.w $f0, $f0 /* B21C 8002FE1C E6000074 */ swc1 $f0, 0x74($s0) /* B220 8002FE20 44830000 */ mtc1 $v1, $f0 -/* B224 8002FE24 00000000 */ nop +/* B224 8002FE24 00000000 */ nop /* B228 8002FE28 46800020 */ cvt.s.w $f0, $f0 /* B22C 8002FE2C 04810002 */ bgez $a0, .L8002FE38 /* B230 8002FE30 E6000078 */ swc1 $f0, 0x78($s0) @@ -100,12 +100,12 @@ glabel do_camera_type_unused /* B244 8002FE44 4481A000 */ mtc1 $at, $f20 /* B248 8002FE48 00041083 */ sra $v0, $a0, 2 /* B24C 8002FE4C 46141082 */ mul.s $f2, $f2, $f20 -/* B250 8002FE50 00000000 */ nop +/* B250 8002FE50 00000000 */ nop /* B254 8002FE54 4480F000 */ mtc1 $zero, $f30 /* B258 8002FE58 3C0143B4 */ lui $at, 0x43b4 /* B25C 8002FE5C 4481B000 */ mtc1 $at, $f22 /* B260 8002FE60 44820000 */ mtc1 $v0, $f0 -/* B264 8002FE64 00000000 */ nop +/* B264 8002FE64 00000000 */ nop /* B268 8002FE68 46800020 */ cvt.s.w $f0, $f0 /* B26C 8002FE6C E6000018 */ swc1 $f0, 0x18($s0) /* B270 8002FE70 46161683 */ div.s $f26, $f2, $f22 @@ -115,18 +115,18 @@ glabel do_camera_type_unused /* B280 8002FE80 0C00A874 */ jal cos_rad /* B284 8002FE84 4600D306 */ mov.s $f12, $f26 /* B288 8002FE88 461E0202 */ mul.s $f8, $f0, $f30 -/* B28C 8002FE8C 00000000 */ nop +/* B28C 8002FE8C 00000000 */ nop /* B290 8002FE90 4600F087 */ neg.s $f2, $f30 /* B294 8002FE94 4602E082 */ mul.s $f2, $f28, $f2 -/* B298 8002FE98 00000000 */ nop +/* B298 8002FE98 00000000 */ nop /* B29C 8002FE9C C6180078 */ lwc1 $f24, 0x78($s0) /* B2A0 8002FEA0 461CC102 */ mul.s $f4, $f24, $f28 -/* B2A4 8002FEA4 00000000 */ nop +/* B2A4 8002FEA4 00000000 */ nop /* B2A8 8002FEA8 4600C182 */ mul.s $f6, $f24, $f0 -/* B2AC 8002FEAC 00000000 */ nop +/* B2AC 8002FEAC 00000000 */ nop /* B2B0 8002FEB0 C6000084 */ lwc1 $f0, 0x84($s0) /* B2B4 8002FEB4 46140002 */ mul.s $f0, $f0, $f20 -/* B2B8 8002FEB8 00000000 */ nop +/* B2B8 8002FEB8 00000000 */ nop /* B2BC 8002FEBC 4600F286 */ mov.s $f10, $f30 /* B2C0 8002FEC0 46005506 */ mov.s $f20, $f10 /* B2C4 8002FEC4 46044780 */ add.s $f30, $f8, $f4 @@ -138,13 +138,13 @@ glabel do_camera_type_unused /* B2DC 8002FEDC 0C00A874 */ jal cos_rad /* B2E0 8002FEE0 4600D306 */ mov.s $f12, $f26 /* B2E4 8002FEE4 46140182 */ mul.s $f6, $f0, $f20 -/* B2E8 8002FEE8 00000000 */ nop +/* B2E8 8002FEE8 00000000 */ nop /* B2EC 8002FEEC 4614E102 */ mul.s $f4, $f28, $f20 -/* B2F0 8002FEF0 00000000 */ nop +/* B2F0 8002FEF0 00000000 */ nop /* B2F4 8002FEF4 461CC082 */ mul.s $f2, $f24, $f28 -/* B2F8 8002FEF8 00000000 */ nop +/* B2F8 8002FEF8 00000000 */ nop /* B2FC 8002FEFC 4600C002 */ mul.s $f0, $f24, $f0 -/* B300 8002FF00 00000000 */ nop +/* B300 8002FF00 00000000 */ nop /* B304 8002FF04 46023281 */ sub.s $f10, $f6, $f2 /* B308 8002FF08 46002100 */ add.s $f4, $f4, $f0 /* B30C 8002FF0C C600004C */ lwc1 $f0, 0x4c($s0) @@ -179,19 +179,19 @@ glabel do_camera_type_unused /* B37C 8002FF7C 0C00A720 */ jal atan2 /* B380 8002FF80 4600B386 */ mov.s $f14, $f22 /* B384 8002FF84 4614A102 */ mul.s $f4, $f20, $f20 -/* B388 8002FF88 00000000 */ nop +/* B388 8002FF88 00000000 */ nop /* B38C 8002FF8C 4618C082 */ mul.s $f2, $f24, $f24 -/* B390 8002FF90 00000000 */ nop +/* B390 8002FF90 00000000 */ nop /* B394 8002FF94 46022300 */ add.s $f12, $f4, $f2 /* B398 8002FF98 46000007 */ neg.s $f0, $f0 /* B39C 8002FF9C E6000090 */ swc1 $f0, 0x90($s0) /* B3A0 8002FFA0 46006004 */ sqrt.s $f0, $f12 /* B3A4 8002FFA4 46000032 */ c.eq.s $f0, $f0 -/* B3A8 8002FFA8 00000000 */ nop +/* B3A8 8002FFA8 00000000 */ nop /* B3AC 8002FFAC 45030004 */ bc1tl .L8002FFC0 /* B3B0 8002FFB0 4600B306 */ mov.s $f12, $f22 /* B3B4 8002FFB4 0C0187BC */ jal sqrtf -/* B3B8 8002FFB8 00000000 */ nop +/* B3B8 8002FFB8 00000000 */ nop /* B3BC 8002FFBC 4600B306 */ mov.s $f12, $f22 .L8002FFC0: /* B3C0 8002FFC0 46000007 */ neg.s $f0, $f0 diff --git a/asm/nonmatchings/code_ad90_len_2880/func_80030210.s b/asm/nonmatchings/code_ad90_len_2880/func_80030210.s index 479c49e80f..1cb2ad13a0 100644 --- a/asm/nonmatchings/code_ad90_len_2880/func_80030210.s +++ b/asm/nonmatchings/code_ad90_len_2880/func_80030210.s @@ -13,20 +13,20 @@ glabel func_80030210 /* B630 80030230 C6040048 */ lwc1 $f4, 0x48($s0) /* B634 80030234 46040001 */ sub.s $f0, $f0, $f4 /* B638 80030238 4485B000 */ mtc1 $a1, $f22 -/* B63C 8003023C 00000000 */ nop +/* B63C 8003023C 00000000 */ nop /* B640 80030240 46160002 */ mul.s $f0, $f0, $f22 -/* B644 80030244 00000000 */ nop +/* B644 80030244 00000000 */ nop /* B648 80030248 44863000 */ mtc1 $a2, $f6 -/* B64C 8003024C 00000000 */ nop +/* B64C 8003024C 00000000 */ nop /* B650 80030250 46003087 */ neg.s $f2, $f6 /* B654 80030254 4602003C */ c.lt.s $f0, $f2 -/* B658 80030258 00000000 */ nop +/* B658 80030258 00000000 */ nop /* B65C 8003025C 45000002 */ bc1f .L80030268 /* B660 80030260 00E0882D */ daddu $s1, $a3, $zero /* B664 80030264 46001006 */ mov.s $f0, $f2 .L80030268: /* B668 80030268 4600303C */ c.lt.s $f6, $f0 -/* B66C 8003026C 00000000 */ nop +/* B66C 8003026C 00000000 */ nop /* B670 80030270 45030001 */ bc1tl .L80030278 /* B674 80030274 46003006 */ mov.s $f0, $f6 .L80030278: @@ -35,9 +35,9 @@ glabel func_80030210 /* B680 80030280 3C0140C9 */ lui $at, 0x40c9 /* B684 80030284 34210FD0 */ ori $at, $at, 0xfd0 /* B688 80030288 44810000 */ mtc1 $at, $f0 -/* B68C 8003028C 00000000 */ nop +/* B68C 8003028C 00000000 */ nop /* B690 80030290 46001082 */ mul.s $f2, $f2, $f0 -/* B694 80030294 00000000 */ nop +/* B694 80030294 00000000 */ nop /* B698 80030298 3C0143B4 */ lui $at, 0x43b4 /* B69C 8003029C 44810000 */ mtc1 $at, $f0 /* B6A0 800302A0 E604003C */ swc1 $f4, 0x3c($s0) @@ -47,12 +47,12 @@ glabel func_80030210 /* B6B0 800302B0 4600A306 */ mov.s $f12, $f20 /* B6B4 800302B4 C6020078 */ lwc1 $f2, 0x78($s0) /* B6B8 800302B8 46001082 */ mul.s $f2, $f2, $f0 -/* B6BC 800302BC 00000000 */ nop +/* B6BC 800302BC 00000000 */ nop /* B6C0 800302C0 C604005C */ lwc1 $f4, 0x5c($s0) /* B6C4 800302C4 C6060050 */ lwc1 $f6, 0x50($s0) /* B6C8 800302C8 46062101 */ sub.s $f4, $f4, $f6 /* B6CC 800302CC 46162102 */ mul.s $f4, $f4, $f22 -/* B6D0 800302D0 00000000 */ nop +/* B6D0 800302D0 00000000 */ nop /* B6D4 800302D4 46043180 */ add.s $f6, $f6, $f4 /* B6D8 800302D8 46023080 */ add.s $f2, $f6, $f2 /* B6DC 800302DC 00111400 */ sll $v0, $s1, 0x10 @@ -66,12 +66,12 @@ glabel func_80030210 /* B6FC 800302FC 46062101 */ sub.s $f4, $f4, $f6 /* B700 80030300 3C013E00 */ lui $at, 0x3e00 /* B704 80030304 44811000 */ mtc1 $at, $f2 -/* B708 80030308 00000000 */ nop +/* B708 80030308 00000000 */ nop /* B70C 8003030C 46022102 */ mul.s $f4, $f4, $f2 -/* B710 80030310 00000000 */ nop +/* B710 80030310 00000000 */ nop /* B714 80030314 C6020078 */ lwc1 $f2, 0x78($s0) /* B718 80030318 46001082 */ mul.s $f2, $f2, $f0 -/* B71C 8003031C 00000000 */ nop +/* B71C 8003031C 00000000 */ nop /* B720 80030320 46043180 */ add.s $f6, $f6, $f4 /* B724 80030324 46023080 */ add.s $f2, $f6, $f2 /* B728 80030328 E606004C */ swc1 $f6, 0x4c($s0) diff --git a/asm/nonmatchings/code_ad90_len_2880/func_8003034C.s b/asm/nonmatchings/code_ad90_len_2880/func_8003034C.s index 08ec367f98..a2724dacd3 100644 --- a/asm/nonmatchings/code_ad90_len_2880/func_8003034C.s +++ b/asm/nonmatchings/code_ad90_len_2880/func_8003034C.s @@ -19,9 +19,9 @@ glabel func_8003034C /* B784 80030384 4481A000 */ mtc1 $at, $f20 /* B788 80030388 46000005 */ abs.s $f0, $f0 /* B78C 8003038C 4614003C */ c.lt.s $f0, $f20 -/* B790 80030390 00000000 */ nop +/* B790 80030390 00000000 */ nop /* B794 80030394 4500000F */ bc1f .L800303D4 -/* B798 80030398 00000000 */ nop +/* B798 80030398 00000000 */ nop /* B79C 8003039C 86020556 */ lh $v0, 0x556($s0) /* B7A0 800303A0 14400009 */ bnez $v0, .L800303C8 /* B7A4 800303A4 2402000F */ addiu $v0, $zero, 0xf @@ -42,10 +42,10 @@ glabel func_8003034C /* B7D8 800303D8 3C014387 */ lui $at, 0x4387 /* B7DC 800303DC 44817000 */ mtc1 $at, $f14 /* B7E0 800303E0 0C00A70A */ jal get_clamped_angle_diff -/* B7E4 800303E4 00000000 */ nop +/* B7E4 800303E4 00000000 */ nop /* B7E8 800303E8 46000005 */ abs.s $f0, $f0 /* B7EC 800303EC 4614003C */ c.lt.s $f0, $f20 -/* B7F0 800303F0 00000000 */ nop +/* B7F0 800303F0 00000000 */ nop /* B7F4 800303F4 45000010 */ bc1f .L80030438 /* B7F8 800303F8 24030001 */ addiu $v1, $zero, 1 /* B7FC 800303FC 86020556 */ lh $v0, 0x556($s0) diff --git a/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s b/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s index 678c239dd4..ff57fdd71a 100644 --- a/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s +++ b/asm/nonmatchings/code_ad90_len_2880/func_800304FC.s @@ -33,7 +33,7 @@ glabel func_800304FC /* B96C 8003056C 144000C4 */ bnez $v0, .L80030880 /* B970 80030570 0240882D */ daddu $s1, $s2, $zero /* B974 80030574 16000005 */ bnez $s0, .L8003058C -/* B978 80030578 00000000 */ nop +/* B978 80030578 00000000 */ nop /* B97C 8003057C E6580010 */ swc1 $f24, 0x10($s2) /* B980 80030580 E65E0014 */ swc1 $f30, 0x14($s2) /* B984 80030584 0800C220 */ j .L80030880 @@ -47,7 +47,7 @@ glabel func_800304FC /* B9A0 800305A0 00220821 */ addu $at, $at, $v0 /* B9A4 800305A4 8C228210 */ lw $v0, %lo(D_80098210)($at) /* B9A8 800305A8 00400008 */ jr $v0 -/* B9AC 800305AC 00000000 */ nop +/* B9AC 800305AC 00000000 */ nop /* B9B0 800305B0 8E020028 */ lw $v0, 0x28($s0) /* B9B4 800305B4 504000B0 */ beql $v0, $zero, .L80030878 /* B9B8 800305B8 E6380010 */ swc1 $f24, 0x10($s1) @@ -59,26 +59,26 @@ glabel func_800304FC /* B9D0 800305D0 46005280 */ add.s $f10, $f10, $f0 /* B9D4 800305D4 460A0201 */ sub.s $f8, $f0, $f10 /* B9D8 800305D8 46084102 */ mul.s $f4, $f8, $f8 -/* B9DC 800305DC 00000000 */ nop +/* B9DC 800305DC 00000000 */ nop /* B9E0 800305E0 C606000C */ lwc1 $f6, 0xc($s0) /* B9E4 800305E4 46003181 */ sub.s $f6, $f6, $f0 /* B9E8 800305E8 460C3180 */ add.s $f6, $f6, $f12 /* B9EC 800305EC 46066301 */ sub.s $f12, $f12, $f6 /* B9F0 800305F0 460C6382 */ mul.s $f14, $f12, $f12 -/* B9F4 800305F4 00000000 */ nop +/* B9F4 800305F4 00000000 */ nop /* B9F8 800305F8 460AC081 */ sub.s $f2, $f24, $f10 /* B9FC 800305FC 46081082 */ mul.s $f2, $f2, $f8 -/* BA00 80030600 00000000 */ nop +/* BA00 80030600 00000000 */ nop /* BA04 80030604 4606D001 */ sub.s $f0, $f26, $f6 /* BA08 80030608 460C0002 */ mul.s $f0, $f0, $f12 -/* BA0C 8003060C 00000000 */ nop +/* BA0C 8003060C 00000000 */ nop /* BA10 80030610 460E2100 */ add.s $f4, $f4, $f14 /* BA14 80030614 46001080 */ add.s $f2, $f2, $f0 /* BA18 80030618 46041103 */ div.s $f4, $f2, $f4 /* BA1C 8003061C 46082202 */ mul.s $f8, $f4, $f8 -/* BA20 80030620 00000000 */ nop +/* BA20 80030620 00000000 */ nop /* BA24 80030624 460C2102 */ mul.s $f4, $f4, $f12 -/* BA28 80030628 00000000 */ nop +/* BA28 80030628 00000000 */ nop /* BA2C 8003062C 460A4200 */ add.s $f8, $f8, $f10 /* BA30 80030630 46062100 */ add.s $f4, $f4, $f6 /* BA34 80030634 E63E0014 */ swc1 $f30, 0x14($s1) @@ -89,45 +89,45 @@ glabel func_800304FC /* BA48 80030648 C61C0018 */ lwc1 $f28, 0x18($s0) /* BA4C 8003064C 460EE201 */ sub.s $f8, $f28, $f14 /* BA50 80030650 46084502 */ mul.s $f20, $f8, $f8 -/* BA54 80030654 00000000 */ nop +/* BA54 80030654 00000000 */ nop /* BA58 80030658 460EC081 */ sub.s $f2, $f24, $f14 /* BA5C 8003065C 46081082 */ mul.s $f2, $f2, $f8 -/* BA60 80030660 00000000 */ nop +/* BA60 80030660 00000000 */ nop /* BA64 80030664 E7BC0010 */ swc1 $f28, 0x10($sp) /* BA68 80030668 C60C0014 */ lwc1 $f12, 0x14($s0) /* BA6C 8003066C C61C0020 */ lwc1 $f28, 0x20($s0) /* BA70 80030670 460CE181 */ sub.s $f6, $f28, $f12 /* BA74 80030674 46063482 */ mul.s $f18, $f6, $f6 -/* BA78 80030678 00000000 */ nop +/* BA78 80030678 00000000 */ nop /* BA7C 8003067C 460CD001 */ sub.s $f0, $f26, $f12 /* BA80 80030680 46060002 */ mul.s $f0, $f0, $f6 -/* BA84 80030684 00000000 */ nop +/* BA84 80030684 00000000 */ nop /* BA88 80030688 4612A100 */ add.s $f4, $f20, $f18 /* BA8C 8003068C 46001080 */ add.s $f2, $f2, $f0 /* BA90 80030690 46041103 */ div.s $f4, $f2, $f4 /* BA94 80030694 46082002 */ mul.s $f0, $f4, $f8 -/* BA98 80030698 00000000 */ nop +/* BA98 80030698 00000000 */ nop /* BA9C 8003069C 46062102 */ mul.s $f4, $f4, $f6 -/* BAA0 800306A0 00000000 */ nop +/* BAA0 800306A0 00000000 */ nop /* BAA4 800306A4 460E0400 */ add.s $f16, $f0, $f14 /* BAA8 800306A8 46007586 */ mov.s $f22, $f14 /* BAAC 800306AC 46004386 */ mov.s $f14, $f8 /* BAB0 800306B0 46168201 */ sub.s $f8, $f16, $f22 /* BAB4 800306B4 46087082 */ mul.s $f2, $f14, $f8 -/* BAB8 800306B8 00000000 */ nop +/* BAB8 800306B8 00000000 */ nop /* BABC 800306BC 460C2280 */ add.s $f10, $f4, $f12 /* BAC0 800306C0 46006106 */ mov.s $f4, $f12 /* BAC4 800306C4 46003306 */ mov.s $f12, $f6 /* BAC8 800306C8 46045181 */ sub.s $f6, $f10, $f4 /* BACC 800306CC 46066002 */ mul.s $f0, $f12, $f6 -/* BAD0 800306D0 00000000 */ nop +/* BAD0 800306D0 00000000 */ nop /* BAD4 800306D4 4610C501 */ sub.s $f20, $f24, $f16 /* BAD8 800306D8 460AD481 */ sub.s $f18, $f26, $f10 /* BADC 800306DC 46001080 */ add.s $f2, $f2, $f0 /* BAE0 800306E0 44800000 */ mtc1 $zero, $f0 -/* BAE4 800306E4 00000000 */ nop +/* BAE4 800306E4 00000000 */ nop /* BAE8 800306E8 4600103C */ c.lt.s $f2, $f0 -/* BAEC 800306EC 00000000 */ nop +/* BAEC 800306EC 00000000 */ nop /* BAF0 800306F0 45000004 */ bc1f .L80030704 /* BAF4 800306F4 E7BC0020 */ swc1 $f28, 0x20($sp) /* BAF8 800306F8 4600B406 */ mov.s $f16, $f22 @@ -135,19 +135,19 @@ glabel func_800304FC /* BB00 80030700 46002286 */ mov.s $f10, $f4 .L80030704: /* BB04 80030704 46084082 */ mul.s $f2, $f8, $f8 -/* BB08 80030708 00000000 */ nop +/* BB08 80030708 00000000 */ nop /* BB0C 8003070C 46063182 */ mul.s $f6, $f6, $f6 -/* BB10 80030710 00000000 */ nop +/* BB10 80030710 00000000 */ nop /* BB14 80030714 460E7002 */ mul.s $f0, $f14, $f14 -/* BB18 80030718 00000000 */ nop +/* BB18 80030718 00000000 */ nop /* BB1C 8003071C 460C6102 */ mul.s $f4, $f12, $f12 -/* BB20 80030720 00000000 */ nop +/* BB20 80030720 00000000 */ nop /* BB24 80030724 46061080 */ add.s $f2, $f2, $f6 /* BB28 80030728 46040000 */ add.s $f0, $f0, $f4 /* BB2C 8003072C 4602003C */ c.lt.s $f0, $f2 -/* BB30 80030730 00000000 */ nop +/* BB30 80030730 00000000 */ nop /* BB34 80030734 45000003 */ bc1f .L80030744 -/* BB38 80030738 00000000 */ nop +/* BB38 80030738 00000000 */ nop /* BB3C 8003073C C7B00010 */ lwc1 $f16, 0x10($sp) /* BB40 80030740 C7AA0020 */ lwc1 $f10, 0x20($sp) .L80030744: @@ -167,23 +167,23 @@ glabel func_800304FC /* BB74 80030774 C600000C */ lwc1 $f0, 0xc($s0) /* BB78 80030778 4600C581 */ sub.s $f22, $f24, $f0 /* BB7C 8003077C 4616B082 */ mul.s $f2, $f22, $f22 -/* BB80 80030780 00000000 */ nop +/* BB80 80030780 00000000 */ nop /* BB84 80030784 C6000014 */ lwc1 $f0, 0x14($s0) /* BB88 80030788 4600D501 */ sub.s $f20, $f26, $f0 /* BB8C 8003078C 4614A002 */ mul.s $f0, $f20, $f20 -/* BB90 80030790 00000000 */ nop +/* BB90 80030790 00000000 */ nop /* BB94 80030794 46001600 */ add.s $f24, $f2, $f0 /* BB98 80030798 44800000 */ mtc1 $zero, $f0 -/* BB9C 8003079C 00000000 */ nop +/* BB9C 8003079C 00000000 */ nop /* BBA0 800307A0 4600C032 */ c.eq.s $f24, $f0 -/* BBA4 800307A4 00000000 */ nop +/* BBA4 800307A4 00000000 */ nop /* BBA8 800307A8 45010035 */ bc1t .L80030880 -/* BBAC 800307AC 00000000 */ nop +/* BBAC 800307AC 00000000 */ nop /* BBB0 800307B0 4600C184 */ sqrt.s $f6, $f24 /* BBB4 800307B4 46063032 */ c.eq.s $f6, $f6 -/* BBB8 800307B8 00000000 */ nop +/* BBB8 800307B8 00000000 */ nop /* BBBC 800307BC 45010004 */ bc1t .L800307D0 -/* BBC0 800307C0 00000000 */ nop +/* BBC0 800307C0 00000000 */ nop /* BBC4 800307C4 0C0187BC */ jal sqrtf /* BBC8 800307C8 4600C306 */ mov.s $f12, $f24 /* BBCC 800307CC 46000186 */ mov.s $f6, $f0 @@ -192,35 +192,35 @@ glabel func_800304FC /* BBD4 800307D4 C600000C */ lwc1 $f0, 0xc($s0) /* BBD8 800307D8 46002101 */ sub.s $f4, $f4, $f0 /* BBDC 800307DC 46042102 */ mul.s $f4, $f4, $f4 -/* BBE0 800307E0 00000000 */ nop +/* BBE0 800307E0 00000000 */ nop /* BBE4 800307E4 C6020014 */ lwc1 $f2, 0x14($s0) /* BBE8 800307E8 C6000020 */ lwc1 $f0, 0x20($s0) /* BBEC 800307EC 46020001 */ sub.s $f0, $f0, $f2 /* BBF0 800307F0 46000002 */ mul.s $f0, $f0, $f0 -/* BBF4 800307F4 00000000 */ nop +/* BBF4 800307F4 00000000 */ nop /* BBF8 800307F8 3C013F80 */ lui $at, 0x3f80 /* BBFC 800307FC 44811000 */ mtc1 $at, $f2 /* BC00 80030800 46002300 */ add.s $f12, $f4, $f0 /* BC04 80030804 46061603 */ div.s $f24, $f2, $f6 /* BC08 80030808 46006084 */ sqrt.s $f2, $f12 /* BC0C 8003080C 46021032 */ c.eq.s $f2, $f2 -/* BC10 80030810 00000000 */ nop +/* BC10 80030810 00000000 */ nop /* BC14 80030814 45010004 */ bc1t .L80030828 -/* BC18 80030818 00000000 */ nop +/* BC18 80030818 00000000 */ nop /* BC1C 8003081C 0C0187BC */ jal sqrtf -/* BC20 80030820 00000000 */ nop +/* BC20 80030820 00000000 */ nop /* BC24 80030824 46000086 */ mov.s $f2, $f0 .L80030828: /* BC28 80030828 4602B002 */ mul.s $f0, $f22, $f2 -/* BC2C 8003082C 00000000 */ nop +/* BC2C 8003082C 00000000 */ nop /* BC30 80030830 4602A102 */ mul.s $f4, $f20, $f2 -/* BC34 80030834 00000000 */ nop +/* BC34 80030834 00000000 */ nop /* BC38 80030838 46180002 */ mul.s $f0, $f0, $f24 -/* BC3C 8003083C 00000000 */ nop +/* BC3C 8003083C 00000000 */ nop /* BC40 80030840 C602000C */ lwc1 $f2, 0xc($s0) /* BC44 80030844 46001080 */ add.s $f2, $f2, $f0 /* BC48 80030848 46182102 */ mul.s $f4, $f4, $f24 -/* BC4C 8003084C 00000000 */ nop +/* BC4C 8003084C 00000000 */ nop /* BC50 80030850 E63E0014 */ swc1 $f30, 0x14($s1) /* BC54 80030854 E6220010 */ swc1 $f2, 0x10($s1) /* BC58 80030858 C6000014 */ lwc1 $f0, 0x14($s0) @@ -255,7 +255,7 @@ glabel func_800304FC /* BCC0 800308C0 00220821 */ addu $at, $at, $v0 /* BCC4 800308C4 8C228230 */ lw $v0, %lo(D_80098230)($at) /* BCC8 800308C8 00400008 */ jr $v0 -/* BCCC 800308CC 00000000 */ nop +/* BCCC 800308CC 00000000 */ nop /* BCD0 800308D0 C6020018 */ lwc1 $f2, 0x18($s0) /* BCD4 800308D4 C600000C */ lwc1 $f0, 0xc($s0) /* BCD8 800308D8 46001081 */ sub.s $f2, $f2, $f0 @@ -271,7 +271,7 @@ glabel func_800304FC /* BD00 80030900 E6200000 */ swc1 $f0, ($s1) /* BD04 80030904 C6000004 */ lwc1 $f0, 4($s0) /* BD08 80030908 4614003C */ c.lt.s $f0, $f20 -/* BD0C 8003090C 00000000 */ nop +/* BD0C 8003090C 00000000 */ nop /* BD10 80030910 45030001 */ bc1tl .L80030918 /* BD14 80030914 46000007 */ neg.s $f0, $f0 .L80030918: @@ -291,26 +291,26 @@ glabel func_800304FC /* BD4C 8003094C 46005280 */ add.s $f10, $f10, $f0 /* BD50 80030950 460A0201 */ sub.s $f8, $f0, $f10 /* BD54 80030954 46084102 */ mul.s $f4, $f8, $f8 -/* BD58 80030958 00000000 */ nop +/* BD58 80030958 00000000 */ nop /* BD5C 8003095C C606000C */ lwc1 $f6, 0xc($s0) /* BD60 80030960 46003181 */ sub.s $f6, $f6, $f0 /* BD64 80030964 460C3180 */ add.s $f6, $f6, $f12 /* BD68 80030968 46066301 */ sub.s $f12, $f12, $f6 /* BD6C 8003096C 460C6382 */ mul.s $f14, $f12, $f12 -/* BD70 80030970 00000000 */ nop +/* BD70 80030970 00000000 */ nop /* BD74 80030974 460AC081 */ sub.s $f2, $f24, $f10 /* BD78 80030978 46081082 */ mul.s $f2, $f2, $f8 -/* BD7C 8003097C 00000000 */ nop +/* BD7C 8003097C 00000000 */ nop /* BD80 80030980 4606D001 */ sub.s $f0, $f26, $f6 /* BD84 80030984 460C0002 */ mul.s $f0, $f0, $f12 -/* BD88 80030988 00000000 */ nop +/* BD88 80030988 00000000 */ nop /* BD8C 8003098C 460E2100 */ add.s $f4, $f4, $f14 /* BD90 80030990 46001080 */ add.s $f2, $f2, $f0 /* BD94 80030994 46041103 */ div.s $f4, $f2, $f4 /* BD98 80030998 46082202 */ mul.s $f8, $f4, $f8 -/* BD9C 8003099C 00000000 */ nop +/* BD9C 8003099C 00000000 */ nop /* BDA0 800309A0 460C2102 */ mul.s $f4, $f4, $f12 -/* BDA4 800309A4 00000000 */ nop +/* BDA4 800309A4 00000000 */ nop /* BDA8 800309A8 460A4200 */ add.s $f8, $f8, $f10 /* BDAC 800309AC 46062100 */ add.s $f4, $f4, $f6 /* BDB0 800309B0 E63E0014 */ swc1 $f30, 0x14($s1) @@ -336,9 +336,9 @@ glabel func_800304FC /* BDFC 800309FC E6200000 */ swc1 $f0, ($s1) /* BE00 80030A00 C6000004 */ lwc1 $f0, 4($s0) /* BE04 80030A04 4480E000 */ mtc1 $zero, $f28 -/* BE08 80030A08 00000000 */ nop +/* BE08 80030A08 00000000 */ nop /* BE0C 80030A0C 461C003C */ c.lt.s $f0, $f28 -/* BE10 80030A10 00000000 */ nop +/* BE10 80030A10 00000000 */ nop /* BE14 80030A14 45030001 */ bc1tl .L80030A1C /* BE18 80030A18 46000007 */ neg.s $f0, $f0 .L80030A1C: @@ -351,45 +351,45 @@ glabel func_800304FC /* BE34 80030A34 C61C0018 */ lwc1 $f28, 0x18($s0) /* BE38 80030A38 460EE201 */ sub.s $f8, $f28, $f14 /* BE3C 80030A3C 46084502 */ mul.s $f20, $f8, $f8 -/* BE40 80030A40 00000000 */ nop +/* BE40 80030A40 00000000 */ nop /* BE44 80030A44 460EC081 */ sub.s $f2, $f24, $f14 /* BE48 80030A48 46081082 */ mul.s $f2, $f2, $f8 -/* BE4C 80030A4C 00000000 */ nop +/* BE4C 80030A4C 00000000 */ nop /* BE50 80030A50 E7BC0014 */ swc1 $f28, 0x14($sp) /* BE54 80030A54 C60C0014 */ lwc1 $f12, 0x14($s0) /* BE58 80030A58 C61C0020 */ lwc1 $f28, 0x20($s0) /* BE5C 80030A5C 460CE181 */ sub.s $f6, $f28, $f12 /* BE60 80030A60 46063482 */ mul.s $f18, $f6, $f6 -/* BE64 80030A64 00000000 */ nop +/* BE64 80030A64 00000000 */ nop /* BE68 80030A68 460CD001 */ sub.s $f0, $f26, $f12 /* BE6C 80030A6C 46060002 */ mul.s $f0, $f0, $f6 -/* BE70 80030A70 00000000 */ nop +/* BE70 80030A70 00000000 */ nop /* BE74 80030A74 4612A100 */ add.s $f4, $f20, $f18 /* BE78 80030A78 46001080 */ add.s $f2, $f2, $f0 /* BE7C 80030A7C 46041103 */ div.s $f4, $f2, $f4 /* BE80 80030A80 46082002 */ mul.s $f0, $f4, $f8 -/* BE84 80030A84 00000000 */ nop +/* BE84 80030A84 00000000 */ nop /* BE88 80030A88 46062102 */ mul.s $f4, $f4, $f6 -/* BE8C 80030A8C 00000000 */ nop +/* BE8C 80030A8C 00000000 */ nop /* BE90 80030A90 460E0400 */ add.s $f16, $f0, $f14 /* BE94 80030A94 46007586 */ mov.s $f22, $f14 /* BE98 80030A98 46004386 */ mov.s $f14, $f8 /* BE9C 80030A9C 46168201 */ sub.s $f8, $f16, $f22 /* BEA0 80030AA0 46087002 */ mul.s $f0, $f14, $f8 -/* BEA4 80030AA4 00000000 */ nop +/* BEA4 80030AA4 00000000 */ nop /* BEA8 80030AA8 460C2280 */ add.s $f10, $f4, $f12 /* BEAC 80030AAC 46006106 */ mov.s $f4, $f12 /* BEB0 80030AB0 46003306 */ mov.s $f12, $f6 /* BEB4 80030AB4 46045181 */ sub.s $f6, $f10, $f4 /* BEB8 80030AB8 46066082 */ mul.s $f2, $f12, $f6 -/* BEBC 80030ABC 00000000 */ nop +/* BEBC 80030ABC 00000000 */ nop /* BEC0 80030AC0 4610C501 */ sub.s $f20, $f24, $f16 /* BEC4 80030AC4 E7BC0018 */ swc1 $f28, 0x18($sp) /* BEC8 80030AC8 46020000 */ add.s $f0, $f0, $f2 /* BECC 80030ACC 4480E000 */ mtc1 $zero, $f28 -/* BED0 80030AD0 00000000 */ nop +/* BED0 80030AD0 00000000 */ nop /* BED4 80030AD4 461C003C */ c.lt.s $f0, $f28 -/* BED8 80030AD8 00000000 */ nop +/* BED8 80030AD8 00000000 */ nop /* BEDC 80030ADC 45000004 */ bc1f .L80030AF0 /* BEE0 80030AE0 460AD481 */ sub.s $f18, $f26, $f10 /* BEE4 80030AE4 4600B406 */ mov.s $f16, $f22 @@ -397,19 +397,19 @@ glabel func_800304FC /* BEEC 80030AEC 46002286 */ mov.s $f10, $f4 .L80030AF0: /* BEF0 80030AF0 46084082 */ mul.s $f2, $f8, $f8 -/* BEF4 80030AF4 00000000 */ nop +/* BEF4 80030AF4 00000000 */ nop /* BEF8 80030AF8 46063182 */ mul.s $f6, $f6, $f6 -/* BEFC 80030AFC 00000000 */ nop +/* BEFC 80030AFC 00000000 */ nop /* BF00 80030B00 460E7002 */ mul.s $f0, $f14, $f14 -/* BF04 80030B04 00000000 */ nop +/* BF04 80030B04 00000000 */ nop /* BF08 80030B08 460C6102 */ mul.s $f4, $f12, $f12 -/* BF0C 80030B0C 00000000 */ nop +/* BF0C 80030B0C 00000000 */ nop /* BF10 80030B10 46061080 */ add.s $f2, $f2, $f6 /* BF14 80030B14 46040000 */ add.s $f0, $f0, $f4 /* BF18 80030B18 4602003C */ c.lt.s $f0, $f2 -/* BF1C 80030B1C 00000000 */ nop +/* BF1C 80030B1C 00000000 */ nop /* BF20 80030B20 45000003 */ bc1f .L80030B30 -/* BF24 80030B24 00000000 */ nop +/* BF24 80030B24 00000000 */ nop /* BF28 80030B28 C7B00014 */ lwc1 $f16, 0x14($sp) /* BF2C 80030B2C C7AA0018 */ lwc1 $f10, 0x18($sp) .L80030B30: @@ -424,55 +424,55 @@ glabel func_800304FC /* BF4C 80030B4C E62A0018 */ swc1 $f10, 0x18($s1) .L80030B50: /* BF50 80030B50 12E0021B */ beqz $s7, .L800313C0 -/* BF54 80030B54 00000000 */ nop +/* BF54 80030B54 00000000 */ nop /* BF58 80030B58 C6C00000 */ lwc1 $f0, ($s6) /* BF5C 80030B5C 3C013F80 */ lui $at, 0x3f80 /* BF60 80030B60 44812000 */ mtc1 $at, $f4 -/* BF64 80030B64 00000000 */ nop +/* BF64 80030B64 00000000 */ nop /* BF68 80030B68 46040032 */ c.eq.s $f0, $f4 -/* BF6C 80030B6C 00000000 */ nop +/* BF6C 80030B6C 00000000 */ nop /* BF70 80030B70 450101CA */ bc1t .L8003129C -/* BF74 80030B74 00000000 */ nop +/* BF74 80030B74 00000000 */ nop /* BF78 80030B78 8E840000 */ lw $a0, ($s4) /* BF7C 80030B7C 24820002 */ addiu $v0, $a0, 2 /* BF80 80030B80 2C420003 */ sltiu $v0, $v0, 3 /* BF84 80030B84 144001C5 */ bnez $v0, .L8003129C -/* BF88 80030B88 00000000 */ nop +/* BF88 80030B88 00000000 */ nop /* BF8C 80030B8C 8C830000 */ lw $v1, ($a0) /* BF90 80030B90 8E020000 */ lw $v0, ($s0) /* BF94 80030B94 146201C1 */ bne $v1, $v0, .L8003129C -/* BF98 80030B98 00000000 */ nop +/* BF98 80030B98 00000000 */ nop /* BF9C 80030B9C C4820004 */ lwc1 $f2, 4($a0) /* BFA0 80030BA0 C6000004 */ lwc1 $f0, 4($s0) /* BFA4 80030BA4 46001032 */ c.eq.s $f2, $f0 -/* BFA8 80030BA8 00000000 */ nop +/* BFA8 80030BA8 00000000 */ nop /* BFAC 80030BAC 450001BB */ bc1f .L8003129C -/* BFB0 80030BB0 00000000 */ nop +/* BFB0 80030BB0 00000000 */ nop /* BFB4 80030BB4 C4820008 */ lwc1 $f2, 8($a0) /* BFB8 80030BB8 C6000008 */ lwc1 $f0, 8($s0) /* BFBC 80030BBC 46001032 */ c.eq.s $f2, $f0 -/* BFC0 80030BC0 00000000 */ nop +/* BFC0 80030BC0 00000000 */ nop /* BFC4 80030BC4 450001B5 */ bc1f .L8003129C -/* BFC8 80030BC8 00000000 */ nop +/* BFC8 80030BC8 00000000 */ nop /* BFCC 80030BCC C4820024 */ lwc1 $f2, 0x24($a0) /* BFD0 80030BD0 C6000024 */ lwc1 $f0, 0x24($s0) /* BFD4 80030BD4 46001032 */ c.eq.s $f2, $f0 -/* BFD8 80030BD8 00000000 */ nop +/* BFD8 80030BD8 00000000 */ nop /* BFDC 80030BDC 450001AF */ bc1f .L8003129C -/* BFE0 80030BE0 00000000 */ nop +/* BFE0 80030BE0 00000000 */ nop /* BFE4 80030BE4 8C830028 */ lw $v1, 0x28($a0) /* BFE8 80030BE8 8E020028 */ lw $v0, 0x28($s0) /* BFEC 80030BEC 546201AB */ bnel $v1, $v0, .L8003129C /* BFF0 80030BF0 E6C40000 */ swc1 $f4, ($s6) /* BFF4 80030BF4 0800C4A7 */ j .L8003129C -/* BFF8 80030BF8 00000000 */ nop +/* BFF8 80030BF8 00000000 */ nop /* BFFC 80030BFC C6040004 */ lwc1 $f4, 4($s0) /* C000 80030C00 44800000 */ mtc1 $zero, $f0 -/* C004 80030C04 00000000 */ nop +/* C004 80030C04 00000000 */ nop /* C008 80030C08 4600203C */ c.lt.s $f4, $f0 -/* C00C 80030C0C 00000000 */ nop +/* C00C 80030C0C 00000000 */ nop /* C010 80030C10 45000008 */ bc1f .L80030C34 -/* C014 80030C14 00000000 */ nop +/* C014 80030C14 00000000 */ nop /* C018 80030C18 C600000C */ lwc1 $f0, 0xc($s0) /* C01C 80030C1C 4600C581 */ sub.s $f22, $f24, $f0 /* C020 80030C20 C6020014 */ lwc1 $f2, 0x14($s0) @@ -503,23 +503,23 @@ glabel func_800304FC /* C07C 80030C7C C600000C */ lwc1 $f0, 0xc($s0) /* C080 80030C80 4600C581 */ sub.s $f22, $f24, $f0 /* C084 80030C84 4616B082 */ mul.s $f2, $f22, $f22 -/* C088 80030C88 00000000 */ nop +/* C088 80030C88 00000000 */ nop /* C08C 80030C8C C6000014 */ lwc1 $f0, 0x14($s0) /* C090 80030C90 4600D501 */ sub.s $f20, $f26, $f0 /* C094 80030C94 4614A002 */ mul.s $f0, $f20, $f20 -/* C098 80030C98 00000000 */ nop +/* C098 80030C98 00000000 */ nop /* C09C 80030C9C 46001600 */ add.s $f24, $f2, $f0 /* C0A0 80030CA0 4480E000 */ mtc1 $zero, $f28 -/* C0A4 80030CA4 00000000 */ nop +/* C0A4 80030CA4 00000000 */ nop /* C0A8 80030CA8 461CC032 */ c.eq.s $f24, $f28 -/* C0AC 80030CAC 00000000 */ nop +/* C0AC 80030CAC 00000000 */ nop /* C0B0 80030CB0 45010031 */ bc1t .L80030D78 -/* C0B4 80030CB4 00000000 */ nop +/* C0B4 80030CB4 00000000 */ nop /* C0B8 80030CB8 4600C184 */ sqrt.s $f6, $f24 /* C0BC 80030CBC 46063032 */ c.eq.s $f6, $f6 -/* C0C0 80030CC0 00000000 */ nop +/* C0C0 80030CC0 00000000 */ nop /* C0C4 80030CC4 45010004 */ bc1t .L80030CD8 -/* C0C8 80030CC8 00000000 */ nop +/* C0C8 80030CC8 00000000 */ nop /* C0CC 80030CCC 0C0187BC */ jal sqrtf /* C0D0 80030CD0 4600C306 */ mov.s $f12, $f24 /* C0D4 80030CD4 46000186 */ mov.s $f6, $f0 @@ -528,35 +528,35 @@ glabel func_800304FC /* C0DC 80030CDC C600000C */ lwc1 $f0, 0xc($s0) /* C0E0 80030CE0 46002101 */ sub.s $f4, $f4, $f0 /* C0E4 80030CE4 46042102 */ mul.s $f4, $f4, $f4 -/* C0E8 80030CE8 00000000 */ nop +/* C0E8 80030CE8 00000000 */ nop /* C0EC 80030CEC C6020014 */ lwc1 $f2, 0x14($s0) /* C0F0 80030CF0 C6000020 */ lwc1 $f0, 0x20($s0) /* C0F4 80030CF4 46020001 */ sub.s $f0, $f0, $f2 /* C0F8 80030CF8 46000002 */ mul.s $f0, $f0, $f0 -/* C0FC 80030CFC 00000000 */ nop +/* C0FC 80030CFC 00000000 */ nop /* C100 80030D00 3C013F80 */ lui $at, 0x3f80 /* C104 80030D04 44811000 */ mtc1 $at, $f2 /* C108 80030D08 46002300 */ add.s $f12, $f4, $f0 /* C10C 80030D0C 46061603 */ div.s $f24, $f2, $f6 /* C110 80030D10 46006084 */ sqrt.s $f2, $f12 /* C114 80030D14 46021032 */ c.eq.s $f2, $f2 -/* C118 80030D18 00000000 */ nop +/* C118 80030D18 00000000 */ nop /* C11C 80030D1C 45010004 */ bc1t .L80030D30 -/* C120 80030D20 00000000 */ nop +/* C120 80030D20 00000000 */ nop /* C124 80030D24 0C0187BC */ jal sqrtf -/* C128 80030D28 00000000 */ nop +/* C128 80030D28 00000000 */ nop /* C12C 80030D2C 46000086 */ mov.s $f2, $f0 .L80030D30: /* C130 80030D30 4602B002 */ mul.s $f0, $f22, $f2 -/* C134 80030D34 00000000 */ nop +/* C134 80030D34 00000000 */ nop /* C138 80030D38 4602A102 */ mul.s $f4, $f20, $f2 -/* C13C 80030D3C 00000000 */ nop +/* C13C 80030D3C 00000000 */ nop /* C140 80030D40 46180002 */ mul.s $f0, $f0, $f24 -/* C144 80030D44 00000000 */ nop +/* C144 80030D44 00000000 */ nop /* C148 80030D48 C602000C */ lwc1 $f2, 0xc($s0) /* C14C 80030D4C 46001080 */ add.s $f2, $f2, $f0 /* C150 80030D50 46182102 */ mul.s $f4, $f4, $f24 -/* C154 80030D54 00000000 */ nop +/* C154 80030D54 00000000 */ nop /* C158 80030D58 E63E0014 */ swc1 $f30, 0x14($s1) /* C15C 80030D5C E6220010 */ swc1 $f2, 0x10($s1) /* C160 80030D60 C6000014 */ lwc1 $f0, 0x14($s0) @@ -568,63 +568,63 @@ glabel func_800304FC /* C174 80030D74 E63A0018 */ swc1 $f26, 0x18($s1) .L80030D78: /* C178 80030D78 12E00191 */ beqz $s7, .L800313C0 -/* C17C 80030D7C 00000000 */ nop +/* C17C 80030D7C 00000000 */ nop /* C180 80030D80 C6C00000 */ lwc1 $f0, ($s6) /* C184 80030D84 3C013F80 */ lui $at, 0x3f80 /* C188 80030D88 44812000 */ mtc1 $at, $f4 -/* C18C 80030D8C 00000000 */ nop +/* C18C 80030D8C 00000000 */ nop /* C190 80030D90 46040032 */ c.eq.s $f0, $f4 -/* C194 80030D94 00000000 */ nop +/* C194 80030D94 00000000 */ nop /* C198 80030D98 45010140 */ bc1t .L8003129C -/* C19C 80030D9C 00000000 */ nop +/* C19C 80030D9C 00000000 */ nop /* C1A0 80030DA0 8E840000 */ lw $a0, ($s4) /* C1A4 80030DA4 24820002 */ addiu $v0, $a0, 2 /* C1A8 80030DA8 2C420003 */ sltiu $v0, $v0, 3 /* C1AC 80030DAC 1440013B */ bnez $v0, .L8003129C -/* C1B0 80030DB0 00000000 */ nop +/* C1B0 80030DB0 00000000 */ nop /* C1B4 80030DB4 8C830000 */ lw $v1, ($a0) /* C1B8 80030DB8 8E020000 */ lw $v0, ($s0) /* C1BC 80030DBC 14620137 */ bne $v1, $v0, .L8003129C -/* C1C0 80030DC0 00000000 */ nop +/* C1C0 80030DC0 00000000 */ nop /* C1C4 80030DC4 C4820004 */ lwc1 $f2, 4($a0) /* C1C8 80030DC8 C6000004 */ lwc1 $f0, 4($s0) /* C1CC 80030DCC 46001032 */ c.eq.s $f2, $f0 -/* C1D0 80030DD0 00000000 */ nop +/* C1D0 80030DD0 00000000 */ nop /* C1D4 80030DD4 45000131 */ bc1f .L8003129C -/* C1D8 80030DD8 00000000 */ nop +/* C1D8 80030DD8 00000000 */ nop /* C1DC 80030DDC C4820008 */ lwc1 $f2, 8($a0) /* C1E0 80030DE0 C6000008 */ lwc1 $f0, 8($s0) /* C1E4 80030DE4 46001032 */ c.eq.s $f2, $f0 -/* C1E8 80030DE8 00000000 */ nop +/* C1E8 80030DE8 00000000 */ nop /* C1EC 80030DEC 4500012B */ bc1f .L8003129C -/* C1F0 80030DF0 00000000 */ nop +/* C1F0 80030DF0 00000000 */ nop /* C1F4 80030DF4 C4820024 */ lwc1 $f2, 0x24($a0) /* C1F8 80030DF8 C6000024 */ lwc1 $f0, 0x24($s0) /* C1FC 80030DFC 46001032 */ c.eq.s $f2, $f0 -/* C200 80030E00 00000000 */ nop +/* C200 80030E00 00000000 */ nop /* C204 80030E04 45000125 */ bc1f .L8003129C -/* C208 80030E08 00000000 */ nop +/* C208 80030E08 00000000 */ nop /* C20C 80030E0C 8C830028 */ lw $v1, 0x28($a0) /* C210 80030E10 8E020028 */ lw $v0, 0x28($s0) /* C214 80030E14 10620121 */ beq $v1, $v0, .L8003129C -/* C218 80030E18 00000000 */ nop +/* C218 80030E18 00000000 */ nop /* C21C 80030E1C C482000C */ lwc1 $f2, 0xc($a0) /* C220 80030E20 C600000C */ lwc1 $f0, 0xc($s0) /* C224 80030E24 46001032 */ c.eq.s $f2, $f0 -/* C228 80030E28 00000000 */ nop +/* C228 80030E28 00000000 */ nop /* C22C 80030E2C 4500011B */ bc1f .L8003129C -/* C230 80030E30 00000000 */ nop +/* C230 80030E30 00000000 */ nop /* C234 80030E34 C4820014 */ lwc1 $f2, 0x14($a0) /* C238 80030E38 C6000014 */ lwc1 $f0, 0x14($s0) /* C23C 80030E3C 46001032 */ c.eq.s $f2, $f0 -/* C240 80030E40 00000000 */ nop +/* C240 80030E40 00000000 */ nop /* C244 80030E44 45030115 */ bc1tl .L8003129C /* C248 80030E48 E6C40000 */ swc1 $f4, ($s6) /* C24C 80030E4C 0800C4A7 */ j .L8003129C -/* C250 80030E50 00000000 */ nop +/* C250 80030E50 00000000 */ nop /* C254 80030E54 8E020028 */ lw $v0, 0x28($s0) /* C258 80030E58 1440005D */ bnez $v0, .L80030FD0 -/* C25C 80030E5C 00000000 */ nop +/* C25C 80030E5C 00000000 */ nop /* C260 80030E60 C612000C */ lwc1 $f18, 0xc($s0) /* C264 80030E64 C6100018 */ lwc1 $f16, 0x18($s0) /* C268 80030E68 C60A0014 */ lwc1 $f10, 0x14($s0) @@ -632,37 +632,37 @@ glabel func_800304FC /* C270 80030E70 C6040010 */ lwc1 $f4, 0x10($s0) /* C274 80030E74 C60E001C */ lwc1 $f14, 0x1c($s0) /* C278 80030E78 46109032 */ c.eq.s $f18, $f16 -/* C27C 80030E7C 00000000 */ nop +/* C27C 80030E7C 00000000 */ nop /* C280 80030E80 45000007 */ bc1f .L80030EA0 /* C284 80030E84 46048201 */ sub.s $f8, $f16, $f4 /* C288 80030E88 460C5032 */ c.eq.s $f10, $f12 -/* C28C 80030E8C 00000000 */ nop +/* C28C 80030E8C 00000000 */ nop /* C290 80030E90 45000003 */ bc1f .L80030EA0 -/* C294 80030E94 00000000 */ nop +/* C294 80030E94 00000000 */ nop /* C298 80030E98 46002486 */ mov.s $f18, $f4 /* C29C 80030E9C 46007286 */ mov.s $f10, $f14 .L80030EA0: /* C2A0 80030EA0 44800000 */ mtc1 $zero, $f0 -/* C2A4 80030EA4 00000000 */ nop +/* C2A4 80030EA4 00000000 */ nop /* C2A8 80030EA8 46004032 */ c.eq.s $f8, $f0 -/* C2AC 80030EAC 00000000 */ nop +/* C2AC 80030EAC 00000000 */ nop /* C2B0 80030EB0 45020017 */ bc1fl .L80030F10 /* C2B4 80030EB4 460C5181 */ sub.s $f6, $f10, $f12 /* C2B8 80030EB8 46128181 */ sub.s $f6, $f16, $f18 /* C2BC 80030EBC 46064102 */ mul.s $f4, $f8, $f6 -/* C2C0 80030EC0 00000000 */ nop +/* C2C0 80030EC0 00000000 */ nop /* C2C4 80030EC4 461A6081 */ sub.s $f2, $f12, $f26 /* C2C8 80030EC8 46081082 */ mul.s $f2, $f2, $f8 -/* C2CC 80030ECC 00000000 */ nop +/* C2CC 80030ECC 00000000 */ nop /* C2D0 80030ED0 460C5281 */ sub.s $f10, $f10, $f12 /* C2D4 80030ED4 460E6201 */ sub.s $f8, $f12, $f14 /* C2D8 80030ED8 4610C001 */ sub.s $f0, $f24, $f16 /* C2DC 80030EDC 46081083 */ div.s $f2, $f2, $f8 /* C2E0 80030EE0 46020000 */ add.s $f0, $f0, $f2 /* C2E4 80030EE4 46005082 */ mul.s $f2, $f10, $f0 -/* C2E8 80030EE8 00000000 */ nop +/* C2E8 80030EE8 00000000 */ nop /* C2EC 80030EEC 46003182 */ mul.s $f6, $f6, $f0 -/* C2F0 80030EF0 00000000 */ nop +/* C2F0 80030EF0 00000000 */ nop /* C2F4 80030EF4 46082103 */ div.s $f4, $f4, $f8 /* C2F8 80030EF8 460A2101 */ sub.s $f4, $f4, $f10 /* C2FC 80030EFC 46041083 */ div.s $f2, $f2, $f4 @@ -673,18 +673,18 @@ glabel func_800304FC .L80030F10: /* C310 80030F10 460E6081 */ sub.s $f2, $f12, $f14 /* C314 80030F14 46023102 */ mul.s $f4, $f6, $f2 -/* C318 80030F18 00000000 */ nop +/* C318 80030F18 00000000 */ nop /* C31C 80030F1C 46188001 */ sub.s $f0, $f16, $f24 /* C320 80030F20 46020002 */ mul.s $f0, $f0, $f2 -/* C324 80030F24 00000000 */ nop +/* C324 80030F24 00000000 */ nop /* C328 80030F28 460CD081 */ sub.s $f2, $f26, $f12 /* C32C 80030F2C 46080003 */ div.s $f0, $f0, $f8 /* C330 80030F30 46001080 */ add.s $f2, $f2, $f0 /* C334 80030F34 46023182 */ mul.s $f6, $f6, $f2 -/* C338 80030F38 00000000 */ nop +/* C338 80030F38 00000000 */ nop /* C33C 80030F3C 46128001 */ sub.s $f0, $f16, $f18 /* C340 80030F40 46020082 */ mul.s $f2, $f0, $f2 -/* C344 80030F44 00000000 */ nop +/* C344 80030F44 00000000 */ nop /* C348 80030F48 46082103 */ div.s $f4, $f4, $f8 /* C34C 80030F4C 46002101 */ sub.s $f4, $f4, $f0 /* C350 80030F50 46043183 */ div.s $f6, $f6, $f4 @@ -711,7 +711,7 @@ glabel func_800304FC /* C3A0 80030FA0 E6200000 */ swc1 $f0, ($s1) /* C3A4 80030FA4 C6000004 */ lwc1 $f0, 4($s0) /* C3A8 80030FA8 4614003C */ c.lt.s $f0, $f20 -/* C3AC 80030FAC 00000000 */ nop +/* C3AC 80030FAC 00000000 */ nop /* C3B0 80030FB0 45030001 */ bc1tl .L80030FB8 /* C3B4 80030FB4 46000007 */ neg.s $f0, $f0 .L80030FB8: @@ -723,7 +723,7 @@ glabel func_800304FC /* C3CC 80030FCC E620000C */ swc1 $f0, 0xc($s1) .L80030FD0: /* C3D0 80030FD0 12A0001D */ beqz $s5, .L80031048 -/* C3D4 80030FD4 00000000 */ nop +/* C3D4 80030FD4 00000000 */ nop /* C3D8 80030FD8 C6020018 */ lwc1 $f2, 0x18($s0) /* C3DC 80030FDC C600000C */ lwc1 $f0, 0xc($s0) /* C3E0 80030FE0 46001081 */ sub.s $f2, $f2, $f0 @@ -739,7 +739,7 @@ glabel func_800304FC /* C408 80031008 E6200000 */ swc1 $f0, ($s1) /* C40C 8003100C C6000004 */ lwc1 $f0, 4($s0) /* C410 80031010 4614003C */ c.lt.s $f0, $f20 -/* C414 80031014 00000000 */ nop +/* C414 80031014 00000000 */ nop /* C418 80031018 45030001 */ bc1tl .L80031020 /* C41C 8003101C 46000007 */ neg.s $f0, $f0 .L80031020: @@ -767,30 +767,30 @@ glabel func_800304FC /* C468 80031068 2402FFFF */ addiu $v0, $zero, -1 /* C46C 8003106C 8E020028 */ lw $v0, 0x28($s0) /* C470 80031070 1440003A */ bnez $v0, .L8003115C -/* C474 80031074 00000000 */ nop +/* C474 80031074 00000000 */ nop /* C478 80031078 C60C0010 */ lwc1 $f12, 0x10($s0) /* C47C 8003107C C6060018 */ lwc1 $f6, 0x18($s0) /* C480 80031080 460C3181 */ sub.s $f6, $f6, $f12 /* C484 80031084 46063102 */ mul.s $f4, $f6, $f6 -/* C488 80031088 00000000 */ nop +/* C488 80031088 00000000 */ nop /* C48C 8003108C C60A001C */ lwc1 $f10, 0x1c($s0) /* C490 80031090 C6080020 */ lwc1 $f8, 0x20($s0) /* C494 80031094 460A4201 */ sub.s $f8, $f8, $f10 /* C498 80031098 46084382 */ mul.s $f14, $f8, $f8 -/* C49C 8003109C 00000000 */ nop +/* C49C 8003109C 00000000 */ nop /* C4A0 800310A0 460CC081 */ sub.s $f2, $f24, $f12 /* C4A4 800310A4 46061082 */ mul.s $f2, $f2, $f6 -/* C4A8 800310A8 00000000 */ nop +/* C4A8 800310A8 00000000 */ nop /* C4AC 800310AC 460AD001 */ sub.s $f0, $f26, $f10 /* C4B0 800310B0 46080002 */ mul.s $f0, $f0, $f8 -/* C4B4 800310B4 00000000 */ nop +/* C4B4 800310B4 00000000 */ nop /* C4B8 800310B8 460E2100 */ add.s $f4, $f4, $f14 /* C4BC 800310BC 46001080 */ add.s $f2, $f2, $f0 /* C4C0 800310C0 46041103 */ div.s $f4, $f2, $f4 /* C4C4 800310C4 46062182 */ mul.s $f6, $f4, $f6 -/* C4C8 800310C8 00000000 */ nop +/* C4C8 800310C8 00000000 */ nop /* C4CC 800310CC 46082102 */ mul.s $f4, $f4, $f8 -/* C4D0 800310D0 00000000 */ nop +/* C4D0 800310D0 00000000 */ nop /* C4D4 800310D4 460C3080 */ add.s $f2, $f6, $f12 /* C4D8 800310D8 44800000 */ mtc1 $zero, $f0 /* C4DC 800310DC 460A2100 */ add.s $f4, $f4, $f10 @@ -799,9 +799,9 @@ glabel func_800304FC /* C4E8 800310E8 E6240018 */ swc1 $f4, 0x18($s1) /* C4EC 800310EC C6080004 */ lwc1 $f8, 4($s0) /* C4F0 800310F0 4600403C */ c.lt.s $f8, $f0 -/* C4F4 800310F4 00000000 */ nop +/* C4F4 800310F4 00000000 */ nop /* C4F8 800310F8 45000008 */ bc1f .L8003111C -/* C4FC 800310FC 00000000 */ nop +/* C4FC 800310FC 00000000 */ nop /* C500 80031100 C600000C */ lwc1 $f0, 0xc($s0) /* C504 80031104 46001581 */ sub.s $f22, $f2, $f0 /* C508 80031108 C6020014 */ lwc1 $f2, 0x14($s0) @@ -829,14 +829,14 @@ glabel func_800304FC /* C558 80031158 E620000C */ swc1 $f0, 0xc($s1) .L8003115C: /* C55C 8003115C 12A00023 */ beqz $s5, .L800311EC -/* C560 80031160 00000000 */ nop +/* C560 80031160 00000000 */ nop /* C564 80031164 C6060004 */ lwc1 $f6, 4($s0) /* C568 80031168 44800000 */ mtc1 $zero, $f0 -/* C56C 8003116C 00000000 */ nop +/* C56C 8003116C 00000000 */ nop /* C570 80031170 4600303C */ c.lt.s $f6, $f0 -/* C574 80031174 00000000 */ nop +/* C574 80031174 00000000 */ nop /* C578 80031178 4500000A */ bc1f .L800311A4 -/* C57C 8003117C 00000000 */ nop +/* C57C 8003117C 00000000 */ nop /* C580 80031180 C6020018 */ lwc1 $f2, 0x18($s0) /* C584 80031184 C600000C */ lwc1 $f0, 0xc($s0) /* C588 80031188 46001581 */ sub.s $f22, $f2, $f0 @@ -897,7 +897,7 @@ glabel func_800304FC /* C650 80031250 E6200000 */ swc1 $f0, ($s1) /* C654 80031254 C6000004 */ lwc1 $f0, 4($s0) /* C658 80031258 4614003C */ c.lt.s $f0, $f20 -/* C65C 8003125C 00000000 */ nop +/* C65C 8003125C 00000000 */ nop /* C660 80031260 45030001 */ bc1tl .L80031268 /* C664 80031264 46000007 */ neg.s $f0, $f0 .L80031268: @@ -920,13 +920,13 @@ glabel func_800304FC /* C6A0 800312A0 24020005 */ addiu $v0, $zero, 5 /* C6A4 800312A4 8E030000 */ lw $v1, ($s0) /* C6A8 800312A8 10620007 */ beq $v1, $v0, .L800312C8 -/* C6AC 800312AC 00000000 */ nop +/* C6AC 800312AC 00000000 */ nop /* C6B0 800312B0 C6420000 */ lwc1 $f2, ($s2) /* C6B4 800312B4 C6600000 */ lwc1 $f0, ($s3) /* C6B8 800312B8 46001032 */ c.eq.s $f2, $f0 -/* C6BC 800312BC 00000000 */ nop +/* C6BC 800312BC 00000000 */ nop /* C6C0 800312C0 4501003F */ bc1t .L800313C0 -/* C6C4 800312C4 00000000 */ nop +/* C6C4 800312C4 00000000 */ nop .L800312C8: /* C6C8 800312C8 C6400000 */ lwc1 $f0, ($s2) /* C6CC 800312CC C6620000 */ lwc1 $f2, ($s3) @@ -935,9 +935,9 @@ glabel func_800304FC /* C6D8 800312D8 44811000 */ mtc1 $at, $f2 /* C6DC 800312DC 46000005 */ abs.s $f0, $f0 /* C6E0 800312E0 4602003C */ c.lt.s $f0, $f2 -/* C6E4 800312E4 00000000 */ nop +/* C6E4 800312E4 00000000 */ nop /* C6E8 800312E8 45000035 */ bc1f .L800313C0 -/* C6EC 800312EC 00000000 */ nop +/* C6EC 800312EC 00000000 */ nop /* C6F0 800312F0 C6400004 */ lwc1 $f0, 4($s2) /* C6F4 800312F4 C6620004 */ lwc1 $f2, 4($s3) /* C6F8 800312F8 46020001 */ sub.s $f0, $f0, $f2 @@ -945,9 +945,9 @@ glabel func_800304FC /* C700 80031300 44812000 */ mtc1 $at, $f4 /* C704 80031304 46000005 */ abs.s $f0, $f0 /* C708 80031308 4604003C */ c.lt.s $f0, $f4 -/* C70C 8003130C 00000000 */ nop +/* C70C 8003130C 00000000 */ nop /* C710 80031310 4500002B */ bc1f .L800313C0 -/* C714 80031314 00000000 */ nop +/* C714 80031314 00000000 */ nop /* C718 80031318 C6400008 */ lwc1 $f0, 8($s2) /* C71C 8003131C C6620008 */ lwc1 $f2, 8($s3) /* C720 80031320 46020001 */ sub.s $f0, $f0, $f2 @@ -955,48 +955,48 @@ glabel func_800304FC /* C728 80031328 44813000 */ mtc1 $at, $f6 /* C72C 8003132C 46000005 */ abs.s $f0, $f0 /* C730 80031330 4606003C */ c.lt.s $f0, $f6 -/* C734 80031334 00000000 */ nop +/* C734 80031334 00000000 */ nop /* C738 80031338 45000021 */ bc1f .L800313C0 -/* C73C 8003133C 00000000 */ nop +/* C73C 8003133C 00000000 */ nop /* C740 80031340 C640000C */ lwc1 $f0, 0xc($s2) /* C744 80031344 C662000C */ lwc1 $f2, 0xc($s3) /* C748 80031348 46020001 */ sub.s $f0, $f0, $f2 /* C74C 8003134C 46000005 */ abs.s $f0, $f0 /* C750 80031350 4606003C */ c.lt.s $f0, $f6 -/* C754 80031354 00000000 */ nop +/* C754 80031354 00000000 */ nop /* C758 80031358 45000019 */ bc1f .L800313C0 -/* C75C 8003135C 00000000 */ nop +/* C75C 8003135C 00000000 */ nop /* C760 80031360 C6400010 */ lwc1 $f0, 0x10($s2) /* C764 80031364 C6620010 */ lwc1 $f2, 0x10($s3) /* C768 80031368 46020001 */ sub.s $f0, $f0, $f2 /* C76C 8003136C 46000005 */ abs.s $f0, $f0 /* C770 80031370 4604003C */ c.lt.s $f0, $f4 -/* C774 80031374 00000000 */ nop +/* C774 80031374 00000000 */ nop /* C778 80031378 45000011 */ bc1f .L800313C0 -/* C77C 8003137C 00000000 */ nop +/* C77C 8003137C 00000000 */ nop /* C780 80031380 C6400014 */ lwc1 $f0, 0x14($s2) /* C784 80031384 C6620014 */ lwc1 $f2, 0x14($s3) /* C788 80031388 46020001 */ sub.s $f0, $f0, $f2 /* C78C 8003138C 46000005 */ abs.s $f0, $f0 /* C790 80031390 4604003C */ c.lt.s $f0, $f4 -/* C794 80031394 00000000 */ nop +/* C794 80031394 00000000 */ nop /* C798 80031398 45000009 */ bc1f .L800313C0 -/* C79C 8003139C 00000000 */ nop +/* C79C 8003139C 00000000 */ nop /* C7A0 800313A0 C6400018 */ lwc1 $f0, 0x18($s2) /* C7A4 800313A4 C6620018 */ lwc1 $f2, 0x18($s3) /* C7A8 800313A8 46020001 */ sub.s $f0, $f0, $f2 /* C7AC 800313AC 46000005 */ abs.s $f0, $f0 /* C7B0 800313B0 4604003C */ c.lt.s $f0, $f4 -/* C7B4 800313B4 00000000 */ nop +/* C7B4 800313B4 00000000 */ nop /* C7B8 800313B8 45030001 */ bc1tl .L800313C0 /* C7BC 800313BC E6C60000 */ swc1 $f6, ($s6) .L800313C0: /* C7C0 800313C0 8E830000 */ lw $v1, ($s4) /* C7C4 800313C4 2402FFFF */ addiu $v0, $zero, -1 /* C7C8 800313C8 14620021 */ bne $v1, $v0, .L80031450 -/* C7CC 800313CC 00000000 */ nop +/* C7CC 800313CC 00000000 */ nop /* C7D0 800313D0 12E00010 */ beqz $s7, .L80031414 -/* C7D4 800313D4 00000000 */ nop +/* C7D4 800313D4 00000000 */ nop /* C7D8 800313D8 C6460010 */ lwc1 $f6, 0x10($s2) /* C7DC 800313DC C6600010 */ lwc1 $f0, 0x10($s3) /* C7E0 800313E0 C6440014 */ lwc1 $f4, 0x14($s2) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s index f88f9f34ba..64482b54e8 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A4D0.s @@ -40,9 +40,9 @@ glabel func_8013A4D0 /* D0C58 8013A558 26310001 */ addiu $s1, $s1, 1 /* D0C5C 8013A55C 80820005 */ lb $v0, 5($a0) /* D0C60 8013A560 10520003 */ beq $v0, $s2, .L8013A570 -/* D0C64 8013A564 00000000 */ nop +/* D0C64 8013A564 00000000 */ nop /* D0C68 8013A568 0C04EA4F */ jal func_8013A93C -/* D0C6C 8013A56C 00000000 */ nop +/* D0C6C 8013A56C 00000000 */ nop .L8013A570: /* D0C70 8013A570 2A22005A */ slti $v0, $s1, 0x5a /* D0C74 8013A574 1440FFF2 */ bnez $v0, .L8013A540 @@ -67,9 +67,9 @@ glabel func_8013A4D0 /* D0CBC 8013A5BC 10540009 */ beq $v0, $s4, .L8013A5E4 /* D0CC0 8013A5C0 26310001 */ addiu $s1, $s1, 1 /* D0CC4 8013A5C4 10530007 */ beq $v0, $s3, .L8013A5E4 -/* D0CC8 8013A5C8 00000000 */ nop +/* D0CC8 8013A5C8 00000000 */ nop /* D0CCC 8013A5CC 0C00AB1E */ jal general_heap_free -/* D0CD0 8013A5D0 00000000 */ nop +/* D0CD0 8013A5D0 00000000 */ nop /* D0CD4 8013A5D4 8E420000 */ lw $v0, ($s2) /* D0CD8 8013A5D8 02021021 */ addu $v0, $s0, $v0 /* D0CDC 8013A5DC AC40005C */ sw $zero, 0x5c($v0) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s index 73c9a70830..3282e5c6ef 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A610.s @@ -19,4 +19,4 @@ glabel func_8013A610 /* D0D40 8013A640 1440FFF7 */ bnez $v0, .L8013A620 /* D0D44 8013A644 24630008 */ addiu $v1, $v1, 8 /* D0D48 8013A648 03E00008 */ jr $ra -/* D0D4C 8013A64C 00000000 */ nop +/* D0D4C 8013A64C 00000000 */ nop diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s index 74d01b32e7..d3674b7fca 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A650.s @@ -21,7 +21,7 @@ glabel func_8013A650 /* D0D8C 8013A68C 26100008 */ addiu $s0, $s0, 8 /* D0D90 8013A690 92020005 */ lbu $v0, 5($s0) /* D0D94 8013A694 10400005 */ beqz $v0, .L8013A6AC -/* D0D98 8013A698 00000000 */ nop +/* D0D98 8013A698 00000000 */ nop /* D0D9C 8013A69C 0C00AB4B */ jal heap_free /* D0DA0 8013A6A0 8E040000 */ lw $a0, ($s0) /* D0DA4 8013A6A4 0804E9AF */ j .L8013A6BC @@ -29,7 +29,7 @@ glabel func_8013A650 .L8013A6AC: /* D0DAC 8013A6AC 8E040000 */ lw $a0, ($s0) /* D0DB0 8013A6B0 0C00AB1E */ jal general_heap_free -/* D0DB4 8013A6B4 00000000 */ nop +/* D0DB4 8013A6B4 00000000 */ nop /* D0DB8 8013A6B8 AE000000 */ sw $zero, ($s0) .L8013A6BC: /* D0DBC 8013A6BC A2000004 */ sb $zero, 4($s0) @@ -38,7 +38,7 @@ glabel func_8013A650 .L8013A6C8: /* D0DC8 8013A6C8 0211102A */ slt $v0, $s0, $s1 /* D0DCC 8013A6CC 1440FFE7 */ bnez $v0, .L8013A66C -/* D0DD0 8013A6D0 00000000 */ nop +/* D0DD0 8013A6D0 00000000 */ nop /* D0DD4 8013A6D4 8FBF0018 */ lw $ra, 0x18($sp) /* D0DD8 8013A6D8 8FB10014 */ lw $s1, 0x14($sp) /* D0DDC 8013A6DC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s index 19c3233af6..dc72395a5f 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A6E8.s @@ -5,7 +5,7 @@ glabel func_8013A6E8 /* D0DE8 8013A6E8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D0DEC 8013A6EC AFBF0010 */ sw $ra, 0x10($sp) /* D0DF0 8013A6F0 0C04E994 */ jal func_8013A650 -/* D0DF4 8013A6F4 00000000 */ nop +/* D0DF4 8013A6F4 00000000 */ nop /* D0DF8 8013A6F8 8FBF0010 */ lw $ra, 0x10($sp) /* D0DFC 8013A6FC 03E00008 */ jr $ra /* D0E00 8013A700 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s index ba1f164c98..56e944ac13 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A704.s @@ -31,7 +31,7 @@ glabel func_8013A704 /* D0E64 8013A764 10400006 */ beqz $v0, .L8013A780 /* D0E68 8013A768 2402FFFF */ addiu $v0, $zero, -1 /* D0E6C 8013A76C 0804EA0B */ j .L8013A82C -/* D0E70 8013A770 00000000 */ nop +/* D0E70 8013A770 00000000 */ nop .L8013A774: /* D0E74 8013A774 2402FFFF */ addiu $v0, $zero, -1 /* D0E78 8013A778 0804EA0A */ j .L8013A828 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s index bd36dc7645..94cb2a0107 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A93C.s @@ -12,28 +12,28 @@ glabel func_8013A93C .L8013A958: /* D1058 8013A958 8E040068 */ lw $a0, 0x68($s0) /* D105C 8013A95C 10800004 */ beqz $a0, .L8013A970 -/* D1060 8013A960 00000000 */ nop +/* D1060 8013A960 00000000 */ nop /* D1064 8013A964 0C04E984 */ jal func_8013A610 /* D1068 8013A968 24050001 */ addiu $a1, $zero, 1 /* D106C 8013A96C AE000068 */ sw $zero, 0x68($s0) .L8013A970: /* D1070 8013A970 8E04006C */ lw $a0, 0x6c($s0) /* D1074 8013A974 10800004 */ beqz $a0, .L8013A988 -/* D1078 8013A978 00000000 */ nop +/* D1078 8013A978 00000000 */ nop /* D107C 8013A97C 0C04E984 */ jal func_8013A610 /* D1080 8013A980 24050001 */ addiu $a1, $zero, 1 /* D1084 8013A984 AE00006C */ sw $zero, 0x6c($s0) .L8013A988: /* D1088 8013A988 8E040070 */ lw $a0, 0x70($s0) /* D108C 8013A98C 10800004 */ beqz $a0, .L8013A9A0 -/* D1090 8013A990 00000000 */ nop +/* D1090 8013A990 00000000 */ nop /* D1094 8013A994 0C04E984 */ jal func_8013A610 /* D1098 8013A998 24050001 */ addiu $a1, $zero, 1 /* D109C 8013A99C AE000070 */ sw $zero, 0x70($s0) .L8013A9A0: /* D10A0 8013A9A0 8E040074 */ lw $a0, 0x74($s0) /* D10A4 8013A9A4 10800004 */ beqz $a0, .L8013A9B8 -/* D10A8 8013A9A8 00000000 */ nop +/* D10A8 8013A9A8 00000000 */ nop /* D10AC 8013A9AC 0C04E984 */ jal func_8013A610 /* D10B0 8013A9B0 24050001 */ addiu $a1, $zero, 1 /* D10B4 8013A9B4 AE000074 */ sw $zero, 0x74($s0) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s index 5579d68ef8..e6b8dec6f0 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013A9E8.s @@ -50,4 +50,4 @@ glabel func_8013A9E8 /* D118C 8013AA8C 1440FFF6 */ bnez $v0, .L8013AA68 /* D1190 8013AA90 0000182D */ daddu $v1, $zero, $zero /* D1194 8013AA94 03E00008 */ jr $ra -/* D1198 8013AA98 00000000 */ nop +/* D1198 8013AA98 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 dc75f4c91f..425a21a514 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AA9C.s @@ -29,7 +29,7 @@ glabel func_8013AA9C /* D11FC 8013AAFC 00220821 */ addu $at, $at, $v0 /* D1200 8013AB00 8C220FB0 */ lw $v0, %lo(D_80150FB0)($at) /* D1204 8013AB04 00400008 */ jr $v0 -/* D1208 8013AB08 00000000 */ nop +/* D1208 8013AB08 00000000 */ nop /* D120C 8013AB0C 8E300014 */ lw $s0, 0x14($s1) /* D1210 8013AB10 0C04EA4F */ jal func_8013A93C /* D1214 8013AB14 0220202D */ daddu $a0, $s1, $zero @@ -65,7 +65,7 @@ glabel func_8013AA9C /* D1288 8013AB88 10800004 */ beqz $a0, .L8013AB9C /* D128C 8013AB8C 00101080 */ sll $v0, $s0, 2 /* D1290 8013AB90 0C00AB4B */ jal heap_free -/* D1294 8013AB94 00000000 */ nop +/* D1294 8013AB94 00000000 */ nop /* D1298 8013AB98 00101080 */ sll $v0, $s0, 2 .L8013AB9C: /* D129C 8013AB9C A6220060 */ sh $v0, 0x60($s1) @@ -78,26 +78,26 @@ glabel func_8013AA9C /* D12B8 8013ABB8 24030005 */ addiu $v1, $zero, 5 /* D12BC 8013ABBC 8E22002C */ lw $v0, 0x2c($s1) /* D12C0 8013ABC0 1602001E */ bne $s0, $v0, .L8013AC3C -/* D12C4 8013ABC4 00000000 */ nop +/* D12C4 8013ABC4 00000000 */ nop /* D12C8 8013ABC8 8E220030 */ lw $v0, 0x30($s1) /* D12CC 8013ABCC 10E200CE */ beq $a3, $v0, .L8013AF08 -/* D12D0 8013ABD0 00000000 */ nop +/* D12D0 8013ABD0 00000000 */ nop /* D12D4 8013ABD4 0804EB0F */ j .L8013AC3C -/* D12D8 8013ABD8 00000000 */ nop +/* D12D8 8013ABD8 00000000 */ nop /* D12DC 8013ABDC 82220005 */ lb $v0, 5($s1) /* D12E0 8013ABE0 14450016 */ bne $v0, $a1, .L8013AC3C /* D12E4 8013ABE4 24030005 */ addiu $v1, $zero, 5 /* D12E8 8013ABE8 8E22001C */ lw $v0, 0x1c($s1) /* D12EC 8013ABEC 14500013 */ bne $v0, $s0, .L8013AC3C -/* D12F0 8013ABF0 00000000 */ nop +/* D12F0 8013ABF0 00000000 */ nop /* D12F4 8013ABF4 8E220020 */ lw $v0, 0x20($s1) /* D12F8 8013ABF8 14470010 */ bne $v0, $a3, .L8013AC3C -/* D12FC 8013ABFC 00000000 */ nop +/* D12FC 8013ABFC 00000000 */ nop /* D1300 8013AC00 8E220024 */ lw $v0, 0x24($s1) /* D1304 8013AC04 104800C0 */ beq $v0, $t0, .L8013AF08 -/* D1308 8013AC08 00000000 */ nop +/* D1308 8013AC08 00000000 */ nop /* D130C 8013AC0C 0804EB0F */ j .L8013AC3C -/* D1310 8013AC10 00000000 */ nop +/* D1310 8013AC10 00000000 */ nop .L8013AC14: /* D1314 8013AC14 2403000D */ addiu $v1, $zero, 0xd /* D1318 8013AC18 50A30008 */ beql $a1, $v1, .L8013AC3C @@ -130,7 +130,7 @@ glabel func_8013AA9C .L8013AC78: /* D1378 8013AC78 2C42000B */ sltiu $v0, $v0, 0xb /* D137C 8013AC7C 10400006 */ beqz $v0, .L8013AC98 -/* D1380 8013AC80 00000000 */ nop +/* D1380 8013AC80 00000000 */ nop /* D1384 8013AC84 A2250006 */ sb $a1, 6($s1) /* D1388 8013AC88 AE30002C */ sw $s0, 0x2c($s1) /* D138C 8013AC8C AE270030 */ sw $a3, 0x30($s1) @@ -153,7 +153,7 @@ glabel func_8013AA9C /* D13C8 8013ACC8 00220821 */ addu $at, $at, $v0 /* D13CC 8013ACCC 8C220FF8 */ lw $v0, %lo(D_80150FF8)($at) /* D13D0 8013ACD0 00400008 */ jr $v0 -/* D13D4 8013ACD4 00000000 */ nop +/* D13D4 8013ACD4 00000000 */ nop /* D13D8 8013ACD8 A2200001 */ sb $zero, 1($s1) /* D13DC 8013ACDC 0804EBC2 */ j .L8013AF08 /* D13E0 8013ACE0 A2200002 */ sb $zero, 2($s1) @@ -165,7 +165,7 @@ glabel func_8013AA9C /* D13F8 8013ACF8 0C04FB92 */ jal func_8013EE48 /* D13FC 8013ACFC A0820001 */ sb $v0, 1($a0) /* D1400 8013AD00 0804EBC2 */ j .L8013AF08 -/* D1404 8013AD04 00000000 */ nop +/* D1404 8013AD04 00000000 */ nop /* D1408 8013AD08 8E230014 */ lw $v1, 0x14($s1) /* D140C 8013AD0C 24020002 */ addiu $v0, $zero, 2 /* D1410 8013AD10 A2220001 */ sb $v0, 1($s1) @@ -213,10 +213,10 @@ glabel func_8013AA9C /* D14AC 8013ADAC 3C018015 */ lui $at, %hi(D_80151030) /* D14B0 8013ADB0 D4221030 */ ldc1 $f2, %lo(D_80151030)($at) /* D14B4 8013ADB4 44860000 */ mtc1 $a2, $f0 -/* D14B8 8013ADB8 00000000 */ nop +/* D14B8 8013ADB8 00000000 */ nop /* D14BC 8013ADBC 46800021 */ cvt.d.w $f0, $f0 /* D14C0 8013ADC0 46220032 */ c.eq.d $f0, $f2 -/* D14C4 8013ADC4 00000000 */ nop +/* D14C4 8013ADC4 00000000 */ nop /* D14C8 8013ADC8 45000003 */ bc1f .L8013ADD8 /* D14CC 8013ADCC 24020004 */ addiu $v0, $zero, 4 /* D14D0 8013ADD0 0804EBC2 */ j .L8013AF08 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s index af4a0d370a..1de7d7fcc7 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF20.s @@ -11,7 +11,7 @@ glabel func_8013AF20 /* D1638 8013AF38 8C830014 */ lw $v1, 0x14($a0) /* D163C 8013AF3C 30620001 */ andi $v0, $v1, 1 /* D1640 8013AF40 10400009 */ beqz $v0, .L8013AF68 -/* D1644 8013AF44 00000000 */ nop +/* D1644 8013AF44 00000000 */ nop /* D1648 8013AF48 10C00004 */ beqz $a2, .L8013AF5C /* D164C 8013AF4C 30A2FFFF */ andi $v0, $a1, 0xffff /* D1650 8013AF50 00621025 */ or $v0, $v1, $v0 @@ -23,4 +23,4 @@ glabel func_8013AF20 /* D1664 8013AF64 AC820014 */ sw $v0, 0x14($a0) .L8013AF68: /* D1668 8013AF68 03E00008 */ jr $ra -/* D166C 8013AF6C 00000000 */ nop +/* D166C 8013AF6C 00000000 */ nop diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s index 967b9abf6a..23c328caf0 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013AF70.s @@ -49,7 +49,7 @@ glabel func_8013AF70 /* D171C 8013B01C 1040002D */ beqz $v0, .L8013B0D4 /* D1720 8013B020 0000102D */ daddu $v0, $zero, $zero /* D1724 8013B024 1200002B */ beqz $s0, .L8013B0D4 -/* D1728 8013B028 00000000 */ nop +/* D1728 8013B028 00000000 */ nop /* D172C 8013B02C 0C04EC3B */ jal func_8013B0EC /* D1730 8013B030 0200202D */ daddu $a0, $s0, $zero /* D1734 8013B034 0200202D */ daddu $a0, $s0, $zero diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s index 05c041c36a..7f97a8b893 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B0EC.s @@ -14,7 +14,7 @@ glabel func_8013B0EC /* D1810 8013B110 00220821 */ addu $at, $at, $v0 /* D1814 8013B114 8C221038 */ lw $v0, %lo(D_80151038)($at) /* D1818 8013B118 00400008 */ jr $v0 -/* D181C 8013B11C 00000000 */ nop +/* D181C 8013B11C 00000000 */ nop /* D1820 8013B120 8E020034 */ lw $v0, 0x34($s0) /* D1824 8013B124 14400004 */ bnez $v0, .L8013B138 /* D1828 8013B128 24020001 */ addiu $v0, $zero, 1 @@ -28,18 +28,18 @@ glabel func_8013B0EC /* D1840 8013B140 0C04F012 */ jal func_8013C048 /* D1844 8013B144 0200202D */ daddu $a0, $s0, $zero /* D1848 8013B148 0804EC5A */ j .L8013B168 -/* D184C 8013B14C 00000000 */ nop +/* D184C 8013B14C 00000000 */ nop /* D1850 8013B150 0C04F0FC */ jal func_8013C3F0 /* D1854 8013B154 0200202D */ daddu $a0, $s0, $zero /* D1858 8013B158 0804EC5A */ j .L8013B168 -/* D185C 8013B15C 00000000 */ nop +/* D185C 8013B15C 00000000 */ nop /* D1860 8013B160 0C04EF22 */ jal func_8013BC88 /* D1864 8013B164 0200202D */ daddu $a0, $s0, $zero .L8013B168: /* D1868 8013B168 82030005 */ lb $v1, 5($s0) /* D186C 8013B16C 24020004 */ addiu $v0, $zero, 4 /* D1870 8013B170 14620003 */ bne $v1, $v0, .L8013B180 -/* D1874 8013B174 00000000 */ nop +/* D1874 8013B174 00000000 */ nop /* D1878 8013B178 0C04FB9A */ jal func_8013EE68 /* D187C 8013B17C 0200202D */ daddu $a0, $s0, $zero .L8013B180: @@ -48,7 +48,7 @@ glabel func_8013B0EC /* D1888 8013B188 10400005 */ beqz $v0, .L8013B1A0 /* D188C 8013B18C 2862000B */ slti $v0, $v1, 0xb /* D1890 8013B190 14400003 */ bnez $v0, .L8013B1A0 -/* D1894 8013B194 00000000 */ nop +/* D1894 8013B194 00000000 */ nop /* D1898 8013B198 0C04FC7E */ jal func_8013F1F8 /* D189C 8013B19C 0200202D */ daddu $a0, $s0, $zero .L8013B1A0: diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s index f76725c7da..901b8e41dd 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013B1B0.s @@ -91,7 +91,7 @@ glabel func_8013B1B0 /* D19F8 8013B2F8 90430024 */ lbu $v1, 0x24($v0) /* D19FC 8013B2FC 0120102D */ daddu $v0, $t1, $zero /* D1A00 8013B300 44830000 */ mtc1 $v1, $f0 -/* D1A04 8013B304 00000000 */ nop +/* D1A04 8013B304 00000000 */ nop /* D1A08 8013B308 46800020 */ cvt.s.w $f0, $f0 /* D1A0C 8013B30C 46000021 */ cvt.d.s $f0, $f0 /* D1A10 8013B310 46220003 */ div.d $f0, $f0, $f2 @@ -109,7 +109,7 @@ glabel func_8013B1B0 /* D1A40 8013B340 00220821 */ addu $at, $at, $v0 /* D1A44 8013B344 8C221058 */ lw $v0, %lo(D_80151058)($at) /* D1A48 8013B348 00400008 */ jr $v0 -/* D1A4C 8013B34C 00000000 */ nop +/* D1A4C 8013B34C 00000000 */ nop /* D1A50 8013B350 0804ECD9 */ j .L8013B364 /* D1A54 8013B354 240A0002 */ addiu $t2, $zero, 2 /* D1A58 8013B358 0804ECD9 */ j .L8013B364 @@ -120,7 +120,7 @@ glabel func_8013B1B0 /* D1A68 8013B368 C6400038 */ lwc1 $f0, 0x38($s2) /* D1A6C 8013B36C 46800020 */ cvt.s.w $f0, $f0 /* D1A70 8013B370 46020002 */ mul.s $f0, $f0, $f2 -/* D1A74 8013B374 00000000 */ nop +/* D1A74 8013B374 00000000 */ nop /* D1A78 8013B378 34E74B40 */ ori $a3, $a3, 0x4b40 /* D1A7C 8013B37C 3C060010 */ lui $a2, 0x10 /* D1A80 8013B380 34C64B40 */ ori $a2, $a2, 0x4b40 @@ -192,7 +192,7 @@ glabel func_8013B1B0 /* D1B74 8013B474 00220821 */ addu $at, $at, $v0 /* D1B78 8013B478 8C221088 */ lw $v0, %lo(D_80151088)($at) /* D1B7C 8013B47C 00400008 */ jr $v0 -/* D1B80 8013B480 00000000 */ nop +/* D1B80 8013B480 00000000 */ nop /* D1B84 8013B484 3C02FC11 */ lui $v0, 0xfc11 /* D1B88 8013B488 3C03800A */ lui $v1, %hi(gMasterGfxPos) /* D1B8C 8013B48C 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) @@ -388,23 +388,23 @@ glabel func_8013B1B0 /* D1E80 8013B780 AE230000 */ sw $v1, ($s1) /* D1E84 8013B784 4600018D */ trunc.w.s $f6, $f0 /* D1E88 8013B788 44043000 */ mfc1 $a0, $f6 -/* D1E8C 8013B78C 00000000 */ nop +/* D1E8C 8013B78C 00000000 */ nop /* D1E90 8013B790 00042400 */ sll $a0, $a0, 0x10 /* D1E94 8013B794 0C00A4F5 */ jal cosine /* D1E98 8013B798 00042403 */ sra $a0, $a0, 0x10 /* D1E9C 8013B79C C604006C */ lwc1 $f4, 0x6c($s0) /* D1EA0 8013B7A0 3C0142B4 */ lui $at, 0x42b4 /* D1EA4 8013B7A4 44811000 */ mtc1 $at, $f2 -/* D1EA8 8013B7A8 00000000 */ nop +/* D1EA8 8013B7A8 00000000 */ nop /* D1EAC 8013B7AC 46022100 */ add.s $f4, $f4, $f2 /* D1EB0 8013B7B0 3C0142F0 */ lui $at, 0x42f0 /* D1EB4 8013B7B4 4481A000 */ mtc1 $at, $f20 -/* D1EB8 8013B7B8 00000000 */ nop +/* D1EB8 8013B7B8 00000000 */ nop /* D1EBC 8013B7BC 46140002 */ mul.s $f0, $f0, $f20 -/* D1EC0 8013B7C0 00000000 */ nop +/* D1EC0 8013B7C0 00000000 */ nop /* D1EC4 8013B7C4 4600218D */ trunc.w.s $f6, $f4 /* D1EC8 8013B7C8 44043000 */ mfc1 $a0, $f6 -/* D1ECC 8013B7CC 00000000 */ nop +/* D1ECC 8013B7CC 00000000 */ nop /* D1ED0 8013B7D0 00042400 */ sll $a0, $a0, 0x10 /* D1ED4 8013B7D4 4600018D */ trunc.w.s $f6, $f0 /* D1ED8 8013B7D8 44103000 */ mfc1 $s0, $f6 @@ -423,7 +423,7 @@ glabel func_8013B1B0 /* D1F0C 8013B80C 2484EE18 */ addiu $a0, $a0, %lo(D_8014EE18) /* D1F10 8013B810 8E230000 */ lw $v1, ($s1) /* D1F14 8013B814 46140002 */ mul.s $f0, $f0, $f20 -/* D1F18 8013B818 00000000 */ nop +/* D1F18 8013B818 00000000 */ nop /* D1F1C 8013B81C A0820010 */ sb $v0, 0x10($a0) /* D1F20 8013B820 A0900020 */ sb $s0, 0x20($a0) /* D1F24 8013B824 0060282D */ daddu $a1, $v1, $zero @@ -437,7 +437,7 @@ glabel func_8013B1B0 /* D1F44 8013B844 AE220000 */ sw $v0, ($s1) /* D1F48 8013B848 4600018D */ trunc.w.s $f6, $f0 /* D1F4C 8013B84C 44023000 */ mfc1 $v0, $f6 -/* D1F50 8013B850 00000000 */ nop +/* D1F50 8013B850 00000000 */ nop /* D1F54 8013B854 A0820012 */ sb $v0, 0x12($a0) /* D1F58 8013B858 00021600 */ sll $v0, $v0, 0x18 /* D1F5C 8013B85C 00021603 */ sra $v0, $v0, 0x18 @@ -479,7 +479,7 @@ glabel func_8013B1B0 /* D1FEC 8013B8EC ACA20000 */ sw $v0, ($a1) /* D1FF0 8013B8F0 92430033 */ lbu $v1, 0x33($s2) /* D1FF4 8013B8F4 46020002 */ mul.s $f0, $f0, $f2 -/* D1FF8 8013B8F8 00000000 */ nop +/* D1FF8 8013B8F8 00000000 */ nop /* D1FFC 8013B8FC 00031600 */ sll $v0, $v1, 0x18 /* D2000 8013B900 00032400 */ sll $a0, $v1, 0x10 /* D2004 8013B904 00441025 */ or $v0, $v0, $a0 @@ -514,20 +514,20 @@ glabel func_8013B1B0 /* D2074 8013B974 AC620000 */ sw $v0, ($v1) /* D2078 8013B978 24620010 */ addiu $v0, $v1, 0x10 /* D207C 8013B97C 46020002 */ mul.s $f0, $f0, $f2 -/* D2080 8013B980 00000000 */ nop +/* D2080 8013B980 00000000 */ nop /* D2084 8013B984 AC820000 */ sw $v0, ($a0) /* D2088 8013B988 24020003 */ addiu $v0, $zero, 3 /* D208C 8013B98C AC670008 */ sw $a3, 8($v1) /* D2090 8013B990 AC62000C */ sw $v0, 0xc($v1) /* D2094 8013B994 4600018D */ trunc.w.s $f6, $f0 /* D2098 8013B998 44083000 */ mfc1 $t0, $f6 -/* D209C 8013B99C 00000000 */ nop +/* D209C 8013B99C 00000000 */ nop /* D20A0 8013B9A0 310200FF */ andi $v0, $t0, 0xff /* D20A4 8013B9A4 0804EEDA */ j .L8013BB68 /* D20A8 8013B9A8 AC620004 */ sw $v0, 4($v1) .L8013B9AC: /* D20AC 8013B9AC 1462006E */ bne $v1, $v0, .L8013BB68 -/* D20B0 8013B9B0 00000000 */ nop +/* D20B0 8013B9B0 00000000 */ nop /* D20B4 8013B9B4 8E4A0038 */ lw $t2, 0x38($s2) /* D20B8 8013B9B8 8E420030 */ lw $v0, 0x30($s2) /* D20BC 8013B9BC 01424821 */ addu $t1, $t2, $v0 @@ -546,11 +546,11 @@ glabel func_8013B1B0 /* D20EC 8013B9EC 2484A66C */ addiu $a0, $a0, %lo(gMasterGfxPos) /* D20F0 8013B9F0 35081E01 */ ori $t0, $t0, 0x1e01 /* D20F4 8013B9F4 448A0000 */ mtc1 $t2, $f0 -/* D20F8 8013B9F8 00000000 */ nop +/* D20F8 8013B9F8 00000000 */ nop /* D20FC 8013B9FC 46800020 */ cvt.s.w $f0, $f0 /* D2100 8013BA00 8C820000 */ lw $v0, ($a0) /* D2104 8013BA04 46020002 */ mul.s $f0, $f0, $f2 -/* D2108 8013BA08 00000000 */ nop +/* D2108 8013BA08 00000000 */ nop /* D210C 8013BA0C 0040182D */ daddu $v1, $v0, $zero /* D2110 8013BA10 24420008 */ addiu $v0, $v0, 8 /* D2114 8013BA14 AC820000 */ sw $v0, ($a0) @@ -577,7 +577,7 @@ glabel func_8013B1B0 /* D2168 8013BA68 AC43001C */ sw $v1, 0x1c($v0) /* D216C 8013BA6C 4600018D */ trunc.w.s $f6, $f0 /* D2170 8013BA70 44083000 */ mfc1 $t0, $f6 -/* D2174 8013BA74 00000000 */ nop +/* D2174 8013BA74 00000000 */ nop /* D2178 8013BA78 310300FF */ andi $v1, $t0, 0xff /* D217C 8013BA7C 0804EEDA */ j .L8013BB68 /* D2180 8013BA80 AC430014 */ sw $v1, 0x14($v0) @@ -652,22 +652,22 @@ glabel func_8013B1B0 /* D227C 8013BB7C 00220821 */ addu $at, $at, $v0 /* D2280 8013BB80 8C2210D0 */ lw $v0, %lo(D_801510D0)($at) /* D2284 8013BB84 00400008 */ jr $v0 -/* D2288 8013BB88 00000000 */ nop +/* D2288 8013BB88 00000000 */ nop /* 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 +/* D229C 8013BB9C 00000000 */ nop /* 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 +/* D22B0 8013BBB0 00000000 */ nop /* 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 +/* D22C4 8013BBC4 00000000 */ nop /* 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_d0a70_len_4fe0/func_8013BC88.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013BC88.s index bd28b0829f..929f189a12 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013BC88.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013BC88.s @@ -16,7 +16,7 @@ glabel func_8013BC88 /* D23B0 8013BCB0 14610004 */ bne $v1, $at, .L8013BCC4 /* D23B4 8013BCB4 3C018000 */ lui $at, 0x8000 /* D23B8 8013BCB8 14410002 */ bne $v0, $at, .L8013BCC4 -/* D23BC 8013BCBC 00000000 */ nop +/* D23BC 8013BCBC 00000000 */ nop /* D23C0 8013BCC0 0006000D */ break 6 .L8013BCC4: /* D23C4 8013BCC4 00006812 */ mflo $t5 @@ -132,7 +132,7 @@ glabel func_8013BC88 /* D2570 8013BE70 14410004 */ bne $v0, $at, .L8013BE84 /* D2574 8013BE74 3C018000 */ lui $at, 0x8000 /* D2578 8013BE78 14C10002 */ bne $a2, $at, .L8013BE84 -/* D257C 8013BE7C 00000000 */ nop +/* D257C 8013BE7C 00000000 */ nop /* D2580 8013BE80 0006000D */ break 6 .L8013BE84: /* D2584 8013BE84 00003012 */ mflo $a2 diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s index 88457920ca..60b266618a 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C048.s @@ -22,21 +22,21 @@ glabel func_8013C048 /* D278C 8013C08C 94A20008 */ lhu $v0, 8($a1) /* D2790 8013C090 91630003 */ lbu $v1, 3($t3) /* D2794 8013C094 44843000 */ mtc1 $a0, $f6 -/* D2798 8013C098 00000000 */ nop +/* D2798 8013C098 00000000 */ nop /* D279C 8013C09C 468031A0 */ cvt.s.w $f6, $f6 /* D27A0 8013C0A0 44821000 */ mtc1 $v0, $f2 -/* D27A4 8013C0A4 00000000 */ nop +/* D27A4 8013C0A4 00000000 */ nop /* D27A8 8013C0A8 468010A0 */ cvt.s.w $f2, $f2 /* D27AC 8013C0AC 44830000 */ mtc1 $v1, $f0 -/* D27B0 8013C0B0 00000000 */ nop +/* D27B0 8013C0B0 00000000 */ nop /* D27B4 8013C0B4 46800020 */ cvt.s.w $f0, $f0 /* D27B8 8013C0B8 46001283 */ div.s $f10, $f2, $f0 /* D27BC 8013C0BC 94A2000A */ lhu $v0, 0xa($a1) /* D27C0 8013C0C0 44860000 */ mtc1 $a2, $f0 -/* D27C4 8013C0C4 00000000 */ nop +/* D27C4 8013C0C4 00000000 */ nop /* D27C8 8013C0C8 46800020 */ cvt.s.w $f0, $f0 /* D27CC 8013C0CC 44821000 */ mtc1 $v0, $f2 -/* D27D0 8013C0D0 00000000 */ nop +/* D27D0 8013C0D0 00000000 */ nop /* D27D4 8013C0D4 468010A0 */ cvt.s.w $f2, $f2 /* D27D8 8013C0D8 00C8102A */ slt $v0, $a2, $t0 /* D27DC 8013C0DC 1440004B */ bnez $v0, .L8013C20C @@ -50,11 +50,11 @@ glabel func_8013C048 /* D27F8 8013C0F8 9443000A */ lhu $v1, 0xa($v0) /* D27FC 8013C0FC 8442000E */ lh $v0, 0xe($v0) /* D2800 8013C100 44834000 */ mtc1 $v1, $f8 -/* D2804 8013C104 00000000 */ nop +/* D2804 8013C104 00000000 */ nop /* D2808 8013C108 46804220 */ cvt.s.w $f8, $f8 /* D280C 8013C10C 00431023 */ subu $v0, $v0, $v1 /* D2810 8013C110 44823000 */ mtc1 $v0, $f6 -/* D2814 8013C114 00000000 */ nop +/* D2814 8013C114 00000000 */ nop /* D2818 8013C118 468031A0 */ cvt.s.w $f6, $f6 .L8013C11C: /* D281C 8013C11C 8CA20000 */ lw $v0, ($a1) @@ -62,7 +62,7 @@ glabel func_8013C048 /* D2824 8013C124 8442000C */ lh $v0, 0xc($v0) /* D2828 8013C128 91630003 */ lbu $v1, 3($t3) /* D282C 8013C12C 44820000 */ mtc1 $v0, $f0 -/* D2830 8013C130 00000000 */ nop +/* D2830 8013C130 00000000 */ nop /* D2834 8013C134 46800020 */ cvt.s.w $f0, $f0 /* D2838 8013C138 0066102A */ slt $v0, $v1, $a2 /* D283C 8013C13C 5440002E */ bnel $v0, $zero, .L8013C1F8 @@ -71,31 +71,31 @@ glabel func_8013C048 /* D2848 8013C148 440A6000 */ mfc1 $t2, $f12 /* D284C 8013C14C 4600430D */ trunc.w.s $f12, $f8 /* D2850 8013C150 44026000 */ mfc1 $v0, $f12 -/* D2854 8013C154 00000000 */ nop +/* D2854 8013C154 00000000 */ nop /* D2858 8013C158 24420100 */ addiu $v0, $v0, 0x100 /* D285C 8013C15C 00024940 */ sll $t1, $v0, 5 /* D2860 8013C160 24E4000A */ addiu $a0, $a3, 0xa .L8013C164: /* D2864 8013C164 14C3000B */ bne $a2, $v1, .L8013C194 -/* D2868 8013C168 00000000 */ nop +/* D2868 8013C168 00000000 */ nop /* D286C 8013C16C 8CA20000 */ lw $v0, ($a1) /* D2870 8013C170 94430008 */ lhu $v1, 8($v0) /* D2874 8013C174 8442000C */ lh $v0, 0xc($v0) /* D2878 8013C178 44832000 */ mtc1 $v1, $f4 -/* D287C 8013C17C 00000000 */ nop +/* D287C 8013C17C 00000000 */ nop /* D2880 8013C180 46802120 */ cvt.s.w $f4, $f4 /* D2884 8013C184 00431021 */ addu $v0, $v0, $v1 /* D2888 8013C188 44820000 */ mtc1 $v0, $f0 -/* D288C 8013C18C 00000000 */ nop +/* D288C 8013C18C 00000000 */ nop /* D2890 8013C190 46800020 */ cvt.s.w $f0, $f0 .L8013C194: /* D2894 8013C194 4600030D */ trunc.w.s $f12, $f0 /* D2898 8013C198 44026000 */ mfc1 $v0, $f12 -/* D289C 8013C19C 00000000 */ nop +/* D289C 8013C19C 00000000 */ nop /* D28A0 8013C1A0 A4E20000 */ sh $v0, ($a3) /* D28A4 8013C1A4 4600230D */ trunc.w.s $f12, $f4 /* D28A8 8013C1A8 44026000 */ mfc1 $v0, $f12 -/* D28AC 8013C1AC 00000000 */ nop +/* D28AC 8013C1AC 00000000 */ nop /* D28B0 8013C1B0 24420100 */ addiu $v0, $v0, 0x100 /* D28B4 8013C1B4 00021140 */ sll $v0, $v0, 5 /* D28B8 8013C1B8 A48AFFF8 */ sh $t2, -8($a0) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s index a80e27b27b..89030a7833 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C220.s @@ -31,28 +31,28 @@ glabel func_8013C220 /* D2988 8013C288 AE440064 */ sw $a0, 0x64($s2) /* D298C 8013C28C 8E440068 */ lw $a0, 0x68($s2) /* D2990 8013C290 10800004 */ beqz $a0, .L8013C2A4 -/* D2994 8013C294 00000000 */ nop +/* D2994 8013C294 00000000 */ nop /* D2998 8013C298 0C04E984 */ jal func_8013A610 /* D299C 8013C29C 24050001 */ addiu $a1, $zero, 1 /* D29A0 8013C2A0 AE400068 */ sw $zero, 0x68($s2) .L8013C2A4: /* D29A4 8013C2A4 8E44006C */ lw $a0, 0x6c($s2) /* D29A8 8013C2A8 10800004 */ beqz $a0, .L8013C2BC -/* D29AC 8013C2AC 00000000 */ nop +/* D29AC 8013C2AC 00000000 */ nop /* D29B0 8013C2B0 0C04E984 */ jal func_8013A610 /* D29B4 8013C2B4 24050001 */ addiu $a1, $zero, 1 /* D29B8 8013C2B8 AE40006C */ sw $zero, 0x6c($s2) .L8013C2BC: /* D29BC 8013C2BC 8E440070 */ lw $a0, 0x70($s2) /* D29C0 8013C2C0 10800004 */ beqz $a0, .L8013C2D4 -/* D29C4 8013C2C4 00000000 */ nop +/* D29C4 8013C2C4 00000000 */ nop /* D29C8 8013C2C8 0C04E984 */ jal func_8013A610 /* D29CC 8013C2CC 24050001 */ addiu $a1, $zero, 1 /* D29D0 8013C2D0 AE400070 */ sw $zero, 0x70($s2) .L8013C2D4: /* D29D4 8013C2D4 8E440074 */ lw $a0, 0x74($s2) /* D29D8 8013C2D8 10800004 */ beqz $a0, .L8013C2EC -/* D29DC 8013C2DC 00000000 */ nop +/* D29DC 8013C2DC 00000000 */ nop /* D29E0 8013C2E0 0C04E984 */ jal func_8013A610 /* D29E4 8013C2E4 24050001 */ addiu $a1, $zero, 1 /* D29E8 8013C2E8 AE400074 */ sw $zero, 0x74($s2) @@ -112,11 +112,11 @@ glabel func_8013C220 /* D2AB4 8013C3B4 ACA2FFFC */ sw $v0, -4($a1) .L8013C3B8: /* D2AB8 8013C3B8 14C8FFF0 */ bne $a2, $t0, .L8013C37C -/* D2ABC 8013C3BC 00000000 */ nop +/* D2ABC 8013C3BC 00000000 */ nop /* D2AC0 8013C3C0 24840004 */ addiu $a0, $a0, 4 /* D2AC4 8013C3C4 008A102A */ slt $v0, $a0, $t2 /* D2AC8 8013C3C8 1440FFEB */ bnez $v0, .L8013C378 -/* D2ACC 8013C3CC 00000000 */ nop +/* D2ACC 8013C3CC 00000000 */ nop .L8013C3D0: /* D2AD0 8013C3D0 0260102D */ daddu $v0, $s3, $zero /* D2AD4 8013C3D4 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s index 4988afb5c4..c618cba805 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013C3F0.s @@ -24,7 +24,7 @@ glabel func_8013C3F0 /* D2B3C 8013C43C AFAD0014 */ sw $t5, 0x14($sp) /* D2B40 8013C440 0040982D */ daddu $s3, $v0, $zero /* D2B44 8013C444 126002CC */ beqz $s3, .L8013CF78 -/* D2B48 8013C448 00000000 */ nop +/* D2B48 8013C448 00000000 */ nop /* D2B4C 8013C44C 8E430014 */ lw $v1, 0x14($s2) /* D2B50 8013C450 30620200 */ andi $v0, $v1, 0x200 /* D2B54 8013C454 1040000C */ beqz $v0, .L8013C488 @@ -33,11 +33,11 @@ glabel func_8013C3F0 /* D2B60 8013C460 AE420014 */ sw $v0, 0x14($s2) /* D2B64 8013C464 30620100 */ andi $v0, $v1, 0x100 /* D2B68 8013C468 10400007 */ beqz $v0, .L8013C488 -/* D2B6C 8013C46C 00000000 */ nop +/* D2B6C 8013C46C 00000000 */ nop /* D2B70 8013C470 9662000C */ lhu $v0, 0xc($s3) /* D2B74 8013C474 2442FFFF */ addiu $v0, $v0, -1 /* D2B78 8013C478 44820000 */ mtc1 $v0, $f0 -/* D2B7C 8013C47C 00000000 */ nop +/* D2B7C 8013C47C 00000000 */ nop /* D2B80 8013C480 46800020 */ cvt.s.w $f0, $f0 /* D2B84 8013C484 E6400040 */ swc1 $f0, 0x40($s2) .L8013C488: @@ -124,10 +124,10 @@ glabel func_8013C3F0 /* D2CB8 8013C5B8 0000502D */ daddu $t2, $zero, $zero .L8013C5BC: /* D2CBC 8013C5BC 44960000 */ mtc1 $s6, $f0 -/* D2CC0 8013C5C0 00000000 */ nop +/* D2CC0 8013C5C0 00000000 */ nop /* D2CC4 8013C5C4 46800020 */ cvt.s.w $f0, $f0 /* D2CC8 8013C5C8 44941000 */ mtc1 $s4, $f2 -/* D2CCC 8013C5CC 00000000 */ nop +/* D2CCC 8013C5CC 00000000 */ nop /* D2CD0 8013C5D0 468010A0 */ cvt.s.w $f2, $f2 /* D2CD4 8013C5D4 96620008 */ lhu $v0, 8($s3) /* D2CD8 8013C5D8 104001EE */ beqz $v0, .L8013CD94 @@ -151,60 +151,60 @@ glabel func_8013C3F0 /* D2D1C 8013C61C 14620256 */ bne $v1, $v0, .L8013CF78 /* D2D20 8013C620 0282102A */ slt $v0, $s4, $v0 /* D2D24 8013C624 14400108 */ bnez $v0, .L8013CA48 -/* D2D28 8013C628 00000000 */ nop +/* D2D28 8013C628 00000000 */ nop /* D2D2C 8013C62C 9662000E */ lhu $v0, 0xe($s3) /* D2D30 8013C630 30420001 */ andi $v0, $v0, 1 /* D2D34 8013C634 10400039 */ beqz $v0, .L8013C71C -/* D2D38 8013C638 00000000 */ nop +/* D2D38 8013C638 00000000 */ nop /* D2D3C 8013C63C 84C30000 */ lh $v1, ($a2) /* D2D40 8013C640 85020000 */ lh $v0, ($t0) /* D2D44 8013C644 8D240000 */ lw $a0, ($t1) /* D2D48 8013C648 00431023 */ subu $v0, $v0, $v1 /* D2D4C 8013C64C 44821000 */ mtc1 $v0, $f2 -/* D2D50 8013C650 00000000 */ nop +/* D2D50 8013C650 00000000 */ nop /* D2D54 8013C654 468010A0 */ cvt.s.w $f2, $f2 /* D2D58 8013C658 46041082 */ mul.s $f2, $f2, $f4 -/* D2D5C 8013C65C 00000000 */ nop +/* D2D5C 8013C65C 00000000 */ nop /* D2D60 8013C660 00042080 */ sll $a0, $a0, 2 /* D2D64 8013C664 02442021 */ addu $a0, $s2, $a0 /* D2D68 8013C668 44830000 */ mtc1 $v1, $f0 -/* D2D6C 8013C66C 00000000 */ nop +/* D2D6C 8013C66C 00000000 */ nop /* D2D70 8013C670 46800020 */ cvt.s.w $f0, $f0 /* D2D74 8013C674 8C820068 */ lw $v0, 0x68($a0) /* D2D78 8013C678 46020000 */ add.s $f0, $f0, $f2 /* D2D7C 8013C67C 00E21021 */ addu $v0, $a3, $v0 /* D2D80 8013C680 4600028D */ trunc.w.s $f10, $f0 /* D2D84 8013C684 44035000 */ mfc1 $v1, $f10 -/* D2D88 8013C688 00000000 */ nop +/* D2D88 8013C688 00000000 */ nop /* D2D8C 8013C68C A4430000 */ sh $v1, ($v0) /* D2D90 8013C690 84C30002 */ lh $v1, 2($a2) /* D2D94 8013C694 85020002 */ lh $v0, 2($t0) /* D2D98 8013C698 00431023 */ subu $v0, $v0, $v1 /* D2D9C 8013C69C 44820000 */ mtc1 $v0, $f0 -/* D2DA0 8013C6A0 00000000 */ nop +/* D2DA0 8013C6A0 00000000 */ nop /* D2DA4 8013C6A4 46800020 */ cvt.s.w $f0, $f0 /* D2DA8 8013C6A8 46040002 */ mul.s $f0, $f0, $f4 -/* D2DAC 8013C6AC 00000000 */ nop +/* D2DAC 8013C6AC 00000000 */ nop /* D2DB0 8013C6B0 44831000 */ mtc1 $v1, $f2 -/* D2DB4 8013C6B4 00000000 */ nop +/* D2DB4 8013C6B4 00000000 */ nop /* D2DB8 8013C6B8 468010A0 */ cvt.s.w $f2, $f2 /* D2DBC 8013C6BC 8C820068 */ lw $v0, 0x68($a0) /* D2DC0 8013C6C0 46001080 */ add.s $f2, $f2, $f0 /* D2DC4 8013C6C4 00E21021 */ addu $v0, $a3, $v0 /* D2DC8 8013C6C8 4600128D */ trunc.w.s $f10, $f2 /* D2DCC 8013C6CC 44035000 */ mfc1 $v1, $f10 -/* D2DD0 8013C6D0 00000000 */ nop +/* D2DD0 8013C6D0 00000000 */ nop /* D2DD4 8013C6D4 A4430002 */ sh $v1, 2($v0) /* D2DD8 8013C6D8 84C30004 */ lh $v1, 4($a2) /* D2DDC 8013C6DC 85020004 */ lh $v0, 4($t0) /* D2DE0 8013C6E0 00431023 */ subu $v0, $v0, $v1 /* D2DE4 8013C6E4 44820000 */ mtc1 $v0, $f0 -/* D2DE8 8013C6E8 00000000 */ nop +/* D2DE8 8013C6E8 00000000 */ nop /* D2DEC 8013C6EC 46800020 */ cvt.s.w $f0, $f0 /* D2DF0 8013C6F0 46040002 */ mul.s $f0, $f0, $f4 -/* D2DF4 8013C6F4 00000000 */ nop +/* D2DF4 8013C6F4 00000000 */ nop /* D2DF8 8013C6F8 44831000 */ mtc1 $v1, $f2 -/* D2DFC 8013C6FC 00000000 */ nop +/* D2DFC 8013C6FC 00000000 */ nop /* D2E00 8013C700 468010A0 */ cvt.s.w $f2, $f2 /* D2E04 8013C704 8C820068 */ lw $v0, 0x68($a0) /* D2E08 8013C708 46001080 */ add.s $f2, $f2, $f0 @@ -217,31 +217,31 @@ glabel func_8013C3F0 /* D2E20 8013C720 85020000 */ lh $v0, ($t0) /* D2E24 8013C724 00431023 */ subu $v0, $v0, $v1 /* D2E28 8013C728 44821000 */ mtc1 $v0, $f2 -/* D2E2C 8013C72C 00000000 */ nop +/* D2E2C 8013C72C 00000000 */ nop /* D2E30 8013C730 468010A0 */ cvt.s.w $f2, $f2 /* D2E34 8013C734 46041082 */ mul.s $f2, $f2, $f4 -/* D2E38 8013C738 00000000 */ nop +/* D2E38 8013C738 00000000 */ nop /* D2E3C 8013C73C 44830000 */ mtc1 $v1, $f0 -/* D2E40 8013C740 00000000 */ nop +/* D2E40 8013C740 00000000 */ nop /* D2E44 8013C744 46800020 */ cvt.s.w $f0, $f0 /* D2E48 8013C748 46020000 */ add.s $f0, $f0, $f2 /* D2E4C 8013C74C 4600028D */ trunc.w.s $f10, $f0 /* D2E50 8013C750 44025000 */ mfc1 $v0, $f10 -/* D2E54 8013C754 00000000 */ nop +/* D2E54 8013C754 00000000 */ nop /* D2E58 8013C758 00021400 */ sll $v0, $v0, 0x10 /* D2E5C 8013C75C 00021403 */ sra $v0, $v0, 0x10 /* D2E60 8013C760 44821000 */ mtc1 $v0, $f2 -/* D2E64 8013C764 00000000 */ nop +/* D2E64 8013C764 00000000 */ nop /* D2E68 8013C768 468010A1 */ cvt.d.w $f2, $f2 /* D2E6C 8013C76C 46261082 */ mul.d $f2, $f2, $f6 -/* D2E70 8013C770 00000000 */ nop +/* D2E70 8013C770 00000000 */ nop /* D2E74 8013C774 8D650000 */ lw $a1, ($t3) /* D2E78 8013C778 94A20008 */ lhu $v0, 8($a1) /* D2E7C 8013C77C 44820000 */ mtc1 $v0, $f0 -/* D2E80 8013C780 00000000 */ nop +/* D2E80 8013C780 00000000 */ nop /* D2E84 8013C784 46800021 */ cvt.d.w $f0, $f0 /* D2E88 8013C788 46201082 */ mul.d $f2, $f2, $f0 -/* D2E8C 8013C78C 00000000 */ nop +/* D2E8C 8013C78C 00000000 */ nop /* D2E90 8013C790 8D240000 */ lw $a0, ($t1) /* D2E94 8013C794 00042080 */ sll $a0, $a0, 2 /* D2E98 8013C798 02442021 */ addu $a0, $s2, $a0 @@ -249,95 +249,95 @@ glabel func_8013C3F0 /* D2EA0 8013C7A0 00E21021 */ addu $v0, $a3, $v0 /* D2EA4 8013C7A4 4620128D */ trunc.w.d $f10, $f2 /* D2EA8 8013C7A8 44035000 */ mfc1 $v1, $f10 -/* D2EAC 8013C7AC 00000000 */ nop +/* D2EAC 8013C7AC 00000000 */ nop /* D2EB0 8013C7B0 A4430000 */ sh $v1, ($v0) /* D2EB4 8013C7B4 84C30002 */ lh $v1, 2($a2) /* D2EB8 8013C7B8 85020002 */ lh $v0, 2($t0) /* D2EBC 8013C7BC 00431023 */ subu $v0, $v0, $v1 /* D2EC0 8013C7C0 44821000 */ mtc1 $v0, $f2 -/* D2EC4 8013C7C4 00000000 */ nop +/* D2EC4 8013C7C4 00000000 */ nop /* D2EC8 8013C7C8 468010A0 */ cvt.s.w $f2, $f2 /* D2ECC 8013C7CC 46041082 */ mul.s $f2, $f2, $f4 -/* D2ED0 8013C7D0 00000000 */ nop +/* D2ED0 8013C7D0 00000000 */ nop /* D2ED4 8013C7D4 44830000 */ mtc1 $v1, $f0 -/* D2ED8 8013C7D8 00000000 */ nop +/* D2ED8 8013C7D8 00000000 */ nop /* D2EDC 8013C7DC 46800020 */ cvt.s.w $f0, $f0 /* D2EE0 8013C7E0 46020000 */ add.s $f0, $f0, $f2 /* D2EE4 8013C7E4 4600028D */ trunc.w.s $f10, $f0 /* D2EE8 8013C7E8 44025000 */ mfc1 $v0, $f10 -/* D2EEC 8013C7EC 00000000 */ nop +/* D2EEC 8013C7EC 00000000 */ nop /* D2EF0 8013C7F0 00021400 */ sll $v0, $v0, 0x10 /* D2EF4 8013C7F4 00021403 */ sra $v0, $v0, 0x10 /* D2EF8 8013C7F8 44821000 */ mtc1 $v0, $f2 -/* D2EFC 8013C7FC 00000000 */ nop +/* D2EFC 8013C7FC 00000000 */ nop /* D2F00 8013C800 468010A1 */ cvt.d.w $f2, $f2 /* D2F04 8013C804 46261082 */ mul.d $f2, $f2, $f6 -/* D2F08 8013C808 00000000 */ nop +/* D2F08 8013C808 00000000 */ nop /* D2F0C 8013C80C 94A2000A */ lhu $v0, 0xa($a1) /* D2F10 8013C810 44820000 */ mtc1 $v0, $f0 -/* D2F14 8013C814 00000000 */ nop +/* D2F14 8013C814 00000000 */ nop /* D2F18 8013C818 46800021 */ cvt.d.w $f0, $f0 /* D2F1C 8013C81C 46201082 */ mul.d $f2, $f2, $f0 -/* D2F20 8013C820 00000000 */ nop +/* D2F20 8013C820 00000000 */ nop /* D2F24 8013C824 8C820068 */ lw $v0, 0x68($a0) /* D2F28 8013C828 00E21021 */ addu $v0, $a3, $v0 /* D2F2C 8013C82C 4620128D */ trunc.w.d $f10, $f2 /* D2F30 8013C830 44035000 */ mfc1 $v1, $f10 -/* D2F34 8013C834 00000000 */ nop +/* D2F34 8013C834 00000000 */ nop /* D2F38 8013C838 A4430002 */ sh $v1, 2($v0) /* D2F3C 8013C83C 84C30004 */ lh $v1, 4($a2) /* D2F40 8013C840 85020004 */ lh $v0, 4($t0) /* D2F44 8013C844 00431023 */ subu $v0, $v0, $v1 /* D2F48 8013C848 44821000 */ mtc1 $v0, $f2 -/* D2F4C 8013C84C 00000000 */ nop +/* D2F4C 8013C84C 00000000 */ nop /* D2F50 8013C850 468010A0 */ cvt.s.w $f2, $f2 /* D2F54 8013C854 46041082 */ mul.s $f2, $f2, $f4 -/* D2F58 8013C858 00000000 */ nop +/* D2F58 8013C858 00000000 */ nop /* D2F5C 8013C85C 44830000 */ mtc1 $v1, $f0 -/* D2F60 8013C860 00000000 */ nop +/* D2F60 8013C860 00000000 */ nop /* D2F64 8013C864 46800020 */ cvt.s.w $f0, $f0 /* D2F68 8013C868 46020000 */ add.s $f0, $f0, $f2 /* D2F6C 8013C86C 4600028D */ trunc.w.s $f10, $f0 /* D2F70 8013C870 44025000 */ mfc1 $v0, $f10 -/* D2F74 8013C874 00000000 */ nop +/* D2F74 8013C874 00000000 */ nop /* D2F78 8013C878 00021400 */ sll $v0, $v0, 0x10 /* D2F7C 8013C87C 00021403 */ sra $v0, $v0, 0x10 /* D2F80 8013C880 44821000 */ mtc1 $v0, $f2 -/* D2F84 8013C884 00000000 */ nop +/* D2F84 8013C884 00000000 */ nop /* D2F88 8013C888 468010A1 */ cvt.d.w $f2, $f2 /* D2F8C 8013C88C 46261082 */ mul.d $f2, $f2, $f6 -/* D2F90 8013C890 00000000 */ nop +/* D2F90 8013C890 00000000 */ nop /* D2F94 8013C894 94A3000A */ lhu $v1, 0xa($a1) /* D2F98 8013C898 94A20008 */ lhu $v0, 8($a1) /* D2F9C 8013C89C 00431021 */ addu $v0, $v0, $v1 /* D2FA0 8013C8A0 00021043 */ sra $v0, $v0, 1 /* D2FA4 8013C8A4 44820000 */ mtc1 $v0, $f0 -/* D2FA8 8013C8A8 00000000 */ nop +/* D2FA8 8013C8A8 00000000 */ nop /* D2FAC 8013C8AC 46800021 */ cvt.d.w $f0, $f0 /* D2FB0 8013C8B0 46201082 */ mul.d $f2, $f2, $f0 -/* D2FB4 8013C8B4 00000000 */ nop +/* D2FB4 8013C8B4 00000000 */ nop /* D2FB8 8013C8B8 8C820068 */ lw $v0, 0x68($a0) /* D2FBC 8013C8BC 00E21021 */ addu $v0, $a3, $v0 /* D2FC0 8013C8C0 4620128D */ trunc.w.d $f10, $f2 /* D2FC4 8013C8C4 44035000 */ mfc1 $v1, $f10 -/* D2FC8 8013C8C8 00000000 */ nop +/* D2FC8 8013C8C8 00000000 */ nop .L8013C8CC: /* D2FCC 8013C8CC A4430004 */ sh $v1, 4($v0) /* D2FD0 8013C8D0 8E420014 */ lw $v0, 0x14($s2) /* D2FD4 8013C8D4 3042A000 */ andi $v0, $v0, 0xa000 /* D2FD8 8013C8D8 10400040 */ beqz $v0, .L8013C9DC -/* D2FDC 8013C8DC 00000000 */ nop +/* D2FDC 8013C8DC 00000000 */ nop /* D2FE0 8013C8E0 80C30008 */ lb $v1, 8($a2) /* D2FE4 8013C8E4 81020008 */ lb $v0, 8($t0) /* D2FE8 8013C8E8 00431023 */ subu $v0, $v0, $v1 /* D2FEC 8013C8EC 44821000 */ mtc1 $v0, $f2 -/* D2FF0 8013C8F0 00000000 */ nop +/* D2FF0 8013C8F0 00000000 */ nop /* D2FF4 8013C8F4 468010A0 */ cvt.s.w $f2, $f2 /* D2FF8 8013C8F8 46041082 */ mul.s $f2, $f2, $f4 -/* D2FFC 8013C8FC 00000000 */ nop +/* D2FFC 8013C8FC 00000000 */ nop /* D3000 8013C900 8D220000 */ lw $v0, ($t1) /* D3004 8013C904 44830000 */ mtc1 $v1, $f0 -/* D3008 8013C908 00000000 */ nop +/* D3008 8013C908 00000000 */ nop /* D300C 8013C90C 46800020 */ cvt.s.w $f0, $f0 /* D3010 8013C910 00021080 */ sll $v0, $v0, 2 /* D3014 8013C914 02421021 */ addu $v0, $s2, $v0 @@ -346,19 +346,19 @@ glabel func_8013C3F0 /* D3020 8013C920 00E21021 */ addu $v0, $a3, $v0 /* D3024 8013C924 4600028D */ trunc.w.s $f10, $f0 /* D3028 8013C928 44035000 */ mfc1 $v1, $f10 -/* D302C 8013C92C 00000000 */ nop +/* D302C 8013C92C 00000000 */ nop /* D3030 8013C930 A043000C */ sb $v1, 0xc($v0) /* D3034 8013C934 80C30009 */ lb $v1, 9($a2) /* D3038 8013C938 81020009 */ lb $v0, 9($t0) /* D303C 8013C93C 00431023 */ subu $v0, $v0, $v1 /* D3040 8013C940 44821000 */ mtc1 $v0, $f2 -/* D3044 8013C944 00000000 */ nop +/* D3044 8013C944 00000000 */ nop /* D3048 8013C948 468010A0 */ cvt.s.w $f2, $f2 /* D304C 8013C94C 46041082 */ mul.s $f2, $f2, $f4 -/* D3050 8013C950 00000000 */ nop +/* D3050 8013C950 00000000 */ nop /* D3054 8013C954 8D220000 */ lw $v0, ($t1) /* D3058 8013C958 44830000 */ mtc1 $v1, $f0 -/* D305C 8013C95C 00000000 */ nop +/* D305C 8013C95C 00000000 */ nop /* D3060 8013C960 46800020 */ cvt.s.w $f0, $f0 /* D3064 8013C964 00021080 */ sll $v0, $v0, 2 /* D3068 8013C968 02421021 */ addu $v0, $s2, $v0 @@ -367,19 +367,19 @@ glabel func_8013C3F0 /* D3074 8013C974 00E21021 */ addu $v0, $a3, $v0 /* D3078 8013C978 4600028D */ trunc.w.s $f10, $f0 /* D307C 8013C97C 44035000 */ mfc1 $v1, $f10 -/* D3080 8013C980 00000000 */ nop +/* D3080 8013C980 00000000 */ nop /* D3084 8013C984 A043000D */ sb $v1, 0xd($v0) /* D3088 8013C988 80C3000A */ lb $v1, 0xa($a2) /* D308C 8013C98C 8102000A */ lb $v0, 0xa($t0) /* D3090 8013C990 00431023 */ subu $v0, $v0, $v1 /* D3094 8013C994 44821000 */ mtc1 $v0, $f2 -/* D3098 8013C998 00000000 */ nop +/* D3098 8013C998 00000000 */ nop /* D309C 8013C99C 468010A0 */ cvt.s.w $f2, $f2 /* D30A0 8013C9A0 46041082 */ mul.s $f2, $f2, $f4 -/* D30A4 8013C9A4 00000000 */ nop +/* D30A4 8013C9A4 00000000 */ nop /* D30A8 8013C9A8 8D220000 */ lw $v0, ($t1) /* D30AC 8013C9AC 44830000 */ mtc1 $v1, $f0 -/* D30B0 8013C9B0 00000000 */ nop +/* D30B0 8013C9B0 00000000 */ nop /* D30B4 8013C9B4 46800020 */ cvt.s.w $f0, $f0 /* D30B8 8013C9B8 00021080 */ sll $v0, $v0, 2 /* D30BC 8013C9BC 02421021 */ addu $v0, $s2, $v0 @@ -397,10 +397,10 @@ glabel func_8013C3F0 /* D30E8 8013C9E8 D42210F0 */ ldc1 $f2, %lo(D_801510F0)($at) /* D30EC 8013C9EC 00621821 */ addu $v1, $v1, $v0 /* D30F0 8013C9F0 44830000 */ mtc1 $v1, $f0 -/* D30F4 8013C9F4 00000000 */ nop +/* D30F4 8013C9F4 00000000 */ nop /* D30F8 8013C9F8 46800021 */ cvt.d.w $f0, $f0 /* D30FC 8013C9FC 46220002 */ mul.d $f0, $f0, $f2 -/* D3100 8013CA00 00000000 */ nop +/* D3100 8013CA00 00000000 */ nop /* D3104 8013CA04 8D220000 */ lw $v0, ($t1) /* D3108 8013CA08 00021080 */ sll $v0, $v0, 2 /* D310C 8013CA0C 02421021 */ addu $v0, $s2, $v0 @@ -413,7 +413,7 @@ glabel func_8013C3F0 /* D3128 8013CA28 46201001 */ sub.d $f0, $f2, $f0 /* D312C 8013CA2C 2444000D */ addiu $a0, $v0, 0xd /* D3130 8013CA30 4620403E */ c.le.d $f8, $f0 -/* D3134 8013CA34 00000000 */ nop +/* D3134 8013CA34 00000000 */ nop /* D3138 8013CA38 45000086 */ bc1f .L8013CC54 /* D313C 8013CA3C 2442000E */ addiu $v0, $v0, 0xe /* D3140 8013CA40 0804F31A */ j .L8013CC68 @@ -422,7 +422,7 @@ glabel func_8013C3F0 /* D3148 8013CA48 9662000E */ lhu $v0, 0xe($s3) /* D314C 8013CA4C 30420001 */ andi $v0, $v0, 1 /* D3150 8013CA50 10400010 */ beqz $v0, .L8013CA94 -/* D3154 8013CA54 00000000 */ nop +/* D3154 8013CA54 00000000 */ nop /* D3158 8013CA58 8D230000 */ lw $v1, ($t1) /* D315C 8013CA5C 00031880 */ sll $v1, $v1, 2 /* D3160 8013CA60 02431821 */ addu $v1, $s2, $v1 @@ -441,17 +441,17 @@ glabel func_8013C3F0 .L8013CA94: /* D3194 8013CA94 84C20000 */ lh $v0, ($a2) /* D3198 8013CA98 44821000 */ mtc1 $v0, $f2 -/* D319C 8013CA9C 00000000 */ nop +/* D319C 8013CA9C 00000000 */ nop /* D31A0 8013CAA0 468010A1 */ cvt.d.w $f2, $f2 /* D31A4 8013CAA4 46261082 */ mul.d $f2, $f2, $f6 -/* D31A8 8013CAA8 00000000 */ nop +/* D31A8 8013CAA8 00000000 */ nop /* D31AC 8013CAAC 8D650000 */ lw $a1, ($t3) /* D31B0 8013CAB0 94A20008 */ lhu $v0, 8($a1) /* D31B4 8013CAB4 44820000 */ mtc1 $v0, $f0 -/* D31B8 8013CAB8 00000000 */ nop +/* D31B8 8013CAB8 00000000 */ nop /* D31BC 8013CABC 46800021 */ cvt.d.w $f0, $f0 /* D31C0 8013CAC0 46201082 */ mul.d $f2, $f2, $f0 -/* D31C4 8013CAC4 00000000 */ nop +/* D31C4 8013CAC4 00000000 */ nop /* D31C8 8013CAC8 8D240000 */ lw $a0, ($t1) /* D31CC 8013CACC 00042080 */ sll $a0, $a0, 2 /* D31D0 8013CAD0 02442021 */ addu $a0, $s2, $a0 @@ -459,52 +459,52 @@ glabel func_8013C3F0 /* D31D8 8013CAD8 00E21021 */ addu $v0, $a3, $v0 /* D31DC 8013CADC 4620128D */ trunc.w.d $f10, $f2 /* D31E0 8013CAE0 44035000 */ mfc1 $v1, $f10 -/* D31E4 8013CAE4 00000000 */ nop +/* D31E4 8013CAE4 00000000 */ nop /* D31E8 8013CAE8 A4430000 */ sh $v1, ($v0) /* D31EC 8013CAEC 84C20002 */ lh $v0, 2($a2) /* D31F0 8013CAF0 44821000 */ mtc1 $v0, $f2 -/* D31F4 8013CAF4 00000000 */ nop +/* D31F4 8013CAF4 00000000 */ nop /* D31F8 8013CAF8 468010A1 */ cvt.d.w $f2, $f2 /* D31FC 8013CAFC 46261082 */ mul.d $f2, $f2, $f6 -/* D3200 8013CB00 00000000 */ nop +/* D3200 8013CB00 00000000 */ nop /* D3204 8013CB04 94A2000A */ lhu $v0, 0xa($a1) /* D3208 8013CB08 44820000 */ mtc1 $v0, $f0 -/* D320C 8013CB0C 00000000 */ nop +/* D320C 8013CB0C 00000000 */ nop /* D3210 8013CB10 46800021 */ cvt.d.w $f0, $f0 /* D3214 8013CB14 46201082 */ mul.d $f2, $f2, $f0 -/* D3218 8013CB18 00000000 */ nop +/* D3218 8013CB18 00000000 */ nop /* D321C 8013CB1C 8C820068 */ lw $v0, 0x68($a0) /* D3220 8013CB20 00E21021 */ addu $v0, $a3, $v0 /* D3224 8013CB24 4620128D */ trunc.w.d $f10, $f2 /* D3228 8013CB28 44035000 */ mfc1 $v1, $f10 -/* D322C 8013CB2C 00000000 */ nop +/* D322C 8013CB2C 00000000 */ nop /* D3230 8013CB30 A4430002 */ sh $v1, 2($v0) /* D3234 8013CB34 84C20004 */ lh $v0, 4($a2) /* D3238 8013CB38 44821000 */ mtc1 $v0, $f2 -/* D323C 8013CB3C 00000000 */ nop +/* D323C 8013CB3C 00000000 */ nop /* D3240 8013CB40 468010A1 */ cvt.d.w $f2, $f2 /* D3244 8013CB44 46261082 */ mul.d $f2, $f2, $f6 -/* D3248 8013CB48 00000000 */ nop +/* D3248 8013CB48 00000000 */ nop /* D324C 8013CB4C 94A3000A */ lhu $v1, 0xa($a1) /* D3250 8013CB50 94A20008 */ lhu $v0, 8($a1) /* D3254 8013CB54 00431021 */ addu $v0, $v0, $v1 /* D3258 8013CB58 00021043 */ sra $v0, $v0, 1 /* D325C 8013CB5C 44820000 */ mtc1 $v0, $f0 -/* D3260 8013CB60 00000000 */ nop +/* D3260 8013CB60 00000000 */ nop /* D3264 8013CB64 46800021 */ cvt.d.w $f0, $f0 /* D3268 8013CB68 46201082 */ mul.d $f2, $f2, $f0 -/* D326C 8013CB6C 00000000 */ nop +/* D326C 8013CB6C 00000000 */ nop /* D3270 8013CB70 8C820068 */ lw $v0, 0x68($a0) /* D3274 8013CB74 00E21021 */ addu $v0, $a3, $v0 /* D3278 8013CB78 4620128D */ trunc.w.d $f10, $f2 /* D327C 8013CB7C 44035000 */ mfc1 $v1, $f10 -/* D3280 8013CB80 00000000 */ nop +/* D3280 8013CB80 00000000 */ nop .L8013CB84: /* D3284 8013CB84 A4430004 */ sh $v1, 4($v0) /* D3288 8013CB88 8E420014 */ lw $v0, 0x14($s2) /* D328C 8013CB8C 3042A000 */ andi $v0, $v0, 0xa000 /* D3290 8013CB90 10400017 */ beqz $v0, .L8013CBF0 -/* D3294 8013CB94 00000000 */ nop +/* D3294 8013CB94 00000000 */ nop /* D3298 8013CB98 8D220000 */ lw $v0, ($t1) /* D329C 8013CB9C 00021080 */ sll $v0, $v0, 2 /* D32A0 8013CBA0 02421021 */ addu $v0, $s2, $v0 @@ -534,10 +534,10 @@ glabel func_8013C3F0 /* D32FC 8013CBFC D42210F8 */ ldc1 $f2, %lo(D_801510F8)($at) /* D3300 8013CC00 00621821 */ addu $v1, $v1, $v0 /* D3304 8013CC04 44830000 */ mtc1 $v1, $f0 -/* D3308 8013CC08 00000000 */ nop +/* D3308 8013CC08 00000000 */ nop /* D330C 8013CC0C 46800021 */ cvt.d.w $f0, $f0 /* D3310 8013CC10 46220002 */ mul.d $f0, $f0, $f2 -/* D3314 8013CC14 00000000 */ nop +/* D3314 8013CC14 00000000 */ nop /* D3318 8013CC18 8D220000 */ lw $v0, ($t1) /* D331C 8013CC1C 00021080 */ sll $v0, $v0, 2 /* D3320 8013CC20 02421021 */ addu $v0, $s2, $v0 @@ -550,7 +550,7 @@ glabel func_8013C3F0 /* D333C 8013CC3C 46201001 */ sub.d $f0, $f2, $f0 /* D3340 8013CC40 2444000D */ addiu $a0, $v0, 0xd /* D3344 8013CC44 4620403E */ c.le.d $f8, $f0 -/* D3348 8013CC48 00000000 */ nop +/* D3348 8013CC48 00000000 */ nop /* D334C 8013CC4C 45010005 */ bc1t .L8013CC64 /* D3350 8013CC50 2442000E */ addiu $v0, $v0, 0xe .L8013CC54: @@ -563,7 +563,7 @@ glabel func_8013C3F0 .L8013CC68: /* D3368 8013CC68 4620028D */ trunc.w.d $f10, $f0 /* D336C 8013CC6C 44035000 */ mfc1 $v1, $f10 -/* D3370 8013CC70 00000000 */ nop +/* D3370 8013CC70 00000000 */ nop /* D3374 8013CC74 006C1825 */ or $v1, $v1, $t4 /* D3378 8013CC78 A0430000 */ sb $v1, ($v0) .L8013CC7C: @@ -573,7 +573,7 @@ glabel func_8013C3F0 /* D3384 8013CC84 9662000E */ lhu $v0, 0xe($s3) /* D3388 8013CC88 30420001 */ andi $v0, $v0, 1 /* D338C 8013CC8C 1040000E */ beqz $v0, .L8013CCC8 -/* D3390 8013CC90 00000000 */ nop +/* D3390 8013CC90 00000000 */ nop /* D3394 8013CC94 8D240000 */ lw $a0, ($t1) /* D3398 8013CC98 90C20006 */ lbu $v0, 6($a2) /* D339C 8013CC9C 00042080 */ sll $a0, $a0, 2 @@ -590,17 +590,17 @@ glabel func_8013C3F0 .L8013CCC8: /* D33C8 8013CCC8 90C20006 */ lbu $v0, 6($a2) /* D33CC 8013CCCC 44821000 */ mtc1 $v0, $f2 -/* D33D0 8013CCD0 00000000 */ nop +/* D33D0 8013CCD0 00000000 */ nop /* D33D4 8013CCD4 468010A1 */ cvt.d.w $f2, $f2 /* D33D8 8013CCD8 46261082 */ mul.d $f2, $f2, $f6 -/* D33DC 8013CCDC 00000000 */ nop +/* D33DC 8013CCDC 00000000 */ nop /* D33E0 8013CCE0 8D650000 */ lw $a1, ($t3) /* D33E4 8013CCE4 94A20008 */ lhu $v0, 8($a1) /* D33E8 8013CCE8 44820000 */ mtc1 $v0, $f0 -/* D33EC 8013CCEC 00000000 */ nop +/* D33EC 8013CCEC 00000000 */ nop /* D33F0 8013CCF0 46800021 */ cvt.d.w $f0, $f0 /* D33F4 8013CCF4 46201082 */ mul.d $f2, $f2, $f0 -/* D33F8 8013CCF8 00000000 */ nop +/* D33F8 8013CCF8 00000000 */ nop /* D33FC 8013CCFC 8D240000 */ lw $a0, ($t1) /* D3400 8013CD00 00042080 */ sll $a0, $a0, 2 /* D3404 8013CD04 02442021 */ addu $a0, $s2, $a0 @@ -608,27 +608,27 @@ glabel func_8013C3F0 /* D340C 8013CD0C 00E31821 */ addu $v1, $a3, $v1 /* D3410 8013CD10 4620128D */ trunc.w.d $f10, $f2 /* D3414 8013CD14 44025000 */ mfc1 $v0, $f10 -/* D3418 8013CD18 00000000 */ nop +/* D3418 8013CD18 00000000 */ nop /* D341C 8013CD1C 24420100 */ addiu $v0, $v0, 0x100 /* D3420 8013CD20 00021140 */ sll $v0, $v0, 5 /* D3424 8013CD24 A4620008 */ sh $v0, 8($v1) /* D3428 8013CD28 90C20007 */ lbu $v0, 7($a2) /* D342C 8013CD2C 44821000 */ mtc1 $v0, $f2 -/* D3430 8013CD30 00000000 */ nop +/* D3430 8013CD30 00000000 */ nop /* D3434 8013CD34 468010A1 */ cvt.d.w $f2, $f2 /* D3438 8013CD38 46261082 */ mul.d $f2, $f2, $f6 -/* D343C 8013CD3C 00000000 */ nop +/* D343C 8013CD3C 00000000 */ nop /* D3440 8013CD40 94A2000A */ lhu $v0, 0xa($a1) /* D3444 8013CD44 44820000 */ mtc1 $v0, $f0 -/* D3448 8013CD48 00000000 */ nop +/* D3448 8013CD48 00000000 */ nop /* D344C 8013CD4C 46800021 */ cvt.d.w $f0, $f0 /* D3450 8013CD50 46201082 */ mul.d $f2, $f2, $f0 -/* D3454 8013CD54 00000000 */ nop +/* D3454 8013CD54 00000000 */ nop /* D3458 8013CD58 8C830068 */ lw $v1, 0x68($a0) /* D345C 8013CD5C 00E31821 */ addu $v1, $a3, $v1 /* D3460 8013CD60 4620128D */ trunc.w.d $f10, $f2 /* D3464 8013CD64 44025000 */ mfc1 $v0, $f10 -/* D3468 8013CD68 00000000 */ nop +/* D3468 8013CD68 00000000 */ nop .L8013CD6C: /* D346C 8013CD6C 24420100 */ addiu $v0, $v0, 0x100 /* D3470 8013CD70 00021140 */ sll $v0, $v0, 5 @@ -648,13 +648,13 @@ glabel func_8013C3F0 /* D34A4 8013CDA4 0C00AB4B */ jal heap_free /* D34A8 8013CDA8 A642000A */ sh $v0, 0xa($s2) /* D34AC 8013CDAC 12E00003 */ beqz $s7, .L8013CDBC -/* D34B0 8013CDB0 00000000 */ nop +/* D34B0 8013CDB0 00000000 */ nop /* D34B4 8013CDB4 0C00AB4B */ jal heap_free /* D34B8 8013CDB8 02E0202D */ daddu $a0, $s7, $zero .L8013CDBC: /* D34BC 8013CDBC 8FAD0014 */ lw $t5, 0x14($sp) /* D34C0 8013CDC0 11A0006D */ beqz $t5, .L8013CF78 -/* D34C4 8013CDC4 00000000 */ nop +/* D34C4 8013CDC4 00000000 */ nop /* D34C8 8013CDC8 3C028007 */ lui $v0, %hi(gGameStatusPtr) /* D34CC 8013CDCC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* D34D0 8013CDD0 94420134 */ lhu $v0, 0x134($v0) @@ -666,18 +666,18 @@ glabel func_8013C3F0 /* D34E4 8013CDE4 15A10004 */ bne $t5, $at, .L8013CDF8 /* D34E8 8013CDE8 3C018000 */ lui $at, 0x8000 /* D34EC 8013CDEC 14410002 */ bne $v0, $at, .L8013CDF8 -/* D34F0 8013CDF0 00000000 */ nop +/* D34F0 8013CDF0 00000000 */ nop /* D34F4 8013CDF4 0006000D */ break 6 .L8013CDF8: /* D34F8 8013CDF8 00001810 */ mfhi $v1 /* D34FC 8013CDFC 1460005E */ bnez $v1, .L8013CF78 -/* D3500 8013CE00 00000000 */ nop +/* D3500 8013CE00 00000000 */ nop /* D3504 8013CE04 1A800027 */ blez $s4, .L8013CEA4 -/* D3508 8013CE08 00000000 */ nop +/* D3508 8013CE08 00000000 */ nop /* D350C 8013CE0C 26D60001 */ addiu $s6, $s6, 1 /* D3510 8013CE10 02D4102A */ slt $v0, $s6, $s4 /* D3514 8013CE14 14400050 */ bnez $v0, .L8013CF58 -/* D3518 8013CE18 00000000 */ nop +/* D3518 8013CE18 00000000 */ nop /* D351C 8013CE1C 8E430014 */ lw $v1, 0x14($s2) /* D3520 8013CE20 30620100 */ andi $v0, $v1, 0x100 /* D3524 8013CE24 5040000E */ beql $v0, $zero, .L8013CE60 @@ -720,11 +720,11 @@ glabel func_8013C3F0 /* D35A0 8013CEA0 0000B02D */ daddu $s6, $zero, $zero .L8013CEA4: /* D35A4 8013CEA4 0681002C */ bgez $s4, .L8013CF58 -/* D35A8 8013CEA8 00000000 */ nop +/* D35A8 8013CEA8 00000000 */ nop /* D35AC 8013CEAC 8E440014 */ lw $a0, 0x14($s2) /* D35B0 8013CEB0 30820100 */ andi $v0, $a0, 0x100 /* D35B4 8013CEB4 1040000E */ beqz $v0, .L8013CEF0 -/* D35B8 8013CEB8 00000000 */ nop +/* D35B8 8013CEB8 00000000 */ nop /* D35BC 8013CEBC 8FAD0010 */ lw $t5, 0x10($sp) /* D35C0 8013CEC0 022D8823 */ subu $s1, $s1, $t5 /* D35C4 8013CEC4 06210024 */ bgez $s1, .L8013CF58 @@ -756,12 +756,12 @@ glabel func_8013C3F0 /* D3620 8013CF20 14610004 */ bne $v1, $at, .L8013CF34 /* D3624 8013CF24 3C018000 */ lui $at, 0x8000 /* D3628 8013CF28 16210002 */ bne $s1, $at, .L8013CF34 -/* D362C 8013CF2C 00000000 */ nop +/* D362C 8013CF2C 00000000 */ nop /* D3630 8013CF30 0006000D */ break 6 .L8013CF34: /* D3634 8013CF34 00008810 */ mfhi $s1 /* D3638 8013CF38 0804F3D6 */ j .L8013CF58 -/* D363C 8013CF3C 00000000 */ nop +/* D363C 8013CF3C 00000000 */ nop .L8013CF40: /* D3640 8013CF40 10400003 */ beqz $v0, .L8013CF50 /* D3644 8013CF44 34824000 */ ori $v0, $a0, 0x4000 @@ -773,11 +773,11 @@ glabel func_8013C3F0 /* D3654 8013CF54 AE420014 */ sw $v0, 0x14($s2) .L8013CF58: /* D3658 8013CF58 44960000 */ mtc1 $s6, $f0 -/* D365C 8013CF5C 00000000 */ nop +/* D365C 8013CF5C 00000000 */ nop /* D3660 8013CF60 46800020 */ cvt.s.w $f0, $f0 /* D3664 8013CF64 E640003C */ swc1 $f0, 0x3c($s2) /* D3668 8013CF68 44910000 */ mtc1 $s1, $f0 -/* D366C 8013CF6C 00000000 */ nop +/* D366C 8013CF6C 00000000 */ nop /* D3670 8013CF70 46800020 */ cvt.s.w $f0, $f0 /* D3674 8013CF74 E6400040 */ swc1 $f0, 0x40($s2) .L8013CF78: diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s index c610e91f54..837a35a4ad 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013CFA8.s @@ -249,7 +249,7 @@ glabel func_8013CFA8 /* D3A6C 8013D36C 10620005 */ beq $v1, $v0, .L8013D384 /* D3A70 8013D370 2402000F */ addiu $v0, $zero, 0xf /* D3A74 8013D374 14620004 */ bne $v1, $v0, .L8013D388 -/* D3A78 8013D378 00000000 */ nop +/* D3A78 8013D378 00000000 */ nop .L8013D37C: /* D3A7C 8013D37C 0804F4E2 */ j .L8013D388 /* D3A80 8013D380 8E280038 */ lw $t0, 0x38($s1) @@ -473,7 +473,7 @@ glabel func_8013CFA8 /* D3DBC 8013D6BC AE020000 */ sw $v0, ($s0) /* D3DC0 8013D6C0 92220000 */ lbu $v0, ($s1) /* D3DC4 8013D6C4 1040009C */ beqz $v0, .L8013D938 -/* D3DC8 8013D6C8 00000000 */ nop +/* D3DC8 8013D6C8 00000000 */ nop /* D3DCC 8013D6CC 8E220014 */ lw $v0, 0x14($s1) /* D3DD0 8013D6D0 00581024 */ and $v0, $v0, $t8 /* D3DD4 8013D6D4 10400098 */ beqz $v0, .L8013D938 @@ -528,14 +528,14 @@ glabel func_8013CFA8 /* D3E88 8013D788 10600009 */ beqz $v1, .L8013D7B0 /* D3E8C 8013D78C 2402FFFF */ addiu $v0, $zero, -1 /* D3E90 8013D790 0804F5F3 */ j .L8013D7CC -/* D3E94 8013D794 00000000 */ nop +/* D3E94 8013D794 00000000 */ nop .L8013D798: /* D3E98 8013D798 1062000A */ beq $v1, $v0, .L8013D7C4 /* D3E9C 8013D79C 2402000F */ addiu $v0, $zero, 0xf /* D3EA0 8013D7A0 10620005 */ beq $v1, $v0, .L8013D7B8 /* D3EA4 8013D7A4 2402FFFF */ addiu $v0, $zero, -1 /* D3EA8 8013D7A8 0804F5F3 */ j .L8013D7CC -/* D3EAC 8013D7AC 00000000 */ nop +/* D3EAC 8013D7AC 00000000 */ nop .L8013D7B0: /* D3EB0 8013D7B0 0804F5F2 */ j .L8013D7C8 /* D3EB4 8013D7B4 240900FF */ addiu $t1, $zero, 0xff diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s index 6f3dff0c6c..7bcf7b9870 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013DAB4.s @@ -84,7 +84,7 @@ glabel func_8013DAB4 /* D42E4 8013DBE4 02A30018 */ mult $s5, $v1 /* D42E8 8013DBE8 00004012 */ mflo $t0 /* D42EC 8013DBEC 26A20001 */ addiu $v0, $s5, 1 -/* D42F0 8013DBF0 00000000 */ nop +/* D42F0 8013DBF0 00000000 */ nop /* D42F4 8013DBF4 00430018 */ mult $v0, $v1 /* D42F8 8013DBF8 01C81021 */ addu $v0, $t6, $t0 /* D42FC 8013DBFC 00528821 */ addu $s1, $v0, $s2 @@ -296,7 +296,7 @@ glabel func_8013DAB4 /* D4630 8013DF30 10620006 */ beq $v1, $v0, .L8013DF4C /* D4634 8013DF34 00111100 */ sll $v0, $s1, 4 /* D4638 8013DF38 0804F7D4 */ j .L8013DF50 -/* D463C 8013DF3C 00000000 */ nop +/* D463C 8013DF3C 00000000 */ nop .L8013DF40: /* D4640 8013DF40 8E8D0038 */ lw $t5, 0x38($s4) /* D4644 8013DF44 0804F7D4 */ j .L8013DF50 @@ -528,7 +528,7 @@ glabel func_8013DAB4 /* D49B0 8013E2B0 26B50001 */ addiu $s5, $s5, 1 /* D49B4 8013E2B4 02A2102A */ slt $v0, $s5, $v0 /* D49B8 8013E2B8 1440FE46 */ bnez $v0, .L8013DBD4 -/* D49BC 8013E2BC 00000000 */ nop +/* D49BC 8013E2BC 00000000 */ nop .L8013E2C0: /* D49C0 8013E2C0 8FBF004C */ lw $ra, 0x4c($sp) /* D49C4 8013E2C4 8FBE0048 */ lw $fp, 0x48($sp) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s index 16baa29421..be5bef5019 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E2F0.s @@ -248,20 +248,20 @@ glabel func_8013E2F0 /* D4DB8 8013E6B8 10400005 */ beqz $v0, .L8013E6D0 /* D4DBC 8013E6BC 24020007 */ addiu $v0, $zero, 7 /* D4DC0 8013E6C0 1060000D */ beqz $v1, .L8013E6F8 -/* D4DC4 8013E6C4 00000000 */ nop +/* D4DC4 8013E6C4 00000000 */ nop /* D4DC8 8013E6C8 0804F9BE */ j .L8013E6F8 -/* D4DCC 8013E6CC 00000000 */ nop +/* D4DCC 8013E6CC 00000000 */ nop .L8013E6D0: /* D4DD0 8013E6D0 10620008 */ beq $v1, $v0, .L8013E6F4 /* D4DD4 8013E6D4 2402000B */ addiu $v0, $zero, 0xb /* D4DD8 8013E6D8 14620007 */ bne $v1, $v0, .L8013E6F8 -/* D4DDC 8013E6DC 00000000 */ nop +/* D4DDC 8013E6DC 00000000 */ nop /* D4DE0 8013E6E0 0804F9BE */ j .L8013E6F8 /* D4DE4 8013E6E4 240E00FF */ addiu $t6, $zero, 0xff .L8013E6E8: /* D4DE8 8013E6E8 8E6E0038 */ lw $t6, 0x38($s3) /* D4DEC 8013E6EC 0804F9BE */ j .L8013E6F8 -/* D4DF0 8013E6F0 00000000 */ nop +/* D4DF0 8013E6F0 00000000 */ nop .L8013E6F4: /* D4DF4 8013E6F4 240EFFFF */ addiu $t6, $zero, -1 .L8013E6F8: diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s index 3adefb8919..97c0e961be 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013E904.s @@ -40,14 +40,14 @@ glabel func_8013E904 /* D5090 8013E990 94C50008 */ lhu $a1, 8($a2) /* D5094 8013E994 94C3000A */ lhu $v1, 0xa($a2) /* D5098 8013E998 44850000 */ mtc1 $a1, $f0 -/* D509C 8013E99C 00000000 */ nop +/* D509C 8013E99C 00000000 */ nop /* D50A0 8013E9A0 46800020 */ cvt.s.w $f0, $f0 /* D50A4 8013E9A4 46000021 */ cvt.d.s $f0, $f0 /* D50A8 8013E9A8 46220003 */ div.d $f0, $f0, $f2 /* D50AC 8013E9AC 46200020 */ cvt.s.d $f0, $f0 /* D50B0 8013E9B0 44050000 */ mfc1 $a1, $f0 /* D50B4 8013E9B4 44830000 */ mtc1 $v1, $f0 -/* D50B8 8013E9B8 00000000 */ nop +/* D50B8 8013E9B8 00000000 */ nop /* D50BC 8013E9BC 46800020 */ cvt.s.w $f0, $f0 /* D50C0 8013E9C0 46000021 */ cvt.d.s $f0, $f0 /* D50C4 8013E9C4 46220003 */ div.d $f0, $f0, $f2 @@ -240,11 +240,11 @@ glabel func_8013E904 /* D53A8 8013ECA8 44064000 */ mfc1 $a2, $f8 /* D53AC 8013ECAC 00031880 */ sll $v1, $v1, 2 /* D53B0 8013ECB0 44831000 */ mtc1 $v1, $f2 -/* D53B4 8013ECB4 00000000 */ nop +/* D53B4 8013ECB4 00000000 */ nop /* D53B8 8013ECB8 468010A0 */ cvt.s.w $f2, $f2 /* D53BC 8013ECBC 00021080 */ sll $v0, $v0, 2 /* D53C0 8013ECC0 44820000 */ mtc1 $v0, $f0 -/* D53C4 8013ECC4 00000000 */ nop +/* D53C4 8013ECC4 00000000 */ nop /* D53C8 8013ECC8 46800020 */ cvt.s.w $f0, $f0 /* D53CC 8013ECCC 30A50FFF */ andi $a1, $a1, 0xfff /* D53D0 8013ECD0 00052B00 */ sll $a1, $a1, 0xc @@ -280,12 +280,12 @@ glabel func_8013E904 /* D5444 8013ED44 14410004 */ bne $v0, $at, .L8013ED58 /* D5448 8013ED48 3C018000 */ lui $at, 0x8000 /* D544C 8013ED4C 14610002 */ bne $v1, $at, .L8013ED58 -/* D5450 8013ED50 00000000 */ nop +/* D5450 8013ED50 00000000 */ nop /* D5454 8013ED54 0006000D */ break 6 .L8013ED58: /* D5458 8013ED58 00001010 */ mfhi $v0 /* D545C 8013ED5C 44820000 */ mtc1 $v0, $f0 -/* D5460 8013ED60 00000000 */ nop +/* D5460 8013ED60 00000000 */ nop /* D5464 8013ED64 46800020 */ cvt.s.w $f0, $f0 /* D5468 8013ED68 E680004C */ swc1 $f0, 0x4c($s4) /* D546C 8013ED6C C6620010 */ lwc1 $f2, 0x10($s3) @@ -304,7 +304,7 @@ glabel func_8013E904 /* D549C 8013ED9C 14410004 */ bne $v0, $at, .L8013EDB0 /* D54A0 8013EDA0 3C018000 */ lui $at, 0x8000 /* D54A4 8013EDA4 14610002 */ bne $v1, $at, .L8013EDB0 -/* D54A8 8013EDA8 00000000 */ nop +/* D54A8 8013EDA8 00000000 */ nop /* D54AC 8013EDAC 0006000D */ break 6 .L8013EDB0: /* D54B0 8013EDB0 00002810 */ mfhi $a1 @@ -322,7 +322,7 @@ glabel func_8013E904 /* D54E0 8013EDE0 ACE20000 */ sw $v0, ($a3) /* D54E4 8013EDE4 24820078 */ addiu $v0, $a0, 0x78 /* D54E8 8013EDE8 44850000 */ mtc1 $a1, $f0 -/* D54EC 8013EDEC 00000000 */ nop +/* D54EC 8013EDEC 00000000 */ nop /* D54F0 8013EDF0 46800020 */ cvt.s.w $f0, $f0 /* D54F4 8013EDF4 E6800050 */ swc1 $f0, 0x50($s4) /* D54F8 8013EDF8 ACE20000 */ sw $v0, ($a3) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s index 3cec24f0d4..52491bac6d 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013EE68.s @@ -21,7 +21,7 @@ glabel func_8013EE68 /* D55A8 8013EEA8 3C018015 */ lui $at, %hi(D_80151100) /* D55AC 8013EEAC D4221100 */ ldc1 $f2, %lo(D_80151100)($at) /* D55B0 8013EEB0 44820000 */ mtc1 $v0, $f0 -/* D55B4 8013EEB4 00000000 */ nop +/* D55B4 8013EEB4 00000000 */ nop /* D55B8 8013EEB8 46800020 */ cvt.s.w $f0, $f0 /* D55BC 8013EEBC 46000021 */ cvt.d.s $f0, $f0 /* D55C0 8013EEC0 46220003 */ div.d $f0, $f0, $f2 @@ -34,7 +34,7 @@ glabel func_8013EE68 .L8013EED8: /* D55D8 8013EED8 46004021 */ cvt.d.s $f0, $f8 /* D55DC 8013EEDC 4620103C */ c.lt.d $f2, $f0 -/* D55E0 8013EEE0 00000000 */ nop +/* D55E0 8013EEE0 00000000 */ nop /* D55E4 8013EEE4 4503FFFB */ bc1tl .L8013EED4 /* D55E8 8013EEE8 46220001 */ sub.d $f0, $f0, $f2 /* D55EC 8013EEEC 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -44,7 +44,7 @@ glabel func_8013EE68 /* D55FC 8013EEFC D4221110 */ ldc1 $f2, %lo(D_80151110)($at) /* D5600 8013EF00 24420028 */ addiu $v0, $v0, 0x28 /* D5604 8013EF04 44820000 */ mtc1 $v0, $f0 -/* D5608 8013EF08 00000000 */ nop +/* D5608 8013EF08 00000000 */ nop /* D560C 8013EF0C 46800020 */ cvt.s.w $f0, $f0 /* D5610 8013EF10 46000021 */ cvt.d.s $f0, $f0 /* D5614 8013EF14 46220003 */ div.d $f0, $f0, $f2 @@ -57,7 +57,7 @@ glabel func_8013EE68 .L8013EF2C: /* D562C 8013EF2C 46003021 */ cvt.d.s $f0, $f6 /* D5630 8013EF30 4620103C */ c.lt.d $f2, $f0 -/* D5634 8013EF34 00000000 */ nop +/* D5634 8013EF34 00000000 */ nop /* D5638 8013EF38 4503FFFB */ bc1tl .L8013EF28 /* D563C 8013EF3C 46220001 */ sub.d $f0, $f0, $f2 /* D5640 8013EF40 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -67,7 +67,7 @@ glabel func_8013EE68 /* D5650 8013EF50 D4221120 */ ldc1 $f2, %lo(D_80151120)($at) /* D5654 8013EF54 24420019 */ addiu $v0, $v0, 0x19 /* D5658 8013EF58 44820000 */ mtc1 $v0, $f0 -/* D565C 8013EF5C 00000000 */ nop +/* D565C 8013EF5C 00000000 */ nop /* D5660 8013EF60 46800020 */ cvt.s.w $f0, $f0 /* D5664 8013EF64 46000021 */ cvt.d.s $f0, $f0 /* D5668 8013EF68 46220003 */ div.d $f0, $f0, $f2 @@ -80,7 +80,7 @@ glabel func_8013EE68 .L8013EF80: /* D5680 8013EF80 46002021 */ cvt.d.s $f0, $f4 /* D5684 8013EF84 4620103C */ c.lt.d $f2, $f0 -/* D5688 8013EF88 00000000 */ nop +/* D5688 8013EF88 00000000 */ nop /* D568C 8013EF8C 4503FFFB */ bc1tl .L8013EF7C /* D5690 8013EF90 46220001 */ sub.d $f0, $f0, $f2 /* D5694 8013EF94 E648003C */ swc1 $f8, 0x3c($s2) @@ -90,7 +90,7 @@ glabel func_8013EE68 /* D56A4 8013EFA4 46000021 */ cvt.d.s $f0, $f0 /* D56A8 8013EFA8 E6460040 */ swc1 $f6, 0x40($s2) /* D56AC 8013EFAC 4620103E */ c.le.d $f2, $f0 -/* D56B0 8013EFB0 00000000 */ nop +/* D56B0 8013EFB0 00000000 */ nop /* D56B4 8013EFB4 45000004 */ bc1f .L8013EFC8 /* D56B8 8013EFB8 E6440044 */ swc1 $f4, 0x44($s2) /* D56BC 8013EFBC 46220001 */ sub.d $f0, $f0, $f2 @@ -100,9 +100,9 @@ glabel func_8013EE68 /* D56C8 8013EFC8 C6400040 */ lwc1 $f0, 0x40($s2) /* D56CC 8013EFCC 46000021 */ cvt.d.s $f0, $f0 /* D56D0 8013EFD0 4620103E */ c.le.d $f2, $f0 -/* D56D4 8013EFD4 00000000 */ nop +/* D56D4 8013EFD4 00000000 */ nop /* D56D8 8013EFD8 45000004 */ bc1f .L8013EFEC -/* D56DC 8013EFDC 00000000 */ nop +/* D56DC 8013EFDC 00000000 */ nop /* D56E0 8013EFE0 46220001 */ sub.d $f0, $f0, $f2 /* D56E4 8013EFE4 46200020 */ cvt.s.d $f0, $f0 /* D56E8 8013EFE8 E6400040 */ swc1 $f0, 0x40($s2) @@ -110,7 +110,7 @@ glabel func_8013EE68 /* D56EC 8013EFEC C6400044 */ lwc1 $f0, 0x44($s2) /* D56F0 8013EFF0 46000021 */ cvt.d.s $f0, $f0 /* D56F4 8013EFF4 4620103E */ c.le.d $f2, $f0 -/* D56F8 8013EFF8 00000000 */ nop +/* D56F8 8013EFF8 00000000 */ nop /* D56FC 8013EFFC 45000004 */ bc1f .L8013F010 /* D5700 8013F000 0000A02D */ daddu $s4, $zero, $zero /* D5704 8013F004 46220001 */ sub.d $f0, $f0, $f2 @@ -129,7 +129,7 @@ glabel func_8013EE68 /* D5734 8013F034 0280982D */ daddu $s3, $s4, $zero .L8013F038: /* D5738 8013F038 44931000 */ mtc1 $s3, $f2 -/* D573C 8013F03C 00000000 */ nop +/* D573C 8013F03C 00000000 */ nop /* D5740 8013F040 468010A0 */ cvt.s.w $f2, $f2 /* D5744 8013F044 00141040 */ sll $v0, $s4, 1 /* D5748 8013F048 00541021 */ addu $v0, $v0, $s4 @@ -138,7 +138,7 @@ glabel func_8013EE68 /* D5754 8013F054 00031880 */ sll $v1, $v1, 2 /* D5758 8013F058 C64C003C */ lwc1 $f12, 0x3c($s2) /* D575C 8013F05C 44830000 */ mtc1 $v1, $f0 -/* D5760 8013F060 00000000 */ nop +/* D5760 8013F060 00000000 */ nop /* D5764 8013F064 46800020 */ cvt.s.w $f0, $f0 /* D5768 8013F068 46026300 */ add.s $f12, $f12, $f2 /* D576C 8013F06C C6560040 */ lwc1 $f22, 0x40($s2) @@ -154,18 +154,18 @@ glabel func_8013EE68 /* D5794 8013F094 86020000 */ lh $v0, ($s0) /* D5798 8013F098 4600B580 */ add.s $f22, $f22, $f0 /* D579C 8013F09C 4482A000 */ mtc1 $v0, $f20 -/* D57A0 8013F0A0 00000000 */ nop +/* D57A0 8013F0A0 00000000 */ nop /* D57A4 8013F0A4 4680A520 */ cvt.s.w $f20, $f20 /* D57A8 8013F0A8 0C00A85B */ jal sin_rad /* D57AC 8013F0AC 4600C600 */ add.s $f24, $f24, $f0 /* D57B0 8013F0B0 C642001C */ lwc1 $f2, 0x1c($s2) /* D57B4 8013F0B4 468010A0 */ cvt.s.w $f2, $f2 /* D57B8 8013F0B8 46020002 */ mul.s $f0, $f0, $f2 -/* D57BC 8013F0BC 00000000 */ nop +/* D57BC 8013F0BC 00000000 */ nop /* D57C0 8013F0C0 4600A500 */ add.s $f20, $f20, $f0 /* D57C4 8013F0C4 4600A28D */ trunc.w.s $f10, $f20 /* D57C8 8013F0C8 44025000 */ mfc1 $v0, $f10 -/* D57CC 8013F0CC 00000000 */ nop +/* D57CC 8013F0CC 00000000 */ nop /* D57D0 8013F0D0 A6020000 */ sh $v0, ($s0) /* D57D4 8013F0D4 96500008 */ lhu $s0, 8($s2) /* D57D8 8013F0D8 8EC20000 */ lw $v0, ($s6) @@ -174,18 +174,18 @@ glabel func_8013EE68 /* D57E4 8013F0E4 02028021 */ addu $s0, $s0, $v0 /* D57E8 8013F0E8 86020002 */ lh $v0, 2($s0) /* D57EC 8013F0EC 4482A000 */ mtc1 $v0, $f20 -/* D57F0 8013F0F0 00000000 */ nop +/* D57F0 8013F0F0 00000000 */ nop /* D57F4 8013F0F4 4680A520 */ cvt.s.w $f20, $f20 /* D57F8 8013F0F8 0C00A85B */ jal sin_rad /* D57FC 8013F0FC 4600B306 */ mov.s $f12, $f22 /* D5800 8013F100 C6420020 */ lwc1 $f2, 0x20($s2) /* D5804 8013F104 468010A0 */ cvt.s.w $f2, $f2 /* D5808 8013F108 46020002 */ mul.s $f0, $f0, $f2 -/* D580C 8013F10C 00000000 */ nop +/* D580C 8013F10C 00000000 */ nop /* D5810 8013F110 4600A500 */ add.s $f20, $f20, $f0 /* D5814 8013F114 4600A28D */ trunc.w.s $f10, $f20 /* D5818 8013F118 44025000 */ mfc1 $v0, $f10 -/* D581C 8013F11C 00000000 */ nop +/* D581C 8013F11C 00000000 */ nop /* D5820 8013F120 A6020002 */ sh $v0, 2($s0) /* D5824 8013F124 96500008 */ lhu $s0, 8($s2) /* D5828 8013F128 8EC20000 */ lw $v0, ($s6) @@ -194,18 +194,18 @@ glabel func_8013EE68 /* D5834 8013F134 02028021 */ addu $s0, $s0, $v0 /* D5838 8013F138 86020004 */ lh $v0, 4($s0) /* D583C 8013F13C 4482A000 */ mtc1 $v0, $f20 -/* D5840 8013F140 00000000 */ nop +/* D5840 8013F140 00000000 */ nop /* D5844 8013F144 4680A520 */ cvt.s.w $f20, $f20 /* D5848 8013F148 0C00A85B */ jal sin_rad /* D584C 8013F14C 4600C306 */ mov.s $f12, $f24 /* D5850 8013F150 C6420024 */ lwc1 $f2, 0x24($s2) /* D5854 8013F154 468010A0 */ cvt.s.w $f2, $f2 /* D5858 8013F158 46020002 */ mul.s $f0, $f0, $f2 -/* D585C 8013F15C 00000000 */ nop +/* D585C 8013F15C 00000000 */ nop /* D5860 8013F160 4600A500 */ add.s $f20, $f20, $f0 /* D5864 8013F164 4600A28D */ trunc.w.s $f10, $f20 /* D5868 8013F168 44025000 */ mfc1 $v0, $f10 -/* D586C 8013F16C 00000000 */ nop +/* D586C 8013F16C 00000000 */ nop /* D5870 8013F170 A6020004 */ sh $v0, 4($s0) /* D5874 8013F174 92420003 */ lbu $v0, 3($s2) /* D5878 8013F178 24420001 */ addiu $v0, $v0, 1 @@ -217,7 +217,7 @@ glabel func_8013EE68 /* D588C 8013F18C 14410004 */ bne $v0, $at, .L8013F1A0 /* D5890 8013F190 3C018000 */ lui $at, 0x8000 /* D5894 8013F194 16210002 */ bne $s1, $at, .L8013F1A0 -/* D5898 8013F198 00000000 */ nop +/* D5898 8013F198 00000000 */ nop /* D589C 8013F19C 0006000D */ break 6 .L8013F1A0: /* D58A0 8013F1A0 00001810 */ mfhi $v1 @@ -229,7 +229,7 @@ glabel func_8013EE68 /* D58B4 8013F1B4 26310001 */ addiu $s1, $s1, 1 /* D58B8 8013F1B8 0235102A */ slt $v0, $s1, $s5 /* D58BC 8013F1BC 1440FF9E */ bnez $v0, .L8013F038 -/* D58C0 8013F1C0 00000000 */ nop +/* D58C0 8013F1C0 00000000 */ nop .L8013F1C4: /* D58C4 8013F1C4 8FBF002C */ lw $ra, 0x2c($sp) /* D58C8 8013F1C8 8FB60028 */ lw $s6, 0x28($sp) diff --git a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s index 4e425fa596..7dd3202883 100644 --- a/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s +++ b/asm/nonmatchings/code_d0a70_len_4fe0/func_8013F1F8.s @@ -11,7 +11,7 @@ glabel func_8013F1F8 /* D5910 8013F210 90420024 */ lbu $v0, 0x24($v0) /* D5914 8013F214 94E3000A */ lhu $v1, 0xa($a3) /* D5918 8013F218 44820000 */ mtc1 $v0, $f0 -/* D591C 8013F21C 00000000 */ nop +/* D591C 8013F21C 00000000 */ nop /* D5920 8013F220 46800020 */ cvt.s.w $f0, $f0 /* D5924 8013F224 46000021 */ cvt.d.s $f0, $f0 /* D5928 8013F228 46220003 */ div.d $f0, $f0, $f2 @@ -59,15 +59,15 @@ glabel func_8013F1F8 /* D59CC 8013F2CC 90A30003 */ lbu $v1, 3($a1) /* D59D0 8013F2D0 00461021 */ addu $v0, $v0, $a2 /* D59D4 8013F2D4 44830000 */ mtc1 $v1, $f0 -/* D59D8 8013F2D8 00000000 */ nop +/* D59D8 8013F2D8 00000000 */ nop /* D59DC 8013F2DC 46800020 */ cvt.s.w $f0, $f0 /* D59E0 8013F2E0 46040002 */ mul.s $f0, $f0, $f4 -/* D59E4 8013F2E4 00000000 */ nop +/* D59E4 8013F2E4 00000000 */ nop /* D59E8 8013F2E8 8D030000 */ lw $v1, ($t0) /* D59EC 8013F2EC 00021100 */ sll $v0, $v0, 4 /* D59F0 8013F2F0 00431021 */ addu $v0, $v0, $v1 /* D59F4 8013F2F4 4600103E */ c.le.s $f2, $f0 -/* D59F8 8013F2F8 00000000 */ nop +/* D59F8 8013F2F8 00000000 */ nop /* D59FC 8013F2FC 45010005 */ bc1t .L8013F314 /* D5A00 8013F300 2442000F */ addiu $v0, $v0, 0xf /* D5A04 8013F304 4600018D */ trunc.w.s $f6, $f0 @@ -78,7 +78,7 @@ glabel func_8013F1F8 /* D5A14 8013F314 46020001 */ sub.s $f0, $f0, $f2 /* D5A18 8013F318 4600018D */ trunc.w.s $f6, $f0 /* D5A1C 8013F31C 44033000 */ mfc1 $v1, $f6 -/* D5A20 8013F320 00000000 */ nop +/* D5A20 8013F320 00000000 */ nop /* D5A24 8013F324 006A1825 */ or $v1, $v1, $t2 /* D5A28 8013F328 A0430000 */ sb $v1, ($v0) .L8013F32C: @@ -88,7 +88,7 @@ glabel func_8013F1F8 /* D5A38 8013F338 00062880 */ sll $a1, $a2, 2 .L8013F33C: /* D5A3C 8013F33C 03E00008 */ jr $ra -/* D5A40 8013F340 00000000 */ nop -/* D5A44 8013F344 00000000 */ nop -/* D5A48 8013F348 00000000 */ nop -/* D5A4C 8013F34C 00000000 */ nop +/* D5A40 8013F340 00000000 */ nop +/* D5A44 8013F344 00000000 */ nop +/* D5A48 8013F348 00000000 */ nop +/* D5A4C 8013F34C 00000000 */ nop diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s index 6b1211c110..cbe2cc9d00 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/create_icon.s @@ -22,10 +22,10 @@ glabel create_icon /* D7BE4 801414E4 2A220140 */ slti $v0, $s1, 0x140 .L801414E8: /* D7BE8 801414E8 14400003 */ bnez $v0, .L801414F8 -/* D7BEC 801414EC 00000000 */ nop +/* D7BEC 801414EC 00000000 */ nop .L801414F0: /* D7BF0 801414F0 0805053C */ j .L801414F0 -/* D7BF4 801414F4 00000000 */ nop +/* D7BF4 801414F4 00000000 */ nop .L801414F8: /* D7BF8 801414F8 0C00AB39 */ jal heap_malloc /* D7BFC 801414FC 24040054 */ addiu $a0, $zero, 0x54 @@ -43,7 +43,7 @@ glabel create_icon /* D7C2C 8014152C ACA30000 */ sw $v1, ($a1) .L80141530: /* D7C30 80141530 0805054C */ j .L80141530 -/* D7C34 80141534 00000000 */ nop +/* D7C34 80141534 00000000 */ nop .L80141538: /* D7C38 80141538 24030001 */ addiu $v1, $zero, 1 /* D7C3C 8014153C AE030000 */ sw $v1, ($s0) @@ -82,7 +82,7 @@ glabel create_icon /* D7CBC 801415BC E6000030 */ swc1 $f0, 0x30($s0) /* D7CC0 801415C0 80820070 */ lb $v0, 0x70($a0) /* D7CC4 801415C4 10400005 */ beqz $v0, .L801415DC -/* D7CC8 801415C8 00000000 */ nop +/* D7CC8 801415C8 00000000 */ nop /* D7CCC 801415CC 8E020000 */ lw $v0, ($s0) /* D7CD0 801415D0 36310800 */ ori $s1, $s1, 0x800 /* D7CD4 801415D4 34420400 */ ori $v0, $v0, 0x400 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s index bef99a4985..0ede182a19 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/draw_menu_icon.s @@ -25,7 +25,7 @@ glabel draw_menu_icon /* DA9E8 801442E8 3C021020 */ lui $v0, 0x1020 /* DA9EC 801442EC 00621024 */ and $v0, $v1, $v0 /* DA9F0 801442F0 14400123 */ bnez $v0, .L80144780 -/* DA9F4 801442F4 00000000 */ nop +/* DA9F4 801442F4 00000000 */ nop /* DA9F8 801442F8 82020045 */ lb $v0, 0x45($s0) /* DA9FC 801442FC 04400120 */ bltz $v0, .L80144780 /* DAA00 80144300 24020001 */ addiu $v0, $zero, 1 @@ -130,7 +130,7 @@ glabel draw_menu_icon /* DAB84 80144484 3C020010 */ lui $v0, 0x10 /* DAB88 80144488 00621024 */ and $v0, $v1, $v0 /* DAB8C 8014448C 1440000B */ bnez $v0, .L801444BC -/* DAB90 80144490 00000000 */ nop +/* DAB90 80144490 00000000 */ nop /* DAB94 80144494 82040046 */ lb $a0, 0x46($s0) /* DAB98 80144498 3C038015 */ lui $v1, %hi(D_8014EFCC) /* DAB9C 8014449C 2463EFCC */ addiu $v1, $v1, %lo(D_8014EFCC) @@ -151,7 +151,7 @@ glabel draw_menu_icon /* DABD0 801444D0 3C020010 */ lui $v0, 0x10 /* DABD4 801444D4 00621024 */ and $v0, $v1, $v0 /* DABD8 801444D8 1440000C */ bnez $v0, .L8014450C -/* DABDC 801444DC 00000000 */ nop +/* DABDC 801444DC 00000000 */ nop /* DABE0 801444E0 82020045 */ lb $v0, 0x45($s0) /* DABE4 801444E4 3C048015 */ lui $a0, %hi(D_8014EFCC) /* DABE8 801444E8 2484EFCC */ addiu $a0, $a0, %lo(D_8014EFCC) @@ -252,7 +252,7 @@ glabel draw_menu_icon /* DAD44 80144644 44815000 */ mtc1 $at, $f10 /* DAD48 80144648 46000207 */ neg.s $f8, $f0 /* DAD4C 8014464C 46024202 */ mul.s $f8, $f8, $f2 -/* DAD50 80144650 00000000 */ nop +/* DAD50 80144650 00000000 */ nop /* DAD54 80144654 3C014480 */ lui $at, 0x4480 /* DAD58 80144658 44816000 */ mtc1 $at, $f12 /* DAD5C 8014465C 8E020000 */ lw $v0, ($s0) @@ -262,27 +262,27 @@ glabel draw_menu_icon /* DAD6C 8014466C 44127000 */ mfc1 $s2, $f14 /* DAD70 80144670 46003187 */ neg.s $f6, $f6 /* DAD74 80144674 46023182 */ mul.s $f6, $f6, $f2 -/* DAD78 80144678 00000000 */ nop +/* DAD78 80144678 00000000 */ nop /* DAD7C 8014467C 44912000 */ mtc1 $s1, $f4 -/* DAD80 80144680 00000000 */ nop +/* DAD80 80144680 00000000 */ nop /* DAD84 80144684 46802120 */ cvt.s.w $f4, $f4 /* DAD88 80144688 44960000 */ mtc1 $s6, $f0 -/* DAD8C 8014468C 00000000 */ nop +/* DAD8C 8014468C 00000000 */ nop /* DAD90 80144690 46800020 */ cvt.s.w $f0, $f0 /* DAD94 80144694 46002103 */ div.s $f4, $f4, $f0 /* DAD98 80144698 46045103 */ div.s $f4, $f10, $f4 /* DAD9C 8014469C 460C2102 */ mul.s $f4, $f4, $f12 -/* DADA0 801446A0 00000000 */ nop +/* DADA0 801446A0 00000000 */ nop /* DADA4 801446A4 44920000 */ mtc1 $s2, $f0 -/* DADA8 801446A8 00000000 */ nop +/* DADA8 801446A8 00000000 */ nop /* DADAC 801446AC 46800020 */ cvt.s.w $f0, $f0 /* DADB0 801446B0 44951000 */ mtc1 $s5, $f2 -/* DADB4 801446B4 00000000 */ nop +/* DADB4 801446B4 00000000 */ nop /* DADB8 801446B8 468010A0 */ cvt.s.w $f2, $f2 /* DADBC 801446BC 46020003 */ div.s $f0, $f0, $f2 /* DADC0 801446C0 46005003 */ div.s $f0, $f10, $f0 /* DADC4 801446C4 460C0002 */ mul.s $f0, $f0, $f12 -/* DADC8 801446C8 00000000 */ nop +/* DADC8 801446C8 00000000 */ nop /* DADCC 801446CC 00431024 */ and $v0, $v0, $v1 /* DADD0 801446D0 4600438D */ trunc.w.s $f14, $f8 /* DADD4 801446D4 44137000 */ mfc1 $s3, $f14 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s index 1ed8ed4aa6..f1daa9b491 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/free_icon.s @@ -18,9 +18,9 @@ glabel free_icon /* DB028 80144928 3C030001 */ lui $v1, 1 /* DB02C 8014492C 00431024 */ and $v0, $v0, $v1 /* DB030 80144930 10400003 */ beqz $v0, .L80144940 -/* DB034 80144934 00000000 */ nop +/* DB034 80144934 00000000 */ nop /* DB038 80144938 0C051442 */ jal func_80145108 -/* DB03C 8014493C 00000000 */ nop +/* DB03C 8014493C 00000000 */ nop .L80144940: /* DB040 80144940 8E220000 */ lw $v0, ($s1) /* DB044 80144944 02021021 */ addu $v0, $s0, $v0 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s index a49805ed69..0c783b8b6d 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F350.s @@ -27,7 +27,7 @@ glabel func_8013F350 /* D5AA4 8013F3A4 00220821 */ addu $at, $at, $v0 /* D5AA8 8013F3A8 8C221140 */ lw $v0, %lo(D_80151140)($at) /* D5AAC 8013F3AC 00400008 */ jr $v0 -/* D5AB0 8013F3B0 00000000 */ nop +/* D5AB0 8013F3B0 00000000 */ nop /* D5AB4 8013F3B4 0804FCE3 */ j .L8013F38C /* D5AB8 8013F3B8 2610000C */ addiu $s0, $s0, 0xc /* D5ABC 8013F3BC 8E130000 */ lw $s3, ($s0) @@ -79,7 +79,7 @@ glabel func_8013F350 /* D5B64 8013F464 8C830000 */ lw $v1, ($a0) /* D5B68 8013F468 2402FFFF */ addiu $v0, $zero, -1 /* D5B6C 8013F46C 14620038 */ bne $v1, $v0, .L8013F550 -/* D5B70 8013F470 00000000 */ nop +/* D5B70 8013F470 00000000 */ nop /* D5B74 8013F474 3C038015 */ lui $v1, %hi(D_8015133C) /* D5B78 8013F478 8C63133C */ lw $v1, %lo(D_8015133C)($v1) /* D5B7C 8013F47C 3C028015 */ lui $v0, %hi(D_80151314) @@ -92,7 +92,7 @@ glabel func_8013F350 /* D5B98 8013F498 ACA20000 */ sw $v0, ($a1) /* D5B9C 8013F49C 80820070 */ lb $v0, 0x70($a0) /* D5BA0 8013F4A0 14400004 */ bnez $v0, .L8013F4B4 -/* D5BA4 8013F4A4 00000000 */ nop +/* D5BA4 8013F4A4 00000000 */ nop /* D5BA8 8013F4A8 3C048015 */ lui $a0, %hi(D_8014EFC4) /* D5BAC 8013F4AC 0804FD32 */ j .L8013F4C8 /* D5BB0 8013F4B0 8C84EFC4 */ lw $a0, %lo(D_8014EFC4)($a0) @@ -110,10 +110,10 @@ glabel func_8013F350 /* D5BD8 8013F4D8 00431021 */ addu $v0, $v0, $v1 /* D5BDC 8013F4DC 0044102A */ slt $v0, $v0, $a0 /* D5BE0 8013F4E0 14400003 */ bnez $v0, .L8013F4F0 -/* D5BE4 8013F4E4 00000000 */ nop +/* D5BE4 8013F4E4 00000000 */ nop .L8013F4E8: /* D5BE8 8013F4E8 0804FD3A */ j .L8013F4E8 -/* D5BEC 8013F4EC 00000000 */ nop +/* D5BEC 8013F4EC 00000000 */ nop .L8013F4F0: /* D5BF0 8013F4F0 3C04001D */ lui $a0, 0x1d /* D5BF4 8013F4F4 2484C310 */ addiu $a0, $a0, -0x3cf0 @@ -163,7 +163,7 @@ glabel func_8013F350 /* D5C90 8013F590 26100004 */ addiu $s0, $s0, 4 .L8013F594: /* D5C94 8013F594 0804FD65 */ j .L8013F594 -/* D5C98 8013F598 00000000 */ nop +/* D5C98 8013F598 00000000 */ nop .L8013F59C: /* D5C9C 8013F59C 3C048015 */ lui $a0, %hi(D_801512D0) /* D5CA0 8013F5A0 8C8412D0 */ lw $a0, %lo(D_801512D0)($a0) @@ -173,7 +173,7 @@ glabel func_8013F350 /* D5CAC 8013F5AC 8C830000 */ lw $v1, ($a0) /* D5CB0 8013F5B0 2402FFFF */ addiu $v0, $zero, -1 /* D5CB4 8013F5B4 14620036 */ bne $v1, $v0, .L8013F690 -/* D5CB8 8013F5B8 00000000 */ nop +/* D5CB8 8013F5B8 00000000 */ nop /* D5CBC 8013F5BC 3C038015 */ lui $v1, %hi(D_8015133C) /* D5CC0 8013F5C0 8C63133C */ lw $v1, %lo(D_8015133C)($v1) /* D5CC4 8013F5C4 3C028015 */ lui $v0, %hi(D_80151314) @@ -186,7 +186,7 @@ glabel func_8013F350 /* D5CE0 8013F5E0 ACA20000 */ sw $v0, ($a1) /* D5CE4 8013F5E4 80820070 */ lb $v0, 0x70($a0) /* D5CE8 8013F5E8 14400004 */ bnez $v0, .L8013F5FC -/* D5CEC 8013F5EC 00000000 */ nop +/* D5CEC 8013F5EC 00000000 */ nop /* D5CF0 8013F5F0 3C048015 */ lui $a0, %hi(D_8014EFC4) /* D5CF4 8013F5F4 0804FD84 */ j .L8013F610 /* D5CF8 8013F5F8 8C84EFC4 */ lw $a0, %lo(D_8014EFC4)($a0) @@ -203,10 +203,10 @@ glabel func_8013F350 /* D5D1C 8013F61C 24420020 */ addiu $v0, $v0, 0x20 /* D5D20 8013F620 0044102A */ slt $v0, $v0, $a0 /* D5D24 8013F624 14400003 */ bnez $v0, .L8013F634 -/* D5D28 8013F628 00000000 */ nop +/* D5D28 8013F628 00000000 */ nop .L8013F62C: /* D5D2C 8013F62C 0804FD8B */ j .L8013F62C -/* D5D30 8013F630 00000000 */ nop +/* D5D30 8013F630 00000000 */ nop .L8013F634: /* D5D34 8013F634 3C04001D */ lui $a0, 0x1d /* D5D38 8013F638 2484C310 */ addiu $a0, $a0, -0x3cf0 @@ -255,7 +255,7 @@ glabel func_8013F350 /* D5DD0 8013F6D0 26100004 */ addiu $s0, $s0, 4 .L8013F6D4: /* D5DD4 8013F6D4 0804FDB5 */ j .L8013F6D4 -/* D5DD8 8013F6D8 00000000 */ nop +/* D5DD8 8013F6D8 00000000 */ nop .L8013F6DC: /* D5DDC 8013F6DC 8FBF002C */ lw $ra, 0x2c($sp) /* D5DE0 8013F6E0 8FB60028 */ lw $s6, 0x28($sp) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s index 48f0af7a03..079b6a372d 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8013F704.s @@ -25,7 +25,7 @@ glabel func_8013F704 /* D5E50 8013F750 16C10004 */ bne $s6, $at, .L8013F764 /* D5E54 8013F754 3C018000 */ lui $at, 0x8000 /* D5E58 8013F758 15010002 */ bne $t0, $at, .L8013F764 -/* D5E5C 8013F75C 00000000 */ nop +/* D5E5C 8013F75C 00000000 */ nop /* D5E60 8013F760 0006000D */ break 6 .L8013F764: /* D5E64 8013F764 00004012 */ mflo $t0 @@ -42,7 +42,7 @@ glabel func_8013F704 /* D5E8C 8013F78C 16C10004 */ bne $s6, $at, .L8013F7A0 /* D5E90 8013F790 3C018000 */ lui $at, 0x8000 /* D5E94 8013F794 15210002 */ bne $t1, $at, .L8013F7A0 -/* D5E98 8013F798 00000000 */ nop +/* D5E98 8013F798 00000000 */ nop /* D5E9C 8013F79C 0006000D */ break 6 .L8013F7A0: /* D5EA0 8013F7A0 00004812 */ mflo $t1 @@ -156,13 +156,13 @@ glabel func_8013F704 /* D6020 8013F920 1062000B */ beq $v1, $v0, .L8013F950 /* D6024 8013F924 24080003 */ addiu $t0, $zero, 3 /* D6028 8013F928 0804FE55 */ j .L8013F954 -/* D602C 8013F92C 00000000 */ nop +/* D602C 8013F92C 00000000 */ nop .L8013F930: /* D6030 8013F930 24020020 */ addiu $v0, $zero, 0x20 /* D6034 8013F934 10620006 */ beq $v1, $v0, .L8013F950 /* D6038 8013F938 24080005 */ addiu $t0, $zero, 5 /* D603C 8013F93C 0804FE55 */ j .L8013F954 -/* D6040 8013F940 00000000 */ nop +/* D6040 8013F940 00000000 */ nop .L8013F944: /* D6044 8013F944 24160004 */ addiu $s6, $zero, 4 /* D6048 8013F948 0804FE55 */ j .L8013F954 @@ -179,13 +179,13 @@ glabel func_8013F704 /* D606C 8013F96C 12C00060 */ beqz $s6, .L8013FAF0 /* D6070 8013F970 3C06E200 */ lui $a2, 0xe200 /* D6074 8013F974 0804FECD */ j .L8013FB34 -/* D6078 8013F978 00000000 */ nop +/* D6078 8013F978 00000000 */ nop .L8013F97C: /* D607C 8013F97C 8FA80008 */ lw $t0, 8($sp) /* D6080 8013F980 1102005B */ beq $t0, $v0, .L8013FAF0 /* D6084 8013F984 3C06E200 */ lui $a2, 0xe200 /* D6088 8013F988 0804FECD */ j .L8013FB34 -/* D608C 8013F98C 00000000 */ nop +/* D608C 8013F98C 00000000 */ nop .L8013F990: /* D6090 8013F990 8E630000 */ lw $v1, ($s3) /* D6094 8013F994 30620020 */ andi $v0, $v1, 0x20 @@ -367,7 +367,7 @@ glabel func_8013F704 /* D6330 8013FC30 44801000 */ mtc1 $zero, $f2 /* D6334 8013FC34 46202003 */ div.d $f0, $f4, $f0 /* D6338 8013FC38 46220002 */ mul.d $f0, $f0, $f2 -/* D633C 8013FC3C 00000000 */ nop +/* D633C 8013FC3C 00000000 */ nop /* D6340 8013FC40 8FA80024 */ lw $t0, 0x24($sp) /* D6344 8013FC44 8FB60004 */ lw $s6, 4($sp) /* D6348 8013FC48 C7A20028 */ lwc1 $f2, 0x28($sp) @@ -384,13 +384,13 @@ glabel func_8013F704 .L8013FC74: /* D6374 8013FC74 8FB6002C */ lw $s6, 0x2c($sp) /* D6378 8013FC78 06C0050D */ bltz $s6, .L801410B0 -/* D637C 8013FC7C 00000000 */ nop +/* D637C 8013FC7C 00000000 */ nop /* D6380 8013FC80 8FA80028 */ lw $t0, 0x28($sp) /* D6384 8013FC84 290200F1 */ slti $v0, $t0, 0xf1 /* D6388 8013FC88 10400509 */ beqz $v0, .L801410B0 /* D638C 8013FC8C 2AC200F0 */ slti $v0, $s6, 0xf0 /* D6390 8013FC90 1440000B */ bnez $v0, .L8013FCC0 -/* D6394 8013FC94 00000000 */ nop +/* D6394 8013FC94 00000000 */ nop /* D6398 8013FC98 8FB60024 */ lw $s6, 0x24($sp) /* D639C 8013FC9C 26C2010F */ addiu $v0, $s6, 0x10f /* D63A0 8013FCA0 8FA80040 */ lw $t0, 0x40($sp) @@ -479,7 +479,7 @@ glabel func_8013F704 /* D64D8 8013FDD8 44801000 */ mtc1 $zero, $f2 /* D64DC 8013FDDC 46202003 */ div.d $f0, $f4, $f0 /* D64E0 8013FDE0 46220002 */ mul.d $f0, $f0, $f2 -/* D64E4 8013FDE4 00000000 */ nop +/* D64E4 8013FDE4 00000000 */ nop /* D64E8 8013FDE8 8FB60000 */ lw $s6, ($sp) /* D64EC 8013FDEC C7A20030 */ lwc1 $f2, 0x30($sp) /* D64F0 8013FDF0 468010A1 */ cvt.d.w $f2, $f2 @@ -495,7 +495,7 @@ glabel func_8013F704 .L8013FE18: /* D6518 8013FE18 8FB60088 */ lw $s6, 0x88($sp) /* D651C 8013FE1C 06C00490 */ bltz $s6, .L80141060 -/* D6520 8013FE20 00000000 */ nop +/* D6520 8013FE20 00000000 */ nop /* D6524 8013FE24 8FA80030 */ lw $t0, 0x30($sp) /* D6528 8013FE28 29020141 */ slti $v0, $t0, 0x141 /* D652C 8013FE2C 1040048C */ beqz $v0, .L80141060 @@ -515,7 +515,7 @@ glabel func_8013F704 /* D6560 8013FE60 25620001 */ addiu $v0, $t3, 1 /* D6564 8013FE64 0048102A */ slt $v0, $v0, $t0 /* D6568 8013FE68 1440000E */ bnez $v0, .L8013FEA4 -/* D656C 8013FE6C 00000000 */ nop +/* D656C 8013FE6C 00000000 */ nop /* D6570 8013FE70 8FB60064 */ lw $s6, 0x64($sp) /* D6574 8013FE74 16C00005 */ bnez $s6, .L8013FE8C /* D6578 8013FE78 250BFFFF */ addiu $t3, $t0, -1 @@ -540,7 +540,7 @@ glabel func_8013F704 /* D65B8 8013FEB8 AC600004 */ sw $zero, 4($v1) /* D65BC 8013FEBC 8FA8001C */ lw $t0, 0x1c($sp) /* D65C0 8013FEC0 11000004 */ beqz $t0, .L8013FED4 -/* D65C4 8013FEC4 00000000 */ nop +/* D65C4 8013FEC4 00000000 */ nop /* D65C8 8013FEC8 8FB60020 */ lw $s6, 0x20($sp) /* D65CC 8013FECC 0804FFBC */ j .L8013FEF0 /* D65D0 8013FED0 2EC90001 */ sltiu $t1, $s6, 1 @@ -565,12 +565,12 @@ glabel func_8013F704 /* D6610 8013FF10 11000007 */ beqz $t0, .L8013FF30 /* D6614 8013FF14 3C04FCFF */ lui $a0, 0xfcff /* D6618 8013FF18 0805032C */ j .L80140CB0 -/* D661C 8013FF1C 00000000 */ nop +/* D661C 8013FF1C 00000000 */ nop .L8013FF20: /* D6620 8013FF20 11020211 */ beq $t0, $v0, .L80140768 /* D6624 8013FF24 3C04FC11 */ lui $a0, 0xfc11 /* D6628 8013FF28 0805032C */ j .L80140CB0 -/* D662C 8013FF2C 00000000 */ nop +/* D662C 8013FF2C 00000000 */ nop .L8013FF30: /* D6630 8013FF30 3484FFFF */ ori $a0, $a0, 0xffff /* D6634 8013FF34 3C03FFFC */ lui $v1, 0xfffc @@ -835,14 +835,14 @@ glabel func_8013F704 /* D6A1C 8014031C 11200009 */ beqz $t1, .L80140344 /* D6A20 80140320 3C02FD48 */ lui $v0, 0xfd48 /* D6A24 80140324 0805032C */ j .L80140CB0 -/* D6A28 80140328 00000000 */ nop +/* D6A28 80140328 00000000 */ nop .L8014032C: /* D6A2C 8014032C 11220068 */ beq $t1, $v0, .L801404D0 /* D6A30 80140330 24020003 */ addiu $v0, $zero, 3 /* D6A34 80140334 11220098 */ beq $t1, $v0, .L80140598 /* D6A38 80140338 3C02FD48 */ lui $v0, 0xfd48 /* D6A3C 8014033C 0805032C */ j .L80140CB0 -/* D6A40 80140340 00000000 */ nop +/* D6A40 80140340 00000000 */ nop .L80140344: /* D6A44 80140344 8D440000 */ lw $a0, ($t2) /* D6A48 80140348 0080182D */ daddu $v1, $a0, $zero @@ -1153,11 +1153,11 @@ glabel func_8013F704 /* D6EF0 801407F0 1136003A */ beq $t1, $s6, .L801408DC /* D6EF4 801407F4 29220002 */ slti $v0, $t1, 2 /* D6EF8 801407F8 10400005 */ beqz $v0, .L80140810 -/* D6EFC 801407FC 00000000 */ nop +/* D6EFC 801407FC 00000000 */ nop /* D6F00 80140800 1120000A */ beqz $t1, .L8014082C /* D6F04 80140804 24E20010 */ addiu $v0, $a3, 0x10 /* D6F08 80140808 0805032C */ j .L80140CB0 -/* D6F0C 8014080C 00000000 */ nop +/* D6F0C 8014080C 00000000 */ nop .L80140810: /* D6F10 80140810 8FA80008 */ lw $t0, 8($sp) /* D6F14 80140814 1128005E */ beq $t1, $t0, .L80140990 @@ -1165,7 +1165,7 @@ glabel func_8013F704 /* D6F1C 8014081C 11220089 */ beq $t1, $v0, .L80140A44 /* D6F20 80140820 24E20010 */ addiu $v0, $a3, 0x10 /* D6F24 80140824 0805032C */ j .L80140CB0 -/* D6F28 80140828 00000000 */ nop +/* D6F28 80140828 00000000 */ nop .L8014082C: /* D6F2C 8014082C AD420000 */ sw $v0, ($t2) /* D6F30 80140830 3C02FD68 */ lui $v0, 0xfd68 @@ -1469,7 +1469,7 @@ glabel func_8013F704 /* D73B0 80140CB0 8E620000 */ lw $v0, ($s3) /* D73B4 80140CB4 30428000 */ andi $v0, $v0, 0x8000 /* D73B8 80140CB8 10400065 */ beqz $v0, .L80140E50 -/* D73BC 80140CBC 00000000 */ nop +/* D73BC 80140CBC 00000000 */ nop /* D73C0 80140CC0 8D440000 */ lw $a0, ($t2) /* D73C4 80140CC4 24820008 */ addiu $v0, $a0, 8 /* D73C8 80140CC8 AD420000 */ sw $v0, ($t2) @@ -1508,7 +1508,7 @@ glabel func_8013F704 /* D7438 80140D38 AC620000 */ sw $v0, ($v1) /* D743C 80140D3C 8FA80078 */ lw $t0, 0x78($sp) /* D7440 80140D40 19000004 */ blez $t0, .L80140D54 -/* D7444 80140D44 00000000 */ nop +/* D7444 80140D44 00000000 */ nop /* D7448 80140D48 8FB6007C */ lw $s6, 0x7c($sp) /* D744C 80140D4C 00561025 */ or $v0, $v0, $s6 /* D7450 80140D50 AC620000 */ sw $v0, ($v1) @@ -1562,7 +1562,7 @@ glabel func_8013F704 /* D74F8 80140DF8 00081400 */ sll $v0, $t0, 0x10 /* D74FC 80140DFC 00021403 */ sra $v0, $v0, 0x10 /* D7500 80140E00 0441000A */ bgez $v0, .L80140E2C -/* D7504 80140E04 00000000 */ nop +/* D7504 80140E04 00000000 */ nop /* D7508 80140E08 8FA80078 */ lw $t0, 0x78($sp) /* D750C 80140E0C 01020018 */ mult $t0, $v0 /* D7510 80140E10 0000B012 */ mflo $s6 @@ -1623,7 +1623,7 @@ glabel func_8013F704 /* D75C8 80140EC8 AC620000 */ sw $v0, ($v1) /* D75CC 80140ECC 8FB60078 */ lw $s6, 0x78($sp) /* D75D0 80140ED0 1AC00004 */ blez $s6, .L80140EE4 -/* D75D4 80140ED4 00000000 */ nop +/* D75D4 80140ED4 00000000 */ nop /* D75D8 80140ED8 8FA8007C */ lw $t0, 0x7c($sp) /* D75DC 80140EDC 00481025 */ or $v0, $v0, $t0 /* D75E0 80140EE0 AC620000 */ sw $v0, ($v1) @@ -1675,7 +1675,7 @@ glabel func_8013F704 /* D7680 80140F80 00081400 */ sll $v0, $t0, 0x10 /* D7684 80140F84 00021403 */ sra $v0, $v0, 0x10 /* D7688 80140F88 0441000A */ bgez $v0, .L80140FB4 -/* D768C 80140F8C 00000000 */ nop +/* D768C 80140F8C 00000000 */ nop /* D7690 80140F90 8FA80078 */ lw $t0, 0x78($sp) /* D7694 80140F94 01020018 */ mult $t0, $v0 /* D7698 80140F98 0000B012 */ mflo $s6 @@ -1721,7 +1721,7 @@ glabel func_8013F704 /* D7728 80141028 44801000 */ mtc1 $zero, $f2 /* D772C 8014102C 46202003 */ div.d $f0, $f4, $f0 /* D7730 80141030 46220002 */ mul.d $f0, $f0, $f2 -/* D7734 80141034 00000000 */ nop +/* D7734 80141034 00000000 */ nop /* D7738 80141038 8FB60080 */ lw $s6, 0x80($sp) /* D773C 8014103C C7A20030 */ lwc1 $f2, 0x30($sp) /* D7740 80141040 468010A1 */ cvt.d.w $f2, $f2 @@ -1735,7 +1735,7 @@ glabel func_8013F704 .L80141060: /* D7760 80141060 8FB60020 */ lw $s6, 0x20($sp) /* D7764 80141064 16C00012 */ bnez $s6, .L801410B0 -/* D7768 80141068 00000000 */ nop +/* D7768 80141068 00000000 */ nop /* D776C 8014106C C7A20010 */ lwc1 $f2, 0x10($sp) /* D7770 80141070 468010A1 */ cvt.d.w $f2, $f2 /* D7774 80141074 3C014040 */ lui $at, 0x4040 @@ -1743,7 +1743,7 @@ glabel func_8013F704 /* D777C 8014107C 44800000 */ mtc1 $zero, $f0 /* D7780 80141080 46222083 */ div.d $f2, $f4, $f2 /* D7784 80141084 46201082 */ mul.d $f2, $f2, $f0 -/* D7788 80141088 00000000 */ nop +/* D7788 80141088 00000000 */ nop /* D778C 8014108C 8FA80024 */ lw $t0, 0x24($sp) /* D7790 80141090 C7A00028 */ lwc1 $f0, 0x28($sp) /* D7794 80141094 46800021 */ cvt.d.w $f0, $f0 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s index 7bf416e1f0..204b55a56e 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141100.s @@ -8,7 +8,7 @@ glabel func_80141100 /* D780C 8014110C AFBF0010 */ sw $ra, 0x10($sp) /* D7810 80141110 80420070 */ lb $v0, 0x70($v0) /* D7814 80141114 14400011 */ bnez $v0, .L8014115C -/* D7818 80141118 00000000 */ nop +/* D7818 80141118 00000000 */ nop /* D781C 8014111C 3C028015 */ lui $v0, %hi(D_80156F60) /* D7820 80141120 24426F60 */ addiu $v0, $v0, %lo(D_80156F60) /* D7824 80141124 3C018015 */ lui $at, %hi(D_80157960) @@ -24,7 +24,7 @@ glabel func_80141100 /* D784C 8014114C 3C028015 */ lui $v0, %hi(D_80157F70) /* D7850 80141150 24427F70 */ addiu $v0, $v0, %lo(D_80157F70) /* D7854 80141154 08050465 */ j .L80141194 -/* D7858 80141158 00000000 */ nop +/* D7858 80141158 00000000 */ nop .L8014115C: /* D785C 8014115C 3C028015 */ lui $v0, %hi(D_80157460) /* D7860 80141160 24427460 */ addiu $v0, $v0, %lo(D_80157460) @@ -47,7 +47,7 @@ glabel func_80141100 /* D78A0 801411A0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* D78A4 801411A4 80420070 */ lb $v0, 0x70($v0) /* D78A8 801411A8 1440001F */ bnez $v0, .L80141228 -/* D78AC 801411AC 00000000 */ nop +/* D78AC 801411AC 00000000 */ nop /* D78B0 801411B0 3C048015 */ lui $a0, %hi(D_8014EFC4) /* D78B4 801411B4 0C00AB0A */ jal general_heap_malloc /* D78B8 801411B8 8C84EFC4 */ lw $a0, %lo(D_8014EFC4)($a0) @@ -57,7 +57,7 @@ glabel func_80141100 /* D78C8 801411C8 0000202D */ daddu $a0, $zero, $zero .L801411CC: /* D78CC 801411CC 08050473 */ j .L801411CC -/* D78D0 801411D0 00000000 */ nop +/* D78D0 801411D0 00000000 */ nop .L801411D4: /* D78D4 801411D4 3C028015 */ lui $v0, %hi(D_80151314) /* D78D8 801411D8 8C421314 */ lw $v0, %lo(D_80151314)($v0) @@ -80,7 +80,7 @@ glabel func_80141100 /* D7918 80141218 1440FFFA */ bnez $v0, .L80141204 /* D791C 8014121C 24630008 */ addiu $v1, $v1, 8 /* D7920 80141220 080504AF */ j .L801412BC -/* D7924 80141224 00000000 */ nop +/* D7924 80141224 00000000 */ nop .L80141228: /* D7928 80141228 3C028015 */ lui $v0, %hi(D_8014EFC0) /* D792C 8014122C 8C42EFC0 */ lw $v0, %lo(D_8014EFC0)($v0) @@ -98,7 +98,7 @@ glabel func_80141100 /* D795C 8014125C 0000202D */ daddu $a0, $zero, $zero .L80141260: /* D7960 80141260 08050498 */ j .L80141260 -/* D7964 80141264 00000000 */ nop +/* D7964 80141264 00000000 */ nop .L80141268: /* D7968 80141268 3C018015 */ lui $at, %hi(D_80151314) /* D796C 8014126C AC221314 */ sw $v0, %lo(D_80151314)($at) @@ -138,7 +138,7 @@ glabel func_80141100 /* D79E4 801412E4 3C018016 */ lui $at, %hi(D_80159180) /* D79E8 801412E8 AC209180 */ sw $zero, %lo(D_80159180)($at) /* D79EC 801412EC 0C0504FE */ jal func_801413F8 -/* D79F0 801412F0 00000000 */ nop +/* D79F0 801412F0 00000000 */ nop /* D79F4 801412F4 8FBF0010 */ lw $ra, 0x10($sp) /* D79F8 801412F8 03E00008 */ jr $ra /* D79FC 801412FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s index 60568e4166..fdd84d1423 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80141704.s @@ -20,7 +20,7 @@ glabel func_80141704 /* D7E40 80141740 00220821 */ addu $at, $at, $v0 /* D7E44 80141744 8C2211B0 */ lw $v0, %lo(D_801511B0)($at) /* D7E48 80141748 00400008 */ jr $v0 -/* D7E4C 8014174C 00000000 */ nop +/* D7E4C 8014174C 00000000 */ nop /* D7E50 80141750 8E620000 */ lw $v0, ($s3) /* D7E54 80141754 2403003C */ addiu $v1, $zero, 0x3c /* D7E58 80141758 A2630047 */ sb $v1, 0x47($s3) @@ -89,7 +89,7 @@ glabel func_80141704 /* D7F50 80141850 3C020010 */ lui $v0, 0x10 /* D7F54 80141854 00621024 */ and $v0, $v1, $v0 /* D7F58 80141858 14400012 */ bnez $v0, .L801418A4 -/* D7F5C 8014185C 00000000 */ nop +/* D7F5C 8014185C 00000000 */ nop /* D7F60 80141860 3C028015 */ lui $v0, %hi(D_8014EFCC) /* D7F64 80141864 2442EFCC */ addiu $v0, $v0, %lo(D_8014EFCC) /* D7F68 80141868 82650046 */ lb $a1, 0x46($s3) @@ -119,24 +119,24 @@ glabel func_80141704 /* D7FC0 801418C0 2402FDFF */ addiu $v0, $zero, -0x201 /* D7FC4 801418C4 34620200 */ ori $v0, $v1, 0x200 /* D7FC8 801418C8 44870000 */ mtc1 $a3, $f0 -/* D7FCC 801418CC 00000000 */ nop +/* D7FCC 801418CC 00000000 */ nop /* D7FD0 801418D0 46800020 */ cvt.s.w $f0, $f0 /* D7FD4 801418D4 44882000 */ mtc1 $t0, $f4 -/* D7FD8 801418D8 00000000 */ nop +/* D7FD8 801418D8 00000000 */ nop /* D7FDC 801418DC 46802120 */ cvt.s.w $f4, $f4 /* D7FE0 801418E0 44841000 */ mtc1 $a0, $f2 -/* D7FE4 801418E4 00000000 */ nop +/* D7FE4 801418E4 00000000 */ nop /* D7FE8 801418E8 468010A0 */ cvt.s.w $f2, $f2 /* D7FEC 801418EC AE620000 */ sw $v0, ($s3) /* D7FF0 801418F0 82620047 */ lb $v0, 0x47($s3) /* D7FF4 801418F4 46001081 */ sub.s $f2, $f2, $f0 /* D7FF8 801418F8 E6600028 */ swc1 $f0, 0x28($s3) /* D7FFC 801418FC 44820000 */ mtc1 $v0, $f0 -/* D8000 80141900 00000000 */ nop +/* D8000 80141900 00000000 */ nop /* D8004 80141904 46800020 */ cvt.s.w $f0, $f0 /* D8008 80141908 46001083 */ div.s $f2, $f2, $f0 /* D800C 8014190C 44850000 */ mtc1 $a1, $f0 -/* D8010 80141910 00000000 */ nop +/* D8010 80141910 00000000 */ nop /* D8014 80141914 46800020 */ cvt.s.w $f0, $f0 /* D8018 80141918 08050713 */ j .L80141C4C /* D801C 8014191C E664002C */ swc1 $f4, 0x2c($s3) @@ -169,7 +169,7 @@ glabel func_80141704 /* D8084 80141984 3C020010 */ lui $v0, 0x10 /* D8088 80141988 00621024 */ and $v0, $v1, $v0 /* D808C 8014198C 14400012 */ bnez $v0, .L801419D8 -/* D8090 80141990 00000000 */ nop +/* D8090 80141990 00000000 */ nop /* D8094 80141994 3C028015 */ lui $v0, %hi(D_8014EFCC) /* D8098 80141998 2442EFCC */ addiu $v0, $v0, %lo(D_8014EFCC) /* D809C 8014199C 82650046 */ lb $a1, 0x46($s3) @@ -199,24 +199,24 @@ glabel func_80141704 /* D80F4 801419F4 2402FDFF */ addiu $v0, $zero, -0x201 /* D80F8 801419F8 34620200 */ ori $v0, $v1, 0x200 /* D80FC 801419FC 44870000 */ mtc1 $a3, $f0 -/* D8100 80141A00 00000000 */ nop +/* D8100 80141A00 00000000 */ nop /* D8104 80141A04 46800020 */ cvt.s.w $f0, $f0 /* D8108 80141A08 44882000 */ mtc1 $t0, $f4 -/* D810C 80141A0C 00000000 */ nop +/* D810C 80141A0C 00000000 */ nop /* D8110 80141A10 46802120 */ cvt.s.w $f4, $f4 /* D8114 80141A14 44841000 */ mtc1 $a0, $f2 -/* D8118 80141A18 00000000 */ nop +/* D8118 80141A18 00000000 */ nop /* D811C 80141A1C 468010A0 */ cvt.s.w $f2, $f2 /* D8120 80141A20 AE620000 */ sw $v0, ($s3) /* D8124 80141A24 82620047 */ lb $v0, 0x47($s3) /* D8128 80141A28 46001081 */ sub.s $f2, $f2, $f0 /* D812C 80141A2C E6600028 */ swc1 $f0, 0x28($s3) /* D8130 80141A30 44820000 */ mtc1 $v0, $f0 -/* D8134 80141A34 00000000 */ nop +/* D8134 80141A34 00000000 */ nop /* D8138 80141A38 46800020 */ cvt.s.w $f0, $f0 /* D813C 80141A3C 46001083 */ div.s $f2, $f2, $f0 /* D8140 80141A40 44850000 */ mtc1 $a1, $f0 -/* D8144 80141A44 00000000 */ nop +/* D8144 80141A44 00000000 */ nop /* D8148 80141A48 46800020 */ cvt.s.w $f0, $f0 /* D814C 80141A4C 08050713 */ j .L80141C4C /* D8150 80141A50 E664002C */ swc1 $f4, 0x2c($s3) @@ -251,7 +251,7 @@ glabel func_80141704 /* D81B8 80141AB8 24840008 */ addiu $a0, $a0, 8 .L80141ABC: /* D81BC 80141ABC 080506AF */ j .L80141ABC -/* D81C0 80141AC0 00000000 */ nop +/* D81C0 80141AC0 00000000 */ nop .L80141AC4: /* D81C4 80141AC4 000310C0 */ sll $v0, $v1, 3 /* D81C8 80141AC8 0000182D */ daddu $v1, $zero, $zero @@ -270,7 +270,7 @@ glabel func_80141704 /* D81F8 80141AF8 24840008 */ addiu $a0, $a0, 8 .L80141AFC: /* D81FC 80141AFC 080506BF */ j .L80141AFC -/* D8200 80141B00 00000000 */ nop +/* D8200 80141B00 00000000 */ nop .L80141B04: /* D8204 80141B04 00471021 */ addu $v0, $v0, $a3 /* D8208 80141B08 8C420004 */ lw $v0, 4($v0) @@ -283,7 +283,7 @@ glabel func_80141704 /* D8224 80141B24 3C020010 */ lui $v0, 0x10 /* D8228 80141B28 00621024 */ and $v0, $v1, $v0 /* D822C 80141B2C 14400012 */ bnez $v0, .L80141B78 -/* D8230 80141B30 00000000 */ nop +/* D8230 80141B30 00000000 */ nop /* D8234 80141B34 3C028015 */ lui $v0, %hi(D_8014EFCC) /* D8238 80141B38 2442EFCC */ addiu $v0, $v0, %lo(D_8014EFCC) /* D823C 80141B3C 82650046 */ lb $a1, 0x46($s3) @@ -313,37 +313,37 @@ glabel func_80141704 /* D8294 80141B94 2402FDFF */ addiu $v0, $zero, -0x201 /* D8298 80141B98 34620200 */ ori $v0, $v1, 0x200 /* D829C 80141B9C 44870000 */ mtc1 $a3, $f0 -/* D82A0 80141BA0 00000000 */ nop +/* D82A0 80141BA0 00000000 */ nop /* D82A4 80141BA4 46800020 */ cvt.s.w $f0, $f0 /* D82A8 80141BA8 44882000 */ mtc1 $t0, $f4 -/* D82AC 80141BAC 00000000 */ nop +/* D82AC 80141BAC 00000000 */ nop /* D82B0 80141BB0 46802120 */ cvt.s.w $f4, $f4 /* D82B4 80141BB4 44841000 */ mtc1 $a0, $f2 -/* D82B8 80141BB8 00000000 */ nop +/* D82B8 80141BB8 00000000 */ nop /* D82BC 80141BBC 468010A0 */ cvt.s.w $f2, $f2 /* D82C0 80141BC0 AE620000 */ sw $v0, ($s3) /* D82C4 80141BC4 82620047 */ lb $v0, 0x47($s3) /* D82C8 80141BC8 46001081 */ sub.s $f2, $f2, $f0 /* D82CC 80141BCC E6600028 */ swc1 $f0, 0x28($s3) /* D82D0 80141BD0 44820000 */ mtc1 $v0, $f0 -/* D82D4 80141BD4 00000000 */ nop +/* D82D4 80141BD4 00000000 */ nop /* D82D8 80141BD8 46800020 */ cvt.s.w $f0, $f0 /* D82DC 80141BDC 46001083 */ div.s $f2, $f2, $f0 /* D82E0 80141BE0 44850000 */ mtc1 $a1, $f0 -/* D82E4 80141BE4 00000000 */ nop +/* D82E4 80141BE4 00000000 */ nop /* D82E8 80141BE8 46800020 */ cvt.s.w $f0, $f0 /* D82EC 80141BEC 08050713 */ j .L80141C4C /* D82F0 80141BF0 E664002C */ swc1 $f4, 0x2c($s3) .L80141BF4: /* D82F4 80141BF4 00621024 */ and $v0, $v1, $v0 /* D82F8 80141BF8 44840000 */ mtc1 $a0, $f0 -/* D82FC 80141BFC 00000000 */ nop +/* D82FC 80141BFC 00000000 */ nop /* D8300 80141C00 46800020 */ cvt.s.w $f0, $f0 /* D8304 80141C04 44852000 */ mtc1 $a1, $f4 -/* D8308 80141C08 00000000 */ nop +/* D8308 80141C08 00000000 */ nop /* D830C 80141C0C 46802120 */ cvt.s.w $f4, $f4 /* D8310 80141C10 44871000 */ mtc1 $a3, $f2 -/* D8314 80141C14 00000000 */ nop +/* D8314 80141C14 00000000 */ nop /* D8318 80141C18 468010A0 */ cvt.s.w $f2, $f2 /* D831C 80141C1C AE620000 */ sw $v0, ($s3) /* D8320 80141C20 82620047 */ lb $v0, 0x47($s3) @@ -351,17 +351,17 @@ glabel func_80141704 /* D8328 80141C28 E6600028 */ swc1 $f0, 0x28($s3) /* D832C 80141C2C E664002C */ swc1 $f4, 0x2c($s3) /* D8330 80141C30 44820000 */ mtc1 $v0, $f0 -/* D8334 80141C34 00000000 */ nop +/* D8334 80141C34 00000000 */ nop /* D8338 80141C38 46800020 */ cvt.s.w $f0, $f0 /* D833C 80141C3C 46001083 */ div.s $f2, $f2, $f0 /* D8340 80141C40 44880000 */ mtc1 $t0, $f0 -/* D8344 80141C44 00000000 */ nop +/* D8344 80141C44 00000000 */ nop /* D8348 80141C48 46800020 */ cvt.s.w $f0, $f0 .L80141C4C: /* D834C 80141C4C 46040001 */ sub.s $f0, $f0, $f4 /* D8350 80141C50 E6620020 */ swc1 $f2, 0x20($s3) /* D8354 80141C54 44821000 */ mtc1 $v0, $f2 -/* D8358 80141C58 00000000 */ nop +/* D8358 80141C58 00000000 */ nop /* D835C 80141C5C 468010A0 */ cvt.s.w $f2, $f2 /* D8360 80141C60 46020003 */ div.s $f0, $f0, $f2 /* D8364 80141C64 0805087C */ j .L801421F0 @@ -429,28 +429,28 @@ glabel func_80141704 /* D8458 80141D58 84650002 */ lh $a1, 2($v1) /* D845C 80141D5C 8E630000 */ lw $v1, ($s3) /* D8460 80141D60 44841000 */ mtc1 $a0, $f2 -/* D8464 80141D64 00000000 */ nop +/* D8464 80141D64 00000000 */ nop /* D8468 80141D68 468010A0 */ cvt.s.w $f2, $f2 /* D846C 80141D6C 44870000 */ mtc1 $a3, $f0 -/* D8470 80141D70 00000000 */ nop +/* D8470 80141D70 00000000 */ nop /* D8474 80141D74 46800020 */ cvt.s.w $f0, $f0 /* D8478 80141D78 46001203 */ div.s $f8, $f2, $f0 /* D847C 80141D7C 46083203 */ div.s $f8, $f6, $f8 /* D8480 80141D80 3C014480 */ lui $at, 0x4480 /* D8484 80141D84 44811000 */ mtc1 $at, $f2 /* D8488 80141D88 44852000 */ mtc1 $a1, $f4 -/* D848C 80141D8C 00000000 */ nop +/* D848C 80141D8C 00000000 */ nop /* D8490 80141D90 46802120 */ cvt.s.w $f4, $f4 /* D8494 80141D94 46024202 */ mul.s $f8, $f8, $f2 -/* D8498 80141D98 00000000 */ nop +/* D8498 80141D98 00000000 */ nop /* D849C 80141D9C 44880000 */ mtc1 $t0, $f0 -/* D84A0 80141DA0 00000000 */ nop +/* D84A0 80141DA0 00000000 */ nop /* D84A4 80141DA4 46800020 */ cvt.s.w $f0, $f0 /* D84A8 80141DA8 46002283 */ div.s $f10, $f4, $f0 /* D84AC 80141DAC 460A3283 */ div.s $f10, $f6, $f10 /* D84B0 80141DB0 2404FEFF */ addiu $a0, $zero, -0x101 /* D84B4 80141DB4 46025082 */ mul.s $f2, $f10, $f2 -/* D84B8 80141DB8 00000000 */ nop +/* D84B8 80141DB8 00000000 */ nop /* D84BC 80141DBC 00641824 */ and $v1, $v1, $a0 /* D84C0 80141DC0 34630800 */ ori $v1, $v1, 0x800 /* D84C4 80141DC4 AE630000 */ sw $v1, ($s3) @@ -518,7 +518,7 @@ glabel func_80141704 /* D85B0 80141EB0 C6040000 */ lwc1 $f4, ($s0) /* D85B4 80141EB4 46802120 */ cvt.s.w $f4, $f4 /* D85B8 80141EB8 46002102 */ mul.s $f4, $f4, $f0 -/* D85BC 80141EBC 00000000 */ nop +/* D85BC 80141EBC 00000000 */ nop /* D85C0 80141EC0 26100004 */ addiu $s0, $s0, 4 /* D85C4 80141EC4 8E620000 */ lw $v0, ($s3) /* D85C8 80141EC8 3C030010 */ lui $v1, 0x10 @@ -549,85 +549,85 @@ glabel func_80141704 /* D8628 80141F28 92650051 */ lbu $a1, 0x51($s3) .L80141F2C: /* D862C 80141F2C 44840000 */ mtc1 $a0, $f0 -/* D8630 80141F30 00000000 */ nop +/* D8630 80141F30 00000000 */ nop /* D8634 80141F34 46800020 */ cvt.s.w $f0, $f0 /* D8638 80141F38 46040002 */ mul.s $f0, $f0, $f4 -/* D863C 80141F3C 00000000 */ nop +/* D863C 80141F3C 00000000 */ nop /* D8640 80141F40 3C014F00 */ lui $at, 0x4f00 /* D8644 80141F44 44811000 */ mtc1 $at, $f2 -/* D8648 80141F48 00000000 */ nop +/* D8648 80141F48 00000000 */ nop /* D864C 80141F4C 4600103E */ c.le.s $f2, $f0 -/* D8650 80141F50 00000000 */ nop +/* D8650 80141F50 00000000 */ nop /* D8654 80141F54 45010005 */ bc1t .L80141F6C /* D8658 80141F58 26660048 */ addiu $a2, $s3, 0x48 /* D865C 80141F5C 4600030D */ trunc.w.s $f12, $f0 /* D8660 80141F60 44036000 */ mfc1 $v1, $f12 /* D8664 80141F64 080507E1 */ j .L80141F84 -/* D8668 80141F68 00000000 */ nop +/* D8668 80141F68 00000000 */ nop .L80141F6C: /* D866C 80141F6C 46020001 */ sub.s $f0, $f0, $f2 /* D8670 80141F70 3C028000 */ lui $v0, 0x8000 /* D8674 80141F74 4600030D */ trunc.w.s $f12, $f0 /* D8678 80141F78 44036000 */ mfc1 $v1, $f12 -/* D867C 80141F7C 00000000 */ nop +/* D867C 80141F7C 00000000 */ nop /* D8680 80141F80 00621825 */ or $v1, $v1, $v0 .L80141F84: /* D8684 80141F84 44850000 */ mtc1 $a1, $f0 -/* D8688 80141F88 00000000 */ nop +/* D8688 80141F88 00000000 */ nop /* D868C 80141F8C 46800020 */ cvt.s.w $f0, $f0 /* D8690 80141F90 46040002 */ mul.s $f0, $f0, $f4 -/* D8694 80141F94 00000000 */ nop +/* D8694 80141F94 00000000 */ nop /* D8698 80141F98 3C014F00 */ lui $at, 0x4f00 /* D869C 80141F9C 44811000 */ mtc1 $at, $f2 /* D86A0 80141FA0 A0C30000 */ sb $v1, ($a2) /* D86A4 80141FA4 4600103E */ c.le.s $f2, $f0 -/* D86A8 80141FA8 00000000 */ nop +/* D86A8 80141FA8 00000000 */ nop /* D86AC 80141FAC 45010005 */ bc1t .L80141FC4 /* D86B0 80141FB0 26660049 */ addiu $a2, $s3, 0x49 /* D86B4 80141FB4 4600030D */ trunc.w.s $f12, $f0 /* D86B8 80141FB8 44036000 */ mfc1 $v1, $f12 /* D86BC 80141FBC 080507F7 */ j .L80141FDC -/* D86C0 80141FC0 00000000 */ nop +/* D86C0 80141FC0 00000000 */ nop .L80141FC4: /* D86C4 80141FC4 46020001 */ sub.s $f0, $f0, $f2 /* D86C8 80141FC8 3C028000 */ lui $v0, 0x8000 /* D86CC 80141FCC 4600030D */ trunc.w.s $f12, $f0 /* D86D0 80141FD0 44036000 */ mfc1 $v1, $f12 -/* D86D4 80141FD4 00000000 */ nop +/* D86D4 80141FD4 00000000 */ nop /* D86D8 80141FD8 00621825 */ or $v1, $v1, $v0 .L80141FDC: /* D86DC 80141FDC 44840000 */ mtc1 $a0, $f0 -/* D86E0 80141FE0 00000000 */ nop +/* D86E0 80141FE0 00000000 */ nop /* D86E4 80141FE4 46800020 */ cvt.s.w $f0, $f0 /* D86E8 80141FE8 44871000 */ mtc1 $a3, $f2 -/* D86EC 80141FEC 00000000 */ nop +/* D86EC 80141FEC 00000000 */ nop /* D86F0 80141FF0 468010A0 */ cvt.s.w $f2, $f2 /* D86F4 80141FF4 46020003 */ div.s $f0, $f0, $f2 /* D86F8 80141FF8 46040202 */ mul.s $f8, $f0, $f4 -/* D86FC 80141FFC 00000000 */ nop +/* D86FC 80141FFC 00000000 */ nop /* D8700 80142000 44850000 */ mtc1 $a1, $f0 -/* D8704 80142004 00000000 */ nop +/* D8704 80142004 00000000 */ nop /* D8708 80142008 46800020 */ cvt.s.w $f0, $f0 /* D870C 8014200C 44881000 */ mtc1 $t0, $f2 -/* D8710 80142010 00000000 */ nop +/* D8710 80142010 00000000 */ nop /* D8714 80142014 468010A0 */ cvt.s.w $f2, $f2 /* D8718 80142018 46020003 */ div.s $f0, $f0, $f2 /* D871C 8014201C 3C013F80 */ lui $at, 0x3f80 /* D8720 80142020 44811000 */ mtc1 $at, $f2 /* D8724 80142024 46040282 */ mul.s $f10, $f0, $f4 -/* D8728 80142028 00000000 */ nop +/* D8728 80142028 00000000 */ nop /* D872C 8014202C 3C014480 */ lui $at, 0x4480 /* D8730 80142030 44810000 */ mtc1 $at, $f0 /* D8734 80142034 A0C30000 */ sb $v1, ($a2) /* D8738 80142038 46081203 */ div.s $f8, $f2, $f8 /* D873C 8014203C 46004102 */ mul.s $f4, $f8, $f0 -/* D8740 80142040 00000000 */ nop +/* D8740 80142040 00000000 */ nop /* D8744 80142044 8E630000 */ lw $v1, ($s3) /* D8748 80142048 2404FEFF */ addiu $a0, $zero, -0x101 /* D874C 8014204C AE700004 */ sw $s0, 4($s3) /* D8750 80142050 460A1283 */ div.s $f10, $f2, $f10 /* D8754 80142054 46005002 */ mul.s $f0, $f10, $f0 -/* D8758 80142058 00000000 */ nop +/* D8758 80142058 00000000 */ nop /* D875C 8014205C 00641824 */ and $v1, $v1, $a0 /* D8760 80142060 34630810 */ ori $v1, $v1, 0x810 /* D8764 80142064 AE630000 */ sw $v1, ($s3) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s index e00ec5ec07..794810ab39 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80142210.s @@ -123,14 +123,14 @@ glabel func_80142210 /* D8AC4 801423C4 8C500000 */ lw $s0, ($v0) /* D8AC8 801423C8 8E020004 */ lw $v0, 4($s0) /* D8ACC 801423CC 104000C7 */ beqz $v0, .L801426EC -/* D8AD0 801423D0 00000000 */ nop +/* D8AD0 801423D0 00000000 */ nop /* D8AD4 801423D4 8E030000 */ lw $v1, ($s0) /* D8AD8 801423D8 30620100 */ andi $v0, $v1, 0x100 /* D8ADC 801423DC 1440005B */ bnez $v0, .L8014254C /* D8AE0 801423E0 3C0E0010 */ lui $t6, 0x10 /* D8AE4 801423E4 006E1024 */ and $v0, $v1, $t6 /* D8AE8 801423E8 1440000B */ bnez $v0, .L80142418 -/* D8AEC 801423EC 00000000 */ nop +/* D8AEC 801423EC 00000000 */ nop /* D8AF0 801423F0 82030046 */ lb $v1, 0x46($s0) /* D8AF4 801423F4 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D8AF8 801423F8 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -151,7 +151,7 @@ glabel func_80142210 /* D8B2C 8014242C 3C0E0010 */ lui $t6, 0x10 /* D8B30 80142430 006E1024 */ and $v0, $v1, $t6 /* D8B34 80142434 1440000C */ bnez $v0, .L80142468 -/* D8B38 80142438 00000000 */ nop +/* D8B38 80142438 00000000 */ nop /* D8B3C 8014243C 82030045 */ lb $v1, 0x45($s0) /* D8B40 80142440 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D8B44 80142444 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -228,7 +228,7 @@ glabel func_80142210 .L8014254C: /* D8C4C 8014254C 006E1024 */ and $v0, $v1, $t6 /* D8C50 80142550 1440000B */ bnez $v0, .L80142580 -/* D8C54 80142554 00000000 */ nop +/* D8C54 80142554 00000000 */ nop /* D8C58 80142558 82030046 */ lb $v1, 0x46($s0) /* D8C5C 8014255C 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D8C60 80142560 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -249,7 +249,7 @@ glabel func_80142210 /* D8C94 80142594 44811000 */ mtc1 $at, $f2 /* D8C98 80142598 46000307 */ neg.s $f12, $f0 /* D8C9C 8014259C 46026302 */ mul.s $f12, $f12, $f2 -/* D8CA0 801425A0 00000000 */ nop +/* D8CA0 801425A0 00000000 */ nop /* D8CA4 801425A4 3C013F80 */ lui $at, 0x3f80 /* D8CA8 801425A8 44814000 */ mtc1 $at, $f8 /* D8CAC 801425AC 3C014480 */ lui $at, 0x4480 @@ -260,27 +260,27 @@ glabel func_80142210 /* D8CC0 801425C0 44127000 */ mfc1 $s2, $f14 /* D8CC4 801425C4 46003187 */ neg.s $f6, $f6 /* D8CC8 801425C8 46023182 */ mul.s $f6, $f6, $f2 -/* D8CCC 801425CC 00000000 */ nop +/* D8CCC 801425CC 00000000 */ nop /* D8CD0 801425D0 44912000 */ mtc1 $s1, $f4 -/* D8CD4 801425D4 00000000 */ nop +/* D8CD4 801425D4 00000000 */ nop /* D8CD8 801425D8 46802120 */ cvt.s.w $f4, $f4 /* D8CDC 801425DC 44960000 */ mtc1 $s6, $f0 -/* D8CE0 801425E0 00000000 */ nop +/* D8CE0 801425E0 00000000 */ nop /* D8CE4 801425E4 46800020 */ cvt.s.w $f0, $f0 /* D8CE8 801425E8 46002103 */ div.s $f4, $f4, $f0 /* D8CEC 801425EC 46044103 */ div.s $f4, $f8, $f4 /* D8CF0 801425F0 460A2102 */ mul.s $f4, $f4, $f10 -/* D8CF4 801425F4 00000000 */ nop +/* D8CF4 801425F4 00000000 */ nop /* D8CF8 801425F8 44921000 */ mtc1 $s2, $f2 -/* D8CFC 801425FC 00000000 */ nop +/* D8CFC 801425FC 00000000 */ nop /* D8D00 80142600 468010A0 */ cvt.s.w $f2, $f2 /* D8D04 80142604 44950000 */ mtc1 $s5, $f0 -/* D8D08 80142608 00000000 */ nop +/* D8D08 80142608 00000000 */ nop /* D8D0C 8014260C 46800020 */ cvt.s.w $f0, $f0 /* D8D10 80142610 46001083 */ div.s $f2, $f2, $f0 /* D8D14 80142614 46024083 */ div.s $f2, $f8, $f2 /* D8D18 80142618 460A1082 */ mul.s $f2, $f2, $f10 -/* D8D1C 8014261C 00000000 */ nop +/* D8D1C 8014261C 00000000 */ nop /* D8D20 80142620 8E020000 */ lw $v0, ($s0) /* D8D24 80142624 4600638D */ trunc.w.s $f14, $f12 /* D8D28 80142628 44137000 */ mfc1 $s3, $f14 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s index be164c827a..ac72f3cb31 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_8014271C.s @@ -118,7 +118,7 @@ glabel func_8014271C /* D8FC0 801428C0 3C0E0010 */ lui $t6, 0x10 /* D8FC4 801428C4 006E1024 */ and $v0, $v1, $t6 /* D8FC8 801428C8 1440000B */ bnez $v0, .L801428F8 -/* D8FCC 801428CC 00000000 */ nop +/* D8FCC 801428CC 00000000 */ nop /* D8FD0 801428D0 82030046 */ lb $v1, 0x46($s0) /* D8FD4 801428D4 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D8FD8 801428D8 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -139,7 +139,7 @@ glabel func_8014271C /* D900C 8014290C 3C0E0010 */ lui $t6, 0x10 /* D9010 80142910 006E1024 */ and $v0, $v1, $t6 /* D9014 80142914 1440000C */ bnez $v0, .L80142948 -/* D9018 80142918 00000000 */ nop +/* D9018 80142918 00000000 */ nop /* D901C 8014291C 82030045 */ lb $v1, 0x45($s0) /* D9020 80142920 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D9024 80142924 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -216,7 +216,7 @@ glabel func_8014271C .L80142A2C: /* D912C 80142A2C 006E1024 */ and $v0, $v1, $t6 /* D9130 80142A30 1440000B */ bnez $v0, .L80142A60 -/* D9134 80142A34 00000000 */ nop +/* D9134 80142A34 00000000 */ nop /* D9138 80142A38 82030045 */ lb $v1, 0x45($s0) /* D913C 80142A3C 3C0E8015 */ lui $t6, %hi(D_8014EFCC) /* D9140 80142A40 25CEEFCC */ addiu $t6, $t6, %lo(D_8014EFCC) @@ -237,7 +237,7 @@ glabel func_8014271C /* D9174 80142A74 44811000 */ mtc1 $at, $f2 /* D9178 80142A78 46000307 */ neg.s $f12, $f0 /* D917C 80142A7C 46026302 */ mul.s $f12, $f12, $f2 -/* D9180 80142A80 00000000 */ nop +/* D9180 80142A80 00000000 */ nop /* D9184 80142A84 3C013F80 */ lui $at, 0x3f80 /* D9188 80142A88 44814000 */ mtc1 $at, $f8 /* D918C 80142A8C 3C014480 */ lui $at, 0x4480 @@ -248,27 +248,27 @@ glabel func_8014271C /* D91A0 80142AA0 44127000 */ mfc1 $s2, $f14 /* D91A4 80142AA4 46003187 */ neg.s $f6, $f6 /* D91A8 80142AA8 46023182 */ mul.s $f6, $f6, $f2 -/* D91AC 80142AAC 00000000 */ nop +/* D91AC 80142AAC 00000000 */ nop /* D91B0 80142AB0 44912000 */ mtc1 $s1, $f4 -/* D91B4 80142AB4 00000000 */ nop +/* D91B4 80142AB4 00000000 */ nop /* D91B8 80142AB8 46802120 */ cvt.s.w $f4, $f4 /* D91BC 80142ABC 44960000 */ mtc1 $s6, $f0 -/* D91C0 80142AC0 00000000 */ nop +/* D91C0 80142AC0 00000000 */ nop /* D91C4 80142AC4 46800020 */ cvt.s.w $f0, $f0 /* D91C8 80142AC8 46002103 */ div.s $f4, $f4, $f0 /* D91CC 80142ACC 46044103 */ div.s $f4, $f8, $f4 /* D91D0 80142AD0 460A2102 */ mul.s $f4, $f4, $f10 -/* D91D4 80142AD4 00000000 */ nop +/* D91D4 80142AD4 00000000 */ nop /* D91D8 80142AD8 44921000 */ mtc1 $s2, $f2 -/* D91DC 80142ADC 00000000 */ nop +/* D91DC 80142ADC 00000000 */ nop /* D91E0 80142AE0 468010A0 */ cvt.s.w $f2, $f2 /* D91E4 80142AE4 44950000 */ mtc1 $s5, $f0 -/* D91E8 80142AE8 00000000 */ nop +/* D91E8 80142AE8 00000000 */ nop /* D91EC 80142AEC 46800020 */ cvt.s.w $f0, $f0 /* D91F0 80142AF0 46001083 */ div.s $f2, $f2, $f0 /* D91F4 80142AF4 46024083 */ div.s $f2, $f8, $f2 /* D91F8 80142AF8 460A1082 */ mul.s $f2, $f2, $f10 -/* D91FC 80142AFC 00000000 */ nop +/* D91FC 80142AFC 00000000 */ nop /* D9200 80142B00 8E020000 */ lw $v0, ($s0) /* D9204 80142B04 4600638D */ trunc.w.s $f14, $f12 /* D9208 80142B08 44137000 */ mfc1 $s3, $f14 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s index 7525c98eb4..b07ffa7e2e 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80143C48.s @@ -342,7 +342,7 @@ glabel func_80143C48 /* DA888 80144188 00431021 */ addu $v0, $v0, $v1 /* DA88C 8014418C 8C440000 */ lw $a0, ($v0) /* DA890 80144190 10800015 */ beqz $a0, .L801441E8 -/* DA894 80144194 00000000 */ nop +/* DA894 80144194 00000000 */ nop /* DA898 80144198 8C830000 */ lw $v1, ($a0) /* DA89C 8014419C 10600012 */ beqz $v1, .L801441E8 /* DA8A0 801441A0 30620002 */ andi $v0, $v1, 2 @@ -355,14 +355,14 @@ glabel func_80143C48 /* DA8BC 801441BC 1040000A */ beqz $v0, .L801441E8 /* DA8C0 801441C0 30620040 */ andi $v0, $v1, 0x40 /* DA8C4 801441C4 14400008 */ bnez $v0, .L801441E8 -/* DA8C8 801441C8 00000000 */ nop +/* DA8C8 801441C8 00000000 */ nop /* DA8CC 801441CC 80820045 */ lb $v0, 0x45($a0) /* DA8D0 801441D0 04400005 */ bltz $v0, .L801441E8 /* DA8D4 801441D4 30620080 */ andi $v0, $v1, 0x80 /* DA8D8 801441D8 10400003 */ beqz $v0, .L801441E8 -/* DA8DC 801441DC 00000000 */ nop +/* DA8DC 801441DC 00000000 */ nop /* DA8E0 801441E0 0C050AFF */ jal render_menu_icon -/* DA8E4 801441E4 00000000 */ nop +/* DA8E4 801441E4 00000000 */ nop .L801441E8: /* DA8E8 801441E8 8FBF0044 */ lw $ra, 0x44($sp) /* DA8EC 801441EC 8FBE0040 */ lw $fp, 0x40($sp) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144A5C.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144A5C.s index aa74001ecb..b32f342f91 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144A5C.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144A5C.s @@ -9,7 +9,7 @@ glabel func_80144A5C /* DB16C 80144A6C AFB00010 */ sw $s0, 0x10($sp) /* DB170 80144A70 80420070 */ lb $v0, 0x70($v0) /* DB174 80144A74 14400030 */ bnez $v0, .L80144B38 -/* DB178 80144A78 00000000 */ nop +/* DB178 80144A78 00000000 */ nop /* DB17C 80144A7C 3C108015 */ lui $s0, %hi(D_80151314) /* DB180 80144A80 26101314 */ addiu $s0, $s0, %lo(D_80151314) /* DB184 80144A84 0C00AB4B */ jal heap_free @@ -21,7 +21,7 @@ glabel func_80144A5C /* DB19C 80144A9C AE020000 */ sw $v0, ($s0) .L80144AA0: /* DB1A0 80144AA0 080512A8 */ j .L80144AA0 -/* DB1A4 80144AA4 00000000 */ nop +/* DB1A4 80144AA4 00000000 */ nop .L80144AA8: /* DB1A8 80144AA8 0000482D */ daddu $t1, $zero, $zero /* DB1AC 80144AAC 240AFFFF */ addiu $t2, $zero, -1 @@ -59,12 +59,12 @@ glabel func_80144A5C /* DB228 80144B28 1440FFFA */ bnez $v0, .L80144B14 /* DB22C 80144B2C 24E70008 */ addiu $a3, $a3, 8 /* DB230 80144B30 08051304 */ j .L80144C10 -/* DB234 80144B34 00000000 */ nop +/* DB234 80144B34 00000000 */ nop .L80144B38: /* DB238 80144B38 3C028015 */ lui $v0, %hi(D_8014EFC0) /* DB23C 80144B3C 8C42EFC0 */ lw $v0, %lo(D_8014EFC0)($v0) /* DB240 80144B40 1440000F */ bnez $v0, .L80144B80 -/* DB244 80144B44 00000000 */ nop +/* DB244 80144B44 00000000 */ nop /* DB248 80144B48 3C108015 */ lui $s0, %hi(D_80151314) /* DB24C 80144B4C 26101314 */ addiu $s0, $s0, %lo(D_80151314) /* DB250 80144B50 0C00AB4B */ jal heap_free @@ -79,7 +79,7 @@ glabel func_80144A5C /* DB274 80144B74 AE020000 */ sw $v0, ($s0) .L80144B78: /* DB278 80144B78 080512DE */ j .L80144B78 -/* DB27C 80144B7C 00000000 */ nop +/* DB27C 80144B7C 00000000 */ nop .L80144B80: /* DB280 80144B80 3C018015 */ lui $at, %hi(D_80151314) /* DB284 80144B84 AC221314 */ sw $v0, %lo(D_80151314)($at) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s index 405c7f6ba9..b554c0f9c0 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144C20.s @@ -39,84 +39,84 @@ glabel func_80144C20 /* DB3A4 80144CA4 90A60051 */ lbu $a2, 0x51($a1) .L80144CA8: /* DB3A8 80144CA8 44840000 */ mtc1 $a0, $f0 -/* DB3AC 80144CAC 00000000 */ nop +/* DB3AC 80144CAC 00000000 */ nop /* DB3B0 80144CB0 46800020 */ cvt.s.w $f0, $f0 /* DB3B4 80144CB4 46060002 */ mul.s $f0, $f0, $f6 -/* DB3B8 80144CB8 00000000 */ nop +/* DB3B8 80144CB8 00000000 */ nop /* DB3BC 80144CBC 3C014F00 */ lui $at, 0x4f00 /* DB3C0 80144CC0 44811000 */ mtc1 $at, $f2 -/* DB3C4 80144CC4 00000000 */ nop +/* DB3C4 80144CC4 00000000 */ nop /* DB3C8 80144CC8 4600103E */ c.le.s $f2, $f0 -/* DB3CC 80144CCC 00000000 */ nop +/* DB3CC 80144CCC 00000000 */ nop /* DB3D0 80144CD0 45010005 */ bc1t .L80144CE8 /* DB3D4 80144CD4 24A70048 */ addiu $a3, $a1, 0x48 /* DB3D8 80144CD8 4600020D */ trunc.w.s $f8, $f0 /* DB3DC 80144CDC 44034000 */ mfc1 $v1, $f8 /* DB3E0 80144CE0 08051340 */ j .L80144D00 -/* DB3E4 80144CE4 00000000 */ nop +/* DB3E4 80144CE4 00000000 */ nop .L80144CE8: /* DB3E8 80144CE8 46020001 */ sub.s $f0, $f0, $f2 /* DB3EC 80144CEC 3C028000 */ lui $v0, 0x8000 /* DB3F0 80144CF0 4600020D */ trunc.w.s $f8, $f0 /* DB3F4 80144CF4 44034000 */ mfc1 $v1, $f8 -/* DB3F8 80144CF8 00000000 */ nop +/* DB3F8 80144CF8 00000000 */ nop /* DB3FC 80144CFC 00621825 */ or $v1, $v1, $v0 .L80144D00: /* DB400 80144D00 44860000 */ mtc1 $a2, $f0 -/* DB404 80144D04 00000000 */ nop +/* DB404 80144D04 00000000 */ nop /* DB408 80144D08 46800020 */ cvt.s.w $f0, $f0 /* DB40C 80144D0C 46060002 */ mul.s $f0, $f0, $f6 -/* DB410 80144D10 00000000 */ nop +/* DB410 80144D10 00000000 */ nop /* DB414 80144D14 3C014F00 */ lui $at, 0x4f00 /* DB418 80144D18 44811000 */ mtc1 $at, $f2 /* DB41C 80144D1C A0E30000 */ sb $v1, ($a3) /* DB420 80144D20 4600103E */ c.le.s $f2, $f0 -/* DB424 80144D24 00000000 */ nop +/* DB424 80144D24 00000000 */ nop /* DB428 80144D28 45010005 */ bc1t .L80144D40 /* DB42C 80144D2C 24A70049 */ addiu $a3, $a1, 0x49 /* DB430 80144D30 4600020D */ trunc.w.s $f8, $f0 /* DB434 80144D34 44034000 */ mfc1 $v1, $f8 /* DB438 80144D38 08051356 */ j .L80144D58 -/* DB43C 80144D3C 00000000 */ nop +/* DB43C 80144D3C 00000000 */ nop .L80144D40: /* DB440 80144D40 46020001 */ sub.s $f0, $f0, $f2 /* DB444 80144D44 3C028000 */ lui $v0, 0x8000 /* DB448 80144D48 4600020D */ trunc.w.s $f8, $f0 /* DB44C 80144D4C 44034000 */ mfc1 $v1, $f8 -/* DB450 80144D50 00000000 */ nop +/* DB450 80144D50 00000000 */ nop /* DB454 80144D54 00621825 */ or $v1, $v1, $v0 .L80144D58: /* DB458 80144D58 44842000 */ mtc1 $a0, $f4 -/* DB45C 80144D5C 00000000 */ nop +/* DB45C 80144D5C 00000000 */ nop /* DB460 80144D60 46802120 */ cvt.s.w $f4, $f4 /* DB464 80144D64 44880000 */ mtc1 $t0, $f0 -/* DB468 80144D68 00000000 */ nop +/* DB468 80144D68 00000000 */ nop /* DB46C 80144D6C 46800020 */ cvt.s.w $f0, $f0 /* DB470 80144D70 46002103 */ div.s $f4, $f4, $f0 /* DB474 80144D74 46062102 */ mul.s $f4, $f4, $f6 -/* DB478 80144D78 00000000 */ nop +/* DB478 80144D78 00000000 */ nop /* DB47C 80144D7C 44861000 */ mtc1 $a2, $f2 -/* DB480 80144D80 00000000 */ nop +/* DB480 80144D80 00000000 */ nop /* DB484 80144D84 468010A0 */ cvt.s.w $f2, $f2 /* DB488 80144D88 44890000 */ mtc1 $t1, $f0 -/* DB48C 80144D8C 00000000 */ nop +/* DB48C 80144D8C 00000000 */ nop /* DB490 80144D90 46800020 */ cvt.s.w $f0, $f0 /* DB494 80144D94 46001083 */ div.s $f2, $f2, $f0 /* DB498 80144D98 46061082 */ mul.s $f2, $f2, $f6 -/* DB49C 80144D9C 00000000 */ nop +/* DB49C 80144D9C 00000000 */ nop /* DB4A0 80144DA0 3C013F80 */ lui $at, 0x3f80 /* DB4A4 80144DA4 44810000 */ mtc1 $at, $f0 /* DB4A8 80144DA8 3C014480 */ lui $at, 0x4480 /* DB4AC 80144DAC 44813000 */ mtc1 $at, $f6 /* DB4B0 80144DB0 46040103 */ div.s $f4, $f0, $f4 /* DB4B4 80144DB4 46062102 */ mul.s $f4, $f4, $f6 -/* DB4B8 80144DB8 00000000 */ nop +/* DB4B8 80144DB8 00000000 */ nop /* DB4BC 80144DBC A0E30000 */ sb $v1, ($a3) /* DB4C0 80144DC0 2403FEFF */ addiu $v1, $zero, -0x101 /* DB4C4 80144DC4 8CA20000 */ lw $v0, ($a1) /* DB4C8 80144DC8 46020083 */ div.s $f2, $f0, $f2 /* DB4CC 80144DCC 46061082 */ mul.s $f2, $f2, $f6 -/* DB4D0 80144DD0 00000000 */ nop +/* DB4D0 80144DD0 00000000 */ nop /* DB4D4 80144DD4 00431024 */ and $v0, $v0, $v1 /* DB4D8 80144DD8 34420810 */ ori $v0, $v0, 0x810 /* DB4DC 80144DDC ACA20000 */ sw $v0, ($a1) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144F28.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144F28.s index 09c5189fe2..78f9053d75 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144F28.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144F28.s @@ -20,7 +20,7 @@ glabel func_80144F28 /* DB664 80144F64 AE30001C */ sw $s0, 0x1c($s1) .L80144F68: /* DB668 80144F68 080513DA */ j .L80144F68 -/* DB66C 80144F6C 00000000 */ nop +/* DB66C 80144F6C 00000000 */ nop .L80144F70: /* DB670 80144F70 24040001 */ addiu $a0, $zero, 1 /* DB674 80144F74 8E220000 */ lw $v0, ($s1) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s index 835cf21ccc..396e980143 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80144FD8.s @@ -19,7 +19,7 @@ glabel func_80144FD8 /* DB710 80145010 AE04001C */ sw $a0, 0x1c($s0) .L80145014: /* DB714 80145014 08051405 */ j .L80145014 -/* DB718 80145018 00000000 */ nop +/* DB718 80145018 00000000 */ nop .L8014501C: /* DB71C 8014501C 3C020003 */ lui $v0, 3 /* DB720 80145020 8E030000 */ lw $v1, ($s0) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145070.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145070.s index a97ec9536b..201196999b 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145070.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145070.s @@ -19,7 +19,7 @@ glabel func_80145070 /* DB7A8 801450A8 AE04001C */ sw $a0, 0x1c($s0) .L801450AC: /* DB7AC 801450AC 0805142B */ j .L801450AC -/* DB7B0 801450B0 00000000 */ nop +/* DB7B0 801450B0 00000000 */ nop .L801450B4: /* DB7B4 801450B4 3C024003 */ lui $v0, 0x4003 /* DB7B8 801450B8 8E030000 */ lw $v1, ($s0) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s index 2ff6161de5..7faff9fe94 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145108.s @@ -17,13 +17,13 @@ glabel func_80145108 /* DB838 80145138 8E04001C */ lw $a0, 0x1c($s0) /* DB83C 8014513C 00431024 */ and $v0, $v0, $v1 /* DB840 80145140 14400004 */ bnez $v0, .L80145154 -/* DB844 80145144 00000000 */ nop +/* DB844 80145144 00000000 */ nop /* DB848 80145148 0C04EA15 */ jal func_8013A854 /* DB84C 8014514C 8C840000 */ lw $a0, ($a0) /* DB850 80145150 8E04001C */ lw $a0, 0x1c($s0) .L80145154: /* DB854 80145154 0C00AB4B */ jal heap_free -/* DB858 80145158 00000000 */ nop +/* DB858 80145158 00000000 */ nop /* DB85C 8014515C 3C03BFFC */ lui $v1, 0xbffc /* DB860 80145160 8E020000 */ lw $v0, ($s0) /* DB864 80145164 3463FFFF */ ori $v1, $v1, 0xffff diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s index ee0eab624c..b8628aad3c 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145184.s @@ -22,4 +22,4 @@ glabel func_80145184 /* DB8C8 801451C8 E464000C */ swc1 $f4, 0xc($v1) .L801451CC: /* DB8CC 801451CC 03E00008 */ jr $ra -/* DB8D0 801451D0 00000000 */ nop +/* DB8D0 801451D0 00000000 */ nop diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s index fa58ed9826..8be9f378e5 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_801451D4.s @@ -22,4 +22,4 @@ glabel func_801451D4 /* DB918 80145218 E4640024 */ swc1 $f4, 0x24($v1) .L8014521C: /* DB91C 8014521C 03E00008 */ jr $ra -/* DB920 80145220 00000000 */ nop +/* DB920 80145220 00000000 */ nop diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s index 8f498de6ec..3a5467b7ee 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145224.s @@ -22,4 +22,4 @@ glabel func_80145224 /* DB968 80145268 E4640018 */ swc1 $f4, 0x18($v1) .L8014526C: /* DB96C 8014526C 03E00008 */ jr $ra -/* DB970 80145270 00000000 */ nop +/* DB970 80145270 00000000 */ nop diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s index 6e989be2df..78bd0e4c02 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_80145274.s @@ -18,4 +18,4 @@ glabel func_80145274 /* DB9A8 801452A8 A466002A */ sh $a2, 0x2a($v1) .L801452AC: /* DB9AC 801452AC 03E00008 */ jr $ra -/* DB9B0 801452B0 00000000 */ nop +/* DB9B0 801452B0 00000000 */ nop diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s index 6b2cb1922c..8b05199286 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_801452B4.s @@ -14,4 +14,4 @@ glabel func_801452B4 /* DB9D8 801452D8 00250821 */ addu $at, $at, $a1 /* DB9DC 801452DC AC227460 */ sw $v0, %lo(D_80157460)($at) /* DB9E0 801452E0 03E00008 */ jr $ra -/* DB9E4 801452E4 00000000 */ nop +/* DB9E4 801452E4 00000000 */ nop diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s b/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s index 812bad814d..d1f85528bc 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/func_801452E8.s @@ -14,6 +14,6 @@ glabel func_801452E8 /* DBA08 80145308 3C018015 */ lui $at, %hi(D_8014EFC4) /* DBA0C 8014530C 03E00008 */ jr $ra /* DBA10 80145310 AC25EFC4 */ sw $a1, %lo(D_8014EFC4)($at) -/* DBA14 80145314 00000000 */ nop -/* DBA18 80145318 00000000 */ nop -/* DBA1C 8014531C 00000000 */ nop +/* DBA14 80145314 00000000 */ nop +/* DBA18 80145318 00000000 */ nop +/* DBA1C 8014531C 00000000 */ nop diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/icon_set_opacity.s b/asm/nonmatchings/code_d5a50_len_5fd0/icon_set_opacity.s index f765a9f902..fcef7770e3 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/icon_set_opacity.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/icon_set_opacity.s @@ -21,4 +21,4 @@ glabel icon_set_opacity /* DB5F0 80144EF0 AC820000 */ sw $v0, ($a0) .L80144EF4: /* DB5F4 80144EF4 03E00008 */ jr $ra -/* DB5F8 80144EF8 00000000 */ nop +/* DB5F8 80144EF8 00000000 */ nop diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s b/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s index 3750a3d27a..a785369712 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/init_menu_icon_list.s @@ -9,14 +9,14 @@ glabel init_menu_icon_list /* D7A10 80141310 AFB00010 */ sw $s0, 0x10($sp) /* D7A14 80141314 80420070 */ lb $v0, 0x70($v0) /* D7A18 80141318 1440001B */ bnez $v0, .L80141388 -/* D7A1C 8014131C 00000000 */ nop +/* D7A1C 8014131C 00000000 */ nop /* D7A20 80141320 3C108016 */ lui $s0, %hi(D_80158570) /* D7A24 80141324 26108570 */ addiu $s0, $s0, %lo(D_80158570) /* D7A28 80141328 8E040000 */ lw $a0, ($s0) /* D7A2C 8014132C 10800004 */ beqz $a0, .L80141340 -/* D7A30 80141330 00000000 */ nop +/* D7A30 80141330 00000000 */ nop /* D7A34 80141334 0C00AB1E */ jal general_heap_free -/* D7A38 80141338 00000000 */ nop +/* D7A38 80141338 00000000 */ nop /* D7A3C 8014133C AE000000 */ sw $zero, ($s0) .L80141340: /* D7A40 80141340 3C038015 */ lui $v1, %hi(D_80157964) @@ -36,7 +36,7 @@ glabel init_menu_icon_list /* D7A78 80141378 3C028015 */ lui $v0, %hi(D_80157F70) /* D7A7C 8014137C 24427F70 */ addiu $v0, $v0, %lo(D_80157F70) /* D7A80 80141380 080504F2 */ j .L801413C8 -/* D7A84 80141384 00000000 */ nop +/* D7A84 80141384 00000000 */ nop .L80141388: /* D7A88 80141388 3C038016 */ lui $v1, %hi(D_80158570) /* D7A8C 8014138C 8C638570 */ lw $v1, %lo(D_80158570)($v1) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s index c85007db20..70c351169d 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icon.s @@ -54,7 +54,7 @@ glabel render_menu_icon .L80142CB8: /* D93B8 80142CB8 00621024 */ and $v0, $v1, $v0 /* D93BC 80142CBC 14400011 */ bnez $v0, .L80142D04 -/* D93C0 80142CC0 00000000 */ nop +/* D93C0 80142CC0 00000000 */ nop /* D93C4 80142CC4 82E30046 */ lb $v1, 0x46($s7) /* D93C8 80142CC8 3C048015 */ lui $a0, %hi(D_8014EFCC) /* D93CC 80142CCC 2484EFCC */ addiu $a0, $a0, %lo(D_8014EFCC) @@ -65,20 +65,20 @@ glabel render_menu_icon /* D93E0 80142CE0 84430000 */ lh $v1, ($v0) /* D93E4 80142CE4 84420002 */ lh $v0, 2($v0) /* D93E8 80142CE8 4483C000 */ mtc1 $v1, $f24 -/* D93EC 80142CEC 00000000 */ nop +/* D93EC 80142CEC 00000000 */ nop /* D93F0 80142CF0 4680C620 */ cvt.s.w $f24, $f24 /* D93F4 80142CF4 4482A000 */ mtc1 $v0, $f20 -/* D93F8 80142CF8 00000000 */ nop +/* D93F8 80142CF8 00000000 */ nop /* D93FC 80142CFC 08050B49 */ j .L80142D24 /* D9400 80142D00 4680A520 */ cvt.s.w $f20, $f20 .L80142D04: /* D9404 80142D04 92E2004E */ lbu $v0, 0x4e($s7) /* D9408 80142D08 92E3004F */ lbu $v1, 0x4f($s7) /* D940C 80142D0C 4482C000 */ mtc1 $v0, $f24 -/* D9410 80142D10 00000000 */ nop +/* D9410 80142D10 00000000 */ nop /* D9414 80142D14 4680C620 */ cvt.s.w $f24, $f24 /* D9418 80142D18 4483A000 */ mtc1 $v1, $f20 -/* D941C 80142D1C 00000000 */ nop +/* D941C 80142D1C 00000000 */ nop /* D9420 80142D20 4680A520 */ cvt.s.w $f20, $f20 .L80142D24: /* D9424 80142D24 C6E00028 */ lwc1 $f0, 0x28($s7) @@ -94,7 +94,7 @@ glabel render_menu_icon /* D9448 80142D48 3C030010 */ lui $v1, 0x10 /* D944C 80142D4C 00431024 */ and $v0, $v0, $v1 /* D9450 80142D50 1440000C */ bnez $v0, .L80142D84 -/* D9454 80142D54 00000000 */ nop +/* D9454 80142D54 00000000 */ nop /* D9458 80142D58 82E20046 */ lb $v0, 0x46($s7) /* D945C 80142D5C 3C048015 */ lui $a0, %hi(D_8014EFCC) /* D9460 80142D60 2484EFCC */ addiu $a0, $a0, %lo(D_8014EFCC) @@ -119,12 +119,12 @@ glabel render_menu_icon /* D94A4 80142DA4 87C30028 */ lh $v1, 0x28($fp) /* D94A8 80142DA8 87C2002A */ lh $v0, 0x2a($fp) /* D94AC 80142DAC 44833000 */ mtc1 $v1, $f6 -/* D94B0 80142DB0 00000000 */ nop +/* D94B0 80142DB0 00000000 */ nop /* D94B4 80142DB4 468031A0 */ cvt.s.w $f6, $f6 /* D94B8 80142DB8 00021023 */ negu $v0, $v0 /* D94BC 80142DBC 44053000 */ mfc1 $a1, $f6 /* D94C0 80142DC0 44823000 */ mtc1 $v0, $f6 -/* D94C4 80142DC4 00000000 */ nop +/* D94C4 80142DC4 00000000 */ nop /* D94C8 80142DC8 468031A0 */ cvt.s.w $f6, $f6 /* D94CC 80142DCC 44063000 */ mfc1 $a2, $f6 /* D94D0 80142DD0 0C019E40 */ jal guTranslateF @@ -136,11 +136,11 @@ glabel render_menu_icon /* D94E8 80142DE8 87C3002A */ lh $v1, 0x2a($fp) /* D94EC 80142DEC 00021023 */ negu $v0, $v0 /* D94F0 80142DF0 44823000 */ mtc1 $v0, $f6 -/* D94F4 80142DF4 00000000 */ nop +/* D94F4 80142DF4 00000000 */ nop /* D94F8 80142DF8 468031A0 */ cvt.s.w $f6, $f6 /* D94FC 80142DFC 44053000 */ mfc1 $a1, $f6 /* D9500 80142E00 44833000 */ mtc1 $v1, $f6 -/* D9504 80142E04 00000000 */ nop +/* D9504 80142E04 00000000 */ nop /* D9508 80142E08 468031A0 */ cvt.s.w $f6, $f6 /* D950C 80142E0C 44063000 */ mfc1 $a2, $f6 /* D9510 80142E10 0C019E40 */ jal guTranslateF @@ -155,7 +155,7 @@ glabel render_menu_icon /* D9534 80142E34 00431021 */ addu $v0, $v0, $v1 /* D9538 80142E38 00441021 */ addu $v0, $v0, $a0 /* D953C 80142E3C 44821000 */ mtc1 $v0, $f2 -/* D9540 80142E40 00000000 */ nop +/* D9540 80142E40 00000000 */ nop /* D9544 80142E44 468010A0 */ cvt.s.w $f2, $f2 /* D9548 80142E48 46001080 */ add.s $f2, $f2, $f0 /* D954C 80142E4C 86E2003E */ lh $v0, 0x3e($s7) @@ -167,12 +167,12 @@ glabel render_menu_icon /* D9564 80142E64 00441021 */ addu $v0, $v0, $a0 /* D9568 80142E68 44051000 */ mfc1 $a1, $f2 /* D956C 80142E6C 44821000 */ mtc1 $v0, $f2 -/* D9570 80142E70 00000000 */ nop +/* D9570 80142E70 00000000 */ nop /* D9574 80142E74 468010A0 */ cvt.s.w $f2, $f2 /* D9578 80142E78 82E20044 */ lb $v0, 0x44($s7) /* D957C 80142E7C 46001080 */ add.s $f2, $f2, $f0 /* D9580 80142E80 44820000 */ mtc1 $v0, $f0 -/* D9584 80142E84 00000000 */ nop +/* D9584 80142E84 00000000 */ nop /* D9588 80142E88 46800021 */ cvt.d.w $f0, $f0 /* D958C 80142E8C 46240003 */ div.d $f0, $f0, $f4 /* D9590 80142E90 44061000 */ mfc1 $a2, $f2 @@ -187,16 +187,16 @@ glabel render_menu_icon /* D95B4 80142EB4 0280202D */ daddu $a0, $s4, $zero /* D95B8 80142EB8 C6E20030 */ lwc1 $f2, 0x30($s7) /* D95BC 80142EBC 46181102 */ mul.s $f4, $f2, $f24 -/* D95C0 80142EC0 00000000 */ nop +/* D95C0 80142EC0 00000000 */ nop /* D95C4 80142EC4 46141082 */ mul.s $f2, $f2, $f20 -/* D95C8 80142EC8 00000000 */ nop +/* D95C8 80142EC8 00000000 */ nop /* D95CC 80142ECC C7C0001C */ lwc1 $f0, 0x1c($fp) /* D95D0 80142ED0 46002102 */ mul.s $f4, $f4, $f0 -/* D95D4 80142ED4 00000000 */ nop +/* D95D4 80142ED4 00000000 */ nop /* D95D8 80142ED8 C7C00020 */ lwc1 $f0, 0x20($fp) /* D95DC 80142EDC 3C150001 */ lui $s5, 1 /* D95E0 80142EE0 46001082 */ mul.s $f2, $f2, $f0 -/* D95E4 80142EE4 00000000 */ nop +/* D95E4 80142EE4 00000000 */ nop /* D95E8 80142EE8 36B51630 */ ori $s5, $s5, 0x1630 /* D95EC 80142EEC 27B30260 */ addiu $s3, $sp, 0x260 /* D95F0 80142EF0 8FC70024 */ lw $a3, 0x24($fp) @@ -313,7 +313,7 @@ glabel render_menu_icon /* D979C 8014309C 10E20052 */ beq $a3, $v0, .L801431E8 /* D97A0 801430A0 3C03D838 */ lui $v1, 0xd838 /* D97A4 801430A4 08050D8F */ j .L8014363C -/* D97A8 801430A8 00000000 */ nop +/* D97A8 801430A8 00000000 */ nop .L801430AC: /* D97AC 801430AC 8EE30000 */ lw $v1, ($s7) /* D97B0 801430B0 3C020002 */ lui $v0, 2 @@ -361,7 +361,7 @@ glabel render_menu_icon /* D984C 8014314C 00A0382D */ daddu $a3, $a1, $zero .L80143150: /* D9850 80143150 0C04EAA7 */ jal func_8013AA9C -/* D9854 80143154 00000000 */ nop +/* D9854 80143154 00000000 */ nop /* D9858 80143158 8EE20010 */ lw $v0, 0x10($s7) /* D985C 8014315C 8FAE02B8 */ lw $t6, 0x2b8($sp) /* D9860 80143160 AFA202A0 */ sw $v0, 0x2a0($sp) @@ -616,7 +616,7 @@ glabel render_menu_icon /* D9C14 80143514 14A10004 */ bne $a1, $at, .L80143528 /* D9C18 80143518 3C018000 */ lui $at, 0x8000 /* D9C1C 8014351C 14610002 */ bne $v1, $at, .L80143528 -/* D9C20 80143520 00000000 */ nop +/* D9C20 80143520 00000000 */ nop /* D9C24 80143524 0006000D */ break 6 .L80143528: /* D9C28 80143528 00001012 */ mflo $v0 diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s index 0389e84da1..2028e6c2ba 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/render_menu_icons.s @@ -187,7 +187,7 @@ glabel render_menu_icons /* DA06C 8014396C 26310001 */ addiu $s1, $s1, 1 /* DA070 80143970 0232102A */ slt $v0, $s1, $s2 /* DA074 80143974 1440FFF5 */ bnez $v0, .L8014394C -/* DA078 80143978 00000000 */ nop +/* DA078 80143978 00000000 */ nop .L8014397C: /* DA07C 8014397C 3C03800A */ lui $v1, %hi(D_8009A634) /* DA080 80143980 8463A634 */ lh $v1, %lo(D_8009A634)($v1) @@ -370,7 +370,7 @@ glabel render_menu_icons /* DA320 80143C20 26310001 */ addiu $s1, $s1, 1 /* DA324 80143C24 0232102A */ slt $v0, $s1, $s2 /* DA328 80143C28 1440FFF5 */ bnez $v0, .L80143C00 -/* DA32C 80143C2C 00000000 */ nop +/* DA32C 80143C2C 00000000 */ nop .L80143C30: /* DA330 80143C30 8FBF051C */ lw $ra, 0x51c($sp) /* DA334 80143C34 8FB20518 */ lw $s2, 0x518($sp) diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s b/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s index c206d39300..39bdd0e4c9 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/set_menu_icon_script.s @@ -44,7 +44,7 @@ glabel set_menu_icon_script /* DAF90 80144890 0C0505C1 */ jal func_80141704 /* DAF94 80144894 0200202D */ daddu $a0, $s0, $zero /* DAF98 80144898 1440FFFD */ bnez $v0, .L80144890 -/* DAF9C 8014489C 00000000 */ nop +/* DAF9C 8014489C 00000000 */ nop /* DAFA0 801448A0 8FBF0014 */ lw $ra, 0x14($sp) /* DAFA4 801448A4 8FB00010 */ lw $s0, 0x10($sp) /* DAFA8 801448A8 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s b/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s index eeea841525..093d48c22d 100644 --- a/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s +++ b/asm/nonmatchings/code_d5a50_len_5fd0/update_menu_icons.s @@ -24,7 +24,7 @@ glabel update_menu_icons /* D7D58 80141658 26310001 */ addiu $s1, $s1, 1 /* D7D5C 8014165C 00721024 */ and $v0, $v1, $s2 /* D7D60 80141660 10400005 */ beqz $v0, .L80141678 -/* D7D64 80141664 00000000 */ nop +/* D7D64 80141664 00000000 */ nop /* D7D68 80141668 0C05123D */ jal free_icon /* D7D6C 8014166C 0220202D */ daddu $a0, $s1, $zero /* D7D70 80141670 080505B8 */ j .L801416E0 @@ -32,18 +32,18 @@ glabel update_menu_icons .L80141678: /* D7D78 80141678 8E020004 */ lw $v0, 4($s0) /* D7D7C 8014167C 1040001B */ beqz $v0, .L801416EC -/* D7D80 80141680 00000000 */ nop +/* D7D80 80141680 00000000 */ nop /* D7D84 80141684 92020047 */ lbu $v0, 0x47($s0) /* D7D88 80141688 2442FFFF */ addiu $v0, $v0, -1 /* D7D8C 8014168C A2020047 */ sb $v0, 0x47($s0) /* D7D90 80141690 00021600 */ sll $v0, $v0, 0x18 /* D7D94 80141694 14400005 */ bnez $v0, .L801416AC -/* D7D98 80141698 00000000 */ nop +/* D7D98 80141698 00000000 */ nop .L8014169C: /* D7D9C 8014169C 0C0505C1 */ jal func_80141704 /* D7DA0 801416A0 0200202D */ daddu $a0, $s0, $zero /* D7DA4 801416A4 1440FFFD */ bnez $v0, .L8014169C -/* D7DA8 801416A8 00000000 */ nop +/* D7DA8 801416A8 00000000 */ nop .L801416AC: /* D7DAC 801416AC 8E020000 */ lw $v0, ($s0) /* D7DB0 801416B0 30420100 */ andi $v0, $v0, 0x100 @@ -62,7 +62,7 @@ glabel update_menu_icons .L801416E0: /* D7DE0 801416E0 2A220140 */ slti $v0, $s1, 0x140 /* D7DE4 801416E4 1440FFD1 */ bnez $v0, .L8014162C -/* D7DE8 801416E8 00000000 */ nop +/* D7DE8 801416E8 00000000 */ nop .L801416EC: /* D7DEC 801416EC 8FBF001C */ lw $ra, 0x1c($sp) /* D7DF0 801416F0 8FB20018 */ lw $s2, 0x18($sp) diff --git a/asm/nonmatchings/code_de740_len_23f0/_play_sound.s b/asm/nonmatchings/code_de740_len_23f0/_play_sound.s index 2685bb1166..ead8ba5ebf 100644 --- a/asm/nonmatchings/code_de740_len_23f0/_play_sound.s +++ b/asm/nonmatchings/code_de740_len_23f0/_play_sound.s @@ -40,7 +40,7 @@ glabel _play_sound /* E023C 80149B3C 0C052642 */ jal func_80149908 /* E0240 80149B40 00073C03 */ sra $a3, $a3, 0x10 /* E0244 80149B44 080526F6 */ j .L80149BD8 -/* E0248 80149B48 00000000 */ nop +/* E0248 80149B48 00000000 */ nop .L80149B4C: /* E024C 80149B4C 3C028015 */ lui $v0, %hi(gCurrentDoorSoundsSet) /* E0250 80149B50 94421340 */ lhu $v0, %lo(gCurrentDoorSoundsSet)($v0) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80148040.s b/asm/nonmatchings/code_de740_len_23f0/func_80148040.s index f390e68a61..ef3b7522fd 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80148040.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80148040.s @@ -5,7 +5,7 @@ glabel func_80148040 /* DE740 80148040 27BDFFE8 */ addiu $sp, $sp, -0x18 /* DE744 80148044 AFBF0010 */ sw $ra, 0x10($sp) /* DE748 80148048 0C05203C */ jal func_801480F0 -/* DE74C 8014804C 00000000 */ nop +/* DE74C 8014804C 00000000 */ nop /* DE750 80148050 0000202D */ daddu $a0, $zero, $zero /* DE754 80148054 3C068015 */ lui $a2, %hi(D_80151328) /* DE758 80148058 24C61328 */ addiu $a2, $a2, %lo(D_80151328) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s b/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s index 745992308d..078d4a66b4 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801480F0.s @@ -6,7 +6,7 @@ glabel func_801480F0 /* DE7F4 801480F4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* DE7F8 801480F8 80420070 */ lb $v0, 0x70($v0) /* DE7FC 801480FC 1440000B */ bnez $v0, .L8014812C -/* DE800 80148100 00000000 */ nop +/* DE800 80148100 00000000 */ nop /* DE804 80148104 3C028016 */ lui $v0, %hi(D_801595C0) /* DE808 80148108 244295C0 */ addiu $v0, $v0, %lo(D_801595C0) /* DE80C 8014810C 3C018015 */ lui $at, %hi(D_80151328) @@ -16,7 +16,7 @@ glabel func_801480F0 /* DE81C 8014811C 3C018015 */ lui $at, %hi(D_801512B0) /* DE820 80148120 AC2212B0 */ sw $v0, %lo(D_801512B0)($at) /* DE824 80148124 03E00008 */ jr $ra -/* DE828 80148128 00000000 */ nop +/* DE828 80148128 00000000 */ nop .L8014812C: /* DE82C 8014812C 3C028016 */ lui $v0, %hi(D_80159670) /* DE830 80148130 24429670 */ addiu $v0, $v0, %lo(D_80159670) @@ -27,4 +27,4 @@ glabel func_801480F0 /* DE844 80148144 3C018015 */ lui $at, %hi(D_801512B0) /* DE848 80148148 AC2212B0 */ sw $v0, %lo(D_801512B0)($at) /* DE84C 8014814C 03E00008 */ jr $ra -/* DE850 80148150 00000000 */ nop +/* DE850 80148150 00000000 */ nop diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80148154.s b/asm/nonmatchings/code_de740_len_23f0/func_80148154.s index 650f60e5dc..a7d6fd762b 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80148154.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80148154.s @@ -30,4 +30,4 @@ glabel func_80148154 /* DE8B8 801481B8 E4600010 */ swc1 $f0, 0x10($v1) .L801481BC: /* DE8BC 801481BC 03E00008 */ jr $ra -/* DE8C0 801481C0 00000000 */ nop +/* DE8C0 801481C0 00000000 */ nop diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s b/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s index 7513c69eb7..d6c370bf5d 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801481C4.s @@ -53,7 +53,7 @@ glabel func_801481C4 /* DE984 80148284 E7B2008C */ swc1 $f18, 0x8c($sp) /* DE988 80148288 C6720028 */ lwc1 $f18, 0x28($s3) /* DE98C 8014828C 46001082 */ mul.s $f2, $f2, $f0 -/* DE990 80148290 00000000 */ nop +/* DE990 80148290 00000000 */ nop /* DE994 80148294 E7B20068 */ swc1 $f18, 0x68($sp) /* DE998 80148298 C44000FC */ lwc1 $f0, 0xfc($v0) /* DE99C 8014829C C7B20080 */ lwc1 $f18, 0x80($sp) @@ -64,23 +64,23 @@ glabel func_801481C4 /* DE9B0 801482B0 C7B20068 */ lwc1 $f18, 0x68($sp) /* DE9B4 801482B4 8FB5010C */ lw $s5, 0x10c($sp) /* DE9B8 801482B8 46009002 */ mul.s $f0, $f18, $f0 -/* DE9BC 801482BC 00000000 */ nop +/* DE9BC 801482BC 00000000 */ nop /* DE9C0 801482C0 C7B20080 */ lwc1 $f18, 0x80($sp) /* DE9C4 801482C4 E7B20094 */ swc1 $f18, 0x94($sp) /* DE9C8 801482C8 904300AC */ lbu $v1, 0xac($v0) /* DE9CC 801482CC E7B20098 */ swc1 $f18, 0x98($sp) /* DE9D0 801482D0 44839000 */ mtc1 $v1, $f18 -/* DE9D4 801482D4 00000000 */ nop +/* DE9D4 801482D4 00000000 */ nop /* DE9D8 801482D8 468094A0 */ cvt.s.w $f18, $f18 /* DE9DC 801482DC E7B2006C */ swc1 $f18, 0x6c($sp) /* DE9E0 801482E0 904300AD */ lbu $v1, 0xad($v0) /* DE9E4 801482E4 904200AE */ lbu $v0, 0xae($v0) /* DE9E8 801482E8 44839000 */ mtc1 $v1, $f18 -/* DE9EC 801482EC 00000000 */ nop +/* DE9EC 801482EC 00000000 */ nop /* DE9F0 801482F0 468094A0 */ cvt.s.w $f18, $f18 /* DE9F4 801482F4 E7B20070 */ swc1 $f18, 0x70($sp) /* DE9F8 801482F8 44829000 */ mtc1 $v0, $f18 -/* DE9FC 801482FC 00000000 */ nop +/* DE9FC 801482FC 00000000 */ nop /* DEA00 80148300 468094A0 */ cvt.s.w $f18, $f18 /* DEA04 80148304 E7B20074 */ swc1 $f18, 0x74($sp) /* DEA08 80148308 46001080 */ add.s $f2, $f2, $f0 @@ -99,7 +99,7 @@ glabel func_801481C4 /* DEA3C 8014833C 00C0F02D */ daddu $fp, $a2, $zero /* DEA40 80148340 3C013F80 */ lui $at, 0x3f80 /* DEA44 80148344 44819000 */ mtc1 $at, $f18 -/* DEA48 80148348 00000000 */ nop +/* DEA48 80148348 00000000 */ nop /* DEA4C 8014834C E7B20060 */ swc1 $f18, 0x60($sp) .L80148350: /* DEA50 80148350 0000902D */ daddu $s2, $zero, $zero @@ -117,28 +117,28 @@ glabel func_801481C4 /* DEA7C 8014837C C7B20054 */ lwc1 $f18, 0x54($sp) /* DEA80 80148380 46009681 */ sub.s $f26, $f18, $f0 /* DEA84 80148384 461AD082 */ mul.s $f2, $f26, $f26 -/* DEA88 80148388 00000000 */ nop +/* DEA88 80148388 00000000 */ nop /* DEA8C 8014838C C6000008 */ lwc1 $f0, 8($s0) /* DEA90 80148390 C7B20058 */ lwc1 $f18, 0x58($sp) /* DEA94 80148394 46009601 */ sub.s $f24, $f18, $f0 /* DEA98 80148398 4618C102 */ mul.s $f4, $f24, $f24 -/* DEA9C 8014839C 00000000 */ nop +/* DEA9C 8014839C 00000000 */ nop /* DEAA0 801483A0 C600000C */ lwc1 $f0, 0xc($s0) /* DEAA4 801483A4 C7B2005C */ lwc1 $f18, 0x5c($sp) /* DEAA8 801483A8 46009581 */ sub.s $f22, $f18, $f0 /* DEAAC 801483AC 4616B002 */ mul.s $f0, $f22, $f22 -/* DEAB0 801483B0 00000000 */ nop +/* DEAB0 801483B0 00000000 */ nop /* DEAB4 801483B4 46041080 */ add.s $f2, $f2, $f4 /* DEAB8 801483B8 46001500 */ add.s $f20, $f2, $f0 /* DEABC 801483BC 461CA032 */ c.eq.s $f20, $f28 -/* DEAC0 801483C0 00000000 */ nop +/* DEAC0 801483C0 00000000 */ nop /* DEAC4 801483C4 4501000D */ bc1t .L801483FC /* DEAC8 801483C8 4600E086 */ mov.s $f2, $f28 /* DEACC 801483CC 4600A004 */ sqrt.s $f0, $f20 /* DEAD0 801483D0 46000032 */ c.eq.s $f0, $f0 -/* DEAD4 801483D4 00000000 */ nop +/* DEAD4 801483D4 00000000 */ nop /* DEAD8 801483D8 45010003 */ bc1t .L801483E8 -/* DEADC 801483DC 00000000 */ nop +/* DEADC 801483DC 00000000 */ nop /* DEAE0 801483E0 0C0187BC */ jal sqrtf /* DEAE4 801483E4 4600A306 */ mov.s $f12, $f20 .L801483E8: @@ -151,66 +151,66 @@ glabel func_801481C4 /* DEAFC 801483FC 4600E006 */ mov.s $f0, $f28 .L80148400: /* DEB00 80148400 4600D682 */ mul.s $f26, $f26, $f0 -/* DEB04 80148404 00000000 */ nop +/* DEB04 80148404 00000000 */ nop /* DEB08 80148408 4600C602 */ mul.s $f24, $f24, $f0 -/* DEB0C 8014840C 00000000 */ nop +/* DEB0C 8014840C 00000000 */ nop /* DEB10 80148410 92030000 */ lbu $v1, ($s0) /* DEB14 80148414 4600B582 */ mul.s $f22, $f22, $f0 -/* DEB18 80148418 00000000 */ nop +/* DEB18 80148418 00000000 */ nop /* DEB1C 8014841C 30620004 */ andi $v0, $v1, 4 /* DEB20 80148420 5040000E */ beql $v0, $zero, .L8014845C /* DEB24 80148424 30620008 */ andi $v0, $v1, 8 /* DEB28 80148428 461C1032 */ c.eq.s $f2, $f28 -/* DEB2C 8014842C 00000000 */ nop +/* DEB2C 8014842C 00000000 */ nop /* DEB30 80148430 45000006 */ bc1f .L8014844C -/* DEB34 80148434 00000000 */ nop +/* DEB34 80148434 00000000 */ nop /* DEB38 80148438 C6000010 */ lwc1 $f0, 0x10($s0) /* DEB3C 8014843C 461C0032 */ c.eq.s $f0, $f28 -/* DEB40 80148440 00000000 */ nop +/* DEB40 80148440 00000000 */ nop /* DEB44 80148444 4501001E */ bc1t .L801484C0 -/* DEB48 80148448 00000000 */ nop +/* DEB48 80148448 00000000 */ nop .L8014844C: /* DEB4C 8014844C C6000010 */ lwc1 $f0, 0x10($s0) /* DEB50 80148450 46001002 */ mul.s $f0, $f2, $f0 /* DEB54 80148454 08052125 */ j .L80148494 -/* DEB58 80148458 00000000 */ nop +/* DEB58 80148458 00000000 */ nop .L8014845C: /* DEB5C 8014845C 10400018 */ beqz $v0, .L801484C0 -/* DEB60 80148460 00000000 */ nop +/* DEB60 80148460 00000000 */ nop /* DEB64 80148464 461CA032 */ c.eq.s $f20, $f28 -/* DEB68 80148468 00000000 */ nop +/* DEB68 80148468 00000000 */ nop /* DEB6C 8014846C 45000006 */ bc1f .L80148488 -/* DEB70 80148470 00000000 */ nop +/* DEB70 80148470 00000000 */ nop /* DEB74 80148474 C6000010 */ lwc1 $f0, 0x10($s0) /* DEB78 80148478 461C0032 */ c.eq.s $f0, $f28 -/* DEB7C 8014847C 00000000 */ nop +/* DEB7C 8014847C 00000000 */ nop /* DEB80 80148480 4501000F */ bc1t .L801484C0 -/* DEB84 80148484 00000000 */ nop +/* DEB84 80148484 00000000 */ nop .L80148488: /* DEB88 80148488 C6000010 */ lwc1 $f0, 0x10($s0) /* DEB8C 8014848C 4600A002 */ mul.s $f0, $f20, $f0 -/* DEB90 80148490 00000000 */ nop +/* DEB90 80148490 00000000 */ nop .L80148494: /* DEB94 80148494 3C013F80 */ lui $at, 0x3f80 /* DEB98 80148498 44819000 */ mtc1 $at, $f18 -/* DEB9C 8014849C 00000000 */ nop +/* DEB9C 8014849C 00000000 */ nop /* DEBA0 801484A0 46009203 */ div.s $f8, $f18, $f0 /* DEBA4 801484A4 4608D682 */ mul.s $f26, $f26, $f8 -/* DEBA8 801484A8 00000000 */ nop +/* DEBA8 801484A8 00000000 */ nop /* DEBAC 801484AC 4608C602 */ mul.s $f24, $f24, $f8 -/* DEBB0 801484B0 00000000 */ nop +/* DEBB0 801484B0 00000000 */ nop /* DEBB4 801484B4 4608B582 */ mul.s $f22, $f22, $f8 /* DEBB8 801484B8 08052132 */ j .L801484C8 -/* DEBBC 801484BC 00000000 */ nop +/* DEBBC 801484BC 00000000 */ nop .L801484C0: /* DEBC0 801484C0 3C013F80 */ lui $at, 0x3f80 /* DEBC4 801484C4 44814000 */ mtc1 $at, $f8 .L801484C8: /* DEBC8 801484C8 3C013F80 */ lui $at, 0x3f80 /* DEBCC 801484CC 44819000 */ mtc1 $at, $f18 -/* DEBD0 801484D0 00000000 */ nop +/* DEBD0 801484D0 00000000 */ nop /* DEBD4 801484D4 4608903C */ c.lt.s $f18, $f8 -/* DEBD8 801484D8 00000000 */ nop +/* DEBD8 801484D8 00000000 */ nop /* DEBDC 801484DC 45030001 */ bc1tl .L801484E4 /* DEBE0 801484E0 46009206 */ mov.s $f8, $f18 .L801484E4: @@ -225,7 +225,7 @@ glabel func_801481C4 /* DEC04 80148504 E7B20050 */ swc1 $f18, 0x50($sp) /* DEC08 80148508 C7B20060 */ lwc1 $f18, 0x60($sp) /* DEC0C 8014850C 461C903C */ c.lt.s $f18, $f28 -/* DEC10 80148510 00000000 */ nop +/* DEC10 80148510 00000000 */ nop /* DEC14 80148514 45000005 */ bc1f .L8014852C /* DEC18 80148518 4600F086 */ mov.s $f2, $f30 /* DEC1C 8014851C C7B20068 */ lwc1 $f18, 0x68($sp) @@ -238,15 +238,15 @@ glabel func_801481C4 /* DEC34 80148534 46009007 */ neg.s $f0, $f18 .L80148538: /* DEC38 80148538 461A0002 */ mul.s $f0, $f0, $f26 -/* DEC3C 8014853C 00000000 */ nop +/* DEC3C 8014853C 00000000 */ nop /* DEC40 80148540 46181082 */ mul.s $f2, $f2, $f24 -/* DEC44 80148544 00000000 */ nop +/* DEC44 80148544 00000000 */ nop /* DEC48 80148548 46162102 */ mul.s $f4, $f4, $f22 -/* DEC4C 8014854C 00000000 */ nop +/* DEC4C 8014854C 00000000 */ nop /* DEC50 80148550 46020000 */ add.s $f0, $f0, $f2 /* DEC54 80148554 C7B20060 */ lwc1 $f18, 0x60($sp) /* DEC58 80148558 461C903C */ c.lt.s $f18, $f28 -/* DEC5C 8014855C 00000000 */ nop +/* DEC5C 8014855C 00000000 */ nop /* DEC60 80148560 45000005 */ bc1f .L80148578 /* DEC64 80148564 46040280 */ add.s $f10, $f0, $f4 /* DEC68 80148568 C7A20068 */ lwc1 $f2, 0x68($sp) @@ -261,97 +261,97 @@ glabel func_801481C4 /* DEC88 80148588 46009187 */ neg.s $f6, $f18 .L8014858C: /* DEC8C 8014858C 461A1082 */ mul.s $f2, $f2, $f26 -/* DEC90 80148590 00000000 */ nop +/* DEC90 80148590 00000000 */ nop /* DEC94 80148594 46182102 */ mul.s $f4, $f4, $f24 -/* DEC98 80148598 00000000 */ nop +/* DEC98 80148598 00000000 */ nop /* DEC9C 8014859C 46163182 */ mul.s $f6, $f6, $f22 -/* DECA0 801485A0 00000000 */ nop +/* DECA0 801485A0 00000000 */ nop /* DECA4 801485A4 46005005 */ abs.s $f0, $f10 /* DECA8 801485A8 46004302 */ mul.s $f12, $f8, $f0 -/* DECAC 801485AC 00000000 */ nop +/* DECAC 801485AC 00000000 */ nop /* DECB0 801485B0 46041080 */ add.s $f2, $f2, $f4 /* DECB4 801485B4 46061400 */ add.s $f16, $f2, $f6 /* DECB8 801485B8 460AE03C */ c.lt.s $f28, $f10 /* DECBC 801485BC 46008005 */ abs.s $f0, $f16 /* DECC0 801485C0 46004182 */ mul.s $f6, $f8, $f0 -/* DECC4 801485C4 00000000 */ nop +/* DECC4 801485C4 00000000 */ nop /* DECC8 801485C8 45000021 */ bc1f .L80148650 /* DECCC 801485CC 46008506 */ mov.s $f20, $f16 /* DECD0 801485D0 92020001 */ lbu $v0, 1($s0) /* DECD4 801485D4 44827000 */ mtc1 $v0, $f14 -/* DECD8 801485D8 00000000 */ nop +/* DECD8 801485D8 00000000 */ nop /* DECDC 801485DC 468073A0 */ cvt.s.w $f14, $f14 /* DECE0 801485E0 460C7102 */ mul.s $f4, $f14, $f12 -/* DECE4 801485E4 00000000 */ nop +/* DECE4 801485E4 00000000 */ nop /* DECE8 801485E8 C7B20078 */ lwc1 $f18, 0x78($sp) /* DECEC 801485EC 92020002 */ lbu $v0, 2($s0) /* DECF0 801485F0 46049480 */ add.s $f18, $f18, $f4 /* DECF4 801485F4 44825000 */ mtc1 $v0, $f10 -/* DECF8 801485F8 00000000 */ nop +/* DECF8 801485F8 00000000 */ nop /* DECFC 801485FC 468052A0 */ cvt.s.w $f10, $f10 /* DED00 80148600 92020003 */ lbu $v0, 3($s0) /* DED04 80148604 460C5082 */ mul.s $f2, $f10, $f12 -/* DED08 80148608 00000000 */ nop +/* DED08 80148608 00000000 */ nop /* DED0C 8014860C E7B20078 */ swc1 $f18, 0x78($sp) /* DED10 80148610 C7B2007C */ lwc1 $f18, 0x7c($sp) /* DED14 80148614 46029480 */ add.s $f18, $f18, $f2 /* DED18 80148618 44824000 */ mtc1 $v0, $f8 -/* DED1C 8014861C 00000000 */ nop +/* DED1C 8014861C 00000000 */ nop /* DED20 80148620 46804220 */ cvt.s.w $f8, $f8 /* DED24 80148624 460C4002 */ mul.s $f0, $f8, $f12 -/* DED28 80148628 00000000 */ nop +/* DED28 80148628 00000000 */ nop /* DED2C 8014862C E7B2007C */ swc1 $f18, 0x7c($sp) /* DED30 80148630 C7B20080 */ lwc1 $f18, 0x80($sp) /* DED34 80148634 46009480 */ add.s $f18, $f18, $f0 /* DED38 80148638 4610E03C */ c.lt.s $f28, $f16 -/* DED3C 8014863C 00000000 */ nop +/* DED3C 8014863C 00000000 */ nop /* DED40 80148640 45010021 */ bc1t .L801486C8 /* DED44 80148644 E7B20080 */ swc1 $f18, 0x80($sp) /* DED48 80148648 080521C2 */ j .L80148708 -/* DED4C 8014864C 00000000 */ nop +/* DED4C 8014864C 00000000 */ nop .L80148650: /* DED50 80148650 92020001 */ lbu $v0, 1($s0) /* DED54 80148654 44827000 */ mtc1 $v0, $f14 -/* DED58 80148658 00000000 */ nop +/* DED58 80148658 00000000 */ nop /* DED5C 8014865C 468073A0 */ cvt.s.w $f14, $f14 /* DED60 80148660 460C7102 */ mul.s $f4, $f14, $f12 -/* DED64 80148664 00000000 */ nop +/* DED64 80148664 00000000 */ nop /* DED68 80148668 C7B2006C */ lwc1 $f18, 0x6c($sp) /* DED6C 8014866C 92020002 */ lbu $v0, 2($s0) /* DED70 80148670 46049480 */ add.s $f18, $f18, $f4 /* DED74 80148674 44825000 */ mtc1 $v0, $f10 -/* DED78 80148678 00000000 */ nop +/* DED78 80148678 00000000 */ nop /* DED7C 8014867C 468052A0 */ cvt.s.w $f10, $f10 /* DED80 80148680 92020003 */ lbu $v0, 3($s0) /* DED84 80148684 460C5082 */ mul.s $f2, $f10, $f12 -/* DED88 80148688 00000000 */ nop +/* DED88 80148688 00000000 */ nop /* DED8C 8014868C E7B2006C */ swc1 $f18, 0x6c($sp) /* DED90 80148690 C7B20070 */ lwc1 $f18, 0x70($sp) /* DED94 80148694 46029480 */ add.s $f18, $f18, $f2 /* DED98 80148698 44824000 */ mtc1 $v0, $f8 -/* DED9C 8014869C 00000000 */ nop +/* DED9C 8014869C 00000000 */ nop /* DEDA0 801486A0 46804220 */ cvt.s.w $f8, $f8 /* DEDA4 801486A4 460C4002 */ mul.s $f0, $f8, $f12 -/* DEDA8 801486A8 00000000 */ nop +/* DEDA8 801486A8 00000000 */ nop /* DEDAC 801486AC E7B20070 */ swc1 $f18, 0x70($sp) /* DEDB0 801486B0 C7B20074 */ lwc1 $f18, 0x74($sp) /* DEDB4 801486B4 46009480 */ add.s $f18, $f18, $f0 /* DEDB8 801486B8 4614E03C */ c.lt.s $f28, $f20 -/* DEDBC 801486BC 00000000 */ nop +/* DEDBC 801486BC 00000000 */ nop /* DEDC0 801486C0 45000011 */ bc1f .L80148708 /* DEDC4 801486C4 E7B20074 */ swc1 $f18, 0x74($sp) .L801486C8: /* DEDC8 801486C8 46067002 */ mul.s $f0, $f14, $f6 -/* DEDCC 801486CC 00000000 */ nop +/* DEDCC 801486CC 00000000 */ nop /* DEDD0 801486D0 C7B20084 */ lwc1 $f18, 0x84($sp) /* DEDD4 801486D4 46009480 */ add.s $f18, $f18, $f0 /* DEDD8 801486D8 46065082 */ mul.s $f2, $f10, $f6 -/* DEDDC 801486DC 00000000 */ nop +/* DEDDC 801486DC 00000000 */ nop /* DEDE0 801486E0 E7B20084 */ swc1 $f18, 0x84($sp) /* DEDE4 801486E4 C7B20088 */ lwc1 $f18, 0x88($sp) /* DEDE8 801486E8 46029480 */ add.s $f18, $f18, $f2 /* DEDEC 801486EC 46064102 */ mul.s $f4, $f8, $f6 -/* DEDF0 801486F0 00000000 */ nop +/* DEDF0 801486F0 00000000 */ nop /* DEDF4 801486F4 E7B20088 */ swc1 $f18, 0x88($sp) /* DEDF8 801486F8 C7B2008C */ lwc1 $f18, 0x8c($sp) /* DEDFC 801486FC 46049480 */ add.s $f18, $f18, $f4 @@ -359,16 +359,16 @@ glabel func_801481C4 /* DEE04 80148704 E7B2008C */ swc1 $f18, 0x8c($sp) .L80148708: /* DEE08 80148708 46067002 */ mul.s $f0, $f14, $f6 -/* DEE0C 8014870C 00000000 */ nop +/* DEE0C 8014870C 00000000 */ nop /* DEE10 80148710 C7B20090 */ lwc1 $f18, 0x90($sp) /* DEE14 80148714 46009480 */ add.s $f18, $f18, $f0 /* DEE18 80148718 46065082 */ mul.s $f2, $f10, $f6 -/* DEE1C 8014871C 00000000 */ nop +/* DEE1C 8014871C 00000000 */ nop /* DEE20 80148720 E7B20090 */ swc1 $f18, 0x90($sp) /* DEE24 80148724 C7B20094 */ lwc1 $f18, 0x94($sp) /* DEE28 80148728 46029480 */ add.s $f18, $f18, $f2 /* DEE2C 8014872C 46064102 */ mul.s $f4, $f8, $f6 -/* DEE30 80148730 00000000 */ nop +/* DEE30 80148730 00000000 */ nop /* DEE34 80148734 E7B20094 */ swc1 $f18, 0x94($sp) /* DEE38 80148738 C7B20098 */ lwc1 $f18, 0x98($sp) /* DEE3C 8014873C 46049480 */ add.s $f18, $f18, $f4 @@ -382,7 +382,7 @@ glabel func_801481C4 /* DEE54 80148754 44800000 */ mtc1 $zero, $f0 /* DEE58 80148758 C7B20060 */ lwc1 $f18, 0x60($sp) /* DEE5C 8014875C 4600903C */ c.lt.s $f18, $f0 -/* DEE60 80148760 00000000 */ nop +/* DEE60 80148760 00000000 */ nop /* DEE64 80148764 45000004 */ bc1f .L80148778 /* DEE68 80148768 4600F086 */ mov.s $f2, $f30 /* DEE6C 8014876C C7A00068 */ lwc1 $f0, 0x68($sp) @@ -396,21 +396,21 @@ glabel func_801481C4 .L80148788: /* DEE88 80148788 C7B20048 */ lwc1 $f18, 0x48($sp) /* DEE8C 8014878C 46120002 */ mul.s $f0, $f0, $f18 -/* DEE90 80148790 00000000 */ nop +/* DEE90 80148790 00000000 */ nop /* DEE94 80148794 C7B2004C */ lwc1 $f18, 0x4c($sp) /* DEE98 80148798 46121082 */ mul.s $f2, $f2, $f18 -/* DEE9C 8014879C 00000000 */ nop +/* DEE9C 8014879C 00000000 */ nop /* DEEA0 801487A0 C7B20050 */ lwc1 $f18, 0x50($sp) /* DEEA4 801487A4 46122102 */ mul.s $f4, $f4, $f18 -/* DEEA8 801487A8 00000000 */ nop +/* DEEA8 801487A8 00000000 */ nop /* DEEAC 801487AC 46020000 */ add.s $f0, $f0, $f2 /* DEEB0 801487B0 46040000 */ add.s $f0, $f0, $f4 /* DEEB4 801487B4 44801000 */ mtc1 $zero, $f2 -/* DEEB8 801487B8 00000000 */ nop +/* DEEB8 801487B8 00000000 */ nop /* DEEBC 801487BC 4600103C */ c.lt.s $f2, $f0 -/* DEEC0 801487C0 00000000 */ nop +/* DEEC0 801487C0 00000000 */ nop /* DEEC4 801487C4 45000031 */ bc1f .L8014888C -/* DEEC8 801487C8 00000000 */ nop +/* DEEC8 801487C8 00000000 */ nop /* DEECC 801487CC C7B2006C */ lwc1 $f18, 0x6c($sp) /* DEED0 801487D0 4600948D */ trunc.w.s $f18, $f18 /* DEED4 801487D4 E7B20024 */ swc1 $f18, 0x24($sp) @@ -433,7 +433,7 @@ glabel func_801481C4 /* DEF18 80148818 906200AC */ lbu $v0, 0xac($v1) /* DEF1C 8014881C C7B20078 */ lwc1 $f18, 0x78($sp) /* DEF20 80148820 44820000 */ mtc1 $v0, $f0 -/* DEF24 80148824 00000000 */ nop +/* DEF24 80148824 00000000 */ nop /* DEF28 80148828 46800020 */ cvt.s.w $f0, $f0 /* DEF2C 8014882C 46120000 */ add.s $f0, $f0, $f18 /* DEF30 80148830 C7B20084 */ lwc1 $f18, 0x84($sp) @@ -443,7 +443,7 @@ glabel func_801481C4 /* DEF40 80148840 906200AD */ lbu $v0, 0xad($v1) /* DEF44 80148844 C7B2007C */ lwc1 $f18, 0x7c($sp) /* DEF48 80148848 44820000 */ mtc1 $v0, $f0 -/* DEF4C 8014884C 00000000 */ nop +/* DEF4C 8014884C 00000000 */ nop /* DEF50 80148850 46800020 */ cvt.s.w $f0, $f0 /* DEF54 80148854 46120000 */ add.s $f0, $f0, $f18 /* DEF58 80148858 C7B20088 */ lwc1 $f18, 0x88($sp) @@ -453,7 +453,7 @@ glabel func_801481C4 /* DEF68 80148868 906200AE */ lbu $v0, 0xae($v1) /* DEF6C 8014886C C7B20080 */ lwc1 $f18, 0x80($sp) /* DEF70 80148870 44820000 */ mtc1 $v0, $f0 -/* DEF74 80148874 00000000 */ nop +/* DEF74 80148874 00000000 */ nop /* DEF78 80148878 46800020 */ cvt.s.w $f0, $f0 /* DEF7C 8014887C 46120000 */ add.s $f0, $f0, $f18 /* DEF80 80148880 C7B2008C */ lwc1 $f18, 0x8c($sp) @@ -482,7 +482,7 @@ glabel func_801481C4 /* DEFD8 801488D8 906200AC */ lbu $v0, 0xac($v1) /* DEFDC 801488DC C7B20078 */ lwc1 $f18, 0x78($sp) /* DEFE0 801488E0 44820000 */ mtc1 $v0, $f0 -/* DEFE4 801488E4 00000000 */ nop +/* DEFE4 801488E4 00000000 */ nop /* DEFE8 801488E8 46800020 */ cvt.s.w $f0, $f0 /* DEFEC 801488EC 46120000 */ add.s $f0, $f0, $f18 /* DEFF0 801488F0 C7B20090 */ lwc1 $f18, 0x90($sp) @@ -492,7 +492,7 @@ glabel func_801481C4 /* DF000 80148900 906200AD */ lbu $v0, 0xad($v1) /* DF004 80148904 C7B2007C */ lwc1 $f18, 0x7c($sp) /* DF008 80148908 44820000 */ mtc1 $v0, $f0 -/* DF00C 8014890C 00000000 */ nop +/* DF00C 8014890C 00000000 */ nop /* DF010 80148910 46800020 */ cvt.s.w $f0, $f0 /* DF014 80148914 46120000 */ add.s $f0, $f0, $f18 /* DF018 80148918 C7B20094 */ lwc1 $f18, 0x94($sp) @@ -502,7 +502,7 @@ glabel func_801481C4 /* DF028 80148928 906200AE */ lbu $v0, 0xae($v1) /* DF02C 8014892C C7B20080 */ lwc1 $f18, 0x80($sp) /* DF030 80148930 44820000 */ mtc1 $v0, $f0 -/* DF034 80148934 00000000 */ nop +/* DF034 80148934 00000000 */ nop /* DF038 80148938 46800020 */ cvt.s.w $f0, $f0 /* DF03C 8014893C 46120000 */ add.s $f0, $f0, $f18 /* DF040 80148940 C7B20098 */ lwc1 $f18, 0x98($sp) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s b/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s index de995e4531..5243a9b9d8 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801489B8.s @@ -31,19 +31,19 @@ glabel func_801489B8 /* DF120 80148A20 24841D80 */ addiu $a0, $a0, %lo(gCameras) /* DF124 80148A24 AFBF003C */ sw $ra, 0x3c($sp) /* DF128 80148A28 4616B002 */ mul.s $f0, $f22, $f22 -/* DF12C 80148A2C 00000000 */ nop +/* DF12C 80148A2C 00000000 */ nop /* DF130 80148A30 AFBE0038 */ sw $fp, 0x38($sp) /* DF134 80148A34 AFB70034 */ sw $s7, 0x34($sp) /* DF138 80148A38 F7BE0068 */ sdc1 $f30, 0x68($sp) /* DF13C 80148A3C F7BA0058 */ sdc1 $f26, 0x58($sp) /* DF140 80148A40 4618C082 */ mul.s $f2, $f24, $f24 -/* DF144 80148A44 00000000 */ nop +/* DF144 80148A44 00000000 */ nop /* DF148 80148A48 AFA50074 */ sw $a1, 0x74($sp) /* DF14C 80148A4C AFA60078 */ sw $a2, 0x78($sp) /* DF150 80148A50 AFA7007C */ sw $a3, 0x7c($sp) /* DF154 80148A54 00031080 */ sll $v0, $v1, 2 /* DF158 80148A58 4614A102 */ mul.s $f4, $f20, $f20 -/* DF15C 80148A5C 00000000 */ nop +/* DF15C 80148A5C 00000000 */ nop /* DF160 80148A60 00431021 */ addu $v0, $v0, $v1 /* DF164 80148A64 00021080 */ sll $v0, $v0, 2 /* DF168 80148A68 00431023 */ subu $v0, $v0, $v1 @@ -57,64 +57,64 @@ glabel func_801489B8 /* DF188 80148A88 44801000 */ mtc1 $zero, $f2 /* DF18C 80148A8C 46006021 */ cvt.d.s $f0, $f12 /* DF190 80148A90 4622003C */ c.lt.d $f0, $f2 -/* DF194 80148A94 00000000 */ nop +/* DF194 80148A94 00000000 */ nop /* DF198 80148A98 45000008 */ bc1f .L80148ABC /* DF19C 80148A9C 0044F021 */ addu $fp, $v0, $a0 /* DF1A0 80148AA0 44900000 */ mtc1 $s0, $f0 -/* DF1A4 80148AA4 00000000 */ nop +/* DF1A4 80148AA4 00000000 */ nop /* DF1A8 80148AA8 46800020 */ cvt.s.w $f0, $f0 /* DF1AC 80148AAC 460C0002 */ mul.s $f0, $f0, $f12 -/* DF1B0 80148AB0 00000000 */ nop +/* DF1B0 80148AB0 00000000 */ nop /* DF1B4 80148AB4 4600028D */ trunc.w.s $f10, $f0 /* DF1B8 80148AB8 44105000 */ mfc1 $s0, $f10 .L80148ABC: /* DF1BC 80148ABC 461C6032 */ c.eq.s $f12, $f28 -/* DF1C0 80148AC0 00000000 */ nop +/* DF1C0 80148AC0 00000000 */ nop /* DF1C4 80148AC4 4501000D */ bc1t .L80148AFC -/* DF1C8 80148AC8 00000000 */ nop +/* DF1C8 80148AC8 00000000 */ nop /* DF1CC 80148ACC 46006084 */ sqrt.s $f2, $f12 /* DF1D0 80148AD0 46021032 */ c.eq.s $f2, $f2 -/* DF1D4 80148AD4 00000000 */ nop +/* DF1D4 80148AD4 00000000 */ nop /* DF1D8 80148AD8 45010004 */ bc1t .L80148AEC -/* DF1DC 80148ADC 00000000 */ nop +/* DF1DC 80148ADC 00000000 */ nop /* DF1E0 80148AE0 0C0187BC */ jal sqrtf -/* DF1E4 80148AE4 00000000 */ nop +/* DF1E4 80148AE4 00000000 */ nop /* DF1E8 80148AE8 46000086 */ mov.s $f2, $f0 .L80148AEC: /* DF1EC 80148AEC 3C013F80 */ lui $at, 0x3f80 /* DF1F0 80148AF0 44810000 */ mtc1 $at, $f0 -/* DF1F4 80148AF4 00000000 */ nop +/* DF1F4 80148AF4 00000000 */ nop /* DF1F8 80148AF8 46020303 */ div.s $f12, $f0, $f2 .L80148AFC: /* DF1FC 80148AFC 460CB582 */ mul.s $f22, $f22, $f12 -/* DF200 80148B00 00000000 */ nop +/* DF200 80148B00 00000000 */ nop /* DF204 80148B04 460CC602 */ mul.s $f24, $f24, $f12 -/* DF208 80148B08 00000000 */ nop +/* DF208 80148B08 00000000 */ nop /* DF20C 80148B0C 460CA502 */ mul.s $f20, $f20, $f12 -/* DF210 80148B10 00000000 */ nop +/* DF210 80148B10 00000000 */ nop /* DF214 80148B14 C6260008 */ lwc1 $f6, 8($s1) /* DF218 80148B18 C7C200DC */ lwc1 $f2, 0xdc($fp) /* DF21C 80148B1C 46003107 */ neg.s $f4, $f6 /* DF220 80148B20 46022082 */ mul.s $f2, $f4, $f2 -/* DF224 80148B24 00000000 */ nop +/* DF224 80148B24 00000000 */ nop /* DF228 80148B28 C6280028 */ lwc1 $f8, 0x28($s1) /* DF22C 80148B2C C7C000FC */ lwc1 $f0, 0xfc($fp) /* DF230 80148B30 46004002 */ mul.s $f0, $f8, $f0 -/* DF234 80148B34 00000000 */ nop +/* DF234 80148B34 00000000 */ nop /* DF238 80148B38 46001080 */ add.s $f2, $f2, $f0 /* DF23C 80148B3C 44800000 */ mtc1 $zero, $f0 /* DF240 80148B40 3C01BF80 */ lui $at, 0xbf80 /* DF244 80148B44 4481F000 */ mtc1 $at, $f30 /* DF248 80148B48 4600103C */ c.lt.s $f2, $f0 -/* DF24C 80148B4C 00000000 */ nop +/* DF24C 80148B4C 00000000 */ nop /* DF250 80148B50 45000004 */ bc1f .L80148B64 -/* DF254 80148B54 00000000 */ nop +/* DF254 80148B54 00000000 */ nop /* DF258 80148B58 3C013F80 */ lui $at, 0x3f80 /* DF25C 80148B5C 4481F000 */ mtc1 $at, $f30 -/* DF260 80148B60 00000000 */ nop +/* DF260 80148B60 00000000 */ nop .L80148B64: /* DF264 80148B64 4600F03C */ c.lt.s $f30, $f0 -/* DF268 80148B68 00000000 */ nop +/* DF268 80148B68 00000000 */ nop /* DF26C 80148B6C 45000004 */ bc1f .L80148B80 /* DF270 80148B70 46003086 */ mov.s $f2, $f6 /* DF274 80148B74 C6200018 */ lwc1 $f0, 0x18($s1) @@ -125,53 +125,53 @@ glabel func_801489B8 /* DF284 80148B84 C6200018 */ lwc1 $f0, 0x18($s1) .L80148B88: /* DF288 80148B88 46161102 */ mul.s $f4, $f2, $f22 -/* DF28C 80148B8C 00000000 */ nop +/* DF28C 80148B8C 00000000 */ nop /* DF290 80148B90 46180002 */ mul.s $f0, $f0, $f24 -/* DF294 80148B94 00000000 */ nop +/* DF294 80148B94 00000000 */ nop /* DF298 80148B98 46144202 */ mul.s $f8, $f8, $f20 -/* DF29C 80148B9C 00000000 */ nop +/* DF29C 80148B9C 00000000 */ nop /* DF2A0 80148BA0 C7C200FC */ lwc1 $f2, 0xfc($fp) /* DF2A4 80148BA4 46001087 */ neg.s $f2, $f2 /* DF2A8 80148BA8 4602B082 */ mul.s $f2, $f22, $f2 -/* DF2AC 80148BAC 00000000 */ nop +/* DF2AC 80148BAC 00000000 */ nop /* DF2B0 80148BB0 C7C600DC */ lwc1 $f6, 0xdc($fp) /* DF2B4 80148BB4 4606A182 */ mul.s $f6, $f20, $f6 -/* DF2B8 80148BB8 00000000 */ nop +/* DF2B8 80148BB8 00000000 */ nop /* DF2BC 80148BBC 46002100 */ add.s $f4, $f4, $f0 /* DF2C0 80148BC0 46082100 */ add.s $f4, $f4, $f8 /* DF2C4 80148BC4 44800000 */ mtc1 $zero, $f0 -/* DF2C8 80148BC8 00000000 */ nop +/* DF2C8 80148BC8 00000000 */ nop /* DF2CC 80148BCC 4604003C */ c.lt.s $f0, $f4 -/* DF2D0 80148BD0 00000000 */ nop +/* DF2D0 80148BD0 00000000 */ nop /* DF2D4 80148BD4 45000007 */ bc1f .L80148BF4 /* DF2D8 80148BD8 46061180 */ add.s $f6, $f2, $f6 /* DF2DC 80148BDC 44900000 */ mtc1 $s0, $f0 -/* DF2E0 80148BE0 00000000 */ nop +/* DF2E0 80148BE0 00000000 */ nop /* DF2E4 80148BE4 46800020 */ cvt.s.w $f0, $f0 /* DF2E8 80148BE8 46060682 */ mul.s $f26, $f0, $f6 /* DF2EC 80148BEC 08052302 */ j .L80148C08 -/* DF2F0 80148BF0 00000000 */ nop +/* DF2F0 80148BF0 00000000 */ nop .L80148BF4: /* DF2F4 80148BF4 44901000 */ mtc1 $s0, $f2 -/* DF2F8 80148BF8 00000000 */ nop +/* DF2F8 80148BF8 00000000 */ nop /* DF2FC 80148BFC 468010A0 */ cvt.s.w $f2, $f2 /* DF300 80148C00 46061682 */ mul.s $f26, $f2, $f6 -/* DF304 80148C04 00000000 */ nop +/* DF304 80148C04 00000000 */ nop .L80148C08: /* DF308 80148C08 4616B002 */ mul.s $f0, $f22, $f22 -/* DF30C 80148C0C 00000000 */ nop +/* DF30C 80148C0C 00000000 */ nop /* DF310 80148C10 4614A082 */ mul.s $f2, $f20, $f20 -/* DF314 80148C14 00000000 */ nop +/* DF314 80148C14 00000000 */ nop /* DF318 80148C18 46020500 */ add.s $f20, $f0, $f2 /* DF31C 80148C1C 44800000 */ mtc1 $zero, $f0 -/* DF320 80148C20 00000000 */ nop +/* DF320 80148C20 00000000 */ nop /* DF324 80148C24 4600A032 */ c.eq.s $f20, $f0 -/* DF328 80148C28 00000000 */ nop +/* DF328 80148C28 00000000 */ nop /* DF32C 80148C2C 45010009 */ bc1t .L80148C54 -/* DF330 80148C30 00000000 */ nop +/* DF330 80148C30 00000000 */ nop /* DF334 80148C34 4600A004 */ sqrt.s $f0, $f20 /* DF338 80148C38 46000032 */ c.eq.s $f0, $f0 -/* DF33C 80148C3C 00000000 */ nop +/* DF33C 80148C3C 00000000 */ nop /* DF340 80148C40 45030004 */ bc1tl .L80148C54 /* DF344 80148C44 46000506 */ mov.s $f20, $f0 /* DF348 80148C48 0C0187BC */ jal sqrtf @@ -181,38 +181,38 @@ glabel func_801489B8 /* DF354 80148C54 C6200004 */ lwc1 $f0, 4($s1) /* DF358 80148C58 46000007 */ neg.s $f0, $f0 /* DF35C 80148C5C 46000002 */ mul.s $f0, $f0, $f0 -/* DF360 80148C60 00000000 */ nop +/* DF360 80148C60 00000000 */ nop /* DF364 80148C64 C6220024 */ lwc1 $f2, 0x24($s1) /* DF368 80148C68 46021082 */ mul.s $f2, $f2, $f2 -/* DF36C 80148C6C 00000000 */ nop +/* DF36C 80148C6C 00000000 */ nop /* DF370 80148C70 46020300 */ add.s $f12, $f0, $f2 /* DF374 80148C74 44800000 */ mtc1 $zero, $f0 /* DF378 80148C78 C6360014 */ lwc1 $f22, 0x14($s1) /* DF37C 80148C7C 46006032 */ c.eq.s $f12, $f0 -/* DF380 80148C80 00000000 */ nop +/* DF380 80148C80 00000000 */ nop /* DF384 80148C84 45010009 */ bc1t .L80148CAC -/* DF388 80148C88 00000000 */ nop +/* DF388 80148C88 00000000 */ nop /* DF38C 80148C8C 46006004 */ sqrt.s $f0, $f12 /* DF390 80148C90 46000032 */ c.eq.s $f0, $f0 -/* DF394 80148C94 00000000 */ nop +/* DF394 80148C94 00000000 */ nop /* DF398 80148C98 45030004 */ bc1tl .L80148CAC /* DF39C 80148C9C 46000306 */ mov.s $f12, $f0 /* DF3A0 80148CA0 0C0187BC */ jal sqrtf -/* DF3A4 80148CA4 00000000 */ nop +/* DF3A4 80148CA4 00000000 */ nop /* DF3A8 80148CA8 46000306 */ mov.s $f12, $f0 .L80148CAC: /* DF3AC 80148CAC 460CA002 */ mul.s $f0, $f20, $f12 -/* DF3B0 80148CB0 00000000 */ nop +/* DF3B0 80148CB0 00000000 */ nop /* DF3B4 80148CB4 4616C082 */ mul.s $f2, $f24, $f22 -/* DF3B8 80148CB8 00000000 */ nop +/* DF3B8 80148CB8 00000000 */ nop /* DF3BC 80148CBC 46020000 */ add.s $f0, $f0, $f2 /* DF3C0 80148CC0 2A620100 */ slti $v0, $s3, 0x100 /* DF3C4 80148CC4 44901000 */ mtc1 $s0, $f2 -/* DF3C8 80148CC8 00000000 */ nop +/* DF3C8 80148CC8 00000000 */ nop /* DF3CC 80148CCC 468010A0 */ cvt.s.w $f2, $f2 /* DF3D0 80148CD0 46000007 */ neg.s $f0, $f0 /* DF3D4 80148CD4 46020702 */ mul.s $f28, $f0, $f2 -/* DF3D8 80148CD8 00000000 */ nop +/* DF3D8 80148CD8 00000000 */ nop /* DF3DC 80148CDC 50400001 */ beql $v0, $zero, .L80148CE4 /* DF3E0 80148CE0 241300FF */ addiu $s3, $zero, 0xff .L80148CE4: @@ -376,27 +376,27 @@ glabel func_801489B8 /* DF644 80148F44 87C2000E */ lh $v0, 0xe($fp) /* DF648 80148F48 87C30010 */ lh $v1, 0x10($fp) /* DF64C 80148F4C 44821000 */ mtc1 $v0, $f2 -/* DF650 80148F50 00000000 */ nop +/* DF650 80148F50 00000000 */ nop /* DF654 80148F54 468010A0 */ cvt.s.w $f2, $f2 /* DF658 80148F58 46041082 */ mul.s $f2, $f2, $f4 -/* DF65C 80148F5C 00000000 */ nop +/* DF65C 80148F5C 00000000 */ nop /* DF660 80148F60 25420020 */ addiu $v0, $t2, 0x20 /* DF664 80148F64 44830000 */ mtc1 $v1, $f0 -/* DF668 80148F68 00000000 */ nop +/* DF668 80148F68 00000000 */ nop /* DF66C 80148F6C 46800020 */ cvt.s.w $f0, $f0 /* DF670 80148F70 AEE20000 */ sw $v0, ($s7) /* DF674 80148F74 25420028 */ addiu $v0, $t2, 0x28 /* DF678 80148F78 46040002 */ mul.s $f0, $f0, $f4 -/* DF67C 80148F7C 00000000 */ nop +/* DF67C 80148F7C 00000000 */ nop /* DF680 80148F80 AEE20000 */ sw $v0, ($s7) /* DF684 80148F84 4600128D */ trunc.w.s $f10, $f2 /* DF688 80148F88 44035000 */ mfc1 $v1, $f10 -/* DF68C 80148F8C 00000000 */ nop +/* DF68C 80148F8C 00000000 */ nop /* DF690 80148F90 30630FFF */ andi $v1, $v1, 0xfff /* DF694 80148F94 00031B00 */ sll $v1, $v1, 0xc /* DF698 80148F98 4600028D */ trunc.w.s $f10, $f0 /* DF69C 80148F9C 44025000 */ mfc1 $v0, $f10 -/* DF6A0 80148FA0 00000000 */ nop +/* DF6A0 80148FA0 00000000 */ nop /* DF6A4 80148FA4 30420FFF */ andi $v0, $v0, 0xfff /* DF6A8 80148FA8 00521025 */ or $v0, $v0, $s2 /* DF6AC 80148FAC 00621825 */ or $v1, $v1, $v0 @@ -408,29 +408,29 @@ glabel func_801489B8 /* DF6C4 80148FC4 87C20010 */ lh $v0, 0x10($fp) /* DF6C8 80148FC8 00641821 */ addu $v1, $v1, $a0 /* DF6CC 80148FCC 44831000 */ mtc1 $v1, $f2 -/* DF6D0 80148FD0 00000000 */ nop +/* DF6D0 80148FD0 00000000 */ nop /* DF6D4 80148FD4 468010A0 */ cvt.s.w $f2, $f2 /* DF6D8 80148FD8 25440038 */ addiu $a0, $t2, 0x38 /* DF6DC 80148FDC 87C3000C */ lh $v1, 0xc($fp) /* DF6E0 80148FE0 46041082 */ mul.s $f2, $f2, $f4 -/* DF6E4 80148FE4 00000000 */ nop +/* DF6E4 80148FE4 00000000 */ nop /* DF6E8 80148FE8 AEE40000 */ sw $a0, ($s7) /* DF6EC 80148FEC 00431021 */ addu $v0, $v0, $v1 /* DF6F0 80148FF0 44820000 */ mtc1 $v0, $f0 -/* DF6F4 80148FF4 00000000 */ nop +/* DF6F4 80148FF4 00000000 */ nop /* DF6F8 80148FF8 46800020 */ cvt.s.w $f0, $f0 /* DF6FC 80148FFC 25420040 */ addiu $v0, $t2, 0x40 /* DF700 80149000 46040002 */ mul.s $f0, $f0, $f4 -/* DF704 80149004 00000000 */ nop +/* DF704 80149004 00000000 */ nop /* DF708 80149008 AEE20000 */ sw $v0, ($s7) /* DF70C 8014900C 4600128D */ trunc.w.s $f10, $f2 /* DF710 80149010 44025000 */ mfc1 $v0, $f10 -/* DF714 80149014 00000000 */ nop +/* DF714 80149014 00000000 */ nop /* DF718 80149018 30420FFF */ andi $v0, $v0, 0xfff /* DF71C 8014901C 00021300 */ sll $v0, $v0, 0xc /* DF720 80149020 4600028D */ trunc.w.s $f10, $f0 /* DF724 80149024 44035000 */ mfc1 $v1, $f10 -/* DF728 80149028 00000000 */ nop +/* DF728 80149028 00000000 */ nop /* DF72C 8014902C 30630FFF */ andi $v1, $v1, 0xfff /* DF730 80149030 00431025 */ or $v0, $v0, $v1 /* DF734 80149034 ACA20004 */ sw $v0, 4($a1) @@ -487,7 +487,7 @@ glabel func_801489B8 /* DF7F8 801490F8 2463A66C */ addiu $v1, $v1, %lo(gMasterGfxPos) /* DF7FC 801490FC 8C620000 */ lw $v0, ($v1) /* DF800 80149100 461ED002 */ mul.s $f0, $f26, $f30 -/* DF804 80149104 00000000 */ nop +/* DF804 80149104 00000000 */ nop /* DF808 80149108 0040382D */ daddu $a3, $v0, $zero /* DF80C 8014910C 24420008 */ addiu $v0, $v0, 8 /* DF810 80149110 AC620000 */ sw $v0, ($v1) @@ -497,7 +497,7 @@ glabel func_801489B8 /* DF820 80149120 00031880 */ sll $v1, $v1, 2 /* DF824 80149124 4600028D */ trunc.w.s $f10, $f0 /* DF828 80149128 44055000 */ mfc1 $a1, $f10 -/* DF82C 8014912C 00000000 */ nop +/* DF82C 8014912C 00000000 */ nop /* DF830 80149130 00651821 */ addu $v1, $v1, $a1 /* DF834 80149134 30630FFF */ andi $v1, $v1, 0xfff /* DF838 80149138 8FAF0078 */ lw $t7, 0x78($sp) @@ -506,7 +506,7 @@ glabel func_801489B8 /* DF844 80149144 00021080 */ sll $v0, $v0, 2 /* DF848 80149148 4600E28D */ trunc.w.s $f10, $f28 /* DF84C 8014914C 44065000 */ mfc1 $a2, $f10 -/* DF850 80149150 00000000 */ nop +/* DF850 80149150 00000000 */ nop /* DF854 80149154 00461021 */ addu $v0, $v0, $a2 /* DF858 80149158 30420FFF */ andi $v0, $v0, 0xfff /* DF85C 8014915C 00441025 */ or $v0, $v0, $a0 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s b/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s index af940f4bde..7638dc35b7 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_801491E4.s @@ -30,4 +30,4 @@ glabel func_801491E4 /* DF940 80149240 ACA40000 */ sw $a0, ($a1) /* DF944 80149244 03E00008 */ jr $ra /* DF948 80149248 ACA30004 */ sw $v1, 4($a1) -/* DF94C 8014924C 00000000 */ nop +/* DF94C 8014924C 00000000 */ nop diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149250.s b/asm/nonmatchings/code_de740_len_23f0/func_80149250.s index 4a288eecfd..82afabb87c 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149250.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149250.s @@ -84,15 +84,15 @@ glabel func_80149250 .L80149370: /* DFA70 80149370 2463FF6F */ addiu $v1, $v1, -0x91 /* DFA74 80149374 44831000 */ mtc1 $v1, $f2 -/* DFA78 80149378 00000000 */ nop +/* DFA78 80149378 00000000 */ nop /* DFA7C 8014937C 468010A0 */ cvt.s.w $f2, $f2 /* DFA80 80149380 46001021 */ cvt.d.s $f0, $f2 /* DFA84 80149384 4638003C */ c.lt.d $f0, $f24 -/* DFA88 80149388 00000000 */ nop +/* DFA88 80149388 00000000 */ nop /* DFA8C 8014938C 45000003 */ bc1f .L8014939C /* DFA90 80149390 0000202D */ daddu $a0, $zero, $zero /* DFA94 80149394 44801000 */ mtc1 $zero, $f2 -/* DFA98 80149398 00000000 */ nop +/* DFA98 80149398 00000000 */ nop .L8014939C: /* DFA9C 8014939C 4600120D */ trunc.w.s $f8, $f2 /* DFAA0 801493A0 44074000 */ mfc1 $a3, $f8 @@ -107,7 +107,7 @@ glabel func_80149250 /* DFAC4 801493C4 46000686 */ mov.s $f26, $f0 /* DFAC8 801493C8 4600D021 */ cvt.d.s $f0, $f26 /* DFACC 801493CC 4638003C */ c.lt.d $f0, $f24 -/* DFAD0 801493D0 00000000 */ nop +/* DFAD0 801493D0 00000000 */ nop /* DFAD4 801493D4 45030001 */ bc1tl .L801493DC /* DFAD8 801493D8 4600B686 */ mov.s $f26, $f22 .L801493DC: @@ -119,11 +119,11 @@ glabel func_80149250 .L801493F0: /* DFAF0 801493F0 2463FF97 */ addiu $v1, $v1, -0x69 /* DFAF4 801493F4 44831000 */ mtc1 $v1, $f2 -/* DFAF8 801493F8 00000000 */ nop +/* DFAF8 801493F8 00000000 */ nop /* DFAFC 801493FC 468010A0 */ cvt.s.w $f2, $f2 /* DFB00 80149400 46001021 */ cvt.d.s $f0, $f2 /* DFB04 80149404 4638003C */ c.lt.d $f0, $f24 -/* DFB08 80149408 00000000 */ nop +/* DFB08 80149408 00000000 */ nop /* DFB0C 8014940C 45030001 */ bc1tl .L80149414 /* DFB10 80149410 4600B086 */ mov.s $f2, $f22 .L80149414: @@ -138,7 +138,7 @@ glabel func_80149250 /* DFB34 80149434 46000506 */ mov.s $f20, $f0 /* DFB38 80149438 4600A021 */ cvt.d.s $f0, $f20 /* DFB3C 8014943C 4638003C */ c.lt.d $f0, $f24 -/* DFB40 80149440 00000000 */ nop +/* DFB40 80149440 00000000 */ nop /* DFB44 80149444 45030001 */ bc1tl .L8014944C /* DFB48 80149448 4600B506 */ mov.s $f20, $f22 .L8014944C: @@ -150,7 +150,7 @@ glabel func_80149250 /* DFB60 80149460 462010A0 */ cvt.s.d $f2, $f2 /* DFB64 80149464 46001021 */ cvt.d.s $f0, $f2 /* DFB68 80149468 4638003C */ c.lt.d $f0, $f24 -/* DFB6C 8014946C 00000000 */ nop +/* DFB6C 8014946C 00000000 */ nop /* DFB70 80149470 45030001 */ bc1tl .L80149478 /* DFB74 80149474 4600B086 */ mov.s $f2, $f22 .L80149478: @@ -165,44 +165,44 @@ glabel func_80149250 /* DFB98 80149498 46000086 */ mov.s $f2, $f0 /* DFB9C 8014949C 46001021 */ cvt.d.s $f0, $f2 /* DFBA0 801494A0 4638003C */ c.lt.d $f0, $f24 -/* DFBA4 801494A4 00000000 */ nop +/* DFBA4 801494A4 00000000 */ nop /* DFBA8 801494A8 45030001 */ bc1tl .L801494B0 /* DFBAC 801494AC 4600B086 */ mov.s $f2, $f22 .L801494B0: /* DFBB0 801494B0 4614D002 */ mul.s $f0, $f26, $f20 -/* DFBB4 801494B4 00000000 */ nop +/* DFBB4 801494B4 00000000 */ nop /* DFBB8 801494B8 46020002 */ mul.s $f0, $f0, $f2 -/* DFBBC 801494BC 00000000 */ nop +/* DFBBC 801494BC 00000000 */ nop /* DFBC0 801494C0 3C018015 */ lui $at, %hi(D_80151258) /* DFBC4 801494C4 D4261258 */ ldc1 $f6, %lo(D_80151258)($at) /* DFBC8 801494C8 46000021 */ cvt.d.s $f0, $f0 /* DFBCC 801494CC 46260002 */ mul.d $f0, $f0, $f6 -/* DFBD0 801494D0 00000000 */ nop +/* DFBD0 801494D0 00000000 */ nop /* DFBD4 801494D4 46200120 */ cvt.s.d $f4, $f0 /* DFBD8 801494D8 3C01402E */ lui $at, 0x402e /* DFBDC 801494DC 44810800 */ mtc1 $at, $f1 /* DFBE0 801494E0 44800000 */ mtc1 $zero, $f0 /* DFBE4 801494E4 460020A1 */ cvt.d.s $f2, $f4 /* DFBE8 801494E8 4620103C */ c.lt.d $f2, $f0 -/* DFBEC 801494EC 00000000 */ nop +/* DFBEC 801494EC 00000000 */ nop /* DFBF0 801494F0 45000005 */ bc1f .L80149508 -/* DFBF4 801494F4 00000000 */ nop +/* DFBF4 801494F4 00000000 */ nop /* DFBF8 801494F8 3C014170 */ lui $at, 0x4170 /* DFBFC 801494FC 44812000 */ mtc1 $at, $f4 /* DFC00 80149500 08052549 */ j .L80149524 -/* DFC04 80149504 00000000 */ nop +/* DFC04 80149504 00000000 */ nop .L80149508: /* DFC08 80149508 4622303C */ c.lt.d $f6, $f2 -/* DFC0C 8014950C 00000000 */ nop +/* DFC0C 8014950C 00000000 */ nop /* DFC10 80149510 45000004 */ bc1f .L80149524 -/* DFC14 80149514 00000000 */ nop +/* DFC14 80149514 00000000 */ nop /* DFC18 80149518 3C0142FE */ lui $at, 0x42fe /* DFC1C 8014951C 44812000 */ mtc1 $at, $f4 -/* DFC20 80149520 00000000 */ nop +/* DFC20 80149520 00000000 */ nop .L80149524: /* DFC24 80149524 4600220D */ trunc.w.s $f8, $f4 /* DFC28 80149528 44024000 */ mfc1 $v0, $f8 -/* DFC2C 8014952C 00000000 */ nop +/* DFC2C 8014952C 00000000 */ nop /* DFC30 80149530 A6220000 */ sh $v0, ($s1) /* DFC34 80149534 C7A00020 */ lwc1 $f0, 0x20($sp) /* DFC38 80149538 46800020 */ cvt.s.w $f0, $f0 @@ -224,27 +224,27 @@ glabel func_80149250 /* DFC78 80149578 44800000 */ mtc1 $zero, $f0 /* DFC7C 8014957C 460020A1 */ cvt.d.s $f2, $f4 /* DFC80 80149580 4620103C */ c.lt.d $f2, $f0 -/* DFC84 80149584 00000000 */ nop +/* DFC84 80149584 00000000 */ nop /* DFC88 80149588 45000005 */ bc1f .L801495A0 -/* DFC8C 8014958C 00000000 */ nop +/* DFC8C 8014958C 00000000 */ nop /* DFC90 80149590 3C013F80 */ lui $at, 0x3f80 /* DFC94 80149594 44812000 */ mtc1 $at, $f4 /* DFC98 80149598 08052571 */ j .L801495C4 -/* DFC9C 8014959C 00000000 */ nop +/* DFC9C 8014959C 00000000 */ nop .L801495A0: /* DFCA0 801495A0 3C018015 */ lui $at, %hi(D_80151268) /* DFCA4 801495A4 D4201268 */ ldc1 $f0, %lo(D_80151268)($at) /* DFCA8 801495A8 4622003C */ c.lt.d $f0, $f2 -/* DFCAC 801495AC 00000000 */ nop +/* DFCAC 801495AC 00000000 */ nop /* DFCB0 801495B0 45000004 */ bc1f .L801495C4 -/* DFCB4 801495B4 00000000 */ nop +/* DFCB4 801495B4 00000000 */ nop /* DFCB8 801495B8 3C0142FE */ lui $at, 0x42fe /* DFCBC 801495BC 44812000 */ mtc1 $at, $f4 -/* DFCC0 801495C0 00000000 */ nop +/* DFCC0 801495C0 00000000 */ nop .L801495C4: /* DFCC4 801495C4 4600220D */ trunc.w.s $f8, $f4 /* DFCC8 801495C8 44024000 */ mfc1 $v0, $f8 -/* DFCCC 801495CC 00000000 */ nop +/* DFCCC 801495CC 00000000 */ nop /* DFCD0 801495D0 A6420000 */ sh $v0, ($s2) .L801495D4: /* DFCD4 801495D4 8FBF003C */ lw $ra, 0x3c($sp) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149618.s b/asm/nonmatchings/code_de740_len_23f0/func_80149618.s index 04c1a3bc34..fc909fa727 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149618.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149618.s @@ -19,7 +19,7 @@ glabel func_80149618 /* DFD50 80149650 0C0525FF */ jal func_801497FC /* DFD54 80149654 0000202D */ daddu $a0, $zero, $zero /* DFD58 80149658 0C052580 */ jal func_80149600 -/* DFD5C 8014965C 00000000 */ nop +/* DFD5C 8014965C 00000000 */ nop /* DFD60 80149660 8FBF0014 */ lw $ra, 0x14($sp) /* DFD64 80149664 8FB00010 */ lw $s0, 0x10($sp) /* DFD68 80149668 03E00008 */ jr $ra diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149670.s b/asm/nonmatchings/code_de740_len_23f0/func_80149670.s index dea804c213..daa119958d 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149670.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149670.s @@ -11,11 +11,11 @@ glabel func_80149670 /* DFD88 80149688 AFB00010 */ sw $s0, 0x10($sp) /* DFD8C 8014968C 80420070 */ lb $v0, 0x70($v0) /* DFD90 80149690 14400005 */ bnez $v0, .L801496A8 -/* DFD94 80149694 00000000 */ nop +/* DFD94 80149694 00000000 */ nop /* DFD98 80149698 3C028016 */ lui $v0, %hi(D_801598A0) /* DFD9C 8014969C 244298A0 */ addiu $v0, $v0, %lo(D_801598A0) /* DFDA0 801496A0 080525AC */ j .L801496B0 -/* DFDA4 801496A4 00000000 */ nop +/* DFDA4 801496A4 00000000 */ nop .L801496A8: /* DFDA8 801496A8 3C028016 */ lui $v0, %hi(D_801599B8) /* DFDAC 801496AC 244299B8 */ addiu $v0, $v0, %lo(D_801599B8) @@ -44,7 +44,7 @@ glabel func_80149670 /* DFDFC 801496FC 1440FFF4 */ bnez $v0, .L801496D0 /* DFE00 80149700 2631001C */ addiu $s1, $s1, 0x1c /* DFE04 80149704 080525C7 */ j .L8014971C -/* DFE08 80149708 00000000 */ nop +/* DFE08 80149708 00000000 */ nop .L8014970C: /* DFE0C 8014970C 3C048016 */ lui $a0, %hi(D_80159AD0) /* DFE10 80149710 8C849AD0 */ lw $a0, %lo(D_80159AD0)($a0) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149734.s b/asm/nonmatchings/code_de740_len_23f0/func_80149734.s index 20ed455994..5697c9a77f 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149734.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149734.s @@ -22,7 +22,7 @@ glabel func_80149734 /* DFE74 80149774 26520001 */ addiu $s2, $s2, 1 /* DFE78 80149778 30620002 */ andi $v0, $v1, 2 /* DFE7C 8014977C 1040000D */ beqz $v0, .L801497B4 -/* DFE80 80149780 00000000 */ nop +/* DFE80 80149780 00000000 */ nop /* DFE84 80149784 AFB30010 */ sw $s3, 0x10($sp) /* DFE88 80149788 8E020004 */ lw $v0, 4($s0) /* DFE8C 8014978C AFA20014 */ sw $v0, 0x14($sp) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149828.s b/asm/nonmatchings/code_de740_len_23f0/func_80149828.s index a4b37d507e..1d57022dd7 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149828.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149828.s @@ -5,4 +5,4 @@ glabel func_80149828 /* DFF28 80149828 3C028016 */ lui $v0, %hi(D_80159AD4) /* DFF2C 8014982C 8C429AD4 */ lw $v0, %lo(D_80159AD4)($v0) /* DFF30 80149830 03E00008 */ jr $ra -/* DFF34 80149834 00000000 */ nop +/* DFF34 80149834 00000000 */ nop diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149838.s b/asm/nonmatchings/code_de740_len_23f0/func_80149838.s index a741526b55..c5c26e9f0f 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149838.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149838.s @@ -10,11 +10,11 @@ glabel func_80149838 /* DFF4C 8014984C AFB00010 */ sw $s0, 0x10($sp) /* DFF50 80149850 80420070 */ lb $v0, 0x70($v0) /* DFF54 80149854 14400005 */ bnez $v0, .L8014986C -/* DFF58 80149858 00000000 */ nop +/* DFF58 80149858 00000000 */ nop /* DFF5C 8014985C 3C028016 */ lui $v0, %hi(D_801598A0) /* DFF60 80149860 244298A0 */ addiu $v0, $v0, %lo(D_801598A0) /* DFF64 80149864 0805261D */ j .L80149874 -/* DFF68 80149868 00000000 */ nop +/* DFF68 80149868 00000000 */ nop .L8014986C: /* DFF6C 8014986C 3C028016 */ lui $v0, %hi(D_801599B8) /* DFF70 80149870 244299B8 */ addiu $v0, $v0, %lo(D_801599B8) @@ -31,7 +31,7 @@ glabel func_80149838 /* DFF94 80149894 26310001 */ addiu $s1, $s1, 1 /* DFF98 80149898 8E040004 */ lw $a0, 4($s0) /* DFF9C 8014989C 0C0154F0 */ jal func_800553C0 -/* DFFA0 801498A0 00000000 */ nop +/* DFFA0 801498A0 00000000 */ nop .L801498A4: /* DFFA4 801498A4 2A22000A */ slti $v0, $s1, 0xa /* DFFA8 801498A8 1440FFF7 */ bnez $v0, .L80149888 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s b/asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s index 637f28edf0..4427ef7072 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149A6C.s @@ -16,7 +16,7 @@ glabel func_80149A6C /* E0198 80149A98 AC820000 */ sw $v0, ($a0) /* E019C 80149A9C 8C840004 */ lw $a0, 4($a0) /* E01A0 80149AA0 0C0154F0 */ jal func_800553C0 -/* E01A4 80149AA4 00000000 */ nop +/* E01A4 80149AA4 00000000 */ nop .L80149AA8: /* E01A8 80149AA8 8FBF0014 */ lw $ra, 0x14($sp) /* E01AC 80149AAC 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149BE4.s b/asm/nonmatchings/code_de740_len_23f0/func_80149BE4.s index 236a8a0e00..1619557b4f 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149BE4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149BE4.s @@ -20,7 +20,7 @@ glabel func_80149BE4 /* E0320 80149C20 0C052631 */ jal func_801498C4 /* E0324 80149C24 8C84F2D0 */ lw $a0, %lo(D_8014F2D0)($a0) /* E0328 80149C28 1040000A */ beqz $v0, .L80149C54 -/* E032C 80149C2C 00000000 */ nop +/* E032C 80149C2C 00000000 */ nop /* E0330 80149C30 A050000C */ sb $s0, 0xc($v0) /* E0334 80149C34 A051000D */ sb $s1, 0xd($v0) /* E0338 80149C38 08052715 */ j .L80149C54 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149E04.s b/asm/nonmatchings/code_de740_len_23f0/func_80149E04.s index 41e0d5d9eb..f23e374cf2 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149E04.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149E04.s @@ -73,7 +73,7 @@ glabel func_80149E04 .L80149EF8: /* E05F8 80149EF8 02021024 */ and $v0, $s0, $v0 /* E05FC 80149EFC 10400006 */ beqz $v0, .L80149F18 -/* E0600 80149F00 00000000 */ nop +/* E0600 80149F00 00000000 */ nop /* E0604 80149F04 86220000 */ lh $v0, ($s1) /* E0608 80149F08 28420028 */ slti $v0, $v0, 0x28 /* E060C 80149F0C 10400002 */ beqz $v0, .L80149F18 diff --git a/asm/nonmatchings/code_de740_len_23f0/func_80149F58.s b/asm/nonmatchings/code_de740_len_23f0/func_80149F58.s index 247ece3e01..e68953091f 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_80149F58.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_80149F58.s @@ -43,22 +43,22 @@ glabel func_80149F58 /* E06E4 80149FE4 A6020000 */ sh $v0, ($s0) /* E06E8 80149FE8 8FA20020 */ lw $v0, 0x20($sp) /* E06EC 80149FEC 04410012 */ bgez $v0, .L8014A038 -/* E06F0 80149FF0 00000000 */ nop +/* E06F0 80149FF0 00000000 */ nop /* E06F4 80149FF4 3C013E99 */ lui $at, 0x3e99 /* E06F8 80149FF8 3421999A */ ori $at, $at, 0x999a /* E06FC 80149FFC 44811000 */ mtc1 $at, $f2 /* E0700 8014A000 44820000 */ mtc1 $v0, $f0 -/* E0704 8014A004 00000000 */ nop +/* E0704 8014A004 00000000 */ nop /* E0708 8014A008 46800020 */ cvt.s.w $f0, $f0 /* E070C 8014A00C 46020002 */ mul.s $f0, $f0, $f2 -/* E0710 8014A010 00000000 */ nop +/* E0710 8014A010 00000000 */ nop /* E0714 8014A014 3C0142FE */ lui $at, 0x42fe /* E0718 8014A018 44811000 */ mtc1 $at, $f2 -/* E071C 8014A01C 00000000 */ nop +/* E071C 8014A01C 00000000 */ nop /* E0720 8014A020 46020000 */ add.s $f0, $f0, $f2 /* E0724 8014A024 4600010D */ trunc.w.s $f4, $f0 /* E0728 8014A028 44022000 */ mfc1 $v0, $f4 -/* E072C 8014A02C 00000000 */ nop +/* E072C 8014A02C 00000000 */ nop /* E0730 8014A030 A6020000 */ sh $v0, ($s0) /* E0734 8014A034 AFA00020 */ sw $zero, 0x20($sp) .L8014A038: @@ -70,17 +70,17 @@ glabel func_80149F58 /* E074C 8014A04C 3421999A */ ori $at, $at, 0x999a /* E0750 8014A050 44810000 */ mtc1 $at, $f0 /* E0754 8014A054 44821000 */ mtc1 $v0, $f2 -/* E0758 8014A058 00000000 */ nop +/* E0758 8014A058 00000000 */ nop /* E075C 8014A05C 468010A0 */ cvt.s.w $f2, $f2 /* E0760 8014A060 46001082 */ mul.s $f2, $f2, $f0 -/* E0764 8014A064 00000000 */ nop +/* E0764 8014A064 00000000 */ nop /* E0768 8014A068 3C0142FE */ lui $at, 0x42fe /* E076C 8014A06C 44810000 */ mtc1 $at, $f0 -/* E0770 8014A070 00000000 */ nop +/* E0770 8014A070 00000000 */ nop /* E0774 8014A074 46020001 */ sub.s $f0, $f0, $f2 /* E0778 8014A078 4600010D */ trunc.w.s $f4, $f0 /* E077C 8014A07C 44022000 */ mfc1 $v0, $f4 -/* E0780 8014A080 00000000 */ nop +/* E0780 8014A080 00000000 */ nop /* E0784 8014A084 A6020000 */ sh $v0, ($s0) /* E0788 8014A088 24020140 */ addiu $v0, $zero, 0x140 /* E078C 8014A08C AFA20020 */ sw $v0, 0x20($sp) @@ -94,17 +94,17 @@ glabel func_80149F58 /* E07A4 8014A0A4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* E07A8 8014A0A8 80420070 */ lb $v0, 0x70($v0) /* E07AC 8014A0AC 14400010 */ bnez $v0, .L8014A0F0 -/* E07B0 8014A0B0 00000000 */ nop +/* E07B0 8014A0B0 00000000 */ nop /* E07B4 8014A0B4 3C013E4C */ lui $at, 0x3e4c /* E07B8 8014A0B8 3421CCCD */ ori $at, $at, 0xcccd /* E07BC 8014A0BC 44811000 */ mtc1 $at, $f2 /* E07C0 8014A0C0 C7A00020 */ lwc1 $f0, 0x20($sp) /* E07C4 8014A0C4 46800020 */ cvt.s.w $f0, $f0 /* E07C8 8014A0C8 46020002 */ mul.s $f0, $f0, $f2 -/* E07CC 8014A0CC 00000000 */ nop +/* E07CC 8014A0CC 00000000 */ nop /* E07D0 8014A0D0 3C014200 */ lui $at, 0x4200 /* E07D4 8014A0D4 44811000 */ mtc1 $at, $f2 -/* E07D8 8014A0D8 00000000 */ nop +/* E07D8 8014A0D8 00000000 */ nop /* E07DC 8014A0DC 46020000 */ add.s $f0, $f0, $f2 /* E07E0 8014A0E0 4600010D */ trunc.w.s $f4, $f0 /* E07E4 8014A0E4 44022000 */ mfc1 $v0, $f4 @@ -116,7 +116,7 @@ glabel func_80149F58 /* E07F8 8014A0F8 C7B40020 */ lwc1 $f20, 0x20($sp) /* E07FC 8014A0FC 4680A521 */ cvt.d.w $f20, $f20 /* E0800 8014A100 4620A502 */ mul.d $f20, $f20, $f0 -/* E0804 8014A104 00000000 */ nop +/* E0804 8014A104 00000000 */ nop /* E0808 8014A108 3C014074 */ lui $at, 0x4074 /* E080C 8014A10C 44810800 */ mtc1 $at, $f1 /* E0810 8014A110 44800000 */ mtc1 $zero, $f0 @@ -131,27 +131,27 @@ glabel func_80149F58 /* E0834 8014A134 4600A321 */ cvt.d.s $f12, $f20 /* E0838 8014A138 46206305 */ abs.d $f12, $f12 /* E083C 8014A13C 46206302 */ mul.d $f12, $f12, $f0 -/* E0840 8014A140 00000000 */ nop +/* E0840 8014A140 00000000 */ nop /* E0844 8014A144 3C013F90 */ lui $at, 0x3f90 /* E0848 8014A148 44810800 */ mtc1 $at, $f1 /* E084C 8014A14C 44800000 */ mtc1 $zero, $f0 -/* E0850 8014A150 00000000 */ nop +/* E0850 8014A150 00000000 */ nop /* E0854 8014A154 46206302 */ mul.d $f12, $f12, $f0 -/* E0858 8014A158 00000000 */ nop +/* E0858 8014A158 00000000 */ nop /* E085C 8014A15C 3C018015 */ lui $at, %hi(D_80151280) /* E0860 8014A160 D4201280 */ ldc1 $f0, %lo(D_80151280)($at) /* E0864 8014A164 46206302 */ mul.d $f12, $f12, $f0 -/* E0868 8014A168 00000000 */ nop +/* E0868 8014A168 00000000 */ nop /* E086C 8014A16C 3C018015 */ lui $at, %hi(D_80151288) /* E0870 8014A170 D4201288 */ ldc1 $f0, %lo(D_80151288)($at) /* E0874 8014A174 46206303 */ div.d $f12, $f12, $f0 /* E0878 8014A178 0C00A85B */ jal sin_rad /* E087C 8014A17C 46206320 */ cvt.s.d $f12, $f12 /* E0880 8014A180 4600A502 */ mul.s $f20, $f20, $f0 -/* E0884 8014A184 00000000 */ nop +/* E0884 8014A184 00000000 */ nop /* E0888 8014A188 4600A10D */ trunc.w.s $f4, $f20 /* E088C 8014A18C 44022000 */ mfc1 $v0, $f4 -/* E0890 8014A190 00000000 */ nop +/* E0890 8014A190 00000000 */ nop /* E0894 8014A194 24420040 */ addiu $v0, $v0, 0x40 /* E0898 8014A198 A6220000 */ sh $v0, ($s1) .L8014A19C: diff --git a/asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s b/asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s index 33293cc0ec..b3640d8671 100644 --- a/asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s +++ b/asm/nonmatchings/code_de740_len_23f0/func_8014A1B4.s @@ -32,7 +32,7 @@ glabel func_8014A1B4 /* E0920 8014A220 44070000 */ mfc1 $a3, $f0 /* E0924 8014A224 AFBF003C */ sw $ra, 0x3c($sp) /* E0928 8014A228 0C00B94E */ jal get_screen_coords -/* E092C 8014A22C 00000000 */ nop +/* E092C 8014A22C 00000000 */ nop /* E0930 8014A230 8FA20020 */ lw $v0, 0x20($sp) /* E0934 8014A234 24420BB8 */ addiu $v0, $v0, 0xbb8 /* E0938 8014A238 2C421771 */ sltiu $v0, $v0, 0x1771 @@ -54,22 +54,22 @@ glabel func_8014A1B4 /* E096C 8014A26C A6050000 */ sh $a1, ($s0) /* E0970 8014A270 8FA20020 */ lw $v0, 0x20($sp) /* E0974 8014A274 04410012 */ bgez $v0, .L8014A2C0 -/* E0978 8014A278 00000000 */ nop +/* E0978 8014A278 00000000 */ nop /* E097C 8014A27C 3C013E99 */ lui $at, 0x3e99 /* E0980 8014A280 3421999A */ ori $at, $at, 0x999a /* E0984 8014A284 44811000 */ mtc1 $at, $f2 /* E0988 8014A288 44820000 */ mtc1 $v0, $f0 -/* E098C 8014A28C 00000000 */ nop +/* E098C 8014A28C 00000000 */ nop /* E0990 8014A290 46800020 */ cvt.s.w $f0, $f0 /* E0994 8014A294 46020002 */ mul.s $f0, $f0, $f2 -/* E0998 8014A298 00000000 */ nop +/* E0998 8014A298 00000000 */ nop /* E099C 8014A29C 3C0142FE */ lui $at, 0x42fe /* E09A0 8014A2A0 44811000 */ mtc1 $at, $f2 -/* E09A4 8014A2A4 00000000 */ nop +/* E09A4 8014A2A4 00000000 */ nop /* E09A8 8014A2A8 46020000 */ add.s $f0, $f0, $f2 /* E09AC 8014A2AC 4600018D */ trunc.w.s $f6, $f0 /* E09B0 8014A2B0 44023000 */ mfc1 $v0, $f6 -/* E09B4 8014A2B4 00000000 */ nop +/* E09B4 8014A2B4 00000000 */ nop /* E09B8 8014A2B8 A6020000 */ sh $v0, ($s0) /* E09BC 8014A2BC AFA00020 */ sw $zero, 0x20($sp) .L8014A2C0: @@ -82,17 +82,17 @@ glabel func_8014A1B4 /* E09D8 8014A2D8 3421999A */ ori $at, $at, 0x999a /* E09DC 8014A2DC 44810000 */ mtc1 $at, $f0 /* E09E0 8014A2E0 44821000 */ mtc1 $v0, $f2 -/* E09E4 8014A2E4 00000000 */ nop +/* E09E4 8014A2E4 00000000 */ nop /* E09E8 8014A2E8 468010A0 */ cvt.s.w $f2, $f2 /* E09EC 8014A2EC 46001082 */ mul.s $f2, $f2, $f0 -/* E09F0 8014A2F0 00000000 */ nop +/* E09F0 8014A2F0 00000000 */ nop /* E09F4 8014A2F4 3C0142FE */ lui $at, 0x42fe /* E09F8 8014A2F8 44810000 */ mtc1 $at, $f0 -/* E09FC 8014A2FC 00000000 */ nop +/* E09FC 8014A2FC 00000000 */ nop /* E0A00 8014A300 46020001 */ sub.s $f0, $f0, $f2 /* E0A04 8014A304 4600018D */ trunc.w.s $f6, $f0 /* E0A08 8014A308 44023000 */ mfc1 $v0, $f6 -/* E0A0C 8014A30C 00000000 */ nop +/* E0A0C 8014A30C 00000000 */ nop /* E0A10 8014A310 A6020000 */ sh $v0, ($s0) /* E0A14 8014A314 8622000A */ lh $v0, 0xa($s1) /* E0A18 8014A318 AFA20020 */ sw $v0, 0x20($sp) @@ -103,11 +103,11 @@ glabel func_8014A1B4 /* E0A28 8014A328 44811000 */ mtc1 $at, $f2 /* E0A2C 8014A32C 00621823 */ subu $v1, $v1, $v0 /* E0A30 8014A330 44830000 */ mtc1 $v1, $f0 -/* E0A34 8014A334 00000000 */ nop +/* E0A34 8014A334 00000000 */ nop /* E0A38 8014A338 46800020 */ cvt.s.w $f0, $f0 /* E0A3C 8014A33C 46000005 */ abs.s $f0, $f0 /* E0A40 8014A340 4600103C */ c.lt.s $f2, $f0 -/* E0A44 8014A344 00000000 */ nop +/* E0A44 8014A344 00000000 */ nop /* E0A48 8014A348 45030001 */ bc1tl .L8014A350 /* E0A4C 8014A34C 46001006 */ mov.s $f0, $f2 .L8014A350: @@ -117,19 +117,19 @@ glabel func_8014A1B4 /* E0A5C 8014A35C 86020000 */ lh $v0, ($s0) /* E0A60 8014A360 46001081 */ sub.s $f2, $f2, $f0 /* E0A64 8014A364 44820000 */ mtc1 $v0, $f0 -/* E0A68 8014A368 00000000 */ nop +/* E0A68 8014A368 00000000 */ nop /* E0A6C 8014A36C 46800020 */ cvt.s.w $f0, $f0 /* E0A70 8014A370 46020002 */ mul.s $f0, $f0, $f2 -/* E0A74 8014A374 00000000 */ nop +/* E0A74 8014A374 00000000 */ nop /* E0A78 8014A378 3C013A83 */ lui $at, 0x3a83 /* E0A7C 8014A37C 3421126F */ ori $at, $at, 0x126f /* E0A80 8014A380 44811000 */ mtc1 $at, $f2 -/* E0A84 8014A384 00000000 */ nop +/* E0A84 8014A384 00000000 */ nop /* E0A88 8014A388 46020002 */ mul.s $f0, $f0, $f2 -/* E0A8C 8014A38C 00000000 */ nop +/* E0A8C 8014A38C 00000000 */ nop /* E0A90 8014A390 4600018D */ trunc.w.s $f6, $f0 /* E0A94 8014A394 44023000 */ mfc1 $v0, $f6 -/* E0A98 8014A398 00000000 */ nop +/* E0A98 8014A398 00000000 */ nop /* E0A9C 8014A39C A6020000 */ sh $v0, ($s0) /* E0AA0 8014A3A0 00021400 */ sll $v0, $v0, 0x10 /* E0AA4 8014A3A4 00021403 */ sra $v0, $v0, 0x10 @@ -147,18 +147,18 @@ glabel func_8014A1B4 /* E0ACC 8014A3CC C7A00020 */ lwc1 $f0, 0x20($sp) /* E0AD0 8014A3D0 46800020 */ cvt.s.w $f0, $f0 /* E0AD4 8014A3D4 46020002 */ mul.s $f0, $f0, $f2 -/* E0AD8 8014A3D8 00000000 */ nop +/* E0AD8 8014A3D8 00000000 */ nop /* E0ADC 8014A3DC 8622000A */ lh $v0, 0xa($s1) /* E0AE0 8014A3E0 3C014200 */ lui $at, 0x4200 /* E0AE4 8014A3E4 44812000 */ mtc1 $at, $f4 /* E0AE8 8014A3E8 44821000 */ mtc1 $v0, $f2 -/* E0AEC 8014A3EC 00000000 */ nop +/* E0AEC 8014A3EC 00000000 */ nop /* E0AF0 8014A3F0 468010A0 */ cvt.s.w $f2, $f2 /* E0AF4 8014A3F4 46020003 */ div.s $f0, $f0, $f2 /* E0AF8 8014A3F8 46040000 */ add.s $f0, $f0, $f4 /* E0AFC 8014A3FC 4600018D */ trunc.w.s $f6, $f0 /* E0B00 8014A400 44023000 */ mfc1 $v0, $f6 -/* E0B04 8014A404 00000000 */ nop +/* E0B04 8014A404 00000000 */ nop /* E0B08 8014A408 A6420000 */ sh $v0, ($s2) .L8014A40C: /* E0B0C 8014A40C 8FBF003C */ lw $ra, 0x3c($sp) @@ -167,6 +167,6 @@ glabel func_8014A1B4 /* E0B18 8014A418 8FB00030 */ lw $s0, 0x30($sp) /* E0B1C 8014A41C 03E00008 */ jr $ra /* E0B20 8014A420 27BD0040 */ addiu $sp, $sp, 0x40 -/* E0B24 8014A424 00000000 */ nop -/* E0B28 8014A428 00000000 */ nop -/* E0B2C 8014A42C 00000000 */ nop +/* E0B24 8014A424 00000000 */ nop +/* E0B28 8014A428 00000000 */ nop +/* E0B2C 8014A42C 00000000 */ nop diff --git a/asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s b/asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s index e87d65efa3..dbad75cb45 100644 --- a/asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s +++ b/asm/nonmatchings/code_de740_len_23f0/play_sound_at_position.s @@ -23,7 +23,7 @@ glabel play_sound_at_position /* E04A4 80149DA4 0C05265D */ jal func_80149974 /* E04A8 80149DA8 E7A00010 */ swc1 $f0, 0x10($sp) /* E04AC 80149DAC 0805277B */ j .L80149DEC -/* E04B0 80149DB0 00000000 */ nop +/* E04B0 80149DB0 00000000 */ nop .L80149DB4: /* E04B4 80149DB4 27B10018 */ addiu $s1, $sp, 0x18 /* E04B8 80149DB8 0220382D */ daddu $a3, $s1, $zero diff --git a/asm/nonmatchings/code_de740_len_23f0/stop_sound.s b/asm/nonmatchings/code_de740_len_23f0/stop_sound.s index 28a221fc76..4c7d6d09af 100644 --- a/asm/nonmatchings/code_de740_len_23f0/stop_sound.s +++ b/asm/nonmatchings/code_de740_len_23f0/stop_sound.s @@ -14,7 +14,7 @@ glabel stop_sound /* E0390 80149C90 0C05269B */ jal func_80149A6C /* E0394 80149C94 0000282D */ daddu $a1, $zero, $zero /* E0398 80149C98 0805272A */ j .L80149CA8 -/* E039C 80149C9C 00000000 */ nop +/* E039C 80149C9C 00000000 */ nop .L80149CA0: /* E03A0 80149CA0 0C0154F0 */ jal func_800553C0 /* E03A4 80149CA4 0040202D */ daddu $a0, $v0, $zero diff --git a/asm/nonmatchings/code_e20eb0/func_802B70B4.s b/asm/nonmatchings/code_e20eb0/func_802B70B4.s index 9c08b5ba39..e08de5d762 100644 --- a/asm/nonmatchings/code_e20eb0/func_802B70B4.s +++ b/asm/nonmatchings/code_e20eb0/func_802B70B4.s @@ -18,12 +18,12 @@ glabel func_802B70B4 /* E20F98 802B70E8 848300A8 */ lh $v1, 0xa8($a0) /* E20F9C 802B70EC C480003C */ lwc1 $f0, 0x3c($a0) /* E20FA0 802B70F0 44831000 */ mtc1 $v1, $f2 -/* E20FA4 802B70F4 00000000 */ nop +/* E20FA4 802B70F4 00000000 */ nop /* E20FA8 802B70F8 468010A0 */ cvt.s.w $f2, $f2 /* E20FAC 802B70FC 46020000 */ add.s $f0, $f0, $f2 /* E20FB0 802B7100 3C014100 */ lui $at, 0x4100 /* E20FB4 802B7104 44811000 */ mtc1 $at, $f2 -/* E20FB8 802B7108 00000000 */ nop +/* E20FB8 802B7108 00000000 */ nop /* E20FBC 802B710C 46020000 */ add.s $f0, $f0, $f2 /* E20FC0 802B7110 E440001C */ swc1 $f0, 0x1c($v0) /* E20FC4 802B7114 E4400008 */ swc1 $f0, 8($v0) diff --git a/asm/nonmatchings/code_e20eb0/func_802B742C.s b/asm/nonmatchings/code_e20eb0/func_802B742C.s index 6df7cede82..74927b3947 100644 --- a/asm/nonmatchings/code_e20eb0/func_802B742C.s +++ b/asm/nonmatchings/code_e20eb0/func_802B742C.s @@ -18,17 +18,17 @@ glabel func_802B742C /* E21310 802B7460 8C63A600 */ lw $v1, %lo(gGameState)($v1) /* E21314 802B7464 24020004 */ addiu $v0, $zero, 4 /* E21318 802B7468 1062000B */ beq $v1, $v0, .L802B7498 -/* E2131C 802B746C 00000000 */ nop +/* E2131C 802B746C 00000000 */ nop /* E21320 802B7470 8E030004 */ lw $v1, 4($s0) /* E21324 802B7474 30620001 */ andi $v0, $v1, 1 /* E21328 802B7478 14400007 */ bnez $v0, .L802B7498 -/* E2132C 802B747C 00000000 */ nop +/* E2132C 802B747C 00000000 */ nop /* E21330 802B7480 82020015 */ lb $v0, 0x15($s0) /* E21334 802B7484 14400004 */ bnez $v0, .L802B7498 /* E21338 802B7488 3C020001 */ lui $v0, 1 /* E2133C 802B748C 00621024 */ and $v0, $v1, $v0 /* E21340 802B7490 10400005 */ beqz $v0, .L802B74A8 -/* E21344 802B7494 00000000 */ nop +/* E21344 802B7494 00000000 */ nop .L802B7498: /* E21348 802B7498 3C03802B */ lui $v1, 0x802b /* E2134C 802B749C 8C6379A8 */ lw $v1, 0x79a8($v1) @@ -45,16 +45,16 @@ glabel func_802B742C /* E21374 802B74C4 10400005 */ beqz $v0, .L802B74DC /* E21378 802B74C8 24020002 */ addiu $v0, $zero, 2 /* E2137C 802B74CC 10A00009 */ beqz $a1, .L802B74F4 -/* E21380 802B74D0 00000000 */ nop +/* E21380 802B74D0 00000000 */ nop /* E21384 802B74D4 080ADDA0 */ j .L802B7680 -/* E21388 802B74D8 00000000 */ nop +/* E21388 802B74D8 00000000 */ nop .L802B74DC: /* E2138C 802B74DC 10A20027 */ beq $a1, $v0, .L802B757C /* E21390 802B74E0 24020003 */ addiu $v0, $zero, 3 /* E21394 802B74E4 10A20033 */ beq $a1, $v0, .L802B75B4 -/* E21398 802B74E8 00000000 */ nop +/* E21398 802B74E8 00000000 */ nop /* E2139C 802B74EC 080ADDA0 */ j .L802B7680 -/* E213A0 802B74F0 00000000 */ nop +/* E213A0 802B74F0 00000000 */ nop .L802B74F4: /* E213A4 802B74F4 C4800014 */ lwc1 $f0, 0x14($a0) /* E213A8 802B74F8 3C01802B */ lui $at, 0x802b @@ -67,7 +67,7 @@ glabel func_802B742C /* E213C4 802B7514 46200020 */ cvt.s.d $f0, $f0 /* E213C8 802B7518 460000A1 */ cvt.d.s $f2, $f0 /* E213CC 802B751C 4622203E */ c.le.d $f4, $f2 -/* E213D0 802B7520 00000000 */ nop +/* E213D0 802B7520 00000000 */ nop /* E213D4 802B7524 45000056 */ bc1f .L802B7680 /* E213D8 802B7528 E4800014 */ swc1 $f0, 0x14($a0) /* E213DC 802B752C 9082002A */ lbu $v0, 0x2a($a0) @@ -95,13 +95,13 @@ glabel func_802B742C /* E2142C 802B757C C48C0010 */ lwc1 $f12, 0x10($a0) /* E21430 802B7580 3C014120 */ lui $at, 0x4120 /* E21434 802B7584 44810000 */ mtc1 $at, $f0 -/* E21438 802B7588 00000000 */ nop +/* E21438 802B7588 00000000 */ nop /* E2143C 802B758C 46006300 */ add.s $f12, $f12, $f0 /* E21440 802B7590 3C0143B4 */ lui $at, 0x43b4 /* E21444 802B7594 44810000 */ mtc1 $at, $f0 -/* E21448 802B7598 00000000 */ nop +/* E21448 802B7598 00000000 */ nop /* E2144C 802B759C 460C003E */ c.le.s $f0, $f12 -/* E21450 802B75A0 00000000 */ nop +/* E21450 802B75A0 00000000 */ nop /* E21454 802B75A4 45030001 */ bc1tl .L802B75AC /* E21458 802B75A8 46006301 */ sub.s $f12, $f12, $f0 .L802B75AC: @@ -111,45 +111,45 @@ glabel func_802B742C /* E21464 802B75B4 C48C0010 */ lwc1 $f12, 0x10($a0) /* E21468 802B75B8 3C0141C8 */ lui $at, 0x41c8 /* E2146C 802B75BC 44810000 */ mtc1 $at, $f0 -/* E21470 802B75C0 00000000 */ nop +/* E21470 802B75C0 00000000 */ nop /* E21474 802B75C4 46006300 */ add.s $f12, $f12, $f0 /* E21478 802B75C8 3C0143B4 */ lui $at, 0x43b4 /* E2147C 802B75CC 44810000 */ mtc1 $at, $f0 -/* E21480 802B75D0 00000000 */ nop +/* E21480 802B75D0 00000000 */ nop /* E21484 802B75D4 460C003E */ c.le.s $f0, $f12 -/* E21488 802B75D8 00000000 */ nop +/* E21488 802B75D8 00000000 */ nop /* E2148C 802B75DC 45030001 */ bc1tl .L802B75E4 /* E21490 802B75E0 46006301 */ sub.s $f12, $f12, $f0 .L802B75E4: /* E21494 802B75E4 3C01428C */ lui $at, 0x428c /* E21498 802B75E8 44810000 */ mtc1 $at, $f0 -/* E2149C 802B75EC 00000000 */ nop +/* E2149C 802B75EC 00000000 */ nop /* E214A0 802B75F0 460C003E */ c.le.s $f0, $f12 -/* E214A4 802B75F4 00000000 */ nop +/* E214A4 802B75F4 00000000 */ nop /* E214A8 802B75F8 45000008 */ bc1f .L802B761C /* E214AC 802B75FC E48C0010 */ swc1 $f12, 0x10($a0) /* E214B0 802B7600 3C0142DC */ lui $at, 0x42dc /* E214B4 802B7604 44810000 */ mtc1 $at, $f0 -/* E214B8 802B7608 00000000 */ nop +/* E214B8 802B7608 00000000 */ nop /* E214BC 802B760C 4600603E */ c.le.s $f12, $f0 -/* E214C0 802B7610 00000000 */ nop +/* E214C0 802B7610 00000000 */ nop /* E214C4 802B7614 4501000F */ bc1t .L802B7654 -/* E214C8 802B7618 00000000 */ nop +/* E214C8 802B7618 00000000 */ nop .L802B761C: /* E214CC 802B761C 3C01437A */ lui $at, 0x437a /* E214D0 802B7620 44810000 */ mtc1 $at, $f0 -/* E214D4 802B7624 00000000 */ nop +/* E214D4 802B7624 00000000 */ nop /* E214D8 802B7628 460C003E */ c.le.s $f0, $f12 -/* E214DC 802B762C 00000000 */ nop +/* E214DC 802B762C 00000000 */ nop /* E214E0 802B7630 45000010 */ bc1f .L802B7674 -/* E214E4 802B7634 00000000 */ nop +/* E214E4 802B7634 00000000 */ nop /* E214E8 802B7638 3C014391 */ lui $at, 0x4391 /* E214EC 802B763C 44810000 */ mtc1 $at, $f0 -/* E214F0 802B7640 00000000 */ nop +/* E214F0 802B7640 00000000 */ nop /* E214F4 802B7644 4600603E */ c.le.s $f12, $f0 -/* E214F8 802B7648 00000000 */ nop +/* E214F8 802B7648 00000000 */ nop /* E214FC 802B764C 45000009 */ bc1f .L802B7674 -/* E21500 802B7650 00000000 */ nop +/* E21500 802B7650 00000000 */ nop .L802B7654: /* E21504 802B7654 8E020004 */ lw $v0, 4($s0) /* E21508 802B7658 2403FFDF */ addiu $v1, $zero, -0x21 @@ -161,7 +161,7 @@ glabel func_802B742C /* E21520 802B7670 AE020004 */ sw $v0, 4($s0) .L802B7674: /* E21524 802B7674 0C0ADC00 */ jal func_802B7000 -/* E21528 802B7678 00000000 */ nop +/* E21528 802B7678 00000000 */ nop /* E2152C 802B767C 0040302D */ daddu $a2, $v0, $zero .L802B7680: /* E21530 802B7680 3C04802B */ lui $a0, 0x802b @@ -170,7 +170,7 @@ glabel func_802B742C /* E2153C 802B768C A046002B */ sb $a2, 0x2b($v0) /* E21540 802B7690 8E0300C8 */ lw $v1, 0xc8($s0) /* E21544 802B7694 10600005 */ beqz $v1, .L802B76AC -/* E21548 802B7698 00000000 */ nop +/* E21548 802B7698 00000000 */ nop /* E2154C 802B769C 8C840000 */ lw $a0, ($a0) /* E21550 802B76A0 8C820000 */ lw $v0, ($a0) /* E21554 802B76A4 54620001 */ bnel $v1, $v0, .L802B76AC @@ -182,12 +182,12 @@ glabel func_802B742C /* E21568 802B76B8 848200A8 */ lh $v0, 0xa8($a0) /* E2156C 802B76BC C480003C */ lwc1 $f0, 0x3c($a0) /* E21570 802B76C0 44821000 */ mtc1 $v0, $f2 -/* E21574 802B76C4 00000000 */ nop +/* E21574 802B76C4 00000000 */ nop /* E21578 802B76C8 468010A0 */ cvt.s.w $f2, $f2 /* E2157C 802B76CC 46020000 */ add.s $f0, $f0, $f2 /* E21580 802B76D0 3C014100 */ lui $at, 0x4100 /* E21584 802B76D4 44811000 */ mtc1 $at, $f2 -/* E21588 802B76D8 00000000 */ nop +/* E21588 802B76D8 00000000 */ nop /* E2158C 802B76DC 46020000 */ add.s $f0, $f0, $f2 /* E21590 802B76E0 E460001C */ swc1 $f0, 0x1c($v1) /* E21594 802B76E4 E4600008 */ swc1 $f0, 8($v1) @@ -200,5 +200,5 @@ glabel func_802B742C /* E215AC 802B76FC 8FB00010 */ lw $s0, 0x10($sp) /* E215B0 802B7700 03E00008 */ jr $ra /* E215B4 802B7704 27BD0018 */ addiu $sp, $sp, 0x18 -/* E215B8 802B7708 00000000 */ nop -/* E215BC 802B770C 00000000 */ nop +/* E215B8 802B7708 00000000 */ nop +/* E215BC 802B770C 00000000 */ nop diff --git a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s index 02afdd5f47..ae0fb83078 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/func_80033BC0.s @@ -33,9 +33,9 @@ glabel func_80033BC0 /* F030 80033C30 0C018030 */ jal nuContRmbForceStopEnd /* F034 80033C34 AC820000 */ sw $v0, ($a0) /* F038 80033C38 0C05260E */ jal func_80149838 -/* F03C 80033C3C 00000000 */ nop +/* F03C 80033C3C 00000000 */ nop /* F040 80033C40 0C016AFA */ jal get_current_map_header -/* F044 80033C44 00000000 */ nop +/* F044 80033C44 00000000 */ nop /* F048 80033C48 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* F04C 80033C4C 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* F050 80033C50 8E040000 */ lw $a0, ($s0) @@ -53,7 +53,7 @@ glabel func_80033BC0 /* F080 80033C80 0C016BE1 */ jal func_8005AF84 /* F084 80033C84 A0400070 */ sb $zero, 0x70($v0) /* F088 80033C88 0C00AB37 */ jal func_8002ACDC -/* F08C 80033C8C 00000000 */ nop +/* F08C 80033C8C 00000000 */ nop /* F090 80033C90 0C05259C */ jal func_80149670 /* F094 80033C94 24040001 */ addiu $a0, $zero, 1 /* F098 80033C98 8E030000 */ lw $v1, ($s0) @@ -65,37 +65,37 @@ glabel func_80033BC0 /* F0B0 80033CB0 0C0B763E */ jal func_802DD8F8 /* F0B4 80033CB4 80440084 */ lb $a0, 0x84($v0) /* F0B8 80033CB8 0C0457FA */ jal init_model_data -/* F0BC 80033CBC 00000000 */ nop +/* F0BC 80033CBC 00000000 */ nop /* F0C0 80033CC0 0C05203C */ jal func_801480F0 -/* F0C4 80033CC4 00000000 */ nop +/* F0C4 80033CC4 00000000 */ nop /* F0C8 80033CC8 0C048316 */ jal init_virtual_models -/* F0CC 80033CCC 00000000 */ nop +/* F0CC 80033CCC 00000000 */ nop /* F0D0 80033CD0 0C0478C4 */ jal func_8011E310 -/* F0D4 80033CD4 00000000 */ nop +/* F0D4 80033CD4 00000000 */ nop /* F0D8 80033CD8 0C048C45 */ jal init_dynamic_entity_list -/* F0DC 80033CDC 00000000 */ nop +/* F0DC 80033CDC 00000000 */ nop /* F0E0 80033CE0 0000202D */ daddu $a0, $zero, $zero /* F0E4 80033CE4 0C0514BA */ jal func_801452E8 /* F0E8 80033CE8 0080282D */ daddu $a1, $a0, $zero /* F0EC 80033CEC 0C0504C0 */ jal init_menu_icon_list -/* F0F0 80033CF0 00000000 */ nop +/* F0F0 80033CF0 00000000 */ nop /* F0F4 80033CF4 0C04C433 */ jal init_item_entity_list -/* F0F8 80033CF8 00000000 */ nop +/* F0F8 80033CF8 00000000 */ nop /* F0FC 80033CFC 0C0B0CBB */ jal init_script_list -/* F100 80033D00 00000000 */ nop +/* F100 80033D00 00000000 */ nop /* F104 80033D04 0C00E14B */ jal init_npc_list -/* F108 80033D08 00000000 */ nop +/* F108 80033D08 00000000 */ nop /* F10C 80033D0C 0C044396 */ jal func_80110E58 -/* F110 80033D10 00000000 */ nop +/* F110 80033D10 00000000 */ nop /* F114 80033D14 0C0515CA */ jal init_trigger_list -/* F118 80033D18 00000000 */ nop +/* F118 80033D18 00000000 */ nop /* F11C 80033D1C 8E020000 */ lw $v0, ($s0) /* F120 80033D20 904200AA */ lbu $v0, 0xaa($v0) /* F124 80033D24 30420001 */ andi $v0, $v0, 1 /* F128 80033D28 10400008 */ beqz $v0, .L80033D4C -/* F12C 80033D2C 00000000 */ nop +/* F12C 80033D2C 00000000 */ nop /* F130 80033D30 0C00EC6C */ jal func_8003B1B0 -/* F134 80033D34 00000000 */ nop +/* F134 80033D34 00000000 */ nop /* F138 80033D38 3C02800A */ lui $v0, %hi(D_800A0904) /* F13C 80033D3C 8C420904 */ lw $v0, %lo(D_800A0904)($v0) /* F140 80033D40 24040011 */ addiu $a0, $zero, 0x11 @@ -107,7 +107,7 @@ glabel func_80033BC0 /* F154 80033D54 0C03AC80 */ jal func_800EB200 /* F158 80033D58 80440012 */ lb $a0, 0x12($v0) /* F15C 80033D5C 0C0169B0 */ jal load_world_script_api -/* F160 80033D60 00000000 */ nop +/* F160 80033D60 00000000 */ nop /* F164 80033D64 3C04800E */ lui $a0, %hi(D_800D9230) /* F168 80033D68 24849230 */ addiu $a0, $a0, %lo(D_800D9230) /* F16C 80033D6C 0C016B3A */ jal load_asset_by_name @@ -120,12 +120,12 @@ glabel func_80033BC0 /* F188 80033D88 0C00AB1E */ jal general_heap_free /* F18C 80033D8C 0200202D */ daddu $a0, $s0, $zero /* F190 80033D90 0C016BE5 */ jal initialize_collision -/* F194 80033D94 00000000 */ nop +/* F194 80033D94 00000000 */ nop /* F198 80033D98 0C016C16 */ jal load_collision -/* F19C 80033D9C 00000000 */ nop +/* F19C 80033D9C 00000000 */ nop /* F1A0 80033DA0 8E240008 */ lw $a0, 8($s1) /* F1A4 80033DA4 10800004 */ beqz $a0, .L80033DB8 -/* F1A8 80033DA8 00000000 */ nop +/* F1A8 80033DA8 00000000 */ nop /* F1AC 80033DAC 8E25000C */ lw $a1, 0xc($s1) /* F1B0 80033DB0 0C00A5CF */ jal dma_copy /* F1B4 80033DB4 8E260010 */ lw $a2, 0x10($s1) @@ -136,9 +136,9 @@ glabel func_80033BC0 /* F1C4 80033DC4 50800005 */ beql $a0, $zero, .L80033DDC /* F1C8 80033DC8 24040128 */ addiu $a0, $zero, 0x128 /* F1CC 80033DCC 0C05178A */ jal read_background_size -/* F1D0 80033DD0 00000000 */ nop +/* F1D0 80033DD0 00000000 */ nop /* F1D4 80033DD4 0800CF7B */ j .L80033DEC -/* F1D8 80033DD8 00000000 */ nop +/* F1D8 80033DD8 00000000 */ nop .L80033DDC: /* F1DC 80033DDC 240500C8 */ addiu $a1, $zero, 0xc8 /* F1E0 80033DE0 2406000C */ addiu $a2, $zero, 0xc @@ -154,9 +154,9 @@ glabel func_80033BC0 /* F204 80033E04 0C045709 */ jal load_model_textures /* F208 80033E08 0040282D */ daddu $a1, $v0, $zero /* F20C 80033E0C 0C04584B */ jal calculate_model_sizes -/* F210 80033E10 00000000 */ nop +/* F210 80033E10 00000000 */ nop /* F214 80033E14 0C00EC6C */ jal func_8003B1B0 -/* F218 80033E18 00000000 */ nop +/* F218 80033E18 00000000 */ nop /* F21C 80033E1C 3C02800A */ lui $v0, %hi(D_800A0904) /* F220 80033E20 8C420904 */ lw $v0, %lo(D_800A0904)($v0) /* F224 80033E24 3C04800A */ lui $a0, %hi(D_800A0908) @@ -164,12 +164,12 @@ glabel func_80033BC0 /* F22C 80033E2C 10800003 */ beqz $a0, .L80033E3C /* F230 80033E30 AE620004 */ sw $v0, 4($s3) /* F234 80033E34 0C009C22 */ jal func_80027088 -/* F238 80033E38 00000000 */ nop +/* F238 80033E38 00000000 */ nop .L80033E3C: /* F23C 80033E3C 24040004 */ addiu $a0, $zero, 4 .L80033E40: /* F240 80033E40 0C00CD3C */ jal set_game_mode -/* F244 80033E44 00000000 */ nop +/* F244 80033E44 00000000 */ nop .L80033E48: /* F248 80033E48 8FBF0028 */ lw $ra, 0x28($sp) /* F24C 80033E4C 8FB30024 */ lw $s3, 0x24($sp) diff --git a/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s b/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s index 8807eee7d1..99b1ba25e1 100644 --- a/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s +++ b/asm/nonmatchings/code_ebd0_len_6a0/step_battle.s @@ -41,11 +41,11 @@ glabel step_battle /* ED6C 8003396C 0C017CBC */ jal nuGfxSetCfb /* ED70 80033970 A2020000 */ sb $v0, ($s0) /* ED74 80033974 0C018030 */ jal nuContRmbForceStopEnd -/* ED78 80033978 00000000 */ nop +/* ED78 80033978 00000000 */ nop /* ED7C 8003397C 0C05260E */ jal func_80149838 -/* ED80 80033980 00000000 */ nop +/* ED80 80033980 00000000 */ nop /* ED84 80033984 0C00EC6A */ jal func_8003B1A8 -/* ED88 80033988 00000000 */ nop +/* ED88 80033988 00000000 */ nop /* ED8C 8003398C 3C108007 */ lui $s0, %hi(gGameStatusPtr) /* ED90 80033990 2610419C */ addiu $s0, $s0, %lo(gGameStatusPtr) /* ED94 80033994 8E030000 */ lw $v1, ($s0) @@ -53,9 +53,9 @@ glabel step_battle /* ED9C 8003399C 0C016BA8 */ jal allocate_hit_tables /* EDA0 800339A0 A0620070 */ sb $v0, 0x70($v1) /* EDA4 800339A4 0C00B458 */ jal func_8002D160 -/* EDA8 800339A8 00000000 */ nop +/* EDA8 800339A8 00000000 */ nop /* EDAC 800339AC 0C0AC82D */ jal func_802B20B4 -/* EDB0 800339B0 00000000 */ nop +/* EDB0 800339B0 00000000 */ nop /* EDB4 800339B4 0C05259C */ jal func_80149670 /* EDB8 800339B8 0000202D */ daddu $a0, $zero, $zero /* EDBC 800339BC 8E100000 */ lw $s0, ($s0) @@ -78,36 +78,36 @@ glabel step_battle /* EDFC 800339FC 24040006 */ addiu $a0, $zero, 6 .L80033A00: /* EE00 80033A00 0C0B763E */ jal func_802DD8F8 -/* EE04 80033A04 00000000 */ nop +/* EE04 80033A04 00000000 */ nop /* EE08 80033A08 0C045751 */ jal clear_model_data -/* EE0C 80033A0C 00000000 */ nop +/* EE0C 80033A0C 00000000 */ nop /* EE10 80033A10 0C052010 */ jal func_80148040 -/* EE14 80033A14 00000000 */ nop +/* EE14 80033A14 00000000 */ nop /* EE18 80033A18 0C05177E */ jal func_80145DF8 -/* EE1C 80033A1C 00000000 */ nop +/* EE1C 80033A1C 00000000 */ nop /* EE20 80033A20 0C0482EC */ jal clear_virtual_models -/* EE24 80033A24 00000000 */ nop +/* EE24 80033A24 00000000 */ nop /* EE28 80033A28 0C047889 */ jal func_8011E224 -/* EE2C 80033A2C 00000000 */ nop +/* EE2C 80033A2C 00000000 */ nop /* EE30 80033A30 0C048C2E */ jal clear_dynamic_entity_list -/* EE34 80033A34 00000000 */ nop +/* EE34 80033A34 00000000 */ nop /* EE38 80033A38 0000202D */ daddu $a0, $zero, $zero /* EE3C 80033A3C 0C0514BA */ jal func_801452E8 /* EE40 80033A40 0080282D */ daddu $a1, $a0, $zero /* EE44 80033A44 0C050440 */ jal func_80141100 -/* EE48 80033A48 00000000 */ nop +/* EE48 80033A48 00000000 */ nop /* EE4C 80033A4C 0C03A6EC */ jal reset_status_menu -/* EE50 80033A50 00000000 */ nop +/* EE50 80033A50 00000000 */ nop /* EE54 80033A54 0C04C3FC */ jal clear_item_entity_data -/* EE58 80033A58 00000000 */ nop +/* EE58 80033A58 00000000 */ nop /* EE5C 80033A5C 0C0B0C77 */ jal clear_script_list -/* EE60 80033A60 00000000 */ nop +/* EE60 80033A60 00000000 */ nop /* EE64 80033A64 0C00E12F */ jal clear_npcs -/* EE68 80033A68 00000000 */ nop +/* EE68 80033A68 00000000 */ nop /* EE6C 80033A6C 0C04432E */ jal clear_entity_data /* EE70 80033A70 24040001 */ addiu $a0, $zero, 1 /* EE74 80033A74 0C0515A0 */ jal clear_trigger_data -/* EE78 80033A78 00000000 */ nop +/* EE78 80033A78 00000000 */ nop /* EE7C 80033A7C 3C040017 */ lui $a0, 0x17 /* EE80 80033A80 2484C8E0 */ addiu $a0, $a0, -0x3720 /* EE84 80033A84 3C05001D */ lui $a1, 0x1d @@ -115,13 +115,13 @@ glabel step_battle /* EE8C 80033A8C 3C068024 */ lui $a2, %hi(get_dpad_input_radial) /* EE90 80033A90 24C6E000 */ addiu $a2, $a2, %lo(get_dpad_input_radial) /* EE94 80033A94 0C00A5CF */ jal dma_copy -/* EE98 80033A98 00000000 */ nop +/* EE98 80033A98 00000000 */ nop /* EE9C 80033A9C 0C08F84C */ jal initialize_battle -/* EEA0 80033AA0 00000000 */ nop +/* EEA0 80033AA0 00000000 */ nop /* EEA4 80033AA4 0C09027D */ jal func_802409F4 -/* EEA8 80033AA8 00000000 */ nop +/* EEA8 80033AA8 00000000 */ nop /* EEAC 80033AAC 0C01CAF7 */ jal func_80072BDC -/* EEB0 80033AB0 00000000 */ nop +/* EEB0 80033AB0 00000000 */ nop /* EEB4 80033AB4 3C04800F */ lui $a0, %hi(gPlayerStatusPtr) /* EEB8 80033AB8 8C847B30 */ lw $a0, %lo(gPlayerStatusPtr)($a0) /* EEBC 80033ABC 8C820004 */ lw $v0, 4($a0) @@ -146,19 +146,19 @@ glabel step_battle /* EF08 80033B08 ACA20000 */ sw $v0, ($a1) .L80033B0C: /* EF0C 80033B0C 0C00F949 */ jal func_8003E524 -/* EF10 80033B10 00000000 */ nop +/* EF10 80033B10 00000000 */ nop /* EF14 80033B14 0C08F90E */ jal update_battle_state -/* EF18 80033B18 00000000 */ nop +/* EF18 80033B18 00000000 */ nop /* EF1C 80033B1C 0C00E64C */ jal update_npcs -/* EF20 80033B20 00000000 */ nop +/* EF20 80033B20 00000000 */ nop /* EF24 80033B24 0C04C7BB */ jal update_item_entities -/* EF28 80033B28 00000000 */ nop +/* EF28 80033B28 00000000 */ nop /* EF2C 80033B2C 0C016754 */ jal func_80059D50 -/* EF30 80033B30 00000000 */ nop +/* EF30 80033B30 00000000 */ nop /* EF34 80033B34 0C04599D */ jal func_80116674 -/* EF38 80033B38 00000000 */ nop +/* EF38 80033B38 00000000 */ nop /* EF3C 80033B3C 0C00B500 */ jal update_cameras -/* EF40 80033B40 00000000 */ nop +/* EF40 80033B40 00000000 */ nop .L80033B44: /* EF44 80033B44 8FBF0014 */ lw $ra, 0x14($sp) /* EF48 80033B48 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/os/code_3b390_len_110/nuContRmbModeSet.s b/asm/nonmatchings/os/code_3b390_len_110/nuContRmbModeSet.s index 1f9b1c1d5a..ad35443cf6 100644 --- a/asm/nonmatchings/os/code_3b390_len_110/nuContRmbModeSet.s +++ b/asm/nonmatchings/os/code_3b390_len_110/nuContRmbModeSet.s @@ -28,12 +28,12 @@ glabel nuContRmbModeSet /* 3B3EC 8005FFEC 1080000D */ beqz $a0, .L80060024 /* 3B3F0 8005FFF0 02261025 */ or $v0, $s1, $a2 /* 3B3F4 8005FFF4 0801801E */ j .L80060078 -/* 3B3F8 8005FFF8 00000000 */ nop +/* 3B3F8 8005FFF8 00000000 */ nop .L8005FFFC: /* 3B3FC 8005FFFC 1082000E */ beq $a0, $v0, .L80060038 /* 3B400 80060000 02261025 */ or $v0, $s1, $a2 /* 3B404 80060004 0801801E */ j .L80060078 -/* 3B408 80060008 00000000 */ nop +/* 3B408 80060008 00000000 */ nop .L8006000C: /* 3B40C 8006000C 3C03800B */ lui $v1, %hi(D_800B1D49) /* 3B410 80060010 00651821 */ addu $v1, $v1, $a1 @@ -46,7 +46,7 @@ glabel nuContRmbModeSet /* 3B428 80060028 00250821 */ addu $at, $at, $a1 /* 3B42C 8006002C A0221D47 */ sb $v0, %lo(D_800B1D47)($at) /* 3B430 80060030 0801801E */ j .L80060078 -/* 3B434 80060034 00000000 */ nop +/* 3B434 80060034 00000000 */ nop .L80060038: /* 3B438 80060038 3C01800B */ lui $at, %hi(D_800B1D47) /* 3B43C 8006003C 00250821 */ addu $at, $at, $a1 @@ -55,12 +55,12 @@ glabel nuContRmbModeSet /* 3B448 80060048 00451021 */ addu $v0, $v0, $a1 /* 3B44C 8006004C 90421D49 */ lbu $v0, %lo(D_800B1D49)($v0) /* 3B450 80060050 14440006 */ bne $v0, $a0, .L8006006C -/* 3B454 80060054 00000000 */ nop +/* 3B454 80060054 00000000 */ nop /* 3B458 80060058 3C01800B */ lui $at, %hi(D_800B1D48) /* 3B45C 8006005C 00250821 */ addu $at, $at, $a1 /* 3B460 80060060 A0231D48 */ sb $v1, %lo(D_800B1D48)($at) /* 3B464 80060064 0801801E */ j .L80060078 -/* 3B468 80060068 00000000 */ nop +/* 3B468 80060068 00000000 */ nop .L8006006C: /* 3B46C 8006006C 3C01800B */ lui $at, %hi(D_800B1D48) /* 3B470 80060070 00250821 */ addu $at, $at, $a1 @@ -73,6 +73,6 @@ glabel nuContRmbModeSet /* 3B488 80060088 8FB00010 */ lw $s0, 0x10($sp) /* 3B48C 8006008C 03E00008 */ jr $ra /* 3B490 80060090 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3B494 80060094 00000000 */ nop -/* 3B498 80060098 00000000 */ nop -/* 3B49C 8006009C 00000000 */ nop +/* 3B494 80060094 00000000 */ nop +/* 3B498 80060098 00000000 */ nop +/* 3B49C 8006009C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s index 19518901bf..59f2f20ab2 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuGfxThread.s @@ -28,30 +28,30 @@ glabel nuGfxThread /* 3B6A0 800602A0 8FA20020 */ lw $v0, 0x20($sp) /* 3B6A4 800602A4 84420000 */ lh $v0, ($v0) /* 3B6A8 800602A8 10510005 */ beq $v0, $s1, .L800602C0 -/* 3B6AC 800602AC 00000000 */ nop +/* 3B6AC 800602AC 00000000 */ nop /* 3B6B0 800602B0 1050000D */ beq $v0, $s0, .L800602E8 -/* 3B6B4 800602B4 00000000 */ nop +/* 3B6B4 800602B4 00000000 */ nop /* 3B6B8 800602B8 080180A3 */ j .L8006028C -/* 3B6BC 800602BC 00000000 */ nop +/* 3B6BC 800602BC 00000000 */ nop .L800602C0: /* 3B6C0 800602C0 3C028009 */ lui $v0, %hi(nuGfxFunc) /* 3B6C4 800602C4 8C423D10 */ lw $v0, %lo(nuGfxFunc)($v0) /* 3B6C8 800602C8 1040FFF0 */ beqz $v0, .L8006028C -/* 3B6CC 800602CC 00000000 */ nop +/* 3B6CC 800602CC 00000000 */ nop /* 3B6D0 800602D0 3C04800A */ lui $a0, %hi(nuGfxTaskSpool) /* 3B6D4 800602D4 8C84A618 */ lw $a0, %lo(nuGfxTaskSpool)($a0) /* 3B6D8 800602D8 0040F809 */ jalr $v0 -/* 3B6DC 800602DC 00000000 */ nop +/* 3B6DC 800602DC 00000000 */ nop /* 3B6E0 800602E0 080180A3 */ j .L8006028C -/* 3B6E4 800602E4 00000000 */ nop +/* 3B6E4 800602E4 00000000 */ nop .L800602E8: /* 3B6E8 800602E8 3C028009 */ lui $v0, %hi(nuGfxPreNMIFunc) /* 3B6EC 800602EC 8C423D14 */ lw $v0, %lo(nuGfxPreNMIFunc)($v0) /* 3B6F0 800602F0 1040FFE6 */ beqz $v0, .L8006028C -/* 3B6F4 800602F4 00000000 */ nop +/* 3B6F4 800602F4 00000000 */ nop /* 3B6F8 800602F8 0040F809 */ jalr $v0 -/* 3B6FC 800602FC 00000000 */ nop +/* 3B6FC 800602FC 00000000 */ nop /* 3B700 80060300 080180A3 */ j .L8006028C -/* 3B704 80060304 00000000 */ nop -/* 3B708 80060308 00000000 */ nop -/* 3B70C 8006030C 00000000 */ nop +/* 3B704 80060304 00000000 */ nop +/* 3B708 80060308 00000000 */ nop +/* 3B70C 8006030C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s b/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s index ae204d2236..6fcbc5e7e1 100644 --- a/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s +++ b/asm/nonmatchings/os/code_3b4a0_len_270/nuPiReadRomOverlay.s @@ -32,7 +32,7 @@ glabel nuPiReadRomOverlay /* 3B54C 8006014C 8E930008 */ lw $s3, 8($s4) /* 3B550 80060150 00528823 */ subu $s1, $v0, $s2 /* 3B554 80060154 1220001C */ beqz $s1, .L800601C8 -/* 3B558 80060158 00000000 */ nop +/* 3B558 80060158 00000000 */ nop .L8006015C: /* 3B55C 8006015C 2E224001 */ sltiu $v0, $s1, 0x4001 /* 3B560 80060160 14400002 */ bnez $v0, .L8006016C @@ -73,4 +73,4 @@ glabel nuPiReadRomOverlay /* 3B5E0 800601E0 8FB00048 */ lw $s0, 0x48($sp) /* 3B5E4 800601E4 03E00008 */ jr $ra /* 3B5E8 800601E8 27BD0068 */ addiu $sp, $sp, 0x68 -/* 3B5EC 800601EC 00000000 */ nop +/* 3B5EC 800601EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s b/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s index 79c053b761..de1f45dd9e 100644 --- a/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s +++ b/asm/nonmatchings/os/code_3b710_len_40/nuGfxSwapCfbFuncSet.s @@ -16,5 +16,5 @@ glabel nuGfxSwapCfbFuncSet /* 3B73C 8006033C 8FB00010 */ lw $s0, 0x10($sp) /* 3B740 80060340 03E00008 */ jr $ra /* 3B744 80060344 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3B748 80060348 00000000 */ nop -/* 3B74C 8006034C 00000000 */ nop +/* 3B748 80060348 00000000 */ nop +/* 3B74C 8006034C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s b/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s index 2495d3258f..dab35d725a 100644 --- a/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s +++ b/asm/nonmatchings/os/code_3b770_len_80/nuGfxRetraceWait.s @@ -33,6 +33,6 @@ glabel nuGfxRetraceWait /* 3B7D8 800603D8 8FB00040 */ lw $s0, 0x40($sp) /* 3B7DC 800603DC 03E00008 */ jr $ra /* 3B7E0 800603E0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 3B7E4 800603E4 00000000 */ nop -/* 3B7E8 800603E8 00000000 */ nop -/* 3B7EC 800603EC 00000000 */ nop +/* 3B7E4 800603E4 00000000 */ nop +/* 3B7E8 800603E8 00000000 */ nop +/* 3B7EC 800603EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s b/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s index e80b209b15..eef9403276 100644 --- a/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s +++ b/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackAdd.s @@ -20,7 +20,7 @@ glabel nuSiCallBackAdd /* 3B828 80060428 0060802D */ daddu $s0, $v1, $zero /* 3B82C 8006042C 8E020000 */ lw $v0, ($s0) /* 3B830 80060430 1440FFFA */ bnez $v0, .L8006041C -/* 3B834 80060434 00000000 */ nop +/* 3B834 80060434 00000000 */ nop .L80060438: /* 3B838 80060438 8E430004 */ lw $v1, 4($s2) /* 3B83C 8006043C 8C620004 */ lw $v0, 4($v1) diff --git a/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s b/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s index a646addc9f..f983be7dde 100644 --- a/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s +++ b/asm/nonmatchings/os/code_3b7f0_len_120/nuSiCallBackRemove.s @@ -10,12 +10,12 @@ glabel nuSiCallBackRemove /* 3B8A4 800604A4 AFB00010 */ sw $s0, 0x10($sp) /* 3B8A8 800604A8 8E220000 */ lw $v0, ($s1) /* 3B8AC 800604AC 10400011 */ beqz $v0, .L800604F4 -/* 3B8B0 800604B0 00000000 */ nop +/* 3B8B0 800604B0 00000000 */ nop .L800604B4: /* 3B8B4 800604B4 8E220000 */ lw $v0, ($s1) /* 3B8B8 800604B8 8C500000 */ lw $s0, ($v0) /* 3B8BC 800604BC 1604000B */ bne $s0, $a0, .L800604EC -/* 3B8C0 800604C0 00000000 */ nop +/* 3B8C0 800604C0 00000000 */ nop /* 3B8C4 800604C4 0C018250 */ jal osSetIntMask /* 3B8C8 800604C8 24040001 */ addiu $a0, $zero, 1 /* 3B8CC 800604CC 8E250000 */ lw $a1, ($s1) @@ -25,7 +25,7 @@ glabel nuSiCallBackRemove /* 3B8DC 800604DC 0C018250 */ jal osSetIntMask /* 3B8E0 800604E0 AE000000 */ sw $zero, ($s0) /* 3B8E4 800604E4 0801813D */ j .L800604F4 -/* 3B8E8 800604E8 00000000 */ nop +/* 3B8E8 800604E8 00000000 */ nop .L800604EC: /* 3B8EC 800604EC 1600FFF1 */ bnez $s0, .L800604B4 /* 3B8F0 800604F0 0040882D */ daddu $s1, $v0, $zero @@ -35,5 +35,5 @@ glabel nuSiCallBackRemove /* 3B8FC 800604FC 8FB00010 */ lw $s0, 0x10($sp) /* 3B900 80060500 03E00008 */ jr $ra /* 3B904 80060504 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3B908 80060508 00000000 */ nop -/* 3B90C 8006050C 00000000 */ nop +/* 3B908 80060508 00000000 */ nop +/* 3B90C 8006050C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3b910_len_410/contReadData.s b/asm/nonmatchings/os/code_3b910_len_410/contReadData.s index 19ea806b93..86f626d3b8 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contReadData.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contReadData.s @@ -9,7 +9,7 @@ glabel contReadData /* 3BB48 80060748 3C04800E */ lui $a0, %hi(nuSiMesgQ) /* 3BB4C 8006074C 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BB50 80060750 0C018668 */ jal osContStartReadData -/* 3BB54 80060754 00000000 */ nop +/* 3BB54 80060754 00000000 */ nop /* 3BB58 80060758 14400012 */ bnez $v0, .L800607A4 /* 3BB5C 8006075C 0000282D */ daddu $a1, $zero, $zero /* 3BB60 80060760 3C04800E */ lui $a0, %hi(nuSiMesgQ) diff --git a/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s b/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s index 8df50f941a..8ae4258c43 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contReadNW.s @@ -14,7 +14,7 @@ glabel contReadNW /* 3BBD8 800607D8 3C04800E */ lui $a0, %hi(nuSiMesgQ) /* 3BBDC 800607DC 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BBE0 800607E0 0C018668 */ jal osContStartReadData -/* 3BBE4 800607E4 00000000 */ nop +/* 3BBE4 800607E4 00000000 */ nop /* 3BBE8 800607E8 14400013 */ bnez $v0, .L80060838 /* 3BBEC 800607EC 0000282D */ daddu $a1, $zero, $zero /* 3BBF0 800607F0 3C04800E */ lui $a0, %hi(nuSiMesgQ) @@ -37,14 +37,14 @@ glabel contReadNW /* 3BC34 80060834 0000102D */ daddu $v0, $zero, $zero .L80060838: /* 3BC38 80060838 14400009 */ bnez $v0, .L80060860 -/* 3BC3C 8006083C 00000000 */ nop +/* 3BC3C 8006083C 00000000 */ nop /* 3BC40 80060840 3C028009 */ lui $v0, %hi(D_80093D20) /* 3BC44 80060844 8C423D20 */ lw $v0, %lo(D_80093D20)($v0) /* 3BC48 80060848 50400005 */ beql $v0, $zero, .L80060860 /* 3BC4C 8006084C 0000102D */ daddu $v0, $zero, $zero /* 3BC50 80060850 86040000 */ lh $a0, ($s0) /* 3BC54 80060854 0040F809 */ jalr $v0 -/* 3BC58 80060858 00000000 */ nop +/* 3BC58 80060858 00000000 */ nop /* 3BC5C 8006085C 0000102D */ daddu $v0, $zero, $zero .L80060860: /* 3BC60 80060860 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s b/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s index 4f83aa4624..9d7a3c73be 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s +++ b/asm/nonmatchings/os/code_3b910_len_410/contRetrace.s @@ -17,7 +17,7 @@ glabel contRetrace /* 3BA8C 8006068C 3C04800E */ lui $a0, %hi(nuSiMesgQ) /* 3BA90 80060690 2484AC78 */ addiu $a0, $a0, %lo(nuSiMesgQ) /* 3BA94 80060694 0C018668 */ jal osContStartReadData -/* 3BA98 80060698 00000000 */ nop +/* 3BA98 80060698 00000000 */ nop /* 3BA9C 8006069C 14400016 */ bnez $v0, .L800606F8 /* 3BAA0 800606A0 0000282D */ daddu $a1, $zero, $zero /* 3BAA4 800606A4 3C04800E */ lui $a0, %hi(nuSiMesgQ) @@ -45,7 +45,7 @@ glabel contRetrace /* 3BAF8 800606F8 3C028009 */ lui $v0, %hi(D_80093D20) /* 3BAFC 800606FC 8C423D20 */ lw $v0, %lo(D_80093D20)($v0) /* 3BB00 80060700 10400003 */ beqz $v0, .L80060710 -/* 3BB04 80060704 00000000 */ nop +/* 3BB04 80060704 00000000 */ nop /* 3BB08 80060708 0040F809 */ jalr $v0 /* 3BB0C 8006070C 86040000 */ lh $a0, ($s0) .L80060710: diff --git a/asm/nonmatchings/os/code_3b910_len_410/nuContDataUnLock.s b/asm/nonmatchings/os/code_3b910_len_410/nuContDataUnLock.s index 4377f18520..6ef95485a8 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/nuContDataUnLock.s +++ b/asm/nonmatchings/os/code_3b910_len_410/nuContDataUnLock.s @@ -13,4 +13,4 @@ glabel nuContDataUnLock /* 3BD10 80060910 8FBF0010 */ lw $ra, 0x10($sp) /* 3BD14 80060914 03E00008 */ jr $ra /* 3BD18 80060918 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3BD1C 8006091C 00000000 */ nop +/* 3BD1C 8006091C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3b910_len_410/nuContMgrInit.s b/asm/nonmatchings/os/code_3b910_len_410/nuContMgrInit.s index 0fa9a439b6..eed39e5640 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/nuContMgrInit.s +++ b/asm/nonmatchings/os/code_3b910_len_410/nuContMgrInit.s @@ -5,7 +5,7 @@ glabel nuContMgrInit /* 3B910 80060510 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 3B914 80060514 AFBF0010 */ sw $ra, 0x10($sp) /* 3B918 80060518 0C01823C */ jal nuContDataUnLock -/* 3B91C 8006051C 00000000 */ nop +/* 3B91C 8006051C 00000000 */ nop /* 3B920 80060520 3C04800B */ lui $a0, %hi(D_800B0EB8) /* 3B924 80060524 24840EB8 */ addiu $a0, $a0, %lo(D_800B0EB8) /* 3B928 80060528 3C05800B */ lui $a1, %hi(D_800AE6D0) @@ -22,7 +22,7 @@ glabel nuContMgrInit /* 3B954 80060554 0C0180FC */ jal nuSiCallBackAdd /* 3B958 80060558 24843D38 */ addiu $a0, $a0, %lo(D_80093D38) /* 3B95C 8006055C 0C018248 */ jal nuContQueryRead -/* 3B960 80060560 00000000 */ nop +/* 3B960 80060560 00000000 */ nop /* 3B964 80060564 24050001 */ addiu $a1, $zero, 1 /* 3B968 80060568 0000302D */ daddu $a2, $zero, $zero /* 3B96C 8006056C 0000202D */ daddu $a0, $zero, $zero diff --git a/asm/nonmatchings/os/code_3b910_len_410/nuContMgrRemove.s b/asm/nonmatchings/os/code_3b910_len_410/nuContMgrRemove.s index 70c7255e61..716046f24b 100644 --- a/asm/nonmatchings/os/code_3b910_len_410/nuContMgrRemove.s +++ b/asm/nonmatchings/os/code_3b910_len_410/nuContMgrRemove.s @@ -7,7 +7,7 @@ glabel nuContMgrRemove /* 3B9F0 800605F0 24843D38 */ addiu $a0, $a0, %lo(D_80093D38) /* 3B9F4 800605F4 AFBF0010 */ sw $ra, 0x10($sp) /* 3B9F8 800605F8 0C018124 */ jal nuSiCallBackRemove -/* 3B9FC 800605FC 00000000 */ nop +/* 3B9FC 800605FC 00000000 */ nop /* 3BA00 80060600 8FBF0010 */ lw $ra, 0x10($sp) /* 3BA04 80060604 03E00008 */ jr $ra /* 3BA08 80060608 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s b/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s index 8b32682320..a38ea59fea 100644 --- a/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s +++ b/asm/nonmatchings/os/code_3bde0_len_3e0/osCreatePiManager.s @@ -32,7 +32,7 @@ glabel osCreatePiManager /* 3BE4C 80060A4C 54400004 */ bnel $v0, $zero, .L80060A60 /* 3BE50 80060A50 24040008 */ addiu $a0, $zero, 8 /* 3BE54 80060A54 0C018514 */ jal osPiCreateAccessQueue -/* 3BE58 80060A58 00000000 */ nop +/* 3BE58 80060A58 00000000 */ nop /* 3BE5C 80060A5C 24040008 */ addiu $a0, $zero, 8 .L80060A60: /* 3BE60 80060A60 02602821 */ addu $a1, $s3, $zero @@ -45,14 +45,14 @@ glabel osCreatePiManager /* 3BE7C 80060A7C 00401821 */ addu $v1, $v0, $zero /* 3BE80 80060A80 0070102A */ slt $v0, $v1, $s0 /* 3BE84 80060A84 10400005 */ beqz $v0, .L80060A9C -/* 3BE88 80060A88 00000000 */ nop +/* 3BE88 80060A88 00000000 */ nop /* 3BE8C 80060A8C 00609021 */ addu $s2, $v1, $zero /* 3BE90 80060A90 00002021 */ addu $a0, $zero, $zero /* 3BE94 80060A94 0C0197D4 */ jal osSetThreadPri /* 3BE98 80060A98 02002821 */ addu $a1, $s0, $zero .L80060A9C: /* 3BE9C 80060A9C 0C01ACD8 */ jal __osDisableInt -/* 3BEA0 80060AA0 00000000 */ nop +/* 3BEA0 80060AA0 00000000 */ nop /* 3BEA4 80060AA4 3C11800B */ lui $s1, %hi(D_800AE6E0) /* 3BEA8 80060AA8 2631E6E0 */ addiu $s1, $s1, %lo(D_800AE6E0) /* 3BEAC 80060AAC 02202021 */ addu $a0, $s1, $zero diff --git a/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiRawStartDma.s b/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiRawStartDma.s index 9b19029433..e95fb327ff 100644 --- a/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiRawStartDma.s +++ b/asm/nonmatchings/os/code_3bde0_len_3e0/osEPiRawStartDma.s @@ -24,7 +24,7 @@ glabel osEPiRawStartDma /* 3BFB8 80060BB8 8C620000 */ lw $v0, ($v1) /* 3BFBC 80060BBC 30420003 */ andi $v0, $v0, 3 /* 3BFC0 80060BC0 1440FFFD */ bnez $v0, .L80060BB8 -/* 3BFC4 80060BC4 00000000 */ nop +/* 3BFC4 80060BC4 00000000 */ nop .L80060BC8: /* 3BFC8 80060BC8 92060009 */ lbu $a2, 9($s0) /* 3BFCC 80060BCC 00061080 */ sll $v0, $a2, 2 @@ -34,7 +34,7 @@ glabel osEPiRawStartDma /* 3BFDC 80060BDC 92020004 */ lbu $v0, 4($s0) /* 3BFE0 80060BE0 90A30004 */ lbu $v1, 4($a1) /* 3BFE4 80060BE4 1062003D */ beq $v1, $v0, .L80060CDC -/* 3BFE8 80060BE8 00000000 */ nop +/* 3BFE8 80060BE8 00000000 */ nop /* 3BFEC 80060BEC 14C00019 */ bnez $a2, .L80060C54 /* 3BFF0 80060BF0 00A01821 */ addu $v1, $a1, $zero /* 3BFF4 80060BF4 90620005 */ lbu $v0, 5($v1) @@ -106,7 +106,7 @@ glabel osEPiRawStartDma /* 3C0D8 80060CD8 A0620008 */ sb $v0, 8($v1) .L80060CDC: /* 3C0DC 80060CDC 0C0187A4 */ jal osVirtualToPhysical -/* 3C0E0 80060CE0 00000000 */ nop +/* 3C0E0 80060CE0 00000000 */ nop /* 3C0E4 80060CE4 3C04A460 */ lui $a0, 0xa460 /* 3C0E8 80060CE8 34840004 */ ori $a0, $a0, 4 /* 3C0EC 80060CEC 3C03A460 */ lui $v1, 0xa460 @@ -141,4 +141,4 @@ glabel osEPiRawStartDma /* 3C150 80060D50 8FB00010 */ lw $s0, 0x10($sp) /* 3C154 80060D54 03E00008 */ jr $ra /* 3C158 80060D58 27BD0028 */ addiu $sp, $sp, 0x28 -/* 3C15C 80060D5C 00000000 */ nop +/* 3C15C 80060D5C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s b/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s index 47ebd40db4..0aa65013b8 100644 --- a/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s +++ b/asm/nonmatchings/os/code_3c220_len_a0/osEPiStartDma.s @@ -23,18 +23,18 @@ glabel osEPiStartDma /* 3C25C 80060E5C 92030002 */ lbu $v1, 2($s0) /* 3C260 80060E60 24020001 */ addiu $v0, $zero, 1 /* 3C264 80060E64 14620009 */ bne $v1, $v0, .L80060E8C -/* 3C268 80060E68 00000000 */ nop +/* 3C268 80060E68 00000000 */ nop /* 3C26C 80060E6C 0C01AD54 */ jal osPiGetCmdQueue -/* 3C270 80060E70 00000000 */ nop +/* 3C270 80060E70 00000000 */ nop /* 3C274 80060E74 00402021 */ addu $a0, $v0, $zero /* 3C278 80060E78 02002821 */ addu $a1, $s0, $zero /* 3C27C 80060E7C 0C01956C */ jal osJamMesg /* 3C280 80060E80 00003021 */ addu $a2, $zero, $zero /* 3C284 80060E84 080183A9 */ j .L80060EA4 -/* 3C288 80060E88 00000000 */ nop +/* 3C288 80060E88 00000000 */ nop .L80060E8C: /* 3C28C 80060E8C 0C01AD54 */ jal osPiGetCmdQueue -/* 3C290 80060E90 00000000 */ nop +/* 3C290 80060E90 00000000 */ nop /* 3C294 80060E94 00402021 */ addu $a0, $v0, $zero /* 3C298 80060E98 02002821 */ addu $a1, $s0, $zero /* 3C29C 80060E9C 0C019608 */ jal osSendMesg @@ -44,6 +44,6 @@ glabel osEPiStartDma /* 3C2A8 80060EA8 8FB00010 */ lw $s0, 0x10($sp) /* 3C2AC 80060EAC 03E00008 */ jr $ra /* 3C2B0 80060EB0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3C2B4 80060EB4 00000000 */ nop -/* 3C2B8 80060EB8 00000000 */ nop -/* 3C2BC 80060EBC 00000000 */ nop +/* 3C2B4 80060EB4 00000000 */ nop +/* 3C2B8 80060EB8 00000000 */ nop +/* 3C2BC 80060EBC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s b/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s index e65b3d6546..d2fe4e88c5 100644 --- a/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s +++ b/asm/nonmatchings/os/code_3c2c0_len_50/osEPiLinkHandle.s @@ -19,6 +19,6 @@ glabel osEPiLinkHandle /* 3C2F8 80060EF8 8FB00010 */ lw $s0, 0x10($sp) /* 3C2FC 80060EFC 03E00008 */ jr $ra /* 3C300 80060F00 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3C304 80060F04 00000000 */ nop -/* 3C308 80060F08 00000000 */ nop -/* 3C30C 80060F0C 00000000 */ nop +/* 3C304 80060F04 00000000 */ nop +/* 3C308 80060F08 00000000 */ nop +/* 3C30C 80060F0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3c310_len_180/osCartRomInit.s b/asm/nonmatchings/os/code_3c310_len_180/osCartRomInit.s index b6531b6968..3f2d9c4035 100644 --- a/asm/nonmatchings/os/code_3c310_len_180/osCartRomInit.s +++ b/asm/nonmatchings/os/code_3c310_len_180/osCartRomInit.s @@ -10,7 +10,7 @@ glabel osCartRomInit /* 3C324 80060F24 3C028009 */ lui $v0, %hi(D_80093D80) /* 3C328 80060F28 8C423D80 */ lw $v0, %lo(D_80093D80)($v0) /* 3C32C 80060F2C 1040004D */ beqz $v0, .L80061064 -/* 3C330 80060F30 00000000 */ nop +/* 3C330 80060F30 00000000 */ nop /* 3C334 80060F34 3C02800B */ lui $v0, %hi(D_800B430C) /* 3C338 80060F38 2442430C */ addiu $v0, $v0, %lo(D_800B430C) /* 3C33C 80060F3C 24440010 */ addiu $a0, $v0, 0x10 @@ -37,7 +37,7 @@ glabel osCartRomInit /* 3C38C 80060F8C 8C620000 */ lw $v0, ($v1) /* 3C390 80060F90 30420003 */ andi $v0, $v0, 3 /* 3C394 80060F94 1440FFFD */ bnez $v0, .L80060F8C -/* 3C398 80060F98 00000000 */ nop +/* 3C398 80060F98 00000000 */ nop .L80060F9C: /* 3C39C 80060F9C 3C08A460 */ lui $t0, 0xa460 /* 3C3A0 80060FA0 35080014 */ ori $t0, $t0, 0x14 @@ -91,7 +91,7 @@ glabel osCartRomInit /* 3C460 80061060 AE23FFF4 */ sw $v1, -0xc($s1) .L80061064: /* 3C464 80061064 0C018544 */ jal osPiRelAccess -/* 3C468 80061068 00000000 */ nop +/* 3C468 80061068 00000000 */ nop /* 3C46C 8006106C 3C02800B */ lui $v0, %hi(D_800B4308) /* 3C470 80061070 24424308 */ addiu $v0, $v0, %lo(D_800B4308) /* 3C474 80061074 8FBF0018 */ lw $ra, 0x18($sp) @@ -99,5 +99,5 @@ glabel osCartRomInit /* 3C47C 8006107C 8FB00010 */ lw $s0, 0x10($sp) /* 3C480 80061080 03E00008 */ jr $ra /* 3C484 80061084 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3C488 80061088 00000000 */ nop -/* 3C48C 8006108C 00000000 */ nop +/* 3C488 80061088 00000000 */ nop +/* 3C48C 8006108C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s b/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s index 9c971be5ec..8e01c71dae 100644 --- a/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s +++ b/asm/nonmatchings/os/code_3c490_len_3c0/osDevMgrMain.s @@ -22,10 +22,10 @@ glabel osDevMgrMain /* 3C4D0 800610D0 8FA20018 */ lw $v0, 0x18($sp) /* 3C4D4 800610D4 8C500014 */ lw $s0, 0x14($v0) /* 3C4D8 800610D8 1200007C */ beqz $s0, .L800612CC -/* 3C4DC 800610DC 00000000 */ nop +/* 3C4DC 800610DC 00000000 */ nop /* 3C4E0 800610E0 92020004 */ lbu $v0, 4($s0) /* 3C4E4 800610E4 14540078 */ bne $v0, $s4, .L800612C8 -/* 3C4E8 800610E8 00000000 */ nop +/* 3C4E8 800610E8 00000000 */ nop /* 3C4EC 800610EC 8E020014 */ lw $v0, 0x14($s0) /* 3C4F0 800610F0 2C420002 */ sltiu $v0, $v0, 2 /* 3C4F4 800610F4 10400074 */ beqz $v0, .L800612C8 @@ -40,7 +40,7 @@ glabel osDevMgrMain /* 3C518 80061118 2451002C */ addiu $s1, $v0, 0x2c /* 3C51C 8006111C 24020003 */ addiu $v0, $zero, 3 /* 3C520 80061120 10620005 */ beq $v1, $v0, .L80061138 -/* 3C524 80061124 00000000 */ nop +/* 3C524 80061124 00000000 */ nop /* 3C528 80061128 8E220004 */ lw $v0, 4($s1) /* 3C52C 8006112C 8E23000C */ lw $v1, 0xc($s1) /* 3C530 80061130 00431023 */ subu $v0, $v0, $v1 @@ -131,7 +131,7 @@ glabel osDevMgrMain /* 3C670 80061270 0C019608 */ jal osSendMesg /* 3C674 80061274 00003021 */ addu $a2, $zero, $zero /* 3C678 80061278 16750006 */ bne $s3, $s5, .L80061294 -/* 3C67C 8006127C 00000000 */ nop +/* 3C67C 8006127C 00000000 */ nop /* 3C680 80061280 8FA20018 */ lw $v0, 0x18($sp) /* 3C684 80061284 8C420014 */ lw $v0, 0x14($v0) /* 3C688 80061288 8C42002C */ lw $v0, 0x2c($v0) @@ -146,11 +146,11 @@ glabel osDevMgrMain /* 3C6A8 800612A8 8C420014 */ lw $v0, 0x14($v0) /* 3C6AC 800612AC 9442001A */ lhu $v0, 0x1a($v0) /* 3C6B0 800612B0 1455FF83 */ bne $v0, $s5, .L800610C0 -/* 3C6B4 800612B4 00000000 */ nop +/* 3C6B4 800612B4 00000000 */ nop /* 3C6B8 800612B8 0C019890 */ jal osYieldThread -/* 3C6BC 800612BC 00000000 */ nop +/* 3C6BC 800612BC 00000000 */ nop /* 3C6C0 800612C0 08018430 */ j .L800610C0 -/* 3C6C4 800612C4 00000000 */ nop +/* 3C6C4 800612C4 00000000 */ nop .L800612C8: /* 3C6C8 800612C8 8FA20018 */ lw $v0, 0x18($sp) .L800612CC: @@ -163,7 +163,7 @@ glabel osDevMgrMain /* 3C6E4 800612E4 00220821 */ addu $at, $at, $v0 /* 3C6E8 800612E8 8C229B20 */ lw $v0, %lo(D_80099B20)($at) /* 3C6EC 800612EC 00400008 */ jr $v0 -/* 3C6F0 800612F0 00000000 */ nop +/* 3C6F0 800612F0 00000000 */ nop /* 3C6F4 800612F4 8E440010 */ lw $a0, 0x10($s2) /* 3C6F8 800612F8 27A5001C */ addiu $a1, $sp, 0x1c /* 3C6FC 800612FC 0C0195BC */ jal osRecvMesg @@ -176,7 +176,7 @@ glabel osDevMgrMain /* 3C718 80061318 0040F809 */ jalr $v0 /* 3C71C 8006131C 00002021 */ addu $a0, $zero, $zero /* 3C720 80061320 080184FA */ j .L800613E8 -/* 3C724 80061324 00000000 */ nop +/* 3C724 80061324 00000000 */ nop /* 3C728 80061328 8E440010 */ lw $a0, 0x10($s2) /* 3C72C 8006132C 27A5001C */ addiu $a1, $sp, 0x1c /* 3C730 80061330 0C0195BC */ jal osRecvMesg @@ -189,7 +189,7 @@ glabel osDevMgrMain /* 3C74C 8006134C 0040F809 */ jalr $v0 /* 3C750 80061350 24040001 */ addiu $a0, $zero, 1 /* 3C754 80061354 080184FA */ j .L800613E8 -/* 3C758 80061358 00000000 */ nop +/* 3C758 80061358 00000000 */ nop /* 3C75C 8006135C 8E440010 */ lw $a0, 0x10($s2) /* 3C760 80061360 27A5001C */ addiu $a1, $sp, 0x1c /* 3C764 80061364 0C0195BC */ jal osRecvMesg @@ -204,7 +204,7 @@ glabel osDevMgrMain /* 3C788 80061388 0040F809 */ jalr $v0 /* 3C78C 8006138C 00002821 */ addu $a1, $zero, $zero /* 3C790 80061390 080184FA */ j .L800613E8 -/* 3C794 80061394 00000000 */ nop +/* 3C794 80061394 00000000 */ nop /* 3C798 80061398 8E440010 */ lw $a0, 0x10($s2) /* 3C79C 8006139C 27A5001C */ addiu $a1, $sp, 0x1c /* 3C7A0 800613A0 0C0195BC */ jal osRecvMesg @@ -219,7 +219,7 @@ glabel osDevMgrMain /* 3C7C4 800613C4 0040F809 */ jalr $v0 /* 3C7C8 800613C8 24050001 */ addiu $a1, $zero, 1 /* 3C7CC 800613CC 080184FA */ j .L800613E8 -/* 3C7D0 800613D0 00000000 */ nop +/* 3C7D0 800613D0 00000000 */ nop /* 3C7D4 800613D4 8FA50018 */ lw $a1, 0x18($sp) /* 3C7D8 800613D8 8CA40004 */ lw $a0, 4($a1) /* 3C7DC 800613DC 0C019608 */ jal osSendMesg @@ -241,7 +241,7 @@ glabel osDevMgrMain /* 3C814 80061414 0C019608 */ jal osSendMesg /* 3C818 80061418 00003021 */ addu $a2, $zero, $zero /* 3C81C 8006141C 08018430 */ j .L800610C0 -/* 3C820 80061420 00000000 */ nop +/* 3C820 80061420 00000000 */ nop /* 3C824 80061424 8FBF0040 */ lw $ra, 0x40($sp) /* 3C828 80061428 8FB5003C */ lw $s5, 0x3c($sp) /* 3C82C 8006142C 8FB40038 */ lw $s4, 0x38($sp) @@ -251,5 +251,5 @@ glabel osDevMgrMain /* 3C83C 8006143C 8FB00028 */ lw $s0, 0x28($sp) /* 3C840 80061440 03E00008 */ jr $ra /* 3C844 80061444 27BD0048 */ addiu $sp, $sp, 0x48 -/* 3C848 80061448 00000000 */ nop -/* 3C84C 8006144C 00000000 */ nop +/* 3C848 80061448 00000000 */ nop +/* 3C84C 8006144C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3c850_len_f0/osPiRelAccess.s b/asm/nonmatchings/os/code_3c850_len_f0/osPiRelAccess.s index 5041305edf..5afb5c55e6 100644 --- a/asm/nonmatchings/os/code_3c850_len_f0/osPiRelAccess.s +++ b/asm/nonmatchings/os/code_3c850_len_f0/osPiRelAccess.s @@ -12,5 +12,5 @@ glabel osPiRelAccess /* 3C92C 8006152C 8FBF0010 */ lw $ra, 0x10($sp) /* 3C930 80061530 03E00008 */ jr $ra /* 3C934 80061534 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3C938 80061538 00000000 */ nop -/* 3C93C 8006153C 00000000 */ nop +/* 3C938 80061538 00000000 */ nop +/* 3C93C 8006153C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s b/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s index b1e51ccd3e..9bcfdfefc8 100644 --- a/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s +++ b/asm/nonmatchings/os/code_3c940_len_140/osAiSetFrequency.s @@ -3,7 +3,7 @@ glabel osAiSetFrequency /* 3C960 80061560 44841000 */ mtc1 $a0, $f2 -/* 3C964 80061564 00000000 */ nop +/* 3C964 80061564 00000000 */ nop /* 3C968 80061568 468010A1 */ cvt.d.w $f2, $f2 /* 3C96C 8006156C 3C018009 */ lui $at, %hi(D_800958F8) /* 3C970 80061570 C42458F8 */ lwc1 $f4, %lo(D_800958F8)($at) @@ -18,19 +18,19 @@ glabel osAiSetFrequency /* 3C990 80061590 46002003 */ div.s $f0, $f4, $f0 /* 3C994 80061594 3C013F00 */ lui $at, 0x3f00 /* 3C998 80061598 44811000 */ mtc1 $at, $f2 -/* 3C99C 8006159C 00000000 */ nop +/* 3C99C 8006159C 00000000 */ nop /* 3C9A0 800615A0 46020080 */ add.s $f2, $f0, $f2 /* 3C9A4 800615A4 3C014F00 */ lui $at, 0x4f00 /* 3C9A8 800615A8 44810000 */ mtc1 $at, $f0 -/* 3C9AC 800615AC 00000000 */ nop +/* 3C9AC 800615AC 00000000 */ nop /* 3C9B0 800615B0 4602003E */ c.le.s $f0, $f2 -/* 3C9B4 800615B4 00000000 */ nop -/* 3C9B8 800615B8 00000000 */ nop +/* 3C9B4 800615B4 00000000 */ nop +/* 3C9B8 800615B8 00000000 */ nop /* 3C9BC 800615BC 45030006 */ bc1tl .L800615D8 /* 3C9C0 800615C0 46001001 */ sub.s $f0, $f2, $f0 /* 3C9C4 800615C4 4600100D */ trunc.w.s $f0, $f2 /* 3C9C8 800615C8 44050000 */ mfc1 $a1, $f0 -/* 3C9CC 800615CC 00000000 */ nop +/* 3C9CC 800615CC 00000000 */ nop /* 3C9D0 800615D0 0801857B */ j .L800615EC /* 3C9D4 800615D4 2CA20084 */ sltiu $v0, $a1, 0x84 .L800615D8: @@ -65,19 +65,19 @@ glabel osAiSetFrequency /* 3CA40 80061640 AC830000 */ sw $v1, ($a0) /* 3CA44 80061644 0045001A */ div $zero, $v0, $a1 /* 3CA48 80061648 14A00002 */ bnez $a1, .L80061654 -/* 3CA4C 8006164C 00000000 */ nop +/* 3CA4C 8006164C 00000000 */ nop /* 3CA50 80061650 0007000D */ break 7 .L80061654: /* 3CA54 80061654 2401FFFF */ addiu $at, $zero, -1 /* 3CA58 80061658 14A10004 */ bne $a1, $at, .L8006166C /* 3CA5C 8006165C 3C018000 */ lui $at, 0x8000 /* 3CA60 80061660 14410002 */ bne $v0, $at, .L8006166C -/* 3CA64 80061664 00000000 */ nop +/* 3CA64 80061664 00000000 */ nop /* 3CA68 80061668 0006000D */ break 6 .L8006166C: /* 3CA6C 8006166C 00001012 */ mflo $v0 .L80061670: /* 3CA70 80061670 03E00008 */ jr $ra -/* 3CA74 80061674 00000000 */ nop -/* 3CA78 80061678 00000000 */ nop -/* 3CA7C 8006167C 00000000 */ nop +/* 3CA74 80061674 00000000 */ nop +/* 3CA78 80061678 00000000 */ nop +/* 3CA7C 8006167C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s b/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s index 1699cecfd6..ed5ed30209 100644 --- a/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s +++ b/asm/nonmatchings/os/code_3ca80_len_a0/osAiSetNextBuffer.s @@ -29,7 +29,7 @@ glabel osAiSetNextBuffer /* 3CAD8 800616D8 A0203DA0 */ sb $zero, %lo(D_80093DA0)($at) .L800616DC: /* 3CADC 800616DC 0C0187A4 */ jal osVirtualToPhysical -/* 3CAE0 800616E0 00000000 */ nop +/* 3CAE0 800616E0 00000000 */ nop /* 3CAE4 800616E4 3C05A450 */ lui $a1, 0xa450 /* 3CAE8 800616E8 34A50004 */ ori $a1, $a1, 4 /* 3CAEC 800616EC 00402021 */ addu $a0, $v0, $zero @@ -43,6 +43,6 @@ glabel osAiSetNextBuffer /* 3CB08 80061708 8FB00010 */ lw $s0, 0x10($sp) /* 3CB0C 8006170C 03E00008 */ jr $ra /* 3CB10 80061710 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3CB14 80061714 00000000 */ nop -/* 3CB18 80061718 00000000 */ nop -/* 3CB1C 8006171C 00000000 */ nop +/* 3CB14 80061714 00000000 */ nop +/* 3CB18 80061718 00000000 */ nop +/* 3CB1C 8006171C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s b/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s index 97e7a81070..ba527fe1ed 100644 --- a/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s +++ b/asm/nonmatchings/os/code_3cb20_len_130/osInvalDCache.s @@ -3,35 +3,35 @@ glabel osInvalDCache /* 3CB20 80061720 18A00020 */ blez $a1, .L800617A4 -/* 3CB24 80061724 00000000 */ nop +/* 3CB24 80061724 00000000 */ nop /* 3CB28 80061728 240B2000 */ addiu $t3, $zero, 0x2000 /* 3CB2C 8006172C 00AB082B */ sltu $at, $a1, $t3 /* 3CB30 80061730 1020001E */ beqz $at, .L800617AC -/* 3CB34 80061734 00000000 */ nop +/* 3CB34 80061734 00000000 */ nop /* 3CB38 80061738 00804021 */ addu $t0, $a0, $zero /* 3CB3C 8006173C 00854821 */ addu $t1, $a0, $a1 /* 3CB40 80061740 0109082B */ sltu $at, $t0, $t1 /* 3CB44 80061744 10200017 */ beqz $at, .L800617A4 -/* 3CB48 80061748 00000000 */ nop +/* 3CB48 80061748 00000000 */ nop /* 3CB4C 8006174C 2529FFF0 */ addiu $t1, $t1, -0x10 /* 3CB50 80061750 310A000F */ andi $t2, $t0, 0xf /* 3CB54 80061754 11400007 */ beqz $t2, .L80061774 -/* 3CB58 80061758 00000000 */ nop +/* 3CB58 80061758 00000000 */ nop /* 3CB5C 8006175C 010A4023 */ subu $t0, $t0, $t2 /* 3CB60 80061760 BD150000 */ cache 0x15, ($t0) /* 3CB64 80061764 0109082B */ sltu $at, $t0, $t1 /* 3CB68 80061768 1020000E */ beqz $at, .L800617A4 -/* 3CB6C 8006176C 00000000 */ nop +/* 3CB6C 8006176C 00000000 */ nop /* 3CB70 80061770 25080010 */ addiu $t0, $t0, 0x10 .L80061774: /* 3CB74 80061774 312A000F */ andi $t2, $t1, 0xf /* 3CB78 80061778 11400006 */ beqz $t2, .L80061794 -/* 3CB7C 8006177C 00000000 */ nop +/* 3CB7C 8006177C 00000000 */ nop /* 3CB80 80061780 012A4823 */ subu $t1, $t1, $t2 /* 3CB84 80061784 BD350010 */ cache 0x15, 0x10($t1) /* 3CB88 80061788 0128082B */ sltu $at, $t1, $t0 /* 3CB8C 8006178C 14200005 */ bnez $at, .L800617A4 -/* 3CB90 80061790 00000000 */ nop +/* 3CB90 80061790 00000000 */ nop .L80061794: /* 3CB94 80061794 BD110000 */ cache 0x11, ($t0) /* 3CB98 80061798 0109082B */ sltu $at, $t0, $t1 @@ -39,7 +39,7 @@ glabel osInvalDCache /* 3CBA0 800617A0 25080010 */ addiu $t0, $t0, 0x10 .L800617A4: /* 3CBA4 800617A4 03E00008 */ jr $ra -/* 3CBA8 800617A8 00000000 */ nop +/* 3CBA8 800617A8 00000000 */ nop .L800617AC: /* 3CBAC 800617AC 3C088000 */ lui $t0, 0x8000 /* 3CBB0 800617B0 010B4821 */ addu $t1, $t0, $t3 @@ -50,4 +50,4 @@ glabel osInvalDCache /* 3CBC0 800617C0 1420FFFD */ bnez $at, .L800617B8 /* 3CBC4 800617C4 25080010 */ addiu $t0, $t0, 0x10 /* 3CBC8 800617C8 03E00008 */ jr $ra -/* 3CBCC 800617CC 00000000 */ nop +/* 3CBCC 800617CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s b/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s index c4e923ee5a..82aedb0276 100644 --- a/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s +++ b/asm/nonmatchings/os/code_3cb20_len_130/osInvalICache.s @@ -3,16 +3,16 @@ glabel osInvalICache /* 3CBD0 800617D0 18A00011 */ blez $a1, .L80061818 -/* 3CBD4 800617D4 00000000 */ nop +/* 3CBD4 800617D4 00000000 */ nop /* 3CBD8 800617D8 240B4000 */ addiu $t3, $zero, 0x4000 /* 3CBDC 800617DC 00AB082B */ sltu $at, $a1, $t3 /* 3CBE0 800617E0 1020000F */ beqz $at, .L80061820 -/* 3CBE4 800617E4 00000000 */ nop +/* 3CBE4 800617E4 00000000 */ nop /* 3CBE8 800617E8 00804021 */ addu $t0, $a0, $zero /* 3CBEC 800617EC 00854821 */ addu $t1, $a0, $a1 /* 3CBF0 800617F0 0109082B */ sltu $at, $t0, $t1 /* 3CBF4 800617F4 10200008 */ beqz $at, .L80061818 -/* 3CBF8 800617F8 00000000 */ nop +/* 3CBF8 800617F8 00000000 */ nop /* 3CBFC 800617FC 2529FFE0 */ addiu $t1, $t1, -0x20 /* 3CC00 80061800 310A001F */ andi $t2, $t0, 0x1f /* 3CC04 80061804 010A4023 */ subu $t0, $t0, $t2 @@ -23,7 +23,7 @@ glabel osInvalICache /* 3CC14 80061814 25080020 */ addiu $t0, $t0, 0x20 .L80061818: /* 3CC18 80061818 03E00008 */ jr $ra -/* 3CC1C 8006181C 00000000 */ nop +/* 3CC1C 8006181C 00000000 */ nop .L80061820: /* 3CC20 80061820 3C088000 */ lui $t0, 0x8000 /* 3CC24 80061824 010B4821 */ addu $t1, $t0, $t3 @@ -34,7 +34,7 @@ glabel osInvalICache /* 3CC34 80061834 1420FFFD */ bnez $at, .L8006182C /* 3CC38 80061838 25080020 */ addiu $t0, $t0, 0x20 /* 3CC3C 8006183C 03E00008 */ jr $ra -/* 3CC40 80061840 00000000 */ nop -/* 3CC44 80061844 00000000 */ nop -/* 3CC48 80061848 00000000 */ nop -/* 3CC4C 8006184C 00000000 */ nop +/* 3CC40 80061840 00000000 */ nop +/* 3CC44 80061844 00000000 */ nop +/* 3CC48 80061848 00000000 */ nop +/* 3CC4C 8006184C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s b/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s index 8f246c07cb..30f37e3156 100644 --- a/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s +++ b/asm/nonmatchings/os/code_3cc50_len_80/osWritebackDCache.s @@ -3,16 +3,16 @@ glabel osWritebackDCache /* 3CC50 80061850 18A00011 */ blez $a1, .L80061898 -/* 3CC54 80061854 00000000 */ nop +/* 3CC54 80061854 00000000 */ nop /* 3CC58 80061858 240B2000 */ addiu $t3, $zero, 0x2000 /* 3CC5C 8006185C 00AB082B */ sltu $at, $a1, $t3 /* 3CC60 80061860 1020000F */ beqz $at, .L800618A0 -/* 3CC64 80061864 00000000 */ nop +/* 3CC64 80061864 00000000 */ nop /* 3CC68 80061868 00804021 */ addu $t0, $a0, $zero /* 3CC6C 8006186C 00854821 */ addu $t1, $a0, $a1 /* 3CC70 80061870 0109082B */ sltu $at, $t0, $t1 /* 3CC74 80061874 10200008 */ beqz $at, .L80061898 -/* 3CC78 80061878 00000000 */ nop +/* 3CC78 80061878 00000000 */ nop /* 3CC7C 8006187C 2529FFF0 */ addiu $t1, $t1, -0x10 /* 3CC80 80061880 310A000F */ andi $t2, $t0, 0xf /* 3CC84 80061884 010A4023 */ subu $t0, $t0, $t2 @@ -23,7 +23,7 @@ glabel osWritebackDCache /* 3CC94 80061894 25080010 */ addiu $t0, $t0, 0x10 .L80061898: /* 3CC98 80061898 03E00008 */ jr $ra -/* 3CC9C 8006189C 00000000 */ nop +/* 3CC9C 8006189C 00000000 */ nop .L800618A0: /* 3CCA0 800618A0 3C088000 */ lui $t0, 0x8000 /* 3CCA4 800618A4 010B4821 */ addu $t1, $t0, $t3 @@ -34,7 +34,7 @@ glabel osWritebackDCache /* 3CCB4 800618B4 1420FFFD */ bnez $at, .L800618AC /* 3CCB8 800618B8 25080010 */ addiu $t0, $t0, 0x10 /* 3CCBC 800618BC 03E00008 */ jr $ra -/* 3CCC0 800618C0 00000000 */ nop -/* 3CCC4 800618C4 00000000 */ nop -/* 3CCC8 800618C8 00000000 */ nop -/* 3CCCC 800618CC 00000000 */ nop +/* 3CCC0 800618C0 00000000 */ nop +/* 3CCC4 800618C4 00000000 */ nop +/* 3CCC8 800618C8 00000000 */ nop +/* 3CCCC 800618CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s b/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s index 0aa68dcb2c..63502194a4 100644 --- a/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s +++ b/asm/nonmatchings/os/code_3ccd0_len_30/osWritebackDCacheAll.s @@ -12,6 +12,6 @@ glabel osWritebackDCacheAll /* 3CCE8 800618E8 1420FFFD */ bnez $at, .L800618E0 /* 3CCEC 800618EC 25080010 */ addiu $t0, $t0, 0x10 /* 3CCF0 800618F0 03E00008 */ jr $ra -/* 3CCF4 800618F4 00000000 */ nop -/* 3CCF8 800618F8 00000000 */ nop -/* 3CCFC 800618FC 00000000 */ nop +/* 3CCF4 800618F4 00000000 */ nop +/* 3CCF8 800618F8 00000000 */ nop +/* 3CCFC 800618FC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s index e463ab224f..3a4f0df90c 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osContGetReadData.s @@ -43,4 +43,4 @@ glabel osContGetReadData .L80061AB8: /* 3CEB8 80061AB8 27BD0010 */ addiu $sp, $sp, 0x10 /* 3CEBC 80061ABC 03E00008 */ jr $ra -/* 3CEC0 80061AC0 00000000 */ nop +/* 3CEC0 80061AC0 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s index ab28ae5e39..021365007d 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartQuery.s @@ -10,7 +10,7 @@ glabel osContStartQuery /* 3CD14 80061914 3C02800A */ lui $v0, %hi(D_8009A61C) /* 3CD18 80061918 9042A61C */ lbu $v0, %lo(D_8009A61C)($v0) /* 3CD1C 8006191C 1040000B */ beqz $v0, .L8006194C -/* 3CD20 80061920 00000000 */ nop +/* 3CD20 80061920 00000000 */ nop /* 3CD24 80061924 0C018774 */ jal osPackRequestData /* 3CD28 80061928 00002021 */ addu $a0, $zero, $zero /* 3CD2C 8006192C 3C05800B */ lui $a1, %hi(D_800B0ED0) diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s index 9d6bf4f34e..daa4ca7f05 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osContStartReadData.s @@ -11,9 +11,9 @@ glabel osContStartReadData /* 3CDB8 800619B8 9063A61C */ lbu $v1, %lo(D_8009A61C)($v1) /* 3CDBC 800619BC 24020001 */ addiu $v0, $zero, 1 /* 3CDC0 800619C0 1062000B */ beq $v1, $v0, .L800619F0 -/* 3CDC4 800619C4 00000000 */ nop +/* 3CDC4 800619C4 00000000 */ nop /* 3CDC8 800619C8 0C0186B1 */ jal osPackReadData -/* 3CDCC 800619CC 00000000 */ nop +/* 3CDCC 800619CC 00000000 */ nop /* 3CDD0 800619D0 3C05800B */ lui $a1, %hi(D_800B0ED0) /* 3CDD4 800619D4 24A50ED0 */ addiu $a1, $a1, %lo(D_800B0ED0) /* 3CDD8 800619D8 0C019730 */ jal osSiRawStartDma diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s index e983a709a4..c30e304c72 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osPackReadData.s @@ -51,4 +51,4 @@ glabel osPackReadData /* 3CF70 80061B70 A0E20000 */ sb $v0, ($a3) /* 3CF74 80061B74 03E00008 */ jr $ra /* 3CF78 80061B78 27BD0010 */ addiu $sp, $sp, 0x10 -/* 3CF7C 80061B7C 00000000 */ nop +/* 3CF7C 80061B7C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osPackRequestData.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osPackRequestData.s index b386561598..02aedcb746 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osPackRequestData.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osPackRequestData.s @@ -52,4 +52,4 @@ glabel osPackRequestData /* 3D280 80061E80 A0E20000 */ sb $v0, ($a3) /* 3D284 80061E84 03E00008 */ jr $ra /* 3D288 80061E88 27BD0010 */ addiu $sp, $sp, 0x10 -/* 3D28C 80061E8C 00000000 */ nop +/* 3D28C 80061E8C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3cd00_len_5f0/osVirtualToPhysical.s b/asm/nonmatchings/os/code_3cd00_len_5f0/osVirtualToPhysical.s index 9e740a2994..a5f44a265a 100644 --- a/asm/nonmatchings/os/code_3cd00_len_5f0/osVirtualToPhysical.s +++ b/asm/nonmatchings/os/code_3cd00_len_5f0/osVirtualToPhysical.s @@ -16,15 +16,15 @@ glabel osVirtualToPhysical /* 3D2BC 80061EBC 10400006 */ beqz $v0, .L80061ED8 /* 3D2C0 80061EC0 00831024 */ and $v0, $a0, $v1 /* 3D2C4 80061EC4 0C019A18 */ jal osProbeTLB -/* 3D2C8 80061EC8 00000000 */ nop +/* 3D2C8 80061EC8 00000000 */ nop /* 3D2CC 80061ECC 080187B6 */ j .L80061ED8 -/* 3D2D0 80061ED0 00000000 */ nop +/* 3D2D0 80061ED0 00000000 */ nop .L80061ED4: /* 3D2D4 80061ED4 00831024 */ and $v0, $a0, $v1 .L80061ED8: /* 3D2D8 80061ED8 8FBF0010 */ lw $ra, 0x10($sp) /* 3D2DC 80061EDC 03E00008 */ jr $ra /* 3D2E0 80061EE0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3D2E4 80061EE4 00000000 */ nop -/* 3D2E8 80061EE8 00000000 */ nop -/* 3D2EC 80061EEC 00000000 */ nop +/* 3D2E4 80061EE4 00000000 */ nop +/* 3D2E8 80061EE8 00000000 */ nop +/* 3D2EC 80061EEC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s b/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s index 3d1622adda..05d8d4cb77 100644 --- a/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s +++ b/asm/nonmatchings/os/code_3d2f0_len_10/sqrtf.s @@ -4,5 +4,5 @@ glabel sqrtf /* 3D2F0 80061EF0 03E00008 */ jr $ra /* 3D2F4 80061EF4 46006004 */ sqrt.s $f0, $f12 -/* 3D2F8 80061EF8 00000000 */ nop -/* 3D2FC 80061EFC 00000000 */ nop +/* 3D2F8 80061EF8 00000000 */ nop +/* 3D2FC 80061EFC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3d300_len_30/coss.s b/asm/nonmatchings/os/code_3d300_len_30/coss.s index 71576da5d7..8e77ff6fcf 100644 --- a/asm/nonmatchings/os/code_3d300_len_30/coss.s +++ b/asm/nonmatchings/os/code_3d300_len_30/coss.s @@ -12,5 +12,5 @@ glabel coss /* 3D31C 80061F1C 00021403 */ sra $v0, $v0, 0x10 /* 3D320 80061F20 03E00008 */ jr $ra /* 3D324 80061F24 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3D328 80061F28 00000000 */ nop -/* 3D32C 80061F2C 00000000 */ nop +/* 3D328 80061F28 00000000 */ nop +/* 3D32C 80061F2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3d330_len_990/guFrustum.s b/asm/nonmatchings/os/code_3d330_len_990/guFrustum.s index 75f2b9830b..a5f84120aa 100644 --- a/asm/nonmatchings/os/code_3d330_len_990/guFrustum.s +++ b/asm/nonmatchings/os/code_3d330_len_990/guFrustum.s @@ -39,9 +39,9 @@ glabel guFrustum /* 3D4E8 800620E8 46041083 */ div.s $f2, $f2, $f4 /* 3D4EC 800620EC 3C01C000 */ lui $at, 0xc000 /* 3D4F0 800620F0 44810000 */ mtc1 $at, $f0 -/* 3D4F4 800620F4 00000000 */ nop +/* 3D4F4 800620F4 00000000 */ nop /* 3D4F8 800620F8 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D4FC 800620FC 00000000 */ nop +/* 3D4FC 800620FC 00000000 */ nop /* 3D500 80062100 4616A502 */ mul.s $f20, $f20, $f22 /* 3D504 80062104 4604A503 */ div.s $f20, $f20, $f4 /* 3D508 80062108 3C01BF80 */ lui $at, 0xbf80 @@ -61,7 +61,7 @@ glabel guFrustum .L8006213C: /* 3D53C 8006213C C4600000 */ lwc1 $f0, ($v1) /* 3D540 80062140 44915000 */ mtc1 $s1, $f10 -/* 3D544 80062144 00000000 */ nop +/* 3D544 80062144 00000000 */ nop /* 3D548 80062148 460A0002 */ mul.s $f0, $f0, $f10 /* 3D54C 8006214C 24840001 */ addiu $a0, $a0, 1 /* 3D550 80062150 28820004 */ slti $v0, $a0, 4 @@ -87,4 +87,4 @@ glabel guFrustum /* 3D5A0 800621A0 D7B40060 */ ldc1 $f20, 0x60($sp) /* 3D5A4 800621A4 03E00008 */ jr $ra /* 3D5A8 800621A8 27BD0090 */ addiu $sp, $sp, 0x90 -/* 3D5AC 800621AC 00000000 */ nop +/* 3D5AC 800621AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3d330_len_990/guFrustumF.s b/asm/nonmatchings/os/code_3d330_len_990/guFrustumF.s index 1ac9af718e..c770d2b7c0 100644 --- a/asm/nonmatchings/os/code_3d330_len_990/guFrustumF.s +++ b/asm/nonmatchings/os/code_3d330_len_990/guFrustumF.s @@ -36,9 +36,9 @@ glabel guFrustumF /* 3D3AC 80061FAC 46041083 */ div.s $f2, $f2, $f4 /* 3D3B0 80061FB0 3C01C000 */ lui $at, 0xc000 /* 3D3B4 80061FB4 44810000 */ mtc1 $at, $f0 -/* 3D3B8 80061FB8 00000000 */ nop +/* 3D3B8 80061FB8 00000000 */ nop /* 3D3BC 80061FBC 4600A502 */ mul.s $f20, $f20, $f0 -/* 3D3C0 80061FC0 00000000 */ nop +/* 3D3C0 80061FC0 00000000 */ nop /* 3D3C4 80061FC4 4616A502 */ mul.s $f20, $f20, $f22 /* 3D3C8 80061FC8 4604A503 */ div.s $f20, $f20, $f4 /* 3D3CC 80061FCC 3C01BF80 */ lui $at, 0xbf80 @@ -58,7 +58,7 @@ glabel guFrustumF .L80062000: /* 3D400 80062000 C4600000 */ lwc1 $f0, ($v1) /* 3D404 80062004 44915000 */ mtc1 $s1, $f10 -/* 3D408 80062008 00000000 */ nop +/* 3D408 80062008 00000000 */ nop /* 3D40C 8006200C 460A0002 */ mul.s $f0, $f0, $f10 /* 3D410 80062010 24840001 */ addiu $a0, $a0, 1 /* 3D414 80062014 28820004 */ slti $v0, $a0, 4 diff --git a/asm/nonmatchings/os/code_3d330_len_990/guLookAt.s b/asm/nonmatchings/os/code_3d330_len_990/guLookAt.s index d6760d24c5..b229dde68e 100644 --- a/asm/nonmatchings/os/code_3d330_len_990/guLookAt.s +++ b/asm/nonmatchings/os/code_3d330_len_990/guLookAt.s @@ -33,26 +33,26 @@ glabel guLookAt /* 3D9A0 800625A0 0C019D28 */ jal guMtxIdentF /* 3D9A4 800625A4 03C02021 */ addu $a0, $fp, $zero /* 3D9A8 800625A8 44937000 */ mtc1 $s3, $f14 -/* 3D9AC 800625AC 00000000 */ nop +/* 3D9AC 800625AC 00000000 */ nop /* 3D9B0 800625B0 460EA681 */ sub.s $f26, $f20, $f14 /* 3D9B4 800625B4 461AD002 */ mul.s $f0, $f26, $f26 /* 3D9B8 800625B8 44949000 */ mtc1 $s4, $f18 -/* 3D9BC 800625BC 00000000 */ nop +/* 3D9BC 800625BC 00000000 */ nop /* 3D9C0 800625C0 4612B701 */ sub.s $f28, $f22, $f18 /* 3D9C4 800625C4 461CE102 */ mul.s $f4, $f28, $f28 /* 3D9C8 800625C8 44957000 */ mtc1 $s5, $f14 -/* 3D9CC 800625CC 00000000 */ nop +/* 3D9CC 800625CC 00000000 */ nop /* 3D9D0 800625D0 460EC781 */ sub.s $f30, $f24, $f14 /* 3D9D4 800625D4 461EF082 */ mul.s $f2, $f30, $f30 /* 3D9D8 800625D8 46040000 */ add.s $f0, $f0, $f4 /* 3D9DC 800625DC 46020300 */ add.s $f12, $f0, $f2 /* 3D9E0 800625E0 46006084 */ sqrt.s $f2, $f12 /* 3D9E4 800625E4 46021032 */ c.eq.s $f2, $f2 -/* 3D9E8 800625E8 00000000 */ nop +/* 3D9E8 800625E8 00000000 */ nop /* 3D9EC 800625EC 45010004 */ bc1t .L80062600 -/* 3D9F0 800625F0 00000000 */ nop +/* 3D9F0 800625F0 00000000 */ nop /* 3D9F4 800625F4 0C0187BC */ jal sqrtf -/* 3D9F8 800625F8 00000000 */ nop +/* 3D9F8 800625F8 00000000 */ nop /* 3D9FC 800625FC 46000086 */ mov.s $f2, $f0 .L80062600: /* 3DA00 80062600 3C01800A */ lui $at, %hi(D_80099B60) @@ -61,25 +61,25 @@ glabel guLookAt /* 3DA0C 8006260C 46220003 */ div.d $f0, $f0, $f2 /* 3DA10 80062610 46200420 */ cvt.s.d $f16, $f0 /* 3DA14 80062614 4610D682 */ mul.s $f26, $f26, $f16 -/* 3DA18 80062618 00000000 */ nop +/* 3DA18 80062618 00000000 */ nop /* 3DA1C 8006261C 4610F782 */ mul.s $f30, $f30, $f16 -/* 3DA20 80062620 00000000 */ nop +/* 3DA20 80062620 00000000 */ nop /* 3DA24 80062624 4610E702 */ mul.s $f28, $f28, $f16 /* 3DA28 80062628 44919000 */ mtc1 $s1, $f18 -/* 3DA2C 8006262C 00000000 */ nop +/* 3DA2C 8006262C 00000000 */ nop /* 3DA30 80062630 461E9102 */ mul.s $f4, $f18, $f30 /* 3DA34 80062634 44907000 */ mtc1 $s0, $f14 -/* 3DA38 80062638 00000000 */ nop +/* 3DA38 80062638 00000000 */ nop /* 3DA3C 8006263C 461C7002 */ mul.s $f0, $f14, $f28 -/* 3DA40 80062640 00000000 */ nop +/* 3DA40 80062640 00000000 */ nop /* 3DA44 80062644 461A7202 */ mul.s $f8, $f14, $f26 /* 3DA48 80062648 44929000 */ mtc1 $s2, $f18 -/* 3DA4C 8006264C 00000000 */ nop +/* 3DA4C 8006264C 00000000 */ nop /* 3DA50 80062650 461E9082 */ mul.s $f2, $f18, $f30 -/* 3DA54 80062654 00000000 */ nop +/* 3DA54 80062654 00000000 */ nop /* 3DA58 80062658 461C9282 */ mul.s $f10, $f18, $f28 /* 3DA5C 8006265C 44917000 */ mtc1 $s1, $f14 -/* 3DA60 80062660 00000000 */ nop +/* 3DA60 80062660 00000000 */ nop /* 3DA64 80062664 461A7182 */ mul.s $f6, $f14, $f26 /* 3DA68 80062668 46002601 */ sub.s $f24, $f4, $f0 /* 3DA6C 8006266C 4618C002 */ mul.s $f0, $f24, $f24 @@ -91,11 +91,11 @@ glabel guLookAt /* 3DA84 80062684 46020300 */ add.s $f12, $f0, $f2 /* 3DA88 80062688 46006004 */ sqrt.s $f0, $f12 /* 3DA8C 8006268C 46000032 */ c.eq.s $f0, $f0 -/* 3DA90 80062690 00000000 */ nop +/* 3DA90 80062690 00000000 */ nop /* 3DA94 80062694 45010003 */ bc1t .L800626A4 -/* 3DA98 80062698 00000000 */ nop +/* 3DA98 80062698 00000000 */ nop /* 3DA9C 8006269C 0C0187BC */ jal sqrtf -/* 3DAA0 800626A0 00000000 */ nop +/* 3DAA0 800626A0 00000000 */ nop .L800626A4: /* 3DAA4 800626A4 3C01800A */ lui $at, %hi(D_80099B68) /* 3DAA8 800626A8 8C369B68 */ lw $s6, %lo(D_80099B68)($at) @@ -106,21 +106,21 @@ glabel guLookAt /* 3DABC 800626BC 46209003 */ div.d $f0, $f18, $f0 /* 3DAC0 800626C0 46200420 */ cvt.s.d $f16, $f0 /* 3DAC4 800626C4 4610C602 */ mul.s $f24, $f24, $f16 -/* 3DAC8 800626C8 00000000 */ nop +/* 3DAC8 800626C8 00000000 */ nop /* 3DACC 800626CC 4610A502 */ mul.s $f20, $f20, $f16 -/* 3DAD0 800626D0 00000000 */ nop +/* 3DAD0 800626D0 00000000 */ nop /* 3DAD4 800626D4 4610B582 */ mul.s $f22, $f22, $f16 -/* 3DAD8 800626D8 00000000 */ nop +/* 3DAD8 800626D8 00000000 */ nop /* 3DADC 800626DC 4614E102 */ mul.s $f4, $f28, $f20 -/* 3DAE0 800626E0 00000000 */ nop +/* 3DAE0 800626E0 00000000 */ nop /* 3DAE4 800626E4 4616F002 */ mul.s $f0, $f30, $f22 -/* 3DAE8 800626E8 00000000 */ nop +/* 3DAE8 800626E8 00000000 */ nop /* 3DAEC 800626EC 4618F202 */ mul.s $f8, $f30, $f24 -/* 3DAF0 800626F0 00000000 */ nop +/* 3DAF0 800626F0 00000000 */ nop /* 3DAF4 800626F4 4614D082 */ mul.s $f2, $f26, $f20 -/* 3DAF8 800626F8 00000000 */ nop +/* 3DAF8 800626F8 00000000 */ nop /* 3DAFC 800626FC 4616D282 */ mul.s $f10, $f26, $f22 -/* 3DB00 80062700 00000000 */ nop +/* 3DB00 80062700 00000000 */ nop /* 3DB04 80062704 4618E182 */ mul.s $f6, $f28, $f24 /* 3DB08 80062708 46002101 */ sub.s $f4, $f4, $f0 /* 3DB0C 8006270C 46042002 */ mul.s $f0, $f4, $f4 @@ -136,9 +136,9 @@ glabel guLookAt /* 3DB34 80062734 44114000 */ mfc1 $s1, $f8 /* 3DB38 80062738 44105000 */ mfc1 $s0, $f10 /* 3DB3C 8006273C 45010003 */ bc1t .L8006274C -/* 3DB40 80062740 00000000 */ nop +/* 3DB40 80062740 00000000 */ nop /* 3DB44 80062744 0C0187BC */ jal sqrtf -/* 3DB48 80062748 00000000 */ nop +/* 3DB48 80062748 00000000 */ nop .L8006274C: /* 3DB4C 8006274C 44977000 */ mtc1 $s7, $f14 /* 3DB50 80062750 44967800 */ mtc1 $s6, $f15 @@ -148,32 +148,32 @@ glabel guLookAt /* 3DB60 80062760 46200420 */ cvt.s.d $f16, $f0 /* 3DB64 80062764 46109482 */ mul.s $f18, $f18, $f16 /* 3DB68 80062768 44917000 */ mtc1 $s1, $f14 -/* 3DB6C 8006276C 00000000 */ nop +/* 3DB6C 8006276C 00000000 */ nop /* 3DB70 80062770 46107382 */ mul.s $f14, $f14, $f16 /* 3DB74 80062774 44129000 */ mfc1 $s2, $f18 /* 3DB78 80062778 44939000 */ mtc1 $s3, $f18 -/* 3DB7C 8006277C 00000000 */ nop +/* 3DB7C 8006277C 00000000 */ nop /* 3DB80 80062780 46189082 */ mul.s $f2, $f18, $f24 /* 3DB84 80062784 44117000 */ mfc1 $s1, $f14 /* 3DB88 80062788 44947000 */ mtc1 $s4, $f14 -/* 3DB8C 8006278C 00000000 */ nop +/* 3DB8C 8006278C 00000000 */ nop /* 3DB90 80062790 46167182 */ mul.s $f6, $f14, $f22 /* 3DB94 80062794 44959000 */ mtc1 $s5, $f18 -/* 3DB98 80062798 00000000 */ nop +/* 3DB98 80062798 00000000 */ nop /* 3DB9C 8006279C 46149202 */ mul.s $f8, $f18, $f20 /* 3DBA0 800627A0 44937000 */ mtc1 $s3, $f14 /* 3DBA4 800627A4 44929000 */ mtc1 $s2, $f18 -/* 3DBA8 800627A8 00000000 */ nop +/* 3DBA8 800627A8 00000000 */ nop /* 3DBAC 800627AC 46127102 */ mul.s $f4, $f14, $f18 /* 3DBB0 800627B0 44947000 */ mtc1 $s4, $f14 /* 3DBB4 800627B4 44919000 */ mtc1 $s1, $f18 -/* 3DBB8 800627B8 00000000 */ nop +/* 3DBB8 800627B8 00000000 */ nop /* 3DBBC 800627BC 46127282 */ mul.s $f10, $f14, $f18 /* 3DBC0 800627C0 44937000 */ mtc1 $s3, $f14 -/* 3DBC4 800627C4 00000000 */ nop +/* 3DBC4 800627C4 00000000 */ nop /* 3DBC8 800627C8 461A7002 */ mul.s $f0, $f14, $f26 /* 3DBCC 800627CC 44949000 */ mtc1 $s4, $f18 -/* 3DBD0 800627D0 00000000 */ nop +/* 3DBD0 800627D0 00000000 */ nop /* 3DBD4 800627D4 461C9302 */ mul.s $f12, $f18, $f28 /* 3DBD8 800627D8 44957000 */ mtc1 $s5, $f14 /* 3DBDC 800627DC 8FA50054 */ lw $a1, 0x54($sp) @@ -230,6 +230,6 @@ glabel guLookAt /* 3DCA8 800628A8 D7B40088 */ ldc1 $f20, 0x88($sp) /* 3DCAC 800628AC 03E00008 */ jr $ra /* 3DCB0 800628B0 27BD00B8 */ addiu $sp, $sp, 0xb8 -/* 3DCB4 800628B4 00000000 */ nop -/* 3DCB8 800628B8 00000000 */ nop -/* 3DCBC 800628BC 00000000 */ nop +/* 3DCB4 800628B4 00000000 */ nop +/* 3DCB8 800628B8 00000000 */ nop +/* 3DCBC 800628BC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3d330_len_990/guLookAtF.s b/asm/nonmatchings/os/code_3d330_len_990/guLookAtF.s index 093448dbd2..43c7426206 100644 --- a/asm/nonmatchings/os/code_3d330_len_990/guLookAtF.s +++ b/asm/nonmatchings/os/code_3d330_len_990/guLookAtF.s @@ -31,29 +31,29 @@ glabel guLookAtF /* 3D618 80062218 0C019D28 */ jal guMtxIdentF /* 3D61C 8006221C 00E0F021 */ addu $fp, $a3, $zero /* 3D620 80062220 44947000 */ mtc1 $s4, $f14 -/* 3D624 80062224 00000000 */ nop +/* 3D624 80062224 00000000 */ nop /* 3D628 80062228 460EA701 */ sub.s $f28, $f20, $f14 /* 3D62C 8006222C 44959000 */ mtc1 $s5, $f18 /* 3D630 80062230 461CE002 */ mul.s $f0, $f28, $f28 /* 3D634 80062234 4612B781 */ sub.s $f30, $f22, $f18 /* 3D638 80062238 449E7000 */ mtc1 $fp, $f14 -/* 3D63C 8006223C 00000000 */ nop +/* 3D63C 8006223C 00000000 */ nop /* 3D640 80062240 460EC381 */ sub.s $f14, $f24, $f14 /* 3D644 80062244 461EF102 */ mul.s $f4, $f30, $f30 /* 3D648 80062248 44117000 */ mfc1 $s1, $f14 -/* 3D64C 8006224C 00000000 */ nop +/* 3D64C 8006224C 00000000 */ nop /* 3D650 80062250 44919000 */ mtc1 $s1, $f18 -/* 3D654 80062254 00000000 */ nop +/* 3D654 80062254 00000000 */ nop /* 3D658 80062258 46127082 */ mul.s $f2, $f14, $f18 /* 3D65C 8006225C 46040000 */ add.s $f0, $f0, $f4 /* 3D660 80062260 46020300 */ add.s $f12, $f0, $f2 /* 3D664 80062264 46006084 */ sqrt.s $f2, $f12 /* 3D668 80062268 46021032 */ c.eq.s $f2, $f2 -/* 3D66C 8006226C 00000000 */ nop +/* 3D66C 8006226C 00000000 */ nop /* 3D670 80062270 45010004 */ bc1t .L80062284 -/* 3D674 80062274 00000000 */ nop +/* 3D674 80062274 00000000 */ nop /* 3D678 80062278 0C0187BC */ jal sqrtf -/* 3D67C 8006227C 00000000 */ nop +/* 3D67C 8006227C 00000000 */ nop /* 3D680 80062280 46000086 */ mov.s $f2, $f0 .L80062284: /* 3D684 80062284 3C01800A */ lui $at, %hi(D_80099B50) @@ -63,25 +63,25 @@ glabel guLookAtF /* 3D694 80062294 46200420 */ cvt.s.d $f16, $f0 /* 3D698 80062298 4610E702 */ mul.s $f28, $f28, $f16 /* 3D69C 8006229C 44917000 */ mtc1 $s1, $f14 -/* 3D6A0 800622A0 00000000 */ nop +/* 3D6A0 800622A0 00000000 */ nop /* 3D6A4 800622A4 46107382 */ mul.s $f14, $f14, $f16 -/* 3D6A8 800622A8 00000000 */ nop +/* 3D6A8 800622A8 00000000 */ nop /* 3D6AC 800622AC 4610F782 */ mul.s $f30, $f30, $f16 /* 3D6B0 800622B0 44929000 */ mtc1 $s2, $f18 -/* 3D6B4 800622B4 00000000 */ nop +/* 3D6B4 800622B4 00000000 */ nop /* 3D6B8 800622B8 460E9102 */ mul.s $f4, $f18, $f14 -/* 3D6BC 800622BC 00000000 */ nop +/* 3D6BC 800622BC 00000000 */ nop /* 3D6C0 800622C0 461ED002 */ mul.s $f0, $f26, $f30 -/* 3D6C4 800622C4 00000000 */ nop +/* 3D6C4 800622C4 00000000 */ nop /* 3D6C8 800622C8 461CD202 */ mul.s $f8, $f26, $f28 /* 3D6CC 800622CC 44939000 */ mtc1 $s3, $f18 -/* 3D6D0 800622D0 00000000 */ nop +/* 3D6D0 800622D0 00000000 */ nop /* 3D6D4 800622D4 460E9082 */ mul.s $f2, $f18, $f14 -/* 3D6D8 800622D8 00000000 */ nop +/* 3D6D8 800622D8 00000000 */ nop /* 3D6DC 800622DC 461E9282 */ mul.s $f10, $f18, $f30 /* 3D6E0 800622E0 44117000 */ mfc1 $s1, $f14 /* 3D6E4 800622E4 44927000 */ mtc1 $s2, $f14 -/* 3D6E8 800622E8 00000000 */ nop +/* 3D6E8 800622E8 00000000 */ nop /* 3D6EC 800622EC 461C7182 */ mul.s $f6, $f14, $f28 /* 3D6F0 800622F0 46002601 */ sub.s $f24, $f4, $f0 /* 3D6F4 800622F4 4618C002 */ mul.s $f0, $f24, $f24 @@ -93,11 +93,11 @@ glabel guLookAtF /* 3D70C 8006230C 46020300 */ add.s $f12, $f0, $f2 /* 3D710 80062310 46006004 */ sqrt.s $f0, $f12 /* 3D714 80062314 46000032 */ c.eq.s $f0, $f0 -/* 3D718 80062318 00000000 */ nop +/* 3D718 80062318 00000000 */ nop /* 3D71C 8006231C 45010003 */ bc1t .L8006232C -/* 3D720 80062320 00000000 */ nop +/* 3D720 80062320 00000000 */ nop /* 3D724 80062324 0C0187BC */ jal sqrtf -/* 3D728 80062328 00000000 */ nop +/* 3D728 80062328 00000000 */ nop .L8006232C: /* 3D72C 8006232C 3C01800A */ lui $at, %hi(D_80099B58) /* 3D730 80062330 8C369B58 */ lw $s6, %lo(D_80099B58)($at) @@ -108,22 +108,22 @@ glabel guLookAtF /* 3D744 80062344 46209003 */ div.d $f0, $f18, $f0 /* 3D748 80062348 46200420 */ cvt.s.d $f16, $f0 /* 3D74C 8006234C 4610C602 */ mul.s $f24, $f24, $f16 -/* 3D750 80062350 00000000 */ nop +/* 3D750 80062350 00000000 */ nop /* 3D754 80062354 4610A502 */ mul.s $f20, $f20, $f16 -/* 3D758 80062358 00000000 */ nop +/* 3D758 80062358 00000000 */ nop /* 3D75C 8006235C 4610B582 */ mul.s $f22, $f22, $f16 -/* 3D760 80062360 00000000 */ nop +/* 3D760 80062360 00000000 */ nop /* 3D764 80062364 4614F102 */ mul.s $f4, $f30, $f20 /* 3D768 80062368 44917000 */ mtc1 $s1, $f14 -/* 3D76C 8006236C 00000000 */ nop +/* 3D76C 8006236C 00000000 */ nop /* 3D770 80062370 46167002 */ mul.s $f0, $f14, $f22 -/* 3D774 80062374 00000000 */ nop +/* 3D774 80062374 00000000 */ nop /* 3D778 80062378 46187202 */ mul.s $f8, $f14, $f24 -/* 3D77C 8006237C 00000000 */ nop +/* 3D77C 8006237C 00000000 */ nop /* 3D780 80062380 4614E082 */ mul.s $f2, $f28, $f20 -/* 3D784 80062384 00000000 */ nop +/* 3D784 80062384 00000000 */ nop /* 3D788 80062388 4616E282 */ mul.s $f10, $f28, $f22 -/* 3D78C 8006238C 00000000 */ nop +/* 3D78C 8006238C 00000000 */ nop /* 3D790 80062390 4618F182 */ mul.s $f6, $f30, $f24 /* 3D794 80062394 46002101 */ sub.s $f4, $f4, $f0 /* 3D798 80062398 46042002 */ mul.s $f0, $f4, $f4 @@ -137,11 +137,11 @@ glabel guLookAtF /* 3D7B8 800623B8 46006004 */ sqrt.s $f0, $f12 /* 3D7BC 800623BC 46000032 */ c.eq.s $f0, $f0 /* 3D7C0 800623C0 44124000 */ mfc1 $s2, $f8 -/* 3D7C4 800623C4 00000000 */ nop +/* 3D7C4 800623C4 00000000 */ nop /* 3D7C8 800623C8 45030006 */ bc1tl .L800623E4 /* 3D7CC 800623CC 46000021 */ cvt.d.s $f0, $f0 /* 3D7D0 800623D0 0C0187BC */ jal sqrtf -/* 3D7D4 800623D4 00000000 */ nop +/* 3D7D4 800623D4 00000000 */ nop /* 3D7D8 800623D8 44979000 */ mtc1 $s7, $f18 /* 3D7DC 800623DC 44969800 */ mtc1 $s6, $f19 /* 3D7E0 800623E0 46000021 */ cvt.d.s $f0, $f0 @@ -151,34 +151,34 @@ glabel guLookAtF /* 3D7EC 800623EC 46200420 */ cvt.s.d $f16, $f0 /* 3D7F0 800623F0 46107382 */ mul.s $f14, $f14, $f16 /* 3D7F4 800623F4 44929000 */ mtc1 $s2, $f18 -/* 3D7F8 800623F8 00000000 */ nop +/* 3D7F8 800623F8 00000000 */ nop /* 3D7FC 800623FC 46109482 */ mul.s $f18, $f18, $f16 -/* 3D800 80062400 00000000 */ nop +/* 3D800 80062400 00000000 */ nop /* 3D804 80062404 4610D682 */ mul.s $f26, $f26, $f16 /* 3D808 80062408 44137000 */ mfc1 $s3, $f14 /* 3D80C 8006240C 44947000 */ mtc1 $s4, $f14 -/* 3D810 80062410 00000000 */ nop +/* 3D810 80062410 00000000 */ nop /* 3D814 80062414 46187082 */ mul.s $f2, $f14, $f24 /* 3D818 80062418 44129000 */ mfc1 $s2, $f18 /* 3D81C 8006241C 44959000 */ mtc1 $s5, $f18 -/* 3D820 80062420 00000000 */ nop +/* 3D820 80062420 00000000 */ nop /* 3D824 80062424 46169182 */ mul.s $f6, $f18, $f22 /* 3D828 80062428 449E7000 */ mtc1 $fp, $f14 -/* 3D82C 8006242C 00000000 */ nop +/* 3D82C 8006242C 00000000 */ nop /* 3D830 80062430 46147202 */ mul.s $f8, $f14, $f20 /* 3D834 80062434 44949000 */ mtc1 $s4, $f18 /* 3D838 80062438 44937000 */ mtc1 $s3, $f14 -/* 3D83C 8006243C 00000000 */ nop +/* 3D83C 8006243C 00000000 */ nop /* 3D840 80062440 460E9102 */ mul.s $f4, $f18, $f14 /* 3D844 80062444 44959000 */ mtc1 $s5, $f18 /* 3D848 80062448 44927000 */ mtc1 $s2, $f14 -/* 3D84C 8006244C 00000000 */ nop +/* 3D84C 8006244C 00000000 */ nop /* 3D850 80062450 460E9282 */ mul.s $f10, $f18, $f14 /* 3D854 80062454 44949000 */ mtc1 $s4, $f18 -/* 3D858 80062458 00000000 */ nop +/* 3D858 80062458 00000000 */ nop /* 3D85C 8006245C 461C9002 */ mul.s $f0, $f18, $f28 /* 3D860 80062460 44957000 */ mtc1 $s5, $f14 -/* 3D864 80062464 00000000 */ nop +/* 3D864 80062464 00000000 */ nop /* 3D868 80062468 461E7302 */ mul.s $f12, $f14, $f30 /* 3D86C 8006246C 46061080 */ add.s $f2, $f2, $f6 /* 3D870 80062470 44917000 */ mtc1 $s1, $f14 diff --git a/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s b/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s index 77cb52fecc..2503c047de 100644 --- a/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s +++ b/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHilite.s @@ -55,5 +55,5 @@ glabel guLookAtHilite /* 3E70C 8006330C D7B40098 */ ldc1 $f20, 0x98($sp) /* 3E710 80063310 03E00008 */ jr $ra /* 3E714 80063314 27BD00B8 */ addiu $sp, $sp, 0xb8 -/* 3E718 80063318 00000000 */ nop -/* 3E71C 8006331C 00000000 */ nop +/* 3E718 80063318 00000000 */ nop +/* 3E71C 8006331C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s b/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s index 59a2e0a83a..ea206e3083 100644 --- a/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s +++ b/asm/nonmatchings/os/code_3dcc0_len_a60/guLookAtHiliteF.s @@ -36,15 +36,15 @@ glabel guLookAtHiliteF /* 3DD3C 8006293C 44178000 */ mfc1 $s7, $f16 /* 3DD40 80062940 460EA501 */ sub.s $f20, $f20, $f14 /* 3DD44 80062944 44977000 */ mtc1 $s7, $f14 -/* 3DD48 80062948 00000000 */ nop +/* 3DD48 80062948 00000000 */ nop /* 3DD4C 8006294C 460E8102 */ mul.s $f4, $f16, $f14 /* 3DD50 80062950 C7B0008C */ lwc1 $f16, 0x8c($sp) /* 3DD54 80062954 4610C401 */ sub.s $f16, $f24, $f16 /* 3DD58 80062958 4614A002 */ mul.s $f0, $f20, $f20 /* 3DD5C 8006295C 44168000 */ mfc1 $s6, $f16 -/* 3DD60 80062960 00000000 */ nop +/* 3DD60 80062960 00000000 */ nop /* 3DD64 80062964 44967000 */ mtc1 $s6, $f14 -/* 3DD68 80062968 00000000 */ nop +/* 3DD68 80062968 00000000 */ nop /* 3DD6C 8006296C 460E8082 */ mul.s $f2, $f16, $f14 /* 3DD70 80062970 46040000 */ add.s $f0, $f0, $f4 /* 3DD74 80062974 46020300 */ add.s $f12, $f0, $f2 @@ -52,9 +52,9 @@ glabel guLookAtHiliteF /* 3DD7C 8006297C 46021032 */ c.eq.s $f2, $f2 /* 3DD80 80062980 441EA000 */ mfc1 $fp, $f20 /* 3DD84 80062984 45010004 */ bc1t .L80062998 -/* 3DD88 80062988 00000000 */ nop +/* 3DD88 80062988 00000000 */ nop /* 3DD8C 8006298C 0C0187BC */ jal sqrtf -/* 3DD90 80062990 00000000 */ nop +/* 3DD90 80062990 00000000 */ nop /* 3DD94 80062994 46000086 */ mov.s $f2, $f0 .L80062998: /* 3DD98 80062998 3C01800A */ lui $at, %hi(D_80099B70) @@ -66,31 +66,31 @@ glabel guLookAtHiliteF /* 3DDB0 800629B0 46008402 */ mul.s $f16, $f16, $f0 /* 3DDB4 800629B4 441E8000 */ mfc1 $fp, $f16 /* 3DDB8 800629B8 44978000 */ mtc1 $s7, $f16 -/* 3DDBC 800629BC 00000000 */ nop +/* 3DDBC 800629BC 00000000 */ nop /* 3DDC0 800629C0 46008402 */ mul.s $f16, $f16, $f0 /* 3DDC4 800629C4 44967000 */ mtc1 $s6, $f14 -/* 3DDC8 800629C8 00000000 */ nop +/* 3DDC8 800629C8 00000000 */ nop /* 3DDCC 800629CC 46007382 */ mul.s $f14, $f14, $f0 /* 3DDD0 800629D0 44178000 */ mfc1 $s7, $f16 /* 3DDD4 800629D4 44958000 */ mtc1 $s5, $f16 -/* 3DDD8 800629D8 00000000 */ nop +/* 3DDD8 800629D8 00000000 */ nop /* 3DDDC 800629DC 460E8102 */ mul.s $f4, $f16, $f14 /* 3DDE0 800629E0 44167000 */ mfc1 $s6, $f14 /* 3DDE4 800629E4 44977000 */ mtc1 $s7, $f14 -/* 3DDE8 800629E8 00000000 */ nop +/* 3DDE8 800629E8 00000000 */ nop /* 3DDEC 800629EC 460EE002 */ mul.s $f0, $f28, $f14 /* 3DDF0 800629F0 449E8000 */ mtc1 $fp, $f16 -/* 3DDF4 800629F4 00000000 */ nop +/* 3DDF4 800629F4 00000000 */ nop /* 3DDF8 800629F8 4610E202 */ mul.s $f8, $f28, $f16 /* 3DDFC 800629FC 44967000 */ mtc1 $s6, $f14 -/* 3DE00 80062A00 00000000 */ nop +/* 3DE00 80062A00 00000000 */ nop /* 3DE04 80062A04 460EF082 */ mul.s $f2, $f30, $f14 /* 3DE08 80062A08 44978000 */ mtc1 $s7, $f16 -/* 3DE0C 80062A0C 00000000 */ nop +/* 3DE0C 80062A0C 00000000 */ nop /* 3DE10 80062A10 4610F282 */ mul.s $f10, $f30, $f16 /* 3DE14 80062A14 44957000 */ mtc1 $s5, $f14 /* 3DE18 80062A18 449E8000 */ mtc1 $fp, $f16 -/* 3DE1C 80062A1C 00000000 */ nop +/* 3DE1C 80062A1C 00000000 */ nop /* 3DE20 80062A20 46107182 */ mul.s $f6, $f14, $f16 /* 3DE24 80062A24 46002101 */ sub.s $f4, $f4, $f0 /* 3DE28 80062A28 46042002 */ mul.s $f0, $f4, $f4 @@ -106,9 +106,9 @@ glabel guLookAtHiliteF /* 3DE50 80062A50 44134000 */ mfc1 $s3, $f8 /* 3DE54 80062A54 44145000 */ mfc1 $s4, $f10 /* 3DE58 80062A58 45010003 */ bc1t .L80062A68 -/* 3DE5C 80062A5C 00000000 */ nop +/* 3DE5C 80062A5C 00000000 */ nop /* 3DE60 80062A60 0C0187BC */ jal sqrtf -/* 3DE64 80062A64 00000000 */ nop +/* 3DE64 80062A64 00000000 */ nop .L80062A68: /* 3DE68 80062A68 3C01800A */ lui $at, %hi(D_80099B78) /* 3DE6C 80062A6C D43A9B78 */ ldc1 $f26, %lo(D_80099B78)($at) @@ -119,33 +119,33 @@ glabel guLookAtHiliteF /* 3DE80 80062A80 46007382 */ mul.s $f14, $f14, $f0 /* 3DE84 80062A84 44127000 */ mfc1 $s2, $f14 /* 3DE88 80062A88 44937000 */ mtc1 $s3, $f14 -/* 3DE8C 80062A8C 00000000 */ nop +/* 3DE8C 80062A8C 00000000 */ nop /* 3DE90 80062A90 46007382 */ mul.s $f14, $f14, $f0 /* 3DE94 80062A94 44948000 */ mtc1 $s4, $f16 -/* 3DE98 80062A98 00000000 */ nop +/* 3DE98 80062A98 00000000 */ nop /* 3DE9C 80062A9C 46008402 */ mul.s $f16, $f16, $f0 /* 3DEA0 80062AA0 44137000 */ mfc1 $s3, $f14 /* 3DEA4 80062AA4 44977000 */ mtc1 $s7, $f14 -/* 3DEA8 80062AA8 00000000 */ nop +/* 3DEA8 80062AA8 00000000 */ nop /* 3DEAC 80062AAC 46107102 */ mul.s $f4, $f14, $f16 /* 3DEB0 80062AB0 44148000 */ mfc1 $s4, $f16 /* 3DEB4 80062AB4 44968000 */ mtc1 $s6, $f16 /* 3DEB8 80062AB8 44937000 */ mtc1 $s3, $f14 -/* 3DEBC 80062ABC 00000000 */ nop +/* 3DEBC 80062ABC 00000000 */ nop /* 3DEC0 80062AC0 460E8002 */ mul.s $f0, $f16, $f14 /* 3DEC4 80062AC4 44927000 */ mtc1 $s2, $f14 -/* 3DEC8 80062AC8 00000000 */ nop +/* 3DEC8 80062AC8 00000000 */ nop /* 3DECC 80062ACC 460E8202 */ mul.s $f8, $f16, $f14 /* 3DED0 80062AD0 449E8000 */ mtc1 $fp, $f16 /* 3DED4 80062AD4 44947000 */ mtc1 $s4, $f14 -/* 3DED8 80062AD8 00000000 */ nop +/* 3DED8 80062AD8 00000000 */ nop /* 3DEDC 80062ADC 460E8082 */ mul.s $f2, $f16, $f14 /* 3DEE0 80062AE0 44937000 */ mtc1 $s3, $f14 -/* 3DEE4 80062AE4 00000000 */ nop +/* 3DEE4 80062AE4 00000000 */ nop /* 3DEE8 80062AE8 460E8282 */ mul.s $f10, $f16, $f14 /* 3DEEC 80062AEC 44978000 */ mtc1 $s7, $f16 /* 3DEF0 80062AF0 44927000 */ mtc1 $s2, $f14 -/* 3DEF4 80062AF4 00000000 */ nop +/* 3DEF4 80062AF4 00000000 */ nop /* 3DEF8 80062AF8 460E8182 */ mul.s $f6, $f16, $f14 /* 3DEFC 80062AFC 46002781 */ sub.s $f30, $f4, $f0 /* 3DF00 80062B00 461EF002 */ mul.s $f0, $f30, $f30 @@ -159,9 +159,9 @@ glabel guLookAtHiliteF /* 3DF20 80062B20 46063032 */ c.eq.s $f6, $f6 /* 3DF24 80062B24 44154000 */ mfc1 $s5, $f8 /* 3DF28 80062B28 45010004 */ bc1t .L80062B3C -/* 3DF2C 80062B2C 00000000 */ nop +/* 3DF2C 80062B2C 00000000 */ nop /* 3DF30 80062B30 0C0187BC */ jal sqrtf -/* 3DF34 80062B34 00000000 */ nop +/* 3DF34 80062B34 00000000 */ nop /* 3DF38 80062B38 46000186 */ mov.s $f6, $f0 .L80062B3C: /* 3DF3C 80062B3C C7B000A8 */ lwc1 $f16, 0xa8($sp) @@ -181,15 +181,15 @@ glabel guLookAtHiliteF /* 3DF74 80062B74 46200020 */ cvt.s.d $f0, $f0 /* 3DF78 80062B78 4600F782 */ mul.s $f30, $f30, $f0 /* 3DF7C 80062B7C 44958000 */ mtc1 $s5, $f16 -/* 3DF80 80062B80 00000000 */ nop +/* 3DF80 80062B80 00000000 */ nop /* 3DF84 80062B84 46008402 */ mul.s $f16, $f16, $f0 /* 3DF88 80062B88 46021032 */ c.eq.s $f2, $f2 /* 3DF8C 80062B8C 44158000 */ mfc1 $s5, $f16 -/* 3DF90 80062B90 00000000 */ nop +/* 3DF90 80062B90 00000000 */ nop /* 3DF94 80062B94 45010004 */ bc1t .L80062BA8 /* 3DF98 80062B98 4600E702 */ mul.s $f28, $f28, $f0 /* 3DF9C 80062B9C 0C0187BC */ jal sqrtf -/* 3DFA0 80062BA0 00000000 */ nop +/* 3DFA0 80062BA0 00000000 */ nop /* 3DFA4 80062BA4 46000086 */ mov.s $f2, $f0 .L80062BA8: /* 3DFA8 80062BA8 46001021 */ cvt.d.s $f0, $f2 @@ -206,57 +206,57 @@ glabel guLookAtHiliteF /* 3DFD4 80062BD4 C7B000A8 */ lwc1 $f16, 0xa8($sp) /* 3DFD8 80062BD8 E7AE00B0 */ swc1 $f14, 0xb0($sp) /* 3DFDC 80062BDC 449E7000 */ mtc1 $fp, $f14 -/* 3DFE0 80062BE0 00000000 */ nop +/* 3DFE0 80062BE0 00000000 */ nop /* 3DFE4 80062BE4 460E8600 */ add.s $f24, $f16, $f14 /* 3DFE8 80062BE8 C7B000AC */ lwc1 $f16, 0xac($sp) /* 3DFEC 80062BEC 4618C002 */ mul.s $f0, $f24, $f24 /* 3DFF0 80062BF0 44977000 */ mtc1 $s7, $f14 -/* 3DFF4 80062BF4 00000000 */ nop +/* 3DFF4 80062BF4 00000000 */ nop /* 3DFF8 80062BF8 460E8500 */ add.s $f20, $f16, $f14 /* 3DFFC 80062BFC C7B000B0 */ lwc1 $f16, 0xb0($sp) /* 3E000 80062C00 4614A102 */ mul.s $f4, $f20, $f20 /* 3E004 80062C04 44967000 */ mtc1 $s6, $f14 -/* 3E008 80062C08 00000000 */ nop +/* 3E008 80062C08 00000000 */ nop /* 3E00C 80062C0C 460E8580 */ add.s $f22, $f16, $f14 /* 3E010 80062C10 4616B082 */ mul.s $f2, $f22, $f22 /* 3E014 80062C14 46040000 */ add.s $f0, $f0, $f4 /* 3E018 80062C18 46020300 */ add.s $f12, $f0, $f2 /* 3E01C 80062C1C 46006084 */ sqrt.s $f2, $f12 /* 3E020 80062C20 46021032 */ c.eq.s $f2, $f2 -/* 3E024 80062C24 00000000 */ nop +/* 3E024 80062C24 00000000 */ nop /* 3E028 80062C28 45010004 */ bc1t .L80062C3C -/* 3E02C 80062C2C 00000000 */ nop +/* 3E02C 80062C2C 00000000 */ nop /* 3E030 80062C30 0C0187BC */ jal sqrtf -/* 3E034 80062C34 00000000 */ nop +/* 3E034 80062C34 00000000 */ nop /* 3E038 80062C38 46000086 */ mov.s $f2, $f0 .L80062C3C: /* 3E03C 80062C3C 3C01800A */ lui $at, %hi(D_80099B80) /* 3E040 80062C40 D4209B80 */ ldc1 $f0, %lo(D_80099B80)($at) /* 3E044 80062C44 460010A1 */ cvt.d.s $f2, $f2 /* 3E048 80062C48 4622003C */ c.lt.d $f0, $f2 -/* 3E04C 80062C4C 00000000 */ nop +/* 3E04C 80062C4C 00000000 */ nop /* 3E050 80062C50 45000035 */ bc1f .L80062D28 -/* 3E054 80062C54 00000000 */ nop +/* 3E054 80062C54 00000000 */ nop /* 3E058 80062C58 4622D003 */ div.d $f0, $f26, $f2 /* 3E05C 80062C5C 46200020 */ cvt.s.d $f0, $f0 /* 3E060 80062C60 4600C602 */ mul.s $f24, $f24, $f0 -/* 3E064 80062C64 00000000 */ nop +/* 3E064 80062C64 00000000 */ nop /* 3E068 80062C68 4600A502 */ mul.s $f20, $f20, $f0 -/* 3E06C 80062C6C 00000000 */ nop +/* 3E06C 80062C6C 00000000 */ nop /* 3E070 80062C70 4600B582 */ mul.s $f22, $f22, $f0 /* 3E074 80062C74 44928000 */ mtc1 $s2, $f16 -/* 3E078 80062C78 00000000 */ nop +/* 3E078 80062C78 00000000 */ nop /* 3E07C 80062C7C 4610C002 */ mul.s $f0, $f24, $f16 /* 3E080 80062C80 44937000 */ mtc1 $s3, $f14 -/* 3E084 80062C84 00000000 */ nop +/* 3E084 80062C84 00000000 */ nop /* 3E088 80062C88 460EA102 */ mul.s $f4, $f20, $f14 -/* 3E08C 80062C8C 00000000 */ nop +/* 3E08C 80062C8C 00000000 */ nop /* 3E090 80062C90 461EC082 */ mul.s $f2, $f24, $f30 /* 3E094 80062C94 44948000 */ mtc1 $s4, $f16 -/* 3E098 80062C98 00000000 */ nop +/* 3E098 80062C98 00000000 */ nop /* 3E09C 80062C9C 4610B182 */ mul.s $f6, $f22, $f16 /* 3E0A0 80062CA0 44957000 */ mtc1 $s5, $f14 -/* 3E0A4 80062CA4 00000000 */ nop +/* 3E0A4 80062CA4 00000000 */ nop /* 3E0A8 80062CA8 460EA202 */ mul.s $f8, $f20, $f14 /* 3E0AC 80062CAC 46040000 */ add.s $f0, $f0, $f4 /* 3E0B0 80062CB0 461CB282 */ mul.s $f10, $f22, $f28 @@ -275,13 +275,13 @@ glabel guLookAtHiliteF /* 3E0E4 80062CE4 00031080 */ sll $v0, $v1, 2 /* 3E0E8 80062CE8 8FA300C4 */ lw $v1, 0xc4($sp) /* 3E0EC 80062CEC 44822000 */ mtc1 $v0, $f4 -/* 3E0F0 80062CF0 00000000 */ nop +/* 3E0F0 80062CF0 00000000 */ nop /* 3E0F4 80062CF4 46802120 */ cvt.s.w $f4, $f4 /* 3E0F8 80062CF8 46002100 */ add.s $f4, $f4, $f0 /* 3E0FC 80062CFC 00031080 */ sll $v0, $v1, 2 /* 3E100 80062D00 8FA30014 */ lw $v1, 0x14($sp) /* 3E104 80062D04 44820000 */ mtc1 $v0, $f0 -/* 3E108 80062D08 00000000 */ nop +/* 3E108 80062D08 00000000 */ nop /* 3E10C 80062D0C 46800020 */ cvt.s.w $f0, $f0 /* 3E110 80062D10 46020000 */ add.s $f0, $f0, $f2 /* 3E114 80062D14 4600208D */ trunc.w.s $f2, $f4 @@ -312,11 +312,11 @@ glabel guLookAtHiliteF /* 3E170 80062D70 46040300 */ add.s $f12, $f0, $f4 /* 3E174 80062D74 46006004 */ sqrt.s $f0, $f12 /* 3E178 80062D78 46000032 */ c.eq.s $f0, $f0 -/* 3E17C 80062D7C 00000000 */ nop +/* 3E17C 80062D7C 00000000 */ nop /* 3E180 80062D80 45010003 */ bc1t .L80062D90 -/* 3E184 80062D84 00000000 */ nop +/* 3E184 80062D84 00000000 */ nop /* 3E188 80062D88 0C0187BC */ jal sqrtf -/* 3E18C 80062D8C 00000000 */ nop +/* 3E18C 80062D8C 00000000 */ nop .L80062D90: /* 3E190 80062D90 3C01800A */ lui $at, %hi(D_80099B88) /* 3E194 80062D94 D43A9B88 */ ldc1 $f26, %lo(D_80099B88)($at) @@ -334,57 +334,57 @@ glabel guLookAtHiliteF /* 3E1C4 80062DC4 C7B000B4 */ lwc1 $f16, 0xb4($sp) /* 3E1C8 80062DC8 E7AE00BC */ swc1 $f14, 0xbc($sp) /* 3E1CC 80062DCC 449E7000 */ mtc1 $fp, $f14 -/* 3E1D0 80062DD0 00000000 */ nop +/* 3E1D0 80062DD0 00000000 */ nop /* 3E1D4 80062DD4 460E8600 */ add.s $f24, $f16, $f14 /* 3E1D8 80062DD8 C7B000B8 */ lwc1 $f16, 0xb8($sp) /* 3E1DC 80062DDC 4618C002 */ mul.s $f0, $f24, $f24 /* 3E1E0 80062DE0 44977000 */ mtc1 $s7, $f14 -/* 3E1E4 80062DE4 00000000 */ nop +/* 3E1E4 80062DE4 00000000 */ nop /* 3E1E8 80062DE8 460E8500 */ add.s $f20, $f16, $f14 /* 3E1EC 80062DEC C7B000BC */ lwc1 $f16, 0xbc($sp) /* 3E1F0 80062DF0 4614A102 */ mul.s $f4, $f20, $f20 /* 3E1F4 80062DF4 44967000 */ mtc1 $s6, $f14 -/* 3E1F8 80062DF8 00000000 */ nop +/* 3E1F8 80062DF8 00000000 */ nop /* 3E1FC 80062DFC 460E8580 */ add.s $f22, $f16, $f14 /* 3E200 80062E00 4616B082 */ mul.s $f2, $f22, $f22 /* 3E204 80062E04 46040000 */ add.s $f0, $f0, $f4 /* 3E208 80062E08 46020300 */ add.s $f12, $f0, $f2 /* 3E20C 80062E0C 46006084 */ sqrt.s $f2, $f12 /* 3E210 80062E10 46021032 */ c.eq.s $f2, $f2 -/* 3E214 80062E14 00000000 */ nop +/* 3E214 80062E14 00000000 */ nop /* 3E218 80062E18 45010004 */ bc1t .L80062E2C -/* 3E21C 80062E1C 00000000 */ nop +/* 3E21C 80062E1C 00000000 */ nop /* 3E220 80062E20 0C0187BC */ jal sqrtf -/* 3E224 80062E24 00000000 */ nop +/* 3E224 80062E24 00000000 */ nop /* 3E228 80062E28 46000086 */ mov.s $f2, $f0 .L80062E2C: /* 3E22C 80062E2C 3C01800A */ lui $at, %hi(D_80099B90) /* 3E230 80062E30 D4209B90 */ ldc1 $f0, %lo(D_80099B90)($at) /* 3E234 80062E34 460010A1 */ cvt.d.s $f2, $f2 /* 3E238 80062E38 4622003C */ c.lt.d $f0, $f2 -/* 3E23C 80062E3C 00000000 */ nop +/* 3E23C 80062E3C 00000000 */ nop /* 3E240 80062E40 45000035 */ bc1f .L80062F18 -/* 3E244 80062E44 00000000 */ nop +/* 3E244 80062E44 00000000 */ nop /* 3E248 80062E48 4622D003 */ div.d $f0, $f26, $f2 /* 3E24C 80062E4C 46200020 */ cvt.s.d $f0, $f0 /* 3E250 80062E50 4600C602 */ mul.s $f24, $f24, $f0 -/* 3E254 80062E54 00000000 */ nop +/* 3E254 80062E54 00000000 */ nop /* 3E258 80062E58 4600A502 */ mul.s $f20, $f20, $f0 -/* 3E25C 80062E5C 00000000 */ nop +/* 3E25C 80062E5C 00000000 */ nop /* 3E260 80062E60 4600B582 */ mul.s $f22, $f22, $f0 /* 3E264 80062E64 44928000 */ mtc1 $s2, $f16 -/* 3E268 80062E68 00000000 */ nop +/* 3E268 80062E68 00000000 */ nop /* 3E26C 80062E6C 4610C002 */ mul.s $f0, $f24, $f16 /* 3E270 80062E70 44937000 */ mtc1 $s3, $f14 -/* 3E274 80062E74 00000000 */ nop +/* 3E274 80062E74 00000000 */ nop /* 3E278 80062E78 460EA102 */ mul.s $f4, $f20, $f14 -/* 3E27C 80062E7C 00000000 */ nop +/* 3E27C 80062E7C 00000000 */ nop /* 3E280 80062E80 461EC082 */ mul.s $f2, $f24, $f30 /* 3E284 80062E84 44948000 */ mtc1 $s4, $f16 -/* 3E288 80062E88 00000000 */ nop +/* 3E288 80062E88 00000000 */ nop /* 3E28C 80062E8C 4610B182 */ mul.s $f6, $f22, $f16 /* 3E290 80062E90 44957000 */ mtc1 $s5, $f14 -/* 3E294 80062E94 00000000 */ nop +/* 3E294 80062E94 00000000 */ nop /* 3E298 80062E98 460EA202 */ mul.s $f8, $f20, $f14 /* 3E29C 80062E9C 46040000 */ add.s $f0, $f0, $f4 /* 3E2A0 80062EA0 461CB282 */ mul.s $f10, $f22, $f28 @@ -403,13 +403,13 @@ glabel guLookAtHiliteF /* 3E2D4 80062ED4 00031080 */ sll $v0, $v1, 2 /* 3E2D8 80062ED8 8FA300C4 */ lw $v1, 0xc4($sp) /* 3E2DC 80062EDC 44822000 */ mtc1 $v0, $f4 -/* 3E2E0 80062EE0 00000000 */ nop +/* 3E2E0 80062EE0 00000000 */ nop /* 3E2E4 80062EE4 46802120 */ cvt.s.w $f4, $f4 /* 3E2E8 80062EE8 46002100 */ add.s $f4, $f4, $f0 /* 3E2EC 80062EEC 00031080 */ sll $v0, $v1, 2 /* 3E2F0 80062EF0 8FA30014 */ lw $v1, 0x14($sp) /* 3E2F4 80062EF4 44820000 */ mtc1 $v0, $f0 -/* 3E2F8 80062EF8 00000000 */ nop +/* 3E2F8 80062EF8 00000000 */ nop /* 3E2FC 80062EFC 46800020 */ cvt.s.w $f0, $f0 /* 3E300 80062F00 46020000 */ add.s $f0, $f0, $f2 /* 3E304 80062F04 4600208D */ trunc.w.s $f2, $f4 @@ -430,14 +430,14 @@ glabel guLookAtHiliteF /* 3E338 80062F38 3C014300 */ lui $at, 0x4300 /* 3E33C 80062F3C 44810000 */ mtc1 $at, $f0 /* 3E340 80062F40 44927000 */ mtc1 $s2, $f14 -/* 3E344 80062F44 00000000 */ nop +/* 3E344 80062F44 00000000 */ nop /* 3E348 80062F48 46007082 */ mul.s $f2, $f14, $f0 /* 3E34C 80062F4C 3C0142FE */ lui $at, 0x42fe /* 3E350 80062F50 44810000 */ mtc1 $at, $f0 -/* 3E354 80062F54 00000000 */ nop +/* 3E354 80062F54 00000000 */ nop /* 3E358 80062F58 4600103C */ c.lt.s $f2, $f0 -/* 3E35C 80062F5C 00000000 */ nop -/* 3E360 80062F60 00000000 */ nop +/* 3E35C 80062F5C 00000000 */ nop +/* 3E360 80062F60 00000000 */ nop /* 3E364 80062F64 45000003 */ bc1f .L80062F74 /* 3E368 80062F68 2402007F */ addiu $v0, $zero, 0x7f /* 3E36C 80062F6C 4600100D */ trunc.w.s $f0, $f2 @@ -446,97 +446,97 @@ glabel guLookAtHiliteF /* 3E374 80062F74 3C014300 */ lui $at, 0x4300 /* 3E378 80062F78 44810000 */ mtc1 $at, $f0 /* 3E37C 80062F7C 44938000 */ mtc1 $s3, $f16 -/* 3E380 80062F80 00000000 */ nop +/* 3E380 80062F80 00000000 */ nop /* 3E384 80062F84 46008082 */ mul.s $f2, $f16, $f0 /* 3E388 80062F88 3C0142FE */ lui $at, 0x42fe /* 3E38C 80062F8C 44810000 */ mtc1 $at, $f0 -/* 3E390 80062F90 00000000 */ nop +/* 3E390 80062F90 00000000 */ nop /* 3E394 80062F94 4600103C */ c.lt.s $f2, $f0 -/* 3E398 80062F98 00000000 */ nop -/* 3E39C 80062F9C 00000000 */ nop +/* 3E398 80062F98 00000000 */ nop +/* 3E39C 80062F9C 00000000 */ nop /* 3E3A0 80062FA0 45000005 */ bc1f .L80062FB8 /* 3E3A4 80062FA4 A2020008 */ sb $v0, 8($s0) /* 3E3A8 80062FA8 4600100D */ trunc.w.s $f0, $f2 /* 3E3AC 80062FAC 44020000 */ mfc1 $v0, $f0 /* 3E3B0 80062FB0 08018BEF */ j .L80062FBC -/* 3E3B4 80062FB4 00000000 */ nop +/* 3E3B4 80062FB4 00000000 */ nop .L80062FB8: /* 3E3B8 80062FB8 2402007F */ addiu $v0, $zero, 0x7f .L80062FBC: /* 3E3BC 80062FBC 3C014300 */ lui $at, 0x4300 /* 3E3C0 80062FC0 44810000 */ mtc1 $at, $f0 /* 3E3C4 80062FC4 44947000 */ mtc1 $s4, $f14 -/* 3E3C8 80062FC8 00000000 */ nop +/* 3E3C8 80062FC8 00000000 */ nop /* 3E3CC 80062FCC 46007082 */ mul.s $f2, $f14, $f0 /* 3E3D0 80062FD0 3C0142FE */ lui $at, 0x42fe /* 3E3D4 80062FD4 44810000 */ mtc1 $at, $f0 -/* 3E3D8 80062FD8 00000000 */ nop +/* 3E3D8 80062FD8 00000000 */ nop /* 3E3DC 80062FDC 4600103C */ c.lt.s $f2, $f0 -/* 3E3E0 80062FE0 00000000 */ nop -/* 3E3E4 80062FE4 00000000 */ nop +/* 3E3E0 80062FE0 00000000 */ nop +/* 3E3E4 80062FE4 00000000 */ nop /* 3E3E8 80062FE8 45000005 */ bc1f .L80063000 /* 3E3EC 80062FEC A2020009 */ sb $v0, 9($s0) /* 3E3F0 80062FF0 4600100D */ trunc.w.s $f0, $f2 /* 3E3F4 80062FF4 44020000 */ mfc1 $v0, $f0 /* 3E3F8 80062FF8 08018C01 */ j .L80063004 -/* 3E3FC 80062FFC 00000000 */ nop +/* 3E3FC 80062FFC 00000000 */ nop .L80063000: /* 3E400 80063000 2402007F */ addiu $v0, $zero, 0x7f .L80063004: /* 3E404 80063004 3C014300 */ lui $at, 0x4300 /* 3E408 80063008 44810000 */ mtc1 $at, $f0 -/* 3E40C 8006300C 00000000 */ nop +/* 3E40C 8006300C 00000000 */ nop /* 3E410 80063010 4600F082 */ mul.s $f2, $f30, $f0 /* 3E414 80063014 3C0142FE */ lui $at, 0x42fe /* 3E418 80063018 44810000 */ mtc1 $at, $f0 -/* 3E41C 8006301C 00000000 */ nop +/* 3E41C 8006301C 00000000 */ nop /* 3E420 80063020 4600103C */ c.lt.s $f2, $f0 -/* 3E424 80063024 00000000 */ nop -/* 3E428 80063028 00000000 */ nop +/* 3E424 80063024 00000000 */ nop +/* 3E428 80063028 00000000 */ nop /* 3E42C 8006302C 45000005 */ bc1f .L80063044 /* 3E430 80063030 A202000A */ sb $v0, 0xa($s0) /* 3E434 80063034 4600100D */ trunc.w.s $f0, $f2 /* 3E438 80063038 44020000 */ mfc1 $v0, $f0 /* 3E43C 8006303C 08018C12 */ j .L80063048 -/* 3E440 80063040 00000000 */ nop +/* 3E440 80063040 00000000 */ nop .L80063044: /* 3E444 80063044 2402007F */ addiu $v0, $zero, 0x7f .L80063048: /* 3E448 80063048 3C014300 */ lui $at, 0x4300 /* 3E44C 8006304C 44810000 */ mtc1 $at, $f0 /* 3E450 80063050 44958000 */ mtc1 $s5, $f16 -/* 3E454 80063054 00000000 */ nop +/* 3E454 80063054 00000000 */ nop /* 3E458 80063058 46008082 */ mul.s $f2, $f16, $f0 /* 3E45C 8006305C 3C0142FE */ lui $at, 0x42fe /* 3E460 80063060 44810000 */ mtc1 $at, $f0 -/* 3E464 80063064 00000000 */ nop +/* 3E464 80063064 00000000 */ nop /* 3E468 80063068 4600103C */ c.lt.s $f2, $f0 -/* 3E46C 8006306C 00000000 */ nop -/* 3E470 80063070 00000000 */ nop +/* 3E46C 8006306C 00000000 */ nop +/* 3E470 80063070 00000000 */ nop /* 3E474 80063074 45000005 */ bc1f .L8006308C /* 3E478 80063078 A2020018 */ sb $v0, 0x18($s0) /* 3E47C 8006307C 4600100D */ trunc.w.s $f0, $f2 /* 3E480 80063080 44020000 */ mfc1 $v0, $f0 /* 3E484 80063084 08018C24 */ j .L80063090 -/* 3E488 80063088 00000000 */ nop +/* 3E488 80063088 00000000 */ nop .L8006308C: /* 3E48C 8006308C 2402007F */ addiu $v0, $zero, 0x7f .L80063090: /* 3E490 80063090 3C014300 */ lui $at, 0x4300 /* 3E494 80063094 44810000 */ mtc1 $at, $f0 -/* 3E498 80063098 00000000 */ nop +/* 3E498 80063098 00000000 */ nop /* 3E49C 8006309C 4600E082 */ mul.s $f2, $f28, $f0 /* 3E4A0 800630A0 3C0142FE */ lui $at, 0x42fe /* 3E4A4 800630A4 44810000 */ mtc1 $at, $f0 -/* 3E4A8 800630A8 00000000 */ nop +/* 3E4A8 800630A8 00000000 */ nop /* 3E4AC 800630AC 4600103C */ c.lt.s $f2, $f0 -/* 3E4B0 800630B0 00000000 */ nop -/* 3E4B4 800630B4 00000000 */ nop +/* 3E4B0 800630B0 00000000 */ nop +/* 3E4B4 800630B4 00000000 */ nop /* 3E4B8 800630B8 45000006 */ bc1f .L800630D4 /* 3E4BC 800630BC A2020019 */ sb $v0, 0x19($s0) /* 3E4C0 800630C0 4600100D */ trunc.w.s $f0, $f2 /* 3E4C4 800630C4 44020000 */ mfc1 $v0, $f0 -/* 3E4C8 800630C8 00000000 */ nop +/* 3E4C8 800630C8 00000000 */ nop /* 3E4CC 800630CC 08018C37 */ j .L800630DC /* 3E4D0 800630D0 A202001A */ sb $v0, 0x1a($s0) .L800630D4: @@ -545,15 +545,15 @@ glabel guLookAtHiliteF .L800630DC: /* 3E4DC 800630DC C7AE001C */ lwc1 $f14, 0x1c($sp) /* 3E4E0 800630E0 44928000 */ mtc1 $s2, $f16 -/* 3E4E4 800630E4 00000000 */ nop +/* 3E4E4 800630E4 00000000 */ nop /* 3E4E8 800630E8 46107102 */ mul.s $f4, $f14, $f16 /* 3E4EC 800630EC C7AE0088 */ lwc1 $f14, 0x88($sp) /* 3E4F0 800630F0 44938000 */ mtc1 $s3, $f16 -/* 3E4F4 800630F4 00000000 */ nop +/* 3E4F4 800630F4 00000000 */ nop /* 3E4F8 800630F8 46107182 */ mul.s $f6, $f14, $f16 /* 3E4FC 800630FC C7AE008C */ lwc1 $f14, 0x8c($sp) /* 3E500 80063100 44948000 */ mtc1 $s4, $f16 -/* 3E504 80063104 00000000 */ nop +/* 3E504 80063104 00000000 */ nop /* 3E508 80063108 46107202 */ mul.s $f8, $f14, $f16 /* 3E50C 8006310C C7AE001C */ lwc1 $f14, 0x1c($sp) /* 3E510 80063110 A2000000 */ sb $zero, ($s0) diff --git a/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s b/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s index 378ea4cdc7..97c70c36c3 100644 --- a/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s +++ b/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflect.s @@ -29,6 +29,6 @@ glabel guLookAtReflect /* 3ECF8 800638F8 8FB00070 */ lw $s0, 0x70($sp) /* 3ECFC 800638FC 03E00008 */ jr $ra /* 3ED00 80063900 27BD0078 */ addiu $sp, $sp, 0x78 -/* 3ED04 80063904 00000000 */ nop -/* 3ED08 80063908 00000000 */ nop -/* 3ED0C 8006390C 00000000 */ nop +/* 3ED04 80063904 00000000 */ nop +/* 3ED08 80063908 00000000 */ nop +/* 3ED0C 8006390C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s b/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s index 5a217e1ef2..ba6a4bc5e5 100644 --- a/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s +++ b/asm/nonmatchings/os/code_3e720_len_5f0/guLookAtReflectF.s @@ -31,37 +31,37 @@ glabel guLookAtReflectF /* 3E788 80063388 0C019D28 */ jal guMtxIdentF /* 3E78C 8006338C AFB20018 */ sw $s2, 0x18($sp) /* 3E790 80063390 44957000 */ mtc1 $s5, $f14 -/* 3E794 80063394 00000000 */ nop +/* 3E794 80063394 00000000 */ nop /* 3E798 80063398 460EA381 */ sub.s $f14, $f20, $f14 /* 3E79C 8006339C 44147000 */ mfc1 $s4, $f14 -/* 3E7A0 800633A0 00000000 */ nop +/* 3E7A0 800633A0 00000000 */ nop /* 3E7A4 800633A4 44948000 */ mtc1 $s4, $f16 -/* 3E7A8 800633A8 00000000 */ nop +/* 3E7A8 800633A8 00000000 */ nop /* 3E7AC 800633AC 46107002 */ mul.s $f0, $f14, $f16 /* 3E7B0 800633B0 449E7000 */ mtc1 $fp, $f14 -/* 3E7B4 800633B4 00000000 */ nop +/* 3E7B4 800633B4 00000000 */ nop /* 3E7B8 800633B8 460EB381 */ sub.s $f14, $f22, $f14 /* 3E7BC 800633BC 44137000 */ mfc1 $s3, $f14 -/* 3E7C0 800633C0 00000000 */ nop +/* 3E7C0 800633C0 00000000 */ nop /* 3E7C4 800633C4 44938000 */ mtc1 $s3, $f16 -/* 3E7C8 800633C8 00000000 */ nop +/* 3E7C8 800633C8 00000000 */ nop /* 3E7CC 800633CC 46107102 */ mul.s $f4, $f14, $f16 /* 3E7D0 800633D0 C7AE0078 */ lwc1 $f14, 0x78($sp) /* 3E7D4 800633D4 460EC381 */ sub.s $f14, $f24, $f14 /* 3E7D8 800633D8 44127000 */ mfc1 $s2, $f14 -/* 3E7DC 800633DC 00000000 */ nop +/* 3E7DC 800633DC 00000000 */ nop /* 3E7E0 800633E0 44928000 */ mtc1 $s2, $f16 -/* 3E7E4 800633E4 00000000 */ nop +/* 3E7E4 800633E4 00000000 */ nop /* 3E7E8 800633E8 46107082 */ mul.s $f2, $f14, $f16 /* 3E7EC 800633EC 46040000 */ add.s $f0, $f0, $f4 /* 3E7F0 800633F0 46020300 */ add.s $f12, $f0, $f2 /* 3E7F4 800633F4 46006084 */ sqrt.s $f2, $f12 /* 3E7F8 800633F8 46021032 */ c.eq.s $f2, $f2 -/* 3E7FC 800633FC 00000000 */ nop +/* 3E7FC 800633FC 00000000 */ nop /* 3E800 80063400 45010004 */ bc1t .L80063414 -/* 3E804 80063404 00000000 */ nop +/* 3E804 80063404 00000000 */ nop /* 3E808 80063408 0C0187BC */ jal sqrtf -/* 3E80C 8006340C 00000000 */ nop +/* 3E80C 8006340C 00000000 */ nop /* 3E810 80063410 46000086 */ mov.s $f2, $f0 .L80063414: /* 3E814 80063414 3C01800A */ lui $at, %hi(D_80099BA0) @@ -72,29 +72,29 @@ glabel guLookAtReflectF /* 3E828 80063428 462000A0 */ cvt.s.d $f2, $f0 /* 3E82C 8006342C 46028402 */ mul.s $f16, $f16, $f2 /* 3E830 80063430 44947000 */ mtc1 $s4, $f14 -/* 3E834 80063434 00000000 */ nop +/* 3E834 80063434 00000000 */ nop /* 3E838 80063438 46027382 */ mul.s $f14, $f14, $f2 -/* 3E83C 8006343C 00000000 */ nop +/* 3E83C 8006343C 00000000 */ nop /* 3E840 80063440 4610F102 */ mul.s $f4, $f30, $f16 /* 3E844 80063444 44147000 */ mfc1 $s4, $f14 /* 3E848 80063448 44937000 */ mtc1 $s3, $f14 -/* 3E84C 8006344C 00000000 */ nop +/* 3E84C 8006344C 00000000 */ nop /* 3E850 80063450 46027382 */ mul.s $f14, $f14, $f2 /* 3E854 80063454 44128000 */ mfc1 $s2, $f16 /* 3E858 80063458 44948000 */ mtc1 $s4, $f16 -/* 3E85C 8006345C 00000000 */ nop +/* 3E85C 8006345C 00000000 */ nop /* 3E860 80063460 4610D202 */ mul.s $f8, $f26, $f16 -/* 3E864 80063464 00000000 */ nop +/* 3E864 80063464 00000000 */ nop /* 3E868 80063468 460ED002 */ mul.s $f0, $f26, $f14 /* 3E86C 8006346C 44137000 */ mfc1 $s3, $f14 /* 3E870 80063470 44927000 */ mtc1 $s2, $f14 -/* 3E874 80063474 00000000 */ nop +/* 3E874 80063474 00000000 */ nop /* 3E878 80063478 460EE082 */ mul.s $f2, $f28, $f14 /* 3E87C 8006347C 44938000 */ mtc1 $s3, $f16 -/* 3E880 80063480 00000000 */ nop +/* 3E880 80063480 00000000 */ nop /* 3E884 80063484 4610E282 */ mul.s $f10, $f28, $f16 /* 3E888 80063488 44947000 */ mtc1 $s4, $f14 -/* 3E88C 8006348C 00000000 */ nop +/* 3E88C 8006348C 00000000 */ nop /* 3E890 80063490 460EF182 */ mul.s $f6, $f30, $f14 /* 3E894 80063494 46002501 */ sub.s $f20, $f4, $f0 /* 3E898 80063498 4614A002 */ mul.s $f0, $f20, $f20 @@ -106,11 +106,11 @@ glabel guLookAtReflectF /* 3E8B0 800634B0 46020300 */ add.s $f12, $f0, $f2 /* 3E8B4 800634B4 46006004 */ sqrt.s $f0, $f12 /* 3E8B8 800634B8 46000032 */ c.eq.s $f0, $f0 -/* 3E8BC 800634BC 00000000 */ nop +/* 3E8BC 800634BC 00000000 */ nop /* 3E8C0 800634C0 45010003 */ bc1t .L800634D0 -/* 3E8C4 800634C4 00000000 */ nop +/* 3E8C4 800634C4 00000000 */ nop /* 3E8C8 800634C8 0C0187BC */ jal sqrtf -/* 3E8CC 800634CC 00000000 */ nop +/* 3E8CC 800634CC 00000000 */ nop .L800634D0: /* 3E8D0 800634D0 3C01800A */ lui $at, %hi(D_80099BA8) /* 3E8D4 800634D4 8C369BA8 */ lw $s6, %lo(D_80099BA8)($at) @@ -121,25 +121,25 @@ glabel guLookAtReflectF /* 3E8E8 800634E8 46208003 */ div.d $f0, $f16, $f0 /* 3E8EC 800634EC 462000A0 */ cvt.s.d $f2, $f0 /* 3E8F0 800634F0 4602A502 */ mul.s $f20, $f20, $f2 -/* 3E8F4 800634F4 00000000 */ nop +/* 3E8F4 800634F4 00000000 */ nop /* 3E8F8 800634F8 4602C602 */ mul.s $f24, $f24, $f2 -/* 3E8FC 800634FC 00000000 */ nop +/* 3E8FC 800634FC 00000000 */ nop /* 3E900 80063500 4602B582 */ mul.s $f22, $f22, $f2 /* 3E904 80063504 44937000 */ mtc1 $s3, $f14 -/* 3E908 80063508 00000000 */ nop +/* 3E908 80063508 00000000 */ nop /* 3E90C 8006350C 46187102 */ mul.s $f4, $f14, $f24 /* 3E910 80063510 44928000 */ mtc1 $s2, $f16 -/* 3E914 80063514 00000000 */ nop +/* 3E914 80063514 00000000 */ nop /* 3E918 80063518 46168002 */ mul.s $f0, $f16, $f22 -/* 3E91C 8006351C 00000000 */ nop +/* 3E91C 8006351C 00000000 */ nop /* 3E920 80063520 46148202 */ mul.s $f8, $f16, $f20 /* 3E924 80063524 44947000 */ mtc1 $s4, $f14 -/* 3E928 80063528 00000000 */ nop +/* 3E928 80063528 00000000 */ nop /* 3E92C 8006352C 46187082 */ mul.s $f2, $f14, $f24 -/* 3E930 80063530 00000000 */ nop +/* 3E930 80063530 00000000 */ nop /* 3E934 80063534 46167282 */ mul.s $f10, $f14, $f22 /* 3E938 80063538 44938000 */ mtc1 $s3, $f16 -/* 3E93C 8006353C 00000000 */ nop +/* 3E93C 8006353C 00000000 */ nop /* 3E940 80063540 46148182 */ mul.s $f6, $f16, $f20 /* 3E944 80063544 46002701 */ sub.s $f28, $f4, $f0 /* 3E948 80063548 461CE002 */ mul.s $f0, $f28, $f28 @@ -151,11 +151,11 @@ glabel guLookAtReflectF /* 3E960 80063560 46020300 */ add.s $f12, $f0, $f2 /* 3E964 80063564 46006004 */ sqrt.s $f0, $f12 /* 3E968 80063568 46000032 */ c.eq.s $f0, $f0 -/* 3E96C 8006356C 00000000 */ nop +/* 3E96C 8006356C 00000000 */ nop /* 3E970 80063570 45010003 */ bc1t .L80063580 -/* 3E974 80063574 00000000 */ nop +/* 3E974 80063574 00000000 */ nop /* 3E978 80063578 0C0187BC */ jal sqrtf -/* 3E97C 8006357C 00000000 */ nop +/* 3E97C 8006357C 00000000 */ nop .L80063580: /* 3E980 80063580 44977000 */ mtc1 $s7, $f14 /* 3E984 80063584 44967800 */ mtc1 $s6, $f15 @@ -165,116 +165,116 @@ glabel guLookAtReflectF /* 3E994 80063594 4602E702 */ mul.s $f28, $f28, $f2 /* 3E998 80063598 3C014300 */ lui $at, 0x4300 /* 3E99C 8006359C 44810000 */ mtc1 $at, $f0 -/* 3E9A0 800635A0 00000000 */ nop +/* 3E9A0 800635A0 00000000 */ nop /* 3E9A4 800635A4 4600A102 */ mul.s $f4, $f20, $f0 -/* 3E9A8 800635A8 00000000 */ nop +/* 3E9A8 800635A8 00000000 */ nop /* 3E9AC 800635AC 4602F782 */ mul.s $f30, $f30, $f2 /* 3E9B0 800635B0 3C0142FE */ lui $at, 0x42fe /* 3E9B4 800635B4 44810000 */ mtc1 $at, $f0 -/* 3E9B8 800635B8 00000000 */ nop +/* 3E9B8 800635B8 00000000 */ nop /* 3E9BC 800635BC 4600203C */ c.lt.s $f4, $f0 -/* 3E9C0 800635C0 00000000 */ nop -/* 3E9C4 800635C4 00000000 */ nop +/* 3E9C0 800635C0 00000000 */ nop +/* 3E9C4 800635C4 00000000 */ nop /* 3E9C8 800635C8 45000005 */ bc1f .L800635E0 /* 3E9CC 800635CC 4602D682 */ mul.s $f26, $f26, $f2 /* 3E9D0 800635D0 4600200D */ trunc.w.s $f0, $f4 /* 3E9D4 800635D4 44020000 */ mfc1 $v0, $f0 /* 3E9D8 800635D8 08018D79 */ j .L800635E4 -/* 3E9DC 800635DC 00000000 */ nop +/* 3E9DC 800635DC 00000000 */ nop .L800635E0: /* 3E9E0 800635E0 2402007F */ addiu $v0, $zero, 0x7f .L800635E4: /* 3E9E4 800635E4 3C014300 */ lui $at, 0x4300 /* 3E9E8 800635E8 44810000 */ mtc1 $at, $f0 -/* 3E9EC 800635EC 00000000 */ nop +/* 3E9EC 800635EC 00000000 */ nop /* 3E9F0 800635F0 4600B082 */ mul.s $f2, $f22, $f0 /* 3E9F4 800635F4 3C0142FE */ lui $at, 0x42fe /* 3E9F8 800635F8 44810000 */ mtc1 $at, $f0 -/* 3E9FC 800635FC 00000000 */ nop +/* 3E9FC 800635FC 00000000 */ nop /* 3EA00 80063600 4600103C */ c.lt.s $f2, $f0 -/* 3EA04 80063604 00000000 */ nop -/* 3EA08 80063608 00000000 */ nop +/* 3EA04 80063604 00000000 */ nop +/* 3EA08 80063608 00000000 */ nop /* 3EA0C 8006360C 45000005 */ bc1f .L80063624 /* 3EA10 80063610 A2020008 */ sb $v0, 8($s0) /* 3EA14 80063614 4600100D */ trunc.w.s $f0, $f2 /* 3EA18 80063618 44020000 */ mfc1 $v0, $f0 /* 3EA1C 8006361C 08018D8A */ j .L80063628 -/* 3EA20 80063620 00000000 */ nop +/* 3EA20 80063620 00000000 */ nop .L80063624: /* 3EA24 80063624 2402007F */ addiu $v0, $zero, 0x7f .L80063628: /* 3EA28 80063628 3C014300 */ lui $at, 0x4300 /* 3EA2C 8006362C 44810000 */ mtc1 $at, $f0 -/* 3EA30 80063630 00000000 */ nop +/* 3EA30 80063630 00000000 */ nop /* 3EA34 80063634 4600C082 */ mul.s $f2, $f24, $f0 /* 3EA38 80063638 3C0142FE */ lui $at, 0x42fe /* 3EA3C 8006363C 44810000 */ mtc1 $at, $f0 -/* 3EA40 80063640 00000000 */ nop +/* 3EA40 80063640 00000000 */ nop /* 3EA44 80063644 4600103C */ c.lt.s $f2, $f0 -/* 3EA48 80063648 00000000 */ nop -/* 3EA4C 8006364C 00000000 */ nop +/* 3EA48 80063648 00000000 */ nop +/* 3EA4C 8006364C 00000000 */ nop /* 3EA50 80063650 45000005 */ bc1f .L80063668 /* 3EA54 80063654 A2020009 */ sb $v0, 9($s0) /* 3EA58 80063658 4600100D */ trunc.w.s $f0, $f2 /* 3EA5C 8006365C 44020000 */ mfc1 $v0, $f0 /* 3EA60 80063660 08018D9B */ j .L8006366C -/* 3EA64 80063664 00000000 */ nop +/* 3EA64 80063664 00000000 */ nop .L80063668: /* 3EA68 80063668 2402007F */ addiu $v0, $zero, 0x7f .L8006366C: /* 3EA6C 8006366C 3C014300 */ lui $at, 0x4300 /* 3EA70 80063670 44810000 */ mtc1 $at, $f0 -/* 3EA74 80063674 00000000 */ nop +/* 3EA74 80063674 00000000 */ nop /* 3EA78 80063678 4600E082 */ mul.s $f2, $f28, $f0 /* 3EA7C 8006367C 3C0142FE */ lui $at, 0x42fe /* 3EA80 80063680 44810000 */ mtc1 $at, $f0 -/* 3EA84 80063684 00000000 */ nop +/* 3EA84 80063684 00000000 */ nop /* 3EA88 80063688 4600103C */ c.lt.s $f2, $f0 -/* 3EA8C 8006368C 00000000 */ nop -/* 3EA90 80063690 00000000 */ nop +/* 3EA8C 8006368C 00000000 */ nop +/* 3EA90 80063690 00000000 */ nop /* 3EA94 80063694 45000005 */ bc1f .L800636AC /* 3EA98 80063698 A202000A */ sb $v0, 0xa($s0) /* 3EA9C 8006369C 4600100D */ trunc.w.s $f0, $f2 /* 3EAA0 800636A0 44020000 */ mfc1 $v0, $f0 /* 3EAA4 800636A4 08018DAC */ j .L800636B0 -/* 3EAA8 800636A8 00000000 */ nop +/* 3EAA8 800636A8 00000000 */ nop .L800636AC: /* 3EAAC 800636AC 2402007F */ addiu $v0, $zero, 0x7f .L800636B0: /* 3EAB0 800636B0 3C014300 */ lui $at, 0x4300 /* 3EAB4 800636B4 44810000 */ mtc1 $at, $f0 -/* 3EAB8 800636B8 00000000 */ nop +/* 3EAB8 800636B8 00000000 */ nop /* 3EABC 800636BC 4600F082 */ mul.s $f2, $f30, $f0 /* 3EAC0 800636C0 3C0142FE */ lui $at, 0x42fe /* 3EAC4 800636C4 44810000 */ mtc1 $at, $f0 -/* 3EAC8 800636C8 00000000 */ nop +/* 3EAC8 800636C8 00000000 */ nop /* 3EACC 800636CC 4600103C */ c.lt.s $f2, $f0 -/* 3EAD0 800636D0 00000000 */ nop -/* 3EAD4 800636D4 00000000 */ nop +/* 3EAD0 800636D0 00000000 */ nop +/* 3EAD4 800636D4 00000000 */ nop /* 3EAD8 800636D8 45000005 */ bc1f .L800636F0 /* 3EADC 800636DC A2020018 */ sb $v0, 0x18($s0) /* 3EAE0 800636E0 4600100D */ trunc.w.s $f0, $f2 /* 3EAE4 800636E4 44020000 */ mfc1 $v0, $f0 /* 3EAE8 800636E8 08018DBD */ j .L800636F4 -/* 3EAEC 800636EC 00000000 */ nop +/* 3EAEC 800636EC 00000000 */ nop .L800636F0: /* 3EAF0 800636F0 2402007F */ addiu $v0, $zero, 0x7f .L800636F4: /* 3EAF4 800636F4 3C014300 */ lui $at, 0x4300 /* 3EAF8 800636F8 44810000 */ mtc1 $at, $f0 -/* 3EAFC 800636FC 00000000 */ nop +/* 3EAFC 800636FC 00000000 */ nop /* 3EB00 80063700 4600D082 */ mul.s $f2, $f26, $f0 /* 3EB04 80063704 3C0142FE */ lui $at, 0x42fe /* 3EB08 80063708 44810000 */ mtc1 $at, $f0 -/* 3EB0C 8006370C 00000000 */ nop +/* 3EB0C 8006370C 00000000 */ nop /* 3EB10 80063710 4600103C */ c.lt.s $f2, $f0 -/* 3EB14 80063714 00000000 */ nop -/* 3EB18 80063718 00000000 */ nop +/* 3EB14 80063714 00000000 */ nop +/* 3EB18 80063718 00000000 */ nop /* 3EB1C 8006371C 45000006 */ bc1f .L80063738 /* 3EB20 80063720 A2020019 */ sb $v0, 0x19($s0) /* 3EB24 80063724 4600100D */ trunc.w.s $f0, $f2 /* 3EB28 80063728 44020000 */ mfc1 $v0, $f0 -/* 3EB2C 8006372C 00000000 */ nop +/* 3EB2C 8006372C 00000000 */ nop /* 3EB30 80063730 08018DD0 */ j .L80063740 /* 3EB34 80063734 A202001A */ sb $v0, 0x1a($s0) .L80063738: @@ -282,13 +282,13 @@ glabel guLookAtReflectF /* 3EB3C 8006373C A202001A */ sb $v0, 0x1a($s0) .L80063740: /* 3EB40 80063740 44958000 */ mtc1 $s5, $f16 -/* 3EB44 80063744 00000000 */ nop +/* 3EB44 80063744 00000000 */ nop /* 3EB48 80063748 46148102 */ mul.s $f4, $f16, $f20 /* 3EB4C 8006374C 449E7000 */ mtc1 $fp, $f14 -/* 3EB50 80063750 00000000 */ nop +/* 3EB50 80063750 00000000 */ nop /* 3EB54 80063754 46167182 */ mul.s $f6, $f14, $f22 /* 3EB58 80063758 44957000 */ mtc1 $s5, $f14 -/* 3EB5C 8006375C 00000000 */ nop +/* 3EB5C 8006375C 00000000 */ nop /* 3EB60 80063760 461C7082 */ mul.s $f2, $f14, $f28 /* 3EB64 80063764 C7B00078 */ lwc1 $f16, 0x78($sp) /* 3EB68 80063768 46188202 */ mul.s $f8, $f16, $f24 diff --git a/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s b/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s index 67b2d31043..c4802ee95f 100644 --- a/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s +++ b/asm/nonmatchings/os/code_3ef90_len_600/guPerspective.s @@ -74,8 +74,8 @@ glabel guPerspective /* 3F24C 80063E4C D4209BD8 */ ldc1 $f0, %lo(D_80099BD8)($at) /* 3F250 80063E50 460010A1 */ cvt.d.s $f2, $f2 /* 3F254 80063E54 4620103E */ c.le.d $f2, $f0 -/* 3F258 80063E58 00000000 */ nop -/* 3F25C 80063E5C 00000000 */ nop +/* 3F258 80063E58 00000000 */ nop +/* 3F25C 80063E5C 00000000 */ nop /* 3F260 80063E60 4501001A */ bc1t .L80063ECC /* 3F264 80063E64 3402FFFF */ ori $v0, $zero, 0xffff /* 3F268 80063E68 3C01800A */ lui $at, %hi(D_80099BE0) @@ -84,13 +84,13 @@ glabel guPerspective /* 3F274 80063E74 3C01800A */ lui $at, %hi(D_80099BE8) /* 3F278 80063E78 D4209BE8 */ ldc1 $f0, %lo(D_80099BE8)($at) /* 3F27C 80063E7C 4622003E */ c.le.d $f0, $f2 -/* 3F280 80063E80 00000000 */ nop -/* 3F284 80063E84 00000000 */ nop +/* 3F280 80063E80 00000000 */ nop +/* 3F284 80063E84 00000000 */ nop /* 3F288 80063E88 45030006 */ bc1tl .L80063EA4 /* 3F28C 80063E8C 46201001 */ sub.d $f0, $f2, $f0 /* 3F290 80063E90 4620100D */ trunc.w.d $f0, $f2 /* 3F294 80063E94 44030000 */ mfc1 $v1, $f0 -/* 3F298 80063E98 00000000 */ nop +/* 3F298 80063E98 00000000 */ nop /* 3F29C 80063E9C 08018FAE */ j .L80063EB8 /* 3F2A0 80063EA0 00601021 */ addu $v0, $v1, $zero .L80063EA4: @@ -122,5 +122,5 @@ glabel guPerspective /* 3F2FC 80063EFC D7B40060 */ ldc1 $f20, 0x60($sp) /* 3F300 80063F00 03E00008 */ jr $ra /* 3F304 80063F04 27BD0088 */ addiu $sp, $sp, 0x88 -/* 3F308 80063F08 00000000 */ nop -/* 3F30C 80063F0C 00000000 */ nop +/* 3F308 80063F08 00000000 */ nop +/* 3F30C 80063F0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s b/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s index 6e9ce63a51..471d0f75bc 100644 --- a/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s +++ b/asm/nonmatchings/os/code_3ef90_len_600/guPerspectiveF.s @@ -66,14 +66,14 @@ glabel guPerspectiveF /* 3F07C 80063C7C 1440FFF4 */ bnez $v0, .L80063C50 /* 3F080 80063C80 26100010 */ addiu $s0, $s0, 0x10 /* 3F084 80063C84 12200023 */ beqz $s1, .L80063D14 -/* 3F088 80063C88 00000000 */ nop +/* 3F088 80063C88 00000000 */ nop /* 3F08C 80063C8C 461CD080 */ add.s $f2, $f26, $f28 /* 3F090 80063C90 3C01800A */ lui $at, %hi(D_80099BB8) /* 3F094 80063C94 D4209BB8 */ ldc1 $f0, %lo(D_80099BB8)($at) /* 3F098 80063C98 460010A1 */ cvt.d.s $f2, $f2 /* 3F09C 80063C9C 4620103E */ c.le.d $f2, $f0 -/* 3F0A0 80063CA0 00000000 */ nop -/* 3F0A4 80063CA4 00000000 */ nop +/* 3F0A0 80063CA0 00000000 */ nop +/* 3F0A4 80063CA4 00000000 */ nop /* 3F0A8 80063CA8 45010019 */ bc1t .L80063D10 /* 3F0AC 80063CAC 3402FFFF */ ori $v0, $zero, 0xffff /* 3F0B0 80063CB0 3C01800A */ lui $at, %hi(D_80099BC0) @@ -82,13 +82,13 @@ glabel guPerspectiveF /* 3F0BC 80063CBC 3C01800A */ lui $at, %hi(D_80099BC8) /* 3F0C0 80063CC0 D4209BC8 */ ldc1 $f0, %lo(D_80099BC8)($at) /* 3F0C4 80063CC4 4622003E */ c.le.d $f0, $f2 -/* 3F0C8 80063CC8 00000000 */ nop -/* 3F0CC 80063CCC 00000000 */ nop +/* 3F0C8 80063CC8 00000000 */ nop +/* 3F0CC 80063CCC 00000000 */ nop /* 3F0D0 80063CD0 45030006 */ bc1tl .L80063CEC /* 3F0D4 80063CD4 46201001 */ sub.d $f0, $f2, $f0 /* 3F0D8 80063CD8 4620100D */ trunc.w.d $f0, $f2 /* 3F0DC 80063CDC 44030000 */ mfc1 $v1, $f0 -/* 3F0E0 80063CE0 00000000 */ nop +/* 3F0E0 80063CE0 00000000 */ nop /* 3F0E4 80063CE4 08018F40 */ j .L80063D00 /* 3F0E8 80063CE8 00601021 */ addu $v0, $v1, $zero .L80063CEC: diff --git a/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s b/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s index e3a75d0467..7c4f7be210 100644 --- a/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s +++ b/asm/nonmatchings/os/code_3f310_len_3c0/guPosition.s @@ -23,7 +23,7 @@ glabel guPosition /* 3F530 80064130 F7BC0080 */ sdc1 $f28, 0x80($sp) /* 3F534 80064134 F7B60068 */ sdc1 $f22, 0x68($sp) /* 3F538 80064138 44109000 */ mfc1 $s0, $f18 -/* 3F53C 8006413C 00000000 */ nop +/* 3F53C 8006413C 00000000 */ nop /* 3F540 80064140 0C00A85B */ jal sin_rad /* 3F544 80064144 4600A306 */ mov.s $f12, $f20 /* 3F548 80064148 4600A306 */ mov.s $f12, $f20 @@ -36,50 +36,50 @@ glabel guPosition /* 3F564 80064164 0C00A874 */ jal cos_rad /* 3F568 80064168 46000506 */ mov.s $f20, $f0 /* 3F56C 8006416C 44906000 */ mtc1 $s0, $f12 -/* 3F570 80064170 00000000 */ nop +/* 3F570 80064170 00000000 */ nop /* 3F574 80064174 0C00A85B */ jal sin_rad /* 3F578 80064178 46000706 */ mov.s $f28, $f0 /* 3F57C 8006417C 44906000 */ mtc1 $s0, $f12 -/* 3F580 80064180 00000000 */ nop +/* 3F580 80064180 00000000 */ nop /* 3F584 80064184 0C00A874 */ jal cos_rad /* 3F588 80064188 46000686 */ mov.s $f26, $f0 -/* 3F58C 8006418C 00000000 */ nop +/* 3F58C 8006418C 00000000 */ nop /* 3F590 80064190 4600E382 */ mul.s $f14, $f28, $f0 -/* 3F594 80064194 00000000 */ nop +/* 3F594 80064194 00000000 */ nop /* 3F598 80064198 461AE402 */ mul.s $f16, $f28, $f26 -/* 3F59C 8006419C 00000000 */ nop +/* 3F59C 8006419C 00000000 */ nop /* 3F5A0 800641A0 4614F102 */ mul.s $f4, $f30, $f20 -/* 3F5A4 800641A4 00000000 */ nop +/* 3F5A4 800641A4 00000000 */ nop /* 3F5A8 800641A8 461AB082 */ mul.s $f2, $f22, $f26 -/* 3F5AC 800641AC 00000000 */ nop +/* 3F5AC 800641AC 00000000 */ nop /* 3F5B0 800641B0 4600B182 */ mul.s $f6, $f22, $f0 /* 3F5B4 800641B4 4600A307 */ neg.s $f12, $f20 /* 3F5B8 800641B8 4614B502 */ mul.s $f20, $f22, $f20 -/* 3F5BC 800641BC 00000000 */ nop +/* 3F5BC 800641BC 00000000 */ nop /* 3F5C0 800641C0 461CF282 */ mul.s $f10, $f30, $f28 -/* 3F5C4 800641C4 00000000 */ nop +/* 3F5C4 800641C4 00000000 */ nop /* 3F5C8 800641C8 461CB582 */ mul.s $f22, $f22, $f28 -/* 3F5CC 800641CC 00000000 */ nop +/* 3F5CC 800641CC 00000000 */ nop /* 3F5D0 800641D0 46186302 */ mul.s $f12, $f12, $f24 -/* 3F5D4 800641D4 00000000 */ nop +/* 3F5D4 800641D4 00000000 */ nop /* 3F5D8 800641D8 46187382 */ mul.s $f14, $f14, $f24 -/* 3F5DC 800641DC 00000000 */ nop +/* 3F5DC 800641DC 00000000 */ nop /* 3F5E0 800641E0 46188402 */ mul.s $f16, $f16, $f24 -/* 3F5E4 800641E4 00000000 */ nop +/* 3F5E4 800641E4 00000000 */ nop /* 3F5E8 800641E8 46002202 */ mul.s $f8, $f4, $f0 -/* 3F5EC 800641EC 00000000 */ nop +/* 3F5EC 800641EC 00000000 */ nop /* 3F5F0 800641F0 461A2102 */ mul.s $f4, $f4, $f26 -/* 3F5F4 800641F4 00000000 */ nop +/* 3F5F4 800641F4 00000000 */ nop /* 3F5F8 800641F8 46185282 */ mul.s $f10, $f10, $f24 -/* 3F5FC 800641FC 00000000 */ nop +/* 3F5FC 800641FC 00000000 */ nop /* 3F600 80064200 4618B582 */ mul.s $f22, $f22, $f24 /* 3F604 80064204 46062100 */ add.s $f4, $f4, $f6 /* 3F608 80064208 4600A182 */ mul.s $f6, $f20, $f0 /* 3F60C 8006420C 46024201 */ sub.s $f8, $f8, $f2 /* 3F610 80064210 461AF082 */ mul.s $f2, $f30, $f26 -/* 3F614 80064214 00000000 */ nop +/* 3F614 80064214 00000000 */ nop /* 3F618 80064218 461AA502 */ mul.s $f20, $f20, $f26 -/* 3F61C 8006421C 00000000 */ nop +/* 3F61C 8006421C 00000000 */ nop /* 3F620 80064220 4600F782 */ mul.s $f30, $f30, $f0 /* 3F624 80064224 C7B200A4 */ lwc1 $f18, 0xa4($sp) /* 3F628 80064228 46184202 */ mul.s $f8, $f8, $f24 @@ -122,5 +122,5 @@ glabel guPosition /* 3F6BC 800642BC D7B40060 */ ldc1 $f20, 0x60($sp) /* 3F6C0 800642C0 03E00008 */ jr $ra /* 3F6C4 800642C4 27BD0090 */ addiu $sp, $sp, 0x90 -/* 3F6C8 800642C8 00000000 */ nop -/* 3F6CC 800642CC 00000000 */ nop +/* 3F6C8 800642C8 00000000 */ nop +/* 3F6CC 800642CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s b/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s index 846394418d..c24d8cfe71 100644 --- a/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s +++ b/asm/nonmatchings/os/code_3f310_len_3c0/guPositionF.s @@ -25,7 +25,7 @@ glabel guPositionF /* 3F360 80063F60 0C00A85B */ jal sin_rad /* 3F364 80063F64 4600A306 */ mov.s $f12, $f20 /* 3F368 80063F68 44110000 */ mfc1 $s1, $f0 -/* 3F36C 80063F6C 00000000 */ nop +/* 3F36C 80063F6C 00000000 */ nop /* 3F370 80063F70 0C00A874 */ jal cos_rad /* 3F374 80063F74 4600A306 */ mov.s $f12, $f20 /* 3F378 80063F78 46000686 */ mov.s $f26, $f0 @@ -40,44 +40,44 @@ glabel guPositionF /* 3F39C 80063F9C 4600C306 */ mov.s $f12, $f24 /* 3F3A0 80063FA0 0C00A874 */ jal cos_rad /* 3F3A4 80063FA4 46000586 */ mov.s $f22, $f0 -/* 3F3A8 80063FA8 00000000 */ nop +/* 3F3A8 80063FA8 00000000 */ nop /* 3F3AC 80063FAC 4600F382 */ mul.s $f14, $f30, $f0 -/* 3F3B0 80063FB0 00000000 */ nop +/* 3F3B0 80063FB0 00000000 */ nop /* 3F3B4 80063FB4 4616F402 */ mul.s $f16, $f30, $f22 -/* 3F3B8 80063FB8 00000000 */ nop +/* 3F3B8 80063FB8 00000000 */ nop /* 3F3BC 80063FBC 4616D082 */ mul.s $f2, $f26, $f22 -/* 3F3C0 80063FC0 00000000 */ nop +/* 3F3C0 80063FC0 00000000 */ nop /* 3F3C4 80063FC4 4600D182 */ mul.s $f6, $f26, $f0 /* 3F3C8 80063FC8 44919000 */ mtc1 $s1, $f18 -/* 3F3CC 80063FCC 00000000 */ nop +/* 3F3CC 80063FCC 00000000 */ nop /* 3F3D0 80063FD0 46149102 */ mul.s $f4, $f18, $f20 /* 3F3D4 80063FD4 4600A307 */ neg.s $f12, $f20 /* 3F3D8 80063FD8 461C6302 */ mul.s $f12, $f12, $f28 -/* 3F3DC 80063FDC 00000000 */ nop +/* 3F3DC 80063FDC 00000000 */ nop /* 3F3E0 80063FE0 4614D502 */ mul.s $f20, $f26, $f20 -/* 3F3E4 80063FE4 00000000 */ nop +/* 3F3E4 80063FE4 00000000 */ nop /* 3F3E8 80063FE8 461E9282 */ mul.s $f10, $f18, $f30 -/* 3F3EC 80063FEC 00000000 */ nop +/* 3F3EC 80063FEC 00000000 */ nop /* 3F3F0 80063FF0 461ED682 */ mul.s $f26, $f26, $f30 -/* 3F3F4 80063FF4 00000000 */ nop +/* 3F3F4 80063FF4 00000000 */ nop /* 3F3F8 80063FF8 461C7382 */ mul.s $f14, $f14, $f28 -/* 3F3FC 80063FFC 00000000 */ nop +/* 3F3FC 80063FFC 00000000 */ nop /* 3F400 80064000 461C8402 */ mul.s $f16, $f16, $f28 -/* 3F404 80064004 00000000 */ nop +/* 3F404 80064004 00000000 */ nop /* 3F408 80064008 46002202 */ mul.s $f8, $f4, $f0 -/* 3F40C 8006400C 00000000 */ nop +/* 3F40C 8006400C 00000000 */ nop /* 3F410 80064010 46162102 */ mul.s $f4, $f4, $f22 -/* 3F414 80064014 00000000 */ nop +/* 3F414 80064014 00000000 */ nop /* 3F418 80064018 461C5282 */ mul.s $f10, $f10, $f28 -/* 3F41C 8006401C 00000000 */ nop +/* 3F41C 8006401C 00000000 */ nop /* 3F420 80064020 461CD682 */ mul.s $f26, $f26, $f28 /* 3F424 80064024 46062100 */ add.s $f4, $f4, $f6 /* 3F428 80064028 4600A182 */ mul.s $f6, $f20, $f0 /* 3F42C 8006402C 46024201 */ sub.s $f8, $f8, $f2 /* 3F430 80064030 46169082 */ mul.s $f2, $f18, $f22 -/* 3F434 80064034 00000000 */ nop +/* 3F434 80064034 00000000 */ nop /* 3F438 80064038 4616A502 */ mul.s $f20, $f20, $f22 -/* 3F43C 8006403C 00000000 */ nop +/* 3F43C 8006403C 00000000 */ nop /* 3F440 80064040 46009482 */ mul.s $f18, $f18, $f0 /* 3F444 80064044 3C013F80 */ lui $at, 0x3f80 /* 3F448 80064048 44810000 */ mtc1 $at, $f0 @@ -96,7 +96,7 @@ glabel guPositionF /* 3F47C 8006407C 461C3182 */ mul.s $f6, $f6, $f28 /* 3F480 80064080 E6120038 */ swc1 $f18, 0x38($s0) /* 3F484 80064084 44919000 */ mtc1 $s1, $f18 -/* 3F488 80064088 00000000 */ nop +/* 3F488 80064088 00000000 */ nop /* 3F48C 8006408C 4612A501 */ sub.s $f20, $f20, $f18 /* 3F490 80064090 E600003C */ swc1 $f0, 0x3c($s0) /* 3F494 80064094 E60C0008 */ swc1 $f12, 8($s0) diff --git a/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s b/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s index 10119ebbc4..24176b0ea0 100644 --- a/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s +++ b/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAngles.s @@ -22,7 +22,7 @@ glabel guRotateAngles /* 3F89C 8006449C F7BA0080 */ sdc1 $f26, 0x80($sp) /* 3F8A0 800644A0 F7B80078 */ sdc1 $f24, 0x78($sp) /* 3F8A4 800644A4 44104000 */ mfc1 $s0, $f8 -/* 3F8A8 800644A8 00000000 */ nop +/* 3F8A8 800644A8 00000000 */ nop /* 3F8AC 800644AC 0C00A85B */ jal sin_rad /* 3F8B0 800644B0 4600A306 */ mov.s $f12, $f20 /* 3F8B4 800644B4 4600A306 */ mov.s $f12, $f20 @@ -35,42 +35,42 @@ glabel guRotateAngles /* 3F8D0 800644D0 0C00A874 */ jal cos_rad /* 3F8D4 800644D4 46000686 */ mov.s $f26, $f0 /* 3F8D8 800644D8 44906000 */ mtc1 $s0, $f12 -/* 3F8DC 800644DC 00000000 */ nop +/* 3F8DC 800644DC 00000000 */ nop /* 3F8E0 800644E0 0C00A85B */ jal sin_rad /* 3F8E4 800644E4 46000606 */ mov.s $f24, $f0 /* 3F8E8 800644E8 44906000 */ mtc1 $s0, $f12 -/* 3F8EC 800644EC 00000000 */ nop +/* 3F8EC 800644EC 00000000 */ nop /* 3F8F0 800644F0 0C00A874 */ jal cos_rad /* 3F8F4 800644F4 46000506 */ mov.s $f20, $f0 /* 3F8F8 800644F8 27B00010 */ addiu $s0, $sp, 0x10 /* 3F8FC 800644FC 02002021 */ addu $a0, $s0, $zero /* 3F900 80064500 0C019D28 */ jal guMtxIdentF /* 3F904 80064504 46000586 */ mov.s $f22, $f0 -/* 3F908 80064508 00000000 */ nop +/* 3F908 80064508 00000000 */ nop /* 3F90C 8006450C 4616C402 */ mul.s $f16, $f24, $f22 -/* 3F910 80064510 00000000 */ nop +/* 3F910 80064510 00000000 */ nop /* 3F914 80064514 461AF082 */ mul.s $f2, $f30, $f26 -/* 3F918 80064518 00000000 */ nop +/* 3F918 80064518 00000000 */ nop /* 3F91C 8006451C 4614C482 */ mul.s $f18, $f24, $f20 -/* 3F920 80064520 00000000 */ nop +/* 3F920 80064520 00000000 */ nop /* 3F924 80064524 4614E202 */ mul.s $f8, $f28, $f20 -/* 3F928 80064528 00000000 */ nop +/* 3F928 80064528 00000000 */ nop /* 3F92C 8006452C 4616E282 */ mul.s $f10, $f28, $f22 -/* 3F930 80064530 00000000 */ nop +/* 3F930 80064530 00000000 */ nop /* 3F934 80064534 461AE002 */ mul.s $f0, $f28, $f26 -/* 3F938 80064538 00000000 */ nop +/* 3F938 80064538 00000000 */ nop /* 3F93C 8006453C 4618F382 */ mul.s $f14, $f30, $f24 -/* 3F940 80064540 00000000 */ nop +/* 3F940 80064540 00000000 */ nop /* 3F944 80064544 4614F302 */ mul.s $f12, $f30, $f20 -/* 3F948 80064548 00000000 */ nop +/* 3F948 80064548 00000000 */ nop /* 3F94C 8006454C 4618E702 */ mul.s $f28, $f28, $f24 -/* 3F950 80064550 00000000 */ nop +/* 3F950 80064550 00000000 */ nop /* 3F954 80064554 4616F782 */ mul.s $f30, $f30, $f22 -/* 3F958 80064558 00000000 */ nop +/* 3F958 80064558 00000000 */ nop /* 3F95C 8006455C 46161182 */ mul.s $f6, $f2, $f22 -/* 3F960 80064560 00000000 */ nop +/* 3F960 80064560 00000000 */ nop /* 3F964 80064564 46141082 */ mul.s $f2, $f2, $f20 -/* 3F968 80064568 00000000 */ nop +/* 3F968 80064568 00000000 */ nop /* 3F96C 8006456C 46160102 */ mul.s $f4, $f0, $f22 /* 3F970 80064570 46083181 */ sub.s $f6, $f6, $f8 /* 3F974 80064574 02002021 */ addu $a0, $s0, $zero @@ -101,6 +101,6 @@ glabel guRotateAngles /* 3F9D8 800645D8 D7B40068 */ ldc1 $f20, 0x68($sp) /* 3F9DC 800645DC 03E00008 */ jr $ra /* 3F9E0 800645E0 27BD0098 */ addiu $sp, $sp, 0x98 -/* 3F9E4 800645E4 00000000 */ nop -/* 3F9E8 800645E8 00000000 */ nop -/* 3F9EC 800645EC 00000000 */ nop +/* 3F9E4 800645E4 00000000 */ nop +/* 3F9E8 800645E8 00000000 */ nop +/* 3F9EC 800645EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s b/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s index ba7e220a98..b14e238b72 100644 --- a/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s +++ b/asm/nonmatchings/os/code_3f6d0_len_320/guRotateAnglesF.s @@ -24,7 +24,7 @@ glabel guRotateAnglesF /* 3F71C 8006431C 0C00A85B */ jal sin_rad /* 3F720 80064320 4600A306 */ mov.s $f12, $f20 /* 3F724 80064324 44110000 */ mfc1 $s1, $f0 -/* 3F728 80064328 00000000 */ nop +/* 3F728 80064328 00000000 */ nop /* 3F72C 8006432C 0C00A874 */ jal cos_rad /* 3F730 80064330 4600A306 */ mov.s $f12, $f20 /* 3F734 80064334 46000786 */ mov.s $f30, $f0 @@ -42,37 +42,37 @@ glabel guRotateAnglesF /* 3F764 80064364 46000586 */ mov.s $f22, $f0 /* 3F768 80064368 0C019D28 */ jal guMtxIdentF /* 3F76C 8006436C 02002021 */ addu $a0, $s0, $zero -/* 3F770 80064370 00000000 */ nop +/* 3F770 80064370 00000000 */ nop /* 3F774 80064374 4616D402 */ mul.s $f16, $f26, $f22 -/* 3F778 80064378 00000000 */ nop +/* 3F778 80064378 00000000 */ nop /* 3F77C 8006437C 4614D482 */ mul.s $f18, $f26, $f20 -/* 3F780 80064380 00000000 */ nop +/* 3F780 80064380 00000000 */ nop /* 3F784 80064384 4616F282 */ mul.s $f10, $f30, $f22 -/* 3F788 80064388 00000000 */ nop +/* 3F788 80064388 00000000 */ nop /* 3F78C 8006438C 461CF002 */ mul.s $f0, $f30, $f28 /* 3F790 80064390 44914000 */ mtc1 $s1, $f8 -/* 3F794 80064394 00000000 */ nop +/* 3F794 80064394 00000000 */ nop /* 3F798 80064398 461C4082 */ mul.s $f2, $f8, $f28 -/* 3F79C 8006439C 00000000 */ nop +/* 3F79C 8006439C 00000000 */ nop /* 3F7A0 800643A0 4614F202 */ mul.s $f8, $f30, $f20 -/* 3F7A4 800643A4 00000000 */ nop +/* 3F7A4 800643A4 00000000 */ nop /* 3F7A8 800643A8 461AF782 */ mul.s $f30, $f30, $f26 -/* 3F7AC 800643AC 00000000 */ nop +/* 3F7AC 800643AC 00000000 */ nop /* 3F7B0 800643B0 46160102 */ mul.s $f4, $f0, $f22 -/* 3F7B4 800643B4 00000000 */ nop +/* 3F7B4 800643B4 00000000 */ nop /* 3F7B8 800643B8 46161182 */ mul.s $f6, $f2, $f22 -/* 3F7BC 800643BC 00000000 */ nop +/* 3F7BC 800643BC 00000000 */ nop /* 3F7C0 800643C0 46141082 */ mul.s $f2, $f2, $f20 /* 3F7C4 800643C4 E7A80014 */ swc1 $f8, 0x14($sp) /* 3F7C8 800643C8 44914000 */ mtc1 $s1, $f8 -/* 3F7CC 800643CC 00000000 */ nop +/* 3F7CC 800643CC 00000000 */ nop /* 3F7D0 800643D0 461A4382 */ mul.s $f14, $f8, $f26 -/* 3F7D4 800643D4 00000000 */ nop +/* 3F7D4 800643D4 00000000 */ nop /* 3F7D8 800643D8 46144302 */ mul.s $f12, $f8, $f20 /* 3F7DC 800643DC C7A80014 */ lwc1 $f8, 0x14($sp) /* 3F7E0 800643E0 46083181 */ sub.s $f6, $f6, $f8 /* 3F7E4 800643E4 44914000 */ mtc1 $s1, $f8 -/* 3F7E8 800643E8 00000000 */ nop +/* 3F7E8 800643E8 00000000 */ nop /* 3F7EC 800643EC 46164202 */ mul.s $f8, $f8, $f22 /* 3F7F0 800643F0 4600E707 */ neg.s $f28, $f28 /* 3F7F4 800643F4 46140002 */ mul.s $f0, $f0, $f20 diff --git a/asm/nonmatchings/os/code_3f9f0_len_60/sins.s b/asm/nonmatchings/os/code_3f9f0_len_60/sins.s index 6b264d11c0..6cd5294649 100644 --- a/asm/nonmatchings/os/code_3f9f0_len_60/sins.s +++ b/asm/nonmatchings/os/code_3f9f0_len_60/sins.s @@ -27,6 +27,6 @@ glabel sins .L8006463C: /* 3FA3C 8006463C 03E00008 */ jr $ra /* 3FA40 80064640 00021403 */ sra $v0, $v0, 0x10 -/* 3FA44 80064644 00000000 */ nop -/* 3FA48 80064648 00000000 */ nop -/* 3FA4C 8006464C 00000000 */ nop +/* 3FA44 80064644 00000000 */ nop +/* 3FA48 80064648 00000000 */ nop +/* 3FA4C 8006464C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/_Printf.s b/asm/nonmatchings/os/code_3fa50_len_f60/_Printf.s index b3bc7e45d4..f9f21325b4 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/_Printf.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/_Printf.s @@ -39,7 +39,7 @@ glabel _Printf /* 3FF1C 80064B1C 02003021 */ addu $a2, $s0, $zero /* 3FF20 80064B20 00409821 */ addu $s3, $v0, $zero /* 3FF24 80064B24 12600134 */ beqz $s3, .L80064FF8 -/* 3FF28 80064B28 00000000 */ nop +/* 3FF28 80064B28 00000000 */ nop /* 3FF2C 80064B2C 8FA2003C */ lw $v0, 0x3c($sp) /* 3FF30 80064B30 00501021 */ addu $v0, $v0, $s0 /* 3FF34 80064B34 AFA2003C */ sw $v0, 0x3c($sp) @@ -109,7 +109,7 @@ glabel _Printf /* 40018 80064C18 2442FFD0 */ addiu $v0, $v0, -0x30 /* 4001C 80064C1C 2C42000A */ sltiu $v0, $v0, 0xa /* 40020 80064C20 1440FFF0 */ bnez $v0, .L80064BE4 -/* 40024 80064C24 00000000 */ nop +/* 40024 80064C24 00000000 */ nop .L80064C28: /* 40028 80064C28 82430000 */ lb $v1, ($s2) /* 4002C 80064C2C 2402002E */ addiu $v0, $zero, 0x2e @@ -157,7 +157,7 @@ glabel _Printf /* 400C4 80064CC4 2442FFD0 */ addiu $v0, $v0, -0x30 /* 400C8 80064CC8 2C42000A */ sltiu $v0, $v0, 0xa /* 400CC 80064CCC 1440FFF0 */ bnez $v0, .L80064C90 -/* 400D0 80064CD0 00000000 */ nop +/* 400D0 80064CD0 00000000 */ nop .L80064CD4: /* 400D4 80064CD4 82450000 */ lb $a1, ($s2) /* 400D8 80064CD8 3C04800A */ lui $a0, %hi(D_80099C10) @@ -206,7 +206,7 @@ glabel _Printf /* 40178 80064D78 14400017 */ bnez $v0, .L80064DD8 /* 4017C 80064D7C AFA50038 */ sw $a1, 0x38($sp) /* 40180 80064D80 18A00015 */ blez $a1, .L80064DD8 -/* 40184 80064D84 00000000 */ nop +/* 40184 80064D84 00000000 */ nop /* 40188 80064D88 00A08821 */ addu $s1, $a1, $zero /* 4018C 80064D8C 2E220021 */ sltiu $v0, $s1, 0x21 .L80064D90: @@ -238,7 +238,7 @@ glabel _Printf /* 401E8 80064DE8 27A50048 */ addiu $a1, $sp, 0x48 /* 401EC 80064DEC 00409821 */ addu $s3, $v0, $zero /* 401F0 80064DF0 12600081 */ beqz $s3, .L80064FF8 -/* 401F4 80064DF4 00000000 */ nop +/* 401F4 80064DF4 00000000 */ nop /* 401F8 80064DF8 8FA2003C */ lw $v0, 0x3c($sp) /* 401FC 80064DFC 8FA3001C */ lw $v1, 0x1c($sp) /* 40200 80064E00 00431021 */ addu $v0, $v0, $v1 @@ -246,7 +246,7 @@ glabel _Printf .L80064E08: /* 40208 80064E08 8FA20020 */ lw $v0, 0x20($sp) /* 4020C 80064E0C 18400015 */ blez $v0, .L80064E64 -/* 40210 80064E10 00000000 */ nop +/* 40210 80064E10 00000000 */ nop /* 40214 80064E14 00408821 */ addu $s1, $v0, $zero /* 40218 80064E18 2E220021 */ sltiu $v0, $s1, 0x21 .L80064E1C: @@ -273,13 +273,13 @@ glabel _Printf .L80064E64: /* 40264 80064E64 8FA60024 */ lw $a2, 0x24($sp) /* 40268 80064E68 18C0000B */ blez $a2, .L80064E98 -/* 4026C 80064E6C 00000000 */ nop +/* 4026C 80064E6C 00000000 */ nop /* 40270 80064E70 8FA50018 */ lw $a1, 0x18($sp) /* 40274 80064E74 0280F809 */ jalr $s4 /* 40278 80064E78 02602021 */ addu $a0, $s3, $zero /* 4027C 80064E7C 00409821 */ addu $s3, $v0, $zero /* 40280 80064E80 1260005D */ beqz $s3, .L80064FF8 -/* 40284 80064E84 00000000 */ nop +/* 40284 80064E84 00000000 */ nop /* 40288 80064E88 8FA2003C */ lw $v0, 0x3c($sp) /* 4028C 80064E8C 8FA30024 */ lw $v1, 0x24($sp) /* 40290 80064E90 00431021 */ addu $v0, $v0, $v1 @@ -287,7 +287,7 @@ glabel _Printf .L80064E98: /* 40298 80064E98 8FA20028 */ lw $v0, 0x28($sp) /* 4029C 80064E9C 18400015 */ blez $v0, .L80064EF4 -/* 402A0 80064EA0 00000000 */ nop +/* 402A0 80064EA0 00000000 */ nop /* 402A4 80064EA4 00408821 */ addu $s1, $v0, $zero /* 402A8 80064EA8 2E220021 */ sltiu $v0, $s1, 0x21 .L80064EAC: @@ -321,7 +321,7 @@ glabel _Printf /* 4030C 80064F0C 00452821 */ addu $a1, $v0, $a1 /* 40310 80064F10 00409821 */ addu $s3, $v0, $zero /* 40314 80064F14 12600038 */ beqz $s3, .L80064FF8 -/* 40318 80064F18 00000000 */ nop +/* 40318 80064F18 00000000 */ nop /* 4031C 80064F1C 8FA2003C */ lw $v0, 0x3c($sp) /* 40320 80064F20 8FA3002C */ lw $v1, 0x2c($sp) /* 40324 80064F24 00431021 */ addu $v0, $v0, $v1 @@ -329,7 +329,7 @@ glabel _Printf .L80064F2C: /* 4032C 80064F2C 8FA20030 */ lw $v0, 0x30($sp) /* 40330 80064F30 18400015 */ blez $v0, .L80064F88 -/* 40334 80064F34 00000000 */ nop +/* 40334 80064F34 00000000 */ nop /* 40338 80064F38 00408821 */ addu $s1, $v0, $zero /* 4033C 80064F3C 2E220021 */ sltiu $v0, $s1, 0x21 .L80064F40: diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s b/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s index 91f33d4363..2e942e7f52 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/_Putfld.s @@ -25,7 +25,7 @@ glabel _Putfld /* 40470 80065070 00220821 */ addu $at, $at, $v0 /* 40474 80065074 8C229C18 */ lw $v0, %lo(D_80099C18)($at) /* 40478 80065078 00400008 */ jr $v0 -/* 4047C 8006507C 00000000 */ nop +/* 4047C 8006507C 00000000 */ nop /* 40480 80065080 8E04000C */ lw $a0, 0xc($s0) /* 40484 80065084 24820001 */ addiu $v0, $a0, 1 /* 40488 80065088 AE02000C */ sw $v0, 0xc($s0) @@ -69,7 +69,7 @@ glabel _Putfld /* 40518 80065118 82030034 */ lb $v1, 0x34($s0) /* 4051C 8006511C 24020068 */ addiu $v0, $zero, 0x68 /* 40520 80065120 14620008 */ bne $v1, $v0, .L80065144 -/* 40524 80065124 00000000 */ nop +/* 40524 80065124 00000000 */ nop /* 40528 80065128 8E020000 */ lw $v0, ($s0) /* 4052C 8006512C 8E030004 */ lw $v1, 4($s0) /* 40530 80065130 00031400 */ sll $v0, $v1, 0x10 @@ -80,7 +80,7 @@ glabel _Putfld .L80065144: /* 40544 80065144 8E020000 */ lw $v0, ($s0) /* 40548 80065148 04410007 */ bgez $v0, .L80065168 -/* 4054C 8006514C 00000000 */ nop +/* 4054C 8006514C 00000000 */ nop /* 40550 80065150 8E02000C */ lw $v0, 0xc($s0) /* 40554 80065154 24430001 */ addiu $v1, $v0, 1 /* 40558 80065158 01221021 */ addu $v0, $t1, $v0 @@ -142,10 +142,10 @@ glabel _Putfld /* 40624 80065224 00001021 */ addu $v0, $zero, $zero /* 40628 80065228 96030006 */ lhu $v1, 6($s0) /* 4062C 8006522C 08019490 */ j .L80065240 -/* 40630 80065230 00000000 */ nop +/* 40630 80065230 00000000 */ nop .L80065234: /* 40634 80065234 14600004 */ bnez $v1, .L80065248 -/* 40638 80065238 00000000 */ nop +/* 40638 80065238 00000000 */ nop /* 4063C 8006523C 8E030004 */ lw $v1, 4($s0) .L80065240: /* 40640 80065240 AE020000 */ sw $v0, ($s0) @@ -169,7 +169,7 @@ glabel _Putfld /* 40684 80065284 2C420001 */ sltiu $v0, $v0, 1 /* 40688 80065288 00621825 */ or $v1, $v1, $v0 /* 4068C 8006528C 10600007 */ beqz $v1, .L800652AC -/* 40690 80065290 00000000 */ nop +/* 40690 80065290 00000000 */ nop /* 40694 80065294 8E02000C */ lw $v0, 0xc($s0) /* 40698 80065298 24430001 */ addiu $v1, $v0, 1 /* 4069C 8006529C 01221021 */ addu $v0, $t1, $v0 @@ -185,7 +185,7 @@ glabel _Putfld /* 406BC 800652BC 0C01AE60 */ jal _Litob /* 406C0 800652C0 AC820008 */ sw $v0, 8($a0) /* 406C4 800652C4 08019538 */ j .L800654E0 -/* 406C8 800652C8 00000000 */ nop +/* 406C8 800652C8 00000000 */ nop /* 406CC 800652CC 8D020000 */ lw $v0, ($t0) /* 406D0 800652D0 2403FFF8 */ addiu $v1, $zero, -8 /* 406D4 800652D4 24420007 */ addiu $v0, $v0, 7 @@ -197,7 +197,7 @@ glabel _Putfld /* 406EC 800652EC 96020000 */ lhu $v0, ($s0) /* 406F0 800652F0 30428000 */ andi $v0, $v0, 0x8000 /* 406F4 800652F4 10400007 */ beqz $v0, .L80065314 -/* 406F8 800652F8 00000000 */ nop +/* 406F8 800652F8 00000000 */ nop /* 406FC 800652FC 8E02000C */ lw $v0, 0xc($s0) /* 40700 80065300 24430001 */ addiu $v1, $v0, 1 /* 40704 80065304 01221021 */ addu $v0, $t1, $v0 @@ -234,7 +234,7 @@ glabel _Putfld /* 40770 80065370 0C01AEF4 */ jal _Ldtob /* 40774 80065374 AC820008 */ sw $v0, 8($a0) /* 40778 80065378 08019538 */ j .L800654E0 -/* 4077C 8006537C 00000000 */ nop +/* 4077C 8006537C 00000000 */ nop /* 40780 80065380 82030034 */ lb $v1, 0x34($s0) /* 40784 80065384 24020068 */ addiu $v0, $zero, 0x68 /* 40788 80065388 1462000B */ bne $v1, $v0, .L800653B8 @@ -295,7 +295,7 @@ glabel _Putfld /* 4085C 8006545C 0C01AE60 */ jal _Litob /* 40860 80065460 AC860008 */ sw $a2, 8($a0) /* 40864 80065464 08019538 */ j .L800654E0 -/* 40868 80065468 00000000 */ nop +/* 40868 80065468 00000000 */ nop /* 4086C 8006546C 8D020000 */ lw $v0, ($t0) /* 40870 80065470 2403FFFC */ addiu $v1, $zero, -4 /* 40874 80065474 24420003 */ addiu $v0, $v0, 3 @@ -312,7 +312,7 @@ glabel _Putfld /* 408A0 800654A0 5440000F */ bnel $v0, $zero, .L800654E0 /* 408A4 800654A4 AE030014 */ sw $v1, 0x14($s0) /* 408A8 800654A8 08019538 */ j .L800654E0 -/* 408AC 800654AC 00000000 */ nop +/* 408AC 800654AC 00000000 */ nop /* 408B0 800654B0 8E02000C */ lw $v0, 0xc($s0) /* 408B4 800654B4 24430001 */ addiu $v1, $v0, 1 /* 408B8 800654B8 01221021 */ addu $v0, $t1, $v0 diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s b/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s index 8549ebed90..2dfbd264ac 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/bcopy.s @@ -5,27 +5,27 @@ glabel bcopy /* 3FA50 80064650 10C0001B */ beqz $a2, .L800646C0 /* 3FA54 80064654 00A03821 */ addu $a3, $a1, $zero /* 3FA58 80064658 10850019 */ beq $a0, $a1, .L800646C0 -/* 3FA5C 8006465C 00000000 */ nop +/* 3FA5C 8006465C 00000000 */ nop /* 3FA60 80064660 00A4082A */ slt $at, $a1, $a0 /* 3FA64 80064664 14200007 */ bnez $at, .L80064684 -/* 3FA68 80064668 00000000 */ nop +/* 3FA68 80064668 00000000 */ nop /* 3FA6C 8006466C 00861020 */ add $v0, $a0, $a2 /* 3FA70 80064670 00A2082A */ slt $at, $a1, $v0 /* 3FA74 80064674 10200003 */ beqz $at, .L80064684 -/* 3FA78 80064678 00000000 */ nop +/* 3FA78 80064678 00000000 */ nop /* 3FA7C 8006467C 1000005C */ b .L800647F0 -/* 3FA80 80064680 00000000 */ nop +/* 3FA80 80064680 00000000 */ nop .L80064684: /* 3FA84 80064684 28C10010 */ slti $at, $a2, 0x10 /* 3FA88 80064688 14200005 */ bnez $at, .L800646A0 -/* 3FA8C 8006468C 00000000 */ nop +/* 3FA8C 8006468C 00000000 */ nop /* 3FA90 80064690 30820003 */ andi $v0, $a0, 3 /* 3FA94 80064694 30A30003 */ andi $v1, $a1, 3 /* 3FA98 80064698 1043000B */ beq $v0, $v1, .L800646C8 -/* 3FA9C 8006469C 00000000 */ nop +/* 3FA9C 8006469C 00000000 */ nop .L800646A0: /* 3FAA0 800646A0 10C00007 */ beqz $a2, .L800646C0 -/* 3FAA4 800646A4 00000000 */ nop +/* 3FAA4 800646A4 00000000 */ nop /* 3FAA8 800646A8 00861821 */ addu $v1, $a0, $a2 .L800646AC: /* 3FAAC 800646AC 80820000 */ lb $v0, ($a0) @@ -38,13 +38,13 @@ glabel bcopy /* 3FAC4 800646C4 00E01021 */ addu $v0, $a3, $zero .L800646C8: /* 3FAC8 800646C8 1040001A */ beqz $v0, .L80064734 -/* 3FACC 800646CC 00000000 */ nop +/* 3FACC 800646CC 00000000 */ nop /* 3FAD0 800646D0 24010001 */ addiu $at, $zero, 1 /* 3FAD4 800646D4 10410010 */ beq $v0, $at, .L80064718 -/* 3FAD8 800646D8 00000000 */ nop +/* 3FAD8 800646D8 00000000 */ nop /* 3FADC 800646DC 24010002 */ addiu $at, $zero, 2 /* 3FAE0 800646E0 10410007 */ beq $v0, $at, .L80064700 -/* 3FAE4 800646E4 00000000 */ nop +/* 3FAE4 800646E4 00000000 */ nop /* 3FAE8 800646E8 80820000 */ lb $v0, ($a0) /* 3FAEC 800646EC 24840001 */ addiu $a0, $a0, 1 /* 3FAF0 800646F0 A0A20000 */ sb $v0, ($a1) @@ -69,7 +69,7 @@ glabel bcopy .L80064734: /* 3FB34 80064734 28C10020 */ slti $at, $a2, 0x20 /* 3FB38 80064738 14200015 */ bnez $at, .L80064790 -/* 3FB3C 8006473C 00000000 */ nop +/* 3FB3C 8006473C 00000000 */ nop /* 3FB40 80064740 8C820000 */ lw $v0, ($a0) /* 3FB44 80064744 8C830004 */ lw $v1, 4($a0) /* 3FB48 80064748 8C880008 */ lw $t0, 8($a0) @@ -93,7 +93,7 @@ glabel bcopy .L80064790: /* 3FB90 80064790 28C10010 */ slti $at, $a2, 0x10 /* 3FB94 80064794 1420000D */ bnez $at, .L800647CC -/* 3FB98 80064798 00000000 */ nop +/* 3FB98 80064798 00000000 */ nop /* 3FB9C 8006479C 8C820000 */ lw $v0, ($a0) /* 3FBA0 800647A0 8C830004 */ lw $v1, 4($a0) /* 3FBA4 800647A4 8C880008 */ lw $t0, 8($a0) @@ -109,7 +109,7 @@ glabel bcopy .L800647CC: /* 3FBCC 800647CC 28C10004 */ slti $at, $a2, 4 /* 3FBD0 800647D0 1420FFB3 */ bnez $at, .L800646A0 -/* 3FBD4 800647D4 00000000 */ nop +/* 3FBD4 800647D4 00000000 */ nop /* 3FBD8 800647D8 8C820000 */ lw $v0, ($a0) /* 3FBDC 800647DC 24840004 */ addiu $a0, $a0, 4 /* 3FBE0 800647E0 ACA20000 */ sw $v0, ($a1) @@ -121,14 +121,14 @@ glabel bcopy /* 3FBF4 800647F4 00A62820 */ add $a1, $a1, $a2 /* 3FBF8 800647F8 28C10010 */ slti $at, $a2, 0x10 /* 3FBFC 800647FC 14200005 */ bnez $at, .L80064814 -/* 3FC00 80064800 00000000 */ nop +/* 3FC00 80064800 00000000 */ nop /* 3FC04 80064804 30820003 */ andi $v0, $a0, 3 /* 3FC08 80064808 30A30003 */ andi $v1, $a1, 3 /* 3FC0C 8006480C 1043000D */ beq $v0, $v1, .L80064844 -/* 3FC10 80064810 00000000 */ nop +/* 3FC10 80064810 00000000 */ nop .L80064814: /* 3FC14 80064814 10C0FFAA */ beqz $a2, .L800646C0 -/* 3FC18 80064818 00000000 */ nop +/* 3FC18 80064818 00000000 */ nop /* 3FC1C 8006481C 2484FFFF */ addiu $a0, $a0, -1 /* 3FC20 80064820 24A5FFFF */ addiu $a1, $a1, -1 /* 3FC24 80064824 00861823 */ subu $v1, $a0, $a2 @@ -142,13 +142,13 @@ glabel bcopy /* 3FC40 80064840 00E01021 */ addu $v0, $a3, $zero .L80064844: /* 3FC44 80064844 1040001A */ beqz $v0, .L800648B0 -/* 3FC48 80064848 00000000 */ nop +/* 3FC48 80064848 00000000 */ nop /* 3FC4C 8006484C 24010003 */ addiu $at, $zero, 3 /* 3FC50 80064850 10410010 */ beq $v0, $at, .L80064894 -/* 3FC54 80064854 00000000 */ nop +/* 3FC54 80064854 00000000 */ nop /* 3FC58 80064858 24010002 */ addiu $at, $zero, 2 /* 3FC5C 8006485C 10410007 */ beq $v0, $at, .L8006487C -/* 3FC60 80064860 00000000 */ nop +/* 3FC60 80064860 00000000 */ nop /* 3FC64 80064864 8082FFFF */ lb $v0, -1($a0) /* 3FC68 80064868 2484FFFF */ addiu $a0, $a0, -1 /* 3FC6C 8006486C A0A2FFFF */ sb $v0, -1($a1) @@ -173,7 +173,7 @@ glabel bcopy .L800648B0: /* 3FCB0 800648B0 28C10020 */ slti $at, $a2, 0x20 /* 3FCB4 800648B4 14200015 */ bnez $at, .L8006490C -/* 3FCB8 800648B8 00000000 */ nop +/* 3FCB8 800648B8 00000000 */ nop /* 3FCBC 800648BC 8C82FFFC */ lw $v0, -4($a0) /* 3FCC0 800648C0 8C83FFF8 */ lw $v1, -8($a0) /* 3FCC4 800648C4 8C88FFF4 */ lw $t0, -0xc($a0) @@ -197,7 +197,7 @@ glabel bcopy .L8006490C: /* 3FD0C 8006490C 28C10010 */ slti $at, $a2, 0x10 /* 3FD10 80064910 1420000D */ bnez $at, .L80064948 -/* 3FD14 80064914 00000000 */ nop +/* 3FD14 80064914 00000000 */ nop /* 3FD18 80064918 8C82FFFC */ lw $v0, -4($a0) /* 3FD1C 8006491C 8C83FFF8 */ lw $v1, -8($a0) /* 3FD20 80064920 8C88FFF4 */ lw $t0, -0xc($a0) @@ -213,11 +213,11 @@ glabel bcopy .L80064948: /* 3FD48 80064948 28C10004 */ slti $at, $a2, 4 /* 3FD4C 8006494C 1420FFB1 */ bnez $at, .L80064814 -/* 3FD50 80064950 00000000 */ nop +/* 3FD50 80064950 00000000 */ nop /* 3FD54 80064954 8C82FFFC */ lw $v0, -4($a0) /* 3FD58 80064958 2484FFFC */ addiu $a0, $a0, -4 /* 3FD5C 8006495C ACA2FFFC */ sw $v0, -4($a1) /* 3FD60 80064960 24A5FFFC */ addiu $a1, $a1, -4 /* 3FD64 80064964 1000FFF8 */ b .L80064948 /* 3FD68 80064968 24C6FFFC */ addiu $a2, $a2, -4 -/* 3FD6C 8006496C 00000000 */ nop +/* 3FD6C 8006496C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s b/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s index 0a744a175c..affda4fd6b 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/bzero.s @@ -5,7 +5,7 @@ glabel bzero /* 3FD70 80064970 00041823 */ negu $v1, $a0 /* 3FD74 80064974 28A1000C */ slti $at, $a1, 0xc /* 3FD78 80064978 1420001D */ bnez $at, .L800649F0 -/* 3FD7C 8006497C 00000000 */ nop +/* 3FD7C 8006497C 00000000 */ nop /* 3FD80 80064980 30630003 */ andi $v1, $v1, 3 /* 3FD84 80064984 10600003 */ beqz $v1, .L80064994 /* 3FD88 80064988 00A32823 */ subu $a1, $a1, $v1 @@ -40,7 +40,7 @@ glabel bzero /* 3FDEC 800649EC AC80FFFC */ sw $zero, -4($a0) .L800649F0: /* 3FDF0 800649F0 18A00005 */ blez $a1, .L80064A08 -/* 3FDF4 800649F4 00000000 */ nop +/* 3FDF4 800649F4 00000000 */ nop /* 3FDF8 800649F8 00A42821 */ addu $a1, $a1, $a0 .L800649FC: /* 3FDFC 800649FC 24840001 */ addiu $a0, $a0, 1 @@ -48,4 +48,4 @@ glabel bzero /* 3FE04 80064A04 A080FFFF */ sb $zero, -1($a0) .L80064A08: /* 3FE08 80064A08 03E00008 */ jr $ra -/* 3FE0C 80064A0C 00000000 */ nop +/* 3FE0C 80064A0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s b/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s index 5d347e9824..524965ffee 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/memcpy.s @@ -14,4 +14,4 @@ glabel memcpy .L80064A94: /* 3FE94 80064A94 03E00008 */ jr $ra /* 3FE98 80064A98 00801021 */ addu $v0, $a0, $zero -/* 3FE9C 80064A9C 00000000 */ nop +/* 3FE9C 80064A9C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/osCreateMesgQueue.s b/asm/nonmatchings/os/code_3fa50_len_f60/osCreateMesgQueue.s index c7b02a7eaf..1f35b77342 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/osCreateMesgQueue.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/osCreateMesgQueue.s @@ -11,6 +11,6 @@ glabel osCreateMesgQueue /* 40998 80065598 AC860010 */ sw $a2, 0x10($a0) /* 4099C 8006559C 03E00008 */ jr $ra /* 409A0 800655A0 AC850014 */ sw $a1, 0x14($a0) -/* 409A4 800655A4 00000000 */ nop -/* 409A8 800655A8 00000000 */ nop -/* 409AC 800655AC 00000000 */ nop +/* 409A4 800655A4 00000000 */ nop +/* 409A8 800655A8 00000000 */ nop +/* 409AC 800655AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3fa50_len_f60/proutSprintf.s b/asm/nonmatchings/os/code_3fa50_len_f60/proutSprintf.s index c8a4b24da1..dfd4d9aca1 100644 --- a/asm/nonmatchings/os/code_3fa50_len_f60/proutSprintf.s +++ b/asm/nonmatchings/os/code_3fa50_len_f60/proutSprintf.s @@ -15,4 +15,4 @@ glabel proutSprintf /* 40970 80065570 8FB00010 */ lw $s0, 0x10($sp) /* 40974 80065574 03E00008 */ jr $ra /* 40978 80065578 27BD0020 */ addiu $sp, $sp, 0x20 -/* 4097C 8006557C 00000000 */ nop +/* 4097C 8006557C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s b/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s index 6a06507296..3691eab26f 100644 --- a/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s +++ b/asm/nonmatchings/os/code_409b0_len_140/osJamMesg.s @@ -37,7 +37,7 @@ glabel osJamMesg /* 40A28 80065628 8E030010 */ lw $v1, 0x10($s0) /* 40A2C 8006562C 0043102A */ slt $v0, $v0, $v1 /* 40A30 80065630 1040FFF2 */ beqz $v0, .L800655FC -/* 40A34 80065634 00000000 */ nop +/* 40A34 80065634 00000000 */ nop .L80065638: /* 40A38 80065638 8E02000C */ lw $v0, 0xc($s0) /* 40A3C 8006563C 8E030010 */ lw $v1, 0x10($s0) @@ -45,14 +45,14 @@ glabel osJamMesg /* 40A44 80065644 2442FFFF */ addiu $v0, $v0, -1 /* 40A48 80065648 0043001A */ div $zero, $v0, $v1 /* 40A4C 8006564C 14600002 */ bnez $v1, .L80065658 -/* 40A50 80065650 00000000 */ nop +/* 40A50 80065650 00000000 */ nop /* 40A54 80065654 0007000D */ break 7 .L80065658: /* 40A58 80065658 2401FFFF */ addiu $at, $zero, -1 /* 40A5C 8006565C 14610004 */ bne $v1, $at, .L80065670 /* 40A60 80065660 3C018000 */ lui $at, 0x8000 /* 40A64 80065664 14410002 */ bne $v0, $at, .L80065670 -/* 40A68 80065668 00000000 */ nop +/* 40A68 80065668 00000000 */ nop /* 40A6C 8006566C 0006000D */ break 6 .L80065670: /* 40A70 80065670 00001810 */ mfhi $v1 @@ -67,7 +67,7 @@ glabel osJamMesg /* 40A94 80065694 AE020008 */ sw $v0, 8($s0) /* 40A98 80065698 8C620000 */ lw $v0, ($v1) /* 40A9C 8006569C 10400005 */ beqz $v0, .L800656B4 -/* 40AA0 800656A0 00000000 */ nop +/* 40AA0 800656A0 00000000 */ nop /* 40AA4 800656A4 0C01AC6F */ jal osPopThread /* 40AA8 800656A8 02002021 */ addu $a0, $s0, $zero /* 40AAC 800656AC 0C019808 */ jal osStartThread @@ -86,6 +86,6 @@ glabel osJamMesg /* 40AD8 800656D8 8FB00010 */ lw $s0, 0x10($sp) /* 40ADC 800656DC 03E00008 */ jr $ra /* 40AE0 800656E0 27BD0030 */ addiu $sp, $sp, 0x30 -/* 40AE4 800656E4 00000000 */ nop -/* 40AE8 800656E8 00000000 */ nop -/* 40AEC 800656EC 00000000 */ nop +/* 40AE4 800656E4 00000000 */ nop +/* 40AE8 800656E8 00000000 */ nop +/* 40AEC 800656EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s b/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s index 1132f3bbdc..2e0b54f114 100644 --- a/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s +++ b/asm/nonmatchings/os/code_40af0_len_130/osRecvMesg.s @@ -31,10 +31,10 @@ glabel osRecvMesg /* 40B50 80065750 A4530010 */ sh $s3, 0x10($v0) /* 40B54 80065754 8E020008 */ lw $v0, 8($s0) /* 40B58 80065758 1040FFF4 */ beqz $v0, .L8006572C -/* 40B5C 8006575C 00000000 */ nop +/* 40B5C 8006575C 00000000 */ nop .L80065760: /* 40B60 80065760 12800007 */ beqz $s4, .L80065780 -/* 40B64 80065764 00000000 */ nop +/* 40B64 80065764 00000000 */ nop /* 40B68 80065768 8E02000C */ lw $v0, 0xc($s0) /* 40B6C 8006576C 8E030014 */ lw $v1, 0x14($s0) /* 40B70 80065770 00021080 */ sll $v0, $v0, 2 @@ -47,14 +47,14 @@ glabel osRecvMesg /* 40B88 80065788 24420001 */ addiu $v0, $v0, 1 /* 40B8C 8006578C 0043001A */ div $zero, $v0, $v1 /* 40B90 80065790 14600002 */ bnez $v1, .L8006579C -/* 40B94 80065794 00000000 */ nop +/* 40B94 80065794 00000000 */ nop /* 40B98 80065798 0007000D */ break 7 .L8006579C: /* 40B9C 8006579C 2401FFFF */ addiu $at, $zero, -1 /* 40BA0 800657A0 14610004 */ bne $v1, $at, .L800657B4 /* 40BA4 800657A4 3C018000 */ lui $at, 0x8000 /* 40BA8 800657A8 14410002 */ bne $v0, $at, .L800657B4 -/* 40BAC 800657AC 00000000 */ nop +/* 40BAC 800657AC 00000000 */ nop /* 40BB0 800657B0 0006000D */ break 6 .L800657B4: /* 40BB4 800657B4 00002010 */ mfhi $a0 @@ -65,7 +65,7 @@ glabel osRecvMesg /* 40BC8 800657C8 AE04000C */ sw $a0, 0xc($s0) /* 40BCC 800657CC 8C620000 */ lw $v0, ($v1) /* 40BD0 800657D0 10400005 */ beqz $v0, .L800657E8 -/* 40BD4 800657D4 00000000 */ nop +/* 40BD4 800657D4 00000000 */ nop /* 40BD8 800657D8 0C01AC6F */ jal osPopThread /* 40BDC 800657DC 26040004 */ addiu $a0, $s0, 4 /* 40BE0 800657E0 0C019808 */ jal osStartThread @@ -83,6 +83,6 @@ glabel osRecvMesg /* 40C08 80065808 8FB00010 */ lw $s0, 0x10($sp) /* 40C0C 8006580C 03E00008 */ jr $ra /* 40C10 80065810 27BD0028 */ addiu $sp, $sp, 0x28 -/* 40C14 80065814 00000000 */ nop -/* 40C18 80065818 00000000 */ nop -/* 40C1C 8006581C 00000000 */ nop +/* 40C14 80065814 00000000 */ nop +/* 40C18 80065818 00000000 */ nop +/* 40C1C 8006581C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_40c20_len_1f0/osGetCount.s b/asm/nonmatchings/os/code_40c20_len_1f0/osGetCount.s index 09b9ce86ab..ed1e89a39e 100644 --- a/asm/nonmatchings/os/code_40c20_len_1f0/osGetCount.s +++ b/asm/nonmatchings/os/code_40c20_len_1f0/osGetCount.s @@ -4,5 +4,5 @@ glabel osGetCount /* 40E00 80065A00 40024800 */ mfc0 $v0, $9 /* 40E04 80065A04 03E00008 */ jr $ra -/* 40E08 80065A08 00000000 */ nop -/* 40E0C 80065A0C 00000000 */ nop +/* 40E08 80065A08 00000000 */ nop +/* 40E0C 80065A0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s b/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s index 98e6b7e9e4..a6106df911 100644 --- a/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s +++ b/asm/nonmatchings/os/code_40c20_len_1f0/osSendMesg.s @@ -37,7 +37,7 @@ glabel osSendMesg /* 40C98 80065898 8E030010 */ lw $v1, 0x10($s0) /* 40C9C 8006589C 0043102A */ slt $v0, $v0, $v1 /* 40CA0 800658A0 1040FFF2 */ beqz $v0, .L8006586C -/* 40CA4 800658A4 00000000 */ nop +/* 40CA4 800658A4 00000000 */ nop .L800658A8: /* 40CA8 800658A8 8E03000C */ lw $v1, 0xc($s0) /* 40CAC 800658AC 8E040008 */ lw $a0, 8($s0) @@ -45,14 +45,14 @@ glabel osSendMesg /* 40CB4 800658B4 00641821 */ addu $v1, $v1, $a0 /* 40CB8 800658B8 0062001A */ div $zero, $v1, $v0 /* 40CBC 800658BC 14400002 */ bnez $v0, .L800658C8 -/* 40CC0 800658C0 00000000 */ nop +/* 40CC0 800658C0 00000000 */ nop /* 40CC4 800658C4 0007000D */ break 7 .L800658C8: /* 40CC8 800658C8 2401FFFF */ addiu $at, $zero, -1 /* 40CCC 800658CC 14410004 */ bne $v0, $at, .L800658E0 /* 40CD0 800658D0 3C018000 */ lui $at, 0x8000 /* 40CD4 800658D4 14610002 */ bne $v1, $at, .L800658E0 -/* 40CD8 800658D8 00000000 */ nop +/* 40CD8 800658D8 00000000 */ nop /* 40CDC 800658DC 0006000D */ break 6 .L800658E0: /* 40CE0 800658E0 00001010 */ mfhi $v0 @@ -66,7 +66,7 @@ glabel osSendMesg /* 40D00 80065900 AE020008 */ sw $v0, 8($s0) /* 40D04 80065904 8C620000 */ lw $v0, ($v1) /* 40D08 80065908 10400005 */ beqz $v0, .L80065920 -/* 40D0C 8006590C 00000000 */ nop +/* 40D0C 8006590C 00000000 */ nop /* 40D10 80065910 0C01AC6F */ jal osPopThread /* 40D14 80065914 02002021 */ addu $a0, $s0, $zero /* 40D18 80065918 0C019808 */ jal osStartThread diff --git a/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s b/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s index 287e96d7e0..ce03f99967 100644 --- a/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s +++ b/asm/nonmatchings/os/code_40c20_len_1f0/osSetEventMesg.s @@ -47,4 +47,4 @@ glabel osSetEventMesg /* 40DF0 800659F0 8FB00010 */ lw $s0, 0x10($sp) /* 40DF4 800659F4 03E00008 */ jr $ra /* 40DF8 800659F8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 40DFC 800659FC 00000000 */ nop +/* 40DFC 800659FC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_40e10_len_240/osSpTaskLoad.s b/asm/nonmatchings/os/code_40e10_len_240/osSpTaskLoad.s index d036014c53..ef02ce804e 100644 --- a/asm/nonmatchings/os/code_40e10_len_240/osSpTaskLoad.s +++ b/asm/nonmatchings/os/code_40e10_len_240/osSpTaskLoad.s @@ -15,63 +15,63 @@ glabel osSpTaskLoad /* 40E38 80065A38 3C04800B */ lui $a0, %hi(D_800AF8D0) /* 40E3C 80065A3C 8C84F8D0 */ lw $a0, %lo(D_800AF8D0)($a0) /* 40E40 80065A40 10800005 */ beqz $a0, .L80065A58 -/* 40E44 80065A44 00000000 */ nop +/* 40E44 80065A44 00000000 */ nop /* 40E48 80065A48 0C0187A4 */ jal osVirtualToPhysical -/* 40E4C 80065A4C 00000000 */ nop +/* 40E4C 80065A4C 00000000 */ nop /* 40E50 80065A50 3C01800B */ lui $at, %hi(D_800AF8D0) /* 40E54 80065A54 AC22F8D0 */ sw $v0, %lo(D_800AF8D0)($at) .L80065A58: /* 40E58 80065A58 3C04800B */ lui $a0, %hi(D_800AF8D8) /* 40E5C 80065A5C 8C84F8D8 */ lw $a0, %lo(D_800AF8D8)($a0) /* 40E60 80065A60 10800005 */ beqz $a0, .L80065A78 -/* 40E64 80065A64 00000000 */ nop +/* 40E64 80065A64 00000000 */ nop /* 40E68 80065A68 0C0187A4 */ jal osVirtualToPhysical -/* 40E6C 80065A6C 00000000 */ nop +/* 40E6C 80065A6C 00000000 */ nop /* 40E70 80065A70 3C01800B */ lui $at, %hi(D_800AF8D8) /* 40E74 80065A74 AC22F8D8 */ sw $v0, %lo(D_800AF8D8)($at) .L80065A78: /* 40E78 80065A78 3C04800B */ lui $a0, %hi(D_800AF8E0) /* 40E7C 80065A7C 8C84F8E0 */ lw $a0, %lo(D_800AF8E0)($a0) /* 40E80 80065A80 10800005 */ beqz $a0, .L80065A98 -/* 40E84 80065A84 00000000 */ nop +/* 40E84 80065A84 00000000 */ nop /* 40E88 80065A88 0C0187A4 */ jal osVirtualToPhysical -/* 40E8C 80065A8C 00000000 */ nop +/* 40E8C 80065A8C 00000000 */ nop /* 40E90 80065A90 3C01800B */ lui $at, %hi(D_800AF8E0) /* 40E94 80065A94 AC22F8E0 */ sw $v0, %lo(D_800AF8E0)($at) .L80065A98: /* 40E98 80065A98 3C04800B */ lui $a0, %hi(D_800AF8E8) /* 40E9C 80065A9C 8C84F8E8 */ lw $a0, %lo(D_800AF8E8)($a0) /* 40EA0 80065AA0 10800005 */ beqz $a0, .L80065AB8 -/* 40EA4 80065AA4 00000000 */ nop +/* 40EA4 80065AA4 00000000 */ nop /* 40EA8 80065AA8 0C0187A4 */ jal osVirtualToPhysical -/* 40EAC 80065AAC 00000000 */ nop +/* 40EAC 80065AAC 00000000 */ nop /* 40EB0 80065AB0 3C01800B */ lui $at, %hi(D_800AF8E8) /* 40EB4 80065AB4 AC22F8E8 */ sw $v0, %lo(D_800AF8E8)($at) .L80065AB8: /* 40EB8 80065AB8 3C04800B */ lui $a0, %hi(D_800AF8EC) /* 40EBC 80065ABC 8C84F8EC */ lw $a0, %lo(D_800AF8EC)($a0) /* 40EC0 80065AC0 10800005 */ beqz $a0, .L80065AD8 -/* 40EC4 80065AC4 00000000 */ nop +/* 40EC4 80065AC4 00000000 */ nop /* 40EC8 80065AC8 0C0187A4 */ jal osVirtualToPhysical -/* 40ECC 80065ACC 00000000 */ nop +/* 40ECC 80065ACC 00000000 */ nop /* 40ED0 80065AD0 3C01800B */ lui $at, %hi(D_800AF8EC) /* 40ED4 80065AD4 AC22F8EC */ sw $v0, %lo(D_800AF8EC)($at) .L80065AD8: /* 40ED8 80065AD8 3C04800B */ lui $a0, %hi(D_800AF8F0) /* 40EDC 80065ADC 8C84F8F0 */ lw $a0, %lo(D_800AF8F0)($a0) /* 40EE0 80065AE0 10800005 */ beqz $a0, .L80065AF8 -/* 40EE4 80065AE4 00000000 */ nop +/* 40EE4 80065AE4 00000000 */ nop /* 40EE8 80065AE8 0C0187A4 */ jal osVirtualToPhysical -/* 40EEC 80065AEC 00000000 */ nop +/* 40EEC 80065AEC 00000000 */ nop /* 40EF0 80065AF0 3C01800B */ lui $at, %hi(D_800AF8F0) /* 40EF4 80065AF4 AC22F8F0 */ sw $v0, %lo(D_800AF8F0)($at) .L80065AF8: /* 40EF8 80065AF8 3C04800B */ lui $a0, %hi(D_800AF8F8) /* 40EFC 80065AFC 8C84F8F8 */ lw $a0, %lo(D_800AF8F8)($a0) /* 40F00 80065B00 10800005 */ beqz $a0, .L80065B18 -/* 40F04 80065B04 00000000 */ nop +/* 40F04 80065B04 00000000 */ nop /* 40F08 80065B08 0C0187A4 */ jal osVirtualToPhysical -/* 40F0C 80065B0C 00000000 */ nop +/* 40F0C 80065B0C 00000000 */ nop /* 40F10 80065B10 3C01800B */ lui $at, %hi(D_800AF8F8) /* 40F14 80065B14 AC22F8F8 */ sw $v0, %lo(D_800AF8F8)($at) .L80065B18: @@ -128,7 +128,7 @@ glabel osSpTaskLoad /* 40FD4 80065BD4 24040001 */ addiu $a0, $zero, 1 .L80065BD8: /* 40FD8 80065BD8 0C01B1B0 */ jal osSpDeviceBusy -/* 40FDC 80065BDC 00000000 */ nop +/* 40FDC 80065BDC 00000000 */ nop /* 40FE0 80065BE0 1440FFFD */ bnez $v0, .L80065BD8 /* 40FE4 80065BE4 24040001 */ addiu $a0, $zero, 1 /* 40FE8 80065BE8 2410FFFF */ addiu $s0, $zero, -1 diff --git a/asm/nonmatchings/os/code_40e10_len_240/osSpTaskStartGo.s b/asm/nonmatchings/os/code_40e10_len_240/osSpTaskStartGo.s index c870a883e5..5c63f5a265 100644 --- a/asm/nonmatchings/os/code_40e10_len_240/osSpTaskStartGo.s +++ b/asm/nonmatchings/os/code_40e10_len_240/osSpTaskStartGo.s @@ -6,13 +6,13 @@ glabel osSpTaskStartGo /* 41020 80065C20 AFBF0010 */ sw $ra, 0x10($sp) .L80065C24: /* 41024 80065C24 0C01B1B0 */ jal osSpDeviceBusy -/* 41028 80065C28 00000000 */ nop +/* 41028 80065C28 00000000 */ nop /* 4102C 80065C2C 1440FFFD */ bnez $v0, .L80065C24 -/* 41030 80065C30 00000000 */ nop +/* 41030 80065C30 00000000 */ nop /* 41034 80065C34 0C01B1BC */ jal osSpSetStatus /* 41038 80065C38 24040125 */ addiu $a0, $zero, 0x125 /* 4103C 80065C3C 8FBF0010 */ lw $ra, 0x10($sp) /* 41040 80065C40 03E00008 */ jr $ra /* 41044 80065C44 27BD0018 */ addiu $sp, $sp, 0x18 -/* 41048 80065C48 00000000 */ nop -/* 4104C 80065C4C 00000000 */ nop +/* 41048 80065C48 00000000 */ nop +/* 4104C 80065C4C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41050_len_120/osSiRawStartDma.s b/asm/nonmatchings/os/code_41050_len_120/osSiRawStartDma.s index a907bdf084..d4ea6abb27 100644 --- a/asm/nonmatchings/os/code_41050_len_120/osSiRawStartDma.s +++ b/asm/nonmatchings/os/code_41050_len_120/osSiRawStartDma.s @@ -48,6 +48,6 @@ glabel osSiRawStartDma /* 41158 80065D58 8FB00010 */ lw $s0, 0x10($sp) /* 4115C 80065D5C 03E00008 */ jr $ra /* 41160 80065D60 27BD0020 */ addiu $sp, $sp, 0x20 -/* 41164 80065D64 00000000 */ nop -/* 41168 80065D68 00000000 */ nop -/* 4116C 80065D6C 00000000 */ nop +/* 41164 80065D64 00000000 */ nop +/* 41168 80065D68 00000000 */ nop +/* 4116C 80065D6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s b/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s index d4b81f05cd..f2df926325 100644 --- a/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s +++ b/asm/nonmatchings/os/code_41050_len_120/osSpTaskYield.s @@ -9,4 +9,4 @@ glabel osSpTaskYield /* 41060 80065C60 8FBF0010 */ lw $ra, 0x10($sp) /* 41064 80065C64 03E00008 */ jr $ra /* 41068 80065C68 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4106C 80065C6C 00000000 */ nop +/* 4106C 80065C6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41050_len_120/osSpTaskYielded.s b/asm/nonmatchings/os/code_41050_len_120/osSpTaskYielded.s index af7f9377fa..cafca33adc 100644 --- a/asm/nonmatchings/os/code_41050_len_120/osSpTaskYielded.s +++ b/asm/nonmatchings/os/code_41050_len_120/osSpTaskYielded.s @@ -22,4 +22,4 @@ glabel osSpTaskYielded /* 410B0 80065CB0 8FB00010 */ lw $s0, 0x10($sp) /* 410B4 80065CB4 03E00008 */ jr $ra /* 410B8 80065CB8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 410BC 80065CBC 00000000 */ nop +/* 410BC 80065CBC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41170_len_f0/osSiRelAccess.s b/asm/nonmatchings/os/code_41170_len_f0/osSiRelAccess.s index 037e4bedd9..97ee96729c 100644 --- a/asm/nonmatchings/os/code_41170_len_f0/osSiRelAccess.s +++ b/asm/nonmatchings/os/code_41170_len_f0/osSiRelAccess.s @@ -12,5 +12,5 @@ glabel osSiRelAccess /* 4124C 80065E4C 8FBF0010 */ lw $ra, 0x10($sp) /* 41250 80065E50 03E00008 */ jr $ra /* 41254 80065E54 27BD0018 */ addiu $sp, $sp, 0x18 -/* 41258 80065E58 00000000 */ nop -/* 4125C 80065E5C 00000000 */ nop +/* 41258 80065E58 00000000 */ nop +/* 4125C 80065E5C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41350_len_d0/osSetThreadPri.s b/asm/nonmatchings/os/code_41350_len_d0/osSetThreadPri.s index fe81422a5d..350e3a26bd 100644 --- a/asm/nonmatchings/os/code_41350_len_d0/osSetThreadPri.s +++ b/asm/nonmatchings/os/code_41350_len_d0/osSetThreadPri.s @@ -17,7 +17,7 @@ glabel osSetThreadPri .L80065F80: /* 41380 80065F80 8E020004 */ lw $v0, 4($s0) /* 41384 80065F84 1051001C */ beq $v0, $s1, .L80065FF8 -/* 41388 80065F88 00000000 */ nop +/* 41388 80065F88 00000000 */ nop /* 4138C 80065F8C 3C028009 */ lui $v0, %hi(D_80094660) /* 41390 80065F90 8C424660 */ lw $v0, %lo(D_80094660)($v0) /* 41394 80065F94 1202000B */ beq $s0, $v0, .L80065FC4 @@ -25,7 +25,7 @@ glabel osSetThreadPri /* 4139C 80065F9C 96030010 */ lhu $v1, 0x10($s0) /* 413A0 80065FA0 24020001 */ addiu $v0, $zero, 1 /* 413A4 80065FA4 10620007 */ beq $v1, $v0, .L80065FC4 -/* 413A8 80065FA8 00000000 */ nop +/* 413A8 80065FA8 00000000 */ nop /* 413AC 80065FAC 8E040008 */ lw $a0, 8($s0) /* 413B0 80065FB0 0C019880 */ jal osDequeueThread /* 413B4 80065FB4 02002821 */ addu $a1, $s0, $zero @@ -55,5 +55,5 @@ glabel osSetThreadPri /* 4140C 8006600C 8FB00010 */ lw $s0, 0x10($sp) /* 41410 80066010 03E00008 */ jr $ra /* 41414 80066014 27BD0020 */ addiu $sp, $sp, 0x20 -/* 41418 80066018 00000000 */ nop -/* 4141C 8006601C 00000000 */ nop +/* 41418 80066018 00000000 */ nop +/* 4141C 8006601C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41420_len_120/osStartThread.s b/asm/nonmatchings/os/code_41420_len_120/osStartThread.s index 3f623f82b9..8f53106668 100644 --- a/asm/nonmatchings/os/code_41420_len_120/osStartThread.s +++ b/asm/nonmatchings/os/code_41420_len_120/osStartThread.s @@ -43,21 +43,21 @@ glabel osStartThread /* 414AC 800660AC A6020010 */ sh $v0, 0x10($s0) /* 414B0 800660B0 8E040008 */ lw $a0, 8($s0) /* 414B4 800660B4 0C01AC6F */ jal osPopThread -/* 414B8 800660B8 00000000 */ nop +/* 414B8 800660B8 00000000 */ nop /* 414BC 800660BC 02202021 */ addu $a0, $s1, $zero /* 414C0 800660C0 00402821 */ addu $a1, $v0, $zero .L800660C4: /* 414C4 800660C4 0C01AC5D */ jal osEnqueueThread -/* 414C8 800660C8 00000000 */ nop +/* 414C8 800660C8 00000000 */ nop .L800660CC: /* 414CC 800660CC 3C048009 */ lui $a0, %hi(D_80094660) /* 414D0 800660D0 8C844660 */ lw $a0, %lo(D_80094660)($a0) /* 414D4 800660D4 14800005 */ bnez $a0, .L800660EC -/* 414D8 800660D8 00000000 */ nop +/* 414D8 800660D8 00000000 */ nop /* 414DC 800660DC 0C01AC75 */ jal osDispatchThread -/* 414E0 800660E0 00000000 */ nop +/* 414E0 800660E0 00000000 */ nop /* 414E4 800660E4 08019846 */ j .L80066118 -/* 414E8 800660E8 00000000 */ nop +/* 414E8 800660E8 00000000 */ nop .L800660EC: /* 414EC 800660EC 3C028009 */ lui $v0, %hi(D_80094658) /* 414F0 800660F0 8C424658 */ lw $v0, %lo(D_80094658)($v0) @@ -79,5 +79,5 @@ glabel osStartThread /* 4152C 8006612C 8FB00010 */ lw $s0, 0x10($sp) /* 41530 80066130 03E00008 */ jr $ra /* 41534 80066134 27BD0020 */ addiu $sp, $sp, 0x20 -/* 41538 80066138 00000000 */ nop -/* 4153C 8006613C 00000000 */ nop +/* 41538 80066138 00000000 */ nop +/* 4153C 8006613C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s b/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s index 64cb0c9116..5e27697a92 100644 --- a/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s +++ b/asm/nonmatchings/os/code_41540_len_c0/osStopThread.s @@ -20,15 +20,15 @@ glabel osStopThread /* 41578 80066178 10400005 */ beqz $v0, .L80066190 /* 4157C 8006617C 24020002 */ addiu $v0, $zero, 2 /* 41580 80066180 10620010 */ beq $v1, $v0, .L800661C4 -/* 41584 80066184 00000000 */ nop +/* 41584 80066184 00000000 */ nop /* 41588 80066188 08019876 */ j .L800661D8 -/* 4158C 8006618C 00000000 */ nop +/* 4158C 8006618C 00000000 */ nop .L80066190: /* 41590 80066190 24020008 */ addiu $v0, $zero, 8 /* 41594 80066194 1062000B */ beq $v1, $v0, .L800661C4 -/* 41598 80066198 00000000 */ nop +/* 41598 80066198 00000000 */ nop /* 4159C 8006619C 08019876 */ j .L800661D8 -/* 415A0 800661A0 00000000 */ nop +/* 415A0 800661A0 00000000 */ nop .L800661A4: /* 415A4 800661A4 3C038009 */ lui $v1, %hi(D_80094660) /* 415A8 800661A8 8C634660 */ lw $v1, %lo(D_80094660)($v1) @@ -37,7 +37,7 @@ glabel osStopThread /* 415B4 800661B4 0C01AC1B */ jal osEnqueueAndYield /* 415B8 800661B8 A4620010 */ sh $v0, 0x10($v1) /* 415BC 800661BC 08019876 */ j .L800661D8 -/* 415C0 800661C0 00000000 */ nop +/* 415C0 800661C0 00000000 */ nop .L800661C4: /* 415C4 800661C4 8E040008 */ lw $a0, 8($s0) /* 415C8 800661C8 24020001 */ addiu $v0, $zero, 1 @@ -52,6 +52,6 @@ glabel osStopThread /* 415E8 800661E8 8FB00010 */ lw $s0, 0x10($sp) /* 415EC 800661EC 03E00008 */ jr $ra /* 415F0 800661F0 27BD0020 */ addiu $sp, $sp, 0x20 -/* 415F4 800661F4 00000000 */ nop -/* 415F8 800661F8 00000000 */ nop -/* 415FC 800661FC 00000000 */ nop +/* 415F4 800661F4 00000000 */ nop +/* 415F8 800661F8 00000000 */ nop +/* 415FC 800661FC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41600_len_40/osDequeueThread.s b/asm/nonmatchings/os/code_41600_len_40/osDequeueThread.s index 892283ed69..ee102c13a9 100644 --- a/asm/nonmatchings/os/code_41600_len_40/osDequeueThread.s +++ b/asm/nonmatchings/os/code_41600_len_40/osDequeueThread.s @@ -4,7 +4,7 @@ glabel osDequeueThread /* 41600 80066200 8C820000 */ lw $v0, ($a0) /* 41604 80066204 10400009 */ beqz $v0, .L8006622C -/* 41608 80066208 00000000 */ nop +/* 41608 80066208 00000000 */ nop .L8006620C: /* 4160C 8006620C 54450004 */ bnel $v0, $a1, .L80066220 /* 41610 80066210 00402021 */ addu $a0, $v0, $zero @@ -14,10 +14,10 @@ glabel osDequeueThread .L80066220: /* 41620 80066220 8C420000 */ lw $v0, ($v0) /* 41624 80066224 1440FFF9 */ bnez $v0, .L8006620C -/* 41628 80066228 00000000 */ nop +/* 41628 80066228 00000000 */ nop .L8006622C: /* 4162C 8006622C 03E00008 */ jr $ra -/* 41630 80066230 00000000 */ nop -/* 41634 80066234 00000000 */ nop -/* 41638 80066238 00000000 */ nop -/* 4163C 8006623C 00000000 */ nop +/* 41630 80066230 00000000 */ nop +/* 41634 80066234 00000000 */ nop +/* 41638 80066238 00000000 */ nop +/* 4163C 8006623C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s b/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s index 8b46c91a05..e35c7e7d28 100644 --- a/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s +++ b/asm/nonmatchings/os/code_41640_len_50/osYieldThread.s @@ -20,5 +20,5 @@ glabel osYieldThread /* 4167C 8006627C 8FB00010 */ lw $s0, 0x10($sp) /* 41680 80066280 03E00008 */ jr $ra /* 41684 80066284 27BD0018 */ addiu $sp, $sp, 0x18 -/* 41688 80066288 00000000 */ nop -/* 4168C 8006628C 00000000 */ nop +/* 41688 80066288 00000000 */ nop +/* 4168C 8006628C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s b/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s index a093d46cf8..853c62d03b 100644 --- a/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s +++ b/asm/nonmatchings/os/code_41690_len_10/osGetActiveQueue.s @@ -5,4 +5,4 @@ glabel osGetActiveQueue /* 41690 80066290 3C028009 */ lui $v0, %hi(D_8009465C) /* 41694 80066294 03E00008 */ jr $ra /* 41698 80066298 8C42465C */ lw $v0, %lo(D_8009465C)($v0) -/* 4169C 8006629C 00000000 */ nop +/* 4169C 8006629C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s b/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s index f7fa1038f2..4574cef33f 100644 --- a/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s +++ b/asm/nonmatchings/os/code_416a0_len_90/osGetTime.s @@ -35,6 +35,6 @@ glabel osGetTime /* 41718 80066318 8FB00010 */ lw $s0, 0x10($sp) /* 4171C 8006631C 03E00008 */ jr $ra /* 41720 80066320 27BD0028 */ addiu $sp, $sp, 0x28 -/* 41724 80066324 00000000 */ nop -/* 41728 80066328 00000000 */ nop -/* 4172C 8006632C 00000000 */ nop +/* 41724 80066324 00000000 */ nop +/* 41728 80066328 00000000 */ nop +/* 4172C 8006632C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41730_len_20/osSetTime.s b/asm/nonmatchings/os/code_41730_len_20/osSetTime.s index e55e16ac67..66f5106307 100644 --- a/asm/nonmatchings/os/code_41730_len_20/osSetTime.s +++ b/asm/nonmatchings/os/code_41730_len_20/osSetTime.s @@ -7,6 +7,6 @@ glabel osSetTime /* 41738 80066338 3C01800A */ lui $at, %hi(D_8009A60C) /* 4173C 8006633C 03E00008 */ jr $ra /* 41740 80066340 AC25A60C */ sw $a1, %lo(D_8009A60C)($at) -/* 41744 80066344 00000000 */ nop -/* 41748 80066348 00000000 */ nop -/* 4174C 8006634C 00000000 */ nop +/* 41744 80066344 00000000 */ nop +/* 41748 80066348 00000000 */ nop +/* 4174C 8006634C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41750_len_450/osInsertTimer.s b/asm/nonmatchings/os/code_41750_len_450/osInsertTimer.s index 1d2fd89a71..ee5a6fe0dd 100644 --- a/asm/nonmatchings/os/code_41750_len_450/osInsertTimer.s +++ b/asm/nonmatchings/os/code_41750_len_450/osInsertTimer.s @@ -17,7 +17,7 @@ glabel osInsertTimer /* 41AC0 800666C0 10C30017 */ beq $a2, $v1, .L80066720 /* 41AC4 800666C4 00403821 */ addu $a3, $v0, $zero /* 41AC8 800666C8 080199BE */ j .L800666F8 -/* 41ACC 800666CC 00000000 */ nop +/* 41ACC 800666CC 00000000 */ nop .L800666D0: /* 41AD0 800666D0 8CC20010 */ lw $v0, 0x10($a2) /* 41AD4 800666D4 8CC30014 */ lw $v1, 0x14($a2) @@ -33,13 +33,13 @@ glabel osInsertTimer /* 41AF8 800666F8 8CC30010 */ lw $v1, 0x10($a2) /* 41AFC 800666FC 0070102B */ sltu $v0, $v1, $s0 /* 41B00 80066700 1440FFF3 */ bnez $v0, .L800666D0 -/* 41B04 80066704 00000000 */ nop +/* 41B04 80066704 00000000 */ nop /* 41B08 80066708 16030005 */ bne $s0, $v1, .L80066720 -/* 41B0C 8006670C 00000000 */ nop +/* 41B0C 8006670C 00000000 */ nop /* 41B10 80066710 8CC20014 */ lw $v0, 0x14($a2) /* 41B14 80066714 0051102B */ sltu $v0, $v0, $s1 /* 41B18 80066718 1440FFED */ bnez $v0, .L800666D0 -/* 41B1C 8006671C 00000000 */ nop +/* 41B1C 8006671C 00000000 */ nop .L80066720: /* 41B20 80066720 3C028009 */ lui $v0, %hi(D_80094670) /* 41B24 80066724 8C424670 */ lw $v0, %lo(D_80094670)($v0) @@ -72,5 +72,5 @@ glabel osInsertTimer /* 41B8C 8006678C 8FB00010 */ lw $s0, 0x10($sp) /* 41B90 80066790 03E00008 */ jr $ra /* 41B94 80066794 27BD0020 */ addiu $sp, $sp, 0x20 -/* 41B98 80066798 00000000 */ nop -/* 41B9C 8006679C 00000000 */ nop +/* 41B98 80066798 00000000 */ nop +/* 41B9C 8006679C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s b/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s index b1e97e4c24..d939c1b306 100644 --- a/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s +++ b/asm/nonmatchings/os/code_41750_len_450/osSetTimer.s @@ -43,13 +43,13 @@ glabel osSetTimer /* 417E4 800663E4 00003021 */ addu $a2, $zero, $zero /* 417E8 800663E8 00C3102B */ sltu $v0, $a2, $v1 /* 417EC 800663EC 14400007 */ bnez $v0, .L8006640C -/* 417F0 800663F0 00000000 */ nop +/* 417F0 800663F0 00000000 */ nop /* 417F4 800663F4 1466000C */ bne $v1, $a2, .L80066428 -/* 417F8 800663F8 00000000 */ nop +/* 417F8 800663F8 00000000 */ nop /* 417FC 800663FC 8E220014 */ lw $v0, 0x14($s1) /* 41800 80066400 00E2102B */ sltu $v0, $a3, $v0 /* 41804 80066404 10400008 */ beqz $v0, .L80066428 -/* 41808 80066408 00000000 */ nop +/* 41808 80066408 00000000 */ nop .L8006640C: /* 4180C 8006640C 8E220010 */ lw $v0, 0x10($s1) /* 41810 80066410 8E230014 */ lw $v1, 0x14($s1) @@ -82,4 +82,4 @@ glabel osSetTimer /* 41870 80066470 8FB00010 */ lw $s0, 0x10($sp) /* 41874 80066474 03E00008 */ jr $ra /* 41878 80066478 27BD0020 */ addiu $sp, $sp, 0x20 -/* 4187C 8006647C 00000000 */ nop +/* 4187C 8006647C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41750_len_450/osSetTimerIntr.s b/asm/nonmatchings/os/code_41750_len_450/osSetTimerIntr.s index 4e040a82ec..ec1a81b983 100644 --- a/asm/nonmatchings/os/code_41750_len_450/osSetTimerIntr.s +++ b/asm/nonmatchings/os/code_41750_len_450/osSetTimerIntr.s @@ -13,13 +13,13 @@ glabel osSetTimerIntr /* 41A30 80066630 16400003 */ bnez $s2, .L80066640 /* 41A34 80066634 2E6201D4 */ sltiu $v0, $s3, 0x1d4 /* 41A38 80066638 10400003 */ beqz $v0, .L80066648 -/* 41A3C 8006663C 00000000 */ nop +/* 41A3C 8006663C 00000000 */ nop .L80066640: /* 41A40 80066640 24120000 */ addiu $s2, $zero, 0 /* 41A44 80066644 241301D4 */ addiu $s3, $zero, 0x1d4 .L80066648: /* 41A48 80066648 0C01ACD8 */ jal __osDisableInt -/* 41A4C 8006664C 00000000 */ nop +/* 41A4C 8006664C 00000000 */ nop /* 41A50 80066650 0C019680 */ jal osGetCount /* 41A54 80066654 00408021 */ addu $s0, $v0, $zero /* 41A58 80066658 3C01800A */ lui $at, %hi(D_8009A62C) diff --git a/asm/nonmatchings/os/code_41750_len_450/osTimerInterrupt.s b/asm/nonmatchings/os/code_41750_len_450/osTimerInterrupt.s index 44b146d3d6..2330fb1c3b 100644 --- a/asm/nonmatchings/os/code_41750_len_450/osTimerInterrupt.s +++ b/asm/nonmatchings/os/code_41750_len_450/osTimerInterrupt.s @@ -9,13 +9,13 @@ glabel osTimerInterrupt /* 418E4 800664E4 AFB00010 */ sw $s0, 0x10($sp) /* 418E8 800664E8 8C620000 */ lw $v0, ($v1) /* 418EC 800664EC 10430044 */ beq $v0, $v1, .L80066600 -/* 418F0 800664F0 00000000 */ nop +/* 418F0 800664F0 00000000 */ nop .L800664F4: /* 418F4 800664F4 3C028009 */ lui $v0, %hi(D_80094670) /* 418F8 800664F8 8C424670 */ lw $v0, %lo(D_80094670)($v0) /* 418FC 800664FC 8C500000 */ lw $s0, ($v0) /* 41900 80066500 16020006 */ bne $s0, $v0, .L8006651C -/* 41904 80066504 00000000 */ nop +/* 41904 80066504 00000000 */ nop /* 41908 80066508 0C01B1A0 */ jal osSetCompare /* 4190C 8006650C 00002021 */ addu $a0, $zero, $zero /* 41910 80066510 3C01800A */ lui $at, %hi(D_8009A62C) @@ -23,7 +23,7 @@ glabel osTimerInterrupt /* 41918 80066518 AC20A62C */ sw $zero, %lo(D_8009A62C)($at) .L8006651C: /* 4191C 8006651C 0C019680 */ jal osGetCount -/* 41920 80066520 00000000 */ nop +/* 41920 80066520 00000000 */ nop /* 41924 80066524 3C03800A */ lui $v1, %hi(D_8009A62C) /* 41928 80066528 8C63A62C */ lw $v1, %lo(D_8009A62C)($v1) /* 4192C 8006652C 3C01800A */ lui $at, %hi(D_8009A62C) @@ -34,13 +34,13 @@ glabel osTimerInterrupt /* 41940 80066540 00003021 */ addu $a2, $zero, $zero /* 41944 80066544 00C3102B */ sltu $v0, $a2, $v1 /* 41948 80066548 14400007 */ bnez $v0, .L80066568 -/* 4194C 8006654C 00000000 */ nop +/* 4194C 8006654C 00000000 */ nop /* 41950 80066550 14660010 */ bne $v1, $a2, .L80066594 -/* 41954 80066554 00000000 */ nop +/* 41954 80066554 00000000 */ nop /* 41958 80066558 8E020014 */ lw $v0, 0x14($s0) /* 4195C 8006655C 00E2102B */ sltu $v0, $a3, $v0 /* 41960 80066560 1040000C */ beqz $v0, .L80066594 -/* 41964 80066564 00000000 */ nop +/* 41964 80066564 00000000 */ nop .L80066568: /* 41968 80066568 8E040010 */ lw $a0, 0x10($s0) /* 4196C 8006656C 8E050014 */ lw $a1, 0x14($s0) @@ -52,7 +52,7 @@ glabel osTimerInterrupt /* 41984 80066584 0C019984 */ jal osSetTimerIntr /* 41988 80066588 AE050014 */ sw $a1, 0x14($s0) /* 4198C 8006658C 08019980 */ j .L80066600 -/* 41990 80066590 00000000 */ nop +/* 41990 80066590 00000000 */ nop .L80066594: /* 41994 80066594 8E030004 */ lw $v1, 4($s0) /* 41998 80066598 8E020000 */ lw $v0, ($s0) @@ -70,10 +70,10 @@ glabel osTimerInterrupt .L800665C8: /* 419C8 800665C8 8E020008 */ lw $v0, 8($s0) /* 419CC 800665CC 14400004 */ bnez $v0, .L800665E0 -/* 419D0 800665D0 00000000 */ nop +/* 419D0 800665D0 00000000 */ nop /* 419D4 800665D4 8E02000C */ lw $v0, 0xc($s0) /* 419D8 800665D8 1040FFC6 */ beqz $v0, .L800664F4 -/* 419DC 800665DC 00000000 */ nop +/* 419DC 800665DC 00000000 */ nop .L800665E0: /* 419E0 800665E0 8E020008 */ lw $v0, 8($s0) /* 419E4 800665E4 8E03000C */ lw $v1, 0xc($s0) @@ -82,7 +82,7 @@ glabel osTimerInterrupt /* 419F0 800665F0 0C0199A4 */ jal osInsertTimer /* 419F4 800665F4 AC830014 */ sw $v1, 0x14($a0) /* 419F8 800665F8 0801993D */ j .L800664F4 -/* 419FC 800665FC 00000000 */ nop +/* 419FC 800665FC 00000000 */ nop .L80066600: /* 41A00 80066600 8FBF0014 */ lw $ra, 0x14($sp) /* 41A04 80066604 8FB00010 */ lw $s0, 0x10($sp) diff --git a/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s b/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s index 0b598868f2..e2834ad4ef 100644 --- a/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s +++ b/asm/nonmatchings/os/code_41ba0_len_c0/osMapTLB.s @@ -18,41 +18,41 @@ glabel osMapTLB /* 41BCC 800667CC 40865000 */ mtc0 $a2, $10 /* 41BD0 800667D0 2401FFFF */ addiu $at, $zero, -1 /* 41BD4 800667D4 10E10006 */ beq $a3, $at, .L800667F0 -/* 41BD8 800667D8 00000000 */ nop +/* 41BD8 800667D8 00000000 */ nop /* 41BDC 800667DC 00075982 */ srl $t3, $a3, 6 /* 41BE0 800667E0 016A5825 */ or $t3, $t3, $t2 /* 41BE4 800667E4 408B1000 */ mtc0 $t3, $2 /* 41BE8 800667E8 10000002 */ b .L800667F4 -/* 41BEC 800667EC 00000000 */ nop +/* 41BEC 800667EC 00000000 */ nop .L800667F0: /* 41BF0 800667F0 408C1000 */ mtc0 $t4, $2 .L800667F4: /* 41BF4 800667F4 8FAB0010 */ lw $t3, 0x10($sp) /* 41BF8 800667F8 2401FFFF */ addiu $at, $zero, -1 /* 41BFC 800667FC 11610006 */ beq $t3, $at, .L80066818 -/* 41C00 80066800 00000000 */ nop +/* 41C00 80066800 00000000 */ nop /* 41C04 80066804 000B5982 */ srl $t3, $t3, 6 /* 41C08 80066808 016A5825 */ or $t3, $t3, $t2 /* 41C0C 8006680C 408B1800 */ mtc0 $t3, $3 /* 41C10 80066810 10000007 */ b .L80066830 -/* 41C14 80066814 00000000 */ nop +/* 41C14 80066814 00000000 */ nop .L80066818: /* 41C18 80066818 408C1800 */ mtc0 $t4, $3 /* 41C1C 8006681C 2401FFFF */ addiu $at, $zero, -1 /* 41C20 80066820 14E10003 */ bne $a3, $at, .L80066830 -/* 41C24 80066824 00000000 */ nop +/* 41C24 80066824 00000000 */ nop /* 41C28 80066828 3C0B8000 */ lui $t3, 0x8000 /* 41C2C 8006682C 408B5000 */ mtc0 $t3, $10 .L80066830: -/* 41C30 80066830 00000000 */ nop -/* 41C34 80066834 42000002 */ tlbwi -/* 41C38 80066838 00000000 */ nop -/* 41C3C 8006683C 00000000 */ nop -/* 41C40 80066840 00000000 */ nop -/* 41C44 80066844 00000000 */ nop +/* 41C30 80066830 00000000 */ nop +/* 41C34 80066834 42000002 */ tlbwi +/* 41C38 80066838 00000000 */ nop +/* 41C3C 8006683C 00000000 */ nop +/* 41C40 80066840 00000000 */ nop +/* 41C44 80066844 00000000 */ nop /* 41C48 80066848 40885000 */ mtc0 $t0, $10 /* 41C4C 8006684C 03E00008 */ jr $ra -/* 41C50 80066850 00000000 */ nop -/* 41C54 80066854 00000000 */ nop -/* 41C58 80066858 00000000 */ nop -/* 41C5C 8006685C 00000000 */ nop +/* 41C50 80066850 00000000 */ nop +/* 41C54 80066854 00000000 */ nop +/* 41C58 80066858 00000000 */ nop +/* 41C5C 8006685C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s b/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s index 93cf2a081c..00ab7a3526 100644 --- a/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s +++ b/asm/nonmatchings/os/code_41c60_len_c0/osProbeTLB.s @@ -8,21 +8,21 @@ glabel osProbeTLB /* 41C6C 8006686C 00815024 */ and $t2, $a0, $at /* 41C70 80066870 012A4825 */ or $t1, $t1, $t2 /* 41C74 80066874 40895000 */ mtc0 $t1, $10 -/* 41C78 80066878 00000000 */ nop -/* 41C7C 8006687C 00000000 */ nop -/* 41C80 80066880 00000000 */ nop -/* 41C84 80066884 42000008 */ tlbp -/* 41C88 80066888 00000000 */ nop -/* 41C8C 8006688C 00000000 */ nop +/* 41C78 80066878 00000000 */ nop +/* 41C7C 8006687C 00000000 */ nop +/* 41C80 80066880 00000000 */ nop +/* 41C84 80066884 42000008 */ tlbp +/* 41C88 80066888 00000000 */ nop +/* 41C8C 8006688C 00000000 */ nop /* 41C90 80066890 400B0000 */ mfc0 $t3, $0 /* 41C94 80066894 3C018000 */ lui $at, 0x8000 /* 41C98 80066898 01615824 */ and $t3, $t3, $at /* 41C9C 8006689C 1560001A */ bnez $t3, .L80066908 -/* 41CA0 800668A0 00000000 */ nop -/* 41CA4 800668A4 42000001 */ tlbr -/* 41CA8 800668A8 00000000 */ nop -/* 41CAC 800668AC 00000000 */ nop -/* 41CB0 800668B0 00000000 */ nop +/* 41CA0 800668A0 00000000 */ nop +/* 41CA4 800668A4 42000001 */ tlbr +/* 41CA8 800668A8 00000000 */ nop +/* 41CAC 800668AC 00000000 */ nop +/* 41CB0 800668B0 00000000 */ nop /* 41CB4 800668B4 400B2800 */ mfc0 $t3, $5 /* 41CB8 800668B8 216B2000 */ addi $t3, $t3, 0x2000 /* 41CBC 800668BC 000B5842 */ srl $t3, $t3, 1 @@ -31,13 +31,13 @@ glabel osProbeTLB /* 41CC8 800668C8 216BFFFF */ addi $t3, $t3, -1 /* 41CCC 800668CC 40021000 */ mfc0 $v0, $2 /* 41CD0 800668D0 10000002 */ b .L800668DC -/* 41CD4 800668D4 00000000 */ nop +/* 41CD4 800668D4 00000000 */ nop .L800668D8: /* 41CD8 800668D8 40021800 */ mfc0 $v0, $3 .L800668DC: /* 41CDC 800668DC 304D0002 */ andi $t5, $v0, 2 /* 41CE0 800668E0 11A00009 */ beqz $t5, .L80066908 -/* 41CE4 800668E4 00000000 */ nop +/* 41CE4 800668E4 00000000 */ nop /* 41CE8 800668E8 3C013FFF */ lui $at, 0x3fff /* 41CEC 800668EC 3421FFC0 */ ori $at, $at, 0xffc0 /* 41CF0 800668F0 00411024 */ and $v0, $v0, $at @@ -45,12 +45,12 @@ glabel osProbeTLB /* 41CF8 800668F8 008B6824 */ and $t5, $a0, $t3 /* 41CFC 800668FC 004D1020 */ add $v0, $v0, $t5 /* 41D00 80066900 10000002 */ b .L8006690C -/* 41D04 80066904 00000000 */ nop +/* 41D04 80066904 00000000 */ nop .L80066908: /* 41D08 80066908 2402FFFF */ addiu $v0, $zero, -1 .L8006690C: /* 41D0C 8006690C 40885000 */ mtc0 $t0, $10 /* 41D10 80066910 03E00008 */ jr $ra -/* 41D14 80066914 00000000 */ nop -/* 41D18 80066918 00000000 */ nop -/* 41D1C 8006691C 00000000 */ nop +/* 41D14 80066914 00000000 */ nop +/* 41D18 80066918 00000000 */ nop +/* 41D1C 8006691C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s b/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s index 42fd5cbfc1..47d5e3350f 100644 --- a/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s +++ b/asm/nonmatchings/os/code_41d20_len_40/osUnmapTLB.s @@ -8,13 +8,13 @@ glabel osUnmapTLB /* 41D2C 8006692C 40895000 */ mtc0 $t1, $10 /* 41D30 80066930 40801000 */ mtc0 $zero, $2 /* 41D34 80066934 40801800 */ mtc0 $zero, $3 -/* 41D38 80066938 00000000 */ nop -/* 41D3C 8006693C 42000002 */ tlbwi -/* 41D40 80066940 00000000 */ nop -/* 41D44 80066944 00000000 */ nop -/* 41D48 80066948 00000000 */ nop -/* 41D4C 8006694C 00000000 */ nop +/* 41D38 80066938 00000000 */ nop +/* 41D3C 8006693C 42000002 */ tlbwi +/* 41D40 80066940 00000000 */ nop +/* 41D44 80066944 00000000 */ nop +/* 41D48 80066948 00000000 */ nop +/* 41D4C 8006694C 00000000 */ nop /* 41D50 80066950 40885000 */ mtc0 $t0, $10 /* 41D54 80066954 03E00008 */ jr $ra -/* 41D58 80066958 00000000 */ nop -/* 41D5C 8006695C 00000000 */ nop +/* 41D58 80066958 00000000 */ nop +/* 41D5C 8006695C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s b/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s index 58a50cd969..7e07df5ce9 100644 --- a/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s +++ b/asm/nonmatchings/os/code_41d60_len_50/osUnmapTLBAll.s @@ -10,16 +10,16 @@ glabel osUnmapTLBAll /* 41D74 80066974 40801800 */ mtc0 $zero, $3 .L80066978: /* 41D78 80066978 40890000 */ mtc0 $t1, $0 -/* 41D7C 8006697C 00000000 */ nop -/* 41D80 80066980 42000002 */ tlbwi -/* 41D84 80066984 00000000 */ nop -/* 41D88 80066988 00000000 */ nop +/* 41D7C 8006697C 00000000 */ nop +/* 41D80 80066980 42000002 */ tlbwi +/* 41D84 80066984 00000000 */ nop +/* 41D88 80066988 00000000 */ nop /* 41D8C 8006698C 2129FFFF */ addi $t1, $t1, -1 /* 41D90 80066990 0521FFF9 */ bgez $t1, .L80066978 -/* 41D94 80066994 00000000 */ nop +/* 41D94 80066994 00000000 */ nop /* 41D98 80066998 40885000 */ mtc0 $t0, $10 /* 41D9C 8006699C 03E00008 */ jr $ra -/* 41DA0 800669A0 00000000 */ nop -/* 41DA4 800669A4 00000000 */ nop -/* 41DA8 800669A8 00000000 */ nop -/* 41DAC 800669AC 00000000 */ nop +/* 41DA0 800669A0 00000000 */ nop +/* 41DA4 800669A4 00000000 */ nop +/* 41DA8 800669A8 00000000 */ nop +/* 41DAC 800669AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s b/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s index 0c777b995f..0cc5f205ac 100644 --- a/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s +++ b/asm/nonmatchings/os/code_41db0_len_40/osViGetCurrentFramebuffer.s @@ -16,5 +16,5 @@ glabel osViGetCurrentFramebuffer /* 41DDC 800669DC 8FB00010 */ lw $s0, 0x10($sp) /* 41DE0 800669E0 03E00008 */ jr $ra /* 41DE4 800669E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 41DE8 800669E8 00000000 */ nop -/* 41DEC 800669EC 00000000 */ nop +/* 41DE8 800669E8 00000000 */ nop +/* 41DEC 800669EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s b/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s index 6a7417521b..263ae4ad1b 100644 --- a/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s +++ b/asm/nonmatchings/os/code_41df0_len_40/osViGetNextFramebuffer.s @@ -16,5 +16,5 @@ glabel osViGetNextFramebuffer /* 41E1C 80066A1C 8FB00010 */ lw $s0, 0x10($sp) /* 41E20 80066A20 03E00008 */ jr $ra /* 41E24 80066A24 27BD0018 */ addiu $sp, $sp, 0x18 -/* 41E28 80066A28 00000000 */ nop -/* 41E2C 80066A2C 00000000 */ nop +/* 41E28 80066A28 00000000 */ nop +/* 41E2C 80066A2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s b/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s index 5eda561f21..487209d97e 100644 --- a/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s +++ b/asm/nonmatchings/os/code_41e30_len_40/osViGetCurrentMode.s @@ -17,4 +17,4 @@ glabel osViGetCurrentMode /* 41E60 80066A60 8FB00010 */ lw $s0, 0x10($sp) /* 41E64 80066A64 03E00008 */ jr $ra /* 41E68 80066A68 27BD0018 */ addiu $sp, $sp, 0x18 -/* 41E6C 80066A6C 00000000 */ nop +/* 41E6C 80066A6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s b/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s index 730a58546c..0e492b4b16 100644 --- a/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s +++ b/asm/nonmatchings/os/code_41e70_len_340/osCreateViManager.s @@ -53,14 +53,14 @@ glabel osCreateViManager /* 41F30 80066B30 00401821 */ addu $v1, $v0, $zero /* 41F34 80066B34 0071102A */ slt $v0, $v1, $s1 /* 41F38 80066B38 10400005 */ beqz $v0, .L80066B50 -/* 41F3C 80066B3C 00000000 */ nop +/* 41F3C 80066B3C 00000000 */ nop /* 41F40 80066B40 00609021 */ addu $s2, $v1, $zero /* 41F44 80066B44 00002021 */ addu $a0, $zero, $zero /* 41F48 80066B48 0C0197D4 */ jal osSetThreadPri /* 41F4C 80066B4C 02202821 */ addu $a1, $s1, $zero .L80066B50: /* 41F50 80066B50 0C01ACD8 */ jal __osDisableInt -/* 41F54 80066B54 00000000 */ nop +/* 41F54 80066B54 00000000 */ nop /* 41F58 80066B58 3C10800B */ lui $s0, %hi(D_800AF918) /* 41F5C 80066B5C 2610F918 */ addiu $s0, $s0, %lo(D_800AF918) /* 41F60 80066B60 02002021 */ addu $a0, $s0, $zero @@ -89,7 +89,7 @@ glabel osCreateViManager /* 41FBC 80066BBC 0C019798 */ jal osCreateThread /* 41FC0 80066BC0 AFA30010 */ sw $v1, 0x10($sp) /* 41FC4 80066BC4 0C01B2A4 */ jal osViInit -/* 41FC8 80066BC8 00000000 */ nop +/* 41FC8 80066BC8 00000000 */ nop /* 41FCC 80066BCC 0C019808 */ jal osStartThread /* 41FD0 80066BD0 02002021 */ addu $a0, $s0, $zero /* 41FD4 80066BD4 0C01ACF4 */ jal __osRestoreInt diff --git a/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s b/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s index 0da590d426..36e3ae3702 100644 --- a/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s +++ b/asm/nonmatchings/os/code_41e70_len_340/viMgrMain.s @@ -32,14 +32,14 @@ glabel viMgrMain /* 42074 80066C74 8FA20010 */ lw $v0, 0x10($sp) /* 42078 80066C78 94420000 */ lhu $v0, ($v0) /* 4207C 80066C7C 10540005 */ beq $v0, $s4, .L80066C94 -/* 42080 80066C80 00000000 */ nop +/* 42080 80066C80 00000000 */ nop /* 42084 80066C84 1053003C */ beq $v0, $s3, .L80066D78 -/* 42088 80066C88 00000000 */ nop +/* 42088 80066C88 00000000 */ nop /* 4208C 80066C8C 08019B19 */ j .L80066C64 -/* 42090 80066C90 00000000 */ nop +/* 42090 80066C90 00000000 */ nop .L80066C94: /* 42094 80066C94 0C019C1C */ jal osViSwapContext -/* 42098 80066C98 00000000 */ nop +/* 42098 80066C98 00000000 */ nop /* 4209C 80066C9C 3C02800B */ lui $v0, %hi(D_800AF910) /* 420A0 80066CA0 9442F910 */ lhu $v0, %lo(D_800AF910)($v0) /* 420A4 80066CA4 2442FFFF */ addiu $v0, $v0, -1 @@ -47,9 +47,9 @@ glabel viMgrMain /* 420AC 80066CAC A422F910 */ sh $v0, %lo(D_800AF910)($at) /* 420B0 80066CB0 3042FFFF */ andi $v0, $v0, 0xffff /* 420B4 80066CB4 1440000C */ bnez $v0, .L80066CE8 -/* 420B8 80066CB8 00000000 */ nop +/* 420B8 80066CB8 00000000 */ nop /* 420BC 80066CBC 0C01B2E8 */ jal osViGetCurrentContext -/* 420C0 80066CC0 00000000 */ nop +/* 420C0 80066CC0 00000000 */ nop /* 420C4 80066CC4 8C440010 */ lw $a0, 0x10($v0) /* 420C8 80066CC8 10800004 */ beqz $a0, .L80066CDC /* 420CC 80066CCC 00408021 */ addu $s0, $v0, $zero @@ -100,9 +100,9 @@ glabel viMgrMain /* 42174 80066D74 AC23A60C */ sw $v1, %lo(D_8009A60C)($at) .L80066D78: /* 42178 80066D78 0C019935 */ jal osTimerInterrupt -/* 4217C 80066D7C 00000000 */ nop +/* 4217C 80066D7C 00000000 */ nop /* 42180 80066D80 08019B19 */ j .L80066C64 -/* 42184 80066D84 00000000 */ nop +/* 42184 80066D84 00000000 */ nop /* 42188 80066D88 8FBF002C */ lw $ra, 0x2c($sp) /* 4218C 80066D8C 8FB40028 */ lw $s4, 0x28($sp) /* 42190 80066D90 8FB30024 */ lw $s3, 0x24($sp) @@ -111,5 +111,5 @@ glabel viMgrMain /* 4219C 80066D9C 8FB00018 */ lw $s0, 0x18($sp) /* 421A0 80066DA0 03E00008 */ jr $ra /* 421A4 80066DA4 27BD0030 */ addiu $sp, $sp, 0x30 -/* 421A8 80066DA8 00000000 */ nop -/* 421AC 80066DAC 00000000 */ nop +/* 421A8 80066DA8 00000000 */ nop +/* 421AC 80066DAC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s b/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s index 94c7acc757..8f5f0573b5 100644 --- a/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s +++ b/asm/nonmatchings/os/code_421b0_len_60/osViSetEvent.s @@ -24,5 +24,5 @@ glabel osViSetEvent /* 421FC 80066DFC 8FB00010 */ lw $s0, 0x10($sp) /* 42200 80066E00 03E00008 */ jr $ra /* 42204 80066E04 27BD0020 */ addiu $sp, $sp, 0x20 -/* 42208 80066E08 00000000 */ nop -/* 4220C 80066E0C 00000000 */ nop +/* 42208 80066E08 00000000 */ nop +/* 4220C 80066E0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s b/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s index 6b73205d23..113a194cc6 100644 --- a/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s +++ b/asm/nonmatchings/os/code_42210_len_50/osViSetMode.s @@ -21,4 +21,4 @@ glabel osViSetMode /* 42250 80066E50 8FB00010 */ lw $s0, 0x10($sp) /* 42254 80066E54 03E00008 */ jr $ra /* 42258 80066E58 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4225C 80066E5C 00000000 */ nop +/* 4225C 80066E5C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s b/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s index e5c2147d9a..d7d93a1839 100644 --- a/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s +++ b/asm/nonmatchings/os/code_42260_len_170/osViSetSpecialFeatures.s @@ -99,6 +99,6 @@ glabel osViSetSpecialFeatures /* 423B8 80066FB8 8FB00010 */ lw $s0, 0x10($sp) /* 423BC 80066FBC 03E00008 */ jr $ra /* 423C0 80066FC0 27BD0018 */ addiu $sp, $sp, 0x18 -/* 423C4 80066FC4 00000000 */ nop -/* 423C8 80066FC8 00000000 */ nop -/* 423CC 80066FCC 00000000 */ nop +/* 423C4 80066FC4 00000000 */ nop +/* 423C8 80066FC8 00000000 */ nop +/* 423CC 80066FCC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s b/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s index 5b909d84b4..8b2f4e5ed2 100644 --- a/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s +++ b/asm/nonmatchings/os/code_423d0_len_50/osViSetYScale.s @@ -19,6 +19,6 @@ glabel osViSetYScale /* 42408 80067008 D7B40018 */ ldc1 $f20, 0x18($sp) /* 4240C 8006700C 03E00008 */ jr $ra /* 42410 80067010 27BD0020 */ addiu $sp, $sp, 0x20 -/* 42414 80067014 00000000 */ nop -/* 42418 80067018 00000000 */ nop -/* 4241C 8006701C 00000000 */ nop +/* 42414 80067014 00000000 */ nop +/* 42418 80067018 00000000 */ nop +/* 4241C 8006701C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s b/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s index e4525b0b47..ededfd2ec7 100644 --- a/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s +++ b/asm/nonmatchings/os/code_42420_len_50/osViSwapBuffer.s @@ -19,6 +19,6 @@ glabel osViSwapBuffer /* 42458 80067058 8FB00010 */ lw $s0, 0x10($sp) /* 4245C 8006705C 03E00008 */ jr $ra /* 42460 80067060 27BD0018 */ addiu $sp, $sp, 0x18 -/* 42464 80067064 00000000 */ nop -/* 42468 80067068 00000000 */ nop -/* 4246C 8006706C 00000000 */ nop +/* 42464 80067064 00000000 */ nop +/* 42468 80067068 00000000 */ nop +/* 4246C 8006706C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s b/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s index ee2ea144b9..e29ef3f0d6 100644 --- a/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s +++ b/asm/nonmatchings/os/code_42470_len_310/osViSwapContext.s @@ -48,7 +48,7 @@ glabel osViSwapContext /* 42514 80067114 8C42002C */ lw $v0, 0x2c($v0) /* 42518 80067118 30420FFF */ andi $v0, $v0, 0xfff /* 4251C 8006711C 44822000 */ mtc1 $v0, $f4 -/* 42520 80067120 00000000 */ nop +/* 42520 80067120 00000000 */ nop /* 42524 80067124 04410004 */ bgez $v0, .L80067138 /* 42528 80067128 46802121 */ cvt.d.w $f4, $f4 /* 4252C 8006712C 3C01800A */ lui $at, %hi(D_80099D70) @@ -60,15 +60,15 @@ glabel osViSwapContext /* 42540 80067140 46001082 */ mul.s $f2, $f2, $f0 /* 42544 80067144 3C014F00 */ lui $at, 0x4f00 /* 42548 80067148 44810000 */ mtc1 $at, $f0 -/* 4254C 8006714C 00000000 */ nop +/* 4254C 8006714C 00000000 */ nop /* 42550 80067150 4602003E */ c.le.s $f0, $f2 -/* 42554 80067154 00000000 */ nop -/* 42558 80067158 00000000 */ nop +/* 42554 80067154 00000000 */ nop +/* 42558 80067158 00000000 */ nop /* 4255C 8006715C 45030006 */ bc1tl .L80067178 /* 42560 80067160 46001001 */ sub.s $f0, $f2, $f0 /* 42564 80067164 4600100D */ trunc.w.s $f0, $f2 /* 42568 80067168 44040000 */ mfc1 $a0, $f0 -/* 4256C 8006716C 00000000 */ nop +/* 4256C 8006716C 00000000 */ nop /* 42570 80067170 08019C63 */ j .L8006718C /* 42574 80067174 00111080 */ sll $v0, $s1, 2 .L80067178: @@ -206,5 +206,5 @@ glabel osViSwapContext /* 4276C 8006736C 8FB00010 */ lw $s0, 0x10($sp) /* 42770 80067370 03E00008 */ jr $ra /* 42774 80067374 27BD0028 */ addiu $sp, $sp, 0x28 -/* 42778 80067378 00000000 */ nop -/* 4277C 8006737C 00000000 */ nop +/* 42778 80067378 00000000 */ nop +/* 4277C 8006737C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42780_len_120/guMtxIdent.s b/asm/nonmatchings/os/code_42780_len_120/guMtxIdent.s index 9777562795..c321480e36 100644 --- a/asm/nonmatchings/os/code_42780_len_120/guMtxIdent.s +++ b/asm/nonmatchings/os/code_42780_len_120/guMtxIdent.s @@ -21,8 +21,8 @@ glabel guMtxIdent /* 42880 80067480 AC800038 */ sw $zero, 0x38($a0) /* 42884 80067484 03E00008 */ jr $ra /* 42888 80067488 AC80003C */ sw $zero, 0x3c($a0) -/* 4288C 8006748C 00000000 */ nop -/* 42890 80067490 00000000 */ nop -/* 42894 80067494 00000000 */ nop -/* 42898 80067498 00000000 */ nop -/* 4289C 8006749C 00000000 */ nop +/* 4288C 8006748C 00000000 */ nop +/* 42890 80067490 00000000 */ nop +/* 42894 80067494 00000000 */ nop +/* 42898 80067498 00000000 */ nop +/* 4289C 8006749C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42780_len_120/osViBlack.s b/asm/nonmatchings/os/code_42780_len_120/osViBlack.s index 42c4003697..845b900cd8 100644 --- a/asm/nonmatchings/os/code_42780_len_120/osViBlack.s +++ b/asm/nonmatchings/os/code_42780_len_120/osViBlack.s @@ -27,4 +27,4 @@ glabel osViBlack /* 427D0 800673D0 8FB00010 */ lw $s0, 0x10($sp) /* 427D4 800673D4 03E00008 */ jr $ra /* 427D8 800673D8 27BD0018 */ addiu $sp, $sp, 0x18 -/* 427DC 800673DC 00000000 */ nop +/* 427DC 800673DC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42780_len_120/osViRepeatLine.s b/asm/nonmatchings/os/code_42780_len_120/osViRepeatLine.s index 63dd2c2f58..99d59eee8c 100644 --- a/asm/nonmatchings/os/code_42780_len_120/osViRepeatLine.s +++ b/asm/nonmatchings/os/code_42780_len_120/osViRepeatLine.s @@ -27,4 +27,4 @@ glabel osViRepeatLine /* 42830 80067430 8FB00010 */ lw $s0, 0x10($sp) /* 42834 80067434 03E00008 */ jr $ra /* 42838 80067438 27BD0018 */ addiu $sp, $sp, 0x18 -/* 4283C 8006743C 00000000 */ nop +/* 4283C 8006743C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s b/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s index 719602125c..c832d3d69b 100644 --- a/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s +++ b/asm/nonmatchings/os/code_42900_len_80/guMtxF2L.s @@ -27,11 +27,11 @@ glabel guMtxF2L /* 42954 80067554 14B8FFEE */ bne $a1, $t8, .L80067510 /* 42958 80067558 24840008 */ addiu $a0, $a0, 8 /* 4295C 8006755C 03E00008 */ jr $ra -/* 42960 80067560 00000000 */ nop -/* 42964 80067564 00000000 */ nop -/* 42968 80067568 00000000 */ nop -/* 4296C 8006756C 00000000 */ nop -/* 42970 80067570 00000000 */ nop -/* 42974 80067574 00000000 */ nop -/* 42978 80067578 00000000 */ nop -/* 4297C 8006757C 00000000 */ nop +/* 42960 80067560 00000000 */ nop +/* 42964 80067564 00000000 */ nop +/* 42968 80067568 00000000 */ nop +/* 4296C 8006756C 00000000 */ nop +/* 42970 80067570 00000000 */ nop +/* 42974 80067574 00000000 */ nop +/* 42978 80067578 00000000 */ nop +/* 4297C 8006757C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s b/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s index 4cdbf06c9d..4769f465b2 100644 --- a/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s +++ b/asm/nonmatchings/os/code_42980_len_80/guMtxL2F.s @@ -16,11 +16,11 @@ glabel guMtxL2F /* 429A8 800675A8 312EFFFF */ andi $t6, $t1, 0xffff /* 429AC 800675AC 01AE7825 */ or $t7, $t5, $t6 /* 429B0 800675B0 448C2000 */ mtc1 $t4, $f4 -/* 429B4 800675B4 00000000 */ nop +/* 429B4 800675B4 00000000 */ nop /* 429B8 800675B8 468021A0 */ cvt.s.w $f6, $f4 /* 429BC 800675BC 46003202 */ mul.s $f8, $f6, $f0 /* 429C0 800675C0 448F5000 */ mtc1 $t7, $f10 -/* 429C4 800675C4 00000000 */ nop +/* 429C4 800675C4 00000000 */ nop /* 429C8 800675C8 46805420 */ cvt.s.w $f16, $f10 /* 429CC 800675CC 46008482 */ mul.s $f18, $f16, $f0 /* 429D0 800675D0 E4880000 */ swc1 $f8, ($a0) @@ -29,9 +29,9 @@ glabel guMtxL2F /* 429DC 800675DC 14B8FFEC */ bne $a1, $t8, .L80067590 /* 429E0 800675E0 24840008 */ addiu $a0, $a0, 8 /* 429E4 800675E4 03E00008 */ jr $ra -/* 429E8 800675E8 00000000 */ nop -/* 429EC 800675EC 00000000 */ nop -/* 429F0 800675F0 00000000 */ nop -/* 429F4 800675F4 00000000 */ nop -/* 429F8 800675F8 00000000 */ nop -/* 429FC 800675FC 00000000 */ nop +/* 429E8 800675E8 00000000 */ nop +/* 429EC 800675EC 00000000 */ nop +/* 429F0 800675F0 00000000 */ nop +/* 429F4 800675F4 00000000 */ nop +/* 429F8 800675F8 00000000 */ nop +/* 429FC 800675FC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s b/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s index 5090900bec..9da08b46b5 100644 --- a/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s +++ b/asm/nonmatchings/os/code_42a00_len_100/guMtxCatF.s @@ -30,7 +30,7 @@ glabel guMtxCatF /* 42A5C 8006765C 254A0004 */ addiu $t2, $t2, 4 /* 42A60 80067660 24840010 */ addiu $a0, $a0, 0x10 /* 42A64 80067664 1482FFEA */ bne $a0, $v0, .L80067610 -/* 42A68 80067668 00000000 */ nop +/* 42A68 80067668 00000000 */ nop /* 42A6C 8006766C E4C8003C */ swc1 $f8, 0x3c($a2) /* 42A70 80067670 8FA80000 */ lw $t0, ($sp) /* 42A74 80067674 8FA90004 */ lw $t1, 4($sp) @@ -64,7 +64,7 @@ glabel guMtxCatF /* 42AE4 800676E4 ACC70038 */ sw $a3, 0x38($a2) /* 42AE8 800676E8 03E00008 */ jr $ra /* 42AEC 800676EC 27BD0040 */ addiu $sp, $sp, 0x40 -/* 42AF0 800676F0 00000000 */ nop -/* 42AF4 800676F4 00000000 */ nop -/* 42AF8 800676F8 00000000 */ nop -/* 42AFC 800676FC 00000000 */ nop +/* 42AF0 800676F0 00000000 */ nop +/* 42AF4 800676F4 00000000 */ nop +/* 42AF8 800676F8 00000000 */ nop +/* 42AFC 800676FC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42b00_len_c0/guScale.s b/asm/nonmatchings/os/code_42b00_len_c0/guScale.s index a9ed9d1986..2265a6b7df 100644 --- a/asm/nonmatchings/os/code_42b00_len_c0/guScale.s +++ b/asm/nonmatchings/os/code_42b00_len_c0/guScale.s @@ -5,32 +5,32 @@ glabel guScale /* 42B00 80067700 3C014780 */ lui $at, 0x4780 /* 42B04 80067704 44812000 */ mtc1 $at, $f4 /* 42B08 80067708 44853000 */ mtc1 $a1, $f6 -/* 42B0C 8006770C 00000000 */ nop +/* 42B0C 8006770C 00000000 */ nop /* 42B10 80067710 46043202 */ mul.s $f8, $f6, $f4 /* 42B14 80067714 4600428D */ trunc.w.s $f10, $f8 /* 42B18 80067718 44095000 */ mfc1 $t1, $f10 -/* 42B1C 8006771C 00000000 */ nop +/* 42B1C 8006771C 00000000 */ nop /* 42B20 80067720 00095402 */ srl $t2, $t1, 0x10 /* 42B24 80067724 000A4400 */ sll $t0, $t2, 0x10 /* 42B28 80067728 AC880000 */ sw $t0, ($a0) /* 42B2C 8006772C 00095400 */ sll $t2, $t1, 0x10 /* 42B30 80067730 AC8A0020 */ sw $t2, 0x20($a0) /* 42B34 80067734 44863000 */ mtc1 $a2, $f6 -/* 42B38 80067738 00000000 */ nop +/* 42B38 80067738 00000000 */ nop /* 42B3C 8006773C 46043202 */ mul.s $f8, $f6, $f4 /* 42B40 80067740 4600428D */ trunc.w.s $f10, $f8 /* 42B44 80067744 44095000 */ mfc1 $t1, $f10 -/* 42B48 80067748 00000000 */ nop +/* 42B48 80067748 00000000 */ nop /* 42B4C 8006774C 00094402 */ srl $t0, $t1, 0x10 /* 42B50 80067750 AC880008 */ sw $t0, 8($a0) /* 42B54 80067754 312AFFFF */ andi $t2, $t1, 0xffff /* 42B58 80067758 AC8A0028 */ sw $t2, 0x28($a0) /* 42B5C 8006775C 44873000 */ mtc1 $a3, $f6 -/* 42B60 80067760 00000000 */ nop +/* 42B60 80067760 00000000 */ nop /* 42B64 80067764 46043202 */ mul.s $f8, $f6, $f4 /* 42B68 80067768 4600428D */ trunc.w.s $f10, $f8 /* 42B6C 8006776C 44095000 */ mfc1 $t1, $f10 -/* 42B70 80067770 00000000 */ nop +/* 42B70 80067770 00000000 */ nop /* 42B74 80067774 00095402 */ srl $t2, $t1, 0x10 /* 42B78 80067778 000A4400 */ sll $t0, $t2, 0x10 /* 42B7C 8006777C AC880014 */ sw $t0, 0x14($a0) @@ -48,5 +48,5 @@ glabel guScale /* 42BAC 800677AC AC800038 */ sw $zero, 0x38($a0) /* 42BB0 800677B0 03E00008 */ jr $ra /* 42BB4 800677B4 AC80003C */ sw $zero, 0x3c($a0) -/* 42BB8 800677B8 00000000 */ nop -/* 42BBC 800677BC 00000000 */ nop +/* 42BB8 800677B8 00000000 */ nop +/* 42BBC 800677BC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s b/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s index 1456d70e4e..44ea7df10a 100644 --- a/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s +++ b/asm/nonmatchings/os/code_42bc0_len_60/guScaleF.s @@ -20,9 +20,9 @@ glabel guScaleF /* 42BFC 800677FC AC800038 */ sw $zero, 0x38($a0) /* 42C00 80067800 03E00008 */ jr $ra /* 42C04 80067804 AC88003C */ sw $t0, 0x3c($a0) -/* 42C08 80067808 00000000 */ nop -/* 42C0C 8006780C 00000000 */ nop -/* 42C10 80067810 00000000 */ nop -/* 42C14 80067814 00000000 */ nop -/* 42C18 80067818 00000000 */ nop -/* 42C1C 8006781C 00000000 */ nop +/* 42C08 80067808 00000000 */ nop +/* 42C0C 8006780C 00000000 */ nop +/* 42C10 80067810 00000000 */ nop +/* 42C14 80067814 00000000 */ nop +/* 42C18 80067818 00000000 */ nop +/* 42C1C 8006781C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s b/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s index fccc84065a..985ef4ec5a 100644 --- a/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s +++ b/asm/nonmatchings/os/code_42c20_len_e0/guTranslate.s @@ -5,12 +5,12 @@ glabel guTranslate /* 42C20 80067820 3C014780 */ lui $at, 0x4780 /* 42C24 80067824 44812000 */ mtc1 $at, $f4 /* 42C28 80067828 44853000 */ mtc1 $a1, $f6 -/* 42C2C 8006782C 00000000 */ nop +/* 42C2C 8006782C 00000000 */ nop /* 42C30 80067830 46043202 */ mul.s $f8, $f6, $f4 /* 42C34 80067834 4600428D */ trunc.w.s $f10, $f8 /* 42C38 80067838 44095000 */ mfc1 $t1, $f10 /* 42C3C 8006783C 44863000 */ mtc1 $a2, $f6 -/* 42C40 80067840 00000000 */ nop +/* 42C40 80067840 00000000 */ nop /* 42C44 80067844 46043202 */ mul.s $f8, $f6, $f4 /* 42C48 80067848 4600428D */ trunc.w.s $f10, $f8 /* 42C4C 8006784C 440B5000 */ mfc1 $t3, $f10 @@ -25,11 +25,11 @@ glabel guTranslate /* 42C70 80067870 010A4025 */ or $t0, $t0, $t2 /* 42C74 80067874 AC880038 */ sw $t0, 0x38($a0) /* 42C78 80067878 44873000 */ mtc1 $a3, $f6 -/* 42C7C 8006787C 00000000 */ nop +/* 42C7C 8006787C 00000000 */ nop /* 42C80 80067880 46043202 */ mul.s $f8, $f6, $f4 /* 42C84 80067884 4600428D */ trunc.w.s $f10, $f8 /* 42C88 80067888 44095000 */ mfc1 $t1, $f10 -/* 42C8C 8006788C 00000000 */ nop +/* 42C8C 8006788C 00000000 */ nop /* 42C90 80067890 00095402 */ srl $t2, $t1, 0x10 /* 42C94 80067894 000A4400 */ sll $t0, $t2, 0x10 /* 42C98 80067898 25080001 */ addiu $t0, $t0, 1 @@ -56,5 +56,5 @@ glabel guTranslate /* 42CEC 800678EC 35080001 */ ori $t0, $t0, 1 /* 42CF0 800678F0 03E00008 */ jr $ra /* 42CF4 800678F4 AC880008 */ sw $t0, 8($a0) -/* 42CF8 800678F8 00000000 */ nop -/* 42CFC 800678FC 00000000 */ nop +/* 42CF8 800678F8 00000000 */ nop +/* 42CFC 800678FC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s b/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s index d3a68debac..b396d4e4c7 100644 --- a/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s +++ b/asm/nonmatchings/os/code_42d00_len_60/guTranslateF.s @@ -20,9 +20,9 @@ glabel guTranslateF /* 42D3C 8006793C AC870038 */ sw $a3, 0x38($a0) /* 42D40 80067940 03E00008 */ jr $ra /* 42D44 80067944 AC88003C */ sw $t0, 0x3c($a0) -/* 42D48 80067948 00000000 */ nop -/* 42D4C 8006794C 00000000 */ nop -/* 42D50 80067950 00000000 */ nop -/* 42D54 80067954 00000000 */ nop -/* 42D58 80067958 00000000 */ nop -/* 42D5C 8006795C 00000000 */ nop +/* 42D48 80067948 00000000 */ nop +/* 42D4C 8006794C 00000000 */ nop +/* 42D50 80067950 00000000 */ nop +/* 42D54 80067954 00000000 */ nop +/* 42D58 80067958 00000000 */ nop +/* 42D5C 8006795C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s b/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s index a4220522ff..3c05bc5eb5 100644 --- a/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s +++ b/asm/nonmatchings/os/code_42d60_len_80/guMtxCat.s @@ -31,6 +31,6 @@ glabel guMtxCat /* 42DC8 800679C8 8FB000D0 */ lw $s0, 0xd0($sp) /* 42DCC 800679CC 03E00008 */ jr $ra /* 42DD0 800679D0 27BD00E0 */ addiu $sp, $sp, 0xe0 -/* 42DD4 800679D4 00000000 */ nop -/* 42DD8 800679D8 00000000 */ nop -/* 42DDC 800679DC 00000000 */ nop +/* 42DD4 800679D4 00000000 */ nop +/* 42DD8 800679D8 00000000 */ nop +/* 42DDC 800679DC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s b/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s index fc83f61eba..705d157d40 100644 --- a/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s +++ b/asm/nonmatchings/os/code_42de0_len_90/guMtxXFML.s @@ -37,4 +37,4 @@ glabel guMtxXFML /* 42E60 80067A60 D7B40070 */ ldc1 $f20, 0x70($sp) /* 42E64 80067A64 03E00008 */ jr $ra /* 42E68 80067A68 27BD0088 */ addiu $sp, $sp, 0x88 -/* 42E6C 80067A6C 00000000 */ nop +/* 42E6C 80067A6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s b/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s index 81d7a777b7..703ec611a0 100644 --- a/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s +++ b/asm/nonmatchings/os/code_42e70_len_390/guMtxXFMF.s @@ -4,15 +4,15 @@ glabel guMtxXFMF /* 42E70 80067A70 C4820000 */ lwc1 $f2, ($a0) /* 42E74 80067A74 44853000 */ mtc1 $a1, $f6 -/* 42E78 80067A78 00000000 */ nop +/* 42E78 80067A78 00000000 */ nop /* 42E7C 80067A7C 46061082 */ mul.s $f2, $f2, $f6 /* 42E80 80067A80 C4840010 */ lwc1 $f4, 0x10($a0) /* 42E84 80067A84 44864000 */ mtc1 $a2, $f8 -/* 42E88 80067A88 00000000 */ nop +/* 42E88 80067A88 00000000 */ nop /* 42E8C 80067A8C 46082102 */ mul.s $f4, $f4, $f8 /* 42E90 80067A90 C4800020 */ lwc1 $f0, 0x20($a0) /* 42E94 80067A94 44875000 */ mtc1 $a3, $f10 -/* 42E98 80067A98 00000000 */ nop +/* 42E98 80067A98 00000000 */ nop /* 42E9C 80067A9C 460A0002 */ mul.s $f0, $f0, $f10 /* 42EA0 80067AA0 46041080 */ add.s $f2, $f2, $f4 /* 42EA4 80067AA4 46001080 */ add.s $f2, $f2, $f0 @@ -45,4 +45,4 @@ glabel guMtxXFMF /* 42F10 80067B10 46020000 */ add.s $f0, $f0, $f2 /* 42F14 80067B14 03E00008 */ jr $ra /* 42F18 80067B18 E4A00000 */ swc1 $f0, ($a1) -/* 42F1C 80067B1C 00000000 */ nop +/* 42F1C 80067B1C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42e70_len_390/guRotate.s b/asm/nonmatchings/os/code_42e70_len_390/guRotate.s index 3cf940c867..3dd97abf1d 100644 --- a/asm/nonmatchings/os/code_42e70_len_390/guRotate.s +++ b/asm/nonmatchings/os/code_42e70_len_390/guRotate.s @@ -41,9 +41,9 @@ glabel guRotate /* 43110 80067D10 46000606 */ mov.s $f24, $f0 /* 43114 80067D14 4618D301 */ sub.s $f12, $f26, $f24 /* 43118 80067D18 460CE702 */ mul.s $f28, $f28, $f12 -/* 4311C 80067D1C 00000000 */ nop +/* 4311C 80067D1C 00000000 */ nop /* 43120 80067D20 460CB582 */ mul.s $f22, $f22, $f12 -/* 43124 80067D24 00000000 */ nop +/* 43124 80067D24 00000000 */ nop /* 43128 80067D28 460CA502 */ mul.s $f20, $f20, $f12 /* 4312C 80067D2C 27B00010 */ addiu $s0, $sp, 0x10 /* 43130 80067D30 0C019D28 */ jal guMtxIdentF @@ -55,7 +55,7 @@ glabel guRotate /* 43148 80067D48 C7A2005C */ lwc1 $f2, 0x5c($sp) /* 4314C 80067D4C 46066180 */ add.s $f6, $f12, $f6 /* 43150 80067D50 46021302 */ mul.s $f12, $f2, $f2 -/* 43154 80067D54 00000000 */ nop +/* 43154 80067D54 00000000 */ nop /* 43158 80067D58 461E0002 */ mul.s $f0, $f0, $f30 /* 4315C 80067D5C 460CD101 */ sub.s $f4, $f26, $f12 /* 43160 80067D60 4604C102 */ mul.s $f4, $f24, $f4 @@ -96,5 +96,5 @@ glabel guRotate /* 431EC 80067DEC D7B40078 */ ldc1 $f20, 0x78($sp) /* 431F0 80067DF0 03E00008 */ jr $ra /* 431F4 80067DF4 27BD00A8 */ addiu $sp, $sp, 0xa8 -/* 431F8 80067DF8 00000000 */ nop -/* 431FC 80067DFC 00000000 */ nop +/* 431F8 80067DF8 00000000 */ nop +/* 431FC 80067DFC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_42e70_len_390/guRotateF.s b/asm/nonmatchings/os/code_42e70_len_390/guRotateF.s index 8dee932c7e..8b96602a30 100644 --- a/asm/nonmatchings/os/code_42e70_len_390/guRotateF.s +++ b/asm/nonmatchings/os/code_42e70_len_390/guRotateF.s @@ -38,9 +38,9 @@ glabel guRotateF /* 42FA4 80067BA4 46000606 */ mov.s $f24, $f0 /* 42FA8 80067BA8 4618D301 */ sub.s $f12, $f26, $f24 /* 42FAC 80067BAC 460CE702 */ mul.s $f28, $f28, $f12 -/* 42FB0 80067BB0 00000000 */ nop +/* 42FB0 80067BB0 00000000 */ nop /* 42FB4 80067BB4 460CB582 */ mul.s $f22, $f22, $f12 -/* 42FB8 80067BB8 00000000 */ nop +/* 42FB8 80067BB8 00000000 */ nop /* 42FBC 80067BBC 460CA502 */ mul.s $f20, $f20, $f12 /* 42FC0 80067BC0 0C019D28 */ jal guMtxIdentF /* 42FC4 80067BC4 02002021 */ addu $a0, $s0, $zero @@ -55,7 +55,7 @@ glabel guRotateF /* 42FE8 80067BE8 E6000000 */ swc1 $f0, ($s0) /* 42FEC 80067BEC C7A00054 */ lwc1 $f0, 0x54($sp) /* 42FF0 80067BF0 46000302 */ mul.s $f12, $f0, $f0 -/* 42FF4 80067BF4 00000000 */ nop +/* 42FF4 80067BF4 00000000 */ nop /* 42FF8 80067BF8 461E1082 */ mul.s $f2, $f2, $f30 /* 42FFC 80067BFC 460CD181 */ sub.s $f6, $f26, $f12 /* 43000 80067C00 4604A000 */ add.s $f0, $f20, $f4 diff --git a/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s b/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s index d06efd9f7a..faae56ebfc 100644 --- a/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s +++ b/asm/nonmatchings/os/code_43200_len_7c0/__osMotorAccess.s @@ -22,7 +22,7 @@ glabel __osMotorAccess /* 43244 80067E44 24020005 */ addiu $v0, $zero, 5 .L80067E48: /* 43248 80067E48 0C019771 */ jal osSiGetAccess -/* 4324C 80067E4C 00000000 */ nop +/* 4324C 80067E4C 00000000 */ nop /* 43250 80067E50 8E220008 */ lw $v0, 8($s1) /* 43254 80067E54 24030001 */ addiu $v1, $zero, 1 /* 43258 80067E58 00021180 */ sll $v0, $v0, 6 @@ -64,12 +64,12 @@ glabel __osMotorAccess /* 432E4 80067EE4 92420002 */ lbu $v0, 2($s2) /* 432E8 80067EE8 305000C0 */ andi $s0, $v0, 0xc0 /* 432EC 80067EEC 1600000B */ bnez $s0, .L80067F1C -/* 432F0 80067EF0 00000000 */ nop +/* 432F0 80067EF0 00000000 */ nop /* 432F4 80067EF4 16600006 */ bnez $s3, .L80067F10 /* 432F8 80067EF8 240200EB */ addiu $v0, $zero, 0xeb /* 432FC 80067EFC 92420026 */ lbu $v0, 0x26($s2) /* 43300 80067F00 10400006 */ beqz $v0, .L80067F1C -/* 43304 80067F04 00000000 */ nop +/* 43304 80067F04 00000000 */ nop /* 43308 80067F08 08019FC7 */ j .L80067F1C /* 4330C 80067F0C 24100004 */ addiu $s0, $zero, 4 .L80067F10: @@ -78,7 +78,7 @@ glabel __osMotorAccess /* 43318 80067F18 24100004 */ addiu $s0, $zero, 4 .L80067F1C: /* 4331C 80067F1C 0C01978C */ jal osSiRelAccess -/* 43320 80067F20 00000000 */ nop +/* 43320 80067F20 00000000 */ nop /* 43324 80067F24 02001021 */ addu $v0, $s0, $zero .L80067F28: /* 43328 80067F28 8FBF0020 */ lw $ra, 0x20($sp) diff --git a/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s b/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s index 0f7b3a82cb..72921a662c 100644 --- a/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s +++ b/asm/nonmatchings/os/code_43200_len_7c0/osMotorInit.s @@ -35,7 +35,7 @@ glabel osMotorInit /* 433B8 80067FB8 24020004 */ addiu $v0, $zero, 4 .L80067FBC: /* 433BC 80067FBC 1440006C */ bnez $v0, .L80068170 -/* 433C0 80067FC0 00000000 */ nop +/* 433C0 80067FC0 00000000 */ nop /* 433C4 80067FC4 93A3002F */ lbu $v1, 0x2f($sp) /* 433C8 80067FC8 240200FE */ addiu $v0, $zero, 0xfe /* 433CC 80067FCC 10620013 */ beq $v1, $v0, .L8006801C @@ -55,11 +55,11 @@ glabel osMotorInit /* 43400 80068000 24020004 */ addiu $v0, $zero, 4 .L80068004: /* 43404 80068004 1440005A */ bnez $v0, .L80068170 -/* 43408 80068008 00000000 */ nop +/* 43408 80068008 00000000 */ nop /* 4340C 8006800C 93A3002F */ lbu $v1, 0x2f($sp) /* 43410 80068010 24020080 */ addiu $v0, $zero, 0x80 /* 43414 80068014 10620003 */ beq $v1, $v0, .L80068024 -/* 43418 80068018 00000000 */ nop +/* 43418 80068018 00000000 */ nop .L8006801C: /* 4341C 8006801C 0801A05C */ j .L80068170 /* 43420 80068020 2402000B */ addiu $v0, $zero, 0xb @@ -122,7 +122,7 @@ glabel osMotorInit /* 434F4 800680F4 14C8FFEE */ bne $a2, $t0, .L800680B0 /* 434F8 800680F8 24E70010 */ addiu $a3, $a3, 0x10 /* 434FC 800680FC 0801A04D */ j .L80068134 -/* 43500 80068100 00000000 */ nop +/* 43500 80068100 00000000 */ nop .L80068104: /* 43504 80068104 27A80050 */ addiu $t0, $sp, 0x50 .L80068108: @@ -162,4 +162,4 @@ glabel osMotorInit /* 43580 80068180 8FB00060 */ lw $s0, 0x60($sp) /* 43584 80068184 03E00008 */ jr $ra /* 43588 80068188 27BD0078 */ addiu $sp, $sp, 0x78 -/* 4358C 8006818C 00000000 */ nop +/* 4358C 8006818C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_43200_len_7c0/osPfsAllocateFile.s b/asm/nonmatchings/os/code_43200_len_7c0/osPfsAllocateFile.s index fd839a7e9b..f44cf30591 100644 --- a/asm/nonmatchings/os/code_43200_len_7c0/osPfsAllocateFile.s +++ b/asm/nonmatchings/os/code_43200_len_7c0/osPfsAllocateFile.s @@ -109,7 +109,7 @@ glabel osPfsAllocateFile /* 43718 80068318 2402FFFF */ addiu $v0, $zero, -1 /* 4371C 8006831C 8FA30244 */ lw $v1, 0x244($sp) /* 43720 80068320 1062002B */ beq $v1, $v0, .L800683D0 -/* 43724 80068324 00000000 */ nop +/* 43724 80068324 00000000 */ nop /* 43728 80068328 12A0000F */ beqz $s5, .L80068368 /* 4372C 8006832C 02402021 */ addu $a0, $s2, $zero /* 43730 80068330 02802821 */ addu $a1, $s4, $zero @@ -123,9 +123,9 @@ glabel osPfsAllocateFile /* 43750 80068350 A0430001 */ sb $v1, 1($v0) /* 43754 80068354 00401821 */ addu $v1, $v0, $zero /* 43758 80068358 10600006 */ beqz $v1, .L80068374 -/* 4375C 8006835C 00000000 */ nop +/* 4375C 8006835C 00000000 */ nop /* 43760 80068360 0801A11B */ j .L8006846C -/* 43764 80068364 00000000 */ nop +/* 43764 80068364 00000000 */ nop .L80068368: /* 43768 80068368 306300FF */ andi $v1, $v1, 0xff /* 4376C 8006836C 00111200 */ sll $v0, $s1, 8 @@ -143,9 +143,9 @@ glabel osPfsAllocateFile /* 43798 80068398 322700FF */ andi $a3, $s1, 0xff /* 4379C 8006839C 00401821 */ addu $v1, $v0, $zero /* 437A0 800683A0 10600011 */ beqz $v1, .L800683E8 -/* 437A4 800683A4 00000000 */ nop +/* 437A4 800683A4 00000000 */ nop /* 437A8 800683A8 0801A11B */ j .L8006846C -/* 437AC 800683AC 00000000 */ nop +/* 437AC 800683AC 00000000 */ nop .L800683B0: /* 437B0 800683B0 27A50120 */ addiu $a1, $sp, 0x120 /* 437B4 800683B4 0C019194 */ jal bcopy diff --git a/asm/nonmatchings/os/code_43200_len_7c0/osPfsDeclearPage.s b/asm/nonmatchings/os/code_43200_len_7c0/osPfsDeclearPage.s index 40e36421a0..39e6aea56a 100644 --- a/asm/nonmatchings/os/code_43200_len_7c0/osPfsDeclearPage.s +++ b/asm/nonmatchings/os/code_43200_len_7c0/osPfsDeclearPage.s @@ -83,6 +83,6 @@ glabel osPfsDeclearPage .L800685AC: /* 439AC 800685AC 03E00008 */ jr $ra /* 439B0 800685B0 01E01021 */ addu $v0, $t7, $zero -/* 439B4 800685B4 00000000 */ nop -/* 439B8 800685B8 00000000 */ nop -/* 439BC 800685BC 00000000 */ nop +/* 439B4 800685B4 00000000 */ nop +/* 439B8 800685B8 00000000 */ nop +/* 439BC 800685BC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s b/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s index 7edb471d51..0308e7c586 100644 --- a/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s +++ b/asm/nonmatchings/os/code_439c0_len_220/osPfsDeleteFile.s @@ -26,14 +26,14 @@ glabel osPfsDeleteFile /* 43A10 80068610 0C01A370 */ jal osPfsFindFile /* 43A14 80068614 AFA20014 */ sw $v0, 0x14($sp) /* 43A18 80068618 1440004B */ bnez $v0, .L80068748 -/* 43A1C 8006861C 00000000 */ nop +/* 43A1C 8006861C 00000000 */ nop /* 43A20 80068620 92220065 */ lbu $v0, 0x65($s1) /* 43A24 80068624 10400005 */ beqz $v0, .L8006863C /* 43A28 80068628 02202021 */ addu $a0, $s1, $zero /* 43A2C 8006862C 0C01A5B4 */ jal osPfsSelectBank /* 43A30 80068630 00002821 */ addu $a1, $zero, $zero /* 43A34 80068634 14400044 */ bnez $v0, .L80068748 -/* 43A38 80068638 00000000 */ nop +/* 43A38 80068638 00000000 */ nop .L8006863C: /* 43A3C 8006863C 8E240004 */ lw $a0, 4($s1) /* 43A40 80068640 8E26005C */ lw $a2, 0x5c($s1) @@ -44,7 +44,7 @@ glabel osPfsDeleteFile /* 43A54 80068654 0C01A874 */ jal osContRamRead /* 43A58 80068658 30C6FFFF */ andi $a2, $a2, 0xffff /* 43A5C 8006865C 1440003A */ bnez $v0, .L80068748 -/* 43A60 80068660 00000000 */ nop +/* 43A60 80068660 00000000 */ nop /* 43A64 80068664 93B3011E */ lbu $s3, 0x11e($sp) /* 43A68 80068668 92220064 */ lbu $v0, 0x64($s1) /* 43A6C 8006866C 93B2011F */ lbu $s2, 0x11f($sp) @@ -73,10 +73,10 @@ glabel osPfsDeleteFile /* 43AC4 800686C4 0C01A7A3 */ jal osPfsRWInode /* 43AC8 800686C8 02003821 */ addu $a3, $s0, $zero /* 43ACC 800686CC 1440001E */ bnez $v0, .L80068748 -/* 43AD0 800686D0 00000000 */ nop +/* 43AD0 800686D0 00000000 */ nop /* 43AD4 800686D4 97A2013C */ lhu $v0, 0x13c($sp) /* 43AD8 800686D8 10550008 */ beq $v0, $s5, .L800686FC -/* 43ADC 800686DC 00000000 */ nop +/* 43ADC 800686DC 00000000 */ nop /* 43AE0 800686E0 93B3013C */ lbu $s3, 0x13c($sp) /* 43AE4 800686E4 92220064 */ lbu $v0, 0x64($s1) /* 43AE8 800686E8 93B2013D */ lbu $s2, 0x13d($sp) @@ -102,7 +102,7 @@ glabel osPfsDeleteFile /* 43B34 80068734 0C01A8F0 */ jal osContRamWrite /* 43B38 80068738 30C6FFFF */ andi $a2, $a2, 0xffff /* 43B3C 8006873C 0801A1D2 */ j .L80068748 -/* 43B40 80068740 00000000 */ nop +/* 43B40 80068740 00000000 */ nop .L80068744: /* 43B44 80068744 24020003 */ addiu $v0, $zero, 3 .L80068748: diff --git a/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s b/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s index d8e00f4edb..cb814354fc 100644 --- a/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s +++ b/asm/nonmatchings/os/code_439c0_len_220/osPfsReleasePages.s @@ -30,6 +30,6 @@ glabel osPfsReleasePages .L800687CC: /* 43BCC 800687CC 03E00008 */ jr $ra /* 43BD0 800687D0 00001021 */ addu $v0, $zero, $zero -/* 43BD4 800687D4 00000000 */ nop -/* 43BD8 800687D8 00000000 */ nop -/* 43BDC 800687DC 00000000 */ nop +/* 43BD4 800687D4 00000000 */ nop +/* 43BD8 800687D8 00000000 */ nop +/* 43BDC 800687DC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s b/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s index ef3ed8f608..d511dcf076 100644 --- a/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s +++ b/asm/nonmatchings/os/code_43be0_len_5e0/osPfsFileState.s @@ -26,14 +26,14 @@ glabel osPfsFileState /* 44074 80068C74 0C01A775 */ jal osCheckId /* 44078 80068C78 02202021 */ addu $a0, $s1, $zero /* 4407C 80068C7C 14400044 */ bnez $v0, .L80068D90 -/* 44080 80068C80 00000000 */ nop +/* 44080 80068C80 00000000 */ nop /* 44084 80068C84 92220065 */ lbu $v0, 0x65($s1) /* 44088 80068C88 10400005 */ beqz $v0, .L80068CA0 /* 4408C 80068C8C 02202021 */ addu $a0, $s1, $zero /* 44090 80068C90 0C01A5B4 */ jal osPfsSelectBank /* 44094 80068C94 00002821 */ addu $a1, $zero, $zero /* 44098 80068C98 1440003D */ bnez $v0, .L80068D90 -/* 4409C 80068C9C 00000000 */ nop +/* 4409C 80068C9C 00000000 */ nop .L80068CA0: /* 440A0 80068CA0 8E240004 */ lw $a0, 4($s1) /* 440A4 80068CA4 8E26005C */ lw $a2, 0x5c($s1) @@ -43,7 +43,7 @@ glabel osPfsFileState /* 440B4 80068CB4 0C01A874 */ jal osContRamRead /* 440B8 80068CB8 30C6FFFF */ andi $a2, $a2, 0xffff /* 440BC 80068CBC 14400034 */ bnez $v0, .L80068D90 -/* 440C0 80068CC0 00000000 */ nop +/* 440C0 80068CC0 00000000 */ nop /* 440C4 80068CC4 97A20114 */ lhu $v0, 0x114($sp) /* 440C8 80068CC8 10400031 */ beqz $v0, .L80068D90 /* 440CC 80068CCC 24020005 */ addiu $v0, $zero, 5 @@ -71,7 +71,7 @@ glabel osPfsFileState /* 44118 80068D18 0C01A7A3 */ jal osPfsRWInode /* 4411C 80068D1C 00003021 */ addu $a2, $zero, $zero /* 44120 80068D20 1440001B */ bnez $v0, .L80068D90 -/* 44124 80068D24 00000000 */ nop +/* 44124 80068D24 00000000 */ nop .L80068D28: /* 44128 80068D28 320200FF */ andi $v0, $s0, 0xff /* 4412C 80068D2C 00021040 */ sll $v0, $v0, 1 @@ -110,6 +110,6 @@ glabel osPfsFileState /* 441A8 80068DA8 8FB00130 */ lw $s0, 0x130($sp) /* 441AC 80068DAC 03E00008 */ jr $ra /* 441B0 80068DB0 27BD0150 */ addiu $sp, $sp, 0x150 -/* 441B4 80068DB4 00000000 */ nop -/* 441B8 80068DB8 00000000 */ nop -/* 441BC 80068DBC 00000000 */ nop +/* 441B4 80068DB4 00000000 */ nop +/* 441B8 80068DB8 00000000 */ nop +/* 441BC 80068DBC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s b/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s index bcb8b2204f..8ebaf71cf8 100644 --- a/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s +++ b/asm/nonmatchings/os/code_43be0_len_5e0/osPfsReadWriteFile.s @@ -46,7 +46,7 @@ glabel osPfsReadWriteFile /* 43C84 80068884 00002821 */ addu $a1, $zero, $zero /* 43C88 80068888 00401821 */ addu $v1, $v0, $zero /* 43C8C 8006888C 146000DA */ bnez $v1, .L80068BF8 -/* 43C90 80068890 00000000 */ nop +/* 43C90 80068890 00000000 */ nop .L80068894: /* 43C94 80068894 8E040004 */ lw $a0, 4($s0) /* 43C98 80068898 8E06005C */ lw $a2, 0x5c($s0) @@ -57,7 +57,7 @@ glabel osPfsReadWriteFile /* 43CAC 800688AC 30C6FFFF */ andi $a2, $a2, 0xffff /* 43CB0 800688B0 00401821 */ addu $v1, $v0, $zero /* 43CB4 800688B4 146000D0 */ bnez $v1, .L80068BF8 -/* 43CB8 800688B8 00000000 */ nop +/* 43CB8 800688B8 00000000 */ nop /* 43CBC 800688BC 97A2001C */ lhu $v0, 0x1c($sp) /* 43CC0 800688C0 104000CD */ beqz $v0, .L80068BF8 /* 43CC4 800688C4 24020005 */ addiu $v0, $zero, 5 @@ -68,12 +68,12 @@ glabel osPfsReadWriteFile /* 43CD8 800688D8 8E030060 */ lw $v1, 0x60($s0) /* 43CDC 800688DC 0043102A */ slt $v0, $v0, $v1 /* 43CE0 800688E0 1440000D */ bnez $v0, .L80068918 -/* 43CE4 800688E4 00000000 */ nop +/* 43CE4 800688E4 00000000 */ nop /* 43CE8 800688E8 93A2001E */ lbu $v0, 0x1e($sp) /* 43CEC 800688EC 92030064 */ lbu $v1, 0x64($s0) /* 43CF0 800688F0 0043102B */ sltu $v0, $v0, $v1 /* 43CF4 800688F4 10400008 */ beqz $v0, .L80068918 -/* 43CF8 800688F8 00000000 */ nop +/* 43CF8 800688F8 00000000 */ nop /* 43CFC 800688FC 93A2001F */ lbu $v0, 0x1f($sp) /* 43D00 80068900 2C430001 */ sltiu $v1, $v0, 1 /* 43D04 80068904 2C420080 */ sltiu $v0, $v0, 0x80 @@ -133,12 +133,12 @@ glabel osPfsReadWriteFile /* 43DC0 800689C0 8E020060 */ lw $v0, 0x60($s0) /* 43DC4 800689C4 0062182A */ slt $v1, $v1, $v0 /* 43DC8 800689C8 1460000D */ bnez $v1, .L80068A00 -/* 43DCC 800689CC 00000000 */ nop +/* 43DCC 800689CC 00000000 */ nop /* 43DD0 800689D0 93A2013A */ lbu $v0, 0x13a($sp) /* 43DD4 800689D4 92030064 */ lbu $v1, 0x64($s0) /* 43DD8 800689D8 0043102B */ sltu $v0, $v0, $v1 /* 43DDC 800689DC 10400008 */ beqz $v0, .L80068A00 -/* 43DE0 800689E0 00000000 */ nop +/* 43DE0 800689E0 00000000 */ nop /* 43DE4 800689E4 93A2013B */ lbu $v0, 0x13b($sp) /* 43DE8 800689E8 2C430001 */ sltiu $v1, $v0, 1 /* 43DEC 800689EC 2C420080 */ sltiu $v0, $v0, 0x80 @@ -169,7 +169,7 @@ glabel osPfsReadWriteFile .L80068A40: /* 43E40 80068A40 24020008 */ addiu $v0, $zero, 8 /* 43E44 80068A44 16220028 */ bne $s1, $v0, .L80068AE8 -/* 43E48 80068A48 00000000 */ nop +/* 43E48 80068A48 00000000 */ nop /* 43E4C 80068A4C 93A3013A */ lbu $v1, 0x13a($sp) /* 43E50 80068A50 93A20138 */ lbu $v0, 0x138($sp) /* 43E54 80068A54 306700FF */ andi $a3, $v1, 0xff @@ -191,12 +191,12 @@ glabel osPfsReadWriteFile /* 43E90 80068A90 8E020060 */ lw $v0, 0x60($s0) /* 43E94 80068A94 0062182A */ slt $v1, $v1, $v0 /* 43E98 80068A98 1460000D */ bnez $v1, .L80068AD0 -/* 43E9C 80068A9C 00000000 */ nop +/* 43E9C 80068A9C 00000000 */ nop /* 43EA0 80068AA0 93A2013A */ lbu $v0, 0x13a($sp) /* 43EA4 80068AA4 92030064 */ lbu $v1, 0x64($s0) /* 43EA8 80068AA8 0043102B */ sltu $v0, $v0, $v1 /* 43EAC 80068AAC 10400008 */ beqz $v0, .L80068AD0 -/* 43EB0 80068AB0 00000000 */ nop +/* 43EB0 80068AB0 00000000 */ nop /* 43EB4 80068AB4 93A2013B */ lbu $v0, 0x13b($sp) /* 43EB8 80068AB8 2C430001 */ sltiu $v1, $v0, 1 /* 43EBC 80068ABC 2C420080 */ sltiu $v0, $v0, 0x80 @@ -216,7 +216,7 @@ glabel osPfsReadWriteFile /* 43EE8 80068AE8 92020065 */ lbu $v0, 0x65($s0) /* 43EEC 80068AEC 93A5013A */ lbu $a1, 0x13a($sp) /* 43EF0 80068AF0 10450006 */ beq $v0, $a1, .L80068B0C -/* 43EF4 80068AF4 00000000 */ nop +/* 43EF4 80068AF4 00000000 */ nop /* 43EF8 80068AF8 0C01A5B4 */ jal osPfsSelectBank /* 43EFC 80068AFC 02002021 */ addu $a0, $s0, $zero /* 43F00 80068B00 00401821 */ addu $v1, $v0, $zero @@ -253,7 +253,7 @@ glabel osPfsReadWriteFile .L80068B70: /* 43F70 80068B70 24020001 */ addiu $v0, $zero, 1 /* 43F74 80068B74 1462001D */ bne $v1, $v0, .L80068BEC -/* 43F78 80068B78 00000000 */ nop +/* 43F78 80068B78 00000000 */ nop /* 43F7C 80068B7C 93A30020 */ lbu $v1, 0x20($sp) /* 43F80 80068B80 30620002 */ andi $v0, $v1, 2 /* 43F84 80068B84 14400019 */ bnez $v0, .L80068BEC @@ -266,7 +266,7 @@ glabel osPfsReadWriteFile /* 43FA0 80068BA0 00002821 */ addu $a1, $zero, $zero /* 43FA4 80068BA4 00401821 */ addu $v1, $v0, $zero /* 43FA8 80068BA8 14600013 */ bnez $v1, .L80068BF8 -/* 43FAC 80068BAC 00000000 */ nop +/* 43FAC 80068BAC 00000000 */ nop .L80068BB0: /* 43FB0 80068BB0 8E06005C */ lw $a2, 0x5c($s0) /* 43FB4 80068BB4 AFA00010 */ sw $zero, 0x10($sp) @@ -278,9 +278,9 @@ glabel osPfsReadWriteFile /* 43FCC 80068BCC 30C6FFFF */ andi $a2, $a2, 0xffff /* 43FD0 80068BD0 00401821 */ addu $v1, $v0, $zero /* 43FD4 80068BD4 10600005 */ beqz $v1, .L80068BEC -/* 43FD8 80068BD8 00000000 */ nop +/* 43FD8 80068BD8 00000000 */ nop /* 43FDC 80068BDC 0801A2FE */ j .L80068BF8 -/* 43FE0 80068BE0 00000000 */ nop +/* 43FE0 80068BE0 00000000 */ nop .L80068BE4: /* 43FE4 80068BE4 0801A2FE */ j .L80068BF8 /* 43FE8 80068BE8 00601021 */ addu $v0, $v1, $zero diff --git a/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s b/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s index 493d50a9ed..f8800d4877 100644 --- a/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s +++ b/asm/nonmatchings/os/code_441c0_len_1c0/osPfsFindFile.s @@ -26,7 +26,7 @@ glabel osPfsFindFile /* 44214 80068E14 02002021 */ addu $a0, $s0, $zero /* 44218 80068E18 00403821 */ addu $a3, $v0, $zero /* 4421C 80068E1C 14E0004A */ bnez $a3, .L80068F48 -/* 44220 80068E20 00000000 */ nop +/* 44220 80068E20 00000000 */ nop /* 44224 80068E24 8E020050 */ lw $v0, 0x50($s0) /* 44228 80068E28 18400044 */ blez $v0, .L80068F3C /* 4422C 80068E2C 00008821 */ addu $s1, $zero, $zero @@ -51,10 +51,10 @@ glabel osPfsFindFile /* 44274 80068E74 32E2FFFF */ andi $v0, $s7, 0xffff /* 44278 80068E78 97A30014 */ lhu $v1, 0x14($sp) /* 4427C 80068E7C 1462002A */ bne $v1, $v0, .L80068F28 -/* 44280 80068E80 00000000 */ nop +/* 44280 80068E80 00000000 */ nop /* 44284 80068E84 8FA20010 */ lw $v0, 0x10($sp) /* 44288 80068E88 145E0027 */ bne $v0, $fp, .L80068F28 -/* 4428C 80068E8C 00000000 */ nop +/* 4428C 80068E8C 00000000 */ nop /* 44290 80068E90 1240000C */ beqz $s2, .L80068EC4 /* 44294 80068E94 00004021 */ addu $t0, $zero, $zero /* 44298 80068E98 00002021 */ addu $a0, $zero, $zero @@ -74,7 +74,7 @@ glabel osPfsFindFile /* 442C8 80068EC8 2D030001 */ sltiu $v1, $t0, 1 /* 442CC 80068ECC 00431024 */ and $v0, $v0, $v1 /* 442D0 80068ED0 1040000C */ beqz $v0, .L80068F04 -/* 442D4 80068ED4 00000000 */ nop +/* 442D4 80068ED4 00000000 */ nop /* 442D8 80068ED8 00002021 */ addu $a0, $zero, $zero /* 442DC 80068EDC 02603021 */ addu $a2, $s3, $zero /* 442E0 80068EE0 02A02821 */ addu $a1, $s5, $zero @@ -89,7 +89,7 @@ glabel osPfsFindFile /* 44300 80068F00 24A50001 */ addiu $a1, $a1, 1 .L80068F04: /* 44304 80068F04 15000008 */ bnez $t0, .L80068F28 -/* 44308 80068F08 00000000 */ nop +/* 44308 80068F08 00000000 */ nop /* 4430C 80068F0C AE910000 */ sw $s1, ($s4) .L80068F10: /* 44310 80068F10 0801A3D2 */ j .L80068F48 @@ -105,7 +105,7 @@ glabel osPfsFindFile /* 4432C 80068F2C 26310001 */ addiu $s1, $s1, 1 /* 44330 80068F30 0222102A */ slt $v0, $s1, $v0 /* 44334 80068F34 1440FFC0 */ bnez $v0, .L80068E38 -/* 44338 80068F38 00000000 */ nop +/* 44338 80068F38 00000000 */ nop .L80068F3C: /* 4433C 80068F3C 2402FFFF */ addiu $v0, $zero, -1 /* 44340 80068F40 AE820000 */ sw $v0, ($s4) @@ -124,5 +124,5 @@ glabel osPfsFindFile /* 4436C 80068F6C 8FB00038 */ lw $s0, 0x38($sp) /* 44370 80068F70 03E00008 */ jr $ra /* 44374 80068F74 27BD0060 */ addiu $sp, $sp, 0x60 -/* 44378 80068F78 00000000 */ nop -/* 4437C 80068F7C 00000000 */ nop +/* 44378 80068F78 00000000 */ nop +/* 4437C 80068F7C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_44380_len_4e0/osPfsCheckRamArea.s b/asm/nonmatchings/os/code_44380_len_4e0/osPfsCheckRamArea.s index c8e7386f35..5b2f4e9f1c 100644 --- a/asm/nonmatchings/os/code_44380_len_4e0/osPfsCheckRamArea.s +++ b/asm/nonmatchings/os/code_44380_len_4e0/osPfsCheckRamArea.s @@ -55,6 +55,6 @@ glabel osPfsCheckRamArea /* 44848 80069448 8FB00078 */ lw $s0, 0x78($sp) /* 4484C 8006944C 03E00008 */ jr $ra /* 44850 80069450 27BD0088 */ addiu $sp, $sp, 0x88 -/* 44854 80069454 00000000 */ nop -/* 44858 80069458 00000000 */ nop -/* 4485C 8006945C 00000000 */ nop +/* 44854 80069454 00000000 */ nop +/* 44858 80069458 00000000 */ nop +/* 4485C 8006945C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s b/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s index 40984abeed..828e5656a3 100644 --- a/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s +++ b/asm/nonmatchings/os/code_44380_len_4e0/osPfsFreeBlocks.s @@ -22,7 +22,7 @@ glabel osPfsFreeBlocks /* 443C0 80068FC0 0C01A775 */ jal osCheckId /* 443C4 80068FC4 02402021 */ addu $a0, $s2, $zero /* 443C8 80068FC8 14400027 */ bnez $v0, .L80069068 -/* 443CC 80068FCC 00000000 */ nop +/* 443CC 80068FCC 00000000 */ nop /* 443D0 80068FD0 92420064 */ lbu $v0, 0x64($s2) /* 443D4 80068FD4 0262102B */ sltu $v0, $s3, $v0 /* 443D8 80068FD8 10400020 */ beqz $v0, .L8006905C @@ -36,7 +36,7 @@ glabel osPfsFreeBlocks /* 443F4 80068FF4 0C01A7A3 */ jal osPfsRWInode /* 443F8 80068FF8 02003821 */ addu $a3, $s0, $zero /* 443FC 80068FFC 1440001A */ bnez $v0, .L80069068 -/* 44400 80069000 00000000 */ nop +/* 44400 80069000 00000000 */ nop /* 44404 80069004 16000002 */ bnez $s0, .L80069010 /* 44408 80069008 24020001 */ addiu $v0, $zero, 1 /* 4440C 8006900C 8E420060 */ lw $v0, 0x60($s2) @@ -76,4 +76,4 @@ glabel osPfsFreeBlocks /* 44480 80069080 8FB00110 */ lw $s0, 0x110($sp) /* 44484 80069084 03E00008 */ jr $ra /* 44488 80069088 27BD0130 */ addiu $sp, $sp, 0x130 -/* 4448C 8006908C 00000000 */ nop +/* 4448C 8006908C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_44380_len_4e0/osPfsInitPak.s b/asm/nonmatchings/os/code_44380_len_4e0/osPfsInitPak.s index 345e779029..a89cee2aa7 100644 --- a/asm/nonmatchings/os/code_44380_len_4e0/osPfsInitPak.s +++ b/asm/nonmatchings/os/code_44380_len_4e0/osPfsInitPak.s @@ -49,14 +49,14 @@ glabel osPfsInitPak /* 44640 80069240 97A3002E */ lhu $v1, 0x2e($sp) /* 44644 80069244 97A20052 */ lhu $v0, 0x52($sp) /* 44648 80069248 1062000B */ beq $v1, $v0, .L80069278 -/* 4464C 8006924C 00000000 */ nop +/* 4464C 8006924C 00000000 */ nop .L80069250: /* 44650 80069250 02202021 */ addu $a0, $s1, $zero /* 44654 80069254 0C01A6A9 */ jal osCheckPackId /* 44658 80069258 02402821 */ addu $a1, $s2, $zero /* 4465C 8006925C 00408021 */ addu $s0, $v0, $zero /* 44660 80069260 12000005 */ beqz $s0, .L80069278 -/* 44664 80069264 00000000 */ nop +/* 44664 80069264 00000000 */ nop /* 44668 80069268 8E230000 */ lw $v1, ($s1) /* 4466C 8006926C 34630004 */ ori $v1, $v1, 4 /* 44670 80069270 0801A4DB */ j .L8006936C diff --git a/asm/nonmatchings/os/code_44380_len_4e0/osPfsNumFiles.s b/asm/nonmatchings/os/code_44380_len_4e0/osPfsNumFiles.s index 9d80eed91b..705847288f 100644 --- a/asm/nonmatchings/os/code_44380_len_4e0/osPfsNumFiles.s +++ b/asm/nonmatchings/os/code_44380_len_4e0/osPfsNumFiles.s @@ -22,14 +22,14 @@ glabel osPfsNumFiles /* 444D0 800690D0 0C01A775 */ jal osCheckId /* 444D4 800690D4 02002021 */ addu $a0, $s0, $zero /* 444D8 800690D8 14400025 */ bnez $v0, .L80069170 -/* 444DC 800690DC 00000000 */ nop +/* 444DC 800690DC 00000000 */ nop /* 444E0 800690E0 92020065 */ lbu $v0, 0x65($s0) /* 444E4 800690E4 10400005 */ beqz $v0, .L800690FC /* 444E8 800690E8 02002021 */ addu $a0, $s0, $zero /* 444EC 800690EC 0C01A5B4 */ jal osPfsSelectBank /* 444F0 800690F0 00002821 */ addu $a1, $zero, $zero /* 444F4 800690F4 1440001E */ bnez $v0, .L80069170 -/* 444F8 800690F8 00000000 */ nop +/* 444F8 800690F8 00000000 */ nop .L800690FC: /* 444FC 800690FC 8E020050 */ lw $v0, 0x50($s0) /* 44500 80069100 18400015 */ blez $v0, .L80069158 @@ -43,10 +43,10 @@ glabel osPfsNumFiles /* 4451C 8006911C 0C01A874 */ jal osContRamRead /* 44520 80069120 30C6FFFF */ andi $a2, $a2, 0xffff /* 44524 80069124 14400012 */ bnez $v0, .L80069170 -/* 44528 80069128 00000000 */ nop +/* 44528 80069128 00000000 */ nop /* 4452C 8006912C 97A20014 */ lhu $v0, 0x14($sp) /* 44530 80069130 10400004 */ beqz $v0, .L80069144 -/* 44534 80069134 00000000 */ nop +/* 44534 80069134 00000000 */ nop /* 44538 80069138 8FA20010 */ lw $v0, 0x10($sp) /* 4453C 8006913C 0002102B */ sltu $v0, $zero, $v0 /* 44540 80069140 02429021 */ addu $s2, $s2, $v0 @@ -55,7 +55,7 @@ glabel osPfsNumFiles /* 44548 80069148 26310001 */ addiu $s1, $s1, 1 /* 4454C 8006914C 0222102A */ slt $v0, $s1, $v0 /* 44550 80069150 1440FFED */ bnez $v0, .L80069108 -/* 44554 80069154 00000000 */ nop +/* 44554 80069154 00000000 */ nop .L80069158: /* 44558 80069158 AE720000 */ sw $s2, ($s3) /* 4455C 8006915C 8E020050 */ lw $v0, 0x50($s0) diff --git a/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s b/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s index feea3ba39e..3648ad7eb0 100644 --- a/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s +++ b/asm/nonmatchings/os/code_44860_len_60/osPfsRepairId.s @@ -11,7 +11,7 @@ glabel osPfsRepairId /* 44878 80069478 5040000A */ beql $v0, $zero, .L800694A4 /* 4487C 8006947C 24040005 */ addiu $a0, $zero, 5 /* 44880 80069480 0C01A702 */ jal osGetId -/* 44884 80069484 00000000 */ nop +/* 44884 80069484 00000000 */ nop /* 44888 80069488 00402021 */ addu $a0, $v0, $zero /* 4488C 8006948C 14800006 */ bnez $a0, .L800694A8 /* 44890 80069490 00801021 */ addu $v0, $a0, $zero @@ -26,5 +26,5 @@ glabel osPfsRepairId /* 448AC 800694AC 8FB00010 */ lw $s0, 0x10($sp) /* 448B0 800694B0 03E00008 */ jr $ra /* 448B4 800694B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 448B8 800694B8 00000000 */ nop -/* 448BC 800694BC 00000000 */ nop +/* 448B8 800694B8 00000000 */ nop +/* 448BC 800694BC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s b/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s index f261f1a45a..84e3dc75d3 100644 --- a/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s +++ b/asm/nonmatchings/os/code_448c0_len_210/osPfsGetOneChannelData.s @@ -37,6 +37,6 @@ glabel osPfsGetOneChannelData .L800696BC: /* 44ABC 800696BC 03E00008 */ jr $ra /* 44AC0 800696C0 27BD0010 */ addiu $sp, $sp, 0x10 -/* 44AC4 800696C4 00000000 */ nop -/* 44AC8 800696C8 00000000 */ nop -/* 44ACC 800696CC 00000000 */ nop +/* 44AC4 800696C4 00000000 */ nop +/* 44AC8 800696C8 00000000 */ nop +/* 44ACC 800696CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s b/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s index 58a845fa38..62cc713ae5 100644 --- a/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s +++ b/asm/nonmatchings/os/code_448c0_len_210/osPfsGetStatus.s @@ -48,7 +48,7 @@ glabel osPfsGetStatus /* 44968 80069568 24030100 */ addiu $v1, $zero, 0x100 /* 4496C 8006956C 304201FF */ andi $v0, $v0, 0x1ff /* 44970 80069570 10430003 */ beq $v0, $v1, .L80069580 -/* 44974 80069574 00000000 */ nop +/* 44974 80069574 00000000 */ nop /* 44978 80069578 0801A565 */ j .L80069594 /* 4497C 8006957C 24020001 */ addiu $v0, $zero, 1 .L80069580: diff --git a/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s b/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s index 6c138e4cd7..68d14741e2 100644 --- a/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s +++ b/asm/nonmatchings/os/code_44ad0_len_70/osPfsSelectBank.s @@ -29,6 +29,6 @@ glabel osPfsSelectBank /* 44B28 80069728 8FB00038 */ lw $s0, 0x38($sp) /* 44B2C 8006972C 03E00008 */ jr $ra /* 44B30 80069730 27BD0048 */ addiu $sp, $sp, 0x48 -/* 44B34 80069734 00000000 */ nop -/* 44B38 80069738 00000000 */ nop -/* 44B3C 8006973C 00000000 */ nop +/* 44B34 80069734 00000000 */ nop +/* 44B38 80069738 00000000 */ nop +/* 44B3C 8006973C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s b/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s index f8bea1f56f..d240934bc6 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osCheckId.s @@ -8,7 +8,7 @@ glabel osCheckId /* 451E0 80069DE0 AFBF0034 */ sw $ra, 0x34($sp) /* 451E4 80069DE4 92020065 */ lbu $v0, 0x65($s0) /* 451E8 80069DE8 1040000C */ beqz $v0, .L80069E1C -/* 451EC 80069DEC 00000000 */ nop +/* 451EC 80069DEC 00000000 */ nop /* 451F0 80069DF0 0C01A5B4 */ jal osPfsSelectBank /* 451F4 80069DF4 00002821 */ addu $a1, $zero, $zero /* 451F8 80069DF8 00401821 */ addu $v1, $v0, $zero @@ -39,7 +39,7 @@ glabel osCheckId /* 45254 80069E54 27A70010 */ addiu $a3, $sp, 0x10 /* 45258 80069E58 00401821 */ addu $v1, $v0, $zero /* 4525C 80069E5C 14600007 */ bnez $v1, .L80069E7C -/* 45260 80069E60 00000000 */ nop +/* 45260 80069E60 00000000 */ nop .L80069E64: /* 45264 80069E64 2604000C */ addiu $a0, $s0, 0xc /* 45268 80069E68 27A50010 */ addiu $a1, $sp, 0x10 diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s b/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s index 7c0138fd58..6343bc5c03 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osCheckPackId.s @@ -17,7 +17,7 @@ glabel osCheckPackId /* 44ED4 80069AD4 0C01A5B4 */ jal osPfsSelectBank /* 44ED8 80069AD8 00002821 */ addu $a1, $zero, $zero /* 44EDC 80069ADC 14400041 */ bnez $v0, .L80069BE4 -/* 44EE0 80069AE0 00000000 */ nop +/* 44EE0 80069AE0 00000000 */ nop .L80069AE4: /* 44EE4 80069AE4 24130001 */ addiu $s3, $zero, 1 /* 44EE8 80069AE8 27B0001A */ addiu $s0, $sp, 0x1a diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s b/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s index e67c66b25a..daee7df11c 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osGetId.s @@ -9,12 +9,12 @@ glabel osGetId /* 45018 80069C18 AFB1005C */ sw $s1, 0x5c($sp) /* 4501C 80069C1C 92020065 */ lbu $v0, 0x65($s0) /* 45020 80069C20 10400006 */ beqz $v0, .L80069C3C -/* 45024 80069C24 00000000 */ nop +/* 45024 80069C24 00000000 */ nop /* 45028 80069C28 0C01A5B4 */ jal osPfsSelectBank /* 4502C 80069C2C 00002821 */ addu $a1, $zero, $zero /* 45030 80069C30 00401821 */ addu $v1, $v0, $zero /* 45034 80069C34 14600062 */ bnez $v1, .L80069DC0 -/* 45038 80069C38 00000000 */ nop +/* 45038 80069C38 00000000 */ nop .L80069C3C: /* 4503C 80069C3C 8E040004 */ lw $a0, 4($s0) /* 45040 80069C40 8E050008 */ lw $a1, 8($s0) @@ -46,7 +46,7 @@ glabel osGetId /* 450A4 80069CA4 97A3002E */ lhu $v1, 0x2e($sp) /* 450A8 80069CA8 3082FFFF */ andi $v0, $a0, 0xffff /* 450AC 80069CAC 10620013 */ beq $v1, $v0, .L80069CFC -/* 450B0 80069CB0 00000000 */ nop +/* 450B0 80069CB0 00000000 */ nop .L80069CB4: /* 450B4 80069CB4 02002021 */ addu $a0, $s0, $zero /* 450B8 80069CB8 0C01A6A9 */ jal osCheckPackId @@ -61,9 +61,9 @@ glabel osGetId /* 450DC 80069CDC 02203021 */ addu $a2, $s1, $zero /* 450E0 80069CE0 00401821 */ addu $v1, $v0, $zero /* 450E4 80069CE4 10600005 */ beqz $v1, .L80069CFC -/* 450E8 80069CE8 00000000 */ nop +/* 450E8 80069CE8 00000000 */ nop /* 450EC 80069CEC 0801A770 */ j .L80069DC0 -/* 450F0 80069CF0 00000000 */ nop +/* 450F0 80069CF0 00000000 */ nop .L80069CF4: /* 450F4 80069CF4 14600032 */ bnez $v1, .L80069DC0 /* 450F8 80069CF8 00601021 */ addu $v0, $v1, $zero @@ -79,7 +79,7 @@ glabel osGetId /* 4511C 80069D1C 02203021 */ addu $a2, $s1, $zero /* 45120 80069D20 00401821 */ addu $v1, $v0, $zero /* 45124 80069D24 14600026 */ bnez $v1, .L80069DC0 -/* 45128 80069D28 00000000 */ nop +/* 45128 80069D28 00000000 */ nop /* 4512C 80069D2C 97A20048 */ lhu $v0, 0x48($sp) /* 45130 80069D30 30420001 */ andi $v0, $v0, 1 /* 45134 80069D34 14400003 */ bnez $v0, .L80069D44 diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s b/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s index 371bb081cc..a7b0356e6f 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osIdCheckSum.s @@ -17,6 +17,6 @@ glabel osIdCheckSum /* 44BA0 800697A0 A4C20000 */ sh $v0, ($a2) /* 44BA4 800697A4 0087102B */ sltu $v0, $a0, $a3 /* 44BA8 800697A8 1440FFF5 */ bnez $v0, .L80069780 -/* 44BAC 800697AC 00000000 */ nop +/* 44BAC 800697AC 00000000 */ nop /* 44BB0 800697B0 03E00008 */ jr $ra /* 44BB4 800697B4 00001021 */ addu $v0, $zero, $zero diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s b/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s index 29e674365f..d8c8c28f03 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osPfsRWInode.s @@ -23,12 +23,12 @@ glabel osPfsRWInode /* 452D4 80069ED4 906358D4 */ lbu $v1, %lo(D_800958D4)($v1) /* 452D8 80069ED8 32E200FF */ andi $v0, $s7, 0xff /* 452DC 80069EDC 1443000C */ bne $v0, $v1, .L80069F10 -/* 452E0 80069EE0 00000000 */ nop +/* 452E0 80069EE0 00000000 */ nop /* 452E4 80069EE4 8E430008 */ lw $v1, 8($s2) /* 452E8 80069EE8 3C028009 */ lui $v0, %hi(D_800958D0) /* 452EC 80069EEC 8C4258D0 */ lw $v0, %lo(D_800958D0)($v0) /* 452F0 80069EF0 14620007 */ bne $v1, $v0, .L80069F10 -/* 452F4 80069EF4 00000000 */ nop +/* 452F4 80069EF4 00000000 */ nop /* 452F8 80069EF8 3C04800E */ lui $a0, %hi(D_800D9680) /* 452FC 80069EFC 24849680 */ addiu $a0, $a0, %lo(D_800D9680) /* 45300 80069F00 0C019194 */ jal bcopy @@ -43,7 +43,7 @@ glabel osPfsRWInode /* 45320 80069F20 00002821 */ addu $a1, $zero, $zero /* 45324 80069F24 00401821 */ addu $v1, $v0, $zero /* 45328 80069F28 1460009A */ bnez $v1, .L8006A194 -/* 4532C 80069F2C 00000000 */ nop +/* 4532C 80069F2C 00000000 */ nop .L80069F30: /* 45330 80069F30 32E200FF */ andi $v0, $s7, 0xff /* 45334 80069F34 14400002 */ bnez $v0, .L80069F40 @@ -178,7 +178,7 @@ glabel osPfsRWInode /* 45508 8006A108 10430005 */ beq $v0, $v1, .L8006A120 /* 4550C 8006A10C 24020003 */ addiu $v0, $zero, 3 /* 45510 8006A110 0801A865 */ j .L8006A194 -/* 45514 8006A114 00000000 */ nop +/* 45514 8006A114 00000000 */ nop .L8006A118: /* 45518 8006A118 0801A865 */ j .L8006A194 /* 4551C 8006A11C 00601021 */ addu $v0, $v1, $zero @@ -201,7 +201,7 @@ glabel osPfsRWInode /* 45558 8006A158 26100001 */ addiu $s0, $s0, 1 /* 4555C 8006A15C 2A020008 */ slti $v0, $s0, 8 /* 45560 8006A160 1440FFF3 */ bnez $v0, .L8006A130 -/* 45564 8006A164 00000000 */ nop +/* 45564 8006A164 00000000 */ nop .L8006A168: /* 45568 8006A168 02802021 */ addu $a0, $s4, $zero .L8006A16C: @@ -228,6 +228,6 @@ glabel osPfsRWInode /* 455B8 8006A1B8 8FB00028 */ lw $s0, 0x28($sp) /* 455BC 8006A1BC 03E00008 */ jr $ra /* 455C0 8006A1C0 27BD0050 */ addiu $sp, $sp, 0x50 -/* 455C4 8006A1C4 00000000 */ nop -/* 455C8 8006A1C8 00000000 */ nop -/* 455CC 8006A1CC 00000000 */ nop +/* 455C4 8006A1C4 00000000 */ nop +/* 455C8 8006A1C8 00000000 */ nop +/* 455CC 8006A1CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s b/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s index 9c4ec0cdbe..9d044b407a 100644 --- a/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s +++ b/asm/nonmatchings/os/code_44b40_len_a90/osRepairPackId.s @@ -33,7 +33,7 @@ glabel osRepairPackId /* 44C28 80069828 0C01A5B4 */ jal osPfsSelectBank /* 44C2C 8006982C 00002821 */ addu $a1, $zero, $zero /* 44C30 80069830 14400092 */ bnez $v0, .L80069A7C -/* 44C34 80069834 00000000 */ nop +/* 44C34 80069834 00000000 */ nop .L80069838: /* 44C38 80069838 27B40018 */ addiu $s4, $sp, 0x18 /* 44C3C 8006983C 27B60038 */ addiu $s6, $sp, 0x38 @@ -88,7 +88,7 @@ glabel osRepairPackId /* 44CF4 800698F4 24020020 */ addiu $v0, $zero, 0x20 .L800698F8: /* 44CF8 800698F8 16020015 */ bne $s0, $v0, .L80069950 -/* 44CFC 800698FC 00000000 */ nop +/* 44CFC 800698FC 00000000 */ nop /* 44D00 80069900 1A40000F */ blez $s2, .L80069940 /* 44D04 80069904 02202021 */ addu $a0, $s1, $zero /* 44D08 80069908 0C01A5B4 */ jal osPfsSelectBank @@ -100,11 +100,11 @@ glabel osRepairPackId /* 44D20 80069920 0C01A874 */ jal osContRamRead /* 44D24 80069924 02803821 */ addu $a3, $s4, $zero /* 44D28 80069928 14400054 */ bnez $v0, .L80069A7C -/* 44D2C 8006992C 00000000 */ nop +/* 44D2C 8006992C 00000000 */ nop /* 44D30 80069930 93A30018 */ lbu $v1, 0x18($sp) /* 44D34 80069934 24020080 */ addiu $v0, $zero, 0x80 /* 44D38 80069938 14620005 */ bne $v1, $v0, .L80069950 -/* 44D3C 8006993C 00000000 */ nop +/* 44D3C 8006993C 00000000 */ nop .L80069940: /* 44D40 80069940 26520001 */ addiu $s2, $s2, 1 /* 44D44 80069944 2A42003E */ slti $v0, $s2, 0x3e @@ -117,7 +117,7 @@ glabel osRepairPackId /* 44D5C 8006995C 0C01A5B4 */ jal osPfsSelectBank /* 44D60 80069960 00002821 */ addu $a1, $zero, $zero /* 44D64 80069964 14400045 */ bnez $v0, .L80069A7C -/* 44D68 80069968 00000000 */ nop +/* 44D68 80069968 00000000 */ nop .L8006996C: /* 44D6C 8006996C 96A20018 */ lhu $v0, 0x18($s5) /* 44D70 80069970 2666001E */ addiu $a2, $s3, 0x1e @@ -176,7 +176,7 @@ glabel osRepairPackId /* 44E3C 80069A3C 10400005 */ beqz $v0, .L80069A54 /* 44E40 80069A40 02603021 */ addu $a2, $s3, $zero /* 44E44 80069A44 0801A69F */ j .L80069A7C -/* 44E48 80069A48 00000000 */ nop +/* 44E48 80069A48 00000000 */ nop .L80069A4C: /* 44E4C 80069A4C 0801A69F */ j .L80069A7C /* 44E50 80069A50 2402000B */ addiu $v0, $zero, 0xb diff --git a/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s b/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s index c5ee1d8ad6..7d3516a6b7 100644 --- a/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s +++ b/asm/nonmatchings/os/code_455d0_len_1f0/osContRamRead.s @@ -100,7 +100,7 @@ glabel osContRamRead /* 45738 8006A338 02602821 */ addu $a1, $s3, $zero /* 4573C 8006A33C 00408821 */ addu $s1, $v0, $zero /* 45740 8006A340 1620000E */ bnez $s1, .L8006A37C -/* 45744 8006A344 00000000 */ nop +/* 45744 8006A344 00000000 */ nop /* 45748 8006A348 0801A8DA */ j .L8006A368 /* 4574C 8006A34C 24110004 */ addiu $s1, $zero, 4 .L8006A350: @@ -119,7 +119,7 @@ glabel osContRamRead /* 45778 8006A378 26B5FFFF */ addiu $s5, $s5, -1 .L8006A37C: /* 4577C 8006A37C 0C01978C */ jal osSiRelAccess -/* 45780 8006A380 00000000 */ nop +/* 45780 8006A380 00000000 */ nop /* 45784 8006A384 02201021 */ addu $v0, $s1, $zero /* 45788 8006A388 8FBF004C */ lw $ra, 0x4c($sp) /* 4578C 8006A38C 8FBE0048 */ lw $fp, 0x48($sp) @@ -133,5 +133,5 @@ glabel osContRamRead /* 457AC 8006A3AC 8FB00028 */ lw $s0, 0x28($sp) /* 457B0 8006A3B0 03E00008 */ jr $ra /* 457B4 8006A3B4 27BD0050 */ addiu $sp, $sp, 0x50 -/* 457B8 8006A3B8 00000000 */ nop -/* 457BC 8006A3BC 00000000 */ nop +/* 457B8 8006A3B8 00000000 */ nop +/* 457BC 8006A3BC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s b/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s index 141f7dbc6c..1ed29a5aa9 100644 --- a/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s +++ b/asm/nonmatchings/os/code_457c0_len_270/osContRamWrite.s @@ -115,7 +115,7 @@ glabel osContRamWrite /* 45960 8006A560 02602821 */ addu $a1, $s3, $zero /* 45964 8006A564 00408821 */ addu $s1, $v0, $zero /* 45968 8006A568 16200007 */ bnez $s1, .L8006A588 -/* 4596C 8006A56C 00000000 */ nop +/* 4596C 8006A56C 00000000 */ nop /* 45970 8006A570 24110004 */ addiu $s1, $zero, 4 .L8006A574: /* 45974 8006A574 24020004 */ addiu $v0, $zero, 4 @@ -125,7 +125,7 @@ glabel osContRamWrite /* 45984 8006A584 26B5FFFF */ addiu $s5, $s5, -1 .L8006A588: /* 45988 8006A588 0C01978C */ jal osSiRelAccess -/* 4598C 8006A58C 00000000 */ nop +/* 4598C 8006A58C 00000000 */ nop /* 45990 8006A590 02201021 */ addu $v0, $s1, $zero .L8006A594: /* 45994 8006A594 8FBF0044 */ lw $ra, 0x44($sp) @@ -140,30 +140,30 @@ glabel osContRamWrite /* 459B8 8006A5B8 8FB00020 */ lw $s0, 0x20($sp) /* 459BC 8006A5BC 03E00008 */ jr $ra /* 459C0 8006A5C0 27BD0048 */ addiu $sp, $sp, 0x48 -/* 459C4 8006A5C4 00000000 */ nop -/* 459C8 8006A5C8 00000000 */ nop -/* 459CC 8006A5CC 00000000 */ nop -/* 459D0 8006A5D0 00000000 */ nop -/* 459D4 8006A5D4 00000000 */ nop -/* 459D8 8006A5D8 00000000 */ nop -/* 459DC 8006A5DC 00000000 */ nop -/* 459E0 8006A5E0 00000000 */ nop -/* 459E4 8006A5E4 00000000 */ nop -/* 459E8 8006A5E8 00000000 */ nop -/* 459EC 8006A5EC 00000000 */ nop -/* 459F0 8006A5F0 00000000 */ nop -/* 459F4 8006A5F4 00000000 */ nop -/* 459F8 8006A5F8 00000000 */ nop -/* 459FC 8006A5FC 00000000 */ nop -/* 45A00 8006A600 00000000 */ nop -/* 45A04 8006A604 00000000 */ nop -/* 45A08 8006A608 00000000 */ nop -/* 45A0C 8006A60C 00000000 */ nop -/* 45A10 8006A610 00000000 */ nop -/* 45A14 8006A614 00000000 */ nop -/* 45A18 8006A618 00000000 */ nop -/* 45A1C 8006A61C 00000000 */ nop -/* 45A20 8006A620 00000000 */ nop -/* 45A24 8006A624 00000000 */ nop -/* 45A28 8006A628 00000000 */ nop -/* 45A2C 8006A62C 00000000 */ nop +/* 459C4 8006A5C4 00000000 */ nop +/* 459C8 8006A5C8 00000000 */ nop +/* 459CC 8006A5CC 00000000 */ nop +/* 459D0 8006A5D0 00000000 */ nop +/* 459D4 8006A5D4 00000000 */ nop +/* 459D8 8006A5D8 00000000 */ nop +/* 459DC 8006A5DC 00000000 */ nop +/* 459E0 8006A5E0 00000000 */ nop +/* 459E4 8006A5E4 00000000 */ nop +/* 459E8 8006A5E8 00000000 */ nop +/* 459EC 8006A5EC 00000000 */ nop +/* 459F0 8006A5F0 00000000 */ nop +/* 459F4 8006A5F4 00000000 */ nop +/* 459F8 8006A5F8 00000000 */ nop +/* 459FC 8006A5FC 00000000 */ nop +/* 45A00 8006A600 00000000 */ nop +/* 45A04 8006A604 00000000 */ nop +/* 45A08 8006A608 00000000 */ nop +/* 45A0C 8006A60C 00000000 */ nop +/* 45A10 8006A610 00000000 */ nop +/* 45A14 8006A614 00000000 */ nop +/* 45A18 8006A618 00000000 */ nop +/* 45A1C 8006A61C 00000000 */ nop +/* 45A20 8006A620 00000000 */ nop +/* 45A24 8006A624 00000000 */ nop +/* 45A28 8006A628 00000000 */ nop +/* 45A2C 8006A62C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s b/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s index 7f77f96be9..1e1ba3bd1e 100644 --- a/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s +++ b/asm/nonmatchings/os/code_45a30_len_20/osAfterPreNMI.s @@ -9,4 +9,4 @@ glabel osAfterPreNMI /* 45A40 8006A640 8FBF0010 */ lw $ra, 0x10($sp) /* 45A44 8006A644 03E00008 */ jr $ra /* 45A48 8006A648 27BD0018 */ addiu $sp, $sp, 0x18 -/* 45A4C 8006A64C 00000000 */ nop +/* 45A4C 8006A64C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A9E0.s b/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A9E0.s index bf3e17660b..9ed9b471e3 100644 --- a/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A9E0.s +++ b/asm/nonmatchings/os/code_45a50_len_3a0/func_8006A9E0.s @@ -3,6 +3,6 @@ glabel func_8006A9E0 /* 45DE0 8006A9E0 03E00008 */ jr $ra -/* 45DE4 8006A9E4 00000000 */ nop -/* 45DE8 8006A9E8 00000000 */ nop -/* 45DEC 8006A9EC 00000000 */ nop +/* 45DE4 8006A9E4 00000000 */ nop +/* 45DE8 8006A9E8 00000000 */ nop +/* 45DEC 8006A9EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s b/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s index 4e44e6df8c..74f12f692b 100644 --- a/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s +++ b/asm/nonmatchings/os/code_467f0_len_90/osResetGlobalIntMask.s @@ -20,5 +20,5 @@ glabel osResetGlobalIntMask /* 4686C 8006B46C 8FB00010 */ lw $s0, 0x10($sp) /* 46870 8006B470 03E00008 */ jr $ra /* 46874 8006B474 27BD0018 */ addiu $sp, $sp, 0x18 -/* 46878 8006B478 00000000 */ nop -/* 4687C 8006B47C 00000000 */ nop +/* 46878 8006B478 00000000 */ nop +/* 4687C 8006B47C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s b/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s index f992cdcef1..c74b60e307 100644 --- a/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s +++ b/asm/nonmatchings/os/code_46880_len_260/osEPiRawReadIo.s @@ -13,7 +13,7 @@ glabel osEPiRawReadIo /* 4698C 8006B58C 8C620000 */ lw $v0, ($v1) /* 46990 8006B590 30420003 */ andi $v0, $v0, 3 /* 46994 8006B594 1440FFFD */ bnez $v0, .L8006B58C -/* 46998 8006B598 00000000 */ nop +/* 46998 8006B598 00000000 */ nop .L8006B59C: /* 4699C 8006B59C 90880009 */ lbu $t0, 9($a0) /* 469A0 8006B5A0 00081080 */ sll $v0, $t0, 2 @@ -23,7 +23,7 @@ glabel osEPiRawReadIo /* 469B0 8006B5B0 90820004 */ lbu $v0, 4($a0) /* 469B4 8006B5B4 90E30004 */ lbu $v1, 4($a3) /* 469B8 8006B5B8 1062003F */ beq $v1, $v0, .L8006B6B8 -/* 469BC 8006B5BC 00000000 */ nop +/* 469BC 8006B5BC 00000000 */ nop /* 469C0 8006B5C0 1500001A */ bnez $t0, .L8006B62C /* 469C4 8006B5C4 00E01821 */ addu $v1, $a3, $zero /* 469C8 8006B5C8 90620005 */ lbu $v0, 5($v1) @@ -50,7 +50,7 @@ glabel osEPiRawReadIo /* 46A10 8006B610 90620008 */ lbu $v0, 8($v1) /* 46A14 8006B614 90870008 */ lbu $a3, 8($a0) /* 46A18 8006B618 1047001D */ beq $v0, $a3, .L8006B690 -/* 46A1C 8006B61C 00000000 */ nop +/* 46A1C 8006B61C 00000000 */ nop /* 46A20 8006B620 3C02A460 */ lui $v0, 0xa460 /* 46A24 8006B624 0801ADA3 */ j .L8006B68C /* 46A28 8006B628 34420018 */ ori $v0, $v0, 0x18 @@ -79,7 +79,7 @@ glabel osEPiRawReadIo /* 46A74 8006B674 90620008 */ lbu $v0, 8($v1) /* 46A78 8006B678 90870008 */ lbu $a3, 8($a0) /* 46A7C 8006B67C 10470004 */ beq $v0, $a3, .L8006B690 -/* 46A80 8006B680 00000000 */ nop +/* 46A80 8006B680 00000000 */ nop /* 46A84 8006B684 3C02A460 */ lui $v0, 0xa460 /* 46A88 8006B688 34420028 */ ori $v0, $v0, 0x28 .L8006B68C: @@ -104,5 +104,5 @@ glabel osEPiRawReadIo /* 46ACC 8006B6CC ACC20000 */ sw $v0, ($a2) /* 46AD0 8006B6D0 03E00008 */ jr $ra /* 46AD4 8006B6D4 00001021 */ addu $v0, $zero, $zero -/* 46AD8 8006B6D8 00000000 */ nop -/* 46ADC 8006B6DC 00000000 */ nop +/* 46AD8 8006B6D8 00000000 */ nop +/* 46ADC 8006B6DC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s b/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s index f1d46f50d6..67636fbeea 100644 --- a/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s +++ b/asm/nonmatchings/os/code_46880_len_260/osPiGetCmdQueue.s @@ -10,4 +10,4 @@ glabel osPiGetCmdQueue /* 46964 8006B564 8C423D58 */ lw $v0, %lo(D_80093D58)($v0) .L8006B568: /* 46968 8006B568 03E00008 */ jr $ra -/* 4696C 8006B56C 00000000 */ nop +/* 4696C 8006B56C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s b/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s index c22bf819eb..dd802753fa 100644 --- a/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s +++ b/asm/nonmatchings/os/code_46880_len_260/osPiRawStartDma.s @@ -22,10 +22,10 @@ glabel osPiRawStartDma /* 468C0 8006B4C0 8C620000 */ lw $v0, ($v1) /* 468C4 8006B4C4 30420003 */ andi $v0, $v0, 3 /* 468C8 8006B4C8 1440FFFD */ bnez $v0, .L8006B4C0 -/* 468CC 8006B4CC 00000000 */ nop +/* 468CC 8006B4CC 00000000 */ nop .L8006B4D0: /* 468D0 8006B4D0 0C0187A4 */ jal osVirtualToPhysical -/* 468D4 8006B4D4 00000000 */ nop +/* 468D4 8006B4D4 00000000 */ nop /* 468D8 8006B4D8 3C06A460 */ lui $a2, 0xa460 /* 468DC 8006B4DC 34C60004 */ ori $a2, $a2, 4 /* 468E0 8006B4E0 3C051FFF */ lui $a1, 0x1fff diff --git a/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s b/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s index 2e32c456c2..a196cbb213 100644 --- a/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s +++ b/asm/nonmatchings/os/code_46ae0_len_170/osEPiRawWriteIo.s @@ -13,7 +13,7 @@ glabel osEPiRawWriteIo /* 46AFC 8006B6FC 8C620000 */ lw $v0, ($v1) /* 46B00 8006B700 30420003 */ andi $v0, $v0, 3 /* 46B04 8006B704 1440FFFD */ bnez $v0, .L8006B6FC -/* 46B08 8006B708 00000000 */ nop +/* 46B08 8006B708 00000000 */ nop .L8006B70C: /* 46B0C 8006B70C 90880009 */ lbu $t0, 9($a0) /* 46B10 8006B710 00081080 */ sll $v0, $t0, 2 @@ -23,7 +23,7 @@ glabel osEPiRawWriteIo /* 46B20 8006B720 90820004 */ lbu $v0, 4($a0) /* 46B24 8006B724 90E30004 */ lbu $v1, 4($a3) /* 46B28 8006B728 1062003F */ beq $v1, $v0, .L8006B828 -/* 46B2C 8006B72C 00000000 */ nop +/* 46B2C 8006B72C 00000000 */ nop /* 46B30 8006B730 1500001A */ bnez $t0, .L8006B79C /* 46B34 8006B734 00E01821 */ addu $v1, $a3, $zero /* 46B38 8006B738 90620005 */ lbu $v0, 5($v1) @@ -50,7 +50,7 @@ glabel osEPiRawWriteIo /* 46B80 8006B780 90620008 */ lbu $v0, 8($v1) /* 46B84 8006B784 90870008 */ lbu $a3, 8($a0) /* 46B88 8006B788 1047001D */ beq $v0, $a3, .L8006B800 -/* 46B8C 8006B78C 00000000 */ nop +/* 46B8C 8006B78C 00000000 */ nop /* 46B90 8006B790 3C02A460 */ lui $v0, 0xa460 /* 46B94 8006B794 0801ADFF */ j .L8006B7FC /* 46B98 8006B798 34420018 */ ori $v0, $v0, 0x18 @@ -79,7 +79,7 @@ glabel osEPiRawWriteIo /* 46BE4 8006B7E4 90620008 */ lbu $v0, 8($v1) /* 46BE8 8006B7E8 90870008 */ lbu $a3, 8($a0) /* 46BEC 8006B7EC 10470004 */ beq $v0, $a3, .L8006B800 -/* 46BF0 8006B7F0 00000000 */ nop +/* 46BF0 8006B7F0 00000000 */ nop /* 46BF4 8006B7F4 3C02A460 */ lui $v0, 0xa460 /* 46BF8 8006B7F8 34420028 */ ori $v0, $v0, 0x28 .L8006B7FC: @@ -103,6 +103,6 @@ glabel osEPiRawWriteIo /* 46C38 8006B838 AC460000 */ sw $a2, ($v0) /* 46C3C 8006B83C 03E00008 */ jr $ra /* 46C40 8006B840 00001021 */ addu $v0, $zero, $zero -/* 46C44 8006B844 00000000 */ nop -/* 46C48 8006B848 00000000 */ nop -/* 46C4C 8006B84C 00000000 */ nop +/* 46C44 8006B844 00000000 */ nop +/* 46C48 8006B848 00000000 */ nop +/* 46C4C 8006B84C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_46c50_len_20/osAiDeviceBusy.s b/asm/nonmatchings/os/code_46c50_len_20/osAiDeviceBusy.s index cb8d45e9f6..fd664c7160 100644 --- a/asm/nonmatchings/os/code_46c50_len_20/osAiDeviceBusy.s +++ b/asm/nonmatchings/os/code_46c50_len_20/osAiDeviceBusy.s @@ -7,6 +7,6 @@ glabel osAiDeviceBusy /* 46C58 8006B858 8C420000 */ lw $v0, ($v0) /* 46C5C 8006B85C 03E00008 */ jr $ra /* 46C60 8006B860 28420000 */ slti $v0, $v0, 0 -/* 46C64 8006B864 00000000 */ nop -/* 46C68 8006B868 00000000 */ nop -/* 46C6C 8006B86C 00000000 */ nop +/* 46C64 8006B864 00000000 */ nop +/* 46C68 8006B868 00000000 */ nop +/* 46C6C 8006B86C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s b/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s index d982b18207..08495265aa 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/_Genld.s @@ -75,7 +75,7 @@ glabel _Genld /* 475BC 8006C1BC A0620000 */ sb $v0, ($v1) /* 475C0 8006C1C0 8E220024 */ lw $v0, 0x24($s1) /* 475C4 8006C1C4 1C400005 */ bgtz $v0, .L8006C1DC -/* 475C8 8006C1C8 00000000 */ nop +/* 475C8 8006C1C8 00000000 */ nop /* 475CC 8006C1CC 8E220030 */ lw $v0, 0x30($s1) /* 475D0 8006C1D0 30420008 */ andi $v0, $v0, 8 /* 475D4 8006C1D4 10400009 */ beqz $v0, .L8006C1FC @@ -143,7 +143,7 @@ glabel _Genld /* 476B8 8006C2B8 8E220030 */ lw $v0, 0x30($s1) /* 476BC 8006C2BC 30420008 */ andi $v0, $v0, 8 /* 476C0 8006C2C0 10400009 */ beqz $v0, .L8006C2E8 -/* 476C4 8006C2C4 00000000 */ nop +/* 476C4 8006C2C4 00000000 */ nop .L8006C2C8: /* 476C8 8006C2C8 8E220008 */ lw $v0, 8($s1) /* 476CC 8006C2CC 8E230014 */ lw $v1, 0x14($s1) @@ -172,7 +172,7 @@ glabel _Genld /* 47720 8006C320 8E220030 */ lw $v0, 0x30($s1) /* 47724 8006C324 30420008 */ andi $v0, $v0, 8 /* 47728 8006C328 10400007 */ beqz $v0, .L8006C348 -/* 4772C 8006C32C 00000000 */ nop +/* 4772C 8006C32C 00000000 */ nop .L8006C330: /* 47730 8006C330 8E220008 */ lw $v0, 8($s1) /* 47734 8006C334 24C30001 */ addiu $v1, $a2, 1 @@ -243,7 +243,7 @@ glabel _Genld /* 47820 8006C420 8E220030 */ lw $v0, 0x30($s1) /* 47824 8006C424 30420008 */ andi $v0, $v0, 8 /* 47828 8006C428 10400008 */ beqz $v0, .L8006C44C -/* 4782C 8006C42C 00000000 */ nop +/* 4782C 8006C42C 00000000 */ nop .L8006C430: /* 47830 8006C430 8E240014 */ lw $a0, 0x14($s1) /* 47834 8006C434 8E230008 */ lw $v1, 8($s1) @@ -368,7 +368,7 @@ glabel _Genld /* 479F0 8006C5F0 24030010 */ addiu $v1, $zero, 0x10 /* 479F4 8006C5F4 30420014 */ andi $v0, $v0, 0x14 /* 479F8 8006C5F8 1443000F */ bne $v0, $v1, .L8006C638 -/* 479FC 8006C5FC 00000000 */ nop +/* 479FC 8006C5FC 00000000 */ nop /* 47A00 8006C600 8E22000C */ lw $v0, 0xc($s1) /* 47A04 8006C604 8E230014 */ lw $v1, 0x14($s1) /* 47A08 8006C608 8E240018 */ lw $a0, 0x18($s1) @@ -393,4 +393,4 @@ glabel _Genld /* 47A50 8006C650 8FB00010 */ lw $s0, 0x10($sp) /* 47A54 8006C654 03E00008 */ jr $ra /* 47A58 8006C658 27BD0030 */ addiu $sp, $sp, 0x30 -/* 47A5C 8006C65C 00000000 */ nop +/* 47A5C 8006C65C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s b/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s index 0a297d15e8..c2c8553d0d 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/_Ldtob.s @@ -67,10 +67,10 @@ glabel _Ldtob .L8006BCB4: /* 470B4 8006BCB4 44800000 */ mtc1 $zero, $f0 /* 470B8 8006BCB8 44800800 */ mtc1 $zero, $f1 -/* 470BC 8006BCBC 00000000 */ nop +/* 470BC 8006BCBC 00000000 */ nop /* 470C0 8006BCC0 4620A03C */ c.lt.d $f20, $f0 -/* 470C4 8006BCC4 00000000 */ nop -/* 470C8 8006BCC8 00000000 */ nop +/* 470C4 8006BCC4 00000000 */ nop +/* 470C8 8006BCC8 00000000 */ nop /* 470CC 8006BCCC 45030001 */ bc1tl .L8006BCD4 /* 470D0 8006BCD0 4620A507 */ neg.d $f20, $f20 .L8006BCD4: @@ -109,7 +109,7 @@ glabel _Ldtob /* 4714C 8006BD4C 1C60FFFA */ bgtz $v1, .L8006BD38 /* 47150 8006BD50 24840008 */ addiu $a0, $a0, 8 /* 47154 8006BD54 0801AF6A */ j .L8006BDA8 -/* 47158 8006BD58 00000000 */ nop +/* 47158 8006BD58 00000000 */ nop .L8006BD5C: /* 4715C 8006BD5C 18400012 */ blez $v0, .L8006BDA8 /* 47160 8006BD60 2402FFFC */ addiu $v0, $zero, -4 @@ -159,7 +159,7 @@ glabel _Ldtob .L8006BDF8: /* 471F8 8006BDF8 4634C03C */ c.lt.d $f24, $f20 /* 471FC 8006BDFC 24030001 */ addiu $v1, $zero, 1 -/* 47200 8006BE00 00000000 */ nop +/* 47200 8006BE00 00000000 */ nop /* 47204 8006BE04 45010002 */ bc1t .L8006BE10 /* 47208 8006BE08 0012102A */ slt $v0, $zero, $s2 /* 4720C 8006BE0C 00001821 */ addu $v1, $zero, $zero @@ -169,11 +169,11 @@ glabel _Ldtob /* 47218 8006BE18 2652FFF8 */ addiu $s2, $s2, -8 /* 4721C 8006BE1C 4620A00D */ trunc.w.d $f0, $f20 /* 47220 8006BE20 44050000 */ mfc1 $a1, $f0 -/* 47224 8006BE24 00000000 */ nop +/* 47224 8006BE24 00000000 */ nop /* 47228 8006BE28 1A400006 */ blez $s2, .L8006BE44 /* 4722C 8006BE2C 26310008 */ addiu $s1, $s1, 8 /* 47230 8006BE30 44850000 */ mtc1 $a1, $f0 -/* 47234 8006BE34 00000000 */ nop +/* 47234 8006BE34 00000000 */ nop /* 47238 8006BE38 46800021 */ cvt.d.w $f0, $f0 /* 4723C 8006BE3C 4620A001 */ sub.d $f0, $f20, $f0 /* 47240 8006BE40 46360502 */ mul.d $f20, $f0, $f22 @@ -194,7 +194,7 @@ glabel _Ldtob /* 47274 8006BE74 1CA0FFF6 */ bgtz $a1, .L8006BE50 /* 47278 8006BE78 2610FFFF */ addiu $s0, $s0, -1 /* 4727C 8006BE7C 0801AFA3 */ j .L8006BE8C -/* 47280 8006BE80 00000000 */ nop +/* 47280 8006BE80 00000000 */ nop .L8006BE84: /* 47284 8006BE84 A2340000 */ sb $s4, ($s1) .L8006BE88: diff --git a/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s b/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s index 9d3a9dadfa..c30642dade 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/_Ldunscale.s @@ -43,4 +43,4 @@ glabel _Ldunscale /* 474A8 8006C0A8 24020002 */ addiu $v0, $zero, 2 .L8006C0AC: /* 474AC 8006C0AC 03E00008 */ jr $ra -/* 474B0 8006C0B0 00000000 */ nop +/* 474B0 8006C0B0 00000000 */ nop diff --git a/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s b/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s index 072c9b85e5..4088978d94 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/_Litob.s @@ -49,7 +49,7 @@ glabel _Litob /* 46E24 8006BA24 24120018 */ addiu $s2, $zero, 0x18 /* 46E28 8006BA28 8E220000 */ lw $v0, ($s1) /* 46E2C 8006BA2C 04410005 */ bgez $v0, .L8006BA44 -/* 46E30 8006BA30 00000000 */ nop +/* 46E30 8006BA30 00000000 */ nop /* 46E34 8006BA34 0015A823 */ negu $s5, $s5 /* 46E38 8006BA38 0014A023 */ negu $s4, $s4 /* 46E3C 8006BA3C 0015102B */ sltu $v0, $zero, $s5 @@ -140,7 +140,7 @@ glabel _Litob /* 46F70 8006BB70 8E220030 */ lw $v0, 0x30($s1) /* 46F74 8006BB74 30420014 */ andi $v0, $v0, 0x14 /* 46F78 8006BB78 1443000B */ bne $v0, $v1, .L8006BBA8 -/* 46F7C 8006BB7C 00000000 */ nop +/* 46F7C 8006BB7C 00000000 */ nop /* 46F80 8006BB80 8E220028 */ lw $v0, 0x28($s1) /* 46F84 8006BB84 8E23000C */ lw $v1, 0xc($s1) /* 46F88 8006BB88 8E250010 */ lw $a1, 0x10($s1) diff --git a/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s b/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s index 4f145bc2a9..25f16cf13c 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/bcmp.s @@ -5,7 +5,7 @@ glabel bcmp /* 46C70 8006B870 00851026 */ xor $v0, $a0, $a1 /* 46C74 8006B874 28C10010 */ slti $at, $a2, 0x10 /* 46C78 8006B878 14200034 */ bnez $at, .L8006B94C -/* 46C7C 8006B87C 00000000 */ nop +/* 46C7C 8006B87C 00000000 */ nop /* 46C80 8006B880 30420003 */ andi $v0, $v0, 3 /* 46C84 8006B884 14400018 */ bnez $v0, .L8006B8E8 /* 46C88 8006B888 0004C023 */ negu $t8, $a0 @@ -31,9 +31,9 @@ glabel bcmp /* 46CD0 8006B8D0 14430029 */ bne $v0, $v1, .L8006B978 /* 46CD4 8006B8D4 24A50004 */ addiu $a1, $a1, 4 /* 46CD8 8006B8D8 1487FFFA */ bne $a0, $a3, .L8006B8C4 -/* 46CDC 8006B8DC 00000000 */ nop +/* 46CDC 8006B8DC 00000000 */ nop /* 46CE0 8006B8E0 1000001A */ b .L8006B94C -/* 46CE4 8006B8E4 00000000 */ nop +/* 46CE4 8006B8E4 00000000 */ nop .L8006B8E8: /* 46CE8 8006B8E8 00053823 */ negu $a3, $a1 /* 46CEC 8006B8EC 30E70003 */ andi $a3, $a3, 3 @@ -47,7 +47,7 @@ glabel bcmp /* 46D08 8006B908 1443001B */ bne $v0, $v1, .L8006B978 /* 46D0C 8006B90C 24A50001 */ addiu $a1, $a1, 1 /* 46D10 8006B910 1487FFFA */ bne $a0, $a3, .L8006B8FC -/* 46D14 8006B914 00000000 */ nop +/* 46D14 8006B914 00000000 */ nop .L8006B918: /* 46D18 8006B918 2401FFFC */ addiu $at, $zero, -4 /* 46D1C 8006B91C 00C13824 */ and $a3, $a2, $at @@ -62,7 +62,7 @@ glabel bcmp /* 46D3C 8006B93C 1443000E */ bne $v0, $v1, .L8006B978 /* 46D40 8006B940 24A50004 */ addiu $a1, $a1, 4 /* 46D44 8006B944 1487FFF9 */ bne $a0, $a3, .L8006B92C -/* 46D48 8006B948 00000000 */ nop +/* 46D48 8006B948 00000000 */ nop .L8006B94C: /* 46D4C 8006B94C 18C00008 */ blez $a2, .L8006B970 /* 46D50 8006B950 00C43821 */ addu $a3, $a2, $a0 @@ -73,7 +73,7 @@ glabel bcmp /* 46D60 8006B960 14430005 */ bne $v0, $v1, .L8006B978 /* 46D64 8006B964 24A50001 */ addiu $a1, $a1, 1 /* 46D68 8006B968 1487FFFA */ bne $a0, $a3, .L8006B954 -/* 46D6C 8006B96C 00000000 */ nop +/* 46D6C 8006B96C 00000000 */ nop .L8006B970: /* 46D70 8006B970 03E00008 */ jr $ra /* 46D74 8006B974 00001021 */ addu $v0, $zero, $zero diff --git a/asm/nonmatchings/os/code_46c70_len_e00/osGetCause.s b/asm/nonmatchings/os/code_46c70_len_e00/osGetCause.s index 18d3e5fe33..3926dc04fb 100644 --- a/asm/nonmatchings/os/code_46c70_len_e00/osGetCause.s +++ b/asm/nonmatchings/os/code_46c70_len_e00/osGetCause.s @@ -4,5 +4,5 @@ glabel osGetCause /* 47A60 8006C660 40026800 */ mfc0 $v0, $13 /* 47A64 8006C664 03E00008 */ jr $ra -/* 47A68 8006C668 00000000 */ nop -/* 47A6C 8006C66C 00000000 */ nop +/* 47A68 8006C668 00000000 */ nop +/* 47A6C 8006C66C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s b/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s index 1305e521f2..20897de18e 100644 --- a/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s +++ b/asm/nonmatchings/os/code_47a70_len_10/osGetSR.s @@ -4,5 +4,5 @@ glabel osGetSR /* 47A70 8006C670 40026000 */ mfc0 $v0, $12 /* 47A74 8006C674 03E00008 */ jr $ra -/* 47A78 8006C678 00000000 */ nop -/* 47A7C 8006C67C 00000000 */ nop +/* 47A78 8006C678 00000000 */ nop +/* 47A7C 8006C67C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s b/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s index 07a3ee9032..4a9e5d26a7 100644 --- a/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s +++ b/asm/nonmatchings/os/code_47a80_len_10/osSetCompare.s @@ -4,5 +4,5 @@ glabel osSetCompare /* 47A80 8006C680 40845800 */ mtc0 $a0, $11 /* 47A84 8006C684 03E00008 */ jr $ra -/* 47A88 8006C688 00000000 */ nop -/* 47A8C 8006C68C 00000000 */ nop +/* 47A88 8006C688 00000000 */ nop +/* 47A8C 8006C68C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s b/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s index 104bbb6718..8ebf6f9bf6 100644 --- a/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s +++ b/asm/nonmatchings/os/code_47a90_len_50/osSetFpcCsr.s @@ -5,4 +5,4 @@ glabel osSetFpcCsr /* 47A90 8006C690 4442F800 */ cfc1 $v0, $31 /* 47A94 8006C694 44C4F800 */ ctc1 $a0, $31 /* 47A98 8006C698 03E00008 */ jr $ra -/* 47A9C 8006C69C 00000000 */ nop +/* 47A9C 8006C69C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s b/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s index 66f682d99a..4c1ea58445 100644 --- a/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s +++ b/asm/nonmatchings/os/code_47a90_len_50/osSetSR.s @@ -3,6 +3,6 @@ glabel osSetSR /* 47AA0 8006C6A0 40846000 */ mtc0 $a0, $12 -/* 47AA4 8006C6A4 00000000 */ nop +/* 47AA4 8006C6A4 00000000 */ nop /* 47AA8 8006C6A8 03E00008 */ jr $ra -/* 47AAC 8006C6AC 00000000 */ nop +/* 47AAC 8006C6AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s b/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s index 1c3d64d690..2f5bea5faf 100644 --- a/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s +++ b/asm/nonmatchings/os/code_47a90_len_50/osSetWatchLo.s @@ -3,6 +3,6 @@ glabel osSetWatchLo /* 47AB0 8006C6B0 40849000 */ mtc0 $a0, $18 -/* 47AB4 8006C6B4 00000000 */ nop +/* 47AB4 8006C6B4 00000000 */ nop /* 47AB8 8006C6B8 03E00008 */ jr $ra -/* 47ABC 8006C6BC 00000000 */ nop +/* 47ABC 8006C6BC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s b/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s index 1f5bb92b39..d471d714c8 100644 --- a/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s +++ b/asm/nonmatchings/os/code_47a90_len_50/osSpDeviceBusy.s @@ -8,5 +8,5 @@ glabel osSpDeviceBusy /* 47ACC 8006C6CC 3042001C */ andi $v0, $v0, 0x1c /* 47AD0 8006C6D0 03E00008 */ jr $ra /* 47AD4 8006C6D4 0002102B */ sltu $v0, $zero, $v0 -/* 47AD8 8006C6D8 00000000 */ nop -/* 47ADC 8006C6DC 00000000 */ nop +/* 47AD8 8006C6D8 00000000 */ nop +/* 47ADC 8006C6DC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s b/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s index 75e9129f3e..41769880c2 100644 --- a/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s +++ b/asm/nonmatchings/os/code_47ae0_len_e0/osSpRawStartDma.s @@ -40,4 +40,4 @@ glabel osSpRawStartDma /* 47BB0 8006C7B0 8FB00010 */ lw $s0, 0x10($sp) /* 47BB4 8006C7B4 03E00008 */ jr $ra /* 47BB8 8006C7B8 27BD0028 */ addiu $sp, $sp, 0x28 -/* 47BBC 8006C7BC 00000000 */ nop +/* 47BBC 8006C7BC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s b/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s index 88cc38141f..82347d5727 100644 --- a/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s +++ b/asm/nonmatchings/os/code_47ae0_len_e0/osSpSetPc.s @@ -15,4 +15,4 @@ glabel osSpSetPc /* 47B24 8006C724 2402FFFF */ addiu $v0, $zero, -1 .L8006C728: /* 47B28 8006C728 03E00008 */ jr $ra -/* 47B2C 8006C72C 00000000 */ nop +/* 47B2C 8006C72C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s b/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s index d0484f0add..b573bc8541 100644 --- a/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s +++ b/asm/nonmatchings/os/code_47bc0_len_50/osSiRawReadIo.s @@ -22,4 +22,4 @@ glabel osSiRawReadIo /* 47C00 8006C800 8FB00010 */ lw $s0, 0x10($sp) /* 47C04 8006C804 03E00008 */ jr $ra /* 47C08 8006C808 27BD0020 */ addiu $sp, $sp, 0x20 -/* 47C0C 8006C80C 00000000 */ nop +/* 47C0C 8006C80C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s b/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s index 3054c0c411..1126f89568 100644 --- a/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s +++ b/asm/nonmatchings/os/code_47c10_len_50/osSiRawWriteIo.s @@ -21,5 +21,5 @@ glabel osSiRawWriteIo /* 47C4C 8006C84C 8FB00010 */ lw $s0, 0x10($sp) /* 47C50 8006C850 03E00008 */ jr $ra /* 47C54 8006C854 27BD0020 */ addiu $sp, $sp, 0x20 -/* 47C58 8006C858 00000000 */ nop -/* 47C5C 8006C85C 00000000 */ nop +/* 47C58 8006C858 00000000 */ nop +/* 47C5C 8006C85C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s b/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s index 852e378bca..799d09f182 100644 --- a/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s +++ b/asm/nonmatchings/os/code_47c60_len_f0/osContDataCrc.s @@ -39,5 +39,5 @@ glabel osContDataCrc /* 47D3C 8006C93C 00031840 */ sll $v1, $v1, 1 /* 47D40 8006C940 03E00008 */ jr $ra /* 47D44 8006C944 306200FF */ andi $v0, $v1, 0xff -/* 47D48 8006C948 00000000 */ nop -/* 47D4C 8006C94C 00000000 */ nop +/* 47D48 8006C948 00000000 */ nop +/* 47D4C 8006C94C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s b/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s index af5b94ba98..a6399dea5f 100644 --- a/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s +++ b/asm/nonmatchings/os/code_47d50_len_e0/osDestroyThread.s @@ -17,7 +17,7 @@ glabel osDestroyThread /* 47D7C 8006C97C 96030010 */ lhu $v1, 0x10($s0) /* 47D80 8006C980 24020001 */ addiu $v0, $zero, 1 /* 47D84 8006C984 10620004 */ beq $v1, $v0, .L8006C998 -/* 47D88 8006C988 00000000 */ nop +/* 47D88 8006C988 00000000 */ nop /* 47D8C 8006C98C 8E040008 */ lw $a0, 8($s0) /* 47D90 8006C990 0C019880 */ jal osDequeueThread /* 47D94 8006C994 02002821 */ addu $a1, $s0, $zero @@ -38,23 +38,23 @@ glabel osDestroyThread /* 47DC4 8006C9C4 8C830004 */ lw $v1, 4($a0) /* 47DC8 8006C9C8 2402FFFF */ addiu $v0, $zero, -1 /* 47DCC 8006C9CC 10620009 */ beq $v1, $v0, .L8006C9F4 -/* 47DD0 8006C9D0 00000000 */ nop +/* 47DD0 8006C9D0 00000000 */ nop /* 47DD4 8006C9D4 2403FFFF */ addiu $v1, $zero, -1 .L8006C9D8: /* 47DD8 8006C9D8 8C82000C */ lw $v0, 0xc($a0) /* 47DDC 8006C9DC 1050FFF6 */ beq $v0, $s0, .L8006C9B8 -/* 47DE0 8006C9E0 00000000 */ nop +/* 47DE0 8006C9E0 00000000 */ nop /* 47DE4 8006C9E4 00402021 */ addu $a0, $v0, $zero /* 47DE8 8006C9E8 8C820004 */ lw $v0, 4($a0) /* 47DEC 8006C9EC 1443FFFA */ bne $v0, $v1, .L8006C9D8 -/* 47DF0 8006C9F0 00000000 */ nop +/* 47DF0 8006C9F0 00000000 */ nop .L8006C9F4: /* 47DF4 8006C9F4 3C028009 */ lui $v0, %hi(D_80094660) /* 47DF8 8006C9F8 8C424660 */ lw $v0, %lo(D_80094660)($v0) /* 47DFC 8006C9FC 16020003 */ bne $s0, $v0, .L8006CA0C -/* 47E00 8006CA00 00000000 */ nop +/* 47E00 8006CA00 00000000 */ nop /* 47E04 8006CA04 0C01AC75 */ jal osDispatchThread -/* 47E08 8006CA08 00000000 */ nop +/* 47E08 8006CA08 00000000 */ nop .L8006CA0C: /* 47E0C 8006CA0C 0C01ACF4 */ jal __osRestoreInt /* 47E10 8006CA10 02202021 */ addu $a0, $s1, $zero @@ -63,5 +63,5 @@ glabel osDestroyThread /* 47E1C 8006CA1C 8FB00010 */ lw $s0, 0x10($sp) /* 47E20 8006CA20 03E00008 */ jr $ra /* 47E24 8006CA24 27BD0020 */ addiu $sp, $sp, 0x20 -/* 47E28 8006CA28 00000000 */ nop -/* 47E2C 8006CA2C 00000000 */ nop +/* 47E28 8006CA28 00000000 */ nop +/* 47E2C 8006CA2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s b/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s index 80091ec750..c4181e6af2 100644 --- a/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s +++ b/asm/nonmatchings/os/code_47e30_len_60/osMapTLBRdb.s @@ -15,14 +15,14 @@ glabel osMapTLBRdb /* 47E58 8006CA58 408B1000 */ mtc0 $t3, $2 /* 47E5C 8006CA5C 24090001 */ addiu $t1, $zero, 1 /* 47E60 8006CA60 40891800 */ mtc0 $t1, $3 -/* 47E64 8006CA64 00000000 */ nop -/* 47E68 8006CA68 42000002 */ tlbwi -/* 47E6C 8006CA6C 00000000 */ nop -/* 47E70 8006CA70 00000000 */ nop -/* 47E74 8006CA74 00000000 */ nop -/* 47E78 8006CA78 00000000 */ nop +/* 47E64 8006CA64 00000000 */ nop +/* 47E68 8006CA68 42000002 */ tlbwi +/* 47E6C 8006CA6C 00000000 */ nop +/* 47E70 8006CA70 00000000 */ nop +/* 47E74 8006CA74 00000000 */ nop +/* 47E78 8006CA78 00000000 */ nop /* 47E7C 8006CA7C 40885000 */ mtc0 $t0, $10 /* 47E80 8006CA80 03E00008 */ jr $ra -/* 47E84 8006CA84 00000000 */ nop -/* 47E88 8006CA88 00000000 */ nop -/* 47E8C 8006CA8C 00000000 */ nop +/* 47E84 8006CA84 00000000 */ nop +/* 47E88 8006CA88 00000000 */ nop +/* 47E8C 8006CA8C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47e90_len_110/osViInit.s b/asm/nonmatchings/os/code_47e90_len_110/osViInit.s index 2883aa98be..053170d849 100644 --- a/asm/nonmatchings/os/code_47e90_len_110/osViInit.s +++ b/asm/nonmatchings/os/code_47e90_len_110/osViInit.s @@ -34,7 +34,7 @@ glabel osViInit /* 47F04 8006CB04 244259E0 */ addiu $v0, $v0, %lo(D_800959E0) .L8006CB08: /* 47F08 8006CB08 14620004 */ bne $v1, $v0, .L8006CB1C -/* 47F0C 8006CB0C 00000000 */ nop +/* 47F0C 8006CB0C 00000000 */ nop /* 47F10 8006CB10 3C028009 */ lui $v0, %hi(D_80095870) /* 47F14 8006CB14 0801B2C9 */ j .L8006CB24 /* 47F18 8006CB18 24425870 */ addiu $v0, $v0, %lo(D_80095870) @@ -67,11 +67,11 @@ glabel osViInit .L8006CB78: /* 47F78 8006CB78 AC400000 */ sw $zero, ($v0) /* 47F7C 8006CB7C 0C019C1C */ jal osViSwapContext -/* 47F80 8006CB80 00000000 */ nop +/* 47F80 8006CB80 00000000 */ nop /* 47F84 8006CB84 8FBF0014 */ lw $ra, 0x14($sp) /* 47F88 8006CB88 8FB00010 */ lw $s0, 0x10($sp) /* 47F8C 8006CB8C 03E00008 */ jr $ra /* 47F90 8006CB90 27BD0018 */ addiu $sp, $sp, 0x18 -/* 47F94 8006CB94 00000000 */ nop -/* 47F98 8006CB98 00000000 */ nop -/* 47F9C 8006CB9C 00000000 */ nop +/* 47F94 8006CB94 00000000 */ nop +/* 47F98 8006CB98 00000000 */ nop +/* 47F9C 8006CB9C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s b/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s index 55c6ba575e..2adf26e16f 100644 --- a/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s +++ b/asm/nonmatchings/os/code_47fa0_len_20/osViGetCurrentContext.s @@ -5,8 +5,8 @@ glabel osViGetCurrentContext /* 47FA0 8006CBA0 3C028009 */ lui $v0, %hi(D_800959D0) /* 47FA4 8006CBA4 03E00008 */ jr $ra /* 47FA8 8006CBA8 8C4259D0 */ lw $v0, %lo(D_800959D0)($v0) -/* 47FAC 8006CBAC 00000000 */ nop -/* 47FB0 8006CBB0 00000000 */ nop -/* 47FB4 8006CBB4 00000000 */ nop -/* 47FB8 8006CBB8 00000000 */ nop -/* 47FBC 8006CBBC 00000000 */ nop +/* 47FAC 8006CBAC 00000000 */ nop +/* 47FB0 8006CBB0 00000000 */ nop +/* 47FB4 8006CBB4 00000000 */ nop +/* 47FB8 8006CBB8 00000000 */ nop +/* 47FBC 8006CBBC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s b/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s index fd382592f4..434608fe07 100644 --- a/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s +++ b/asm/nonmatchings/os/code_47fc0_len_60/guNormalize.s @@ -15,14 +15,14 @@ glabel guNormalize /* 47FE8 8006CBE8 46005404 */ sqrt.s $f16, $f10 /* 47FEC 8006CBEC 46109283 */ div.s $f10, $f18, $f16 /* 47FF0 8006CBF0 460A2402 */ mul.s $f16, $f4, $f10 -/* 47FF4 8006CBF4 00000000 */ nop +/* 47FF4 8006CBF4 00000000 */ nop /* 47FF8 8006CBF8 460A3482 */ mul.s $f18, $f6, $f10 -/* 47FFC 8006CBFC 00000000 */ nop +/* 47FFC 8006CBFC 00000000 */ nop /* 48000 8006CC00 460A4102 */ mul.s $f4, $f8, $f10 /* 48004 8006CC04 E4900000 */ swc1 $f16, ($a0) /* 48008 8006CC08 E4B20000 */ swc1 $f18, ($a1) /* 4800C 8006CC0C 03E00008 */ jr $ra /* 48010 8006CC10 E4C40000 */ swc1 $f4, ($a2) -/* 48014 8006CC14 00000000 */ nop -/* 48018 8006CC18 00000000 */ nop -/* 4801C 8006CC1C 00000000 */ nop +/* 48014 8006CC14 00000000 */ nop +/* 48018 8006CC18 00000000 */ nop +/* 4801C 8006CC1C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_48020_len_a00/corrupted.s b/asm/nonmatchings/os/code_48020_len_a00/corrupted.s index 2048542544..70adc08526 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/corrupted.s +++ b/asm/nonmatchings/os/code_48020_len_a00/corrupted.s @@ -41,7 +41,7 @@ glabel corrupted /* 48660 8006D260 00621007 */ srav $v0, $v0, $v1 /* 48664 8006D264 30420001 */ andi $v0, $v0, 1 /* 48668 8006D268 10400023 */ beqz $v0, .L8006D2F8 -/* 4866C 8006D26C 00000000 */ nop +/* 4866C 8006D26C 00000000 */ nop .L8006D270: /* 48670 8006D270 92220100 */ lbu $v0, 0x100($s1) /* 48674 8006D274 10E2000C */ beq $a3, $v0, .L8006D2A8 diff --git a/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s b/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s index 676683b8bc..3be5bc94e3 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s +++ b/asm/nonmatchings/os/code_48020_len_a00/corrupted_init.s @@ -62,7 +62,7 @@ glabel corrupted_init /* 48554 8006D154 24A50001 */ addiu $a1, $a1, 1 /* 48558 8006D158 00031A02 */ srl $v1, $v1, 8 /* 4855C 8006D15C 1067000A */ beq $v1, $a3, .L8006D188 -/* 48560 8006D160 00000000 */ nop +/* 48560 8006D160 00000000 */ nop /* 48564 8006D164 3082007F */ andi $v0, $a0, 0x7f /* 48568 8006D168 00021082 */ srl $v0, $v0, 2 /* 4856C 8006D16C 30630007 */ andi $v1, $v1, 7 diff --git a/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s b/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s index e44531716e..5c97589b8e 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s +++ b/asm/nonmatchings/os/code_48020_len_a00/osPfsChecker.s @@ -20,7 +20,7 @@ glabel osPfsChecker /* 4805C 8006CC5C 00408021 */ addu $s0, $v0, $zero /* 48060 8006CC60 24020002 */ addiu $v0, $zero, 2 /* 48064 8006CC64 16020004 */ bne $s0, $v0, .L8006CC78 -/* 48068 8006CC68 00000000 */ nop +/* 48068 8006CC68 00000000 */ nop /* 4806C 8006CC6C 0C01A702 */ jal osGetId /* 48070 8006CC70 02202021 */ addu $a0, $s1, $zero /* 48074 8006CC74 00408021 */ addu $s0, $v0, $zero @@ -35,7 +35,7 @@ glabel osPfsChecker /* 4808C 8006CC8C 27A50258 */ addiu $a1, $sp, 0x258 /* 48090 8006CC90 00408021 */ addu $s0, $v0, $zero /* 48094 8006CC94 160000EE */ bnez $s0, .L8006D050 -/* 48098 8006CC98 00000000 */ nop +/* 48098 8006CC98 00000000 */ nop /* 4809C 8006CC9C 8E220050 */ lw $v0, 0x50($s1) /* 480A0 8006CCA0 0202102A */ slt $v0, $s0, $v0 /* 480A4 8006CCA4 1040006B */ beqz $v0, .L8006CE54 @@ -54,12 +54,12 @@ glabel osPfsChecker /* 480D4 8006CCD4 02001021 */ addu $v0, $s0, $zero /* 480D8 8006CCD8 97A2021C */ lhu $v0, 0x21c($sp) /* 480DC 8006CCDC 14400006 */ bnez $v0, .L8006CCF8 -/* 480E0 8006CCE0 00000000 */ nop +/* 480E0 8006CCE0 00000000 */ nop /* 480E4 8006CCE4 8FA20218 */ lw $v0, 0x218($sp) /* 480E8 8006CCE8 10400055 */ beqz $v0, .L8006CE40 /* 480EC 8006CCEC 2405FFFF */ addiu $a1, $zero, -1 /* 480F0 8006CCF0 0801B374 */ j .L8006CDD0 -/* 480F4 8006CCF4 00000000 */ nop +/* 480F4 8006CCF4 00000000 */ nop .L8006CCF8: /* 480F8 8006CCF8 8FA20218 */ lw $v0, 0x218($sp) /* 480FC 8006CCFC 14400003 */ bnez $v0, .L8006CD0C @@ -126,7 +126,7 @@ glabel osPfsChecker /* 481D8 8006CDD8 3283FFFF */ andi $v1, $s4, 0xffff /* 481DC 8006CDDC 24020001 */ addiu $v0, $zero, 1 /* 481E0 8006CDE0 10620017 */ beq $v1, $v0, .L8006CE40 -/* 481E4 8006CDE4 00000000 */ nop +/* 481E4 8006CDE4 00000000 */ nop .L8006CDE8: /* 481E8 8006CDE8 27A40218 */ addiu $a0, $sp, 0x218 .L8006CDEC: @@ -157,7 +157,7 @@ glabel osPfsChecker /* 48244 8006CE44 26520001 */ addiu $s2, $s2, 1 /* 48248 8006CE48 0242102A */ slt $v0, $s2, $v0 /* 4824C 8006CE4C 1440FF98 */ bnez $v0, .L8006CCB0 -/* 48250 8006CE50 00000000 */ nop +/* 48250 8006CE50 00000000 */ nop .L8006CE54: /* 48254 8006CE54 8E220050 */ lw $v0, 0x50($s1) /* 48258 8006CE58 1840001D */ blez $v0, .L8006CED0 @@ -268,7 +268,7 @@ glabel osPfsChecker /* 483D0 8006CFD0 A4430220 */ sh $v1, 0x220($v0) /* 483D4 8006CFD4 90820000 */ lbu $v0, ($a0) /* 483D8 8006CFD8 1048FFF1 */ beq $v0, $t0, .L8006CFA0 -/* 483DC 8006CFDC 00000000 */ nop +/* 483DC 8006CFDC 00000000 */ nop .L8006CFE0: /* 483E0 8006CFE0 24C60002 */ addiu $a2, $a2, 2 .L8006CFE4: diff --git a/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s b/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s index 5059e8b9b9..428dd2c141 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s +++ b/asm/nonmatchings/os/code_48020_len_a00/osPfsGetInitData.s @@ -50,6 +50,6 @@ glabel osPfsGetInitData /* 48A08 8006D608 A16A0000 */ sb $t2, ($t3) /* 48A0C 8006D60C 03E00008 */ jr $ra /* 48A10 8006D610 27BD0010 */ addiu $sp, $sp, 0x10 -/* 48A14 8006D614 00000000 */ nop -/* 48A18 8006D618 00000000 */ nop -/* 48A1C 8006D61C 00000000 */ nop +/* 48A14 8006D614 00000000 */ nop +/* 48A18 8006D618 00000000 */ nop +/* 48A1C 8006D61C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s b/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s index be10218c65..4b3a0e8eec 100644 --- a/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s +++ b/asm/nonmatchings/os/code_48020_len_a00/osPfsIsPlug.s @@ -67,7 +67,7 @@ glabel osPfsIsPlug /* 48828 8006D428 00021023 */ negu $v0, $v0 /* 4882C 8006D42C 02028024 */ and $s0, $s0, $v0 /* 48830 8006D430 1E00FFD6 */ bgtz $s0, .L8006D38C -/* 48834 8006D434 00000000 */ nop +/* 48834 8006D434 00000000 */ nop /* 48838 8006D438 10600011 */ beqz $v1, .L8006D480 /* 4883C 8006D43C 00002021 */ addu $a0, $zero, $zero /* 48840 8006D440 24060001 */ addiu $a2, $zero, 1 @@ -90,7 +90,7 @@ glabel osPfsIsPlug /* 4887C 8006D47C 24630004 */ addiu $v1, $v1, 4 .L8006D480: /* 48880 8006D480 0C01978C */ jal osSiRelAccess -/* 48884 8006D484 00000000 */ nop +/* 48884 8006D484 00000000 */ nop /* 48888 8006D488 A2F30000 */ sb $s3, ($s7) /* 4888C 8006D48C 02C01021 */ addu $v0, $s6, $zero /* 48890 8006D490 8FBF0058 */ lw $ra, 0x58($sp) diff --git a/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s b/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s index 4df82d3ccc..638a48b41f 100644 --- a/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s +++ b/asm/nonmatchings/os/code_48c00_len_5c0/func_8006D800.s @@ -67,7 +67,7 @@ glabel func_8006D800 /* 48CE0 8006D8E0 00003812 */ mflo $a3 /* 48CE4 8006D8E4 00001810 */ mfhi $v1 /* 48CE8 8006D8E8 3128FFFF */ andi $t0, $t1, 0xffff -/* 48CEC 8006D8EC 00000000 */ nop +/* 48CEC 8006D8EC 00000000 */ nop /* 48CF0 8006D8F0 00E80018 */ mult $a3, $t0 /* 48CF4 8006D8F4 000B1402 */ srl $v0, $t3, 0x10 /* 48CF8 8006D8F8 00031C00 */ sll $v1, $v1, 0x10 @@ -94,8 +94,8 @@ glabel func_8006D800 .L8006D944: /* 48D44 8006D944 00002012 */ mflo $a0 /* 48D48 8006D948 00001810 */ mfhi $v1 -/* 48D4C 8006D94C 00000000 */ nop -/* 48D50 8006D950 00000000 */ nop +/* 48D4C 8006D94C 00000000 */ nop +/* 48D50 8006D950 00000000 */ nop /* 48D54 8006D954 00880018 */ mult $a0, $t0 /* 48D58 8006D958 3162FFFF */ andi $v0, $t3, 0xffff /* 48D5C 8006D95C 00031C00 */ sll $v1, $v1, 0x10 @@ -167,7 +167,7 @@ glabel func_8006D800 /* 48E44 8006DA44 00004012 */ mflo $t0 /* 48E48 8006DA48 00001810 */ mfhi $v1 /* 48E4C 8006DA4C 3125FFFF */ andi $a1, $t1, 0xffff -/* 48E50 8006DA50 00000000 */ nop +/* 48E50 8006DA50 00000000 */ nop /* 48E54 8006DA54 01050018 */ mult $t0, $a1 /* 48E58 8006DA58 00041402 */ srl $v0, $a0, 0x10 /* 48E5C 8006DA5C 00031C00 */ sll $v1, $v1, 0x10 @@ -194,8 +194,8 @@ glabel func_8006D800 .L8006DAA8: /* 48EA8 8006DAA8 00003012 */ mflo $a2 /* 48EAC 8006DAAC 00001810 */ mfhi $v1 -/* 48EB0 8006DAB0 00000000 */ nop -/* 48EB4 8006DAB4 00000000 */ nop +/* 48EB0 8006DAB0 00000000 */ nop +/* 48EB4 8006DAB4 00000000 */ nop /* 48EB8 8006DAB8 00C50018 */ mult $a2, $a1 /* 48EBC 8006DABC 3082FFFF */ andi $v0, $a0, 0xffff /* 48EC0 8006DAC0 00031C00 */ sll $v1, $v1, 0x10 @@ -227,7 +227,7 @@ glabel func_8006D800 /* 48F18 8006DB18 00003812 */ mflo $a3 /* 48F1C 8006DB1C 00001810 */ mfhi $v1 /* 48F20 8006DB20 3128FFFF */ andi $t0, $t1, 0xffff -/* 48F24 8006DB24 00000000 */ nop +/* 48F24 8006DB24 00000000 */ nop /* 48F28 8006DB28 00E80018 */ mult $a3, $t0 /* 48F2C 8006DB2C 000B1402 */ srl $v0, $t3, 0x10 /* 48F30 8006DB30 00031C00 */ sll $v1, $v1, 0x10 @@ -254,8 +254,8 @@ glabel func_8006D800 .L8006DB7C: /* 48F7C 8006DB7C 00002012 */ mflo $a0 /* 48F80 8006DB80 00001810 */ mfhi $v1 -/* 48F84 8006DB84 00000000 */ nop -/* 48F88 8006DB88 00000000 */ nop +/* 48F84 8006DB84 00000000 */ nop +/* 48F88 8006DB88 00000000 */ nop /* 48F8C 8006DB8C 00880018 */ mult $a0, $t0 /* 48F90 8006DB90 3162FFFF */ andi $v0, $t3, 0xffff /* 48F94 8006DB94 00031C00 */ sll $v1, $v1, 0x10 @@ -331,7 +331,7 @@ glabel func_8006D800 /* 49090 8006DC90 00005012 */ mflo $t2 /* 49094 8006DC94 00001810 */ mfhi $v1 /* 49098 8006DC98 3105FFFF */ andi $a1, $t0, 0xffff -/* 4909C 8006DC9C 00000000 */ nop +/* 4909C 8006DC9C 00000000 */ nop /* 490A0 8006DCA0 01450018 */ mult $t2, $a1 /* 490A4 8006DCA4 00041402 */ srl $v0, $a0, 0x10 /* 490A8 8006DCA8 00031C00 */ sll $v1, $v1, 0x10 @@ -358,8 +358,8 @@ glabel func_8006D800 .L8006DCF4: /* 490F4 8006DCF4 00003012 */ mflo $a2 /* 490F8 8006DCF8 00001810 */ mfhi $v1 -/* 490FC 8006DCFC 00000000 */ nop -/* 49100 8006DD00 00000000 */ nop +/* 490FC 8006DCFC 00000000 */ nop +/* 49100 8006DD00 00000000 */ nop /* 49104 8006DD04 00C50018 */ mult $a2, $a1 /* 49108 8006DD08 3082FFFF */ andi $v0, $a0, 0xffff /* 4910C 8006DD0C 00031C00 */ sll $v1, $v1, 0x10 @@ -411,5 +411,5 @@ glabel func_8006D800 /* 491B0 8006DDB0 01A0182D */ daddu $v1, $t5, $zero .L8006DDB4: /* 491B4 8006DDB4 03E00008 */ jr $ra -/* 491B8 8006DDB8 00000000 */ nop -/* 491BC 8006DDBC 00000000 */ nop +/* 491B8 8006DDB8 00000000 */ nop +/* 491BC 8006DDBC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s b/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s index 17925c9ca0..137348eb79 100644 --- a/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s +++ b/asm/nonmatchings/os/code_491c0_len_f80/func_8006DDC0.s @@ -115,7 +115,7 @@ glabel func_8006DDC0 /* 4934C 8006DF4C 00001012 */ mflo $v0 /* 49350 8006DF50 00001810 */ mfhi $v1 /* 49354 8006DF54 3106FFFF */ andi $a2, $t0, 0xffff -/* 49358 8006DF58 00000000 */ nop +/* 49358 8006DF58 00000000 */ nop /* 4935C 8006DF5C 00460018 */ mult $v0, $a2 /* 49360 8006DF60 00031C00 */ sll $v1, $v1, 0x10 /* 49364 8006DF64 000A1402 */ srl $v0, $t2, 0x10 @@ -140,8 +140,8 @@ glabel func_8006DDC0 .L8006DFA8: /* 493A8 8006DFA8 00001012 */ mflo $v0 /* 493AC 8006DFAC 00001810 */ mfhi $v1 -/* 493B0 8006DFB0 00000000 */ nop -/* 493B4 8006DFB4 00000000 */ nop +/* 493B0 8006DFB0 00000000 */ nop +/* 493B4 8006DFB4 00000000 */ nop /* 493B8 8006DFB8 00460018 */ mult $v0, $a2 /* 493BC 8006DFBC 00031C00 */ sll $v1, $v1, 0x10 /* 493C0 8006DFC0 3142FFFF */ andi $v0, $t2, 0xffff @@ -168,7 +168,7 @@ glabel func_8006DDC0 /* 49408 8006E008 00001012 */ mflo $v0 /* 4940C 8006E00C 00001810 */ mfhi $v1 /* 49410 8006E010 3106FFFF */ andi $a2, $t0, 0xffff -/* 49414 8006E014 00000000 */ nop +/* 49414 8006E014 00000000 */ nop /* 49418 8006E018 00460018 */ mult $v0, $a2 /* 4941C 8006E01C 00031C00 */ sll $v1, $v1, 0x10 /* 49420 8006E020 000B1402 */ srl $v0, $t3, 0x10 @@ -193,8 +193,8 @@ glabel func_8006DDC0 .L8006E064: /* 49464 8006E064 00001012 */ mflo $v0 /* 49468 8006E068 00001810 */ mfhi $v1 -/* 4946C 8006E06C 00000000 */ nop -/* 49470 8006E070 00000000 */ nop +/* 4946C 8006E06C 00000000 */ nop +/* 49470 8006E070 00000000 */ nop /* 49474 8006E074 00460018 */ mult $v0, $a2 /* 49478 8006E078 00031C00 */ sll $v1, $v1, 0x10 /* 4947C 8006E07C 3162FFFF */ andi $v0, $t3, 0xffff @@ -202,7 +202,7 @@ glabel func_8006DDC0 /* 49484 8006E084 00002012 */ mflo $a0 /* 49488 8006E088 0064102B */ sltu $v0, $v1, $a0 /* 4948C 8006E08C 10400007 */ beqz $v0, .L8006E0AC -/* 49490 8006E090 00000000 */ nop +/* 49490 8006E090 00000000 */ nop /* 49494 8006E094 00681821 */ addu $v1, $v1, $t0 /* 49498 8006E098 0068102B */ sltu $v0, $v1, $t0 /* 4949C 8006E09C 14400003 */ bnez $v0, .L8006E0AC @@ -224,7 +224,7 @@ glabel func_8006DDC0 /* 494D4 8006E0D4 AFAE0000 */ sw $t6, ($sp) /* 494D8 8006E0D8 AFAF0004 */ sw $t7, 4($sp) /* 494DC 8006E0DC 0801B8B3 */ j .L8006E2CC -/* 494E0 8006E0E0 00000000 */ nop +/* 494E0 8006E0E0 00000000 */ nop .L8006E0E4: /* 494E4 8006E0E4 0049102B */ sltu $v0, $v0, $t1 /* 494E8 8006E0E8 14400005 */ bnez $v0, .L8006E100 @@ -255,7 +255,7 @@ glabel func_8006DDC0 /* 49544 8006E144 01682023 */ subu $a0, $t3, $t0 /* 49548 8006E148 0168102B */ sltu $v0, $t3, $t0 /* 4954C 8006E14C 14400005 */ bnez $v0, .L8006E164 -/* 49550 8006E150 00000000 */ nop +/* 49550 8006E150 00000000 */ nop .L8006E154: /* 49554 8006E154 01491823 */ subu $v1, $t2, $t1 /* 49558 8006E158 0164102B */ sltu $v0, $t3, $a0 @@ -283,7 +283,7 @@ glabel func_8006DDC0 /* 495A4 8006E1A4 00003812 */ mflo $a3 /* 495A8 8006E1A8 00001810 */ mfhi $v1 /* 495AC 8006E1AC 312CFFFF */ andi $t4, $t1, 0xffff -/* 495B0 8006E1B0 00000000 */ nop +/* 495B0 8006E1B0 00000000 */ nop /* 495B4 8006E1B4 00EC0018 */ mult $a3, $t4 /* 495B8 8006E1B8 000A1402 */ srl $v0, $t2, 0x10 /* 495BC 8006E1BC 00031C00 */ sll $v1, $v1, 0x10 @@ -310,8 +310,8 @@ glabel func_8006DDC0 .L8006E208: /* 49608 8006E208 00002012 */ mflo $a0 /* 4960C 8006E20C 00001810 */ mfhi $v1 -/* 49610 8006E210 00000000 */ nop -/* 49614 8006E214 00000000 */ nop +/* 49610 8006E210 00000000 */ nop +/* 49614 8006E214 00000000 */ nop /* 49618 8006E218 008C0018 */ mult $a0, $t4 /* 4961C 8006E21C 3142FFFF */ andi $v0, $t2, 0xffff /* 49620 8006E220 00031C00 */ sll $v1, $v1, 0x10 @@ -364,7 +364,7 @@ glabel func_8006DDC0 /* 496C8 8006E2C8 AF2F0004 */ sw $t7, 4($t9) .L8006E2CC: /* 496CC 8006E2CC 12400009 */ beqz $s2, .L8006E2F4 -/* 496D0 8006E2D0 00000000 */ nop +/* 496D0 8006E2D0 00000000 */ nop /* 496D4 8006E2D4 8FA20000 */ lw $v0, ($sp) /* 496D8 8006E2D8 8FA30004 */ lw $v1, 4($sp) /* 496DC 8006E2DC 00038823 */ negu $s1, $v1 diff --git a/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s b/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s index 59e3d8c503..fd0d8d8cf7 100644 --- a/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s +++ b/asm/nonmatchings/os/code_491c0_len_f80/func_8006E310.s @@ -47,7 +47,7 @@ glabel func_8006E310 /* 497A8 8006E3A8 00003812 */ mflo $a3 /* 497AC 8006E3AC 00001810 */ mfhi $v1 /* 497B0 8006E3B0 3128FFFF */ andi $t0, $t1, 0xffff -/* 497B4 8006E3B4 00000000 */ nop +/* 497B4 8006E3B4 00000000 */ nop /* 497B8 8006E3B8 00E80018 */ mult $a3, $t0 /* 497BC 8006E3BC 000B1402 */ srl $v0, $t3, 0x10 /* 497C0 8006E3C0 00031C00 */ sll $v1, $v1, 0x10 @@ -74,8 +74,8 @@ glabel func_8006E310 .L8006E40C: /* 4980C 8006E40C 00002012 */ mflo $a0 /* 49810 8006E410 00001810 */ mfhi $v1 -/* 49814 8006E414 00000000 */ nop -/* 49818 8006E418 00000000 */ nop +/* 49814 8006E414 00000000 */ nop +/* 49818 8006E418 00000000 */ nop /* 4981C 8006E41C 00880018 */ mult $a0, $t0 /* 49820 8006E420 3162FFFF */ andi $v0, $t3, 0xffff /* 49824 8006E424 00031C00 */ sll $v1, $v1, 0x10 @@ -147,7 +147,7 @@ glabel func_8006E310 /* 4990C 8006E50C 00004012 */ mflo $t0 /* 49910 8006E510 00001810 */ mfhi $v1 /* 49914 8006E514 3125FFFF */ andi $a1, $t1, 0xffff -/* 49918 8006E518 00000000 */ nop +/* 49918 8006E518 00000000 */ nop /* 4991C 8006E51C 01050018 */ mult $t0, $a1 /* 49920 8006E520 00041402 */ srl $v0, $a0, 0x10 /* 49924 8006E524 00031C00 */ sll $v1, $v1, 0x10 @@ -174,8 +174,8 @@ glabel func_8006E310 .L8006E570: /* 49970 8006E570 00003012 */ mflo $a2 /* 49974 8006E574 00001810 */ mfhi $v1 -/* 49978 8006E578 00000000 */ nop -/* 4997C 8006E57C 00000000 */ nop +/* 49978 8006E578 00000000 */ nop +/* 4997C 8006E57C 00000000 */ nop /* 49980 8006E580 00C50018 */ mult $a2, $a1 /* 49984 8006E584 3082FFFF */ andi $v0, $a0, 0xffff /* 49988 8006E588 00031C00 */ sll $v1, $v1, 0x10 @@ -207,7 +207,7 @@ glabel func_8006E310 /* 499E0 8006E5E0 00003812 */ mflo $a3 /* 499E4 8006E5E4 00001810 */ mfhi $v1 /* 499E8 8006E5E8 3128FFFF */ andi $t0, $t1, 0xffff -/* 499EC 8006E5EC 00000000 */ nop +/* 499EC 8006E5EC 00000000 */ nop /* 499F0 8006E5F0 00E80018 */ mult $a3, $t0 /* 499F4 8006E5F4 000B1402 */ srl $v0, $t3, 0x10 /* 499F8 8006E5F8 00031C00 */ sll $v1, $v1, 0x10 @@ -234,8 +234,8 @@ glabel func_8006E310 .L8006E644: /* 49A44 8006E644 00002012 */ mflo $a0 /* 49A48 8006E648 00001810 */ mfhi $v1 -/* 49A4C 8006E64C 00000000 */ nop -/* 49A50 8006E650 00000000 */ nop +/* 49A4C 8006E64C 00000000 */ nop +/* 49A50 8006E650 00000000 */ nop /* 49A54 8006E654 00880018 */ mult $a0, $t0 /* 49A58 8006E658 3162FFFF */ andi $v0, $t3, 0xffff /* 49A5C 8006E65C 00031C00 */ sll $v1, $v1, 0x10 @@ -311,7 +311,7 @@ glabel func_8006E310 /* 49B58 8006E758 00005012 */ mflo $t2 /* 49B5C 8006E75C 00001810 */ mfhi $v1 /* 49B60 8006E760 3105FFFF */ andi $a1, $t0, 0xffff -/* 49B64 8006E764 00000000 */ nop +/* 49B64 8006E764 00000000 */ nop /* 49B68 8006E768 01450018 */ mult $t2, $a1 /* 49B6C 8006E76C 00041402 */ srl $v0, $a0, 0x10 /* 49B70 8006E770 00031C00 */ sll $v1, $v1, 0x10 @@ -338,8 +338,8 @@ glabel func_8006E310 .L8006E7BC: /* 49BBC 8006E7BC 00003012 */ mflo $a2 /* 49BC0 8006E7C0 00001810 */ mfhi $v1 -/* 49BC4 8006E7C4 00000000 */ nop -/* 49BC8 8006E7C8 00000000 */ nop +/* 49BC4 8006E7C4 00000000 */ nop +/* 49BC8 8006E7C8 00000000 */ nop /* 49BCC 8006E7CC 00C50018 */ mult $a2, $a1 /* 49BD0 8006E7D0 3082FFFF */ andi $v0, $a0, 0xffff /* 49BD4 8006E7D4 00031C00 */ sll $v1, $v1, 0x10 @@ -383,6 +383,6 @@ glabel func_8006E310 /* 49C58 8006E858 0180102D */ daddu $v0, $t4, $zero /* 49C5C 8006E85C 03E00008 */ jr $ra /* 49C60 8006E860 01A0182D */ daddu $v1, $t5, $zero -/* 49C64 8006E864 00000000 */ nop -/* 49C68 8006E868 00000000 */ nop -/* 49C6C 8006E86C 00000000 */ nop +/* 49C64 8006E864 00000000 */ nop +/* 49C68 8006E868 00000000 */ nop +/* 49C6C 8006E86C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_49C70/func_8006E870.s b/asm/nonmatchings/os/code_49C70/func_8006E870.s index a3b00ebcff..3e9e23d105 100644 --- a/asm/nonmatchings/os/code_49C70/func_8006E870.s +++ b/asm/nonmatchings/os/code_49C70/func_8006E870.s @@ -93,7 +93,7 @@ glabel func_8006E870 /* 49DAC 8006E9AC 00001012 */ mflo $v0 /* 49DB0 8006E9B0 00001810 */ mfhi $v1 /* 49DB4 8006E9B4 3106FFFF */ andi $a2, $t0, 0xffff -/* 49DB8 8006E9B8 00000000 */ nop +/* 49DB8 8006E9B8 00000000 */ nop /* 49DBC 8006E9BC 00460018 */ mult $v0, $a2 /* 49DC0 8006E9C0 00031C00 */ sll $v1, $v1, 0x10 /* 49DC4 8006E9C4 000A1402 */ srl $v0, $t2, 0x10 @@ -118,8 +118,8 @@ glabel func_8006E870 .L8006EA08: /* 49E08 8006EA08 00001012 */ mflo $v0 /* 49E0C 8006EA0C 00001810 */ mfhi $v1 -/* 49E10 8006EA10 00000000 */ nop -/* 49E14 8006EA14 00000000 */ nop +/* 49E10 8006EA10 00000000 */ nop +/* 49E14 8006EA14 00000000 */ nop /* 49E18 8006EA18 00460018 */ mult $v0, $a2 /* 49E1C 8006EA1C 00031C00 */ sll $v1, $v1, 0x10 /* 49E20 8006EA20 3142FFFF */ andi $v0, $t2, 0xffff @@ -146,7 +146,7 @@ glabel func_8006E870 /* 49E68 8006EA68 00001012 */ mflo $v0 /* 49E6C 8006EA6C 00001810 */ mfhi $v1 /* 49E70 8006EA70 3106FFFF */ andi $a2, $t0, 0xffff -/* 49E74 8006EA74 00000000 */ nop +/* 49E74 8006EA74 00000000 */ nop /* 49E78 8006EA78 00460018 */ mult $v0, $a2 /* 49E7C 8006EA7C 00031C00 */ sll $v1, $v1, 0x10 /* 49E80 8006EA80 000B1402 */ srl $v0, $t3, 0x10 @@ -171,8 +171,8 @@ glabel func_8006E870 .L8006EAC4: /* 49EC4 8006EAC4 00001012 */ mflo $v0 /* 49EC8 8006EAC8 00001810 */ mfhi $v1 -/* 49ECC 8006EACC 00000000 */ nop -/* 49ED0 8006EAD0 00000000 */ nop +/* 49ECC 8006EACC 00000000 */ nop +/* 49ED0 8006EAD0 00000000 */ nop /* 49ED4 8006EAD4 00460018 */ mult $v0, $a2 /* 49ED8 8006EAD8 00031C00 */ sll $v1, $v1, 0x10 /* 49EDC 8006EADC 3162FFFF */ andi $v0, $t3, 0xffff @@ -180,7 +180,7 @@ glabel func_8006E870 /* 49EE4 8006EAE4 00002012 */ mflo $a0 /* 49EE8 8006EAE8 0064102B */ sltu $v0, $v1, $a0 /* 49EEC 8006EAEC 10400007 */ beqz $v0, .L8006EB0C -/* 49EF0 8006EAF0 00000000 */ nop +/* 49EF0 8006EAF0 00000000 */ nop /* 49EF4 8006EAF4 00681821 */ addu $v1, $v1, $t0 /* 49EF8 8006EAF8 0068102B */ sltu $v0, $v1, $t0 /* 49EFC 8006EAFC 14400003 */ bnez $v0, .L8006EB0C @@ -202,7 +202,7 @@ glabel func_8006E870 /* 49F34 8006EB34 AFAE0000 */ sw $t6, ($sp) /* 49F38 8006EB38 AFAF0004 */ sw $t7, 4($sp) /* 49F3C 8006EB3C 0801BB4B */ j .L8006ED2C -/* 49F40 8006EB40 00000000 */ nop +/* 49F40 8006EB40 00000000 */ nop .L8006EB44: /* 49F44 8006EB44 0049102B */ sltu $v0, $v0, $t1 /* 49F48 8006EB48 14400005 */ bnez $v0, .L8006EB60 @@ -233,7 +233,7 @@ glabel func_8006E870 /* 49FA4 8006EBA4 01682023 */ subu $a0, $t3, $t0 /* 49FA8 8006EBA8 0168102B */ sltu $v0, $t3, $t0 /* 49FAC 8006EBAC 14400005 */ bnez $v0, .L8006EBC4 -/* 49FB0 8006EBB0 00000000 */ nop +/* 49FB0 8006EBB0 00000000 */ nop .L8006EBB4: /* 49FB4 8006EBB4 01491823 */ subu $v1, $t2, $t1 /* 49FB8 8006EBB8 0164102B */ sltu $v0, $t3, $a0 @@ -261,7 +261,7 @@ glabel func_8006E870 /* 4A004 8006EC04 00003812 */ mflo $a3 /* 4A008 8006EC08 00001810 */ mfhi $v1 /* 4A00C 8006EC0C 312CFFFF */ andi $t4, $t1, 0xffff -/* 4A010 8006EC10 00000000 */ nop +/* 4A010 8006EC10 00000000 */ nop /* 4A014 8006EC14 00EC0018 */ mult $a3, $t4 /* 4A018 8006EC18 000A1402 */ srl $v0, $t2, 0x10 /* 4A01C 8006EC1C 00031C00 */ sll $v1, $v1, 0x10 @@ -288,8 +288,8 @@ glabel func_8006E870 .L8006EC68: /* 4A068 8006EC68 00002012 */ mflo $a0 /* 4A06C 8006EC6C 00001810 */ mfhi $v1 -/* 4A070 8006EC70 00000000 */ nop -/* 4A074 8006EC74 00000000 */ nop +/* 4A070 8006EC70 00000000 */ nop +/* 4A074 8006EC74 00000000 */ nop /* 4A078 8006EC78 008C0018 */ mult $a0, $t4 /* 4A07C 8006EC7C 3142FFFF */ andi $v0, $t2, 0xffff /* 4A080 8006EC80 00031C00 */ sll $v1, $v1, 0x10 @@ -345,4 +345,4 @@ glabel func_8006E870 /* 4A130 8006ED30 8FA30004 */ lw $v1, 4($sp) /* 4A134 8006ED34 03E00008 */ jr $ra /* 4A138 8006ED38 27BD0008 */ addiu $sp, $sp, 8 -/* 4A13C 8006ED3C 00000000 */ nop +/* 4A13C 8006ED3C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a140_len_70/strcmp.s b/asm/nonmatchings/os/code_4a140_len_70/strcmp.s index e65a7faf5e..ba9af18d2c 100644 --- a/asm/nonmatchings/os/code_4a140_len_70/strcmp.s +++ b/asm/nonmatchings/os/code_4a140_len_70/strcmp.s @@ -17,7 +17,7 @@ glabel strcmp /* 4A198 8006ED98 00001021 */ addu $v0, $zero, $zero .L8006ED9C: /* 4A19C 8006ED9C 03E00008 */ jr $ra -/* 4A1A0 8006EDA0 00000000 */ nop -/* 4A1A4 8006EDA4 00000000 */ nop -/* 4A1A8 8006EDA8 00000000 */ nop -/* 4A1AC 8006EDAC 00000000 */ nop +/* 4A1A0 8006EDA0 00000000 */ nop +/* 4A1A4 8006EDA4 00000000 */ nop +/* 4A1A8 8006EDA8 00000000 */ nop +/* 4A1AC 8006EDAC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a1b0_len_40/memset.s b/asm/nonmatchings/os/code_4a1b0_len_40/memset.s index c3c8282baf..75e2ad8fbd 100644 --- a/asm/nonmatchings/os/code_4a1b0_len_40/memset.s +++ b/asm/nonmatchings/os/code_4a1b0_len_40/memset.s @@ -16,7 +16,7 @@ glabel memset .L8006EDD8: /* 4A1D8 8006EDD8 27BD0008 */ addiu $sp, $sp, 8 /* 4A1DC 8006EDDC 03E00008 */ jr $ra -/* 4A1E0 8006EDE0 00000000 */ nop -/* 4A1E4 8006EDE4 00000000 */ nop -/* 4A1E8 8006EDE8 00000000 */ nop -/* 4A1EC 8006EDEC 00000000 */ nop +/* 4A1E0 8006EDE0 00000000 */ nop +/* 4A1E4 8006EDE4 00000000 */ nop +/* 4A1E8 8006EDE8 00000000 */ nop +/* 4A1EC 8006EDEC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s b/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s index 66ef5e7386..02fad728f8 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/decode_yay0.s @@ -12,14 +12,14 @@ glabel decode_yay0 /* 4A20C 8006EE0C 20840010 */ addi $a0, $a0, 0x10 .L8006EE10: /* 4A210 8006EE10 14C00004 */ bnez $a2, .L8006EE24 -/* 4A214 8006EE14 00000000 */ nop +/* 4A214 8006EE14 00000000 */ nop /* 4A218 8006EE18 8C880000 */ lw $t0, ($a0) /* 4A21C 8006EE1C 24060020 */ addiu $a2, $zero, 0x20 /* 4A220 8006EE20 20840004 */ addi $a0, $a0, 4 .L8006EE24: /* 4A224 8006EE24 0100482A */ slt $t1, $t0, $zero /* 4A228 8006EE28 11200006 */ beqz $t1, .L8006EE44 -/* 4A22C 8006EE2C 00000000 */ nop +/* 4A22C 8006EE2C 00000000 */ nop /* 4A230 8006EE30 832A0000 */ lb $t2, ($t9) /* 4A234 8006EE34 23390001 */ addi $t9, $t9, 1 /* 4A238 8006EE38 A0AA0000 */ sb $t2, ($a1) @@ -45,13 +45,13 @@ glabel decode_yay0 /* 4A27C 8006EE7C 14B8FFE4 */ bne $a1, $t8, .L8006EE10 /* 4A280 8006EE80 20C6FFFF */ addi $a2, $a2, -1 /* 4A284 8006EE84 03E00008 */ jr $ra -/* 4A288 8006EE88 00000000 */ nop +/* 4A288 8006EE88 00000000 */ nop .L8006EE8C: /* 4A28C 8006EE8C 932B0000 */ lbu $t3, ($t9) /* 4A290 8006EE90 23390001 */ addi $t9, $t9, 1 /* 4A294 8006EE94 1000FFF2 */ b .L8006EE60 /* 4A298 8006EE98 216B0012 */ addi $t3, $t3, 0x12 -/* 4A29C 8006EE9C 00000000 */ nop +/* 4A29C 8006EE9C 00000000 */ nop /* 4A2A0 8006EEA0 308400FF */ andi $a0, $a0, 0xff /* 4A2A4 8006EEA4 30A500FF */ andi $a1, $a1, 0xff /* 4A2A8 8006EEA8 30C600FF */ andi $a2, $a2, 0xff @@ -63,7 +63,7 @@ glabel decode_yay0 /* 4A2C0 8006EEC0 AC2F0C7C */ sw $t7, %lo(D_800B0C7C)($at) /* 4A2C4 8006EEC4 3C18800B */ lui $t8, %hi(D_800B0C74) /* 4A2C8 8006EEC8 93180C74 */ lbu $t8, %lo(D_800B0C74)($t8) -/* 4A2CC 8006EECC 00000000 */ nop +/* 4A2CC 8006EECC 00000000 */ nop /* 4A2D0 8006EED0 27190001 */ addiu $t9, $t8, 1 /* 4A2D4 8006EED4 3C01800B */ lui $at, %hi(D_800B0C74) /* 4A2D8 8006EED8 A0390C74 */ sb $t9, %lo(D_800B0C74)($at) @@ -81,4 +81,4 @@ glabel decode_yay0 /* 4A308 8006EF08 3C02800B */ lui $v0, %hi(D_800B0C70) /* 4A30C 8006EF0C 24420C70 */ addiu $v0, $v0, %lo(D_800B0C70) /* 4A310 8006EF10 03E00008 */ jr $ra -/* 4A314 8006EF14 00000000 */ nop +/* 4A314 8006EF14 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF18.s b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF18.s index baa3e99c7d..dd60b6a725 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF18.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF18.s @@ -3,4 +3,4 @@ glabel func_8006EF18 /* 4A318 8006EF18 03E00008 */ jr $ra -/* 4A31C 8006EF1C 00000000 */ nop +/* 4A31C 8006EF1C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF20.s b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF20.s index 7382d2c38e..42bdf0d935 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF20.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF20.s @@ -3,4 +3,4 @@ glabel func_8006EF20 /* 4A320 8006EF20 03E00008 */ jr $ra -/* 4A324 8006EF24 00000000 */ nop +/* 4A324 8006EF24 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s index ea050b8c5e..ce49f3e1bc 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF28.s @@ -13,4 +13,4 @@ glabel func_8006EF28 /* 4A348 8006EF48 3C01800B */ lui $at, %hi(D_800B0C74) /* 4A34C 8006EF4C A0390C74 */ sb $t9, %lo(D_800B0C74)($at) /* 4A350 8006EF50 03E00008 */ jr $ra -/* 4A354 8006EF54 00000000 */ nop +/* 4A354 8006EF54 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF58.s b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF58.s index 19197a20b4..176c41014f 100644 --- a/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF58.s +++ b/asm/nonmatchings/os/code_4a1f0_len_170/func_8006EF58.s @@ -3,4 +3,4 @@ glabel func_8006EF58 /* 4A358 8006EF58 03E00008 */ jr $ra -/* 4A35C 8006EF5C 00000000 */ nop +/* 4A35C 8006EF5C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/func_8006EF60.s b/asm/nonmatchings/os/code_4a360_len_930/func_8006EF60.s index bfc720de12..608cdcc54c 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/func_8006EF60.s +++ b/asm/nonmatchings/os/code_4a360_len_930/func_8006EF60.s @@ -3,4 +3,4 @@ glabel func_8006EF60 /* 4A360 8006EF60 03E00008 */ jr $ra -/* 4A364 8006EF64 00000000 */ nop +/* 4A364 8006EF64 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s index 17547b09f5..e970fb4c8b 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashAllErase.s @@ -13,7 +13,7 @@ glabel osFlashAllErase /* 4A728 8006F328 01C02825 */ or $a1, $t6, $zero /* 4A72C 8006F32C 3C063C00 */ lui $a2, 0x3c00 /* 4A730 8006F330 0C018358 */ jal osEPiWriteIo -/* 4A734 8006F334 00000000 */ nop +/* 4A734 8006F334 00000000 */ nop /* 4A738 8006F338 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A73C 8006F33C 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A740 8006F340 3C05800B */ lui $a1, %hi(D_800B0C7C) @@ -23,7 +23,7 @@ glabel osFlashAllErase /* 4A750 8006F350 01E02825 */ or $a1, $t7, $zero /* 4A754 8006F354 3C067800 */ lui $a2, 0x7800 /* 4A758 8006F358 0C018358 */ jal osEPiWriteIo -/* 4A75C 8006F35C 00000000 */ nop +/* 4A75C 8006F35C 00000000 */ nop .L8006F360: /* 4A760 8006F360 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A764 8006F364 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) @@ -31,50 +31,50 @@ glabel osFlashAllErase /* 4A76C 8006F36C 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4A770 8006F370 27A6001C */ addiu $a2, $sp, 0x1c /* 4A774 8006F374 0C018370 */ jal osEPiReadIo -/* 4A778 8006F378 00000000 */ nop +/* 4A778 8006F378 00000000 */ nop /* 4A77C 8006F37C 8FB8001C */ lw $t8, 0x1c($sp) -/* 4A780 8006F380 00000000 */ nop +/* 4A780 8006F380 00000000 */ nop /* 4A784 8006F384 33190002 */ andi $t9, $t8, 2 /* 4A788 8006F388 24010002 */ addiu $at, $zero, 2 /* 4A78C 8006F38C 1321FFF4 */ beq $t9, $at, .L8006F360 -/* 4A790 8006F390 00000000 */ nop +/* 4A790 8006F390 00000000 */ nop /* 4A794 8006F394 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A798 8006F398 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A79C 8006F39C 3C05800B */ lui $a1, %hi(D_800B0C7C) /* 4A7A0 8006F3A0 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4A7A4 8006F3A4 27A6001C */ addiu $a2, $sp, 0x1c /* 4A7A8 8006F3A8 0C018370 */ jal osEPiReadIo -/* 4A7AC 8006F3AC 00000000 */ nop +/* 4A7AC 8006F3AC 00000000 */ nop /* 4A7B0 8006F3B0 0C01BCA7 */ jal osFlashClearStatus -/* 4A7B4 8006F3B4 00000000 */ nop +/* 4A7B4 8006F3B4 00000000 */ nop /* 4A7B8 8006F3B8 8FA8001C */ lw $t0, 0x1c($sp) -/* 4A7BC 8006F3BC 00000000 */ nop +/* 4A7BC 8006F3BC 00000000 */ nop /* 4A7C0 8006F3C0 310900FF */ andi $t1, $t0, 0xff /* 4A7C4 8006F3C4 24010008 */ addiu $at, $zero, 8 /* 4A7C8 8006F3C8 11210008 */ beq $t1, $at, .L8006F3EC -/* 4A7CC 8006F3CC 00000000 */ nop +/* 4A7CC 8006F3CC 00000000 */ nop /* 4A7D0 8006F3D0 24010048 */ addiu $at, $zero, 0x48 /* 4A7D4 8006F3D4 11210005 */ beq $t1, $at, .L8006F3EC -/* 4A7D8 8006F3D8 00000000 */ nop +/* 4A7D8 8006F3D8 00000000 */ nop /* 4A7DC 8006F3DC 310A0008 */ andi $t2, $t0, 8 /* 4A7E0 8006F3E0 24010008 */ addiu $at, $zero, 8 /* 4A7E4 8006F3E4 15410006 */ bne $t2, $at, .L8006F400 -/* 4A7E8 8006F3E8 00000000 */ nop +/* 4A7E8 8006F3E8 00000000 */ nop .L8006F3EC: /* 4A7EC 8006F3EC 00001025 */ or $v0, $zero, $zero /* 4A7F0 8006F3F0 10000008 */ b .L8006F414 -/* 4A7F4 8006F3F4 00000000 */ nop +/* 4A7F4 8006F3F4 00000000 */ nop /* 4A7F8 8006F3F8 10000004 */ b .L8006F40C -/* 4A7FC 8006F3FC 00000000 */ nop +/* 4A7FC 8006F3FC 00000000 */ nop .L8006F400: /* 4A800 8006F400 2402FFFF */ addiu $v0, $zero, -1 /* 4A804 8006F404 10000003 */ b .L8006F414 -/* 4A808 8006F408 00000000 */ nop +/* 4A808 8006F408 00000000 */ nop .L8006F40C: /* 4A80C 8006F40C 10000001 */ b .L8006F414 -/* 4A810 8006F410 00000000 */ nop +/* 4A810 8006F410 00000000 */ nop .L8006F414: /* 4A814 8006F414 8FBF0014 */ lw $ra, 0x14($sp) /* 4A818 8006F418 27BD0020 */ addiu $sp, $sp, 0x20 /* 4A81C 8006F41C 03E00008 */ jr $ra -/* 4A820 8006F420 00000000 */ nop +/* 4A820 8006F420 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s index 2d1609306e..8784e1b162 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashClearStatus.s @@ -13,20 +13,20 @@ glabel osFlashClearStatus /* 4A6BC 8006F2BC 01C02825 */ or $a1, $t6, $zero /* 4A6C0 8006F2C0 3C06D200 */ lui $a2, 0xd200 /* 4A6C4 8006F2C4 0C018358 */ jal osEPiWriteIo -/* 4A6C8 8006F2C8 00000000 */ nop +/* 4A6C8 8006F2C8 00000000 */ nop /* 4A6CC 8006F2CC 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A6D0 8006F2D0 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A6D4 8006F2D4 3C05800B */ lui $a1, %hi(D_800B0C7C) /* 4A6D8 8006F2D8 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4A6DC 8006F2DC 00003025 */ or $a2, $zero, $zero /* 4A6E0 8006F2E0 0C018358 */ jal osEPiWriteIo -/* 4A6E4 8006F2E4 00000000 */ nop +/* 4A6E4 8006F2E4 00000000 */ nop /* 4A6E8 8006F2E8 10000003 */ b .L8006F2F8 -/* 4A6EC 8006F2EC 00000000 */ nop +/* 4A6EC 8006F2EC 00000000 */ nop /* 4A6F0 8006F2F0 10000001 */ b .L8006F2F8 -/* 4A6F4 8006F2F4 00000000 */ nop +/* 4A6F4 8006F2F4 00000000 */ nop .L8006F2F8: /* 4A6F8 8006F2F8 8FBF0014 */ lw $ra, 0x14($sp) /* 4A6FC 8006F2FC 27BD0018 */ addiu $sp, $sp, 0x18 /* 4A700 8006F300 03E00008 */ jr $ra -/* 4A704 8006F304 00000000 */ nop +/* 4A704 8006F304 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s index f3d8563e62..a3b284dcdd 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashInit.s @@ -10,16 +10,16 @@ glabel osFlashInit /* 4A37C 8006EF7C 24A50CE4 */ addiu $a1, $a1, %lo(D_800B0CE4) /* 4A380 8006EF80 24060001 */ addiu $a2, $zero, 1 /* 4A384 8006EF84 0C019560 */ jal osCreateMesgQueue -/* 4A388 8006EF88 00000000 */ nop +/* 4A388 8006EF88 00000000 */ nop /* 4A38C 8006EF8C 3C0E800B */ lui $t6, %hi(D_800B0C7C) /* 4A390 8006EF90 8DCE0C7C */ lw $t6, %lo(D_800B0C7C)($t6) /* 4A394 8006EF94 3C01A800 */ lui $at, 0xa800 /* 4A398 8006EF98 15C10005 */ bne $t6, $at, .L8006EFB0 -/* 4A39C 8006EF9C 00000000 */ nop +/* 4A39C 8006EF9C 00000000 */ nop /* 4A3A0 8006EFA0 3C02800B */ lui $v0, %hi(D_800B0C70) /* 4A3A4 8006EFA4 24420C70 */ addiu $v0, $v0, %lo(D_800B0C70) /* 4A3A8 8006EFA8 1000003F */ b .L8006F0A8 -/* 4A3AC 8006EFAC 00000000 */ nop +/* 4A3AC 8006EFAC 00000000 */ nop .L8006EFB0: /* 4A3B0 8006EFB0 240F0008 */ addiu $t7, $zero, 8 /* 4A3B4 8006EFB4 3C01800B */ lui $at, %hi(D_800B0C74) @@ -49,32 +49,32 @@ glabel osFlashInit /* 4A414 8006F014 24840014 */ addiu $a0, $a0, 0x14 /* 4A418 8006F018 24050060 */ addiu $a1, $zero, 0x60 /* 4A41C 8006F01C 0C01925C */ jal bzero -/* 4A420 8006F020 00000000 */ nop +/* 4A420 8006F020 00000000 */ nop /* 4A424 8006F024 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A428 8006F028 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A42C 8006F02C 0C0183B0 */ jal osEPiLinkHandle -/* 4A430 8006F030 00000000 */ nop +/* 4A430 8006F030 00000000 */ nop /* 4A434 8006F034 27A4001C */ addiu $a0, $sp, 0x1c /* 4A438 8006F038 27A50018 */ addiu $a1, $sp, 0x18 /* 4A43C 8006F03C 0C01BC61 */ jal osFlashReadId -/* 4A440 8006F040 00000000 */ nop +/* 4A440 8006F040 00000000 */ nop /* 4A444 8006F044 8FAC0018 */ lw $t4, 0x18($sp) /* 4A448 8006F048 3C0100C2 */ lui $at, 0xc2 /* 4A44C 8006F04C 3421001E */ ori $at, $at, 0x1e /* 4A450 8006F050 11810008 */ beq $t4, $at, .L8006F074 -/* 4A454 8006F054 00000000 */ nop +/* 4A454 8006F054 00000000 */ nop /* 4A458 8006F058 3C0100C2 */ lui $at, 0xc2 /* 4A45C 8006F05C 34210001 */ ori $at, $at, 1 /* 4A460 8006F060 11810004 */ beq $t4, $at, .L8006F074 -/* 4A464 8006F064 00000000 */ nop +/* 4A464 8006F064 00000000 */ nop /* 4A468 8006F068 3C0100C2 */ lui $at, 0xc2 /* 4A46C 8006F06C 15810005 */ bne $t4, $at, .L8006F084 -/* 4A470 8006F070 00000000 */ nop +/* 4A470 8006F070 00000000 */ nop .L8006F074: /* 4A474 8006F074 3C01800B */ lui $at, %hi(D_800B0CE8) /* 4A478 8006F078 AC200CE8 */ sw $zero, %lo(D_800B0CE8)($at) /* 4A47C 8006F07C 10000004 */ b .L8006F090 -/* 4A480 8006F080 00000000 */ nop +/* 4A480 8006F080 00000000 */ nop .L8006F084: /* 4A484 8006F084 240D0001 */ addiu $t5, $zero, 1 /* 4A488 8006F088 3C01800B */ lui $at, %hi(D_800B0CE8) @@ -83,11 +83,11 @@ glabel osFlashInit /* 4A490 8006F090 3C02800B */ lui $v0, %hi(D_800B0C70) /* 4A494 8006F094 24420C70 */ addiu $v0, $v0, %lo(D_800B0C70) /* 4A498 8006F098 10000003 */ b .L8006F0A8 -/* 4A49C 8006F09C 00000000 */ nop +/* 4A49C 8006F09C 00000000 */ nop /* 4A4A0 8006F0A0 10000001 */ b .L8006F0A8 -/* 4A4A4 8006F0A4 00000000 */ nop +/* 4A4A4 8006F0A4 00000000 */ nop .L8006F0A8: /* 4A4A8 8006F0A8 8FBF0014 */ lw $ra, 0x14($sp) /* 4A4AC 8006F0AC 27BD0020 */ addiu $sp, $sp, 0x20 /* 4A4B0 8006F0B0 03E00008 */ jr $ra -/* 4A4B4 8006F0B4 00000000 */ nop +/* 4A4B4 8006F0B4 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s index fbcb68bd91..f99b852006 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadArray.s @@ -17,51 +17,51 @@ glabel osFlashReadArray /* 4AB8C 8006F78C 01C02825 */ or $a1, $t6, $zero /* 4AB90 8006F790 3C06F000 */ lui $a2, 0xf000 /* 4AB94 8006F794 0C018358 */ jal osEPiWriteIo -/* 4AB98 8006F798 00000000 */ nop +/* 4AB98 8006F798 00000000 */ nop /* 4AB9C 8006F79C 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4ABA0 8006F7A0 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4ABA4 8006F7A4 3C05800B */ lui $a1, %hi(D_800B0C7C) /* 4ABA8 8006F7A8 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4ABAC 8006F7AC 27A60018 */ addiu $a2, $sp, 0x18 /* 4ABB0 8006F7B0 0C018370 */ jal osEPiReadIo -/* 4ABB4 8006F7B4 00000000 */ nop +/* 4ABB4 8006F7B4 00000000 */ nop /* 4ABB8 8006F7B8 8FAF0024 */ lw $t7, 0x24($sp) /* 4ABBC 8006F7BC 8FB80020 */ lw $t8, 0x20($sp) -/* 4ABC0 8006F7C0 00000000 */ nop +/* 4ABC0 8006F7C0 00000000 */ nop /* 4ABC4 8006F7C4 A30F0002 */ sb $t7, 2($t8) /* 4ABC8 8006F7C8 8FB90034 */ lw $t9, 0x34($sp) /* 4ABCC 8006F7CC 8FA80020 */ lw $t0, 0x20($sp) -/* 4ABD0 8006F7D0 00000000 */ nop +/* 4ABD0 8006F7D0 00000000 */ nop /* 4ABD4 8006F7D4 AD190004 */ sw $t9, 4($t0) /* 4ABD8 8006F7D8 8FA9002C */ lw $t1, 0x2c($sp) /* 4ABDC 8006F7DC 8FAA0020 */ lw $t2, 0x20($sp) -/* 4ABE0 8006F7E0 00000000 */ nop +/* 4ABE0 8006F7E0 00000000 */ nop /* 4ABE4 8006F7E4 AD490008 */ sw $t1, 8($t2) /* 4ABE8 8006F7E8 8FAB0030 */ lw $t3, 0x30($sp) -/* 4ABEC 8006F7EC 00000000 */ nop +/* 4ABEC 8006F7EC 00000000 */ nop /* 4ABF0 8006F7F0 000B61C0 */ sll $t4, $t3, 7 /* 4ABF4 8006F7F4 8FAD0020 */ lw $t5, 0x20($sp) -/* 4ABF8 8006F7F8 00000000 */ nop +/* 4ABF8 8006F7F8 00000000 */ nop /* 4ABFC 8006F7FC ADAC0010 */ sw $t4, 0x10($t5) /* 4AC00 8006F800 3C0E800B */ lui $t6, %hi(D_800B0CE8) /* 4AC04 8006F804 8DCE0CE8 */ lw $t6, %lo(D_800B0CE8)($t6) -/* 4AC08 8006F808 00000000 */ nop +/* 4AC08 8006F808 00000000 */ nop /* 4AC0C 8006F80C 15C00009 */ bnez $t6, .L8006F834 -/* 4AC10 8006F810 00000000 */ nop +/* 4AC10 8006F810 00000000 */ nop /* 4AC14 8006F814 8FAF0028 */ lw $t7, 0x28($sp) -/* 4AC18 8006F818 00000000 */ nop +/* 4AC18 8006F818 00000000 */ nop /* 4AC1C 8006F81C 000FC180 */ sll $t8, $t7, 6 /* 4AC20 8006F820 8FB90020 */ lw $t9, 0x20($sp) -/* 4AC24 8006F824 00000000 */ nop +/* 4AC24 8006F824 00000000 */ nop /* 4AC28 8006F828 AF38000C */ sw $t8, 0xc($t9) /* 4AC2C 8006F82C 10000007 */ b .L8006F84C -/* 4AC30 8006F830 00000000 */ nop +/* 4AC30 8006F830 00000000 */ nop .L8006F834: /* 4AC34 8006F834 8FA80028 */ lw $t0, 0x28($sp) -/* 4AC38 8006F838 00000000 */ nop +/* 4AC38 8006F838 00000000 */ nop /* 4AC3C 8006F83C 000849C0 */ sll $t1, $t0, 7 /* 4AC40 8006F840 8FAA0020 */ lw $t2, 0x20($sp) -/* 4AC44 8006F844 00000000 */ nop +/* 4AC44 8006F844 00000000 */ nop /* 4AC48 8006F848 AD49000C */ sw $t1, 0xc($t2) .L8006F84C: /* 4AC4C 8006F84C 3C04800B */ lui $a0, %hi(D_800B0C70) @@ -69,16 +69,16 @@ glabel osFlashReadArray /* 4AC54 8006F854 8FA50020 */ lw $a1, 0x20($sp) /* 4AC58 8006F858 00003025 */ or $a2, $zero, $zero /* 4AC5C 8006F85C 0C018388 */ jal osEPiStartDma -/* 4AC60 8006F860 00000000 */ nop +/* 4AC60 8006F860 00000000 */ nop /* 4AC64 8006F864 AFA2001C */ sw $v0, 0x1c($sp) /* 4AC68 8006F868 8FA2001C */ lw $v0, 0x1c($sp) /* 4AC6C 8006F86C 10000003 */ b .L8006F87C -/* 4AC70 8006F870 00000000 */ nop +/* 4AC70 8006F870 00000000 */ nop /* 4AC74 8006F874 10000001 */ b .L8006F87C -/* 4AC78 8006F878 00000000 */ nop +/* 4AC78 8006F878 00000000 */ nop .L8006F87C: /* 4AC7C 8006F87C 8FBF0014 */ lw $ra, 0x14($sp) /* 4AC80 8006F880 27BD0020 */ addiu $sp, $sp, 0x20 /* 4AC84 8006F884 03E00008 */ jr $ra -/* 4AC88 8006F888 00000000 */ nop -/* 4AC8C 8006F88C 00000000 */ nop +/* 4AC88 8006F888 00000000 */ nop +/* 4AC8C 8006F88C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s index d9b7857948..f42e42fb35 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadId.s @@ -8,7 +8,7 @@ glabel osFlashReadId /* 4A590 8006F190 AFA50024 */ sw $a1, 0x24($sp) /* 4A594 8006F194 27A4001F */ addiu $a0, $sp, 0x1f /* 4A598 8006F198 0C01BC2E */ jal osFlashReadStatus -/* 4A59C 8006F19C 00000000 */ nop +/* 4A59C 8006F19C 00000000 */ nop /* 4A5A0 8006F1A0 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A5A4 8006F1A4 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A5A8 8006F1A8 3C05800B */ lui $a1, %hi(D_800B0C7C) @@ -18,7 +18,7 @@ glabel osFlashReadId /* 4A5B8 8006F1B8 01C02825 */ or $a1, $t6, $zero /* 4A5BC 8006F1BC 3C06E100 */ lui $a2, 0xe100 /* 4A5C0 8006F1C0 0C018358 */ jal osEPiWriteIo -/* 4A5C4 8006F1C4 00000000 */ nop +/* 4A5C4 8006F1C4 00000000 */ nop /* 4A5C8 8006F1C8 3C01800B */ lui $at, %hi(D_800B0C42) /* 4A5CC 8006F1CC A0200C42 */ sb $zero, %lo(D_800B0C42)($at) /* 4A5D0 8006F1D0 3C0F800B */ lui $t7, %hi(D_800B0C58) @@ -38,38 +38,38 @@ glabel osFlashReadId /* 4A608 8006F208 24840C30 */ addiu $a0, $a0, %lo(D_800B0C30) /* 4A60C 8006F20C 24050010 */ addiu $a1, $zero, 0x10 /* 4A610 8006F210 0C018614 */ jal osWritebackDCache -/* 4A614 8006F214 00000000 */ nop +/* 4A614 8006F214 00000000 */ nop /* 4A618 8006F218 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A61C 8006F21C 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A620 8006F220 3C05800B */ lui $a1, %hi(D_800B0C40) /* 4A624 8006F224 24A50C40 */ addiu $a1, $a1, %lo(D_800B0C40) /* 4A628 8006F228 00003025 */ or $a2, $zero, $zero /* 4A62C 8006F22C 0C018388 */ jal osEPiStartDma -/* 4A630 8006F230 00000000 */ nop +/* 4A630 8006F230 00000000 */ nop /* 4A634 8006F234 3C04800B */ lui $a0, %hi(D_800B0C58) /* 4A638 8006F238 24840C58 */ addiu $a0, $a0, %lo(D_800B0C58) /* 4A63C 8006F23C 00002825 */ or $a1, $zero, $zero /* 4A640 8006F240 24060001 */ addiu $a2, $zero, 1 /* 4A644 8006F244 0C0195BC */ jal osRecvMesg -/* 4A648 8006F248 00000000 */ nop +/* 4A648 8006F248 00000000 */ nop /* 4A64C 8006F24C 3C08800B */ lui $t0, %hi(D_800B0C30) /* 4A650 8006F250 25080C30 */ addiu $t0, $t0, %lo(D_800B0C30) /* 4A654 8006F254 8D090000 */ lw $t1, ($t0) /* 4A658 8006F258 8FAA0020 */ lw $t2, 0x20($sp) -/* 4A65C 8006F25C 00000000 */ nop +/* 4A65C 8006F25C 00000000 */ nop /* 4A660 8006F260 AD490000 */ sw $t1, ($t2) /* 4A664 8006F264 3C0B800B */ lui $t3, %hi(D_800B0C30) /* 4A668 8006F268 256B0C30 */ addiu $t3, $t3, %lo(D_800B0C30) /* 4A66C 8006F26C 8D6C0004 */ lw $t4, 4($t3) /* 4A670 8006F270 8FAD0024 */ lw $t5, 0x24($sp) -/* 4A674 8006F274 00000000 */ nop +/* 4A674 8006F274 00000000 */ nop /* 4A678 8006F278 ADAC0000 */ sw $t4, ($t5) /* 4A67C 8006F27C 10000003 */ b .L8006F28C -/* 4A680 8006F280 00000000 */ nop +/* 4A680 8006F280 00000000 */ nop /* 4A684 8006F284 10000001 */ b .L8006F28C -/* 4A688 8006F288 00000000 */ nop +/* 4A688 8006F288 00000000 */ nop .L8006F28C: /* 4A68C 8006F28C 8FBF0014 */ lw $ra, 0x14($sp) /* 4A690 8006F290 27BD0020 */ addiu $sp, $sp, 0x20 /* 4A694 8006F294 03E00008 */ jr $ra -/* 4A698 8006F298 00000000 */ nop +/* 4A698 8006F298 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s index 5f2cd0320e..018d12e508 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashReadStatus.s @@ -14,14 +14,14 @@ glabel osFlashReadStatus /* 4A4DC 8006F0DC 01C02825 */ or $a1, $t6, $zero /* 4A4E0 8006F0E0 3C06D200 */ lui $a2, 0xd200 /* 4A4E4 8006F0E4 0C018358 */ jal osEPiWriteIo -/* 4A4E8 8006F0E8 00000000 */ nop +/* 4A4E8 8006F0E8 00000000 */ nop /* 4A4EC 8006F0EC 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A4F0 8006F0F0 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A4F4 8006F0F4 3C05800B */ lui $a1, %hi(D_800B0C7C) /* 4A4F8 8006F0F8 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4A4FC 8006F0FC 27A6001C */ addiu $a2, $sp, 0x1c /* 4A500 8006F100 0C018370 */ jal osEPiReadIo -/* 4A504 8006F104 00000000 */ nop +/* 4A504 8006F104 00000000 */ nop /* 4A508 8006F108 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A50C 8006F10C 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A510 8006F110 3C05800B */ lui $a1, %hi(D_800B0C7C) @@ -31,26 +31,26 @@ glabel osFlashReadStatus /* 4A520 8006F120 01E02825 */ or $a1, $t7, $zero /* 4A524 8006F124 3C06D200 */ lui $a2, 0xd200 /* 4A528 8006F128 0C018358 */ jal osEPiWriteIo -/* 4A52C 8006F12C 00000000 */ nop +/* 4A52C 8006F12C 00000000 */ nop /* 4A530 8006F130 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A534 8006F134 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A538 8006F138 3C05800B */ lui $a1, %hi(D_800B0C7C) /* 4A53C 8006F13C 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4A540 8006F140 27A6001C */ addiu $a2, $sp, 0x1c /* 4A544 8006F144 0C018370 */ jal osEPiReadIo -/* 4A548 8006F148 00000000 */ nop +/* 4A548 8006F148 00000000 */ nop /* 4A54C 8006F14C 8FB8001C */ lw $t8, 0x1c($sp) -/* 4A550 8006F150 00000000 */ nop +/* 4A550 8006F150 00000000 */ nop /* 4A554 8006F154 331900FF */ andi $t9, $t8, 0xff /* 4A558 8006F158 8FA80020 */ lw $t0, 0x20($sp) -/* 4A55C 8006F15C 00000000 */ nop +/* 4A55C 8006F15C 00000000 */ nop /* 4A560 8006F160 A1190000 */ sb $t9, ($t0) /* 4A564 8006F164 10000003 */ b .L8006F174 -/* 4A568 8006F168 00000000 */ nop +/* 4A568 8006F168 00000000 */ nop /* 4A56C 8006F16C 10000001 */ b .L8006F174 -/* 4A570 8006F170 00000000 */ nop +/* 4A570 8006F170 00000000 */ nop .L8006F174: /* 4A574 8006F174 8FBF0014 */ lw $ra, 0x14($sp) /* 4A578 8006F178 27BD0020 */ addiu $sp, $sp, 0x20 /* 4A57C 8006F17C 03E00008 */ jr $ra -/* 4A580 8006F180 00000000 */ nop +/* 4A580 8006F180 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s index d463a4c2df..b617f2301b 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashSectorErase.s @@ -17,7 +17,7 @@ glabel osFlashSectorErase /* 4A854 8006F454 00C17825 */ or $t7, $a2, $at /* 4A858 8006F458 01E03025 */ or $a2, $t7, $zero /* 4A85C 8006F45C 0C018358 */ jal osEPiWriteIo -/* 4A860 8006F460 00000000 */ nop +/* 4A860 8006F460 00000000 */ nop /* 4A864 8006F464 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A868 8006F468 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A86C 8006F46C 3C05800B */ lui $a1, %hi(D_800B0C7C) @@ -27,7 +27,7 @@ glabel osFlashSectorErase /* 4A87C 8006F47C 03002825 */ or $a1, $t8, $zero /* 4A880 8006F480 3C067800 */ lui $a2, 0x7800 /* 4A884 8006F484 0C018358 */ jal osEPiWriteIo -/* 4A888 8006F488 00000000 */ nop +/* 4A888 8006F488 00000000 */ nop .L8006F48C: /* 4A88C 8006F48C 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A890 8006F490 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) @@ -35,50 +35,50 @@ glabel osFlashSectorErase /* 4A898 8006F498 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4A89C 8006F49C 27A6001C */ addiu $a2, $sp, 0x1c /* 4A8A0 8006F4A0 0C018370 */ jal osEPiReadIo -/* 4A8A4 8006F4A4 00000000 */ nop +/* 4A8A4 8006F4A4 00000000 */ nop /* 4A8A8 8006F4A8 8FB9001C */ lw $t9, 0x1c($sp) -/* 4A8AC 8006F4AC 00000000 */ nop +/* 4A8AC 8006F4AC 00000000 */ nop /* 4A8B0 8006F4B0 33280002 */ andi $t0, $t9, 2 /* 4A8B4 8006F4B4 24010002 */ addiu $at, $zero, 2 /* 4A8B8 8006F4B8 1101FFF4 */ beq $t0, $at, .L8006F48C -/* 4A8BC 8006F4BC 00000000 */ nop +/* 4A8BC 8006F4BC 00000000 */ nop /* 4A8C0 8006F4C0 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A8C4 8006F4C4 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A8C8 8006F4C8 3C05800B */ lui $a1, %hi(D_800B0C7C) /* 4A8CC 8006F4CC 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4A8D0 8006F4D0 27A6001C */ addiu $a2, $sp, 0x1c /* 4A8D4 8006F4D4 0C018370 */ jal osEPiReadIo -/* 4A8D8 8006F4D8 00000000 */ nop +/* 4A8D8 8006F4D8 00000000 */ nop /* 4A8DC 8006F4DC 0C01BCA7 */ jal osFlashClearStatus -/* 4A8E0 8006F4E0 00000000 */ nop +/* 4A8E0 8006F4E0 00000000 */ nop /* 4A8E4 8006F4E4 8FA9001C */ lw $t1, 0x1c($sp) -/* 4A8E8 8006F4E8 00000000 */ nop +/* 4A8E8 8006F4E8 00000000 */ nop /* 4A8EC 8006F4EC 312A00FF */ andi $t2, $t1, 0xff /* 4A8F0 8006F4F0 24010008 */ addiu $at, $zero, 8 /* 4A8F4 8006F4F4 11410008 */ beq $t2, $at, .L8006F518 -/* 4A8F8 8006F4F8 00000000 */ nop +/* 4A8F8 8006F4F8 00000000 */ nop /* 4A8FC 8006F4FC 24010048 */ addiu $at, $zero, 0x48 /* 4A900 8006F500 11410005 */ beq $t2, $at, .L8006F518 -/* 4A904 8006F504 00000000 */ nop +/* 4A904 8006F504 00000000 */ nop /* 4A908 8006F508 312B0008 */ andi $t3, $t1, 8 /* 4A90C 8006F50C 24010008 */ addiu $at, $zero, 8 /* 4A910 8006F510 15610006 */ bne $t3, $at, .L8006F52C -/* 4A914 8006F514 00000000 */ nop +/* 4A914 8006F514 00000000 */ nop .L8006F518: /* 4A918 8006F518 00001025 */ or $v0, $zero, $zero /* 4A91C 8006F51C 10000008 */ b .L8006F540 -/* 4A920 8006F520 00000000 */ nop +/* 4A920 8006F520 00000000 */ nop /* 4A924 8006F524 10000004 */ b .L8006F538 -/* 4A928 8006F528 00000000 */ nop +/* 4A928 8006F528 00000000 */ nop .L8006F52C: /* 4A92C 8006F52C 2402FFFF */ addiu $v0, $zero, -1 /* 4A930 8006F530 10000003 */ b .L8006F540 -/* 4A934 8006F534 00000000 */ nop +/* 4A934 8006F534 00000000 */ nop .L8006F538: /* 4A938 8006F538 10000001 */ b .L8006F540 -/* 4A93C 8006F53C 00000000 */ nop +/* 4A93C 8006F53C 00000000 */ nop .L8006F540: /* 4A940 8006F540 8FBF0014 */ lw $ra, 0x14($sp) /* 4A944 8006F544 27BD0020 */ addiu $sp, $sp, 0x20 /* 4A948 8006F548 03E00008 */ jr $ra -/* 4A94C 8006F54C 00000000 */ nop +/* 4A94C 8006F54C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s index 2a95443ba7..a4d0ab435d 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteArray.s @@ -9,7 +9,7 @@ glabel osFlashWriteArray /* 4AA2C 8006F62C 8DCE0CE8 */ lw $t6, %lo(D_800B0CE8)($t6) /* 4AA30 8006F630 24010001 */ addiu $at, $zero, 1 /* 4AA34 8006F634 15C1000B */ bne $t6, $at, .L8006F664 -/* 4AA38 8006F638 00000000 */ nop +/* 4AA38 8006F638 00000000 */ nop /* 4AA3C 8006F63C 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4AA40 8006F640 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4AA44 8006F644 3C05800B */ lui $a1, %hi(D_800B0C7C) @@ -19,7 +19,7 @@ glabel osFlashWriteArray /* 4AA54 8006F654 01E02825 */ or $a1, $t7, $zero /* 4AA58 8006F658 3C06B400 */ lui $a2, 0xb400 /* 4AA5C 8006F65C 0C018358 */ jal osEPiWriteIo -/* 4AA60 8006F660 00000000 */ nop +/* 4AA60 8006F660 00000000 */ nop .L8006F664: /* 4AA64 8006F664 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4AA68 8006F668 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) @@ -33,7 +33,7 @@ glabel osFlashWriteArray /* 4AA88 8006F688 00C1C825 */ or $t9, $a2, $at /* 4AA8C 8006F68C 03203025 */ or $a2, $t9, $zero /* 4AA90 8006F690 0C018358 */ jal osEPiWriteIo -/* 4AA94 8006F694 00000000 */ nop +/* 4AA94 8006F694 00000000 */ nop .L8006F698: /* 4AA98 8006F698 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4AA9C 8006F69C 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) @@ -41,50 +41,50 @@ glabel osFlashWriteArray /* 4AAA4 8006F6A4 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4AAA8 8006F6A8 27A6001C */ addiu $a2, $sp, 0x1c /* 4AAAC 8006F6AC 0C018370 */ jal osEPiReadIo -/* 4AAB0 8006F6B0 00000000 */ nop +/* 4AAB0 8006F6B0 00000000 */ nop /* 4AAB4 8006F6B4 8FA8001C */ lw $t0, 0x1c($sp) -/* 4AAB8 8006F6B8 00000000 */ nop +/* 4AAB8 8006F6B8 00000000 */ nop /* 4AABC 8006F6BC 31090001 */ andi $t1, $t0, 1 /* 4AAC0 8006F6C0 24010001 */ addiu $at, $zero, 1 /* 4AAC4 8006F6C4 1121FFF4 */ beq $t1, $at, .L8006F698 -/* 4AAC8 8006F6C8 00000000 */ nop +/* 4AAC8 8006F6C8 00000000 */ nop /* 4AACC 8006F6CC 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4AAD0 8006F6D0 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4AAD4 8006F6D4 3C05800B */ lui $a1, %hi(D_800B0C7C) /* 4AAD8 8006F6D8 8CA50C7C */ lw $a1, %lo(D_800B0C7C)($a1) /* 4AADC 8006F6DC 27A6001C */ addiu $a2, $sp, 0x1c /* 4AAE0 8006F6E0 0C018370 */ jal osEPiReadIo -/* 4AAE4 8006F6E4 00000000 */ nop +/* 4AAE4 8006F6E4 00000000 */ nop /* 4AAE8 8006F6E8 0C01BCA7 */ jal osFlashClearStatus -/* 4AAEC 8006F6EC 00000000 */ nop +/* 4AAEC 8006F6EC 00000000 */ nop /* 4AAF0 8006F6F0 8FAA001C */ lw $t2, 0x1c($sp) -/* 4AAF4 8006F6F4 00000000 */ nop +/* 4AAF4 8006F6F4 00000000 */ nop /* 4AAF8 8006F6F8 314B00FF */ andi $t3, $t2, 0xff /* 4AAFC 8006F6FC 24010004 */ addiu $at, $zero, 4 /* 4AB00 8006F700 11610008 */ beq $t3, $at, .L8006F724 -/* 4AB04 8006F704 00000000 */ nop +/* 4AB04 8006F704 00000000 */ nop /* 4AB08 8006F708 24010044 */ addiu $at, $zero, 0x44 /* 4AB0C 8006F70C 11610005 */ beq $t3, $at, .L8006F724 -/* 4AB10 8006F710 00000000 */ nop +/* 4AB10 8006F710 00000000 */ nop /* 4AB14 8006F714 314C0004 */ andi $t4, $t2, 4 /* 4AB18 8006F718 24010004 */ addiu $at, $zero, 4 /* 4AB1C 8006F71C 15810006 */ bne $t4, $at, .L8006F738 -/* 4AB20 8006F720 00000000 */ nop +/* 4AB20 8006F720 00000000 */ nop .L8006F724: /* 4AB24 8006F724 00001025 */ or $v0, $zero, $zero /* 4AB28 8006F728 10000008 */ b .L8006F74C -/* 4AB2C 8006F72C 00000000 */ nop +/* 4AB2C 8006F72C 00000000 */ nop /* 4AB30 8006F730 10000004 */ b .L8006F744 -/* 4AB34 8006F734 00000000 */ nop +/* 4AB34 8006F734 00000000 */ nop .L8006F738: /* 4AB38 8006F738 2402FFFF */ addiu $v0, $zero, -1 /* 4AB3C 8006F73C 10000003 */ b .L8006F74C -/* 4AB40 8006F740 00000000 */ nop +/* 4AB40 8006F740 00000000 */ nop .L8006F744: /* 4AB44 8006F744 10000001 */ b .L8006F74C -/* 4AB48 8006F748 00000000 */ nop +/* 4AB48 8006F748 00000000 */ nop .L8006F74C: /* 4AB4C 8006F74C 8FBF0014 */ lw $ra, 0x14($sp) /* 4AB50 8006F750 27BD0020 */ addiu $sp, $sp, 0x20 /* 4AB54 8006F754 03E00008 */ jr $ra -/* 4AB58 8006F758 00000000 */ nop +/* 4AB58 8006F758 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s b/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s index 07701387eb..3899b63875 100644 --- a/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s +++ b/asm/nonmatchings/os/code_4a360_len_930/osFlashWriteBuffer.s @@ -17,40 +17,40 @@ glabel osFlashWriteBuffer /* 4A980 8006F580 01C02825 */ or $a1, $t6, $zero /* 4A984 8006F584 3C06B400 */ lui $a2, 0xb400 /* 4A988 8006F588 0C018358 */ jal osEPiWriteIo -/* 4A98C 8006F58C 00000000 */ nop +/* 4A98C 8006F58C 00000000 */ nop /* 4A990 8006F590 8FAF0024 */ lw $t7, 0x24($sp) /* 4A994 8006F594 8FB80020 */ lw $t8, 0x20($sp) -/* 4A998 8006F598 00000000 */ nop +/* 4A998 8006F598 00000000 */ nop /* 4A99C 8006F59C A30F0002 */ sb $t7, 2($t8) /* 4A9A0 8006F5A0 8FB9002C */ lw $t9, 0x2c($sp) /* 4A9A4 8006F5A4 8FA80020 */ lw $t0, 0x20($sp) -/* 4A9A8 8006F5A8 00000000 */ nop +/* 4A9A8 8006F5A8 00000000 */ nop /* 4A9AC 8006F5AC AD190004 */ sw $t9, 4($t0) /* 4A9B0 8006F5B0 8FA90028 */ lw $t1, 0x28($sp) /* 4A9B4 8006F5B4 8FAA0020 */ lw $t2, 0x20($sp) -/* 4A9B8 8006F5B8 00000000 */ nop +/* 4A9B8 8006F5B8 00000000 */ nop /* 4A9BC 8006F5BC AD490008 */ sw $t1, 8($t2) /* 4A9C0 8006F5C0 8FAB0020 */ lw $t3, 0x20($sp) -/* 4A9C4 8006F5C4 00000000 */ nop +/* 4A9C4 8006F5C4 00000000 */ nop /* 4A9C8 8006F5C8 AD60000C */ sw $zero, 0xc($t3) /* 4A9CC 8006F5CC 240C0080 */ addiu $t4, $zero, 0x80 /* 4A9D0 8006F5D0 8FAD0020 */ lw $t5, 0x20($sp) -/* 4A9D4 8006F5D4 00000000 */ nop +/* 4A9D4 8006F5D4 00000000 */ nop /* 4A9D8 8006F5D8 ADAC0010 */ sw $t4, 0x10($t5) /* 4A9DC 8006F5DC 3C04800B */ lui $a0, %hi(D_800B0C70) /* 4A9E0 8006F5E0 24840C70 */ addiu $a0, $a0, %lo(D_800B0C70) /* 4A9E4 8006F5E4 8FA50020 */ lw $a1, 0x20($sp) /* 4A9E8 8006F5E8 24060001 */ addiu $a2, $zero, 1 /* 4A9EC 8006F5EC 0C018388 */ jal osEPiStartDma -/* 4A9F0 8006F5F0 00000000 */ nop +/* 4A9F0 8006F5F0 00000000 */ nop /* 4A9F4 8006F5F4 AFA2001C */ sw $v0, 0x1c($sp) /* 4A9F8 8006F5F8 8FA2001C */ lw $v0, 0x1c($sp) /* 4A9FC 8006F5FC 10000003 */ b .L8006F60C -/* 4AA00 8006F600 00000000 */ nop +/* 4AA00 8006F600 00000000 */ nop /* 4AA04 8006F604 10000001 */ b .L8006F60C -/* 4AA08 8006F608 00000000 */ nop +/* 4AA08 8006F608 00000000 */ nop .L8006F60C: /* 4AA0C 8006F60C 8FBF0014 */ lw $ra, 0x14($sp) /* 4AA10 8006F610 27BD0020 */ addiu $sp, $sp, 0x20 /* 4AA14 8006F614 03E00008 */ jr $ra -/* 4AA18 8006F618 00000000 */ nop +/* 4AA18 8006F618 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s index ff7d3326f5..7308b9e791 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F890.s @@ -25,4 +25,4 @@ glabel func_8006F890 /* 4ACE0 8006F8E0 3C018008 */ lui $at, %hi(D_8007F210) /* 4ACE4 8006F8E4 8C21F210 */ lw $at, %lo(D_8007F210)($at) /* 4ACE8 8006F8E8 00200008 */ jr $at -/* 4ACEC 8006F8EC 00000000 */ nop +/* 4ACEC 8006F8EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s index 44df02189c..a87db96ed2 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F8F0.s @@ -25,4 +25,4 @@ glabel func_8006F8F0 /* 4AD40 8006F940 3C018008 */ lui $at, %hi(D_8007F228) /* 4AD44 8006F944 8C21F228 */ lw $at, %lo(D_8007F228)($at) /* 4AD48 8006F948 00200008 */ jr $at -/* 4AD4C 8006F94C 00000000 */ nop +/* 4AD4C 8006F94C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s index 1a4cc64302..d4f9bb7eb3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F950.s @@ -25,4 +25,4 @@ glabel func_8006F950 /* 4ADA0 8006F9A0 3C018008 */ lui $at, %hi(D_8007F240) /* 4ADA4 8006F9A4 8C21F240 */ lw $at, %lo(D_8007F240)($at) /* 4ADA8 8006F9A8 00200008 */ jr $at -/* 4ADAC 8006F9AC 00000000 */ nop +/* 4ADAC 8006F9AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s index e623842b4a..45b47e5a0a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006F9B0.s @@ -25,4 +25,4 @@ glabel func_8006F9B0 /* 4AE00 8006FA00 3C018008 */ lui $at, %hi(D_8007F258) /* 4AE04 8006FA04 8C21F258 */ lw $at, %lo(D_8007F258)($at) /* 4AE08 8006FA08 00200008 */ jr $at -/* 4AE0C 8006FA0C 00000000 */ nop +/* 4AE0C 8006FA0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s index 536716fbf5..88696d617f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA10.s @@ -25,4 +25,4 @@ glabel func_8006FA10 /* 4AE60 8006FA60 3C018008 */ lui $at, %hi(D_8007F270) /* 4AE64 8006FA64 8C21F270 */ lw $at, %lo(D_8007F270)($at) /* 4AE68 8006FA68 00200008 */ jr $at -/* 4AE6C 8006FA6C 00000000 */ nop +/* 4AE6C 8006FA6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s index 21cfcefd50..a32d3d2617 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FA70.s @@ -25,4 +25,4 @@ glabel func_8006FA70 /* 4AEC0 8006FAC0 3C018008 */ lui $at, %hi(D_8007F288) /* 4AEC4 8006FAC4 8C21F288 */ lw $at, %lo(D_8007F288)($at) /* 4AEC8 8006FAC8 00200008 */ jr $at -/* 4AECC 8006FACC 00000000 */ nop +/* 4AECC 8006FACC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s index dfd3f26660..5b5944cc71 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FB90.s @@ -25,4 +25,4 @@ glabel func_8006FB90 /* 4AFE0 8006FBE0 3C018008 */ lui $at, %hi(D_8007F2D0) /* 4AFE4 8006FBE4 8C21F2D0 */ lw $at, %lo(D_8007F2D0)($at) /* 4AFE8 8006FBE8 00200008 */ jr $at -/* 4AFEC 8006FBEC 00000000 */ nop +/* 4AFEC 8006FBEC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s index 6a43f511a8..bbee9640ba 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FBF0.s @@ -25,4 +25,4 @@ glabel func_8006FBF0 /* 4B040 8006FC40 3C018008 */ lui $at, %hi(D_8007F2E8) /* 4B044 8006FC44 8C21F2E8 */ lw $at, %lo(D_8007F2E8)($at) /* 4B048 8006FC48 00200008 */ jr $at -/* 4B04C 8006FC4C 00000000 */ nop +/* 4B04C 8006FC4C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s index 638f6f8b23..e2e396766a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FC50.s @@ -25,4 +25,4 @@ glabel func_8006FC50 /* 4B0A0 8006FCA0 3C018008 */ lui $at, %hi(D_8007F300) /* 4B0A4 8006FCA4 8C21F300 */ lw $at, %lo(D_8007F300)($at) /* 4B0A8 8006FCA8 00200008 */ jr $at -/* 4B0AC 8006FCAC 00000000 */ nop +/* 4B0AC 8006FCAC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s index 4e3c72240b..5238b89679 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FCB0.s @@ -25,4 +25,4 @@ glabel func_8006FCB0 /* 4B100 8006FD00 3C018008 */ lui $at, %hi(D_8007F318) /* 4B104 8006FD04 8C21F318 */ lw $at, %lo(D_8007F318)($at) /* 4B108 8006FD08 00200008 */ jr $at -/* 4B10C 8006FD0C 00000000 */ nop +/* 4B10C 8006FD0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s index d89437fee8..cc42632ad5 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD10.s @@ -25,4 +25,4 @@ glabel func_8006FD10 /* 4B160 8006FD60 3C018008 */ lui $at, %hi(D_8007F330) /* 4B164 8006FD64 8C21F330 */ lw $at, %lo(D_8007F330)($at) /* 4B168 8006FD68 00200008 */ jr $at -/* 4B16C 8006FD6C 00000000 */ nop +/* 4B16C 8006FD6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s index 19ee6981f7..451fecec2a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FD70.s @@ -25,4 +25,4 @@ glabel func_8006FD70 /* 4B1C0 8006FDC0 3C018008 */ lui $at, %hi(D_8007F348) /* 4B1C4 8006FDC4 8C21F348 */ lw $at, %lo(D_8007F348)($at) /* 4B1C8 8006FDC8 00200008 */ jr $at -/* 4B1CC 8006FDCC 00000000 */ nop +/* 4B1CC 8006FDCC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s index ca263294c3..240fae707b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FDD0.s @@ -25,4 +25,4 @@ glabel func_8006FDD0 /* 4B220 8006FE20 3C018008 */ lui $at, %hi(D_8007F360) /* 4B224 8006FE24 8C21F360 */ lw $at, %lo(D_8007F360)($at) /* 4B228 8006FE28 00200008 */ jr $at -/* 4B22C 8006FE2C 00000000 */ nop +/* 4B22C 8006FE2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s index 43ab5bf4a1..90c4ba213b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FE30.s @@ -25,4 +25,4 @@ glabel func_8006FE30 /* 4B280 8006FE80 3C018008 */ lui $at, %hi(D_8007F378) /* 4B284 8006FE84 8C21F378 */ lw $at, %lo(D_8007F378)($at) /* 4B288 8006FE88 00200008 */ jr $at -/* 4B28C 8006FE8C 00000000 */ nop +/* 4B28C 8006FE8C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s index 6bc3da433d..0bb938b2dc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FEF0.s @@ -25,4 +25,4 @@ glabel func_8006FEF0 /* 4B340 8006FF40 3C018008 */ lui $at, %hi(D_8007F3A8) /* 4B344 8006FF44 8C21F3A8 */ lw $at, %lo(D_8007F3A8)($at) /* 4B348 8006FF48 00200008 */ jr $at -/* 4B34C 8006FF4C 00000000 */ nop +/* 4B34C 8006FF4C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s index c05084cb23..482847ac90 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FF50.s @@ -25,4 +25,4 @@ glabel func_8006FF50 /* 4B3A0 8006FFA0 3C018008 */ lui $at, %hi(D_8007F3C0) /* 4B3A4 8006FFA4 8C21F3C0 */ lw $at, %lo(D_8007F3C0)($at) /* 4B3A8 8006FFA8 00200008 */ jr $at -/* 4B3AC 8006FFAC 00000000 */ nop +/* 4B3AC 8006FFAC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s index 4bb03899f1..397a8c29b4 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_8006FFB0.s @@ -25,4 +25,4 @@ glabel func_8006FFB0 /* 4B400 80070000 3C018008 */ lui $at, %hi(D_8007F3D8) /* 4B404 80070004 8C21F3D8 */ lw $at, %lo(D_8007F3D8)($at) /* 4B408 80070008 00200008 */ jr $at -/* 4B40C 8007000C 00000000 */ nop +/* 4B40C 8007000C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s index 195046711a..c659eafe84 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070010.s @@ -25,4 +25,4 @@ glabel func_80070010 /* 4B460 80070060 3C018008 */ lui $at, %hi(D_8007F3F0) /* 4B464 80070064 8C21F3F0 */ lw $at, %lo(D_8007F3F0)($at) /* 4B468 80070068 00200008 */ jr $at -/* 4B46C 8007006C 00000000 */ nop +/* 4B46C 8007006C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s index f2d02b9acc..1082ec4808 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070070.s @@ -25,4 +25,4 @@ glabel func_80070070 /* 4B4C0 800700C0 3C018008 */ lui $at, %hi(D_8007F408) /* 4B4C4 800700C4 8C21F408 */ lw $at, %lo(D_8007F408)($at) /* 4B4C8 800700C8 00200008 */ jr $at -/* 4B4CC 800700CC 00000000 */ nop +/* 4B4CC 800700CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s index 554920b735..5f84066dbb 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800700D0.s @@ -25,4 +25,4 @@ glabel func_800700D0 /* 4B520 80070120 3C018008 */ lui $at, %hi(D_8007F420) /* 4B524 80070124 8C21F420 */ lw $at, %lo(D_8007F420)($at) /* 4B528 80070128 00200008 */ jr $at -/* 4B52C 8007012C 00000000 */ nop +/* 4B52C 8007012C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s index 3507c4954b..c638658332 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070130.s @@ -25,4 +25,4 @@ glabel func_80070130 /* 4B580 80070180 3C018008 */ lui $at, %hi(D_8007F438) /* 4B584 80070184 8C21F438 */ lw $at, %lo(D_8007F438)($at) /* 4B588 80070188 00200008 */ jr $at -/* 4B58C 8007018C 00000000 */ nop +/* 4B58C 8007018C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s index de72185342..4b2f229217 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070190.s @@ -25,4 +25,4 @@ glabel func_80070190 /* 4B5E0 800701E0 3C018008 */ lui $at, %hi(D_8007F450) /* 4B5E4 800701E4 8C21F450 */ lw $at, %lo(D_8007F450)($at) /* 4B5E8 800701E8 00200008 */ jr $at -/* 4B5EC 800701EC 00000000 */ nop +/* 4B5EC 800701EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s index 409ebc0bf1..d18cdced15 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800701F0.s @@ -25,4 +25,4 @@ glabel func_800701F0 /* 4B640 80070240 3C018008 */ lui $at, %hi(D_8007F468) /* 4B644 80070244 8C21F468 */ lw $at, %lo(D_8007F468)($at) /* 4B648 80070248 00200008 */ jr $at -/* 4B64C 8007024C 00000000 */ nop +/* 4B64C 8007024C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s index 4b84327f05..1b8ee2262a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070250.s @@ -25,4 +25,4 @@ glabel func_80070250 /* 4B6A0 800702A0 3C018008 */ lui $at, %hi(D_8007F480) /* 4B6A4 800702A4 8C21F480 */ lw $at, %lo(D_8007F480)($at) /* 4B6A8 800702A8 00200008 */ jr $at -/* 4B6AC 800702AC 00000000 */ nop +/* 4B6AC 800702AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s index 6332f037c9..9ef59a1a81 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800702B0.s @@ -25,4 +25,4 @@ glabel func_800702B0 /* 4B700 80070300 3C018008 */ lui $at, %hi(D_8007F498) /* 4B704 80070304 8C21F498 */ lw $at, %lo(D_8007F498)($at) /* 4B708 80070308 00200008 */ jr $at -/* 4B70C 8007030C 00000000 */ nop +/* 4B70C 8007030C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s index 47a6b335de..d5ece2c775 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070310.s @@ -25,4 +25,4 @@ glabel func_80070310 /* 4B760 80070360 3C018008 */ lui $at, %hi(D_8007F4B0) /* 4B764 80070364 8C21F4B0 */ lw $at, %lo(D_8007F4B0)($at) /* 4B768 80070368 00200008 */ jr $at -/* 4B76C 8007036C 00000000 */ nop +/* 4B76C 8007036C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s index 1e62c3c417..c12f4fe344 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070370.s @@ -25,4 +25,4 @@ glabel func_80070370 /* 4B7C0 800703C0 3C018008 */ lui $at, %hi(D_8007F4C8) /* 4B7C4 800703C4 8C21F4C8 */ lw $at, %lo(D_8007F4C8)($at) /* 4B7C8 800703C8 00200008 */ jr $at -/* 4B7CC 800703CC 00000000 */ nop +/* 4B7CC 800703CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s index 8c8d1e6a9c..6c7b0e03df 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800703D0.s @@ -25,4 +25,4 @@ glabel func_800703D0 /* 4B820 80070420 3C018008 */ lui $at, %hi(D_8007F4E0) /* 4B824 80070424 8C21F4E0 */ lw $at, %lo(D_8007F4E0)($at) /* 4B828 80070428 00200008 */ jr $at -/* 4B82C 8007042C 00000000 */ nop +/* 4B82C 8007042C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s index 53d0c05121..0e5d905eef 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070430.s @@ -25,4 +25,4 @@ glabel func_80070430 /* 4B880 80070480 3C018008 */ lui $at, %hi(D_8007F4F8) /* 4B884 80070484 8C21F4F8 */ lw $at, %lo(D_8007F4F8)($at) /* 4B888 80070488 00200008 */ jr $at -/* 4B88C 8007048C 00000000 */ nop +/* 4B88C 8007048C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s index 57a7a51c51..f210d25008 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070490.s @@ -25,4 +25,4 @@ glabel func_80070490 /* 4B8E0 800704E0 3C018008 */ lui $at, %hi(D_8007F510) /* 4B8E4 800704E4 8C21F510 */ lw $at, %lo(D_8007F510)($at) /* 4B8E8 800704E8 00200008 */ jr $at -/* 4B8EC 800704EC 00000000 */ nop +/* 4B8EC 800704EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s index aeb0898541..3c9a261f05 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800704F0.s @@ -25,4 +25,4 @@ glabel func_800704F0 /* 4B940 80070540 3C018008 */ lui $at, %hi(D_8007F528) /* 4B944 80070544 8C21F528 */ lw $at, %lo(D_8007F528)($at) /* 4B948 80070548 00200008 */ jr $at -/* 4B94C 8007054C 00000000 */ nop +/* 4B94C 8007054C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s index bfb0f04723..ee1087c6fe 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070550.s @@ -25,4 +25,4 @@ glabel func_80070550 /* 4B9A0 800705A0 3C018008 */ lui $at, %hi(D_8007F540) /* 4B9A4 800705A4 8C21F540 */ lw $at, %lo(D_8007F540)($at) /* 4B9A8 800705A8 00200008 */ jr $at -/* 4B9AC 800705AC 00000000 */ nop +/* 4B9AC 800705AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s index 6f4f6fb8a2..c8125a0d99 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800705B0.s @@ -25,4 +25,4 @@ glabel func_800705B0 /* 4BA00 80070600 3C018008 */ lui $at, %hi(D_8007F558) /* 4BA04 80070604 8C21F558 */ lw $at, %lo(D_8007F558)($at) /* 4BA08 80070608 00200008 */ jr $at -/* 4BA0C 8007060C 00000000 */ nop +/* 4BA0C 8007060C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s index a01b8dc76a..2b20772f4c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070610.s @@ -25,4 +25,4 @@ glabel func_80070610 /* 4BA60 80070660 3C018008 */ lui $at, %hi(D_8007F570) /* 4BA64 80070664 8C21F570 */ lw $at, %lo(D_8007F570)($at) /* 4BA68 80070668 00200008 */ jr $at -/* 4BA6C 8007066C 00000000 */ nop +/* 4BA6C 8007066C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s index 0ef05ce3a5..6acfd64ccc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070670.s @@ -25,4 +25,4 @@ glabel func_80070670 /* 4BAC0 800706C0 3C018008 */ lui $at, %hi(D_8007F588) /* 4BAC4 800706C4 8C21F588 */ lw $at, %lo(D_8007F588)($at) /* 4BAC8 800706C8 00200008 */ jr $at -/* 4BACC 800706CC 00000000 */ nop +/* 4BACC 800706CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s index e54bbccf7f..73696488b4 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800706D0.s @@ -25,4 +25,4 @@ glabel func_800706D0 /* 4BB20 80070720 3C018008 */ lui $at, %hi(D_8007F5A0) /* 4BB24 80070724 8C21F5A0 */ lw $at, %lo(D_8007F5A0)($at) /* 4BB28 80070728 00200008 */ jr $at -/* 4BB2C 8007072C 00000000 */ nop +/* 4BB2C 8007072C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s index 557e617329..b72ae039a4 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070730.s @@ -25,4 +25,4 @@ glabel func_80070730 /* 4BB80 80070780 3C018008 */ lui $at, %hi(D_8007F5B8) /* 4BB84 80070784 8C21F5B8 */ lw $at, %lo(D_8007F5B8)($at) /* 4BB88 80070788 00200008 */ jr $at -/* 4BB8C 8007078C 00000000 */ nop +/* 4BB8C 8007078C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s index 7d85b190c0..465e4c3e32 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070850.s @@ -25,4 +25,4 @@ glabel func_80070850 /* 4BCA0 800708A0 3C018008 */ lui $at, %hi(D_8007F600) /* 4BCA4 800708A4 8C21F600 */ lw $at, %lo(D_8007F600)($at) /* 4BCA8 800708A8 00200008 */ jr $at -/* 4BCAC 800708AC 00000000 */ nop +/* 4BCAC 800708AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s index 99feb203fe..fc2360b763 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800708B0.s @@ -25,4 +25,4 @@ glabel func_800708B0 /* 4BD00 80070900 3C018008 */ lui $at, %hi(D_8007F618) /* 4BD04 80070904 8C21F618 */ lw $at, %lo(D_8007F618)($at) /* 4BD08 80070908 00200008 */ jr $at -/* 4BD0C 8007090C 00000000 */ nop +/* 4BD0C 8007090C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s index bbb0cec400..16c5a7c137 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070910.s @@ -25,4 +25,4 @@ glabel func_80070910 /* 4BD60 80070960 3C018008 */ lui $at, %hi(D_8007F630) /* 4BD64 80070964 8C21F630 */ lw $at, %lo(D_8007F630)($at) /* 4BD68 80070968 00200008 */ jr $at -/* 4BD6C 8007096C 00000000 */ nop +/* 4BD6C 8007096C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s index 503e536a07..2bdecbae03 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070970.s @@ -25,4 +25,4 @@ glabel func_80070970 /* 4BDC0 800709C0 3C018008 */ lui $at, %hi(D_8007F648) /* 4BDC4 800709C4 8C21F648 */ lw $at, %lo(D_8007F648)($at) /* 4BDC8 800709C8 00200008 */ jr $at -/* 4BDCC 800709CC 00000000 */ nop +/* 4BDCC 800709CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s index 9928311335..0660e026b3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800709D0.s @@ -25,4 +25,4 @@ glabel func_800709D0 /* 4BE20 80070A20 3C018008 */ lui $at, %hi(D_8007F660) /* 4BE24 80070A24 8C21F660 */ lw $at, %lo(D_8007F660)($at) /* 4BE28 80070A28 00200008 */ jr $at -/* 4BE2C 80070A2C 00000000 */ nop +/* 4BE2C 80070A2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s index 054201dad0..37045b3b57 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A30.s @@ -25,4 +25,4 @@ glabel func_80070A30 /* 4BE80 80070A80 3C018008 */ lui $at, %hi(D_8007F678) /* 4BE84 80070A84 8C21F678 */ lw $at, %lo(D_8007F678)($at) /* 4BE88 80070A88 00200008 */ jr $at -/* 4BE8C 80070A8C 00000000 */ nop +/* 4BE8C 80070A8C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s index e8876d1a12..f18b6fece1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070A90.s @@ -25,4 +25,4 @@ glabel func_80070A90 /* 4BEE0 80070AE0 3C018008 */ lui $at, %hi(D_8007F690) /* 4BEE4 80070AE4 8C21F690 */ lw $at, %lo(D_8007F690)($at) /* 4BEE8 80070AE8 00200008 */ jr $at -/* 4BEEC 80070AEC 00000000 */ nop +/* 4BEEC 80070AEC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s index 3ef662b761..1555b534f0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070AF0.s @@ -25,4 +25,4 @@ glabel func_80070AF0 /* 4BF40 80070B40 3C018008 */ lui $at, %hi(D_8007F6A8) /* 4BF44 80070B44 8C21F6A8 */ lw $at, %lo(D_8007F6A8)($at) /* 4BF48 80070B48 00200008 */ jr $at -/* 4BF4C 80070B4C 00000000 */ nop +/* 4BF4C 80070B4C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s index fa18bb86a4..32d41b1584 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070B50.s @@ -25,4 +25,4 @@ glabel func_80070B50 /* 4BFA0 80070BA0 3C018008 */ lui $at, %hi(D_8007F6C0) /* 4BFA4 80070BA4 8C21F6C0 */ lw $at, %lo(D_8007F6C0)($at) /* 4BFA8 80070BA8 00200008 */ jr $at -/* 4BFAC 80070BAC 00000000 */ nop +/* 4BFAC 80070BAC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s index 341a75e74b..cf45dedd05 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070BB0.s @@ -25,4 +25,4 @@ glabel func_80070BB0 /* 4C000 80070C00 3C018008 */ lui $at, %hi(D_8007F6D8) /* 4C004 80070C04 8C21F6D8 */ lw $at, %lo(D_8007F6D8)($at) /* 4C008 80070C08 00200008 */ jr $at -/* 4C00C 80070C0C 00000000 */ nop +/* 4C00C 80070C0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s index ae0294a199..b0b4edfb33 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C10.s @@ -25,4 +25,4 @@ glabel func_80070C10 /* 4C060 80070C60 3C018008 */ lui $at, %hi(D_8007F6F0) /* 4C064 80070C64 8C21F6F0 */ lw $at, %lo(D_8007F6F0)($at) /* 4C068 80070C68 00200008 */ jr $at -/* 4C06C 80070C6C 00000000 */ nop +/* 4C06C 80070C6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s index 051db53ee5..0fdcc676ff 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070C70.s @@ -25,4 +25,4 @@ glabel func_80070C70 /* 4C0C0 80070CC0 3C018008 */ lui $at, %hi(D_8007F708) /* 4C0C4 80070CC4 8C21F708 */ lw $at, %lo(D_8007F708)($at) /* 4C0C8 80070CC8 00200008 */ jr $at -/* 4C0CC 80070CCC 00000000 */ nop +/* 4C0CC 80070CCC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s index 8baae50785..1f0ea79be0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070CD0.s @@ -25,4 +25,4 @@ glabel func_80070CD0 /* 4C120 80070D20 3C018008 */ lui $at, %hi(D_8007F720) /* 4C124 80070D24 8C21F720 */ lw $at, %lo(D_8007F720)($at) /* 4C128 80070D28 00200008 */ jr $at -/* 4C12C 80070D2C 00000000 */ nop +/* 4C12C 80070D2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s index 55fb5c830c..94a685dccc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D30.s @@ -25,4 +25,4 @@ glabel func_80070D30 /* 4C180 80070D80 3C018008 */ lui $at, %hi(D_8007F738) /* 4C184 80070D84 8C21F738 */ lw $at, %lo(D_8007F738)($at) /* 4C188 80070D88 00200008 */ jr $at -/* 4C18C 80070D8C 00000000 */ nop +/* 4C18C 80070D8C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s index 7ca3a971d9..62ef98565e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070D90.s @@ -25,4 +25,4 @@ glabel func_80070D90 /* 4C1E0 80070DE0 3C018008 */ lui $at, %hi(D_8007F750) /* 4C1E4 80070DE4 8C21F750 */ lw $at, %lo(D_8007F750)($at) /* 4C1E8 80070DE8 00200008 */ jr $at -/* 4C1EC 80070DEC 00000000 */ nop +/* 4C1EC 80070DEC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s index d0f5f8f584..6826866da3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070DF0.s @@ -25,4 +25,4 @@ glabel func_80070DF0 /* 4C240 80070E40 3C018008 */ lui $at, %hi(D_8007F768) /* 4C244 80070E44 8C21F768 */ lw $at, %lo(D_8007F768)($at) /* 4C248 80070E48 00200008 */ jr $at -/* 4C24C 80070E4C 00000000 */ nop +/* 4C24C 80070E4C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s index 7b20c4a238..6583746755 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070E50.s @@ -25,4 +25,4 @@ glabel func_80070E50 /* 4C2A0 80070EA0 3C018008 */ lui $at, %hi(D_8007F780) /* 4C2A4 80070EA4 8C21F780 */ lw $at, %lo(D_8007F780)($at) /* 4C2A8 80070EA8 00200008 */ jr $at -/* 4C2AC 80070EAC 00000000 */ nop +/* 4C2AC 80070EAC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s index ff44068381..929b8ce8c2 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070EB0.s @@ -25,4 +25,4 @@ glabel func_80070EB0 /* 4C300 80070F00 3C018008 */ lui $at, %hi(D_8007F798) /* 4C304 80070F04 8C21F798 */ lw $at, %lo(D_8007F798)($at) /* 4C308 80070F08 00200008 */ jr $at -/* 4C30C 80070F0C 00000000 */ nop +/* 4C30C 80070F0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s index ac7bb79699..a3c36e34c9 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F10.s @@ -25,4 +25,4 @@ glabel func_80070F10 /* 4C360 80070F60 3C018008 */ lui $at, %hi(D_8007F7B0) /* 4C364 80070F64 8C21F7B0 */ lw $at, %lo(D_8007F7B0)($at) /* 4C368 80070F68 00200008 */ jr $at -/* 4C36C 80070F6C 00000000 */ nop +/* 4C36C 80070F6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s index 9ba6f5ee50..fb2987760c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070F70.s @@ -25,4 +25,4 @@ glabel func_80070F70 /* 4C3C0 80070FC0 3C018008 */ lui $at, %hi(D_8007F7C8) /* 4C3C4 80070FC4 8C21F7C8 */ lw $at, %lo(D_8007F7C8)($at) /* 4C3C8 80070FC8 00200008 */ jr $at -/* 4C3CC 80070FCC 00000000 */ nop +/* 4C3CC 80070FCC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s index a08f6ad44b..33c4227246 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80070FD0.s @@ -25,4 +25,4 @@ glabel func_80070FD0 /* 4C420 80071020 3C018008 */ lui $at, %hi(D_8007F7E0) /* 4C424 80071024 8C21F7E0 */ lw $at, %lo(D_8007F7E0)($at) /* 4C428 80071028 00200008 */ jr $at -/* 4C42C 8007102C 00000000 */ nop +/* 4C42C 8007102C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s index 04a899fd8c..97f34fb8c5 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071030.s @@ -25,4 +25,4 @@ glabel func_80071030 /* 4C480 80071080 3C018008 */ lui $at, %hi(D_8007F7F8) /* 4C484 80071084 8C21F7F8 */ lw $at, %lo(D_8007F7F8)($at) /* 4C488 80071088 00200008 */ jr $at -/* 4C48C 8007108C 00000000 */ nop +/* 4C48C 8007108C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s index 7b9828f062..58bb4884a7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071090.s @@ -25,4 +25,4 @@ glabel func_80071090 /* 4C4E0 800710E0 3C018008 */ lui $at, %hi(D_8007F810) /* 4C4E4 800710E4 8C21F810 */ lw $at, %lo(D_8007F810)($at) /* 4C4E8 800710E8 00200008 */ jr $at -/* 4C4EC 800710EC 00000000 */ nop +/* 4C4EC 800710EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s index ace0b4b248..8a9913d85d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800710F0.s @@ -25,4 +25,4 @@ glabel func_800710F0 /* 4C540 80071140 3C018008 */ lui $at, %hi(D_8007F828) /* 4C544 80071144 8C21F828 */ lw $at, %lo(D_8007F828)($at) /* 4C548 80071148 00200008 */ jr $at -/* 4C54C 8007114C 00000000 */ nop +/* 4C54C 8007114C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s index 4dfe41008d..626132460f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071150.s @@ -25,4 +25,4 @@ glabel func_80071150 /* 4C5A0 800711A0 3C018008 */ lui $at, %hi(D_8007F840) /* 4C5A4 800711A4 8C21F840 */ lw $at, %lo(D_8007F840)($at) /* 4C5A8 800711A8 00200008 */ jr $at -/* 4C5AC 800711AC 00000000 */ nop +/* 4C5AC 800711AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s index 73843fb6b7..c31b21e885 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800711B0.s @@ -25,4 +25,4 @@ glabel func_800711B0 /* 4C600 80071200 3C018008 */ lui $at, %hi(D_8007F858) /* 4C604 80071204 8C21F858 */ lw $at, %lo(D_8007F858)($at) /* 4C608 80071208 00200008 */ jr $at -/* 4C60C 8007120C 00000000 */ nop +/* 4C60C 8007120C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s index ada25816fd..adfae21e3b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071210.s @@ -25,4 +25,4 @@ glabel func_80071210 /* 4C660 80071260 3C018008 */ lui $at, %hi(D_8007F870) /* 4C664 80071264 8C21F870 */ lw $at, %lo(D_8007F870)($at) /* 4C668 80071268 00200008 */ jr $at -/* 4C66C 8007126C 00000000 */ nop +/* 4C66C 8007126C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s index 5c4f82b549..553357b993 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071270.s @@ -25,4 +25,4 @@ glabel func_80071270 /* 4C6C0 800712C0 3C018008 */ lui $at, %hi(D_8007F888) /* 4C6C4 800712C4 8C21F888 */ lw $at, %lo(D_8007F888)($at) /* 4C6C8 800712C8 00200008 */ jr $at -/* 4C6CC 800712CC 00000000 */ nop +/* 4C6CC 800712CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s index ea439136e3..e6d2c10e99 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800712D0.s @@ -25,4 +25,4 @@ glabel func_800712D0 /* 4C720 80071320 3C018008 */ lui $at, %hi(D_8007F8A0) /* 4C724 80071324 8C21F8A0 */ lw $at, %lo(D_8007F8A0)($at) /* 4C728 80071328 00200008 */ jr $at -/* 4C72C 8007132C 00000000 */ nop +/* 4C72C 8007132C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s index 83b5407ea3..c50e666026 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071330.s @@ -25,4 +25,4 @@ glabel func_80071330 /* 4C780 80071380 3C018008 */ lui $at, %hi(D_8007F8B8) /* 4C784 80071384 8C21F8B8 */ lw $at, %lo(D_8007F8B8)($at) /* 4C788 80071388 00200008 */ jr $at -/* 4C78C 8007138C 00000000 */ nop +/* 4C78C 8007138C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s index 6c5c06b7f6..09cd061bac 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071390.s @@ -25,4 +25,4 @@ glabel func_80071390 /* 4C7E0 800713E0 3C018008 */ lui $at, %hi(D_8007F8D0) /* 4C7E4 800713E4 8C21F8D0 */ lw $at, %lo(D_8007F8D0)($at) /* 4C7E8 800713E8 00200008 */ jr $at -/* 4C7EC 800713EC 00000000 */ nop +/* 4C7EC 800713EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s index ec2488bf12..0ef6d2ff4d 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800713F0.s @@ -25,4 +25,4 @@ glabel func_800713F0 /* 4C840 80071440 3C018008 */ lui $at, %hi(D_8007F8E8) /* 4C844 80071444 8C21F8E8 */ lw $at, %lo(D_8007F8E8)($at) /* 4C848 80071448 00200008 */ jr $at -/* 4C84C 8007144C 00000000 */ nop +/* 4C84C 8007144C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s index 0e0ad68a4d..5da809c181 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071450.s @@ -25,4 +25,4 @@ glabel func_80071450 /* 4C8A0 800714A0 3C018008 */ lui $at, %hi(D_8007F900) /* 4C8A4 800714A4 8C21F900 */ lw $at, %lo(D_8007F900)($at) /* 4C8A8 800714A8 00200008 */ jr $at -/* 4C8AC 800714AC 00000000 */ nop +/* 4C8AC 800714AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s index 23d8e7b992..45ffa7c84b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800714B0.s @@ -25,4 +25,4 @@ glabel func_800714B0 /* 4C900 80071500 3C018008 */ lui $at, %hi(D_8007F918) /* 4C904 80071504 8C21F918 */ lw $at, %lo(D_8007F918)($at) /* 4C908 80071508 00200008 */ jr $at -/* 4C90C 8007150C 00000000 */ nop +/* 4C90C 8007150C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s index 244ec84a0e..980d1a73e3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071510.s @@ -25,4 +25,4 @@ glabel func_80071510 /* 4C960 80071560 3C018008 */ lui $at, %hi(D_8007F930) /* 4C964 80071564 8C21F930 */ lw $at, %lo(D_8007F930)($at) /* 4C968 80071568 00200008 */ jr $at -/* 4C96C 8007156C 00000000 */ nop +/* 4C96C 8007156C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s index 0c2cfebf2f..f3ad214b07 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071570.s @@ -25,4 +25,4 @@ glabel func_80071570 /* 4C9C0 800715C0 3C018008 */ lui $at, %hi(D_8007F948) /* 4C9C4 800715C4 8C21F948 */ lw $at, %lo(D_8007F948)($at) /* 4C9C8 800715C8 00200008 */ jr $at -/* 4C9CC 800715CC 00000000 */ nop +/* 4C9CC 800715CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s index c69a9430d3..6fe3ae0e89 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800715D0.s @@ -25,4 +25,4 @@ glabel func_800715D0 /* 4CA20 80071620 3C018008 */ lui $at, %hi(D_8007F960) /* 4CA24 80071624 8C21F960 */ lw $at, %lo(D_8007F960)($at) /* 4CA28 80071628 00200008 */ jr $at -/* 4CA2C 8007162C 00000000 */ nop +/* 4CA2C 8007162C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s index 74d1d81098..96f9a8cfb3 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071630.s @@ -25,4 +25,4 @@ glabel func_80071630 /* 4CA80 80071680 3C018008 */ lui $at, %hi(D_8007F978) /* 4CA84 80071684 8C21F978 */ lw $at, %lo(D_8007F978)($at) /* 4CA88 80071688 00200008 */ jr $at -/* 4CA8C 8007168C 00000000 */ nop +/* 4CA8C 8007168C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s index 8fadae94f9..403c27253a 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071690.s @@ -25,4 +25,4 @@ glabel func_80071690 /* 4CAE0 800716E0 3C018008 */ lui $at, %hi(D_8007F990) /* 4CAE4 800716E4 8C21F990 */ lw $at, %lo(D_8007F990)($at) /* 4CAE8 800716E8 00200008 */ jr $at -/* 4CAEC 800716EC 00000000 */ nop +/* 4CAEC 800716EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s index 7af79fbf2b..630f557120 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800716F0.s @@ -25,4 +25,4 @@ glabel func_800716F0 /* 4CB40 80071740 3C018008 */ lui $at, %hi(D_8007F9A8) /* 4CB44 80071744 8C21F9A8 */ lw $at, %lo(D_8007F9A8)($at) /* 4CB48 80071748 00200008 */ jr $at -/* 4CB4C 8007174C 00000000 */ nop +/* 4CB4C 8007174C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s index 0406770c9d..2150d4b918 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071750.s @@ -25,4 +25,4 @@ glabel func_80071750 /* 4CBA0 800717A0 3C018008 */ lui $at, %hi(D_8007F9C0) /* 4CBA4 800717A4 8C21F9C0 */ lw $at, %lo(D_8007F9C0)($at) /* 4CBA8 800717A8 00200008 */ jr $at -/* 4CBAC 800717AC 00000000 */ nop +/* 4CBAC 800717AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s index 942d305fcf..c746c55cfe 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800717B0.s @@ -25,4 +25,4 @@ glabel func_800717B0 /* 4CC00 80071800 3C018008 */ lui $at, %hi(D_8007F9D8) /* 4CC04 80071804 8C21F9D8 */ lw $at, %lo(D_8007F9D8)($at) /* 4CC08 80071808 00200008 */ jr $at -/* 4CC0C 8007180C 00000000 */ nop +/* 4CC0C 8007180C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s index 63009fd980..a8a3748cd7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071810.s @@ -25,4 +25,4 @@ glabel func_80071810 /* 4CC60 80071860 3C018008 */ lui $at, %hi(D_8007F9F0) /* 4CC64 80071864 8C21F9F0 */ lw $at, %lo(D_8007F9F0)($at) /* 4CC68 80071868 00200008 */ jr $at -/* 4CC6C 8007186C 00000000 */ nop +/* 4CC6C 8007186C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s index b5a9bd34a7..71ba658dca 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071870.s @@ -25,4 +25,4 @@ glabel func_80071870 /* 4CCC0 800718C0 3C018008 */ lui $at, %hi(D_8007FA08) /* 4CCC4 800718C4 8C21FA08 */ lw $at, %lo(D_8007FA08)($at) /* 4CCC8 800718C8 00200008 */ jr $at -/* 4CCCC 800718CC 00000000 */ nop +/* 4CCCC 800718CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s index 24adf87e07..e39fb72f35 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800718D0.s @@ -25,4 +25,4 @@ glabel func_800718D0 /* 4CD20 80071920 3C018008 */ lui $at, %hi(D_8007FA20) /* 4CD24 80071924 8C21FA20 */ lw $at, %lo(D_8007FA20)($at) /* 4CD28 80071928 00200008 */ jr $at -/* 4CD2C 8007192C 00000000 */ nop +/* 4CD2C 8007192C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s index 4ae279caa8..2d1b845d45 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071930.s @@ -25,4 +25,4 @@ glabel func_80071930 /* 4CD80 80071980 3C018008 */ lui $at, %hi(D_8007FA38) /* 4CD84 80071984 8C21FA38 */ lw $at, %lo(D_8007FA38)($at) /* 4CD88 80071988 00200008 */ jr $at -/* 4CD8C 8007198C 00000000 */ nop +/* 4CD8C 8007198C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s index 24444fa637..651b804644 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071990.s @@ -25,4 +25,4 @@ glabel func_80071990 /* 4CDE0 800719E0 3C018008 */ lui $at, %hi(D_8007FA50) /* 4CDE4 800719E4 8C21FA50 */ lw $at, %lo(D_8007FA50)($at) /* 4CDE8 800719E8 00200008 */ jr $at -/* 4CDEC 800719EC 00000000 */ nop +/* 4CDEC 800719EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s index f54b3772e6..1f8d44b1eb 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800719F0.s @@ -25,4 +25,4 @@ glabel func_800719F0 /* 4CE40 80071A40 3C018008 */ lui $at, %hi(D_8007FA68) /* 4CE44 80071A44 8C21FA68 */ lw $at, %lo(D_8007FA68)($at) /* 4CE48 80071A48 00200008 */ jr $at -/* 4CE4C 80071A4C 00000000 */ nop +/* 4CE4C 80071A4C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s index ac1f15901e..cf02837eee 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071A50.s @@ -25,4 +25,4 @@ glabel func_80071A50 /* 4CEA0 80071AA0 3C018008 */ lui $at, %hi(D_8007FA80) /* 4CEA4 80071AA4 8C21FA80 */ lw $at, %lo(D_8007FA80)($at) /* 4CEA8 80071AA8 00200008 */ jr $at -/* 4CEAC 80071AAC 00000000 */ nop +/* 4CEAC 80071AAC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s index f569ae458a..01a8a5b7a1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071AB0.s @@ -25,4 +25,4 @@ glabel func_80071AB0 /* 4CF00 80071B00 3C018008 */ lui $at, %hi(D_8007FA98) /* 4CF04 80071B04 8C21FA98 */ lw $at, %lo(D_8007FA98)($at) /* 4CF08 80071B08 00200008 */ jr $at -/* 4CF0C 80071B0C 00000000 */ nop +/* 4CF0C 80071B0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s index d0b5fde354..45fd184f31 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B10.s @@ -25,4 +25,4 @@ glabel func_80071B10 /* 4CF60 80071B60 3C018008 */ lui $at, %hi(D_8007FAB0) /* 4CF64 80071B64 8C21FAB0 */ lw $at, %lo(D_8007FAB0)($at) /* 4CF68 80071B68 00200008 */ jr $at -/* 4CF6C 80071B6C 00000000 */ nop +/* 4CF6C 80071B6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s index 999dbd1c18..37245f5a60 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071B70.s @@ -25,4 +25,4 @@ glabel func_80071B70 /* 4CFC0 80071BC0 3C018008 */ lui $at, %hi(D_8007FAC8) /* 4CFC4 80071BC4 8C21FAC8 */ lw $at, %lo(D_8007FAC8)($at) /* 4CFC8 80071BC8 00200008 */ jr $at -/* 4CFCC 80071BCC 00000000 */ nop +/* 4CFCC 80071BCC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s index 31f349698c..67509cae1b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071BD0.s @@ -25,4 +25,4 @@ glabel func_80071BD0 /* 4D020 80071C20 3C018008 */ lui $at, %hi(D_8007FAE0) /* 4D024 80071C24 8C21FAE0 */ lw $at, %lo(D_8007FAE0)($at) /* 4D028 80071C28 00200008 */ jr $at -/* 4D02C 80071C2C 00000000 */ nop +/* 4D02C 80071C2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s index 72b7befacf..be78887acc 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C30.s @@ -25,4 +25,4 @@ glabel func_80071C30 /* 4D080 80071C80 3C018008 */ lui $at, %hi(D_8007FAF8) /* 4D084 80071C84 8C21FAF8 */ lw $at, %lo(D_8007FAF8)($at) /* 4D088 80071C88 00200008 */ jr $at -/* 4D08C 80071C8C 00000000 */ nop +/* 4D08C 80071C8C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s index b7e2598ed2..6c9f4d6cb7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071C90.s @@ -25,4 +25,4 @@ glabel func_80071C90 /* 4D0E0 80071CE0 3C018008 */ lui $at, %hi(D_8007FB10) /* 4D0E4 80071CE4 8C21FB10 */ lw $at, %lo(D_8007FB10)($at) /* 4D0E8 80071CE8 00200008 */ jr $at -/* 4D0EC 80071CEC 00000000 */ nop +/* 4D0EC 80071CEC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s index 83dd6a5a73..8b610ab330 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071CF0.s @@ -25,4 +25,4 @@ glabel func_80071CF0 /* 4D140 80071D40 3C018008 */ lui $at, %hi(D_8007FB28) /* 4D144 80071D44 8C21FB28 */ lw $at, %lo(D_8007FB28)($at) /* 4D148 80071D48 00200008 */ jr $at -/* 4D14C 80071D4C 00000000 */ nop +/* 4D14C 80071D4C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s index 180f223bae..783194806b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071D50.s @@ -25,4 +25,4 @@ glabel func_80071D50 /* 4D1A0 80071DA0 3C018008 */ lui $at, %hi(D_8007FB40) /* 4D1A4 80071DA4 8C21FB40 */ lw $at, %lo(D_8007FB40)($at) /* 4D1A8 80071DA8 00200008 */ jr $at -/* 4D1AC 80071DAC 00000000 */ nop +/* 4D1AC 80071DAC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s index 728cfcee8b..1bff07b585 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071DB0.s @@ -25,4 +25,4 @@ glabel func_80071DB0 /* 4D200 80071E00 3C018008 */ lui $at, %hi(D_8007FB58) /* 4D204 80071E04 8C21FB58 */ lw $at, %lo(D_8007FB58)($at) /* 4D208 80071E08 00200008 */ jr $at -/* 4D20C 80071E0C 00000000 */ nop +/* 4D20C 80071E0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s index dfbd24b9b5..7bc3280afa 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E10.s @@ -25,4 +25,4 @@ glabel func_80071E10 /* 4D260 80071E60 3C018008 */ lui $at, %hi(D_8007FB70) /* 4D264 80071E64 8C21FB70 */ lw $at, %lo(D_8007FB70)($at) /* 4D268 80071E68 00200008 */ jr $at -/* 4D26C 80071E6C 00000000 */ nop +/* 4D26C 80071E6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s index c4a7699b40..ab70daa772 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071E70.s @@ -25,4 +25,4 @@ glabel func_80071E70 /* 4D2C0 80071EC0 3C018008 */ lui $at, %hi(D_8007FB88) /* 4D2C4 80071EC4 8C21FB88 */ lw $at, %lo(D_8007FB88)($at) /* 4D2C8 80071EC8 00200008 */ jr $at -/* 4D2CC 80071ECC 00000000 */ nop +/* 4D2CC 80071ECC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s index 250ecdfc2b..26b5f3a77f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071ED0.s @@ -25,4 +25,4 @@ glabel func_80071ED0 /* 4D320 80071F20 3C018008 */ lui $at, %hi(D_8007FBA0) /* 4D324 80071F24 8C21FBA0 */ lw $at, %lo(D_8007FBA0)($at) /* 4D328 80071F28 00200008 */ jr $at -/* 4D32C 80071F2C 00000000 */ nop +/* 4D32C 80071F2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s index 870221e2a4..77815d9137 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F30.s @@ -25,4 +25,4 @@ glabel func_80071F30 /* 4D380 80071F80 3C018008 */ lui $at, %hi(D_8007FBB8) /* 4D384 80071F84 8C21FBB8 */ lw $at, %lo(D_8007FBB8)($at) /* 4D388 80071F88 00200008 */ jr $at -/* 4D38C 80071F8C 00000000 */ nop +/* 4D38C 80071F8C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s index 23400b8021..ec262f2b4b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071F90.s @@ -25,4 +25,4 @@ glabel func_80071F90 /* 4D3E0 80071FE0 3C018008 */ lui $at, %hi(D_8007FBD0) /* 4D3E4 80071FE4 8C21FBD0 */ lw $at, %lo(D_8007FBD0)($at) /* 4D3E8 80071FE8 00200008 */ jr $at -/* 4D3EC 80071FEC 00000000 */ nop +/* 4D3EC 80071FEC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s index 0c975f12a3..faa063cba0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80071FF0.s @@ -25,4 +25,4 @@ glabel func_80071FF0 /* 4D440 80072040 3C018008 */ lui $at, %hi(D_8007FBE8) /* 4D444 80072044 8C21FBE8 */ lw $at, %lo(D_8007FBE8)($at) /* 4D448 80072048 00200008 */ jr $at -/* 4D44C 8007204C 00000000 */ nop +/* 4D44C 8007204C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s index 608f07a3da..c29ce60a0b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072050.s @@ -25,4 +25,4 @@ glabel func_80072050 /* 4D4A0 800720A0 3C018008 */ lui $at, %hi(D_8007FC00) /* 4D4A4 800720A4 8C21FC00 */ lw $at, %lo(D_8007FC00)($at) /* 4D4A8 800720A8 00200008 */ jr $at -/* 4D4AC 800720AC 00000000 */ nop +/* 4D4AC 800720AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s index 7b596cfc68..0d22db3a98 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800720B0.s @@ -25,4 +25,4 @@ glabel func_800720B0 /* 4D500 80072100 3C018008 */ lui $at, %hi(D_8007FC18) /* 4D504 80072104 8C21FC18 */ lw $at, %lo(D_8007FC18)($at) /* 4D508 80072108 00200008 */ jr $at -/* 4D50C 8007210C 00000000 */ nop +/* 4D50C 8007210C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s index 6dab4459db..5d2fbabb2c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072110.s @@ -25,4 +25,4 @@ glabel func_80072110 /* 4D560 80072160 3C018008 */ lui $at, %hi(D_8007FC30) /* 4D564 80072164 8C21FC30 */ lw $at, %lo(D_8007FC30)($at) /* 4D568 80072168 00200008 */ jr $at -/* 4D56C 8007216C 00000000 */ nop +/* 4D56C 8007216C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s index 95810148ce..53b28d1610 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072170.s @@ -25,4 +25,4 @@ glabel func_80072170 /* 4D5C0 800721C0 3C018008 */ lui $at, %hi(D_8007FC48) /* 4D5C4 800721C4 8C21FC48 */ lw $at, %lo(D_8007FC48)($at) /* 4D5C8 800721C8 00200008 */ jr $at -/* 4D5CC 800721CC 00000000 */ nop +/* 4D5CC 800721CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s index 70ca2aa409..9057e90dd7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800721D0.s @@ -25,4 +25,4 @@ glabel func_800721D0 /* 4D620 80072220 3C018008 */ lui $at, %hi(D_8007FC60) /* 4D624 80072224 8C21FC60 */ lw $at, %lo(D_8007FC60)($at) /* 4D628 80072228 00200008 */ jr $at -/* 4D62C 8007222C 00000000 */ nop +/* 4D62C 8007222C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s index e259e22cde..be3e3bb704 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072230.s @@ -25,4 +25,4 @@ glabel func_80072230 /* 4D680 80072280 3C018008 */ lui $at, %hi(D_8007FC78) /* 4D684 80072284 8C21FC78 */ lw $at, %lo(D_8007FC78)($at) /* 4D688 80072288 00200008 */ jr $at -/* 4D68C 8007228C 00000000 */ nop +/* 4D68C 8007228C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s index b558402996..2cc4d8bac6 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072290.s @@ -25,4 +25,4 @@ glabel func_80072290 /* 4D6E0 800722E0 3C018008 */ lui $at, %hi(D_8007FC90) /* 4D6E4 800722E4 8C21FC90 */ lw $at, %lo(D_8007FC90)($at) /* 4D6E8 800722E8 00200008 */ jr $at -/* 4D6EC 800722EC 00000000 */ nop +/* 4D6EC 800722EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s index b7b5439f0f..ece10a8246 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800722F0.s @@ -25,4 +25,4 @@ glabel func_800722F0 /* 4D740 80072340 3C018008 */ lui $at, %hi(D_8007FCA8) /* 4D744 80072344 8C21FCA8 */ lw $at, %lo(D_8007FCA8)($at) /* 4D748 80072348 00200008 */ jr $at -/* 4D74C 8007234C 00000000 */ nop +/* 4D74C 8007234C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s index 5c7d578276..eae34daf11 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072350.s @@ -25,4 +25,4 @@ glabel func_80072350 /* 4D7A0 800723A0 3C018008 */ lui $at, %hi(D_8007FCC0) /* 4D7A4 800723A4 8C21FCC0 */ lw $at, %lo(D_8007FCC0)($at) /* 4D7A8 800723A8 00200008 */ jr $at -/* 4D7AC 800723AC 00000000 */ nop +/* 4D7AC 800723AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s index ad85b7c64a..bb48285646 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800723B0.s @@ -25,4 +25,4 @@ glabel func_800723B0 /* 4D800 80072400 3C018008 */ lui $at, %hi(D_8007FCD8) /* 4D804 80072404 8C21FCD8 */ lw $at, %lo(D_8007FCD8)($at) /* 4D808 80072408 00200008 */ jr $at -/* 4D80C 8007240C 00000000 */ nop +/* 4D80C 8007240C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s index 110dfe4fd5..00f84cd959 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072410.s @@ -25,4 +25,4 @@ glabel func_80072410 /* 4D860 80072460 3C018008 */ lui $at, %hi(D_8007FCF0) /* 4D864 80072464 8C21FCF0 */ lw $at, %lo(D_8007FCF0)($at) /* 4D868 80072468 00200008 */ jr $at -/* 4D86C 8007246C 00000000 */ nop +/* 4D86C 8007246C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s index f26ca7063e..3f7595040e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072470.s @@ -25,4 +25,4 @@ glabel func_80072470 /* 4D8C0 800724C0 3C018008 */ lui $at, %hi(D_8007FD08) /* 4D8C4 800724C4 8C21FD08 */ lw $at, %lo(D_8007FD08)($at) /* 4D8C8 800724C8 00200008 */ jr $at -/* 4D8CC 800724CC 00000000 */ nop +/* 4D8CC 800724CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s index 24526ce540..cf6c730b1f 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800724D0.s @@ -25,4 +25,4 @@ glabel func_800724D0 /* 4D920 80072520 3C018008 */ lui $at, %hi(D_8007FD20) /* 4D924 80072524 8C21FD20 */ lw $at, %lo(D_8007FD20)($at) /* 4D928 80072528 00200008 */ jr $at -/* 4D92C 8007252C 00000000 */ nop +/* 4D92C 8007252C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s index 7af358d20e..b722194215 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072530.s @@ -25,4 +25,4 @@ glabel func_80072530 /* 4D980 80072580 3C018008 */ lui $at, %hi(D_8007FD38) /* 4D984 80072584 8C21FD38 */ lw $at, %lo(D_8007FD38)($at) /* 4D988 80072588 00200008 */ jr $at -/* 4D98C 8007258C 00000000 */ nop +/* 4D98C 8007258C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s index f1b3416d75..c59d80d504 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072590.s @@ -25,4 +25,4 @@ glabel func_80072590 /* 4D9E0 800725E0 3C018008 */ lui $at, %hi(D_8007FD50) /* 4D9E4 800725E4 8C21FD50 */ lw $at, %lo(D_8007FD50)($at) /* 4D9E8 800725E8 00200008 */ jr $at -/* 4D9EC 800725EC 00000000 */ nop +/* 4D9EC 800725EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s index e6da5fcaa2..bcb39e6686 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800725F0.s @@ -25,4 +25,4 @@ glabel func_800725F0 /* 4DA40 80072640 3C018008 */ lui $at, %hi(D_8007FD68) /* 4DA44 80072644 8C21FD68 */ lw $at, %lo(D_8007FD68)($at) /* 4DA48 80072648 00200008 */ jr $at -/* 4DA4C 8007264C 00000000 */ nop +/* 4DA4C 8007264C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s index 5a8197dac8..1ab8ef8714 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072650.s @@ -25,4 +25,4 @@ glabel func_80072650 /* 4DAA0 800726A0 3C018008 */ lui $at, %hi(D_8007FD80) /* 4DAA4 800726A4 8C21FD80 */ lw $at, %lo(D_8007FD80)($at) /* 4DAA8 800726A8 00200008 */ jr $at -/* 4DAAC 800726AC 00000000 */ nop +/* 4DAAC 800726AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s index 21ae0d58c0..d89e860b19 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800726B0.s @@ -25,4 +25,4 @@ glabel func_800726B0 /* 4DB00 80072700 3C018008 */ lui $at, %hi(D_8007FD98) /* 4DB04 80072704 8C21FD98 */ lw $at, %lo(D_8007FD98)($at) /* 4DB08 80072708 00200008 */ jr $at -/* 4DB0C 8007270C 00000000 */ nop +/* 4DB0C 8007270C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s index ffd9044093..9d3e26a61b 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072710.s @@ -25,4 +25,4 @@ glabel func_80072710 /* 4DB60 80072760 3C018008 */ lui $at, %hi(D_8007FDB0) /* 4DB64 80072764 8C21FDB0 */ lw $at, %lo(D_8007FDB0)($at) /* 4DB68 80072768 00200008 */ jr $at -/* 4DB6C 8007276C 00000000 */ nop +/* 4DB6C 8007276C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s index e6551fad9d..fecaffc333 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072770.s @@ -25,4 +25,4 @@ glabel func_80072770 /* 4DBC0 800727C0 3C018008 */ lui $at, %hi(D_8007FDC8) /* 4DBC4 800727C4 8C21FDC8 */ lw $at, %lo(D_8007FDC8)($at) /* 4DBC8 800727C8 00200008 */ jr $at -/* 4DBCC 800727CC 00000000 */ nop +/* 4DBCC 800727CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s index fb957fd1f4..c4a2104b25 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800727D0.s @@ -25,4 +25,4 @@ glabel func_800727D0 /* 4DC20 80072820 3C018008 */ lui $at, %hi(D_8007FDE0) /* 4DC24 80072824 8C21FDE0 */ lw $at, %lo(D_8007FDE0)($at) /* 4DC28 80072828 00200008 */ jr $at -/* 4DC2C 8007282C 00000000 */ nop +/* 4DC2C 8007282C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s index bf1eada031..2697388c2c 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072830.s @@ -25,4 +25,4 @@ glabel func_80072830 /* 4DC80 80072880 3C018008 */ lui $at, %hi(D_8007FDF8) /* 4DC84 80072884 8C21FDF8 */ lw $at, %lo(D_8007FDF8)($at) /* 4DC88 80072888 00200008 */ jr $at -/* 4DC8C 8007288C 00000000 */ nop +/* 4DC8C 8007288C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s index 6eab692687..14d0afd64e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072890.s @@ -25,4 +25,4 @@ glabel func_80072890 /* 4DCE0 800728E0 3C018008 */ lui $at, %hi(D_8007FE10) /* 4DCE4 800728E4 8C21FE10 */ lw $at, %lo(D_8007FE10)($at) /* 4DCE8 800728E8 00200008 */ jr $at -/* 4DCEC 800728EC 00000000 */ nop +/* 4DCEC 800728EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s index 47c9100314..b391f8cf30 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800728F0.s @@ -25,4 +25,4 @@ glabel func_800728F0 /* 4DD40 80072940 3C018008 */ lui $at, %hi(D_8007FE28) /* 4DD44 80072944 8C21FE28 */ lw $at, %lo(D_8007FE28)($at) /* 4DD48 80072948 00200008 */ jr $at -/* 4DD4C 8007294C 00000000 */ nop +/* 4DD4C 8007294C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s index 98066cd14e..0b37581ea0 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072950.s @@ -25,4 +25,4 @@ glabel func_80072950 /* 4DDA0 800729A0 3C018008 */ lui $at, %hi(D_8007FE40) /* 4DDA4 800729A4 8C21FE40 */ lw $at, %lo(D_8007FE40)($at) /* 4DDA8 800729A8 00200008 */ jr $at -/* 4DDAC 800729AC 00000000 */ nop +/* 4DDAC 800729AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s index c5969247fb..0b55df9323 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_800729B0.s @@ -25,4 +25,4 @@ glabel func_800729B0 /* 4DE00 80072A00 3C018008 */ lui $at, %hi(D_8007FE58) /* 4DE04 80072A04 8C21FE58 */ lw $at, %lo(D_8007FE58)($at) /* 4DE08 80072A08 00200008 */ jr $at -/* 4DE0C 80072A0C 00000000 */ nop +/* 4DE0C 80072A0C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s index 20812f2897..e779935a93 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A10.s @@ -25,4 +25,4 @@ glabel func_80072A10 /* 4DE60 80072A60 3C018008 */ lui $at, %hi(D_8007FE70) /* 4DE64 80072A64 8C21FE70 */ lw $at, %lo(D_8007FE70)($at) /* 4DE68 80072A68 00200008 */ jr $at -/* 4DE6C 80072A6C 00000000 */ nop +/* 4DE6C 80072A6C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s index 87f7101606..d49bce7cde 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072A70.s @@ -25,4 +25,4 @@ glabel func_80072A70 /* 4DEC0 80072AC0 3C018008 */ lui $at, %hi(D_8007FE88) /* 4DEC4 80072AC4 8C21FE88 */ lw $at, %lo(D_8007FE88)($at) /* 4DEC8 80072AC8 00200008 */ jr $at -/* 4DECC 80072ACC 00000000 */ nop +/* 4DECC 80072ACC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s index d14a2a59f6..3148e133e6 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072AD0.s @@ -25,4 +25,4 @@ glabel func_80072AD0 /* 4DF20 80072B20 3C018008 */ lui $at, %hi(D_8007FEA0) /* 4DF24 80072B24 8C21FEA0 */ lw $at, %lo(D_8007FEA0)($at) /* 4DF28 80072B28 00200008 */ jr $at -/* 4DF2C 80072B2C 00000000 */ nop +/* 4DF2C 80072B2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s index 0c2cb4b003..862831c36e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072B30.s @@ -33,4 +33,4 @@ glabel func_80072B30 /* 4DFA0 80072BA0 3C01800E */ lui $at, %hi(gBattleStatus+0x484) /* 4DFA4 80072BA4 AC20C4F4 */ sw $zero, %lo(gBattleStatus+0x484)($at) /* 4DFA8 80072BA8 03E00008 */ jr $ra -/* 4DFAC 80072BAC 00000000 */ nop +/* 4DFAC 80072BAC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BB0.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BB0.s index 0d4f655d73..dc4e227211 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BB0.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BB0.s @@ -5,7 +5,7 @@ glabel func_80072BB0 /* 4DFB0 80072BB0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4DFB4 80072BB4 AFBF0010 */ sw $ra, 0x10($sp) /* 4DFB8 80072BB8 0C01CACC */ jal func_80072B30 -/* 4DFBC 80072BBC 00000000 */ nop +/* 4DFBC 80072BBC 00000000 */ nop /* 4DFC0 80072BC0 8FBF0010 */ lw $ra, 0x10($sp) /* 4DFC4 80072BC4 03E00008 */ jr $ra /* 4DFC8 80072BC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s index eb66faceab..74b66f37f7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BCC.s @@ -5,4 +5,4 @@ glabel func_80072BCC /* 4DFCC 80072BCC 3C01800E */ lui $at, %hi(gBattleStatus+0x488) /* 4DFD0 80072BD0 AC24C4F8 */ sw $a0, %lo(gBattleStatus+0x488)($at) /* 4DFD4 80072BD4 03E00008 */ jr $ra -/* 4DFD8 80072BD8 00000000 */ nop +/* 4DFD8 80072BD8 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s index d949782b3a..59f0699dad 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072BDC.s @@ -18,7 +18,7 @@ glabel func_80072BDC /* 4E010 80072C10 3C10800E */ lui $s0, %hi(gBattleStatus+0x47B) /* 4E014 80072C14 9210C4EB */ lbu $s0, %lo(gBattleStatus+0x47B)($s0) /* 4E018 80072C18 0C00A5CF */ jal dma_copy -/* 4E01C 80072C1C 00000000 */ nop +/* 4E01C 80072C1C 00000000 */ nop /* 4E020 80072C20 00101880 */ sll $v1, $s0, 2 /* 4E024 80072C24 00701821 */ addu $v1, $v1, $s0 /* 4E028 80072C28 00031880 */ sll $v1, $v1, 2 @@ -33,7 +33,7 @@ glabel func_80072BDC /* 4E04C 80072C4C 3C01800E */ lui $at, %hi(D_800DC064) /* 4E050 80072C50 AC20C064 */ sw $zero, %lo(D_800DC064)($at) /* 4E054 80072C54 0801CB1B */ j .L80072C6C -/* 4E058 80072C58 00000000 */ nop +/* 4E058 80072C58 00000000 */ nop .L80072C5C: /* 4E05C 80072C5C 8E220014 */ lw $v0, 0x14($s1) /* 4E060 80072C60 00431021 */ addu $v0, $v0, $v1 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s index 5c3ccca5ef..08c9b604ef 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CCC.s @@ -5,4 +5,4 @@ glabel func_80072CCC /* 4E0CC 80072CCC 3C01800E */ lui $at, %hi(gBattleStatus+0x47C) /* 4E0D0 80072CD0 AC24C4EC */ sw $a0, %lo(gBattleStatus+0x47C)($at) /* 4E0D4 80072CD4 03E00008 */ jr $ra -/* 4E0D8 80072CD8 00000000 */ nop +/* 4E0D8 80072CD8 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s index d9e9564219..635c663869 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CDC.s @@ -5,4 +5,4 @@ glabel func_80072CDC /* 4E0DC 80072CDC 3C01800E */ lui $at, %hi(gBattleStatus+0x484) /* 4E0E0 80072CE0 AC24C4F4 */ sw $a0, %lo(gBattleStatus+0x484)($at) /* 4E0E4 80072CE4 03E00008 */ jr $ra -/* 4E0E8 80072CE8 00000000 */ nop +/* 4E0E8 80072CE8 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CEC.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CEC.s index 4e65ad7788..42294b8ff7 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CEC.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CEC.s @@ -3,4 +3,4 @@ glabel func_80072CEC /* 4E0EC 80072CEC 03E00008 */ jr $ra -/* 4E0F0 80072CF0 00000000 */ nop +/* 4E0F0 80072CF0 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CF4.s b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CF4.s index 013565165e..0fe69ca89e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CF4.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/func_80072CF4.s @@ -12,7 +12,7 @@ glabel func_80072CF4 /* 4E110 80072D10 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 4E114 80072D14 AFBF0010 */ sw $ra, 0x10($sp) /* 4E118 80072D18 0C01CB3B */ jal func_80072CEC -/* 4E11C 80072D1C 00000000 */ nop +/* 4E11C 80072D1C 00000000 */ nop /* 4E120 80072D20 8FBF0010 */ lw $ra, 0x10($sp) /* 4E124 80072D24 03E00008 */ jr $ra /* 4E128 80072D28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s index 3e94a2dd79..7d5140e02e 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_emote.s @@ -25,4 +25,4 @@ glabel fx_emote /* 4B2E0 8006FEE0 3C018008 */ lui $at, %hi(D_8007F390) /* 4B2E4 8006FEE4 8C21F390 */ lw $at, %lo(D_8007F390)($at) /* 4B2E8 8006FEE8 00200008 */ jr $at -/* 4B2EC 8006FEEC 00000000 */ nop +/* 4B2EC 8006FEEC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s index 2609ce9656..e261f91239 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sleep_bubble.s @@ -25,4 +25,4 @@ glabel fx_sleep_bubble /* 4BC40 80070840 3C018008 */ lui $at, %hi(D_8007F5E8) /* 4BC44 80070844 8C21F5E8 */ lw $at, %lo(D_8007F5E8)($at) /* 4BC48 80070848 00200008 */ jr $at -/* 4BC4C 8007084C 00000000 */ nop +/* 4BC4C 8007084C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s index 666f2c815f..760cabb2d9 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_sweat.s @@ -25,4 +25,4 @@ glabel fx_sweat /* 4BBE0 800707E0 3C018008 */ lui $at, %hi(D_8007F5D0) /* 4BBE4 800707E4 8C21F5D0 */ lw $at, %lo(D_8007F5D0)($at) /* 4BBE8 800707E8 00200008 */ jr $at -/* 4BBEC 800707EC 00000000 */ nop +/* 4BBEC 800707EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s index e914ea99e9..364c9eabda 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_large.s @@ -25,4 +25,4 @@ glabel fx_walk_large /* 4AF20 8006FB20 3C018008 */ lui $at, %hi(D_8007F2A0) /* 4AF24 8006FB24 8C21F2A0 */ lw $at, %lo(D_8007F2A0)($at) /* 4AF28 8006FB28 00200008 */ jr $at -/* 4AF2C 8006FB2C 00000000 */ nop +/* 4AF2C 8006FB2C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s index 4350b8e299..0ae2e22ee1 100644 --- a/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s +++ b/asm/nonmatchings/os/code_4ac90_len_3910/fx_walk_normal.s @@ -25,4 +25,4 @@ glabel fx_walk_normal /* 4AF80 8006FB80 3C018008 */ lui $at, %hi(D_8007F2B8) /* 4AF84 8006FB84 8C21F2B8 */ lw $at, %lo(D_8007F2B8)($at) /* 4AF88 8006FB88 00200008 */ jr $at -/* 4AF8C 8006FB8C 00000000 */ nop +/* 4AF8C 8006FB8C 00000000 */ nop 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 f4d977bbe4..d98efcf179 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 @@ -17,51 +17,51 @@ glabel load_demo_battle /* 4E244 80072E44 0C00AB00 */ jal general_heap_create /* 4E248 80072E48 A0400070 */ sb $zero, 0x70($v0) /* 4E24C 80072E4C 0C048C2E */ jal clear_dynamic_entity_list -/* 4E250 80072E50 00000000 */ nop +/* 4E250 80072E50 00000000 */ nop /* 4E254 80072E54 0C0B0C77 */ jal clear_script_list -/* 4E258 80072E58 00000000 */ nop +/* 4E258 80072E58 00000000 */ nop /* 4E25C 80072E5C 0C00B7BD */ jal create_cameras_a -/* 4E260 80072E60 00000000 */ nop +/* 4E260 80072E60 00000000 */ nop /* 4E264 80072E64 0C0B763E */ jal func_802DD8F8 /* 4E268 80072E68 0000202D */ daddu $a0, $zero, $zero /* 4E26C 80072E6C 0C047889 */ jal func_8011E224 -/* 4E270 80072E70 00000000 */ nop +/* 4E270 80072E70 00000000 */ nop /* 4E274 80072E74 0C0482EC */ jal clear_virtual_models -/* 4E278 80072E78 00000000 */ nop +/* 4E278 80072E78 00000000 */ nop /* 4E27C 80072E7C 0C00E12F */ jal clear_npcs -/* 4E280 80072E80 00000000 */ nop +/* 4E280 80072E80 00000000 */ nop /* 4E284 80072E84 0C050440 */ jal func_80141100 -/* 4E288 80072E88 00000000 */ nop +/* 4E288 80072E88 00000000 */ nop /* 4E28C 80072E8C 0C0515A0 */ jal clear_trigger_data -/* 4E290 80072E90 00000000 */ nop +/* 4E290 80072E90 00000000 */ nop /* 4E294 80072E94 0C045751 */ jal clear_model_data -/* 4E298 80072E98 00000000 */ nop +/* 4E298 80072E98 00000000 */ nop /* 4E29C 80072E9C 0C052010 */ jal func_80148040 -/* 4E2A0 80072EA0 00000000 */ nop +/* 4E2A0 80072EA0 00000000 */ nop /* 4E2A4 80072EA4 0C05177E */ jal func_80145DF8 -/* 4E2A8 80072EA8 00000000 */ nop +/* 4E2A8 80072EA8 00000000 */ nop /* 4E2AC 80072EAC 0C04E062 */ jal func_80138188 -/* 4E2B0 80072EB0 00000000 */ nop +/* 4E2B0 80072EB0 00000000 */ nop /* 4E2B4 80072EB4 0C01CACC */ jal func_80072B30 -/* 4E2B8 80072EB8 00000000 */ nop +/* 4E2B8 80072EB8 00000000 */ nop /* 4E2BC 80072EBC 0C00F900 */ jal clear_encounter_status -/* 4E2C0 80072EC0 00000000 */ nop +/* 4E2C0 80072EC0 00000000 */ nop /* 4E2C4 80072EC4 0C04432E */ jal clear_entity_data /* 4E2C8 80072EC8 24040001 */ addiu $a0, $zero, 1 /* 4E2CC 80072ECC 0C016727 */ jal func_80059C9C -/* 4E2D0 80072ED0 00000000 */ nop +/* 4E2D0 80072ED0 00000000 */ nop /* 4E2D4 80072ED4 0C037F14 */ jal clear_player_status -/* 4E2D8 80072ED8 00000000 */ nop +/* 4E2D8 80072ED8 00000000 */ nop /* 4E2DC 80072EDC 0C048D9D */ jal clear_printers -/* 4E2E0 80072EE0 00000000 */ nop +/* 4E2E0 80072EE0 00000000 */ nop /* 4E2E4 80072EE4 0C04C3FC */ jal clear_item_entity_data -/* 4E2E8 80072EE8 00000000 */ nop +/* 4E2E8 80072EE8 00000000 */ nop /* 4E2EC 80072EEC 0C039CE8 */ jal clear_player_data -/* 4E2F0 80072EF0 00000000 */ nop +/* 4E2F0 80072EF0 00000000 */ nop /* 4E2F4 80072EF4 0C039E4D */ jal initialize_status_menu -/* 4E2F8 80072EF8 00000000 */ nop +/* 4E2F8 80072EF8 00000000 */ nop /* 4E2FC 80072EFC 0C04C3FC */ jal clear_item_entity_data -/* 4E300 80072F00 00000000 */ nop +/* 4E300 80072F00 00000000 */ nop /* 4E304 80072F04 3C05437F */ lui $a1, 0x437f /* 4E308 80072F08 0C04DF62 */ jal func_80137D88 /* 4E30C 80072F0C 24040009 */ addiu $a0, $zero, 9 @@ -74,7 +74,7 @@ glabel load_demo_battle /* 4E328 80072F28 00220821 */ addu $at, $at, $v0 /* 4E32C 80072F2C 8C22A578 */ lw $v0, %lo(D_8009A578)($at) /* 4E330 80072F30 00400008 */ jr $v0 -/* 4E334 80072F34 00000000 */ nop +/* 4E334 80072F34 00000000 */ nop /* 4E338 80072F38 0C01CB4B */ jal setup_demo_player /* 4E33C 80072F3C 24112700 */ addiu $s1, $zero, 0x2700 /* 4E340 80072F40 0000202D */ daddu $a0, $zero, $zero @@ -133,7 +133,7 @@ glabel load_demo_battle /* 4E40C 8007300C 00220821 */ addu $at, $at, $v0 /* 4E410 80073010 8C22A590 */ lw $v0, %lo(D_8009A590)($at) /* 4E414 80073014 00400008 */ jr $v0 -/* 4E418 80073018 00000000 */ nop +/* 4E418 80073018 00000000 */ nop /* 4E41C 8007301C 3C03800B */ lui $v1, %hi(gCurrentEncounter) /* 4E420 80073020 24630F10 */ addiu $v1, $v1, %lo(gCurrentEncounter) /* 4E424 80073024 3C048007 */ lui $a0, %hi(gGameStatusPtr) @@ -233,4 +233,4 @@ glabel load_demo_battle /* 4E590 80073190 8FB00010 */ lw $s0, 0x10($sp) /* 4E594 80073194 03E00008 */ jr $ra /* 4E598 80073198 27BD0020 */ addiu $sp, $sp, 0x20 -/* 4E59C 8007319C 00000000 */ nop +/* 4E59C 8007319C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s index 7015d9a540..07fbdf5e5e 100644 --- a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s +++ b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskMgr.s @@ -30,23 +30,23 @@ glabel nuGfxTaskMgr /* 7EA0 8002CAA0 8C820054 */ lw $v0, 0x54($a0) /* 7EA4 8002CAA4 84420000 */ lh $v0, ($v0) /* 7EA8 8002CAA8 10530005 */ beq $v0, $s3, .L8002CAC0 -/* 7EAC 8002CAAC 00000000 */ nop +/* 7EAC 8002CAAC 00000000 */ nop /* 7EB0 8002CAB0 10520012 */ beq $v0, $s2, .L8002CAFC -/* 7EB4 8002CAB4 00000000 */ nop +/* 7EB4 8002CAB4 00000000 */ nop /* 7EB8 8002CAB8 0800B2A2 */ j .L8002CA88 -/* 7EBC 8002CABC 00000000 */ nop +/* 7EBC 8002CABC 00000000 */ nop .L8002CAC0: /* 7EC0 8002CAC0 3C028007 */ lui $v0, %hi(D_800773F4) /* 7EC4 8002CAC4 8C4273F4 */ lw $v0, %lo(D_800773F4)($v0) /* 7EC8 8002CAC8 10400003 */ beqz $v0, .L8002CAD8 -/* 7ECC 8002CACC 00000000 */ nop +/* 7ECC 8002CACC 00000000 */ nop /* 7ED0 8002CAD0 0040F809 */ jalr $v0 -/* 7ED4 8002CAD4 00000000 */ nop +/* 7ED4 8002CAD4 00000000 */ nop .L8002CAD8: /* 7ED8 8002CAD8 8E220000 */ lw $v0, ($s1) /* 7EDC 8002CADC 30420080 */ andi $v0, $v0, 0x80 /* 7EE0 8002CAE0 1040000C */ beqz $v0, .L8002CB14 -/* 7EE4 8002CAE4 00000000 */ nop +/* 7EE4 8002CAE4 00000000 */ nop /* 7EE8 8002CAE8 0C019CE0 */ jal osViBlack /* 7EEC 8002CAEC 0000202D */ daddu $a0, $zero, $zero /* 7EF0 8002CAF0 24020001 */ addiu $v0, $zero, 1 @@ -56,9 +56,9 @@ glabel nuGfxTaskMgr /* 7EFC 8002CAFC 3C028007 */ lui $v0, %hi(D_800773F8) /* 7F00 8002CB00 8C4273F8 */ lw $v0, %lo(D_800773F8)($v0) /* 7F04 8002CB04 10400003 */ beqz $v0, .L8002CB14 -/* 7F08 8002CB08 00000000 */ nop +/* 7F08 8002CB08 00000000 */ nop /* 7F0C 8002CB0C 0040F809 */ jalr $v0 -/* 7F10 8002CB10 00000000 */ nop +/* 7F10 8002CB10 00000000 */ nop .L8002CB14: /* 7F14 8002CB14 0C018250 */ jal osSetIntMask /* 7F18 8002CB18 24040001 */ addiu $a0, $zero, 1 @@ -68,4 +68,4 @@ glabel nuGfxTaskMgr /* 7F28 8002CB28 0C018250 */ jal osSetIntMask /* 7F2C 8002CB2C AE030000 */ sw $v1, ($s0) /* 7F30 8002CB30 0800B2A2 */ j .L8002CA88 -/* 7F34 8002CB34 00000000 */ nop +/* 7F34 8002CB34 00000000 */ nop diff --git a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s index d69178158f..371e646ca9 100644 --- a/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s +++ b/asm/nonmatchings/os/code_7e40_len_3f0/nuGfxTaskStart.s @@ -79,7 +79,7 @@ glabel nuGfxTaskStart /* 81DC 8002CDDC 0C018250 */ jal osSetIntMask /* 81E0 8002CDE0 ACA30000 */ sw $v1, ($a1) /* 81E4 8002CDE4 0C018634 */ jal osWritebackDCacheAll -/* 81E8 8002CDE8 00000000 */ nop +/* 81E8 8002CDE8 00000000 */ nop /* 81EC 8002CDEC 3C04800E */ lui $a0, %hi(D_800DA47C) /* 81F0 8002CDF0 2484A47C */ addiu $a0, $a0, %lo(D_800DA47C) /* 81F4 8002CDF4 3C10800A */ lui $s0, %hi(D_8009C510) @@ -94,6 +94,6 @@ glabel nuGfxTaskStart /* 8218 8002CE18 8FB00010 */ lw $s0, 0x10($sp) /* 821C 8002CE1C 03E00008 */ jr $ra /* 8220 8002CE20 27BD0018 */ addiu $sp, $sp, 0x18 -/* 8224 8002CE24 00000000 */ nop -/* 8228 8002CE28 00000000 */ nop -/* 822C 8002CE2C 00000000 */ nop +/* 8224 8002CE24 00000000 */ nop +/* 8228 8002CE28 00000000 */ nop +/* 822C 8002CE2C 00000000 */ nop diff --git a/asm/nonmatchings/os/guMtxIdentF/guMtxIdentF.s b/asm/nonmatchings/os/guMtxIdentF/guMtxIdentF.s index 73a6f14520..5aa42c4f8d 100644 --- a/asm/nonmatchings/os/guMtxIdentF/guMtxIdentF.s +++ b/asm/nonmatchings/os/guMtxIdentF/guMtxIdentF.s @@ -20,9 +20,9 @@ glabel guMtxIdentF /* 428DC 800674DC AC800038 */ sw $zero, 0x38($a0) /* 428E0 800674E0 03E00008 */ jr $ra /* 428E4 800674E4 AC88003C */ sw $t0, 0x3c($a0) -/* 428E8 800674E8 00000000 */ nop -/* 428EC 800674EC 00000000 */ nop -/* 428F0 800674F0 00000000 */ nop -/* 428F4 800674F4 00000000 */ nop -/* 428F8 800674F8 00000000 */ nop -/* 428FC 800674FC 00000000 */ nop +/* 428E8 800674E8 00000000 */ nop +/* 428EC 800674EC 00000000 */ nop +/* 428F0 800674F0 00000000 */ nop +/* 428F4 800674F4 00000000 */ nop +/* 428F8 800674F8 00000000 */ nop +/* 428FC 800674FC 00000000 */ nop diff --git a/asm/nonmatchings/os/ldiv/ldiv.s b/asm/nonmatchings/os/ldiv/ldiv.s index 8c09d0216d..7576b45bec 100644 --- a/asm/nonmatchings/os/ldiv/ldiv.s +++ b/asm/nonmatchings/os/ldiv/ldiv.s @@ -4,19 +4,19 @@ glabel ldiv /* 48A20 8006D620 00A6001A */ div $zero, $a1, $a2 /* 48A24 8006D624 14C00002 */ bnez $a2, .L8006D630 -/* 48A28 8006D628 00000000 */ nop +/* 48A28 8006D628 00000000 */ nop /* 48A2C 8006D62C 0007000D */ break 7 .L8006D630: /* 48A30 8006D630 2401FFFF */ addiu $at, $zero, -1 /* 48A34 8006D634 14C10004 */ bne $a2, $at, .L8006D648 /* 48A38 8006D638 3C018000 */ lui $at, 0x8000 /* 48A3C 8006D63C 14A10002 */ bne $a1, $at, .L8006D648 -/* 48A40 8006D640 00000000 */ nop +/* 48A40 8006D640 00000000 */ nop /* 48A44 8006D644 0006000D */ break 6 .L8006D648: /* 48A48 8006D648 00001812 */ mflo $v1 -/* 48A4C 8006D64C 00000000 */ nop -/* 48A50 8006D650 00000000 */ nop +/* 48A4C 8006D64C 00000000 */ nop +/* 48A50 8006D650 00000000 */ nop /* 48A54 8006D654 00C30018 */ mult $a2, $v1 /* 48A58 8006D658 00001012 */ mflo $v0 /* 48A5C 8006D65C 27BDFFF8 */ addiu $sp, $sp, -8 diff --git a/asm/nonmatchings/os/ldiv/lldiv.s b/asm/nonmatchings/os/ldiv/lldiv.s index 4e624c9e5d..b0293848d3 100644 --- a/asm/nonmatchings/os/ldiv/lldiv.s +++ b/asm/nonmatchings/os/ldiv/lldiv.s @@ -24,12 +24,12 @@ glabel lldiv /* 48AF0 8006D6F0 02670019 */ multu $s3, $a3 /* 48AF4 8006D6F4 00001010 */ mfhi $v0 /* 48AF8 8006D6F8 00001812 */ mflo $v1 -/* 48AFC 8006D6FC 00000000 */ nop -/* 48B00 8006D700 00000000 */ nop +/* 48AFC 8006D6FC 00000000 */ nop +/* 48B00 8006D700 00000000 */ nop /* 48B04 8006D704 02660018 */ mult $s3, $a2 /* 48B08 8006D708 00002012 */ mflo $a0 -/* 48B0C 8006D70C 00000000 */ nop -/* 48B10 8006D710 00000000 */ nop +/* 48B0C 8006D70C 00000000 */ nop +/* 48B10 8006D710 00000000 */ nop /* 48B14 8006D714 00F20018 */ mult $a3, $s2 /* 48B18 8006D718 00002812 */ mflo $a1 /* 48B1C 8006D71C AFA60010 */ sw $a2, 0x10($sp) @@ -48,7 +48,7 @@ glabel lldiv /* 48B50 8006D750 5C400006 */ bgtzl $v0, .L8006D76C /* 48B54 8006D754 24E30001 */ addiu $v1, $a3, 1 /* 48B58 8006D758 1440000E */ bnez $v0, .L8006D794 -/* 48B5C 8006D75C 00000000 */ nop +/* 48B5C 8006D75C 00000000 */ nop /* 48B60 8006D760 8FA2001C */ lw $v0, 0x1c($sp) /* 48B64 8006D764 1040000B */ beqz $v0, .L8006D794 /* 48B68 8006D768 24E30001 */ addiu $v1, $a3, 1 @@ -81,5 +81,5 @@ glabel lldiv /* 48BCC 8006D7CC 8FB00020 */ lw $s0, 0x20($sp) /* 48BD0 8006D7D0 03E00008 */ jr $ra /* 48BD4 8006D7D4 27BD0038 */ addiu $sp, $sp, 0x38 -/* 48BD8 8006D7D8 00000000 */ nop -/* 48BDC 8006D7DC 00000000 */ nop +/* 48BD8 8006D7D8 00000000 */ nop +/* 48BDC 8006D7DC 00000000 */ nop diff --git a/asm/nonmatchings/os/nusys/nuGfxSetCfb/nuGfxSetCfb.s b/asm/nonmatchings/os/nusys/nuGfxSetCfb/nuGfxSetCfb.s index 7632071094..7df5cb32f5 100644 --- a/asm/nonmatchings/os/nusys/nuGfxSetCfb/nuGfxSetCfb.s +++ b/asm/nonmatchings/os/nusys/nuGfxSetCfb/nuGfxSetCfb.s @@ -40,11 +40,11 @@ glabel nuGfxSetCfb /* 3A774 8005F374 2622FFFF */ addiu $v0, $s1, -1 .L8005F378: /* 3A778 8005F378 1602000C */ bne $s0, $v0, .L8005F3AC -/* 3A77C 8005F37C 00000000 */ nop +/* 3A77C 8005F37C 00000000 */ nop /* 3A780 8005F380 0C017BE4 */ jal nuScSetFrameBufferNum /* 3A784 8005F384 24040001 */ addiu $a0, $zero, 1 /* 3A788 8005F388 08017CFA */ j .L8005F3E8 -/* 3A78C 8005F38C 00000000 */ nop +/* 3A78C 8005F38C 00000000 */ nop .L8005F390: /* 3A790 8005F390 8C820000 */ lw $v0, ($a0) /* 3A794 8005F394 3C01800A */ lui $at, %hi(D_8009A5F0) @@ -52,28 +52,28 @@ glabel nuGfxSetCfb /* 3A79C 8005F39C 3C01800A */ lui $at, %hi(D_8009A64C) /* 3A7A0 8005F3A0 AC22A64C */ sw $v0, %lo(D_8009A64C)($at) /* 3A7A4 8005F3A4 08017CFA */ j .L8005F3E8 -/* 3A7A8 8005F3A8 00000000 */ nop +/* 3A7A8 8005F3A8 00000000 */ nop .L8005F3AC: /* 3A7AC 8005F3AC 1220000E */ beqz $s1, .L8005F3E8 /* 3A7B0 8005F3B0 0000802D */ daddu $s0, $zero, $zero .L8005F3B4: /* 3A7B4 8005F3B4 0C019A6C */ jal osViGetCurrentFramebuffer -/* 3A7B8 8005F3B8 00000000 */ nop +/* 3A7B8 8005F3B8 00000000 */ nop /* 3A7BC 8005F3BC 3C03800A */ lui $v1, %hi(D_8009A658) /* 3A7C0 8005F3C0 8C63A658 */ lw $v1, %lo(D_8009A658)($v1) /* 3A7C4 8005F3C4 00102080 */ sll $a0, $s0, 2 /* 3A7C8 8005F3C8 00832021 */ addu $a0, $a0, $v1 /* 3A7CC 8005F3CC 8C830000 */ lw $v1, ($a0) /* 3A7D0 8005F3D0 1443FFEF */ bne $v0, $v1, .L8005F390 -/* 3A7D4 8005F3D4 00000000 */ nop +/* 3A7D4 8005F3D4 00000000 */ nop /* 3A7D8 8005F3D8 26100001 */ addiu $s0, $s0, 1 /* 3A7DC 8005F3DC 0211102B */ sltu $v0, $s0, $s1 /* 3A7E0 8005F3E0 1440FFF4 */ bnez $v0, .L8005F3B4 -/* 3A7E4 8005F3E4 00000000 */ nop +/* 3A7E4 8005F3E4 00000000 */ nop .L8005F3E8: /* 3A7E8 8005F3E8 8FBF0018 */ lw $ra, 0x18($sp) /* 3A7EC 8005F3EC 8FB10014 */ lw $s1, 0x14($sp) /* 3A7F0 8005F3F0 8FB00010 */ lw $s0, 0x10($sp) /* 3A7F4 8005F3F4 03E00008 */ jr $ra /* 3A7F8 8005F3F8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3A7FC 8005F3FC 00000000 */ nop +/* 3A7FC 8005F3FC 00000000 */ nop diff --git a/asm/nonmatchings/os/nusys/nuSched/nuScEventHandler.s b/asm/nonmatchings/os/nusys/nuSched/nuScEventHandler.s index 1f45b06521..ea802b40af 100644 --- a/asm/nonmatchings/os/nusys/nuSched/nuScEventHandler.s +++ b/asm/nonmatchings/os/nusys/nuSched/nuScEventHandler.s @@ -25,7 +25,7 @@ glabel nuScEventHandler /* 3A3EC 8005EFEC 24060001 */ addiu $a2, $zero, 1 /* 3A3F0 8005EFF0 8FA20010 */ lw $v0, 0x10($sp) /* 3A3F4 8005EFF4 10540005 */ beq $v0, $s4, .L8005F00C -/* 3A3F8 8005EFF8 00000000 */ nop +/* 3A3F8 8005EFF8 00000000 */ nop /* 3A3FC 8005EFFC 1053001D */ beq $v0, $s3, .L8005F074 /* 3A400 8005F000 0220202D */ daddu $a0, $s1, $zero /* 3A404 8005F004 08017BFA */ j .L8005EFE8 @@ -53,7 +53,7 @@ glabel nuScEventHandler /* 3A454 8005F054 3C013F80 */ lui $at, 0x3f80 /* 3A458 8005F058 44816000 */ mtc1 $at, $f12 /* 3A45C 8005F05C 0C019BF4 */ jal osViSetYScale -/* 3A460 8005F060 00000000 */ nop +/* 3A460 8005F060 00000000 */ nop /* 3A464 8005F064 0C019CE0 */ jal osViBlack /* 3A468 8005F068 24040001 */ addiu $a0, $zero, 1 /* 3A46C 8005F06C 08017BF9 */ j .L8005EFE4 @@ -66,9 +66,9 @@ glabel nuScEventHandler /* 3A484 8005F084 3C028009 */ lui $v0, %hi(D_80093B80) /* 3A488 8005F088 8C423B80 */ lw $v0, %lo(D_80093B80)($v0) /* 3A48C 8005F08C 10400003 */ beqz $v0, .L8005F09C -/* 3A490 8005F090 00000000 */ nop +/* 3A490 8005F090 00000000 */ nop /* 3A494 8005F094 0040F809 */ jalr $v0 -/* 3A498 8005F098 00000000 */ nop +/* 3A498 8005F098 00000000 */ nop .L8005F09C: /* 3A49C 8005F09C 92220608 */ lbu $v0, 0x608($s1) /* 3A4A0 8005F0A0 8E230604 */ lw $v1, 0x604($s1) diff --git a/asm/nonmatchings/os/nusys/nuSched/nuScExecuteAudio.s b/asm/nonmatchings/os/nusys/nuSched/nuScExecuteAudio.s index e3df2d7314..cfcdd74a78 100644 --- a/asm/nonmatchings/os/nusys/nuSched/nuScExecuteAudio.s +++ b/asm/nonmatchings/os/nusys/nuSched/nuScExecuteAudio.s @@ -24,12 +24,12 @@ glabel nuScExecuteAudio /* 3A028 8005EC28 9042A5B0 */ lbu $v0, %lo(D_8009A5B0)($v0) /* 3A02C 8005EC2C 30420002 */ andi $v0, $v0, 2 /* 3A030 8005EC30 14400031 */ bnez $v0, .L8005ECF8 -/* 3A034 8005EC34 00000000 */ nop +/* 3A034 8005EC34 00000000 */ nop /* 3A038 8005EC38 0C018634 */ jal osWritebackDCacheAll /* 3A03C 8005EC3C 0000802D */ daddu $s0, $zero, $zero /* 3A040 8005EC40 8E910668 */ lw $s1, 0x668($s4) /* 3A044 8005EC44 1220000B */ beqz $s1, .L8005EC74 -/* 3A048 8005EC48 00000000 */ nop +/* 3A048 8005EC48 00000000 */ nop /* 3A04C 8005EC4C 0C019714 */ jal osSpTaskYield /* 3A050 8005EC50 24100002 */ addiu $s0, $zero, 2 /* 3A054 8005EC54 268400A8 */ addiu $a0, $s4, 0xa8 @@ -69,7 +69,7 @@ glabel nuScExecuteAudio /* 3A0D4 8005ECD4 0C019707 */ jal osSpTaskStartGo /* 3A0D8 8005ECD8 0200202D */ daddu $a0, $s0, $zero /* 3A0DC 8005ECDC 08017B3E */ j .L8005ECF8 -/* 3A0E0 8005ECE0 00000000 */ nop +/* 3A0E0 8005ECE0 00000000 */ nop .L8005ECE4: /* 3A0E4 8005ECE4 16020004 */ bne $s0, $v0, .L8005ECF8 /* 3A0E8 8005ECE8 02A0202D */ daddu $a0, $s5, $zero diff --git a/asm/nonmatchings/os/nusys/nuSched/nuScExecuteGraphics.s b/asm/nonmatchings/os/nusys/nuSched/nuScExecuteGraphics.s index 57430a764c..c2ebdb0072 100644 --- a/asm/nonmatchings/os/nusys/nuSched/nuScExecuteGraphics.s +++ b/asm/nonmatchings/os/nusys/nuSched/nuScExecuteGraphics.s @@ -18,7 +18,7 @@ glabel nuScExecuteGraphics /* 3A144 8005ED44 9042A5B0 */ lbu $v0, %lo(D_8009A5B0)($v0) /* 3A148 8005ED48 30420002 */ andi $v0, $v0, 2 /* 3A14C 8005ED4C 14400032 */ bnez $v0, .L8005EE18 -/* 3A150 8005ED50 00000000 */ nop +/* 3A150 8005ED50 00000000 */ nop /* 3A154 8005ED54 0C017C48 */ jal nuScWaitTaskReady /* 3A158 8005ED58 8FA40010 */ lw $a0, 0x10($sp) /* 3A15C 8005ED5C 0C018250 */ jal osSetIntMask @@ -39,7 +39,7 @@ glabel nuScExecuteGraphics /* 3A198 8005ED98 AE000638 */ sw $zero, 0x638($s0) .L8005ED9C: /* 3A19C 8005ED9C 0C018250 */ jal osSetIntMask -/* 3A1A0 8005EDA0 00000000 */ nop +/* 3A1A0 8005EDA0 00000000 */ nop /* 3A1A4 8005EDA4 0C018250 */ jal osSetIntMask /* 3A1A8 8005EDA8 24040001 */ addiu $a0, $zero, 1 /* 3A1AC 8005EDAC 8FA30010 */ lw $v1, 0x10($sp) diff --git a/asm/nonmatchings/os/nusys/nuSched/nuScWaitTaskReady.s b/asm/nonmatchings/os/nusys/nuSched/nuScWaitTaskReady.s index 5d7af7d7ca..a297885c2f 100644 --- a/asm/nonmatchings/os/nusys/nuSched/nuScWaitTaskReady.s +++ b/asm/nonmatchings/os/nusys/nuSched/nuScWaitTaskReady.s @@ -20,13 +20,13 @@ glabel nuScWaitTaskReady /* 3A55C 8005F15C 0060982D */ daddu $s3, $v1, $zero .L8005F160: /* 3A560 8005F160 0C019A6C */ jal osViGetCurrentFramebuffer -/* 3A564 8005F164 00000000 */ nop +/* 3A564 8005F164 00000000 */ nop /* 3A568 8005F168 10520005 */ beq $v0, $s2, .L8005F180 -/* 3A56C 8005F16C 00000000 */ nop +/* 3A56C 8005F16C 00000000 */ nop /* 3A570 8005F170 0C019A7C */ jal osViGetNextFramebuffer -/* 3A574 8005F174 00000000 */ nop +/* 3A574 8005F174 00000000 */ nop /* 3A578 8005F178 1452002B */ bne $v0, $s2, .L8005F228 -/* 3A57C 8005F17C 00000000 */ nop +/* 3A57C 8005F17C 00000000 */ nop .L8005F180: /* 3A580 8005F180 0C018250 */ jal osSetIntMask /* 3A584 8005F184 24040001 */ addiu $a0, $zero, 1 @@ -56,7 +56,7 @@ glabel nuScWaitTaskReady /* 3A5E0 8005F1E0 54700007 */ bnel $v1, $s0, .L8005F200 /* 3A5E4 8005F1E4 0060282D */ daddu $a1, $v1, $zero /* 3A5E8 8005F1E8 14A0000C */ bnez $a1, .L8005F21C -/* 3A5EC 8005F1EC 00000000 */ nop +/* 3A5EC 8005F1EC 00000000 */ nop /* 3A5F0 8005F1F0 8C620000 */ lw $v0, ($v1) /* 3A5F4 8005F1F4 3C01800E */ lui $at, %hi(D_800DAAA8) /* 3A5F8 8005F1F8 08017C83 */ j .L8005F20C @@ -64,12 +64,12 @@ glabel nuScWaitTaskReady .L8005F200: /* 3A600 8005F200 8CA30000 */ lw $v1, ($a1) /* 3A604 8005F204 1460FFF6 */ bnez $v1, .L8005F1E0 -/* 3A608 8005F208 00000000 */ nop +/* 3A608 8005F208 00000000 */ nop .L8005F20C: /* 3A60C 8005F20C 0C018250 */ jal osSetIntMask -/* 3A610 8005F210 00000000 */ nop +/* 3A610 8005F210 00000000 */ nop /* 3A614 8005F214 08017C58 */ j .L8005F160 -/* 3A618 8005F218 00000000 */ nop +/* 3A618 8005F218 00000000 */ nop .L8005F21C: /* 3A61C 8005F21C 8C620000 */ lw $v0, ($v1) /* 3A620 8005F220 08017C83 */ j .L8005F20C @@ -83,5 +83,5 @@ glabel nuScWaitTaskReady /* 3A63C 8005F23C 8FB00020 */ lw $s0, 0x20($sp) /* 3A640 8005F240 03E00008 */ jr $ra /* 3A644 8005F244 27BD0038 */ addiu $sp, $sp, 0x38 -/* 3A648 8005F248 00000000 */ nop -/* 3A64C 8005F24C 00000000 */ nop +/* 3A648 8005F248 00000000 */ nop +/* 3A64C 8005F24C 00000000 */ nop diff --git a/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrRestart.s b/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrRestart.s index 21c179e900..d923d0c81c 100644 --- a/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrRestart.s +++ b/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrRestart.s @@ -7,7 +7,7 @@ glabel nuSiMgrRestart /* 83B4 8002CFB4 2484E710 */ addiu $a0, $a0, %lo(D_8009E710) /* 83B8 8002CFB8 AFBF0010 */ sw $ra, 0x10($sp) /* 83BC 8002CFBC 0C019808 */ jal osStartThread -/* 83C0 8002CFC0 00000000 */ nop +/* 83C0 8002CFC0 00000000 */ nop /* 83C4 8002CFC4 8FBF0010 */ lw $ra, 0x10($sp) /* 83C8 8002CFC8 03E00008 */ jr $ra /* 83CC 8002CFCC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrThread.s b/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrThread.s index e4a344aea0..34dfbff842 100644 --- a/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrThread.s +++ b/asm/nonmatchings/os/nusys/nuSiMgr/nuSiMgrThread.s @@ -32,29 +32,29 @@ glabel nuSiMgrThread /* 8438 8002D038 10620016 */ beq $v1, $v0, .L8002D094 /* 843C 8002D03C 0000282D */ daddu $a1, $zero, $zero /* 8440 8002D040 0800B432 */ j .L8002D0C8 -/* 8444 8002D044 00000000 */ nop +/* 8444 8002D044 00000000 */ nop .L8002D048: /* 8448 8002D048 8E020000 */ lw $v0, ($s0) /* 844C 8002D04C 1040FFEE */ beqz $v0, .L8002D008 -/* 8450 8002D050 00000000 */ nop +/* 8450 8002D050 00000000 */ nop .L8002D054: /* 8454 8002D054 8E020000 */ lw $v0, ($s0) /* 8458 8002D058 8C420004 */ lw $v0, 4($v0) /* 845C 8002D05C 8C420000 */ lw $v0, ($v0) /* 8460 8002D060 10400004 */ beqz $v0, .L8002D074 -/* 8464 8002D064 00000000 */ nop +/* 8464 8002D064 00000000 */ nop /* 8468 8002D068 0040F809 */ jalr $v0 /* 846C 8002D06C 8FA40040 */ lw $a0, 0x40($sp) /* 8470 8002D070 0040882D */ daddu $s1, $v0, $zero .L8002D074: /* 8474 8002D074 1620FFE4 */ bnez $s1, .L8002D008 -/* 8478 8002D078 00000000 */ nop +/* 8478 8002D078 00000000 */ nop /* 847C 8002D07C 8E100000 */ lw $s0, ($s0) /* 8480 8002D080 8E020000 */ lw $v0, ($s0) /* 8484 8002D084 1440FFF3 */ bnez $v0, .L8002D054 -/* 8488 8002D088 00000000 */ nop +/* 8488 8002D088 00000000 */ nop /* 848C 8002D08C 0800B402 */ j .L8002D008 -/* 8490 8002D090 00000000 */ nop +/* 8490 8002D090 00000000 */ nop .L8002D094: /* 8494 8002D094 8C840004 */ lw $a0, 4($a0) /* 8498 8002D098 0C019608 */ jal osSendMesg @@ -68,7 +68,7 @@ glabel nuSiMgrThread /* 84B8 8002D0B8 0C017BCE */ jal nuScResetClientMesgType /* 84BC 8002D0BC 24050001 */ addiu $a1, $zero, 1 /* 84C0 8002D0C0 0800B402 */ j .L8002D008 -/* 84C4 8002D0C4 00000000 */ nop +/* 84C4 8002D0C4 00000000 */ nop .L8002D0C8: /* 84C8 8002D0C8 8FA20040 */ lw $v0, 0x40($sp) /* 84CC 8002D0CC 94420000 */ lhu $v0, ($v0) @@ -87,13 +87,13 @@ glabel nuSiMgrThread /* 84FC 8002D0FC 9062000A */ lbu $v0, 0xa($v1) /* 8500 8002D100 0082102B */ sltu $v0, $a0, $v0 /* 8504 8002D104 10400009 */ beqz $v0, .L8002D12C -/* 8508 8002D108 00000000 */ nop +/* 8508 8002D108 00000000 */ nop /* 850C 8002D10C 8C620004 */ lw $v0, 4($v1) /* 8510 8002D110 8FA40040 */ lw $a0, 0x40($sp) /* 8514 8002D114 00C21021 */ addu $v0, $a2, $v0 /* 8518 8002D118 8C420000 */ lw $v0, ($v0) /* 851C 8002D11C 0040F809 */ jalr $v0 -/* 8520 8002D120 00000000 */ nop +/* 8520 8002D120 00000000 */ nop /* 8524 8002D124 8FA30040 */ lw $v1, 0x40($sp) /* 8528 8002D128 AC620008 */ sw $v0, 8($v1) .L8002D12C: @@ -104,10 +104,10 @@ glabel nuSiMgrThread /* 853C 8002D13C 0C019608 */ jal osSendMesg /* 8540 8002D140 24060001 */ addiu $a2, $zero, 1 /* 8544 8002D144 0800B402 */ j .L8002D008 -/* 8548 8002D148 00000000 */ nop +/* 8548 8002D148 00000000 */ nop .L8002D14C: /* 854C 8002D14C 8E020000 */ lw $v0, ($s0) /* 8550 8002D150 1440FFE6 */ bnez $v0, .L8002D0EC -/* 8554 8002D154 00000000 */ nop +/* 8554 8002D154 00000000 */ nop /* 8558 8002D158 0800B402 */ j .L8002D008 -/* 855C 8002D15C 00000000 */ nop +/* 855C 8002D15C 00000000 */ nop diff --git a/asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s b/asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s index 88213f22dd..dc2b3a0fcb 100644 --- a/asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s +++ b/asm/nonmatchings/os/osEPiReadIo/osEPiReadIo.s @@ -24,5 +24,5 @@ glabel osEPiReadIo /* 3C20C 80060E0C 8FB00010 */ lw $s0, 0x10($sp) /* 3C210 80060E10 03E00008 */ jr $ra /* 3C214 80060E14 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3C218 80060E18 00000000 */ nop -/* 3C21C 80060E1C 00000000 */ nop +/* 3C218 80060E18 00000000 */ nop +/* 3C21C 80060E1C 00000000 */ nop diff --git a/asm/nonmatchings/os/osGetThreadPri/osGetThreadPri.s b/asm/nonmatchings/os/osGetThreadPri/osGetThreadPri.s index 996ec518c3..5f5d88fa0e 100644 --- a/asm/nonmatchings/os/osGetThreadPri/osGetThreadPri.s +++ b/asm/nonmatchings/os/osGetThreadPri/osGetThreadPri.s @@ -3,11 +3,11 @@ glabel osGetThreadPri /* 41330 80065F30 14800003 */ bnez $a0, .L80065F40 -/* 41334 80065F34 00000000 */ nop +/* 41334 80065F34 00000000 */ nop /* 41338 80065F38 3C048009 */ lui $a0, %hi(D_80094660) /* 4133C 80065F3C 8C844660 */ lw $a0, %lo(D_80094660)($a0) .L80065F40: /* 41340 80065F40 03E00008 */ jr $ra /* 41344 80065F44 8C820004 */ lw $v0, 4($a0) -/* 41348 80065F48 00000000 */ nop -/* 4134C 80065F4C 00000000 */ nop +/* 41348 80065F48 00000000 */ nop +/* 4134C 80065F4C 00000000 */ nop diff --git a/asm/nonmatchings/world_goompa/func_802BD14C.s b/asm/nonmatchings/world_goompa/func_802BD14C.s index 5f370243bc..5f68d33a09 100644 --- a/asm/nonmatchings/world_goompa/func_802BD14C.s +++ b/asm/nonmatchings/world_goompa/func_802BD14C.s @@ -49,14 +49,14 @@ glabel func_802BD14C /* 324B04 802BD1F4 10600009 */ beqz $v1, .L802BD21C /* 324B08 802BD1F8 0000102D */ daddu $v0, $zero, $zero /* 324B0C 802BD1FC 080AF530 */ j .L802BD4C0 -/* 324B10 802BD200 00000000 */ nop +/* 324B10 802BD200 00000000 */ nop .L802BD204: /* 324B14 802BD204 1062009A */ beq $v1, $v0, .L802BD470 /* 324B18 802BD208 24020003 */ addiu $v0, $zero, 3 /* 324B1C 802BD20C 106200A0 */ beq $v1, $v0, .L802BD490 /* 324B20 802BD210 0000102D */ daddu $v0, $zero, $zero /* 324B24 802BD214 080AF530 */ j .L802BD4C0 -/* 324B28 802BD218 00000000 */ nop +/* 324B28 802BD218 00000000 */ nop .L802BD21C: /* 324B2C 802BD21C AC850004 */ sw $a1, 4($a0) /* 324B30 802BD220 8E220000 */ lw $v0, ($s1) @@ -100,7 +100,7 @@ glabel func_802BD14C /* 324BC4 802BD2B4 44810000 */ mtc1 $at, $f0 /* 324BC8 802BD2B8 C44C0010 */ lwc1 $f12, 0x10($v0) /* 324BCC 802BD2BC 46006302 */ mul.s $f12, $f12, $f0 -/* 324BD0 802BD2C0 00000000 */ nop +/* 324BD0 802BD2C0 00000000 */ nop /* 324BD4 802BD2C4 27A50010 */ addiu $a1, $sp, 0x10 /* 324BD8 802BD2C8 3C0143B4 */ lui $at, 0x43b4 /* 324BDC 802BD2CC 44810000 */ mtc1 $at, $f0 @@ -111,14 +111,14 @@ glabel func_802BD14C /* 324BF0 802BD2E0 C7A20010 */ lwc1 $f2, 0x10($sp) /* 324BF4 802BD2E4 C440000C */ lwc1 $f0, 0xc($v0) /* 324BF8 802BD2E8 46001082 */ mul.s $f2, $f2, $f0 -/* 324BFC 802BD2EC 00000000 */ nop +/* 324BFC 802BD2EC 00000000 */ nop /* 324C00 802BD2F0 C6400048 */ lwc1 $f0, 0x48($s2) /* 324C04 802BD2F4 46020000 */ add.s $f0, $f0, $f2 /* 324C08 802BD2F8 E6200038 */ swc1 $f0, 0x38($s1) /* 324C0C 802BD2FC C7A20014 */ lwc1 $f2, 0x14($sp) /* 324C10 802BD300 C440000C */ lwc1 $f0, 0xc($v0) /* 324C14 802BD304 46001082 */ mul.s $f2, $f2, $f0 -/* 324C18 802BD308 00000000 */ nop +/* 324C18 802BD308 00000000 */ nop /* 324C1C 802BD30C C6400050 */ lwc1 $f0, 0x50($s2) /* 324C20 802BD310 46020001 */ sub.s $f0, $f0, $f2 /* 324C24 802BD314 E6200040 */ swc1 $f0, 0x40($s1) @@ -131,7 +131,7 @@ glabel func_802BD14C /* 324C40 802BD330 44811000 */ mtc1 $at, $f2 /* 324C44 802BD334 C604000C */ lwc1 $f4, 0xc($s0) /* 324C48 802BD338 4604103C */ c.lt.s $f2, $f4 -/* 324C4C 802BD33C 00000000 */ nop +/* 324C4C 802BD33C 00000000 */ nop /* 324C50 802BD340 45000005 */ bc1f .L802BD358 /* 324C54 802BD344 E6000010 */ swc1 $f0, 0x10($s0) /* 324C58 802BD348 3C013F80 */ lui $at, 0x3f80 @@ -141,14 +141,14 @@ glabel func_802BD14C .L802BD358: /* 324C68 802BD358 3C014198 */ lui $at, 0x4198 /* 324C6C 802BD35C 44810000 */ mtc1 $at, $f0 -/* 324C70 802BD360 00000000 */ nop +/* 324C70 802BD360 00000000 */ nop /* 324C74 802BD364 4600203C */ c.lt.s $f4, $f0 -/* 324C78 802BD368 00000000 */ nop +/* 324C78 802BD368 00000000 */ nop /* 324C7C 802BD36C 45000006 */ bc1f .L802BD388 -/* 324C80 802BD370 00000000 */ nop +/* 324C80 802BD370 00000000 */ nop /* 324C84 802BD374 3C013F80 */ lui $at, 0x3f80 /* 324C88 802BD378 44810000 */ mtc1 $at, $f0 -/* 324C8C 802BD37C 00000000 */ nop +/* 324C8C 802BD37C 00000000 */ nop /* 324C90 802BD380 46002000 */ add.s $f0, $f4, $f0 .L802BD384: /* 324C94 802BD384 E600000C */ swc1 $f0, 0xc($s0) @@ -161,7 +161,7 @@ glabel func_802BD14C /* 324CAC 802BD39C 44810000 */ mtc1 $at, $f0 /* 324CB0 802BD3A0 C44C0018 */ lwc1 $f12, 0x18($v0) /* 324CB4 802BD3A4 46006302 */ mul.s $f12, $f12, $f0 -/* 324CB8 802BD3A8 00000000 */ nop +/* 324CB8 802BD3A8 00000000 */ nop /* 324CBC 802BD3AC 3C0143B4 */ lui $at, 0x43b4 /* 324CC0 802BD3B0 4481A000 */ mtc1 $at, $f20 /* 324CC4 802BD3B4 0C00A85B */ jal sin_rad @@ -173,11 +173,11 @@ glabel func_802BD14C /* 324CDC 802BD3CC 46041080 */ add.s $f2, $f2, $f4 /* 324CE0 802BD3D0 3C014316 */ lui $at, 0x4316 /* 324CE4 802BD3D4 44813000 */ mtc1 $at, $f6 -/* 324CE8 802BD3D8 00000000 */ nop +/* 324CE8 802BD3D8 00000000 */ nop /* 324CEC 802BD3DC 4602303C */ c.lt.s $f6, $f2 /* 324CF0 802BD3E0 E4420018 */ swc1 $f2, 0x18($v0) /* 324CF4 802BD3E4 46040082 */ mul.s $f2, $f0, $f4 -/* 324CF8 802BD3E8 00000000 */ nop +/* 324CF8 802BD3E8 00000000 */ nop /* 324CFC 802BD3EC 45030001 */ bc1tl .L802BD3F4 /* 324D00 802BD3F0 E4460018 */ swc1 $f6, 0x18($v0) .L802BD3F4: @@ -199,7 +199,7 @@ glabel func_802BD14C /* 324D40 802BD430 44811000 */ mtc1 $at, $f2 /* 324D44 802BD434 46200020 */ cvt.s.d $f0, $f0 /* 324D48 802BD438 4600103C */ c.lt.s $f2, $f0 -/* 324D4C 802BD43C 00000000 */ nop +/* 324D4C 802BD43C 00000000 */ nop /* 324D50 802BD440 45000002 */ bc1f .L802BD44C /* 324D54 802BD444 E4400014 */ swc1 $f0, 0x14($v0) /* 324D58 802BD448 E4420014 */ swc1 $f2, 0x14($v0) diff --git a/asm/nonmatchings/world_goompa/func_802BD4E0.s b/asm/nonmatchings/world_goompa/func_802BD4E0.s index 8042d78ecc..4e7bbea26c 100644 --- a/asm/nonmatchings/world_goompa/func_802BD4E0.s +++ b/asm/nonmatchings/world_goompa/func_802BD4E0.s @@ -8,7 +8,7 @@ glabel func_802BD4E0 /* 324DFC 802BD4EC AFBF0010 */ sw $ra, 0x10($sp) /* 324E00 802BD4F0 8CA20000 */ lw $v0, ($a1) /* 324E04 802BD4F4 10400008 */ beqz $v0, .L802BD518 -/* 324E08 802BD4F8 00000000 */ nop +/* 324E08 802BD4F8 00000000 */ nop /* 324E0C 802BD4FC 3C03802C */ lui $v1, %hi(D_802BD58C) /* 324E10 802BD500 8C63D58C */ lw $v1, %lo(D_802BD58C)($v1) /* 324E14 802BD504 8C620008 */ lw $v0, 8($v1) diff --git a/asm/os/__osDisableInt.s b/asm/os/__osDisableInt.s index 84a78fd17d..50fd07c03c 100644 --- a/asm/os/__osDisableInt.s +++ b/asm/os/__osDisableInt.s @@ -32,8 +32,8 @@ glabel __osDisableInt /* 467B4 8006B3B4 2401FFFE */ addiu $at, $zero, -2 /* 467B8 8006B3B8 01214824 */ and $t1, $t1, $at /* 467BC 8006B3BC 40896000 */ mtc0 $t1, $12 -/* 467C0 8006B3C0 00000000 */ nop -/* 467C4 8006B3C4 00000000 */ nop +/* 467C0 8006B3C0 00000000 */ nop +/* 467C4 8006B3C4 00000000 */ nop .L8006B3C8: /* 467C8 8006B3C8 03E00008 */ jr $ra -/* 467CC 8006B3CC 00000000 */ nop +/* 467CC 8006B3CC 00000000 */ nop diff --git a/asm/os/__osRestoreInt.s b/asm/os/__osRestoreInt.s index d30c03552f..45a119ca70 100644 --- a/asm/os/__osRestoreInt.s +++ b/asm/os/__osRestoreInt.s @@ -11,8 +11,8 @@ glabel __osRestoreInt /* 467D0 8006B3D0 40086000 */ mfc0 $t0, $12 /* 467D4 8006B3D4 01044025 */ or $t0, $t0, $a0 /* 467D8 8006B3D8 40886000 */ mtc0 $t0, $12 -/* 467DC 8006B3DC 00000000 */ nop -/* 467E0 8006B3E0 00000000 */ nop +/* 467DC 8006B3DC 00000000 */ nop +/* 467E0 8006B3E0 00000000 */ nop /* 467E4 8006B3E4 03E00008 */ jr $ra -/* 467E8 8006B3E8 00000000 */ nop -/* 467EC 8006B3EC 00000000 */ nop +/* 467E8 8006B3E8 00000000 */ nop +/* 467EC 8006B3EC 00000000 */ nop diff --git a/asm/os/code_45df0_len_970.s b/asm/os/code_45df0_len_970.s index cc1cfc5786..02169734e1 100644 --- a/asm/os/code_45df0_len_970.s +++ b/asm/os/code_45df0_len_970.s @@ -11,8 +11,7 @@ glabel func_8006A9F0 /* 45DF0 8006A9F0 3C1A8007 */ lui $k0, %hi(osExceptionPreamble) /* 45DF4 8006A9F4 275AAA00 */ addiu $k0, $k0, %lo(osExceptionPreamble) /* 45DF8 8006A9F8 03400008 */ jr $k0 -/* 45DFC 8006A9FC 00000000 */ nop - +/* 45DFC 8006A9FC 00000000 */ nop glabel osExceptionPreamble /* 45E00 8006AA00 3C1A800B */ lui $k0, %hi(D_800B0D08) /* 45E04 8006AA04 275A0D08 */ addiu $k0, $k0, %lo(D_800B0D08) @@ -74,7 +73,7 @@ glabel func_8006AA34 /* 45EDC 8006AADC 8F5B0118 */ lw $k1, 0x118($k0) /* 45EE0 8006AAE0 3369FF00 */ andi $t1, $k1, 0xff00 /* 45EE4 8006AAE4 11200013 */ beqz $t1, .L8006AB34 -/* 45EE8 8006AAE8 00000000 */ nop +/* 45EE8 8006AAE8 00000000 */ nop /* 45EEC 8006AAEC 3C088009 */ lui $t0, %hi(D_80095900) /* 45EF0 8006AAF0 25085900 */ addiu $t0, $t0, %lo(D_80095900) /* 45EF4 8006AAF4 8D080000 */ lw $t0, ($t0) @@ -97,7 +96,7 @@ glabel func_8006AA34 /* 45F34 8006AB34 3C09A430 */ lui $t1, %hi(D_A430000C) /* 45F38 8006AB38 8D29000C */ lw $t1, %lo(D_A430000C)($t1) /* 45F3C 8006AB3C 1120000B */ beqz $t1, .L8006AB6C -/* 45F40 8006AB40 00000000 */ nop +/* 45F40 8006AB40 00000000 */ nop /* 45F44 8006AB44 3C088009 */ lui $t0, %hi(D_80095900) /* 45F48 8006AB48 25085900 */ addiu $t0, $t0, %lo(D_80095900) /* 45F4C 8006AB4C 8D080000 */ lw $t0, ($t0) @@ -114,9 +113,9 @@ glabel func_8006AA34 /* 45F74 8006AB74 AF48011C */ sw $t0, 0x11c($k0) /* 45F78 8006AB78 8F480018 */ lw $t0, 0x18($k0) /* 45F7C 8006AB7C 11000014 */ beqz $t0, .L8006ABD0 -/* 45F80 8006AB80 00000000 */ nop +/* 45F80 8006AB80 00000000 */ nop /* 45F84 8006AB84 4448F800 */ cfc1 $t0, $31 -/* 45F88 8006AB88 00000000 */ nop +/* 45F88 8006AB88 00000000 */ nop /* 45F8C 8006AB8C AF48012C */ sw $t0, 0x12c($k0) /* 45F90 8006AB90 F7400130 */ sdc1 $f0, 0x130($k0) /* 45F94 8006AB94 F7420138 */ sdc1 $f2, 0x138($k0) @@ -142,19 +141,19 @@ glabel func_8006AA34 /* 45FE0 8006ABE0 3109007C */ andi $t1, $t0, 0x7c /* 45FE4 8006ABE4 240A0024 */ addiu $t2, $zero, 0x24 /* 45FE8 8006ABE8 112A00BF */ beq $t1, $t2, .L8006AEE8 -/* 45FEC 8006ABEC 00000000 */ nop +/* 45FEC 8006ABEC 00000000 */ nop /* 45FF0 8006ABF0 240A002C */ addiu $t2, $zero, 0x2c /* 45FF4 8006ABF4 112A0110 */ beq $t1, $t2, handle_CPU -/* 45FF8 8006ABF8 00000000 */ nop +/* 45FF8 8006ABF8 00000000 */ nop /* 45FFC 8006ABFC 240A0000 */ addiu $t2, $zero, 0 /* 46000 8006AC00 152A00D2 */ bne $t1, $t2, .L8006AF4C -/* 46004 8006AC04 00000000 */ nop +/* 46004 8006AC04 00000000 */ nop /* 46008 8006AC08 03688024 */ and $s0, $k1, $t0 .L8006AC0C: /* 4600C 8006AC0C 3209FF00 */ andi $t1, $s0, 0xff00 /* 46010 8006AC10 00095302 */ srl $t2, $t1, 0xc /* 46014 8006AC14 15400003 */ bnez $t2, .L8006AC24 -/* 46018 8006AC18 00000000 */ nop +/* 46018 8006AC18 00000000 */ nop /* 4601C 8006AC1C 00095202 */ srl $t2, $t1, 8 /* 46020 8006AC20 214A0010 */ addi $t2, $t2, 0x10 .L8006AC24: @@ -165,7 +164,7 @@ glabel func_8006AA34 /* 46034 8006AC34 002A0821 */ addu $at, $at, $t2 /* 46038 8006AC38 8C2A9DA0 */ lw $t2, %lo(D_80099DA0)($at) /* 4603C 8006AC3C 01400008 */ jr $t2 -/* 46040 8006AC40 00000000 */ nop +/* 46040 8006AC40 00000000 */ nop /* 46044 8006AC44 2401DFFF */ addiu $at, $zero, -0x2001 /* 46048 8006AC48 1000FFF0 */ b .L8006AC0C /* 4604C 8006AC4C 02018024 */ and $s0, $s0, $at @@ -176,7 +175,7 @@ glabel func_8006AA34 /* 46060 8006AC60 40895800 */ mtc0 $t1, $11 /* 46064 8006AC64 24040018 */ addiu $a0, $zero, 0x18 /* 46068 8006AC68 0C01ABDF */ jal send_mesg -/* 4606C 8006AC6C 00000000 */ nop +/* 4606C 8006AC6C 00000000 */ nop /* 46070 8006AC70 3C01FFFF */ lui $at, 0xffff /* 46074 8006AC74 34217FFF */ ori $at, $at, 0x7fff /* 46078 8006AC78 1000FFE4 */ b .L8006AC0C @@ -188,18 +187,18 @@ glabel func_8006AA34 /* 46090 8006AC90 21290008 */ addi $t1, $t1, 8 /* 46094 8006AC94 8D2A0000 */ lw $t2, ($t1) /* 46098 8006AC98 11400007 */ beqz $t2, .L8006ACB8 -/* 4609C 8006AC9C 00000000 */ nop +/* 4609C 8006AC9C 00000000 */ nop /* 460A0 8006ACA0 0140F809 */ jalr $t2 /* 460A4 8006ACA4 8D3D0004 */ lw $sp, 4($t1) /* 460A8 8006ACA8 10400003 */ beqz $v0, .L8006ACB8 -/* 460AC 8006ACAC 00000000 */ nop +/* 460AC 8006ACAC 00000000 */ nop /* 460B0 8006ACB0 10000093 */ b .L8006AF00 -/* 460B4 8006ACB4 00000000 */ nop +/* 460B4 8006ACB4 00000000 */ nop .L8006ACB8: /* 460B8 8006ACB8 0C01ABDF */ jal send_mesg /* 460BC 8006ACBC 24040010 */ addiu $a0, $zero, 0x10 /* 460C0 8006ACC0 1000FFD2 */ b .L8006AC0C -/* 460C4 8006ACC4 00000000 */ nop +/* 460C4 8006ACC4 00000000 */ nop /* 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) @@ -209,7 +208,7 @@ glabel func_8006AA34 /* 460E0 8006ACE0 02288824 */ and $s1, $s1, $t0 /* 460E4 8006ACE4 32290001 */ andi $t1, $s1, 1 /* 460E8 8006ACE8 11200014 */ beqz $t1, .L8006AD3C -/* 460EC 8006ACEC 00000000 */ nop +/* 460EC 8006ACEC 00000000 */ nop /* 460F0 8006ACF0 3231003E */ andi $s1, $s1, 0x3e /* 460F4 8006ACF4 3C0CA404 */ lui $t4, %hi(D_A4040010) /* 460F8 8006ACF8 8D8C0010 */ lw $t4, %lo(D_A4040010)($t4) @@ -218,33 +217,33 @@ glabel func_8006AA34 /* 46104 8006AD04 AC290010 */ sw $t1, %lo(D_A4040010)($at) /* 46108 8006AD08 318C0300 */ andi $t4, $t4, 0x300 /* 4610C 8006AD0C 11800007 */ beqz $t4, .L8006AD2C -/* 46110 8006AD10 00000000 */ nop +/* 46110 8006AD10 00000000 */ nop /* 46114 8006AD14 0C01ABDF */ jal send_mesg /* 46118 8006AD18 24040020 */ addiu $a0, $zero, 0x20 /* 4611C 8006AD1C 12200044 */ beqz $s1, .L8006AE30 -/* 46120 8006AD20 00000000 */ nop +/* 46120 8006AD20 00000000 */ nop /* 46124 8006AD24 10000005 */ b .L8006AD3C -/* 46128 8006AD28 00000000 */ nop +/* 46128 8006AD28 00000000 */ nop .L8006AD2C: /* 4612C 8006AD2C 0C01ABDF */ jal send_mesg /* 46130 8006AD30 24040058 */ addiu $a0, $zero, 0x58 /* 46134 8006AD34 1220003E */ beqz $s1, .L8006AE30 -/* 46138 8006AD38 00000000 */ nop +/* 46138 8006AD38 00000000 */ nop .L8006AD3C: /* 4613C 8006AD3C 32290008 */ andi $t1, $s1, 8 /* 46140 8006AD40 11200008 */ beqz $t1, .L8006AD64 -/* 46144 8006AD44 00000000 */ nop +/* 46144 8006AD44 00000000 */ nop /* 46148 8006AD48 32310037 */ andi $s1, $s1, 0x37 /* 4614C 8006AD4C 3C01A440 */ lui $at, %hi(D_A4400010) /* 46150 8006AD50 AC200010 */ sw $zero, %lo(D_A4400010)($at) /* 46154 8006AD54 0C01ABDF */ jal send_mesg /* 46158 8006AD58 24040038 */ addiu $a0, $zero, 0x38 /* 4615C 8006AD5C 12200034 */ beqz $s1, .L8006AE30 -/* 46160 8006AD60 00000000 */ nop +/* 46160 8006AD60 00000000 */ nop .L8006AD64: /* 46164 8006AD64 32290004 */ andi $t1, $s1, 4 /* 46168 8006AD68 11200009 */ beqz $t1, .L8006AD90 -/* 4616C 8006AD6C 00000000 */ nop +/* 4616C 8006AD6C 00000000 */ nop /* 46170 8006AD70 3231003B */ andi $s1, $s1, 0x3b /* 46174 8006AD74 24090001 */ addiu $t1, $zero, 1 /* 46178 8006AD78 3C01A450 */ lui $at, %hi(D_A450000C) @@ -252,22 +251,22 @@ glabel func_8006AA34 /* 46180 8006AD80 0C01ABDF */ jal send_mesg /* 46184 8006AD84 24040030 */ addiu $a0, $zero, 0x30 /* 46188 8006AD88 12200029 */ beqz $s1, .L8006AE30 -/* 4618C 8006AD8C 00000000 */ nop +/* 4618C 8006AD8C 00000000 */ nop .L8006AD90: /* 46190 8006AD90 32290002 */ andi $t1, $s1, 2 /* 46194 8006AD94 11200008 */ beqz $t1, .L8006ADB8 -/* 46198 8006AD98 00000000 */ nop +/* 46198 8006AD98 00000000 */ nop /* 4619C 8006AD9C 3231003D */ andi $s1, $s1, 0x3d /* 461A0 8006ADA0 3C01A480 */ lui $at, %hi(D_A4800018) /* 461A4 8006ADA4 AC200018 */ sw $zero, %lo(D_A4800018)($at) /* 461A8 8006ADA8 0C01ABDF */ jal send_mesg /* 461AC 8006ADAC 24040028 */ addiu $a0, $zero, 0x28 /* 461B0 8006ADB0 1220001F */ beqz $s1, .L8006AE30 -/* 461B4 8006ADB4 00000000 */ nop +/* 461B4 8006ADB4 00000000 */ nop .L8006ADB8: /* 461B8 8006ADB8 32290010 */ andi $t1, $s1, 0x10 /* 461BC 8006ADBC 11200013 */ beqz $t1, .L8006AE0C -/* 461C0 8006ADC0 00000000 */ nop +/* 461C0 8006ADC0 00000000 */ nop /* 461C4 8006ADC4 3231002F */ andi $s1, $s1, 0x2f /* 461C8 8006ADC8 24090002 */ addiu $t1, $zero, 2 /* 461CC 8006ADCC 3C01A460 */ lui $at, %hi(D_A4600010) @@ -276,22 +275,22 @@ glabel func_8006AA34 /* 461D8 8006ADD8 25295938 */ addiu $t1, $t1, %lo(D_80095938) /* 461DC 8006ADDC 8D2A0000 */ lw $t2, ($t1) /* 461E0 8006ADE0 11400006 */ beqz $t2, .L8006ADFC -/* 461E4 8006ADE4 00000000 */ nop +/* 461E4 8006ADE4 00000000 */ nop /* 461E8 8006ADE8 8D3D0004 */ lw $sp, 4($t1) /* 461EC 8006ADEC 0140F809 */ jalr $t2 /* 461F0 8006ADF0 00402021 */ addu $a0, $v0, $zero /* 461F4 8006ADF4 14400003 */ bnez $v0, .L8006AE04 -/* 461F8 8006ADF8 00000000 */ nop +/* 461F8 8006ADF8 00000000 */ nop .L8006ADFC: /* 461FC 8006ADFC 0C01ABDF */ jal send_mesg /* 46200 8006AE00 24040040 */ addiu $a0, $zero, 0x40 .L8006AE04: /* 46204 8006AE04 1220000A */ beqz $s1, .L8006AE30 -/* 46208 8006AE08 00000000 */ nop +/* 46208 8006AE08 00000000 */ nop .L8006AE0C: /* 4620C 8006AE0C 32290020 */ andi $t1, $s1, 0x20 /* 46210 8006AE10 11200007 */ beqz $t1, .L8006AE30 -/* 46214 8006AE14 00000000 */ nop +/* 46214 8006AE14 00000000 */ nop /* 46218 8006AE18 3231001F */ andi $s1, $s1, 0x1f /* 4621C 8006AE1C 24090800 */ addiu $t1, $zero, 0x800 /* 46220 8006AE20 3C01A430 */ lui $at, 0xa430 @@ -310,7 +309,7 @@ glabel func_8006AA34 /* 46250 8006AE50 252958FC */ addiu $t1, $t1, %lo(D_800958FC) /* 46254 8006AE54 8D2A0000 */ lw $t2, ($t1) /* 46258 8006AE58 11400004 */ beqz $t2, .L8006AE6C -/* 4625C 8006AE5C 00000000 */ nop +/* 4625C 8006AE5C 00000000 */ nop /* 46260 8006AE60 2401EFFF */ addiu $at, $zero, -0x1001 /* 46264 8006AE64 10000026 */ b .L8006AF00 /* 46268 8006AE68 02018024 */ and $s0, $s0, $at @@ -333,7 +332,7 @@ glabel func_8006AA34 /* 462A8 8006AEA8 40886800 */ mtc0 $t0, $13 /* 462AC 8006AEAC 24040008 */ addiu $a0, $zero, 8 /* 462B0 8006AEB0 0C01ABDF */ jal send_mesg -/* 462B4 8006AEB4 00000000 */ nop +/* 462B4 8006AEB4 00000000 */ nop /* 462B8 8006AEB8 2401FDFF */ addiu $at, $zero, -0x201 /* 462BC 8006AEBC 1000FF53 */ b .L8006AC0C /* 462C0 8006AEC0 02018024 */ and $s0, $s0, $at @@ -342,7 +341,7 @@ glabel func_8006AA34 /* 462CC 8006AECC 40886800 */ mtc0 $t0, $13 /* 462D0 8006AED0 24040000 */ addiu $a0, $zero, 0 /* 462D4 8006AED4 0C01ABDF */ jal send_mesg -/* 462D8 8006AED8 00000000 */ nop +/* 462D8 8006AED8 00000000 */ nop /* 462DC 8006AEDC 2401FEFF */ addiu $at, $zero, -0x101 /* 462E0 8006AEE0 1000FF4A */ b .L8006AC0C /* 462E4 8006AEE4 02018024 */ and $s0, $s0, $at @@ -352,7 +351,7 @@ glabel func_8006AA34 /* 462F0 8006AEF0 0C01ABDF */ jal send_mesg /* 462F4 8006AEF4 24040050 */ addiu $a0, $zero, 0x50 /* 462F8 8006AEF8 10000001 */ b .L8006AF00 -/* 462FC 8006AEFC 00000000 */ nop +/* 462FC 8006AEFC 00000000 */ nop .L8006AF00: /* 46300 8006AF00 8F490004 */ lw $t1, 4($k0) /* 46304 8006AF04 3C0A8009 */ lui $t2, %hi(D_80094658) @@ -360,13 +359,13 @@ glabel func_8006AA34 /* 4630C 8006AF0C 8D4B0004 */ lw $t3, 4($t2) /* 46310 8006AF10 012B082A */ slt $at, $t1, $t3 /* 46314 8006AF14 10200007 */ beqz $at, .L8006AF34 -/* 46318 8006AF18 00000000 */ nop +/* 46318 8006AF18 00000000 */ nop /* 4631C 8006AF1C 03402821 */ addu $a1, $k0, $zero /* 46320 8006AF20 3C048009 */ lui $a0, %hi(D_80094658) /* 46324 8006AF24 0C01AC5D */ jal osEnqueueThread /* 46328 8006AF28 24844658 */ addiu $a0, $a0, %lo(D_80094658) /* 4632C 8006AF2C 0801AC75 */ j osDispatchThread -/* 46330 8006AF30 00000000 */ nop +/* 46330 8006AF30 00000000 */ nop .L8006AF34: /* 46334 8006AF34 3C098009 */ lui $t1, %hi(D_80094658) /* 46338 8006AF38 25294658 */ addiu $t1, $t1, %lo(D_80094658) @@ -386,8 +385,7 @@ glabel func_8006AA34 /* 4636C 8006AF6C 0C01ABDF */ jal send_mesg /* 46370 8006AF70 24040060 */ addiu $a0, $zero, 0x60 /* 46374 8006AF74 0801AC75 */ j osDispatchThread -/* 46378 8006AF78 00000000 */ nop - +/* 46378 8006AF78 00000000 */ nop glabel send_mesg /* 4637C 8006AF7C 03E09021 */ addu $s2, $ra, $zero /* 46380 8006AF80 3C0A800E */ lui $t2, %hi(D_800D9F80) @@ -395,24 +393,24 @@ glabel send_mesg /* 46388 8006AF88 01445021 */ addu $t2, $t2, $a0 /* 4638C 8006AF8C 8D490000 */ lw $t1, ($t2) /* 46390 8006AF90 11200027 */ beqz $t1, .L8006B030 -/* 46394 8006AF94 00000000 */ nop +/* 46394 8006AF94 00000000 */ nop /* 46398 8006AF98 8D2B0008 */ lw $t3, 8($t1) /* 4639C 8006AF9C 8D2C0010 */ lw $t4, 0x10($t1) /* 463A0 8006AFA0 016C082A */ slt $at, $t3, $t4 /* 463A4 8006AFA4 10200022 */ beqz $at, .L8006B030 -/* 463A8 8006AFA8 00000000 */ nop +/* 463A8 8006AFA8 00000000 */ nop /* 463AC 8006AFAC 8D2D000C */ lw $t5, 0xc($t1) /* 463B0 8006AFB0 01AB6821 */ addu $t5, $t5, $t3 /* 463B4 8006AFB4 01AC001A */ div $zero, $t5, $t4 /* 463B8 8006AFB8 15800002 */ bnez $t4, .L8006AFC4 -/* 463BC 8006AFBC 00000000 */ nop +/* 463BC 8006AFBC 00000000 */ nop /* 463C0 8006AFC0 0007000D */ break 7 .L8006AFC4: /* 463C4 8006AFC4 2401FFFF */ addiu $at, $zero, -1 /* 463C8 8006AFC8 15810004 */ bne $t4, $at, .L8006AFDC /* 463CC 8006AFCC 3C018000 */ lui $at, 0x8000 /* 463D0 8006AFD0 15A10002 */ bne $t5, $at, .L8006AFDC -/* 463D4 8006AFD4 00000000 */ nop +/* 463D4 8006AFD4 00000000 */ nop /* 463D8 8006AFD8 0006000D */ break 6 .L8006AFDC: /* 463DC 8006AFDC 00006810 */ mfhi $t5 @@ -428,7 +426,7 @@ glabel send_mesg /* 46404 8006B004 8D2A0000 */ lw $t2, ($t1) /* 46408 8006B008 8D4B0000 */ lw $t3, ($t2) /* 4640C 8006B00C 11600008 */ beqz $t3, .L8006B030 -/* 46410 8006B010 00000000 */ nop +/* 46410 8006B010 00000000 */ nop /* 46414 8006B014 0C01AC6F */ jal osPopThread /* 46418 8006B018 01202021 */ addu $a0, $t1, $zero /* 4641C 8006B01C 00405021 */ addu $t2, $v0, $zero @@ -438,15 +436,14 @@ glabel send_mesg /* 4642C 8006B02C 24844658 */ addiu $a0, $a0, %lo(D_80094658) .L8006B030: /* 46430 8006B030 02400008 */ jr $s2 -/* 46434 8006B034 00000000 */ nop - +/* 46434 8006B034 00000000 */ nop glabel handle_CPU /* 46438 8006B038 3C013000 */ lui $at, 0x3000 /* 4643C 8006B03C 01014824 */ and $t1, $t0, $at /* 46440 8006B040 00094F02 */ srl $t1, $t1, 0x1c /* 46444 8006B044 240A0001 */ addiu $t2, $zero, 1 /* 46448 8006B048 152AFFC0 */ bne $t1, $t2, .L8006AF4C -/* 4644C 8006B04C 00000000 */ nop +/* 4644C 8006B04C 00000000 */ nop /* 46450 8006B050 24090001 */ addiu $t1, $zero, 1 /* 46454 8006B054 AF490018 */ sw $t1, 0x18($k0) /* 46458 8006B058 8F5B0118 */ lw $k1, 0x118($k0) @@ -476,9 +473,9 @@ glabel osEnqueueAndYield /* 464B0 8006B0B0 ACBF011C */ sw $ra, 0x11c($a1) /* 464B4 8006B0B4 8CBB0018 */ lw $k1, 0x18($a1) /* 464B8 8006B0B8 1360000A */ beqz $k1, .L8006B0E4 -/* 464BC 8006B0BC 00000000 */ nop +/* 464BC 8006B0BC 00000000 */ nop /* 464C0 8006B0C0 445BF800 */ cfc1 $k1, $31 -/* 464C4 8006B0C4 00000000 */ nop +/* 464C4 8006B0C4 00000000 */ nop /* 464C8 8006B0C8 ACBB012C */ sw $k1, 0x12c($a1) /* 464CC 8006B0CC F4B40180 */ sdc1 $f20, 0x180($a1) /* 464D0 8006B0D0 F4B60188 */ sdc1 $f22, 0x188($a1) @@ -490,7 +487,7 @@ glabel osEnqueueAndYield /* 464E4 8006B0E4 8CBB0118 */ lw $k1, 0x118($a1) /* 464E8 8006B0E8 3369FF00 */ andi $t1, $k1, 0xff00 /* 464EC 8006B0EC 1120000D */ beqz $t1, .L8006B124 -/* 464F0 8006B0F0 00000000 */ nop +/* 464F0 8006B0F0 00000000 */ nop /* 464F4 8006B0F4 3C088009 */ lui $t0, %hi(D_80095900) /* 464F8 8006B0F8 25085900 */ addiu $t0, $t0, %lo(D_80095900) /* 464FC 8006B0FC 8D080000 */ lw $t0, ($t0) @@ -507,7 +504,7 @@ glabel osEnqueueAndYield /* 46524 8006B124 3C1BA430 */ lui $k1, %hi(D_A430000C) /* 46528 8006B128 8F7B000C */ lw $k1, %lo(D_A430000C)($k1) /* 4652C 8006B12C 1360000B */ beqz $k1, .L8006B15C -/* 46530 8006B130 00000000 */ nop +/* 46530 8006B130 00000000 */ nop /* 46534 8006B134 3C1A8009 */ lui $k0, %hi(D_80095900) /* 46538 8006B138 275A5900 */ addiu $k0, $k0, %lo(D_80095900) /* 4653C 8006B13C 8F5A0000 */ lw $k0, ($k0) @@ -522,11 +519,10 @@ glabel osEnqueueAndYield /* 4655C 8006B15C 10800003 */ beqz $a0, .L8006B16C /* 46560 8006B160 ACBB0128 */ sw $k1, 0x128($a1) /* 46564 8006B164 0C01AC5D */ jal osEnqueueThread -/* 46568 8006B168 00000000 */ nop +/* 46568 8006B168 00000000 */ nop .L8006B16C: /* 4656C 8006B16C 0801AC75 */ j osDispatchThread -/* 46570 8006B170 00000000 */ nop - +/* 46570 8006B170 00000000 */ nop glabel osEnqueueThread /* 46574 8006B174 0080C821 */ addu $t9, $a0, $zero /* 46578 8006B178 8C980000 */ lw $t8, ($a0) @@ -534,14 +530,14 @@ glabel osEnqueueThread /* 46580 8006B180 8F0E0004 */ lw $t6, 4($t8) /* 46584 8006B184 01CF082A */ slt $at, $t6, $t7 /* 46588 8006B188 14200007 */ bnez $at, .L8006B1A8 -/* 4658C 8006B18C 00000000 */ nop +/* 4658C 8006B18C 00000000 */ nop .L8006B190: /* 46590 8006B190 0300C821 */ addu $t9, $t8, $zero /* 46594 8006B194 8F180000 */ lw $t8, ($t8) /* 46598 8006B198 8F0E0004 */ lw $t6, 4($t8) /* 4659C 8006B19C 01CF082A */ slt $at, $t6, $t7 /* 465A0 8006B1A0 1020FFFB */ beqz $at, .L8006B190 -/* 465A4 8006B1A4 00000000 */ nop +/* 465A4 8006B1A4 00000000 */ nop .L8006B1A8: /* 465A8 8006B1A8 8F380000 */ lw $t8, ($t9) /* 465AC 8006B1AC ACB80000 */ sw $t8, ($a1) @@ -555,8 +551,7 @@ glabel osPopThread /* 465C4 8006B1C4 03E00008 */ jr $ra /* 465C8 8006B1C8 AC990000 */ sw $t9, ($a0) /* 465CC 8006B1CC 03E00008 */ jr $ra -/* 465D0 8006B1D0 00000000 */ nop - +/* 465D0 8006B1D0 00000000 */ nop glabel osDispatchThread /* 465D4 8006B1D4 3C048009 */ lui $a0, %hi(D_80094658) /* 465D8 8006B1D8 0C01AC6F */ jal osPopThread @@ -615,7 +610,7 @@ glabel osDispatchThread /* 466AC 8006B2AC 409B7000 */ mtc0 $k1, $14 /* 466B0 8006B2B0 8F5B0018 */ lw $k1, 0x18($k0) /* 466B4 8006B2B4 13600013 */ beqz $k1, .L8006B304 -/* 466B8 8006B2B8 00000000 */ nop +/* 466B8 8006B2B8 00000000 */ nop /* 466BC 8006B2BC 8F5B012C */ lw $k1, 0x12c($k0) /* 466C0 8006B2C0 44DBF800 */ ctc1 $k1, $31 /* 466C4 8006B2C4 D7400130 */ ldc1 $f0, 0x130($k0) @@ -649,14 +644,14 @@ glabel osDispatchThread /* 46730 8006B330 3C1AA430 */ lui $k0, 0xa430 /* 46734 8006B334 375A000C */ ori $k0, $k0, 0xc /* 46738 8006B338 AF5B0000 */ sw $k1, ($k0) -/* 4673C 8006B33C 00000000 */ nop -/* 46740 8006B340 00000000 */ nop -/* 46744 8006B344 00000000 */ nop -/* 46748 8006B348 00000000 */ nop -/* 4674C 8006B34C 42000018 */ eret +/* 4673C 8006B33C 00000000 */ nop +/* 46740 8006B340 00000000 */ nop +/* 46744 8006B344 00000000 */ nop +/* 46748 8006B348 00000000 */ nop +/* 4674C 8006B34C 42000018 */ eret glabel osCleanupThread /* 46750 8006B350 00002021 */ addu $a0, $zero, $zero /* 46754 8006B354 0C01B254 */ jal osDestroyThread -/* 46758 8006B358 00000000 */ nop -/* 4675C 8006B35C 00000000 */ nop +/* 46758 8006B358 00000000 */ nop +/* 4675C 8006B35C 00000000 */ nop diff --git a/asm/os/osSetIntMask.s b/asm/os/osSetIntMask.s index 4a6e00fcde..df82054d1c 100644 --- a/asm/os/osSetIntMask.s +++ b/asm/os/osSetIntMask.s @@ -45,7 +45,7 @@ glabel osSetIntMask /* 3BDC4 800609C4 01816024 */ and $t4, $t4, $at /* 3BDC8 800609C8 01886025 */ or $t4, $t4, $t0 /* 3BDCC 800609CC 408C6000 */ mtc0 $t4, $12 -/* 3BDD0 800609D0 00000000 */ nop -/* 3BDD4 800609D4 00000000 */ nop +/* 3BDD0 800609D0 00000000 */ nop +/* 3BDD4 800609D4 00000000 */ nop /* 3BDD8 800609D8 03E00008 */ jr $ra -/* 3BDDC 800609DC 00000000 */ nop +/* 3BDDC 800609DC 00000000 */ nop