diff --git a/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s b/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s index b65c3a62a9..5f866e5482 100644 --- a/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s +++ b/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s @@ -58,7 +58,7 @@ glabel func_8006CBAC /* AE3DC0 8006CC20 0C031AB1 */ jal func_800C6AC4 /* AE3DC4 8006CC24 00A08025 */ move $s0, $a1 /* AE3DC8 8006CC28 0C034213 */ jal Matrix_Push -/* AE3DCC 8006CC2C 00000000 */ nop +/* AE3DCC 8006CC2C 00000000 */ nop /* AE3DD0 8006CC30 8FB900A4 */ lw $t9, 0xa4($sp) /* AE3DD4 8006CC34 5320000A */ beql $t9, $zero, .L8006CC60 /* AE3DD8 8006CC38 8FA800A0 */ lw $t0, 0xa0($sp) @@ -90,13 +90,13 @@ glabel func_8006CBAC /* AE3E3C 8006CC9C E7A80074 */ swc1 $f8, 0x74($sp) /* AE3E40 8006CCA0 844DFFF6 */ lh $t5, -0xa($v0) /* AE3E44 8006CCA4 448D5000 */ mtc1 $t5, $f10 -/* AE3E48 8006CCA8 00000000 */ nop +/* AE3E48 8006CCA8 00000000 */ nop /* AE3E4C 8006CCAC 46805420 */ cvt.s.w $f16, $f10 /* AE3E50 8006CCB0 46008482 */ mul.s $f18, $f16, $f0 /* AE3E54 8006CCB4 E7B20078 */ swc1 $f18, 0x78($sp) /* AE3E58 8006CCB8 844EFFF8 */ lh $t6, -8($v0) /* AE3E5C 8006CCBC 448E2000 */ mtc1 $t6, $f4 -/* AE3E60 8006CCC0 00000000 */ nop +/* AE3E60 8006CCC0 00000000 */ nop /* AE3E64 8006CCC4 468021A0 */ cvt.s.w $f6, $f4 /* AE3E68 8006CCC8 46003202 */ mul.s $f8, $f6, $f0 /* AE3E6C 8006CCCC E7A8007C */ swc1 $f8, 0x7c($sp) @@ -108,19 +108,19 @@ glabel func_8006CBAC /* AE3E84 8006CCE4 A7B90070 */ sh $t9, 0x70($sp) /* AE3E88 8006CCE8 84480000 */ lh $t0, ($v0) /* AE3E8C 8006CCEC 44885000 */ mtc1 $t0, $f10 -/* AE3E90 8006CCF0 00000000 */ nop +/* AE3E90 8006CCF0 00000000 */ nop /* AE3E94 8006CCF4 46805420 */ cvt.s.w $f16, $f10 /* AE3E98 8006CCF8 E7B00060 */ swc1 $f16, 0x60($sp) /* AE3E9C 8006CCFC 844B0002 */ lh $t3, 2($v0) /* AE3EA0 8006CD00 448B9000 */ mtc1 $t3, $f18 -/* AE3EA4 8006CD04 00000000 */ nop +/* AE3EA4 8006CD04 00000000 */ nop /* AE3EA8 8006CD08 46809120 */ cvt.s.w $f4, $f18 /* AE3EAC 8006CD0C E7A40064 */ swc1 $f4, 0x64($sp) /* AE3EB0 8006CD10 844A0004 */ lh $t2, 4($v0) /* AE3EB4 8006CD14 448A3000 */ mtc1 $t2, $f6 -/* AE3EB8 8006CD18 00000000 */ nop +/* AE3EB8 8006CD18 00000000 */ nop /* AE3EBC 8006CD1C 46803220 */ cvt.s.w $f8, $f6 -/* AE3EC0 8006CD20 0C0344D0 */ jal func_800D1340 +/* AE3EC0 8006CD20 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* AE3EC4 8006CD24 E7A80068 */ swc1 $f8, 0x68($sp) /* AE3EC8 8006CD28 C7AC0074 */ lwc1 $f12, 0x74($sp) /* AE3ECC 8006CD2C C7AE0078 */ lwc1 $f14, 0x78($sp) @@ -238,7 +238,7 @@ glabel func_8006CBAC /* AE4074 8006CED4 8FA600A0 */ lw $a2, 0xa0($sp) /* AE4078 8006CED8 8FA700A4 */ lw $a3, 0xa4($sp) /* AE407C 8006CEDC 10A10007 */ beq $a1, $at, .L8006CEFC -/* AE4080 8006CEE0 00000000 */ nop +/* AE4080 8006CEE0 00000000 */ nop /* AE4084 8006CEE4 8FA900AC */ lw $t1, 0xac($sp) /* AE4088 8006CEE8 8FAD00B0 */ lw $t5, 0xb0($sp) /* AE408C 8006CEEC AFB00010 */ sw $s0, 0x10($sp) @@ -247,7 +247,7 @@ glabel func_8006CBAC /* AE4098 8006CEF8 AFAD0018 */ sw $t5, 0x18($sp) .L8006CEFC: /* AE409C 8006CEFC 0C034221 */ jal Matrix_Pull -/* AE40A0 8006CF00 00000000 */ nop +/* AE40A0 8006CF00 00000000 */ nop /* AE40A4 8006CF04 8FAE0094 */ lw $t6, 0x94($sp) /* AE40A8 8006CF08 240100FF */ li $at, 255 /* AE40AC 8006CF0C 8FA40098 */ lw $a0, 0x98($sp) @@ -274,5 +274,5 @@ glabel func_8006CBAC /* AE40FC 8006CF5C 8FB00028 */ lw $s0, 0x28($sp) /* AE4100 8006CF60 27BD0098 */ addiu $sp, $sp, 0x98 /* AE4104 8006CF64 03E00008 */ jr $ra -/* AE4108 8006CF68 00000000 */ nop +/* AE4108 8006CF68 00000000 */ nop diff --git a/asm/non_matchings/code/z_player_lib/func_8008F87C.s b/asm/non_matchings/code/z_player_lib/func_8008F87C.s index ee183a3468..d231070cc4 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008F87C.s +++ b/asm/non_matchings/code/z_player_lib/func_8008F87C.s @@ -19,9 +19,9 @@ glabel func_8008F87C /* B06A34 8008F894 AFA700BC */ sw $a3, 0xbc($sp) /* B06A38 8008F898 C4A40054 */ lwc1 $f4, 0x54($a1) /* B06A3C 8008F89C 44803000 */ mtc1 $zero, $f6 -/* B06A40 8008F8A0 00000000 */ nop +/* B06A40 8008F8A0 00000000 */ nop /* B06A44 8008F8A4 4604303E */ c.le.s $f6, $f4 -/* B06A48 8008F8A8 00000000 */ nop +/* B06A48 8008F8A8 00000000 */ nop /* B06A4C 8008F8AC 45020102 */ bc1fl .L8008FCB8 /* B06A50 8008F8B0 8FBF0024 */ lw $ra, 0x24($sp) /* B06A54 8008F8B4 8CAF067C */ lw $t7, 0x67c($a1) @@ -51,7 +51,7 @@ glabel func_8008F87C /* B06AB4 8008F914 0C034213 */ jal Matrix_Push /* B06AB8 8008F918 46062501 */ sub.s $f20, $f4, $f6 /* B06ABC 8008F91C 8FA400BC */ lw $a0, 0xbc($sp) -/* B06AC0 8008F920 0C0344D0 */ jal func_800D1340 +/* B06AC0 8008F920 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B06AC4 8008F924 8FA500C0 */ lw $a1, 0xc0($sp) /* B06AC8 8008F928 3C048012 */ lui $a0, %hi(D_8012602C) # $a0, 0x8012 /* B06ACC 8008F92C 2484602C */ addiu $a0, %lo(D_8012602C) # addiu $a0, $a0, 0x602c @@ -73,7 +73,7 @@ glabel func_8008F87C /* B06B0C 8008F96C 00021040 */ sll $v0, $v0, 1 /* B06B10 8008F970 AFA20038 */ sw $v0, 0x38($sp) /* B06B14 8008F974 01F82021 */ addu $a0, $t7, $t8 -/* B06B18 8008F978 0C0344D0 */ jal func_800D1340 +/* B06B18 8008F978 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B06B1C 8008F97C 03222821 */ addu $a1, $t9, $v0 /* B06B20 8008F980 3C038016 */ lui $v1, %hi(gSaveContext+4) /* B06B24 8008F984 8C63E664 */ lw $v1, %lo(gSaveContext+4)($v1) @@ -94,7 +94,7 @@ glabel func_8008F87C /* B06B60 8008F9C0 0C0346BD */ jal Matrix_MultVec3f /* B06B64 8008F9C4 27A5008C */ addiu $a1, $sp, 0x8c /* B06B68 8008F9C8 0C034221 */ jal Matrix_Pull -/* B06B6C 8008F9CC 00000000 */ nop +/* B06B6C 8008F9CC 00000000 */ nop /* B06B70 8008F9D0 3C014170 */ li $at, 0x41700000 # 0.000000 /* B06B74 8008F9D4 44815000 */ mtc1 $at, $f10 /* B06B78 8008F9D8 C7A80090 */ lwc1 $f8, 0x90($sp) @@ -146,7 +146,7 @@ glabel func_8008F87C /* B06C30 8008FA90 4600A004 */ sqrt.s $f0, $f20 /* B06C34 8008FA94 4480A000 */ mtc1 $zero, $f20 /* B06C38 8008FA98 10000003 */ b .L8008FAA8 -/* B06C3C 8008FA9C 00000000 */ nop +/* B06C3C 8008FA9C 00000000 */ nop /* B06C40 8008FAA0 4600A004 */ sqrt.s $f0, $f20 .L8008FAA4: /* B06C44 8008FAA4 46000506 */ mov.s $f20, $f0 @@ -180,7 +180,7 @@ glabel func_8008F87C /* B06CB0 8008FB10 4600A004 */ sqrt.s $f0, $f20 /* B06CB4 8008FB14 4480A000 */ mtc1 $zero, $f20 /* B06CB8 8008FB18 10000003 */ b .L8008FB28 -/* B06CBC 8008FB1C 00000000 */ nop +/* B06CBC 8008FB1C 00000000 */ nop /* B06CC0 8008FB20 4600A004 */ sqrt.s $f0, $f20 .L8008FB24: /* B06CC4 8008FB24 46000506 */ mov.s $f20, $f0 @@ -215,7 +215,7 @@ glabel func_8008F87C /* B06D34 8008FB94 4600418D */ trunc.w.s $f6, $f8 /* B06D38 8008FB98 460C2202 */ mul.s $f8, $f4, $f12 /* B06D3C 8008FB9C 440E3000 */ mfc1 $t6, $f6 -/* B06D40 8008FBA0 00000000 */ nop +/* B06D40 8008FBA0 00000000 */ nop /* B06D44 8008FBA4 01D94823 */ subu $t1, $t6, $t9 /* B06D48 8008FBA8 00094C00 */ sll $t1, $t1, 0x10 /* B06D4C 8008FBAC 00094C03 */ sra $t1, $t1, 0x10 @@ -293,5 +293,5 @@ glabel func_8008F87C /* B06E58 8008FCB8 D7B40018 */ ldc1 $f20, 0x18($sp) /* B06E5C 8008FCBC 27BD00B0 */ addiu $sp, $sp, 0xb0 /* B06E60 8008FCC0 03E00008 */ jr $ra -/* B06E64 8008FCC4 00000000 */ nop +/* B06E64 8008FCC4 00000000 */ nop diff --git a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s b/asm/non_matchings/code/z_player_lib/func_8008FCC8.s index 79abb7949a..923d4091fb 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s +++ b/asm/non_matchings/code/z_player_lib/func_8008FCC8.s @@ -51,13 +51,13 @@ glabel func_8008FCC8 /* B06EC4 8008FD24 10600003 */ beqz $v1, .L8008FD34 /* B06EC8 8008FD28 30480001 */ andi $t0, $v0, 1 /* B06ECC 8008FD2C 1100000B */ beqz $t0, .L8008FD5C -/* B06ED0 8008FD30 00000000 */ nop +/* B06ED0 8008FD30 00000000 */ nop .L8008FD34: /* B06ED4 8008FD34 C420E90C */ lwc1 $f0, %lo(D_8013E90C)($at) /* B06ED8 8008FD38 C6240000 */ lwc1 $f4, ($s1) /* B06EDC 8008FD3C C6280008 */ lwc1 $f8, 8($s1) /* B06EE0 8008FD40 46002182 */ mul.s $f6, $f4, $f0 -/* B06EE4 8008FD44 00000000 */ nop +/* B06EE4 8008FD44 00000000 */ nop /* B06EE8 8008FD48 46004282 */ mul.s $f10, $f8, $f0 /* B06EEC 8008FD4C E6260000 */ swc1 $f6, ($s1) /* B06EF0 8008FD50 E62A0008 */ swc1 $f10, 8($s1) @@ -84,7 +84,7 @@ glabel func_8008FCC8 /* B06F34 8008FD94 5080009A */ beql $a0, $zero, .L80090000 /* B06F38 8008FD98 00001025 */ move $v0, $zero /* B06F3C 8008FD9C 0C01DE0D */ jal Math_Coss -/* B06F40 8008FDA0 00000000 */ nop +/* B06F40 8008FDA0 00000000 */ nop /* B06F44 8008FDA4 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* B06F48 8008FDA8 44815000 */ mtc1 $at, $f10 /* B06F4C 8008FDAC 3C014348 */ li $at, 0x43480000 # 0.000000 @@ -105,16 +105,16 @@ glabel func_8008FCC8 /* B06F88 8008FDE8 468042A0 */ cvt.s.w $f10, $f8 /* B06F8C 8008FDEC 46105302 */ mul.s $f12, $f10, $f16 /* B06F90 8008FDF0 0C0342DC */ jal Matrix_RotateX -/* B06F94 8008FDF4 00000000 */ nop +/* B06F94 8008FDF4 00000000 */ nop /* B06F98 8008FDF8 8FA20040 */ lw $v0, 0x40($sp) /* B06F9C 8008FDFC 24070001 */ li $a3, 1 /* B06FA0 8008FE00 84440000 */ lh $a0, ($v0) /* B06FA4 8008FE04 84450002 */ lh $a1, 2($v0) -/* B06FA8 8008FE08 0C034421 */ jal Matrix_RotateXYZ +/* B06FA8 8008FE08 0C034421 */ jal Matrix_RotateZYX /* B06FAC 8008FE0C 84460004 */ lh $a2, 4($v0) /* B06FB0 8008FE10 8FA20040 */ lw $v0, 0x40($sp) /* B06FB4 8008FE14 44800000 */ mtc1 $zero, $f0 -/* B06FB8 8008FE18 00000000 */ nop +/* B06FB8 8008FE18 00000000 */ nop /* B06FBC 8008FE1C E6200008 */ swc1 $f0, 8($s1) /* B06FC0 8008FE20 E6200004 */ swc1 $f0, 4($s1) /* B06FC4 8008FE24 E6200000 */ swc1 $f0, ($s1) @@ -168,7 +168,7 @@ glabel func_8008FCC8 /* B07078 8008FED8 46809120 */ cvt.s.w $f4, $f18 /* B0707C 8008FEDC 46062302 */ mul.s $f12, $f4, $f6 /* B07080 8008FEE0 0C034348 */ jal Matrix_RotateY -/* B07084 8008FEE4 00000000 */ nop +/* B07084 8008FEE4 00000000 */ nop /* B07088 8008FEE8 860206BE */ lh $v0, 0x6be($s0) .L8008FEEC: /* B0708C 8008FEEC 5040000A */ beql $v0, $zero, .L8008FF18 @@ -180,7 +180,7 @@ glabel func_8008FCC8 /* B070A4 8008FF04 24050001 */ li $a1, 1 /* B070A8 8008FF08 46105302 */ mul.s $f12, $f10, $f16 /* B070AC 8008FF0C 0C034348 */ jal Matrix_RotateY -/* B070B0 8008FF10 00000000 */ nop +/* B070B0 8008FF10 00000000 */ nop /* B070B4 8008FF14 860206BC */ lh $v0, 0x6bc($s0) .L8008FF18: /* B070B8 8008FF18 5040000A */ beql $v0, $zero, .L8008FF44 @@ -192,7 +192,7 @@ glabel func_8008FCC8 /* B070D0 8008FF30 24050001 */ li $a1, 1 /* B070D4 8008FF34 46062302 */ mul.s $f12, $f4, $f6 /* B070D8 8008FF38 0C0342DC */ jal Matrix_RotateX -/* B070DC 8008FF3C 00000000 */ nop +/* B070DC 8008FF3C 00000000 */ nop /* B070E0 8008FF40 860206C0 */ lh $v0, 0x6c0($s0) .L8008FF44: /* B070E4 8008FF44 5040002E */ beql $v0, $zero, .L80090000 @@ -204,7 +204,7 @@ glabel func_8008FCC8 /* B070FC 8008FF5C 24050001 */ li $a1, 1 /* B07100 8008FF60 46105302 */ mul.s $f12, $f10, $f16 /* B07104 8008FF64 0C0343B5 */ jal Matrix_RotateZ -/* B07108 8008FF68 00000000 */ nop +/* B07108 8008FF68 00000000 */ nop /* B0710C 8008FF6C 10000024 */ b .L80090000 /* B07110 8008FF70 00001025 */ move $v0, $zero .L8008FF74: @@ -284,13 +284,13 @@ glabel func_8008FCC8 /* B07224 80090084 05E10004 */ bgez $t7, .L80090098 /* B07228 80090088 46803220 */ cvt.s.w $f8, $f6 /* B0722C 8009008C 44815000 */ mtc1 $at, $f10 -/* B07230 80090090 00000000 */ nop +/* B07230 80090090 00000000 */ nop /* B07234 80090094 460A4200 */ add.s $f8, $f8, $f10 .L80090098: /* B07238 80090098 4604403E */ c.le.s $f8, $f4 -/* B0723C 8009009C 00000000 */ nop +/* B0723C 8009009C 00000000 */ nop /* B07240 800900A0 45000003 */ bc1f .L800900B0 -/* B07244 800900A4 00000000 */ nop +/* B07244 800900A4 00000000 */ nop /* B07248 800900A8 10000025 */ b .L80090140 /* B0724C 800900AC 24420010 */ addiu $v0, $v0, 0x10 .L800900B0: @@ -314,19 +314,19 @@ glabel func_8008FCC8 .L800900F0: /* B07290 800900F0 3C014000 */ li $at, 0x40000000 # 0.000000 /* B07294 800900F4 15600012 */ bnez $t3, .L80090140 -/* B07298 800900F8 00000000 */ nop +/* B07298 800900F8 00000000 */ nop /* B0729C 800900FC 44818000 */ mtc1 $at, $f16 /* B072A0 80090100 C6120068 */ lwc1 $f18, 0x68($s0) /* B072A4 80090104 4612803C */ c.lt.s $f16, $f18 -/* B072A8 80090108 00000000 */ nop +/* B072A8 80090108 00000000 */ nop /* B072AC 8009010C 4500000C */ bc1f .L80090140 -/* B072B0 80090110 00000000 */ nop +/* B072B0 80090110 00000000 */ nop /* B072B4 80090114 8E0C067C */ lw $t4, 0x67c($s0) /* B072B8 80090118 3C188012 */ lui $t8, %hi(D_80125E18) # $t8, 0x8012 /* B072BC 8009011C 27185E18 */ addiu $t8, %lo(D_80125E18) # addiu $t8, $t8, 0x5e18 /* B072C0 80090120 000C6900 */ sll $t5, $t4, 4 /* B072C4 80090124 05A00006 */ bltz $t5, .L80090140 -/* B072C8 80090128 00000000 */ nop +/* B072C8 80090128 00000000 */ nop /* B072CC 8009012C 8CAE0004 */ lw $t6, 4($a1) /* B072D0 80090130 24190001 */ li $t9, 1 /* B072D4 80090134 AC990000 */ sw $t9, ($a0) @@ -362,9 +362,9 @@ glabel func_8008FCC8 /* B07340 800901A0 44813000 */ mtc1 $at, $f6 /* B07344 800901A4 C60A0068 */ lwc1 $f10, 0x68($s0) /* B07348 800901A8 460A303C */ c.lt.s $f6, $f10 -/* B0734C 800901AC 00000000 */ nop +/* B0734C 800901AC 00000000 */ nop /* B07350 800901B0 4500000D */ bc1f .L800901E8 -/* B07354 800901B4 00000000 */ nop +/* B07354 800901B4 00000000 */ nop /* B07358 800901B8 8E18067C */ lw $t8, 0x67c($s0) /* B0735C 800901BC 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 /* B07360 800901C0 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 @@ -394,7 +394,7 @@ glabel func_8008FCC8 /* B073B8 80090218 10410003 */ beq $v0, $at, .L80090228 /* B073BC 8009021C 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 /* B073C0 80090220 14820010 */ bne $a0, $v0, .L80090264 -/* B073C4 80090224 00000000 */ nop +/* B073C4 80090224 00000000 */ nop .L80090228: /* B073C8 80090228 8202014E */ lb $v0, 0x14e($s0) /* B073CC 8009022C 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 @@ -404,11 +404,11 @@ glabel func_8008FCC8 /* B073DC 8009023C 13200018 */ beqz $t9, .L800902A0 /* B073E0 80090240 28410002 */ slti $at, $v0, 2 /* B073E4 80090244 10200016 */ beqz $at, .L800902A0 -/* B073E8 80090248 00000000 */ nop +/* B073E8 80090248 00000000 */ nop /* B073EC 8009024C 90A80068 */ lbu $t0, 0x68($a1) /* B073F0 80090250 2401003B */ li $at, 59 /* B073F4 80090254 11010012 */ beq $t0, $at, .L800902A0 -/* B073F8 80090258 00000000 */ nop +/* B073F8 80090258 00000000 */ nop /* B073FC 8009025C 10000010 */ b .L800902A0 /* B07400 80090260 24630040 */ addiu $v1, $v1, 0x40 .L80090264: @@ -416,16 +416,16 @@ glabel func_8008FCC8 /* B07408 80090268 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 /* B0740C 8009026C 8CA90004 */ lw $t1, 4($a1) /* B07410 80090270 1120000B */ beqz $t1, .L800902A0 -/* B07414 80090274 00000000 */ nop +/* B07414 80090274 00000000 */ nop /* B07418 80090278 10E20003 */ beq $a3, $v0, .L80090288 /* B0741C 8009027C 24010011 */ li $at, 17 /* B07420 80090280 14410007 */ bne $v0, $at, .L800902A0 -/* B07424 80090284 00000000 */ nop +/* B07424 80090284 00000000 */ nop .L80090288: /* B07428 80090288 90AA0068 */ lbu $t2, 0x68($a1) /* B0742C 8009028C 2401003B */ li $at, 59 /* B07430 80090290 11410003 */ beq $t2, $at, .L800902A0 -/* B07434 80090294 00000000 */ nop +/* B07434 80090294 00000000 */ nop /* B07438 80090298 3C038012 */ lui $v1, %hi(D_80125D68) # $v1, 0x8012 /* B0743C 8009029C 24635D68 */ addiu $v1, %lo(D_80125D68) # addiu $v1, $v1, 0x5d68 .L800902A0: diff --git a/asm/non_matchings/code/z_player_lib/func_800907E4.s b/asm/non_matchings/code/z_player_lib/func_800907E4.s index e1168f40b0..f8dea9f2f4 100644 --- a/asm/non_matchings/code/z_player_lib/func_800907E4.s +++ b/asm/non_matchings/code/z_player_lib/func_800907E4.s @@ -33,7 +33,7 @@ glabel func_800907E4 /* B079BC 8009081C E7A4004C */ swc1 $f4, 0x4c($sp) .L80090820: /* B079C0 80090820 44813000 */ mtc1 $at, $f6 -/* B079C4 80090824 00000000 */ nop +/* B079C4 80090824 00000000 */ nop /* B079C8 80090828 E7A6004C */ swc1 $f6, 0x4c($sp) .L8009082C: /* B079CC 8009082C 8FAF0050 */ lw $t7, 0x50($sp) @@ -93,7 +93,7 @@ glabel func_800907E4 /* B07AA4 80090904 46062200 */ add.s $f8, $f4, $f6 /* B07AA8 80090908 44064000 */ mfc1 $a2, $f8 /* B07AAC 8009090C 0C034261 */ jal Matrix_Translate -/* B07AB0 80090910 00000000 */ nop +/* B07AB0 80090910 00000000 */ nop /* B07AB4 80090914 8FAF0050 */ lw $t7, 0x50($sp) /* B07AB8 80090918 3C050001 */ lui $a1, 1 /* B07ABC 8009091C 00002025 */ move $a0, $zero @@ -108,7 +108,7 @@ glabel func_800907E4 /* B07AE0 80090940 00A12821 */ addu $a1, $a1, $at /* B07AE4 80090944 000528C0 */ sll $a1, $a1, 3 /* B07AE8 80090948 00052C00 */ sll $a1, $a1, 0x10 -/* B07AEC 8009094C 0C034421 */ jal Matrix_RotateXYZ +/* B07AEC 8009094C 0C034421 */ jal Matrix_RotateZYX /* B07AF0 80090950 00052C03 */ sra $a1, $a1, 0x10 /* B07AF4 80090954 3C018014 */ lui $at, %hi(D_8013E930) /* B07AF8 80090958 C42CE930 */ lwc1 $f12, %lo(D_8013E930)($at) @@ -133,5 +133,5 @@ glabel func_800907E4 /* B07B44 800909A4 8FB00018 */ lw $s0, 0x18($sp) /* B07B48 800909A8 27BD0050 */ addiu $sp, $sp, 0x50 /* B07B4C 800909AC 03E00008 */ jr $ra -/* B07B50 800909B0 00000000 */ nop +/* B07B50 800909B0 00000000 */ nop diff --git a/asm/non_matchings/code/z_player_lib/func_80090D20.s b/asm/non_matchings/code/z_player_lib/func_80090D20.s index 53aed4536b..bfaf2a2470 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090D20.s +++ b/asm/non_matchings/code/z_player_lib/func_80090D20.s @@ -101,9 +101,9 @@ glabel func_80090D20 /* B07F4C 80090DAC 44803000 */ mtc1 $zero, $f6 /* B07F50 80090DB0 3C018014 */ lui $at, %hi(D_8013E940) /* B07F54 80090DB4 4604303E */ c.le.s $f6, $f4 -/* B07F58 80090DB8 00000000 */ nop +/* B07F58 80090DB8 00000000 */ nop /* B07F5C 80090DBC 45000014 */ bc1f .L80090E10 -/* B07F60 80090DC0 00000000 */ nop +/* B07F60 80090DC0 00000000 */ nop /* B07F64 80090DC4 C608085C */ lwc1 $f8, 0x85c($s0) /* B07F68 80090DC8 C42AE940 */ lwc1 $f10, %lo(D_8013E940)($at) /* B07F6C 80090DCC 3C018012 */ lui $at, %hi(D_80126080) @@ -120,7 +120,7 @@ glabel func_80090D20 /* B07F98 80090DF8 0C0241B5 */ jal func_800906D4 /* B07F9C 80090DFC 8FA40190 */ lw $a0, 0x190($sp) /* B07FA0 80090E00 10000003 */ b .L80090E10 -/* B07FA4 80090E04 00000000 */ nop +/* B07FA4 80090E04 00000000 */ nop .L80090E08: /* B07FA8 80090E08 0C01DF90 */ jal Math_Vec3f_Copy /* B07FAC 80090E0C 00C02825 */ move $a1, $a2 @@ -136,7 +136,7 @@ glabel func_80090D20 /* B07FD0 80090E30 24048000 */ li $a0, -32768 /* B07FD4 80090E34 00002825 */ move $a1, $zero /* B07FD8 80090E38 24064000 */ li $a2, 16384 -/* B07FDC 80090E3C 0C034421 */ jal Matrix_RotateXYZ +/* B07FDC 80090E3C 0C034421 */ jal Matrix_RotateZYX /* B07FE0 80090E40 24070001 */ li $a3, 1 /* B07FE4 80090E44 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* B07FE8 80090E48 44816000 */ mtc1 $at, $f12 @@ -144,7 +144,7 @@ glabel func_80090D20 /* B07FF0 80090E50 24070001 */ li $a3, 1 /* B07FF4 80090E54 44066000 */ mfc1 $a2, $f12 /* B07FF8 80090E58 0C0342A3 */ jal Matrix_Scale -/* B07FFC 80090E5C 00000000 */ nop +/* B07FFC 80090E5C 00000000 */ nop /* B08000 80090E60 8FA70120 */ lw $a3, 0x120($sp) /* B08004 80090E64 3C0CDA38 */ lui $t4, (0xDA380003 >> 16) # lui $t4, 0xda38 /* B08008 80090E68 358C0003 */ ori $t4, (0xDA380003 & 0xFFFF) # ori $t4, $t4, 3 @@ -184,7 +184,7 @@ glabel func_80090D20 /* B0808C 80090EEC 44809000 */ mtc1 $zero, $f18 /* B08090 80090EF0 8FAD0198 */ lw $t5, 0x198($sp) /* B08094 80090EF4 4600903E */ c.le.s $f18, $f0 -/* B08098 80090EF8 00000000 */ nop +/* B08098 80090EF8 00000000 */ nop /* B0809C 80090EFC 4502001E */ bc1fl .L80090F78 /* B080A0 80090F00 8DAF0000 */ lw $t7, ($t5) /* B080A4 80090F04 820B0843 */ lb $t3, 0x843($s0) @@ -299,9 +299,9 @@ glabel func_80090D20 .L800910AC: /* B0824C 800910AC 44804000 */ mtc1 $zero, $f8 .L800910B0: -/* B08250 800910B0 00000000 */ nop +/* B08250 800910B0 00000000 */ nop /* B08254 800910B4 4600403E */ c.le.s $f8, $f0 -/* B08258 800910B8 00000000 */ nop +/* B08258 800910B8 00000000 */ nop /* B0825C 800910BC 4502019A */ bc1fl .L80091728 /* B08260 800910C0 8FBF0024 */ lw $ra, 0x24($sp) /* B08264 800910C4 0C023C41 */ jal func_8008F104 @@ -310,7 +310,7 @@ glabel func_80090D20 /* B08270 800910D0 260409E0 */ addiu $a0, $s0, 0x9e0 /* B08274 800910D4 8E0303AC */ lw $v1, 0x3ac($s0) /* B08278 800910D8 1060003C */ beqz $v1, .L800911CC -/* B0827C 800910DC 00000000 */ nop +/* B0827C 800910DC 00000000 */ nop /* B08280 800910E0 8E02067C */ lw $v0, 0x67c($s0) /* B08284 800910E4 3C048012 */ lui $a0, %hi(D_80126128) # $a0, 0x8012 /* B08288 800910E8 24846128 */ addiu $a0, %lo(D_80126128) # addiu $a0, $a0, 0x6128 @@ -323,7 +323,7 @@ glabel func_80090D20 /* B082A4 80091104 240469E8 */ li $a0, 27112 /* B082A8 80091108 2405A8F8 */ li $a1, -22280 /* B082AC 8009110C 2406458E */ li $a2, 17806 -/* B082B0 80091110 0C034421 */ jal Matrix_RotateXYZ +/* B082B0 80091110 0C034421 */ jal Matrix_RotateZYX /* B082B4 80091114 24070001 */ li $a3, 1 /* B082B8 80091118 0C034236 */ jal Matrix_Get /* B082BC 8009111C 27A4014C */ addiu $a0, $sp, 0x14c @@ -419,7 +419,7 @@ glabel func_80090D20 /* B0840C 8009126C 0C031AB1 */ jal func_800C6AC4 /* B08410 80091270 AFA500AC */ sw $a1, 0xac($sp) /* B08414 80091274 0C034213 */ jal Matrix_Push -/* B08418 80091278 00000000 */ nop +/* B08418 80091278 00000000 */ nop /* B0841C 8009127C 8FA200B0 */ lw $v0, 0xb0($sp) /* B08420 80091280 24070001 */ li $a3, 1 /* B08424 80091284 C44C0004 */ lwc1 $f12, 4($v0) @@ -464,7 +464,7 @@ glabel func_80090D20 /* B084BC 8009131C E6060858 */ swc1 $f6, 0x858($s0) /* B084C0 80091320 C6080858 */ lwc1 $f8, 0x858($s0) /* B084C4 80091324 4608603C */ c.lt.s $f12, $f8 -/* B084C8 80091328 00000000 */ nop +/* B084C8 80091328 00000000 */ nop /* B084CC 8009132C 45020003 */ bc1fl .L8009133C /* B084D0 80091330 3C01BF00 */ lui $at, 0xbf00 /* B084D4 80091334 E60C0858 */ swc1 $f12, 0x858($s0) @@ -472,7 +472,7 @@ glabel func_80090D20 /* B084D8 80091338 3C01BF00 */ li $at, 0xBF000000 # 0.000000 .L8009133C: /* B084DC 8009133C 44815000 */ mtc1 $at, $f10 -/* B084E0 80091340 00000000 */ nop +/* B084E0 80091340 00000000 */ nop /* B084E4 80091344 E60A085C */ swc1 $f10, 0x85c($s0) /* B084E8 80091348 3C013F80 */ li $at, 0x3F800000 # 0.000000 .L8009134C: @@ -481,7 +481,7 @@ glabel func_80090D20 /* B084F4 80091354 24070001 */ li $a3, 1 /* B084F8 80091358 44066000 */ mfc1 $a2, $f12 /* B084FC 8009135C 0C0342A3 */ jal Matrix_Scale -/* B08500 80091360 00000000 */ nop +/* B08500 80091360 00000000 */ nop /* B08504 80091364 3C0D8016 */ lui $t5, %hi(gSaveContext+4) # $t5, 0x8016 /* B08508 80091368 8DADE664 */ lw $t5, %lo(gSaveContext+4)($t5) /* B0850C 8009136C 3C018014 */ lui $at, %hi(D_8013E954) @@ -492,7 +492,7 @@ glabel func_80090D20 /* B08520 80091380 24050001 */ li $a1, 1 /* B08524 80091384 46128302 */ mul.s $f12, $f16, $f18 /* B08528 80091388 0C0343B5 */ jal Matrix_RotateZ -/* B0852C 8009138C 00000000 */ nop +/* B0852C 8009138C 00000000 */ nop /* B08530 80091390 8FA700AC */ lw $a3, 0xac($sp) .L80091394: /* B08534 80091394 3C18DA38 */ lui $t8, (0xDA380003 >> 16) # lui $t8, 0xda38 @@ -534,7 +534,7 @@ glabel func_80090D20 /* B085C0 80091420 44802000 */ mtc1 $zero, $f4 /* B085C4 80091424 2401000A */ li $at, 10 /* B085C8 80091428 4600203E */ c.le.s $f4, $f0 -/* B085CC 8009142C 00000000 */ nop +/* B085CC 8009142C 00000000 */ nop /* B085D0 80091430 4502000D */ bc1fl .L80091468 /* B085D4 80091434 44803000 */ mtc1 $zero, $f6 /* B085D8 80091438 5441000B */ bnel $v0, $at, .L80091468 @@ -551,9 +551,9 @@ glabel func_80090D20 .L80091464: /* B08604 80091464 44803000 */ mtc1 $zero, $f6 .L80091468: -/* B08608 80091468 00000000 */ nop +/* B08608 80091468 00000000 */ nop /* B0860C 8009146C 4600303E */ c.le.s $f6, $f0 -/* B08610 80091470 00000000 */ nop +/* B08610 80091470 00000000 */ nop /* B08614 80091474 450200AC */ bc1fl .L80091728 /* B08618 80091478 8FBF0024 */ lw $ra, 0x24($sp) /* B0861C 8009147C 82020151 */ lb $v0, 0x151($s0) @@ -577,7 +577,7 @@ glabel func_80090D20 /* B08660 800914C0 00002025 */ move $a0, $zero /* B08664 800914C4 2405C000 */ li $a1, -16384 /* B08668 800914C8 2406C000 */ li $a2, -16384 -/* B0866C 800914CC 0C034421 */ jal Matrix_RotateXYZ +/* B0866C 800914CC 0C034421 */ jal Matrix_RotateZYX /* B08670 800914D0 24070001 */ li $a3, 1 /* B08674 800914D4 0C034236 */ jal Matrix_Get /* B08678 800914D8 27A40044 */ addiu $a0, $sp, 0x44 @@ -683,7 +683,7 @@ glabel func_80090D20 /* B087E8 80091648 8FAC0194 */ lw $t4, 0x194($sp) /* B087EC 8009164C 24010014 */ li $at, 20 /* B087F0 80091650 4608503E */ c.le.s $f10, $f8 -/* B087F4 80091654 00000000 */ nop +/* B087F4 80091654 00000000 */ nop /* B087F8 80091658 45020033 */ bc1fl .L80091728 /* B087FC 8009165C 8FBF0024 */ lw $ra, 0x24($sp) /* B08800 80091660 15810019 */ bne $t4, $at, .L800916C8 @@ -707,7 +707,7 @@ glabel func_80090D20 /* B08844 800916A4 3C048012 */ lui $a0, %hi(D_801261CC) # $a0, 0x8012 /* B08848 800916A8 3C058012 */ lui $a1, %hi(D_801261D8) # $a1, 0x8012 /* B0884C 800916AC 24A561D8 */ addiu $a1, %lo(D_801261D8) # addiu $a1, $a1, 0x61d8 -/* B08850 800916B0 0C0344D0 */ jal func_800D1340 +/* B08850 800916B0 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B08854 800916B4 248461CC */ addiu $a0, %lo(D_801261CC) # addiu $a0, $a0, 0x61cc /* B08858 800916B8 0C034236 */ jal Matrix_Get /* B0885C 800916BC 26040A20 */ addiu $a0, $s0, 0xa20 @@ -744,5 +744,5 @@ glabel func_80090D20 /* B088C8 80091728 8FB00020 */ lw $s0, 0x20($sp) /* B088CC 8009172C 27BD0190 */ addiu $sp, $sp, 0x190 /* B088D0 80091730 03E00008 */ jr $ra -/* B088D4 80091734 00000000 */ nop +/* B088D4 80091734 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s b/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s index caf6fe1af1..ec8efef1c7 100644 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s +++ b/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s @@ -54,7 +54,7 @@ glabel SkelAnime_Draw /* B187C8 800A1628 0C031AB1 */ jal func_800C6AC4 /* B187CC 800A162C AFA50044 */ sw $a1, 0x44($sp) /* B187D0 800A1630 0C034213 */ jal Matrix_Push -/* B187D4 800A1634 00000000 */ nop +/* B187D4 800A1634 00000000 */ nop /* B187D8 800A1638 8FB8006C */ lw $t8, 0x6c($sp) /* B187DC 800A163C 3C0B8016 */ lui $t3, %hi(gSegments) /* B187E0 800A1640 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff @@ -82,12 +82,12 @@ glabel SkelAnime_Draw /* B18838 800A1698 E7A60050 */ swc1 $f6, 0x50($sp) /* B1883C 800A169C 846F0002 */ lh $t7, 2($v1) /* B18840 800A16A0 448F4000 */ mtc1 $t7, $f8 -/* B18844 800A16A4 00000000 */ nop +/* B18844 800A16A4 00000000 */ nop /* B18848 800A16A8 468042A0 */ cvt.s.w $f10, $f8 /* B1884C 800A16AC E7AA0054 */ swc1 $f10, 0x54($sp) /* B18850 800A16B0 84780004 */ lh $t8, 4($v1) /* B18854 800A16B4 44988000 */ mtc1 $t8, $f16 -/* B18858 800A16B8 00000000 */ nop +/* B18858 800A16B8 00000000 */ nop /* B1885C 800A16BC 468084A0 */ cvt.s.w $f18, $f16 /* B18860 800A16C0 E7B20058 */ swc1 $f18, 0x58($sp) /* B18864 800A16C4 886A0006 */ lwl $t2, 6($v1) @@ -108,7 +108,7 @@ glabel SkelAnime_Draw /* B188A0 800A1700 1440001E */ bnez $v0, .L800A177C .L800A1704: /* B188A4 800A1704 27A40050 */ addiu $a0, $sp, 0x50 -/* B188A8 800A1708 0C0344D0 */ jal func_800D1340 +/* B188A8 800A1708 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B188AC 800A170C 27A50048 */ addiu $a1, $sp, 0x48 /* B188B0 800A1710 8FAF005C */ lw $t7, 0x5c($sp) /* B188B4 800A1714 8FA70044 */ lw $a3, 0x44($sp) @@ -165,7 +165,7 @@ glabel SkelAnime_Draw /* B18974 800A17D4 AFB80018 */ sw $t8, 0x18($sp) .L800A17D8: /* B18978 800A17D8 0C034221 */ jal Matrix_Pull -/* B1897C 800A17DC 00000000 */ nop +/* B1897C 800A17DC 00000000 */ nop /* B18980 800A17E0 8FA80068 */ lw $t0, 0x68($sp) /* B18984 800A17E4 3C068014 */ lui $a2, %hi(D_80140158) # $a2, 0x8014 /* B18988 800A17E8 24C60158 */ addiu $a2, %lo(D_80140158) # addiu $a2, $a2, 0x158 @@ -177,5 +177,5 @@ glabel SkelAnime_Draw .L800A1800: /* B189A0 800A1800 27BD0068 */ addiu $sp, $sp, 0x68 /* B189A4 800A1804 03E00008 */ jr $ra -/* B189A8 800A1808 00000000 */ nop +/* B189A8 800A1808 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A08A0.s b/asm/non_matchings/code/z_skelanime/func_800A08A0.s index f2e4b7ae6f..51ce612696 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A08A0.s +++ b/asm/non_matchings/code/z_skelanime/func_800A08A0.s @@ -27,7 +27,7 @@ glabel func_800A08A0 /* B17A6C 800A08CC 0C031AB1 */ jal func_800C6AC4 /* B17A70 800A08D0 AFA50048 */ sw $a1, 0x48($sp) /* B17A74 800A08D4 0C034213 */ jal Matrix_Push -/* B17A78 800A08D8 00000000 */ nop +/* B17A78 800A08D8 00000000 */ nop /* B17A7C 800A08DC 8FB8006C */ lw $t8, 0x6c($sp) /* B17A80 800A08E0 8FAF0070 */ lw $t7, 0x70($sp) /* B17A84 800A08E4 3C0E8016 */ lui $t6, %hi(gSegments) @@ -73,12 +73,12 @@ glabel func_800A08A0 /* B17B24 800A0984 E7A60054 */ swc1 $f6, 0x54($sp) /* B17B28 800A0988 85180002 */ lh $t8, 2($t0) /* B17B2C 800A098C 44984000 */ mtc1 $t8, $f8 -/* B17B30 800A0990 00000000 */ nop +/* B17B30 800A0990 00000000 */ nop /* B17B34 800A0994 468042A0 */ cvt.s.w $f10, $f8 /* B17B38 800A0998 E7AA0058 */ swc1 $f10, 0x58($sp) /* B17B3C 800A099C 850F0004 */ lh $t7, 4($t0) /* B17B40 800A09A0 448F8000 */ mtc1 $t7, $f16 -/* B17B44 800A09A4 00000000 */ nop +/* B17B44 800A09A4 00000000 */ nop /* B17B48 800A09A8 468084A0 */ cvt.s.w $f18, $f16 /* B17B4C 800A09AC E7B2005C */ swc1 $f18, 0x5c($sp) /* B17B50 800A09B0 8F2C0008 */ lw $t4, 8($t9) @@ -94,7 +94,7 @@ glabel func_800A08A0 .L800A09D8: /* B17B78 800A09D8 27A40054 */ addiu $a0, $sp, 0x54 /* B17B7C 800A09DC 27A5004C */ addiu $a1, $sp, 0x4c -/* B17B80 800A09E0 0C0344D0 */ jal func_800D1340 +/* B17B80 800A09E0 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B17B84 800A09E4 AFA80064 */ sw $t0, 0x64($sp) /* B17B88 800A09E8 8FB80060 */ lw $t8, 0x60($sp) /* B17B8C 800A09EC 8FA80064 */ lw $t0, 0x64($sp) @@ -185,5 +185,5 @@ glabel func_800A08A0 /* B17CD0 800A0B30 8FBF0024 */ lw $ra, 0x24($sp) /* B17CD4 800A0B34 27BD0068 */ addiu $sp, $sp, 0x68 /* B17CD8 800A0B38 03E00008 */ jr $ra -/* B17CDC 800A0B3C 00000000 */ nop +/* B17CDC 800A0B3C 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A0B40.s b/asm/non_matchings/code/z_skelanime/func_800A0B40.s index 54889d1b72..afc154d86e 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A0B40.s +++ b/asm/non_matchings/code/z_skelanime/func_800A0B40.s @@ -54,7 +54,7 @@ glabel func_800A0B40 /* B17D40 800A0BA0 0C031AB1 */ jal func_800C6AC4 /* B17D44 800A0BA4 AFA50044 */ sw $a1, 0x44($sp) /* B17D48 800A0BA8 0C034213 */ jal Matrix_Push -/* B17D4C 800A0BAC 00000000 */ nop +/* B17D4C 800A0BAC 00000000 */ nop /* B17D50 800A0BB0 8FB8006C */ lw $t8, 0x6c($sp) /* B17D54 800A0BB4 3C0B8016 */ lui $t3, %hi(gSegments) /* B17D58 800A0BB8 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff @@ -81,7 +81,7 @@ glabel func_800A0B40 /* B17DAC 800A0C0C E7A60050 */ swc1 $f6, 0x50($sp) /* B17DB0 800A0C10 846F0002 */ lh $t7, 2($v1) /* B17DB4 800A0C14 448F4000 */ mtc1 $t7, $f8 -/* B17DB8 800A0C18 00000000 */ nop +/* B17DB8 800A0C18 00000000 */ nop /* B17DBC 800A0C1C 468042A0 */ cvt.s.w $f10, $f8 /* B17DC0 800A0C20 E7AA0054 */ swc1 $f10, 0x54($sp) /* B17DC4 800A0C24 84780004 */ lh $t8, 4($v1) @@ -110,7 +110,7 @@ glabel func_800A0B40 /* B17E20 800A0C80 1440001E */ bnez $v0, .L800A0CFC .L800A0C84: /* B17E24 800A0C84 27A40050 */ addiu $a0, $sp, 0x50 -/* B17E28 800A0C88 0C0344D0 */ jal func_800D1340 +/* B17E28 800A0C88 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B17E2C 800A0C8C 27A50048 */ addiu $a1, $sp, 0x48 /* B17E30 800A0C90 8FA9005C */ lw $t1, 0x5c($sp) /* B17E34 800A0C94 8FA70044 */ lw $a3, 0x44($sp) @@ -169,7 +169,7 @@ glabel func_800A0B40 /* B17EFC 800A0D5C AFAB001C */ sw $t3, 0x1c($sp) .L800A0D60: /* B17F00 800A0D60 0C034221 */ jal Matrix_Pull -/* B17F04 800A0D64 00000000 */ nop +/* B17F04 800A0D64 00000000 */ nop /* B17F08 800A0D68 8FB90068 */ lw $t9, 0x68($sp) /* B17F0C 800A0D6C 3C068014 */ lui $a2, %hi(D_8013FFE4) # $a2, 0x8014 /* B17F10 800A0D70 24C6FFE4 */ addiu $a2, %lo(D_8013FFE4) # addiu $a2, $a2, -0x1c @@ -181,5 +181,5 @@ glabel func_800A0B40 .L800A0D88: /* B17F28 800A0D88 27BD0068 */ addiu $sp, $sp, 0x68 /* B17F2C 800A0D8C 03E00008 */ jr $ra -/* B17F30 800A0D90 00000000 */ nop +/* B17F30 800A0D90 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A0D94.s b/asm/non_matchings/code/z_skelanime/func_800A0D94.s index eb10592b7e..a2a64b69d2 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A0D94.s +++ b/asm/non_matchings/code/z_skelanime/func_800A0D94.s @@ -69,12 +69,12 @@ glabel func_800A0D94 /* B17FF8 800A0E58 E7A60058 */ swc1 $f6, 0x58($sp) /* B17FFC 800A0E5C 846F0002 */ lh $t7, 2($v1) /* B18000 800A0E60 448F4000 */ mtc1 $t7, $f8 -/* B18004 800A0E64 00000000 */ nop +/* B18004 800A0E64 00000000 */ nop /* B18008 800A0E68 468042A0 */ cvt.s.w $f10, $f8 /* B1800C 800A0E6C E7AA005C */ swc1 $f10, 0x5c($sp) /* B18010 800A0E70 846E0004 */ lh $t6, 4($v1) /* B18014 800A0E74 448E8000 */ mtc1 $t6, $f16 -/* B18018 800A0E78 00000000 */ nop +/* B18018 800A0E78 00000000 */ nop /* B1801C 800A0E7C 468084A0 */ cvt.s.w $f18, $f16 /* B18020 800A0E80 E7B20060 */ swc1 $f18, 0x60($sp) /* B18024 800A0E84 8F0B0008 */ lw $t3, 8($t8) @@ -90,7 +90,7 @@ glabel func_800A0D94 /* B1804C 800A0EAC 1440003C */ bnez $v0, .L800A0FA0 .L800A0EB0: /* B18050 800A0EB0 27A40058 */ addiu $a0, $sp, 0x58 -/* B18054 800A0EB4 0C0344D0 */ jal func_800D1340 +/* B18054 800A0EB4 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B18058 800A0EB8 27A50050 */ addiu $a1, $sp, 0x50 /* B1805C 800A0EBC 8FAF0068 */ lw $t7, 0x68($sp) /* B18060 800A0EC0 8FAE0090 */ lw $t6, 0x90($sp) @@ -181,7 +181,7 @@ glabel func_800A0D94 /* B181A8 800A1008 AFAF0020 */ sw $t7, 0x20($sp) .L800A100C: /* B181AC 800A100C 0C034221 */ jal Matrix_Pull -/* B181B0 800A1010 00000000 */ nop +/* B181B0 800A1010 00000000 */ nop /* B181B4 800A1014 8FAD006C */ lw $t5, 0x6c($sp) /* B181B8 800A1018 240100FF */ li $at, 255 /* B181BC 800A101C 8FA40070 */ lw $a0, 0x70($sp) @@ -204,5 +204,5 @@ glabel func_800A0D94 /* B181FC 800A105C 8FBF002C */ lw $ra, 0x2c($sp) /* B18200 800A1060 27BD0070 */ addiu $sp, $sp, 0x70 /* B18204 800A1064 03E00008 */ jr $ra -/* B18208 800A1068 00000000 */ nop +/* B18208 800A1068 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A106C.s b/asm/non_matchings/code/z_skelanime/func_800A106C.s index 17d1a117f3..5566773573 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A106C.s +++ b/asm/non_matchings/code/z_skelanime/func_800A106C.s @@ -99,12 +99,12 @@ glabel func_800A106C /* B18310 800A1170 E7A60064 */ swc1 $f6, 0x64($sp) /* B18314 800A1174 846B0002 */ lh $t3, 2($v1) /* B18318 800A1178 448B4000 */ mtc1 $t3, $f8 -/* B1831C 800A117C 00000000 */ nop +/* B1831C 800A117C 00000000 */ nop /* B18320 800A1180 468042A0 */ cvt.s.w $f10, $f8 /* B18324 800A1184 E7AA0068 */ swc1 $f10, 0x68($sp) /* B18328 800A1188 846D0004 */ lh $t5, 4($v1) /* B1832C 800A118C 448D8000 */ mtc1 $t5, $f16 -/* B18330 800A1190 00000000 */ nop +/* B18330 800A1190 00000000 */ nop /* B18334 800A1194 468084A0 */ cvt.s.w $f18, $f16 /* B18338 800A1198 E7B2006C */ swc1 $f18, 0x6c($sp) /* B1833C 800A119C 886C0006 */ lwl $t4, 6($v1) @@ -133,7 +133,7 @@ glabel func_800A106C .L800A11F8: /* B18398 800A11F8 27A40064 */ addiu $a0, $sp, 0x64 /* B1839C 800A11FC 27A5005C */ addiu $a1, $sp, 0x5c -/* B183A0 800A1200 0C0344D0 */ jal func_800D1340 +/* B183A0 800A1200 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B183A4 800A1204 AFA80054 */ sw $t0, 0x54($sp) /* B183A8 800A1208 8FAC0074 */ lw $t4, 0x74($sp) /* B183AC 800A120C 8FA80054 */ lw $t0, 0x54($sp) @@ -206,7 +206,7 @@ glabel func_800A106C /* B184AC 800A130C AFAF001C */ sw $t7, 0x1c($sp) .L800A1310: /* B184B0 800A1310 0C034221 */ jal Matrix_Pull -/* B184B4 800A1314 00000000 */ nop +/* B184B4 800A1314 00000000 */ nop /* B184B8 800A1318 8FAC0080 */ lw $t4, 0x80($sp) /* B184BC 800A131C 3C068014 */ lui $a2, %hi(D_801400B4) # $a2, 0x8014 /* B184C0 800A1320 24C600B4 */ addiu $a2, %lo(D_801400B4) # addiu $a2, $a2, 0xb4 @@ -218,5 +218,5 @@ glabel func_800A106C .L800A1338: /* B184D8 800A1338 27BD0080 */ addiu $sp, $sp, 0x80 /* B184DC 800A133C 03E00008 */ jr $ra -/* B184E0 800A1340 00000000 */ nop +/* B184E0 800A1340 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A1344.s b/asm/non_matchings/code/z_skelanime/func_800A1344.s index 9bfe4a4cc0..c297f75a50 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A1344.s +++ b/asm/non_matchings/code/z_skelanime/func_800A1344.s @@ -27,7 +27,7 @@ glabel func_800A1344 /* B18510 800A1370 0C031AB1 */ jal func_800C6AC4 /* B18514 800A1374 AFA50048 */ sw $a1, 0x48($sp) /* B18518 800A1378 0C034213 */ jal Matrix_Push -/* B1851C 800A137C 00000000 */ nop +/* B1851C 800A137C 00000000 */ nop /* B18520 800A1380 8FB8006C */ lw $t8, 0x6c($sp) /* B18524 800A1384 8FAF0070 */ lw $t7, 0x70($sp) /* B18528 800A1388 3C0E8016 */ lui $t6, %hi(gSegments) @@ -70,12 +70,12 @@ glabel func_800A1344 /* B185BC 800A141C E7A60054 */ swc1 $f6, 0x54($sp) /* B185C0 800A1420 85180002 */ lh $t8, 2($t0) /* B185C4 800A1424 44984000 */ mtc1 $t8, $f8 -/* B185C8 800A1428 00000000 */ nop +/* B185C8 800A1428 00000000 */ nop /* B185CC 800A142C 468042A0 */ cvt.s.w $f10, $f8 /* B185D0 800A1430 E7AA0058 */ swc1 $f10, 0x58($sp) /* B185D4 800A1434 850F0004 */ lh $t7, 4($t0) /* B185D8 800A1438 448F8000 */ mtc1 $t7, $f16 -/* B185DC 800A143C 00000000 */ nop +/* B185DC 800A143C 00000000 */ nop /* B185E0 800A1440 468084A0 */ cvt.s.w $f18, $f16 /* B185E4 800A1444 E7B2005C */ swc1 $f18, 0x5c($sp) /* B185E8 800A1448 8D090008 */ lw $t1, 8($t0) @@ -91,7 +91,7 @@ glabel func_800A1344 .L800A1470: /* B18610 800A1470 27A40054 */ addiu $a0, $sp, 0x54 /* B18614 800A1474 27A5004C */ addiu $a1, $sp, 0x4c -/* B18618 800A1478 0C0344D0 */ jal func_800D1340 +/* B18618 800A1478 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B1861C 800A147C AFA80064 */ sw $t0, 0x64($sp) /* B18620 800A1480 8FAD0060 */ lw $t5, 0x60($sp) /* B18624 800A1484 8FA80064 */ lw $t0, 0x64($sp) @@ -178,5 +178,5 @@ glabel func_800A1344 /* B18758 800A15B8 8FBF0024 */ lw $ra, 0x24($sp) /* B1875C 800A15BC 27BD0068 */ addiu $sp, $sp, 0x68 /* B18760 800A15C0 03E00008 */ jr $ra -/* B18764 800A15C4 00000000 */ nop +/* B18764 800A15C4 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A180C.s b/asm/non_matchings/code/z_skelanime/func_800A180C.s index cfb1c9d1e8..59875f0a26 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A180C.s +++ b/asm/non_matchings/code/z_skelanime/func_800A180C.s @@ -31,7 +31,7 @@ glabel func_800A180C /* B189D8 800A1838 0C031AB1 */ jal func_800C6AC4 /* B189DC 800A183C AFA50044 */ sw $a1, 0x44($sp) /* B189E0 800A1840 0C034213 */ jal Matrix_Push -/* B189E4 800A1844 00000000 */ nop +/* B189E4 800A1844 00000000 */ nop /* B189E8 800A1848 8FB8006C */ lw $t8, 0x6c($sp) /* B189EC 800A184C 8FAF0070 */ lw $t7, 0x70($sp) /* B189F0 800A1850 3C0D8016 */ lui $t5, %hi(gSegments) @@ -74,12 +74,12 @@ glabel func_800A180C /* B18A84 800A18E4 E7A60050 */ swc1 $f6, 0x50($sp) /* B18A88 800A18E8 846D0002 */ lh $t5, 2($v1) /* B18A8C 800A18EC 448D4000 */ mtc1 $t5, $f8 -/* B18A90 800A18F0 00000000 */ nop +/* B18A90 800A18F0 00000000 */ nop /* B18A94 800A18F4 468042A0 */ cvt.s.w $f10, $f8 /* B18A98 800A18F8 E7AA0054 */ swc1 $f10, 0x54($sp) /* B18A9C 800A18FC 84780004 */ lh $t8, 4($v1) /* B18AA0 800A1900 44988000 */ mtc1 $t8, $f16 -/* B18AA4 800A1904 00000000 */ nop +/* B18AA4 800A1904 00000000 */ nop /* B18AA8 800A1908 468084A0 */ cvt.s.w $f18, $f16 /* B18AAC 800A190C E7B20058 */ swc1 $f18, 0x58($sp) /* B18AB0 800A1910 8C6E0008 */ lw $t6, 8($v1) @@ -95,7 +95,7 @@ glabel func_800A180C /* B18AD8 800A1938 1440002D */ bnez $v0, .L800A19F0 .L800A193C: /* B18ADC 800A193C 27A40050 */ addiu $a0, $sp, 0x50 -/* B18AE0 800A1940 0C0344D0 */ jal func_800D1340 +/* B18AE0 800A1940 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B18AE4 800A1944 27A50048 */ addiu $a1, $sp, 0x48 /* B18AE8 800A1948 8FAB0060 */ lw $t3, 0x60($sp) /* B18AEC 800A194C 8FAC0084 */ lw $t4, 0x84($sp) @@ -169,7 +169,7 @@ glabel func_800A180C /* B18BF0 800A1A50 AFAD001C */ sw $t5, 0x1c($sp) .L800A1A54: /* B18BF4 800A1A54 0C034221 */ jal Matrix_Pull -/* B18BF8 800A1A58 00000000 */ nop +/* B18BF8 800A1A58 00000000 */ nop /* B18BFC 800A1A5C 8FAE0064 */ lw $t6, 0x64($sp) /* B18C00 800A1A60 240100FF */ li $at, 255 /* B18C04 800A1A64 8FA40068 */ lw $a0, 0x68($sp) @@ -197,5 +197,5 @@ glabel func_800A180C /* B18C58 800A1AB8 8FBF0024 */ lw $ra, 0x24($sp) /* B18C5C 800A1ABC 27BD0068 */ addiu $sp, $sp, 0x68 /* B18C60 800A1AC0 03E00008 */ jr $ra -/* B18C64 800A1AC4 00000000 */ nop +/* B18C64 800A1AC4 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A1AC8.s b/asm/non_matchings/code/z_skelanime/func_800A1AC8.s index 6774b024f5..9a44811061 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A1AC8.s +++ b/asm/non_matchings/code/z_skelanime/func_800A1AC8.s @@ -100,12 +100,12 @@ glabel func_800A1AC8 /* B18D70 800A1BD0 E7A6005C */ swc1 $f6, 0x5c($sp) /* B18D74 800A1BD4 846B0002 */ lh $t3, 2($v1) /* B18D78 800A1BD8 448B4000 */ mtc1 $t3, $f8 -/* B18D7C 800A1BDC 00000000 */ nop +/* B18D7C 800A1BDC 00000000 */ nop /* B18D80 800A1BE0 468042A0 */ cvt.s.w $f10, $f8 /* B18D84 800A1BE4 E7AA0060 */ swc1 $f10, 0x60($sp) /* B18D88 800A1BE8 846D0004 */ lh $t5, 4($v1) /* B18D8C 800A1BEC 448D8000 */ mtc1 $t5, $f16 -/* B18D90 800A1BF0 00000000 */ nop +/* B18D90 800A1BF0 00000000 */ nop /* B18D94 800A1BF4 468084A0 */ cvt.s.w $f18, $f16 /* B18D98 800A1BF8 E7B20064 */ swc1 $f18, 0x64($sp) /* B18D9C 800A1BFC 886C0006 */ lwl $t4, 6($v1) @@ -130,7 +130,7 @@ glabel func_800A1AC8 .L800A1C48: /* B18DE8 800A1C48 27A4005C */ addiu $a0, $sp, 0x5c /* B18DEC 800A1C4C 27A50054 */ addiu $a1, $sp, 0x54 -/* B18DF0 800A1C50 0C0344D0 */ jal func_800D1340 +/* B18DF0 800A1C50 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B18DF4 800A1C54 AFA8004C */ sw $t0, 0x4c($sp) /* B18DF8 800A1C58 8FAD006C */ lw $t5, 0x6c($sp) /* B18DFC 800A1C5C 8FA8004C */ lw $t0, 0x4c($sp) @@ -201,7 +201,7 @@ glabel func_800A1AC8 /* B18EF4 800A1D54 AFAA0018 */ sw $t2, 0x18($sp) .L800A1D58: /* B18EF8 800A1D58 0C034221 */ jal Matrix_Pull -/* B18EFC 800A1D5C 00000000 */ nop +/* B18EFC 800A1D5C 00000000 */ nop /* B18F00 800A1D60 8FA90078 */ lw $t1, 0x78($sp) /* B18F04 800A1D64 3C068014 */ lui $a2, %hi(D_80140224) # $a2, 0x8014 /* B18F08 800A1D68 24C60224 */ addiu $a2, %lo(D_80140224) # addiu $a2, $a2, 0x224 @@ -213,5 +213,5 @@ glabel func_800A1AC8 .L800A1D80: /* B18F20 800A1D80 27BD0078 */ addiu $sp, $sp, 0x78 /* B18F24 800A1D84 03E00008 */ jr $ra -/* B18F28 800A1D88 00000000 */ nop +/* B18F28 800A1D88 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A2044.s b/asm/non_matchings/code/z_skelanime/func_800A2044.s index b8879e3ae4..7d668a86ab 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A2044.s +++ b/asm/non_matchings/code/z_skelanime/func_800A2044.s @@ -56,12 +56,12 @@ glabel func_800A2044 /* B192A4 800A2104 E7A60044 */ swc1 $f6, 0x44($sp) /* B192A8 800A2108 860C0002 */ lh $t4, 2($s0) /* B192AC 800A210C 448C4000 */ mtc1 $t4, $f8 -/* B192B0 800A2110 00000000 */ nop +/* B192B0 800A2110 00000000 */ nop /* B192B4 800A2114 468042A0 */ cvt.s.w $f10, $f8 /* B192B8 800A2118 E7AA0048 */ swc1 $f10, 0x48($sp) /* B192BC 800A211C 860F0004 */ lh $t7, 4($s0) /* B192C0 800A2120 448F8000 */ mtc1 $t7, $f16 -/* B192C4 800A2124 00000000 */ nop +/* B192C4 800A2124 00000000 */ nop /* B192C8 800A2128 468084A0 */ cvt.s.w $f18, $f16 /* B192CC 800A212C E7B2004C */ swc1 $f18, 0x4c($sp) /* B192D0 800A2130 8E0D0008 */ lw $t5, 8($s0) @@ -75,7 +75,7 @@ glabel func_800A2044 /* B192F0 800A2150 1440001B */ bnez $v0, .L800A21C0 .L800A2154: /* B192F4 800A2154 27A40044 */ addiu $a0, $sp, 0x44 -/* B192F8 800A2158 0C0344D0 */ jal func_800D1340 +/* B192F8 800A2158 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B192FC 800A215C 27A5003C */ addiu $a1, $sp, 0x3c /* B19300 800A2160 8FAA0050 */ lw $t2, 0x50($sp) /* B19304 800A2164 8FAB0074 */ lw $t3, 0x74($sp) @@ -132,7 +132,7 @@ glabel func_800A2044 /* B193C8 800A2228 AFA20074 */ sw $v0, 0x74($sp) .L800A222C: /* B193CC 800A222C 0C034221 */ jal Matrix_Pull -/* B193D0 800A2230 00000000 */ nop +/* B193D0 800A2230 00000000 */ nop /* B193D4 800A2234 92050007 */ lbu $a1, 7($s0) /* B193D8 800A2238 240100FF */ li $at, 255 /* B193DC 800A223C 8FA40058 */ lw $a0, 0x58($sp) diff --git a/asm/non_matchings/code/z_skelanime/func_800A2288.s b/asm/non_matchings/code/z_skelanime/func_800A2288.s index 1ccfab24a7..029f642c2d 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A2288.s +++ b/asm/non_matchings/code/z_skelanime/func_800A2288.s @@ -38,7 +38,7 @@ glabel func_800A2288 /* B1946C 800A22CC 00001025 */ move $v0, $zero .L800A22D0: /* B19470 800A22D0 0C034213 */ jal Matrix_Push -/* B19474 800A22D4 00000000 */ nop +/* B19474 800A22D4 00000000 */ nop /* B19478 800A22D8 8FAF005C */ lw $t7, 0x5c($sp) /* B1947C 800A22DC 3C0A8016 */ lui $t2, %hi(gSegments) /* B19480 800A22E0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff @@ -71,7 +71,7 @@ glabel func_800A2288 /* B194EC 800A234C E7AA0044 */ swc1 $f10, 0x44($sp) /* B194F0 800A2350 846F0004 */ lh $t7, 4($v1) /* B194F4 800A2354 448F8000 */ mtc1 $t7, $f16 -/* B194F8 800A2358 00000000 */ nop +/* B194F8 800A2358 00000000 */ nop /* B194FC 800A235C 468084A0 */ cvt.s.w $f18, $f16 /* B19500 800A2360 E7B20048 */ swc1 $f18, 0x48($sp) /* B19504 800A2364 88690006 */ lwl $t1, 6($v1) @@ -93,7 +93,7 @@ glabel func_800A2288 /* B19544 800A23A4 1440001B */ bnez $v0, .L800A2414 .L800A23A8: /* B19548 800A23A8 27A40040 */ addiu $a0, $sp, 0x40 -/* B1954C 800A23AC 0C0344D0 */ jal func_800D1340 +/* B1954C 800A23AC 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B19550 800A23B0 27A50038 */ addiu $a1, $sp, 0x38 /* B19554 800A23B4 8FAF004C */ lw $t7, 0x4c($sp) /* B19558 800A23B8 8FB90070 */ lw $t9, 0x70($sp) @@ -151,11 +151,11 @@ glabel func_800A2288 /* B19620 800A2480 AFA20070 */ sw $v0, 0x70($sp) .L800A2484: /* B19624 800A2484 0C034221 */ jal Matrix_Pull -/* B19628 800A2488 00000000 */ nop +/* B19628 800A2488 00000000 */ nop /* B1962C 800A248C 8FA20070 */ lw $v0, 0x70($sp) .L800A2490: /* B19630 800A2490 8FBF0024 */ lw $ra, 0x24($sp) /* B19634 800A2494 27BD0058 */ addiu $sp, $sp, 0x58 /* B19638 800A2498 03E00008 */ jr $ra -/* B1963C 800A249C 00000000 */ nop +/* B1963C 800A249C 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A24A0.s b/asm/non_matchings/code/z_skelanime/func_800A24A0.s index 292cb29a24..34d0fe5524 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A24A0.s +++ b/asm/non_matchings/code/z_skelanime/func_800A24A0.s @@ -60,12 +60,12 @@ glabel func_800A24A0 /* B19700 800A2560 E7A60050 */ swc1 $f6, 0x50($sp) /* B19704 800A2564 860C0002 */ lh $t4, 2($s0) /* B19708 800A2568 448C4000 */ mtc1 $t4, $f8 -/* B1970C 800A256C 00000000 */ nop +/* B1970C 800A256C 00000000 */ nop /* B19710 800A2570 468042A0 */ cvt.s.w $f10, $f8 /* B19714 800A2574 E7AA0054 */ swc1 $f10, 0x54($sp) /* B19718 800A2578 860F0004 */ lh $t7, 4($s0) /* B1971C 800A257C 448F8000 */ mtc1 $t7, $f16 -/* B19720 800A2580 00000000 */ nop +/* B19720 800A2580 00000000 */ nop /* B19724 800A2584 468084A0 */ cvt.s.w $f18, $f16 /* B19728 800A2588 E7B20058 */ swc1 $f18, 0x58($sp) /* B1972C 800A258C 8E0D0008 */ lw $t5, 8($s0) @@ -80,7 +80,7 @@ glabel func_800A24A0 /* B19750 800A25B0 1440002C */ bnez $v0, .L800A2664 .L800A25B4: /* B19754 800A25B4 27A40050 */ addiu $a0, $sp, 0x50 -/* B19758 800A25B8 0C0344D0 */ jal func_800D1340 +/* B19758 800A25B8 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B1975C 800A25BC 27A50048 */ addiu $a1, $sp, 0x48 /* B19760 800A25C0 8FAB0060 */ lw $t3, 0x60($sp) /* B19764 800A25C4 8FA80084 */ lw $t0, 0x84($sp) @@ -157,7 +157,7 @@ glabel func_800A24A0 /* B19874 800A26D4 AFA20088 */ sw $v0, 0x88($sp) .L800A26D8: /* B19878 800A26D8 0C034221 */ jal Matrix_Pull -/* B1987C 800A26DC 00000000 */ nop +/* B1987C 800A26DC 00000000 */ nop /* B19880 800A26E0 92050007 */ lbu $a1, 7($s0) /* B19884 800A26E4 240100FF */ li $at, 255 /* B19888 800A26E8 8FA40068 */ lw $a0, 0x68($sp) diff --git a/asm/non_matchings/code/z_skelanime/func_800A273C.s b/asm/non_matchings/code/z_skelanime/func_800A273C.s index b63757c2fe..6bcbf0cb50 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A273C.s +++ b/asm/non_matchings/code/z_skelanime/func_800A273C.s @@ -86,7 +86,7 @@ glabel func_800A273C /* B199CC 800A282C E7AA0050 */ swc1 $f10, 0x50($sp) /* B199D0 800A2830 846A0004 */ lh $t2, 4($v1) /* B199D4 800A2834 448A8000 */ mtc1 $t2, $f16 -/* B199D8 800A2838 00000000 */ nop +/* B199D8 800A2838 00000000 */ nop /* B199DC 800A283C 468084A0 */ cvt.s.w $f18, $f16 /* B199E0 800A2840 E7B20054 */ swc1 $f18, 0x54($sp) /* B199E4 800A2844 886E0006 */ lwl $t6, 6($v1) @@ -109,7 +109,7 @@ glabel func_800A273C /* B19A28 800A2888 14400027 */ bnez $v0, .L800A2928 .L800A288C: /* B19A2C 800A288C 27A4004C */ addiu $a0, $sp, 0x4c -/* B19A30 800A2890 0C0344D0 */ jal func_800D1340 +/* B19A30 800A2890 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B19A34 800A2894 27A50044 */ addiu $a1, $sp, 0x44 /* B19A38 800A2898 8FAA005C */ lw $t2, 0x5c($sp) /* B19A3C 800A289C 8FA40040 */ lw $a0, 0x40($sp) @@ -182,11 +182,11 @@ glabel func_800A273C /* B19B3C 800A299C AFA20084 */ sw $v0, 0x84($sp) .L800A29A0: /* B19B40 800A29A0 0C034221 */ jal Matrix_Pull -/* B19B44 800A29A4 00000000 */ nop +/* B19B44 800A29A4 00000000 */ nop /* B19B48 800A29A8 8FA20084 */ lw $v0, 0x84($sp) .L800A29AC: /* B19B4C 800A29AC 8FBF002C */ lw $ra, 0x2c($sp) /* B19B50 800A29B0 27BD0068 */ addiu $sp, $sp, 0x68 /* B19B54 800A29B4 03E00008 */ jr $ra -/* B19B58 800A29B8 00000000 */ nop +/* B19B58 800A29B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s index e64c2360bb..bd4ed9df1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s @@ -1,112 +1,112 @@ glabel ArrowFire_Draw /* 00580 80866290 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00584 80866294 AFBF003C */ sw $ra, 0x003C($sp) -/* 00588 80866298 AFB00038 */ sw $s0, 0x0038($sp) -/* 0058C 8086629C AFA40098 */ sw $a0, 0x0098($sp) -/* 00590 808662A0 AFA5009C */ sw $a1, 0x009C($sp) +/* 00584 80866294 AFBF003C */ sw $ra, 0x003C($sp) +/* 00588 80866298 AFB00038 */ sw $s0, 0x0038($sp) +/* 0058C 8086629C AFA40098 */ sw $a0, 0x0098($sp) +/* 00590 808662A0 AFA5009C */ sw $a1, 0x009C($sp) /* 00594 808662A4 8CAF009C */ lw $t7, 0x009C($a1) ## 0000009C -/* 00598 808662A8 AFAF008C */ sw $t7, 0x008C($sp) +/* 00598 808662A8 AFAF008C */ sw $t7, 0x008C($sp) /* 0059C 808662AC 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 005A0 808662B0 50600106 */ beql $v1, $zero, .L808666CC -/* 005A4 808662B4 8FBF003C */ lw $ra, 0x003C($sp) +/* 005A0 808662B0 50600106 */ beql $v1, $zero, .L808666CC +/* 005A4 808662B4 8FBF003C */ lw $ra, 0x003C($sp) /* 005A8 808662B8 8C790130 */ lw $t9, 0x0130($v1) ## 00000130 -/* 005AC 808662BC 53200103 */ beql $t9, $zero, .L808666CC -/* 005B0 808662C0 8FBF003C */ lw $ra, 0x003C($sp) +/* 005AC 808662BC 53200103 */ beql $t9, $zero, .L808666CC +/* 005B0 808662C0 8FBF003C */ lw $ra, 0x003C($sp) /* 005B4 808662C4 948C0166 */ lhu $t4, 0x0166($a0) ## 00000166 /* 005B8 808662C8 3C068086 */ lui $a2, %hi(D_80867B5C) ## $a2 = 80860000 /* 005BC 808662CC 24C67B5C */ addiu $a2, $a2, %lo(D_80867B5C) ## $a2 = 80867B5C -/* 005C0 808662D0 298100FF */ slti $at, $t4, 0x00FF -/* 005C4 808662D4 102000FC */ beq $at, $zero, .L808666C8 -/* 005C8 808662D8 8FAF009C */ lw $t7, 0x009C($sp) +/* 005C0 808662D0 298100FF */ slti $at, $t4, 0x00FF +/* 005C4 808662D4 102000FC */ beq $at, $zero, .L808666C8 +/* 005C8 808662D8 8FAF009C */ lw $t7, 0x009C($sp) /* 005CC 808662DC 906D0249 */ lbu $t5, 0x0249($v1) ## 00000249 /* 005D0 808662E0 2407026A */ addiu $a3, $zero, 0x026A ## $a3 = 0000026A /* 005D4 808662E4 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 005D8 808662E8 51C00004 */ beql $t6, $zero, .L808662FC +/* 005D8 808662E8 51C00004 */ beql $t6, $zero, .L808662FC /* 005DC 808662EC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 005E0 808662F0 10000002 */ beq $zero, $zero, .L808662FC +/* 005E0 808662F0 10000002 */ beq $zero, $zero, .L808662FC /* 005E4 808662F4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 005E8 808662F8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L808662FC: /* 005EC 808662FC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 005F0 80866300 AFA20084 */ sw $v0, 0x0084($sp) +/* 005F0 80866300 AFA20084 */ sw $v0, 0x0084($sp) /* 005F4 80866304 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 80866308 0C031AB1 */ jal func_800C6AC4 +/* 005F8 80866308 0C031AB1 */ jal func_800C6AC4 /* 005FC 8086630C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00600 80866310 8FA20084 */ lw $v0, 0x0084($sp) +/* 00600 80866310 8FA20084 */ lw $v0, 0x0084($sp) /* 00604 80866314 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00608 80866318 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 /* 0060C 8086631C C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00610 80866320 0C034261 */ jal Matrix_Translate +/* 00610 80866320 0C034261 */ jal Matrix_Translate /* 00614 80866324 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 00618 80866328 8FA20084 */ lw $v0, 0x0084($sp) +/* 00618 80866328 8FA20084 */ lw $v0, 0x0084($sp) /* 0061C 8086632C 3C018086 */ lui $at, %hi(D_80867BAC) ## $at = 80860000 -/* 00620 80866330 C4287BAC */ lwc1 $f8, %lo(D_80867BAC)($at) +/* 00620 80866330 C4287BAC */ lwc1 $f8, %lo(D_80867BAC)($at) /* 00624 80866334 845800B6 */ lh $t8, 0x00B6($v0) ## 000000B6 /* 00628 80866338 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0062C 8086633C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 00630 80866340 00000000 */ nop -/* 00634 80866344 468021A0 */ cvt.s.w $f6, $f4 -/* 00638 80866348 46083302 */ mul.s $f12, $f6, $f8 -/* 0063C 8086634C 0C034348 */ jal Matrix_RotateY +/* 00634 80866344 468021A0 */ cvt.s.w $f6, $f4 +/* 00638 80866348 46083302 */ mul.s $f12, $f6, $f8 +/* 0063C 8086634C 0C034348 */ jal Matrix_RotateY /* 00640 80866350 00000000 */ nop -/* 00644 80866354 8FA20084 */ lw $v0, 0x0084($sp) +/* 00644 80866354 8FA20084 */ lw $v0, 0x0084($sp) /* 00648 80866358 3C018086 */ lui $at, %hi(D_80867BB0) ## $at = 80860000 -/* 0064C 8086635C C4327BB0 */ lwc1 $f18, %lo(D_80867BB0)($at) +/* 0064C 8086635C C4327BB0 */ lwc1 $f18, %lo(D_80867BB0)($at) /* 00650 80866360 845900B4 */ lh $t9, 0x00B4($v0) ## 000000B4 /* 00654 80866364 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00658 80866368 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0065C 8086636C 00000000 */ nop -/* 00660 80866370 46805420 */ cvt.s.w $f16, $f10 -/* 00664 80866374 46128302 */ mul.s $f12, $f16, $f18 -/* 00668 80866378 0C0342DC */ jal Matrix_RotateX +/* 00660 80866370 46805420 */ cvt.s.w $f16, $f10 +/* 00664 80866374 46128302 */ mul.s $f12, $f16, $f18 +/* 00668 80866378 0C0342DC */ jal Matrix_RotateX /* 0066C 8086637C 00000000 */ nop -/* 00670 80866380 8FA20084 */ lw $v0, 0x0084($sp) +/* 00670 80866380 8FA20084 */ lw $v0, 0x0084($sp) /* 00674 80866384 3C018086 */ lui $at, %hi(D_80867BB4) ## $at = 80860000 -/* 00678 80866388 C4287BB4 */ lwc1 $f8, %lo(D_80867BB4)($at) +/* 00678 80866388 C4287BB4 */ lwc1 $f8, %lo(D_80867BB4)($at) /* 0067C 8086638C 844B00B8 */ lh $t3, 0x00B8($v0) ## 000000B8 /* 00680 80866390 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00684 80866394 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 00688 80866398 00000000 */ nop -/* 0068C 8086639C 468021A0 */ cvt.s.w $f6, $f4 -/* 00690 808663A0 46083302 */ mul.s $f12, $f6, $f8 -/* 00694 808663A4 0C0343B5 */ jal Matrix_RotateZ +/* 0068C 8086639C 468021A0 */ cvt.s.w $f6, $f4 +/* 00690 808663A0 46083302 */ mul.s $f12, $f6, $f8 +/* 00694 808663A4 0C0343B5 */ jal Matrix_RotateZ /* 00698 808663A8 00000000 */ nop /* 0069C 808663AC 3C018086 */ lui $at, %hi(D_80867BB8) ## $at = 80860000 -/* 006A0 808663B0 C42C7BB8 */ lwc1 $f12, %lo(D_80867BB8)($at) +/* 006A0 808663B0 C42C7BB8 */ lwc1 $f12, %lo(D_80867BB8)($at) /* 006A4 808663B4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A8 808663B8 44066000 */ mfc1 $a2, $f12 -/* 006AC 808663BC 0C0342A3 */ jal Matrix_Scale -/* 006B0 808663C0 46006386 */ mov.s $f14, $f12 -/* 006B4 808663C4 8FAC0098 */ lw $t4, 0x0098($sp) +/* 006A8 808663B8 44066000 */ mfc1 $a2, $f12 +/* 006AC 808663BC 0C0342A3 */ jal Matrix_Scale +/* 006B0 808663C0 46006386 */ mov.s $f14, $f12 +/* 006B4 808663C4 8FAC0098 */ lw $t4, 0x0098($sp) /* 006B8 808663C8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 006BC 808663CC C590015C */ lwc1 $f16, 0x015C($t4) ## 0000015C -/* 006C0 808663D0 4610503C */ c.lt.s $f10, $f16 +/* 006C0 808663D0 4610503C */ c.lt.s $f10, $f16 /* 006C4 808663D4 00000000 */ nop -/* 006C8 808663D8 45020030 */ bc1fl .L8086649C -/* 006CC 808663DC 8FAE009C */ lw $t6, 0x009C($sp) -/* 006D0 808663E0 0C024DF0 */ jal func_800937C0 +/* 006C8 808663D8 45020030 */ bc1fl .L8086649C +/* 006CC 808663DC 8FAE009C */ lw $t6, 0x009C($sp) +/* 006D0 808663E0 0C024DF0 */ jal func_800937C0 /* 006D4 808663E4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 006D8 808663E8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 006DC 808663EC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 006E0 808663F0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 006E4 808663F4 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 /* 006E8 808663F8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006EC 808663FC 8FAF0098 */ lw $t7, 0x0098($sp) +/* 006EC 808663FC 8FAF0098 */ lw $t7, 0x0098($sp) /* 006F0 80866400 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 006F4 80866404 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 /* 006F8 80866408 C5E0015C */ lwc1 $f0, 0x015C($t7) ## 0000015C /* 006FC 8086640C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00700 80866410 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 00704 80866414 46120102 */ mul.s $f4, $f0, $f18 +/* 00704 80866414 46120102 */ mul.s $f4, $f0, $f18 /* 00708 80866418 3C0EE300 */ lui $t6, 0xE300 ## $t6 = E3000000 /* 0070C 8086641C 35CE1A01 */ ori $t6, $t6, 0x1A01 ## $t6 = E3001A01 -/* 00710 80866420 46004282 */ mul.s $f10, $f8, $f0 +/* 00710 80866420 46004282 */ mul.s $f10, $f8, $f0 /* 00714 80866424 240F0030 */ addiu $t7, $zero, 0x0030 ## $t7 = 00000030 -/* 00718 80866428 4600218D */ trunc.w.s $f6, $f4 -/* 0071C 8086642C 4600540D */ trunc.w.s $f16, $f10 -/* 00720 80866430 440C3000 */ mfc1 $t4, $f6 -/* 00724 80866434 44188000 */ mfc1 $t8, $f16 -/* 00728 80866438 000C6E00 */ sll $t5, $t4, 24 +/* 00718 80866428 4600218D */ trunc.w.s $f6, $f4 +/* 0071C 8086642C 4600540D */ trunc.w.s $f16, $f10 +/* 00720 80866430 440C3000 */ mfc1 $t4, $f6 +/* 00724 80866434 44188000 */ mfc1 $t8, $f16 +/* 00728 80866438 000C6E00 */ sll $t5, $t4, 24 /* 0072C 8086643C 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 /* 00730 80866440 01B95825 */ or $t3, $t5, $t9 ## $t3 = 00000008 /* 00734 80866444 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 @@ -130,9 +130,9 @@ glabel ArrowFire_Draw /* 0077C 8086648C AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 00780 80866490 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 00784 80866494 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00788 80866498 8FAE009C */ lw $t6, 0x009C($sp) +/* 00788 80866498 8FAE009C */ lw $t6, 0x009C($sp) .L8086649C: -/* 0078C 8086649C 0C024F61 */ jal func_80093D84 +/* 0078C 8086649C 0C024F61 */ jal func_80093D84 /* 00790 808664A0 8DC40000 */ lw $a0, 0x0000($t6) ## E3001A01 /* 00794 808664A4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00798 808664A8 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -140,7 +140,7 @@ glabel ArrowFire_Draw /* 007A0 808664B0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 007A4 808664B4 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 007A8 808664B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 007AC 808664BC 8FAD0098 */ lw $t5, 0x0098($sp) +/* 007AC 808664BC 8FAD0098 */ lw $t5, 0x0098($sp) /* 007B0 808664C0 3C01FFC8 */ lui $at, 0xFFC8 ## $at = FFC80000 /* 007B4 808664C4 3C18FF00 */ lui $t8, 0xFF00 ## $t8 = FF000000 /* 007B8 808664C8 91AB0168 */ lbu $t3, 0x0168($t5) ## 00000168 @@ -156,47 +156,47 @@ glabel ArrowFire_Draw /* 007E0 808664F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 007E4 808664F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 007E8 808664F8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 007EC 808664FC 0C034421 */ jal Matrix_RotateXYZ +/* 007EC 808664FC 0C034421 */ jal Matrix_RotateZYX /* 007F0 80866500 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 007F4 80866504 8FAD0098 */ lw $t5, 0x0098($sp) +/* 007F4 80866504 8FAD0098 */ lw $t5, 0x0098($sp) /* 007F8 80866508 3C018086 */ lui $at, %hi(D_80867BBC) ## $at = 80860000 /* 007FC 8086650C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00800 80866510 95B90166 */ lhu $t9, 0x0166($t5) ## 00000166 /* 00804 80866514 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00808 80866518 53200009 */ beql $t9, $zero, .L80866540 +/* 00808 80866518 53200009 */ beql $t9, $zero, .L80866540 /* 0080C 8086651C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00810 80866520 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00814 80866524 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00818 80866528 44066000 */ mfc1 $a2, $f12 -/* 0081C 8086652C 0C034261 */ jal Matrix_Translate -/* 00820 80866530 46006386 */ mov.s $f14, $f12 -/* 00824 80866534 10000005 */ beq $zero, $zero, .L8086654C -/* 00828 80866538 8FAB0098 */ lw $t3, 0x0098($sp) +/* 00818 80866528 44066000 */ mfc1 $a2, $f12 +/* 0081C 8086652C 0C034261 */ jal Matrix_Translate +/* 00820 80866530 46006386 */ mov.s $f14, $f12 +/* 00824 80866534 10000005 */ beq $zero, $zero, .L8086654C +/* 00828 80866538 8FAB0098 */ lw $t3, 0x0098($sp) /* 0082C 8086653C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 .L80866540: -/* 00830 80866540 0C034261 */ jal Matrix_Translate -/* 00834 80866544 C42E7BBC */ lwc1 $f14, %lo(D_80867BBC)($at) -/* 00838 80866548 8FAB0098 */ lw $t3, 0x0098($sp) +/* 00830 80866540 0C034261 */ jal Matrix_Translate +/* 00834 80866544 C42E7BBC */ lwc1 $f14, %lo(D_80867BBC)($at) +/* 00838 80866548 8FAB0098 */ lw $t3, 0x0098($sp) .L8086654C: /* 0083C 8086654C 3C018086 */ lui $at, %hi(D_80867BC0) ## $at = 80860000 -/* 00840 80866550 C4267BC0 */ lwc1 $f6, %lo(D_80867BC0)($at) +/* 00840 80866550 C4267BC0 */ lwc1 $f6, %lo(D_80867BC0)($at) /* 00844 80866554 856C0164 */ lh $t4, 0x0164($t3) ## 00000164 /* 00848 80866558 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0084C 8086655C 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 00850 80866560 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 /* 00854 80866564 C5680158 */ lwc1 $f8, 0x0158($t3) ## 00000158 /* 00858 80866568 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0085C 8086656C 46809120 */ cvt.s.w $f4, $f18 -/* 00860 80866570 46062302 */ mul.s $f12, $f4, $f6 -/* 00864 80866574 44066000 */ mfc1 $a2, $f12 -/* 00868 80866578 460A4382 */ mul.s $f14, $f8, $f10 -/* 0086C 8086657C 0C0342A3 */ jal Matrix_Scale +/* 0085C 8086656C 46809120 */ cvt.s.w $f4, $f18 +/* 00860 80866570 46062302 */ mul.s $f12, $f4, $f6 +/* 00864 80866574 44066000 */ mfc1 $a2, $f12 +/* 00868 80866578 460A4382 */ mul.s $f14, $f8, $f10 +/* 0086C 8086657C 0C0342A3 */ jal Matrix_Scale /* 00870 80866580 00000000 */ nop /* 00874 80866584 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00878 80866588 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 /* 0087C 8086658C 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 00880 80866590 44066000 */ mfc1 $a2, $f12 -/* 00884 80866594 0C034261 */ jal Matrix_Translate +/* 00880 80866590 44066000 */ mfc1 $a2, $f12 +/* 00884 80866594 0C034261 */ jal Matrix_Translate /* 00888 80866598 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0088C 8086659C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00890 808665A0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -204,14 +204,14 @@ glabel ArrowFire_Draw /* 00898 808665A8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0089C 808665AC AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 008A0 808665B0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008A4 808665B4 8FB8009C */ lw $t8, 0x009C($sp) +/* 008A4 808665B4 8FB8009C */ lw $t8, 0x009C($sp) /* 008A8 808665B8 3C058086 */ lui $a1, %hi(D_80867B70) ## $a1 = 80860000 /* 008AC 808665BC 24A57B70 */ addiu $a1, $a1, %lo(D_80867B70) ## $a1 = 80867B70 /* 008B0 808665C0 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 008B4 808665C4 2406029A */ addiu $a2, $zero, 0x029A ## $a2 = 0000029A -/* 008B8 808665C8 0C0346A2 */ jal Matrix_NewMtx -/* 008BC 808665CC AFA20054 */ sw $v0, 0x0054($sp) -/* 008C0 808665D0 8FA30054 */ lw $v1, 0x0054($sp) +/* 008B8 808665C8 0C0346A2 */ jal Matrix_NewMtx +/* 008BC 808665CC AFA20054 */ sw $v0, 0x0054($sp) +/* 008C0 808665D0 8FA30054 */ lw $v1, 0x0054($sp) /* 008C4 808665D4 3C198086 */ lui $t9, %hi(D_80867990) ## $t9 = 80860000 /* 008C8 808665D8 27397990 */ addiu $t9, $t9, %lo(D_80867990) ## $t9 = 80867990 /* 008CC 808665DC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -223,40 +223,40 @@ glabel ArrowFire_Draw /* 008E4 808665F4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 008E8 808665F8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 008EC 808665FC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008F0 80866600 8FAA008C */ lw $t2, 0x008C($sp) +/* 008F0 80866600 8FAA008C */ lw $t2, 0x008C($sp) /* 008F4 80866604 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 /* 008F8 80866608 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 008FC 8086660C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 00900 80866610 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00904 80866614 8FAB009C */ lw $t3, 0x009C($sp) -/* 00908 80866618 000A7040 */ sll $t6, $t2, 1 +/* 00904 80866614 8FAB009C */ lw $t3, 0x009C($sp) +/* 00908 80866618 000A7040 */ sll $t6, $t2, 1 /* 0090C 8086661C 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 /* 00910 80866620 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 00914 80866624 000A7080 */ sll $t6, $t2, 2 -/* 00918 80866628 01CA7021 */ addu $t6, $t6, $t2 -/* 0091C 8086662C 000E7040 */ sll $t6, $t6, 1 -/* 00920 80866630 AFB80010 */ sw $t8, 0x0010($sp) -/* 00924 80866634 010F3023 */ subu $a2, $t0, $t7 +/* 00914 80866624 000A7080 */ sll $t6, $t2, 2 +/* 00918 80866628 01CA7021 */ addu $t6, $t6, $t2 +/* 0091C 8086662C 000E7040 */ sll $t6, $t6, 1 +/* 00920 80866630 AFB80010 */ sw $t8, 0x0010($sp) +/* 00924 80866634 010F3023 */ subu $a2, $t0, $t7 /* 00928 80866638 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0092C 8086663C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 /* 00930 80866640 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 00000000 -/* 00934 80866644 010C5823 */ subu $t3, $t0, $t4 -/* 00938 80866648 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0093C 8086664C AFB90018 */ sw $t9, 0x0018($sp) +/* 00934 80866644 010C5823 */ subu $t3, $t0, $t4 +/* 00938 80866648 AFAD0014 */ sw $t5, 0x0014($sp) +/* 0093C 8086664C AFB90018 */ sw $t9, 0x0018($sp) /* 00940 80866650 31CF01FF */ andi $t7, $t6, 0x01FF ## $t7 = 00000000 /* 00944 80866654 241801FF */ addiu $t8, $zero, 0x01FF ## $t8 = 000001FF -/* 00948 80866658 030F6823 */ subu $t5, $t8, $t7 +/* 00948 80866658 030F6823 */ subu $t5, $t8, $t7 /* 0094C 8086665C 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 /* 00950 80866660 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 00954 80866664 AFAC0028 */ sw $t4, 0x0028($sp) -/* 00958 80866668 AFB90024 */ sw $t9, 0x0024($sp) -/* 0095C 8086666C AFAD0020 */ sw $t5, 0x0020($sp) -/* 00960 80866670 AFAB001C */ sw $t3, 0x001C($sp) +/* 00954 80866664 AFAC0028 */ sw $t4, 0x0028($sp) +/* 00958 80866668 AFB90024 */ sw $t9, 0x0024($sp) +/* 0095C 8086666C AFAD0020 */ sw $t5, 0x0020($sp) +/* 00960 80866670 AFAB001C */ sw $t3, 0x001C($sp) /* 00964 80866674 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00968 80866678 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0096C 8086667C 0C0253D0 */ jal Draw_TwoTexScroll -/* 00970 80866680 AFA2004C */ sw $v0, 0x004C($sp) -/* 00974 80866684 8FA3004C */ lw $v1, 0x004C($sp) +/* 0096C 8086667C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00970 80866680 AFA2004C */ sw $v0, 0x004C($sp) +/* 00974 80866684 8FA3004C */ lw $v1, 0x004C($sp) /* 00978 80866688 3C188086 */ lui $t8, %hi(D_80867A40) ## $t8 = 80860000 /* 0097C 8086668C 27187A40 */ addiu $t8, $t8, %lo(D_80867A40) ## $t8 = 80867A40 /* 00980 80866690 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -267,18 +267,18 @@ glabel ArrowFire_Draw /* 00994 808666A4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 00998 808666A8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 0099C 808666AC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009A0 808666B0 8FAF009C */ lw $t7, 0x009C($sp) +/* 009A0 808666B0 8FAF009C */ lw $t7, 0x009C($sp) /* 009A4 808666B4 24C67B84 */ addiu $a2, $a2, %lo(D_80867B84) ## $a2 = 80867B84 /* 009A8 808666B8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 009AC 808666BC 240702AA */ addiu $a3, $zero, 0x02AA ## $a3 = 000002AA -/* 009B0 808666C0 0C031AD5 */ jal func_800C6B54 +/* 009B0 808666C0 0C031AD5 */ jal func_800C6B54 /* 009B4 808666C4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 .L808666C8: -/* 009B8 808666C8 8FBF003C */ lw $ra, 0x003C($sp) +/* 009B8 808666C8 8FBF003C */ lw $ra, 0x003C($sp) .L808666CC: -/* 009BC 808666CC 8FB00038 */ lw $s0, 0x0038($sp) +/* 009BC 808666CC 8FB00038 */ lw $s0, 0x0038($sp) /* 009C0 808666D0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 009C4 808666D4 03E00008 */ jr $ra +/* 009C4 808666D4 03E00008 */ jr $ra /* 009C8 808666D8 00000000 */ nop /* 009CC 808666DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s index 57317ce687..ca4c44aad0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s @@ -1,118 +1,118 @@ glabel ArrowIce_Draw /* 00580 80868250 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00584 80868254 AFBF003C */ sw $ra, 0x003C($sp) -/* 00588 80868258 AFB00038 */ sw $s0, 0x0038($sp) -/* 0058C 8086825C AFA40098 */ sw $a0, 0x0098($sp) -/* 00590 80868260 AFA5009C */ sw $a1, 0x009C($sp) +/* 00584 80868254 AFBF003C */ sw $ra, 0x003C($sp) +/* 00588 80868258 AFB00038 */ sw $s0, 0x0038($sp) +/* 0058C 8086825C AFA40098 */ sw $a0, 0x0098($sp) +/* 00590 80868260 AFA5009C */ sw $a1, 0x009C($sp) /* 00594 80868264 8CAF009C */ lw $t7, 0x009C($a1) ## 0000009C -/* 00598 80868268 AFAF0088 */ sw $t7, 0x0088($sp) +/* 00598 80868268 AFAF0088 */ sw $t7, 0x0088($sp) /* 0059C 8086826C 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 005A0 80868270 5060010E */ beql $v1, $zero, .L808686AC -/* 005A4 80868274 8FBF003C */ lw $ra, 0x003C($sp) +/* 005A0 80868270 5060010E */ beql $v1, $zero, .L808686AC +/* 005A4 80868274 8FBF003C */ lw $ra, 0x003C($sp) /* 005A8 80868278 8C790130 */ lw $t9, 0x0130($v1) ## 00000130 -/* 005AC 8086827C 5320010B */ beql $t9, $zero, .L808686AC -/* 005B0 80868280 8FBF003C */ lw $ra, 0x003C($sp) +/* 005AC 8086827C 5320010B */ beql $t9, $zero, .L808686AC +/* 005B0 80868280 8FBF003C */ lw $ra, 0x003C($sp) /* 005B4 80868284 948D014E */ lhu $t5, 0x014E($a0) ## 0000014E /* 005B8 80868288 3C068087 */ lui $a2, %hi(D_80869B3C) ## $a2 = 80870000 /* 005BC 8086828C 24C69B3C */ addiu $a2, $a2, %lo(D_80869B3C) ## $a2 = 80869B3C -/* 005C0 80868290 29A100FF */ slti $at, $t5, 0x00FF -/* 005C4 80868294 10200104 */ beq $at, $zero, .L808686A8 -/* 005C8 80868298 8FB8009C */ lw $t8, 0x009C($sp) +/* 005C0 80868290 29A100FF */ slti $at, $t5, 0x00FF +/* 005C4 80868294 10200104 */ beq $at, $zero, .L808686A8 +/* 005C8 80868298 8FB8009C */ lw $t8, 0x009C($sp) /* 005CC 8086829C 906E0249 */ lbu $t6, 0x0249($v1) ## 00000249 /* 005D0 808682A0 24070262 */ addiu $a3, $zero, 0x0262 ## $a3 = 00000262 /* 005D4 808682A4 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 005D8 808682A8 51E00004 */ beql $t7, $zero, .L808682BC +/* 005D8 808682A8 51E00004 */ beql $t7, $zero, .L808682BC /* 005DC 808682AC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 005E0 808682B0 10000002 */ beq $zero, $zero, .L808682BC +/* 005E0 808682B0 10000002 */ beq $zero, $zero, .L808682BC /* 005E4 808682B4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 005E8 808682B8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L808682BC: /* 005EC 808682BC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 005F0 808682C0 AFA2008C */ sw $v0, 0x008C($sp) +/* 005F0 808682C0 AFA2008C */ sw $v0, 0x008C($sp) /* 005F4 808682C4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 808682C8 0C031AB1 */ jal func_800C6AC4 +/* 005F8 808682C8 0C031AB1 */ jal func_800C6AC4 /* 005FC 808682CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00600 808682D0 8FA2008C */ lw $v0, 0x008C($sp) +/* 00600 808682D0 8FA2008C */ lw $v0, 0x008C($sp) /* 00604 808682D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00608 808682D8 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 /* 0060C 808682DC C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00610 808682E0 0C034261 */ jal Matrix_Translate +/* 00610 808682E0 0C034261 */ jal Matrix_Translate /* 00614 808682E4 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 00618 808682E8 8FA2008C */ lw $v0, 0x008C($sp) +/* 00618 808682E8 8FA2008C */ lw $v0, 0x008C($sp) /* 0061C 808682EC 3C018087 */ lui $at, %hi(D_80869B8C) ## $at = 80870000 -/* 00620 808682F0 C4289B8C */ lwc1 $f8, %lo(D_80869B8C)($at) +/* 00620 808682F0 C4289B8C */ lwc1 $f8, %lo(D_80869B8C)($at) /* 00624 808682F4 845900B6 */ lh $t9, 0x00B6($v0) ## 000000B6 /* 00628 808682F8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0062C 808682FC 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 /* 00630 80868300 00000000 */ nop -/* 00634 80868304 468021A0 */ cvt.s.w $f6, $f4 -/* 00638 80868308 46083302 */ mul.s $f12, $f6, $f8 -/* 0063C 8086830C 0C034348 */ jal Matrix_RotateY +/* 00634 80868304 468021A0 */ cvt.s.w $f6, $f4 +/* 00638 80868308 46083302 */ mul.s $f12, $f6, $f8 +/* 0063C 8086830C 0C034348 */ jal Matrix_RotateY /* 00640 80868310 00000000 */ nop -/* 00644 80868314 8FA2008C */ lw $v0, 0x008C($sp) +/* 00644 80868314 8FA2008C */ lw $v0, 0x008C($sp) /* 00648 80868318 3C018087 */ lui $at, %hi(D_80869B90) ## $at = 80870000 -/* 0064C 8086831C C4329B90 */ lwc1 $f18, %lo(D_80869B90)($at) +/* 0064C 8086831C C4329B90 */ lwc1 $f18, %lo(D_80869B90)($at) /* 00650 80868320 844C00B4 */ lh $t4, 0x00B4($v0) ## 000000B4 /* 00654 80868324 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00658 80868328 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 0065C 8086832C 00000000 */ nop -/* 00660 80868330 46805420 */ cvt.s.w $f16, $f10 -/* 00664 80868334 46128302 */ mul.s $f12, $f16, $f18 -/* 00668 80868338 0C0342DC */ jal Matrix_RotateX +/* 00660 80868330 46805420 */ cvt.s.w $f16, $f10 +/* 00664 80868334 46128302 */ mul.s $f12, $f16, $f18 +/* 00668 80868338 0C0342DC */ jal Matrix_RotateX /* 0066C 8086833C 00000000 */ nop -/* 00670 80868340 8FA2008C */ lw $v0, 0x008C($sp) +/* 00670 80868340 8FA2008C */ lw $v0, 0x008C($sp) /* 00674 80868344 3C018087 */ lui $at, %hi(D_80869B94) ## $at = 80870000 -/* 00678 80868348 C4289B94 */ lwc1 $f8, %lo(D_80869B94)($at) +/* 00678 80868348 C4289B94 */ lwc1 $f8, %lo(D_80869B94)($at) /* 0067C 8086834C 844D00B8 */ lh $t5, 0x00B8($v0) ## 000000B8 /* 00680 80868350 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00684 80868354 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 /* 00688 80868358 00000000 */ nop -/* 0068C 8086835C 468021A0 */ cvt.s.w $f6, $f4 -/* 00690 80868360 46083302 */ mul.s $f12, $f6, $f8 -/* 00694 80868364 0C0343B5 */ jal Matrix_RotateZ +/* 0068C 8086835C 468021A0 */ cvt.s.w $f6, $f4 +/* 00690 80868360 46083302 */ mul.s $f12, $f6, $f8 +/* 00694 80868364 0C0343B5 */ jal Matrix_RotateZ /* 00698 80868368 00000000 */ nop /* 0069C 8086836C 3C018087 */ lui $at, %hi(D_80869B98) ## $at = 80870000 -/* 006A0 80868370 C42C9B98 */ lwc1 $f12, %lo(D_80869B98)($at) +/* 006A0 80868370 C42C9B98 */ lwc1 $f12, %lo(D_80869B98)($at) /* 006A4 80868374 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A8 80868378 44066000 */ mfc1 $a2, $f12 -/* 006AC 8086837C 0C0342A3 */ jal Matrix_Scale -/* 006B0 80868380 46006386 */ mov.s $f14, $f12 -/* 006B4 80868384 8FAE0098 */ lw $t6, 0x0098($sp) +/* 006A8 80868378 44066000 */ mfc1 $a2, $f12 +/* 006AC 8086837C 0C0342A3 */ jal Matrix_Scale +/* 006B0 80868380 46006386 */ mov.s $f14, $f12 +/* 006B4 80868384 8FAE0098 */ lw $t6, 0x0098($sp) /* 006B8 80868388 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 006BC 8086838C C5D00164 */ lwc1 $f16, 0x0164($t6) ## 00000164 -/* 006C0 80868390 4610503C */ c.lt.s $f10, $f16 +/* 006C0 80868390 4610503C */ c.lt.s $f10, $f16 /* 006C4 80868394 00000000 */ nop -/* 006C8 80868398 4502003A */ bc1fl .L80868484 -/* 006CC 8086839C 8FAE009C */ lw $t6, 0x009C($sp) -/* 006D0 808683A0 0C024DF0 */ jal func_800937C0 +/* 006C8 80868398 4502003A */ bc1fl .L80868484 +/* 006CC 8086839C 8FAE009C */ lw $t6, 0x009C($sp) +/* 006D0 808683A0 0C024DF0 */ jal func_800937C0 /* 006D4 808683A4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 006D8 808683A8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 006DC 808683AC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 006E0 808683B0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 006E4 808683B4 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 /* 006E8 808683B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 006EC 808683BC 8FB90098 */ lw $t9, 0x0098($sp) +/* 006EC 808683BC 8FB90098 */ lw $t9, 0x0098($sp) /* 006F0 808683C0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 006F4 808683C4 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 006F8 808683C8 C7200164 */ lwc1 $f0, 0x0164($t9) ## 00000164 /* 006FC 808683CC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00700 808683D0 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 00704 808683D4 46120102 */ mul.s $f4, $f0, $f18 +/* 00704 808683D4 46120102 */ mul.s $f4, $f0, $f18 /* 00708 808683D8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 0070C 808683DC 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 00710 808683E0 46004282 */ mul.s $f10, $f8, $f0 -/* 00714 808683E4 4600218D */ trunc.w.s $f6, $f4 -/* 00718 808683E8 46009102 */ mul.s $f4, $f18, $f0 -/* 0071C 808683EC 440E3000 */ mfc1 $t6, $f6 -/* 00720 808683F0 4600540D */ trunc.w.s $f16, $f10 +/* 00710 808683E0 46004282 */ mul.s $f10, $f8, $f0 +/* 00714 808683E4 4600218D */ trunc.w.s $f6, $f4 +/* 00718 808683E8 46009102 */ mul.s $f4, $f18, $f0 +/* 0071C 808683EC 440E3000 */ mfc1 $t6, $f6 +/* 00720 808683F0 4600540D */ trunc.w.s $f16, $f10 /* 00724 808683F4 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 00728 808683F8 000FC400 */ sll $t8, $t7, 16 -/* 0072C 808683FC 4600218D */ trunc.w.s $f6, $f4 -/* 00730 80868400 440D8000 */ mfc1 $t5, $f16 +/* 00728 808683F8 000FC400 */ sll $t8, $t7, 16 +/* 0072C 808683FC 4600218D */ trunc.w.s $f6, $f4 +/* 00730 80868400 440D8000 */ mfc1 $t5, $f16 /* 00734 80868404 00000000 */ nop /* 00738 80868408 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 0073C 8086840C 000E7A00 */ sll $t7, $t6, 8 -/* 00740 80868410 440E3000 */ mfc1 $t6, $f6 +/* 0073C 8086840C 000E7A00 */ sll $t7, $t6, 8 +/* 00740 80868410 440E3000 */ mfc1 $t6, $f6 /* 00744 80868414 030FC825 */ or $t9, $t8, $t7 ## $t9 = FA000000 /* 00748 80868418 3C0DE300 */ lui $t5, 0xE300 ## $t5 = E3000000 /* 0074C 8086841C 31D800FF */ andi $t8, $t6, 0x00FF ## $t8 = 00000000 @@ -140,9 +140,9 @@ glabel ArrowIce_Draw /* 007A4 80868474 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 007A8 80868478 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 007AC 8086847C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 007B0 80868480 8FAE009C */ lw $t6, 0x009C($sp) +/* 007B0 80868480 8FAE009C */ lw $t6, 0x009C($sp) .L80868484: -/* 007B4 80868484 0C024F61 */ jal func_80093D84 +/* 007B4 80868484 0C024F61 */ jal func_80093D84 /* 007B8 80868488 8DC40000 */ lw $a0, 0x0000($t6) ## 00000030 /* 007BC 8086848C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 007C0 80868490 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -150,7 +150,7 @@ glabel ArrowIce_Draw /* 007C8 80868498 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 007CC 8086849C AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 007D0 808684A0 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 007D4 808684A4 8FAF0098 */ lw $t7, 0x0098($sp) +/* 007D4 808684A4 8FAF0098 */ lw $t7, 0x0098($sp) /* 007D8 808684A8 3C01AAFF */ lui $at, 0xAAFF ## $at = AAFF0000 /* 007DC 808684AC 3421FF00 */ ori $at, $at, 0xFF00 ## $at = AAFFFF00 /* 007E0 808684B0 91ED0150 */ lbu $t5, 0x0150($t7) ## 00000150 @@ -166,47 +166,47 @@ glabel ArrowIce_Draw /* 00808 808684D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0080C 808684DC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00810 808684E0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00814 808684E4 0C034421 */ jal Matrix_RotateXYZ +/* 00814 808684E4 0C034421 */ jal Matrix_RotateZYX /* 00818 808684E8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0081C 808684EC 8FAC0098 */ lw $t4, 0x0098($sp) +/* 0081C 808684EC 8FAC0098 */ lw $t4, 0x0098($sp) /* 00820 808684F0 3C018087 */ lui $at, %hi(D_80869B9C) ## $at = 80870000 /* 00824 808684F4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00828 808684F8 958D014E */ lhu $t5, 0x014E($t4) ## 0000014E /* 0082C 808684FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00830 80868500 51A00009 */ beql $t5, $zero, .L80868528 +/* 00830 80868500 51A00009 */ beql $t5, $zero, .L80868528 /* 00834 80868504 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00838 80868508 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0083C 8086850C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00840 80868510 44066000 */ mfc1 $a2, $f12 -/* 00844 80868514 0C034261 */ jal Matrix_Translate -/* 00848 80868518 46006386 */ mov.s $f14, $f12 -/* 0084C 8086851C 10000005 */ beq $zero, $zero, .L80868534 -/* 00850 80868520 8FAE0098 */ lw $t6, 0x0098($sp) +/* 00840 80868510 44066000 */ mfc1 $a2, $f12 +/* 00844 80868514 0C034261 */ jal Matrix_Translate +/* 00848 80868518 46006386 */ mov.s $f14, $f12 +/* 0084C 8086851C 10000005 */ beq $zero, $zero, .L80868534 +/* 00850 80868520 8FAE0098 */ lw $t6, 0x0098($sp) /* 00854 80868524 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 .L80868528: -/* 00858 80868528 0C034261 */ jal Matrix_Translate -/* 0085C 8086852C C42E9B9C */ lwc1 $f14, %lo(D_80869B9C)($at) -/* 00860 80868530 8FAE0098 */ lw $t6, 0x0098($sp) +/* 00858 80868528 0C034261 */ jal Matrix_Translate +/* 0085C 8086852C C42E9B9C */ lwc1 $f14, %lo(D_80869B9C)($at) +/* 00860 80868530 8FAE0098 */ lw $t6, 0x0098($sp) .L80868534: /* 00864 80868534 3C018087 */ lui $at, %hi(D_80869BA0) ## $at = 80870000 -/* 00868 80868538 C4309BA0 */ lwc1 $f16, %lo(D_80869BA0)($at) +/* 00868 80868538 C4309BA0 */ lwc1 $f16, %lo(D_80869BA0)($at) /* 0086C 8086853C 85D9014C */ lh $t9, 0x014C($t6) ## 0000014C /* 00870 80868540 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00874 80868544 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 00878 80868548 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 0087C 8086854C C5D20160 */ lwc1 $f18, 0x0160($t6) ## 00000160 /* 00880 80868550 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00884 80868554 468042A0 */ cvt.s.w $f10, $f8 -/* 00888 80868558 46105302 */ mul.s $f12, $f10, $f16 -/* 0088C 8086855C 44066000 */ mfc1 $a2, $f12 -/* 00890 80868560 46049382 */ mul.s $f14, $f18, $f4 -/* 00894 80868564 0C0342A3 */ jal Matrix_Scale +/* 00884 80868554 468042A0 */ cvt.s.w $f10, $f8 +/* 00888 80868558 46105302 */ mul.s $f12, $f10, $f16 +/* 0088C 8086855C 44066000 */ mfc1 $a2, $f12 +/* 00890 80868560 46049382 */ mul.s $f14, $f18, $f4 +/* 00894 80868564 0C0342A3 */ jal Matrix_Scale /* 00898 80868568 00000000 */ nop /* 0089C 8086856C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 008A0 80868570 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 /* 008A4 80868574 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 008A8 80868578 44066000 */ mfc1 $a2, $f12 -/* 008AC 8086857C 0C034261 */ jal Matrix_Translate +/* 008A8 80868578 44066000 */ mfc1 $a2, $f12 +/* 008AC 8086857C 0C034261 */ jal Matrix_Translate /* 008B0 80868580 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 008B4 80868584 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 008B8 80868588 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -214,14 +214,14 @@ glabel ArrowIce_Draw /* 008C0 80868590 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 008C4 80868594 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 008C8 80868598 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008CC 8086859C 8FAC009C */ lw $t4, 0x009C($sp) +/* 008CC 8086859C 8FAC009C */ lw $t4, 0x009C($sp) /* 008D0 808685A0 3C058087 */ lui $a1, %hi(D_80869B50) ## $a1 = 80870000 /* 008D4 808685A4 24A59B50 */ addiu $a1, $a1, %lo(D_80869B50) ## $a1 = 80869B50 /* 008D8 808685A8 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 008DC 808685AC 24060294 */ addiu $a2, $zero, 0x0294 ## $a2 = 00000294 -/* 008E0 808685B0 0C0346A2 */ jal Matrix_NewMtx -/* 008E4 808685B4 AFA20054 */ sw $v0, 0x0054($sp) -/* 008E8 808685B8 8FA30054 */ lw $v1, 0x0054($sp) +/* 008E0 808685B0 0C0346A2 */ jal Matrix_NewMtx +/* 008E4 808685B4 AFA20054 */ sw $v0, 0x0054($sp) +/* 008E8 808685B8 8FA30054 */ lw $v1, 0x0054($sp) /* 008EC 808685BC 3C198087 */ lui $t9, %hi(D_80869970) ## $t9 = 80870000 /* 008F0 808685C0 27399970 */ addiu $t9, $t9, %lo(D_80869970) ## $t9 = 80869970 /* 008F4 808685C4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -233,38 +233,38 @@ glabel ArrowIce_Draw /* 0090C 808685DC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 00910 808685E0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00914 808685E4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00918 808685E8 8FAB0088 */ lw $t3, 0x0088($sp) +/* 00918 808685E8 8FAB0088 */ lw $t3, 0x0088($sp) /* 0091C 808685EC 240D0080 */ addiu $t5, $zero, 0x0080 ## $t5 = 00000080 /* 00920 808685F0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00924 808685F4 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 00928 808685F8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0092C 808685FC 8FB8009C */ lw $t8, 0x009C($sp) -/* 00930 80868600 000B7880 */ sll $t7, $t3, 2 -/* 00934 80868604 01EB7821 */ addu $t7, $t7, $t3 +/* 0092C 808685FC 8FB8009C */ lw $t8, 0x009C($sp) +/* 00930 80868600 000B7880 */ sll $t7, $t3, 2 +/* 00934 80868604 01EB7821 */ addu $t7, $t7, $t3 /* 00938 80868608 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 0093C 8086860C 000BC080 */ sll $t8, $t3, 2 +/* 0093C 8086860C 000BC080 */ sll $t8, $t3, 2 /* 00940 80868610 31EC01FF */ andi $t4, $t7, 0x01FF ## $t4 = 00000000 -/* 00944 80868614 030BC021 */ addu $t8, $t8, $t3 -/* 00948 80868618 0018C040 */ sll $t8, $t8, 1 +/* 00944 80868614 030BC021 */ addu $t8, $t8, $t3 +/* 00948 80868618 0018C040 */ sll $t8, $t8, 1 /* 0094C 8086861C 330F01FF */ andi $t7, $t8, 0x01FF ## $t7 = 00000000 -/* 00950 80868620 012C3023 */ subu $a2, $t1, $t4 -/* 00954 80868624 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00950 80868620 012C3023 */ subu $a2, $t1, $t4 +/* 00954 80868624 AFAD0010 */ sw $t5, 0x0010($sp) /* 00958 80868628 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 /* 0095C 8086862C 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 00960 80868630 012F1823 */ subu $v1, $t1, $t7 +/* 00960 80868630 012F1823 */ subu $v1, $t1, $t7 /* 00964 80868634 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00968 80868638 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 0096C 8086863C AFB90014 */ sw $t9, 0x0014($sp) -/* 00970 80868640 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00974 80868644 AFA3001C */ sw $v1, 0x001C($sp) -/* 00978 80868648 AFA30020 */ sw $v1, 0x0020($sp) -/* 0097C 8086864C AFAC0024 */ sw $t4, 0x0024($sp) -/* 00980 80868650 AFAD0028 */ sw $t5, 0x0028($sp) +/* 0096C 8086863C AFB90014 */ sw $t9, 0x0014($sp) +/* 00970 80868640 AFAE0018 */ sw $t6, 0x0018($sp) +/* 00974 80868644 AFA3001C */ sw $v1, 0x001C($sp) +/* 00978 80868648 AFA30020 */ sw $v1, 0x0020($sp) +/* 0097C 8086864C AFAC0024 */ sw $t4, 0x0024($sp) +/* 00980 80868650 AFAD0028 */ sw $t5, 0x0028($sp) /* 00984 80868654 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00988 80868658 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0098C 8086865C 0C0253D0 */ jal Draw_TwoTexScroll -/* 00990 80868660 AFA2004C */ sw $v0, 0x004C($sp) -/* 00994 80868664 8FA8004C */ lw $t0, 0x004C($sp) +/* 0098C 8086865C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00990 80868660 AFA2004C */ sw $v0, 0x004C($sp) +/* 00994 80868664 8FA8004C */ lw $t0, 0x004C($sp) /* 00998 80868668 3C188087 */ lui $t8, %hi(D_80869A20) ## $t8 = 80870000 /* 0099C 8086866C 27189A20 */ addiu $t8, $t8, %lo(D_80869A20) ## $t8 = 80869A20 /* 009A0 80868670 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -275,18 +275,18 @@ glabel ArrowIce_Draw /* 009B4 80868684 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 009B8 80868688 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 009BC 8086868C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009C0 80868690 8FAF009C */ lw $t7, 0x009C($sp) +/* 009C0 80868690 8FAF009C */ lw $t7, 0x009C($sp) /* 009C4 80868694 24C69B64 */ addiu $a2, $a2, %lo(D_80869B64) ## $a2 = 80869B64 /* 009C8 80868698 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 009CC 8086869C 240702A4 */ addiu $a3, $zero, 0x02A4 ## $a3 = 000002A4 -/* 009D0 808686A0 0C031AD5 */ jal func_800C6B54 +/* 009D0 808686A0 0C031AD5 */ jal func_800C6B54 /* 009D4 808686A4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 .L808686A8: -/* 009D8 808686A8 8FBF003C */ lw $ra, 0x003C($sp) +/* 009D8 808686A8 8FBF003C */ lw $ra, 0x003C($sp) .L808686AC: -/* 009DC 808686AC 8FB00038 */ lw $s0, 0x0038($sp) +/* 009DC 808686AC 8FB00038 */ lw $s0, 0x0038($sp) /* 009E0 808686B0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 009E4 808686B4 03E00008 */ jr $ra +/* 009E4 808686B4 03E00008 */ jr $ra /* 009E8 808686B8 00000000 */ nop /* 009EC 808686BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s index e5db139a55..d17143562b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s @@ -1,120 +1,120 @@ glabel ArrowLight_Draw /* 00580 8086A230 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00584 8086A234 AFBF003C */ sw $ra, 0x003C($sp) -/* 00588 8086A238 AFB00038 */ sw $s0, 0x0038($sp) -/* 0058C 8086A23C AFA40098 */ sw $a0, 0x0098($sp) -/* 00590 8086A240 AFA5009C */ sw $a1, 0x009C($sp) +/* 00584 8086A234 AFBF003C */ sw $ra, 0x003C($sp) +/* 00588 8086A238 AFB00038 */ sw $s0, 0x0038($sp) +/* 0058C 8086A23C AFA40098 */ sw $a0, 0x0098($sp) +/* 00590 8086A240 AFA5009C */ sw $a1, 0x009C($sp) /* 00594 8086A244 8CAF009C */ lw $t7, 0x009C($a1) ## 0000009C -/* 00598 8086A248 AFAF008C */ sw $t7, 0x008C($sp) +/* 00598 8086A248 AFAF008C */ sw $t7, 0x008C($sp) /* 0059C 8086A24C 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 005A0 8086A250 50600112 */ beql $v1, $zero, .L8086A69C -/* 005A4 8086A254 8FBF003C */ lw $ra, 0x003C($sp) +/* 005A0 8086A250 50600112 */ beql $v1, $zero, .L8086A69C +/* 005A4 8086A254 8FBF003C */ lw $ra, 0x003C($sp) /* 005A8 8086A258 8C790130 */ lw $t9, 0x0130($v1) ## 00000130 -/* 005AC 8086A25C 5320010F */ beql $t9, $zero, .L8086A69C -/* 005B0 8086A260 8FBF003C */ lw $ra, 0x003C($sp) +/* 005AC 8086A25C 5320010F */ beql $t9, $zero, .L8086A69C +/* 005B0 8086A260 8FBF003C */ lw $ra, 0x003C($sp) /* 005B4 8086A264 948C014E */ lhu $t4, 0x014E($a0) ## 0000014E /* 005B8 8086A268 3C068087 */ lui $a2, %hi(D_8086BB2C) ## $a2 = 80870000 /* 005BC 8086A26C 24C6BB2C */ addiu $a2, $a2, %lo(D_8086BB2C) ## $a2 = 8086BB2C -/* 005C0 8086A270 298100FF */ slti $at, $t4, 0x00FF -/* 005C4 8086A274 10200108 */ beq $at, $zero, .L8086A698 -/* 005C8 8086A278 8FAF009C */ lw $t7, 0x009C($sp) +/* 005C0 8086A270 298100FF */ slti $at, $t4, 0x00FF +/* 005C4 8086A274 10200108 */ beq $at, $zero, .L8086A698 +/* 005C8 8086A278 8FAF009C */ lw $t7, 0x009C($sp) /* 005CC 8086A27C 906D0249 */ lbu $t5, 0x0249($v1) ## 00000249 /* 005D0 8086A280 24070256 */ addiu $a3, $zero, 0x0256 ## $a3 = 00000256 /* 005D4 8086A284 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 005D8 8086A288 51C00004 */ beql $t6, $zero, .L8086A29C +/* 005D8 8086A288 51C00004 */ beql $t6, $zero, .L8086A29C /* 005DC 8086A28C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 005E0 8086A290 10000002 */ beq $zero, $zero, .L8086A29C +/* 005E0 8086A290 10000002 */ beq $zero, $zero, .L8086A29C /* 005E4 8086A294 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 005E8 8086A298 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L8086A29C: /* 005EC 8086A29C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 005F0 8086A2A0 AFA20084 */ sw $v0, 0x0084($sp) +/* 005F0 8086A2A0 AFA20084 */ sw $v0, 0x0084($sp) /* 005F4 8086A2A4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 8086A2A8 0C031AB1 */ jal func_800C6AC4 +/* 005F8 8086A2A8 0C031AB1 */ jal func_800C6AC4 /* 005FC 8086A2AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00600 8086A2B0 8FA20084 */ lw $v0, 0x0084($sp) +/* 00600 8086A2B0 8FA20084 */ lw $v0, 0x0084($sp) /* 00604 8086A2B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00608 8086A2B8 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 /* 0060C 8086A2BC C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00610 8086A2C0 0C034261 */ jal Matrix_Translate +/* 00610 8086A2C0 0C034261 */ jal Matrix_Translate /* 00614 8086A2C4 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 00618 8086A2C8 8FA20084 */ lw $v0, 0x0084($sp) +/* 00618 8086A2C8 8FA20084 */ lw $v0, 0x0084($sp) /* 0061C 8086A2CC 3C018087 */ lui $at, %hi(D_8086BB7C) ## $at = 80870000 -/* 00620 8086A2D0 C428BB7C */ lwc1 $f8, %lo(D_8086BB7C)($at) +/* 00620 8086A2D0 C428BB7C */ lwc1 $f8, %lo(D_8086BB7C)($at) /* 00624 8086A2D4 845800B6 */ lh $t8, 0x00B6($v0) ## 000000B6 /* 00628 8086A2D8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0062C 8086A2DC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 00630 8086A2E0 00000000 */ nop -/* 00634 8086A2E4 468021A0 */ cvt.s.w $f6, $f4 -/* 00638 8086A2E8 46083302 */ mul.s $f12, $f6, $f8 -/* 0063C 8086A2EC 0C034348 */ jal Matrix_RotateY +/* 00634 8086A2E4 468021A0 */ cvt.s.w $f6, $f4 +/* 00638 8086A2E8 46083302 */ mul.s $f12, $f6, $f8 +/* 0063C 8086A2EC 0C034348 */ jal Matrix_RotateY /* 00640 8086A2F0 00000000 */ nop -/* 00644 8086A2F4 8FA20084 */ lw $v0, 0x0084($sp) +/* 00644 8086A2F4 8FA20084 */ lw $v0, 0x0084($sp) /* 00648 8086A2F8 3C018087 */ lui $at, %hi(D_8086BB80) ## $at = 80870000 -/* 0064C 8086A2FC C432BB80 */ lwc1 $f18, %lo(D_8086BB80)($at) +/* 0064C 8086A2FC C432BB80 */ lwc1 $f18, %lo(D_8086BB80)($at) /* 00650 8086A300 845900B4 */ lh $t9, 0x00B4($v0) ## 000000B4 /* 00654 8086A304 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00658 8086A308 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0065C 8086A30C 00000000 */ nop -/* 00660 8086A310 46805420 */ cvt.s.w $f16, $f10 -/* 00664 8086A314 46128302 */ mul.s $f12, $f16, $f18 -/* 00668 8086A318 0C0342DC */ jal Matrix_RotateX +/* 00660 8086A310 46805420 */ cvt.s.w $f16, $f10 +/* 00664 8086A314 46128302 */ mul.s $f12, $f16, $f18 +/* 00668 8086A318 0C0342DC */ jal Matrix_RotateX /* 0066C 8086A31C 00000000 */ nop -/* 00670 8086A320 8FA20084 */ lw $v0, 0x0084($sp) +/* 00670 8086A320 8FA20084 */ lw $v0, 0x0084($sp) /* 00674 8086A324 3C018087 */ lui $at, %hi(D_8086BB84) ## $at = 80870000 -/* 00678 8086A328 C428BB84 */ lwc1 $f8, %lo(D_8086BB84)($at) +/* 00678 8086A328 C428BB84 */ lwc1 $f8, %lo(D_8086BB84)($at) /* 0067C 8086A32C 844B00B8 */ lh $t3, 0x00B8($v0) ## 000000B8 /* 00680 8086A330 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00684 8086A334 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 00688 8086A338 00000000 */ nop -/* 0068C 8086A33C 468021A0 */ cvt.s.w $f6, $f4 -/* 00690 8086A340 46083302 */ mul.s $f12, $f6, $f8 -/* 00694 8086A344 0C0343B5 */ jal Matrix_RotateZ +/* 0068C 8086A33C 468021A0 */ cvt.s.w $f6, $f4 +/* 00690 8086A340 46083302 */ mul.s $f12, $f6, $f8 +/* 00694 8086A344 0C0343B5 */ jal Matrix_RotateZ /* 00698 8086A348 00000000 */ nop /* 0069C 8086A34C 3C018087 */ lui $at, %hi(D_8086BB88) ## $at = 80870000 -/* 006A0 8086A350 C42CBB88 */ lwc1 $f12, %lo(D_8086BB88)($at) +/* 006A0 8086A350 C42CBB88 */ lwc1 $f12, %lo(D_8086BB88)($at) /* 006A4 8086A354 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A8 8086A358 44066000 */ mfc1 $a2, $f12 -/* 006AC 8086A35C 0C0342A3 */ jal Matrix_Scale -/* 006B0 8086A360 46006386 */ mov.s $f14, $f12 -/* 006B4 8086A364 8FAC0098 */ lw $t4, 0x0098($sp) +/* 006A8 8086A358 44066000 */ mfc1 $a2, $f12 +/* 006AC 8086A35C 0C0342A3 */ jal Matrix_Scale +/* 006B0 8086A360 46006386 */ mov.s $f14, $f12 +/* 006B4 8086A364 8FAC0098 */ lw $t4, 0x0098($sp) /* 006B8 8086A368 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 006BC 8086A36C C5900164 */ lwc1 $f16, 0x0164($t4) ## 00000164 -/* 006C0 8086A370 4610503C */ c.lt.s $f10, $f16 +/* 006C0 8086A370 4610503C */ c.lt.s $f10, $f16 /* 006C4 8086A374 00000000 */ nop -/* 006C8 8086A378 45020039 */ bc1fl .L8086A460 -/* 006CC 8086A37C 8FAE009C */ lw $t6, 0x009C($sp) -/* 006D0 8086A380 0C024DF0 */ jal func_800937C0 +/* 006C8 8086A378 45020039 */ bc1fl .L8086A460 +/* 006CC 8086A37C 8FAE009C */ lw $t6, 0x009C($sp) +/* 006D0 8086A380 0C024DF0 */ jal func_800937C0 /* 006D4 8086A384 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 006D8 8086A388 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 006DC 8086A38C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 006E0 8086A390 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 006E4 8086A394 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 /* 006E8 8086A398 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006EC 8086A39C 8FAF0098 */ lw $t7, 0x0098($sp) +/* 006EC 8086A39C 8FAF0098 */ lw $t7, 0x0098($sp) /* 006F0 8086A3A0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 006F4 8086A3A4 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 /* 006F8 8086A3A8 C5E00164 */ lwc1 $f0, 0x0164($t7) ## 00000164 /* 006FC 8086A3AC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00700 8086A3B0 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 00704 8086A3B4 46120102 */ mul.s $f4, $f0, $f18 +/* 00704 8086A3B4 46120102 */ mul.s $f4, $f0, $f18 /* 00708 8086A3B8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 0070C 8086A3BC 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 00710 8086A3C0 46004282 */ mul.s $f10, $f8, $f0 +/* 00710 8086A3C0 46004282 */ mul.s $f10, $f8, $f0 /* 00714 8086A3C4 3C0EE300 */ lui $t6, 0xE300 ## $t6 = E3000000 /* 00718 8086A3C8 35CE1A01 */ ori $t6, $t6, 0x1A01 ## $t6 = E3001A01 /* 0071C 8086A3CC 240F0030 */ addiu $t7, $zero, 0x0030 ## $t7 = 00000030 -/* 00720 8086A3D0 4600218D */ trunc.w.s $f6, $f4 -/* 00724 8086A3D4 46009102 */ mul.s $f4, $f18, $f0 -/* 00728 8086A3D8 440C3000 */ mfc1 $t4, $f6 -/* 0072C 8086A3DC 4600540D */ trunc.w.s $f16, $f10 -/* 00730 8086A3E0 000C6E00 */ sll $t5, $t4, 24 -/* 00734 8086A3E4 4600218D */ trunc.w.s $f6, $f4 -/* 00738 8086A3E8 44188000 */ mfc1 $t8, $f16 +/* 00720 8086A3D0 4600218D */ trunc.w.s $f6, $f4 +/* 00724 8086A3D4 46009102 */ mul.s $f4, $f18, $f0 +/* 00728 8086A3D8 440C3000 */ mfc1 $t4, $f6 +/* 0072C 8086A3DC 4600540D */ trunc.w.s $f16, $f10 +/* 00730 8086A3E0 000C6E00 */ sll $t5, $t4, 24 +/* 00734 8086A3E4 4600218D */ trunc.w.s $f6, $f4 +/* 00738 8086A3E8 44188000 */ mfc1 $t8, $f16 /* 0073C 8086A3EC 00000000 */ nop /* 00740 8086A3F0 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00744 8086A3F4 44183000 */ mfc1 $t8, $f6 -/* 00748 8086A3F8 00195C00 */ sll $t3, $t9, 16 +/* 00744 8086A3F4 44183000 */ mfc1 $t8, $f6 +/* 00748 8086A3F8 00195C00 */ sll $t3, $t9, 16 /* 0074C 8086A3FC 01AB6025 */ or $t4, $t5, $t3 ## $t4 = 00000008 /* 00750 8086A400 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 /* 00754 8086A404 01996825 */ or $t5, $t4, $t9 ## $t5 = 00000008 @@ -139,9 +139,9 @@ glabel ArrowLight_Draw /* 007A0 8086A450 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 007A4 8086A454 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 007A8 8086A458 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 007AC 8086A45C 8FAE009C */ lw $t6, 0x009C($sp) +/* 007AC 8086A45C 8FAE009C */ lw $t6, 0x009C($sp) .L8086A460: -/* 007B0 8086A460 0C024F61 */ jal func_80093D84 +/* 007B0 8086A460 0C024F61 */ jal func_80093D84 /* 007B4 8086A464 8DC40000 */ lw $a0, 0x0000($t6) ## E3001A01 /* 007B8 8086A468 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 007BC 8086A46C 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -149,7 +149,7 @@ glabel ArrowLight_Draw /* 007C4 8086A474 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 007C8 8086A478 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 007CC 8086A47C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 007D0 8086A480 8FAC0098 */ lw $t4, 0x0098($sp) +/* 007D0 8086A480 8FAC0098 */ lw $t4, 0x0098($sp) /* 007D4 8086A484 2401AA00 */ addiu $at, $zero, 0xAA00 ## $at = FFFFAA00 /* 007D8 8086A488 3C18FFFF */ lui $t8, 0xFFFF ## $t8 = FFFF0000 /* 007DC 8086A48C 918D0150 */ lbu $t5, 0x0150($t4) ## 00000150 @@ -165,47 +165,47 @@ glabel ArrowLight_Draw /* 00804 8086A4B4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00808 8086A4B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0080C 8086A4BC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00810 8086A4C0 0C034421 */ jal Matrix_RotateXYZ +/* 00810 8086A4C0 0C034421 */ jal Matrix_RotateZYX /* 00814 8086A4C4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00818 8086A4C8 8FAC0098 */ lw $t4, 0x0098($sp) +/* 00818 8086A4C8 8FAC0098 */ lw $t4, 0x0098($sp) /* 0081C 8086A4CC 3C018087 */ lui $at, %hi(D_8086BB8C) ## $at = 80870000 /* 00820 8086A4D0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00824 8086A4D4 9599014E */ lhu $t9, 0x014E($t4) ## 0000014E /* 00828 8086A4D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0082C 8086A4DC 53200009 */ beql $t9, $zero, .L8086A504 +/* 0082C 8086A4DC 53200009 */ beql $t9, $zero, .L8086A504 /* 00830 8086A4E0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00834 8086A4E4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00838 8086A4E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0083C 8086A4EC 44066000 */ mfc1 $a2, $f12 -/* 00840 8086A4F0 0C034261 */ jal Matrix_Translate -/* 00844 8086A4F4 46006386 */ mov.s $f14, $f12 -/* 00848 8086A4F8 10000005 */ beq $zero, $zero, .L8086A510 -/* 0084C 8086A4FC 8FAD0098 */ lw $t5, 0x0098($sp) +/* 0083C 8086A4EC 44066000 */ mfc1 $a2, $f12 +/* 00840 8086A4F0 0C034261 */ jal Matrix_Translate +/* 00844 8086A4F4 46006386 */ mov.s $f14, $f12 +/* 00848 8086A4F8 10000005 */ beq $zero, $zero, .L8086A510 +/* 0084C 8086A4FC 8FAD0098 */ lw $t5, 0x0098($sp) /* 00850 8086A500 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 .L8086A504: -/* 00854 8086A504 0C034261 */ jal Matrix_Translate -/* 00858 8086A508 C42EBB8C */ lwc1 $f14, %lo(D_8086BB8C)($at) -/* 0085C 8086A50C 8FAD0098 */ lw $t5, 0x0098($sp) +/* 00854 8086A504 0C034261 */ jal Matrix_Translate +/* 00858 8086A508 C42EBB8C */ lwc1 $f14, %lo(D_8086BB8C)($at) +/* 0085C 8086A50C 8FAD0098 */ lw $t5, 0x0098($sp) .L8086A510: /* 00860 8086A510 3C018087 */ lui $at, %hi(D_8086BB90) ## $at = 80870000 -/* 00864 8086A514 C430BB90 */ lwc1 $f16, %lo(D_8086BB90)($at) +/* 00864 8086A514 C430BB90 */ lwc1 $f16, %lo(D_8086BB90)($at) /* 00868 8086A518 85AB014C */ lh $t3, 0x014C($t5) ## 0000014C /* 0086C 8086A51C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00870 8086A520 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 /* 00874 8086A524 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 /* 00878 8086A528 C5B20160 */ lwc1 $f18, 0x0160($t5) ## 00000160 /* 0087C 8086A52C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00880 8086A530 468042A0 */ cvt.s.w $f10, $f8 -/* 00884 8086A534 46105302 */ mul.s $f12, $f10, $f16 -/* 00888 8086A538 44066000 */ mfc1 $a2, $f12 -/* 0088C 8086A53C 46049382 */ mul.s $f14, $f18, $f4 -/* 00890 8086A540 0C0342A3 */ jal Matrix_Scale +/* 00880 8086A530 468042A0 */ cvt.s.w $f10, $f8 +/* 00884 8086A534 46105302 */ mul.s $f12, $f10, $f16 +/* 00888 8086A538 44066000 */ mfc1 $a2, $f12 +/* 0088C 8086A53C 46049382 */ mul.s $f14, $f18, $f4 +/* 00890 8086A540 0C0342A3 */ jal Matrix_Scale /* 00894 8086A544 00000000 */ nop /* 00898 8086A548 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0089C 8086A54C 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 /* 008A0 8086A550 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 008A4 8086A554 44066000 */ mfc1 $a2, $f12 -/* 008A8 8086A558 0C034261 */ jal Matrix_Translate +/* 008A4 8086A554 44066000 */ mfc1 $a2, $f12 +/* 008A8 8086A558 0C034261 */ jal Matrix_Translate /* 008AC 8086A55C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 008B0 8086A560 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 008B4 8086A564 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -213,14 +213,14 @@ glabel ArrowLight_Draw /* 008BC 8086A56C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 008C0 8086A570 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 008C4 8086A574 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008C8 8086A578 8FB8009C */ lw $t8, 0x009C($sp) +/* 008C8 8086A578 8FB8009C */ lw $t8, 0x009C($sp) /* 008CC 8086A57C 3C058087 */ lui $a1, %hi(D_8086BB40) ## $a1 = 80870000 /* 008D0 8086A580 24A5BB40 */ addiu $a1, $a1, %lo(D_8086BB40) ## $a1 = 8086BB40 /* 008D4 8086A584 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 008D8 8086A588 24060288 */ addiu $a2, $zero, 0x0288 ## $a2 = 00000288 -/* 008DC 8086A58C 0C0346A2 */ jal Matrix_NewMtx -/* 008E0 8086A590 AFA20054 */ sw $v0, 0x0054($sp) -/* 008E4 8086A594 8FA30054 */ lw $v1, 0x0054($sp) +/* 008DC 8086A58C 0C0346A2 */ jal Matrix_NewMtx +/* 008E0 8086A590 AFA20054 */ sw $v0, 0x0054($sp) +/* 008E4 8086A594 8FA30054 */ lw $v1, 0x0054($sp) /* 008E8 8086A598 3C198087 */ lui $t9, %hi(D_8086B960) ## $t9 = 80870000 /* 008EC 8086A59C 2739B960 */ addiu $t9, $t9, %lo(D_8086B960) ## $t9 = 8086B960 /* 008F0 8086A5A0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -232,43 +232,43 @@ glabel ArrowLight_Draw /* 00908 8086A5B8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 0090C 8086A5BC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00910 8086A5C0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00914 8086A5C4 8FAA008C */ lw $t2, 0x008C($sp) +/* 00914 8086A5C4 8FAA008C */ lw $t2, 0x008C($sp) /* 00918 8086A5C8 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 0091C 8086A5CC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00920 8086A5D0 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 00924 8086A5D4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00928 8086A5D8 8FAD009C */ lw $t5, 0x009C($sp) -/* 0092C 8086A5DC 000A7080 */ sll $t6, $t2, 2 -/* 00930 8086A5E0 01CA7021 */ addu $t6, $t6, $t2 +/* 00928 8086A5D8 8FAD009C */ lw $t5, 0x009C($sp) +/* 0092C 8086A5DC 000A7080 */ sll $t6, $t2, 2 +/* 00930 8086A5E0 01CA7021 */ addu $t6, $t6, $t2 /* 00934 8086A5E4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 00938 8086A5E8 31CF01FF */ andi $t7, $t6, 0x01FF ## $t7 = 00000000 -/* 0093C 8086A5EC 006F3023 */ subu $a2, $v1, $t7 -/* 00940 8086A5F0 000A5880 */ sll $t3, $t2, 2 -/* 00944 8086A5F4 016A5821 */ addu $t3, $t3, $t2 -/* 00948 8086A5F8 000A7900 */ sll $t7, $t2, 4 -/* 0094C 8086A5FC 000B5840 */ sll $t3, $t3, 1 -/* 00950 8086A600 01EA7823 */ subu $t7, $t7, $t2 -/* 00954 8086A604 000F7840 */ sll $t7, $t7, 1 +/* 0093C 8086A5EC 006F3023 */ subu $a2, $v1, $t7 +/* 00940 8086A5F0 000A5880 */ sll $t3, $t2, 2 +/* 00944 8086A5F4 016A5821 */ addu $t3, $t3, $t2 +/* 00948 8086A5F8 000A7900 */ sll $t7, $t2, 4 +/* 0094C 8086A5FC 000B5840 */ sll $t3, $t3, 1 +/* 00950 8086A600 01EA7823 */ subu $t7, $t7, $t2 +/* 00954 8086A604 000F7840 */ sll $t7, $t7, 1 /* 00958 8086A608 316D01FF */ andi $t5, $t3, 0x01FF ## $t5 = 00000008 -/* 0095C 8086A60C AFB80010 */ sw $t8, 0x0010($sp) +/* 0095C 8086A60C AFB80010 */ sw $t8, 0x0010($sp) /* 00960 8086A610 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00964 8086A614 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 00968 8086A618 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0096C 8086A61C AFB90018 */ sw $t9, 0x0018($sp) +/* 00968 8086A618 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0096C 8086A61C AFB90018 */ sw $t9, 0x0018($sp) /* 00970 8086A620 31F801FF */ andi $t8, $t7, 0x01FF ## $t8 = 00000000 -/* 00974 8086A624 00786023 */ subu $t4, $v1, $t8 +/* 00974 8086A624 00786023 */ subu $t4, $v1, $t8 /* 00978 8086A628 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 0097C 8086A62C 006D7023 */ subu $t6, $v1, $t5 +/* 0097C 8086A62C 006D7023 */ subu $t6, $v1, $t5 /* 00980 8086A630 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 00984 8086A634 AFAB0028 */ sw $t3, 0x0028($sp) -/* 00988 8086A638 AFAE001C */ sw $t6, 0x001C($sp) -/* 0098C 8086A63C AFB90024 */ sw $t9, 0x0024($sp) -/* 00990 8086A640 AFAC0020 */ sw $t4, 0x0020($sp) +/* 00984 8086A634 AFAB0028 */ sw $t3, 0x0028($sp) +/* 00988 8086A638 AFAE001C */ sw $t6, 0x001C($sp) +/* 0098C 8086A63C AFB90024 */ sw $t9, 0x0024($sp) +/* 00990 8086A640 AFAC0020 */ sw $t4, 0x0020($sp) /* 00994 8086A644 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00998 8086A648 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0099C 8086A64C 0C0253D0 */ jal Draw_TwoTexScroll -/* 009A0 8086A650 AFA2004C */ sw $v0, 0x004C($sp) -/* 009A4 8086A654 8FA8004C */ lw $t0, 0x004C($sp) +/* 0099C 8086A64C 0C0253D0 */ jal Draw_TwoTexScroll +/* 009A0 8086A650 AFA2004C */ sw $v0, 0x004C($sp) +/* 009A4 8086A654 8FA8004C */ lw $t0, 0x004C($sp) /* 009A8 8086A658 3C0F8087 */ lui $t7, %hi(D_8086BA10) ## $t7 = 80870000 /* 009AC 8086A65C 25EFBA10 */ addiu $t7, $t7, %lo(D_8086BA10) ## $t7 = 8086BA10 /* 009B0 8086A660 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -279,18 +279,18 @@ glabel ArrowLight_Draw /* 009C4 8086A674 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 009C8 8086A678 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 009CC 8086A67C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009D0 8086A680 8FB8009C */ lw $t8, 0x009C($sp) +/* 009D0 8086A680 8FB8009C */ lw $t8, 0x009C($sp) /* 009D4 8086A684 24C6BB54 */ addiu $a2, $a2, %lo(D_8086BB54) ## $a2 = 8086BB54 /* 009D8 8086A688 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 009DC 8086A68C 24070298 */ addiu $a3, $zero, 0x0298 ## $a3 = 00000298 -/* 009E0 8086A690 0C031AD5 */ jal func_800C6B54 +/* 009E0 8086A690 0C031AD5 */ jal func_800C6B54 /* 009E4 8086A694 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 .L8086A698: -/* 009E8 8086A698 8FBF003C */ lw $ra, 0x003C($sp) +/* 009E8 8086A698 8FBF003C */ lw $ra, 0x003C($sp) .L8086A69C: -/* 009EC 8086A69C 8FB00038 */ lw $s0, 0x0038($sp) +/* 009EC 8086A69C 8FB00038 */ lw $s0, 0x0038($sp) /* 009F0 8086A6A0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 009F4 8086A6A4 03E00008 */ jr $ra +/* 009F4 8086A6A4 03E00008 */ jr $ra /* 009F8 8086A6A8 00000000 */ nop /* 009FC 8086A6AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s index 555792df76..f439c5cdd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s @@ -1,25 +1,25 @@ glabel func_8086FDC0 /* 001E0 8086FDC0 27BDFE08 */ addiu $sp, $sp, 0xFE08 ## $sp = FFFFFE08 /* 001E4 8086FDC4 3C0F8087 */ lui $t7, %hi(D_808707F0) ## $t7 = 80870000 -/* 001E8 8086FDC8 AFBF0084 */ sw $ra, 0x0084($sp) -/* 001EC 8086FDCC AFBE0080 */ sw $s8, 0x0080($sp) -/* 001F0 8086FDD0 AFB7007C */ sw $s7, 0x007C($sp) -/* 001F4 8086FDD4 AFB60078 */ sw $s6, 0x0078($sp) -/* 001F8 8086FDD8 AFB50074 */ sw $s5, 0x0074($sp) -/* 001FC 8086FDDC AFB40070 */ sw $s4, 0x0070($sp) -/* 00200 8086FDE0 AFB3006C */ sw $s3, 0x006C($sp) -/* 00204 8086FDE4 AFB20068 */ sw $s2, 0x0068($sp) -/* 00208 8086FDE8 AFB10064 */ sw $s1, 0x0064($sp) -/* 0020C 8086FDEC AFB00060 */ sw $s0, 0x0060($sp) -/* 00210 8086FDF0 F7BE0058 */ sdc1 $f30, 0x0058($sp) -/* 00214 8086FDF4 F7BC0050 */ sdc1 $f28, 0x0050($sp) -/* 00218 8086FDF8 F7BA0048 */ sdc1 $f26, 0x0048($sp) -/* 0021C 8086FDFC F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 00220 8086FE00 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 00224 8086FE04 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 00228 8086FE08 AFA60200 */ sw $a2, 0x0200($sp) -/* 0022C 8086FE0C AFA70204 */ sw $a3, 0x0204($sp) -/* 00230 8086FE10 A7A001D8 */ sh $zero, 0x01D8($sp) +/* 001E8 8086FDC8 AFBF0084 */ sw $ra, 0x0084($sp) +/* 001EC 8086FDCC AFBE0080 */ sw $s8, 0x0080($sp) +/* 001F0 8086FDD0 AFB7007C */ sw $s7, 0x007C($sp) +/* 001F4 8086FDD4 AFB60078 */ sw $s6, 0x0078($sp) +/* 001F8 8086FDD8 AFB50074 */ sw $s5, 0x0074($sp) +/* 001FC 8086FDDC AFB40070 */ sw $s4, 0x0070($sp) +/* 00200 8086FDE0 AFB3006C */ sw $s3, 0x006C($sp) +/* 00204 8086FDE4 AFB20068 */ sw $s2, 0x0068($sp) +/* 00208 8086FDE8 AFB10064 */ sw $s1, 0x0064($sp) +/* 0020C 8086FDEC AFB00060 */ sw $s0, 0x0060($sp) +/* 00210 8086FDF0 F7BE0058 */ sdc1 $f30, 0x0058($sp) +/* 00214 8086FDF4 F7BC0050 */ sdc1 $f28, 0x0050($sp) +/* 00218 8086FDF8 F7BA0048 */ sdc1 $f26, 0x0048($sp) +/* 0021C 8086FDFC F7B80040 */ sdc1 $f24, 0x0040($sp) +/* 00220 8086FE00 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 00224 8086FE04 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 00228 8086FE08 AFA60200 */ sw $a2, 0x0200($sp) +/* 0022C 8086FE0C AFA70204 */ sw $a3, 0x0204($sp) +/* 00230 8086FE10 A7A001D8 */ sh $zero, 0x01D8($sp) /* 00234 8086FE14 25EF07F0 */ addiu $t7, $t7, %lo(D_808707F0) ## $t7 = 808707F0 /* 00238 8086FE18 8DF90000 */ lw $t9, 0x0000($t7) ## 808707F0 /* 0023C 8086FE1C 27AE01CC */ addiu $t6, $sp, 0x01CC ## $t6 = FFFFFFD4 @@ -56,7 +56,7 @@ glabel func_8086FDC0 /* 002B4 8086FE94 8DAEFFF8 */ lw $t6, -0x0008($t5) ## 80870818 /* 002B8 8086FE98 AD8EFFF8 */ sw $t6, -0x0008($t4) ## FFFFFF90 /* 002BC 8086FE9C 8DAFFFFC */ lw $t7, -0x0004($t5) ## 8087081C -/* 002C0 8086FEA0 15B8FFF8 */ bne $t5, $t8, .L8086FE84 +/* 002C0 8086FEA0 15B8FFF8 */ bne $t5, $t8, .L8086FE84 /* 002C4 8086FEA4 AD8FFFFC */ sw $t7, -0x0004($t4) ## FFFFFF94 /* 002C8 8086FEA8 3C088087 */ lui $t0, %hi(D_80870844) ## $t0 = 80870000 /* 002CC 8086FEAC 25080844 */ addiu $t0, $t0, %lo(D_80870844) ## $t0 = 80870844 @@ -70,267 +70,267 @@ glabel func_8086FDC0 /* 002E8 8086FEC8 8D09FFF8 */ lw $t1, -0x0008($t0) ## 80870848 /* 002EC 8086FECC AF29FFF8 */ sw $t1, -0x0008($t9) ## FFFFFED0 /* 002F0 8086FED0 8D0AFFFC */ lw $t2, -0x0004($t0) ## 8087084C -/* 002F4 8086FED4 150BFFF8 */ bne $t0, $t3, .L8086FEB8 +/* 002F4 8086FED4 150BFFF8 */ bne $t0, $t3, .L8086FEB8 /* 002F8 8086FED8 AF2AFFFC */ sw $t2, -0x0004($t9) ## FFFFFED4 /* 002FC 8086FEDC 27A20184 */ addiu $v0, $sp, 0x0184 ## $v0 = FFFFFF8C /* 00300 8086FEE0 00402025 */ or $a0, $v0, $zero ## $a0 = FFFFFF8C /* 00304 8086FEE4 27B201A8 */ addiu $s2, $sp, 0x01A8 ## $s2 = FFFFFFB0 -/* 00308 8086FEE8 C7A20208 */ lwc1 $f2, 0x0208($sp) -/* 0030C 8086FEEC C7A0020C */ lwc1 $f0, 0x020C($sp) +/* 00308 8086FEE8 C7A20208 */ lwc1 $f2, 0x0208($sp) +/* 0030C 8086FEEC C7A0020C */ lwc1 $f0, 0x020C($sp) /* 00310 8086FEF0 27A301A8 */ addiu $v1, $sp, 0x01A8 ## $v1 = FFFFFFB0 .L8086FEF4: -/* 00314 8086FEF4 52420004 */ beql $s2, $v0, .L8086FF08 +/* 00314 8086FEF4 52420004 */ beql $s2, $v0, .L8086FF08 /* 00318 8086FEF8 C6440000 */ lwc1 $f4, 0x0000($s2) ## FFFFFFB0 -/* 0031C 8086FEFC 5643000E */ bnel $s2, $v1, .L8086FF38 +/* 0031C 8086FEFC 5643000E */ bnel $s2, $v1, .L8086FF38 /* 00320 8086FF00 C6440000 */ lwc1 $f4, 0x0000($s2) ## FFFFFFB0 /* 00324 8086FF04 C6440000 */ lwc1 $f4, 0x0000($s2) ## FFFFFFB0 .L8086FF08: /* 00328 8086FF08 C6480004 */ lwc1 $f8, 0x0004($s2) ## FFFFFFB4 /* 0032C 8086FF0C C6500008 */ lwc1 $f16, 0x0008($s2) ## FFFFFFB8 -/* 00330 8086FF10 46002182 */ mul.s $f6, $f4, $f0 +/* 00330 8086FF10 46002182 */ mul.s $f6, $f4, $f0 /* 00334 8086FF14 00000000 */ nop -/* 00338 8086FF18 46024282 */ mul.s $f10, $f8, $f2 +/* 00338 8086FF18 46024282 */ mul.s $f10, $f8, $f2 /* 0033C 8086FF1C 00000000 */ nop -/* 00340 8086FF20 46028482 */ mul.s $f18, $f16, $f2 +/* 00340 8086FF20 46028482 */ mul.s $f18, $f16, $f2 /* 00344 8086FF24 E6460000 */ swc1 $f6, 0x0000($s2) ## FFFFFFB0 /* 00348 8086FF28 E64A0004 */ swc1 $f10, 0x0004($s2) ## FFFFFFB4 -/* 0034C 8086FF2C 1000000C */ beq $zero, $zero, .L8086FF60 +/* 0034C 8086FF2C 1000000C */ beq $zero, $zero, .L8086FF60 /* 00350 8086FF30 E6520008 */ swc1 $f18, 0x0008($s2) ## FFFFFFB8 /* 00354 8086FF34 C6440000 */ lwc1 $f4, 0x0000($s2) ## FFFFFFB0 .L8086FF38: /* 00358 8086FF38 C6480004 */ lwc1 $f8, 0x0004($s2) ## FFFFFFB4 /* 0035C 8086FF3C C6500008 */ lwc1 $f16, 0x0008($s2) ## FFFFFFB8 -/* 00360 8086FF40 46022182 */ mul.s $f6, $f4, $f2 +/* 00360 8086FF40 46022182 */ mul.s $f6, $f4, $f2 /* 00364 8086FF44 00000000 */ nop -/* 00368 8086FF48 46004282 */ mul.s $f10, $f8, $f0 +/* 00368 8086FF48 46004282 */ mul.s $f10, $f8, $f0 /* 0036C 8086FF4C 00000000 */ nop -/* 00370 8086FF50 46008482 */ mul.s $f18, $f16, $f0 +/* 00370 8086FF50 46008482 */ mul.s $f18, $f16, $f0 /* 00374 8086FF54 E6460000 */ swc1 $f6, 0x0000($s2) ## FFFFFFB0 /* 00378 8086FF58 E64A0004 */ swc1 $f10, 0x0004($s2) ## FFFFFFB4 /* 0037C 8086FF5C E6520008 */ swc1 $f18, 0x0008($s2) ## FFFFFFB8 .L8086FF60: /* 00380 8086FF60 2652FFF4 */ addiu $s2, $s2, 0xFFF4 ## $s2 = FFFFFFA4 -/* 00384 8086FF64 0244082B */ sltu $at, $s2, $a0 -/* 00388 8086FF68 1020FFE2 */ beq $at, $zero, .L8086FEF4 +/* 00384 8086FF64 0244082B */ sltu $at, $s2, $a0 +/* 00388 8086FF68 1020FFE2 */ beq $at, $zero, .L8086FEF4 /* 0038C 8086FF6C 00000000 */ nop -/* 00390 8086FF70 8FAD0210 */ lw $t5, 0x0210($sp) -/* 00394 8086FF74 AFA001DC */ sw $zero, 0x01DC($sp) +/* 00390 8086FF70 8FAD0210 */ lw $t5, 0x0210($sp) +/* 00394 8086FF74 AFA001DC */ sw $zero, 0x01DC($sp) /* 00398 8086FF78 26EC1C24 */ addiu $t4, $s7, 0x1C24 ## $t4 = 00001C24 -/* 0039C 8086FF7C 19A000B1 */ blez $t5, .L80870244 +/* 0039C 8086FF7C 19A000B1 */ blez $t5, .L80870244 /* 003A0 8086FF80 3C018087 */ lui $at, %hi(D_808709AC) ## $at = 80870000 -/* 003A4 8086FF84 C43C09AC */ lwc1 $f28, %lo(D_808709AC)($at) +/* 003A4 8086FF84 C43C09AC */ lwc1 $f28, %lo(D_808709AC)($at) /* 003A8 8086FF88 3C018087 */ lui $at, %hi(D_808709B0) ## $at = 80870000 -/* 003AC 8086FF8C C43A09B0 */ lwc1 $f26, %lo(D_808709B0)($at) +/* 003AC 8086FF8C C43A09B0 */ lwc1 $f26, %lo(D_808709B0)($at) /* 003B0 8086FF90 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 003B4 8086FF94 4481C000 */ mtc1 $at, $f24 ## $f24 = 20.00 -/* 003B8 8086FF98 AFAC009C */ sw $t4, 0x009C($sp) -/* 003BC 8086FF9C AFA501FC */ sw $a1, 0x01FC($sp) -/* 003C0 8086FFA0 C7BE0214 */ lwc1 $f30, 0x0214($sp) +/* 003B8 8086FF98 AFAC009C */ sw $t4, 0x009C($sp) +/* 003BC 8086FF9C AFA501FC */ sw $a1, 0x01FC($sp) +/* 003C0 8086FFA0 C7BE0214 */ lwc1 $f30, 0x0214($sp) /* 003C4 8086FFA4 27B501E8 */ addiu $s5, $sp, 0x01E8 ## $s5 = FFFFFFF0 .L8086FFA8: -/* 003C8 8086FFA8 8FA501FC */ lw $a1, 0x01FC($sp) +/* 003C8 8086FFA8 8FA501FC */ lw $a1, 0x01FC($sp) /* 003CC 8086FFAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 003D0 8086FFB0 84A20032 */ lh $v0, 0x0032($a1) ## 00000032 -/* 003D4 8086FFB4 04400003 */ bltz $v0, .L8086FFC4 -/* 003D8 8086FFB8 00028023 */ subu $s0, $zero, $v0 -/* 003DC 8086FFBC 10000001 */ beq $zero, $zero, .L8086FFC4 +/* 003D4 8086FFB4 04400003 */ bltz $v0, .L8086FFC4 +/* 003D8 8086FFB8 00028023 */ subu $s0, $zero, $v0 +/* 003DC 8086FFBC 10000001 */ beq $zero, $zero, .L8086FFC4 /* 003E0 8086FFC0 00408025 */ or $s0, $v0, $zero ## $s0 = FFFFFF8C .L8086FFC4: /* 003E4 8086FFC4 C4AC0024 */ lwc1 $f12, 0x0024($a1) ## 00000024 /* 003E8 8086FFC8 C4AE0028 */ lwc1 $f14, 0x0028($a1) ## 00000028 /* 003EC 8086FFCC 8CA6002C */ lw $a2, 0x002C($a1) ## 0000002C -/* 003F0 8086FFD0 0C034261 */ jal Matrix_Translate -/* 003F4 8086FFD4 AFA501FC */ sw $a1, 0x01FC($sp) -/* 003F8 8086FFD8 8FA201FC */ lw $v0, 0x01FC($sp) +/* 003F0 8086FFD0 0C034261 */ jal Matrix_Translate +/* 003F4 8086FFD4 AFA501FC */ sw $a1, 0x01FC($sp) +/* 003F8 8086FFD8 8FA201FC */ lw $v0, 0x01FC($sp) /* 003FC 8086FFDC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00400 8086FFE0 84440030 */ lh $a0, 0x0030($v0) ## 00000030 /* 00404 8086FFE4 84450032 */ lh $a1, 0x0032($v0) ## 00000032 -/* 00408 8086FFE8 0C034421 */ jal Matrix_RotateXYZ +/* 00408 8086FFE8 0C034421 */ jal Matrix_RotateZYX /* 0040C 8086FFEC 84460034 */ lh $a2, 0x0034($v0) ## 00000034 -/* 00410 8086FFF0 8FA20200 */ lw $v0, 0x0200($sp) +/* 00410 8086FFF0 8FA20200 */ lw $v0, 0x0200($sp) /* 00414 8086FFF4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00418 8086FFF8 C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000000 /* 0041C 8086FFFC C44E0004 */ lwc1 $f14, 0x0004($v0) ## 00000004 -/* 00420 80870000 0C034261 */ jal Matrix_Translate +/* 00420 80870000 0C034261 */ jal Matrix_Translate /* 00424 80870004 8C460008 */ lw $a2, 0x0008($v0) ## 00000008 -/* 00428 80870008 87AE01D8 */ lh $t6, 0x01D8($sp) +/* 00428 80870008 87AE01D8 */ lh $t6, 0x01D8($sp) /* 0042C 8087000C 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 00430 80870010 27A60154 */ addiu $a2, $sp, 0x0154 ## $a2 = FFFFFF5C -/* 00434 80870014 020EF021 */ addu $s8, $s0, $t6 -/* 00438 80870018 001EF400 */ sll $s8, $s8, 16 -/* 0043C 8087001C 001EF403 */ sra $s8, $s8, 16 -/* 00440 80870020 AFA600A4 */ sw $a2, 0x00A4($sp) -/* 00444 80870024 AFA301E0 */ sw $v1, 0x01E0($sp) +/* 00434 80870014 020EF021 */ addu $s8, $s0, $t6 +/* 00438 80870018 001EF400 */ sll $s8, $s8, 16 +/* 0043C 8087001C 001EF403 */ sra $s8, $s8, 16 +/* 00440 80870020 AFA600A4 */ sw $a2, 0x00A4($sp) +/* 00444 80870024 AFA301E0 */ sw $v1, 0x01E0($sp) .L80870028: -/* 00448 80870028 8FA301E0 */ lw $v1, 0x01E0($sp) -/* 0044C 8087002C 8FA600A4 */ lw $a2, 0x00A4($sp) +/* 00448 80870028 8FA301E0 */ lw $v1, 0x01E0($sp) +/* 0044C 8087002C 8FA600A4 */ lw $a2, 0x00A4($sp) /* 00450 80870030 24130024 */ addiu $s3, $zero, 0x0024 ## $s3 = 00000024 /* 00454 80870034 27B101C6 */ addiu $s1, $sp, 0x01C6 ## $s1 = FFFFFFCE /* 00458 80870038 30760001 */ andi $s6, $v1, 0x0001 ## $s6 = 00000001 /* 0045C 8087003C 24D40024 */ addiu $s4, $a2, 0x0024 ## $s4 = FFFFFF80 .L80870040: /* 00460 80870040 02802025 */ or $a0, $s4, $zero ## $a0 = FFFFFF80 -/* 00464 80870044 0C0346BD */ jal Matrix_MultVec3f +/* 00464 80870044 0C0346BD */ jal Matrix_MultVec3f /* 00468 80870048 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFF0 /* 0046C 8087004C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00470 80870050 4600C306 */ mov.s $f12, $f24 -/* 00474 80870054 46000506 */ mov.s $f20, $f0 + +/* 00470 80870050 4600C306 */ mov.s $f12, $f24 +/* 00474 80870054 46000506 */ mov.s $f20, $f0 /* 00478 80870058 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0047C 8087005C 4600C306 */ mov.s $f12, $f24 -/* 00480 80870060 46000586 */ mov.s $f22, $f0 + +/* 0047C 8087005C 4600C306 */ mov.s $f12, $f24 +/* 00480 80870060 46000586 */ mov.s $f22, $f0 /* 00484 80870064 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00488 80870068 4600C306 */ mov.s $f12, $f24 -/* 0048C 8087006C C7A801EC */ lwc1 $f8, 0x01EC($sp) -/* 00490 80870070 C7B001F0 */ lwc1 $f16, 0x01F0($sp) -/* 00494 80870074 C7A401E8 */ lwc1 $f4, 0x01E8($sp) -/* 00498 80870078 4608B280 */ add.s $f10, $f22, $f8 + +/* 00488 80870068 4600C306 */ mov.s $f12, $f24 +/* 0048C 8087006C C7A801EC */ lwc1 $f8, 0x01EC($sp) +/* 00490 80870070 C7B001F0 */ lwc1 $f16, 0x01F0($sp) +/* 00494 80870074 C7A401E8 */ lwc1 $f4, 0x01E8($sp) +/* 00498 80870078 4608B280 */ add.s $f10, $f22, $f8 /* 0049C 8087007C 2409000B */ addiu $t1, $zero, 0x000B ## $t1 = 0000000B -/* 004A0 80870080 8FA4009C */ lw $a0, 0x009C($sp) -/* 004A4 80870084 46100480 */ add.s $f18, $f0, $f16 -/* 004A8 80870088 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 004A0 80870080 8FA4009C */ lw $a0, 0x009C($sp) +/* 004A4 80870084 46100480 */ add.s $f18, $f0, $f16 +/* 004A8 80870088 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 004AC 8087008C 02E02825 */ or $a1, $s7, $zero ## $a1 = 00000000 -/* 004B0 80870090 4604A180 */ add.s $f6, $f20, $f4 -/* 004B4 80870094 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 004B0 80870090 4604A180 */ add.s $f6, $f20, $f4 +/* 004B4 80870094 E7B20014 */ swc1 $f18, 0x0014($sp) /* 004B8 80870098 862F0000 */ lh $t7, 0x0000($s1) ## FFFFFFCE /* 004BC 8087009C 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 -/* 004C0 808700A0 44073000 */ mfc1 $a3, $f6 -/* 004C4 808700A4 AFAF0018 */ sw $t7, 0x0018($sp) +/* 004C0 808700A0 44073000 */ mfc1 $a3, $f6 +/* 004C4 808700A4 AFAF0018 */ sw $t7, 0x0018($sp) /* 004C8 808700A8 862B0002 */ lh $t3, 0x0002($s1) ## FFFFFFD0 -/* 004CC 808700AC 017E4021 */ addu $t0, $t3, $s8 -/* 004D0 808700B0 AFA8001C */ sw $t0, 0x001C($sp) +/* 004CC 808700AC 017E4021 */ addu $t0, $t3, $s8 +/* 004D0 808700B0 AFA8001C */ sw $t0, 0x001C($sp) /* 004D4 808700B4 86390004 */ lh $t9, 0x0004($s1) ## FFFFFFD2 -/* 004D8 808700B8 AFA90024 */ sw $t1, 0x0024($sp) +/* 004D8 808700B8 AFA90024 */ sw $t1, 0x0024($sp) /* 004DC 808700BC 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 004E0 808700C0 AFB90020 */ sw $t9, 0x0020($sp) -/* 004E4 808700C4 16C00010 */ bne $s6, $zero, .L80870108 +/* 004E0 808700C0 AFB90020 */ sw $t9, 0x0020($sp) +/* 004E4 808700C4 16C00010 */ bne $s6, $zero, .L80870108 /* 004E8 808700C8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 004EC 808700CC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 004F0 808700D0 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 004F4 808700D4 C7A40204 */ lwc1 $f4, 0x0204($sp) +/* 004F4 808700D4 C7A40204 */ lwc1 $f4, 0x0204($sp) /* 004F8 808700D8 240A028A */ addiu $t2, $zero, 0x028A ## $t2 = 0000028A /* 004FC 808700DC 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 -/* 00500 808700E0 46062202 */ mul.s $f8, $f4, $f6 +/* 00500 808700E0 46062202 */ mul.s $f8, $f4, $f6 /* 00504 808700E4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00508 808700E8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0050C 808700EC AFB80014 */ sw $t8, 0x0014($sp) -/* 00510 808700F0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00508 808700E8 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0050C 808700EC AFB80014 */ sw $t8, 0x0014($sp) +/* 00510 808700F0 AFAA0010 */ sw $t2, 0x0010($sp) /* 00514 808700F4 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 /* 00518 808700F8 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFF0 -/* 0051C 808700FC 44064000 */ mfc1 $a2, $f8 -/* 00520 80870100 0C00CD20 */ jal func_80033480 +/* 0051C 808700FC 44064000 */ mfc1 $a2, $f8 +/* 00520 80870100 0C00CD20 */ jal func_80033480 /* 00524 80870104 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 .L80870108: -/* 00528 80870108 12000038 */ beq $s0, $zero, .L808701EC +/* 00528 80870108 12000038 */ beq $s0, $zero, .L808701EC /* 0052C 8087010C 3C018087 */ lui $at, %hi(D_808709B4) ## $at = 80870000 -/* 00530 80870110 C42A09B4 */ lwc1 $f10, %lo(D_808709B4)($at) +/* 00530 80870110 C42A09B4 */ lwc1 $f10, %lo(D_808709B4)($at) /* 00534 80870114 27AC0184 */ addiu $t4, $sp, 0x0184 ## $t4 = FFFFFF8C -/* 00538 80870118 026C9021 */ addu $s2, $s3, $t4 -/* 0053C 8087011C 460AF502 */ mul.s $f20, $f30, $f10 +/* 00538 80870118 026C9021 */ addu $s2, $s3, $t4 +/* 0053C 8087011C 460AF502 */ mul.s $f20, $f30, $f10 /* 00540 80870120 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00544 80870124 00000000 */ nop -/* 00548 80870128 46140400 */ add.s $f16, $f0, $f20 +/* 00548 80870128 46140400 */ add.s $f16, $f0, $f20 /* 0054C 8087012C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00550 80870130 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 00554 80870134 46140480 */ add.s $f18, $f0, $f20 +/* 00554 80870134 46140480 */ add.s $f18, $f0, $f20 /* 00558 80870138 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0055C 8087013C E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 00560 80870140 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00564 80870144 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 00568 80870148 3C018087 */ lui $at, %hi(D_808709B8) ## $at = 80870000 -/* 0056C 8087014C C42809B8 */ lwc1 $f8, %lo(D_808709B8)($at) -/* 00570 80870150 46040181 */ sub.s $f6, $f0, $f4 +/* 0056C 8087014C C42809B8 */ lwc1 $f8, %lo(D_808709B8)($at) +/* 00570 80870150 46040181 */ sub.s $f6, $f0, $f4 /* 00574 80870154 86190032 */ lh $t9, 0x0032($s0) ## 00000032 -/* 00578 80870158 46083282 */ mul.s $f10, $f6, $f8 -/* 0057C 8087015C 4600540D */ trunc.w.s $f16, $f10 -/* 00580 80870160 44088000 */ mfc1 $t0, $f16 +/* 00578 80870158 46083282 */ mul.s $f10, $f6, $f8 +/* 0057C 8087015C 4600540D */ trunc.w.s $f16, $f10 +/* 00580 80870160 44088000 */ mfc1 $t0, $f16 /* 00584 80870164 00000000 */ nop -/* 00588 80870168 03284821 */ addu $t1, $t9, $t0 +/* 00588 80870168 03284821 */ addu $t1, $t9, $t0 /* 0058C 8087016C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00590 80870170 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 00594 80870174 461C0482 */ mul.s $f18, $f0, $f28 -/* 00598 80870178 4600910D */ trunc.w.s $f4, $f18 -/* 0059C 8087017C 440C2000 */ mfc1 $t4, $f4 +/* 00594 80870174 461C0482 */ mul.s $f18, $f0, $f28 +/* 00598 80870178 4600910D */ trunc.w.s $f4, $f18 +/* 0059C 8087017C 440C2000 */ mfc1 $t4, $f4 /* 005A0 80870180 00000000 */ nop /* 005A4 80870184 258E07D0 */ addiu $t6, $t4, 0x07D0 ## $t6 = 000007D0 /* 005A8 80870188 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 005AC 8087018C A60E0030 */ sh $t6, 0x0030($s0) ## 00000030 -/* 005B0 80870190 461C0182 */ mul.s $f6, $f0, $f28 -/* 005B4 80870194 4600D306 */ mov.s $f12, $f26 -/* 005B8 80870198 4600320D */ trunc.w.s $f8, $f6 -/* 005BC 8087019C 44084000 */ mfc1 $t0, $f8 +/* 005B0 80870190 461C0182 */ mul.s $f6, $f0, $f28 +/* 005B4 80870194 4600D306 */ mov.s $f12, $f26 +/* 005B8 80870198 4600320D */ trunc.w.s $f8, $f6 +/* 005BC 8087019C 44084000 */ mfc1 $t0, $f8 /* 005C0 808701A0 00000000 */ nop /* 005C4 808701A4 250907D0 */ addiu $t1, $t0, 0x07D0 ## $t1 = 000007D0 /* 005C8 808701A8 A6090034 */ sh $t1, 0x0034($s0) ## 00000034 -/* 005CC 808701AC 8FAA01FC */ lw $t2, 0x01FC($sp) +/* 005CC 808701AC 8FAA01FC */ lw $t2, 0x01FC($sp) /* 005D0 808701B0 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 005D4 808701B4 AE0A0118 */ sw $t2, 0x0118($s0) ## 00000118 /* 005D8 808701B8 C64A0000 */ lwc1 $f10, 0x0000($s2) ## FFFFFFA4 -/* 005DC 808701BC 4600D306 */ mov.s $f12, $f26 -/* 005E0 808701C0 460A0400 */ add.s $f16, $f0, $f10 +/* 005DC 808701BC 4600D306 */ mov.s $f12, $f26 +/* 005E0 808701C0 460A0400 */ add.s $f16, $f0, $f10 /* 005E4 808701C4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 005E8 808701C8 E6100050 */ swc1 $f16, 0x0050($s0) ## 00000050 /* 005EC 808701CC C6520004 */ lwc1 $f18, 0x0004($s2) ## FFFFFFA8 -/* 005F0 808701D0 4600D306 */ mov.s $f12, $f26 -/* 005F4 808701D4 46120100 */ add.s $f4, $f0, $f18 +/* 005F0 808701D0 4600D306 */ mov.s $f12, $f26 +/* 005F4 808701D4 46120100 */ add.s $f4, $f0, $f18 /* 005F8 808701D8 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 005FC 808701DC E6040054 */ swc1 $f4, 0x0054($s0) ## 00000054 /* 00600 808701E0 C6460008 */ lwc1 $f6, 0x0008($s2) ## FFFFFFAC -/* 00604 808701E4 46060200 */ add.s $f8, $f0, $f6 +/* 00604 808701E4 46060200 */ add.s $f8, $f0, $f6 /* 00608 808701E8 E6080058 */ swc1 $f8, 0x0058($s0) ## 00000058 .L808701EC: /* 0060C 808701EC 2631FFFA */ addiu $s1, $s1, 0xFFFA ## $s1 = FFFFFFC8 /* 00610 808701F0 27B801B4 */ addiu $t8, $sp, 0x01B4 ## $t8 = FFFFFFBC -/* 00614 808701F4 0238082B */ sltu $at, $s1, $t8 +/* 00614 808701F4 0238082B */ sltu $at, $s1, $t8 /* 00618 808701F8 2673FFF4 */ addiu $s3, $s3, 0xFFF4 ## $s3 = 00000018 -/* 0061C 808701FC 1020FF90 */ beq $at, $zero, .L80870040 +/* 0061C 808701FC 1020FF90 */ beq $at, $zero, .L80870040 /* 00620 80870200 2694FFF4 */ addiu $s4, $s4, 0xFFF4 ## $s4 = FFFFFF74 -/* 00624 80870204 8FAD01E0 */ lw $t5, 0x01E0($sp) -/* 00628 80870208 8FAE00A4 */ lw $t6, 0x00A4($sp) +/* 00624 80870204 8FAD01E0 */ lw $t5, 0x01E0($sp) +/* 00628 80870208 8FAE00A4 */ lw $t6, 0x00A4($sp) /* 0062C 8087020C 25ACFFFF */ addiu $t4, $t5, 0xFFFF ## $t4 = FFFFFFFF /* 00630 80870210 25CFFFD0 */ addiu $t7, $t6, 0xFFD0 ## $t7 = FFFFFFD0 -/* 00634 80870214 AFAF00A4 */ sw $t7, 0x00A4($sp) -/* 00638 80870218 0581FF83 */ bgez $t4, .L80870028 -/* 0063C 8087021C AFAC01E0 */ sw $t4, 0x01E0($sp) -/* 00640 80870220 87AB01D8 */ lh $t3, 0x01D8($sp) -/* 00644 80870224 8FA201DC */ lw $v0, 0x01DC($sp) -/* 00648 80870228 8FA80210 */ lw $t0, 0x0210($sp) +/* 00634 80870214 AFAF00A4 */ sw $t7, 0x00A4($sp) +/* 00638 80870218 0581FF83 */ bgez $t4, .L80870028 +/* 0063C 8087021C AFAC01E0 */ sw $t4, 0x01E0($sp) +/* 00640 80870220 87AB01D8 */ lh $t3, 0x01D8($sp) +/* 00644 80870224 8FA201DC */ lw $v0, 0x01DC($sp) +/* 00648 80870228 8FA80210 */ lw $t0, 0x0210($sp) /* 0064C 8087022C 25794000 */ addiu $t9, $t3, 0x4000 ## $t9 = 00004000 /* 00650 80870230 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00654 80870234 AFA201DC */ sw $v0, 0x01DC($sp) -/* 00658 80870238 1448FF5B */ bne $v0, $t0, .L8086FFA8 -/* 0065C 8087023C A7B901D8 */ sh $t9, 0x01D8($sp) -/* 00660 80870240 AFB001F4 */ sw $s0, 0x01F4($sp) +/* 00654 80870234 AFA201DC */ sw $v0, 0x01DC($sp) +/* 00658 80870238 1448FF5B */ bne $v0, $t0, .L8086FFA8 +/* 0065C 8087023C A7B901D8 */ sh $t9, 0x01D8($sp) +/* 00660 80870240 AFB001F4 */ sw $s0, 0x01F4($sp) .L80870244: -/* 00664 80870244 8FBF0084 */ lw $ra, 0x0084($sp) -/* 00668 80870248 8FA201F4 */ lw $v0, 0x01F4($sp) -/* 0066C 8087024C D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 00670 80870250 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00674 80870254 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 00678 80870258 D7BA0048 */ ldc1 $f26, 0x0048($sp) -/* 0067C 8087025C D7BC0050 */ ldc1 $f28, 0x0050($sp) -/* 00680 80870260 D7BE0058 */ ldc1 $f30, 0x0058($sp) -/* 00684 80870264 8FB00060 */ lw $s0, 0x0060($sp) -/* 00688 80870268 8FB10064 */ lw $s1, 0x0064($sp) -/* 0068C 8087026C 8FB20068 */ lw $s2, 0x0068($sp) -/* 00690 80870270 8FB3006C */ lw $s3, 0x006C($sp) -/* 00694 80870274 8FB40070 */ lw $s4, 0x0070($sp) -/* 00698 80870278 8FB50074 */ lw $s5, 0x0074($sp) -/* 0069C 8087027C 8FB60078 */ lw $s6, 0x0078($sp) -/* 006A0 80870280 8FB7007C */ lw $s7, 0x007C($sp) -/* 006A4 80870284 8FBE0080 */ lw $s8, 0x0080($sp) -/* 006A8 80870288 03E00008 */ jr $ra +/* 00664 80870244 8FBF0084 */ lw $ra, 0x0084($sp) +/* 00668 80870248 8FA201F4 */ lw $v0, 0x01F4($sp) +/* 0066C 8087024C D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 00670 80870250 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 00674 80870254 D7B80040 */ ldc1 $f24, 0x0040($sp) +/* 00678 80870258 D7BA0048 */ ldc1 $f26, 0x0048($sp) +/* 0067C 8087025C D7BC0050 */ ldc1 $f28, 0x0050($sp) +/* 00680 80870260 D7BE0058 */ ldc1 $f30, 0x0058($sp) +/* 00684 80870264 8FB00060 */ lw $s0, 0x0060($sp) +/* 00688 80870268 8FB10064 */ lw $s1, 0x0064($sp) +/* 0068C 8087026C 8FB20068 */ lw $s2, 0x0068($sp) +/* 00690 80870270 8FB3006C */ lw $s3, 0x006C($sp) +/* 00694 80870274 8FB40070 */ lw $s4, 0x0070($sp) +/* 00698 80870278 8FB50074 */ lw $s5, 0x0074($sp) +/* 0069C 8087027C 8FB60078 */ lw $s6, 0x0078($sp) +/* 006A0 80870280 8FB7007C */ lw $s7, 0x007C($sp) +/* 006A4 80870284 8FBE0080 */ lw $s8, 0x0080($sp) +/* 006A8 80870288 03E00008 */ jr $ra /* 006AC 8087028C 27BD01F8 */ addiu $sp, $sp, 0x01F8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s index 465eb46b5f..c54f43209e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s @@ -1,18 +1,18 @@ glabel func_8088BC40 /* 00BC0 8088BC40 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00BC4 8088BC44 AFBF001C */ sw $ra, 0x001C($sp) -/* 00BC8 8088BC48 AFB00018 */ sw $s0, 0x0018($sp) -/* 00BCC 8088BC4C AFA40058 */ sw $a0, 0x0058($sp) -/* 00BD0 8088BC50 AFA5005C */ sw $a1, 0x005C($sp) +/* 00BC4 8088BC44 AFBF001C */ sw $ra, 0x001C($sp) +/* 00BC8 8088BC48 AFB00018 */ sw $s0, 0x0018($sp) +/* 00BCC 8088BC4C AFA40058 */ sw $a0, 0x0058($sp) +/* 00BD0 8088BC50 AFA5005C */ sw $a1, 0x005C($sp) /* 00BD4 8088BC54 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 00BD8 8088BC58 3C068089 */ lui $a2, %hi(D_8088BFF0) ## $a2 = 80890000 /* 00BDC 8088BC5C 24C6BFF0 */ addiu $a2, $a2, %lo(D_8088BFF0) ## $a2 = 8088BFF0 /* 00BE0 8088BC60 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00BE4 8088BC64 24070328 */ addiu $a3, $zero, 0x0328 ## $a3 = 00000328 -/* 00BE8 8088BC68 0C031AB1 */ jal func_800C6AC4 +/* 00BE8 8088BC68 0C031AB1 */ jal func_800C6AC4 /* 00BEC 8088BC6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00BF0 8088BC70 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00BF4 8088BC74 0C024DDD */ jal func_80093774 +/* 00BF4 8088BC74 0C024DDD */ jal func_80093774 /* 00BF8 8088BC78 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00BFC 8088BC7C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00C00 8088BC80 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 @@ -31,13 +31,13 @@ glabel func_8088BC40 /* 00C34 8088BCB4 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 /* 00C38 8088BCB8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00C3C 8088BCBC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00C40 8088BCC0 8FA3005C */ lw $v1, 0x005C($sp) +/* 00C40 8088BCC0 8FA3005C */ lw $v1, 0x005C($sp) /* 00C44 8088BCC4 3C028089 */ lui $v0, %hi(D_8088BF60) ## $v0 = 80890000 /* 00C48 8088BCC8 2442BF60 */ addiu $v0, $v0, %lo(D_8088BF60) ## $v0 = 8088BF60 /* 00C4C 8088BCCC 906B0168 */ lbu $t3, 0x0168($v1) ## 00000168 /* 00C50 8088BCD0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00C54 8088BCD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00C58 8088BCD8 5560000C */ bnel $t3, $zero, .L8088BD0C +/* 00C58 8088BCD8 5560000C */ bnel $t3, $zero, .L8088BD0C /* 00C5C 8088BCDC C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C /* 00C60 8088BCE0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00C64 8088BCE4 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 @@ -45,72 +45,72 @@ glabel func_8088BC40 /* 00C6C 8088BCEC C44C0000 */ lwc1 $f12, 0x0000($v0) ## 8088BF60 /* 00C70 8088BCF0 8C460008 */ lw $a2, 0x0008($v0) ## 8088BF68 /* 00C74 8088BCF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00C78 8088BCF8 0C034261 */ jal Matrix_Translate -/* 00C7C 8088BCFC 46062381 */ sub.s $f14, $f4, $f6 -/* 00C80 8088BD00 10000008 */ beq $zero, $zero, .L8088BD24 -/* 00C84 8088BD04 8FA20058 */ lw $v0, 0x0058($sp) +/* 00C78 8088BCF8 0C034261 */ jal Matrix_Translate +/* 00C7C 8088BCFC 46062381 */ sub.s $f14, $f4, $f6 +/* 00C80 8088BD00 10000008 */ beq $zero, $zero, .L8088BD24 +/* 00C84 8088BD04 8FA20058 */ lw $v0, 0x0058($sp) /* 00C88 8088BD08 C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C .L8088BD0C: /* 00C8C 8088BD0C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 /* 00C90 8088BD10 C46C0008 */ lwc1 $f12, 0x0008($v1) ## 00000008 /* 00C94 8088BD14 8C660010 */ lw $a2, 0x0010($v1) ## 00000010 -/* 00C98 8088BD18 0C034261 */ jal Matrix_Translate -/* 00C9C 8088BD1C 460A4381 */ sub.s $f14, $f8, $f10 -/* 00CA0 8088BD20 8FA20058 */ lw $v0, 0x0058($sp) +/* 00C98 8088BD18 0C034261 */ jal Matrix_Translate +/* 00C9C 8088BD1C 460A4381 */ sub.s $f14, $f8, $f10 +/* 00CA0 8088BD20 8FA20058 */ lw $v0, 0x0058($sp) .L8088BD24: /* 00CA4 8088BD24 844C07A0 */ lh $t4, 0x07A0($v0) ## 000007A0 -/* 00CA8 8088BD28 000C6880 */ sll $t5, $t4, 2 -/* 00CAC 8088BD2C 004D7021 */ addu $t6, $v0, $t5 -/* 00CB0 8088BD30 0C016A7D */ jal func_8005A9F4 +/* 00CA8 8088BD28 000C6880 */ sll $t5, $t4, 2 +/* 00CAC 8088BD2C 004D7021 */ addu $t6, $v0, $t5 +/* 00CB0 8088BD30 0C016A7D */ jal func_8005A9F4 /* 00CB4 8088BD34 8DC40790 */ lw $a0, 0x0790($t6) ## 00000790 /* 00CB8 8088BD38 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00CBC 8088BD3C 00412821 */ addu $a1, $v0, $at -/* 00CC0 8088BD40 00052C00 */ sll $a1, $a1, 16 -/* 00CC4 8088BD44 00052C03 */ sra $a1, $a1, 16 +/* 00CBC 8088BD3C 00412821 */ addu $a1, $v0, $at +/* 00CC0 8088BD40 00052C00 */ sll $a1, $a1, 16 +/* 00CC4 8088BD44 00052C03 */ sra $a1, $a1, 16 /* 00CC8 8088BD48 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00CCC 8088BD4C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00CD0 8088BD50 0C034421 */ jal Matrix_RotateXYZ +/* 00CD0 8088BD50 0C034421 */ jal Matrix_RotateZYX /* 00CD4 8088BD54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CD8 8088BD58 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 00CDC 8088BD5C 3C01C128 */ lui $at, 0xC128 ## $at = C1280000 /* 00CE0 8088BD60 44816000 */ mtc1 $at, $f12 ## $f12 = -10.50 -/* 00CE4 8088BD64 44067000 */ mfc1 $a2, $f14 -/* 00CE8 8088BD68 0C034261 */ jal Matrix_Translate +/* 00CE4 8088BD64 44067000 */ mfc1 $a2, $f14 +/* 00CE8 8088BD68 0C034261 */ jal Matrix_Translate /* 00CEC 8088BD6C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CF0 8088BD70 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00CF4 8088BD74 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 -/* 00CF8 8088BD78 8FAF005C */ lw $t7, 0x005C($sp) +/* 00CF8 8088BD78 8FAF005C */ lw $t7, 0x005C($sp) /* 00CFC 8088BD7C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D00 8088BD80 44066000 */ mfc1 $a2, $f12 -/* 00D04 8088BD84 0C0342A3 */ jal Matrix_Scale +/* 00D00 8088BD80 44066000 */ mfc1 $a2, $f12 +/* 00D04 8088BD84 0C0342A3 */ jal Matrix_Scale /* 00D08 8088BD88 C5EE016C */ lwc1 $f14, 0x016C($t7) ## 0000016C /* 00D0C 8088BD8C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00D10 8088BD90 8FA70058 */ lw $a3, 0x0058($sp) +/* 00D10 8088BD90 8FA70058 */ lw $a3, 0x0058($sp) /* 00D14 8088BD94 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00D18 8088BD98 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00D1C 8088BD9C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 00D20 8088BDA0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00D24 8088BDA4 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 00D28 8088BDA8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00D2C 8088BDAC 01074021 */ addu $t0, $t0, $a3 +/* 00D2C 8088BDAC 01074021 */ addu $t0, $t0, $a3 /* 00D30 8088BDB0 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 /* 00D34 8088BDB4 3C048089 */ lui $a0, %hi(D_8088BFC4) ## $a0 = 80890000 /* 00D38 8088BDB8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00D3C 8088BDBC 31090007 */ andi $t1, $t0, 0x0007 ## $t1 = 00000000 -/* 00D40 8088BDC0 00095080 */ sll $t2, $t1, 2 -/* 00D44 8088BDC4 008A2021 */ addu $a0, $a0, $t2 -/* 00D48 8088BDC8 8C84BFC4 */ lw $a0, %lo(D_8088BFC4)($a0) +/* 00D40 8088BDC0 00095080 */ sll $t2, $t1, 2 +/* 00D44 8088BDC4 008A2021 */ addu $a0, $a0, $t2 +/* 00D48 8088BDC8 8C84BFC4 */ lw $a0, %lo(D_8088BFC4)($a0) /* 00D4C 8088BDCC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00D50 8088BDD0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00D54 8088BDD4 00046100 */ sll $t4, $a0, 4 -/* 00D58 8088BDD8 000C6F02 */ srl $t5, $t4, 28 -/* 00D5C 8088BDDC 000D7080 */ sll $t6, $t5, 2 -/* 00D60 8088BDE0 01EE7821 */ addu $t7, $t7, $t6 +/* 00D54 8088BDD4 00046100 */ sll $t4, $a0, 4 +/* 00D58 8088BDD8 000C6F02 */ srl $t5, $t4, 28 +/* 00D5C 8088BDDC 000D7080 */ sll $t6, $t5, 2 +/* 00D60 8088BDE0 01EE7821 */ addu $t7, $t7, $t6 /* 00D64 8088BDE4 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 -/* 00D68 8088BDE8 00815824 */ and $t3, $a0, $at +/* 00D68 8088BDE8 00815824 */ and $t3, $a0, $at /* 00D6C 8088BDEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D70 8088BDF0 016FC021 */ addu $t8, $t3, $t7 -/* 00D74 8088BDF4 0301C821 */ addu $t9, $t8, $at +/* 00D70 8088BDF0 016FC021 */ addu $t8, $t3, $t7 +/* 00D74 8088BDF4 0301C821 */ addu $t9, $t8, $at /* 00D78 8088BDF8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00D7C 8088BDFC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00D80 8088BE00 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -122,9 +122,9 @@ glabel func_8088BC40 /* 00D98 8088BE18 8CE40000 */ lw $a0, 0x0000($a3) ## 00000000 /* 00D9C 8088BE1C 24A5C008 */ addiu $a1, $a1, %lo(D_8088C008) ## $a1 = 8088C008 /* 00DA0 8088BE20 24060355 */ addiu $a2, $zero, 0x0355 ## $a2 = 00000355 -/* 00DA4 8088BE24 0C0346A2 */ jal Matrix_NewMtx -/* 00DA8 8088BE28 AFA20030 */ sw $v0, 0x0030($sp) -/* 00DAC 8088BE2C 8FA30030 */ lw $v1, 0x0030($sp) +/* 00DA4 8088BE24 0C0346A2 */ jal Matrix_NewMtx +/* 00DA8 8088BE28 AFA20030 */ sw $v0, 0x0030($sp) +/* 00DAC 8088BE2C 8FA30030 */ lw $v1, 0x0030($sp) /* 00DB0 8088BE30 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 /* 00DB4 8088BE34 25ADCA10 */ addiu $t5, $t5, 0xCA10 ## $t5 = 0600CA10 /* 00DB8 8088BE38 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -135,16 +135,16 @@ glabel func_8088BC40 /* 00DCC 8088BE4C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 00DD0 8088BE50 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 00DD4 8088BE54 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00DD8 8088BE58 8FAE0058 */ lw $t6, 0x0058($sp) +/* 00DD8 8088BE58 8FAE0058 */ lw $t6, 0x0058($sp) /* 00DDC 8088BE5C 24C6C020 */ addiu $a2, $a2, %lo(D_8088C020) ## $a2 = 8088C020 /* 00DE0 8088BE60 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00DE4 8088BE64 24070359 */ addiu $a3, $zero, 0x0359 ## $a3 = 00000359 -/* 00DE8 8088BE68 0C031AD5 */ jal func_800C6B54 +/* 00DE8 8088BE68 0C031AD5 */ jal func_800C6B54 /* 00DEC 8088BE6C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00DF0 8088BE70 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DF4 8088BE74 8FB00018 */ lw $s0, 0x0018($sp) +/* 00DF0 8088BE70 8FBF001C */ lw $ra, 0x001C($sp) +/* 00DF4 8088BE74 8FB00018 */ lw $s0, 0x0018($sp) /* 00DF8 8088BE78 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00DFC 8088BE7C 03E00008 */ jr $ra +/* 00DFC 8088BE7C 03E00008 */ jr $ra /* 00E00 8088BE80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s index 4329662882..4b948c685e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s @@ -1,25 +1,25 @@ glabel BgMenkuriEye_Draw /* 00270 8089BEE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00274 8089BEE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00278 8089BEE8 AFB10018 */ sw $s1, 0x0018($sp) -/* 0027C 8089BEEC AFB00014 */ sw $s0, 0x0014($sp) -/* 00280 8089BEF0 AFA5005C */ sw $a1, 0x005C($sp) +/* 00274 8089BEE4 AFBF001C */ sw $ra, 0x001C($sp) +/* 00278 8089BEE8 AFB10018 */ sw $s1, 0x0018($sp) +/* 0027C 8089BEEC AFB00014 */ sw $s0, 0x0014($sp) +/* 00280 8089BEF0 AFA5005C */ sw $a1, 0x005C($sp) /* 00284 8089BEF4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00288 8089BEF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0028C 8089BEFC 3C06808A */ lui $a2, %hi(D_8089C0D0) ## $a2 = 808A0000 /* 00290 8089BF00 24C6C0D0 */ addiu $a2, $a2, %lo(D_8089C0D0) ## $a2 = 8089C0D0 /* 00294 8089BF04 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00298 8089BF08 24070124 */ addiu $a3, $zero, 0x0124 ## $a3 = 00000124 -/* 0029C 8089BF0C 0C031AB1 */ jal func_800C6AC4 +/* 0029C 8089BF0C 0C031AB1 */ jal func_800C6AC4 /* 002A0 8089BF10 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 002A4 8089BF14 8FAF005C */ lw $t7, 0x005C($sp) -/* 002A8 8089BF18 0C024F61 */ jal func_80093D84 +/* 002A4 8089BF14 8FAF005C */ lw $t7, 0x005C($sp) +/* 002A8 8089BF18 0C024F61 */ jal func_80093D84 /* 002AC 8089BF1C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 002B0 8089BF20 8FA4005C */ lw $a0, 0x005C($sp) +/* 002B0 8089BF20 8FA4005C */ lw $a0, 0x005C($sp) /* 002B4 8089BF24 0C00B2D0 */ jal Flags_GetSwitch - + /* 002B8 8089BF28 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 002BC 8089BF2C 1040000A */ beq $v0, $zero, .L8089BF58 +/* 002BC 8089BF2C 1040000A */ beq $v0, $zero, .L8089BF58 /* 002C0 8089BF30 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 002C4 8089BF34 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 002C8 8089BF38 3C08C800 */ lui $t0, 0xC800 ## $t0 = C8000000 @@ -28,13 +28,13 @@ glabel BgMenkuriEye_Draw /* 002D4 8089BF44 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 /* 002D8 8089BF48 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 002DC 8089BF4C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 002E0 8089BF50 10000015 */ beq $zero, $zero, .L8089BFA8 +/* 002E0 8089BF50 10000015 */ beq $zero, $zero, .L8089BFA8 /* 002E4 8089BF54 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L8089BF58: /* 002E8 8089BF58 8609014C */ lh $t1, 0x014C($s0) ## 0000014C /* 002EC 8089BF5C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 002F0 8089BF60 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 002F4 8089BF64 5521000A */ bnel $t1, $at, .L8089BF90 +/* 002F4 8089BF64 5521000A */ bnel $t1, $at, .L8089BF90 /* 002F8 8089BF68 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 002FC 8089BF6C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00300 8089BF70 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 @@ -42,7 +42,7 @@ glabel BgMenkuriEye_Draw /* 00308 8089BF78 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0030C 8089BF7C AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 /* 00310 8089BF80 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00314 8089BF84 10000008 */ beq $zero, $zero, .L8089BFA8 +/* 00314 8089BF84 10000008 */ beq $zero, $zero, .L8089BFA8 /* 00318 8089BF88 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 0031C 8089BF8C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 .L8089BF90: @@ -55,17 +55,17 @@ glabel BgMenkuriEye_Draw .L8089BFA8: /* 00338 8089BFA8 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 0033C 8089BFAC C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 -/* 00340 8089BFB0 0C034261 */ jal Matrix_Translate +/* 00340 8089BFB0 0C034261 */ jal Matrix_Translate /* 00344 8089BFB4 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C /* 00348 8089BFB8 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 0034C 8089BFBC 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00350 8089BFC0 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 00354 8089BFC4 0C034421 */ jal Matrix_RotateXYZ +/* 00354 8089BFC4 0C034421 */ jal Matrix_RotateZYX /* 00358 8089BFC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0035C 8089BFCC C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 /* 00360 8089BFD0 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 /* 00364 8089BFD4 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 00368 8089BFD8 0C0342A3 */ jal Matrix_Scale +/* 00368 8089BFD8 0C0342A3 */ jal Matrix_Scale /* 0036C 8089BFDC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00370 8089BFE0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00374 8089BFE4 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -73,12 +73,12 @@ glabel BgMenkuriEye_Draw /* 0037C 8089BFEC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00380 8089BFF0 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 /* 00384 8089BFF4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00388 8089BFF8 8FA8005C */ lw $t0, 0x005C($sp) +/* 00388 8089BFF8 8FA8005C */ lw $t0, 0x005C($sp) /* 0038C 8089BFFC 3C05808A */ lui $a1, %hi(D_8089C0E8) ## $a1 = 808A0000 /* 00390 8089C000 24A5C0E8 */ addiu $a1, $a1, %lo(D_8089C0E8) ## $a1 = 8089C0E8 /* 00394 8089C004 2406014B */ addiu $a2, $zero, 0x014B ## $a2 = 0000014B /* 00398 8089C008 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0039C 8089C00C 0C0346A2 */ jal Matrix_NewMtx +/* 0039C 8089C00C 0C0346A2 */ jal Matrix_NewMtx /* 003A0 8089C010 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 003A4 8089C014 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 003A8 8089C018 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -89,17 +89,17 @@ glabel BgMenkuriEye_Draw /* 003BC 8089C02C 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 /* 003C0 8089C030 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 003C4 8089C034 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 003C8 8089C038 8FAC005C */ lw $t4, 0x005C($sp) +/* 003C8 8089C038 8FAC005C */ lw $t4, 0x005C($sp) /* 003CC 8089C03C 3C06808A */ lui $a2, %hi(D_8089C100) ## $a2 = 808A0000 /* 003D0 8089C040 24C6C100 */ addiu $a2, $a2, %lo(D_8089C100) ## $a2 = 8089C100 /* 003D4 8089C044 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 003D8 8089C048 2407014F */ addiu $a3, $zero, 0x014F ## $a3 = 0000014F -/* 003DC 8089C04C 0C031AD5 */ jal func_800C6B54 +/* 003DC 8089C04C 0C031AD5 */ jal func_800C6B54 /* 003E0 8089C050 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 003E4 8089C054 8FBF001C */ lw $ra, 0x001C($sp) -/* 003E8 8089C058 8FB00014 */ lw $s0, 0x0014($sp) -/* 003EC 8089C05C 8FB10018 */ lw $s1, 0x0018($sp) -/* 003F0 8089C060 03E00008 */ jr $ra +/* 003E4 8089C054 8FBF001C */ lw $ra, 0x001C($sp) +/* 003E8 8089C058 8FB00014 */ lw $s0, 0x0014($sp) +/* 003EC 8089C05C 8FB10018 */ lw $s1, 0x0018($sp) +/* 003F0 8089C060 03E00008 */ jr $ra /* 003F4 8089C064 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 003F8 8089C068 00000000 */ nop /* 003FC 8089C06C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s index 1366433fd4..42e5bfc46b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s @@ -1,37 +1,37 @@ glabel func_808A3F58 /* 00788 808A3F58 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 0078C 808A3F5C AFBF001C */ sw $ra, 0x001C($sp) -/* 00790 808A3F60 AFB00018 */ sw $s0, 0x0018($sp) -/* 00794 808A3F64 AFA400B0 */ sw $a0, 0x00B0($sp) -/* 00798 808A3F68 AFA500B4 */ sw $a1, 0x00B4($sp) +/* 0078C 808A3F5C AFBF001C */ sw $ra, 0x001C($sp) +/* 00790 808A3F60 AFB00018 */ sw $s0, 0x0018($sp) +/* 00794 808A3F64 AFA400B0 */ sw $a0, 0x00B0($sp) +/* 00798 808A3F68 AFA500B4 */ sw $a1, 0x00B4($sp) /* 0079C 808A3F6C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 007A0 808A3F70 3C06808A */ lui $a2, %hi(D_808A4420) ## $a2 = 808A0000 /* 007A4 808A3F74 24C64420 */ addiu $a2, $a2, %lo(D_808A4420) ## $a2 = 808A4420 /* 007A8 808A3F78 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFA4 /* 007AC 808A3F7C 24070263 */ addiu $a3, $zero, 0x0263 ## $a3 = 00000263 -/* 007B0 808A3F80 0C031AB1 */ jal func_800C6AC4 +/* 007B0 808A3F80 0C031AB1 */ jal func_800C6AC4 /* 007B4 808A3F84 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 007B8 808A3F88 8FAF00B4 */ lw $t7, 0x00B4($sp) -/* 007BC 808A3F8C 0C024F46 */ jal func_80093D18 +/* 007B8 808A3F88 8FAF00B4 */ lw $t7, 0x00B4($sp) +/* 007BC 808A3F8C 0C024F46 */ jal func_80093D18 /* 007C0 808A3F90 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 007C4 808A3F94 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 007C8 808A3F98 8FA700B4 */ lw $a3, 0x00B4($sp) +/* 007C8 808A3F98 8FA700B4 */ lw $a3, 0x00B4($sp) /* 007CC 808A3F9C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 007D0 808A3FA0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 007D4 808A3FA4 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 007D8 808A3FA8 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 007DC 808A3FAC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 007E0 808A3FB0 8FA800B0 */ lw $t0, 0x00B0($sp) +/* 007E0 808A3FB0 8FA800B0 */ lw $t0, 0x00B0($sp) /* 007E4 808A3FB4 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 007E8 808A3FB8 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 007EC 808A3FBC 81090169 */ lb $t1, 0x0169($t0) ## 00000169 /* 007F0 808A3FC0 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 007F4 808A3FC4 3C05808A */ lui $a1, %hi(D_808A4438) ## $a1 = 808A0000 -/* 007F8 808A3FC8 00095100 */ sll $t2, $t1, 4 -/* 007FC 808A3FCC 01495021 */ addu $t2, $t2, $t1 -/* 00800 808A3FD0 000A5080 */ sll $t2, $t2, 2 -/* 00804 808A3FD4 00EA5821 */ addu $t3, $a3, $t2 -/* 00808 808A3FD8 018B6021 */ addu $t4, $t4, $t3 +/* 007F8 808A3FC8 00095100 */ sll $t2, $t1, 4 +/* 007FC 808A3FCC 01495021 */ addu $t2, $t2, $t1 +/* 00800 808A3FD0 000A5080 */ sll $t2, $t2, 2 +/* 00804 808A3FD4 00EA5821 */ addu $t3, $a3, $t2 +/* 00808 808A3FD8 018B6021 */ addu $t4, $t4, $t3 /* 0080C 808A3FDC 8D8C17B4 */ lw $t4, 0x17B4($t4) ## 000117B4 /* 00810 808A3FE0 24A54438 */ addiu $a1, $a1, %lo(D_808A4438) ## $a1 = 808A4438 /* 00814 808A3FE4 2406026A */ addiu $a2, $zero, 0x026A ## $a2 = 0000026A @@ -41,75 +41,75 @@ glabel func_808A3F58 /* 00824 808A3FF4 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 00828 808A3FF8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 0082C 808A3FFC 8CE40000 */ lw $a0, 0x0000($a3) ## 00000000 -/* 00830 808A4000 0C0346A2 */ jal Matrix_NewMtx -/* 00834 808A4004 AFA2004C */ sw $v0, 0x004C($sp) -/* 00838 808A4008 8FA3004C */ lw $v1, 0x004C($sp) +/* 00830 808A4000 0C0346A2 */ jal Matrix_NewMtx +/* 00834 808A4004 AFA2004C */ sw $v0, 0x004C($sp) +/* 00838 808A4008 8FA3004C */ lw $v1, 0x004C($sp) /* 0083C 808A400C 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 /* 00840 808A4010 3C09808A */ lui $t1, %hi(D_808A4408) ## $t1 = 808A0000 /* 00844 808A4014 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00848 808A4018 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0084C 808A401C 8FA600B0 */ lw $a2, 0x00B0($sp) +/* 0084C 808A401C 8FA600B0 */ lw $a2, 0x00B0($sp) /* 00850 808A4020 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00854 808A4024 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 00858 808A4028 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 0085C 808A402C 84D9001C */ lh $t9, 0x001C($a2) ## 0000001C -/* 00860 808A4030 00194080 */ sll $t0, $t9, 2 -/* 00864 808A4034 01284821 */ addu $t1, $t1, $t0 -/* 00868 808A4038 8D294408 */ lw $t1, %lo(D_808A4408)($t1) +/* 00860 808A4030 00194080 */ sll $t0, $t9, 2 +/* 00864 808A4034 01284821 */ addu $t1, $t1, $t0 +/* 00868 808A4038 8D294408 */ lw $t1, %lo(D_808A4408)($t1) /* 0086C 808A403C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 00870 808A4040 80CA016A */ lb $t2, 0x016A($a2) ## 0000016A -/* 00874 808A4044 59400005 */ blezl $t2, .L808A405C +/* 00874 808A4044 59400005 */ blezl $t2, .L808A405C /* 00878 808A4048 8CCC0164 */ lw $t4, 0x0164($a2) ## 00000164 -/* 0087C 808A404C 0C034236 */ jal Matrix_Get +/* 0087C 808A404C 0C034236 */ jal Matrix_Get /* 00880 808A4050 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 -/* 00884 808A4054 8FA600B0 */ lw $a2, 0x00B0($sp) +/* 00884 808A4054 8FA600B0 */ lw $a2, 0x00B0($sp) /* 00888 808A4058 8CCC0164 */ lw $t4, 0x0164($a2) ## 00000164 .L808A405C: /* 0088C 808A405C 3C0B808A */ lui $t3, %hi(func_808A3C8C) ## $t3 = 808A0000 /* 00890 808A4060 256B3C8C */ addiu $t3, $t3, %lo(func_808A3C8C) ## $t3 = 808A3C8C -/* 00894 808A4064 556C0042 */ bnel $t3, $t4, .L808A4170 +/* 00894 808A4064 556C0042 */ bnel $t3, $t4, .L808A4170 /* 00898 808A4068 80CE016A */ lb $t6, 0x016A($a2) ## 0000016A /* 0089C 808A406C 84CD00B8 */ lh $t5, 0x00B8($a2) ## 000000B8 -/* 008A0 808A4070 8FAE00B4 */ lw $t6, 0x00B4($sp) -/* 008A4 808A4074 51A0003E */ beql $t5, $zero, .L808A4170 +/* 008A0 808A4070 8FAE00B4 */ lw $t6, 0x00B4($sp) +/* 008A4 808A4074 51A0003E */ beql $t5, $zero, .L808A4170 /* 008A8 808A4078 80CE016A */ lb $t6, 0x016A($a2) ## 0000016A -/* 008AC 808A407C 0C024F46 */ jal func_80093D18 +/* 008AC 808A407C 0C024F46 */ jal func_80093D18 /* 008B0 808A4080 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 008B4 808A4084 8FAF00B0 */ lw $t7, 0x00B0($sp) +/* 008B4 808A4084 8FAF00B0 */ lw $t7, 0x00B0($sp) /* 008B8 808A4088 3C06C4E3 */ lui $a2, 0xC4E3 ## $a2 = C4E30000 /* 008BC 808A408C 34C6A000 */ ori $a2, $a2, 0xA000 ## $a2 = C4E3A000 /* 008C0 808A4090 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C /* 008C4 808A4094 3C01808A */ lui $at, %hi(D_808A44C8) ## $at = 808A0000 /* 008C8 808A4098 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008CC 808A409C 1700000B */ bne $t8, $zero, .L808A40CC +/* 008CC 808A409C 1700000B */ bne $t8, $zero, .L808A40CC /* 008D0 808A40A0 00000000 */ nop /* 008D4 808A40A4 3C01808A */ lui $at, %hi(D_808A44C0) ## $at = 808A0000 -/* 008D8 808A40A8 C42C44C0 */ lwc1 $f12, %lo(D_808A44C0)($at) +/* 008D8 808A40A8 C42C44C0 */ lwc1 $f12, %lo(D_808A44C0)($at) /* 008DC 808A40AC 3C01808A */ lui $at, %hi(D_808A44C4) ## $at = 808A0000 /* 008E0 808A40B0 3C06C4E3 */ lui $a2, 0xC4E3 ## $a2 = C4E30000 /* 008E4 808A40B4 34C6A000 */ ori $a2, $a2, 0xA000 ## $a2 = C4E3A000 -/* 008E8 808A40B8 C42E44C4 */ lwc1 $f14, %lo(D_808A44C4)($at) -/* 008EC 808A40BC 0C034261 */ jal Matrix_Translate +/* 008E8 808A40B8 C42E44C4 */ lwc1 $f14, %lo(D_808A44C4)($at) +/* 008EC 808A40BC 0C034261 */ jal Matrix_Translate /* 008F0 808A40C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008F4 808A40C4 10000006 */ beq $zero, $zero, .L808A40E0 -/* 008F8 808A40C8 8FB900B0 */ lw $t9, 0x00B0($sp) +/* 008F4 808A40C4 10000006 */ beq $zero, $zero, .L808A40E0 +/* 008F8 808A40C8 8FB900B0 */ lw $t9, 0x00B0($sp) .L808A40CC: -/* 008FC 808A40CC C42C44C8 */ lwc1 $f12, %lo(D_808A44C8)($at) +/* 008FC 808A40CC C42C44C8 */ lwc1 $f12, %lo(D_808A44C8)($at) /* 00900 808A40D0 3C01808A */ lui $at, %hi(D_808A44CC) ## $at = 808A0000 -/* 00904 808A40D4 0C034261 */ jal Matrix_Translate -/* 00908 808A40D8 C42E44CC */ lwc1 $f14, %lo(D_808A44CC)($at) -/* 0090C 808A40DC 8FB900B0 */ lw $t9, 0x00B0($sp) +/* 00904 808A40D4 0C034261 */ jal Matrix_Translate +/* 00908 808A40D8 C42E44CC */ lwc1 $f14, %lo(D_808A44CC)($at) +/* 0090C 808A40DC 8FB900B0 */ lw $t9, 0x00B0($sp) .L808A40E0: /* 00910 808A40E0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00914 808A40E4 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 /* 00918 808A40E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0091C 808A40EC 0C034421 */ jal Matrix_RotateXYZ +/* 0091C 808A40EC 0C034421 */ jal Matrix_RotateZYX /* 00920 808A40F0 872600B8 */ lh $a2, 0x00B8($t9) ## 000000B8 /* 00924 808A40F4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00928 808A40F8 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 /* 0092C 808A40FC 44817000 */ mtc1 $at, $f14 ## $f14 = -50.00 -/* 00930 808A4100 44066000 */ mfc1 $a2, $f12 -/* 00934 808A4104 0C034261 */ jal Matrix_Translate +/* 00930 808A4100 44066000 */ mfc1 $a2, $f12 +/* 00934 808A4104 0C034261 */ jal Matrix_Translate /* 00938 808A4108 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0093C 808A410C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00940 808A4110 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -117,14 +117,14 @@ glabel func_808A3F58 /* 00948 808A4118 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 0094C 808A411C AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 00950 808A4120 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00954 808A4124 8FAA00B4 */ lw $t2, 0x00B4($sp) +/* 00954 808A4124 8FAA00B4 */ lw $t2, 0x00B4($sp) /* 00958 808A4128 3C05808A */ lui $a1, %hi(D_808A4450) ## $a1 = 808A0000 /* 0095C 808A412C 24A54450 */ addiu $a1, $a1, %lo(D_808A4450) ## $a1 = 808A4450 /* 00960 808A4130 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 00964 808A4134 2406028C */ addiu $a2, $zero, 0x028C ## $a2 = 0000028C -/* 00968 808A4138 0C0346A2 */ jal Matrix_NewMtx -/* 0096C 808A413C AFA20044 */ sw $v0, 0x0044($sp) -/* 00970 808A4140 8FA30044 */ lw $v1, 0x0044($sp) +/* 00968 808A4138 0C0346A2 */ jal Matrix_NewMtx +/* 0096C 808A413C AFA20044 */ sw $v0, 0x0044($sp) +/* 00970 808A4140 8FA30044 */ lw $v1, 0x0044($sp) /* 00974 808A4144 3C0D0405 */ lui $t5, 0x0405 ## $t5 = 04050000 /* 00978 808A4148 25AD9FE0 */ addiu $t5, $t5, 0x9FE0 ## $t5 = 04049FE0 /* 0097C 808A414C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -134,47 +134,47 @@ glabel func_808A3F58 /* 0098C 808A415C AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 00990 808A4160 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 00994 808A4164 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00998 808A4168 8FA600B0 */ lw $a2, 0x00B0($sp) +/* 00998 808A4168 8FA600B0 */ lw $a2, 0x00B0($sp) /* 0099C 808A416C 80CE016A */ lb $t6, 0x016A($a2) ## 0000016A .L808A4170: /* 009A0 808A4170 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 009A4 808A4174 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 009A8 808A4178 19C0008A */ blez $t6, .L808A43A4 -/* 009AC 808A417C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 009B0 808A4180 00812021 */ addu $a0, $a0, $at -/* 009B4 808A4184 AFA40020 */ sw $a0, 0x0020($sp) +/* 009A8 808A4178 19C0008A */ blez $t6, .L808A43A4 +/* 009AC 808A417C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 009B0 808A4180 00812021 */ addu $a0, $a0, $at +/* 009B4 808A4184 AFA40020 */ sw $a0, 0x0020($sp) /* 009B8 808A4188 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 009BC 808A418C 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E -/* 009C0 808A4190 8FAF00B0 */ lw $t7, 0x00B0($sp) -/* 009C4 808A4194 0002C600 */ sll $t8, $v0, 24 -/* 009C8 808A4198 0018CE03 */ sra $t9, $t8, 24 -/* 009CC 808A419C 8FA40020 */ lw $a0, 0x0020($sp) -/* 009D0 808A41A0 1B200080 */ blez $t9, .L808A43A4 +/* 009C0 808A4190 8FAF00B0 */ lw $t7, 0x00B0($sp) +/* 009C4 808A4194 0002C600 */ sll $t8, $v0, 24 +/* 009C8 808A4198 0018CE03 */ sra $t9, $t8, 24 +/* 009CC 808A419C 8FA40020 */ lw $a0, 0x0020($sp) +/* 009D0 808A41A0 1B200080 */ blez $t9, .L808A43A4 /* 009D4 808A41A4 A1E2016A */ sb $v0, 0x016A($t7) ## 0000016A -/* 009D8 808A41A8 8FA800B0 */ lw $t0, 0x00B0($sp) +/* 009D8 808A41A8 8FA800B0 */ lw $t0, 0x00B0($sp) /* 009DC 808A41AC 0C026062 */ jal Object_IsLoaded - + /* 009E0 808A41B0 8105016A */ lb $a1, 0x016A($t0) ## 0000016A -/* 009E4 808A41B4 5040007C */ beql $v0, $zero, .L808A43A8 -/* 009E8 808A41B8 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 009E4 808A41B4 5040007C */ beql $v0, $zero, .L808A43A8 +/* 009E8 808A41B8 8FAD00B4 */ lw $t5, 0x00B4($sp) /* 009EC 808A41BC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 009F0 808A41C0 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 009F4 808A41C4 354A0018 */ ori $t2, $t2, 0x0018 ## $t2 = DB060018 /* 009F8 808A41C8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 009FC 808A41CC AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 00A00 808A41D0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00A04 808A41D4 8FAC00B0 */ lw $t4, 0x00B0($sp) -/* 00A08 808A41D8 8FAB00B4 */ lw $t3, 0x00B4($sp) +/* 00A04 808A41D4 8FAC00B0 */ lw $t4, 0x00B0($sp) +/* 00A08 808A41D8 8FAB00B4 */ lw $t3, 0x00B4($sp) /* 00A0C 808A41DC 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 00A10 808A41E0 818D016A */ lb $t5, 0x016A($t4) ## 0000016A /* 00A14 808A41E4 3C098011 */ lui $t1, 0x8011 ## $t1 = 80110000 /* 00A18 808A41E8 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 00A1C 808A41EC 000D7100 */ sll $t6, $t5, 4 -/* 00A20 808A41F0 01CD7021 */ addu $t6, $t6, $t5 -/* 00A24 808A41F4 000E7080 */ sll $t6, $t6, 2 -/* 00A28 808A41F8 016E7821 */ addu $t7, $t3, $t6 -/* 00A2C 808A41FC 030FC021 */ addu $t8, $t8, $t7 +/* 00A1C 808A41EC 000D7100 */ sll $t6, $t5, 4 +/* 00A20 808A41F0 01CD7021 */ addu $t6, $t6, $t5 +/* 00A24 808A41F4 000E7080 */ sll $t6, $t6, 2 +/* 00A28 808A41F8 016E7821 */ addu $t7, $t3, $t6 +/* 00A2C 808A41FC 030FC021 */ addu $t8, $t8, $t7 /* 00A30 808A4200 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 00A34 808A4204 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 /* 00A38 808A4208 25296290 */ addiu $t1, $t1, 0x6290 ## $t1 = 80116290 @@ -184,7 +184,7 @@ glabel func_808A3F58 /* 00A48 808A4218 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 00A4C 808A421C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 00A50 808A4220 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00A54 808A4224 0C03423F */ jal Matrix_Put +/* 00A54 808A4224 0C03423F */ jal Matrix_Put /* 00A58 808A4228 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 00A5C 808A422C 3C014313 */ lui $at, 0x4313 ## $at = 43130000 /* 00A60 808A4230 44816000 */ mtc1 $at, $f12 ## $f12 = 147.00 @@ -192,32 +192,32 @@ glabel func_808A3F58 /* 00A68 808A4238 44817000 */ mtc1 $at, $f14 ## $f14 = -245.00 /* 00A6C 808A423C 3C06C3E2 */ lui $a2, 0xC3E2 ## $a2 = C3E20000 /* 00A70 808A4240 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3E28000 -/* 00A74 808A4244 0C034261 */ jal Matrix_Translate +/* 00A74 808A4244 0C034261 */ jal Matrix_Translate /* 00A78 808A4248 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00A7C 808A424C 3C01808A */ lui $at, %hi(D_808A44D0) ## $at = 808A0000 -/* 00A80 808A4250 C42C44D0 */ lwc1 $f12, %lo(D_808A44D0)($at) -/* 00A84 808A4254 0C034348 */ jal Matrix_RotateY +/* 00A80 808A4250 C42C44D0 */ lwc1 $f12, %lo(D_808A44D0)($at) +/* 00A84 808A4254 0C034348 */ jal Matrix_RotateY /* 00A88 808A4258 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00A8C 808A425C 3C01808A */ lui $at, %hi(D_808A44D4) ## $at = 808A0000 -/* 00A90 808A4260 C42C44D4 */ lwc1 $f12, %lo(D_808A44D4)($at) +/* 00A90 808A4260 C42C44D4 */ lwc1 $f12, %lo(D_808A44D4)($at) /* 00A94 808A4264 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00A98 808A4268 44066000 */ mfc1 $a2, $f12 -/* 00A9C 808A426C 0C0342A3 */ jal Matrix_Scale -/* 00AA0 808A4270 46006386 */ mov.s $f14, $f12 +/* 00A98 808A4268 44066000 */ mfc1 $a2, $f12 +/* 00A9C 808A426C 0C0342A3 */ jal Matrix_Scale +/* 00AA0 808A4270 46006386 */ mov.s $f14, $f12 /* 00AA4 808A4274 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00AA8 808A4278 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 /* 00AAC 808A427C 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 /* 00AB0 808A4280 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00AB4 808A4284 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 00AB8 808A4288 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00ABC 808A428C 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 00ABC 808A428C 8FAD00B4 */ lw $t5, 0x00B4($sp) /* 00AC0 808A4290 3C05808A */ lui $a1, %hi(D_808A4468) ## $a1 = 808A0000 /* 00AC4 808A4294 24A54468 */ addiu $a1, $a1, %lo(D_808A4468) ## $a1 = 808A4468 /* 00AC8 808A4298 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 00ACC 808A429C 240602B1 */ addiu $a2, $zero, 0x02B1 ## $a2 = 000002B1 -/* 00AD0 808A42A0 0C0346A2 */ jal Matrix_NewMtx -/* 00AD4 808A42A4 AFA20034 */ sw $v0, 0x0034($sp) -/* 00AD8 808A42A8 8FA30034 */ lw $v1, 0x0034($sp) +/* 00AD0 808A42A0 0C0346A2 */ jal Matrix_NewMtx +/* 00AD4 808A42A4 AFA20034 */ sw $v0, 0x0034($sp) +/* 00AD8 808A42A8 8FA30034 */ lw $v1, 0x0034($sp) /* 00ADC 808A42AC 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00AE0 808A42B0 25EF0AE8 */ addiu $t7, $t7, 0x0AE8 ## $t7 = 06000AE8 /* 00AE4 808A42B4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -227,7 +227,7 @@ glabel func_808A3F58 /* 00AF4 808A42C4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00AF8 808A42C8 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 00AFC 808A42CC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00B00 808A42D0 0C03423F */ jal Matrix_Put +/* 00B00 808A42D0 0C03423F */ jal Matrix_Put /* 00B04 808A42D4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 00B08 808A42D8 3C014327 */ lui $at, 0x4327 ## $at = 43270000 /* 00B0C 808A42DC 44816000 */ mtc1 $at, $f12 ## $f12 = 167.00 @@ -235,45 +235,45 @@ glabel func_808A3F58 /* 00B14 808A42E4 44817000 */ mtc1 $at, $f14 ## $f14 = -218.00 /* 00B18 808A42E8 3C06C3E2 */ lui $a2, 0xC3E2 ## $a2 = C3E20000 /* 00B1C 808A42EC 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3E28000 -/* 00B20 808A42F0 0C034261 */ jal Matrix_Translate +/* 00B20 808A42F0 0C034261 */ jal Matrix_Translate /* 00B24 808A42F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B28 808A42F8 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 00B28 808A42F8 8FA400B4 */ lw $a0, 0x00B4($sp) /* 00B2C 808A42FC 0C00B32C */ jal Flags_GetTreasure - + /* 00B30 808A4300 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E -/* 00B34 808A4304 10400007 */ beq $v0, $zero, .L808A4324 +/* 00B34 808A4304 10400007 */ beq $v0, $zero, .L808A4324 /* 00B38 808A4308 3C01808A */ lui $at, %hi(D_808A44DC) ## $at = 808A0000 /* 00B3C 808A430C 3C01808A */ lui $at, %hi(D_808A44D8) ## $at = 808A0000 -/* 00B40 808A4310 C42C44D8 */ lwc1 $f12, %lo(D_808A44D8)($at) -/* 00B44 808A4314 0C0343B5 */ jal Matrix_RotateZ +/* 00B40 808A4310 C42C44D8 */ lwc1 $f12, %lo(D_808A44D8)($at) +/* 00B44 808A4314 0C0343B5 */ jal Matrix_RotateZ /* 00B48 808A4318 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00B4C 808A431C 10000004 */ beq $zero, $zero, .L808A4330 +/* 00B4C 808A431C 10000004 */ beq $zero, $zero, .L808A4330 /* 00B50 808A4320 00000000 */ nop .L808A4324: -/* 00B54 808A4324 C42C44DC */ lwc1 $f12, %lo(D_808A44DC)($at) -/* 00B58 808A4328 0C0343B5 */ jal Matrix_RotateZ +/* 00B54 808A4324 C42C44DC */ lwc1 $f12, %lo(D_808A44DC)($at) +/* 00B58 808A4328 0C0343B5 */ jal Matrix_RotateZ /* 00B5C 808A432C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L808A4330: /* 00B60 808A4330 3C01808A */ lui $at, %hi(D_808A44E0) ## $at = 808A0000 -/* 00B64 808A4334 C42C44E0 */ lwc1 $f12, %lo(D_808A44E0)($at) +/* 00B64 808A4334 C42C44E0 */ lwc1 $f12, %lo(D_808A44E0)($at) /* 00B68 808A4338 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B6C 808A433C 44066000 */ mfc1 $a2, $f12 -/* 00B70 808A4340 0C0342A3 */ jal Matrix_Scale -/* 00B74 808A4344 46006386 */ mov.s $f14, $f12 +/* 00B6C 808A433C 44066000 */ mfc1 $a2, $f12 +/* 00B70 808A4340 0C0342A3 */ jal Matrix_Scale +/* 00B74 808A4344 46006386 */ mov.s $f14, $f12 /* 00B78 808A4348 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00B7C 808A434C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 /* 00B80 808A4350 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 /* 00B84 808A4354 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00B88 808A4358 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 00B8C 808A435C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00B90 808A4360 8FA800B4 */ lw $t0, 0x00B4($sp) +/* 00B90 808A4360 8FA800B4 */ lw $t0, 0x00B4($sp) /* 00B94 808A4364 3C05808A */ lui $a1, %hi(D_808A4480) ## $a1 = 808A0000 /* 00B98 808A4368 24A54480 */ addiu $a1, $a1, %lo(D_808A4480) ## $a1 = 808A4480 /* 00B9C 808A436C 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 00BA0 808A4370 240602BF */ addiu $a2, $zero, 0x02BF ## $a2 = 000002BF -/* 00BA4 808A4374 0C0346A2 */ jal Matrix_NewMtx -/* 00BA8 808A4378 AFA2002C */ sw $v0, 0x002C($sp) -/* 00BAC 808A437C 8FA3002C */ lw $v1, 0x002C($sp) +/* 00BA4 808A4374 0C0346A2 */ jal Matrix_NewMtx +/* 00BA8 808A4378 AFA2002C */ sw $v0, 0x002C($sp) +/* 00BAC 808A437C 8FA3002C */ lw $v1, 0x002C($sp) /* 00BB0 808A4380 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 /* 00BB4 808A4384 258C1678 */ addiu $t4, $t4, 0x1678 ## $t4 = 06001678 /* 00BB8 808A4388 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -284,18 +284,18 @@ glabel func_808A3F58 /* 00BCC 808A439C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00BD0 808A43A0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 .L808A43A4: -/* 00BD4 808A43A4 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 00BD4 808A43A4 8FAD00B4 */ lw $t5, 0x00B4($sp) .L808A43A8: /* 00BD8 808A43A8 3C06808A */ lui $a2, %hi(D_808A4498) ## $a2 = 808A0000 /* 00BDC 808A43AC 24C64498 */ addiu $a2, $a2, %lo(D_808A4498) ## $a2 = 808A4498 /* 00BE0 808A43B0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFA4 /* 00BE4 808A43B4 240702C5 */ addiu $a3, $zero, 0x02C5 ## $a3 = 000002C5 -/* 00BE8 808A43B8 0C031AD5 */ jal func_800C6B54 +/* 00BE8 808A43B8 0C031AD5 */ jal func_800C6B54 /* 00BEC 808A43BC 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 00BF0 808A43C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BF4 808A43C4 8FB00018 */ lw $s0, 0x0018($sp) +/* 00BF0 808A43C0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00BF4 808A43C4 8FB00018 */ lw $s0, 0x0018($sp) /* 00BF8 808A43C8 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 -/* 00BFC 808A43CC 03E00008 */ jr $ra +/* 00BFC 808A43CC 03E00008 */ jr $ra /* 00C00 808A43D0 00000000 */ nop /* 00C04 808A43D4 00000000 */ nop /* 00C08 808A43D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s index 6f92d495c7..738fab1d71 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s @@ -1,27 +1,27 @@ glabel BgYdanSp_Draw /* 011B8 808C05C8 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 011BC 808C05CC AFB40030 */ sw $s4, 0x0030($sp) +/* 011BC 808C05CC AFB40030 */ sw $s4, 0x0030($sp) /* 011C0 808C05D0 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 011C4 808C05D4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 011C8 808C05D8 AFB3002C */ sw $s3, 0x002C($sp) -/* 011CC 808C05DC AFB20028 */ sw $s2, 0x0028($sp) -/* 011D0 808C05E0 AFB10024 */ sw $s1, 0x0024($sp) -/* 011D4 808C05E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 011D8 808C05E8 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 011C4 808C05D4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 011C8 808C05D8 AFB3002C */ sw $s3, 0x002C($sp) +/* 011CC 808C05DC AFB20028 */ sw $s2, 0x0028($sp) +/* 011D0 808C05E0 AFB10024 */ sw $s1, 0x0024($sp) +/* 011D4 808C05E4 AFB00020 */ sw $s0, 0x0020($sp) +/* 011D8 808C05E8 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 011DC 808C05EC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 011E0 808C05F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 011E4 808C05F4 3C06808C */ lui $a2, %hi(D_808C09F0) ## $a2 = 808C0000 /* 011E8 808C05F8 24C609F0 */ addiu $a2, $a2, %lo(D_808C09F0) ## $a2 = 808C09F0 /* 011EC 808C05FC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFA4 /* 011F0 808C0600 2407030D */ addiu $a3, $zero, 0x030D ## $a3 = 0000030D -/* 011F4 808C0604 0C031AB1 */ jal func_800C6AC4 +/* 011F4 808C0604 0C031AB1 */ jal func_800C6AC4 /* 011F8 808C0608 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 011FC 808C060C 0C024F61 */ jal func_80093D84 +/* 011FC 808C060C 0C024F61 */ jal func_80093D84 /* 01200 808C0610 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 01204 808C0614 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 01208 808C0618 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0120C 808C061C 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 01210 808C0620 15C10014 */ bne $t6, $at, .L808C0674 +/* 01210 808C0620 15C10014 */ bne $t6, $at, .L808C0674 /* 01214 808C0624 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 /* 01218 808C0628 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 /* 0121C 808C062C 3C05808C */ lui $a1, %hi(D_808C0A04) ## $a1 = 808C0000 @@ -30,7 +30,7 @@ glabel BgYdanSp_Draw /* 01228 808C0638 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 /* 0122C 808C063C AE180000 */ sw $t8, 0x0000($s0) ## 00000000 /* 01230 808C0640 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 -/* 01234 808C0644 0C0346A2 */ jal Matrix_NewMtx +/* 01234 808C0644 0C0346A2 */ jal Matrix_NewMtx /* 01238 808C0648 24060313 */ addiu $a2, $zero, 0x0313 ## $a2 = 00000313 /* 0123C 808C064C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01240 808C0650 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 @@ -40,45 +40,45 @@ glabel BgYdanSp_Draw /* 01250 808C0660 AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 /* 01254 808C0664 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 /* 01258 808C0668 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 0125C 808C066C 10000099 */ beq $zero, $zero, .L808C08D4 +/* 0125C 808C066C 10000099 */ beq $zero, $zero, .L808C08D4 /* 01260 808C0670 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 .L808C0674: /* 01264 808C0674 8E0B0164 */ lw $t3, 0x0164($s0) ## 00000164 /* 01268 808C0678 3C0A808C */ lui $t2, %hi(func_808BFC50) ## $t2 = 808C0000 /* 0126C 808C067C 254AFC50 */ addiu $t2, $t2, %lo(func_808BFC50) ## $t2 = 808BFC50 -/* 01270 808C0680 554B0067 */ bnel $t2, $t3, .L808C0820 +/* 01270 808C0680 554B0067 */ bnel $t2, $t3, .L808C0820 /* 01274 808C0684 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 01278 808C0688 0C034236 */ jal Matrix_Get +/* 01278 808C0688 0C034236 */ jal Matrix_Get /* 0127C 808C068C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFB8 /* 01280 808C0690 860C016A */ lh $t4, 0x016A($s0) ## 0000016A /* 01284 808C0694 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 01288 808C0698 55810030 */ bnel $t4, $at, .L808C075C +/* 01288 808C0698 55810030 */ bnel $t4, $at, .L808C075C /* 0128C 808C069C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01290 808C06A0 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C /* 01294 808C06A4 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01298 808C06A8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0129C 808C06AC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 012A0 808C06B0 46062201 */ sub.s $f8, $f4, $f6 +/* 012A0 808C06B0 46062201 */ sub.s $f8, $f4, $f6 /* 012A4 808C06B4 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 012A8 808C06B8 44066000 */ mfc1 $a2, $f12 +/* 012A8 808C06B8 44066000 */ mfc1 $a2, $f12 /* 012AC 808C06BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012B0 808C06C0 460A4382 */ mul.s $f14, $f8, $f10 -/* 012B4 808C06C4 0C034261 */ jal Matrix_Translate +/* 012B0 808C06C0 460A4382 */ mul.s $f14, $f8, $f10 +/* 012B4 808C06C4 0C034261 */ jal Matrix_Translate /* 012B8 808C06C8 00000000 */ nop /* 012BC 808C06CC C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C /* 012C0 808C06D0 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 012C4 808C06D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 012C8 808C06D8 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 012CC 808C06DC 46128101 */ sub.s $f4, $f16, $f18 +/* 012CC 808C06DC 46128101 */ sub.s $f4, $f16, $f18 /* 012D0 808C06E0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 012D4 808C06E4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 012D8 808C06E8 3C01808C */ lui $at, %hi(D_808C0A90) ## $at = 808C0000 -/* 012DC 808C06EC C42A0A90 */ lwc1 $f10, %lo(D_808C0A90)($at) -/* 012E0 808C06F0 46062200 */ add.s $f8, $f4, $f6 -/* 012E4 808C06F4 44066000 */ mfc1 $a2, $f12 +/* 012DC 808C06EC C42A0A90 */ lwc1 $f10, %lo(D_808C0A90)($at) +/* 012E0 808C06F0 46062200 */ add.s $f8, $f4, $f6 +/* 012E4 808C06F4 44066000 */ mfc1 $a2, $f12 /* 012E8 808C06F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012EC 808C06FC 460A4382 */ mul.s $f14, $f8, $f10 -/* 012F0 808C0700 0C0342A3 */ jal Matrix_Scale +/* 012EC 808C06FC 460A4382 */ mul.s $f14, $f8, $f10 +/* 012F0 808C0700 0C0342A3 */ jal Matrix_Scale /* 012F4 808C0704 00000000 */ nop /* 012F8 808C0708 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 /* 012FC 808C070C 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 @@ -89,7 +89,7 @@ glabel BgYdanSp_Draw /* 01310 808C0720 AE0E0000 */ sw $t6, 0x0000($s0) ## 00000000 /* 01314 808C0724 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 01318 808C0728 24A50A18 */ addiu $a1, $a1, %lo(D_808C0A18) ## $a1 = 808C0A18 -/* 0131C 808C072C 0C0346A2 */ jal Matrix_NewMtx +/* 0131C 808C072C 0C0346A2 */ jal Matrix_NewMtx /* 01320 808C0730 24060328 */ addiu $a2, $zero, 0x0328 ## $a2 = 00000328 /* 01324 808C0734 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01328 808C0738 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 @@ -107,26 +107,26 @@ glabel BgYdanSp_Draw /* 01354 808C0764 26733850 */ addiu $s3, $s3, 0x3850 ## $s3 = 06003850 /* 01358 808C0768 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L808C076C: -/* 0135C 808C076C 0C03423F */ jal Matrix_Put +/* 0135C 808C076C 0C03423F */ jal Matrix_Put /* 01360 808C0770 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFB8 -/* 01364 808C0774 00112C00 */ sll $a1, $s1, 16 -/* 01368 808C0778 00052C03 */ sra $a1, $a1, 16 +/* 01364 808C0774 00112C00 */ sll $a1, $s1, 16 +/* 01368 808C0778 00052C03 */ sra $a1, $a1, 16 /* 0136C 808C077C 2404FA60 */ addiu $a0, $zero, 0xFA60 ## $a0 = FFFFFA60 /* 01370 808C0780 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01374 808C0784 0C034421 */ jal Matrix_RotateXYZ +/* 01374 808C0784 0C034421 */ jal Matrix_RotateZYX /* 01378 808C0788 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0137C 808C078C 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 01380 808C0790 44817000 */ mtc1 $at, $f14 ## $f14 = 700.00 /* 01384 808C0794 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01388 808C0798 3C06C461 */ lui $a2, 0xC461 ## $a2 = C4610000 -/* 0138C 808C079C 0C034261 */ jal Matrix_Translate +/* 0138C 808C079C 0C034261 */ jal Matrix_Translate /* 01390 808C07A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01394 808C07A4 3C014060 */ lui $at, 0x4060 ## $at = 40600000 /* 01398 808C07A8 44816000 */ mtc1 $at, $f12 ## $f12 = 3.50 /* 0139C 808C07AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 013A0 808C07B0 44817000 */ mtc1 $at, $f14 ## $f14 = 5.00 -/* 013A4 808C07B4 4406A000 */ mfc1 $a2, $f20 -/* 013A8 808C07B8 0C0342A3 */ jal Matrix_Scale +/* 013A4 808C07B4 4406A000 */ mfc1 $a2, $f20 +/* 013A8 808C07B8 0C0342A3 */ jal Matrix_Scale /* 013AC 808C07BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013B0 808C07C0 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 /* 013B4 808C07C4 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -137,7 +137,7 @@ glabel BgYdanSp_Draw /* 013C8 808C07D8 AE090000 */ sw $t1, 0x0000($s0) ## 00000000 /* 013CC 808C07DC 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 013D0 808C07E0 24A50A2C */ addiu $a1, $a1, %lo(D_808C0A2C) ## $a1 = 808C0A2C -/* 013D4 808C07E4 0C0346A2 */ jal Matrix_NewMtx +/* 013D4 808C07E4 0C0346A2 */ jal Matrix_NewMtx /* 013D8 808C07E8 2406033E */ addiu $a2, $zero, 0x033E ## $a2 = 0000033E /* 013DC 808C07EC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 013E0 808C07F0 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 @@ -147,36 +147,36 @@ glabel BgYdanSp_Draw /* 013F0 808C0800 AE4A02D0 */ sw $t2, 0x02D0($s2) ## 000002D0 /* 013F4 808C0804 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 /* 013F8 808C0808 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 013FC 808C080C 1621FFD7 */ bne $s1, $at, .L808C076C +/* 013FC 808C080C 1621FFD7 */ bne $s1, $at, .L808C076C /* 01400 808C0810 AC730004 */ sw $s3, 0x0004($v1) ## 00000004 -/* 01404 808C0814 1000002F */ beq $zero, $zero, .L808C08D4 +/* 01404 808C0814 1000002F */ beq $zero, $zero, .L808C08D4 /* 01408 808C0818 00000000 */ nop /* 0140C 808C081C C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C .L808C0820: /* 01410 808C0820 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 01414 808C0824 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01418 808C0828 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0141C 808C082C 46128101 */ sub.s $f4, $f16, $f18 +/* 0141C 808C082C 46128101 */ sub.s $f4, $f16, $f18 /* 01420 808C0830 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01424 808C0834 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01428 808C0838 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0142C 808C083C 46062382 */ mul.s $f14, $f4, $f6 -/* 01430 808C0840 0C034261 */ jal Matrix_Translate +/* 0142C 808C083C 46062382 */ mul.s $f14, $f4, $f6 +/* 01430 808C0840 0C034261 */ jal Matrix_Translate /* 01434 808C0844 00000000 */ nop /* 01438 808C0848 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 0143C 808C084C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 01440 808C0850 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01444 808C0854 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01448 808C0858 460A4401 */ sub.s $f16, $f8, $f10 +/* 01448 808C0858 460A4401 */ sub.s $f16, $f8, $f10 /* 0144C 808C085C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01450 808C0860 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 01454 808C0864 3C01808C */ lui $at, %hi(D_808C0A94) ## $at = 808C0000 -/* 01458 808C0868 C4260A94 */ lwc1 $f6, %lo(D_808C0A94)($at) -/* 0145C 808C086C 46128100 */ add.s $f4, $f16, $f18 -/* 01460 808C0870 44066000 */ mfc1 $a2, $f12 +/* 01458 808C0868 C4260A94 */ lwc1 $f6, %lo(D_808C0A94)($at) +/* 0145C 808C086C 46128100 */ add.s $f4, $f16, $f18 +/* 01460 808C0870 44066000 */ mfc1 $a2, $f12 /* 01464 808C0874 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01468 808C0878 46062382 */ mul.s $f14, $f4, $f6 -/* 0146C 808C087C 0C0342A3 */ jal Matrix_Scale +/* 01468 808C0878 46062382 */ mul.s $f14, $f4, $f6 +/* 0146C 808C087C 0C0342A3 */ jal Matrix_Scale /* 01470 808C0880 00000000 */ nop /* 01474 808C0884 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 /* 01478 808C0888 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 @@ -187,7 +187,7 @@ glabel BgYdanSp_Draw /* 0148C 808C089C AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 /* 01490 808C08A0 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 01494 808C08A4 24A50A40 */ addiu $a1, $a1, %lo(D_808C0A40) ## $a1 = 808C0A40 -/* 01498 808C08A8 0C0346A2 */ jal Matrix_NewMtx +/* 01498 808C08A8 0C0346A2 */ jal Matrix_NewMtx /* 0149C 808C08AC 24060351 */ addiu $a2, $zero, 0x0351 ## $a2 = 00000351 /* 014A0 808C08B0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 014A4 808C08B4 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 @@ -203,15 +203,15 @@ glabel BgYdanSp_Draw /* 014C8 808C08D8 24C60A54 */ addiu $a2, $a2, %lo(D_808C0A54) ## $a2 = 808C0A54 /* 014CC 808C08DC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFA4 /* 014D0 808C08E0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 014D4 808C08E4 0C031AD5 */ jal func_800C6B54 +/* 014D4 808C08E4 0C031AD5 */ jal func_800C6B54 /* 014D8 808C08E8 24070358 */ addiu $a3, $zero, 0x0358 ## $a3 = 00000358 -/* 014DC 808C08EC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 014E0 808C08F0 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 014E4 808C08F4 8FB00020 */ lw $s0, 0x0020($sp) -/* 014E8 808C08F8 8FB10024 */ lw $s1, 0x0024($sp) -/* 014EC 808C08FC 8FB20028 */ lw $s2, 0x0028($sp) -/* 014F0 808C0900 8FB3002C */ lw $s3, 0x002C($sp) -/* 014F4 808C0904 8FB40030 */ lw $s4, 0x0030($sp) -/* 014F8 808C0908 03E00008 */ jr $ra +/* 014DC 808C08EC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 014E0 808C08F0 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 014E4 808C08F4 8FB00020 */ lw $s0, 0x0020($sp) +/* 014E8 808C08F8 8FB10024 */ lw $s1, 0x0024($sp) +/* 014EC 808C08FC 8FB20028 */ lw $s2, 0x0028($sp) +/* 014F0 808C0900 8FB3002C */ lw $s3, 0x002C($sp) +/* 014F4 808C0904 8FB40030 */ lw $s4, 0x0030($sp) +/* 014F8 808C0908 03E00008 */ jr $ra /* 014FC 808C090C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s index 4077b1343e..603700c16f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s @@ -1,119 +1,119 @@ glabel func_808C4940 /* 037B0 808C4940 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 037B4 808C4944 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 037B8 808C4948 AFBF0014 */ sw $ra, 0x0014($sp) -/* 037BC 808C494C AFA40050 */ sw $a0, 0x0050($sp) -/* 037C0 808C4950 AFA50054 */ sw $a1, 0x0054($sp) -/* 037C4 808C4954 10A10001 */ beq $a1, $at, .L808C495C -/* 037C8 808C4958 AFA60058 */ sw $a2, 0x0058($sp) +/* 037B8 808C4948 AFBF0014 */ sw $ra, 0x0014($sp) +/* 037BC 808C494C AFA40050 */ sw $a0, 0x0050($sp) +/* 037C0 808C4950 AFA50054 */ sw $a1, 0x0054($sp) +/* 037C4 808C4954 10A10001 */ beq $a1, $at, .L808C495C +/* 037C8 808C4958 AFA60058 */ sw $a2, 0x0058($sp) .L808C495C: /* 037CC 808C495C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 037D0 808C4960 0C0344D0 */ jal func_800D1340 -/* 037D4 808C4964 8FA50060 */ lw $a1, 0x0060($sp) -/* 037D8 808C4968 8FAF0058 */ lw $t7, 0x0058($sp) +/* 037D0 808C4960 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* 037D4 808C4964 8FA50060 */ lw $a1, 0x0060($sp) +/* 037D8 808C4968 8FAF0058 */ lw $t7, 0x0058($sp) /* 037DC 808C496C 3C06808D */ lui $a2, %hi(D_808CA5A0) ## $a2 = 808D0000 /* 037E0 808C4970 24C6A5A0 */ addiu $a2, $a2, %lo(D_808CA5A0) ## $a2 = 808CA5A0 /* 037E4 808C4974 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 037E8 808C4978 8FB90050 */ lw $t9, 0x0050($sp) +/* 037E8 808C4978 8FB90050 */ lw $t9, 0x0050($sp) /* 037EC 808C497C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 037F0 808C4980 5300007F */ beql $t8, $zero, .L808C4B80 -/* 037F4 808C4984 8FBF0014 */ lw $ra, 0x0014($sp) +/* 037F0 808C4980 5300007F */ beql $t8, $zero, .L808C4B80 +/* 037F4 808C4984 8FBF0014 */ lw $ra, 0x0014($sp) /* 037F8 808C4988 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 037FC 808C498C 24070ECB */ addiu $a3, $zero, 0x0ECB ## $a3 = 00000ECB -/* 03800 808C4990 0C031AB1 */ jal func_800C6AC4 -/* 03804 808C4994 AFA50040 */ sw $a1, 0x0040($sp) +/* 03800 808C4990 0C031AB1 */ jal func_800C6AC4 +/* 03804 808C4994 AFA50040 */ sw $a1, 0x0040($sp) /* 03808 808C4998 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0380C 808C499C 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 -/* 03810 808C49A0 8FA30054 */ lw $v1, 0x0054($sp) +/* 03810 808C49A0 8FA30054 */ lw $v1, 0x0054($sp) /* 03814 808C49A4 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 -/* 03818 808C49A8 8FA80064 */ lw $t0, 0x0064($sp) -/* 0381C 808C49AC 10610004 */ beq $v1, $at, .L808C49C0 -/* 03820 808C49B0 46007006 */ mov.s $f0, $f14 +/* 03818 808C49A8 8FA80064 */ lw $t0, 0x0064($sp) +/* 0381C 808C49AC 10610004 */ beq $v1, $at, .L808C49C0 +/* 03820 808C49B0 46007006 */ mov.s $f0, $f14 /* 03824 808C49B4 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 03828 808C49B8 54610004 */ bnel $v1, $at, .L808C49CC -/* 0382C 808C49BC E7A00048 */ swc1 $f0, 0x0048($sp) +/* 03828 808C49B8 54610004 */ bnel $v1, $at, .L808C49CC +/* 0382C 808C49BC E7A00048 */ swc1 $f0, 0x0048($sp) .L808C49C0: /* 03830 808C49C0 C50001F8 */ lwc1 $f0, 0x01F8($t0) ## 000001F8 -/* 03834 808C49C4 46000386 */ mov.s $f14, $f0 -/* 03838 808C49C8 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 03834 808C49C4 46000386 */ mov.s $f14, $f0 +/* 03838 808C49C8 E7A00048 */ swc1 $f0, 0x0048($sp) .L808C49CC: -/* 0383C 808C49CC 0C034213 */ jal Matrix_Push -/* 03840 808C49D0 E7AE004C */ swc1 $f14, 0x004C($sp) -/* 03844 808C49D4 C7A00048 */ lwc1 $f0, 0x0048($sp) +/* 0383C 808C49CC 0C034213 */ jal Matrix_Push +/* 03840 808C49D0 E7AE004C */ swc1 $f14, 0x004C($sp) +/* 03844 808C49D4 C7A00048 */ lwc1 $f0, 0x0048($sp) /* 03848 808C49D8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0384C 808C49DC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 03850 808C49E0 44060000 */ mfc1 $a2, $f0 -/* 03854 808C49E4 C7AE004C */ lwc1 $f14, 0x004C($sp) -/* 03858 808C49E8 0C0342A3 */ jal Matrix_Scale +/* 03850 808C49E0 44060000 */ mfc1 $a2, $f0 +/* 03854 808C49E4 C7AE004C */ lwc1 $f14, 0x004C($sp) +/* 03858 808C49E8 0C0342A3 */ jal Matrix_Scale /* 0385C 808C49EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 03860 808C49F0 8FA30054 */ lw $v1, 0x0054($sp) +/* 03860 808C49F0 8FA30054 */ lw $v1, 0x0054($sp) /* 03864 808C49F4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 03868 808C49F8 1061003F */ beq $v1, $at, .L808C4AF8 +/* 03868 808C49F8 1061003F */ beq $v1, $at, .L808C4AF8 /* 0386C 808C49FC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 03870 808C4A00 1061003D */ beq $v1, $at, .L808C4AF8 -/* 03874 808C4A04 8FA90064 */ lw $t1, 0x0064($sp) -/* 03878 808C4A08 00035080 */ sll $t2, $v1, 2 -/* 0387C 808C4A0C 012A1021 */ addu $v0, $t1, $t2 +/* 03870 808C4A00 1061003D */ beq $v1, $at, .L808C4AF8 +/* 03874 808C4A04 8FA90064 */ lw $t1, 0x0064($sp) +/* 03878 808C4A08 00035080 */ sll $t2, $v1, 2 +/* 0387C 808C4A0C 012A1021 */ addu $v0, $t1, $t2 /* 03880 808C4A10 3C01808D */ lui $at, %hi(D_808CA728) ## $at = 808D0000 -/* 03884 808C4A14 C426A728 */ lwc1 $f6, %lo(D_808CA728)($at) +/* 03884 808C4A14 C426A728 */ lwc1 $f6, %lo(D_808CA728)($at) /* 03888 808C4A18 C444025C */ lwc1 $f4, 0x025C($v0) ## 0000025C -/* 0388C 808C4A1C AFA20020 */ sw $v0, 0x0020($sp) +/* 0388C 808C4A1C AFA20020 */ sw $v0, 0x0020($sp) /* 03890 808C4A20 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03894 808C4A24 46062302 */ mul.s $f12, $f4, $f6 -/* 03898 808C4A28 0C0342DC */ jal Matrix_RotateX +/* 03894 808C4A24 46062302 */ mul.s $f12, $f4, $f6 +/* 03898 808C4A28 0C0342DC */ jal Matrix_RotateX /* 0389C 808C4A2C 00000000 */ nop -/* 038A0 808C4A30 8FAB0020 */ lw $t3, 0x0020($sp) +/* 038A0 808C4A30 8FAB0020 */ lw $t3, 0x0020($sp) /* 038A4 808C4A34 3C01808D */ lui $at, %hi(D_808CA72C) ## $at = 808D0000 -/* 038A8 808C4A38 C42AA72C */ lwc1 $f10, %lo(D_808CA72C)($at) +/* 038A8 808C4A38 C42AA72C */ lwc1 $f10, %lo(D_808CA72C)($at) /* 038AC 808C4A3C C568025C */ lwc1 $f8, 0x025C($t3) ## 0000025C /* 038B0 808C4A40 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 038B4 808C4A44 460A4302 */ mul.s $f12, $f8, $f10 -/* 038B8 808C4A48 0C034348 */ jal Matrix_RotateY +/* 038B4 808C4A44 460A4302 */ mul.s $f12, $f8, $f10 +/* 038B8 808C4A48 0C034348 */ jal Matrix_RotateY /* 038BC 808C4A4C 00000000 */ nop -/* 038C0 808C4A50 8FAC0020 */ lw $t4, 0x0020($sp) +/* 038C0 808C4A50 8FAC0020 */ lw $t4, 0x0020($sp) /* 038C4 808C4A54 3C01808D */ lui $at, %hi(D_808CA730) ## $at = 808D0000 -/* 038C8 808C4A58 C432A730 */ lwc1 $f18, %lo(D_808CA730)($at) +/* 038C8 808C4A58 C432A730 */ lwc1 $f18, %lo(D_808CA730)($at) /* 038CC 808C4A5C C590025C */ lwc1 $f16, 0x025C($t4) ## 0000025C /* 038D0 808C4A60 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 038D4 808C4A64 46128302 */ mul.s $f12, $f16, $f18 -/* 038D8 808C4A68 0C0343B5 */ jal Matrix_RotateZ +/* 038D4 808C4A64 46128302 */ mul.s $f12, $f16, $f18 +/* 038D8 808C4A68 0C0343B5 */ jal Matrix_RotateZ /* 038DC 808C4A6C 00000000 */ nop -/* 038E0 808C4A70 8FAD0064 */ lw $t5, 0x0064($sp) +/* 038E0 808C4A70 8FAD0064 */ lw $t5, 0x0064($sp) /* 038E4 808C4A74 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 038E8 808C4A78 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 038EC 808C4A7C C5A00208 */ lwc1 $f0, 0x0208($t5) ## 00000208 /* 038F0 808C4A80 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 038F4 808C4A84 46001301 */ sub.s $f12, $f2, $f0 -/* 038F8 808C4A88 46020380 */ add.s $f14, $f0, $f2 -/* 038FC 808C4A8C 44066000 */ mfc1 $a2, $f12 -/* 03900 808C4A90 0C0342A3 */ jal Matrix_Scale +/* 038F4 808C4A84 46001301 */ sub.s $f12, $f2, $f0 +/* 038F8 808C4A88 46020380 */ add.s $f14, $f0, $f2 +/* 038FC 808C4A8C 44066000 */ mfc1 $a2, $f12 +/* 03900 808C4A90 0C0342A3 */ jal Matrix_Scale /* 03904 808C4A94 00000000 */ nop -/* 03908 808C4A98 8FAE0020 */ lw $t6, 0x0020($sp) +/* 03908 808C4A98 8FAE0020 */ lw $t6, 0x0020($sp) /* 0390C 808C4A9C 3C01808D */ lui $at, %hi(D_808CA734) ## $at = 808D0000 -/* 03910 808C4AA0 C426A734 */ lwc1 $f6, %lo(D_808CA734)($at) +/* 03910 808C4AA0 C426A734 */ lwc1 $f6, %lo(D_808CA734)($at) /* 03914 808C4AA4 C5C4025C */ lwc1 $f4, 0x025C($t6) ## 0000025C /* 03918 808C4AA8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0391C 808C4AAC 46062302 */ mul.s $f12, $f4, $f6 -/* 03920 808C4AB0 0C0343B5 */ jal Matrix_RotateZ -/* 03924 808C4AB4 46006307 */ neg.s $f12, $f12 -/* 03928 808C4AB8 8FAF0020 */ lw $t7, 0x0020($sp) +/* 0391C 808C4AAC 46062302 */ mul.s $f12, $f4, $f6 +/* 03920 808C4AB0 0C0343B5 */ jal Matrix_RotateZ +/* 03924 808C4AB4 46006307 */ neg.s $f12, $f12 +/* 03928 808C4AB8 8FAF0020 */ lw $t7, 0x0020($sp) /* 0392C 808C4ABC 3C01808D */ lui $at, %hi(D_808CA738) ## $at = 808D0000 -/* 03930 808C4AC0 C42AA738 */ lwc1 $f10, %lo(D_808CA738)($at) +/* 03930 808C4AC0 C42AA738 */ lwc1 $f10, %lo(D_808CA738)($at) /* 03934 808C4AC4 C5E8025C */ lwc1 $f8, 0x025C($t7) ## 0000025C /* 03938 808C4AC8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0393C 808C4ACC 460A4302 */ mul.s $f12, $f8, $f10 -/* 03940 808C4AD0 0C034348 */ jal Matrix_RotateY -/* 03944 808C4AD4 46006307 */ neg.s $f12, $f12 -/* 03948 808C4AD8 8FB80020 */ lw $t8, 0x0020($sp) +/* 0393C 808C4ACC 460A4302 */ mul.s $f12, $f8, $f10 +/* 03940 808C4AD0 0C034348 */ jal Matrix_RotateY +/* 03944 808C4AD4 46006307 */ neg.s $f12, $f12 +/* 03948 808C4AD8 8FB80020 */ lw $t8, 0x0020($sp) /* 0394C 808C4ADC 3C01808D */ lui $at, %hi(D_808CA73C) ## $at = 808D0000 -/* 03950 808C4AE0 C432A73C */ lwc1 $f18, %lo(D_808CA73C)($at) +/* 03950 808C4AE0 C432A73C */ lwc1 $f18, %lo(D_808CA73C)($at) /* 03954 808C4AE4 C710025C */ lwc1 $f16, 0x025C($t8) ## 0000025C /* 03958 808C4AE8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0395C 808C4AEC 46128302 */ mul.s $f12, $f16, $f18 -/* 03960 808C4AF0 0C0342DC */ jal Matrix_RotateX -/* 03964 808C4AF4 46006307 */ neg.s $f12, $f12 +/* 0395C 808C4AEC 46128302 */ mul.s $f12, $f16, $f18 +/* 03960 808C4AF0 0C0342DC */ jal Matrix_RotateX +/* 03964 808C4AF4 46006307 */ neg.s $f12, $f12 .L808C4AF8: -/* 03968 808C4AF8 8FA70040 */ lw $a3, 0x0040($sp) +/* 03968 808C4AF8 8FA70040 */ lw $a3, 0x0040($sp) /* 0396C 808C4AFC 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 /* 03970 808C4B00 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 /* 03974 808C4B04 8CE202C0 */ lw $v0, 0x02C0($a3) ## 000002C0 @@ -122,35 +122,35 @@ glabel func_808C4940 /* 03980 808C4B10 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 03984 808C4B14 ACF902C0 */ sw $t9, 0x02C0($a3) ## 000002C0 /* 03988 808C4B18 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 0398C 808C4B1C 8FA90050 */ lw $t1, 0x0050($sp) +/* 0398C 808C4B1C 8FA90050 */ lw $t1, 0x0050($sp) /* 03990 808C4B20 24060EEE */ addiu $a2, $zero, 0x0EEE ## $a2 = 00000EEE /* 03994 808C4B24 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 03998 808C4B28 0C0346A2 */ jal Matrix_NewMtx -/* 0399C 808C4B2C AFA2002C */ sw $v0, 0x002C($sp) -/* 039A0 808C4B30 8FA3002C */ lw $v1, 0x002C($sp) +/* 03998 808C4B28 0C0346A2 */ jal Matrix_NewMtx +/* 0399C 808C4B2C AFA2002C */ sw $v0, 0x002C($sp) +/* 039A0 808C4B30 8FA3002C */ lw $v1, 0x002C($sp) /* 039A4 808C4B34 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 039A8 808C4B38 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 039AC 808C4B3C 8FAA0040 */ lw $t2, 0x0040($sp) +/* 039AC 808C4B3C 8FAA0040 */ lw $t2, 0x0040($sp) /* 039B0 808C4B40 8D4202C0 */ lw $v0, 0x02C0($t2) ## 000002C0 /* 039B4 808C4B44 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 039B8 808C4B48 AD4B02C0 */ sw $t3, 0x02C0($t2) ## 000002C0 /* 039BC 808C4B4C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 039C0 808C4B50 8FAD0058 */ lw $t5, 0x0058($sp) +/* 039C0 808C4B50 8FAD0058 */ lw $t5, 0x0058($sp) /* 039C4 808C4B54 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 039C8 808C4B58 0C034221 */ jal Matrix_Pull +/* 039C8 808C4B58 0C034221 */ jal Matrix_Pull /* 039CC 808C4B5C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 039D0 808C4B60 8FAF0050 */ lw $t7, 0x0050($sp) +/* 039D0 808C4B60 8FAF0050 */ lw $t7, 0x0050($sp) /* 039D4 808C4B64 3C06808D */ lui $a2, %hi(D_808CA5C8) ## $a2 = 808D0000 /* 039D8 808C4B68 24C6A5C8 */ addiu $a2, $a2, %lo(D_808CA5C8) ## $a2 = 808CA5C8 /* 039DC 808C4B6C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 039E0 808C4B70 24070EF2 */ addiu $a3, $zero, 0x0EF2 ## $a3 = 00000EF2 -/* 039E4 808C4B74 0C031AD5 */ jal func_800C6B54 +/* 039E4 808C4B74 0C031AD5 */ jal func_800C6B54 /* 039E8 808C4B78 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 039EC 808C4B7C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 039EC 808C4B7C 8FBF0014 */ lw $ra, 0x0014($sp) .L808C4B80: /* 039F0 808C4B80 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 039F4 808C4B84 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 039F8 808C4B88 03E00008 */ jr $ra +/* 039F8 808C4B88 03E00008 */ jr $ra /* 039FC 808C4B8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s index 22b1040e9c..90ef96c371 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s @@ -1,20 +1,20 @@ glabel func_8091A560 /* 04B50 8091A560 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 04B54 8091A564 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B58 8091A568 AFA40068 */ sw $a0, 0x0068($sp) -/* 04B5C 8091A56C AFA5006C */ sw $a1, 0x006C($sp) -/* 04B60 8091A570 AFA60070 */ sw $a2, 0x0070($sp) -/* 04B64 8091A574 AFA70074 */ sw $a3, 0x0074($sp) -/* 04B68 8091A578 AFA00060 */ sw $zero, 0x0060($sp) +/* 04B54 8091A564 AFBF0014 */ sw $ra, 0x0014($sp) +/* 04B58 8091A568 AFA40068 */ sw $a0, 0x0068($sp) +/* 04B5C 8091A56C AFA5006C */ sw $a1, 0x006C($sp) +/* 04B60 8091A570 AFA60070 */ sw $a2, 0x0070($sp) +/* 04B64 8091A574 AFA70074 */ sw $a3, 0x0074($sp) +/* 04B68 8091A578 AFA00060 */ sw $zero, 0x0060($sp) /* 04B6C 8091A57C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 04B70 8091A580 3C068092 */ lui $a2, %hi(D_8091B464) ## $a2 = 80920000 /* 04B74 8091A584 24C6B464 */ addiu $a2, $a2, %lo(D_8091B464) ## $a2 = 8091B464 /* 04B78 8091A588 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 04B7C 8091A58C 2407124D */ addiu $a3, $zero, 0x124D ## $a3 = 0000124D -/* 04B80 8091A590 0C031AB1 */ jal func_800C6AC4 -/* 04B84 8091A594 AFA5005C */ sw $a1, 0x005C($sp) -/* 04B88 8091A598 8FA9005C */ lw $t1, 0x005C($sp) -/* 04B8C 8091A59C 8FA70074 */ lw $a3, 0x0074($sp) +/* 04B80 8091A590 0C031AB1 */ jal func_800C6AC4 +/* 04B84 8091A594 AFA5005C */ sw $a1, 0x005C($sp) +/* 04B88 8091A598 8FA9005C */ lw $t1, 0x005C($sp) +/* 04B8C 8091A59C 8FA70074 */ lw $a3, 0x0074($sp) /* 04B90 8091A5A0 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 /* 04B94 8091A5A4 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04B98 8091A5A8 3C04FB00 */ lui $a0, 0xFB00 ## $a0 = FB000000 @@ -23,60 +23,60 @@ glabel func_8091A560 /* 04BA4 8091A5B4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 04BA8 8091A5B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 04BAC 8091A5BC 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 -/* 04BB0 8091A5C0 8FA8007C */ lw $t0, 0x007C($sp) +/* 04BB0 8091A5C0 8FA8007C */ lw $t0, 0x007C($sp) /* 04BB4 8091A5C4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 04BB8 8091A5C8 AD3902C0 */ sw $t9, 0x02C0($t1) ## 000002C0 /* 04BBC 8091A5CC AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 04BC0 8091A5D0 C504020C */ lwc1 $f4, 0x020C($t0) ## 0000020C /* 04BC4 8091A5D4 C5080204 */ lwc1 $f8, 0x0204($t0) ## 00000204 /* 04BC8 8091A5D8 C5100208 */ lwc1 $f16, 0x0208($t0) ## 00000208 -/* 04BCC 8091A5DC 4600218D */ trunc.w.s $f6, $f4 -/* 04BD0 8091A5E0 4600428D */ trunc.w.s $f10, $f8 -/* 04BD4 8091A5E4 440D3000 */ mfc1 $t5, $f6 -/* 04BD8 8091A5E8 4600848D */ trunc.w.s $f18, $f16 -/* 04BDC 8091A5EC 440C5000 */ mfc1 $t4, $f10 +/* 04BCC 8091A5DC 4600218D */ trunc.w.s $f6, $f4 +/* 04BD0 8091A5E0 4600428D */ trunc.w.s $f10, $f8 +/* 04BD4 8091A5E4 440D3000 */ mfc1 $t5, $f6 +/* 04BD8 8091A5E8 4600848D */ trunc.w.s $f18, $f16 +/* 04BDC 8091A5EC 440C5000 */ mfc1 $t4, $f10 /* 04BE0 8091A5F0 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 04BE4 8091A5F4 000E7A00 */ sll $t7, $t6, 8 -/* 04BE8 8091A5F8 440B9000 */ mfc1 $t3, $f18 -/* 04BEC 8091A5FC 000C6E00 */ sll $t5, $t4, 24 +/* 04BE4 8091A5F4 000E7A00 */ sll $t7, $t6, 8 +/* 04BE8 8091A5F8 440B9000 */ mfc1 $t3, $f18 +/* 04BEC 8091A5FC 000C6E00 */ sll $t5, $t4, 24 /* 04BF0 8091A600 01ED7025 */ or $t6, $t7, $t5 ## $t6 = 00000008 /* 04BF4 8091A604 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 04BF8 8091A608 000C7C00 */ sll $t7, $t4, 16 +/* 04BF8 8091A608 000C7C00 */ sll $t7, $t4, 16 /* 04BFC 8091A60C 01CF6825 */ or $t5, $t6, $t7 ## $t5 = 00000008 /* 04C00 8091A610 35B800FF */ ori $t8, $t5, 0x00FF ## $t8 = 000000FF /* 04C04 8091A614 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 04C08 8091A618 8FA2006C */ lw $v0, 0x006C($sp) -/* 04C0C 8091A61C 8FA60070 */ lw $a2, 0x0070($sp) -/* 04C10 8091A620 0102C821 */ addu $t9, $t0, $v0 +/* 04C08 8091A618 8FA2006C */ lw $v0, 0x006C($sp) +/* 04C0C 8091A61C 8FA60070 */ lw $a2, 0x0070($sp) +/* 04C10 8091A620 0102C821 */ addu $t9, $t0, $v0 /* 04C14 8091A624 932A0758 */ lbu $t2, 0x0758($t9) ## 00000760 /* 04C18 8091A628 244BFFFB */ addiu $t3, $v0, 0xFFFB ## $t3 = FFFFFFFB -/* 04C1C 8091A62C 29410002 */ slti $at, $t2, 0x0002 -/* 04C20 8091A630 54200003 */ bnel $at, $zero, .L8091A640 -/* 04C24 8091A634 2D610023 */ sltiu $at, $t3, 0x0023 +/* 04C1C 8091A62C 29410002 */ slti $at, $t2, 0x0002 +/* 04C20 8091A630 54200003 */ bnel $at, $zero, .L8091A640 +/* 04C24 8091A634 2D610023 */ sltiu $at, $t3, 0x0023 /* 04C28 8091A638 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 04C2C 8091A63C 2D610023 */ sltiu $at, $t3, 0x0023 +/* 04C2C 8091A63C 2D610023 */ sltiu $at, $t3, 0x0023 .L8091A640: -/* 04C30 8091A640 102000DD */ beq $at, $zero, .L8091A9B8 -/* 04C34 8091A644 8FA60070 */ lw $a2, 0x0070($sp) -/* 04C38 8091A648 000B5880 */ sll $t3, $t3, 2 +/* 04C30 8091A640 102000DD */ beq $at, $zero, .L8091A9B8 +/* 04C34 8091A644 8FA60070 */ lw $a2, 0x0070($sp) +/* 04C38 8091A648 000B5880 */ sll $t3, $t3, 2 /* 04C3C 8091A64C 3C018092 */ lui $at, %hi(jtbl_8091B57C) ## $at = 80920000 -/* 04C40 8091A650 002B0821 */ addu $at, $at, $t3 -/* 04C44 8091A654 8C2BB57C */ lw $t3, %lo(jtbl_8091B57C)($at) -/* 04C48 8091A658 01600008 */ jr $t3 +/* 04C40 8091A650 002B0821 */ addu $at, $at, $t3 +/* 04C44 8091A654 8C2BB57C */ lw $t3, %lo(jtbl_8091B57C)($at) +/* 04C48 8091A658 01600008 */ jr $t3 /* 04C4C 8091A65C 00000000 */ nop glabel L8091A660 /* 04C50 8091A660 850C01B4 */ lh $t4, 0x01B4($t0) ## 000001B4 -/* 04C54 8091A664 55800008 */ bnel $t4, $zero, .L8091A688 +/* 04C54 8091A664 55800008 */ bnel $t4, $zero, .L8091A688 /* 04C58 8091A668 850F01BA */ lh $t7, 0x01BA($t0) ## 000001BA /* 04C5C 8091A66C 850E0198 */ lh $t6, 0x0198($t0) ## 00000198 -/* 04C60 8091A670 29C1F574 */ slti $at, $t6, 0xF574 -/* 04C64 8091A674 50200004 */ beql $at, $zero, .L8091A688 +/* 04C60 8091A670 29C1F574 */ slti $at, $t6, 0xF574 +/* 04C64 8091A674 50200004 */ beql $at, $zero, .L8091A688 /* 04C68 8091A678 850F01BA */ lh $t7, 0x01BA($t0) ## 000001BA -/* 04C6C 8091A67C 100000CE */ beq $zero, $zero, .L8091A9B8 +/* 04C6C 8091A67C 100000CE */ beq $zero, $zero, .L8091A9B8 /* 04C70 8091A680 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 /* 04C74 8091A684 850F01BA */ lh $t7, 0x01BA($t0) ## 000001BA .L8091A688: -/* 04C78 8091A688 51E00024 */ beql $t7, $zero, .L8091A71C +/* 04C78 8091A688 51E00024 */ beql $t7, $zero, .L8091A71C /* 04C7C 8091A68C 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04C80 8091A690 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04C84 8091A694 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 @@ -84,36 +84,36 @@ glabel L8091A660 /* 04C8C 8091A69C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 04C90 8091A6A0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 04C94 8091A6A4 AFA20040 */ sw $v0, 0x0040($sp) +/* 04C94 8091A6A4 AFA20040 */ sw $v0, 0x0040($sp) /* 04C98 8091A6A8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 04C9C 8091A6AC E7A0001C */ swc1 $f0, 0x001C($sp) +/* 04C9C 8091A6AC E7A0001C */ swc1 $f0, 0x001C($sp) /* 04CA0 8091A6B0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 04CA4 8091A6B4 E7A00020 */ swc1 $f0, 0x0020($sp) +/* 04CA4 8091A6B4 E7A00020 */ swc1 $f0, 0x0020($sp) /* 04CA8 8091A6B8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 04CAC 8091A6BC 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 04CB0 8091A6C0 C7A80020 */ lwc1 $f8, 0x0020($sp) -/* 04CB4 8091A6C4 C7B2001C */ lwc1 $f18, 0x001C($sp) -/* 04CB8 8091A6C8 46020102 */ mul.s $f4, $f0, $f2 -/* 04CBC 8091A6CC 8FAD0040 */ lw $t5, 0x0040($sp) -/* 04CC0 8091A6D0 46024282 */ mul.s $f10, $f8, $f2 -/* 04CC4 8091A6D4 4600218D */ trunc.w.s $f6, $f4 -/* 04CC8 8091A6D8 46029102 */ mul.s $f4, $f18, $f2 -/* 04CCC 8091A6DC 440B3000 */ mfc1 $t3, $f6 -/* 04CD0 8091A6E0 4600540D */ trunc.w.s $f16, $f10 +/* 04CB0 8091A6C0 C7A80020 */ lwc1 $f8, 0x0020($sp) +/* 04CB4 8091A6C4 C7B2001C */ lwc1 $f18, 0x001C($sp) +/* 04CB8 8091A6C8 46020102 */ mul.s $f4, $f0, $f2 +/* 04CBC 8091A6CC 8FAD0040 */ lw $t5, 0x0040($sp) +/* 04CC0 8091A6D0 46024282 */ mul.s $f10, $f8, $f2 +/* 04CC4 8091A6D4 4600218D */ trunc.w.s $f6, $f4 +/* 04CC8 8091A6D8 46029102 */ mul.s $f4, $f18, $f2 +/* 04CCC 8091A6DC 440B3000 */ mfc1 $t3, $f6 +/* 04CD0 8091A6E0 4600540D */ trunc.w.s $f16, $f10 /* 04CD4 8091A6E4 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 04CD8 8091A6E8 000C7200 */ sll $t6, $t4, 8 -/* 04CDC 8091A6EC 4600218D */ trunc.w.s $f6, $f4 -/* 04CE0 8091A6F0 440A8000 */ mfc1 $t2, $f16 -/* 04CE4 8091A6F4 44193000 */ mfc1 $t9, $f6 -/* 04CE8 8091A6F8 000A5E00 */ sll $t3, $t2, 24 +/* 04CD8 8091A6E8 000C7200 */ sll $t6, $t4, 8 +/* 04CDC 8091A6EC 4600218D */ trunc.w.s $f6, $f4 +/* 04CE0 8091A6F0 440A8000 */ mfc1 $t2, $f16 +/* 04CE4 8091A6F4 44193000 */ mfc1 $t9, $f6 +/* 04CE8 8091A6F8 000A5E00 */ sll $t3, $t2, 24 /* 04CEC 8091A6FC 01CB6025 */ or $t4, $t6, $t3 ## $t4 = 00000000 /* 04CF0 8091A700 332A00FF */ andi $t2, $t9, 0x00FF ## $t2 = 00000000 -/* 04CF4 8091A704 000A7400 */ sll $t6, $t2, 16 +/* 04CF4 8091A704 000A7400 */ sll $t6, $t2, 16 /* 04CF8 8091A708 018E5825 */ or $t3, $t4, $t6 ## $t3 = 00000000 /* 04CFC 8091A70C 356F003F */ ori $t7, $t3, 0x003F ## $t7 = 0000003F -/* 04D00 8091A710 100000A9 */ beq $zero, $zero, .L8091A9B8 +/* 04D00 8091A710 100000A9 */ beq $zero, $zero, .L8091A9B8 /* 04D04 8091A714 ADAF0004 */ sw $t7, 0x0004($t5) ## 00000004 /* 04D08 8091A718 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 .L8091A71C: @@ -123,61 +123,61 @@ glabel L8091A660 /* 04D18 8091A728 C5080218 */ lwc1 $f8, 0x0218($t0) ## 00000218 /* 04D1C 8091A72C C5100210 */ lwc1 $f16, 0x0210($t0) ## 00000210 /* 04D20 8091A730 C5040214 */ lwc1 $f4, 0x0214($t0) ## 00000214 -/* 04D24 8091A734 4600428D */ trunc.w.s $f10, $f8 -/* 04D28 8091A738 4600848D */ trunc.w.s $f18, $f16 -/* 04D2C 8091A73C 440E5000 */ mfc1 $t6, $f10 -/* 04D30 8091A740 4600218D */ trunc.w.s $f6, $f4 -/* 04D34 8091A744 440C9000 */ mfc1 $t4, $f18 +/* 04D24 8091A734 4600428D */ trunc.w.s $f10, $f8 +/* 04D28 8091A738 4600848D */ trunc.w.s $f18, $f16 +/* 04D2C 8091A73C 440E5000 */ mfc1 $t6, $f10 +/* 04D30 8091A740 4600218D */ trunc.w.s $f6, $f4 +/* 04D34 8091A744 440C9000 */ mfc1 $t4, $f18 /* 04D38 8091A748 31CB00FF */ andi $t3, $t6, 0x00FF ## $t3 = 00000000 -/* 04D3C 8091A74C 000B7A00 */ sll $t7, $t3, 8 -/* 04D40 8091A750 440A3000 */ mfc1 $t2, $f6 -/* 04D44 8091A754 000C7600 */ sll $t6, $t4, 24 +/* 04D3C 8091A74C 000B7A00 */ sll $t7, $t3, 8 +/* 04D40 8091A750 440A3000 */ mfc1 $t2, $f6 +/* 04D44 8091A754 000C7600 */ sll $t6, $t4, 24 /* 04D48 8091A758 01EE5825 */ or $t3, $t7, $t6 ## $t3 = 0000003F /* 04D4C 8091A75C 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 00000000 -/* 04D50 8091A760 000C7C00 */ sll $t7, $t4, 16 +/* 04D50 8091A760 000C7C00 */ sll $t7, $t4, 16 /* 04D54 8091A764 016F7025 */ or $t6, $t3, $t7 ## $t6 = 0000003F /* 04D58 8091A768 35CD003F */ ori $t5, $t6, 0x003F ## $t5 = 0000003F -/* 04D5C 8091A76C 10000092 */ beq $zero, $zero, .L8091A9B8 +/* 04D5C 8091A76C 10000092 */ beq $zero, $zero, .L8091A9B8 /* 04D60 8091A770 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 glabel L8091A774 -/* 04D64 8091A774 8FA50078 */ lw $a1, 0x0078($sp) +/* 04D64 8091A774 8FA50078 */ lw $a1, 0x0078($sp) /* 04D68 8091A778 85190198 */ lh $t9, 0x0198($t0) ## 00000198 /* 04D6C 8091A77C 84B80000 */ lh $t8, 0x0000($a1) ## 00000000 -/* 04D70 8091A780 03195021 */ addu $t2, $t8, $t9 -/* 04D74 8091A784 1000008C */ beq $zero, $zero, .L8091A9B8 +/* 04D70 8091A780 03195021 */ addu $t2, $t8, $t9 +/* 04D74 8091A784 1000008C */ beq $zero, $zero, .L8091A9B8 /* 04D78 8091A788 A4AA0000 */ sh $t2, 0x0000($a1) ## 00000000 glabel L8091A78C -/* 04D7C 8091A78C 8FA50078 */ lw $a1, 0x0078($sp) +/* 04D7C 8091A78C 8FA50078 */ lw $a1, 0x0078($sp) /* 04D80 8091A790 850B019A */ lh $t3, 0x019A($t0) ## 0000019A /* 04D84 8091A794 84AC0000 */ lh $t4, 0x0000($a1) ## 00000000 -/* 04D88 8091A798 018B7821 */ addu $t7, $t4, $t3 -/* 04D8C 8091A79C 10000086 */ beq $zero, $zero, .L8091A9B8 +/* 04D88 8091A798 018B7821 */ addu $t7, $t4, $t3 +/* 04D8C 8091A79C 10000086 */ beq $zero, $zero, .L8091A9B8 /* 04D90 8091A7A0 A4AF0000 */ sh $t7, 0x0000($a1) ## 00000000 glabel L8091A7A4 -/* 04D94 8091A7A4 8FA50078 */ lw $a1, 0x0078($sp) +/* 04D94 8091A7A4 8FA50078 */ lw $a1, 0x0078($sp) /* 04D98 8091A7A8 850D019E */ lh $t5, 0x019E($t0) ## 0000019E /* 04D9C 8091A7AC 84AE0000 */ lh $t6, 0x0000($a1) ## 00000000 /* 04DA0 8091A7B0 84B90002 */ lh $t9, 0x0002($a1) ## 00000002 -/* 04DA4 8091A7B4 01CDC021 */ addu $t8, $t6, $t5 +/* 04DA4 8091A7B4 01CDC021 */ addu $t8, $t6, $t5 /* 04DA8 8091A7B8 A4B80000 */ sh $t8, 0x0000($a1) ## 00000000 /* 04DAC 8091A7BC 850A01A0 */ lh $t2, 0x01A0($t0) ## 000001A0 -/* 04DB0 8091A7C0 032A6021 */ addu $t4, $t9, $t2 -/* 04DB4 8091A7C4 1000007C */ beq $zero, $zero, .L8091A9B8 +/* 04DB0 8091A7C0 032A6021 */ addu $t4, $t9, $t2 +/* 04DB4 8091A7C4 1000007C */ beq $zero, $zero, .L8091A9B8 /* 04DB8 8091A7C8 A4AC0002 */ sh $t4, 0x0002($a1) ## 00000002 glabel L8091A7CC /* 04DBC 8091A7CC 850B01B4 */ lh $t3, 0x01B4($t0) ## 000001B4 -/* 04DC0 8091A7D0 55600008 */ bnel $t3, $zero, .L8091A7F4 +/* 04DC0 8091A7D0 55600008 */ bnel $t3, $zero, .L8091A7F4 /* 04DC4 8091A7D4 850E01B8 */ lh $t6, 0x01B8($t0) ## 000001B8 /* 04DC8 8091A7D8 850F0198 */ lh $t7, 0x0198($t0) ## 00000198 -/* 04DCC 8091A7DC 29E1F574 */ slti $at, $t7, 0xF574 -/* 04DD0 8091A7E0 50200004 */ beql $at, $zero, .L8091A7F4 +/* 04DCC 8091A7DC 29E1F574 */ slti $at, $t7, 0xF574 +/* 04DD0 8091A7E0 50200004 */ beql $at, $zero, .L8091A7F4 /* 04DD4 8091A7E4 850E01B8 */ lh $t6, 0x01B8($t0) ## 000001B8 -/* 04DD8 8091A7E8 10000073 */ beq $zero, $zero, .L8091A9B8 +/* 04DD8 8091A7E8 10000073 */ beq $zero, $zero, .L8091A9B8 /* 04DDC 8091A7EC ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 /* 04DE0 8091A7F0 850E01B8 */ lh $t6, 0x01B8($t0) ## 000001B8 .L8091A7F4: /* 04DE4 8091A7F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 04DE8 8091A7F8 55C1000A */ bnel $t6, $at, .L8091A824 +/* 04DE8 8091A7F8 55C1000A */ bnel $t6, $at, .L8091A824 /* 04DEC 8091A7FC 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04DF0 8091A800 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04DF4 8091A804 3C183232 */ lui $t8, 0x3232 ## $t8 = 32320000 @@ -185,7 +185,7 @@ glabel L8091A7CC /* 04DFC 8091A80C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 04E00 8091A810 AD2D02C0 */ sw $t5, 0x02C0($t1) ## 000002C0 /* 04E04 8091A814 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 04E08 8091A818 10000007 */ beq $zero, $zero, .L8091A838 +/* 04E08 8091A818 10000007 */ beq $zero, $zero, .L8091A838 /* 04E0C 8091A81C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 04E10 8091A820 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 .L8091A824: @@ -195,24 +195,24 @@ glabel L8091A7CC /* 04E20 8091A830 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 04E24 8091A834 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 .L8091A838: -/* 04E28 8091A838 8FA50078 */ lw $a1, 0x0078($sp) +/* 04E28 8091A838 8FA50078 */ lw $a1, 0x0078($sp) /* 04E2C 8091A83C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04E30 8091A840 0C0344D0 */ jal func_800D1340 -/* 04E34 8091A844 AFA9005C */ sw $t1, 0x005C($sp) -/* 04E38 8091A848 8FAC0070 */ lw $t4, 0x0070($sp) -/* 04E3C 8091A84C 8FA9005C */ lw $t1, 0x005C($sp) +/* 04E30 8091A840 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* 04E34 8091A844 AFA9005C */ sw $t1, 0x005C($sp) +/* 04E38 8091A848 8FAC0070 */ lw $t4, 0x0070($sp) +/* 04E3C 8091A84C 8FA9005C */ lw $t1, 0x005C($sp) /* 04E40 8091A850 8D8B0000 */ lw $t3, 0x0000($t4) ## 00000000 -/* 04E44 8091A854 51600025 */ beql $t3, $zero, .L8091A8EC +/* 04E44 8091A854 51600025 */ beql $t3, $zero, .L8091A8EC /* 04E48 8091A858 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 04E4C 8091A85C 0C034213 */ jal Matrix_Push -/* 04E50 8091A860 AFA9005C */ sw $t1, 0x005C($sp) -/* 04E54 8091A864 8FA8007C */ lw $t0, 0x007C($sp) +/* 04E4C 8091A85C 0C034213 */ jal Matrix_Push +/* 04E50 8091A860 AFA9005C */ sw $t1, 0x005C($sp) +/* 04E54 8091A864 8FA8007C */ lw $t0, 0x007C($sp) /* 04E58 8091A868 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04E5C 8091A86C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 04E60 8091A870 C50C01F8 */ lwc1 $f12, 0x01F8($t0) ## 000001F8 -/* 04E64 8091A874 0C0342A3 */ jal Matrix_Scale +/* 04E64 8091A874 0C0342A3 */ jal Matrix_Scale /* 04E68 8091A878 C50E0224 */ lwc1 $f14, 0x0224($t0) ## 00000224 -/* 04E6C 8091A87C 8FA9005C */ lw $t1, 0x005C($sp) +/* 04E6C 8091A87C 8FA9005C */ lw $t1, 0x005C($sp) /* 04E70 8091A880 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 04E74 8091A884 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 04E78 8091A888 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 @@ -221,50 +221,50 @@ glabel L8091A7CC /* 04E84 8091A894 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 04E88 8091A898 AD2F02C0 */ sw $t7, 0x02C0($t1) ## 000002C0 /* 04E8C 8091A89C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04E90 8091A8A0 8FAD0068 */ lw $t5, 0x0068($sp) +/* 04E90 8091A8A0 8FAD0068 */ lw $t5, 0x0068($sp) /* 04E94 8091A8A4 240612CF */ addiu $a2, $zero, 0x12CF ## $a2 = 000012CF /* 04E98 8091A8A8 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 04E9C 8091A8AC AFA9005C */ sw $t1, 0x005C($sp) -/* 04EA0 8091A8B0 0C0346A2 */ jal Matrix_NewMtx -/* 04EA4 8091A8B4 AFA20030 */ sw $v0, 0x0030($sp) -/* 04EA8 8091A8B8 8FA30030 */ lw $v1, 0x0030($sp) -/* 04EAC 8091A8BC 8FA9005C */ lw $t1, 0x005C($sp) +/* 04E9C 8091A8AC AFA9005C */ sw $t1, 0x005C($sp) +/* 04EA0 8091A8B0 0C0346A2 */ jal Matrix_NewMtx +/* 04EA4 8091A8B4 AFA20030 */ sw $v0, 0x0030($sp) +/* 04EA8 8091A8B8 8FA30030 */ lw $v1, 0x0030($sp) +/* 04EAC 8091A8BC 8FA9005C */ lw $t1, 0x005C($sp) /* 04EB0 8091A8C0 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 04EB4 8091A8C4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 04EB8 8091A8C8 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04EBC 8091A8CC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 04EC0 8091A8D0 AD3802C0 */ sw $t8, 0x02C0($t1) ## 000002C0 /* 04EC4 8091A8D4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04EC8 8091A8D8 8FAA0070 */ lw $t2, 0x0070($sp) +/* 04EC8 8091A8D8 8FAA0070 */ lw $t2, 0x0070($sp) /* 04ECC 8091A8DC 8D4C0000 */ lw $t4, 0x0000($t2) ## 00000000 -/* 04ED0 8091A8E0 0C034221 */ jal Matrix_Pull +/* 04ED0 8091A8E0 0C034221 */ jal Matrix_Pull /* 04ED4 8091A8E4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 04ED8 8091A8E8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 .L8091A8EC: -/* 04EDC 8091A8EC 10000032 */ beq $zero, $zero, .L8091A9B8 -/* 04EE0 8091A8F0 AFAB0060 */ sw $t3, 0x0060($sp) +/* 04EDC 8091A8EC 10000032 */ beq $zero, $zero, .L8091A9B8 +/* 04EE0 8091A8F0 AFAB0060 */ sw $t3, 0x0060($sp) glabel L8091A8F4 -/* 04EE4 8091A8F4 8FA50078 */ lw $a1, 0x0078($sp) +/* 04EE4 8091A8F4 8FA50078 */ lw $a1, 0x0078($sp) /* 04EE8 8091A8F8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04EEC 8091A8FC 0C0344D0 */ jal func_800D1340 -/* 04EF0 8091A900 AFA9005C */ sw $t1, 0x005C($sp) -/* 04EF4 8091A904 8FAF0070 */ lw $t7, 0x0070($sp) -/* 04EF8 8091A908 8FA9005C */ lw $t1, 0x005C($sp) +/* 04EEC 8091A8FC 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* 04EF0 8091A900 AFA9005C */ sw $t1, 0x005C($sp) +/* 04EF4 8091A904 8FAF0070 */ lw $t7, 0x0070($sp) +/* 04EF8 8091A908 8FA9005C */ lw $t1, 0x005C($sp) /* 04EFC 8091A90C 8DEE0000 */ lw $t6, 0x0000($t7) ## 00000000 -/* 04F00 8091A910 51C00028 */ beql $t6, $zero, .L8091A9B4 +/* 04F00 8091A910 51C00028 */ beql $t6, $zero, .L8091A9B4 /* 04F04 8091A914 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 04F08 8091A918 0C034213 */ jal Matrix_Push -/* 04F0C 8091A91C AFA9005C */ sw $t1, 0x005C($sp) -/* 04F10 8091A920 8FAD006C */ lw $t5, 0x006C($sp) -/* 04F14 8091A924 8FA8007C */ lw $t0, 0x007C($sp) +/* 04F08 8091A918 0C034213 */ jal Matrix_Push +/* 04F0C 8091A91C AFA9005C */ sw $t1, 0x005C($sp) +/* 04F10 8091A920 8FAD006C */ lw $t5, 0x006C($sp) +/* 04F14 8091A924 8FA8007C */ lw $t0, 0x007C($sp) /* 04F18 8091A928 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04F1C 8091A92C 000DC080 */ sll $t8, $t5, 2 -/* 04F20 8091A930 0118C821 */ addu $t9, $t0, $t8 +/* 04F1C 8091A92C 000DC080 */ sll $t8, $t5, 2 +/* 04F20 8091A930 0118C821 */ addu $t9, $t0, $t8 /* 04F24 8091A934 C72C01BC */ lwc1 $f12, 0x01BC($t9) ## 000001BC -/* 04F28 8091A938 44066000 */ mfc1 $a2, $f12 -/* 04F2C 8091A93C 0C0342A3 */ jal Matrix_Scale -/* 04F30 8091A940 46006386 */ mov.s $f14, $f12 -/* 04F34 8091A944 8FA9005C */ lw $t1, 0x005C($sp) +/* 04F28 8091A938 44066000 */ mfc1 $a2, $f12 +/* 04F2C 8091A93C 0C0342A3 */ jal Matrix_Scale +/* 04F30 8091A940 46006386 */ mov.s $f14, $f12 +/* 04F34 8091A944 8FA9005C */ lw $t1, 0x005C($sp) /* 04F38 8091A948 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 /* 04F3C 8091A94C 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 /* 04F40 8091A950 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 @@ -273,40 +273,40 @@ glabel L8091A8F4 /* 04F4C 8091A95C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 04F50 8091A960 AD2A02C0 */ sw $t2, 0x02C0($t1) ## 000002C0 /* 04F54 8091A964 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04F58 8091A968 8FAB0068 */ lw $t3, 0x0068($sp) +/* 04F58 8091A968 8FAB0068 */ lw $t3, 0x0068($sp) /* 04F5C 8091A96C 240612E4 */ addiu $a2, $zero, 0x12E4 ## $a2 = 000012E4 /* 04F60 8091A970 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 04F64 8091A974 AFA9005C */ sw $t1, 0x005C($sp) -/* 04F68 8091A978 0C0346A2 */ jal Matrix_NewMtx -/* 04F6C 8091A97C AFA20028 */ sw $v0, 0x0028($sp) -/* 04F70 8091A980 8FA30028 */ lw $v1, 0x0028($sp) -/* 04F74 8091A984 8FA9005C */ lw $t1, 0x005C($sp) +/* 04F64 8091A974 AFA9005C */ sw $t1, 0x005C($sp) +/* 04F68 8091A978 0C0346A2 */ jal Matrix_NewMtx +/* 04F6C 8091A97C AFA20028 */ sw $v0, 0x0028($sp) +/* 04F70 8091A980 8FA30028 */ lw $v1, 0x0028($sp) +/* 04F74 8091A984 8FA9005C */ lw $t1, 0x005C($sp) /* 04F78 8091A988 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 04F7C 8091A98C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 04F80 8091A990 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04F84 8091A994 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 04F88 8091A998 AD2F02C0 */ sw $t7, 0x02C0($t1) ## 000002C0 /* 04F8C 8091A99C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04F90 8091A9A0 8FAD0070 */ lw $t5, 0x0070($sp) +/* 04F90 8091A9A0 8FAD0070 */ lw $t5, 0x0070($sp) /* 04F94 8091A9A4 8DB80000 */ lw $t8, 0x0000($t5) ## 00000000 -/* 04F98 8091A9A8 0C034221 */ jal Matrix_Pull +/* 04F98 8091A9A8 0C034221 */ jal Matrix_Pull /* 04F9C 8091A9AC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 04FA0 8091A9B0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 .L8091A9B4: -/* 04FA4 8091A9B4 AFB90060 */ sw $t9, 0x0060($sp) +/* 04FA4 8091A9B4 AFB90060 */ sw $t9, 0x0060($sp) glabel L8091A9B8 .L8091A9B8: -/* 04FA8 8091A9B8 8FAA0068 */ lw $t2, 0x0068($sp) +/* 04FA8 8091A9B8 8FAA0068 */ lw $t2, 0x0068($sp) /* 04FAC 8091A9BC 3C068092 */ lui $a2, %hi(D_8091B4A0) ## $a2 = 80920000 /* 04FB0 8091A9C0 24C6B4A0 */ addiu $a2, $a2, %lo(D_8091B4A0) ## $a2 = 8091B4A0 /* 04FB4 8091A9C4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 04FB8 8091A9C8 240712FA */ addiu $a3, $zero, 0x12FA ## $a3 = 000012FA -/* 04FBC 8091A9CC 0C031AD5 */ jal func_800C6B54 +/* 04FBC 8091A9CC 0C031AD5 */ jal func_800C6B54 /* 04FC0 8091A9D0 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 04FC4 8091A9D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04FC8 8091A9D8 8FA20060 */ lw $v0, 0x0060($sp) +/* 04FC4 8091A9D4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 04FC8 8091A9D8 8FA20060 */ lw $v0, 0x0060($sp) /* 04FCC 8091A9DC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 04FD0 8091A9E0 03E00008 */ jr $ra +/* 04FD0 8091A9E0 03E00008 */ jr $ra /* 04FD4 8091A9E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s index c819fbecef..f203760a77 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s @@ -1,63 +1,63 @@ glabel func_8093639C /* 09DCC 8093639C 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 09DD0 809363A0 AFBF006C */ sw $ra, 0x006C($sp) -/* 09DD4 809363A4 AFBE0068 */ sw $s8, 0x0068($sp) -/* 09DD8 809363A8 AFB70064 */ sw $s7, 0x0064($sp) -/* 09DDC 809363AC AFB60060 */ sw $s6, 0x0060($sp) -/* 09DE0 809363B0 AFB5005C */ sw $s5, 0x005C($sp) -/* 09DE4 809363B4 AFB40058 */ sw $s4, 0x0058($sp) -/* 09DE8 809363B8 AFB30054 */ sw $s3, 0x0054($sp) -/* 09DEC 809363BC AFB20050 */ sw $s2, 0x0050($sp) -/* 09DF0 809363C0 AFB1004C */ sw $s1, 0x004C($sp) -/* 09DF4 809363C4 AFB00048 */ sw $s0, 0x0048($sp) -/* 09DF8 809363C8 F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 09DFC 809363CC F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 09E00 809363D0 AFA500F4 */ sw $a1, 0x00F4($sp) +/* 09DD0 809363A0 AFBF006C */ sw $ra, 0x006C($sp) +/* 09DD4 809363A4 AFBE0068 */ sw $s8, 0x0068($sp) +/* 09DD8 809363A8 AFB70064 */ sw $s7, 0x0064($sp) +/* 09DDC 809363AC AFB60060 */ sw $s6, 0x0060($sp) +/* 09DE0 809363B0 AFB5005C */ sw $s5, 0x005C($sp) +/* 09DE4 809363B4 AFB40058 */ sw $s4, 0x0058($sp) +/* 09DE8 809363B8 AFB30054 */ sw $s3, 0x0054($sp) +/* 09DEC 809363BC AFB20050 */ sw $s2, 0x0050($sp) +/* 09DF0 809363C0 AFB1004C */ sw $s1, 0x004C($sp) +/* 09DF4 809363C4 AFB00048 */ sw $s0, 0x0048($sp) +/* 09DF8 809363C8 F7B60040 */ sdc1 $f22, 0x0040($sp) +/* 09DFC 809363CC F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 09E00 809363D0 AFA500F4 */ sw $a1, 0x00F4($sp) /* 09E04 809363D4 908E0196 */ lbu $t6, 0x0196($a0) ## 00000196 /* 09E08 809363D8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 09E0C 809363DC 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC -/* 09E10 809363E0 11C0015B */ beq $t6, $zero, .L80936950 +/* 09E10 809363E0 11C0015B */ beq $t6, $zero, .L80936950 /* 09E14 809363E4 3C068093 */ lui $a2, %hi(D_80937940) ## $a2 = 80930000 /* 09E18 809363E8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 09E1C 809363EC 24C67940 */ addiu $a2, $a2, %lo(D_80937940) ## $a2 = 80937940 /* 09E20 809363F0 24071C86 */ addiu $a3, $zero, 0x1C86 ## $a3 = 00001C86 -/* 09E24 809363F4 0C031AB1 */ jal func_800C6AC4 +/* 09E24 809363F4 0C031AB1 */ jal func_800C6AC4 /* 09E28 809363F8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 09E2C 809363FC 8FB800F4 */ lw $t8, 0x00F4($sp) -/* 09E30 80936400 0C024F61 */ jal func_80093D84 +/* 09E2C 809363FC 8FB800F4 */ lw $t8, 0x00F4($sp) +/* 09E30 80936400 0C024F61 */ jal func_80093D84 /* 09E34 80936404 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 09E38 80936408 92220196 */ lbu $v0, 0x0196($s1) ## 00000196 /* 09E3C 8093640C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09E40 80936410 8FA800F4 */ lw $t0, 0x00F4($sp) -/* 09E44 80936414 1441007F */ bne $v0, $at, .L80936614 +/* 09E40 80936410 8FA800F4 */ lw $t0, 0x00F4($sp) +/* 09E44 80936414 1441007F */ bne $v0, $at, .L80936614 /* 09E48 80936418 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 09E4C 8093641C 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 09E50 80936420 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 09E54 80936424 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 /* 09E58 80936428 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 09E5C 8093642C AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 -/* 09E60 80936430 00681821 */ addu $v1, $v1, $t0 +/* 09E60 80936430 00681821 */ addu $v1, $v1, $t0 /* 09E64 80936434 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 09E68 80936438 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 /* 09E6C 8093643C 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 09E70 80936440 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 09E74 80936444 00036840 */ sll $t5, $v1, 1 +/* 09E74 80936444 00036840 */ sll $t5, $v1, 1 /* 09E78 80936448 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 /* 09E7C 8093644C 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 /* 09E80 80936450 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 09E84 80936454 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 /* 09E88 80936458 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 09E8C 8093645C AFB80028 */ sw $t8, 0x0028($sp) -/* 09E90 80936460 AFAF0024 */ sw $t7, 0x0024($sp) -/* 09E94 80936464 AFAC0018 */ sw $t4, 0x0018($sp) -/* 09E98 80936468 AFAB0014 */ sw $t3, 0x0014($sp) -/* 09E9C 8093646C AFAE0020 */ sw $t6, 0x0020($sp) -/* 09EA0 80936470 AFAA0010 */ sw $t2, 0x0010($sp) -/* 09EA4 80936474 AFA0001C */ sw $zero, 0x001C($sp) +/* 09E8C 8093645C AFB80028 */ sw $t8, 0x0028($sp) +/* 09E90 80936460 AFAF0024 */ sw $t7, 0x0024($sp) +/* 09E94 80936464 AFAC0018 */ sw $t4, 0x0018($sp) +/* 09E98 80936468 AFAB0014 */ sw $t3, 0x0014($sp) +/* 09E9C 8093646C AFAE0020 */ sw $t6, 0x0020($sp) +/* 09EA0 80936470 AFAA0010 */ sw $t2, 0x0010($sp) +/* 09EA4 80936474 AFA0001C */ sw $zero, 0x001C($sp) /* 09EA8 80936478 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09EAC 8093647C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 09EB0 80936480 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 09EB4 80936484 0C0253D0 */ jal Draw_TwoTexScroll +/* 09EB4 80936484 0C0253D0 */ jal Draw_TwoTexScroll /* 09EB8 80936488 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 /* 09EBC 8093648C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 09EC0 80936490 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 @@ -81,7 +81,7 @@ glabel func_8093639C /* 09F08 809364D8 3C168093 */ lui $s6, %hi(D_80937950) ## $s6 = 80930000 /* 09F0C 809364DC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 09F10 809364E0 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 -/* 09F14 809364E4 C4367A6C */ lwc1 $f22, %lo(D_80937A6C)($at) +/* 09F14 809364E4 C4367A6C */ lwc1 $f22, %lo(D_80937A6C)($at) /* 09F18 809364E8 26D67950 */ addiu $s6, $s6, %lo(D_80937950) ## $s6 = 80937950 /* 09F1C 809364EC 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003 /* 09F20 809364F0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 @@ -90,64 +90,64 @@ glabel func_8093639C /* 09F28 809364F8 866F0720 */ lh $t7, 0x0720($s3) ## 00000720 /* 09F2C 809364FC 26700700 */ addiu $s0, $s3, 0x0700 ## $s0 = 00000700 /* 09F30 80936500 02002025 */ or $a0, $s0, $zero ## $a0 = 00000700 -/* 09F34 80936504 11E0003D */ beq $t7, $zero, .L809365FC -/* 09F38 80936508 8FA500F4 */ lw $a1, 0x00F4($sp) +/* 09F34 80936504 11E0003D */ beq $t7, $zero, .L809365FC +/* 09F38 80936508 8FA500F4 */ lw $a1, 0x00F4($sp) /* 09F3C 8093650C 3C150601 */ lui $s5, 0x0601 ## $s5 = 06010000 -/* 09F40 80936510 0C00D0D7 */ jal func_8003435C +/* 09F40 80936510 0C00D0D7 */ jal func_8003435C /* 09F44 80936514 26B57F80 */ addiu $s5, $s5, 0x7F80 ## $s5 = 06017F80 /* 09F48 80936518 86380722 */ lh $t8, 0x0722($s1) ## 00000722 /* 09F4C 8093651C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09F50 80936520 53000008 */ beql $t8, $zero, .L80936544 +/* 09F50 80936520 53000008 */ beql $t8, $zero, .L80936544 /* 09F54 80936524 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000700 /* 09F58 80936528 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000700 /* 09F5C 8093652C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704 -/* 09F60 80936530 0C034261 */ jal Matrix_Translate +/* 09F60 80936530 0C034261 */ jal Matrix_Translate /* 09F64 80936534 8E060008 */ lw $a2, 0x0008($s0) ## 00000708 -/* 09F68 80936538 1000000F */ beq $zero, $zero, .L80936578 +/* 09F68 80936538 1000000F */ beq $zero, $zero, .L80936578 /* 09F6C 8093653C 86040018 */ lh $a0, 0x0018($s0) ## 00000718 /* 09F70 80936540 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000700 .L80936544: /* 09F74 80936544 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 /* 09F78 80936548 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000708 /* 09F7C 8093654C C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C -/* 09F80 80936550 46062300 */ add.s $f12, $f4, $f6 +/* 09F80 80936550 46062300 */ add.s $f12, $f4, $f6 /* 09F84 80936554 C6080004 */ lwc1 $f8, 0x0004($s0) ## 00000704 /* 09F88 80936558 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -/* 09F8C 8093655C 46128100 */ add.s $f4, $f16, $f18 +/* 09F8C 8093655C 46128100 */ add.s $f4, $f16, $f18 /* 09F90 80936560 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09F94 80936564 460A4380 */ add.s $f14, $f8, $f10 -/* 09F98 80936568 44062000 */ mfc1 $a2, $f4 -/* 09F9C 8093656C 0C034261 */ jal Matrix_Translate +/* 09F94 80936564 460A4380 */ add.s $f14, $f8, $f10 +/* 09F98 80936568 44062000 */ mfc1 $a2, $f4 +/* 09F9C 8093656C 0C034261 */ jal Matrix_Translate /* 09FA0 80936570 00000000 */ nop /* 09FA4 80936574 86040018 */ lh $a0, 0x0018($s0) ## 00000718 .L80936578: /* 09FA8 80936578 8605001A */ lh $a1, 0x001A($s0) ## 0000071A /* 09FAC 8093657C 8606001C */ lh $a2, 0x001C($s0) ## 0000071C -/* 09FB0 80936580 0C034421 */ jal Matrix_RotateXYZ +/* 09FB0 80936580 0C034421 */ jal Matrix_RotateZYX /* 09FB4 80936584 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 09FB8 80936588 9619001E */ lhu $t9, 0x001E($s0) ## 0000071E /* 09FBC 8093658C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 09FC0 80936590 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 09FC4 80936594 07210004 */ bgez $t9, .L809365A8 -/* 09FC8 80936598 46803220 */ cvt.s.w $f8, $f6 +/* 09FC4 80936594 07210004 */ bgez $t9, .L809365A8 +/* 09FC8 80936598 46803220 */ cvt.s.w $f8, $f6 /* 09FCC 8093659C 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 09FD0 809365A0 00000000 */ nop -/* 09FD4 809365A4 460A4200 */ add.s $f8, $f8, $f10 +/* 09FD4 809365A4 460A4200 */ add.s $f8, $f8, $f10 .L809365A8: -/* 09FD8 809365A8 46164302 */ mul.s $f12, $f8, $f22 +/* 09FD8 809365A8 46164302 */ mul.s $f12, $f8, $f22 /* 09FDC 809365AC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 09FE0 809365B0 44066000 */ mfc1 $a2, $f12 -/* 09FE4 809365B4 0C0342A3 */ jal Matrix_Scale -/* 09FE8 809365B8 46006386 */ mov.s $f14, $f12 +/* 09FE0 809365B0 44066000 */ mfc1 $a2, $f12 +/* 09FE4 809365B4 0C0342A3 */ jal Matrix_Scale +/* 09FE8 809365B8 46006386 */ mov.s $f14, $f12 /* 09FEC 809365BC 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 09FF0 809365C0 02C02825 */ or $a1, $s6, $zero ## $a1 = 80937950 /* 09FF4 809365C4 24061CB6 */ addiu $a2, $zero, 0x1CB6 ## $a2 = 00001CB6 /* 09FF8 809365C8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 09FFC 809365CC AE4902D0 */ sw $t1, 0x02D0($s2) ## 000002D0 /* 0A000 809365D0 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 0A004 809365D4 8FAA00F4 */ lw $t2, 0x00F4($sp) +/* 0A004 809365D4 8FAA00F4 */ lw $t2, 0x00F4($sp) /* 0A008 809365D8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A00C 809365DC 0C0346A2 */ jal Matrix_NewMtx +/* 0A00C 809365DC 0C0346A2 */ jal Matrix_NewMtx /* 0A010 809365E0 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 0A014 809365E4 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0A018 809365E8 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 @@ -158,17 +158,17 @@ glabel func_8093639C .L809365FC: /* 0A02C 809365FC 26940028 */ addiu $s4, $s4, 0x0028 ## $s4 = 00000028 /* 0A030 80936600 240102D0 */ addiu $at, $zero, 0x02D0 ## $at = 000002D0 -/* 0A034 80936604 1681FFBC */ bne $s4, $at, .L809364F8 +/* 0A034 80936604 1681FFBC */ bne $s4, $at, .L809364F8 /* 0A038 80936608 26730028 */ addiu $s3, $s3, 0x0028 ## $s3 = 00000028 -/* 0A03C 8093660C 100000CA */ beq $zero, $zero, .L80936938 -/* 0A040 80936610 8FA900F4 */ lw $t1, 0x00F4($sp) +/* 0A03C 8093660C 100000CA */ beq $zero, $zero, .L80936938 +/* 0A040 80936610 8FA900F4 */ lw $t1, 0x00F4($sp) .L80936614: /* 0A044 80936614 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0A048 80936618 1441007B */ bne $v0, $at, .L80936808 +/* 0A048 80936618 1441007B */ bne $v0, $at, .L80936808 /* 0A04C 8093661C 3C0DE700 */ lui $t5, 0xE700 ## $t5 = E7000000 /* 0A050 80936620 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 0A054 80936624 3C018093 */ lui $at, %hi(D_80937A70) ## $at = 80930000 -/* 0A058 80936628 C4347A70 */ lwc1 $f20, %lo(D_80937A70)($at) +/* 0A058 80936628 C4347A70 */ lwc1 $f20, %lo(D_80937A70)($at) /* 0A05C 8093662C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 0A060 80936630 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 /* 0A064 80936634 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 @@ -179,31 +179,31 @@ glabel func_8093639C /* 0A078 80936648 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0A07C 8093664C AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 /* 0A080 80936650 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0A084 80936654 8FB800F4 */ lw $t8, 0x00F4($sp) +/* 0A084 80936654 8FB800F4 */ lw $t8, 0x00F4($sp) /* 0A088 80936658 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 /* 0A08C 8093665C 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 0A090 80936660 00781821 */ addu $v1, $v1, $t8 +/* 0A090 80936660 00781821 */ addu $v1, $v1, $t8 /* 0A094 80936664 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 /* 0A098 80936668 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 0A09C 8093666C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 0A0A0 80936670 00030823 */ subu $at, $zero, $v1 -/* 0A0A4 80936674 00015900 */ sll $t3, $at, 4 -/* 0A0A8 80936678 01615823 */ subu $t3, $t3, $at +/* 0A0A0 80936670 00030823 */ subu $at, $zero, $v1 +/* 0A0A4 80936674 00015900 */ sll $t3, $at, 4 +/* 0A0A8 80936678 01615823 */ subu $t3, $t3, $at /* 0A0AC 8093667C 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000008 /* 0A0B0 80936680 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 /* 0A0B4 80936684 24090040 */ addiu $t1, $zero, 0x0040 ## $t1 = 00000040 /* 0A0B8 80936688 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0A0BC 8093668C AFAA0018 */ sw $t2, 0x0018($sp) -/* 0A0C0 80936690 AFA90014 */ sw $t1, 0x0014($sp) -/* 0A0C4 80936694 AFB90010 */ sw $t9, 0x0010($sp) -/* 0A0C8 80936698 AFAC0020 */ sw $t4, 0x0020($sp) -/* 0A0CC 8093669C AFAD0024 */ sw $t5, 0x0024($sp) -/* 0A0D0 809366A0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 0A0D4 809366A4 AFA0001C */ sw $zero, 0x001C($sp) +/* 0A0BC 8093668C AFAA0018 */ sw $t2, 0x0018($sp) +/* 0A0C0 80936690 AFA90014 */ sw $t1, 0x0014($sp) +/* 0A0C4 80936694 AFB90010 */ sw $t9, 0x0010($sp) +/* 0A0C8 80936698 AFAC0020 */ sw $t4, 0x0020($sp) +/* 0A0CC 8093669C AFAD0024 */ sw $t5, 0x0024($sp) +/* 0A0D0 809366A0 AFAE0028 */ sw $t6, 0x0028($sp) +/* 0A0D4 809366A4 AFA0001C */ sw $zero, 0x001C($sp) /* 0A0D8 809366A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A0DC 809366AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A0E0 809366B0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A0E4 809366B4 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A0E4 809366B4 0C0253D0 */ jal Draw_TwoTexScroll /* 0A0E8 809366B8 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 0A0EC 809366BC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0A0F0 809366C0 3C018093 */ lui $at, %hi(D_80937A74) ## $at = 80930000 @@ -211,7 +211,7 @@ glabel func_8093639C /* 0A0F8 809366C8 3C161E00 */ lui $s6, 0x1E00 ## $s6 = 1E000000 /* 0A0FC 809366CC 36D61E00 */ ori $s6, $s6, 0x1E00 ## $s6 = 1E001E00 /* 0A100 809366D0 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003 -/* 0A104 809366D4 C4367A74 */ lwc1 $f22, %lo(D_80937A74)($at) +/* 0A104 809366D4 C4367A74 */ lwc1 $f22, %lo(D_80937A74)($at) /* 0A108 809366D8 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 /* 0A10C 809366DC 02209825 */ or $s3, $s1, $zero ## $s3 = 00000000 /* 0A110 809366E0 3C17DE00 */ lui $s7, 0xDE00 ## $s7 = DE000000 @@ -219,27 +219,27 @@ glabel func_8093639C /* 0A114 809366E4 866F0720 */ lh $t7, 0x0720($s3) ## 00000720 /* 0A118 809366E8 26700700 */ addiu $s0, $s3, 0x0700 ## $s0 = 00000700 /* 0A11C 809366EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A120 809366F0 11E0003E */ beq $t7, $zero, .L809367EC +/* 0A120 809366F0 11E0003E */ beq $t7, $zero, .L809367EC /* 0A124 809366F4 3C150402 */ lui $s5, 0x0402 ## $s5 = 04020000 /* 0A128 809366F8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000700 /* 0A12C 809366FC C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704 /* 0A130 80936700 8E060008 */ lw $a2, 0x0008($s0) ## 00000708 -/* 0A134 80936704 0C034261 */ jal Matrix_Translate +/* 0A134 80936704 0C034261 */ jal Matrix_Translate /* 0A138 80936708 26B584B0 */ addiu $s5, $s5, 0x84B0 ## $s5 = 040184B0 /* 0A13C 8093670C 9618001E */ lhu $t8, 0x001E($s0) ## 0000071E /* 0A140 80936710 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 0A144 80936714 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 0A148 80936718 07010004 */ bgez $t8, .L8093672C -/* 0A14C 8093671C 468084A0 */ cvt.s.w $f18, $f16 +/* 0A148 80936718 07010004 */ bgez $t8, .L8093672C +/* 0A14C 8093671C 468084A0 */ cvt.s.w $f18, $f16 /* 0A150 80936720 44812000 */ mtc1 $at, $f4 ## $f4 = 4294967296.00 /* 0A154 80936724 00000000 */ nop -/* 0A158 80936728 46049480 */ add.s $f18, $f18, $f4 +/* 0A158 80936728 46049480 */ add.s $f18, $f18, $f4 .L8093672C: -/* 0A15C 8093672C 46169302 */ mul.s $f12, $f18, $f22 -/* 0A160 80936730 4600A386 */ mov.s $f14, $f20 +/* 0A15C 8093672C 46169302 */ mul.s $f12, $f18, $f22 +/* 0A160 80936730 4600A386 */ mov.s $f14, $f20 /* 0A164 80936734 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0A168 80936738 44066000 */ mfc1 $a2, $f12 -/* 0A16C 8093673C 0C0342A3 */ jal Matrix_Scale +/* 0A168 80936738 44066000 */ mfc1 $a2, $f12 +/* 0A16C 8093673C 0C0342A3 */ jal Matrix_Scale /* 0A170 80936740 00000000 */ nop /* 0A174 80936744 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 0A178 80936748 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 @@ -258,9 +258,9 @@ glabel func_8093639C /* 0A1AC 8093677C 920C0024 */ lbu $t4, 0x0024($s0) ## 00000724 /* 0A1B0 80936780 3C058093 */ lui $a1, %hi(D_80937960) ## $a1 = 80930000 /* 0A1B4 80936784 24A57960 */ addiu $a1, $a1, %lo(D_80937960) ## $a1 = 80937960 -/* 0A1B8 80936788 018D0019 */ multu $t4, $t5 +/* 0A1B8 80936788 018D0019 */ multu $t4, $t5 /* 0A1BC 8093678C 24061CE4 */ addiu $a2, $zero, 0x1CE4 ## $a2 = 00001CE4 -/* 0A1C0 80936790 00007012 */ mflo $t6 +/* 0A1C0 80936790 00007012 */ mflo $t6 /* 0A1C4 80936794 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 /* 0A1C8 80936798 01F6C025 */ or $t8, $t7, $s6 ## $t8 = 1E001E00 /* 0A1CC 8093679C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 @@ -273,9 +273,9 @@ glabel func_8093639C /* 0A1E8 809367B8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0A1EC 809367BC AE4A02D0 */ sw $t2, 0x02D0($s2) ## 000002D0 /* 0A1F0 809367C0 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 0A1F4 809367C4 8FAB00F4 */ lw $t3, 0x00F4($sp) +/* 0A1F4 809367C4 8FAB00F4 */ lw $t3, 0x00F4($sp) /* 0A1F8 809367C8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A1FC 809367CC 0C0346A2 */ jal Matrix_NewMtx +/* 0A1FC 809367CC 0C0346A2 */ jal Matrix_NewMtx /* 0A200 809367D0 8D640000 */ lw $a0, 0x0000($t3) ## FA008080 /* 0A204 809367D4 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0A208 809367D8 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 @@ -287,13 +287,13 @@ glabel func_8093639C /* 0A21C 809367EC 26940028 */ addiu $s4, $s4, 0x0028 ## $s4 = 00000028 /* 0A220 809367F0 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 /* 0A224 809367F4 26730028 */ addiu $s3, $s3, 0x0028 ## $s3 = 00000028 -/* 0A228 809367F8 1681FFBA */ bne $s4, $at, .L809366E4 -/* 0A22C 809367FC 4616A501 */ sub.s $f20, $f20, $f22 -/* 0A230 80936800 1000004D */ beq $zero, $zero, .L80936938 -/* 0A234 80936804 8FA900F4 */ lw $t1, 0x00F4($sp) +/* 0A228 809367F8 1681FFBA */ bne $s4, $at, .L809366E4 +/* 0A22C 809367FC 4616A501 */ sub.s $f20, $f20, $f22 +/* 0A230 80936800 1000004D */ beq $zero, $zero, .L80936938 +/* 0A234 80936804 8FA900F4 */ lw $t1, 0x00F4($sp) .L80936808: /* 0A238 80936808 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0A23C 8093680C 14410049 */ bne $v0, $at, .L80936934 +/* 0A23C 8093680C 14410049 */ bne $v0, $at, .L80936934 /* 0A240 80936810 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 /* 0A244 80936814 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 0A248 80936818 3C0F0A0A */ lui $t7, 0x0A0A ## $t7 = 0A0A0000 @@ -317,10 +317,10 @@ glabel func_8093639C /* 0A290 80936860 862C0722 */ lh $t4, 0x0722($s1) ## 00000722 /* 0A294 80936864 3C138093 */ lui $s3, %hi(D_809372C0) ## $s3 = 80930000 /* 0A298 80936868 26300700 */ addiu $s0, $s1, 0x0700 ## $s0 = 00000700 -/* 0A29C 8093686C 12AC0031 */ beq $s5, $t4, .L80936934 +/* 0A29C 8093686C 12AC0031 */ beq $s5, $t4, .L80936934 /* 0A2A0 80936870 267372C0 */ addiu $s3, $s3, %lo(D_809372C0) ## $s3 = 809372C0 /* 0A2A4 80936874 3C018093 */ lui $at, %hi(D_80937A78) ## $at = 80930000 -/* 0A2A8 80936878 C4367A78 */ lwc1 $f22, %lo(D_80937A78)($at) +/* 0A2A8 80936878 C4367A78 */ lwc1 $f22, %lo(D_80937A78)($at) /* 0A2AC 8093687C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0A2B0 80936880 3C1EDA38 */ lui $s8, 0xDA38 ## $s8 = DA380000 /* 0A2B4 80936884 3C148093 */ lui $s4, %hi(D_80937970) ## $s4 = 80930000 @@ -332,22 +332,22 @@ glabel func_8093639C .L8093689C: /* 0A2CC 8093689C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704 /* 0A2D0 809368A0 8E060008 */ lw $a2, 0x0008($s0) ## 00000708 -/* 0A2D4 809368A4 0C034261 */ jal Matrix_Translate +/* 0A2D4 809368A4 0C034261 */ jal Matrix_Translate /* 0A2D8 809368A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A2DC 809368AC 960D001E */ lhu $t5, 0x001E($s0) ## 0000071E /* 0A2E0 809368B0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 0A2E4 809368B4 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 0A2E8 809368B8 05A10004 */ bgez $t5, .L809368CC -/* 0A2EC 809368BC 468032A0 */ cvt.s.w $f10, $f6 +/* 0A2E8 809368B8 05A10004 */ bgez $t5, .L809368CC +/* 0A2EC 809368BC 468032A0 */ cvt.s.w $f10, $f6 /* 0A2F0 809368C0 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 /* 0A2F4 809368C4 00000000 */ nop -/* 0A2F8 809368C8 46085280 */ add.s $f10, $f10, $f8 +/* 0A2F8 809368C8 46085280 */ add.s $f10, $f10, $f8 .L809368CC: -/* 0A2FC 809368CC 46165302 */ mul.s $f12, $f10, $f22 -/* 0A300 809368D0 4600A386 */ mov.s $f14, $f20 +/* 0A2FC 809368CC 46165302 */ mul.s $f12, $f10, $f22 +/* 0A300 809368D0 4600A386 */ mov.s $f14, $f20 /* 0A304 809368D4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0A308 809368D8 44066000 */ mfc1 $a2, $f12 -/* 0A30C 809368DC 0C0342A3 */ jal Matrix_Scale +/* 0A308 809368D8 44066000 */ mfc1 $a2, $f12 +/* 0A30C 809368DC 0C0342A3 */ jal Matrix_Scale /* 0A310 809368E0 00000000 */ nop /* 0A314 809368E4 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 0A318 809368E8 02802825 */ or $a1, $s4, $zero ## $a1 = 80937970 @@ -355,9 +355,9 @@ glabel func_8093639C /* 0A320 809368F0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0A324 809368F4 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 /* 0A328 809368F8 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 0A32C 809368FC 8FAF00F4 */ lw $t7, 0x00F4($sp) +/* 0A32C 809368FC 8FAF00F4 */ lw $t7, 0x00F4($sp) /* 0A330 80936900 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 0A334 80936904 0C0346A2 */ jal Matrix_NewMtx +/* 0A334 80936904 0C0346A2 */ jal Matrix_NewMtx /* 0A338 80936908 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 0A33C 8093690C AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 0A340 80936910 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 @@ -367,31 +367,31 @@ glabel func_8093639C /* 0A350 80936920 AC530004 */ sw $s3, 0x0004($v0) ## 00000004 /* 0A354 80936924 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 /* 0A358 80936928 86190022 */ lh $t9, 0x0022($s0) ## 0000074A -/* 0A35C 8093692C 56B9FFDB */ bnel $s5, $t9, .L8093689C +/* 0A35C 8093692C 56B9FFDB */ bnel $s5, $t9, .L8093689C /* 0A360 80936930 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000728 .L80936934: -/* 0A364 80936934 8FA900F4 */ lw $t1, 0x00F4($sp) +/* 0A364 80936934 8FA900F4 */ lw $t1, 0x00F4($sp) .L80936938: /* 0A368 80936938 3C068093 */ lui $a2, %hi(D_80937980) ## $a2 = 80930000 /* 0A36C 8093693C 24C67980 */ addiu $a2, $a2, %lo(D_80937980) ## $a2 = 80937980 /* 0A370 80936940 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC /* 0A374 80936944 24071D09 */ addiu $a3, $zero, 0x1D09 ## $a3 = 00001D09 -/* 0A378 80936948 0C031AD5 */ jal func_800C6B54 +/* 0A378 80936948 0C031AD5 */ jal func_800C6B54 /* 0A37C 8093694C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 .L80936950: -/* 0A380 80936950 8FBF006C */ lw $ra, 0x006C($sp) -/* 0A384 80936954 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 0A388 80936958 D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 0A38C 8093695C 8FB00048 */ lw $s0, 0x0048($sp) -/* 0A390 80936960 8FB1004C */ lw $s1, 0x004C($sp) -/* 0A394 80936964 8FB20050 */ lw $s2, 0x0050($sp) -/* 0A398 80936968 8FB30054 */ lw $s3, 0x0054($sp) -/* 0A39C 8093696C 8FB40058 */ lw $s4, 0x0058($sp) -/* 0A3A0 80936970 8FB5005C */ lw $s5, 0x005C($sp) -/* 0A3A4 80936974 8FB60060 */ lw $s6, 0x0060($sp) -/* 0A3A8 80936978 8FB70064 */ lw $s7, 0x0064($sp) -/* 0A3AC 8093697C 8FBE0068 */ lw $s8, 0x0068($sp) -/* 0A3B0 80936980 03E00008 */ jr $ra +/* 0A380 80936950 8FBF006C */ lw $ra, 0x006C($sp) +/* 0A384 80936954 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 0A388 80936958 D7B60040 */ ldc1 $f22, 0x0040($sp) +/* 0A38C 8093695C 8FB00048 */ lw $s0, 0x0048($sp) +/* 0A390 80936960 8FB1004C */ lw $s1, 0x004C($sp) +/* 0A394 80936964 8FB20050 */ lw $s2, 0x0050($sp) +/* 0A398 80936968 8FB30054 */ lw $s3, 0x0054($sp) +/* 0A39C 8093696C 8FB40058 */ lw $s4, 0x0058($sp) +/* 0A3A0 80936970 8FB5005C */ lw $s5, 0x005C($sp) +/* 0A3A4 80936974 8FB60060 */ lw $s6, 0x0060($sp) +/* 0A3A8 80936978 8FB70064 */ lw $s7, 0x0064($sp) +/* 0A3AC 8093697C 8FBE0068 */ lw $s8, 0x0068($sp) +/* 0A3B0 80936980 03E00008 */ jr $ra /* 0A3B4 80936984 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 /* 0A3B8 80936988 00000000 */ nop /* 0A3BC 8093698C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s index 7f01783a7e..08d463040e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s @@ -1,9 +1,9 @@ glabel BossVa_Draw /* 09F08 809591C8 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 09F0C 809591CC 3C0F8096 */ lui $t7, %hi(D_8095C2AC) ## $t7 = 80960000 -/* 09F10 809591D0 AFBF003C */ sw $ra, 0x003C($sp) -/* 09F14 809591D4 AFB10038 */ sw $s1, 0x0038($sp) -/* 09F18 809591D8 AFB00034 */ sw $s0, 0x0034($sp) +/* 09F10 809591D0 AFBF003C */ sw $ra, 0x003C($sp) +/* 09F14 809591D4 AFB10038 */ sw $s1, 0x0038($sp) +/* 09F18 809591D8 AFB00034 */ sw $s0, 0x0034($sp) /* 09F1C 809591DC 25EFC2AC */ addiu $t7, $t7, %lo(D_8095C2AC) ## $t7 = 8095C2AC /* 09F20 809591E0 8DF90000 */ lw $t9, 0x0000($t7) ## 8095C2AC /* 09F24 809591E4 27AE00B0 */ addiu $t6, $sp, 0x00B0 ## $t6 = FFFFFFE0 @@ -58,58 +58,58 @@ glabel BossVa_Draw /* 09FE8 809592A8 3C0E8096 */ lui $t6, %hi(D_8095C2F4) ## $t6 = 80960000 /* 09FEC 809592AC AD4C0004 */ sw $t4, 0x0004($t2) ## FFFFFFA8 /* 09FF0 809592B0 AD4D0008 */ sw $t5, 0x0008($t2) ## FFFFFFAC -/* 09FF4 809592B4 8DCEC2F4 */ lw $t6, %lo(D_8095C2F4)($t6) +/* 09FF4 809592B4 8DCEC2F4 */ lw $t6, %lo(D_8095C2F4)($t6) /* 09FF8 809592B8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 09FFC 809592BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A000 809592C0 AFAE0070 */ sw $t6, 0x0070($sp) +/* 0A000 809592C0 AFAE0070 */ sw $t6, 0x0070($sp) /* 0A004 809592C4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0A008 809592C8 3C068096 */ lui $a2, %hi(D_8095C470) ## $a2 = 80960000 /* 0A00C 809592CC 24C6C470 */ addiu $a2, $a2, %lo(D_8095C470) ## $a2 = 8095C470 /* 0A010 809592D0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFF8C /* 0A014 809592D4 240711BE */ addiu $a3, $zero, 0x11BE ## $a3 = 000011BE -/* 0A018 809592D8 0C031AB1 */ jal func_800C6AC4 -/* 0A01C 809592DC AFA5006C */ sw $a1, 0x006C($sp) -/* 0A020 809592E0 0C024F46 */ jal func_80093D18 +/* 0A018 809592D8 0C031AB1 */ jal func_800C6AC4 +/* 0A01C 809592DC AFA5006C */ sw $a1, 0x006C($sp) +/* 0A020 809592E0 0C024F46 */ jal func_80093D18 /* 0A024 809592E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0A028 809592E8 0C024F61 */ jal func_80093D84 +/* 0A028 809592E8 0C024F61 */ jal func_80093D84 /* 0A02C 809592EC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0A030 809592F0 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 0A034 809592F4 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0A038 809592F8 2F010015 */ sltiu $at, $t8, 0x0015 -/* 0A03C 809592FC 1020009E */ beq $at, $zero, .L80959578 -/* 0A040 80959300 0018C080 */ sll $t8, $t8, 2 +/* 0A038 809592F8 2F010015 */ sltiu $at, $t8, 0x0015 +/* 0A03C 809592FC 1020009E */ beq $at, $zero, .L80959578 +/* 0A040 80959300 0018C080 */ sll $t8, $t8, 2 /* 0A044 80959304 3C018096 */ lui $at, %hi(jtbl_8095C840) ## $at = 80960000 -/* 0A048 80959308 00380821 */ addu $at, $at, $t8 -/* 0A04C 8095930C 8C38C840 */ lw $t8, %lo(jtbl_8095C840)($at) -/* 0A050 80959310 03000008 */ jr $t8 +/* 0A048 80959308 00380821 */ addu $at, $at, $t8 +/* 0A04C 8095930C 8C38C840 */ lw $t8, %lo(jtbl_8095C840)($at) +/* 0A050 80959310 03000008 */ jr $t8 /* 0A054 80959314 00000000 */ nop glabel L80959318 /* 0A058 80959318 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A05C 8095931C 02214021 */ addu $t0, $s1, $at +/* 0A05C 8095931C 02214021 */ addu $t0, $s1, $at /* 0A060 80959320 85020AC2 */ lh $v0, 0x0AC2($t0) ## 00000AC2 /* 0A064 80959324 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A068 80959328 00310821 */ addu $at, $at, $s1 -/* 0A06C 8095932C 10400008 */ beq $v0, $zero, .L80959350 +/* 0A068 80959328 00310821 */ addu $at, $at, $s1 +/* 0A06C 8095932C 10400008 */ beq $v0, $zero, .L80959350 /* 0A070 80959330 2459015E */ addiu $t9, $v0, 0x015E ## $t9 = 0000015E /* 0A074 80959334 A4390AC2 */ sh $t9, 0x0AC2($at) ## 00010AC2 /* 0A078 80959338 850A0AC2 */ lh $t2, 0x0AC2($t0) ## 00000AC2 /* 0A07C 8095933C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A080 80959340 00310821 */ addu $at, $at, $s1 -/* 0A084 80959344 59400003 */ blezl $t2, .L80959354 +/* 0A080 80959340 00310821 */ addu $at, $at, $s1 +/* 0A084 80959344 59400003 */ blezl $t2, .L80959354 /* 0A088 80959348 85020AC4 */ lh $v0, 0x0AC4($t0) ## 00000AC4 /* 0A08C 8095934C A4200AC2 */ sh $zero, 0x0AC2($at) ## 00010AC2 .L80959350: /* 0A090 80959350 85020AC4 */ lh $v0, 0x0AC4($t0) ## 00000AC4 .L80959354: /* 0A094 80959354 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A098 80959358 00310821 */ addu $at, $at, $s1 -/* 0A09C 8095935C 10400008 */ beq $v0, $zero, .L80959380 +/* 0A098 80959358 00310821 */ addu $at, $at, $s1 +/* 0A09C 8095935C 10400008 */ beq $v0, $zero, .L80959380 /* 0A0A0 80959360 244B015E */ addiu $t3, $v0, 0x015E ## $t3 = 0000015E /* 0A0A4 80959364 A42B0AC4 */ sh $t3, 0x0AC4($at) ## 00010AC4 /* 0A0A8 80959368 850C0AC4 */ lh $t4, 0x0AC4($t0) ## 00000AC4 /* 0A0AC 8095936C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A0B0 80959370 00310821 */ addu $at, $at, $s1 -/* 0A0B4 80959374 59800003 */ blezl $t4, .L80959384 +/* 0A0B0 80959370 00310821 */ addu $at, $at, $s1 +/* 0A0B4 80959374 59800003 */ blezl $t4, .L80959384 /* 0A0B8 80959378 920D0197 */ lbu $t5, 0x0197($s0) ## 00000197 /* 0A0BC 8095937C A4200AC4 */ sh $zero, 0x0AC4($at) ## 00010AC4 .L80959380: @@ -117,8 +117,8 @@ glabel L80959318 .L80959384: /* 0A0C4 80959384 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 0A0C8 80959388 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 0A0CC 8095938C 15A000FF */ bne $t5, $zero, .L8095978C -/* 0A0D0 80959390 8FA9006C */ lw $t1, 0x006C($sp) +/* 0A0CC 8095938C 15A000FF */ bne $t5, $zero, .L8095978C +/* 0A0D0 80959390 8FA9006C */ lw $t1, 0x006C($sp) /* 0A0D4 80959394 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 0A0D8 80959398 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 0A0DC 8095939C 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 @@ -127,32 +127,32 @@ glabel L80959318 /* 0A0E8 809593A8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0A0EC 809593AC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0A0F0 809593B0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0A0F4 809593B4 AFAA0018 */ sw $t2, 0x0018($sp) -/* 0A0F8 809593B8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0A0FC 809593BC AFB90014 */ sw $t9, 0x0014($sp) -/* 0A100 809593C0 AFB80010 */ sw $t8, 0x0010($sp) +/* 0A0F4 809593B4 AFAA0018 */ sw $t2, 0x0018($sp) +/* 0A0F8 809593B8 AFA0001C */ sw $zero, 0x001C($sp) +/* 0A0FC 809593BC AFB90014 */ sw $t9, 0x0014($sp) +/* 0A100 809593C0 AFB80010 */ sw $t8, 0x0010($sp) /* 0A104 809593C4 8D0B1DE4 */ lw $t3, 0x1DE4($t0) ## 00001DE4 /* 0A108 809593C8 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 0A10C 809593CC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 0A110 809593D0 000B0823 */ subu $at, $zero, $t3 -/* 0A114 809593D4 00016080 */ sll $t4, $at, 2 -/* 0A118 809593D8 01816021 */ addu $t4, $t4, $at -/* 0A11C 809593DC 000C6040 */ sll $t4, $t4, 1 +/* 0A110 809593D0 000B0823 */ subu $at, $zero, $t3 +/* 0A114 809593D4 00016080 */ sll $t4, $at, 2 +/* 0A118 809593D8 01816021 */ addu $t4, $t4, $at +/* 0A11C 809593DC 000C6040 */ sll $t4, $t4, 1 /* 0A120 809593E0 318D000F */ andi $t5, $t4, 0x000F ## $t5 = 00000000 -/* 0A124 809593E4 AFAD0020 */ sw $t5, 0x0020($sp) -/* 0A128 809593E8 AFAE0024 */ sw $t6, 0x0024($sp) -/* 0A12C 809593EC AFAF0028 */ sw $t7, 0x0028($sp) -/* 0A130 809593F0 AFA8004C */ sw $t0, 0x004C($sp) +/* 0A124 809593E4 AFAD0020 */ sw $t5, 0x0020($sp) +/* 0A128 809593E8 AFAE0024 */ sw $t6, 0x0024($sp) +/* 0A12C 809593EC AFAF0028 */ sw $t7, 0x0028($sp) +/* 0A130 809593F0 AFA8004C */ sw $t0, 0x004C($sp) /* 0A134 809593F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A138 809593F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0A13C 809593FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A140 80959400 0C0253D0 */ jal Draw_TwoTexScroll -/* 0A144 80959404 AFA20058 */ sw $v0, 0x0058($sp) -/* 0A148 80959408 8FA30058 */ lw $v1, 0x0058($sp) -/* 0A14C 8095940C 8FA8004C */ lw $t0, 0x004C($sp) +/* 0A140 80959400 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A144 80959404 AFA20058 */ sw $v0, 0x0058($sp) +/* 0A148 80959408 8FA30058 */ lw $v1, 0x0058($sp) +/* 0A14C 8095940C 8FA8004C */ lw $t0, 0x004C($sp) /* 0A150 80959410 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 0A154 80959414 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0A158 80959418 8FB8006C */ lw $t8, 0x006C($sp) +/* 0A158 80959418 8FB8006C */ lw $t8, 0x006C($sp) /* 0A15C 8095941C 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 0A160 80959420 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 /* 0A164 80959424 8F0202C0 */ lw $v0, 0x02C0($t8) ## 000002C0 @@ -164,27 +164,27 @@ glabel L80959318 /* 0A17C 8095943C 8D031DE4 */ lw $v1, 0x1DE4($t0) ## 00001DE4 /* 0A180 80959440 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0A184 80959444 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 0A188 80959448 00030823 */ subu $at, $zero, $v1 -/* 0A18C 8095944C 00013880 */ sll $a3, $at, 2 -/* 0A190 80959450 00017080 */ sll $t6, $at, 2 -/* 0A194 80959454 01C17021 */ addu $t6, $t6, $at -/* 0A198 80959458 00E13821 */ addu $a3, $a3, $at -/* 0A19C 8095945C 00073840 */ sll $a3, $a3, 1 +/* 0A188 80959448 00030823 */ subu $at, $zero, $v1 +/* 0A18C 8095944C 00013880 */ sll $a3, $at, 2 +/* 0A190 80959450 00017080 */ sll $t6, $at, 2 +/* 0A194 80959454 01C17021 */ addu $t6, $t6, $at +/* 0A198 80959458 00E13821 */ addu $a3, $a3, $at +/* 0A19C 8095945C 00073840 */ sll $a3, $a3, 1 /* 0A1A0 80959460 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 /* 0A1A4 80959464 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 0A1A8 80959468 AFB80028 */ sw $t8, 0x0028($sp) -/* 0A1AC 8095946C AFAF0020 */ sw $t7, 0x0020($sp) +/* 0A1A8 80959468 AFB80028 */ sw $t8, 0x0028($sp) +/* 0A1AC 8095946C AFAF0020 */ sw $t7, 0x0020($sp) /* 0A1B0 80959470 30E7001F */ andi $a3, $a3, 0x001F ## $a3 = 00000000 -/* 0A1B4 80959474 AFB90024 */ sw $t9, 0x0024($sp) -/* 0A1B8 80959478 AFA0001C */ sw $zero, 0x001C($sp) -/* 0A1BC 8095947C AFAD0018 */ sw $t5, 0x0018($sp) -/* 0A1C0 80959480 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0A1C4 80959484 AFAB0010 */ sw $t3, 0x0010($sp) +/* 0A1B4 80959474 AFB90024 */ sw $t9, 0x0024($sp) +/* 0A1B8 80959478 AFA0001C */ sw $zero, 0x001C($sp) +/* 0A1BC 8095947C AFAD0018 */ sw $t5, 0x0018($sp) +/* 0A1C0 80959480 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0A1C4 80959484 AFAB0010 */ sw $t3, 0x0010($sp) /* 0A1C8 80959488 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A1CC 8095948C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0A1D0 80959490 0C0253D0 */ jal Draw_TwoTexScroll -/* 0A1D4 80959494 AFA20054 */ sw $v0, 0x0054($sp) -/* 0A1D8 80959498 8FA90054 */ lw $t1, 0x0054($sp) +/* 0A1D0 80959490 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A1D4 80959494 AFA20054 */ sw $v0, 0x0054($sp) +/* 0A1D8 80959498 8FA90054 */ lw $t1, 0x0054($sp) /* 0A1DC 8095949C 3C0A8096 */ lui $t2, %hi(func_80958150) ## $t2 = 80960000 /* 0A1E0 809594A0 254A8150 */ addiu $t2, $t2, %lo(func_80958150) ## $t2 = 80958150 /* 0A1E4 809594A4 AD220004 */ sw $v0, 0x0004($t1) ## 00000004 @@ -192,82 +192,82 @@ glabel L80959318 /* 0A1EC 809594AC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A1F0 809594B0 3C078095 */ lui $a3, %hi(func_80957F60) ## $a3 = 80950000 /* 0A1F4 809594B4 24E77F60 */ addiu $a3, $a3, %lo(func_80957F60) ## $a3 = 80957F60 -/* 0A1F8 809594B8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0A1FC 809594BC AFAA0010 */ sw $t2, 0x0010($sp) +/* 0A1F8 809594B8 AFB00014 */ sw $s0, 0x0014($sp) +/* 0A1FC 809594BC AFAA0010 */ sw $t2, 0x0010($sp) /* 0A200 809594C0 0C028572 */ jal SkelAnime_Draw - + /* 0A204 809594C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0A208 809594C8 100000B1 */ beq $zero, $zero, .L80959790 +/* 0A208 809594C8 100000B1 */ beq $zero, $zero, .L80959790 /* 0A20C 809594CC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C glabel L809594D0 /* 0A210 809594D0 920B0197 */ lbu $t3, 0x0197($s0) ## 00000197 /* 0A214 809594D4 3C0C8096 */ lui $t4, %hi(func_809586A4) ## $t4 = 80960000 /* 0A218 809594D8 258C86A4 */ addiu $t4, $t4, %lo(func_809586A4) ## $t4 = 809586A4 -/* 0A21C 809594DC 156000AB */ bne $t3, $zero, .L8095978C +/* 0A21C 809594DC 156000AB */ bne $t3, $zero, .L8095978C /* 0A220 809594E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A224 809594E4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A228 809594E8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0A22C 809594EC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 0A230 809594F0 3C0D8096 */ lui $t5, %hi(func_809586E4) ## $t5 = 80960000 /* 0A234 809594F4 25AD86E4 */ addiu $t5, $t5, %lo(func_809586E4) ## $t5 = 809586E4 -/* 0A238 809594F8 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0A23C 809594FC AFB00018 */ sw $s0, 0x0018($sp) -/* 0A240 80959500 0C0286B2 */ jal func_800A1AC8 -/* 0A244 80959504 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0A248 80959508 100000A1 */ beq $zero, $zero, .L80959790 +/* 0A238 809594F8 AFAD0014 */ sw $t5, 0x0014($sp) +/* 0A23C 809594FC AFB00018 */ sw $s0, 0x0018($sp) +/* 0A240 80959500 0C0286B2 */ jal func_800A1AC8 +/* 0A244 80959504 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0A248 80959508 100000A1 */ beq $zero, $zero, .L80959790 /* 0A24C 8095950C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C glabel L80959510 /* 0A250 80959510 920E0197 */ lbu $t6, 0x0197($s0) ## 00000197 /* 0A254 80959514 3C0F8096 */ lui $t7, %hi(func_80958934) ## $t7 = 80960000 /* 0A258 80959518 25EF8934 */ addiu $t7, $t7, %lo(func_80958934) ## $t7 = 80958934 -/* 0A25C 8095951C 15C0009B */ bne $t6, $zero, .L8095978C +/* 0A25C 8095951C 15C0009B */ bne $t6, $zero, .L8095978C /* 0A260 80959520 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A264 80959524 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A268 80959528 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0A26C 8095952C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 0A270 80959530 3C198096 */ lui $t9, %hi(func_80958B0C) ## $t9 = 80960000 /* 0A274 80959534 27398B0C */ addiu $t9, $t9, %lo(func_80958B0C) ## $t9 = 80958B0C -/* 0A278 80959538 AFB90014 */ sw $t9, 0x0014($sp) -/* 0A27C 8095953C AFB00018 */ sw $s0, 0x0018($sp) -/* 0A280 80959540 0C0286B2 */ jal func_800A1AC8 -/* 0A284 80959544 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0A288 80959548 10000091 */ beq $zero, $zero, .L80959790 +/* 0A278 80959538 AFB90014 */ sw $t9, 0x0014($sp) +/* 0A27C 8095953C AFB00018 */ sw $s0, 0x0018($sp) +/* 0A280 80959540 0C0286B2 */ jal func_800A1AC8 +/* 0A284 80959544 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0A288 80959548 10000091 */ beq $zero, $zero, .L80959790 /* 0A28C 8095954C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C glabel L80959550 /* 0A290 80959550 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A294 80959554 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0A298 80959558 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 0A29C 8095955C AFA00018 */ sw $zero, 0x0018($sp) -/* 0A2A0 80959560 AFA00014 */ sw $zero, 0x0014($sp) -/* 0A2A4 80959564 AFA00010 */ sw $zero, 0x0010($sp) -/* 0A2A8 80959568 0C0286B2 */ jal func_800A1AC8 +/* 0A29C 8095955C AFA00018 */ sw $zero, 0x0018($sp) +/* 0A2A0 80959560 AFA00014 */ sw $zero, 0x0014($sp) +/* 0A2A4 80959564 AFA00010 */ sw $zero, 0x0010($sp) +/* 0A2A8 80959568 0C0286B2 */ jal func_800A1AC8 /* 0A2AC 8095956C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0A2B0 80959570 10000087 */ beq $zero, $zero, .L80959790 +/* 0A2B0 80959570 10000087 */ beq $zero, $zero, .L80959790 /* 0A2B4 80959574 8602001C */ lh $v0, 0x001C($s0) ## 0000001C glabel L80959578 .L80959578: /* 0A2B8 80959578 92180197 */ lbu $t8, 0x0197($s0) ## 00000197 /* 0A2BC 8095957C 3C078096 */ lui $a3, %hi(func_80958F6C) ## $a3 = 80960000 /* 0A2C0 80959580 24E78F6C */ addiu $a3, $a3, %lo(func_80958F6C) ## $a3 = 80958F6C -/* 0A2C4 80959584 17000081 */ bne $t8, $zero, .L8095978C +/* 0A2C4 80959584 17000081 */ bne $t8, $zero, .L8095978C /* 0A2C8 80959588 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A2CC 8095958C 3C0A8096 */ lui $t2, %hi(func_80958FFC) ## $t2 = 80960000 /* 0A2D0 80959590 254A8FFC */ addiu $t2, $t2, %lo(func_80958FFC) ## $t2 = 80958FFC /* 0A2D4 80959594 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A2D8 80959598 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 0A2DC 8095959C AFB00014 */ sw $s0, 0x0014($sp) +/* 0A2DC 8095959C AFB00014 */ sw $s0, 0x0014($sp) /* 0A2E0 809595A0 0C028572 */ jal SkelAnime_Draw - -/* 0A2E4 809595A4 AFAA0010 */ sw $t2, 0x0010($sp) + +/* 0A2E4 809595A4 AFAA0010 */ sw $t2, 0x0010($sp) /* 0A2E8 809595A8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 0A2EC 809595AC 0C018A29 */ jal func_800628A4 +/* 0A2EC 809595AC 0C018A29 */ jal func_800628A4 /* 0A2F0 809595B0 260502D8 */ addiu $a1, $s0, 0x02D8 ## $a1 = 000002D8 /* 0A2F4 809595B4 3C0B8096 */ lui $t3, %hi(D_809668D2) ## $t3 = 80960000 -/* 0A2F8 809595B8 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) +/* 0A2F8 809595B8 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) /* 0A2FC 809595BC 3C048096 */ lui $a0, %hi(D_8095C220) ## $a0 = 80960000 /* 0A300 809595C0 2484C220 */ addiu $a0, $a0, %lo(D_8095C220) ## $a0 = 8095C220 -/* 0A304 809595C4 2961000D */ slti $at, $t3, 0x000D -/* 0A308 809595C8 5020000B */ beql $at, $zero, .L809595F8 +/* 0A304 809595C4 2961000D */ slti $at, $t3, 0x000D +/* 0A308 809595C8 5020000B */ beql $at, $zero, .L809595F8 /* 0A30C 809595CC 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 /* 0A310 809595D0 8E0D0118 */ lw $t5, 0x0118($s0) ## 00000118 /* 0A314 809595D4 27AC00BC */ addiu $t4, $sp, 0x00BC ## $t4 = FFFFFFEC @@ -276,7 +276,7 @@ glabel L80959578 /* 0A320 809595E0 8DAE0028 */ lw $t6, 0x0028($t5) ## 00000028 /* 0A324 809595E4 AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFF0 /* 0A328 809595E8 8DAF002C */ lw $t7, 0x002C($t5) ## 0000002C -/* 0A32C 809595EC 10000009 */ beq $zero, $zero, .L80959614 +/* 0A32C 809595EC 10000009 */ beq $zero, $zero, .L80959614 /* 0A330 809595F0 AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFF4 /* 0A334 809595F4 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 .L809595F8: @@ -288,62 +288,62 @@ glabel L80959578 /* 0A34C 8095960C 8F0B01E0 */ lw $t3, 0x01E0($t8) ## 000001E0 /* 0A350 80959610 AF2B0008 */ sw $t3, 0x0008($t9) ## FFFFFFF4 .L80959614: -/* 0A354 80959614 0C0346BD */ jal Matrix_MultVec3f +/* 0A354 80959614 0C0346BD */ jal Matrix_MultVec3f /* 0A358 80959618 26050208 */ addiu $a1, $s0, 0x0208 ## $a1 = 00000208 -/* 0A35C 8095961C 0C034213 */ jal Matrix_Push +/* 0A35C 8095961C 0C034213 */ jal Matrix_Push /* 0A360 80959620 00000000 */ nop -/* 0A364 80959624 C7AC00BC */ lwc1 $f12, 0x00BC($sp) -/* 0A368 80959628 C7AE00C0 */ lwc1 $f14, 0x00C0($sp) -/* 0A36C 8095962C 8FA600C4 */ lw $a2, 0x00C4($sp) -/* 0A370 80959630 0C034261 */ jal Matrix_Translate +/* 0A364 80959624 C7AC00BC */ lwc1 $f12, 0x00BC($sp) +/* 0A368 80959628 C7AE00C0 */ lwc1 $f14, 0x00C0($sp) +/* 0A36C 8095962C 8FA600C4 */ lw $a2, 0x00C4($sp) +/* 0A370 80959630 0C034261 */ jal Matrix_Translate /* 0A374 80959634 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A378 80959638 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 0A37C 8095963C 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 0A380 80959640 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0A384 80959644 0C034421 */ jal Matrix_RotateXYZ +/* 0A384 80959644 0C034421 */ jal Matrix_RotateZYX /* 0A388 80959648 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0A38C 8095964C C60401A0 */ lwc1 $f4, 0x01A0($s0) ## 000001A0 /* 0A390 80959650 3C013D80 */ lui $at, 0x3D80 ## $at = 3D800000 /* 0A394 80959654 44815000 */ mtc1 $at, $f10 ## $f10 = 0.06 -/* 0A398 80959658 E7A4007C */ swc1 $f4, 0x007C($sp) -/* 0A39C 8095965C C7A6007C */ lwc1 $f6, 0x007C($sp) +/* 0A398 80959658 E7A4007C */ swc1 $f4, 0x007C($sp) +/* 0A39C 8095965C C7A6007C */ lwc1 $f6, 0x007C($sp) /* 0A3A0 80959660 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE0 /* 0A3A4 80959664 260501FC */ addiu $a1, $s0, 0x01FC ## $a1 = 000001FC -/* 0A3A8 80959668 E7A60088 */ swc1 $f6, 0x0088($sp) +/* 0A3A8 80959668 E7A60088 */ swc1 $f6, 0x0088($sp) /* 0A3AC 8095966C 860C019C */ lh $t4, 0x019C($s0) ## 0000019C /* 0A3B0 80959670 C60801A0 */ lwc1 $f8, 0x01A0($s0) ## 000001A0 /* 0A3B4 80959674 318D000F */ andi $t5, $t4, 0x000F ## $t5 = 00000000 /* 0A3B8 80959678 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 0A3BC 8095967C 460A4402 */ mul.s $f16, $f8, $f10 -/* 0A3C0 80959680 46809120 */ cvt.s.w $f4, $f18 -/* 0A3C4 80959684 46102182 */ mul.s $f6, $f4, $f16 -/* 0A3C8 80959688 0C0346BD */ jal Matrix_MultVec3f -/* 0A3CC 8095968C E7A600B8 */ swc1 $f6, 0x00B8($sp) +/* 0A3BC 8095967C 460A4402 */ mul.s $f16, $f8, $f10 +/* 0A3C0 80959680 46809120 */ cvt.s.w $f4, $f18 +/* 0A3C4 80959684 46102182 */ mul.s $f6, $f4, $f16 +/* 0A3C8 80959688 0C0346BD */ jal Matrix_MultVec3f +/* 0A3CC 8095968C E7A600B8 */ swc1 $f6, 0x00B8($sp) /* 0A3D0 80959690 26050384 */ addiu $a1, $s0, 0x0384 ## $a1 = 00000384 -/* 0A3D4 80959694 AFA50048 */ sw $a1, 0x0048($sp) -/* 0A3D8 80959698 0C0346BD */ jal Matrix_MultVec3f +/* 0A3D4 80959694 AFA50048 */ sw $a1, 0x0048($sp) +/* 0A3D8 80959698 0C0346BD */ jal Matrix_MultVec3f /* 0A3DC 8095969C 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFC8 /* 0A3E0 809596A0 26050378 */ addiu $a1, $s0, 0x0378 ## $a1 = 00000378 -/* 0A3E4 809596A4 AFA5004C */ sw $a1, 0x004C($sp) -/* 0A3E8 809596A8 0C0346BD */ jal Matrix_MultVec3f +/* 0A3E4 809596A4 AFA5004C */ sw $a1, 0x004C($sp) +/* 0A3E8 809596A8 0C0346BD */ jal Matrix_MultVec3f /* 0A3EC 809596AC 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFBC /* 0A3F0 809596B0 2605039C */ addiu $a1, $s0, 0x039C ## $a1 = 0000039C -/* 0A3F4 809596B4 AFA50040 */ sw $a1, 0x0040($sp) -/* 0A3F8 809596B8 0C0346BD */ jal Matrix_MultVec3f +/* 0A3F4 809596B4 AFA50040 */ sw $a1, 0x0040($sp) +/* 0A3F8 809596B8 0C0346BD */ jal Matrix_MultVec3f /* 0A3FC 809596BC 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFB0 /* 0A400 809596C0 26070390 */ addiu $a3, $s0, 0x0390 ## $a3 = 00000390 /* 0A404 809596C4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000390 -/* 0A408 809596C8 AFA70044 */ sw $a3, 0x0044($sp) -/* 0A40C 809596CC 0C0346BD */ jal Matrix_MultVec3f +/* 0A408 809596C8 AFA70044 */ sw $a3, 0x0044($sp) +/* 0A40C 809596CC 0C0346BD */ jal Matrix_MultVec3f /* 0A410 809596D0 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFA4 -/* 0A414 809596D4 8FAE0040 */ lw $t6, 0x0040($sp) -/* 0A418 809596D8 8FA70044 */ lw $a3, 0x0044($sp) +/* 0A414 809596D4 8FAE0040 */ lw $t6, 0x0040($sp) +/* 0A418 809596D8 8FA70044 */ lw $a3, 0x0044($sp) /* 0A41C 809596DC 26040338 */ addiu $a0, $s0, 0x0338 ## $a0 = 00000338 -/* 0A420 809596E0 8FA5004C */ lw $a1, 0x004C($sp) -/* 0A424 809596E4 8FA60048 */ lw $a2, 0x0048($sp) -/* 0A428 809596E8 0C0189CD */ jal func_80062734 -/* 0A42C 809596EC AFAE0010 */ sw $t6, 0x0010($sp) -/* 0A430 809596F0 0C034221 */ jal Matrix_Pull +/* 0A420 809596E0 8FA5004C */ lw $a1, 0x004C($sp) +/* 0A424 809596E4 8FA60048 */ lw $a2, 0x0048($sp) +/* 0A428 809596E8 0C0189CD */ jal func_80062734 +/* 0A42C 809596EC AFAE0010 */ sw $t6, 0x0010($sp) +/* 0A430 809596F0 0C034221 */ jal Matrix_Pull /* 0A434 809596F4 00000000 */ nop /* 0A438 809596F8 8E180024 */ lw $t8, 0x0024($s0) ## 00000024 /* 0A43C 809596FC 27AF00BC */ addiu $t7, $sp, 0x00BC ## $t7 = FFFFFFEC @@ -354,24 +354,24 @@ glabel L80959578 /* 0A450 80959710 ADF90004 */ sw $t9, 0x0004($t7) ## FFFFFFF0 /* 0A454 80959714 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C /* 0A458 80959718 ADF80008 */ sw $t8, 0x0008($t7) ## FFFFFFF4 -/* 0A45C 8095971C C7A800C0 */ lwc1 $f8, 0x00C0($sp) -/* 0A460 80959720 460A4480 */ add.s $f18, $f8, $f10 -/* 0A464 80959724 E7B200C0 */ swc1 $f18, 0x00C0($sp) +/* 0A45C 8095971C C7A800C0 */ lwc1 $f8, 0x00C0($sp) +/* 0A460 80959720 460A4480 */ add.s $f18, $f8, $f10 +/* 0A464 80959724 E7B200C0 */ swc1 $f18, 0x00C0($sp) /* 0A468 80959728 920A0114 */ lbu $t2, 0x0114($s0) ## 00000114 -/* 0A46C 8095972C 51400004 */ beql $t2, $zero, .L80959740 +/* 0A46C 8095972C 51400004 */ beql $t2, $zero, .L80959740 /* 0A470 80959730 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFEC -/* 0A474 80959734 0C009A9B */ jal func_80026A6C +/* 0A474 80959734 0C009A9B */ jal func_80026A6C /* 0A478 80959738 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A47C 8095973C 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFEC .L80959740: /* 0A480 80959740 27A500A4 */ addiu $a1, $sp, 0x00A4 ## $a1 = FFFFFFD4 /* 0A484 80959744 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0A488 80959748 0C00CF0C */ jal func_80033C30 +/* 0A488 80959748 0C00CF0C */ jal func_80033C30 /* 0A48C 8095974C 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 /* 0A490 80959750 920B0114 */ lbu $t3, 0x0114($s0) ## 00000114 /* 0A494 80959754 3C0C8096 */ lui $t4, %hi(D_8095C2F8) ## $t4 = 80960000 /* 0A498 80959758 258CC2F8 */ addiu $t4, $t4, %lo(D_8095C2F8) ## $t4 = 8095C2F8 -/* 0A49C 8095975C 5160000C */ beql $t3, $zero, .L80959790 +/* 0A49C 8095975C 5160000C */ beql $t3, $zero, .L80959790 /* 0A4A0 80959760 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 0A4A4 80959764 8D8E0000 */ lw $t6, 0x0000($t4) ## 8095C2F8 /* 0A4A8 80959768 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFF80 @@ -380,39 +380,39 @@ glabel L80959578 /* 0A4B4 80959774 96070112 */ lhu $a3, 0x0112($s0) ## 00000112 /* 0A4B8 80959778 92060114 */ lbu $a2, 0x0114($s0) ## 00000114 /* 0A4BC 8095977C 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 -/* 0A4C0 80959780 00073C00 */ sll $a3, $a3, 16 -/* 0A4C4 80959784 0C009A18 */ jal func_80026860 -/* 0A4C8 80959788 00073C03 */ sra $a3, $a3, 16 +/* 0A4C0 80959780 00073C00 */ sll $a3, $a3, 16 +/* 0A4C4 80959784 0C009A18 */ jal func_80026860 +/* 0A4C8 80959788 00073C03 */ sra $a3, $a3, 16 glabel L8095978C .L8095978C: /* 0A4CC 8095978C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80959790: /* 0A4D0 80959790 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 0A4D4 80959794 3C048096 */ lui $a0, %hi(D_8095DF50) ## $a0 = 80960000 -/* 0A4D8 80959798 14410005 */ bne $v0, $at, .L809597B0 +/* 0A4D8 80959798 14410005 */ bne $v0, $at, .L809597B0 /* 0A4DC 8095979C 2484DF50 */ addiu $a0, $a0, %lo(D_8095DF50) ## $a0 = 8095DF50 -/* 0A4E0 809597A0 0C256862 */ jal func_8095A188 +/* 0A4E0 809597A0 0C256862 */ jal func_8095A188 /* 0A4E4 809597A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0A4E8 809597A8 10000007 */ beq $zero, $zero, .L809597C8 +/* 0A4E8 809597A8 10000007 */ beq $zero, $zero, .L809597C8 /* 0A4EC 809597AC 00000000 */ nop .L809597B0: /* 0A4F0 809597B0 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 0A4F4 809597B4 14410004 */ bne $v0, $at, .L809597C8 +/* 0A4F4 809597B4 14410004 */ bne $v0, $at, .L809597C8 /* 0A4F8 809597B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A4FC 809597BC 3C058096 */ lui $a1, %hi(D_80966934) ## $a1 = 80960000 -/* 0A500 809597C0 0C256F49 */ jal func_8095BD24 -/* 0A504 809597C4 84A56934 */ lh $a1, %lo(D_80966934)($a1) +/* 0A500 809597C0 0C256F49 */ jal func_8095BD24 +/* 0A504 809597C4 84A56934 */ lh $a1, %lo(D_80966934)($a1) .L809597C8: /* 0A508 809597C8 3C068096 */ lui $a2, %hi(D_8095C480) ## $a2 = 80960000 /* 0A50C 809597CC 24C6C480 */ addiu $a2, $a2, %lo(D_8095C480) ## $a2 = 8095C480 /* 0A510 809597D0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFF8C /* 0A514 809597D4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0A518 809597D8 0C031AD5 */ jal func_800C6B54 +/* 0A518 809597D8 0C031AD5 */ jal func_800C6B54 /* 0A51C 809597DC 24071241 */ addiu $a3, $zero, 0x1241 ## $a3 = 00001241 -/* 0A520 809597E0 8FBF003C */ lw $ra, 0x003C($sp) -/* 0A524 809597E4 8FB00034 */ lw $s0, 0x0034($sp) -/* 0A528 809597E8 8FB10038 */ lw $s1, 0x0038($sp) -/* 0A52C 809597EC 03E00008 */ jr $ra +/* 0A520 809597E0 8FBF003C */ lw $ra, 0x003C($sp) +/* 0A524 809597E4 8FB00034 */ lw $s0, 0x0034($sp) +/* 0A528 809597E8 8FB10038 */ lw $s1, 0x0038($sp) +/* 0A52C 809597EC 03E00008 */ jr $ra /* 0A530 809597F0 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s index 6a9fe57a5e..5640f0f57b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s @@ -1,140 +1,140 @@ glabel func_8094F2C8 /* 00008 8094F2C8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0000C 8094F2CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00010 8094F2D0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00014 8094F2D4 AFB00014 */ sw $s0, 0x0014($sp) +/* 0000C 8094F2CC AFBF001C */ sw $ra, 0x001C($sp) +/* 00010 8094F2D0 AFB10018 */ sw $s1, 0x0018($sp) +/* 00014 8094F2D4 AFB00014 */ sw $s0, 0x0014($sp) /* 00018 8094F2D8 8C910118 */ lw $s1, 0x0118($a0) ## 00000118 /* 0001C 8094F2DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00020 8094F2E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00024 8094F2E4 C62C0024 */ lwc1 $f12, 0x0024($s1) ## 00000024 /* 00028 8094F2E8 C62E0028 */ lwc1 $f14, 0x0028($s1) ## 00000028 -/* 0002C 8094F2EC 0C034261 */ jal Matrix_Translate +/* 0002C 8094F2EC 0C034261 */ jal Matrix_Translate /* 00030 8094F2F0 8E26002C */ lw $a2, 0x002C($s1) ## 0000002C /* 00034 8094F2F4 862400B4 */ lh $a0, 0x00B4($s1) ## 000000B4 /* 00038 8094F2F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0003C 8094F2FC 862600B8 */ lh $a2, 0x00B8($s1) ## 000000B8 -/* 00040 8094F300 0C034421 */ jal Matrix_RotateXYZ +/* 00040 8094F300 0C034421 */ jal Matrix_RotateZYX /* 00044 8094F304 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00048 8094F308 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 0004C 8094F30C 3C188096 */ lui $t8, %hi(D_8095C044) ## $t8 = 80960000 /* 00050 8094F310 2718C044 */ addiu $t8, $t8, %lo(D_8095C044) ## $t8 = 8095C044 -/* 00054 8094F314 000E7880 */ sll $t7, $t6, 2 -/* 00058 8094F318 01EE7823 */ subu $t7, $t7, $t6 -/* 0005C 8094F31C 000F7880 */ sll $t7, $t7, 2 -/* 00060 8094F320 01F82021 */ addu $a0, $t7, $t8 -/* 00064 8094F324 0C0346BD */ jal Matrix_MultVec3f +/* 00054 8094F314 000E7880 */ sll $t7, $t6, 2 +/* 00058 8094F318 01EE7823 */ subu $t7, $t7, $t6 +/* 0005C 8094F31C 000F7880 */ sll $t7, $t7, 2 +/* 00060 8094F320 01F82021 */ addu $a0, $t7, $t8 +/* 00064 8094F324 0C0346BD */ jal Matrix_MultVec3f /* 00068 8094F328 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 0006C 8094F32C 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 00070 8094F330 2C610006 */ sltiu $at, $v1, 0x0006 -/* 00074 8094F334 10200067 */ beq $at, $zero, .L8094F4D4 -/* 00078 8094F338 0003C880 */ sll $t9, $v1, 2 +/* 00070 8094F330 2C610006 */ sltiu $at, $v1, 0x0006 +/* 00074 8094F334 10200067 */ beq $at, $zero, .L8094F4D4 +/* 00078 8094F338 0003C880 */ sll $t9, $v1, 2 /* 0007C 8094F33C 3C018096 */ lui $at, %hi(jtbl_8095C560) ## $at = 80960000 -/* 00080 8094F340 00390821 */ addu $at, $at, $t9 -/* 00084 8094F344 8C39C560 */ lw $t9, %lo(jtbl_8095C560)($at) -/* 00088 8094F348 03200008 */ jr $t9 +/* 00080 8094F340 00390821 */ addu $at, $at, $t9 +/* 00084 8094F344 8C39C560 */ lw $t9, %lo(jtbl_8095C560)($at) +/* 00088 8094F348 03200008 */ jr $t9 /* 0008C 8094F34C 00000000 */ nop glabel L8094F350 /* 00090 8094F350 92080194 */ lbu $t0, 0x0194($s0) ## 00000194 -/* 00094 8094F354 00034880 */ sll $t1, $v1, 2 -/* 00098 8094F358 01234823 */ subu $t1, $t1, $v1 -/* 0009C 8094F35C 1500005D */ bne $t0, $zero, .L8094F4D4 -/* 000A0 8094F360 00094840 */ sll $t1, $t1, 1 +/* 00094 8094F354 00034880 */ sll $t1, $v1, 2 +/* 00098 8094F358 01234823 */ subu $t1, $t1, $v1 +/* 0009C 8094F35C 1500005D */ bne $t0, $zero, .L8094F4D4 +/* 000A0 8094F360 00094840 */ sll $t1, $t1, 1 /* 000A4 8094F364 3C0A8096 */ lui $t2, %hi(D_8095C17C) ## $t2 = 80960000 /* 000A8 8094F368 254AC17C */ addiu $t2, $t2, %lo(D_8095C17C) ## $t2 = 8095C17C -/* 000AC 8094F36C 012A1021 */ addu $v0, $t1, $t2 +/* 000AC 8094F36C 012A1021 */ addu $v0, $t1, $t2 /* 000B0 8094F370 844B0000 */ lh $t3, 0x0000($v0) ## 00000000 /* 000B4 8094F374 862C00B4 */ lh $t4, 0x00B4($s1) ## 000000B4 -/* 000B8 8094F378 016C6821 */ addu $t5, $t3, $t4 +/* 000B8 8094F378 016C6821 */ addu $t5, $t3, $t4 /* 000BC 8094F37C A60D00B4 */ sh $t5, 0x00B4($s0) ## 000000B4 /* 000C0 8094F380 844E0002 */ lh $t6, 0x0002($v0) ## 00000002 /* 000C4 8094F384 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 /* 000C8 8094F388 863800B8 */ lh $t8, 0x00B8($s1) ## 000000B8 /* 000CC 8094F38C 844F0004 */ lh $t7, 0x0004($v0) ## 00000004 -/* 000D0 8094F390 01F8C821 */ addu $t9, $t7, $t8 -/* 000D4 8094F394 1000004F */ beq $zero, $zero, .L8094F4D4 +/* 000D0 8094F390 01F8C821 */ addu $t9, $t7, $t8 +/* 000D4 8094F394 1000004F */ beq $zero, $zero, .L8094F4D4 /* 000D8 8094F398 A61900B8 */ sh $t9, 0x00B8($s0) ## 000000B8 glabel L8094F39C -/* 000DC 8094F39C 00034080 */ sll $t0, $v1, 2 -/* 000E0 8094F3A0 01034023 */ subu $t0, $t0, $v1 +/* 000DC 8094F39C 00034080 */ sll $t0, $v1, 2 +/* 000E0 8094F3A0 01034023 */ subu $t0, $t0, $v1 /* 000E4 8094F3A4 3C098096 */ lui $t1, %hi(D_8095C17C) ## $t1 = 80960000 /* 000E8 8094F3A8 2529C17C */ addiu $t1, $t1, %lo(D_8095C17C) ## $t1 = 8095C17C -/* 000EC 8094F3AC 00084040 */ sll $t0, $t0, 1 -/* 000F0 8094F3B0 01091021 */ addu $v0, $t0, $t1 +/* 000EC 8094F3AC 00084040 */ sll $t0, $t0, 1 +/* 000F0 8094F3B0 01091021 */ addu $v0, $t0, $t1 /* 000F4 8094F3B4 844A0002 */ lh $t2, 0x0002($v0) ## 00000002 /* 000F8 8094F3B8 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 /* 000FC 8094F3BC 0C01DE0D */ jal Math_Coss ## coss? /* 00100 8094F3C0 84440002 */ lh $a0, 0x0002($v0) ## 00000002 -/* 00104 8094F3C4 E7A00020 */ swc1 $f0, 0x0020($sp) +/* 00104 8094F3C4 E7A00020 */ swc1 $f0, 0x0020($sp) /* 00108 8094F3C8 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 0010C 8094F3CC 3C048096 */ lui $a0, %hi(D_8095C17E) ## $a0 = 80960000 -/* 00110 8094F3D0 000B6080 */ sll $t4, $t3, 2 -/* 00114 8094F3D4 018B6023 */ subu $t4, $t4, $t3 -/* 00118 8094F3D8 000C6040 */ sll $t4, $t4, 1 -/* 0011C 8094F3DC 008C2021 */ addu $a0, $a0, $t4 +/* 00110 8094F3D0 000B6080 */ sll $t4, $t3, 2 +/* 00114 8094F3D4 018B6023 */ subu $t4, $t4, $t3 +/* 00118 8094F3D8 000C6040 */ sll $t4, $t4, 1 +/* 0011C 8094F3DC 008C2021 */ addu $a0, $a0, $t4 /* 00120 8094F3E0 0C01DE1C */ jal Math_Sins ## sins? -/* 00124 8094F3E4 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) +/* 00124 8094F3E4 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) /* 00128 8094F3E8 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 0012C 8094F3EC 863800B4 */ lh $t8, 0x00B4($s1) ## 000000B4 -/* 00130 8094F3F0 C7A40020 */ lwc1 $f4, 0x0020($sp) -/* 00134 8094F3F4 000D7080 */ sll $t6, $t5, 2 -/* 00138 8094F3F8 01CD7023 */ subu $t6, $t6, $t5 +/* 00130 8094F3F0 C7A40020 */ lwc1 $f4, 0x0020($sp) +/* 00134 8094F3F4 000D7080 */ sll $t6, $t5, 2 +/* 00138 8094F3F8 01CD7023 */ subu $t6, $t6, $t5 /* 0013C 8094F3FC 862D00B8 */ lh $t5, 0x00B8($s1) ## 000000B8 /* 00140 8094F400 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 /* 00144 8094F404 3C0F8096 */ lui $t7, %hi(D_8095C17C) ## $t7 = 80960000 /* 00148 8094F408 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 0014C 8094F40C 46803220 */ cvt.s.w $f8, $f6 +/* 0014C 8094F40C 46803220 */ cvt.s.w $f8, $f6 /* 00150 8094F410 25EFC17C */ addiu $t7, $t7, %lo(D_8095C17C) ## $t7 = 8095C17C -/* 00154 8094F414 000E7040 */ sll $t6, $t6, 1 -/* 00158 8094F418 01CF1021 */ addu $v0, $t6, $t7 +/* 00154 8094F414 000E7040 */ sll $t6, $t6, 1 +/* 00158 8094F418 01CF1021 */ addu $v0, $t6, $t7 /* 0015C 8094F41C 844B0000 */ lh $t3, 0x0000($v0) ## 00000000 -/* 00160 8094F420 468091A0 */ cvt.s.w $f6, $f18 -/* 00164 8094F424 46082282 */ mul.s $f10, $f4, $f8 +/* 00160 8094F420 468091A0 */ cvt.s.w $f6, $f18 +/* 00164 8094F424 46082282 */ mul.s $f10, $f4, $f8 /* 00168 8094F428 00000000 */ nop -/* 0016C 8094F42C 46060102 */ mul.s $f4, $f0, $f6 -/* 00170 8094F430 4600540D */ trunc.w.s $f16, $f10 -/* 00174 8094F434 4600220D */ trunc.w.s $f8, $f4 -/* 00178 8094F438 440A8000 */ mfc1 $t2, $f16 -/* 0017C 8094F43C 44194000 */ mfc1 $t9, $f8 -/* 00180 8094F440 016A6021 */ addu $t4, $t3, $t2 -/* 00184 8094F444 01994023 */ subu $t0, $t4, $t9 +/* 0016C 8094F42C 46060102 */ mul.s $f4, $f0, $f6 +/* 00170 8094F430 4600540D */ trunc.w.s $f16, $f10 +/* 00174 8094F434 4600220D */ trunc.w.s $f8, $f4 +/* 00178 8094F438 440A8000 */ mfc1 $t2, $f16 +/* 0017C 8094F43C 44194000 */ mfc1 $t9, $f8 +/* 00180 8094F440 016A6021 */ addu $t4, $t3, $t2 +/* 00184 8094F444 01994023 */ subu $t0, $t4, $t9 /* 00188 8094F448 A60800B4 */ sh $t0, 0x00B4($s0) ## 000000B4 /* 0018C 8094F44C 0C01DE0D */ jal Math_Coss ## coss? /* 00190 8094F450 84440002 */ lh $a0, 0x0002($v0) ## 00000002 -/* 00194 8094F454 E7A00020 */ swc1 $f0, 0x0020($sp) +/* 00194 8094F454 E7A00020 */ swc1 $f0, 0x0020($sp) /* 00198 8094F458 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 0019C 8094F45C 3C048096 */ lui $a0, %hi(D_8095C17E) ## $a0 = 80960000 -/* 001A0 8094F460 00095880 */ sll $t3, $t1, 2 -/* 001A4 8094F464 01695823 */ subu $t3, $t3, $t1 -/* 001A8 8094F468 000B5840 */ sll $t3, $t3, 1 -/* 001AC 8094F46C 008B2021 */ addu $a0, $a0, $t3 +/* 001A0 8094F460 00095880 */ sll $t3, $t1, 2 +/* 001A4 8094F464 01695823 */ subu $t3, $t3, $t1 +/* 001A8 8094F468 000B5840 */ sll $t3, $t3, 1 +/* 001AC 8094F46C 008B2021 */ addu $a0, $a0, $t3 /* 001B0 8094F470 0C01DE1C */ jal Math_Sins ## sins? -/* 001B4 8094F474 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) +/* 001B4 8094F474 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) /* 001B8 8094F478 862A00B4 */ lh $t2, 0x00B4($s1) ## 000000B4 /* 001BC 8094F47C 862B00B8 */ lh $t3, 0x00B8($s1) ## 000000B8 -/* 001C0 8094F480 C7A40020 */ lwc1 $f4, 0x0020($sp) +/* 001C0 8094F480 C7A40020 */ lwc1 $f4, 0x0020($sp) /* 001C4 8094F484 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 /* 001C8 8094F488 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 /* 001CC 8094F48C 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 001D0 8094F490 46805420 */ cvt.s.w $f16, $f10 +/* 001D0 8094F490 46805420 */ cvt.s.w $f16, $f10 /* 001D4 8094F494 3C088096 */ lui $t0, %hi(D_8095C180) ## $t0 = 80960000 -/* 001D8 8094F498 000CC880 */ sll $t9, $t4, 2 -/* 001DC 8094F49C 032CC823 */ subu $t9, $t9, $t4 -/* 001E0 8094F4A0 0019C840 */ sll $t9, $t9, 1 -/* 001E4 8094F4A4 468042A0 */ cvt.s.w $f10, $f8 -/* 001E8 8094F4A8 46100482 */ mul.s $f18, $f0, $f16 -/* 001EC 8094F4AC 01194021 */ addu $t0, $t0, $t9 -/* 001F0 8094F4B0 8508C180 */ lh $t0, %lo(D_8095C180)($t0) -/* 001F4 8094F4B4 460A2402 */ mul.s $f16, $f4, $f10 -/* 001F8 8094F4B8 4600918D */ trunc.w.s $f6, $f18 -/* 001FC 8094F4BC 4600848D */ trunc.w.s $f18, $f16 -/* 00200 8094F4C0 44183000 */ mfc1 $t8, $f6 -/* 00204 8094F4C4 440F9000 */ mfc1 $t7, $f18 -/* 00208 8094F4C8 03084821 */ addu $t1, $t8, $t0 -/* 0020C 8094F4CC 012F6021 */ addu $t4, $t1, $t7 +/* 001D8 8094F498 000CC880 */ sll $t9, $t4, 2 +/* 001DC 8094F49C 032CC823 */ subu $t9, $t9, $t4 +/* 001E0 8094F4A0 0019C840 */ sll $t9, $t9, 1 +/* 001E4 8094F4A4 468042A0 */ cvt.s.w $f10, $f8 +/* 001E8 8094F4A8 46100482 */ mul.s $f18, $f0, $f16 +/* 001EC 8094F4AC 01194021 */ addu $t0, $t0, $t9 +/* 001F0 8094F4B0 8508C180 */ lh $t0, %lo(D_8095C180)($t0) +/* 001F4 8094F4B4 460A2402 */ mul.s $f16, $f4, $f10 +/* 001F8 8094F4B8 4600918D */ trunc.w.s $f6, $f18 +/* 001FC 8094F4BC 4600848D */ trunc.w.s $f18, $f16 +/* 00200 8094F4C0 44183000 */ mfc1 $t8, $f6 +/* 00204 8094F4C4 440F9000 */ mfc1 $t7, $f18 +/* 00208 8094F4C8 03084821 */ addu $t1, $t8, $t0 +/* 0020C 8094F4CC 012F6021 */ addu $t4, $t1, $t7 /* 00210 8094F4D0 A60C00B8 */ sh $t4, 0x00B8($s0) ## 000000B8 .L8094F4D4: /* 00214 8094F4D4 8A1800B4 */ lwl $t8, 0x00B4($s0) ## 000000B4 @@ -146,10 +146,10 @@ glabel L8094F39C /* 0022C 8094F4EC A6180034 */ sh $t8, 0x0034($s0) ## 00000034 /* 00230 8094F4F0 C50600BC */ lwc1 $f6, 0x00BC($t0) ## 809600BC /* 00234 8094F4F4 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 00238 8094F4F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0023C 8094F4FC 8FB10018 */ lw $s1, 0x0018($sp) -/* 00240 8094F500 8FB00014 */ lw $s0, 0x0014($sp) -/* 00244 8094F504 03E00008 */ jr $ra +/* 00238 8094F4F8 8FBF001C */ lw $ra, 0x001C($sp) +/* 0023C 8094F4FC 8FB10018 */ lw $s1, 0x0018($sp) +/* 00240 8094F500 8FB00014 */ lw $s0, 0x0014($sp) +/* 00244 8094F504 03E00008 */ jr $ra /* 00248 8094F508 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s index 9bf1fb8c68..3277c96e9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s @@ -1,11 +1,11 @@ glabel func_80958B0C /* 0984C 80958B0C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 09850 80958B10 3C0E8096 */ lui $t6, %hi(D_8095C270) ## $t6 = 80960000 -/* 09854 80958B14 AFBF0024 */ sw $ra, 0x0024($sp) -/* 09858 80958B18 AFB00020 */ sw $s0, 0x0020($sp) -/* 0985C 80958B1C AFA40080 */ sw $a0, 0x0080($sp) -/* 09860 80958B20 AFA60088 */ sw $a2, 0x0088($sp) -/* 09864 80958B24 AFA7008C */ sw $a3, 0x008C($sp) +/* 09854 80958B14 AFBF0024 */ sw $ra, 0x0024($sp) +/* 09858 80958B18 AFB00020 */ sw $s0, 0x0020($sp) +/* 0985C 80958B1C AFA40080 */ sw $a0, 0x0080($sp) +/* 09860 80958B20 AFA60088 */ sw $a2, 0x0088($sp) +/* 09864 80958B24 AFA7008C */ sw $a3, 0x008C($sp) /* 09868 80958B28 25CEC270 */ addiu $t6, $t6, %lo(D_8095C270) ## $t6 = 8095C270 /* 0986C 80958B2C 8DD80000 */ lw $t8, 0x0000($t6) ## 8095C270 /* 09870 80958B30 27A60070 */ addiu $a2, $sp, 0x0070 ## $a2 = FFFFFFF0 @@ -50,21 +50,21 @@ glabel func_80958B0C /* 0990C 80958BCC 8D4C0008 */ lw $t4, 0x0008($t2) ## 8095C2A8 /* 09910 80958BD0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 09914 80958BD4 AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFFC4 -/* 09918 80958BD8 10A1000C */ beq $a1, $at, .L80958C0C +/* 09918 80958BD8 10A1000C */ beq $a1, $at, .L80958C0C /* 0991C 80958BDC AD2C0008 */ sw $t4, 0x0008($t1) ## FFFFFFC8 /* 09920 80958BE0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 09924 80958BE4 10A10018 */ beq $a1, $at, .L80958C48 -/* 09928 80958BE8 8FB00090 */ lw $s0, 0x0090($sp) +/* 09924 80958BE4 10A10018 */ beq $a1, $at, .L80958C48 +/* 09928 80958BE8 8FB00090 */ lw $s0, 0x0090($sp) /* 0992C 80958BEC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 09930 80958BF0 10A10026 */ beq $a1, $at, .L80958C8C -/* 09934 80958BF4 8FB00090 */ lw $s0, 0x0090($sp) +/* 09930 80958BF0 10A10026 */ beq $a1, $at, .L80958C8C +/* 09934 80958BF4 8FB00090 */ lw $s0, 0x0090($sp) /* 09938 80958BF8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0993C 80958BFC 10A10034 */ beq $a1, $at, .L80958CD0 -/* 09940 80958C00 8FB00090 */ lw $s0, 0x0090($sp) -/* 09944 80958C04 100000D5 */ beq $zero, $zero, .L80958F5C -/* 09948 80958C08 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0993C 80958BFC 10A10034 */ beq $a1, $at, .L80958CD0 +/* 09940 80958C00 8FB00090 */ lw $s0, 0x0090($sp) +/* 09944 80958C04 100000D5 */ beq $zero, $zero, .L80958F5C +/* 09948 80958C08 8FBF0024 */ lw $ra, 0x0024($sp) .L80958C0C: -/* 0994C 80958C0C 8FB00090 */ lw $s0, 0x0090($sp) +/* 0994C 80958C0C 8FB00090 */ lw $s0, 0x0090($sp) /* 09950 80958C10 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09954 80958C14 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 09958 80958C18 860D019C */ lh $t5, 0x019C($s0) ## 0000019C @@ -73,16 +73,16 @@ glabel func_80958B0C /* 09964 80958C24 31AE0007 */ andi $t6, $t5, 0x0007 ## $t6 = 00000000 /* 09968 80958C28 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0996C 80958C2C 00000000 */ nop -/* 09970 80958C30 468021A0 */ cvt.s.w $f6, $f4 -/* 09974 80958C34 46083282 */ mul.s $f10, $f6, $f8 -/* 09978 80958C38 0C0346BD */ jal Matrix_MultVec3f -/* 0997C 80958C3C E7AA0070 */ swc1 $f10, 0x0070($sp) -/* 09980 80958C40 100000C6 */ beq $zero, $zero, .L80958F5C -/* 09984 80958C44 8FBF0024 */ lw $ra, 0x0024($sp) +/* 09970 80958C30 468021A0 */ cvt.s.w $f6, $f4 +/* 09974 80958C34 46083282 */ mul.s $f10, $f6, $f8 +/* 09978 80958C38 0C0346BD */ jal Matrix_MultVec3f +/* 0997C 80958C3C E7AA0070 */ swc1 $f10, 0x0070($sp) +/* 09980 80958C40 100000C6 */ beq $zero, $zero, .L80958F5C +/* 09984 80958C44 8FBF0024 */ lw $ra, 0x0024($sp) .L80958C48: /* 09988 80958C48 3C048096 */ lui $a0, %hi(D_8095C220) ## $a0 = 80960000 /* 0998C 80958C4C 2484C220 */ addiu $a0, $a0, %lo(D_8095C220) ## $a0 = 8095C220 -/* 09990 80958C50 0C0346BD */ jal Matrix_MultVec3f +/* 09990 80958C50 0C0346BD */ jal Matrix_MultVec3f /* 09994 80958C54 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 09998 80958C58 860F019C */ lh $t7, 0x019C($s0) ## 0000019C /* 0999C 80958C5C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -91,16 +91,16 @@ glabel func_80958B0C /* 099A8 80958C68 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 /* 099AC 80958C6C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 099B0 80958C70 26050208 */ addiu $a1, $s0, 0x0208 ## $a1 = 00000208 -/* 099B4 80958C74 468084A0 */ cvt.s.w $f18, $f16 -/* 099B8 80958C78 46049182 */ mul.s $f6, $f18, $f4 -/* 099BC 80958C7C 0C0346BD */ jal Matrix_MultVec3f -/* 099C0 80958C80 E7A60070 */ swc1 $f6, 0x0070($sp) -/* 099C4 80958C84 100000B5 */ beq $zero, $zero, .L80958F5C -/* 099C8 80958C88 8FBF0024 */ lw $ra, 0x0024($sp) +/* 099B4 80958C74 468084A0 */ cvt.s.w $f18, $f16 +/* 099B8 80958C78 46049182 */ mul.s $f6, $f18, $f4 +/* 099BC 80958C7C 0C0346BD */ jal Matrix_MultVec3f +/* 099C0 80958C80 E7A60070 */ swc1 $f6, 0x0070($sp) +/* 099C4 80958C84 100000B5 */ beq $zero, $zero, .L80958F5C +/* 099C8 80958C88 8FBF0024 */ lw $ra, 0x0024($sp) .L80958C8C: /* 099CC 80958C8C 3C048096 */ lui $a0, %hi(D_8095C220) ## $a0 = 80960000 /* 099D0 80958C90 2484C220 */ addiu $a0, $a0, %lo(D_8095C220) ## $a0 = 8095C220 -/* 099D4 80958C94 0C0346BD */ jal Matrix_MultVec3f +/* 099D4 80958C94 0C0346BD */ jal Matrix_MultVec3f /* 099D8 80958C98 260501C0 */ addiu $a1, $s0, 0x01C0 ## $a1 = 000001C0 /* 099DC 80958C9C 8619019C */ lh $t9, 0x019C($s0) ## 0000019C /* 099E0 80958CA0 3C014238 */ lui $at, 0x4238 ## $at = 42380000 @@ -109,16 +109,16 @@ glabel func_80958B0C /* 099EC 80958CAC 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 /* 099F0 80958CB0 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 099F4 80958CB4 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 -/* 099F8 80958CB8 468042A0 */ cvt.s.w $f10, $f8 -/* 099FC 80958CBC 46105482 */ mul.s $f18, $f10, $f16 -/* 09A00 80958CC0 0C0346BD */ jal Matrix_MultVec3f -/* 09A04 80958CC4 E7B20070 */ swc1 $f18, 0x0070($sp) -/* 09A08 80958CC8 100000A4 */ beq $zero, $zero, .L80958F5C -/* 09A0C 80958CCC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 099F8 80958CB8 468042A0 */ cvt.s.w $f10, $f8 +/* 099FC 80958CBC 46105482 */ mul.s $f18, $f10, $f16 +/* 09A00 80958CC0 0C0346BD */ jal Matrix_MultVec3f +/* 09A04 80958CC4 E7B20070 */ swc1 $f18, 0x0070($sp) +/* 09A08 80958CC8 100000A4 */ beq $zero, $zero, .L80958F5C +/* 09A0C 80958CCC 8FBF0024 */ lw $ra, 0x0024($sp) .L80958CD0: /* 09A10 80958CD0 3C048096 */ lui $a0, %hi(D_8095C220) ## $a0 = 80960000 /* 09A14 80958CD4 2484C220 */ addiu $a0, $a0, %lo(D_8095C220) ## $a0 = 8095C220 -/* 09A18 80958CD8 0C0346BD */ jal Matrix_MultVec3f +/* 09A18 80958CD8 0C0346BD */ jal Matrix_MultVec3f /* 09A1C 80958CDC 260501CC */ addiu $a1, $s0, 0x01CC ## $a1 = 000001CC /* 09A20 80958CE0 8609019C */ lh $t1, 0x019C($s0) ## 0000019C /* 09A24 80958CE4 3C014238 */ lui $at, 0x4238 ## $at = 42380000 @@ -127,43 +127,43 @@ glabel func_80958B0C /* 09A30 80958CF0 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 /* 09A34 80958CF4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 09A38 80958CF8 26050220 */ addiu $a1, $s0, 0x0220 ## $a1 = 00000220 -/* 09A3C 80958CFC 468021A0 */ cvt.s.w $f6, $f4 -/* 09A40 80958D00 46083282 */ mul.s $f10, $f6, $f8 -/* 09A44 80958D04 0C0346BD */ jal Matrix_MultVec3f -/* 09A48 80958D08 E7AA0070 */ swc1 $f10, 0x0070($sp) +/* 09A3C 80958CFC 468021A0 */ cvt.s.w $f6, $f4 +/* 09A40 80958D00 46083282 */ mul.s $f10, $f6, $f8 +/* 09A44 80958D04 0C0346BD */ jal Matrix_MultVec3f +/* 09A48 80958D08 E7AA0070 */ swc1 $f10, 0x0070($sp) /* 09A4C 80958D0C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 09A50 80958D10 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 /* 09A54 80958D14 26050268 */ addiu $a1, $s0, 0x0268 ## $a1 = 00000268 -/* 09A58 80958D18 AFA50034 */ sw $a1, 0x0034($sp) +/* 09A58 80958D18 AFA50034 */ sw $a1, 0x0034($sp) /* 09A5C 80958D1C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 -/* 09A60 80958D20 0C0346BD */ jal Matrix_MultVec3f -/* 09A64 80958D24 E7B00070 */ swc1 $f16, 0x0070($sp) -/* 09A68 80958D28 8FA40034 */ lw $a0, 0x0034($sp) +/* 09A60 80958D20 0C0346BD */ jal Matrix_MultVec3f +/* 09A64 80958D24 E7B00070 */ swc1 $f16, 0x0070($sp) +/* 09A68 80958D28 8FA40034 */ lw $a0, 0x0034($sp) /* 09A6C 80958D2C 260501D8 */ addiu $a1, $s0, 0x01D8 ## $a1 = 000001D8 /* 09A70 80958D30 260601F6 */ addiu $a2, $s0, 0x01F6 ## $a2 = 000001F6 -/* 09A74 80958D34 0C00D611 */ jal func_80035844 +/* 09A74 80958D34 0C00D611 */ jal func_80035844 /* 09A78 80958D38 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 09A7C 80958D3C 860B01F6 */ lh $t3, 0x01F6($s0) ## 000001F6 -/* 09A80 80958D40 A7AB003E */ sh $t3, 0x003E($sp) +/* 09A80 80958D40 A7AB003E */ sh $t3, 0x003E($sp) /* 09A84 80958D44 860C01F8 */ lh $t4, 0x01F8($s0) ## 000001F8 -/* 09A88 80958D48 0C034213 */ jal Matrix_Push -/* 09A8C 80958D4C A7AC003C */ sh $t4, 0x003C($sp) +/* 09A88 80958D48 0C034213 */ jal Matrix_Push +/* 09A8C 80958D4C A7AC003C */ sh $t4, 0x003C($sp) /* 09A90 80958D50 C60C0268 */ lwc1 $f12, 0x0268($s0) ## 00000268 /* 09A94 80958D54 C60E026C */ lwc1 $f14, 0x026C($s0) ## 0000026C /* 09A98 80958D58 8E060270 */ lw $a2, 0x0270($s0) ## 00000270 -/* 09A9C 80958D5C 0C034261 */ jal Matrix_Translate +/* 09A9C 80958D5C 0C034261 */ jal Matrix_Translate /* 09AA0 80958D60 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09AA4 80958D64 87A4003E */ lh $a0, 0x003E($sp) -/* 09AA8 80958D68 87A5003C */ lh $a1, 0x003C($sp) +/* 09AA4 80958D64 87A4003E */ lh $a0, 0x003E($sp) +/* 09AA8 80958D68 87A5003C */ lh $a1, 0x003C($sp) /* 09AAC 80958D6C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09AB0 80958D70 0C034421 */ jal Matrix_RotateXYZ +/* 09AB0 80958D70 0C034421 */ jal Matrix_RotateZYX /* 09AB4 80958D74 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 09AB8 80958D78 3C0D8096 */ lui $t5, %hi(D_809668D1) ## $t5 = 80960000 -/* 09ABC 80958D7C 91AD68D1 */ lbu $t5, %lo(D_809668D1)($t5) +/* 09ABC 80958D7C 91AD68D1 */ lbu $t5, %lo(D_809668D1)($t5) /* 09AC0 80958D80 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 09AC4 80958D84 29A1000F */ slti $at, $t5, 0x000F -/* 09AC8 80958D88 1420000C */ bne $at, $zero, .L80958DBC -/* 09ACC 80958D8C E7A20070 */ swc1 $f2, 0x0070($sp) +/* 09AC4 80958D84 29A1000F */ slti $at, $t5, 0x000F +/* 09AC8 80958D88 1420000C */ bne $at, $zero, .L80958DBC +/* 09ACC 80958D8C E7A20070 */ swc1 $f2, 0x0070($sp) /* 09AD0 80958D90 860E019C */ lh $t6, 0x019C($s0) ## 0000019C /* 09AD4 80958D94 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 09AD8 80958D98 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 @@ -171,10 +171,10 @@ glabel func_80958B0C /* 09AE0 80958DA0 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000000 /* 09AE4 80958DA4 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00 /* 09AE8 80958DA8 00000000 */ nop -/* 09AEC 80958DAC 46809120 */ cvt.s.w $f4, $f18 -/* 09AF0 80958DB0 46062202 */ mul.s $f8, $f4, $f6 -/* 09AF4 80958DB4 1000000B */ beq $zero, $zero, .L80958DE4 -/* 09AF8 80958DB8 E7A80078 */ swc1 $f8, 0x0078($sp) +/* 09AEC 80958DAC 46809120 */ cvt.s.w $f4, $f18 +/* 09AF0 80958DB0 46062202 */ mul.s $f8, $f4, $f6 +/* 09AF4 80958DB4 1000000B */ beq $zero, $zero, .L80958DE4 +/* 09AF8 80958DB8 E7A80078 */ swc1 $f8, 0x0078($sp) .L80958DBC: /* 09AFC 80958DBC 8619019C */ lh $t9, 0x019C($s0) ## 0000019C /* 09B00 80958DC0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -183,113 +183,113 @@ glabel func_80958B0C /* 09B0C 80958DCC 3109000F */ andi $t1, $t0, 0x000F ## $t1 = 00000000 /* 09B10 80958DD0 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 /* 09B14 80958DD4 00000000 */ nop -/* 09B18 80958DD8 46805420 */ cvt.s.w $f16, $f10 -/* 09B1C 80958DDC 46128102 */ mul.s $f4, $f16, $f18 -/* 09B20 80958DE0 E7A40078 */ swc1 $f4, 0x0078($sp) +/* 09B18 80958DD8 46805420 */ cvt.s.w $f16, $f10 +/* 09B1C 80958DDC 46128102 */ mul.s $f4, $f16, $f18 +/* 09B20 80958DE0 E7A40078 */ swc1 $f4, 0x0078($sp) .L80958DE4: /* 09B24 80958DE4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 09B28 80958DE8 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09B28 80958DE8 C7A00078 */ lwc1 $f0, 0x0078($sp) /* 09B2C 80958DEC 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 /* 09B30 80958DF0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 09B34 80958DF4 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 09B38 80958DF8 46060000 */ add.s $f0, $f0, $f6 +/* 09B38 80958DF8 46060000 */ add.s $f0, $f0, $f6 /* 09B3C 80958DFC 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 09B40 80958E00 2605022C */ addiu $a1, $s0, 0x022C ## $a1 = 0000022C -/* 09B44 80958E04 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 09B48 80958E08 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 09B4C 80958E0C 46080000 */ add.s $f0, $f0, $f8 -/* 09B50 80958E10 0C0346BD */ jal Matrix_MultVec3f -/* 09B54 80958E14 E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09B44 80958E04 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 09B48 80958E08 E7A00054 */ swc1 $f0, 0x0054($sp) +/* 09B4C 80958E0C 46080000 */ add.s $f0, $f0, $f8 +/* 09B50 80958E10 0C0346BD */ jal Matrix_MultVec3f +/* 09B54 80958E14 E7A00078 */ swc1 $f0, 0x0078($sp) /* 09B58 80958E18 3C0A8096 */ lui $t2, %hi(D_809668D1) ## $t2 = 80960000 -/* 09B5C 80958E1C 914A68D1 */ lbu $t2, %lo(D_809668D1)($t2) +/* 09B5C 80958E1C 914A68D1 */ lbu $t2, %lo(D_809668D1)($t2) /* 09B60 80958E20 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 09B64 80958E24 C7A00078 */ lwc1 $f0, 0x0078($sp) -/* 09B68 80958E28 2941000F */ slti $at, $t2, 0x000F -/* 09B6C 80958E2C 14200018 */ bne $at, $zero, .L80958E90 +/* 09B64 80958E24 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09B68 80958E28 2941000F */ slti $at, $t2, 0x000F +/* 09B6C 80958E2C 14200018 */ bne $at, $zero, .L80958E90 /* 09B70 80958E30 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 09B74 80958E34 3C014204 */ lui $at, 0x4204 ## $at = 42040000 -/* 09B78 80958E38 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09B78 80958E38 C7A00078 */ lwc1 $f0, 0x0078($sp) /* 09B7C 80958E3C 44815000 */ mtc1 $at, $f10 ## $f10 = 33.00 /* 09B80 80958E40 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 -/* 09B84 80958E44 460A0001 */ sub.s $f0, $f0, $f10 -/* 09B88 80958E48 4602003C */ c.lt.s $f0, $f2 -/* 09B8C 80958E4C E7A00078 */ swc1 $f0, 0x0078($sp) -/* 09B90 80958E50 45000002 */ bc1f .L80958E5C +/* 09B84 80958E44 460A0001 */ sub.s $f0, $f0, $f10 +/* 09B88 80958E48 4602003C */ c.lt.s $f0, $f2 +/* 09B8C 80958E4C E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09B90 80958E50 45000002 */ bc1f .L80958E5C /* 09B94 80958E54 00000000 */ nop -/* 09B98 80958E58 E7A20078 */ swc1 $f2, 0x0078($sp) +/* 09B98 80958E58 E7A20078 */ swc1 $f2, 0x0078($sp) .L80958E5C: -/* 09B9C 80958E5C 0C0346BD */ jal Matrix_MultVec3f +/* 09B9C 80958E5C 0C0346BD */ jal Matrix_MultVec3f /* 09BA0 80958E60 26050244 */ addiu $a1, $s0, 0x0244 ## $a1 = 00000244 /* 09BA4 80958E64 3C014204 */ lui $at, 0x4204 ## $at = 42040000 -/* 09BA8 80958E68 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09BA8 80958E68 C7A00078 */ lwc1 $f0, 0x0078($sp) /* 09BAC 80958E6C 44818000 */ mtc1 $at, $f16 ## $f16 = 33.00 /* 09BB0 80958E70 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 09BB4 80958E74 46100001 */ sub.s $f0, $f0, $f16 -/* 09BB8 80958E78 4602003C */ c.lt.s $f0, $f2 -/* 09BBC 80958E7C E7A00078 */ swc1 $f0, 0x0078($sp) -/* 09BC0 80958E80 45020019 */ bc1fl .L80958EE8 +/* 09BB4 80958E74 46100001 */ sub.s $f0, $f0, $f16 +/* 09BB8 80958E78 4602003C */ c.lt.s $f0, $f2 +/* 09BBC 80958E7C E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09BC0 80958E80 45020019 */ bc1fl .L80958EE8 /* 09BC4 80958E84 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 -/* 09BC8 80958E88 10000016 */ beq $zero, $zero, .L80958EE4 -/* 09BCC 80958E8C E7A20078 */ swc1 $f2, 0x0078($sp) +/* 09BC8 80958E88 10000016 */ beq $zero, $zero, .L80958EE4 +/* 09BCC 80958E8C E7A20078 */ swc1 $f2, 0x0078($sp) .L80958E90: /* 09BD0 80958E90 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 /* 09BD4 80958E94 44819000 */ mtc1 $at, $f18 ## $f18 = 22.00 /* 09BD8 80958E98 00000000 */ nop -/* 09BDC 80958E9C 46120001 */ sub.s $f0, $f0, $f18 -/* 09BE0 80958EA0 4602003C */ c.lt.s $f0, $f2 -/* 09BE4 80958EA4 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 09BE8 80958EA8 45000002 */ bc1f .L80958EB4 +/* 09BDC 80958E9C 46120001 */ sub.s $f0, $f0, $f18 +/* 09BE0 80958EA0 4602003C */ c.lt.s $f0, $f2 +/* 09BE4 80958EA4 E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09BE8 80958EA8 45000002 */ bc1f .L80958EB4 /* 09BEC 80958EAC 00000000 */ nop -/* 09BF0 80958EB0 E7A20078 */ swc1 $f2, 0x0078($sp) +/* 09BF0 80958EB0 E7A20078 */ swc1 $f2, 0x0078($sp) .L80958EB4: -/* 09BF4 80958EB4 0C0346BD */ jal Matrix_MultVec3f +/* 09BF4 80958EB4 0C0346BD */ jal Matrix_MultVec3f /* 09BF8 80958EB8 26050244 */ addiu $a1, $s0, 0x0244 ## $a1 = 00000244 /* 09BFC 80958EBC 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 09C00 80958EC0 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09C00 80958EC0 C7A00078 */ lwc1 $f0, 0x0078($sp) /* 09C04 80958EC4 44812000 */ mtc1 $at, $f4 ## $f4 = 22.00 /* 09C08 80958EC8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 09C0C 80958ECC 46040001 */ sub.s $f0, $f0, $f4 -/* 09C10 80958ED0 4602003C */ c.lt.s $f0, $f2 -/* 09C14 80958ED4 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 09C18 80958ED8 45020003 */ bc1fl .L80958EE8 +/* 09C0C 80958ECC 46040001 */ sub.s $f0, $f0, $f4 +/* 09C10 80958ED0 4602003C */ c.lt.s $f0, $f2 +/* 09C14 80958ED4 E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09C18 80958ED8 45020003 */ bc1fl .L80958EE8 /* 09C1C 80958EDC 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 -/* 09C20 80958EE0 E7A20078 */ swc1 $f2, 0x0078($sp) +/* 09C20 80958EE0 E7A20078 */ swc1 $f2, 0x0078($sp) .L80958EE4: /* 09C24 80958EE4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 .L80958EE8: -/* 09C28 80958EE8 0C0346BD */ jal Matrix_MultVec3f +/* 09C28 80958EE8 0C0346BD */ jal Matrix_MultVec3f /* 09C2C 80958EEC 26050238 */ addiu $a1, $s0, 0x0238 ## $a1 = 00000238 /* 09C30 80958EF0 26050384 */ addiu $a1, $s0, 0x0384 ## $a1 = 00000384 -/* 09C34 80958EF4 AFA50030 */ sw $a1, 0x0030($sp) -/* 09C38 80958EF8 0C0346BD */ jal Matrix_MultVec3f +/* 09C34 80958EF4 AFA50030 */ sw $a1, 0x0030($sp) +/* 09C38 80958EF8 0C0346BD */ jal Matrix_MultVec3f /* 09C3C 80958EFC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 09C40 80958F00 26050378 */ addiu $a1, $s0, 0x0378 ## $a1 = 00000378 -/* 09C44 80958F04 AFA50034 */ sw $a1, 0x0034($sp) -/* 09C48 80958F08 0C0346BD */ jal Matrix_MultVec3f +/* 09C44 80958F04 AFA50034 */ sw $a1, 0x0034($sp) +/* 09C48 80958F08 0C0346BD */ jal Matrix_MultVec3f /* 09C4C 80958F0C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 /* 09C50 80958F10 2605039C */ addiu $a1, $s0, 0x039C ## $a1 = 0000039C -/* 09C54 80958F14 AFA50028 */ sw $a1, 0x0028($sp) -/* 09C58 80958F18 0C0346BD */ jal Matrix_MultVec3f +/* 09C54 80958F14 AFA50028 */ sw $a1, 0x0028($sp) +/* 09C58 80958F18 0C0346BD */ jal Matrix_MultVec3f /* 09C5C 80958F1C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 09C60 80958F20 26070390 */ addiu $a3, $s0, 0x0390 ## $a3 = 00000390 /* 09C64 80958F24 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000390 -/* 09C68 80958F28 AFA7002C */ sw $a3, 0x002C($sp) -/* 09C6C 80958F2C 0C0346BD */ jal Matrix_MultVec3f +/* 09C68 80958F28 AFA7002C */ sw $a3, 0x002C($sp) +/* 09C6C 80958F2C 0C0346BD */ jal Matrix_MultVec3f /* 09C70 80958F30 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFC0 -/* 09C74 80958F34 8FAB0028 */ lw $t3, 0x0028($sp) -/* 09C78 80958F38 8FA7002C */ lw $a3, 0x002C($sp) +/* 09C74 80958F34 8FAB0028 */ lw $t3, 0x0028($sp) +/* 09C78 80958F38 8FA7002C */ lw $a3, 0x002C($sp) /* 09C7C 80958F3C 26040338 */ addiu $a0, $s0, 0x0338 ## $a0 = 00000338 -/* 09C80 80958F40 8FA50034 */ lw $a1, 0x0034($sp) -/* 09C84 80958F44 8FA60030 */ lw $a2, 0x0030($sp) -/* 09C88 80958F48 0C0189CD */ jal func_80062734 -/* 09C8C 80958F4C AFAB0010 */ sw $t3, 0x0010($sp) -/* 09C90 80958F50 0C034221 */ jal Matrix_Pull +/* 09C80 80958F40 8FA50034 */ lw $a1, 0x0034($sp) +/* 09C84 80958F44 8FA60030 */ lw $a2, 0x0030($sp) +/* 09C88 80958F48 0C0189CD */ jal func_80062734 +/* 09C8C 80958F4C AFAB0010 */ sw $t3, 0x0010($sp) +/* 09C90 80958F50 0C034221 */ jal Matrix_Pull /* 09C94 80958F54 00000000 */ nop -/* 09C98 80958F58 8FBF0024 */ lw $ra, 0x0024($sp) +/* 09C98 80958F58 8FBF0024 */ lw $ra, 0x0024($sp) .L80958F5C: -/* 09C9C 80958F5C 8FB00020 */ lw $s0, 0x0020($sp) +/* 09C9C 80958F5C 8FB00020 */ lw $s0, 0x0020($sp) /* 09CA0 80958F60 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 09CA4 80958F64 03E00008 */ jr $ra +/* 09CA4 80958F64 03E00008 */ jr $ra /* 09CA8 80958F68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s index 808773a784..b6d1d61a30 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s @@ -1,31 +1,31 @@ glabel func_8095A188 /* 0AEC8 8095A188 27BDFEB8 */ addiu $sp, $sp, 0xFEB8 ## $sp = FFFFFEB8 -/* 0AECC 8095A18C AFBF0044 */ sw $ra, 0x0044($sp) -/* 0AED0 8095A190 AFBE0040 */ sw $s8, 0x0040($sp) -/* 0AED4 8095A194 AFB7003C */ sw $s7, 0x003C($sp) -/* 0AED8 8095A198 AFB60038 */ sw $s6, 0x0038($sp) -/* 0AEDC 8095A19C AFB50034 */ sw $s5, 0x0034($sp) -/* 0AEE0 8095A1A0 AFB40030 */ sw $s4, 0x0030($sp) -/* 0AEE4 8095A1A4 AFB3002C */ sw $s3, 0x002C($sp) -/* 0AEE8 8095A1A8 AFB20028 */ sw $s2, 0x0028($sp) -/* 0AEEC 8095A1AC AFB10024 */ sw $s1, 0x0024($sp) -/* 0AEF0 8095A1B0 AFB00020 */ sw $s0, 0x0020($sp) -/* 0AEF4 8095A1B4 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 0AECC 8095A18C AFBF0044 */ sw $ra, 0x0044($sp) +/* 0AED0 8095A190 AFBE0040 */ sw $s8, 0x0040($sp) +/* 0AED4 8095A194 AFB7003C */ sw $s7, 0x003C($sp) +/* 0AED8 8095A198 AFB60038 */ sw $s6, 0x0038($sp) +/* 0AEDC 8095A19C AFB50034 */ sw $s5, 0x0034($sp) +/* 0AEE0 8095A1A0 AFB40030 */ sw $s4, 0x0030($sp) +/* 0AEE4 8095A1A4 AFB3002C */ sw $s3, 0x002C($sp) +/* 0AEE8 8095A1A8 AFB20028 */ sw $s2, 0x0028($sp) +/* 0AEEC 8095A1AC AFB10024 */ sw $s1, 0x0024($sp) +/* 0AEF0 8095A1B0 AFB00020 */ sw $s0, 0x0020($sp) +/* 0AEF4 8095A1B4 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 0AEF8 8095A1B8 8CB10000 */ lw $s1, 0x0000($a1) ## 00000000 /* 0AEFC 8095A1BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0AF00 8095A1C0 AFA40138 */ sw $a0, 0x0138($sp) +/* 0AF00 8095A1C0 AFA40138 */ sw $a0, 0x0138($sp) /* 0AF04 8095A1C4 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 /* 0AF08 8095A1C8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0AF0C 8095A1CC 3C058096 */ lui $a1, %hi(D_8095C23C) ## $a1 = 80960000 /* 0AF10 8095A1D0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0AF14 8095A1D4 0C030129 */ jal func_800C04A4 -/* 0AF18 8095A1D8 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) +/* 0AF14 8095A1D4 0C030129 */ jal func_800C04A4 +/* 0AF18 8095A1D8 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) /* 0AF1C 8095A1DC 3C068096 */ lui $a2, %hi(D_8095C490) ## $a2 = 80960000 -/* 0AF20 8095A1E0 AFA20134 */ sw $v0, 0x0134($sp) +/* 0AF20 8095A1E0 AFA20134 */ sw $v0, 0x0134($sp) /* 0AF24 8095A1E4 24C6C490 */ addiu $a2, $a2, %lo(D_8095C490) ## $a2 = 8095C490 /* 0AF28 8095A1E8 27A40120 */ addiu $a0, $sp, 0x0120 ## $a0 = FFFFFFD8 /* 0AF2C 8095A1EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0AF30 8095A1F0 0C031AB1 */ jal func_800C6AC4 +/* 0AF30 8095A1F0 0C031AB1 */ jal func_800C6AC4 /* 0AF34 8095A1F4 24071359 */ addiu $a3, $zero, 0x1359 ## $a3 = 00001359 /* 0AF38 8095A1F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0AF3C 8095A1FC 3C178096 */ lui $s7, %hi(D_8095C4A0) ## $s7 = 80960000 @@ -38,18 +38,18 @@ glabel func_8095A188 /* 0AF54 8095A214 920E0024 */ lbu $t6, 0x0024($s0) ## 00000024 /* 0AF58 8095A218 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0AF5C 8095A21C 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 0AF60 8095A220 15C10053 */ bne $t6, $at, .L8095A370 +/* 0AF60 8095A220 15C10053 */ bne $t6, $at, .L8095A370 /* 0AF64 8095A224 25EF5710 */ addiu $t7, $t7, 0x5710 ## $t7 = 06015710 /* 0AF68 8095A228 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0AF6C 8095A22C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0AF70 8095A230 02C19021 */ addu $s2, $s6, $at -/* 0AF74 8095A234 16800015 */ bne $s4, $zero, .L8095A28C -/* 0AF78 8095A238 AFAF0050 */ sw $t7, 0x0050($sp) +/* 0AF70 8095A230 02C19021 */ addu $s2, $s6, $at +/* 0AF74 8095A234 16800015 */ bne $s4, $zero, .L8095A28C +/* 0AF78 8095A238 AFAF0050 */ sw $t7, 0x0050($sp) /* 0AF7C 8095A23C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 /* 0AF80 8095A240 271856A0 */ addiu $t8, $t8, 0x56A0 ## $t8 = 060156A0 /* 0AF84 8095A244 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0AF88 8095A248 0C024F61 */ jal func_80093D84 -/* 0AF8C 8095A24C AFB80058 */ sw $t8, 0x0058($sp) +/* 0AF88 8095A248 0C024F61 */ jal func_80093D84 +/* 0AF8C 8095A24C AFB80058 */ sw $t8, 0x0058($sp) /* 0AF90 8095A250 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0AF94 8095A254 3C088282 */ lui $t0, 0x8282 ## $t0 = 82820000 /* 0AF98 8095A258 35081E00 */ ori $t0, $t0, 0x1E00 ## $t0 = 82821E00 @@ -63,7 +63,7 @@ glabel func_8095A188 /* 0AFB8 8095A278 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 0AFBC 8095A27C AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 /* 0AFC0 8095A280 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0AFC4 8095A284 8FAA0058 */ lw $t2, 0x0058($sp) +/* 0AFC4 8095A284 8FAA0058 */ lw $t2, 0x0058($sp) /* 0AFC8 8095A288 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 .L8095A28C: /* 0AFCC 8095A28C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -80,30 +80,30 @@ glabel func_8095A188 /* 0AFF8 8095A2B8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0AFFC 8095A2BC 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 /* 0B000 8095A2C0 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 0B004 8095A2C4 0C034261 */ jal Matrix_Translate +/* 0B004 8095A2C4 0C034261 */ jal Matrix_Translate /* 0B008 8095A2C8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 0B00C 8095A2CC 0C0347F5 */ jal func_800D1FD4 +/* 0B00C 8095A2CC 0C0347F5 */ jal func_800D1FD4 /* 0B010 8095A2D0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0B014 8095A2D4 8618002E */ lh $t8, 0x002E($s0) ## 0000002E /* 0B018 8095A2D8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0B01C 8095A2DC 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 /* 0B020 8095A2E0 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 0B024 8095A2E4 3C018096 */ lui $at, %hi(D_8095C8C0) ## $at = 80960000 -/* 0B028 8095A2E8 C430C8C0 */ lwc1 $f16, %lo(D_8095C8C0)($at) -/* 0B02C 8095A2EC 468021A0 */ cvt.s.w $f6, $f4 +/* 0B028 8095A2E8 C430C8C0 */ lwc1 $f16, %lo(D_8095C8C0)($at) +/* 0B02C 8095A2EC 468021A0 */ cvt.s.w $f6, $f4 /* 0B030 8095A2F0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B034 8095A2F4 46083283 */ div.s $f10, $f6, $f8 -/* 0B038 8095A2F8 46105302 */ mul.s $f12, $f10, $f16 -/* 0B03C 8095A2FC 0C0343B5 */ jal Matrix_RotateZ +/* 0B034 8095A2F4 46083283 */ div.s $f10, $f6, $f8 +/* 0B038 8095A2F8 46105302 */ mul.s $f12, $f10, $f16 +/* 0B03C 8095A2FC 0C0343B5 */ jal Matrix_RotateZ /* 0B040 8095A300 00000000 */ nop /* 0B044 8095A304 3C018096 */ lui $at, %hi(D_8095C8C4) ## $at = 80960000 -/* 0B048 8095A308 C424C8C4 */ lwc1 $f4, %lo(D_8095C8C4)($at) +/* 0B048 8095A308 C424C8C4 */ lwc1 $f4, %lo(D_8095C8C4)($at) /* 0B04C 8095A30C C6120040 */ lwc1 $f18, 0x0040($s0) ## 00000040 -/* 0B050 8095A310 4406A000 */ mfc1 $a2, $f20 +/* 0B050 8095A310 4406A000 */ mfc1 $a2, $f20 /* 0B054 8095A314 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B058 8095A318 46049302 */ mul.s $f12, $f18, $f4 -/* 0B05C 8095A31C 0C0342A3 */ jal Matrix_Scale -/* 0B060 8095A320 46006386 */ mov.s $f14, $f12 +/* 0B058 8095A318 46049302 */ mul.s $f12, $f18, $f4 +/* 0B05C 8095A31C 0C0342A3 */ jal Matrix_Scale +/* 0B060 8095A320 46006386 */ mov.s $f14, $f12 /* 0B064 8095A324 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B068 8095A328 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 /* 0B06C 8095A32C 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 @@ -113,75 +113,75 @@ glabel func_8095A188 /* 0B07C 8095A33C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B080 8095A340 02E02825 */ or $a1, $s7, $zero ## $a1 = 8095C4A0 /* 0B084 8095A344 24061370 */ addiu $a2, $zero, 0x1370 ## $a2 = 00001370 -/* 0B088 8095A348 0C0346A2 */ jal Matrix_NewMtx -/* 0B08C 8095A34C AFA20110 */ sw $v0, 0x0110($sp) -/* 0B090 8095A350 8FA30110 */ lw $v1, 0x0110($sp) +/* 0B088 8095A348 0C0346A2 */ jal Matrix_NewMtx +/* 0B08C 8095A34C AFA20110 */ sw $v0, 0x0110($sp) +/* 0B090 8095A350 8FA30110 */ lw $v1, 0x0110($sp) /* 0B094 8095A354 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B098 8095A358 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B09C 8095A35C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 0B0A0 8095A360 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 /* 0B0A4 8095A364 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B0A8 8095A368 8FAA0050 */ lw $t2, 0x0050($sp) +/* 0B0A8 8095A368 8FAA0050 */ lw $t2, 0x0050($sp) /* 0B0AC 8095A36C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 .L8095A370: /* 0B0B0 8095A370 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B0B4 8095A374 00139C00 */ sll $s3, $s3, 16 -/* 0B0B8 8095A378 00139C03 */ sra $s3, $s3, 16 -/* 0B0BC 8095A37C 2A610190 */ slti $at, $s3, 0x0190 -/* 0B0C0 8095A380 1420FFA4 */ bne $at, $zero, .L8095A214 +/* 0B0B4 8095A374 00139C00 */ sll $s3, $s3, 16 +/* 0B0B8 8095A378 00139C03 */ sra $s3, $s3, 16 +/* 0B0BC 8095A37C 2A610190 */ slti $at, $s3, 0x0190 +/* 0B0C0 8095A380 1420FFA4 */ bne $at, $zero, .L8095A214 /* 0B0C4 8095A384 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000058 /* 0B0C8 8095A388 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B0CC 8095A38C 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B0CC 8095A38C 8FB00138 */ lw $s0, 0x0138($sp) /* 0B0D0 8095A390 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 /* 0B0D4 8095A394 3C17E700 */ lui $s7, 0xE700 ## $s7 = E7000000 .L8095A398: /* 0B0D8 8095A398 920B0024 */ lbu $t3, 0x0024($s0) ## 0000007C /* 0B0DC 8095A39C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 0B0E0 8095A3A0 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 0B0E4 8095A3A4 15610086 */ bne $t3, $at, .L8095A5C0 +/* 0B0E4 8095A3A4 15610086 */ bne $t3, $at, .L8095A5C0 /* 0B0E8 8095A3A8 258C1768 */ addiu $t4, $t4, 0x1768 ## $t4 = 06011768 /* 0B0EC 8095A3AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0B0F0 8095A3B0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0B0F4 8095A3B4 02C19021 */ addu $s2, $s6, $at -/* 0B0F8 8095A3B8 1680000E */ bne $s4, $zero, .L8095A3F4 -/* 0B0FC 8095A3BC AFAC0050 */ sw $t4, 0x0050($sp) +/* 0B0F4 8095A3B4 02C19021 */ addu $s2, $s6, $at +/* 0B0F8 8095A3B8 1680000E */ bne $s4, $zero, .L8095A3F4 +/* 0B0FC 8095A3BC AFAC0050 */ sw $t4, 0x0050($sp) /* 0B100 8095A3C0 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 /* 0B104 8095A3C4 25AD1738 */ addiu $t5, $t5, 0x1738 ## $t5 = 06011738 /* 0B108 8095A3C8 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0B10C 8095A3CC 0C024F61 */ jal func_80093D84 -/* 0B110 8095A3D0 AFAD0058 */ sw $t5, 0x0058($sp) +/* 0B10C 8095A3CC 0C024F61 */ jal func_80093D84 +/* 0B110 8095A3D0 AFAD0058 */ sw $t5, 0x0058($sp) /* 0B114 8095A3D4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B118 8095A3D8 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B11C 8095A3DC 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 /* 0B120 8095A3E0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0B124 8095A3E4 AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 /* 0B128 8095A3E8 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B12C 8095A3EC 8FAF0058 */ lw $t7, 0x0058($sp) +/* 0B12C 8095A3EC 8FAF0058 */ lw $t7, 0x0058($sp) /* 0B130 8095A3F0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 .L8095A3F4: /* 0B134 8095A3F4 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000058 /* 0B138 8095A3F8 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 0000005C /* 0B13C 8095A3FC 8E060008 */ lw $a2, 0x0008($s0) ## 00000060 -/* 0B140 8095A400 0C034261 */ jal Matrix_Translate +/* 0B140 8095A400 0C034261 */ jal Matrix_Translate /* 0B144 8095A404 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0B148 8095A408 0C0347F5 */ jal func_800D1FD4 +/* 0B148 8095A408 0C0347F5 */ jal func_800D1FD4 /* 0B14C 8095A40C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0B150 8095A410 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 00000098 /* 0B154 8095A414 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B158 8095A418 44066000 */ mfc1 $a2, $f12 -/* 0B15C 8095A41C 0C0342A3 */ jal Matrix_Scale -/* 0B160 8095A420 46006386 */ mov.s $f14, $f12 +/* 0B158 8095A418 44066000 */ mfc1 $a2, $f12 +/* 0B15C 8095A41C 0C0342A3 */ jal Matrix_Scale +/* 0B160 8095A420 46006386 */ mov.s $f14, $f12 /* 0B164 8095A424 8618002E */ lh $t8, 0x002E($s0) ## 00000086 /* 0B168 8095A428 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0B16C 8095A42C 44815000 */ mtc1 $at, $f10 ## $f10 = 32768.00 /* 0B170 8095A430 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 /* 0B174 8095A434 3C018096 */ lui $at, %hi(D_8095C8C8) ## $at = 80960000 -/* 0B178 8095A438 C432C8C8 */ lwc1 $f18, %lo(D_8095C8C8)($at) -/* 0B17C 8095A43C 46803220 */ cvt.s.w $f8, $f6 +/* 0B178 8095A438 C432C8C8 */ lwc1 $f18, %lo(D_8095C8C8)($at) +/* 0B17C 8095A43C 46803220 */ cvt.s.w $f8, $f6 /* 0B180 8095A440 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B184 8095A444 460A4403 */ div.s $f16, $f8, $f10 -/* 0B188 8095A448 46128302 */ mul.s $f12, $f16, $f18 -/* 0B18C 8095A44C 0C0343B5 */ jal Matrix_RotateZ +/* 0B184 8095A444 460A4403 */ div.s $f16, $f8, $f10 +/* 0B188 8095A448 46128302 */ mul.s $f12, $f16, $f18 +/* 0B18C 8095A44C 0C0343B5 */ jal Matrix_RotateZ /* 0B190 8095A450 00000000 */ nop /* 0B194 8095A454 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B198 8095A458 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 @@ -193,9 +193,9 @@ glabel func_8095A188 /* 0B1B0 8095A470 24A5C4B0 */ addiu $a1, $a1, %lo(D_8095C4B0) ## $a1 = 8095C4B0 /* 0B1B4 8095A474 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B1B8 8095A478 2406138A */ addiu $a2, $zero, 0x138A ## $a2 = 0000138A -/* 0B1BC 8095A47C 0C0346A2 */ jal Matrix_NewMtx -/* 0B1C0 8095A480 AFA20104 */ sw $v0, 0x0104($sp) -/* 0B1C4 8095A484 8FA30104 */ lw $v1, 0x0104($sp) +/* 0B1BC 8095A47C 0C0346A2 */ jal Matrix_NewMtx +/* 0B1C0 8095A480 AFA20104 */ sw $v0, 0x0104($sp) +/* 0B1C4 8095A484 8FA30104 */ lw $v1, 0x0104($sp) /* 0B1C8 8095A488 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 0B1CC 8095A48C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 0B1D0 8095A490 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -213,19 +213,19 @@ glabel func_8095A188 /* 0B200 8095A4C0 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 /* 0B204 8095A4C4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 0B208 8095A4C8 860C0028 */ lh $t4, 0x0028($s0) ## 00000080 -/* 0B20C 8095A4CC 000C6880 */ sll $t5, $t4, 2 -/* 0B210 8095A4D0 008D2021 */ addu $a0, $a0, $t5 -/* 0B214 8095A4D4 8C84C300 */ lw $a0, %lo(D_8095C300)($a0) +/* 0B20C 8095A4CC 000C6880 */ sll $t5, $t4, 2 +/* 0B210 8095A4D0 008D2021 */ addu $a0, $a0, $t5 +/* 0B214 8095A4D4 8C84C300 */ lw $a0, %lo(D_8095C300)($a0) /* 0B218 8095A4D8 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 0B21C 8095A4DC 00047900 */ sll $t7, $a0, 4 -/* 0B220 8095A4E0 000FC702 */ srl $t8, $t7, 28 -/* 0B224 8095A4E4 0018C880 */ sll $t9, $t8, 2 -/* 0B228 8095A4E8 01194021 */ addu $t0, $t0, $t9 +/* 0B21C 8095A4DC 00047900 */ sll $t7, $a0, 4 +/* 0B220 8095A4E0 000FC702 */ srl $t8, $t7, 28 +/* 0B224 8095A4E4 0018C880 */ sll $t9, $t8, 2 +/* 0B228 8095A4E8 01194021 */ addu $t0, $t0, $t9 /* 0B22C 8095A4EC 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 0B230 8095A4F0 00817024 */ and $t6, $a0, $at +/* 0B230 8095A4F0 00817024 */ and $t6, $a0, $at /* 0B234 8095A4F4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0B238 8095A4F8 01C84821 */ addu $t1, $t6, $t0 -/* 0B23C 8095A4FC 01215021 */ addu $t2, $t1, $at +/* 0B238 8095A4F8 01C84821 */ addu $t1, $t6, $t0 +/* 0B23C 8095A4FC 01215021 */ addu $t2, $t1, $at /* 0B240 8095A500 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 0B244 8095A504 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B248 8095A508 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 @@ -237,11 +237,11 @@ glabel func_8095A188 /* 0B260 8095A520 31AF00FF */ andi $t7, $t5, 0x00FF ## $t7 = 00000000 /* 0B264 8095A524 860D0034 */ lh $t5, 0x0034($s0) ## 0000008C /* 0B268 8095A528 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000008 -/* 0B26C 8095A52C 00197600 */ sll $t6, $t9, 24 +/* 0B26C 8095A52C 00197600 */ sll $t6, $t9, 24 /* 0B270 8095A530 01EE4025 */ or $t0, $t7, $t6 ## $t0 = 00000000 -/* 0B274 8095A534 000A5C00 */ sll $t3, $t2, 16 +/* 0B274 8095A534 000A5C00 */ sll $t3, $t2, 16 /* 0B278 8095A538 31B800FF */ andi $t8, $t5, 0x00FF ## $t8 = 00000000 -/* 0B27C 8095A53C 0018CA00 */ sll $t9, $t8, 8 +/* 0B27C 8095A53C 0018CA00 */ sll $t9, $t8, 8 /* 0B280 8095A540 010B6025 */ or $t4, $t0, $t3 ## $t4 = 00000008 /* 0B284 8095A544 01997825 */ or $t7, $t4, $t9 ## $t7 = 00000008 /* 0B288 8095A548 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 @@ -260,11 +260,11 @@ glabel func_8095A188 /* 0B2BC 8095A57C 314800FF */ andi $t0, $t2, 0x00FF ## $t0 = 00000008 /* 0B2C0 8095A580 860A003C */ lh $t2, 0x003C($s0) ## 00000094 /* 0B2C4 8095A584 332F00FF */ andi $t7, $t9, 0x00FF ## $t7 = 00000000 -/* 0B2C8 8095A588 000DC600 */ sll $t8, $t5, 24 +/* 0B2C8 8095A588 000DC600 */ sll $t8, $t5, 24 /* 0B2CC 8095A58C 01186025 */ or $t4, $t0, $t8 ## $t4 = 00000008 -/* 0B2D0 8095A590 000F7400 */ sll $t6, $t7, 16 +/* 0B2D0 8095A590 000F7400 */ sll $t6, $t7, 16 /* 0B2D4 8095A594 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000008 -/* 0B2D8 8095A598 000B6A00 */ sll $t5, $t3, 8 +/* 0B2D8 8095A598 000B6A00 */ sll $t5, $t3, 8 /* 0B2DC 8095A59C 018E4825 */ or $t1, $t4, $t6 ## $t1 = 00000008 /* 0B2E0 8095A5A0 012D4025 */ or $t0, $t1, $t5 ## $t0 = 00000008 /* 0B2E4 8095A5A4 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 @@ -272,51 +272,51 @@ glabel func_8095A188 /* 0B2EC 8095A5AC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0B2F0 8095A5B0 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 /* 0B2F4 8095A5B4 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B2F8 8095A5B8 8FB90050 */ lw $t9, 0x0050($sp) +/* 0B2F8 8095A5B8 8FB90050 */ lw $t9, 0x0050($sp) /* 0B2FC 8095A5BC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 .L8095A5C0: /* 0B300 8095A5C0 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B304 8095A5C4 00139C00 */ sll $s3, $s3, 16 -/* 0B308 8095A5C8 00139C03 */ sra $s3, $s3, 16 -/* 0B30C 8095A5CC 2A610190 */ slti $at, $s3, 0x0190 -/* 0B310 8095A5D0 1420FF71 */ bne $at, $zero, .L8095A398 +/* 0B304 8095A5C4 00139C00 */ sll $s3, $s3, 16 +/* 0B308 8095A5C8 00139C03 */ sra $s3, $s3, 16 +/* 0B30C 8095A5CC 2A610190 */ slti $at, $s3, 0x0190 +/* 0B310 8095A5D0 1420FF71 */ bne $at, $zero, .L8095A398 /* 0B314 8095A5D4 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 000000B0 /* 0B318 8095A5D8 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B31C 8095A5DC 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B31C 8095A5DC 8FB00138 */ lw $s0, 0x0138($sp) /* 0B320 8095A5E0 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095A5E4: /* 0B324 8095A5E4 920F0024 */ lbu $t7, 0x0024($s0) ## 000000D4 /* 0B328 8095A5E8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 0B32C 8095A5EC 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0B330 8095A5F0 55E10072 */ bnel $t7, $at, .L8095A7BC +/* 0B330 8095A5F0 55E10072 */ bnel $t7, $at, .L8095A7BC /* 0B334 8095A5F4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B338 8095A5F8 16800028 */ bne $s4, $zero, .L8095A69C +/* 0B338 8095A5F8 16800028 */ bne $s4, $zero, .L8095A69C /* 0B33C 8095A5FC 26529468 */ addiu $s2, $s2, 0x9468 ## $s2 = 06009468 /* 0B340 8095A600 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 /* 0B344 8095A604 24425DB0 */ addiu $v0, $v0, 0x5DB0 ## $v0 = 04055DB0 -/* 0B348 8095A608 00027100 */ sll $t6, $v0, 4 -/* 0B34C 8095A60C 000E5702 */ srl $t2, $t6, 28 +/* 0B348 8095A608 00027100 */ sll $t6, $v0, 4 +/* 0B34C 8095A60C 000E5702 */ srl $t2, $t6, 28 /* 0B350 8095A610 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 0B354 8095A614 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0B358 8095A618 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0B35C 8095A61C 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 0B360 8095A620 000A5880 */ sll $t3, $t2, 2 +/* 0B360 8095A620 000A5880 */ sll $t3, $t2, 2 /* 0B364 8095A624 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0B368 8095A628 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 0B36C 8095A62C 258C9430 */ addiu $t4, $t4, 0x9430 ## $t4 = 06009430 -/* 0B370 8095A630 01696821 */ addu $t5, $t3, $t1 -/* 0B374 8095A634 00414024 */ and $t0, $v0, $at -/* 0B378 8095A638 AFA8004C */ sw $t0, 0x004C($sp) -/* 0B37C 8095A63C AFAD0050 */ sw $t5, 0x0050($sp) -/* 0B380 8095A640 0C024F61 */ jal func_80093D84 -/* 0B384 8095A644 AFAC0058 */ sw $t4, 0x0058($sp) +/* 0B370 8095A630 01696821 */ addu $t5, $t3, $t1 +/* 0B374 8095A634 00414024 */ and $t0, $v0, $at +/* 0B378 8095A638 AFA8004C */ sw $t0, 0x004C($sp) +/* 0B37C 8095A63C AFAD0050 */ sw $t5, 0x0050($sp) +/* 0B380 8095A640 0C024F61 */ jal func_80093D84 +/* 0B384 8095A644 AFAC0058 */ sw $t4, 0x0058($sp) /* 0B388 8095A648 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B38C 8095A64C 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 0B390 8095A650 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 0B394 8095A654 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0B398 8095A658 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 /* 0B39C 8095A65C AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B3A0 8095A660 8FB90058 */ lw $t9, 0x0058($sp) +/* 0B3A0 8095A660 8FB90058 */ lw $t9, 0x0058($sp) /* 0B3A4 8095A664 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0B3A8 8095A668 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B3AC 8095A66C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 @@ -325,11 +325,11 @@ glabel func_8095A188 /* 0B3B8 8095A678 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0B3BC 8095A67C AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 /* 0B3C0 8095A680 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0B3C4 8095A684 8FAE0050 */ lw $t6, 0x0050($sp) -/* 0B3C8 8095A688 8FAB004C */ lw $t3, 0x004C($sp) +/* 0B3C4 8095A684 8FAE0050 */ lw $t6, 0x0050($sp) +/* 0B3C8 8095A688 8FAB004C */ lw $t3, 0x004C($sp) /* 0B3CC 8095A68C 8DCA0000 */ lw $t2, 0x0000($t6) ## 00000000 -/* 0B3D0 8095A690 014B4821 */ addu $t1, $t2, $t3 -/* 0B3D4 8095A694 01216821 */ addu $t5, $t1, $at +/* 0B3D0 8095A690 014B4821 */ addu $t1, $t2, $t3 +/* 0B3D4 8095A694 01216821 */ addu $t5, $t1, $at /* 0B3D8 8095A698 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095A69C: /* 0B3DC 8095A69C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -359,28 +359,28 @@ glabel func_8095A188 /* 0B43C 8095A6FC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 0B440 8095A700 8E060008 */ lw $a2, 0x0008($s0) ## 000000B8 /* 0B444 8095A704 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 000000B4 -/* 0B448 8095A708 0C034261 */ jal Matrix_Translate +/* 0B448 8095A708 0C034261 */ jal Matrix_Translate /* 0B44C 8095A70C C60C0000 */ lwc1 $f12, 0x0000($s0) ## 000000B0 /* 0B450 8095A710 86080028 */ lh $t0, 0x0028($s0) ## 000000D8 /* 0B454 8095A714 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0B458 8095A718 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B45C 8095A71C 15010005 */ bne $t0, $at, .L8095A734 +/* 0B45C 8095A71C 15010005 */ bne $t0, $at, .L8095A734 /* 0B460 8095A720 3C018096 */ lui $at, %hi(D_8095C8CC) ## $at = 80960000 -/* 0B464 8095A724 0C0342DC */ jal Matrix_RotateX -/* 0B468 8095A728 C42CC8CC */ lwc1 $f12, %lo(D_8095C8CC)($at) -/* 0B46C 8095A72C 10000006 */ beq $zero, $zero, .L8095A748 +/* 0B464 8095A724 0C0342DC */ jal Matrix_RotateX +/* 0B468 8095A728 C42CC8CC */ lwc1 $f12, %lo(D_8095C8CC)($at) +/* 0B46C 8095A72C 10000006 */ beq $zero, $zero, .L8095A748 /* 0B470 8095A730 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000000F0 .L8095A734: /* 0B474 8095A734 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0B478 8095A738 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0B47C 8095A73C 0C0347F5 */ jal func_800D1FD4 -/* 0B480 8095A740 02C12021 */ addu $a0, $s6, $at +/* 0B47C 8095A73C 0C0347F5 */ jal func_800D1FD4 +/* 0B480 8095A740 02C12021 */ addu $a0, $s6, $at /* 0B484 8095A744 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000000F0 .L8095A748: -/* 0B488 8095A748 4406A000 */ mfc1 $a2, $f20 +/* 0B488 8095A748 4406A000 */ mfc1 $a2, $f20 /* 0B48C 8095A74C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B490 8095A750 0C0342A3 */ jal Matrix_Scale -/* 0B494 8095A754 46006386 */ mov.s $f14, $f12 +/* 0B490 8095A750 0C0342A3 */ jal Matrix_Scale +/* 0B494 8095A754 46006386 */ mov.s $f14, $f12 /* 0B498 8095A758 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B49C 8095A75C 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 0B4A0 8095A760 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 @@ -396,9 +396,9 @@ glabel func_8095A188 /* 0B4C8 8095A788 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0B4CC 8095A78C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B4D0 8095A790 240613BC */ addiu $a2, $zero, 0x13BC ## $a2 = 000013BC -/* 0B4D4 8095A794 0C0346A2 */ jal Matrix_NewMtx -/* 0B4D8 8095A798 AFA200D0 */ sw $v0, 0x00D0($sp) -/* 0B4DC 8095A79C 8FA300D0 */ lw $v1, 0x00D0($sp) +/* 0B4D4 8095A794 0C0346A2 */ jal Matrix_NewMtx +/* 0B4D8 8095A798 AFA200D0 */ sw $v0, 0x00D0($sp) +/* 0B4DC 8095A79C 8FA300D0 */ lw $v1, 0x00D0($sp) /* 0B4E0 8095A7A0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B4E4 8095A7A4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B4E8 8095A7A8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 @@ -407,26 +407,26 @@ glabel func_8095A188 /* 0B4F4 8095A7B4 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 0B4F8 8095A7B8 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095A7BC: -/* 0B4FC 8095A7BC 00139C00 */ sll $s3, $s3, 16 -/* 0B500 8095A7C0 00139C03 */ sra $s3, $s3, 16 -/* 0B504 8095A7C4 2A610190 */ slti $at, $s3, 0x0190 -/* 0B508 8095A7C8 1420FF86 */ bne $at, $zero, .L8095A5E4 +/* 0B4FC 8095A7BC 00139C00 */ sll $s3, $s3, 16 +/* 0B500 8095A7C0 00139C03 */ sra $s3, $s3, 16 +/* 0B504 8095A7C4 2A610190 */ slti $at, $s3, 0x0190 +/* 0B508 8095A7C8 1420FF86 */ bne $at, $zero, .L8095A5E4 /* 0B50C 8095A7CC 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000108 /* 0B510 8095A7D0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B514 8095A7D4 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B514 8095A7D4 8FB00138 */ lw $s0, 0x0138($sp) /* 0B518 8095A7D8 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095A7DC: /* 0B51C 8095A7DC 920E0024 */ lbu $t6, 0x0024($s0) ## 0000012C /* 0B520 8095A7E0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0B524 8095A7E4 55C1004A */ bnel $t6, $at, .L8095A910 +/* 0B524 8095A7E4 55C1004A */ bnel $t6, $at, .L8095A910 /* 0B528 8095A7E8 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B52C 8095A7EC 16800015 */ bne $s4, $zero, .L8095A844 +/* 0B52C 8095A7EC 16800015 */ bne $s4, $zero, .L8095A844 /* 0B530 8095A7F0 8E120054 */ lw $s2, 0x0054($s0) ## 0000015C /* 0B534 8095A7F4 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 /* 0B538 8095A7F8 254A28B8 */ addiu $t2, $t2, 0x28B8 ## $t2 = 060128B8 /* 0B53C 8095A7FC 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0B540 8095A800 0C024F46 */ jal func_80093D18 -/* 0B544 8095A804 AFAA0058 */ sw $t2, 0x0058($sp) +/* 0B540 8095A800 0C024F46 */ jal func_80093D18 +/* 0B544 8095A804 AFAA0058 */ sw $t2, 0x0058($sp) /* 0B548 8095A808 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B54C 8095A80C 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B550 8095A810 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 @@ -440,43 +440,43 @@ glabel func_8095A188 /* 0B570 8095A830 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 0B574 8095A834 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 /* 0B578 8095A838 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B57C 8095A83C 8FB80058 */ lw $t8, 0x0058($sp) +/* 0B57C 8095A83C 8FB80058 */ lw $t8, 0x0058($sp) /* 0B580 8095A840 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L8095A844: /* 0B584 8095A844 86190028 */ lh $t9, 0x0028($s0) ## 00000130 -/* 0B588 8095A848 8FA40134 */ lw $a0, 0x0134($sp) +/* 0B588 8095A848 8FA40134 */ lw $a0, 0x0134($sp) /* 0B58C 8095A84C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B590 8095A850 1721000F */ bne $t9, $at, .L8095A890 +/* 0B590 8095A850 1721000F */ bne $t9, $at, .L8095A890 /* 0B594 8095A854 2484005C */ addiu $a0, $a0, 0x005C ## $a0 = 0000005C /* 0B598 8095A858 02002825 */ or $a1, $s0, $zero ## $a1 = 00000108 /* 0B59C 8095A85C 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 0B5A0 8095A860 AFA40058 */ sw $a0, 0x0058($sp) -/* 0B5A4 8095A864 8FA40058 */ lw $a0, 0x0058($sp) -/* 0B5A8 8095A868 E7A0005C */ swc1 $f0, 0x005C($sp) + +/* 0B5A0 8095A860 AFA40058 */ sw $a0, 0x0058($sp) +/* 0B5A4 8095A864 8FA40058 */ lw $a0, 0x0058($sp) +/* 0B5A8 8095A868 E7A0005C */ swc1 $f0, 0x005C($sp) /* 0B5AC 8095A86C 0C01E00A */ jal Math_Vec3f_DistXZ - + /* 0B5B0 8095A870 26450024 */ addiu $a1, $s2, 0x0024 ## $a1 = 0600948C -/* 0B5B4 8095A874 C7A4005C */ lwc1 $f4, 0x005C($sp) +/* 0B5B4 8095A874 C7A4005C */ lwc1 $f4, 0x005C($sp) /* 0B5B8 8095A878 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0B5BC 8095A87C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 0B5C0 8095A880 46002181 */ sub.s $f6, $f4, $f0 -/* 0B5C4 8095A884 4608303C */ c.lt.s $f6, $f8 +/* 0B5C0 8095A880 46002181 */ sub.s $f6, $f4, $f0 +/* 0B5C4 8095A884 4608303C */ c.lt.s $f6, $f8 /* 0B5C8 8095A888 00000000 */ nop -/* 0B5CC 8095A88C 4500001F */ bc1f .L8095A90C +/* 0B5CC 8095A88C 4500001F */ bc1f .L8095A90C .L8095A890: /* 0B5D0 8095A890 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 /* 0B5D4 8095A894 26522948 */ addiu $s2, $s2, 0x2948 ## $s2 = 06012948 /* 0B5D8 8095A898 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000108 /* 0B5DC 8095A89C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 0000010C /* 0B5E0 8095A8A0 8E060008 */ lw $a2, 0x0008($s0) ## 00000110 -/* 0B5E4 8095A8A4 0C034261 */ jal Matrix_Translate +/* 0B5E4 8095A8A4 0C034261 */ jal Matrix_Translate /* 0B5E8 8095A8A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0B5EC 8095A8AC C60C0040 */ lwc1 $f12, 0x0040($s0) ## 00000148 /* 0B5F0 8095A8B0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B5F4 8095A8B4 44066000 */ mfc1 $a2, $f12 -/* 0B5F8 8095A8B8 0C0342A3 */ jal Matrix_Scale -/* 0B5FC 8095A8BC 46006386 */ mov.s $f14, $f12 +/* 0B5F4 8095A8B4 44066000 */ mfc1 $a2, $f12 +/* 0B5F8 8095A8B8 0C0342A3 */ jal Matrix_Scale +/* 0B5FC 8095A8BC 46006386 */ mov.s $f14, $f12 /* 0B600 8095A8C0 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B604 8095A8C4 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 /* 0B608 8095A8C8 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 @@ -487,9 +487,9 @@ glabel func_8095A188 /* 0B61C 8095A8DC 24A5C4D0 */ addiu $a1, $a1, %lo(D_8095C4D0) ## $a1 = 8095C4D0 /* 0B620 8095A8E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B624 8095A8E4 240613D8 */ addiu $a2, $zero, 0x13D8 ## $a2 = 000013D8 -/* 0B628 8095A8E8 0C0346A2 */ jal Matrix_NewMtx -/* 0B62C 8095A8EC AFA200BC */ sw $v0, 0x00BC($sp) -/* 0B630 8095A8F0 8FA300BC */ lw $v1, 0x00BC($sp) +/* 0B628 8095A8E8 0C0346A2 */ jal Matrix_NewMtx +/* 0B62C 8095A8EC AFA200BC */ sw $v0, 0x00BC($sp) +/* 0B630 8095A8F0 8FA300BC */ lw $v1, 0x00BC($sp) /* 0B634 8095A8F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B638 8095A8F8 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B63C 8095A8FC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 @@ -499,34 +499,34 @@ glabel func_8095A188 .L8095A90C: /* 0B64C 8095A90C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095A910: -/* 0B650 8095A910 00139C00 */ sll $s3, $s3, 16 -/* 0B654 8095A914 00139C03 */ sra $s3, $s3, 16 -/* 0B658 8095A918 2A610190 */ slti $at, $s3, 0x0190 -/* 0B65C 8095A91C 1420FFAF */ bne $at, $zero, .L8095A7DC +/* 0B650 8095A910 00139C00 */ sll $s3, $s3, 16 +/* 0B654 8095A914 00139C03 */ sra $s3, $s3, 16 +/* 0B658 8095A918 2A610190 */ slti $at, $s3, 0x0190 +/* 0B65C 8095A91C 1420FFAF */ bne $at, $zero, .L8095A7DC /* 0B660 8095A920 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000160 /* 0B664 8095A924 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B668 8095A928 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B668 8095A928 8FB00138 */ lw $s0, 0x0138($sp) /* 0B66C 8095A92C 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095A930: /* 0B670 8095A930 920A0024 */ lbu $t2, 0x0024($s0) ## 00000184 /* 0B674 8095A934 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 0B678 8095A938 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0B67C 8095A93C 55410085 */ bnel $t2, $at, .L8095AB54 +/* 0B67C 8095A93C 55410085 */ bnel $t2, $at, .L8095AB54 /* 0B680 8095A940 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B684 8095A944 1680000E */ bne $s4, $zero, .L8095A980 +/* 0B684 8095A944 1680000E */ bne $s4, $zero, .L8095A980 /* 0B688 8095A948 26522C50 */ addiu $s2, $s2, 0x2C50 ## $s2 = 06012C50 /* 0B68C 8095A94C 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 /* 0B690 8095A950 256B2BA0 */ addiu $t3, $t3, 0x2BA0 ## $t3 = 06012BA0 /* 0B694 8095A954 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0B698 8095A958 0C024F46 */ jal func_80093D18 -/* 0B69C 8095A95C AFAB0058 */ sw $t3, 0x0058($sp) +/* 0B698 8095A958 0C024F46 */ jal func_80093D18 +/* 0B69C 8095A95C AFAB0058 */ sw $t3, 0x0058($sp) /* 0B6A0 8095A960 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B6A4 8095A964 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B6A8 8095A968 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 /* 0B6AC 8095A96C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 0B6B0 8095A970 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 /* 0B6B4 8095A974 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B6B8 8095A978 8FAD0058 */ lw $t5, 0x0058($sp) +/* 0B6B8 8095A978 8FAD0058 */ lw $t5, 0x0058($sp) /* 0B6BC 8095A97C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095A980: /* 0B6C0 8095A980 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 @@ -555,77 +555,77 @@ glabel func_8095A188 /* 0B71C 8095A9DC 316900FF */ andi $t1, $t3, 0x00FF ## $t1 = 00000000 /* 0B720 8095A9E0 860B0034 */ lh $t3, 0x0034($s0) ## 00000194 /* 0B724 8095A9E4 31EC00FF */ andi $t4, $t7, 0x00FF ## $t4 = 00000000 -/* 0B728 8095A9E8 0008C600 */ sll $t8, $t0, 24 +/* 0B728 8095A9E8 0008C600 */ sll $t8, $t0, 24 /* 0B72C 8095A9EC 0138C825 */ or $t9, $t1, $t8 ## $t9 = 00000008 -/* 0B730 8095A9F0 000C7400 */ sll $t6, $t4, 16 +/* 0B730 8095A9F0 000C7400 */ sll $t6, $t4, 16 /* 0B734 8095A9F4 316D00FF */ andi $t5, $t3, 0x00FF ## $t5 = 00000000 -/* 0B738 8095A9F8 000D4200 */ sll $t0, $t5, 8 +/* 0B738 8095A9F8 000D4200 */ sll $t0, $t5, 8 /* 0B73C 8095A9FC 032E5025 */ or $t2, $t9, $t6 ## $t2 = 00000008 /* 0B740 8095AA00 01484825 */ or $t1, $t2, $t0 ## $t1 = 00000008 /* 0B744 8095AA04 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 0B748 8095AA08 8E060008 */ lw $a2, 0x0008($s0) ## 00000168 /* 0B74C 8095AA0C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000164 -/* 0B750 8095AA10 0C034261 */ jal Matrix_Translate +/* 0B750 8095AA10 0C034261 */ jal Matrix_Translate /* 0B754 8095AA14 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000160 /* 0B758 8095AA18 8604002A */ lh $a0, 0x002A($s0) ## 0000018A /* 0B75C 8095AA1C 8605002C */ lh $a1, 0x002C($s0) ## 0000018C /* 0B760 8095AA20 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B764 8095AA24 0C034421 */ jal Matrix_RotateXYZ +/* 0B764 8095AA24 0C034421 */ jal Matrix_RotateZYX /* 0B768 8095AA28 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0B76C 8095AA2C C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000001A0 /* 0B770 8095AA30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B774 8095AA34 44066000 */ mfc1 $a2, $f12 -/* 0B778 8095AA38 0C0342A3 */ jal Matrix_Scale -/* 0B77C 8095AA3C 46006386 */ mov.s $f14, $f12 +/* 0B774 8095AA34 44066000 */ mfc1 $a2, $f12 +/* 0B778 8095AA38 0C0342A3 */ jal Matrix_Scale +/* 0B77C 8095AA3C 46006386 */ mov.s $f14, $f12 /* 0B780 8095AA40 3C018096 */ lui $at, %hi(D_8095C8D0) ## $at = 80960000 -/* 0B784 8095AA44 C430C8D0 */ lwc1 $f16, %lo(D_8095C8D0)($at) +/* 0B784 8095AA44 C430C8D0 */ lwc1 $f16, %lo(D_8095C8D0)($at) /* 0B788 8095AA48 C60A0048 */ lwc1 $f10, 0x0048($s0) ## 000001A8 /* 0B78C 8095AA4C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B790 8095AA50 46105302 */ mul.s $f12, $f10, $f16 -/* 0B794 8095AA54 0C0342DC */ jal Matrix_RotateX +/* 0B790 8095AA50 46105302 */ mul.s $f12, $f10, $f16 +/* 0B794 8095AA54 0C0342DC */ jal Matrix_RotateX /* 0B798 8095AA58 00000000 */ nop /* 0B79C 8095AA5C 3C018096 */ lui $at, %hi(D_8095C8D4) ## $at = 80960000 -/* 0B7A0 8095AA60 C424C8D4 */ lwc1 $f4, %lo(D_8095C8D4)($at) +/* 0B7A0 8095AA60 C424C8D4 */ lwc1 $f4, %lo(D_8095C8D4)($at) /* 0B7A4 8095AA64 C6120048 */ lwc1 $f18, 0x0048($s0) ## 000001A8 /* 0B7A8 8095AA68 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B7AC 8095AA6C 46049302 */ mul.s $f12, $f18, $f4 -/* 0B7B0 8095AA70 0C034348 */ jal Matrix_RotateY +/* 0B7AC 8095AA6C 46049302 */ mul.s $f12, $f18, $f4 +/* 0B7B0 8095AA70 0C034348 */ jal Matrix_RotateY /* 0B7B4 8095AA74 00000000 */ nop /* 0B7B8 8095AA78 3C018096 */ lui $at, %hi(D_8095C8D8) ## $at = 80960000 -/* 0B7BC 8095AA7C C428C8D8 */ lwc1 $f8, %lo(D_8095C8D8)($at) +/* 0B7BC 8095AA7C C428C8D8 */ lwc1 $f8, %lo(D_8095C8D8)($at) /* 0B7C0 8095AA80 C6060048 */ lwc1 $f6, 0x0048($s0) ## 000001A8 /* 0B7C4 8095AA84 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B7C8 8095AA88 46083302 */ mul.s $f12, $f6, $f8 -/* 0B7CC 8095AA8C 0C0343B5 */ jal Matrix_RotateZ +/* 0B7C8 8095AA88 46083302 */ mul.s $f12, $f6, $f8 +/* 0B7CC 8095AA8C 0C0343B5 */ jal Matrix_RotateZ /* 0B7D0 8095AA90 00000000 */ nop /* 0B7D4 8095AA94 C6000044 */ lwc1 $f0, 0x0044($s0) ## 000001A4 /* 0B7D8 8095AA98 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B7DC 8095AA9C 4600A301 */ sub.s $f12, $f20, $f0 -/* 0B7E0 8095AAA0 46140380 */ add.s $f14, $f0, $f20 -/* 0B7E4 8095AAA4 44066000 */ mfc1 $a2, $f12 -/* 0B7E8 8095AAA8 0C0342A3 */ jal Matrix_Scale +/* 0B7DC 8095AA9C 4600A301 */ sub.s $f12, $f20, $f0 +/* 0B7E0 8095AAA0 46140380 */ add.s $f14, $f0, $f20 +/* 0B7E4 8095AAA4 44066000 */ mfc1 $a2, $f12 +/* 0B7E8 8095AAA8 0C0342A3 */ jal Matrix_Scale /* 0B7EC 8095AAAC 00000000 */ nop /* 0B7F0 8095AAB0 3C018096 */ lui $at, %hi(D_8095C8DC) ## $at = 80960000 -/* 0B7F4 8095AAB4 C430C8DC */ lwc1 $f16, %lo(D_8095C8DC)($at) +/* 0B7F4 8095AAB4 C430C8DC */ lwc1 $f16, %lo(D_8095C8DC)($at) /* 0B7F8 8095AAB8 C60A0048 */ lwc1 $f10, 0x0048($s0) ## 000001A8 /* 0B7FC 8095AABC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B800 8095AAC0 46105302 */ mul.s $f12, $f10, $f16 -/* 0B804 8095AAC4 0C0343B5 */ jal Matrix_RotateZ -/* 0B808 8095AAC8 46006307 */ neg.s $f12, $f12 +/* 0B800 8095AAC0 46105302 */ mul.s $f12, $f10, $f16 +/* 0B804 8095AAC4 0C0343B5 */ jal Matrix_RotateZ +/* 0B808 8095AAC8 46006307 */ neg.s $f12, $f12 /* 0B80C 8095AACC 3C018096 */ lui $at, %hi(D_8095C8E0) ## $at = 80960000 -/* 0B810 8095AAD0 C424C8E0 */ lwc1 $f4, %lo(D_8095C8E0)($at) +/* 0B810 8095AAD0 C424C8E0 */ lwc1 $f4, %lo(D_8095C8E0)($at) /* 0B814 8095AAD4 C6120048 */ lwc1 $f18, 0x0048($s0) ## 000001A8 /* 0B818 8095AAD8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B81C 8095AADC 46049302 */ mul.s $f12, $f18, $f4 -/* 0B820 8095AAE0 0C034348 */ jal Matrix_RotateY -/* 0B824 8095AAE4 46006307 */ neg.s $f12, $f12 +/* 0B81C 8095AADC 46049302 */ mul.s $f12, $f18, $f4 +/* 0B820 8095AAE0 0C034348 */ jal Matrix_RotateY +/* 0B824 8095AAE4 46006307 */ neg.s $f12, $f12 /* 0B828 8095AAE8 3C018096 */ lui $at, %hi(D_8095C8E4) ## $at = 80960000 -/* 0B82C 8095AAEC C428C8E4 */ lwc1 $f8, %lo(D_8095C8E4)($at) +/* 0B82C 8095AAEC C428C8E4 */ lwc1 $f8, %lo(D_8095C8E4)($at) /* 0B830 8095AAF0 C6060048 */ lwc1 $f6, 0x0048($s0) ## 000001A8 /* 0B834 8095AAF4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B838 8095AAF8 46083302 */ mul.s $f12, $f6, $f8 -/* 0B83C 8095AAFC 0C0342DC */ jal Matrix_RotateX -/* 0B840 8095AB00 46006307 */ neg.s $f12, $f12 +/* 0B838 8095AAF8 46083302 */ mul.s $f12, $f6, $f8 +/* 0B83C 8095AAFC 0C0342DC */ jal Matrix_RotateX +/* 0B840 8095AB00 46006307 */ neg.s $f12, $f12 /* 0B844 8095AB04 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B848 8095AB08 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 0B84C 8095AB0C 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 @@ -636,9 +636,9 @@ glabel func_8095A188 /* 0B860 8095AB20 24A5C4E0 */ addiu $a1, $a1, %lo(D_8095C4E0) ## $a1 = 8095C4E0 /* 0B864 8095AB24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B868 8095AB28 24061404 */ addiu $a2, $zero, 0x1404 ## $a2 = 00001404 -/* 0B86C 8095AB2C 0C0346A2 */ jal Matrix_NewMtx -/* 0B870 8095AB30 AFA200A4 */ sw $v0, 0x00A4($sp) -/* 0B874 8095AB34 8FA300A4 */ lw $v1, 0x00A4($sp) +/* 0B86C 8095AB2C 0C0346A2 */ jal Matrix_NewMtx +/* 0B870 8095AB30 AFA200A4 */ sw $v0, 0x00A4($sp) +/* 0B874 8095AB34 8FA300A4 */ lw $v1, 0x00A4($sp) /* 0B878 8095AB38 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B87C 8095AB3C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B880 8095AB40 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 @@ -647,34 +647,34 @@ glabel func_8095A188 /* 0B88C 8095AB4C AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 0B890 8095AB50 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095AB54: -/* 0B894 8095AB54 00139C00 */ sll $s3, $s3, 16 -/* 0B898 8095AB58 00139C03 */ sra $s3, $s3, 16 -/* 0B89C 8095AB5C 2A610190 */ slti $at, $s3, 0x0190 -/* 0B8A0 8095AB60 1420FF73 */ bne $at, $zero, .L8095A930 +/* 0B894 8095AB54 00139C00 */ sll $s3, $s3, 16 +/* 0B898 8095AB58 00139C03 */ sra $s3, $s3, 16 +/* 0B89C 8095AB5C 2A610190 */ slti $at, $s3, 0x0190 +/* 0B8A0 8095AB60 1420FF73 */ bne $at, $zero, .L8095A930 /* 0B8A4 8095AB64 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 000001B8 /* 0B8A8 8095AB68 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B8AC 8095AB6C 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B8AC 8095AB6C 8FB00138 */ lw $s0, 0x0138($sp) /* 0B8B0 8095AB70 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095AB74: /* 0B8B4 8095AB74 92190024 */ lbu $t9, 0x0024($s0) ## 000001DC /* 0B8B8 8095AB78 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0B8BC 8095AB7C 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0B8C0 8095AB80 5721004C */ bnel $t9, $at, .L8095ACB4 +/* 0B8C0 8095AB80 5721004C */ bnel $t9, $at, .L8095ACB4 /* 0B8C4 8095AB84 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B8C8 8095AB88 1680000E */ bne $s4, $zero, .L8095ABC4 +/* 0B8C8 8095AB88 1680000E */ bne $s4, $zero, .L8095ABC4 /* 0B8CC 8095AB8C 26523638 */ addiu $s2, $s2, 0x3638 ## $s2 = 06013638 /* 0B8D0 8095AB90 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 /* 0B8D4 8095AB94 25CE35B0 */ addiu $t6, $t6, 0x35B0 ## $t6 = 060135B0 /* 0B8D8 8095AB98 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0B8DC 8095AB9C 0C024F61 */ jal func_80093D84 -/* 0B8E0 8095ABA0 AFAE0058 */ sw $t6, 0x0058($sp) +/* 0B8DC 8095AB9C 0C024F61 */ jal func_80093D84 +/* 0B8E0 8095ABA0 AFAE0058 */ sw $t6, 0x0058($sp) /* 0B8E4 8095ABA4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B8E8 8095ABA8 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B8EC 8095ABAC 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 /* 0B8F0 8095ABB0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0B8F4 8095ABB4 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 /* 0B8F8 8095ABB8 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B8FC 8095ABBC 8FAD0058 */ lw $t5, 0x0058($sp) +/* 0B8FC 8095ABBC 8FAD0058 */ lw $t5, 0x0058($sp) /* 0B900 8095ABC0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095ABC4: /* 0B904 8095ABC4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -705,18 +705,18 @@ glabel func_8095A188 /* 0B968 8095AC28 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 0B96C 8095AC2C 8E060008 */ lw $a2, 0x0008($s0) ## 000001C0 /* 0B970 8095AC30 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 000001BC -/* 0B974 8095AC34 0C034261 */ jal Matrix_Translate +/* 0B974 8095AC34 0C034261 */ jal Matrix_Translate /* 0B978 8095AC38 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 000001B8 /* 0B97C 8095AC3C 8604002A */ lh $a0, 0x002A($s0) ## 000001E2 /* 0B980 8095AC40 8605002C */ lh $a1, 0x002C($s0) ## 000001E4 /* 0B984 8095AC44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B988 8095AC48 0C034421 */ jal Matrix_RotateXYZ +/* 0B988 8095AC48 0C034421 */ jal Matrix_RotateZYX /* 0B98C 8095AC4C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0B990 8095AC50 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000001F8 /* 0B994 8095AC54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B998 8095AC58 44066000 */ mfc1 $a2, $f12 -/* 0B99C 8095AC5C 0C0342A3 */ jal Matrix_Scale -/* 0B9A0 8095AC60 46006386 */ mov.s $f14, $f12 +/* 0B998 8095AC58 44066000 */ mfc1 $a2, $f12 +/* 0B99C 8095AC5C 0C0342A3 */ jal Matrix_Scale +/* 0B9A0 8095AC60 46006386 */ mov.s $f14, $f12 /* 0B9A4 8095AC64 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B9A8 8095AC68 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 /* 0B9AC 8095AC6C 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 @@ -727,9 +727,9 @@ glabel func_8095A188 /* 0B9C0 8095AC80 24A5C4F0 */ addiu $a1, $a1, %lo(D_8095C4F0) ## $a1 = 8095C4F0 /* 0B9C4 8095AC84 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B9C8 8095AC88 24061420 */ addiu $a2, $zero, 0x1420 ## $a2 = 00001420 -/* 0B9CC 8095AC8C 0C0346A2 */ jal Matrix_NewMtx -/* 0B9D0 8095AC90 AFA2008C */ sw $v0, 0x008C($sp) -/* 0B9D4 8095AC94 8FA3008C */ lw $v1, 0x008C($sp) +/* 0B9CC 8095AC8C 0C0346A2 */ jal Matrix_NewMtx +/* 0B9D0 8095AC90 AFA2008C */ sw $v0, 0x008C($sp) +/* 0B9D4 8095AC94 8FA3008C */ lw $v1, 0x008C($sp) /* 0B9D8 8095AC98 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B9DC 8095AC9C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B9E0 8095ACA0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 @@ -738,32 +738,32 @@ glabel func_8095A188 /* 0B9EC 8095ACAC AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 0B9F0 8095ACB0 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095ACB4: -/* 0B9F4 8095ACB4 00139C00 */ sll $s3, $s3, 16 -/* 0B9F8 8095ACB8 00139C03 */ sra $s3, $s3, 16 -/* 0B9FC 8095ACBC 2A610190 */ slti $at, $s3, 0x0190 -/* 0BA00 8095ACC0 1420FFAC */ bne $at, $zero, .L8095AB74 +/* 0B9F4 8095ACB4 00139C00 */ sll $s3, $s3, 16 +/* 0B9F8 8095ACB8 00139C03 */ sra $s3, $s3, 16 +/* 0B9FC 8095ACBC 2A610190 */ slti $at, $s3, 0x0190 +/* 0BA00 8095ACC0 1420FFAC */ bne $at, $zero, .L8095AB74 /* 0BA04 8095ACC4 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000210 /* 0BA08 8095ACC8 3C178096 */ lui $s7, %hi(D_8095C500) ## $s7 = 80960000 /* 0BA0C 8095ACCC 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0BA10 8095ACD0 8FB00138 */ lw $s0, 0x0138($sp) +/* 0BA10 8095ACD0 8FB00138 */ lw $s0, 0x0138($sp) /* 0BA14 8095ACD4 26F7C500 */ addiu $s7, $s7, %lo(D_8095C500) ## $s7 = 8095C500 /* 0BA18 8095ACD8 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095ACDC: /* 0BA1C 8095ACDC 92180024 */ lbu $t8, 0x0024($s0) ## 00000234 /* 0BA20 8095ACE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0BA24 8095ACE4 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 0BA28 8095ACE8 17010053 */ bne $t8, $at, .L8095AE38 +/* 0BA28 8095ACE8 17010053 */ bne $t8, $at, .L8095AE38 /* 0BA2C 8095ACEC 25EF5710 */ addiu $t7, $t7, 0x5710 ## $t7 = 06015710 /* 0BA30 8095ACF0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0BA34 8095ACF4 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0BA38 8095ACF8 02C19021 */ addu $s2, $s6, $at -/* 0BA3C 8095ACFC 16800015 */ bne $s4, $zero, .L8095AD54 -/* 0BA40 8095AD00 AFAF0050 */ sw $t7, 0x0050($sp) +/* 0BA38 8095ACF8 02C19021 */ addu $s2, $s6, $at +/* 0BA3C 8095ACFC 16800015 */ bne $s4, $zero, .L8095AD54 +/* 0BA40 8095AD00 AFAF0050 */ sw $t7, 0x0050($sp) /* 0BA44 8095AD04 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 0BA48 8095AD08 258C56A0 */ addiu $t4, $t4, 0x56A0 ## $t4 = 060156A0 /* 0BA4C 8095AD0C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0BA50 8095AD10 0C024F05 */ jal func_80093C14 -/* 0BA54 8095AD14 AFAC0058 */ sw $t4, 0x0058($sp) +/* 0BA50 8095AD10 0C024F05 */ jal func_80093C14 +/* 0BA54 8095AD14 AFAC0058 */ sw $t4, 0x0058($sp) /* 0BA58 8095AD18 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BA5C 8095AD1C 3C0E8282 */ lui $t6, 0x8282 ## $t6 = 82820000 /* 0BA60 8095AD20 35CE1E00 */ ori $t6, $t6, 0x1E00 ## $t6 = 82821E00 @@ -777,7 +777,7 @@ glabel func_8095A188 /* 0BA80 8095AD40 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0BA84 8095AD44 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 /* 0BA88 8095AD48 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0BA8C 8095AD4C 8FAD0058 */ lw $t5, 0x0058($sp) +/* 0BA8C 8095AD4C 8FAD0058 */ lw $t5, 0x0058($sp) /* 0BA90 8095AD50 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095AD54: /* 0BA94 8095AD54 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -794,30 +794,30 @@ glabel func_8095A188 /* 0BAC0 8095AD80 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0BAC4 8095AD84 8E060008 */ lw $a2, 0x0008($s0) ## 00000218 /* 0BAC8 8095AD88 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000214 -/* 0BACC 8095AD8C 0C034261 */ jal Matrix_Translate +/* 0BACC 8095AD8C 0C034261 */ jal Matrix_Translate /* 0BAD0 8095AD90 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000210 -/* 0BAD4 8095AD94 0C0347F5 */ jal func_800D1FD4 +/* 0BAD4 8095AD94 0C0347F5 */ jal func_800D1FD4 /* 0BAD8 8095AD98 02402025 */ or $a0, $s2, $zero ## $a0 = 06013638 /* 0BADC 8095AD9C 860C002E */ lh $t4, 0x002E($s0) ## 0000023E /* 0BAE0 8095ADA0 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0BAE4 8095ADA4 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 /* 0BAE8 8095ADA8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 0BAEC 8095ADAC 3C018096 */ lui $at, %hi(D_8095C8E8) ## $at = 80960000 -/* 0BAF0 8095ADB0 C426C8E8 */ lwc1 $f6, %lo(D_8095C8E8)($at) -/* 0BAF4 8095ADB4 46805420 */ cvt.s.w $f16, $f10 +/* 0BAF0 8095ADB0 C426C8E8 */ lwc1 $f6, %lo(D_8095C8E8)($at) +/* 0BAF4 8095ADB4 46805420 */ cvt.s.w $f16, $f10 /* 0BAF8 8095ADB8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0BAFC 8095ADBC 46128103 */ div.s $f4, $f16, $f18 -/* 0BB00 8095ADC0 46062302 */ mul.s $f12, $f4, $f6 -/* 0BB04 8095ADC4 0C0343B5 */ jal Matrix_RotateZ +/* 0BAFC 8095ADBC 46128103 */ div.s $f4, $f16, $f18 +/* 0BB00 8095ADC0 46062302 */ mul.s $f12, $f4, $f6 +/* 0BB04 8095ADC4 0C0343B5 */ jal Matrix_RotateZ /* 0BB08 8095ADC8 00000000 */ nop /* 0BB0C 8095ADCC 3C018096 */ lui $at, %hi(D_8095C8EC) ## $at = 80960000 -/* 0BB10 8095ADD0 C42AC8EC */ lwc1 $f10, %lo(D_8095C8EC)($at) +/* 0BB10 8095ADD0 C42AC8EC */ lwc1 $f10, %lo(D_8095C8EC)($at) /* 0BB14 8095ADD4 C6080040 */ lwc1 $f8, 0x0040($s0) ## 00000250 -/* 0BB18 8095ADD8 4406A000 */ mfc1 $a2, $f20 +/* 0BB18 8095ADD8 4406A000 */ mfc1 $a2, $f20 /* 0BB1C 8095ADDC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0BB20 8095ADE0 460A4302 */ mul.s $f12, $f8, $f10 -/* 0BB24 8095ADE4 0C0342A3 */ jal Matrix_Scale -/* 0BB28 8095ADE8 46006386 */ mov.s $f14, $f12 +/* 0BB20 8095ADE0 460A4302 */ mul.s $f12, $f8, $f10 +/* 0BB24 8095ADE4 0C0342A3 */ jal Matrix_Scale +/* 0BB28 8095ADE8 46006386 */ mov.s $f14, $f12 /* 0BB2C 8095ADEC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BB30 8095ADF0 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 0BB34 8095ADF4 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 @@ -827,39 +827,39 @@ glabel func_8095A188 /* 0BB44 8095AE04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0BB48 8095AE08 02E02825 */ or $a1, $s7, $zero ## $a1 = 8095C500 /* 0BB4C 8095AE0C 2406143C */ addiu $a2, $zero, 0x143C ## $a2 = 0000143C -/* 0BB50 8095AE10 0C0346A2 */ jal Matrix_NewMtx -/* 0BB54 8095AE14 AFA20078 */ sw $v0, 0x0078($sp) -/* 0BB58 8095AE18 8FA30078 */ lw $v1, 0x0078($sp) +/* 0BB50 8095AE10 0C0346A2 */ jal Matrix_NewMtx +/* 0BB54 8095AE14 AFA20078 */ sw $v0, 0x0078($sp) +/* 0BB58 8095AE18 8FA30078 */ lw $v1, 0x0078($sp) /* 0BB5C 8095AE1C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0BB60 8095AE20 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BB64 8095AE24 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0BB68 8095AE28 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 /* 0BB6C 8095AE2C AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0BB70 8095AE30 8FAD0050 */ lw $t5, 0x0050($sp) +/* 0BB70 8095AE30 8FAD0050 */ lw $t5, 0x0050($sp) /* 0BB74 8095AE34 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095AE38: /* 0BB78 8095AE38 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0BB7C 8095AE3C 00139C00 */ sll $s3, $s3, 16 -/* 0BB80 8095AE40 00139C03 */ sra $s3, $s3, 16 -/* 0BB84 8095AE44 2A610190 */ slti $at, $s3, 0x0190 -/* 0BB88 8095AE48 1420FFA4 */ bne $at, $zero, .L8095ACDC +/* 0BB7C 8095AE3C 00139C00 */ sll $s3, $s3, 16 +/* 0BB80 8095AE40 00139C03 */ sra $s3, $s3, 16 +/* 0BB84 8095AE44 2A610190 */ slti $at, $s3, 0x0190 +/* 0BB88 8095AE48 1420FFA4 */ bne $at, $zero, .L8095ACDC /* 0BB8C 8095AE4C 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000268 /* 0BB90 8095AE50 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0BB94 8095AE54 8FB00138 */ lw $s0, 0x0138($sp) +/* 0BB94 8095AE54 8FB00138 */ lw $s0, 0x0138($sp) /* 0BB98 8095AE58 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 /* 0BB9C 8095AE5C 24170003 */ addiu $s7, $zero, 0x0003 ## $s7 = 00000003 .L8095AE60: /* 0BBA0 8095AE60 920A0024 */ lbu $t2, 0x0024($s0) ## 0000028C /* 0BBA4 8095AE64 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0BBA8 8095AE68 56EA0057 */ bnel $s7, $t2, .L8095AFC8 +/* 0BBA8 8095AE68 56EA0057 */ bnel $s7, $t2, .L8095AFC8 /* 0BBAC 8095AE6C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0BBB0 8095AE70 16800015 */ bne $s4, $zero, .L8095AEC8 +/* 0BBB0 8095AE70 16800015 */ bne $s4, $zero, .L8095AEC8 /* 0BBB4 8095AE74 26528F70 */ addiu $s2, $s2, 0x8F70 ## $s2 = 06008F70 /* 0BBB8 8095AE78 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 /* 0BBBC 8095AE7C 25088F08 */ addiu $t0, $t0, 0x8F08 ## $t0 = 06008F08 /* 0BBC0 8095AE80 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0BBC4 8095AE84 0C024F61 */ jal func_80093D84 -/* 0BBC8 8095AE88 AFA80058 */ sw $t0, 0x0058($sp) +/* 0BBC4 8095AE84 0C024F61 */ jal func_80093D84 +/* 0BBC8 8095AE88 AFA80058 */ sw $t0, 0x0058($sp) /* 0BBCC 8095AE8C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BBD0 8095AE90 3C18FFFF */ lui $t8, 0xFFFF ## $t8 = FFFF0000 /* 0BBD4 8095AE94 37186400 */ ori $t8, $t8, 0x6400 ## $t8 = FFFF6400 @@ -873,7 +873,7 @@ glabel func_8095A188 /* 0BBF4 8095AEB4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0BBF8 8095AEB8 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 /* 0BBFC 8095AEBC AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0BC00 8095AEC0 8FAC0058 */ lw $t4, 0x0058($sp) +/* 0BC00 8095AEC0 8FAC0058 */ lw $t4, 0x0058($sp) /* 0BC04 8095AEC4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L8095AEC8: /* 0BC08 8095AEC8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -889,37 +889,37 @@ glabel func_8095A188 /* 0BC30 8095AEF0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 0BC34 8095AEF4 8E060008 */ lw $a2, 0x0008($s0) ## 00000270 /* 0BC38 8095AEF8 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 0000026C -/* 0BC3C 8095AEFC 0C034261 */ jal Matrix_Translate +/* 0BC3C 8095AEFC 0C034261 */ jal Matrix_Translate /* 0BC40 8095AF00 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000268 /* 0BC44 8095AF04 8608002E */ lh $t0, 0x002E($s0) ## 00000296 /* 0BC48 8095AF08 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0BC4C 8095AF0C 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 /* 0BC50 8095AF10 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 /* 0BC54 8095AF14 3C018096 */ lui $at, %hi(D_8095C8F0) ## $at = 80960000 -/* 0BC58 8095AF18 C428C8F0 */ lwc1 $f8, %lo(D_8095C8F0)($at) -/* 0BC5C 8095AF1C 468084A0 */ cvt.s.w $f18, $f16 +/* 0BC58 8095AF18 C428C8F0 */ lwc1 $f8, %lo(D_8095C8F0)($at) +/* 0BC5C 8095AF1C 468084A0 */ cvt.s.w $f18, $f16 /* 0BC60 8095AF20 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0BC64 8095AF24 46049183 */ div.s $f6, $f18, $f4 -/* 0BC68 8095AF28 46083302 */ mul.s $f12, $f6, $f8 -/* 0BC6C 8095AF2C 0C0343B5 */ jal Matrix_RotateZ +/* 0BC64 8095AF24 46049183 */ div.s $f6, $f18, $f4 +/* 0BC68 8095AF28 46083302 */ mul.s $f12, $f6, $f8 +/* 0BC6C 8095AF2C 0C0343B5 */ jal Matrix_RotateZ /* 0BC70 8095AF30 00000000 */ nop /* 0BC74 8095AF34 8609002C */ lh $t1, 0x002C($s0) ## 00000294 /* 0BC78 8095AF38 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0BC7C 8095AF3C 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 /* 0BC80 8095AF40 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 /* 0BC84 8095AF44 3C018096 */ lui $at, %hi(D_8095C8F4) ## $at = 80960000 -/* 0BC88 8095AF48 C426C8F4 */ lwc1 $f6, %lo(D_8095C8F4)($at) -/* 0BC8C 8095AF4C 46805420 */ cvt.s.w $f16, $f10 +/* 0BC88 8095AF48 C426C8F4 */ lwc1 $f6, %lo(D_8095C8F4)($at) +/* 0BC8C 8095AF4C 46805420 */ cvt.s.w $f16, $f10 /* 0BC90 8095AF50 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0BC94 8095AF54 46128103 */ div.s $f4, $f16, $f18 -/* 0BC98 8095AF58 46062302 */ mul.s $f12, $f4, $f6 -/* 0BC9C 8095AF5C 0C034348 */ jal Matrix_RotateY +/* 0BC94 8095AF54 46128103 */ div.s $f4, $f16, $f18 +/* 0BC98 8095AF58 46062302 */ mul.s $f12, $f4, $f6 +/* 0BC9C 8095AF5C 0C034348 */ jal Matrix_RotateY /* 0BCA0 8095AF60 00000000 */ nop /* 0BCA4 8095AF64 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000002A8 -/* 0BCA8 8095AF68 4406A000 */ mfc1 $a2, $f20 +/* 0BCA8 8095AF68 4406A000 */ mfc1 $a2, $f20 /* 0BCAC 8095AF6C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0BCB0 8095AF70 0C0342A3 */ jal Matrix_Scale -/* 0BCB4 8095AF74 46006386 */ mov.s $f14, $f12 +/* 0BCB0 8095AF70 0C0342A3 */ jal Matrix_Scale +/* 0BCB4 8095AF74 46006386 */ mov.s $f14, $f12 /* 0BCB8 8095AF78 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BCBC 8095AF7C 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 0BCC0 8095AF80 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 @@ -930,9 +930,9 @@ glabel func_8095A188 /* 0BCD4 8095AF94 24A5C510 */ addiu $a1, $a1, %lo(D_8095C510) ## $a1 = 8095C510 /* 0BCD8 8095AF98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0BCDC 8095AF9C 24061458 */ addiu $a2, $zero, 0x1458 ## $a2 = 00001458 -/* 0BCE0 8095AFA0 0C0346A2 */ jal Matrix_NewMtx -/* 0BCE4 8095AFA4 AFA20064 */ sw $v0, 0x0064($sp) -/* 0BCE8 8095AFA8 8FA30064 */ lw $v1, 0x0064($sp) +/* 0BCE0 8095AFA0 0C0346A2 */ jal Matrix_NewMtx +/* 0BCE4 8095AFA4 AFA20064 */ sw $v0, 0x0064($sp) +/* 0BCE8 8095AFA8 8FA30064 */ lw $v1, 0x0064($sp) /* 0BCEC 8095AFAC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0BCF0 8095AFB0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BCF4 8095AFB4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 @@ -941,29 +941,29 @@ glabel func_8095A188 /* 0BD00 8095AFC0 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 0BD04 8095AFC4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095AFC8: -/* 0BD08 8095AFC8 00139C00 */ sll $s3, $s3, 16 -/* 0BD0C 8095AFCC 00139C03 */ sra $s3, $s3, 16 -/* 0BD10 8095AFD0 2A610190 */ slti $at, $s3, 0x0190 -/* 0BD14 8095AFD4 1420FFA2 */ bne $at, $zero, .L8095AE60 +/* 0BD08 8095AFC8 00139C00 */ sll $s3, $s3, 16 +/* 0BD0C 8095AFCC 00139C03 */ sra $s3, $s3, 16 +/* 0BD10 8095AFD0 2A610190 */ slti $at, $s3, 0x0190 +/* 0BD14 8095AFD4 1420FFA2 */ bne $at, $zero, .L8095AE60 /* 0BD18 8095AFD8 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 000002C0 /* 0BD1C 8095AFDC 3C068096 */ lui $a2, %hi(D_8095C520) ## $a2 = 80960000 /* 0BD20 8095AFE0 24C6C520 */ addiu $a2, $a2, %lo(D_8095C520) ## $a2 = 8095C520 /* 0BD24 8095AFE4 27A40120 */ addiu $a0, $sp, 0x0120 ## $a0 = FFFFFFD8 /* 0BD28 8095AFE8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0BD2C 8095AFEC 0C031AD5 */ jal func_800C6B54 +/* 0BD2C 8095AFEC 0C031AD5 */ jal func_800C6B54 /* 0BD30 8095AFF0 2407145F */ addiu $a3, $zero, 0x145F ## $a3 = 0000145F -/* 0BD34 8095AFF4 8FBF0044 */ lw $ra, 0x0044($sp) -/* 0BD38 8095AFF8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 0BD3C 8095AFFC 8FB00020 */ lw $s0, 0x0020($sp) -/* 0BD40 8095B000 8FB10024 */ lw $s1, 0x0024($sp) -/* 0BD44 8095B004 8FB20028 */ lw $s2, 0x0028($sp) -/* 0BD48 8095B008 8FB3002C */ lw $s3, 0x002C($sp) -/* 0BD4C 8095B00C 8FB40030 */ lw $s4, 0x0030($sp) -/* 0BD50 8095B010 8FB50034 */ lw $s5, 0x0034($sp) -/* 0BD54 8095B014 8FB60038 */ lw $s6, 0x0038($sp) -/* 0BD58 8095B018 8FB7003C */ lw $s7, 0x003C($sp) -/* 0BD5C 8095B01C 8FBE0040 */ lw $s8, 0x0040($sp) -/* 0BD60 8095B020 03E00008 */ jr $ra +/* 0BD34 8095AFF4 8FBF0044 */ lw $ra, 0x0044($sp) +/* 0BD38 8095AFF8 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 0BD3C 8095AFFC 8FB00020 */ lw $s0, 0x0020($sp) +/* 0BD40 8095B000 8FB10024 */ lw $s1, 0x0024($sp) +/* 0BD44 8095B004 8FB20028 */ lw $s2, 0x0028($sp) +/* 0BD48 8095B008 8FB3002C */ lw $s3, 0x002C($sp) +/* 0BD4C 8095B00C 8FB40030 */ lw $s4, 0x0030($sp) +/* 0BD50 8095B010 8FB50034 */ lw $s5, 0x0034($sp) +/* 0BD54 8095B014 8FB60038 */ lw $s6, 0x0038($sp) +/* 0BD58 8095B018 8FB7003C */ lw $s7, 0x003C($sp) +/* 0BD5C 8095B01C 8FBE0040 */ lw $s8, 0x0040($sp) +/* 0BD60 8095B020 03E00008 */ jr $ra /* 0BD64 8095B024 27BD0148 */ addiu $sp, $sp, 0x0148 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s index 1f41e54503..85ef1378f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s @@ -1,40 +1,40 @@ glabel func_80977950 /* 005C0 80977950 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 005C4 80977954 AFBF003C */ sw $ra, 0x003C($sp) -/* 005C8 80977958 AFB00038 */ sw $s0, 0x0038($sp) -/* 005CC 8097795C AFA40088 */ sw $a0, 0x0088($sp) +/* 005C4 80977954 AFBF003C */ sw $ra, 0x003C($sp) +/* 005C8 80977958 AFB00038 */ sw $s0, 0x0038($sp) +/* 005CC 8097795C AFA40088 */ sw $a0, 0x0088($sp) /* 005D0 80977960 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 005D4 80977964 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 /* 005D8 80977968 0C031A73 */ jal Graph_Alloc - + /* 005DC 8097796C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005E0 80977970 3C068097 */ lui $a2, %hi(D_80977D20) ## $a2 = 80970000 -/* 005E4 80977974 AFA20080 */ sw $v0, 0x0080($sp) +/* 005E4 80977974 AFA20080 */ sw $v0, 0x0080($sp) /* 005E8 80977978 24C67D20 */ addiu $a2, $a2, %lo(D_80977D20) ## $a2 = 80977D20 /* 005EC 8097797C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 /* 005F0 80977980 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005F4 80977984 0C031AB1 */ jal func_800C6AC4 +/* 005F4 80977984 0C031AB1 */ jal func_800C6AC4 /* 005F8 80977988 240701CC */ addiu $a3, $zero, 0x01CC ## $a3 = 000001CC -/* 005FC 8097798C 0C034213 */ jal Matrix_Push +/* 005FC 8097798C 0C034213 */ jal Matrix_Push /* 00600 80977990 00000000 */ nop -/* 00604 80977994 8FA20088 */ lw $v0, 0x0088($sp) +/* 00604 80977994 8FA20088 */ lw $v0, 0x0088($sp) /* 00608 80977998 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0060C 8097799C 24420178 */ addiu $v0, $v0, 0x0178 ## $v0 = 00000178 /* 00610 809779A0 8C460008 */ lw $a2, 0x0008($v0) ## 00000180 /* 00614 809779A4 C44E0004 */ lwc1 $f14, 0x0004($v0) ## 0000017C -/* 00618 809779A8 0C0342A3 */ jal Matrix_Scale +/* 00618 809779A8 0C0342A3 */ jal Matrix_Scale /* 0061C 809779AC C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000178 /* 00620 809779B0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00624 809779B4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 00628 809779B8 8FAE0088 */ lw $t6, 0x0088($sp) +/* 00628 809779B8 8FAE0088 */ lw $t6, 0x0088($sp) /* 0062C 809779BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00630 809779C0 84441474 */ lh $a0, 0x1474($v0) ## 80161474 /* 00634 809779C4 84461478 */ lh $a2, 0x1478($v0) ## 80161478 /* 00638 809779C8 85C50168 */ lh $a1, 0x0168($t6) ## 00000168 /* 0063C 809779CC 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 00640 809779D0 00042400 */ sll $a0, $a0, 16 -/* 00644 809779D4 0C034421 */ jal Matrix_RotateXYZ -/* 00648 809779D8 00042403 */ sra $a0, $a0, 16 +/* 00640 809779D0 00042400 */ sll $a0, $a0, 16 +/* 00644 809779D4 0C034421 */ jal Matrix_RotateZYX +/* 00648 809779D8 00042403 */ sra $a0, $a0, 16 /* 0064C 809779DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00650 809779E0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00654 809779E4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 @@ -44,22 +44,22 @@ glabel func_80977950 /* 00664 809779F4 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 00668 809779F8 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 0066C 809779FC 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 00670 80977A00 46804220 */ cvt.s.w $f8, $f8 -/* 00674 80977A04 46802320 */ cvt.s.w $f12, $f4 -/* 00678 80977A08 44064000 */ mfc1 $a2, $f8 -/* 0067C 80977A0C 0C034261 */ jal Matrix_Translate -/* 00680 80977A10 468033A0 */ cvt.s.w $f14, $f6 +/* 00670 80977A00 46804220 */ cvt.s.w $f8, $f8 +/* 00674 80977A04 46802320 */ cvt.s.w $f12, $f4 +/* 00678 80977A08 44064000 */ mfc1 $a2, $f8 +/* 0067C 80977A0C 0C034261 */ jal Matrix_Translate +/* 00680 80977A10 468033A0 */ cvt.s.w $f14, $f6 /* 00684 80977A14 3C058097 */ lui $a1, %hi(D_80977D30) ## $a1 = 80970000 /* 00688 80977A18 24A57D30 */ addiu $a1, $a1, %lo(D_80977D30) ## $a1 = 80977D30 -/* 0068C 80977A1C 8FA40080 */ lw $a0, 0x0080($sp) -/* 00690 80977A20 0C034695 */ jal Matrix_ToMtx +/* 0068C 80977A1C 8FA40080 */ lw $a0, 0x0080($sp) +/* 00690 80977A20 0C034695 */ jal Matrix_ToMtx /* 00694 80977A24 240601DC */ addiu $a2, $zero, 0x01DC ## $a2 = 000001DC -/* 00698 80977A28 0C034221 */ jal Matrix_Pull +/* 00698 80977A28 0C034221 */ jal Matrix_Pull /* 0069C 80977A2C 00000000 */ nop -/* 006A0 80977A30 0C024F61 */ jal func_80093D84 +/* 006A0 80977A30 0C024F61 */ jal func_80093D84 /* 006A4 80977A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006A8 80977A38 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 006AC 80977A3C 8FA90088 */ lw $t1, 0x0088($sp) +/* 006AC 80977A3C 8FA90088 */ lw $t1, 0x0088($sp) /* 006B0 80977A40 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 006B4 80977A44 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 006B8 80977A48 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 @@ -78,14 +78,14 @@ glabel func_80977950 /* 006EC 80977A7C 2719008C */ addiu $t9, $t8, 0x008C ## $t9 = 0000008C /* 006F0 80977A80 332A00FF */ andi $t2, $t9, 0x00FF ## $t2 = 0000008C /* 006F4 80977A84 84591488 */ lh $t9, 0x1488($v0) ## 00001488 -/* 006F8 80977A88 000A5A00 */ sll $t3, $t2, 8 +/* 006F8 80977A88 000A5A00 */ sll $t3, $t2, 8 /* 006FC 80977A8C 258E008C */ addiu $t6, $t4, 0x008C ## $t6 = 0000008C -/* 00700 80977A90 000E7E00 */ sll $t7, $t6, 24 +/* 00700 80977A90 000E7E00 */ sll $t7, $t6, 24 /* 00704 80977A94 016FC025 */ or $t8, $t3, $t7 ## $t8 = FA000080 /* 00708 80977A98 8D2B0170 */ lw $t3, 0x0170($t1) ## 00000170 /* 0070C 80977A9C 272A0050 */ addiu $t2, $t9, 0x0050 ## $t2 = 000000DC /* 00710 80977AA0 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 000000DC -/* 00714 80977AA4 000C6C00 */ sll $t5, $t4, 16 +/* 00714 80977AA4 000C6C00 */ sll $t5, $t4, 16 /* 00718 80977AA8 030D7025 */ or $t6, $t8, $t5 ## $t6 = FA000080 /* 0071C 80977AAC 316F00FF */ andi $t7, $t3, 0x00FF ## $t7 = 00000000 /* 00720 80977AB0 01CFC825 */ or $t9, $t6, $t7 ## $t9 = FA000080 @@ -102,14 +102,14 @@ glabel func_80977950 /* 0074C 80977ADC 270D005F */ addiu $t5, $t8, 0x005F ## $t5 = FA0000DF /* 00750 80977AE0 31AB00FF */ andi $t3, $t5, 0x00FF ## $t3 = 000000DF /* 00754 80977AE4 844D1490 */ lh $t5, 0x1490($v0) ## 00001490 -/* 00758 80977AE8 000B7200 */ sll $t6, $t3, 8 +/* 00758 80977AE8 000B7200 */ sll $t6, $t3, 8 /* 0075C 80977AEC 25EA005A */ addiu $t2, $t7, 0x005A ## $t2 = 0000005A -/* 00760 80977AF0 000A6600 */ sll $t4, $t2, 24 +/* 00760 80977AF0 000A6600 */ sll $t4, $t2, 24 /* 00764 80977AF4 01CCC025 */ or $t8, $t6, $t4 ## $t8 = FB000080 /* 00768 80977AF8 8D2E0174 */ lw $t6, 0x0174($t1) ## 00000174 /* 0076C 80977AFC 25AB0032 */ addiu $t3, $t5, 0x0032 ## $t3 = FA000111 /* 00770 80977B00 316F00FF */ andi $t7, $t3, 0x00FF ## $t7 = 00000011 -/* 00774 80977B04 000FCC00 */ sll $t9, $t7, 16 +/* 00774 80977B04 000FCC00 */ sll $t9, $t7, 16 /* 00778 80977B08 03195025 */ or $t2, $t8, $t9 ## $t2 = FB000080 /* 0077C 80977B0C 31CC00FF */ andi $t4, $t6, 0x00FF ## $t4 = 00000080 /* 00780 80977B10 014C6825 */ or $t5, $t2, $t4 ## $t5 = FB000080 @@ -126,20 +126,20 @@ glabel func_80977950 /* 007AC 80977B3C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 007B0 80977B40 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 /* 007B4 80977B44 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 007B8 80977B48 AFB80010 */ sw $t8, 0x0010($sp) -/* 007BC 80977B4C AFB90014 */ sw $t9, 0x0014($sp) -/* 007C0 80977B50 AFAE0018 */ sw $t6, 0x0018($sp) +/* 007B8 80977B48 AFB80010 */ sw $t8, 0x0010($sp) +/* 007BC 80977B4C AFB90014 */ sw $t9, 0x0014($sp) +/* 007C0 80977B50 AFAE0018 */ sw $t6, 0x0018($sp) /* 007C4 80977B54 844A0004 */ lh $t2, 0x0004($v0) ## 00000164 /* 007C8 80977B58 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 /* 007CC 80977B5C 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 007D0 80977B60 AFAA001C */ sw $t2, 0x001C($sp) +/* 007D0 80977B60 AFAA001C */ sw $t2, 0x001C($sp) /* 007D4 80977B64 844C0006 */ lh $t4, 0x0006($v0) ## 00000166 -/* 007D8 80977B68 AFAB0028 */ sw $t3, 0x0028($sp) -/* 007DC 80977B6C AFAD0024 */ sw $t5, 0x0024($sp) -/* 007E0 80977B70 AFA30054 */ sw $v1, 0x0054($sp) -/* 007E4 80977B74 0C0253D0 */ jal Draw_TwoTexScroll -/* 007E8 80977B78 AFAC0020 */ sw $t4, 0x0020($sp) -/* 007EC 80977B7C 8FA80054 */ lw $t0, 0x0054($sp) +/* 007D8 80977B68 AFAB0028 */ sw $t3, 0x0028($sp) +/* 007DC 80977B6C AFAD0024 */ sw $t5, 0x0024($sp) +/* 007E0 80977B70 AFA30054 */ sw $v1, 0x0054($sp) +/* 007E4 80977B74 0C0253D0 */ jal Draw_TwoTexScroll +/* 007E8 80977B78 AFAC0020 */ sw $t4, 0x0020($sp) +/* 007EC 80977B7C 8FA80054 */ lw $t0, 0x0054($sp) /* 007F0 80977B80 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 /* 007F4 80977B84 37180002 */ ori $t8, $t8, 0x0002 ## $t8 = DA380002 /* 007F8 80977B88 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -149,7 +149,7 @@ glabel func_80977950 /* 00808 80977B98 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 0080C 80977B9C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 00810 80977BA0 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 00814 80977BA4 8FB90080 */ lw $t9, 0x0080($sp) +/* 00814 80977BA4 8FB90080 */ lw $t9, 0x0080($sp) /* 00818 80977BA8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 /* 0081C 80977BAC 3C0BD838 */ lui $t3, 0xD838 ## $t3 = D8380000 /* 00820 80977BB0 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 @@ -169,12 +169,12 @@ glabel func_80977950 /* 00858 80977BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0085C 80977BEC 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 00860 80977BF0 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 00864 80977BF4 0C031AD5 */ jal func_800C6B54 +/* 00864 80977BF4 0C031AD5 */ jal func_800C6B54 /* 00868 80977BF8 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 0086C 80977BFC 8FBF003C */ lw $ra, 0x003C($sp) -/* 00870 80977C00 8FB00038 */ lw $s0, 0x0038($sp) +/* 0086C 80977BFC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00870 80977C00 8FB00038 */ lw $s0, 0x0038($sp) /* 00874 80977C04 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 00878 80977C08 03E00008 */ jr $ra +/* 00878 80977C08 03E00008 */ jr $ra /* 0087C 80977C0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s index d8a4588c08..932a94bc18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s @@ -1,42 +1,42 @@ glabel func_8097911C /* 007EC 8097911C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 007F0 80979120 AFBF001C */ sw $ra, 0x001C($sp) -/* 007F4 80979124 AFB00018 */ sw $s0, 0x0018($sp) -/* 007F8 80979128 AFA50064 */ sw $a1, 0x0064($sp) -/* 007FC 8097912C AFA60068 */ sw $a2, 0x0068($sp) +/* 007F0 80979120 AFBF001C */ sw $ra, 0x001C($sp) +/* 007F4 80979124 AFB00018 */ sw $s0, 0x0018($sp) +/* 007F8 80979128 AFA50064 */ sw $a1, 0x0064($sp) +/* 007FC 8097912C AFA60068 */ sw $a2, 0x0068($sp) /* 00800 80979130 848E016C */ lh $t6, 0x016C($a0) ## 0000016C -/* 00804 80979134 A7AE0056 */ sh $t6, 0x0056($sp) +/* 00804 80979134 A7AE0056 */ sh $t6, 0x0056($sp) /* 00808 80979138 848F016E */ lh $t7, 0x016E($a0) ## 0000016E -/* 0080C 8097913C A7AF0054 */ sh $t7, 0x0054($sp) +/* 0080C 8097913C A7AF0054 */ sh $t7, 0x0054($sp) /* 00810 80979140 84980170 */ lh $t8, 0x0170($a0) ## 00000170 -/* 00814 80979144 A7B80052 */ sh $t8, 0x0052($sp) +/* 00814 80979144 A7B80052 */ sh $t8, 0x0052($sp) /* 00818 80979148 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 0081C 8097914C 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 /* 00820 80979150 0C031A73 */ jal Graph_Alloc - + /* 00824 80979154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00828 80979158 3C068098 */ lui $a2, %hi(D_8097C020) ## $a2 = 80980000 -/* 0082C 8097915C AFA20048 */ sw $v0, 0x0048($sp) +/* 0082C 8097915C AFA20048 */ sw $v0, 0x0048($sp) /* 00830 80979160 24C6C020 */ addiu $a2, $a2, %lo(D_8097C020) ## $a2 = 8097C020 /* 00834 80979164 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 /* 00838 80979168 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0083C 8097916C 0C031AB1 */ jal func_800C6AC4 +/* 0083C 8097916C 0C031AB1 */ jal func_800C6AC4 /* 00840 80979170 240704A3 */ addiu $a3, $zero, 0x04A3 ## $a3 = 000004A3 -/* 00844 80979174 0C034213 */ jal Matrix_Push +/* 00844 80979174 0C034213 */ jal Matrix_Push /* 00848 80979178 00000000 */ nop -/* 0084C 8097917C 87A40056 */ lh $a0, 0x0056($sp) -/* 00850 80979180 87A50054 */ lh $a1, 0x0054($sp) -/* 00854 80979184 87A60052 */ lh $a2, 0x0052($sp) -/* 00858 80979188 0C034421 */ jal Matrix_RotateXYZ +/* 0084C 8097917C 87A40056 */ lh $a0, 0x0056($sp) +/* 00850 80979180 87A50054 */ lh $a1, 0x0054($sp) +/* 00854 80979184 87A60052 */ lh $a2, 0x0052($sp) +/* 00858 80979188 0C034421 */ jal Matrix_RotateZYX /* 0085C 8097918C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00860 80979190 3C058098 */ lui $a1, %hi(D_8097C030) ## $a1 = 80980000 /* 00864 80979194 24A5C030 */ addiu $a1, $a1, %lo(D_8097C030) ## $a1 = 8097C030 -/* 00868 80979198 8FA40048 */ lw $a0, 0x0048($sp) -/* 0086C 8097919C 0C034695 */ jal Matrix_ToMtx +/* 00868 80979198 8FA40048 */ lw $a0, 0x0048($sp) +/* 0086C 8097919C 0C034695 */ jal Matrix_ToMtx /* 00870 809791A0 240604A9 */ addiu $a2, $zero, 0x04A9 ## $a2 = 000004A9 -/* 00874 809791A4 0C034221 */ jal Matrix_Pull +/* 00874 809791A4 0C034221 */ jal Matrix_Pull /* 00878 809791A8 00000000 */ nop -/* 0087C 809791AC 0C024F46 */ jal func_80093D18 +/* 0087C 809791AC 0C024F46 */ jal func_80093D18 /* 00880 809791B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00884 809791B4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00888 809791B8 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -44,7 +44,7 @@ glabel func_8097911C /* 00890 809791C0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 00894 809791C4 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 00898 809791C8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0089C 809791CC 8FAA0048 */ lw $t2, 0x0048($sp) +/* 0089C 809791CC 8FAA0048 */ lw $t2, 0x0048($sp) /* 008A0 809791D0 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 008A4 809791D4 3C0FD838 */ lui $t7, 0xD838 ## $t7 = D8380000 /* 008A8 809791D8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 @@ -54,7 +54,7 @@ glabel func_8097911C /* 008B8 809791E8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 008BC 809791EC AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 008C0 809791F0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 008C4 809791F4 8FAD0068 */ lw $t5, 0x0068($sp) +/* 008C4 809791F4 8FAD0068 */ lw $t5, 0x0068($sp) /* 008C8 809791F8 3C068098 */ lui $a2, %hi(D_8097C040) ## $a2 = 80980000 /* 008CC 809791FC 24C6C040 */ addiu $a2, $a2, %lo(D_8097C040) ## $a2 = 8097C040 /* 008D0 80979200 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 @@ -65,12 +65,12 @@ glabel func_8097911C /* 008E4 80979214 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 008E8 80979218 240704B1 */ addiu $a3, $zero, 0x04B1 ## $a3 = 000004B1 /* 008EC 8097921C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 008F0 80979220 0C031AD5 */ jal func_800C6B54 +/* 008F0 80979220 0C031AD5 */ jal func_800C6B54 /* 008F4 80979224 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008F8 80979228 8FBF001C */ lw $ra, 0x001C($sp) -/* 008FC 8097922C 8FB00018 */ lw $s0, 0x0018($sp) +/* 008F8 80979228 8FBF001C */ lw $ra, 0x001C($sp) +/* 008FC 8097922C 8FB00018 */ lw $s0, 0x0018($sp) /* 00900 80979230 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 00904 80979234 03E00008 */ jr $ra +/* 00904 80979234 03E00008 */ jr $ra /* 00908 80979238 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s index dc6a2c7219..91a058c8be 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s @@ -1,19 +1,19 @@ glabel EnBa_Draw /* 018D8 809B7C28 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 018DC 809B7C2C AFB20048 */ sw $s2, 0x0048($sp) +/* 018DC 809B7C2C AFB20048 */ sw $s2, 0x0048($sp) /* 018E0 809B7C30 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 018E4 809B7C34 AFBF005C */ sw $ra, 0x005C($sp) -/* 018E8 809B7C38 AFB60058 */ sw $s6, 0x0058($sp) -/* 018EC 809B7C3C AFB50054 */ sw $s5, 0x0054($sp) -/* 018F0 809B7C40 AFB40050 */ sw $s4, 0x0050($sp) -/* 018F4 809B7C44 AFB3004C */ sw $s3, 0x004C($sp) -/* 018F8 809B7C48 AFB10044 */ sw $s1, 0x0044($sp) -/* 018FC 809B7C4C AFB00040 */ sw $s0, 0x0040($sp) -/* 01900 809B7C50 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 01904 809B7C54 AFA500C4 */ sw $a1, 0x00C4($sp) +/* 018E4 809B7C34 AFBF005C */ sw $ra, 0x005C($sp) +/* 018E8 809B7C38 AFB60058 */ sw $s6, 0x0058($sp) +/* 018EC 809B7C3C AFB50054 */ sw $s5, 0x0054($sp) +/* 018F0 809B7C40 AFB40050 */ sw $s4, 0x0050($sp) +/* 018F4 809B7C44 AFB3004C */ sw $s3, 0x004C($sp) +/* 018F8 809B7C48 AFB10044 */ sw $s1, 0x0044($sp) +/* 018FC 809B7C4C AFB00040 */ sw $s0, 0x0040($sp) +/* 01900 809B7C50 F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 01904 809B7C54 AFA500C4 */ sw $a1, 0x00C4($sp) /* 01908 809B7C58 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 0190C 809B7C5C 0C031A73 */ jal Graph_Alloc - + /* 01910 809B7C60 24050380 */ addiu $a1, $zero, 0x0380 ## $a1 = 00000380 /* 01914 809B7C64 3C18809C */ lui $t8, %hi(D_809B8124) ## $t8 = 809C0000 /* 01918 809B7C68 27188124 */ addiu $t8, $t8, %lo(D_809B8124) ## $t8 = 809B8124 @@ -25,24 +25,24 @@ glabel EnBa_Draw /* 01930 809B7C80 ADF90004 */ sw $t9, 0x0004($t7) ## FFFFFFE8 /* 01934 809B7C84 3C06809C */ lui $a2, %hi(D_809B8130) ## $a2 = 809C0000 /* 01938 809B7C88 ADE90008 */ sw $t1, 0x0008($t7) ## FFFFFFEC -/* 0193C 809B7C8C 8FAA00C4 */ lw $t2, 0x00C4($sp) +/* 0193C 809B7C8C 8FAA00C4 */ lw $t2, 0x00C4($sp) /* 01940 809B7C90 00409825 */ or $s3, $v0, $zero ## $s3 = 00000000 /* 01944 809B7C94 24C68130 */ addiu $a2, $a2, %lo(D_809B8130) ## $a2 = 809B8130 /* 01948 809B7C98 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0194C 809B7C9C 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD0 /* 01950 809B7CA0 240703A5 */ addiu $a3, $zero, 0x03A5 ## $a3 = 000003A5 -/* 01954 809B7CA4 0C031AB1 */ jal func_800C6AC4 +/* 01954 809B7CA4 0C031AB1 */ jal func_800C6AC4 /* 01958 809B7CA8 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 0195C 809B7CAC 8FAB00C4 */ lw $t3, 0x00C4($sp) -/* 01960 809B7CB0 0C024F46 */ jal func_80093D18 +/* 0195C 809B7CAC 8FAB00C4 */ lw $t3, 0x00C4($sp) +/* 01960 809B7CB0 0C024F46 */ jal func_80093D18 /* 01964 809B7CB4 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 01968 809B7CB8 864C001C */ lh $t4, 0x001C($s2) ## 0000001C /* 0196C 809B7CBC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 01970 809B7CC0 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 01974 809B7CC4 29810003 */ slti $at, $t4, 0x0003 -/* 01978 809B7CC8 10200096 */ beq $at, $zero, .L809B7F24 +/* 01974 809B7CC4 29810003 */ slti $at, $t4, 0x0003 +/* 01978 809B7CC8 10200096 */ beq $at, $zero, .L809B7F24 /* 0197C 809B7CCC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01980 809B7CD0 0C034213 */ jal Matrix_Push +/* 01980 809B7CD0 0C034213 */ jal Matrix_Push /* 01984 809B7CD4 00000000 */ nop /* 01988 809B7CD8 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 /* 0198C 809B7CDC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -60,23 +60,23 @@ glabel EnBa_Draw /* 019BC 809B7D0C 8659001C */ lh $t9, 0x001C($s2) ## 0000001C /* 019C0 809B7D10 3C04809C */ lui $a0, %hi(D_809B8118) ## $a0 = 809C0000 /* 019C4 809B7D14 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 019C8 809B7D18 00194880 */ sll $t1, $t9, 2 -/* 019CC 809B7D1C 00892021 */ addu $a0, $a0, $t1 -/* 019D0 809B7D20 8C848118 */ lw $a0, %lo(D_809B8118)($a0) +/* 019C8 809B7D18 00194880 */ sll $t1, $t9, 2 +/* 019CC 809B7D1C 00892021 */ addu $a0, $a0, $t1 +/* 019D0 809B7D20 8C848118 */ lw $a0, %lo(D_809B8118)($a0) /* 019D4 809B7D24 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 019D8 809B7D28 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 019DC 809B7D2C 00045900 */ sll $t3, $a0, 4 -/* 019E0 809B7D30 000B6702 */ srl $t4, $t3, 28 -/* 019E4 809B7D34 000C6880 */ sll $t5, $t4, 2 -/* 019E8 809B7D38 01CD7021 */ addu $t6, $t6, $t5 +/* 019DC 809B7D2C 00045900 */ sll $t3, $a0, 4 +/* 019E0 809B7D30 000B6702 */ srl $t4, $t3, 28 +/* 019E4 809B7D34 000C6880 */ sll $t5, $t4, 2 +/* 019E8 809B7D38 01CD7021 */ addu $t6, $t6, $t5 /* 019EC 809B7D3C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 019F0 809B7D40 00815024 */ and $t2, $a0, $at +/* 019F0 809B7D40 00815024 */ and $t2, $a0, $at /* 019F4 809B7D44 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 019F8 809B7D48 014E7821 */ addu $t7, $t2, $t6 -/* 019FC 809B7D4C 01E1C021 */ addu $t8, $t7, $at +/* 019F8 809B7D48 014E7821 */ addu $t7, $t2, $t6 +/* 019FC 809B7D4C 01E1C021 */ addu $t8, $t7, $at /* 01A00 809B7D50 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01A04 809B7D54 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 -/* 01A08 809B7D58 8FA300C4 */ lw $v1, 0x00C4($sp) +/* 01A08 809B7D58 8FA300C4 */ lw $v1, 0x00C4($sp) /* 01A0C 809B7D5C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 01A10 809B7D60 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01A14 809B7D64 AED902C0 */ sw $t9, 0x02C0($s6) ## 000002C0 @@ -87,26 +87,26 @@ glabel EnBa_Draw /* 01A28 809B7D78 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01A2C 809B7D7C 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 /* 01A30 809B7D80 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 01A34 809B7D84 AFAB0010 */ sw $t3, 0x0010($sp) -/* 01A38 809B7D88 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01A3C 809B7D8C AFAD0018 */ sw $t5, 0x0018($sp) -/* 01A40 809B7D90 AFA0001C */ sw $zero, 0x001C($sp) -/* 01A44 809B7D94 01435021 */ addu $t2, $t2, $v1 +/* 01A34 809B7D84 AFAB0010 */ sw $t3, 0x0010($sp) +/* 01A38 809B7D88 AFAC0014 */ sw $t4, 0x0014($sp) +/* 01A3C 809B7D8C AFAD0018 */ sw $t5, 0x0018($sp) +/* 01A40 809B7D90 AFA0001C */ sw $zero, 0x001C($sp) +/* 01A44 809B7D94 01435021 */ addu $t2, $t2, $v1 /* 01A48 809B7D98 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 /* 01A4C 809B7D9C 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 /* 01A50 809B7DA0 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 01A54 809B7DA4 000A0823 */ subu $at, $zero, $t2 -/* 01A58 809B7DA8 00017080 */ sll $t6, $at, 2 -/* 01A5C 809B7DAC 01C17021 */ addu $t6, $t6, $at -/* 01A60 809B7DB0 000E7040 */ sll $t6, $t6, 1 +/* 01A54 809B7DA4 000A0823 */ subu $at, $zero, $t2 +/* 01A58 809B7DA8 00017080 */ sll $t6, $at, 2 +/* 01A5C 809B7DAC 01C17021 */ addu $t6, $t6, $at +/* 01A60 809B7DB0 000E7040 */ sll $t6, $t6, 1 /* 01A64 809B7DB4 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000000 -/* 01A68 809B7DB8 AFAF0020 */ sw $t7, 0x0020($sp) -/* 01A6C 809B7DBC AFB80024 */ sw $t8, 0x0024($sp) -/* 01A70 809B7DC0 AFB90028 */ sw $t9, 0x0028($sp) +/* 01A68 809B7DB8 AFAF0020 */ sw $t7, 0x0020($sp) +/* 01A6C 809B7DBC AFB80024 */ sw $t8, 0x0024($sp) +/* 01A70 809B7DC0 AFB90028 */ sw $t9, 0x0028($sp) /* 01A74 809B7DC4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01A78 809B7DC8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01A7C 809B7DCC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01A80 809B7DD0 0C0253D0 */ jal Draw_TwoTexScroll +/* 01A80 809B7DD0 0C0253D0 */ jal Draw_TwoTexScroll /* 01A84 809B7DD4 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 01A88 809B7DD8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 01A8C 809B7DDC 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 @@ -115,62 +115,62 @@ glabel EnBa_Draw /* 01A98 809B7DE8 2415000D */ addiu $s5, $zero, 0x000D ## $s5 = 0000000D /* 01A9C 809B7DEC 24140006 */ addiu $s4, $zero, 0x0006 ## $s4 = 00000006 .L809B7DF0: -/* 01AA0 809B7DF0 00114880 */ sll $t1, $s1, 2 -/* 01AA4 809B7DF4 01314823 */ subu $t1, $t1, $s1 -/* 01AA8 809B7DF8 00094880 */ sll $t1, $t1, 2 -/* 01AAC 809B7DFC 02498021 */ addu $s0, $s2, $t1 +/* 01AA0 809B7DF0 00114880 */ sll $t1, $s1, 2 +/* 01AA4 809B7DF4 01314823 */ subu $t1, $t1, $s1 +/* 01AA8 809B7DF8 00094880 */ sll $t1, $t1, 2 +/* 01AAC 809B7DFC 02498021 */ addu $s0, $s2, $t1 /* 01AB0 809B7E00 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000158 /* 01AB4 809B7E04 C60E015C */ lwc1 $f14, 0x015C($s0) ## 0000015C /* 01AB8 809B7E08 8E060160 */ lw $a2, 0x0160($s0) ## 00000160 -/* 01ABC 809B7E0C 0C034261 */ jal Matrix_Translate +/* 01ABC 809B7E0C 0C034261 */ jal Matrix_Translate /* 01AC0 809B7E10 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01AC4 809B7E14 02340019 */ multu $s1, $s4 +/* 01AC4 809B7E14 02340019 */ multu $s1, $s4 /* 01AC8 809B7E18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01ACC 809B7E1C 00005812 */ mflo $t3 -/* 01AD0 809B7E20 024B1021 */ addu $v0, $s2, $t3 +/* 01ACC 809B7E1C 00005812 */ mflo $t3 +/* 01AD0 809B7E20 024B1021 */ addu $v0, $s2, $t3 /* 01AD4 809B7E24 844402A8 */ lh $a0, 0x02A8($v0) ## 000002A8 /* 01AD8 809B7E28 844502AA */ lh $a1, 0x02AA($v0) ## 000002AA -/* 01ADC 809B7E2C 0C034421 */ jal Matrix_RotateXYZ +/* 01ADC 809B7E2C 0C034421 */ jal Matrix_RotateZYX /* 01AE0 809B7E30 844602AC */ lh $a2, 0x02AC($v0) ## 000002AC /* 01AE4 809B7E34 C60C0200 */ lwc1 $f12, 0x0200($s0) ## 00000200 /* 01AE8 809B7E38 C60E0204 */ lwc1 $f14, 0x0204($s0) ## 00000204 /* 01AEC 809B7E3C 8E060208 */ lw $a2, 0x0208($s0) ## 00000208 -/* 01AF0 809B7E40 0C0342A3 */ jal Matrix_Scale +/* 01AF0 809B7E40 0C0342A3 */ jal Matrix_Scale /* 01AF4 809B7E44 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01AF8 809B7E48 12340003 */ beq $s1, $s4, .L809B7E58 +/* 01AF8 809B7E48 12340003 */ beq $s1, $s4, .L809B7E58 /* 01AFC 809B7E4C 00000000 */ nop -/* 01B00 809B7E50 16350010 */ bne $s1, $s5, .L809B7E94 +/* 01B00 809B7E50 16350010 */ bne $s1, $s5, .L809B7E94 /* 01B04 809B7E54 00000000 */ nop .L809B7E58: -/* 01B08 809B7E58 16350006 */ bne $s1, $s5, .L809B7E74 +/* 01B08 809B7E58 16350006 */ bne $s1, $s5, .L809B7E74 /* 01B0C 809B7E5C 26500320 */ addiu $s0, $s2, 0x0320 ## $s0 = 00000320 /* 01B10 809B7E60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01B14 809B7E64 0C018A29 */ jal func_800628A4 +/* 01B14 809B7E64 0C018A29 */ jal func_800628A4 /* 01B18 809B7E68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000320 -/* 01B1C 809B7E6C 10000009 */ beq $zero, $zero, .L809B7E94 +/* 01B1C 809B7E6C 10000009 */ beq $zero, $zero, .L809B7E94 /* 01B20 809B7E70 00000000 */ nop .L809B7E74: -/* 01B24 809B7E74 4600A306 */ mov.s $f12, $f20 -/* 01B28 809B7E78 4600A386 */ mov.s $f14, $f20 +/* 01B24 809B7E74 4600A306 */ mov.s $f12, $f20 +/* 01B28 809B7E78 4600A386 */ mov.s $f14, $f20 /* 01B2C 809B7E7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B30 809B7E80 0C0342A3 */ jal Matrix_Scale +/* 01B30 809B7E80 0C0342A3 */ jal Matrix_Scale /* 01B34 809B7E84 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01B38 809B7E88 24040008 */ addiu $a0, $zero, 0x0008 ## $a0 = 00000008 -/* 01B3C 809B7E8C 0C018A29 */ jal func_800628A4 +/* 01B3C 809B7E8C 0C018A29 */ jal func_800628A4 /* 01B40 809B7E90 02002825 */ or $a1, $s0, $zero ## $a1 = 00000320 .L809B7E94: /* 01B44 809B7E94 3C05809C */ lui $a1, %hi(D_809B8140) ## $a1 = 809C0000 /* 01B48 809B7E98 24A58140 */ addiu $a1, $a1, %lo(D_809B8140) ## $a1 = 809B8140 /* 01B4C 809B7E9C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01B50 809B7EA0 0C034695 */ jal Matrix_ToMtx +/* 01B50 809B7EA0 0C034695 */ jal Matrix_ToMtx /* 01B54 809B7EA4 240603CA */ addiu $a2, $zero, 0x03CA ## $a2 = 000003CA /* 01B58 809B7EA8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 01B5C 809B7EAC 00118C00 */ sll $s1, $s1, 16 -/* 01B60 809B7EB0 00118C03 */ sra $s1, $s1, 16 -/* 01B64 809B7EB4 2A21000E */ slti $at, $s1, 0x000E -/* 01B68 809B7EB8 1420FFCD */ bne $at, $zero, .L809B7DF0 +/* 01B5C 809B7EAC 00118C00 */ sll $s1, $s1, 16 +/* 01B60 809B7EB0 00118C03 */ sra $s1, $s1, 16 +/* 01B64 809B7EB4 2A21000E */ slti $at, $s1, 0x000E +/* 01B68 809B7EB8 1420FFCD */ bne $at, $zero, .L809B7DF0 /* 01B6C 809B7EBC 26730040 */ addiu $s3, $s3, 0x0040 ## $s3 = 00000040 -/* 01B70 809B7EC0 0C034221 */ jal Matrix_Pull +/* 01B70 809B7EC0 0C034221 */ jal Matrix_Pull /* 01B74 809B7EC4 00000000 */ nop /* 01B78 809B7EC8 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 /* 01B7C 809B7ECC 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 @@ -178,12 +178,12 @@ glabel EnBa_Draw /* 01B84 809B7ED4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 01B88 809B7ED8 AECC02C0 */ sw $t4, 0x02C0($s6) ## 000002C0 /* 01B8C 809B7EDC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01B90 809B7EE0 8FAA00C4 */ lw $t2, 0x00C4($sp) +/* 01B90 809B7EE0 8FAA00C4 */ lw $t2, 0x00C4($sp) /* 01B94 809B7EE4 3C05809C */ lui $a1, %hi(D_809B8150) ## $a1 = 809C0000 /* 01B98 809B7EE8 24A58150 */ addiu $a1, $a1, %lo(D_809B8150) ## $a1 = 809B8150 /* 01B9C 809B7EEC 240603CD */ addiu $a2, $zero, 0x03CD ## $a2 = 000003CD /* 01BA0 809B7EF0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01BA4 809B7EF4 0C0346A2 */ jal Matrix_NewMtx +/* 01BA4 809B7EF4 0C0346A2 */ jal Matrix_NewMtx /* 01BA8 809B7EF8 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 01BAC 809B7EFC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01BB0 809B7F00 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 @@ -193,7 +193,7 @@ glabel EnBa_Draw /* 01BC0 809B7F10 AECE02C0 */ sw $t6, 0x02C0($s6) ## 000002C0 /* 01BC4 809B7F14 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 01BC8 809B7F18 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01BCC 809B7F1C 1000003E */ beq $zero, $zero, .L809B8018 +/* 01BCC 809B7F1C 1000003E */ beq $zero, $zero, .L809B8018 /* 01BD0 809B7F20 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L809B7F24: /* 01BD4 809B7F24 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 @@ -202,29 +202,29 @@ glabel EnBa_Draw /* 01BE0 809B7F30 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01BE4 809B7F34 AED902C0 */ sw $t9, 0x02C0($s6) ## 000002C0 /* 01BE8 809B7F38 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01BEC 809B7F3C 8FAB00C4 */ lw $t3, 0x00C4($sp) +/* 01BEC 809B7F3C 8FAB00C4 */ lw $t3, 0x00C4($sp) /* 01BF0 809B7F40 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 /* 01BF4 809B7F44 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01BF8 809B7F48 006B1821 */ addu $v1, $v1, $t3 +/* 01BF8 809B7F48 006B1821 */ addu $v1, $v1, $t3 /* 01BFC 809B7F4C 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 /* 01C00 809B7F50 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 01C04 809B7F54 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 01C08 809B7F58 00030823 */ subu $at, $zero, $v1 -/* 01C0C 809B7F5C 00014080 */ sll $t0, $at, 2 -/* 01C10 809B7F60 01014021 */ addu $t0, $t0, $at -/* 01C14 809B7F64 00033040 */ sll $a2, $v1, 1 +/* 01C08 809B7F58 00030823 */ subu $at, $zero, $v1 +/* 01C0C 809B7F5C 00014080 */ sll $t0, $at, 2 +/* 01C10 809B7F60 01014021 */ addu $t0, $t0, $at +/* 01C14 809B7F64 00033040 */ sll $a2, $v1, 1 /* 01C18 809B7F68 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 01C1C 809B7F6C 3108007F */ andi $t0, $t0, 0x007F ## $t0 = 00000000 /* 01C20 809B7F70 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 01C24 809B7F74 AFAF0028 */ sw $t7, 0x0028($sp) -/* 01C28 809B7F78 AFA8001C */ sw $t0, 0x001C($sp) -/* 01C2C 809B7F7C AFA80020 */ sw $t0, 0x0020($sp) +/* 01C24 809B7F74 AFAF0028 */ sw $t7, 0x0028($sp) +/* 01C28 809B7F78 AFA8001C */ sw $t0, 0x001C($sp) +/* 01C2C 809B7F7C AFA80020 */ sw $t0, 0x0020($sp) /* 01C30 809B7F80 00C03825 */ or $a3, $a2, $zero ## $a3 = 00000000 -/* 01C34 809B7F84 AFAE0024 */ sw $t6, 0x0024($sp) -/* 01C38 809B7F88 AFAA0018 */ sw $t2, 0x0018($sp) -/* 01C3C 809B7F8C AFAD0014 */ sw $t5, 0x0014($sp) -/* 01C40 809B7F90 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01C44 809B7F94 0C0253D0 */ jal Draw_TwoTexScroll +/* 01C34 809B7F84 AFAE0024 */ sw $t6, 0x0024($sp) +/* 01C38 809B7F88 AFAA0018 */ sw $t2, 0x0018($sp) +/* 01C3C 809B7F8C AFAD0014 */ sw $t5, 0x0014($sp) +/* 01C40 809B7F90 AFAC0010 */ sw $t4, 0x0010($sp) +/* 01C44 809B7F94 0C0253D0 */ jal Draw_TwoTexScroll /* 01C48 809B7F98 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 01C4C 809B7F9C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01C50 809B7FA0 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 @@ -241,12 +241,12 @@ glabel EnBa_Draw /* 01C7C 809B7FCC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01C80 809B7FD0 AECB02C0 */ sw $t3, 0x02C0($s6) ## 000002C0 /* 01C84 809B7FD4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01C88 809B7FD8 8FAD00C4 */ lw $t5, 0x00C4($sp) +/* 01C88 809B7FD8 8FAD00C4 */ lw $t5, 0x00C4($sp) /* 01C8C 809B7FDC 3C05809C */ lui $a1, %hi(D_809B8160) ## $a1 = 809C0000 /* 01C90 809B7FE0 24A58160 */ addiu $a1, $a1, %lo(D_809B8160) ## $a1 = 809B8160 /* 01C94 809B7FE4 240603DF */ addiu $a2, $zero, 0x03DF ## $a2 = 000003DF /* 01C98 809B7FE8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01C9C 809B7FEC 0C0346A2 */ jal Matrix_NewMtx +/* 01C9C 809B7FEC 0C0346A2 */ jal Matrix_NewMtx /* 01CA0 809B7FF0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 01CA4 809B7FF4 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01CA8 809B7FF8 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 @@ -258,22 +258,22 @@ glabel EnBa_Draw /* 01CC0 809B8010 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 01CC4 809B8014 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 .L809B8018: -/* 01CC8 809B8018 8FB800C4 */ lw $t8, 0x00C4($sp) +/* 01CC8 809B8018 8FB800C4 */ lw $t8, 0x00C4($sp) /* 01CCC 809B801C 3C06809C */ lui $a2, %hi(D_809B8170) ## $a2 = 809C0000 /* 01CD0 809B8020 24C68170 */ addiu $a2, $a2, %lo(D_809B8170) ## $a2 = 809B8170 /* 01CD4 809B8024 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD0 /* 01CD8 809B8028 240703E3 */ addiu $a3, $zero, 0x03E3 ## $a3 = 000003E3 -/* 01CDC 809B802C 0C031AD5 */ jal func_800C6B54 +/* 01CDC 809B802C 0C031AD5 */ jal func_800C6B54 /* 01CE0 809B8030 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 01CE4 809B8034 8FBF005C */ lw $ra, 0x005C($sp) -/* 01CE8 809B8038 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 01CEC 809B803C 8FB00040 */ lw $s0, 0x0040($sp) -/* 01CF0 809B8040 8FB10044 */ lw $s1, 0x0044($sp) -/* 01CF4 809B8044 8FB20048 */ lw $s2, 0x0048($sp) -/* 01CF8 809B8048 8FB3004C */ lw $s3, 0x004C($sp) -/* 01CFC 809B804C 8FB40050 */ lw $s4, 0x0050($sp) -/* 01D00 809B8050 8FB50054 */ lw $s5, 0x0054($sp) -/* 01D04 809B8054 8FB60058 */ lw $s6, 0x0058($sp) -/* 01D08 809B8058 03E00008 */ jr $ra +/* 01CE4 809B8034 8FBF005C */ lw $ra, 0x005C($sp) +/* 01CE8 809B8038 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 01CEC 809B803C 8FB00040 */ lw $s0, 0x0040($sp) +/* 01CF0 809B8040 8FB10044 */ lw $s1, 0x0044($sp) +/* 01CF4 809B8044 8FB20048 */ lw $s2, 0x0048($sp) +/* 01CF8 809B8048 8FB3004C */ lw $s3, 0x004C($sp) +/* 01CFC 809B804C 8FB40050 */ lw $s4, 0x0050($sp) +/* 01D00 809B8050 8FB50054 */ lw $s5, 0x0054($sp) +/* 01D04 809B8054 8FB60058 */ lw $s6, 0x0058($sp) +/* 01D08 809B8058 03E00008 */ jr $ra /* 01D0C 809B805C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s index d5841d803e..dcc2114f5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s @@ -1,42 +1,42 @@ glabel func_809B65A8 /* 00258 809B65A8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 0025C 809B65AC AFBF003C */ sw $ra, 0x003C($sp) -/* 00260 809B65B0 AFB70038 */ sw $s7, 0x0038($sp) -/* 00264 809B65B4 AFB60034 */ sw $s6, 0x0034($sp) -/* 00268 809B65B8 AFB50030 */ sw $s5, 0x0030($sp) -/* 0026C 809B65BC AFB4002C */ sw $s4, 0x002C($sp) -/* 00270 809B65C0 AFB30028 */ sw $s3, 0x0028($sp) -/* 00274 809B65C4 AFB20024 */ sw $s2, 0x0024($sp) -/* 00278 809B65C8 AFB10020 */ sw $s1, 0x0020($sp) -/* 0027C 809B65CC AFB0001C */ sw $s0, 0x001C($sp) +/* 0025C 809B65AC AFBF003C */ sw $ra, 0x003C($sp) +/* 00260 809B65B0 AFB70038 */ sw $s7, 0x0038($sp) +/* 00264 809B65B4 AFB60034 */ sw $s6, 0x0034($sp) +/* 00268 809B65B8 AFB50030 */ sw $s5, 0x0030($sp) +/* 0026C 809B65BC AFB4002C */ sw $s4, 0x002C($sp) +/* 00270 809B65C0 AFB30028 */ sw $s3, 0x0028($sp) +/* 00274 809B65C4 AFB20024 */ sw $s2, 0x0024($sp) +/* 00278 809B65C8 AFB10020 */ sw $s1, 0x0020($sp) +/* 0027C 809B65CC AFB0001C */ sw $s0, 0x001C($sp) /* 00280 809B65D0 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00284 809B65D4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 00288 809B65D8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0028C 809B65DC AFAE006C */ sw $t6, 0x006C($sp) +/* 0028C 809B65DC AFAE006C */ sw $t6, 0x006C($sp) /* 00290 809B65E0 908F00AE */ lbu $t7, 0x00AE($a0) ## 000000AE /* 00294 809B65E4 0080B025 */ or $s6, $a0, $zero ## $s6 = 00000000 -/* 00298 809B65E8 15E10015 */ bne $t7, $at, .L809B6640 +/* 00298 809B65E8 15E10015 */ bne $t7, $at, .L809B6640 /* 0029C 809B65EC 3C01432F */ lui $at, 0x432F ## $at = 432F0000 /* 002A0 809B65F0 44812000 */ mtc1 $at, $f4 ## $f4 = 175.00 /* 002A4 809B65F4 C4860090 */ lwc1 $f6, 0x0090($a0) ## 00000090 /* 002A8 809B65F8 3C0143A5 */ lui $at, 0x43A5 ## $at = 43A50000 -/* 002AC 809B65FC 4606203C */ c.lt.s $f4, $f6 +/* 002AC 809B65FC 4606203C */ c.lt.s $f4, $f6 /* 002B0 809B6600 00000000 */ nop -/* 002B4 809B6604 4502000F */ bc1fl .L809B6644 +/* 002B4 809B6604 4502000F */ bc1fl .L809B6644 /* 002B8 809B6608 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 002BC 809B660C C6C8000C */ lwc1 $f8, 0x000C($s6) ## 0000000C /* 002C0 809B6610 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 002C4 809B6614 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 002C8 809B6618 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 002CC 809B661C 460A4400 */ add.s $f16, $f8, $f10 +/* 002CC 809B661C 460A4400 */ add.s $f16, $f8, $f10 /* 002D0 809B6620 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 002D4 809B6624 3C0740E0 */ lui $a3, 0x40E0 ## $a3 = 40E00000 -/* 002D8 809B6628 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 002DC 809B662C 44058000 */ mfc1 $a1, $f16 +/* 002D8 809B6628 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 002DC 809B662C 44058000 */ mfc1 $a1, $f16 /* 002E0 809B6630 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 002E4 809B6634 00000000 */ nop -/* 002E8 809B6638 10000010 */ beq $zero, $zero, .L809B667C +/* 002E8 809B6638 10000010 */ beq $zero, $zero, .L809B667C /* 002EC 809B663C 8EC90024 */ lw $t1, 0x0024($s6) ## 00000024 .L809B6640: /* 002F0 809B6640 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -45,56 +45,56 @@ glabel func_809B65A8 /* 002F8 809B6648 C6C4000C */ lwc1 $f4, 0x000C($s6) ## 0000000C /* 002FC 809B664C 8ED80004 */ lw $t8, 0x0004($s6) ## 00000004 /* 00300 809B6650 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00304 809B6654 46062200 */ add.s $f8, $f4, $f6 +/* 00304 809B6654 46062200 */ add.s $f8, $f4, $f6 /* 00308 809B6658 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0030C 809B665C AED90004 */ sw $t9, 0x0004($s6) ## 00000004 /* 00310 809B6660 26C40028 */ addiu $a0, $s6, 0x0028 ## $a0 = 00000028 -/* 00314 809B6664 44054000 */ mfc1 $a1, $f8 +/* 00314 809B6664 44054000 */ mfc1 $a1, $f8 /* 00318 809B6668 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0031C 809B666C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00320 809B6670 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00324 809B6674 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 00324 809B6674 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00328 809B6678 8EC90024 */ lw $t1, 0x0024($s6) ## 00000024 .L809B667C: /* 0032C 809B667C 26D502FC */ addiu $s5, $s6, 0x02FC ## $s5 = 000002FC /* 00330 809B6680 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 /* 00334 809B6684 AEA90000 */ sw $t1, 0x0000($s5) ## 000002FC /* 00338 809B6688 8EC80028 */ lw $t0, 0x0028($s6) ## 00000028 -/* 0033C 809B668C 01505021 */ addu $t2, $t2, $s0 +/* 0033C 809B668C 01505021 */ addu $t2, $t2, $s0 /* 00340 809B6690 AEA80004 */ sw $t0, 0x0004($s5) ## 00000300 /* 00344 809B6694 8EC9002C */ lw $t1, 0x002C($s6) ## 0000002C /* 00348 809B6698 AEA90008 */ sw $t1, 0x0008($s5) ## 00000304 /* 0034C 809B669C 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 /* 00350 809B66A0 314B000F */ andi $t3, $t2, 0x000F ## $t3 = 00000000 -/* 00354 809B66A4 1560001A */ bne $t3, $zero, .L809B6710 +/* 00354 809B66A4 1560001A */ bne $t3, $zero, .L809B6710 /* 00358 809B66A8 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 0035C 809B66AC 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 /* 00360 809B66B0 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00364 809B66B4 00000000 */ nop /* 00368 809B66B8 C6D00310 */ lwc1 $f16, 0x0310($s6) ## 00000310 /* 0036C 809B66BC 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00370 809B66C0 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 -/* 00374 809B66C4 46008480 */ add.s $f18, $f16, $f0 +/* 00374 809B66C4 46008480 */ add.s $f18, $f16, $f0 /* 00378 809B66C8 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0037C 809B66CC E6D20310 */ swc1 $f18, 0x0310($s6) ## 00000310 /* 00380 809B66D0 C6C40314 */ lwc1 $f4, 0x0314($s6) ## 00000314 /* 00384 809B66D4 C6CC0310 */ lwc1 $f12, 0x0310($s6) ## 00000310 -/* 00388 809B66D8 46002180 */ add.s $f6, $f4, $f0 -/* 0038C 809B66DC 0C0329C8 */ jal func_800CA720 +/* 00388 809B66D8 46002180 */ add.s $f6, $f4, $f0 +/* 0038C 809B66DC 0C0329C8 */ jal func_800CA720 /* 00390 809B66E0 E6C60314 */ swc1 $f6, 0x0314($s6) ## 00000314 /* 00394 809B66E4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00398 809B66E8 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 /* 0039C 809B66EC C6CC0314 */ lwc1 $f12, 0x0314($s6) ## 00000314 -/* 003A0 809B66F0 46080282 */ mul.s $f10, $f0, $f8 -/* 003A4 809B66F4 0C0329DD */ jal func_800CA774 +/* 003A0 809B66F0 46080282 */ mul.s $f10, $f0, $f8 +/* 003A4 809B66F4 0C0329DD */ jal func_800CA774 /* 003A8 809B66F8 E6CA0308 */ swc1 $f10, 0x0308($s6) ## 00000308 /* 003AC 809B66FC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 003B0 809B6700 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 /* 003B4 809B6704 00000000 */ nop -/* 003B8 809B6708 46100482 */ mul.s $f18, $f0, $f16 +/* 003B8 809B6708 46100482 */ mul.s $f18, $f0, $f16 /* 003BC 809B670C E6D2030C */ swc1 $f18, 0x030C($s6) ## 0000030C .L809B6710: /* 003C0 809B6710 3C0143E0 */ lui $at, 0x43E0 ## $at = 43E00000 @@ -102,22 +102,22 @@ glabel func_809B65A8 /* 003C8 809B6718 C6C40300 */ lwc1 $f4, 0x0300($s6) ## 00000300 /* 003CC 809B671C C6CA02FC */ lwc1 $f10, 0x02FC($s6) ## 000002FC /* 003D0 809B6720 C6D00308 */ lwc1 $f16, 0x0308($s6) ## 00000308 -/* 003D4 809B6724 46062201 */ sub.s $f8, $f4, $f6 +/* 003D4 809B6724 46062201 */ sub.s $f8, $f4, $f6 /* 003D8 809B6728 C6C6030C */ lwc1 $f6, 0x030C($s6) ## 0000030C /* 003DC 809B672C C6C40304 */ lwc1 $f4, 0x0304($s6) ## 00000304 -/* 003E0 809B6730 46105480 */ add.s $f18, $f10, $f16 +/* 003E0 809B6730 46105480 */ add.s $f18, $f10, $f16 /* 003E4 809B6734 E6C80300 */ swc1 $f8, 0x0300($s6) ## 00000300 /* 003E8 809B6738 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 003EC 809B673C 46062200 */ add.s $f8, $f4, $f6 +/* 003EC 809B673C 46062200 */ add.s $f8, $f4, $f6 /* 003F0 809B6740 E6D202FC */ swc1 $f18, 0x02FC($s6) ## 000002FC /* 003F4 809B6744 8EC70068 */ lw $a3, 0x0068($s6) ## 00000068 /* 003F8 809B6748 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002FC /* 003FC 809B674C E6C80304 */ swc1 $f8, 0x0304($s6) ## 00000304 /* 00400 809B6750 26C501F4 */ addiu $a1, $s6, 0x01F4 ## $a1 = 000001F4 /* 00404 809B6754 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00408 809B6758 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0040C 809B675C 0C00CEBB */ jal func_80033AEC -/* 00410 809B6760 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00408 809B6758 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 0040C 809B675C 0C00CEBB */ jal func_80033AEC +/* 00410 809B6760 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00414 809B6764 26D00090 */ addiu $s0, $s6, 0x0090 ## $s0 = 00000090 /* 00418 809B6768 3C17809C */ lui $s7, %hi(D_809B8080) ## $s7 = 809C0000 /* 0041C 809B676C 26F78080 */ addiu $s7, $s7, %lo(D_809B8080) ## $s7 = 809B8080 @@ -129,73 +129,73 @@ glabel func_809B65A8 /* 00430 809B6780 02402025 */ or $a0, $s2, $zero ## $a0 = 000001F4 /* 00434 809B6784 02202825 */ or $a1, $s1, $zero ## $a1 = 000001E8 /* 00438 809B6788 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFEC -/* 0043C 809B678C 0C00D611 */ jal func_80035844 +/* 0043C 809B678C 0C00D611 */ jal func_80035844 /* 00440 809B6790 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00444 809B6794 C60C0164 */ lwc1 $f12, 0x0164($s0) ## 000001F4 /* 00448 809B6798 C60E0168 */ lwc1 $f14, 0x0168($s0) ## 000001F8 /* 0044C 809B679C 8E06016C */ lw $a2, 0x016C($s0) ## 000001FC -/* 00450 809B67A0 0C034261 */ jal Matrix_Translate +/* 00450 809B67A0 0C034261 */ jal Matrix_Translate /* 00454 809B67A4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00458 809B67A8 87A4005C */ lh $a0, 0x005C($sp) -/* 0045C 809B67AC 87A5005E */ lh $a1, 0x005E($sp) +/* 00458 809B67A8 87A4005C */ lh $a0, 0x005C($sp) +/* 0045C 809B67AC 87A5005E */ lh $a1, 0x005E($sp) /* 00460 809B67B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00464 809B67B4 0C034421 */ jal Matrix_RotateXYZ +/* 00464 809B67B4 0C034421 */ jal Matrix_RotateZYX /* 00468 809B67B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0046C 809B67BC 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00470 809B67C0 0C0346BD */ jal Matrix_MultVec3f +/* 00470 809B67C0 0C0346BD */ jal Matrix_MultVec3f /* 00474 809B67C4 02202825 */ or $a1, $s1, $zero ## $a1 = 000001E8 /* 00478 809B67C8 2673FFF4 */ addiu $s3, $s3, 0xFFF4 ## $s3 = 00000084 /* 0047C 809B67CC 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 00000084 /* 00480 809B67D0 2652FFF4 */ addiu $s2, $s2, 0xFFF4 ## $s2 = 000001E8 -/* 00484 809B67D4 0661FFEA */ bgez $s3, .L809B6780 +/* 00484 809B67D4 0661FFEA */ bgez $s3, .L809B6780 /* 00488 809B67D8 2631FFF4 */ addiu $s1, $s1, 0xFFF4 ## $s1 = 000001DC /* 0048C 809B67DC 26D00158 */ addiu $s0, $s6, 0x0158 ## $s0 = 00000158 /* 00490 809B67E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000158 /* 00494 809B67E4 02A02825 */ or $a1, $s5, $zero ## $a1 = 000002FC /* 00498 809B67E8 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFEC -/* 0049C 809B67EC 0C00D611 */ jal func_80035844 +/* 0049C 809B67EC 0C00D611 */ jal func_80035844 /* 004A0 809B67F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004A4 809B67F4 C6CC0024 */ lwc1 $f12, 0x0024($s6) ## 00000024 /* 004A8 809B67F8 C6CE0028 */ lwc1 $f14, 0x0028($s6) ## 00000028 /* 004AC 809B67FC 8EC6002C */ lw $a2, 0x002C($s6) ## 0000002C -/* 004B0 809B6800 0C034261 */ jal Matrix_Translate +/* 004B0 809B6800 0C034261 */ jal Matrix_Translate /* 004B4 809B6804 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004B8 809B6808 86C502AA */ lh $a1, 0x02AA($s6) ## 000002AA /* 004BC 809B680C 86C7031C */ lh $a3, 0x031C($s6) ## 0000031C /* 004C0 809B6810 240C00B6 */ addiu $t4, $zero, 0x00B6 ## $t4 = 000000B6 -/* 004C4 809B6814 AFAC0010 */ sw $t4, 0x0010($sp) +/* 004C4 809B6814 AFAC0010 */ sw $t4, 0x0010($sp) /* 004C8 809B6818 26C400B6 */ addiu $a0, $s6, 0x00B6 ## $a0 = 000000B6 /* 004CC 809B681C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 004D0 809B6820 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 004D4 809B6824 86C502A8 */ lh $a1, 0x02A8($s6) ## 000002A8 /* 004D8 809B6828 86C7031C */ lh $a3, 0x031C($s6) ## 0000031C /* 004DC 809B682C 240D00B6 */ addiu $t5, $zero, 0x00B6 ## $t5 = 000000B6 -/* 004E0 809B6830 AFAD0010 */ sw $t5, 0x0010($sp) +/* 004E0 809B6830 AFAD0010 */ sw $t5, 0x0010($sp) /* 004E4 809B6834 26C400B4 */ addiu $a0, $s6, 0x00B4 ## $a0 = 000000B4 /* 004E8 809B6838 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 004EC 809B683C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 004F0 809B6840 86C400B4 */ lh $a0, 0x00B4($s6) ## 000000B4 /* 004F4 809B6844 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 004F8 809B6848 86C500B6 */ lh $a1, 0x00B6($s6) ## 000000B6 -/* 004FC 809B684C 00812021 */ addu $a0, $a0, $at -/* 00500 809B6850 00042400 */ sll $a0, $a0, 16 -/* 00504 809B6854 00042403 */ sra $a0, $a0, 16 +/* 004FC 809B684C 00812021 */ addu $a0, $a0, $at +/* 00500 809B6850 00042400 */ sll $a0, $a0, 16 +/* 00504 809B6854 00042403 */ sra $a0, $a0, 16 /* 00508 809B6858 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0050C 809B685C 0C034421 */ jal Matrix_RotateXYZ +/* 0050C 809B685C 0C034421 */ jal Matrix_RotateZYX /* 00510 809B6860 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00514 809B6864 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00518 809B6868 0C0346BD */ jal Matrix_MultVec3f +/* 00518 809B6868 0C0346BD */ jal Matrix_MultVec3f /* 0051C 809B686C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 -/* 00520 809B6870 87AE005E */ lh $t6, 0x005E($sp) +/* 00520 809B6870 87AE005E */ lh $t6, 0x005E($sp) /* 00524 809B6874 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 00528 809B6878 02C08025 */ or $s0, $s6, $zero ## $s0 = 00000000 /* 0052C 809B687C A6CE02F8 */ sh $t6, 0x02F8($s6) ## 000002F8 -/* 00530 809B6880 87AF005C */ lh $t7, 0x005C($sp) +/* 00530 809B6880 87AF005C */ lh $t7, 0x005C($sp) /* 00534 809B6884 26D20164 */ addiu $s2, $s6, 0x0164 ## $s2 = 00000164 /* 00538 809B6888 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 0053C 809B688C 01E1C021 */ addu $t8, $t7, $at +/* 0053C 809B688C 01E1C021 */ addu $t8, $t7, $at /* 00540 809B6890 A6D802F6 */ sh $t8, 0x02F6($s6) ## 000002F6 /* 00544 809B6894 02C08825 */ or $s1, $s6, $zero ## $s1 = 00000000 /* 00548 809B6898 26D402AA */ addiu $s4, $s6, 0x02AA ## $s4 = 000002AA @@ -204,35 +204,35 @@ glabel func_809B65A8 /* 00550 809B68A0 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000158 /* 00554 809B68A4 C60E015C */ lwc1 $f14, 0x015C($s0) ## 0000015C /* 00558 809B68A8 8E060160 */ lw $a2, 0x0160($s0) ## 00000160 -/* 0055C 809B68AC 0C034261 */ jal Matrix_Translate +/* 0055C 809B68AC 0C034261 */ jal Matrix_Translate /* 00560 809B68B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00564 809B68B4 862502B0 */ lh $a1, 0x02B0($s1) ## 000002B0 /* 00568 809B68B8 86C7031C */ lh $a3, 0x031C($s6) ## 0000031C /* 0056C 809B68BC 241900B6 */ addiu $t9, $zero, 0x00B6 ## $t9 = 000000B6 -/* 00570 809B68C0 AFB90010 */ sw $t9, 0x0010($sp) +/* 00570 809B68C0 AFB90010 */ sw $t9, 0x0010($sp) /* 00574 809B68C4 02802025 */ or $a0, $s4, $zero ## $a0 = 000002AA /* 00578 809B68C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0057C 809B68CC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 00580 809B68D0 862502AE */ lh $a1, 0x02AE($s1) ## 000002AE /* 00584 809B68D4 86C7031C */ lh $a3, 0x031C($s6) ## 0000031C /* 00588 809B68D8 240800B6 */ addiu $t0, $zero, 0x00B6 ## $t0 = 000000B6 -/* 0058C 809B68DC AFA80010 */ sw $t0, 0x0010($sp) +/* 0058C 809B68DC AFA80010 */ sw $t0, 0x0010($sp) /* 00590 809B68E0 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002A8 /* 00594 809B68E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00598 809B68E8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 0059C 809B68EC 862402A8 */ lh $a0, 0x02A8($s1) ## 000002A8 /* 005A0 809B68F0 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 005A4 809B68F4 862502AA */ lh $a1, 0x02AA($s1) ## 000002AA -/* 005A8 809B68F8 00812021 */ addu $a0, $a0, $at -/* 005AC 809B68FC 00042400 */ sll $a0, $a0, 16 -/* 005B0 809B6900 00042403 */ sra $a0, $a0, 16 +/* 005A8 809B68F8 00812021 */ addu $a0, $a0, $at +/* 005AC 809B68FC 00042400 */ sll $a0, $a0, 16 +/* 005B0 809B6900 00042403 */ sra $a0, $a0, 16 /* 005B4 809B6904 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 005B8 809B6908 0C034421 */ jal Matrix_RotateXYZ +/* 005B8 809B6908 0C034421 */ jal Matrix_RotateZYX /* 005BC 809B690C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 005C0 809B6910 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 005C4 809B6914 0C0346BD */ jal Matrix_MultVec3f +/* 005C4 809B6914 0C0346BD */ jal Matrix_MultVec3f /* 005C8 809B6918 02402825 */ or $a1, $s2, $zero ## $a1 = 00000164 /* 005CC 809B691C 26730006 */ addiu $s3, $s3, 0x0006 ## $s3 = 00000006 /* 005D0 809B6920 2401004E */ addiu $at, $zero, 0x004E ## $at = 0000004E @@ -240,46 +240,46 @@ glabel func_809B65A8 /* 005D8 809B6928 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 00000170 /* 005DC 809B692C 26310006 */ addiu $s1, $s1, 0x0006 ## $s1 = 00000006 /* 005E0 809B6930 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 000002B0 -/* 005E4 809B6934 1661FFDA */ bne $s3, $at, .L809B68A0 +/* 005E4 809B6934 1661FFDA */ bne $s3, $at, .L809B68A0 /* 005E8 809B6938 26B50006 */ addiu $s5, $s5, 0x0006 ## $s5 = 000002AE /* 005EC 809B693C 86C902F0 */ lh $t1, 0x02F0($s6) ## 000002F0 /* 005F0 809B6940 86CA02F2 */ lh $t2, 0x02F2($s6) ## 000002F2 /* 005F4 809B6944 3C01432F */ lui $at, 0x432F ## $at = 432F0000 /* 005F8 809B6948 A6C902F6 */ sh $t1, 0x02F6($s6) ## 000002F6 /* 005FC 809B694C A6CA02F8 */ sh $t2, 0x02F8($s6) ## 000002F8 -/* 00600 809B6950 8FAB006C */ lw $t3, 0x006C($sp) +/* 00600 809B6950 8FAB006C */ lw $t3, 0x006C($sp) /* 00604 809B6954 8D6C067C */ lw $t4, 0x067C($t3) ## 0000067C -/* 00608 809B6958 000C6940 */ sll $t5, $t4, 5 -/* 0060C 809B695C 05A20013 */ bltzl $t5, .L809B69AC -/* 00610 809B6960 8FBF003C */ lw $ra, 0x003C($sp) +/* 00608 809B6958 000C6940 */ sll $t5, $t4, 5 +/* 0060C 809B695C 05A20013 */ bltzl $t5, .L809B69AC +/* 00610 809B6960 8FBF003C */ lw $ra, 0x003C($sp) /* 00614 809B6964 44815000 */ mtc1 $at, $f10 ## $f10 = 175.00 /* 00618 809B6968 C6D00090 */ lwc1 $f16, 0x0090($s6) ## 00000090 /* 0061C 809B696C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00620 809B6970 460A803E */ c.le.s $f16, $f10 +/* 00620 809B6970 460A803E */ c.le.s $f16, $f10 /* 00624 809B6974 00000000 */ nop -/* 00628 809B6978 4502000C */ bc1fl .L809B69AC -/* 0062C 809B697C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00628 809B6978 4502000C */ bc1fl .L809B69AC +/* 0062C 809B697C 8FBF003C */ lw $ra, 0x003C($sp) /* 00630 809B6980 C6D2000C */ lwc1 $f18, 0x000C($s6) ## 0000000C /* 00634 809B6984 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00638 809B6988 C6C80028 */ lwc1 $f8, 0x0028($s6) ## 00000028 -/* 0063C 809B698C 46049180 */ add.s $f6, $f18, $f4 -/* 00640 809B6990 46083032 */ c.eq.s $f6, $f8 +/* 0063C 809B698C 46049180 */ add.s $f6, $f18, $f4 +/* 00640 809B6990 46083032 */ c.eq.s $f6, $f8 /* 00644 809B6994 00000000 */ nop -/* 00648 809B6998 45020004 */ bc1fl .L809B69AC -/* 0064C 809B699C 8FBF003C */ lw $ra, 0x003C($sp) -/* 00650 809B69A0 0C26DAC1 */ jal func_809B6B04 +/* 00648 809B6998 45020004 */ bc1fl .L809B69AC +/* 0064C 809B699C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00650 809B69A0 0C26DAC1 */ jal func_809B6B04 /* 00654 809B69A4 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 00658 809B69A8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00658 809B69A8 8FBF003C */ lw $ra, 0x003C($sp) .L809B69AC: -/* 0065C 809B69AC 8FB0001C */ lw $s0, 0x001C($sp) -/* 00660 809B69B0 8FB10020 */ lw $s1, 0x0020($sp) -/* 00664 809B69B4 8FB20024 */ lw $s2, 0x0024($sp) -/* 00668 809B69B8 8FB30028 */ lw $s3, 0x0028($sp) -/* 0066C 809B69BC 8FB4002C */ lw $s4, 0x002C($sp) -/* 00670 809B69C0 8FB50030 */ lw $s5, 0x0030($sp) -/* 00674 809B69C4 8FB60034 */ lw $s6, 0x0034($sp) -/* 00678 809B69C8 8FB70038 */ lw $s7, 0x0038($sp) -/* 0067C 809B69CC 03E00008 */ jr $ra +/* 0065C 809B69AC 8FB0001C */ lw $s0, 0x001C($sp) +/* 00660 809B69B0 8FB10020 */ lw $s1, 0x0020($sp) +/* 00664 809B69B4 8FB20024 */ lw $s2, 0x0024($sp) +/* 00668 809B69B8 8FB30028 */ lw $s3, 0x0028($sp) +/* 0066C 809B69BC 8FB4002C */ lw $s4, 0x002C($sp) +/* 00670 809B69C0 8FB50030 */ lw $s5, 0x0030($sp) +/* 00674 809B69C4 8FB60034 */ lw $s6, 0x0034($sp) +/* 00678 809B69C8 8FB70038 */ lw $s7, 0x0038($sp) +/* 0067C 809B69CC 03E00008 */ jr $ra /* 00680 809B69D0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s index 28bb56fc40..35416071e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s @@ -1,66 +1,66 @@ glabel func_809B6B58 /* 00808 809B6B58 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 0080C 809B6B5C AFBF0044 */ sw $ra, 0x0044($sp) -/* 00810 809B6B60 AFBE0040 */ sw $s8, 0x0040($sp) -/* 00814 809B6B64 AFB7003C */ sw $s7, 0x003C($sp) -/* 00818 809B6B68 AFB60038 */ sw $s6, 0x0038($sp) -/* 0081C 809B6B6C AFB50034 */ sw $s5, 0x0034($sp) -/* 00820 809B6B70 AFB40030 */ sw $s4, 0x0030($sp) -/* 00824 809B6B74 AFB3002C */ sw $s3, 0x002C($sp) -/* 00828 809B6B78 AFB20028 */ sw $s2, 0x0028($sp) -/* 0082C 809B6B7C AFB10024 */ sw $s1, 0x0024($sp) -/* 00830 809B6B80 AFB00020 */ sw $s0, 0x0020($sp) -/* 00834 809B6B84 AFA5006C */ sw $a1, 0x006C($sp) +/* 0080C 809B6B5C AFBF0044 */ sw $ra, 0x0044($sp) +/* 00810 809B6B60 AFBE0040 */ sw $s8, 0x0040($sp) +/* 00814 809B6B64 AFB7003C */ sw $s7, 0x003C($sp) +/* 00818 809B6B68 AFB60038 */ sw $s6, 0x0038($sp) +/* 0081C 809B6B6C AFB50034 */ sw $s5, 0x0034($sp) +/* 00820 809B6B70 AFB40030 */ sw $s4, 0x0030($sp) +/* 00824 809B6B74 AFB3002C */ sw $s3, 0x002C($sp) +/* 00828 809B6B78 AFB20028 */ sw $s2, 0x0028($sp) +/* 0082C 809B6B7C AFB10024 */ sw $s1, 0x0024($sp) +/* 00830 809B6B80 AFB00020 */ sw $s0, 0x0020($sp) +/* 00834 809B6B84 AFA5006C */ sw $a1, 0x006C($sp) /* 00838 809B6B88 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 0083C 809B6B8C 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 /* 00840 809B6B90 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00844 809B6B94 AFAF0064 */ sw $t7, 0x0064($sp) +/* 00844 809B6B94 AFAF0064 */ sw $t7, 0x0064($sp) /* 00848 809B6B98 C664000C */ lwc1 $f4, 0x000C($s3) ## 0000000C /* 0084C 809B6B9C 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 00850 809B6BA0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00854 809B6BA4 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 00858 809B6BA8 46062200 */ add.s $f8, $f4, $f6 +/* 00858 809B6BA8 46062200 */ add.s $f8, $f4, $f6 /* 0085C 809B6BAC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00860 809B6BB0 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00864 809B6BB4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00868 809B6BB8 44054000 */ mfc1 $a1, $f8 +/* 00864 809B6BB4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00868 809B6BB8 44054000 */ mfc1 $a1, $f8 /* 0086C 809B6BBC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 00870 809B6BC0 00000000 */ nop /* 00874 809B6BC4 3C01432F */ lui $at, 0x432F ## $at = 432F0000 /* 00878 809B6BC8 44818000 */ mtc1 $at, $f16 ## $f16 = 175.00 /* 0087C 809B6BCC C6620090 */ lwc1 $f2, 0x0090($s3) ## 00000090 -/* 00880 809B6BD0 4610103E */ c.le.s $f2, $f16 +/* 00880 809B6BD0 4610103E */ c.le.s $f2, $f16 /* 00884 809B6BD4 00000000 */ nop -/* 00888 809B6BD8 45030006 */ bc1tl .L809B6BF4 +/* 00888 809B6BD8 45030006 */ bc1tl .L809B6BF4 /* 0088C 809B6BDC 86620318 */ lh $v0, 0x0318($s3) ## 00000318 /* 00890 809B6BE0 8678031A */ lh $t8, 0x031A($s3) ## 0000031A /* 00894 809B6BE4 3C01432F */ lui $at, 0x432F ## $at = 432F0000 -/* 00898 809B6BE8 53000143 */ beql $t8, $zero, .L809B70F8 +/* 00898 809B6BE8 53000143 */ beql $t8, $zero, .L809B70F8 /* 0089C 809B6BEC 44815000 */ mtc1 $at, $f10 ## $f10 = 175.00 /* 008A0 809B6BF0 86620318 */ lh $v0, 0x0318($s3) ## 00000318 .L809B6BF4: /* 008A4 809B6BF4 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 008A8 809B6BF8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 008AC 809B6BFC 14410006 */ bne $v0, $at, .L809B6C18 +/* 008AC 809B6BFC 14410006 */ bne $v0, $at, .L809B6C18 /* 008B0 809B6C00 00000000 */ nop /* 008B4 809B6C04 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 008B8 809B6C08 24053959 */ addiu $a1, $zero, 0x3959 ## $a1 = 00003959 /* 008BC 809B6C0C 241905DC */ addiu $t9, $zero, 0x05DC ## $t9 = 000005DC /* 008C0 809B6C10 A679031C */ sh $t9, 0x031C($s3) ## 0000031C /* 008C4 809B6C14 86620318 */ lh $v0, 0x0318($s3) ## 00000318 .L809B6C18: -/* 008C8 809B6C18 1040007F */ beq $v0, $zero, .L809B6E18 +/* 008C8 809B6C18 1040007F */ beq $v0, $zero, .L809B6E18 /* 008CC 809B6C1C 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF /* 008D0 809B6C20 A6690318 */ sh $t1, 0x0318($s3) ## 00000318 /* 008D4 809B6C24 866A0318 */ lh $t2, 0x0318($s3) ## 00000318 /* 008D8 809B6C28 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 008DC 809B6C2C A668031A */ sh $t0, 0x031A($s3) ## 0000031A -/* 008E0 809B6C30 2941000B */ slti $at, $t2, 0x000B -/* 008E4 809B6C34 14200010 */ bne $at, $zero, .L809B6C78 +/* 008E0 809B6C30 2941000B */ slti $at, $t2, 0x000B +/* 008E4 809B6C34 14200010 */ bne $at, $zero, .L809B6C78 /* 008E8 809B6C38 26700024 */ addiu $s0, $s3, 0x0024 ## $s0 = 00000024 -/* 008EC 809B6C3C 8FAB0064 */ lw $t3, 0x0064($sp) +/* 008EC 809B6C3C 8FAB0064 */ lw $t3, 0x0064($sp) /* 008F0 809B6C40 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 008F4 809B6C44 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 008F8 809B6C48 8D6D0024 */ lw $t5, 0x0024($t3) ## 00000024 @@ -71,135 +71,135 @@ glabel func_809B6B58 /* 0090C 809B6C5C AE6C0300 */ sw $t4, 0x0300($s3) ## 00000300 /* 00910 809B6C60 C6720300 */ lwc1 $f18, 0x0300($s3) ## 00000300 /* 00914 809B6C64 8D6D002C */ lw $t5, 0x002C($t3) ## 0000002C -/* 00918 809B6C68 46049180 */ add.s $f6, $f18, $f4 +/* 00918 809B6C68 46049180 */ add.s $f6, $f18, $f4 /* 0091C 809B6C6C AE6D0304 */ sw $t5, 0x0304($s3) ## 00000304 -/* 00920 809B6C70 10000006 */ beq $zero, $zero, .L809B6C8C +/* 00920 809B6C70 10000006 */ beq $zero, $zero, .L809B6C8C /* 00924 809B6C74 E6660300 */ swc1 $f6, 0x0300($s3) ## 00000300 .L809B6C78: /* 00928 809B6C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000024 /* 0092C 809B6C7C 0C01E01A */ jal Math_Vec3f_Yaw - + /* 00930 809B6C80 266502FC */ addiu $a1, $s3, 0x02FC ## $a1 = 000002FC -/* 00934 809B6C84 0002F400 */ sll $s8, $v0, 16 -/* 00938 809B6C88 001EF403 */ sra $s8, $s8, 16 +/* 00934 809B6C84 0002F400 */ sll $s8, $v0, 16 +/* 00938 809B6C88 001EF403 */ sra $s8, $s8, 16 .L809B6C8C: /* 0093C 809B6C8C 2664031C */ addiu $a0, $s3, 0x031C ## $a0 = 0000031C /* 00940 809B6C90 240505DC */ addiu $a1, $zero, 0x05DC ## $a1 = 000005DC /* 00944 809B6C94 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00948 809B6C98 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E /* 0094C 809B6C9C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00950 809B6CA0 AFA00010 */ sw $zero, 0x0010($sp) + +/* 00950 809B6CA0 AFA00010 */ sw $zero, 0x0010($sp) /* 00954 809B6CA4 26710158 */ addiu $s1, $s3, 0x0158 ## $s1 = 00000158 /* 00958 809B6CA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000158 /* 0095C 809B6CAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000024 /* 00960 809B6CB0 27A60058 */ addiu $a2, $sp, 0x0058 ## $a2 = FFFFFFF0 -/* 00964 809B6CB4 0C00D611 */ jal func_80035844 +/* 00964 809B6CB4 0C00D611 */ jal func_80035844 /* 00968 809B6CB8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0096C 809B6CBC 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00970 809B6CC0 AFA00010 */ sw $zero, 0x0010($sp) +/* 00970 809B6CC0 AFA00010 */ sw $zero, 0x0010($sp) /* 00974 809B6CC4 266400B6 */ addiu $a0, $s3, 0x00B6 ## $a0 = 000000B6 -/* 00978 809B6CC8 87A5005A */ lh $a1, 0x005A($sp) +/* 00978 809B6CC8 87A5005A */ lh $a1, 0x005A($sp) /* 0097C 809B6CCC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00980 809B6CD0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00984 809B6CD4 87A50058 */ lh $a1, 0x0058($sp) +/* 00984 809B6CD4 87A50058 */ lh $a1, 0x0058($sp) /* 00988 809B6CD8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 0098C 809B6CDC 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00990 809B6CE0 00A12821 */ addu $a1, $a1, $at -/* 00994 809B6CE4 00052C00 */ sll $a1, $a1, 16 -/* 00998 809B6CE8 00052C03 */ sra $a1, $a1, 16 -/* 0099C 809B6CEC AFA00010 */ sw $zero, 0x0010($sp) +/* 00990 809B6CE0 00A12821 */ addu $a1, $a1, $at +/* 00994 809B6CE4 00052C00 */ sll $a1, $a1, 16 +/* 00998 809B6CE8 00052C03 */ sra $a1, $a1, 16 +/* 0099C 809B6CEC AFA00010 */ sw $zero, 0x0010($sp) /* 009A0 809B6CF0 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 /* 009A4 809B6CF4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 009A8 809B6CF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 009AC 809B6CFC C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 /* 009B0 809B6D00 C66E0028 */ lwc1 $f14, 0x0028($s3) ## 00000028 /* 009B4 809B6D04 8E66002C */ lw $a2, 0x002C($s3) ## 0000002C -/* 009B8 809B6D08 0C034261 */ jal Matrix_Translate +/* 009B8 809B6D08 0C034261 */ jal Matrix_Translate /* 009BC 809B6D0C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 009C0 809B6D10 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 009C4 809B6D14 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 009C8 809B6D18 866500B6 */ lh $a1, 0x00B6($s3) ## 000000B6 -/* 009CC 809B6D1C 00812021 */ addu $a0, $a0, $at -/* 009D0 809B6D20 00042400 */ sll $a0, $a0, 16 -/* 009D4 809B6D24 00042403 */ sra $a0, $a0, 16 +/* 009CC 809B6D1C 00812021 */ addu $a0, $a0, $at +/* 009D0 809B6D20 00042400 */ sll $a0, $a0, 16 +/* 009D4 809B6D24 00042403 */ sra $a0, $a0, 16 /* 009D8 809B6D28 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009DC 809B6D2C 0C034421 */ jal Matrix_RotateXYZ +/* 009DC 809B6D2C 0C034421 */ jal Matrix_RotateZYX /* 009E0 809B6D30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 009E4 809B6D34 3C17809C */ lui $s7, %hi(D_809B8080) ## $s7 = 809C0000 /* 009E8 809B6D38 26F78080 */ addiu $s7, $s7, %lo(D_809B8080) ## $s7 = 809B8080 /* 009EC 809B6D3C 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 009F0 809B6D40 0C0346BD */ jal Matrix_MultVec3f +/* 009F0 809B6D40 0C0346BD */ jal Matrix_MultVec3f /* 009F4 809B6D44 02202825 */ or $a1, $s1, $zero ## $a1 = 00000158 /* 009F8 809B6D48 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 009FC 809B6D4C 2416000C */ addiu $s6, $zero, 0x000C ## $s6 = 0000000C /* 00A00 809B6D50 241504B0 */ addiu $s5, $zero, 0x04B0 ## $s5 = 000004B0 /* 00A04 809B6D54 24140006 */ addiu $s4, $zero, 0x0006 ## $s4 = 00000006 .L809B6D58: -/* 00A08 809B6D58 02540019 */ multu $s2, $s4 +/* 00A08 809B6D58 02540019 */ multu $s2, $s4 /* 00A0C 809B6D5C 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00A10 809B6D60 AFA00010 */ sw $zero, 0x0010($sp) +/* 00A10 809B6D60 AFA00010 */ sw $zero, 0x0010($sp) /* 00A14 809B6D64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00A18 809B6D68 00007012 */ mflo $t6 -/* 00A1C 809B6D6C 026E8021 */ addu $s0, $s3, $t6 +/* 00A18 809B6D68 00007012 */ mflo $t6 +/* 00A1C 809B6D6C 026E8021 */ addu $s0, $s3, $t6 /* 00A20 809B6D70 260402A8 */ addiu $a0, $s0, 0x02A8 ## $a0 = 000002CC -/* 00A24 809B6D74 02550019 */ multu $s2, $s5 -/* 00A28 809B6D78 00002812 */ mflo $a1 +/* 00A24 809B6D74 02550019 */ multu $s2, $s5 +/* 00A28 809B6D78 00002812 */ mflo $a1 /* 00A2C 809B6D7C 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 -/* 00A30 809B6D80 00052C00 */ sll $a1, $a1, 16 +/* 00A30 809B6D80 00052C00 */ sll $a1, $a1, 16 /* 00A34 809B6D84 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00A38 809B6D88 00052C03 */ sra $a1, $a1, 16 -/* 00A3C 809B6D8C 001E2C00 */ sll $a1, $s8, 16 + +/* 00A38 809B6D88 00052C03 */ sra $a1, $a1, 16 +/* 00A3C 809B6D8C 001E2C00 */ sll $a1, $s8, 16 /* 00A40 809B6D90 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00A44 809B6D94 AFA00010 */ sw $zero, 0x0010($sp) -/* 00A48 809B6D98 00052C03 */ sra $a1, $a1, 16 +/* 00A44 809B6D94 AFA00010 */ sw $zero, 0x0010($sp) +/* 00A48 809B6D98 00052C03 */ sra $a1, $a1, 16 /* 00A4C 809B6D9C 260402AA */ addiu $a0, $s0, 0x02AA ## $a0 = 000002CE /* 00A50 809B6DA0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00A54 809B6DA4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00A58 809B6DA8 02560019 */ multu $s2, $s6 +/* 00A58 809B6DA8 02560019 */ multu $s2, $s6 /* 00A5C 809B6DAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00A60 809B6DB0 00007812 */ mflo $t7 -/* 00A64 809B6DB4 026F8821 */ addu $s1, $s3, $t7 +/* 00A60 809B6DB0 00007812 */ mflo $t7 +/* 00A64 809B6DB4 026F8821 */ addu $s1, $s3, $t7 /* 00A68 809B6DB8 C62C0158 */ lwc1 $f12, 0x0158($s1) ## 000002B0 /* 00A6C 809B6DBC C62E015C */ lwc1 $f14, 0x015C($s1) ## 000002B4 -/* 00A70 809B6DC0 0C034261 */ jal Matrix_Translate +/* 00A70 809B6DC0 0C034261 */ jal Matrix_Translate /* 00A74 809B6DC4 8E260160 */ lw $a2, 0x0160($s1) ## 000002B8 /* 00A78 809B6DC8 860402A8 */ lh $a0, 0x02A8($s0) ## 000002CC /* 00A7C 809B6DCC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 00A80 809B6DD0 860502AA */ lh $a1, 0x02AA($s0) ## 000002CE -/* 00A84 809B6DD4 00812021 */ addu $a0, $a0, $at -/* 00A88 809B6DD8 00042400 */ sll $a0, $a0, 16 -/* 00A8C 809B6DDC 00042403 */ sra $a0, $a0, 16 +/* 00A84 809B6DD4 00812021 */ addu $a0, $a0, $at +/* 00A88 809B6DD8 00042400 */ sll $a0, $a0, 16 +/* 00A8C 809B6DDC 00042403 */ sra $a0, $a0, 16 /* 00A90 809B6DE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A94 809B6DE4 0C034421 */ jal Matrix_RotateXYZ +/* 00A94 809B6DE4 0C034421 */ jal Matrix_RotateZYX /* 00A98 809B6DE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00A9C 809B6DEC 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00AA0 809B6DF0 0C0346BD */ jal Matrix_MultVec3f +/* 00AA0 809B6DF0 0C0346BD */ jal Matrix_MultVec3f /* 00AA4 809B6DF4 26250164 */ addiu $a1, $s1, 0x0164 ## $a1 = 000002BC /* 00AA8 809B6DF8 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 00AAC 809B6DFC 00129400 */ sll $s2, $s2, 16 -/* 00AB0 809B6E00 00129403 */ sra $s2, $s2, 16 -/* 00AB4 809B6E04 2A41000D */ slti $at, $s2, 0x000D -/* 00AB8 809B6E08 1420FFD3 */ bne $at, $zero, .L809B6D58 +/* 00AAC 809B6DFC 00129400 */ sll $s2, $s2, 16 +/* 00AB0 809B6E00 00129403 */ sra $s2, $s2, 16 +/* 00AB4 809B6E04 2A41000D */ slti $at, $s2, 0x000D +/* 00AB8 809B6E08 1420FFD3 */ bne $at, $zero, .L809B6D58 /* 00ABC 809B6E0C 00000000 */ nop -/* 00AC0 809B6E10 1000009C */ beq $zero, $zero, .L809B7084 +/* 00AC0 809B6E10 1000009C */ beq $zero, $zero, .L809B7084 /* 00AC4 809B6E14 92620330 */ lbu $v0, 0x0330($s3) ## 00000330 .L809B6E18: /* 00AC8 809B6E18 8662031A */ lh $v0, 0x031A($s3) ## 0000031A /* 00ACC 809B6E1C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 00AD0 809B6E20 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00AD4 809B6E24 14410004 */ bne $v0, $at, .L809B6E38 +/* 00AD4 809B6E24 14410004 */ bne $v0, $at, .L809B6E38 /* 00AD8 809B6E28 00000000 */ nop /* 00ADC 809B6E2C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00AE0 809B6E30 24053958 */ addiu $a1, $zero, 0x3958 ## $a1 = 00003958 /* 00AE4 809B6E34 8662031A */ lh $v0, 0x031A($s3) ## 0000031A .L809B6E38: -/* 00AE8 809B6E38 1040007C */ beq $v0, $zero, .L809B702C +/* 00AE8 809B6E38 1040007C */ beq $v0, $zero, .L809B702C /* 00AEC 809B6E3C 3C01432F */ lui $at, 0x432F ## $at = 432F0000 /* 00AF0 809B6E40 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 00AF4 809B6E44 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 @@ -209,53 +209,53 @@ glabel func_809B6B58 /* 00B04 809B6E54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000024 /* 00B08 809B6E58 266502FC */ addiu $a1, $s3, 0x02FC ## $a1 = 000002FC /* 00B0C 809B6E5C 0C01E01A */ jal Math_Vec3f_Yaw - + /* 00B10 809B6E60 E6680068 */ swc1 $f8, 0x0068($s3) ## 00000068 -/* 00B14 809B6E64 0002F400 */ sll $s8, $v0, 16 +/* 00B14 809B6E64 0002F400 */ sll $s8, $v0, 16 /* 00B18 809B6E68 26710158 */ addiu $s1, $s3, 0x0158 ## $s1 = 00000158 -/* 00B1C 809B6E6C 001EF403 */ sra $s8, $s8, 16 +/* 00B1C 809B6E6C 001EF403 */ sra $s8, $s8, 16 /* 00B20 809B6E70 02202825 */ or $a1, $s1, $zero ## $a1 = 00000158 /* 00B24 809B6E74 0C01E027 */ jal Math_Vec3f_Pitch - + /* 00B28 809B6E78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000024 /* 00B2C 809B6E7C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00B30 809B6E80 00418021 */ addu $s0, $v0, $at -/* 00B34 809B6E84 00108400 */ sll $s0, $s0, 16 -/* 00B38 809B6E88 001E2C00 */ sll $a1, $s8, 16 +/* 00B30 809B6E80 00418021 */ addu $s0, $v0, $at +/* 00B34 809B6E84 00108400 */ sll $s0, $s0, 16 +/* 00B38 809B6E88 001E2C00 */ sll $a1, $s8, 16 /* 00B3C 809B6E8C 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00B40 809B6E90 00108403 */ sra $s0, $s0, 16 -/* 00B44 809B6E94 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B48 809B6E98 00052C03 */ sra $a1, $a1, 16 +/* 00B40 809B6E90 00108403 */ sra $s0, $s0, 16 +/* 00B44 809B6E94 AFA00010 */ sw $zero, 0x0010($sp) +/* 00B48 809B6E98 00052C03 */ sra $a1, $a1, 16 /* 00B4C 809B6E9C 266400B6 */ addiu $a0, $s3, 0x00B6 ## $a0 = 000000B6 /* 00B50 809B6EA0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00B54 809B6EA4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00B58 809B6EA8 00102C00 */ sll $a1, $s0, 16 +/* 00B58 809B6EA8 00102C00 */ sll $a1, $s0, 16 /* 00B5C 809B6EAC 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00B60 809B6EB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B64 809B6EB4 00052C03 */ sra $a1, $a1, 16 +/* 00B60 809B6EB0 AFA00010 */ sw $zero, 0x0010($sp) +/* 00B64 809B6EB4 00052C03 */ sra $a1, $a1, 16 /* 00B68 809B6EB8 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 /* 00B6C 809B6EBC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00B70 809B6EC0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00B74 809B6EC4 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 /* 00B78 809B6EC8 C66E0028 */ lwc1 $f14, 0x0028($s3) ## 00000028 /* 00B7C 809B6ECC 8E66002C */ lw $a2, 0x002C($s3) ## 0000002C -/* 00B80 809B6ED0 0C034261 */ jal Matrix_Translate +/* 00B80 809B6ED0 0C034261 */ jal Matrix_Translate /* 00B84 809B6ED4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00B88 809B6ED8 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 00B8C 809B6EDC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 00B90 809B6EE0 866500B6 */ lh $a1, 0x00B6($s3) ## 000000B6 -/* 00B94 809B6EE4 00812021 */ addu $a0, $a0, $at -/* 00B98 809B6EE8 00042400 */ sll $a0, $a0, 16 -/* 00B9C 809B6EEC 00042403 */ sra $a0, $a0, 16 +/* 00B94 809B6EE4 00812021 */ addu $a0, $a0, $at +/* 00B98 809B6EE8 00042400 */ sll $a0, $a0, 16 +/* 00B9C 809B6EEC 00042403 */ sra $a0, $a0, 16 /* 00BA0 809B6EF0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BA4 809B6EF4 0C034421 */ jal Matrix_RotateXYZ +/* 00BA4 809B6EF4 0C034421 */ jal Matrix_RotateZYX /* 00BA8 809B6EF8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00BAC 809B6EFC 3C17809C */ lui $s7, %hi(D_809B8080) ## $s7 = 809C0000 /* 00BB0 809B6F00 26F78080 */ addiu $s7, $s7, %lo(D_809B8080) ## $s7 = 809B8080 /* 00BB4 809B6F04 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00BB8 809B6F08 0C0346BD */ jal Matrix_MultVec3f +/* 00BB8 809B6F08 0C0346BD */ jal Matrix_MultVec3f /* 00BBC 809B6F0C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000158 /* 00BC0 809B6F10 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 00BC4 809B6F14 2416000C */ addiu $s6, $zero, 0x000C ## $s6 = 0000000C @@ -264,93 +264,93 @@ glabel func_809B6B58 /* 00BD0 809B6F20 8664031A */ lh $a0, 0x031A($s3) ## 0000031A .L809B6F24: /* 00BD4 809B6F24 24010CCC */ addiu $at, $zero, 0x0CCC ## $at = 00000CCC -/* 00BD8 809B6F28 00810019 */ multu $a0, $at -/* 00BDC 809B6F2C 00002012 */ mflo $a0 -/* 00BE0 809B6F30 00042400 */ sll $a0, $a0, 16 +/* 00BD8 809B6F28 00810019 */ multu $a0, $at +/* 00BDC 809B6F2C 00002012 */ mflo $a0 +/* 00BE0 809B6F30 00042400 */ sll $a0, $a0, 16 /* 00BE4 809B6F34 0C01DE0D */ jal Math_Coss ## coss? -/* 00BE8 809B6F38 00042403 */ sra $a0, $a0, 16 -/* 00BEC 809B6F3C 02540019 */ multu $s2, $s4 -/* 00BF0 809B6F40 46000287 */ neg.s $f10, $f0 +/* 00BE8 809B6F38 00042403 */ sra $a0, $a0, 16 +/* 00BEC 809B6F3C 02540019 */ multu $s2, $s4 +/* 00BF0 809B6F40 46000287 */ neg.s $f10, $f0 /* 00BF4 809B6F44 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00BF8 809B6F48 AFA00010 */ sw $zero, 0x0010($sp) +/* 00BF8 809B6F48 AFA00010 */ sw $zero, 0x0010($sp) /* 00BFC 809B6F4C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C00 809B6F50 0000C812 */ mflo $t9 -/* 00C04 809B6F54 02798021 */ addu $s0, $s3, $t9 +/* 00C00 809B6F50 0000C812 */ mflo $t9 +/* 00C04 809B6F54 02798021 */ addu $s0, $s3, $t9 /* 00C08 809B6F58 260402A8 */ addiu $a0, $s0, 0x02A8 ## $a0 = 000002CC -/* 00C0C 809B6F5C 02550019 */ multu $s2, $s5 -/* 00C10 809B6F60 00004012 */ mflo $t0 +/* 00C0C 809B6F5C 02550019 */ multu $s2, $s5 +/* 00C10 809B6F60 00004012 */ mflo $t0 /* 00C14 809B6F64 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 /* 00C18 809B6F68 00000000 */ nop -/* 00C1C 809B6F6C 468084A0 */ cvt.s.w $f18, $f16 -/* 00C20 809B6F70 46125102 */ mul.s $f4, $f10, $f18 -/* 00C24 809B6F74 4600218D */ trunc.w.s $f6, $f4 -/* 00C28 809B6F78 44053000 */ mfc1 $a1, $f6 +/* 00C1C 809B6F6C 468084A0 */ cvt.s.w $f18, $f16 +/* 00C20 809B6F70 46125102 */ mul.s $f4, $f10, $f18 +/* 00C24 809B6F74 4600218D */ trunc.w.s $f6, $f4 +/* 00C28 809B6F78 44053000 */ mfc1 $a1, $f6 /* 00C2C 809B6F7C 00000000 */ nop -/* 00C30 809B6F80 00052C00 */ sll $a1, $a1, 16 -/* 00C34 809B6F84 00052C03 */ sra $a1, $a1, 16 +/* 00C30 809B6F80 00052C00 */ sll $a1, $a1, 16 +/* 00C34 809B6F84 00052C03 */ sra $a1, $a1, 16 /* 00C38 809B6F88 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 -/* 00C3C 809B6F8C 00052C00 */ sll $a1, $a1, 16 +/* 00C3C 809B6F8C 00052C00 */ sll $a1, $a1, 16 /* 00C40 809B6F90 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00C44 809B6F94 00052C03 */ sra $a1, $a1, 16 -/* 00C48 809B6F98 001E2C00 */ sll $a1, $s8, 16 + +/* 00C44 809B6F94 00052C03 */ sra $a1, $a1, 16 +/* 00C48 809B6F98 001E2C00 */ sll $a1, $s8, 16 /* 00C4C 809B6F9C 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00C50 809B6FA0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C54 809B6FA4 00052C03 */ sra $a1, $a1, 16 +/* 00C50 809B6FA0 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C54 809B6FA4 00052C03 */ sra $a1, $a1, 16 /* 00C58 809B6FA8 260402AA */ addiu $a0, $s0, 0x02AA ## $a0 = 000002CE /* 00C5C 809B6FAC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00C60 809B6FB0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C64 809B6FB4 02560019 */ multu $s2, $s6 +/* 00C64 809B6FB4 02560019 */ multu $s2, $s6 /* 00C68 809B6FB8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00C6C 809B6FBC 00005012 */ mflo $t2 -/* 00C70 809B6FC0 026A8821 */ addu $s1, $s3, $t2 +/* 00C6C 809B6FBC 00005012 */ mflo $t2 +/* 00C70 809B6FC0 026A8821 */ addu $s1, $s3, $t2 /* 00C74 809B6FC4 C62C0158 */ lwc1 $f12, 0x0158($s1) ## 000002B0 /* 00C78 809B6FC8 C62E015C */ lwc1 $f14, 0x015C($s1) ## 000002B4 -/* 00C7C 809B6FCC 0C034261 */ jal Matrix_Translate +/* 00C7C 809B6FCC 0C034261 */ jal Matrix_Translate /* 00C80 809B6FD0 8E260160 */ lw $a2, 0x0160($s1) ## 000002B8 /* 00C84 809B6FD4 860402A8 */ lh $a0, 0x02A8($s0) ## 000002CC /* 00C88 809B6FD8 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 00C8C 809B6FDC 860502AA */ lh $a1, 0x02AA($s0) ## 000002CE -/* 00C90 809B6FE0 00812021 */ addu $a0, $a0, $at -/* 00C94 809B6FE4 00042400 */ sll $a0, $a0, 16 -/* 00C98 809B6FE8 00042403 */ sra $a0, $a0, 16 +/* 00C90 809B6FE0 00812021 */ addu $a0, $a0, $at +/* 00C94 809B6FE4 00042400 */ sll $a0, $a0, 16 +/* 00C98 809B6FE8 00042403 */ sra $a0, $a0, 16 /* 00C9C 809B6FEC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00CA0 809B6FF0 0C034421 */ jal Matrix_RotateXYZ +/* 00CA0 809B6FF0 0C034421 */ jal Matrix_RotateZYX /* 00CA4 809B6FF4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CA8 809B6FF8 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00CAC 809B6FFC 0C0346BD */ jal Matrix_MultVec3f +/* 00CAC 809B6FFC 0C0346BD */ jal Matrix_MultVec3f /* 00CB0 809B7000 26250164 */ addiu $a1, $s1, 0x0164 ## $a1 = 000002BC /* 00CB4 809B7004 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 00CB8 809B7008 00129400 */ sll $s2, $s2, 16 -/* 00CBC 809B700C 00129403 */ sra $s2, $s2, 16 -/* 00CC0 809B7010 2A41000D */ slti $at, $s2, 0x000D -/* 00CC4 809B7014 5420FFC3 */ bnel $at, $zero, .L809B6F24 +/* 00CB8 809B7008 00129400 */ sll $s2, $s2, 16 +/* 00CBC 809B700C 00129403 */ sra $s2, $s2, 16 +/* 00CC0 809B7010 2A41000D */ slti $at, $s2, 0x000D +/* 00CC4 809B7014 5420FFC3 */ bnel $at, $zero, .L809B6F24 /* 00CC8 809B7018 8664031A */ lh $a0, 0x031A($s3) ## 0000031A /* 00CCC 809B701C 866B031A */ lh $t3, 0x031A($s3) ## 0000031A /* 00CD0 809B7020 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = FFFFFFFF -/* 00CD4 809B7024 10000016 */ beq $zero, $zero, .L809B7080 +/* 00CD4 809B7024 10000016 */ beq $zero, $zero, .L809B7080 /* 00CD8 809B7028 A66C031A */ sh $t4, 0x031A($s3) ## 0000031A .L809B702C: /* 00CDC 809B702C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 /* 00CE0 809B7030 C6700090 */ lwc1 $f16, 0x0090($s3) ## 00000090 -/* 00CE4 809B7034 8FAD0064 */ lw $t5, 0x0064($sp) -/* 00CE8 809B7038 4610403C */ c.lt.s $f8, $f16 +/* 00CE4 809B7034 8FAD0064 */ lw $t5, 0x0064($sp) +/* 00CE8 809B7038 4610403C */ c.lt.s $f8, $f16 /* 00CEC 809B703C 00000000 */ nop -/* 00CF0 809B7040 45010005 */ bc1t .L809B7058 +/* 00CF0 809B7040 45010005 */ bc1t .L809B7058 /* 00CF4 809B7044 00000000 */ nop /* 00CF8 809B7048 8DAE067C */ lw $t6, 0x067C($t5) ## 0000067C -/* 00CFC 809B704C 000E7940 */ sll $t7, $t6, 5 -/* 00D00 809B7050 05E10005 */ bgez $t7, .L809B7068 +/* 00CFC 809B704C 000E7940 */ sll $t7, $t6, 5 +/* 00D00 809B7050 05E10005 */ bgez $t7, .L809B7068 /* 00D04 809B7054 00000000 */ nop .L809B7058: -/* 00D08 809B7058 0C26D95A */ jal func_809B6568 +/* 00D08 809B7058 0C26D95A */ jal func_809B6568 /* 00D0C 809B705C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00D10 809B7060 10000008 */ beq $zero, $zero, .L809B7084 +/* 00D10 809B7060 10000008 */ beq $zero, $zero, .L809B7084 /* 00D14 809B7064 92620330 */ lbu $v0, 0x0330($s3) ## 00000330 .L809B7068: -/* 00D18 809B7068 0C26DAC1 */ jal func_809B6B04 +/* 00D18 809B7068 0C26DAC1 */ jal func_809B6B04 /* 00D1C 809B706C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00D20 809B7070 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B /* 00D24 809B7074 241902EE */ addiu $t9, $zero, 0x02EE ## $t9 = 000002EE @@ -363,68 +363,68 @@ glabel func_809B6B58 /* 00D38 809B7088 866902F2 */ lh $t1, 0x02F2($s3) ## 000002F2 /* 00D3C 809B708C 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 /* 00D40 809B7090 A66802F6 */ sh $t0, 0x02F6($s3) ## 000002F6 -/* 00D44 809B7094 1140000F */ beq $t2, $zero, .L809B70D4 +/* 00D44 809B7094 1140000F */ beq $t2, $zero, .L809B70D4 /* 00D48 809B7098 A66902F8 */ sh $t1, 0x02F8($s3) ## 000002F8 /* 00D4C 809B709C 304BFFFD */ andi $t3, $v0, 0xFFFD ## $t3 = 00000000 /* 00D50 809B70A0 A26B0330 */ sb $t3, 0x0330($s3) ## 00000330 -/* 00D54 809B70A4 8FAC0064 */ lw $t4, 0x0064($sp) +/* 00D54 809B70A4 8FAC0064 */ lw $t4, 0x0064($sp) /* 00D58 809B70A8 8E6D0324 */ lw $t5, 0x0324($s3) ## 00000324 /* 00D5C 809B70AC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00D60 809B70B0 8FA4006C */ lw $a0, 0x006C($sp) -/* 00D64 809B70B4 558D0008 */ bnel $t4, $t5, .L809B70D8 -/* 00D68 809B70B8 8FA4006C */ lw $a0, 0x006C($sp) +/* 00D60 809B70B0 8FA4006C */ lw $a0, 0x006C($sp) +/* 00D64 809B70B4 558D0008 */ bnel $t4, $t5, .L809B70D8 +/* 00D68 809B70B8 8FA4006C */ lw $a0, 0x006C($sp) /* 00D6C 809B70BC 44810000 */ mtc1 $at, $f0 ## $f0 = 8.00 /* 00D70 809B70C0 8667008A */ lh $a3, 0x008A($s3) ## 0000008A /* 00D74 809B70C4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00D78 809B70C8 44060000 */ mfc1 $a2, $f0 -/* 00D7C 809B70CC 0C00BDC7 */ jal func_8002F71C -/* 00D80 809B70D0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00D78 809B70C8 44060000 */ mfc1 $a2, $f0 +/* 00D7C 809B70CC 0C00BDC7 */ jal func_8002F71C +/* 00D80 809B70D0 E7A00010 */ swc1 $f0, 0x0010($sp) .L809B70D4: -/* 00D84 809B70D4 8FA4006C */ lw $a0, 0x006C($sp) +/* 00D84 809B70D4 8FA4006C */ lw $a0, 0x006C($sp) .L809B70D8: /* 00D88 809B70D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D8C 809B70DC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00D90 809B70E0 26660320 */ addiu $a2, $s3, 0x0320 ## $a2 = 00000320 /* 00D94 809B70E4 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT -/* 00D98 809B70E8 00812821 */ addu $a1, $a0, $at -/* 00D9C 809B70EC 10000016 */ beq $zero, $zero, .L809B7148 -/* 00DA0 809B70F0 8FBF0044 */ lw $ra, 0x0044($sp) +/* 00D98 809B70E8 00812821 */ addu $a1, $a0, $at +/* 00D9C 809B70EC 10000016 */ beq $zero, $zero, .L809B7148 +/* 00DA0 809B70F0 8FBF0044 */ lw $ra, 0x0044($sp) /* 00DA4 809B70F4 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 .L809B70F8: -/* 00DA8 809B70F8 8FAF0064 */ lw $t7, 0x0064($sp) -/* 00DAC 809B70FC 4602503C */ c.lt.s $f10, $f2 +/* 00DA8 809B70F8 8FAF0064 */ lw $t7, 0x0064($sp) +/* 00DAC 809B70FC 4602503C */ c.lt.s $f10, $f2 /* 00DB0 809B7100 00000000 */ nop -/* 00DB4 809B7104 45010005 */ bc1t .L809B711C +/* 00DB4 809B7104 45010005 */ bc1t .L809B711C /* 00DB8 809B7108 00000000 */ nop /* 00DBC 809B710C 8DF8067C */ lw $t8, 0x067C($t7) ## 0000067C -/* 00DC0 809B7110 0018C940 */ sll $t9, $t8, 5 -/* 00DC4 809B7114 07210005 */ bgez $t9, .L809B712C +/* 00DC0 809B7110 0018C940 */ sll $t9, $t8, 5 +/* 00DC4 809B7114 07210005 */ bgez $t9, .L809B712C /* 00DC8 809B7118 00000000 */ nop .L809B711C: -/* 00DCC 809B711C 0C26D95A */ jal func_809B6568 +/* 00DCC 809B711C 0C26D95A */ jal func_809B6568 /* 00DD0 809B7120 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00DD4 809B7124 10000008 */ beq $zero, $zero, .L809B7148 -/* 00DD8 809B7128 8FBF0044 */ lw $ra, 0x0044($sp) +/* 00DD4 809B7124 10000008 */ beq $zero, $zero, .L809B7148 +/* 00DD8 809B7128 8FBF0044 */ lw $ra, 0x0044($sp) .L809B712C: -/* 00DDC 809B712C 0C26DAC1 */ jal func_809B6B04 +/* 00DDC 809B712C 0C26DAC1 */ jal func_809B6B04 /* 00DE0 809B7130 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00DE4 809B7134 2408001B */ addiu $t0, $zero, 0x001B ## $t0 = 0000001B /* 00DE8 809B7138 240902EE */ addiu $t1, $zero, 0x02EE ## $t1 = 000002EE /* 00DEC 809B713C A6680318 */ sh $t0, 0x0318($s3) ## 00000318 /* 00DF0 809B7140 A669031C */ sh $t1, 0x031C($s3) ## 0000031C -/* 00DF4 809B7144 8FBF0044 */ lw $ra, 0x0044($sp) +/* 00DF4 809B7144 8FBF0044 */ lw $ra, 0x0044($sp) .L809B7148: -/* 00DF8 809B7148 8FB00020 */ lw $s0, 0x0020($sp) -/* 00DFC 809B714C 8FB10024 */ lw $s1, 0x0024($sp) -/* 00E00 809B7150 8FB20028 */ lw $s2, 0x0028($sp) -/* 00E04 809B7154 8FB3002C */ lw $s3, 0x002C($sp) -/* 00E08 809B7158 8FB40030 */ lw $s4, 0x0030($sp) -/* 00E0C 809B715C 8FB50034 */ lw $s5, 0x0034($sp) -/* 00E10 809B7160 8FB60038 */ lw $s6, 0x0038($sp) -/* 00E14 809B7164 8FB7003C */ lw $s7, 0x003C($sp) -/* 00E18 809B7168 8FBE0040 */ lw $s8, 0x0040($sp) -/* 00E1C 809B716C 03E00008 */ jr $ra +/* 00DF8 809B7148 8FB00020 */ lw $s0, 0x0020($sp) +/* 00DFC 809B714C 8FB10024 */ lw $s1, 0x0024($sp) +/* 00E00 809B7150 8FB20028 */ lw $s2, 0x0028($sp) +/* 00E04 809B7154 8FB3002C */ lw $s3, 0x002C($sp) +/* 00E08 809B7158 8FB40030 */ lw $s4, 0x0030($sp) +/* 00E0C 809B715C 8FB50034 */ lw $s5, 0x0034($sp) +/* 00E10 809B7160 8FB60038 */ lw $s6, 0x0038($sp) +/* 00E14 809B7164 8FB7003C */ lw $s7, 0x003C($sp) +/* 00E18 809B7168 8FBE0040 */ lw $s8, 0x0040($sp) +/* 00E1C 809B716C 03E00008 */ jr $ra /* 00E20 809B7170 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s index 8953538770..708e2b650a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s @@ -1,69 +1,69 @@ glabel func_809B71F0 /* 00EA0 809B71F0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00EA4 809B71F4 AFB7003C */ sw $s7, 0x003C($sp) +/* 00EA4 809B71F4 AFB7003C */ sw $s7, 0x003C($sp) /* 00EA8 809B71F8 0080B825 */ or $s7, $a0, $zero ## $s7 = 00000000 -/* 00EAC 809B71FC AFBF0044 */ sw $ra, 0x0044($sp) -/* 00EB0 809B7200 AFBE0040 */ sw $s8, 0x0040($sp) -/* 00EB4 809B7204 AFB60038 */ sw $s6, 0x0038($sp) -/* 00EB8 809B7208 AFB50034 */ sw $s5, 0x0034($sp) -/* 00EBC 809B720C AFB40030 */ sw $s4, 0x0030($sp) -/* 00EC0 809B7210 AFB3002C */ sw $s3, 0x002C($sp) -/* 00EC4 809B7214 AFB20028 */ sw $s2, 0x0028($sp) -/* 00EC8 809B7218 AFB10024 */ sw $s1, 0x0024($sp) -/* 00ECC 809B721C AFB00020 */ sw $s0, 0x0020($sp) +/* 00EAC 809B71FC AFBF0044 */ sw $ra, 0x0044($sp) +/* 00EB0 809B7200 AFBE0040 */ sw $s8, 0x0040($sp) +/* 00EB4 809B7204 AFB60038 */ sw $s6, 0x0038($sp) +/* 00EB8 809B7208 AFB50034 */ sw $s5, 0x0034($sp) +/* 00EBC 809B720C AFB40030 */ sw $s4, 0x0030($sp) +/* 00EC0 809B7210 AFB3002C */ sw $s3, 0x002C($sp) +/* 00EC4 809B7214 AFB20028 */ sw $s2, 0x0028($sp) +/* 00EC8 809B7218 AFB10024 */ sw $s1, 0x0024($sp) +/* 00ECC 809B721C AFB00020 */ sw $s0, 0x0020($sp) /* 00ED0 809B7220 3C0143A5 */ lui $at, 0x43A5 ## $at = 43A50000 /* 00ED4 809B7224 44813000 */ mtc1 $at, $f6 ## $f6 = 330.00 /* 00ED8 809B7228 C6E4000C */ lwc1 $f4, 0x000C($s7) ## 0000000C /* 00EDC 809B722C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00EE0 809B7230 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00EE4 809B7234 46062200 */ add.s $f8, $f4, $f6 +/* 00EE4 809B7234 46062200 */ add.s $f8, $f4, $f6 /* 00EE8 809B7238 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 00EEC 809B723C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00EF0 809B7240 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00EF4 809B7244 44054000 */ mfc1 $a1, $f8 +/* 00EF4 809B7244 44054000 */ mfc1 $a1, $f8 /* 00EF8 809B7248 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00EFC 809B724C E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 00EFC 809B724C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00F00 809B7250 26F40024 */ addiu $s4, $s7, 0x0024 ## $s4 = 00000024 /* 00F04 809B7254 8E8F0000 */ lw $t7, 0x0000($s4) ## 00000024 /* 00F08 809B7258 26F002FC */ addiu $s0, $s7, 0x02FC ## $s0 = 000002FC /* 00F0C 809B725C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 00F10 809B7260 AE0F0000 */ sw $t7, 0x0000($s0) ## 000002FC /* 00F14 809B7264 8E8E0004 */ lw $t6, 0x0004($s4) ## 00000028 -/* 00F18 809B7268 0311C021 */ addu $t8, $t8, $s1 +/* 00F18 809B7268 0311C021 */ addu $t8, $t8, $s1 /* 00F1C 809B726C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000300 /* 00F20 809B7270 8E8F0008 */ lw $t7, 0x0008($s4) ## 0000002C /* 00F24 809B7274 AE0F0008 */ sw $t7, 0x0008($s0) ## 00000304 /* 00F28 809B7278 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 00F2C 809B727C 3319000F */ andi $t9, $t8, 0x000F ## $t9 = 00000000 -/* 00F30 809B7280 1720001A */ bne $t9, $zero, .L809B72EC +/* 00F30 809B7280 1720001A */ bne $t9, $zero, .L809B72EC /* 00F34 809B7284 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00F38 809B7288 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 /* 00F3C 809B728C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00F40 809B7290 00000000 */ nop /* 00F44 809B7294 C6F00310 */ lwc1 $f16, 0x0310($s7) ## 00000310 /* 00F48 809B7298 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00F4C 809B729C 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 -/* 00F50 809B72A0 46008480 */ add.s $f18, $f16, $f0 +/* 00F50 809B72A0 46008480 */ add.s $f18, $f16, $f0 /* 00F54 809B72A4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00F58 809B72A8 E6F20310 */ swc1 $f18, 0x0310($s7) ## 00000310 /* 00F5C 809B72AC C6E40314 */ lwc1 $f4, 0x0314($s7) ## 00000314 /* 00F60 809B72B0 C6EC0310 */ lwc1 $f12, 0x0310($s7) ## 00000310 -/* 00F64 809B72B4 46002180 */ add.s $f6, $f4, $f0 -/* 00F68 809B72B8 0C0329C8 */ jal func_800CA720 +/* 00F64 809B72B4 46002180 */ add.s $f6, $f4, $f0 +/* 00F68 809B72B8 0C0329C8 */ jal func_800CA720 /* 00F6C 809B72BC E6E60314 */ swc1 $f6, 0x0314($s7) ## 00000314 /* 00F70 809B72C0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00F74 809B72C4 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 /* 00F78 809B72C8 C6EC0314 */ lwc1 $f12, 0x0314($s7) ## 00000314 -/* 00F7C 809B72CC 46080282 */ mul.s $f10, $f0, $f8 -/* 00F80 809B72D0 0C0329DD */ jal func_800CA774 +/* 00F7C 809B72CC 46080282 */ mul.s $f10, $f0, $f8 +/* 00F80 809B72D0 0C0329DD */ jal func_800CA774 /* 00F84 809B72D4 E6EA0308 */ swc1 $f10, 0x0308($s7) ## 00000308 /* 00F88 809B72D8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00F8C 809B72DC 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 /* 00F90 809B72E0 00000000 */ nop -/* 00F94 809B72E4 46100482 */ mul.s $f18, $f0, $f16 +/* 00F94 809B72E4 46100482 */ mul.s $f18, $f0, $f16 /* 00F98 809B72E8 E6F2030C */ swc1 $f18, 0x030C($s7) ## 0000030C .L809B72EC: /* 00F9C 809B72EC 3C0143E0 */ lui $at, 0x43E0 ## $at = 43E00000 @@ -71,22 +71,22 @@ glabel func_809B71F0 /* 00FA4 809B72F4 C6E40300 */ lwc1 $f4, 0x0300($s7) ## 00000300 /* 00FA8 809B72F8 C6EA02FC */ lwc1 $f10, 0x02FC($s7) ## 000002FC /* 00FAC 809B72FC C6F00308 */ lwc1 $f16, 0x0308($s7) ## 00000308 -/* 00FB0 809B7300 46062201 */ sub.s $f8, $f4, $f6 +/* 00FB0 809B7300 46062201 */ sub.s $f8, $f4, $f6 /* 00FB4 809B7304 C6E6030C */ lwc1 $f6, 0x030C($s7) ## 0000030C /* 00FB8 809B7308 C6E40304 */ lwc1 $f4, 0x0304($s7) ## 00000304 -/* 00FBC 809B730C 46105480 */ add.s $f18, $f10, $f16 +/* 00FBC 809B730C 46105480 */ add.s $f18, $f10, $f16 /* 00FC0 809B7310 E6E80300 */ swc1 $f8, 0x0300($s7) ## 00000300 /* 00FC4 809B7314 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00FC8 809B7318 46062200 */ add.s $f8, $f4, $f6 +/* 00FC8 809B7318 46062200 */ add.s $f8, $f4, $f6 /* 00FCC 809B731C E6F202FC */ swc1 $f18, 0x02FC($s7) ## 000002FC /* 00FD0 809B7320 8EE70068 */ lw $a3, 0x0068($s7) ## 00000068 /* 00FD4 809B7324 02002025 */ or $a0, $s0, $zero ## $a0 = 000002FC /* 00FD8 809B7328 E6E80304 */ swc1 $f8, 0x0304($s7) ## 00000304 /* 00FDC 809B732C 26E501F4 */ addiu $a1, $s7, 0x01F4 ## $a1 = 000001F4 /* 00FE0 809B7330 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00FE4 809B7334 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00FE8 809B7338 0C00CEBB */ jal func_80033AEC -/* 00FEC 809B733C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00FE4 809B7334 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00FE8 809B7338 0C00CEBB */ jal func_80033AEC +/* 00FEC 809B733C E7A00010 */ swc1 $f0, 0x0010($sp) /* 00FF0 809B7340 26F00090 */ addiu $s0, $s7, 0x0090 ## $s0 = 00000090 /* 00FF4 809B7344 26110164 */ addiu $s1, $s0, 0x0164 ## $s1 = 000001F4 /* 00FF8 809B7348 26120158 */ addiu $s2, $s0, 0x0158 ## $s2 = 000001E8 @@ -96,70 +96,70 @@ glabel func_809B71F0 /* 01004 809B7354 02202025 */ or $a0, $s1, $zero ## $a0 = 000001F4 /* 01008 809B7358 02402825 */ or $a1, $s2, $zero ## $a1 = 000001E8 /* 0100C 809B735C 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 -/* 01010 809B7360 0C00D611 */ jal func_80035844 +/* 01010 809B7360 0C00D611 */ jal func_80035844 /* 01014 809B7364 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01018 809B7368 C60C0164 */ lwc1 $f12, 0x0164($s0) ## 000001F4 /* 0101C 809B736C C60E0168 */ lwc1 $f14, 0x0168($s0) ## 000001F8 /* 01020 809B7370 8E06016C */ lw $a2, 0x016C($s0) ## 000001FC -/* 01024 809B7374 0C034261 */ jal Matrix_Translate +/* 01024 809B7374 0C034261 */ jal Matrix_Translate /* 01028 809B7378 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0102C 809B737C 87A4006C */ lh $a0, 0x006C($sp) -/* 01030 809B7380 87A5006E */ lh $a1, 0x006E($sp) +/* 0102C 809B737C 87A4006C */ lh $a0, 0x006C($sp) +/* 01030 809B7380 87A5006E */ lh $a1, 0x006E($sp) /* 01034 809B7384 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01038 809B7388 0C034421 */ jal Matrix_RotateXYZ +/* 01038 809B7388 0C034421 */ jal Matrix_RotateZYX /* 0103C 809B738C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01040 809B7390 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 01044 809B7394 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 -/* 01048 809B7398 0C0346BD */ jal Matrix_MultVec3f +/* 01048 809B7398 0C0346BD */ jal Matrix_MultVec3f /* 0104C 809B739C 02402825 */ or $a1, $s2, $zero ## $a1 = 000001E8 /* 01050 809B73A0 2673FFF4 */ addiu $s3, $s3, 0xFFF4 ## $s3 = 00000084 /* 01054 809B73A4 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 00000084 /* 01058 809B73A8 2631FFF4 */ addiu $s1, $s1, 0xFFF4 ## $s1 = 000001E8 -/* 0105C 809B73AC 0661FFE9 */ bgez $s3, .L809B7354 +/* 0105C 809B73AC 0661FFE9 */ bgez $s3, .L809B7354 /* 01060 809B73B0 2652FFF4 */ addiu $s2, $s2, 0xFFF4 ## $s2 = 000001DC /* 01064 809B73B4 26F00158 */ addiu $s0, $s7, 0x0158 ## $s0 = 00000158 /* 01068 809B73B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 0106C 809B73BC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000024 /* 01070 809B73C0 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 -/* 01074 809B73C4 0C00D611 */ jal func_80035844 +/* 01074 809B73C4 0C00D611 */ jal func_80035844 /* 01078 809B73C8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0107C 809B73CC C6EC0024 */ lwc1 $f12, 0x0024($s7) ## 00000024 /* 01080 809B73D0 C6EE0028 */ lwc1 $f14, 0x0028($s7) ## 00000028 /* 01084 809B73D4 8EE6002C */ lw $a2, 0x002C($s7) ## 0000002C -/* 01088 809B73D8 0C034261 */ jal Matrix_Translate +/* 01088 809B73D8 0C034261 */ jal Matrix_Translate /* 0108C 809B73DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01090 809B73E0 86E7031C */ lh $a3, 0x031C($s7) ## 0000031C /* 01094 809B73E4 240800B6 */ addiu $t0, $zero, 0x00B6 ## $t0 = 000000B6 -/* 01098 809B73E8 AFA80010 */ sw $t0, 0x0010($sp) +/* 01098 809B73E8 AFA80010 */ sw $t0, 0x0010($sp) /* 0109C 809B73EC 26E400B6 */ addiu $a0, $s7, 0x00B6 ## $a0 = 000000B6 -/* 010A0 809B73F0 87A5006E */ lh $a1, 0x006E($sp) +/* 010A0 809B73F0 87A5006E */ lh $a1, 0x006E($sp) /* 010A4 809B73F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 010A8 809B73F8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 010AC 809B73FC 87A5006C */ lh $a1, 0x006C($sp) +/* 010AC 809B73FC 87A5006C */ lh $a1, 0x006C($sp) /* 010B0 809B7400 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 010B4 809B7404 86E7031C */ lh $a3, 0x031C($s7) ## 0000031C -/* 010B8 809B7408 00A12821 */ addu $a1, $a1, $at -/* 010BC 809B740C 00052C00 */ sll $a1, $a1, 16 +/* 010B8 809B7408 00A12821 */ addu $a1, $a1, $at +/* 010BC 809B740C 00052C00 */ sll $a1, $a1, 16 /* 010C0 809B7410 240900B6 */ addiu $t1, $zero, 0x00B6 ## $t1 = 000000B6 -/* 010C4 809B7414 AFA90010 */ sw $t1, 0x0010($sp) -/* 010C8 809B7418 00052C03 */ sra $a1, $a1, 16 +/* 010C4 809B7414 AFA90010 */ sw $t1, 0x0010($sp) +/* 010C8 809B7418 00052C03 */ sra $a1, $a1, 16 /* 010CC 809B741C 26E400B4 */ addiu $a0, $s7, 0x00B4 ## $a0 = 000000B4 /* 010D0 809B7420 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 010D4 809B7424 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 010D8 809B7428 86E400B4 */ lh $a0, 0x00B4($s7) ## 000000B4 /* 010DC 809B742C 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 010E0 809B7430 86E500B6 */ lh $a1, 0x00B6($s7) ## 000000B6 -/* 010E4 809B7434 00812021 */ addu $a0, $a0, $at -/* 010E8 809B7438 00042400 */ sll $a0, $a0, 16 -/* 010EC 809B743C 00042403 */ sra $a0, $a0, 16 +/* 010E4 809B7434 00812021 */ addu $a0, $a0, $at +/* 010E8 809B7438 00042400 */ sll $a0, $a0, 16 +/* 010EC 809B743C 00042403 */ sra $a0, $a0, 16 /* 010F0 809B7440 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 010F4 809B7444 0C034421 */ jal Matrix_RotateXYZ +/* 010F4 809B7444 0C034421 */ jal Matrix_RotateZYX /* 010F8 809B7448 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 010FC 809B744C 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 01100 809B7450 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 -/* 01104 809B7454 0C0346BD */ jal Matrix_MultVec3f +/* 01104 809B7454 0C0346BD */ jal Matrix_MultVec3f /* 01108 809B7458 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 0110C 809B745C 02E08025 */ or $s0, $s7, $zero ## $s0 = 00000000 /* 01110 809B7460 26F10164 */ addiu $s1, $s7, 0x0164 ## $s1 = 00000164 @@ -172,45 +172,45 @@ glabel func_809B71F0 /* 01128 809B7478 02402025 */ or $a0, $s2, $zero ## $a0 = 00000158 /* 0112C 809B747C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000164 /* 01130 809B7480 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 -/* 01134 809B7484 0C00D611 */ jal func_80035844 +/* 01134 809B7484 0C00D611 */ jal func_80035844 /* 01138 809B7488 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0113C 809B748C C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000158 /* 01140 809B7490 C60E015C */ lwc1 $f14, 0x015C($s0) ## 0000015C /* 01144 809B7494 8E060160 */ lw $a2, 0x0160($s0) ## 00000160 -/* 01148 809B7498 0C034261 */ jal Matrix_Translate +/* 01148 809B7498 0C034261 */ jal Matrix_Translate /* 0114C 809B749C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01150 809B74A0 86E7031C */ lh $a3, 0x031C($s7) ## 0000031C /* 01154 809B74A4 240A00B6 */ addiu $t2, $zero, 0x00B6 ## $t2 = 000000B6 -/* 01158 809B74A8 AFAA0010 */ sw $t2, 0x0010($sp) +/* 01158 809B74A8 AFAA0010 */ sw $t2, 0x0010($sp) /* 0115C 809B74AC 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002AA -/* 01160 809B74B0 87A5006E */ lh $a1, 0x006E($sp) +/* 01160 809B74B0 87A5006E */ lh $a1, 0x006E($sp) /* 01164 809B74B4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01168 809B74B8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0116C 809B74BC 87A5006C */ lh $a1, 0x006C($sp) +/* 0116C 809B74BC 87A5006C */ lh $a1, 0x006C($sp) /* 01170 809B74C0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 01174 809B74C4 86E7031C */ lh $a3, 0x031C($s7) ## 0000031C -/* 01178 809B74C8 00A12821 */ addu $a1, $a1, $at -/* 0117C 809B74CC 00052C00 */ sll $a1, $a1, 16 +/* 01178 809B74C8 00A12821 */ addu $a1, $a1, $at +/* 0117C 809B74CC 00052C00 */ sll $a1, $a1, 16 /* 01180 809B74D0 240B00B6 */ addiu $t3, $zero, 0x00B6 ## $t3 = 000000B6 -/* 01184 809B74D4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 01188 809B74D8 00052C03 */ sra $a1, $a1, 16 +/* 01184 809B74D4 AFAB0010 */ sw $t3, 0x0010($sp) +/* 01188 809B74D8 00052C03 */ sra $a1, $a1, 16 /* 0118C 809B74DC 02C02025 */ or $a0, $s6, $zero ## $a0 = 000002A8 /* 01190 809B74E0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01194 809B74E4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 01198 809B74E8 866402A8 */ lh $a0, 0x02A8($s3) ## 000002A8 /* 0119C 809B74EC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 011A0 809B74F0 866502AA */ lh $a1, 0x02AA($s3) ## 000002AA -/* 011A4 809B74F4 00812021 */ addu $a0, $a0, $at -/* 011A8 809B74F8 00042400 */ sll $a0, $a0, 16 -/* 011AC 809B74FC 00042403 */ sra $a0, $a0, 16 +/* 011A4 809B74F4 00812021 */ addu $a0, $a0, $at +/* 011A8 809B74F8 00042400 */ sll $a0, $a0, 16 +/* 011AC 809B74FC 00042403 */ sra $a0, $a0, 16 /* 011B0 809B7500 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 011B4 809B7504 0C034421 */ jal Matrix_RotateXYZ +/* 011B4 809B7504 0C034421 */ jal Matrix_RotateZYX /* 011B8 809B7508 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 011BC 809B750C 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 011C0 809B7510 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 -/* 011C4 809B7514 0C0346BD */ jal Matrix_MultVec3f +/* 011C4 809B7514 0C0346BD */ jal Matrix_MultVec3f /* 011C8 809B7518 02202825 */ or $a1, $s1, $zero ## $a1 = 00000164 /* 011CC 809B751C 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 00000006 /* 011D0 809B7520 2401004E */ addiu $at, $zero, 0x004E ## $at = 0000004E @@ -219,7 +219,7 @@ glabel func_809B71F0 /* 011DC 809B752C 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 00000164 /* 011E0 809B7530 26730006 */ addiu $s3, $s3, 0x0006 ## $s3 = 00000006 /* 011E4 809B7534 26B50006 */ addiu $s5, $s5, 0x0006 ## $s5 = 000002B0 -/* 011E8 809B7538 1681FFCF */ bne $s4, $at, .L809B7478 +/* 011E8 809B7538 1681FFCF */ bne $s4, $at, .L809B7478 /* 011EC 809B753C 26D60006 */ addiu $s6, $s6, 0x0006 ## $s6 = 000002AE /* 011F0 809B7540 86EE0318 */ lh $t6, 0x0318($s7) ## 00000318 /* 011F4 809B7544 86EC02F0 */ lh $t4, 0x02F0($s7) ## 000002F0 @@ -229,22 +229,22 @@ glabel func_809B71F0 /* 01204 809B7554 86F80318 */ lh $t8, 0x0318($s7) ## 00000318 /* 01208 809B7558 A6EC02F6 */ sh $t4, 0x02F6($s7) ## 000002F6 /* 0120C 809B755C A6ED02F8 */ sh $t5, 0x02F8($s7) ## 000002F8 -/* 01210 809B7560 57000004 */ bnel $t8, $zero, .L809B7574 -/* 01214 809B7564 8FBF0044 */ lw $ra, 0x0044($sp) -/* 01218 809B7568 0C26D95A */ jal func_809B6568 +/* 01210 809B7560 57000004 */ bnel $t8, $zero, .L809B7574 +/* 01214 809B7564 8FBF0044 */ lw $ra, 0x0044($sp) +/* 01218 809B7568 0C26D95A */ jal func_809B6568 /* 0121C 809B756C 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 -/* 01220 809B7570 8FBF0044 */ lw $ra, 0x0044($sp) +/* 01220 809B7570 8FBF0044 */ lw $ra, 0x0044($sp) .L809B7574: -/* 01224 809B7574 8FB00020 */ lw $s0, 0x0020($sp) -/* 01228 809B7578 8FB10024 */ lw $s1, 0x0024($sp) -/* 0122C 809B757C 8FB20028 */ lw $s2, 0x0028($sp) -/* 01230 809B7580 8FB3002C */ lw $s3, 0x002C($sp) -/* 01234 809B7584 8FB40030 */ lw $s4, 0x0030($sp) -/* 01238 809B7588 8FB50034 */ lw $s5, 0x0034($sp) -/* 0123C 809B758C 8FB60038 */ lw $s6, 0x0038($sp) -/* 01240 809B7590 8FB7003C */ lw $s7, 0x003C($sp) -/* 01244 809B7594 8FBE0040 */ lw $s8, 0x0040($sp) -/* 01248 809B7598 03E00008 */ jr $ra +/* 01224 809B7574 8FB00020 */ lw $s0, 0x0020($sp) +/* 01228 809B7578 8FB10024 */ lw $s1, 0x0024($sp) +/* 0122C 809B757C 8FB20028 */ lw $s2, 0x0028($sp) +/* 01230 809B7580 8FB3002C */ lw $s3, 0x002C($sp) +/* 01234 809B7584 8FB40030 */ lw $s4, 0x0030($sp) +/* 01238 809B7588 8FB50034 */ lw $s5, 0x0034($sp) +/* 0123C 809B758C 8FB60038 */ lw $s6, 0x0038($sp) +/* 01240 809B7590 8FB7003C */ lw $s7, 0x003C($sp) +/* 01244 809B7594 8FBE0040 */ lw $s8, 0x0040($sp) +/* 01248 809B7598 03E00008 */ jr $ra /* 0124C 809B759C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s index a2135cff2f..e632705e5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s @@ -1,16 +1,16 @@ glabel func_809B75A0 /* 01250 809B75A0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 01254 809B75A4 3C0E809C */ lui $t6, %hi(D_809B8100) ## $t6 = 809C0000 -/* 01258 809B75A8 AFBF0054 */ sw $ra, 0x0054($sp) -/* 0125C 809B75AC AFBE0050 */ sw $s8, 0x0050($sp) -/* 01260 809B75B0 AFB7004C */ sw $s7, 0x004C($sp) -/* 01264 809B75B4 AFB60048 */ sw $s6, 0x0048($sp) -/* 01268 809B75B8 AFB50044 */ sw $s5, 0x0044($sp) -/* 0126C 809B75BC AFB40040 */ sw $s4, 0x0040($sp) -/* 01270 809B75C0 AFB3003C */ sw $s3, 0x003C($sp) -/* 01274 809B75C4 AFB20038 */ sw $s2, 0x0038($sp) -/* 01278 809B75C8 AFB10034 */ sw $s1, 0x0034($sp) -/* 0127C 809B75CC AFB00030 */ sw $s0, 0x0030($sp) +/* 01258 809B75A8 AFBF0054 */ sw $ra, 0x0054($sp) +/* 0125C 809B75AC AFBE0050 */ sw $s8, 0x0050($sp) +/* 01260 809B75B0 AFB7004C */ sw $s7, 0x004C($sp) +/* 01264 809B75B4 AFB60048 */ sw $s6, 0x0048($sp) +/* 01268 809B75B8 AFB50044 */ sw $s5, 0x0044($sp) +/* 0126C 809B75BC AFB40040 */ sw $s4, 0x0040($sp) +/* 01270 809B75C0 AFB3003C */ sw $s3, 0x003C($sp) +/* 01274 809B75C4 AFB20038 */ sw $s2, 0x0038($sp) +/* 01278 809B75C8 AFB10034 */ sw $s1, 0x0034($sp) +/* 0127C 809B75CC AFB00030 */ sw $s0, 0x0030($sp) /* 01280 809B75D0 25CE8100 */ addiu $t6, $t6, %lo(D_809B8100) ## $t6 = 809B8100 /* 01284 809B75D4 8DD80000 */ lw $t8, 0x0000($t6) ## 809B8100 /* 01288 809B75D8 27BE0074 */ addiu $s8, $sp, 0x0074 ## $s8 = FFFFFFEC @@ -27,10 +27,10 @@ glabel func_809B75A0 /* 012B4 809B7604 A499031C */ sh $t9, 0x031C($a0) ## 0000031C /* 012B8 809B7608 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 012BC 809B760C 266500E4 */ addiu $a1, $s3, 0x00E4 ## $a1 = 000000E4 -/* 012C0 809B7610 AFA90014 */ sw $t1, 0x0014($sp) -/* 012C4 809B7614 AFA80010 */ sw $t0, 0x0010($sp) +/* 012C0 809B7610 AFA90014 */ sw $t1, 0x0014($sp) +/* 012C4 809B7614 AFA80010 */ sw $t0, 0x0010($sp) /* 012C8 809B7618 2406395B */ addiu $a2, $zero, 0x395B ## $a2 = 0000395B -/* 012CC 809B761C 0C00AA7D */ jal func_8002A9F4 +/* 012CC 809B761C 0C00AA7D */ jal func_8002A9F4 /* 012D0 809B7620 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 012D4 809B7624 AE60014C */ sw $zero, 0x014C($s3) ## 0000014C /* 012D8 809B7628 24110054 */ addiu $s1, $zero, 0x0054 ## $s1 = 00000054 @@ -40,69 +40,69 @@ glabel func_809B75A0 /* 012E4 809B7634 C604015C */ lwc1 $f4, 0x015C($s0) ## 000001B0 /* 012E8 809B7638 8E070158 */ lw $a3, 0x0158($s0) ## 000001AC /* 012EC 809B763C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 012F0 809B7640 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 012F0 809B7640 E7A40010 */ swc1 $f4, 0x0010($sp) /* 012F4 809B7644 C6060160 */ lwc1 $f6, 0x0160($s0) ## 000001B4 -/* 012F8 809B7648 AFAA0024 */ sw $t2, 0x0024($sp) -/* 012FC 809B764C AFA00020 */ sw $zero, 0x0020($sp) -/* 01300 809B7650 AFA0001C */ sw $zero, 0x001C($sp) -/* 01304 809B7654 AFA00018 */ sw $zero, 0x0018($sp) +/* 012F8 809B7648 AFAA0024 */ sw $t2, 0x0024($sp) +/* 012FC 809B764C AFA00020 */ sw $zero, 0x0020($sp) +/* 01300 809B7650 AFA0001C */ sw $zero, 0x001C($sp) +/* 01304 809B7654 AFA00018 */ sw $zero, 0x0018($sp) /* 01308 809B7658 02802025 */ or $a0, $s4, $zero ## $a0 = 00001C24 /* 0130C 809B765C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01310 809B7660 240600DE */ addiu $a2, $zero, 0x00DE ## $a2 = 000000DE /* 01314 809B7664 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 01318 809B7668 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01318 809B7668 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0131C 809B766C 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 00000060 -/* 01320 809B7670 2A2100A8 */ slti $at, $s1, 0x00A8 -/* 01324 809B7674 1420FFEF */ bne $at, $zero, .L809B7634 +/* 01320 809B7670 2A2100A8 */ slti $at, $s1, 0x00A8 +/* 01324 809B7674 1420FFEF */ bne $at, $zero, .L809B7634 /* 01328 809B7678 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 00000060 /* 0132C 809B767C 26700158 */ addiu $s0, $s3, 0x0158 ## $s0 = 00000158 /* 01330 809B7680 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 01334 809B7684 0C01E027 */ jal Math_Vec3f_Pitch - + /* 01338 809B7688 26640024 */ addiu $a0, $s3, 0x0024 ## $a0 = 00000024 /* 0133C 809B768C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01340 809B7690 00418821 */ addu $s1, $v0, $at -/* 01344 809B7694 00118C00 */ sll $s1, $s1, 16 +/* 01340 809B7690 00418821 */ addu $s1, $v0, $at +/* 01344 809B7694 00118C00 */ sll $s1, $s1, 16 /* 01348 809B7698 8665008A */ lh $a1, 0x008A($s3) ## 0000008A /* 0134C 809B769C 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 01350 809B76A0 00118C03 */ sra $s1, $s1, 16 -/* 01354 809B76A4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01350 809B76A0 00118C03 */ sra $s1, $s1, 16 +/* 01354 809B76A4 AFA00010 */ sw $zero, 0x0010($sp) /* 01358 809B76A8 266400B6 */ addiu $a0, $s3, 0x00B6 ## $a0 = 000000B6 /* 0135C 809B76AC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01360 809B76B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01364 809B76B4 00112C00 */ sll $a1, $s1, 16 +/* 01364 809B76B4 00112C00 */ sll $a1, $s1, 16 /* 01368 809B76B8 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 0136C 809B76BC AFA00010 */ sw $zero, 0x0010($sp) -/* 01370 809B76C0 00052C03 */ sra $a1, $a1, 16 +/* 0136C 809B76BC AFA00010 */ sw $zero, 0x0010($sp) +/* 01370 809B76C0 00052C03 */ sra $a1, $a1, 16 /* 01374 809B76C4 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 /* 01378 809B76C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0137C 809B76CC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01380 809B76D0 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 /* 01384 809B76D4 C66E0028 */ lwc1 $f14, 0x0028($s3) ## 00000028 /* 01388 809B76D8 8E66002C */ lw $a2, 0x002C($s3) ## 0000002C -/* 0138C 809B76DC 0C034261 */ jal Matrix_Translate +/* 0138C 809B76DC 0C034261 */ jal Matrix_Translate /* 01390 809B76E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01394 809B76E4 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 01398 809B76E8 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 0139C 809B76EC 866500B6 */ lh $a1, 0x00B6($s3) ## 000000B6 -/* 013A0 809B76F0 00812021 */ addu $a0, $a0, $at -/* 013A4 809B76F4 00042400 */ sll $a0, $a0, 16 -/* 013A8 809B76F8 00042403 */ sra $a0, $a0, 16 +/* 013A0 809B76F0 00812021 */ addu $a0, $a0, $at +/* 013A4 809B76F4 00042400 */ sll $a0, $a0, 16 +/* 013A8 809B76F8 00042403 */ sra $a0, $a0, 16 /* 013AC 809B76FC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013B0 809B7700 0C034421 */ jal Matrix_RotateXYZ +/* 013B0 809B7700 0C034421 */ jal Matrix_RotateZYX /* 013B4 809B7704 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013B8 809B7708 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 013BC 809B770C 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 -/* 013C0 809B7710 0C0346BD */ jal Matrix_MultVec3f +/* 013C0 809B7710 0C0346BD */ jal Matrix_MultVec3f /* 013C4 809B7714 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 013C8 809B7718 8E6B0004 */ lw $t3, 0x0004($s3) ## 00000004 /* 013CC 809B771C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 013D0 809B7720 2671001E */ addiu $s1, $s3, 0x001E ## $s1 = 0000001E /* 013D4 809B7724 2670003C */ addiu $s0, $s3, 0x003C ## $s0 = 0000003C -/* 013D8 809B7728 01616024 */ and $t4, $t3, $at +/* 013D8 809B7728 01616024 */ and $t4, $t3, $at /* 013DC 809B772C AE6C0004 */ sw $t4, 0x0004($s3) ## 00000004 /* 013E0 809B7730 26160164 */ addiu $s6, $s0, 0x0164 ## $s6 = 000001A0 /* 013E4 809B7734 263402A8 */ addiu $s4, $s1, 0x02A8 ## $s4 = 000002C6 @@ -112,59 +112,59 @@ glabel func_809B75A0 .L809B7744: /* 013F4 809B7744 866502C6 */ lh $a1, 0x02C6($s3) ## 000002C6 /* 013F8 809B7748 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 013FC 809B774C AFA00010 */ sw $zero, 0x0010($sp) +/* 013FC 809B774C AFA00010 */ sw $zero, 0x0010($sp) /* 01400 809B7750 02802025 */ or $a0, $s4, $zero ## $a0 = 000002C6 /* 01404 809B7754 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01408 809B7758 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0140C 809B775C 866502C8 */ lh $a1, 0x02C8($s3) ## 000002C8 /* 01410 809B7760 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 01414 809B7764 AFA00010 */ sw $zero, 0x0010($sp) +/* 01414 809B7764 AFA00010 */ sw $zero, 0x0010($sp) /* 01418 809B7768 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002C8 /* 0141C 809B776C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01420 809B7770 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01424 809B7774 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000194 /* 01428 809B7778 C60E015C */ lwc1 $f14, 0x015C($s0) ## 00000198 /* 0142C 809B777C 8E060160 */ lw $a2, 0x0160($s0) ## 0000019C -/* 01430 809B7780 0C034261 */ jal Matrix_Translate +/* 01430 809B7780 0C034261 */ jal Matrix_Translate /* 01434 809B7784 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01438 809B7788 862402A8 */ lh $a0, 0x02A8($s1) ## 000002C6 /* 0143C 809B778C 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 01440 809B7790 862502AA */ lh $a1, 0x02AA($s1) ## 000002C8 -/* 01444 809B7794 00812021 */ addu $a0, $a0, $at -/* 01448 809B7798 00042400 */ sll $a0, $a0, 16 -/* 0144C 809B779C 00042403 */ sra $a0, $a0, 16 +/* 01444 809B7794 00812021 */ addu $a0, $a0, $at +/* 01448 809B7798 00042400 */ sll $a0, $a0, 16 +/* 0144C 809B779C 00042403 */ sra $a0, $a0, 16 /* 01450 809B77A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01454 809B77A4 0C034421 */ jal Matrix_RotateXYZ +/* 01454 809B77A4 0C034421 */ jal Matrix_RotateZYX /* 01458 809B77A8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0145C 809B77AC 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFEC -/* 01460 809B77B0 0C0346BD */ jal Matrix_MultVec3f +/* 01460 809B77B0 0C0346BD */ jal Matrix_MultVec3f /* 01464 809B77B4 02C02825 */ or $a1, $s6, $zero ## $a1 = 000001A0 /* 01468 809B77B8 26520006 */ addiu $s2, $s2, 0x0006 ## $s2 = 00000024 /* 0146C 809B77BC 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 00000048 /* 01470 809B77C0 26310006 */ addiu $s1, $s1, 0x0006 ## $s1 = 00000024 /* 01474 809B77C4 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 000002CC /* 01478 809B77C8 26B50006 */ addiu $s5, $s5, 0x0006 ## $s5 = 000002CE -/* 0147C 809B77CC 1657FFDD */ bne $s2, $s7, .L809B7744 +/* 0147C 809B77CC 1657FFDD */ bne $s2, $s7, .L809B7744 /* 01480 809B77D0 26D6000C */ addiu $s6, $s6, 0x000C ## $s6 = 000001AC /* 01484 809B77D4 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F /* 01488 809B77D8 3C05809B */ lui $a1, %hi(func_809B781C) ## $a1 = 809B0000 /* 0148C 809B77DC A66D031A */ sh $t5, 0x031A($s3) ## 0000031A /* 01490 809B77E0 24A5781C */ addiu $a1, $a1, %lo(func_809B781C) ## $a1 = 809B781C -/* 01494 809B77E4 0C26D8D4 */ jal func_809B6350 +/* 01494 809B77E4 0C26D8D4 */ jal func_809B6350 /* 01498 809B77E8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0149C 809B77EC 8FBF0054 */ lw $ra, 0x0054($sp) -/* 014A0 809B77F0 8FB00030 */ lw $s0, 0x0030($sp) -/* 014A4 809B77F4 8FB10034 */ lw $s1, 0x0034($sp) -/* 014A8 809B77F8 8FB20038 */ lw $s2, 0x0038($sp) -/* 014AC 809B77FC 8FB3003C */ lw $s3, 0x003C($sp) -/* 014B0 809B7800 8FB40040 */ lw $s4, 0x0040($sp) -/* 014B4 809B7804 8FB50044 */ lw $s5, 0x0044($sp) -/* 014B8 809B7808 8FB60048 */ lw $s6, 0x0048($sp) -/* 014BC 809B780C 8FB7004C */ lw $s7, 0x004C($sp) -/* 014C0 809B7810 8FBE0050 */ lw $s8, 0x0050($sp) -/* 014C4 809B7814 03E00008 */ jr $ra +/* 0149C 809B77EC 8FBF0054 */ lw $ra, 0x0054($sp) +/* 014A0 809B77F0 8FB00030 */ lw $s0, 0x0030($sp) +/* 014A4 809B77F4 8FB10034 */ lw $s1, 0x0034($sp) +/* 014A8 809B77F8 8FB20038 */ lw $s2, 0x0038($sp) +/* 014AC 809B77FC 8FB3003C */ lw $s3, 0x003C($sp) +/* 014B0 809B7800 8FB40040 */ lw $s4, 0x0040($sp) +/* 014B4 809B7804 8FB50044 */ lw $s5, 0x0044($sp) +/* 014B8 809B7808 8FB60048 */ lw $s6, 0x0048($sp) +/* 014BC 809B780C 8FB7004C */ lw $s7, 0x004C($sp) +/* 014C0 809B7810 8FBE0050 */ lw $s8, 0x0050($sp) +/* 014C4 809B7814 03E00008 */ jr $ra /* 014C8 809B7818 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s index c9e12f240a..3ed4555a8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s @@ -1,16 +1,16 @@ glabel func_809B781C /* 014CC 809B781C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 014D0 809B7820 3C0F809C */ lui $t7, %hi(D_809B810C) ## $t7 = 809C0000 -/* 014D4 809B7824 AFBF0044 */ sw $ra, 0x0044($sp) -/* 014D8 809B7828 AFBE0040 */ sw $s8, 0x0040($sp) -/* 014DC 809B782C AFB7003C */ sw $s7, 0x003C($sp) -/* 014E0 809B7830 AFB60038 */ sw $s6, 0x0038($sp) -/* 014E4 809B7834 AFB50034 */ sw $s5, 0x0034($sp) -/* 014E8 809B7838 AFB40030 */ sw $s4, 0x0030($sp) -/* 014EC 809B783C AFB3002C */ sw $s3, 0x002C($sp) -/* 014F0 809B7840 AFB20028 */ sw $s2, 0x0028($sp) -/* 014F4 809B7844 AFB10024 */ sw $s1, 0x0024($sp) -/* 014F8 809B7848 AFB00020 */ sw $s0, 0x0020($sp) +/* 014D4 809B7824 AFBF0044 */ sw $ra, 0x0044($sp) +/* 014D8 809B7828 AFBE0040 */ sw $s8, 0x0040($sp) +/* 014DC 809B782C AFB7003C */ sw $s7, 0x003C($sp) +/* 014E0 809B7830 AFB60038 */ sw $s6, 0x0038($sp) +/* 014E4 809B7834 AFB50034 */ sw $s5, 0x0034($sp) +/* 014E8 809B7838 AFB40030 */ sw $s4, 0x0030($sp) +/* 014EC 809B783C AFB3002C */ sw $s3, 0x002C($sp) +/* 014F0 809B7840 AFB20028 */ sw $s2, 0x0028($sp) +/* 014F4 809B7844 AFB10024 */ sw $s1, 0x0024($sp) +/* 014F8 809B7848 AFB00020 */ sw $s0, 0x0020($sp) /* 014FC 809B784C 25EF810C */ addiu $t7, $t7, %lo(D_809B810C) ## $t7 = 809B810C /* 01500 809B7850 8DF90000 */ lw $t9, 0x0000($t7) ## 809B810C /* 01504 809B7854 27AE006C */ addiu $t6, $sp, 0x006C ## $t6 = FFFFFFF4 @@ -23,7 +23,7 @@ glabel func_809B781C /* 01520 809B7870 8488031A */ lh $t0, 0x031A($a0) ## 0000031A /* 01524 809B7874 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01528 809B7878 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0152C 809B787C 110000A2 */ beq $t0, $zero, .L809B7B08 +/* 0152C 809B787C 110000A2 */ beq $t0, $zero, .L809B7B08 /* 01530 809B7880 24091F40 */ addiu $t1, $zero, 0x1F40 ## $t1 = 00001F40 /* 01534 809B7884 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 01538 809B7888 3C014100 */ lui $at, 0x4100 ## $at = 41000000 @@ -31,50 +31,50 @@ glabel func_809B781C /* 01540 809B7890 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 /* 01544 809B7894 26500158 */ addiu $s0, $s2, 0x0158 ## $s0 = 00000158 /* 01548 809B7898 A489031C */ sh $t1, 0x031C($a0) ## 0000031C -/* 0154C 809B789C 46083280 */ add.s $f10, $f6, $f8 +/* 0154C 809B789C 46083280 */ add.s $f10, $f6, $f8 /* 01550 809B78A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 01554 809B78A4 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 01558 809B78A8 E4840044 */ swc1 $f4, 0x0044($a0) ## 00000068 /* 0155C 809B78AC 0C01E027 */ jal Math_Vec3f_Pitch - + /* 01560 809B78B0 E48A0004 */ swc1 $f10, 0x0004($a0) ## 00000028 /* 01564 809B78B4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01568 809B78B8 00418821 */ addu $s1, $v0, $at -/* 0156C 809B78BC 00118C00 */ sll $s1, $s1, 16 +/* 01568 809B78B8 00418821 */ addu $s1, $v0, $at +/* 0156C 809B78BC 00118C00 */ sll $s1, $s1, 16 /* 01570 809B78C0 8645008A */ lh $a1, 0x008A($s2) ## 0000008A /* 01574 809B78C4 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01578 809B78C8 00118C03 */ sra $s1, $s1, 16 -/* 0157C 809B78CC AFA00010 */ sw $zero, 0x0010($sp) +/* 01578 809B78C8 00118C03 */ sra $s1, $s1, 16 +/* 0157C 809B78CC AFA00010 */ sw $zero, 0x0010($sp) /* 01580 809B78D0 264400B6 */ addiu $a0, $s2, 0x00B6 ## $a0 = 000000B6 /* 01584 809B78D4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01588 809B78D8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0158C 809B78DC 00112C00 */ sll $a1, $s1, 16 +/* 0158C 809B78DC 00112C00 */ sll $a1, $s1, 16 /* 01590 809B78E0 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01594 809B78E4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01598 809B78E8 00052C03 */ sra $a1, $a1, 16 +/* 01594 809B78E4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01598 809B78E8 00052C03 */ sra $a1, $a1, 16 /* 0159C 809B78EC 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 015A0 809B78F0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 015A4 809B78F4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 015A8 809B78F8 C64C0024 */ lwc1 $f12, 0x0024($s2) ## 00000024 /* 015AC 809B78FC C64E0028 */ lwc1 $f14, 0x0028($s2) ## 00000028 /* 015B0 809B7900 8E46002C */ lw $a2, 0x002C($s2) ## 0000002C -/* 015B4 809B7904 0C034261 */ jal Matrix_Translate +/* 015B4 809B7904 0C034261 */ jal Matrix_Translate /* 015B8 809B7908 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 015BC 809B790C 864400B4 */ lh $a0, 0x00B4($s2) ## 000000B4 /* 015C0 809B7910 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 015C4 809B7914 864500B6 */ lh $a1, 0x00B6($s2) ## 000000B6 -/* 015C8 809B7918 00812021 */ addu $a0, $a0, $at -/* 015CC 809B791C 00042400 */ sll $a0, $a0, 16 -/* 015D0 809B7920 00042403 */ sra $a0, $a0, 16 +/* 015C8 809B7918 00812021 */ addu $a0, $a0, $at +/* 015CC 809B791C 00042400 */ sll $a0, $a0, 16 +/* 015D0 809B7920 00042403 */ sra $a0, $a0, 16 /* 015D4 809B7924 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 015D8 809B7928 0C034421 */ jal Matrix_RotateXYZ +/* 015D8 809B7928 0C034421 */ jal Matrix_RotateZYX /* 015DC 809B792C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 015E0 809B7930 3C1E809C */ lui $s8, %hi(D_809B8080) ## $s8 = 809C0000 /* 015E4 809B7934 27DE8080 */ addiu $s8, $s8, %lo(D_809B8080) ## $s8 = 809B8080 /* 015E8 809B7938 03C02025 */ or $a0, $s8, $zero ## $a0 = 809B8080 -/* 015EC 809B793C 0C0346BD */ jal Matrix_MultVec3f +/* 015EC 809B793C 0C0346BD */ jal Matrix_MultVec3f /* 015F0 809B7940 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 015F4 809B7944 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 /* 015F8 809B7948 02408825 */ or $s1, $s2, $zero ## $s1 = 00000000 @@ -85,66 +85,66 @@ glabel func_809B781C /* 0160C 809B795C 26560164 */ addiu $s6, $s2, 0x0164 ## $s6 = 00000164 .L809B7960: /* 01610 809B7960 8644031A */ lh $a0, 0x031A($s2) ## 0000031A -/* 01614 809B7964 00800821 */ addu $at, $a0, $zero -/* 01618 809B7968 00042100 */ sll $a0, $a0, 4 -/* 0161C 809B796C 00812021 */ addu $a0, $a0, $at -/* 01620 809B7970 00042100 */ sll $a0, $a0, 4 -/* 01624 809B7974 00812021 */ addu $a0, $a0, $at -/* 01628 809B7978 00042080 */ sll $a0, $a0, 2 -/* 0162C 809B797C 00042400 */ sll $a0, $a0, 16 +/* 01614 809B7964 00800821 */ addu $at, $a0, $zero +/* 01618 809B7968 00042100 */ sll $a0, $a0, 4 +/* 0161C 809B796C 00812021 */ addu $a0, $a0, $at +/* 01620 809B7970 00042100 */ sll $a0, $a0, 4 +/* 01624 809B7974 00812021 */ addu $a0, $a0, $at +/* 01628 809B7978 00042080 */ sll $a0, $a0, 2 +/* 0162C 809B797C 00042400 */ sll $a0, $a0, 16 /* 01630 809B7980 0C01DE0D */ jal Math_Coss ## coss? -/* 01634 809B7984 00042403 */ sra $a0, $a0, 16 +/* 01634 809B7984 00042403 */ sra $a0, $a0, 16 /* 01638 809B7988 44979000 */ mtc1 $s7, $f18 ## $f18 = 0.00 -/* 0163C 809B798C 46000407 */ neg.s $f16, $f0 +/* 0163C 809B798C 46000407 */ neg.s $f16, $f0 /* 01640 809B7990 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01644 809B7994 46809120 */ cvt.s.w $f4, $f18 -/* 01648 809B7998 AFA00010 */ sw $zero, 0x0010($sp) +/* 01644 809B7994 46809120 */ cvt.s.w $f4, $f18 +/* 01648 809B7998 AFA00010 */ sw $zero, 0x0010($sp) /* 0164C 809B799C 02602025 */ or $a0, $s3, $zero ## $a0 = 000002A8 /* 01650 809B79A0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01654 809B79A4 46048182 */ mul.s $f6, $f16, $f4 -/* 01658 809B79A8 4600320D */ trunc.w.s $f8, $f6 -/* 0165C 809B79AC 44054000 */ mfc1 $a1, $f8 +/* 01654 809B79A4 46048182 */ mul.s $f6, $f16, $f4 +/* 01658 809B79A8 4600320D */ trunc.w.s $f8, $f6 +/* 0165C 809B79AC 44054000 */ mfc1 $a1, $f8 /* 01660 809B79B0 00000000 */ nop -/* 01664 809B79B4 00052C00 */ sll $a1, $a1, 16 -/* 01668 809B79B8 00052C03 */ sra $a1, $a1, 16 +/* 01664 809B79B4 00052C00 */ sll $a1, $a1, 16 +/* 01668 809B79B8 00052C03 */ sra $a1, $a1, 16 /* 0166C 809B79BC 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 -/* 01670 809B79C0 00052C00 */ sll $a1, $a1, 16 +/* 01670 809B79C0 00052C00 */ sll $a1, $a1, 16 /* 01674 809B79C4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01678 809B79C8 00052C03 */ sra $a1, $a1, 16 + +/* 01678 809B79C8 00052C03 */ sra $a1, $a1, 16 /* 0167C 809B79CC 8645008A */ lh $a1, 0x008A($s2) ## 0000008A /* 01680 809B79D0 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01684 809B79D4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01684 809B79D4 AFA00010 */ sw $zero, 0x0010($sp) /* 01688 809B79D8 02802025 */ or $a0, $s4, $zero ## $a0 = 000002AA /* 0168C 809B79DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01690 809B79E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01694 809B79E4 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000158 /* 01698 809B79E8 C60E015C */ lwc1 $f14, 0x015C($s0) ## 0000015C /* 0169C 809B79EC 8E060160 */ lw $a2, 0x0160($s0) ## 00000160 -/* 016A0 809B79F0 0C034261 */ jal Matrix_Translate +/* 016A0 809B79F0 0C034261 */ jal Matrix_Translate /* 016A4 809B79F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 016A8 809B79F8 862402A8 */ lh $a0, 0x02A8($s1) ## 000002A8 /* 016AC 809B79FC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 016B0 809B7A00 862502AA */ lh $a1, 0x02AA($s1) ## 000002AA -/* 016B4 809B7A04 00812021 */ addu $a0, $a0, $at -/* 016B8 809B7A08 00042400 */ sll $a0, $a0, 16 -/* 016BC 809B7A0C 00042403 */ sra $a0, $a0, 16 +/* 016B4 809B7A04 00812021 */ addu $a0, $a0, $at +/* 016B8 809B7A08 00042400 */ sll $a0, $a0, 16 +/* 016BC 809B7A0C 00042403 */ sra $a0, $a0, 16 /* 016C0 809B7A10 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 016C4 809B7A14 0C034421 */ jal Matrix_RotateXYZ +/* 016C4 809B7A14 0C034421 */ jal Matrix_RotateZYX /* 016C8 809B7A18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 016CC 809B7A1C 03C02025 */ or $a0, $s8, $zero ## $a0 = 809B8080 -/* 016D0 809B7A20 0C0346BD */ jal Matrix_MultVec3f +/* 016D0 809B7A20 0C0346BD */ jal Matrix_MultVec3f /* 016D4 809B7A24 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000164 /* 016D8 809B7A28 26B5000C */ addiu $s5, $s5, 0x000C ## $s5 = 0000000C -/* 016DC 809B7A2C 2AA1003C */ slti $at, $s5, 0x003C +/* 016DC 809B7A2C 2AA1003C */ slti $at, $s5, 0x003C /* 016E0 809B7A30 26F70190 */ addiu $s7, $s7, 0x0190 ## $s7 = 00000190 /* 016E4 809B7A34 26310006 */ addiu $s1, $s1, 0x0006 ## $s1 = 00000006 /* 016E8 809B7A38 26730006 */ addiu $s3, $s3, 0x0006 ## $s3 = 000002AE /* 016EC 809B7A3C 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 000002B0 /* 016F0 809B7A40 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 0000000C -/* 016F4 809B7A44 1420FFC6 */ bne $at, $zero, .L809B7960 +/* 016F4 809B7A44 1420FFC6 */ bne $at, $zero, .L809B7960 /* 016F8 809B7A48 26D6000C */ addiu $s6, $s6, 0x000C ## $s6 = 00000170 /* 016FC 809B7A4C 2651001E */ addiu $s1, $s2, 0x001E ## $s1 = 0000001E /* 01700 809B7A50 2650003C */ addiu $s0, $s2, 0x003C ## $s0 = 0000003C @@ -156,66 +156,66 @@ glabel func_809B781C .L809B7A68: /* 01718 809B7A68 864502C6 */ lh $a1, 0x02C6($s2) ## 000002C6 /* 0171C 809B7A6C 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01720 809B7A70 AFA00010 */ sw $zero, 0x0010($sp) +/* 01720 809B7A70 AFA00010 */ sw $zero, 0x0010($sp) /* 01724 809B7A74 02602025 */ or $a0, $s3, $zero ## $a0 = 000002C6 /* 01728 809B7A78 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0172C 809B7A7C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01730 809B7A80 864502C8 */ lh $a1, 0x02C8($s2) ## 000002C8 /* 01734 809B7A84 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01738 809B7A88 AFA00010 */ sw $zero, 0x0010($sp) +/* 01738 809B7A88 AFA00010 */ sw $zero, 0x0010($sp) /* 0173C 809B7A8C 02802025 */ or $a0, $s4, $zero ## $a0 = 000002C8 /* 01740 809B7A90 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01744 809B7A94 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01748 809B7A98 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000194 /* 0174C 809B7A9C C60E015C */ lwc1 $f14, 0x015C($s0) ## 00000198 /* 01750 809B7AA0 8E060160 */ lw $a2, 0x0160($s0) ## 0000019C -/* 01754 809B7AA4 0C034261 */ jal Matrix_Translate +/* 01754 809B7AA4 0C034261 */ jal Matrix_Translate /* 01758 809B7AA8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0175C 809B7AAC 862402A8 */ lh $a0, 0x02A8($s1) ## 000002C6 /* 01760 809B7AB0 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 01764 809B7AB4 862502AA */ lh $a1, 0x02AA($s1) ## 000002C8 -/* 01768 809B7AB8 00812021 */ addu $a0, $a0, $at -/* 0176C 809B7ABC 00042400 */ sll $a0, $a0, 16 -/* 01770 809B7AC0 00042403 */ sra $a0, $a0, 16 +/* 01768 809B7AB8 00812021 */ addu $a0, $a0, $at +/* 0176C 809B7ABC 00042400 */ sll $a0, $a0, 16 +/* 01770 809B7AC0 00042403 */ sra $a0, $a0, 16 /* 01774 809B7AC4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01778 809B7AC8 0C034421 */ jal Matrix_RotateXYZ +/* 01778 809B7AC8 0C034421 */ jal Matrix_RotateZYX /* 0177C 809B7ACC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01780 809B7AD0 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFF4 -/* 01784 809B7AD4 0C0346BD */ jal Matrix_MultVec3f +/* 01784 809B7AD4 0C0346BD */ jal Matrix_MultVec3f /* 01788 809B7AD8 02C02825 */ or $a1, $s6, $zero ## $a1 = 000001A0 /* 0178C 809B7ADC 26B5000C */ addiu $s5, $s5, 0x000C ## $s5 = 00000048 /* 01790 809B7AE0 26310006 */ addiu $s1, $s1, 0x0006 ## $s1 = 00000024 /* 01794 809B7AE4 26730006 */ addiu $s3, $s3, 0x0006 ## $s3 = 000002CC /* 01798 809B7AE8 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 000002CE /* 0179C 809B7AEC 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 00000048 -/* 017A0 809B7AF0 16B7FFDD */ bne $s5, $s7, .L809B7A68 +/* 017A0 809B7AF0 16B7FFDD */ bne $s5, $s7, .L809B7A68 /* 017A4 809B7AF4 26D6000C */ addiu $s6, $s6, 0x000C ## $s6 = 000001AC /* 017A8 809B7AF8 864B031A */ lh $t3, 0x031A($s2) ## 0000031A /* 017AC 809B7AFC 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = FFFFFFFF -/* 017B0 809B7B00 10000006 */ beq $zero, $zero, .L809B7B1C +/* 017B0 809B7B00 10000006 */ beq $zero, $zero, .L809B7B1C /* 017B4 809B7B04 A64C031A */ sh $t4, 0x031A($s2) ## 0000031A .L809B7B08: /* 017B8 809B7B08 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 017BC 809B7B0C 0C00B2DD */ jal Flags_SetSwitch - + /* 017C0 809B7B10 86450154 */ lh $a1, 0x0154($s2) ## 00000154 /* 017C4 809B7B14 0C00B55C */ jal Actor_Kill - + /* 017C8 809B7B18 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 .L809B7B1C: -/* 017CC 809B7B1C 8FBF0044 */ lw $ra, 0x0044($sp) -/* 017D0 809B7B20 8FB00020 */ lw $s0, 0x0020($sp) -/* 017D4 809B7B24 8FB10024 */ lw $s1, 0x0024($sp) -/* 017D8 809B7B28 8FB20028 */ lw $s2, 0x0028($sp) -/* 017DC 809B7B2C 8FB3002C */ lw $s3, 0x002C($sp) -/* 017E0 809B7B30 8FB40030 */ lw $s4, 0x0030($sp) -/* 017E4 809B7B34 8FB50034 */ lw $s5, 0x0034($sp) -/* 017E8 809B7B38 8FB60038 */ lw $s6, 0x0038($sp) -/* 017EC 809B7B3C 8FB7003C */ lw $s7, 0x003C($sp) -/* 017F0 809B7B40 8FBE0040 */ lw $s8, 0x0040($sp) -/* 017F4 809B7B44 03E00008 */ jr $ra +/* 017CC 809B7B1C 8FBF0044 */ lw $ra, 0x0044($sp) +/* 017D0 809B7B20 8FB00020 */ lw $s0, 0x0020($sp) +/* 017D4 809B7B24 8FB10024 */ lw $s1, 0x0024($sp) +/* 017D8 809B7B28 8FB20028 */ lw $s2, 0x0028($sp) +/* 017DC 809B7B2C 8FB3002C */ lw $s3, 0x002C($sp) +/* 017E0 809B7B30 8FB40030 */ lw $s4, 0x0030($sp) +/* 017E4 809B7B34 8FB50034 */ lw $s5, 0x0034($sp) +/* 017E8 809B7B38 8FB60038 */ lw $s6, 0x0038($sp) +/* 017EC 809B7B3C 8FB7003C */ lw $s7, 0x003C($sp) +/* 017F0 809B7B40 8FBE0040 */ lw $s8, 0x0040($sp) +/* 017F4 809B7B44 03E00008 */ jr $ra /* 017F8 809B7B48 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s index b1d2c24feb..453927822a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s @@ -1,9 +1,9 @@ glabel func_809BA458 /* 02178 809BA458 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0217C 809BA45C 3C0F809C */ lui $t7, %hi(D_809BBB50) ## $t7 = 809C0000 -/* 02180 809BA460 AFBF001C */ sw $ra, 0x001C($sp) -/* 02184 809BA464 AFB00018 */ sw $s0, 0x0018($sp) -/* 02188 809BA468 AFA50034 */ sw $a1, 0x0034($sp) +/* 02180 809BA460 AFBF001C */ sw $ra, 0x001C($sp) +/* 02184 809BA464 AFB00018 */ sw $s0, 0x0018($sp) +/* 02188 809BA468 AFA50034 */ sw $a1, 0x0034($sp) /* 0218C 809BA46C 25EFBB50 */ addiu $t7, $t7, %lo(D_809BBB50) ## $t7 = 809BBB50 /* 02190 809BA470 8DF90000 */ lw $t9, 0x0000($t7) ## 809BBB50 /* 02194 809BA474 27AE0024 */ addiu $t6, $sp, 0x0024 ## $t6 = FFFFFFF4 @@ -15,7 +15,7 @@ glabel func_809BA458 /* 021AC 809BA48C 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 021B0 809BA490 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 021B4 809BA494 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 021B8 809BA498 0C0294BE */ jal func_800A52F8 +/* 021B8 809BA498 0C0294BE */ jal func_800A52F8 /* 021BC 809BA49C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 021C0 809BA4A0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 021C4 809BA4A4 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C @@ -29,32 +29,32 @@ glabel func_809BA458 /* 021E0 809BA4C0 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB /* 021E4 809BA4C4 E6000274 */ swc1 $f0, 0x0274($s0) ## 00000274 /* 021E8 809BA4C8 A60900B4 */ sh $t1, 0x00B4($s0) ## 000000B4 -/* 021EC 809BA4CC 15610006 */ bne $t3, $at, .L809BA4E8 +/* 021EC 809BA4CC 15610006 */ bne $t3, $at, .L809BA4E8 /* 021F0 809BA4D0 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 /* 021F4 809BA4D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021F8 809BA4D8 0C26E7D8 */ jal func_809B9F60 -/* 021FC 809BA4DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 02200 809BA4E0 0C26E7CA */ jal func_809B9F28 +/* 021F8 809BA4D8 0C26E7D8 */ jal func_809B9F60 +/* 021FC 809BA4DC 8FA50034 */ lw $a1, 0x0034($sp) +/* 02200 809BA4E0 0C26E7CA */ jal func_809B9F28 /* 02204 809BA4E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809BA4E8: /* 02208 809BA4E8 C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 /* 0220C 809BA4EC C60E000C */ lwc1 $f14, 0x000C($s0) ## 0000000C /* 02210 809BA4F0 8E060010 */ lw $a2, 0x0010($s0) ## 00000010 -/* 02214 809BA4F4 0C034261 */ jal Matrix_Translate +/* 02214 809BA4F4 0C034261 */ jal Matrix_Translate /* 02218 809BA4F8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0221C 809BA4FC 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 02220 809BA500 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 02224 809BA504 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02228 809BA508 0C034421 */ jal Matrix_RotateXYZ +/* 02228 809BA508 0C034421 */ jal Matrix_RotateZYX /* 0222C 809BA50C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02230 809BA510 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 -/* 02234 809BA514 0C0343B5 */ jal Matrix_RotateZ +/* 02234 809BA514 0C0343B5 */ jal Matrix_RotateZ /* 02238 809BA518 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0223C 809BA51C C6040278 */ lwc1 $f4, 0x0278($s0) ## 00000278 /* 02240 809BA520 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFF4 /* 02244 809BA524 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 02248 809BA528 0C0346BD */ jal Matrix_MultVec3f -/* 0224C 809BA52C E7A40028 */ swc1 $f4, 0x0028($sp) +/* 02248 809BA528 0C0346BD */ jal Matrix_MultVec3f +/* 0224C 809BA52C E7A40028 */ swc1 $f4, 0x0028($sp) /* 02250 809BA530 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02254 809BA534 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 /* 02258 809BA538 AE000324 */ sw $zero, 0x0324($s0) ## 00000324 @@ -66,19 +66,19 @@ glabel func_809BA458 /* 0226C 809BA54C 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 02270 809BA550 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 02274 809BA554 44818000 */ mtc1 $at, $f16 ## $f16 = 180.00 -/* 02278 809BA558 46080282 */ mul.s $f10, $f0, $f8 +/* 02278 809BA558 46080282 */ mul.s $f10, $f0, $f8 /* 0227C 809BA55C 3C05809C */ lui $a1, %hi(func_809BA628) ## $a1 = 809C0000 /* 02280 809BA560 24A5A628 */ addiu $a1, $a1, %lo(func_809BA628) ## $a1 = 809BA628 /* 02284 809BA564 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02288 809BA568 46105480 */ add.s $f18, $f10, $f16 -/* 0228C 809BA56C 4600910D */ trunc.w.s $f4, $f18 -/* 02290 809BA570 440E2000 */ mfc1 $t6, $f4 -/* 02294 809BA574 0C26E0B8 */ jal func_809B82E0 +/* 02288 809BA568 46105480 */ add.s $f18, $f10, $f16 +/* 0228C 809BA56C 4600910D */ trunc.w.s $f4, $f18 +/* 02290 809BA570 440E2000 */ mfc1 $t6, $f4 +/* 02294 809BA574 0C26E0B8 */ jal func_809B82E0 /* 02298 809BA578 A60E026E */ sh $t6, 0x026E($s0) ## 0000026E -/* 0229C 809BA57C 8FBF001C */ lw $ra, 0x001C($sp) -/* 022A0 809BA580 8FB00018 */ lw $s0, 0x0018($sp) +/* 0229C 809BA57C 8FBF001C */ lw $ra, 0x001C($sp) +/* 022A0 809BA580 8FB00018 */ lw $s0, 0x0018($sp) /* 022A4 809BA584 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 022A8 809BA588 03E00008 */ jr $ra +/* 022A8 809BA588 03E00008 */ jr $ra /* 022AC 809BA58C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s index dc18053715..7a62a7f6f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s @@ -1,9 +1,9 @@ glabel func_809BA628 /* 02348 809BA628 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 0234C 809BA62C 3C18809C */ lui $t8, %hi(D_809BBB5C) ## $t8 = 809C0000 -/* 02350 809BA630 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02354 809BA634 AFB00020 */ sw $s0, 0x0020($sp) -/* 02358 809BA638 AFA50074 */ sw $a1, 0x0074($sp) +/* 02350 809BA630 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02354 809BA634 AFB00020 */ sw $s0, 0x0020($sp) +/* 02358 809BA638 AFA50074 */ sw $a1, 0x0074($sp) /* 0235C 809BA63C 2718BB5C */ addiu $t8, $t8, %lo(D_809BBB5C) ## $t8 = 809BBB5C /* 02360 809BA640 8F080000 */ lw $t0, 0x0000($t8) ## 809BBB5C /* 02364 809BA644 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 @@ -24,141 +24,141 @@ glabel func_809BA628 /* 023A0 809BA680 AD2A0004 */ sw $t2, 0x0004($t1) ## FFFFFFE8 /* 023A4 809BA684 8C4B002C */ lw $t3, 0x002C($v0) ## 0000002C /* 023A8 809BA688 AD2B0008 */ sw $t3, 0x0008($t1) ## FFFFFFEC -/* 023AC 809BA68C C7A40058 */ lwc1 $f4, 0x0058($sp) -/* 023B0 809BA690 46062200 */ add.s $f8, $f4, $f6 -/* 023B4 809BA694 E7A80058 */ swc1 $f8, 0x0058($sp) +/* 023AC 809BA68C C7A40058 */ lwc1 $f4, 0x0058($sp) +/* 023B0 809BA690 46062200 */ add.s $f8, $f4, $f6 +/* 023B4 809BA694 E7A80058 */ swc1 $f8, 0x0058($sp) /* 023B8 809BA698 848C001C */ lh $t4, 0x001C($a0) ## 0000001C -/* 023BC 809BA69C 558100AD */ bnel $t4, $at, .L809BA954 +/* 023BC 809BA69C 558100AD */ bnel $t4, $at, .L809BA954 /* 023C0 809BA6A0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 023C4 809BA6A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 023C8 809BA6A8 C48A0068 */ lwc1 $f10, 0x0068($a0) ## 00000068 /* 023CC 809BA6AC 24840008 */ addiu $a0, $a0, 0x0008 ## $a0 = 00000008 /* 023D0 809BA6B0 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 023D4 809BA6B4 460A0032 */ c.eq.s $f0, $f10 +/* 023D4 809BA6B4 460A0032 */ c.eq.s $f0, $f10 /* 023D8 809BA6B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 023DC 809BA6BC 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 023E0 809BA6C0 45020095 */ bc1fl .L809BA918 -/* 023E4 809BA6C4 44050000 */ mfc1 $a1, $f0 -/* 023E8 809BA6C8 AFA4002C */ sw $a0, 0x002C($sp) +/* 023E0 809BA6C0 45020095 */ bc1fl .L809BA918 +/* 023E4 809BA6C4 44050000 */ mfc1 $a1, $f0 +/* 023E8 809BA6C8 AFA4002C */ sw $a0, 0x002C($sp) /* 023EC 809BA6CC 0C01E027 */ jal Math_Vec3f_Pitch - -/* 023F0 809BA6D0 AFA50028 */ sw $a1, 0x0028($sp) -/* 023F4 809BA6D4 8FA50028 */ lw $a1, 0x0028($sp) -/* 023F8 809BA6D8 A7A20052 */ sh $v0, 0x0052($sp) + +/* 023F0 809BA6D0 AFA50028 */ sw $a1, 0x0028($sp) +/* 023F4 809BA6D4 8FA50028 */ lw $a1, 0x0028($sp) +/* 023F8 809BA6D8 A7A20052 */ sh $v0, 0x0052($sp) /* 023FC 809BA6DC 0C01E01A */ jal Math_Vec3f_Yaw - -/* 02400 809BA6E0 8FA4002C */ lw $a0, 0x002C($sp) -/* 02404 809BA6E4 A7A20050 */ sh $v0, 0x0050($sp) + +/* 02400 809BA6E0 8FA4002C */ lw $a0, 0x002C($sp) +/* 02404 809BA6E4 A7A20050 */ sh $v0, 0x0050($sp) /* 02408 809BA6E8 0C01DE1C */ jal Math_Sins ## sins? -/* 0240C 809BA6EC 87A40052 */ lh $a0, 0x0052($sp) +/* 0240C 809BA6EC 87A40052 */ lh $a0, 0x0052($sp) /* 02410 809BA6F0 C610027C */ lwc1 $f16, 0x027C($s0) ## 0000027C -/* 02414 809BA6F4 87A40052 */ lh $a0, 0x0052($sp) -/* 02418 809BA6F8 46100482 */ mul.s $f18, $f0, $f16 +/* 02414 809BA6F4 87A40052 */ lh $a0, 0x0052($sp) +/* 02418 809BA6F8 46100482 */ mul.s $f18, $f0, $f16 /* 0241C 809BA6FC 0C01DE0D */ jal Math_Coss ## coss? -/* 02420 809BA700 E7B2004C */ swc1 $f18, 0x004C($sp) +/* 02420 809BA700 E7B2004C */ swc1 $f18, 0x004C($sp) /* 02424 809BA704 C604027C */ lwc1 $f4, 0x027C($s0) ## 0000027C -/* 02428 809BA708 AFA00010 */ sw $zero, 0x0010($sp) +/* 02428 809BA708 AFA00010 */ sw $zero, 0x0010($sp) /* 0242C 809BA70C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 02430 809BA710 46040182 */ mul.s $f6, $f0, $f4 -/* 02434 809BA714 87A50050 */ lh $a1, 0x0050($sp) +/* 02430 809BA710 46040182 */ mul.s $f6, $f0, $f4 +/* 02434 809BA714 87A50050 */ lh $a1, 0x0050($sp) /* 02438 809BA718 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0243C 809BA71C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 02440 809BA720 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02444 809BA724 E7A60048 */ swc1 $f6, 0x0048($sp) + +/* 02444 809BA724 E7A60048 */ swc1 $f6, 0x0048($sp) /* 02448 809BA728 0C01DE1C */ jal Math_Sins ## sins? /* 0244C 809BA72C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 02450 809BA730 C7A80048 */ lwc1 $f8, 0x0048($sp) +/* 02450 809BA730 C7A80048 */ lwc1 $f8, 0x0048($sp) /* 02454 809BA734 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 02458 809BA738 46080082 */ mul.s $f2, $f0, $f8 +/* 02458 809BA738 46080082 */ mul.s $f2, $f0, $f8 /* 0245C 809BA73C 0C01DE0D */ jal Math_Coss ## coss? -/* 02460 809BA740 E7A20040 */ swc1 $f2, 0x0040($sp) -/* 02464 809BA744 C7A20040 */ lwc1 $f2, 0x0040($sp) +/* 02460 809BA740 E7A20040 */ swc1 $f2, 0x0040($sp) +/* 02464 809BA744 C7A20040 */ lwc1 $f2, 0x0040($sp) /* 02468 809BA748 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0246C 809BA74C C7AA0048 */ lwc1 $f10, 0x0048($sp) +/* 0246C 809BA74C C7AA0048 */ lwc1 $f10, 0x0048($sp) /* 02470 809BA750 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 02474 809BA754 4602803E */ c.le.s $f16, $f2 -/* 02478 809BA758 460A0302 */ mul.s $f12, $f0, $f10 -/* 0247C 809BA75C 8FA4002C */ lw $a0, 0x002C($sp) +/* 02474 809BA754 4602803E */ c.le.s $f16, $f2 +/* 02478 809BA758 460A0302 */ mul.s $f12, $f0, $f10 +/* 0247C 809BA75C 8FA4002C */ lw $a0, 0x002C($sp) /* 02480 809BA760 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02484 809BA764 45020004 */ bc1fl .L809BA778 -/* 02488 809BA768 46001007 */ neg.s $f0, $f2 -/* 0248C 809BA76C 10000002 */ beq $zero, $zero, .L809BA778 -/* 02490 809BA770 46001006 */ mov.s $f0, $f2 -/* 02494 809BA774 46001007 */ neg.s $f0, $f2 +/* 02484 809BA764 45020004 */ bc1fl .L809BA778 +/* 02488 809BA768 46001007 */ neg.s $f0, $f2 +/* 0248C 809BA76C 10000002 */ beq $zero, $zero, .L809BA778 +/* 02490 809BA770 46001006 */ mov.s $f0, $f2 +/* 02494 809BA774 46001007 */ neg.s $f0, $f2 .L809BA778: /* 02498 809BA778 8E050290 */ lw $a1, 0x0290($s0) ## 00000290 -/* 0249C 809BA77C 44070000 */ mfc1 $a3, $f0 -/* 024A0 809BA780 E7AC003C */ swc1 $f12, 0x003C($sp) +/* 0249C 809BA77C 44070000 */ mfc1 $a3, $f0 +/* 024A0 809BA780 E7AC003C */ swc1 $f12, 0x003C($sp) /* 024A4 809BA784 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 024A8 809BA788 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 024AC 809BA78C C7AE004C */ lwc1 $f14, 0x004C($sp) + +/* 024A8 809BA788 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 024AC 809BA78C C7AE004C */ lwc1 $f14, 0x004C($sp) /* 024B0 809BA790 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 024B4 809BA794 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 024B8 809BA798 C7AC003C */ lwc1 $f12, 0x003C($sp) -/* 024BC 809BA79C 460E203E */ c.le.s $f4, $f14 -/* 024C0 809BA7A0 46000086 */ mov.s $f2, $f0 +/* 024B8 809BA798 C7AC003C */ lwc1 $f12, 0x003C($sp) +/* 024BC 809BA79C 460E203E */ c.le.s $f4, $f14 +/* 024C0 809BA7A0 46000086 */ mov.s $f2, $f0 /* 024C4 809BA7A4 2604000C */ addiu $a0, $s0, 0x000C ## $a0 = 0000000C /* 024C8 809BA7A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 024CC 809BA7AC 45020004 */ bc1fl .L809BA7C0 -/* 024D0 809BA7B0 46007007 */ neg.s $f0, $f14 -/* 024D4 809BA7B4 10000002 */ beq $zero, $zero, .L809BA7C0 -/* 024D8 809BA7B8 46007006 */ mov.s $f0, $f14 -/* 024DC 809BA7BC 46007007 */ neg.s $f0, $f14 +/* 024CC 809BA7AC 45020004 */ bc1fl .L809BA7C0 +/* 024D0 809BA7B0 46007007 */ neg.s $f0, $f14 +/* 024D4 809BA7B4 10000002 */ beq $zero, $zero, .L809BA7C0 +/* 024D8 809BA7B8 46007006 */ mov.s $f0, $f14 +/* 024DC 809BA7BC 46007007 */ neg.s $f0, $f14 .L809BA7C0: /* 024E0 809BA7C0 8E050294 */ lw $a1, 0x0294($s0) ## 00000294 -/* 024E4 809BA7C4 44070000 */ mfc1 $a3, $f0 -/* 024E8 809BA7C8 E7AC003C */ swc1 $f12, 0x003C($sp) -/* 024EC 809BA7CC E7A20044 */ swc1 $f2, 0x0044($sp) +/* 024E4 809BA7C4 44070000 */ mfc1 $a3, $f0 +/* 024E8 809BA7C8 E7AC003C */ swc1 $f12, 0x003C($sp) +/* 024EC 809BA7CC E7A20044 */ swc1 $f2, 0x0044($sp) /* 024F0 809BA7D0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 024F4 809BA7D4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 024F8 809BA7D8 C7AC003C */ lwc1 $f12, 0x003C($sp) + +/* 024F4 809BA7D4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 024F8 809BA7D8 C7AC003C */ lwc1 $f12, 0x003C($sp) /* 024FC 809BA7DC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 02500 809BA7E0 C7A20044 */ lwc1 $f2, 0x0044($sp) +/* 02500 809BA7E0 C7A20044 */ lwc1 $f2, 0x0044($sp) /* 02504 809BA7E4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 02508 809BA7E8 460C403E */ c.le.s $f8, $f12 +/* 02508 809BA7E8 460C403E */ c.le.s $f8, $f12 /* 0250C 809BA7EC 26040010 */ addiu $a0, $s0, 0x0010 ## $a0 = 00000010 /* 02510 809BA7F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02514 809BA7F4 46001080 */ add.s $f2, $f2, $f0 -/* 02518 809BA7F8 45020004 */ bc1fl .L809BA80C -/* 0251C 809BA7FC 46006007 */ neg.s $f0, $f12 -/* 02520 809BA800 10000002 */ beq $zero, $zero, .L809BA80C -/* 02524 809BA804 46006006 */ mov.s $f0, $f12 -/* 02528 809BA808 46006007 */ neg.s $f0, $f12 +/* 02514 809BA7F4 46001080 */ add.s $f2, $f2, $f0 +/* 02518 809BA7F8 45020004 */ bc1fl .L809BA80C +/* 0251C 809BA7FC 46006007 */ neg.s $f0, $f12 +/* 02520 809BA800 10000002 */ beq $zero, $zero, .L809BA80C +/* 02524 809BA804 46006006 */ mov.s $f0, $f12 +/* 02528 809BA808 46006007 */ neg.s $f0, $f12 .L809BA80C: /* 0252C 809BA80C 8E050298 */ lw $a1, 0x0298($s0) ## 00000298 -/* 02530 809BA810 44070000 */ mfc1 $a3, $f0 -/* 02534 809BA814 E7A20044 */ swc1 $f2, 0x0044($sp) +/* 02530 809BA810 44070000 */ mfc1 $a3, $f0 +/* 02534 809BA814 E7A20044 */ swc1 $f2, 0x0044($sp) /* 02538 809BA818 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0253C 809BA81C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02540 809BA820 C7A20044 */ lwc1 $f2, 0x0044($sp) -/* 02544 809BA824 46001080 */ add.s $f2, $f2, $f0 + +/* 0253C 809BA81C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02540 809BA820 C7A20044 */ lwc1 $f2, 0x0044($sp) +/* 02544 809BA824 46001080 */ add.s $f2, $f2, $f0 /* 02548 809BA828 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 0254C 809BA82C E7A20044 */ swc1 $f2, 0x0044($sp) +/* 0254C 809BA82C E7A20044 */ swc1 $f2, 0x0044($sp) /* 02550 809BA830 3C01809C */ lui $at, %hi(D_809BBCB0) ## $at = 809C0000 -/* 02554 809BA834 C430BCB0 */ lwc1 $f16, %lo(D_809BBCB0)($at) +/* 02554 809BA834 C430BCB0 */ lwc1 $f16, %lo(D_809BBCB0)($at) /* 02558 809BA838 3C01809C */ lui $at, %hi(D_809BBCB4) ## $at = 809C0000 -/* 0255C 809BA83C C432BCB4 */ lwc1 $f18, %lo(D_809BBCB4)($at) -/* 02560 809BA840 C7A20044 */ lwc1 $f2, 0x0044($sp) +/* 0255C 809BA83C C432BCB4 */ lwc1 $f18, %lo(D_809BBCB4)($at) +/* 02560 809BA840 C7A20044 */ lwc1 $f2, 0x0044($sp) /* 02564 809BA844 C6080274 */ lwc1 $f8, 0x0274($s0) ## 00000274 -/* 02568 809BA848 46120102 */ mul.s $f4, $f0, $f18 +/* 02568 809BA848 46120102 */ mul.s $f4, $f0, $f18 /* 0256C 809BA84C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 02570 809BA850 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02574 809BA854 46121032 */ c.eq.s $f2, $f18 -/* 02578 809BA858 46048180 */ add.s $f6, $f16, $f4 -/* 0257C 809BA85C 46064280 */ add.s $f10, $f8, $f6 -/* 02580 809BA860 45000003 */ bc1f .L809BA870 +/* 02574 809BA854 46121032 */ c.eq.s $f2, $f18 +/* 02578 809BA858 46048180 */ add.s $f6, $f16, $f4 +/* 0257C 809BA85C 46064280 */ add.s $f10, $f8, $f6 +/* 02580 809BA860 45000003 */ bc1f .L809BA870 /* 02584 809BA864 E60A0274 */ swc1 $f10, 0x0274($s0) ## 00000274 -/* 02588 809BA868 0C26E7D8 */ jal func_809B9F60 -/* 0258C 809BA86C 8FA50074 */ lw $a1, 0x0074($sp) +/* 02588 809BA868 0C26E7D8 */ jal func_809B9F60 +/* 0258C 809BA86C 8FA50074 */ lw $a1, 0x0074($sp) .L809BA870: /* 02590 809BA870 920E02BC */ lbu $t6, 0x02BC($s0) ## 000002BC /* 02594 809BA874 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -166,31 +166,31 @@ glabel func_809BA628 /* 0259C 809BA87C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 025A0 809BA880 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 /* 025A4 809BA884 AE0D025C */ sw $t5, 0x025C($s0) ## 0000025C -/* 025A8 809BA888 11E00007 */ beq $t7, $zero, .L809BA8A8 +/* 025A8 809BA888 11E00007 */ beq $t7, $zero, .L809BA8A8 /* 025AC 809BA88C E610027C */ swc1 $f16, 0x027C($s0) ## 0000027C /* 025B0 809BA890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 025B4 809BA894 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 025B8 809BA898 240538CB */ addiu $a1, $zero, 0x38CB ## $a1 = 000038CB /* 025BC 809BA89C 921802BC */ lbu $t8, 0x02BC($s0) ## 000002BC /* 025C0 809BA8A0 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 /* 025C4 809BA8A4 A21902BC */ sb $t9, 0x02BC($s0) ## 000002BC .L809BA8A8: -/* 025C8 809BA8A8 0C0329DD */ jal func_800CA774 +/* 025C8 809BA8A8 0C0329DD */ jal func_800CA774 /* 025CC 809BA8AC C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 025D0 809BA8B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 025D4 809BA8B4 00000000 */ nop -/* 025D8 809BA8B8 46040032 */ c.eq.s $f0, $f4 +/* 025D8 809BA8B8 46040032 */ c.eq.s $f0, $f4 /* 025DC 809BA8BC 00000000 */ nop -/* 025E0 809BA8C0 45020012 */ bc1fl .L809BA90C +/* 025E0 809BA8C0 45020012 */ bc1fl .L809BA90C /* 025E4 809BA8C4 86090032 */ lh $t1, 0x0032($s0) ## 00000032 /* 025E8 809BA8C8 8608026A */ lh $t0, 0x026A($s0) ## 0000026A -/* 025EC 809BA8CC 11000005 */ beq $t0, $zero, .L809BA8E4 +/* 025EC 809BA8CC 11000005 */ beq $t0, $zero, .L809BA8E4 /* 025F0 809BA8D0 00000000 */ nop /* 025F4 809BA8D4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 025F8 809BA8D8 00000000 */ nop -/* 025FC 809BA8DC 1000000A */ beq $zero, $zero, .L809BA908 +/* 025FC 809BA8DC 1000000A */ beq $zero, $zero, .L809BA908 /* 02600 809BA8E0 E6000284 */ swc1 $f0, 0x0284($s0) ## 00000284 .L809BA8E4: /* 02604 809BA8E4 0C03F66B */ jal Math_Rand_ZeroOne @@ -200,149 +200,149 @@ glabel func_809BA628 /* 02610 809BA8F0 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 02614 809BA8F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02618 809BA8F8 240538CA */ addiu $a1, $zero, 0x38CA ## $a1 = 000038CA -/* 0261C 809BA8FC 46080182 */ mul.s $f6, $f0, $f8 +/* 0261C 809BA8FC 46080182 */ mul.s $f6, $f0, $f8 /* 02620 809BA900 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02624 809BA904 E6060284 */ swc1 $f6, 0x0284($s0) ## 00000284 .L809BA908: /* 02628 809BA908 86090032 */ lh $t1, 0x0032($s0) ## 00000032 .L809BA90C: -/* 0262C 809BA90C 1000000D */ beq $zero, $zero, .L809BA944 +/* 0262C 809BA90C 1000000D */ beq $zero, $zero, .L809BA944 /* 02630 809BA910 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 02634 809BA914 44050000 */ mfc1 $a1, $f0 +/* 02634 809BA914 44050000 */ mfc1 $a1, $f0 .L809BA918: /* 02638 809BA918 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0263C 809BA91C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02640 809BA920 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 02640 809BA920 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02644 809BA924 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 02648 809BA928 00000000 */ nop -/* 0264C 809BA92C 460A0032 */ c.eq.s $f0, $f10 +/* 0264C 809BA92C 460A0032 */ c.eq.s $f0, $f10 /* 02650 809BA930 00000000 */ nop -/* 02654 809BA934 45020004 */ bc1fl .L809BA948 +/* 02654 809BA934 45020004 */ bc1fl .L809BA948 /* 02658 809BA938 260A0024 */ addiu $t2, $s0, 0x0024 ## $t2 = 00000024 -/* 0265C 809BA93C 0C26E7CA */ jal func_809B9F28 +/* 0265C 809BA93C 0C26E7CA */ jal func_809B9F28 /* 02660 809BA940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809BA944: /* 02664 809BA944 260A0024 */ addiu $t2, $s0, 0x0024 ## $t2 = 00000024 .L809BA948: -/* 02668 809BA948 10000012 */ beq $zero, $zero, .L809BA994 -/* 0266C 809BA94C AFAA002C */ sw $t2, 0x002C($sp) +/* 02668 809BA948 10000012 */ beq $zero, $zero, .L809BA994 +/* 0266C 809BA94C AFAA002C */ sw $t2, 0x002C($sp) /* 02670 809BA950 8605008A */ lh $a1, 0x008A($s0) ## 0000008A .L809BA954: -/* 02674 809BA954 AFA00010 */ sw $zero, 0x0010($sp) +/* 02674 809BA954 AFA00010 */ sw $zero, 0x0010($sp) /* 02678 809BA958 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0267C 809BA95C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02680 809BA960 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 02684 809BA964 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 02688 809BA968 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 0268C 809BA96C AFA4002C */ sw $a0, 0x002C($sp) +/* 0268C 809BA96C AFA4002C */ sw $a0, 0x002C($sp) /* 02690 809BA970 0C01E027 */ jal Math_Vec3f_Pitch - + /* 02694 809BA974 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFE4 -/* 02698 809BA978 00022C00 */ sll $a1, $v0, 16 -/* 0269C 809BA97C 00052C03 */ sra $a1, $a1, 16 +/* 02698 809BA978 00022C00 */ sll $a1, $v0, 16 +/* 0269C 809BA97C 00052C03 */ sra $a1, $a1, 16 /* 026A0 809BA980 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 026A4 809BA984 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 026A8 809BA988 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 026AC 809BA98C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 026B0 809BA990 AFA00010 */ sw $zero, 0x0010($sp) + +/* 026B0 809BA990 AFA00010 */ sw $zero, 0x0010($sp) .L809BA994: /* 026B4 809BA994 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 026B8 809BA998 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 026BC 809BA99C 0C0329DD */ jal func_800CA774 +/* 026BC 809BA99C 0C0329DD */ jal func_800CA774 /* 026C0 809BA9A0 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 026C4 809BA9A4 3C01809C */ lui $at, %hi(D_809BBCB8) ## $at = 809C0000 -/* 026C8 809BA9A8 C432BCB8 */ lwc1 $f18, %lo(D_809BBCB8)($at) -/* 026CC 809BA9AC 4612003E */ c.le.s $f0, $f18 +/* 026C8 809BA9A8 C432BCB8 */ lwc1 $f18, %lo(D_809BBCB8)($at) +/* 026CC 809BA9AC 4612003E */ c.le.s $f0, $f18 /* 026D0 809BA9B0 00000000 */ nop -/* 026D4 809BA9B4 45020008 */ bc1fl .L809BA9D8 +/* 026D4 809BA9B4 45020008 */ bc1fl .L809BA9D8 /* 026D8 809BA9B8 C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 /* 026DC 809BA9BC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 026E0 809BA9C0 00000000 */ nop /* 026E4 809BA9C4 3C01809C */ lui $at, %hi(D_809BBCBC) ## $at = 809C0000 -/* 026E8 809BA9C8 C430BCBC */ lwc1 $f16, %lo(D_809BBCBC)($at) -/* 026EC 809BA9CC 46100102 */ mul.s $f4, $f0, $f16 +/* 026E8 809BA9C8 C430BCBC */ lwc1 $f16, %lo(D_809BBCBC)($at) +/* 026EC 809BA9CC 46100102 */ mul.s $f4, $f0, $f16 /* 026F0 809BA9D0 E6040284 */ swc1 $f4, 0x0284($s0) ## 00000284 /* 026F4 809BA9D4 C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 .L809BA9D8: /* 026F8 809BA9D8 C60E000C */ lwc1 $f14, 0x000C($s0) ## 0000000C /* 026FC 809BA9DC 8E060010 */ lw $a2, 0x0010($s0) ## 00000010 -/* 02700 809BA9E0 0C034261 */ jal Matrix_Translate +/* 02700 809BA9E0 0C034261 */ jal Matrix_Translate /* 02704 809BA9E4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02708 809BA9E8 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 0270C 809BA9EC 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 02710 809BA9F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02714 809BA9F4 0C034421 */ jal Matrix_RotateXYZ +/* 02714 809BA9F4 0C034421 */ jal Matrix_RotateZYX /* 02718 809BA9F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0271C 809BA9FC C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 -/* 02720 809BAA00 0C0343B5 */ jal Matrix_RotateZ +/* 02720 809BAA00 0C0343B5 */ jal Matrix_RotateZ /* 02724 809BAA04 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 02728 809BAA08 C6080278 */ lwc1 $f8, 0x0278($s0) ## 00000278 /* 0272C 809BAA0C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFF0 /* 02730 809BAA10 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFE4 -/* 02734 809BAA14 0C0346BD */ jal Matrix_MultVec3f -/* 02738 809BAA18 E7A80064 */ swc1 $f8, 0x0064($sp) +/* 02734 809BAA14 0C0346BD */ jal Matrix_MultVec3f +/* 02738 809BAA18 E7A80064 */ swc1 $f8, 0x0064($sp) /* 0273C 809BAA1C 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 02740 809BAA20 44815000 */ mtc1 $at, $f10 ## $f10 = 0.75 /* 02744 809BAA24 C6060274 */ lwc1 $f6, 0x0274($s0) ## 00000274 /* 02748 809BAA28 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0274C 809BAA2C 8FA4002C */ lw $a0, 0x002C($sp) -/* 02750 809BAA30 460A3482 */ mul.s $f18, $f6, $f10 -/* 02754 809BAA34 8FA50054 */ lw $a1, 0x0054($sp) +/* 0274C 809BAA2C 8FA4002C */ lw $a0, 0x002C($sp) +/* 02750 809BAA30 460A3482 */ mul.s $f18, $f6, $f10 +/* 02754 809BAA34 8FA50054 */ lw $a1, 0x0054($sp) /* 02758 809BAA38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0275C 809BAA3C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 02760 809BAA40 44079000 */ mfc1 $a3, $f18 +/* 0275C 809BAA3C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 02760 809BAA40 44079000 */ mfc1 $a3, $f18 /* 02764 809BAA44 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 02768 809BAA48 00000000 */ nop /* 0276C 809BAA4C 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 02770 809BAA50 44814000 */ mtc1 $at, $f8 ## $f8 = 0.75 /* 02774 809BAA54 C6040274 */ lwc1 $f4, 0x0274($s0) ## 00000274 /* 02778 809BAA58 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0277C 809BAA5C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 02780 809BAA60 46082182 */ mul.s $f6, $f4, $f8 -/* 02784 809BAA64 8FA50058 */ lw $a1, 0x0058($sp) +/* 02780 809BAA60 46082182 */ mul.s $f6, $f4, $f8 +/* 02784 809BAA64 8FA50058 */ lw $a1, 0x0058($sp) /* 02788 809BAA68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0278C 809BAA6C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02790 809BAA70 44073000 */ mfc1 $a3, $f6 +/* 0278C 809BAA6C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02790 809BAA70 44073000 */ mfc1 $a3, $f6 /* 02794 809BAA74 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 02798 809BAA78 00000000 */ nop /* 0279C 809BAA7C 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 027A0 809BAA80 44818000 */ mtc1 $at, $f16 ## $f16 = 0.75 /* 027A4 809BAA84 C6120274 */ lwc1 $f18, 0x0274($s0) ## 00000274 /* 027A8 809BAA88 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 027AC 809BAA8C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 027B0 809BAA90 46109102 */ mul.s $f4, $f18, $f16 -/* 027B4 809BAA94 8FA5005C */ lw $a1, 0x005C($sp) +/* 027B0 809BAA90 46109102 */ mul.s $f4, $f18, $f16 +/* 027B4 809BAA94 8FA5005C */ lw $a1, 0x005C($sp) /* 027B8 809BAA98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 027BC 809BAA9C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 027C0 809BAAA0 44072000 */ mfc1 $a3, $f4 +/* 027BC 809BAA9C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 027C0 809BAAA0 44072000 */ mfc1 $a3, $f4 /* 027C4 809BAAA4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 027C8 809BAAA8 00000000 */ nop /* 027CC 809BAAAC 3C01809C */ lui $at, %hi(D_809BBCC0) ## $at = 809C0000 -/* 027D0 809BAAB0 C426BCC0 */ lwc1 $f6, %lo(D_809BBCC0)($at) +/* 027D0 809BAAB0 C426BCC0 */ lwc1 $f6, %lo(D_809BBCC0)($at) /* 027D4 809BAAB4 C60A0284 */ lwc1 $f10, 0x0284($s0) ## 00000284 /* 027D8 809BAAB8 C6100274 */ lwc1 $f16, 0x0274($s0) ## 00000274 /* 027DC 809BAABC 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC -/* 027E0 809BAAC0 460A3480 */ add.s $f18, $f6, $f10 -/* 027E4 809BAAC4 46128100 */ add.s $f4, $f16, $f18 +/* 027E0 809BAAC0 460A3480 */ add.s $f18, $f6, $f10 +/* 027E4 809BAAC4 46128100 */ add.s $f4, $f16, $f18 /* 027E8 809BAAC8 E6040274 */ swc1 $f4, 0x0274($s0) ## 00000274 -/* 027EC 809BAACC 0C00CD90 */ jal func_80033640 -/* 027F0 809BAAD0 8FA40074 */ lw $a0, 0x0074($sp) -/* 027F4 809BAAD4 54400008 */ bnel $v0, $zero, .L809BAAF8 +/* 027EC 809BAACC 0C00CD90 */ jal func_80033640 +/* 027F0 809BAAD0 8FA40074 */ lw $a0, 0x0074($sp) +/* 027F4 809BAAD4 54400008 */ bnel $v0, $zero, .L809BAAF8 /* 027F8 809BAAD8 860E0268 */ lh $t6, 0x0268($s0) ## 00000268 /* 027FC 809BAADC 860B026E */ lh $t3, 0x026E($s0) ## 0000026E /* 02800 809BAAE0 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = FFFFFFFF /* 02804 809BAAE4 A60C026E */ sh $t4, 0x026E($s0) ## 0000026E /* 02808 809BAAE8 860D026E */ lh $t5, 0x026E($s0) ## 0000026E -/* 0280C 809BAAEC 55A00017 */ bnel $t5, $zero, .L809BAB4C +/* 0280C 809BAAEC 55A00017 */ bnel $t5, $zero, .L809BAB4C /* 02810 809BAAF0 860B0268 */ lh $t3, 0x0268($s0) ## 00000268 /* 02814 809BAAF4 860E0268 */ lh $t6, 0x0268($s0) ## 00000268 .L809BAAF8: @@ -354,30 +354,30 @@ glabel func_809BA628 /* 02828 809BAB08 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 0282C 809BAB0C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 02830 809BAB10 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 02834 809BAB14 46080182 */ mul.s $f6, $f0, $f8 +/* 02834 809BAB14 46080182 */ mul.s $f6, $f0, $f8 /* 02838 809BAB18 8608026E */ lh $t0, 0x026E($s0) ## 0000026E /* 0283C 809BAB1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02840 809BAB20 460A3400 */ add.s $f16, $f6, $f10 -/* 02844 809BAB24 4600848D */ trunc.w.s $f18, $f16 -/* 02848 809BAB28 44199000 */ mfc1 $t9, $f18 -/* 0284C 809BAB2C 11000004 */ beq $t0, $zero, .L809BAB40 +/* 02840 809BAB20 460A3400 */ add.s $f16, $f6, $f10 +/* 02844 809BAB24 4600848D */ trunc.w.s $f18, $f16 +/* 02848 809BAB28 44199000 */ mfc1 $t9, $f18 +/* 0284C 809BAB2C 11000004 */ beq $t0, $zero, .L809BAB40 /* 02850 809BAB30 AE190260 */ sw $t9, 0x0260($s0) ## 00000260 /* 02854 809BAB34 920902BD */ lbu $t1, 0x02BD($s0) ## 000002BD /* 02858 809BAB38 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 /* 0285C 809BAB3C A20A02BD */ sb $t2, 0x02BD($s0) ## 000002BD .L809BAB40: /* 02860 809BAB40 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02864 809BAB44 240538CD */ addiu $a1, $zero, 0x38CD ## $a1 = 000038CD /* 02868 809BAB48 860B0268 */ lh $t3, 0x0268($s0) ## 00000268 .L809BAB4C: /* 0286C 809BAB4C 26040288 */ addiu $a0, $s0, 0x0288 ## $a0 = 00000288 /* 02870 809BAB50 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 -/* 02874 809BAB54 11600023 */ beq $t3, $zero, .L809BABE4 +/* 02874 809BAB54 11600023 */ beq $t3, $zero, .L809BABE4 /* 02878 809BAB58 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0287C 809BAB5C 8E0C0260 */ lw $t4, 0x0260($s0) ## 00000260 /* 02880 809BAB60 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF -/* 02884 809BAB64 15A0000F */ bne $t5, $zero, .L809BABA4 +/* 02884 809BAB64 15A0000F */ bne $t5, $zero, .L809BABA4 /* 02888 809BAB68 AE0D0260 */ sw $t5, 0x0260($s0) ## 00000260 /* 0288C 809BAB6C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -386,14 +386,14 @@ glabel func_809BA628 /* 02898 809BAB78 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 0289C 809BAB7C 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 028A0 809BAB80 44813000 */ mtc1 $at, $f6 ## $f6 = 180.00 -/* 028A4 809BAB84 46040202 */ mul.s $f8, $f0, $f4 +/* 028A4 809BAB84 46040202 */ mul.s $f8, $f0, $f4 /* 028A8 809BAB88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 028AC 809BAB8C 240538CC */ addiu $a1, $zero, 0x38CC ## $a1 = 000038CC -/* 028B0 809BAB90 46064280 */ add.s $f10, $f8, $f6 -/* 028B4 809BAB94 4600540D */ trunc.w.s $f16, $f10 -/* 028B8 809BAB98 44188000 */ mfc1 $t8, $f16 +/* 028B0 809BAB90 46064280 */ add.s $f10, $f8, $f6 +/* 028B4 809BAB94 4600540D */ trunc.w.s $f16, $f10 +/* 028B8 809BAB98 44188000 */ mfc1 $t8, $f16 /* 028BC 809BAB9C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 028C0 809BABA0 A618026E */ sh $t8, 0x026E($s0) ## 0000026E .L809BABA4: /* 028C4 809BABA4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -402,69 +402,69 @@ glabel func_809BA628 /* 028D0 809BABB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 028D4 809BABB4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 028D8 809BABB8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 028DC 809BABBC E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 028DC 809BABBC E7B20010 */ swc1 $f18, 0x0010($sp) /* 028E0 809BABC0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 028E4 809BABC4 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C /* 028E8 809BABC8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 028EC 809BABCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 028F0 809BABD0 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 028F4 809BABD4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 028F8 809BABD8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 028FC 809BABDC 1000000D */ beq $zero, $zero, .L809BAC14 + +/* 028F8 809BABD8 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 028FC 809BABDC 1000000D */ beq $zero, $zero, .L809BAC14 /* 02900 809BABE0 C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 .L809BABE4: /* 02904 809BABE4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02908 809BABE8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0290C 809BABEC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02910 809BABF0 E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 02910 809BABF0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02914 809BABF4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02918 809BABF8 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C /* 0291C 809BABFC 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 02920 809BAC00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02924 809BAC04 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 02928 809BAC08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0292C 809BAC0C E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 0292C 809BAC0C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02930 809BAC10 C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 .L809BAC14: /* 02934 809BAC14 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 02938 809BAC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0293C 809BAC1C 4600540D */ trunc.w.s $f16, $f10 -/* 02940 809BAC20 44028000 */ mfc1 $v0, $f16 +/* 0293C 809BAC1C 4600540D */ trunc.w.s $f16, $f10 +/* 02940 809BAC20 44028000 */ mfc1 $v0, $f16 /* 02944 809BAC24 00000000 */ nop -/* 02948 809BAC28 14410007 */ bne $v0, $at, .L809BAC48 +/* 02948 809BAC28 14410007 */ bne $v0, $at, .L809BAC48 /* 0294C 809BAC2C 00000000 */ nop /* 02950 809BAC30 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02954 809BAC34 240538C8 */ addiu $a1, $zero, 0x38C8 ## $a1 = 000038C8 /* 02958 809BAC38 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 0295C 809BAC3C 4600910D */ trunc.w.s $f4, $f18 -/* 02960 809BAC40 44022000 */ mfc1 $v0, $f4 +/* 0295C 809BAC3C 4600910D */ trunc.w.s $f4, $f18 +/* 02960 809BAC40 44022000 */ mfc1 $v0, $f4 /* 02964 809BAC44 00000000 */ nop .L809BAC48: -/* 02968 809BAC48 5440000D */ bnel $v0, $zero, .L809BAC80 -/* 0296C 809BAC4C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02968 809BAC48 5440000D */ bnel $v0, $zero, .L809BAC80 +/* 0296C 809BAC4C 8FBF0024 */ lw $ra, 0x0024($sp) /* 02970 809BAC50 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 02974 809BAC54 00000000 */ nop /* 02978 809BAC58 3C01809C */ lui $at, %hi(D_809BBCC4) ## $at = 809C0000 -/* 0297C 809BAC5C C428BCC4 */ lwc1 $f8, %lo(D_809BBCC4)($at) +/* 0297C 809BAC5C C428BCC4 */ lwc1 $f8, %lo(D_809BBCC4)($at) /* 02980 809BAC60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02984 809BAC64 4608003C */ c.lt.s $f0, $f8 +/* 02984 809BAC64 4608003C */ c.lt.s $f0, $f8 /* 02988 809BAC68 00000000 */ nop -/* 0298C 809BAC6C 45020004 */ bc1fl .L809BAC80 -/* 02990 809BAC70 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0298C 809BAC6C 45020004 */ bc1fl .L809BAC80 +/* 02990 809BAC70 8FBF0024 */ lw $ra, 0x0024($sp) /* 02994 809BAC74 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02998 809BAC78 240538CA */ addiu $a1, $zero, 0x38CA ## $a1 = 000038CA -/* 0299C 809BAC7C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0299C 809BAC7C 8FBF0024 */ lw $ra, 0x0024($sp) .L809BAC80: -/* 029A0 809BAC80 8FB00020 */ lw $s0, 0x0020($sp) +/* 029A0 809BAC80 8FB00020 */ lw $s0, 0x0020($sp) /* 029A4 809BAC84 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 029A8 809BAC88 03E00008 */ jr $ra +/* 029A8 809BAC88 03E00008 */ jr $ra /* 029AC 809BAC8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s index b842a23075..925fdaec89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s @@ -1,31 +1,31 @@ glabel EnBom_Draw /* 00B48 809C3218 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00B4C 809C321C AFBF001C */ sw $ra, 0x001C($sp) -/* 00B50 809C3220 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B54 809C3224 AFA40060 */ sw $a0, 0x0060($sp) -/* 00B58 809C3228 AFA50064 */ sw $a1, 0x0064($sp) +/* 00B4C 809C321C AFBF001C */ sw $ra, 0x001C($sp) +/* 00B50 809C3220 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B54 809C3224 AFA40060 */ sw $a0, 0x0060($sp) +/* 00B58 809C3228 AFA50064 */ sw $a1, 0x0064($sp) /* 00B5C 809C322C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00B60 809C3230 3C06809C */ lui $a2, %hi(D_809C34D0) ## $a2 = 809C0000 /* 00B64 809C3234 24C634D0 */ addiu $a2, $a2, %lo(D_809C34D0) ## $a2 = 809C34D0 /* 00B68 809C3238 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 00B6C 809C323C 24070391 */ addiu $a3, $zero, 0x0391 ## $a3 = 00000391 -/* 00B70 809C3240 0C031AB1 */ jal func_800C6AC4 +/* 00B70 809C3240 0C031AB1 */ jal func_800C6AC4 /* 00B74 809C3244 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B78 809C3248 8FAF0060 */ lw $t7, 0x0060($sp) -/* 00B7C 809C324C 8FB90064 */ lw $t9, 0x0064($sp) +/* 00B78 809C3248 8FAF0060 */ lw $t7, 0x0060($sp) +/* 00B7C 809C324C 8FB90064 */ lw $t9, 0x0064($sp) /* 00B80 809C3250 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C -/* 00B84 809C3254 57000062 */ bnel $t8, $zero, .L809C33E0 -/* 00B88 809C3258 8FAC0064 */ lw $t4, 0x0064($sp) -/* 00B8C 809C325C 0C024F46 */ jal func_80093D18 +/* 00B84 809C3254 57000062 */ bnel $t8, $zero, .L809C33E0 +/* 00B88 809C3258 8FAC0064 */ lw $t4, 0x0064($sp) +/* 00B8C 809C325C 0C024F46 */ jal func_80093D18 /* 00B90 809C3260 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 00B94 809C3264 8FA40064 */ lw $a0, 0x0064($sp) +/* 00B94 809C3264 8FA40064 */ lw $a0, 0x0064($sp) /* 00B98 809C3268 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00B9C 809C326C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00BA0 809C3270 0C0347F5 */ jal func_800D1FD4 -/* 00BA4 809C3274 00812021 */ addu $a0, $a0, $at -/* 00BA8 809C3278 8FA40060 */ lw $a0, 0x0060($sp) -/* 00BAC 809C327C 8FA50064 */ lw $a1, 0x0064($sp) -/* 00BB0 809C3280 0C00BAF3 */ jal func_8002EBCC +/* 00BA0 809C3270 0C0347F5 */ jal func_800D1FD4 +/* 00BA4 809C3274 00812021 */ addu $a0, $a0, $at +/* 00BA8 809C3278 8FA40060 */ lw $a0, 0x0060($sp) +/* 00BAC 809C327C 8FA50064 */ lw $a1, 0x0064($sp) +/* 00BB0 809C3280 0C00BAF3 */ jal func_8002EBCC /* 00BB4 809C3284 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00BB8 809C3288 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00BBC 809C328C 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -33,14 +33,14 @@ glabel EnBom_Draw /* 00BC4 809C3294 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 00BC8 809C3298 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 00BCC 809C329C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00BD0 809C32A0 8FAA0064 */ lw $t2, 0x0064($sp) +/* 00BD0 809C32A0 8FAA0064 */ lw $t2, 0x0064($sp) /* 00BD4 809C32A4 3C05809C */ lui $a1, %hi(D_809C34E0) ## $a1 = 809C0000 /* 00BD8 809C32A8 24A534E0 */ addiu $a1, $a1, %lo(D_809C34E0) ## $a1 = 809C34E0 /* 00BDC 809C32AC 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 00BE0 809C32B0 240603A0 */ addiu $a2, $zero, 0x03A0 ## $a2 = 000003A0 -/* 00BE4 809C32B4 0C0346A2 */ jal Matrix_NewMtx -/* 00BE8 809C32B8 AFA20040 */ sw $v0, 0x0040($sp) -/* 00BEC 809C32BC 8FA30040 */ lw $v1, 0x0040($sp) +/* 00BE4 809C32B4 0C0346A2 */ jal Matrix_NewMtx +/* 00BE8 809C32B8 AFA20040 */ sw $v0, 0x0040($sp) +/* 00BEC 809C32BC 8FA30040 */ lw $v1, 0x0040($sp) /* 00BF0 809C32C0 3C0D0400 */ lui $t5, 0x0400 ## $t5 = 04000000 /* 00BF4 809C32C4 25AD7A50 */ addiu $t5, $t5, 0x7A50 ## $t5 = 04007A50 /* 00BF8 809C32C8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -53,7 +53,7 @@ glabel EnBom_Draw /* 00C14 809C32E4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00C18 809C32E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00C1C 809C32EC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00C20 809C32F0 0C034421 */ jal Matrix_RotateXYZ +/* 00C20 809C32F0 0C034421 */ jal Matrix_RotateZYX /* 00C24 809C32F4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 00C28 809C32F8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00C2C 809C32FC 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -61,14 +61,14 @@ glabel EnBom_Draw /* 00C34 809C3304 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00C38 809C3308 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 00C3C 809C330C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00C40 809C3310 8FB80064 */ lw $t8, 0x0064($sp) +/* 00C40 809C3310 8FB80064 */ lw $t8, 0x0064($sp) /* 00C44 809C3314 3C05809C */ lui $a1, %hi(D_809C34F0) ## $a1 = 809C0000 /* 00C48 809C3318 24A534F0 */ addiu $a1, $a1, %lo(D_809C34F0) ## $a1 = 809C34F0 /* 00C4C 809C331C 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 00C50 809C3320 240603A6 */ addiu $a2, $zero, 0x03A6 ## $a2 = 000003A6 -/* 00C54 809C3324 0C0346A2 */ jal Matrix_NewMtx -/* 00C58 809C3328 AFA20038 */ sw $v0, 0x0038($sp) -/* 00C5C 809C332C 8FA30038 */ lw $v1, 0x0038($sp) +/* 00C54 809C3324 0C0346A2 */ jal Matrix_NewMtx +/* 00C58 809C3328 AFA20038 */ sw $v0, 0x0038($sp) +/* 00C5C 809C332C 8FA30038 */ lw $v1, 0x0038($sp) /* 00C60 809C3330 3C08E700 */ lui $t0, 0xE700 ## $t0 = E7000000 /* 00C64 809C3334 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 /* 00C68 809C3338 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -80,7 +80,7 @@ glabel EnBom_Draw /* 00C80 809C3350 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 00C84 809C3354 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 00C88 809C3358 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00C8C 809C335C 8FA60060 */ lw $a2, 0x0060($sp) +/* 00C8C 809C335C 8FA60060 */ lw $a2, 0x0060($sp) /* 00C90 809C3360 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00C94 809C3364 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00C98 809C3368 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 @@ -88,10 +88,10 @@ glabel EnBom_Draw /* 00CA0 809C3370 C4C401FC */ lwc1 $f4, 0x01FC($a2) ## 000001FC /* 00CA4 809C3374 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 /* 00CA8 809C3378 24C50198 */ addiu $a1, $a2, 0x0198 ## $a1 = 00000198 -/* 00CAC 809C337C 4600218D */ trunc.w.s $f6, $f4 -/* 00CB0 809C3380 440F3000 */ mfc1 $t7, $f6 +/* 00CAC 809C337C 4600218D */ trunc.w.s $f6, $f4 +/* 00CB0 809C3380 440F3000 */ mfc1 $t7, $f6 /* 00CB4 809C3384 00000000 */ nop -/* 00CB8 809C3388 000FCE00 */ sll $t9, $t7, 24 +/* 00CB8 809C3388 000FCE00 */ sll $t9, $t7, 24 /* 00CBC 809C338C 372828FF */ ori $t0, $t9, 0x28FF ## $t0 = 000028FF /* 00CC0 809C3390 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 00CC4 809C3394 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -100,30 +100,30 @@ glabel EnBom_Draw /* 00CD0 809C33A0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 00CD4 809C33A4 C4C801FC */ lwc1 $f8, 0x01FC($a2) ## 000001FC /* 00CD8 809C33A8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00CDC 809C33AC 4600428D */ trunc.w.s $f10, $f8 -/* 00CE0 809C33B0 440F5000 */ mfc1 $t7, $f10 +/* 00CDC 809C33AC 4600428D */ trunc.w.s $f10, $f8 +/* 00CE0 809C33B0 440F5000 */ mfc1 $t7, $f10 /* 00CE4 809C33B4 00000000 */ nop -/* 00CE8 809C33B8 000FCE00 */ sll $t9, $t7, 24 +/* 00CE8 809C33B8 000FCE00 */ sll $t9, $t7, 24 /* 00CEC 809C33BC 372828FF */ ori $t0, $t9, 0x28FF ## $t0 = 000028FF /* 00CF0 809C33C0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 00CF4 809C33C4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00CF8 809C33C8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00CFC 809C33CC AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 00D00 809C33D0 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00D04 809C33D4 0C018A29 */ jal func_800628A4 +/* 00D04 809C33D4 0C018A29 */ jal func_800628A4 /* 00D08 809C33D8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00D0C 809C33DC 8FAC0064 */ lw $t4, 0x0064($sp) +/* 00D0C 809C33DC 8FAC0064 */ lw $t4, 0x0064($sp) .L809C33E0: /* 00D10 809C33E0 3C06809C */ lui $a2, %hi(D_809C3500) ## $a2 = 809C0000 /* 00D14 809C33E4 24C63500 */ addiu $a2, $a2, %lo(D_809C3500) ## $a2 = 809C3500 /* 00D18 809C33E8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 00D1C 809C33EC 240703B7 */ addiu $a3, $zero, 0x03B7 ## $a3 = 000003B7 -/* 00D20 809C33F0 0C031AD5 */ jal func_800C6B54 +/* 00D20 809C33F0 0C031AD5 */ jal func_800C6B54 /* 00D24 809C33F4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00D28 809C33F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D2C 809C33FC 8FB00018 */ lw $s0, 0x0018($sp) +/* 00D28 809C33F8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00D2C 809C33FC 8FB00018 */ lw $s0, 0x0018($sp) /* 00D30 809C3400 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 00D34 809C3404 03E00008 */ jr $ra +/* 00D34 809C3404 03E00008 */ jr $ra /* 00D38 809C3408 00000000 */ nop /* 00D3C 809C340C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s index a83cf8e439..5dc0073ae6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s @@ -1,33 +1,33 @@ glabel EnBx_Draw /* 0061C 809D20FC 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 00620 809D2100 AFB2004C */ sw $s2, 0x004C($sp) +/* 00620 809D2100 AFB2004C */ sw $s2, 0x004C($sp) /* 00624 809D2104 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00628 809D2108 AFBF0064 */ sw $ra, 0x0064($sp) -/* 0062C 809D210C AFB70060 */ sw $s7, 0x0060($sp) -/* 00630 809D2110 AFB6005C */ sw $s6, 0x005C($sp) -/* 00634 809D2114 AFB50058 */ sw $s5, 0x0058($sp) -/* 00638 809D2118 AFB40054 */ sw $s4, 0x0054($sp) -/* 0063C 809D211C AFB30050 */ sw $s3, 0x0050($sp) -/* 00640 809D2120 AFB10048 */ sw $s1, 0x0048($sp) -/* 00644 809D2124 AFB00044 */ sw $s0, 0x0044($sp) -/* 00648 809D2128 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 0064C 809D212C F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 00650 809D2130 AFA500B4 */ sw $a1, 0x00B4($sp) +/* 00628 809D2108 AFBF0064 */ sw $ra, 0x0064($sp) +/* 0062C 809D210C AFB70060 */ sw $s7, 0x0060($sp) +/* 00630 809D2110 AFB6005C */ sw $s6, 0x005C($sp) +/* 00634 809D2114 AFB50058 */ sw $s5, 0x0058($sp) +/* 00638 809D2118 AFB40054 */ sw $s4, 0x0054($sp) +/* 0063C 809D211C AFB30050 */ sw $s3, 0x0050($sp) +/* 00640 809D2120 AFB10048 */ sw $s1, 0x0048($sp) +/* 00644 809D2124 AFB00044 */ sw $s0, 0x0044($sp) +/* 00648 809D2128 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 0064C 809D212C F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 00650 809D2130 AFA500B4 */ sw $a1, 0x00B4($sp) /* 00654 809D2134 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 00658 809D2138 0C031A73 */ jal Graph_Alloc - + /* 0065C 809D213C 24050100 */ addiu $a1, $zero, 0x0100 ## $a1 = 00000100 -/* 00660 809D2140 8FAF00B4 */ lw $t7, 0x00B4($sp) +/* 00660 809D2140 8FAF00B4 */ lw $t7, 0x00B4($sp) /* 00664 809D2144 3C06809D */ lui $a2, %hi(D_809D2570) ## $a2 = 809D0000 /* 00668 809D2148 0040B025 */ or $s6, $v0, $zero ## $s6 = 00000000 /* 0066C 809D214C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 00670 809D2150 24C62570 */ addiu $a2, $a2, %lo(D_809D2570) ## $a2 = 809D2570 /* 00674 809D2154 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFDC /* 00678 809D2158 240701D0 */ addiu $a3, $zero, 0x01D0 ## $a3 = 000001D0 -/* 0067C 809D215C 0C031AB1 */ jal func_800C6AC4 +/* 0067C 809D215C 0C031AB1 */ jal func_800C6AC4 /* 00680 809D2160 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 -/* 00684 809D2164 8FB800B4 */ lw $t8, 0x00B4($sp) -/* 00688 809D2168 0C024F46 */ jal func_80093D18 +/* 00684 809D2164 8FB800B4 */ lw $t8, 0x00B4($sp) +/* 00688 809D2168 0C024F46 */ jal func_80093D18 /* 0068C 809D216C 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 00690 809D2170 8EE202C0 */ lw $v0, 0x02C0($s7) ## 000002C0 /* 00694 809D2174 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -46,23 +46,23 @@ glabel EnBx_Draw /* 006C8 809D21A8 3C04809D */ lui $a0, %hi(D_809D2560) ## $a0 = 809D0000 /* 006CC 809D21AC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 006D0 809D21B0 316C007F */ andi $t4, $t3, 0x007F ## $t4 = 00000000 -/* 006D4 809D21B4 000C6880 */ sll $t5, $t4, 2 -/* 006D8 809D21B8 008D2021 */ addu $a0, $a0, $t5 -/* 006DC 809D21BC 8C842560 */ lw $a0, %lo(D_809D2560)($a0) +/* 006D4 809D21B4 000C6880 */ sll $t5, $t4, 2 +/* 006D8 809D21B8 008D2021 */ addu $a0, $a0, $t5 +/* 006DC 809D21BC 8C842560 */ lw $a0, %lo(D_809D2560)($a0) /* 006E0 809D21C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 006E4 809D21C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 006E8 809D21C8 00047900 */ sll $t7, $a0, 4 -/* 006EC 809D21CC 000FC702 */ srl $t8, $t7, 28 -/* 006F0 809D21D0 0018C880 */ sll $t9, $t8, 2 -/* 006F4 809D21D4 01194021 */ addu $t0, $t0, $t9 +/* 006E8 809D21C8 00047900 */ sll $t7, $a0, 4 +/* 006EC 809D21CC 000FC702 */ srl $t8, $t7, 28 +/* 006F0 809D21D0 0018C880 */ sll $t9, $t8, 2 +/* 006F4 809D21D4 01194021 */ addu $t0, $t0, $t9 /* 006F8 809D21D8 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 006FC 809D21DC 00817024 */ and $t6, $a0, $at +/* 006FC 809D21DC 00817024 */ and $t6, $a0, $at /* 00700 809D21E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00704 809D21E4 01C84821 */ addu $t1, $t6, $t0 -/* 00708 809D21E8 01215021 */ addu $t2, $t1, $at +/* 00704 809D21E4 01C84821 */ addu $t1, $t6, $t0 +/* 00708 809D21E8 01215021 */ addu $t2, $t1, $at /* 0070C 809D21EC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00710 809D21F0 8EE202C0 */ lw $v0, 0x02C0($s7) ## 000002C0 -/* 00714 809D21F4 8FA300B4 */ lw $v1, 0x00B4($sp) +/* 00714 809D21F4 8FA300B4 */ lw $v1, 0x00B4($sp) /* 00718 809D21F8 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 0071C 809D21FC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00720 809D2200 AEEB02C0 */ sw $t3, 0x02C0($s7) ## 000002C0 @@ -73,26 +73,26 @@ glabel EnBx_Draw /* 00734 809D2214 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00738 809D2218 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 0073C 809D221C 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 -/* 00740 809D2220 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00744 809D2224 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00748 809D2228 AFB80018 */ sw $t8, 0x0018($sp) -/* 0074C 809D222C AFA0001C */ sw $zero, 0x001C($sp) -/* 00750 809D2230 0323C821 */ addu $t9, $t9, $v1 +/* 00740 809D2220 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00744 809D2224 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00748 809D2228 AFB80018 */ sw $t8, 0x0018($sp) +/* 0074C 809D222C AFA0001C */ sw $zero, 0x001C($sp) +/* 00750 809D2230 0323C821 */ addu $t9, $t9, $v1 /* 00754 809D2234 8F391DE4 */ lw $t9, 0x1DE4($t9) ## 00011DE4 /* 00758 809D2238 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 /* 0075C 809D223C 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 00760 809D2240 00190823 */ subu $at, $zero, $t9 -/* 00764 809D2244 00017080 */ sll $t6, $at, 2 -/* 00768 809D2248 01C17021 */ addu $t6, $t6, $at -/* 0076C 809D224C 000E7040 */ sll $t6, $t6, 1 +/* 00760 809D2240 00190823 */ subu $at, $zero, $t9 +/* 00764 809D2244 00017080 */ sll $t6, $at, 2 +/* 00768 809D2248 01C17021 */ addu $t6, $t6, $at +/* 0076C 809D224C 000E7040 */ sll $t6, $t6, 1 /* 00770 809D2250 31C8007F */ andi $t0, $t6, 0x007F ## $t0 = 00000000 -/* 00774 809D2254 AFA80020 */ sw $t0, 0x0020($sp) -/* 00778 809D2258 AFA90024 */ sw $t1, 0x0024($sp) -/* 0077C 809D225C AFAA0028 */ sw $t2, 0x0028($sp) +/* 00774 809D2254 AFA80020 */ sw $t0, 0x0020($sp) +/* 00778 809D2258 AFA90024 */ sw $t1, 0x0024($sp) +/* 0077C 809D225C AFAA0028 */ sw $t2, 0x0028($sp) /* 00780 809D2260 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00784 809D2264 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00788 809D2268 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0078C 809D226C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0078C 809D226C 0C0253D0 */ jal Draw_TwoTexScroll /* 00790 809D2270 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 00794 809D2274 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 00798 809D2278 8EE202C0 */ lw $v0, 0x02C0($s7) ## 000002C0 @@ -101,21 +101,21 @@ glabel EnBx_Draw /* 007A4 809D2284 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 007A8 809D2288 AEEB02C0 */ sw $t3, 0x02C0($s7) ## 000002C0 /* 007AC 809D228C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 007B0 809D2290 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 007B0 809D2290 8FAD00B4 */ lw $t5, 0x00B4($sp) /* 007B4 809D2294 3C05809D */ lui $a1, %hi(D_809D2580) ## $a1 = 809D0000 /* 007B8 809D2298 24A52580 */ addiu $a1, $a1, %lo(D_809D2580) ## $a1 = 809D2580 /* 007BC 809D229C 240601DE */ addiu $a2, $zero, 0x01DE ## $a2 = 000001DE /* 007C0 809D22A0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 007C4 809D22A4 0C0346A2 */ jal Matrix_NewMtx +/* 007C4 809D22A4 0C0346A2 */ jal Matrix_NewMtx /* 007C8 809D22A8 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 007CC 809D22AC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 007D0 809D22B0 864F001C */ lh $t7, 0x001C($s2) ## 0000001C /* 007D4 809D22B4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 007D8 809D22B8 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 007DC 809D22BC 53000004 */ beql $t8, $zero, .L809D22D0 +/* 007DC 809D22BC 53000004 */ beql $t8, $zero, .L809D22D0 /* 007E0 809D22C0 8659014E */ lh $t9, 0x014E($s2) ## 0000014E -/* 007E4 809D22C4 0C274743 */ jal func_809D1D0C -/* 007E8 809D22C8 8FA500B4 */ lw $a1, 0x00B4($sp) +/* 007E4 809D22C4 0C274743 */ jal func_809D1D0C +/* 007E8 809D22C8 8FA500B4 */ lw $a1, 0x00B4($sp) /* 007EC 809D22CC 8659014E */ lh $t9, 0x014E($s2) ## 0000014E .L809D22D0: /* 007F0 809D22D0 272EF448 */ addiu $t6, $t9, 0xF448 ## $t6 = FFFFF448 @@ -124,78 +124,78 @@ glabel EnBx_Draw ## coss? /* 007FC 809D22DC 8644014E */ lh $a0, 0x014E($s2) ## 0000014E /* 00800 809D22E0 3C01809D */ lui $at, %hi(D_809D25B8) ## $at = 809D0000 -/* 00804 809D22E4 C43425B8 */ lwc1 $f20, %lo(D_809D25B8)($at) +/* 00804 809D22E4 C43425B8 */ lwc1 $f20, %lo(D_809D25B8)($at) /* 00808 809D22E8 3C01809D */ lui $at, %hi(D_809D25BC) ## $at = 809D0000 -/* 0080C 809D22EC C43625BC */ lwc1 $f22, %lo(D_809D25BC)($at) -/* 00810 809D22F0 46140102 */ mul.s $f4, $f0, $f20 +/* 0080C 809D22EC C43625BC */ lwc1 $f22, %lo(D_809D25BC)($at) +/* 00810 809D22F0 46140102 */ mul.s $f4, $f0, $f20 /* 00814 809D22F4 24110003 */ addiu $s1, $zero, 0x0003 ## $s1 = 00000003 /* 00818 809D22F8 24140006 */ addiu $s4, $zero, 0x0006 ## $s4 = 00000006 /* 0081C 809D22FC 2413000C */ addiu $s3, $zero, 0x000C ## $s3 = 0000000C -/* 00820 809D2300 46162080 */ add.s $f2, $f4, $f22 +/* 00820 809D2300 46162080 */ add.s $f2, $f4, $f22 /* 00824 809D2304 E6420050 */ swc1 $f2, 0x0050($s2) ## 00000050 /* 00828 809D2308 E6420058 */ swc1 $f2, 0x0058($s2) ## 00000058 .L809D230C: /* 0082C 809D230C 8648014E */ lh $t0, 0x014E($s2) ## 0000014E -/* 00830 809D2310 00115B40 */ sll $t3, $s1, 13 -/* 00834 809D2314 010B2021 */ addu $a0, $t0, $t3 -/* 00838 809D2318 00042400 */ sll $a0, $a0, 16 +/* 00830 809D2310 00115B40 */ sll $t3, $s1, 13 +/* 00834 809D2314 010B2021 */ addu $a0, $t0, $t3 +/* 00838 809D2318 00042400 */ sll $a0, $a0, 16 /* 0083C 809D231C 0C01DE0D */ jal Math_Coss ## coss? -/* 00840 809D2320 00042403 */ sra $a0, $a0, 16 -/* 00844 809D2324 02330019 */ multu $s1, $s3 -/* 00848 809D2328 46140182 */ mul.s $f6, $f0, $f20 -/* 0084C 809D232C 46163080 */ add.s $f2, $f6, $f22 -/* 00850 809D2330 00006012 */ mflo $t4 -/* 00854 809D2334 024C8021 */ addu $s0, $s2, $t4 +/* 00840 809D2320 00042403 */ sra $a0, $a0, 16 +/* 00844 809D2324 02330019 */ multu $s1, $s3 +/* 00848 809D2328 46140182 */ mul.s $f6, $f0, $f20 +/* 0084C 809D232C 46163080 */ add.s $f2, $f6, $f22 +/* 00850 809D2330 00006012 */ mflo $t4 +/* 00854 809D2334 024C8021 */ addu $s0, $s2, $t4 /* 00858 809D2338 E6020184 */ swc1 $f2, 0x0184($s0) ## 00000184 -/* 0085C 809D233C 02340019 */ multu $s1, $s4 +/* 0085C 809D233C 02340019 */ multu $s1, $s4 /* 00860 809D2340 E602018C */ swc1 $f2, 0x018C($s0) ## 0000018C /* 00864 809D2344 864F00B4 */ lh $t7, 0x00B4($s2) ## 000000B4 /* 00868 809D2348 2631FFFF */ addiu $s1, $s1, 0xFFFF ## $s1 = 00000002 -/* 0086C 809D234C 00118C00 */ sll $s1, $s1, 16 -/* 00870 809D2350 00118C03 */ sra $s1, $s1, 16 -/* 00874 809D2354 00006812 */ mflo $t5 -/* 00878 809D2358 024D1021 */ addu $v0, $s2, $t5 +/* 0086C 809D234C 00118C00 */ sll $s1, $s1, 16 +/* 00870 809D2350 00118C03 */ sra $s1, $s1, 16 +/* 00874 809D2354 00006812 */ mflo $t5 +/* 00878 809D2358 024D1021 */ addu $v0, $s2, $t5 /* 0087C 809D235C A44F01B4 */ sh $t7, 0x01B4($v0) ## 000001B4 /* 00880 809D2360 865800B6 */ lh $t8, 0x00B6($s2) ## 000000B6 /* 00884 809D2364 A45801B6 */ sh $t8, 0x01B6($v0) ## 000001B6 /* 00888 809D2368 865900B8 */ lh $t9, 0x00B8($s2) ## 000000B8 -/* 0088C 809D236C 0621FFE7 */ bgez $s1, .L809D230C +/* 0088C 809D236C 0621FFE7 */ bgez $s1, .L809D230C /* 00890 809D2370 A45901B8 */ sh $t9, 0x01B8($v0) ## 000001B8 /* 00894 809D2374 3C15809D */ lui $s5, %hi(D_809D2590) ## $s5 = 809D0000 /* 00898 809D2378 26B52590 */ addiu $s5, $s5, %lo(D_809D2590) ## $s5 = 809D2590 /* 0089C 809D237C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L809D2380: -/* 008A0 809D2380 02330019 */ multu $s1, $s3 +/* 008A0 809D2380 02330019 */ multu $s1, $s3 /* 008A4 809D2384 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008A8 809D2388 00007012 */ mflo $t6 -/* 008AC 809D238C 024E8021 */ addu $s0, $s2, $t6 +/* 008A8 809D2388 00007012 */ mflo $t6 +/* 008AC 809D238C 024E8021 */ addu $s0, $s2, $t6 /* 008B0 809D2390 C60C0154 */ lwc1 $f12, 0x0154($s0) ## 00000154 /* 008B4 809D2394 C60E0158 */ lwc1 $f14, 0x0158($s0) ## 00000158 -/* 008B8 809D2398 0C034261 */ jal Matrix_Translate +/* 008B8 809D2398 0C034261 */ jal Matrix_Translate /* 008BC 809D239C 8E06015C */ lw $a2, 0x015C($s0) ## 0000015C -/* 008C0 809D23A0 02340019 */ multu $s1, $s4 +/* 008C0 809D23A0 02340019 */ multu $s1, $s4 /* 008C4 809D23A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 008C8 809D23A8 00004812 */ mflo $t1 -/* 008CC 809D23AC 02491021 */ addu $v0, $s2, $t1 +/* 008C8 809D23A8 00004812 */ mflo $t1 +/* 008CC 809D23AC 02491021 */ addu $v0, $s2, $t1 /* 008D0 809D23B0 844401B4 */ lh $a0, 0x01B4($v0) ## 000001B4 /* 008D4 809D23B4 844501B6 */ lh $a1, 0x01B6($v0) ## 000001B6 -/* 008D8 809D23B8 0C034421 */ jal Matrix_RotateXYZ +/* 008D8 809D23B8 0C034421 */ jal Matrix_RotateZYX /* 008DC 809D23BC 844601B8 */ lh $a2, 0x01B8($v0) ## 000001B8 /* 008E0 809D23C0 C60C0184 */ lwc1 $f12, 0x0184($s0) ## 00000184 /* 008E4 809D23C4 C60E0188 */ lwc1 $f14, 0x0188($s0) ## 00000188 /* 008E8 809D23C8 8E06018C */ lw $a2, 0x018C($s0) ## 0000018C -/* 008EC 809D23CC 0C0342A3 */ jal Matrix_Scale +/* 008EC 809D23CC 0C0342A3 */ jal Matrix_Scale /* 008F0 809D23D0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 008F4 809D23D4 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 008F8 809D23D8 02A02825 */ or $a1, $s5, $zero ## $a1 = 809D2590 -/* 008FC 809D23DC 0C034695 */ jal Matrix_ToMtx +/* 008FC 809D23DC 0C034695 */ jal Matrix_ToMtx /* 00900 809D23E0 240601FB */ addiu $a2, $zero, 0x01FB ## $a2 = 000001FB /* 00904 809D23E4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00908 809D23E8 00118C00 */ sll $s1, $s1, 16 -/* 0090C 809D23EC 00118C03 */ sra $s1, $s1, 16 -/* 00910 809D23F0 2A210004 */ slti $at, $s1, 0x0004 -/* 00914 809D23F4 1420FFE2 */ bne $at, $zero, .L809D2380 +/* 00908 809D23E8 00118C00 */ sll $s1, $s1, 16 +/* 0090C 809D23EC 00118C03 */ sra $s1, $s1, 16 +/* 00910 809D23F0 2A210004 */ slti $at, $s1, 0x0004 +/* 00914 809D23F4 1420FFE2 */ bne $at, $zero, .L809D2380 /* 00918 809D23F8 26D60040 */ addiu $s6, $s6, 0x0040 ## $s6 = 00000040 /* 0091C 809D23FC 8EE202C0 */ lw $v0, 0x02C0($s7) ## 000002C0 /* 00920 809D2400 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 @@ -205,25 +205,25 @@ glabel EnBx_Draw /* 00930 809D2410 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 /* 00934 809D2414 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 00938 809D2418 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0093C 809D241C 8FAC00B4 */ lw $t4, 0x00B4($sp) +/* 0093C 809D241C 8FAC00B4 */ lw $t4, 0x00B4($sp) /* 00940 809D2420 3C06809D */ lui $a2, %hi(D_809D25A0) ## $a2 = 809D0000 /* 00944 809D2424 24C625A0 */ addiu $a2, $a2, %lo(D_809D25A0) ## $a2 = 809D25A0 /* 00948 809D2428 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFDC /* 0094C 809D242C 240701FF */ addiu $a3, $zero, 0x01FF ## $a3 = 000001FF -/* 00950 809D2430 0C031AD5 */ jal func_800C6B54 +/* 00950 809D2430 0C031AD5 */ jal func_800C6B54 /* 00954 809D2434 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00958 809D2438 8FBF0064 */ lw $ra, 0x0064($sp) -/* 0095C 809D243C D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 00960 809D2440 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00964 809D2444 8FB00044 */ lw $s0, 0x0044($sp) -/* 00968 809D2448 8FB10048 */ lw $s1, 0x0048($sp) -/* 0096C 809D244C 8FB2004C */ lw $s2, 0x004C($sp) -/* 00970 809D2450 8FB30050 */ lw $s3, 0x0050($sp) -/* 00974 809D2454 8FB40054 */ lw $s4, 0x0054($sp) -/* 00978 809D2458 8FB50058 */ lw $s5, 0x0058($sp) -/* 0097C 809D245C 8FB6005C */ lw $s6, 0x005C($sp) -/* 00980 809D2460 8FB70060 */ lw $s7, 0x0060($sp) -/* 00984 809D2464 03E00008 */ jr $ra +/* 00958 809D2438 8FBF0064 */ lw $ra, 0x0064($sp) +/* 0095C 809D243C D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 00960 809D2440 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 00964 809D2444 8FB00044 */ lw $s0, 0x0044($sp) +/* 00968 809D2448 8FB10048 */ lw $s1, 0x0048($sp) +/* 0096C 809D244C 8FB2004C */ lw $s2, 0x004C($sp) +/* 00970 809D2450 8FB30050 */ lw $s3, 0x0050($sp) +/* 00974 809D2454 8FB40054 */ lw $s4, 0x0054($sp) +/* 00978 809D2458 8FB50058 */ lw $s5, 0x0058($sp) +/* 0097C 809D245C 8FB6005C */ lw $s6, 0x005C($sp) +/* 00980 809D2460 8FB70060 */ lw $s7, 0x0060($sp) +/* 00984 809D2464 03E00008 */ jr $ra /* 00988 809D2468 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 /* 0098C 809D246C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s index 86e9c0ae8d..1653c8645c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s @@ -1,55 +1,55 @@ glabel func_809E858C /* 02DBC 809E858C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02DC0 809E8590 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DC4 809E8594 AFB10018 */ sw $s1, 0x0018($sp) -/* 02DC8 809E8598 AFB00014 */ sw $s0, 0x0014($sp) -/* 02DCC 809E859C AFA5004C */ sw $a1, 0x004C($sp) +/* 02DC0 809E8590 AFBF001C */ sw $ra, 0x001C($sp) +/* 02DC4 809E8594 AFB10018 */ sw $s1, 0x0018($sp) +/* 02DC8 809E8598 AFB00014 */ sw $s0, 0x0014($sp) +/* 02DCC 809E859C AFA5004C */ sw $a1, 0x004C($sp) /* 02DD0 809E85A0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02DD4 809E85A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02DD8 809E85A8 3C06809F */ lui $a2, %hi(D_809E9040) ## $a2 = 809F0000 /* 02DDC 809E85AC 24C69040 */ addiu $a2, $a2, %lo(D_809E9040) ## $a2 = 809E9040 /* 02DE0 809E85B0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02DE4 809E85B4 2407098D */ addiu $a3, $zero, 0x098D ## $a3 = 0000098D -/* 02DE8 809E85B8 0C031AB1 */ jal func_800C6AC4 +/* 02DE8 809E85B8 0C031AB1 */ jal func_800C6AC4 /* 02DEC 809E85BC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02DF0 809E85C0 3C01809F */ lui $at, %hi(D_809E91C8) ## $at = 809F0000 -/* 02DF4 809E85C4 C42491C8 */ lwc1 $f4, %lo(D_809E91C8)($at) +/* 02DF4 809E85C4 C42491C8 */ lwc1 $f4, %lo(D_809E91C8)($at) /* 02DF8 809E85C8 C6000230 */ lwc1 $f0, 0x0230($s0) ## 00000230 /* 02DFC 809E85CC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 02E00 809E85D0 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 02E04 809E85D4 46040182 */ mul.s $f6, $f0, $f4 +/* 02E04 809E85D4 46040182 */ mul.s $f6, $f0, $f4 /* 02E08 809E85D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02E0C 809E85DC 46005402 */ mul.s $f16, $f10, $f0 -/* 02E10 809E85E0 E7A60044 */ swc1 $f6, 0x0044($sp) +/* 02E0C 809E85DC 46005402 */ mul.s $f16, $f10, $f0 +/* 02E10 809E85E0 E7A60044 */ swc1 $f6, 0x0044($sp) /* 02E14 809E85E4 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 02E18 809E85E8 8E060010 */ lw $a2, 0x0010($s0) ## 00000010 /* 02E1C 809E85EC C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 -/* 02E20 809E85F0 0C034261 */ jal Matrix_Translate -/* 02E24 809E85F4 46104380 */ add.s $f14, $f8, $f16 +/* 02E20 809E85F0 0C034261 */ jal Matrix_Translate +/* 02E24 809E85F4 46104380 */ add.s $f14, $f8, $f16 /* 02E28 809E85F8 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 02E2C 809E85FC 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 02E30 809E8600 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02E34 809E8604 0C034421 */ jal Matrix_RotateXYZ +/* 02E34 809E8604 0C034421 */ jal Matrix_RotateZYX /* 02E38 809E8608 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02E3C 809E860C C7AC0044 */ lwc1 $f12, 0x0044($sp) +/* 02E3C 809E860C C7AC0044 */ lwc1 $f12, 0x0044($sp) /* 02E40 809E8610 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02E44 809E8614 44066000 */ mfc1 $a2, $f12 -/* 02E48 809E8618 0C0342A3 */ jal Matrix_Scale -/* 02E4C 809E861C 46006386 */ mov.s $f14, $f12 +/* 02E44 809E8614 44066000 */ mfc1 $a2, $f12 +/* 02E48 809E8618 0C0342A3 */ jal Matrix_Scale +/* 02E4C 809E861C 46006386 */ mov.s $f14, $f12 /* 02E50 809E8620 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 02E54 809E8624 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 /* 02E58 809E8628 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 /* 02E5C 809E862C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 02E60 809E8630 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 /* 02E64 809E8634 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 02E68 809E8638 8FB9004C */ lw $t9, 0x004C($sp) +/* 02E68 809E8638 8FB9004C */ lw $t9, 0x004C($sp) /* 02E6C 809E863C 3C05809F */ lui $a1, %hi(D_809E9054) ## $a1 = 809F0000 /* 02E70 809E8640 24A59054 */ addiu $a1, $a1, %lo(D_809E9054) ## $a1 = 809E9054 /* 02E74 809E8644 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 02E78 809E8648 2406099D */ addiu $a2, $zero, 0x099D ## $a2 = 0000099D -/* 02E7C 809E864C 0C0346A2 */ jal Matrix_NewMtx -/* 02E80 809E8650 AFA2002C */ sw $v0, 0x002C($sp) -/* 02E84 809E8654 8FA3002C */ lw $v1, 0x002C($sp) +/* 02E7C 809E864C 0C0346A2 */ jal Matrix_NewMtx +/* 02E80 809E8650 AFA2002C */ sw $v0, 0x002C($sp) +/* 02E84 809E8654 8FA3002C */ lw $v1, 0x002C($sp) /* 02E88 809E8658 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 /* 02E8C 809E865C 254A1330 */ addiu $t2, $t2, 0x1330 ## $t2 = 06001330 /* 02E90 809E8660 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -61,19 +61,19 @@ glabel func_809E858C /* 02EA8 809E8678 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02EAC 809E867C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 02EB0 809E8680 0C00B56E */ jal Actor_SetHeight - + /* 02EB4 809E8684 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02EB8 809E8688 8FAB004C */ lw $t3, 0x004C($sp) +/* 02EB8 809E8688 8FAB004C */ lw $t3, 0x004C($sp) /* 02EBC 809E868C 3C06809F */ lui $a2, %hi(D_809E9068) ## $a2 = 809F0000 /* 02EC0 809E8690 24C69068 */ addiu $a2, $a2, %lo(D_809E9068) ## $a2 = 809E9068 /* 02EC4 809E8694 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02EC8 809E8698 240709A4 */ addiu $a3, $zero, 0x09A4 ## $a3 = 000009A4 -/* 02ECC 809E869C 0C031AD5 */ jal func_800C6B54 +/* 02ECC 809E869C 0C031AD5 */ jal func_800C6B54 /* 02ED0 809E86A0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 02ED4 809E86A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02ED8 809E86A8 8FB00014 */ lw $s0, 0x0014($sp) -/* 02EDC 809E86AC 8FB10018 */ lw $s1, 0x0018($sp) -/* 02EE0 809E86B0 03E00008 */ jr $ra +/* 02ED4 809E86A4 8FBF001C */ lw $ra, 0x001C($sp) +/* 02ED8 809E86A8 8FB00014 */ lw $s0, 0x0014($sp) +/* 02EDC 809E86AC 8FB10018 */ lw $s1, 0x0018($sp) +/* 02EE0 809E86B0 03E00008 */ jr $ra /* 02EE4 809E86B4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s index dcbf6c3948..9f16711e4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s @@ -1,77 +1,77 @@ glabel func_809E86B8 /* 02EE8 809E86B8 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 02EEC 809E86BC AFBF005C */ sw $ra, 0x005C($sp) -/* 02EF0 809E86C0 AFBE0058 */ sw $s8, 0x0058($sp) -/* 02EF4 809E86C4 AFB70054 */ sw $s7, 0x0054($sp) -/* 02EF8 809E86C8 AFB60050 */ sw $s6, 0x0050($sp) -/* 02EFC 809E86CC AFB5004C */ sw $s5, 0x004C($sp) -/* 02F00 809E86D0 AFB40048 */ sw $s4, 0x0048($sp) -/* 02F04 809E86D4 AFB30044 */ sw $s3, 0x0044($sp) -/* 02F08 809E86D8 AFB20040 */ sw $s2, 0x0040($sp) -/* 02F0C 809E86DC AFB1003C */ sw $s1, 0x003C($sp) -/* 02F10 809E86E0 AFB00038 */ sw $s0, 0x0038($sp) -/* 02F14 809E86E4 F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 02F18 809E86E8 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 02F1C 809E86EC F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 02F20 809E86F0 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 02F24 809E86F4 AFA500F4 */ sw $a1, 0x00F4($sp) +/* 02EEC 809E86BC AFBF005C */ sw $ra, 0x005C($sp) +/* 02EF0 809E86C0 AFBE0058 */ sw $s8, 0x0058($sp) +/* 02EF4 809E86C4 AFB70054 */ sw $s7, 0x0054($sp) +/* 02EF8 809E86C8 AFB60050 */ sw $s6, 0x0050($sp) +/* 02EFC 809E86CC AFB5004C */ sw $s5, 0x004C($sp) +/* 02F00 809E86D0 AFB40048 */ sw $s4, 0x0048($sp) +/* 02F04 809E86D4 AFB30044 */ sw $s3, 0x0044($sp) +/* 02F08 809E86D8 AFB20040 */ sw $s2, 0x0040($sp) +/* 02F0C 809E86DC AFB1003C */ sw $s1, 0x003C($sp) +/* 02F10 809E86E0 AFB00038 */ sw $s0, 0x0038($sp) +/* 02F14 809E86E4 F7BA0030 */ sdc1 $f26, 0x0030($sp) +/* 02F18 809E86E8 F7B80028 */ sdc1 $f24, 0x0028($sp) +/* 02F1C 809E86EC F7B60020 */ sdc1 $f22, 0x0020($sp) +/* 02F20 809E86F0 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 02F24 809E86F4 AFA500F4 */ sw $a1, 0x00F4($sp) /* 02F28 809E86F8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02F2C 809E86FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02F30 809E8700 3C06809F */ lui $a2, %hi(D_809E907C) ## $a2 = 809F0000 /* 02F34 809E8704 24C6907C */ addiu $a2, $a2, %lo(D_809E907C) ## $a2 = 809E907C /* 02F38 809E8708 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFF98 /* 02F3C 809E870C 240709B7 */ addiu $a3, $zero, 0x09B7 ## $a3 = 000009B7 -/* 02F40 809E8710 0C031AB1 */ jal func_800C6AC4 +/* 02F40 809E8710 0C031AB1 */ jal func_800C6AC4 /* 02F44 809E8714 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 02F48 809E8718 8E1801C0 */ lw $t8, 0x01C0($s0) ## 000001C0 /* 02F4C 809E871C 3C0F809E */ lui $t7, %hi(func_809E7BB0) ## $t7 = 809E0000 /* 02F50 809E8720 25EF7BB0 */ addiu $t7, $t7, %lo(func_809E7BB0) ## $t7 = 809E7BB0 -/* 02F54 809E8724 15F80004 */ bne $t7, $t8, .L809E8738 +/* 02F54 809E8724 15F80004 */ bne $t7, $t8, .L809E8738 /* 02F58 809E8728 3C01809F */ lui $at, %hi(D_809E91CC) ## $at = 809F0000 /* 02F5C 809E872C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 02F60 809E8730 10000003 */ beq $zero, $zero, .L809E8740 -/* 02F64 809E8734 AFB9009C */ sw $t9, 0x009C($sp) +/* 02F60 809E8730 10000003 */ beq $zero, $zero, .L809E8740 +/* 02F64 809E8734 AFB9009C */ sw $t9, 0x009C($sp) .L809E8738: /* 02F68 809E8738 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 02F6C 809E873C AFA8009C */ sw $t0, 0x009C($sp) +/* 02F6C 809E873C AFA8009C */ sw $t0, 0x009C($sp) .L809E8740: /* 02F70 809E8740 C6040230 */ lwc1 $f4, 0x0230($s0) ## 00000230 -/* 02F74 809E8744 C42691CC */ lwc1 $f6, %lo(D_809E91CC)($at) +/* 02F74 809E8744 C42691CC */ lwc1 $f6, %lo(D_809E91CC)($at) /* 02F78 809E8748 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 02F7C 809E874C C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 -/* 02F80 809E8750 46062502 */ mul.s $f20, $f4, $f6 +/* 02F80 809E8750 46062502 */ mul.s $f20, $f4, $f6 /* 02F84 809E8754 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 02F88 809E8758 0C034261 */ jal Matrix_Translate +/* 02F88 809E8758 0C034261 */ jal Matrix_Translate /* 02F8C 809E875C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02F90 809E8760 4406A000 */ mfc1 $a2, $f20 -/* 02F94 809E8764 4600A306 */ mov.s $f12, $f20 -/* 02F98 809E8768 4600A386 */ mov.s $f14, $f20 -/* 02F9C 809E876C 0C0342A3 */ jal Matrix_Scale +/* 02F90 809E8760 4406A000 */ mfc1 $a2, $f20 +/* 02F94 809E8764 4600A306 */ mov.s $f12, $f20 +/* 02F98 809E8768 4600A386 */ mov.s $f14, $f20 +/* 02F9C 809E876C 0C0342A3 */ jal Matrix_Scale /* 02FA0 809E8770 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02FA4 809E8774 0C034236 */ jal Matrix_Get +/* 02FA4 809E8774 0C034236 */ jal Matrix_Get /* 02FA8 809E8778 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFC0 /* 02FAC 809E877C 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 /* 02FB0 809E8780 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02FB4 809E8784 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 02FB8 809E8788 1120000C */ beq $t1, $zero, .L809E87BC +/* 02FB8 809E8788 1120000C */ beq $t1, $zero, .L809E87BC /* 02FBC 809E878C 02009825 */ or $s3, $s0, $zero ## $s3 = 00000000 /* 02FC0 809E8790 4481B000 */ mtc1 $at, $f22 ## $f22 = 20.00 /* 02FC4 809E8794 C6080230 */ lwc1 $f8, 0x0230($s0) ## 00000230 /* 02FC8 809E8798 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 02FCC 809E879C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 02FD0 809E87A0 46164682 */ mul.s $f26, $f8, $f22 +/* 02FD0 809E87A0 46164682 */ mul.s $f26, $f8, $f22 /* 02FD4 809E87A4 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 02FD8 809E87A8 E60A0164 */ swc1 $f10, 0x0164($s0) ## 00000164 /* 02FDC 809E87AC E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C -/* 02FE0 809E87B0 461A8481 */ sub.s $f18, $f16, $f26 +/* 02FE0 809E87B0 461A8481 */ sub.s $f18, $f16, $f26 /* 02FE4 809E87B4 E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 -/* 02FE8 809E87B8 E7BA00A4 */ swc1 $f26, 0x00A4($sp) +/* 02FE8 809E87B8 E7BA00A4 */ swc1 $f26, 0x00A4($sp) .L809E87BC: -/* 02FEC 809E87BC 8FAA009C */ lw $t2, 0x009C($sp) +/* 02FEC 809E87BC 8FAA009C */ lw $t2, 0x009C($sp) /* 02FF0 809E87C0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02FF4 809E87C4 4481B000 */ mtc1 $at, $f22 ## $f22 = 20.00 -/* 02FF8 809E87C8 1940006F */ blez $t2, .L809E8988 -/* 02FFC 809E87CC C7BA00A4 */ lwc1 $f26, 0x00A4($sp) +/* 02FF8 809E87C8 1940006F */ blez $t2, .L809E8988 +/* 02FFC 809E87CC C7BA00A4 */ lwc1 $f26, 0x00A4($sp) /* 03000 809E87D0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 03004 809E87D4 3C15809F */ lui $s5, %hi(D_809E902C) ## $s5 = 809F0000 /* 03008 809E87D8 4481C000 */ mtc1 $at, $f24 ## $f24 = 40.00 @@ -83,39 +83,39 @@ glabel func_809E86B8 /* 0301C 809E87EC 0C01DE1C */ jal Math_Sins ## sins? /* 03020 809E87F0 866401CA */ lh $a0, 0x01CA($s3) ## 000001CA -/* 03024 809E87F4 4600B182 */ mul.s $f6, $f22, $f0 +/* 03024 809E87F4 4600B182 */ mul.s $f6, $f22, $f0 /* 03028 809E87F8 C6080230 */ lwc1 $f8, 0x0230($s0) ## 00000230 -/* 0302C 809E87FC C7B000E4 */ lwc1 $f16, 0x00E4($sp) -/* 03030 809E8800 46083282 */ mul.s $f10, $f6, $f8 -/* 03034 809E8804 460A8480 */ add.s $f18, $f16, $f10 -/* 03038 809E8808 E7B200E4 */ swc1 $f18, 0x00E4($sp) +/* 0302C 809E87FC C7B000E4 */ lwc1 $f16, 0x00E4($sp) +/* 03030 809E8800 46083282 */ mul.s $f10, $f6, $f8 +/* 03034 809E8804 460A8480 */ add.s $f18, $f16, $f10 +/* 03038 809E8808 E7B200E4 */ swc1 $f18, 0x00E4($sp) /* 0303C 809E880C 0C01DE0D */ jal Math_Coss ## coss? /* 03040 809E8810 866401CA */ lh $a0, 0x01CA($s3) ## 000001CA -/* 03044 809E8814 46160102 */ mul.s $f4, $f0, $f22 +/* 03044 809E8814 46160102 */ mul.s $f4, $f0, $f22 /* 03048 809E8818 C6060230 */ lwc1 $f6, 0x0230($s0) ## 00000230 /* 0304C 809E881C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 03050 809E8820 46062502 */ mul.s $f20, $f4, $f6 +/* 03050 809E8820 46062502 */ mul.s $f20, $f4, $f6 /* 03054 809E8824 0C01DE1C */ jal Math_Sins ## sins? /* 03058 809E8828 00000000 */ nop -/* 0305C 809E882C 4600A402 */ mul.s $f16, $f20, $f0 -/* 03060 809E8830 C7A800E0 */ lwc1 $f8, 0x00E0($sp) -/* 03064 809E8834 46104281 */ sub.s $f10, $f8, $f16 -/* 03068 809E8838 E7AA00E0 */ swc1 $f10, 0x00E0($sp) +/* 0305C 809E882C 4600A402 */ mul.s $f16, $f20, $f0 +/* 03060 809E8830 C7A800E0 */ lwc1 $f8, 0x00E0($sp) +/* 03064 809E8834 46104281 */ sub.s $f10, $f8, $f16 +/* 03068 809E8838 E7AA00E0 */ swc1 $f10, 0x00E0($sp) /* 0306C 809E883C 0C01DE0D */ jal Math_Coss ## coss? /* 03070 809E8840 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 03074 809E8844 4600A102 */ mul.s $f4, $f20, $f0 -/* 03078 809E8848 C7B200E8 */ lwc1 $f18, 0x00E8($sp) +/* 03074 809E8844 4600A102 */ mul.s $f4, $f20, $f0 +/* 03078 809E8848 C7B200E8 */ lwc1 $f18, 0x00E8($sp) /* 0307C 809E884C 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFC0 -/* 03080 809E8850 46049181 */ sub.s $f6, $f18, $f4 -/* 03084 809E8854 0C03423F */ jal Matrix_Put -/* 03088 809E8858 E7A600E8 */ swc1 $f6, 0x00E8($sp) +/* 03080 809E8850 46049181 */ sub.s $f6, $f18, $f4 +/* 03084 809E8854 0C03423F */ jal Matrix_Put +/* 03088 809E8858 E7A600E8 */ swc1 $f6, 0x00E8($sp) /* 0308C 809E885C 866401CA */ lh $a0, 0x01CA($s3) ## 000001CA /* 03090 809E8860 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 03094 809E8864 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03098 809E8868 0C034421 */ jal Matrix_RotateXYZ +/* 03098 809E8868 0C034421 */ jal Matrix_RotateZYX /* 0309C 809E886C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 030A0 809E8870 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 /* 030A4 809E8874 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -123,12 +123,12 @@ glabel func_809E86B8 /* 030AC 809E887C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 030B0 809E8880 AE8B02C0 */ sw $t3, 0x02C0($s4) ## 000002C0 /* 030B4 809E8884 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 030B8 809E8888 8FAD00F4 */ lw $t5, 0x00F4($sp) +/* 030B8 809E8888 8FAD00F4 */ lw $t5, 0x00F4($sp) /* 030BC 809E888C 3C05809F */ lui $a1, %hi(D_809E9090) ## $a1 = 809F0000 /* 030C0 809E8890 24A59090 */ addiu $a1, $a1, %lo(D_809E9090) ## $a1 = 809E9090 /* 030C4 809E8894 240609E5 */ addiu $a2, $zero, 0x09E5 ## $a2 = 000009E5 /* 030C8 809E8898 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 030CC 809E889C 0C0346A2 */ jal Matrix_NewMtx +/* 030CC 809E889C 0C0346A2 */ jal Matrix_NewMtx /* 030D0 809E88A0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 030D4 809E88A4 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 030D8 809E88A8 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 @@ -139,80 +139,80 @@ glabel func_809E86B8 /* 030EC 809E88BC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 030F0 809E88C0 8EB80000 */ lw $t8, 0x0000($s5) ## 809E902C /* 030F4 809E88C4 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000238 -/* 030F8 809E88C8 0C018A29 */ jal func_800628A4 +/* 030F8 809E88C8 0C018A29 */ jal func_800628A4 /* 030FC 809E88CC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 03100 809E88D0 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000034 -/* 03104 809E88D4 0C018A29 */ jal func_800628A4 +/* 03104 809E88D4 0C018A29 */ jal func_800628A4 /* 03108 809E88D8 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000238 -/* 0310C 809E88DC 16400015 */ bne $s2, $zero, .L809E8934 -/* 03110 809E88E0 2A410002 */ slti $at, $s2, 0x0002 +/* 0310C 809E88DC 16400015 */ bne $s2, $zero, .L809E8934 +/* 03110 809E88E0 2A410002 */ slti $at, $s2, 0x0002 /* 03114 809E88E4 8E0801C0 */ lw $t0, 0x01C0($s0) ## 000001C0 /* 03118 809E88E8 3C19809E */ lui $t9, %hi(func_809E7A88) ## $t9 = 809E0000 /* 0311C 809E88EC 27397A88 */ addiu $t9, $t9, %lo(func_809E7A88) ## $t9 = 809E7A88 -/* 03120 809E88F0 13280007 */ beq $t9, $t0, .L809E8910 -/* 03124 809E88F4 C7A800E0 */ lwc1 $f8, 0x00E0($sp) +/* 03120 809E88F0 13280007 */ beq $t9, $t0, .L809E8910 +/* 03124 809E88F4 C7A800E0 */ lwc1 $f8, 0x00E0($sp) /* 03128 809E88F8 E6080038 */ swc1 $f8, 0x0038($s0) ## 00000038 -/* 0312C 809E88FC C7B000E4 */ lwc1 $f16, 0x00E4($sp) +/* 0312C 809E88FC C7B000E4 */ lwc1 $f16, 0x00E4($sp) /* 03130 809E8900 E610003C */ swc1 $f16, 0x003C($s0) ## 0000003C -/* 03134 809E8904 C7AA00E8 */ lwc1 $f10, 0x00E8($sp) -/* 03138 809E8908 1000000A */ beq $zero, $zero, .L809E8934 +/* 03134 809E8904 C7AA00E8 */ lwc1 $f10, 0x00E8($sp) +/* 03138 809E8908 1000000A */ beq $zero, $zero, .L809E8934 /* 0313C 809E890C E60A0040 */ swc1 $f10, 0x0040($s0) ## 00000040 .L809E8910: /* 03140 809E8910 C6060230 */ lwc1 $f6, 0x0230($s0) ## 00000230 /* 03144 809E8914 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C /* 03148 809E8918 C6120008 */ lwc1 $f18, 0x0008($s0) ## 00000008 -/* 0314C 809E891C 4606C202 */ mul.s $f8, $f24, $f6 +/* 0314C 809E891C 4606C202 */ mul.s $f8, $f24, $f6 /* 03150 809E8920 C60A0010 */ lwc1 $f10, 0x0010($s0) ## 00000010 /* 03154 809E8924 E6120038 */ swc1 $f18, 0x0038($s0) ## 00000038 /* 03158 809E8928 E60A0040 */ swc1 $f10, 0x0040($s0) ## 00000040 -/* 0315C 809E892C 46082400 */ add.s $f16, $f4, $f8 +/* 0315C 809E892C 46082400 */ add.s $f16, $f4, $f8 /* 03160 809E8930 E610003C */ swc1 $f16, 0x003C($s0) ## 0000003C .L809E8934: -/* 03164 809E8934 1020000E */ beq $at, $zero, .L809E8970 +/* 03164 809E8934 1020000E */ beq $at, $zero, .L809E8970 /* 03168 809E8938 26730002 */ addiu $s3, $s3, 0x0002 ## $s3 = 00000002 /* 0316C 809E893C 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 -/* 03170 809E8940 00125080 */ sll $t2, $s2, 2 -/* 03174 809E8944 01525023 */ subu $t2, $t2, $s2 -/* 03178 809E8948 11200009 */ beq $t1, $zero, .L809E8970 -/* 0317C 809E894C C7B200E0 */ lwc1 $f18, 0x00E0($sp) -/* 03180 809E8950 000A5080 */ sll $t2, $t2, 2 -/* 03184 809E8954 020A1021 */ addu $v0, $s0, $t2 +/* 03170 809E8940 00125080 */ sll $t2, $s2, 2 +/* 03174 809E8944 01525023 */ subu $t2, $t2, $s2 +/* 03178 809E8948 11200009 */ beq $t1, $zero, .L809E8970 +/* 0317C 809E894C C7B200E0 */ lwc1 $f18, 0x00E0($sp) +/* 03180 809E8950 000A5080 */ sll $t2, $t2, 2 +/* 03184 809E8954 020A1021 */ addu $v0, $s0, $t2 /* 03188 809E8958 E452014C */ swc1 $f18, 0x014C($v0) ## 0000014C -/* 0318C 809E895C C7A600E4 */ lwc1 $f6, 0x00E4($sp) -/* 03190 809E8960 461A3101 */ sub.s $f4, $f6, $f26 +/* 0318C 809E895C C7A600E4 */ lwc1 $f6, 0x00E4($sp) +/* 03190 809E8960 461A3101 */ sub.s $f4, $f6, $f26 /* 03194 809E8964 E4440150 */ swc1 $f4, 0x0150($v0) ## 00000150 -/* 03198 809E8968 C7A800E8 */ lwc1 $f8, 0x00E8($sp) +/* 03198 809E8968 C7A800E8 */ lwc1 $f8, 0x00E8($sp) /* 0319C 809E896C E4480154 */ swc1 $f8, 0x0154($v0) ## 00000154 .L809E8970: -/* 031A0 809E8970 8FAB009C */ lw $t3, 0x009C($sp) +/* 031A0 809E8970 8FAB009C */ lw $t3, 0x009C($sp) /* 031A4 809E8974 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 /* 031A8 809E8978 26B50004 */ addiu $s5, $s5, 0x0004 ## $s5 = 809E9030 /* 031AC 809E897C 26D60002 */ addiu $s6, $s6, 0x0002 ## $s6 = 00000035 -/* 031B0 809E8980 164BFF9A */ bne $s2, $t3, .L809E87EC +/* 031B0 809E8980 164BFF9A */ bne $s2, $t3, .L809E87EC /* 031B4 809E8984 26F70002 */ addiu $s7, $s7, 0x0002 ## $s7 = 00000036 .L809E8988: -/* 031B8 809E8988 8FAC00F4 */ lw $t4, 0x00F4($sp) +/* 031B8 809E8988 8FAC00F4 */ lw $t4, 0x00F4($sp) /* 031BC 809E898C 3C06809F */ lui $a2, %hi(D_809E90A4) ## $a2 = 809F0000 /* 031C0 809E8990 24C690A4 */ addiu $a2, $a2, %lo(D_809E90A4) ## $a2 = 809E90A4 /* 031C4 809E8994 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFF98 /* 031C8 809E8998 24070A09 */ addiu $a3, $zero, 0x0A09 ## $a3 = 00000A09 -/* 031CC 809E899C 0C031AD5 */ jal func_800C6B54 +/* 031CC 809E899C 0C031AD5 */ jal func_800C6B54 /* 031D0 809E89A0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 031D4 809E89A4 8FBF005C */ lw $ra, 0x005C($sp) -/* 031D8 809E89A8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 031DC 809E89AC D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 031E0 809E89B0 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 031E4 809E89B4 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 031E8 809E89B8 8FB00038 */ lw $s0, 0x0038($sp) -/* 031EC 809E89BC 8FB1003C */ lw $s1, 0x003C($sp) -/* 031F0 809E89C0 8FB20040 */ lw $s2, 0x0040($sp) -/* 031F4 809E89C4 8FB30044 */ lw $s3, 0x0044($sp) -/* 031F8 809E89C8 8FB40048 */ lw $s4, 0x0048($sp) -/* 031FC 809E89CC 8FB5004C */ lw $s5, 0x004C($sp) -/* 03200 809E89D0 8FB60050 */ lw $s6, 0x0050($sp) -/* 03204 809E89D4 8FB70054 */ lw $s7, 0x0054($sp) -/* 03208 809E89D8 8FBE0058 */ lw $s8, 0x0058($sp) -/* 0320C 809E89DC 03E00008 */ jr $ra +/* 031D4 809E89A4 8FBF005C */ lw $ra, 0x005C($sp) +/* 031D8 809E89A8 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 031DC 809E89AC D7B60020 */ ldc1 $f22, 0x0020($sp) +/* 031E0 809E89B0 D7B80028 */ ldc1 $f24, 0x0028($sp) +/* 031E4 809E89B4 D7BA0030 */ ldc1 $f26, 0x0030($sp) +/* 031E8 809E89B8 8FB00038 */ lw $s0, 0x0038($sp) +/* 031EC 809E89BC 8FB1003C */ lw $s1, 0x003C($sp) +/* 031F0 809E89C0 8FB20040 */ lw $s2, 0x0040($sp) +/* 031F4 809E89C4 8FB30044 */ lw $s3, 0x0044($sp) +/* 031F8 809E89C8 8FB40048 */ lw $s4, 0x0048($sp) +/* 031FC 809E89CC 8FB5004C */ lw $s5, 0x004C($sp) +/* 03200 809E89D0 8FB60050 */ lw $s6, 0x0050($sp) +/* 03204 809E89D4 8FB70054 */ lw $s7, 0x0054($sp) +/* 03208 809E89D8 8FBE0058 */ lw $s8, 0x0058($sp) +/* 0320C 809E89DC 03E00008 */ jr $ra /* 03210 809E89E0 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s index 01de988052..d57a0516d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s @@ -1,21 +1,21 @@ glabel func_809E89E4 /* 03214 809E89E4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03218 809E89E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0321C 809E89EC AFB00018 */ sw $s0, 0x0018($sp) -/* 03220 809E89F0 AFA40040 */ sw $a0, 0x0040($sp) -/* 03224 809E89F4 AFA50044 */ sw $a1, 0x0044($sp) +/* 03218 809E89E8 AFBF001C */ sw $ra, 0x001C($sp) +/* 0321C 809E89EC AFB00018 */ sw $s0, 0x0018($sp) +/* 03220 809E89F0 AFA40040 */ sw $a0, 0x0040($sp) +/* 03224 809E89F4 AFA50044 */ sw $a1, 0x0044($sp) /* 03228 809E89F8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0322C 809E89FC 3C06809F */ lui $a2, %hi(D_809E90B8) ## $a2 = 809F0000 /* 03230 809E8A00 24C690B8 */ addiu $a2, $a2, %lo(D_809E90B8) ## $a2 = 809E90B8 /* 03234 809E8A04 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 03238 809E8A08 24070A13 */ addiu $a3, $zero, 0x0A13 ## $a3 = 00000A13 -/* 0323C 809E8A0C 0C031AB1 */ jal func_800C6AC4 +/* 0323C 809E8A0C 0C031AB1 */ jal func_800C6AC4 /* 03240 809E8A10 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03244 809E8A14 8FA20040 */ lw $v0, 0x0040($sp) +/* 03244 809E8A14 8FA20040 */ lw $v0, 0x0040($sp) /* 03248 809E8A18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0324C 809E8A1C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 03250 809E8A20 844401CE */ lh $a0, 0x01CE($v0) ## 000001CE -/* 03254 809E8A24 0C034421 */ jal Matrix_RotateXYZ +/* 03254 809E8A24 0C034421 */ jal Matrix_RotateZYX /* 03258 809E8A28 844500B6 */ lh $a1, 0x00B6($v0) ## 000000B6 /* 0325C 809E8A2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03260 809E8A30 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 @@ -23,14 +23,14 @@ glabel func_809E89E4 /* 03268 809E8A38 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0326C 809E8A3C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 03270 809E8A40 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03274 809E8A44 8FB90044 */ lw $t9, 0x0044($sp) +/* 03274 809E8A44 8FB90044 */ lw $t9, 0x0044($sp) /* 03278 809E8A48 3C05809F */ lui $a1, %hi(D_809E90CC) ## $a1 = 809F0000 /* 0327C 809E8A4C 24A590CC */ addiu $a1, $a1, %lo(D_809E90CC) ## $a1 = 809E90CC /* 03280 809E8A50 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 03284 809E8A54 24060A1A */ addiu $a2, $zero, 0x0A1A ## $a2 = 00000A1A -/* 03288 809E8A58 0C0346A2 */ jal Matrix_NewMtx -/* 0328C 809E8A5C AFA20028 */ sw $v0, 0x0028($sp) -/* 03290 809E8A60 8FA30028 */ lw $v1, 0x0028($sp) +/* 03288 809E8A58 0C0346A2 */ jal Matrix_NewMtx +/* 0328C 809E8A5C AFA20028 */ sw $v0, 0x0028($sp) +/* 03290 809E8A60 8FA30028 */ lw $v1, 0x0028($sp) /* 03294 809E8A64 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 /* 03298 809E8A68 254A1828 */ addiu $t2, $t2, 0x1828 ## $t2 = 06001828 /* 0329C 809E8A6C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -41,24 +41,24 @@ glabel func_809E89E4 /* 032B0 809E8A80 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 032B4 809E8A84 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 032B8 809E8A88 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 032BC 809E8A8C 8FB00040 */ lw $s0, 0x0040($sp) +/* 032BC 809E8A8C 8FB00040 */ lw $s0, 0x0040($sp) /* 032C0 809E8A90 26100238 */ addiu $s0, $s0, 0x0238 ## $s0 = 00000238 -/* 032C4 809E8A94 0C018A29 */ jal func_800628A4 +/* 032C4 809E8A94 0C018A29 */ jal func_800628A4 /* 032C8 809E8A98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000238 /* 032CC 809E8A9C 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038 -/* 032D0 809E8AA0 0C018A29 */ jal func_800628A4 +/* 032D0 809E8AA0 0C018A29 */ jal func_800628A4 /* 032D4 809E8AA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000238 -/* 032D8 809E8AA8 8FAB0044 */ lw $t3, 0x0044($sp) +/* 032D8 809E8AA8 8FAB0044 */ lw $t3, 0x0044($sp) /* 032DC 809E8AAC 3C06809F */ lui $a2, %hi(D_809E90E0) ## $a2 = 809F0000 /* 032E0 809E8AB0 24C690E0 */ addiu $a2, $a2, %lo(D_809E90E0) ## $a2 = 809E90E0 /* 032E4 809E8AB4 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 032E8 809E8AB8 24070A24 */ addiu $a3, $zero, 0x0A24 ## $a3 = 00000A24 -/* 032EC 809E8ABC 0C031AD5 */ jal func_800C6B54 +/* 032EC 809E8ABC 0C031AD5 */ jal func_800C6B54 /* 032F0 809E8AC0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 032F4 809E8AC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 032F8 809E8AC8 8FB00018 */ lw $s0, 0x0018($sp) +/* 032F4 809E8AC4 8FBF001C */ lw $ra, 0x001C($sp) +/* 032F8 809E8AC8 8FB00018 */ lw $s0, 0x0018($sp) /* 032FC 809E8ACC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03300 809E8AD0 03E00008 */ jr $ra +/* 03300 809E8AD0 03E00008 */ jr $ra /* 03304 809E8AD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s index a2c65a2297..b03252ea6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s @@ -1,9 +1,9 @@ glabel func_809ECA50 /* 001D0 809ECA50 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 001D4 809ECA54 3C0F809F */ lui $t7, %hi(D_809ED740) ## $t7 = 809F0000 -/* 001D8 809ECA58 AFBF0024 */ sw $ra, 0x0024($sp) -/* 001DC 809ECA5C AFB00020 */ sw $s0, 0x0020($sp) -/* 001E0 809ECA60 AFA5008C */ sw $a1, 0x008C($sp) +/* 001D8 809ECA58 AFBF0024 */ sw $ra, 0x0024($sp) +/* 001DC 809ECA5C AFB00020 */ sw $s0, 0x0020($sp) +/* 001E0 809ECA60 AFA5008C */ sw $a1, 0x008C($sp) /* 001E4 809ECA64 25EFD740 */ addiu $t7, $t7, %lo(D_809ED740) ## $t7 = 809ED740 /* 001E8 809ECA68 8DF90000 */ lw $t9, 0x0000($t7) ## 809ED740 /* 001EC 809ECA6C 27AE007C */ addiu $t6, $sp, 0x007C ## $t6 = FFFFFFF4 @@ -31,7 +31,7 @@ glabel func_809ECA50 /* 00244 809ECAC4 AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFE0 /* 00248 809ECAC8 27B9004C */ addiu $t9, $sp, 0x004C ## $t9 = FFFFFFC4 /* 0024C 809ECACC AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFE4 -/* 00250 809ECAD0 8FB8008C */ lw $t8, 0x008C($sp) +/* 00250 809ECAD0 8FB8008C */ lw $t8, 0x008C($sp) /* 00254 809ECAD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00258 809ECAD8 8F061C44 */ lw $a2, 0x1C44($t8) ## 00001C44 /* 0025C 809ECADC 8CC90024 */ lw $t1, 0x0024($a2) ## 00000024 @@ -43,52 +43,52 @@ glabel func_809ECA50 /* 00274 809ECAF4 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 /* 00278 809ECAF8 0C01DE1C */ jal Math_Sins ## sins? -/* 0027C 809ECAFC AFA60060 */ sw $a2, 0x0060($sp) +/* 0027C 809ECAFC AFA60060 */ sw $a2, 0x0060($sp) /* 00280 809ECB00 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00284 809ECB04 44813000 */ mtc1 $at, $f6 ## $f6 = -5.00 -/* 00288 809ECB08 C7A4004C */ lwc1 $f4, 0x004C($sp) -/* 0028C 809ECB0C 8FA60060 */ lw $a2, 0x0060($sp) -/* 00290 809ECB10 46060202 */ mul.s $f8, $f0, $f6 -/* 00294 809ECB14 46082280 */ add.s $f10, $f4, $f8 -/* 00298 809ECB18 E7AA004C */ swc1 $f10, 0x004C($sp) +/* 00288 809ECB08 C7A4004C */ lwc1 $f4, 0x004C($sp) +/* 0028C 809ECB0C 8FA60060 */ lw $a2, 0x0060($sp) +/* 00290 809ECB10 46060202 */ mul.s $f8, $f0, $f6 +/* 00294 809ECB14 46082280 */ add.s $f10, $f4, $f8 +/* 00298 809ECB18 E7AA004C */ swc1 $f10, 0x004C($sp) /* 0029C 809ECB1C 0C01DE0D */ jal Math_Coss ## coss? /* 002A0 809ECB20 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 /* 002A4 809ECB24 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 002A8 809ECB28 44819000 */ mtc1 $at, $f18 ## $f18 = -5.00 -/* 002AC 809ECB2C C7B00054 */ lwc1 $f16, 0x0054($sp) +/* 002AC 809ECB2C C7B00054 */ lwc1 $f16, 0x0054($sp) /* 002B0 809ECB30 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 002B4 809ECB34 46120182 */ mul.s $f6, $f0, $f18 +/* 002B4 809ECB34 46120182 */ mul.s $f6, $f0, $f18 /* 002B8 809ECB38 8D4AE664 */ lw $t2, -0x199C($t2) ## 8015E664 -/* 002BC 809ECB3C 8FA60060 */ lw $a2, 0x0060($sp) -/* 002C0 809ECB40 C7A80050 */ lwc1 $f8, 0x0050($sp) +/* 002BC 809ECB3C 8FA60060 */ lw $a2, 0x0060($sp) +/* 002C0 809ECB40 C7A80050 */ lwc1 $f8, 0x0050($sp) /* 002C4 809ECB44 3C014260 */ lui $at, 0x4260 ## $at = 42600000 /* 002C8 809ECB48 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 002CC 809ECB4C 260401D0 */ addiu $a0, $s0, 0x01D0 ## $a0 = 000001D0 -/* 002D0 809ECB50 46068100 */ add.s $f4, $f16, $f6 -/* 002D4 809ECB54 C7B00050 */ lwc1 $f16, 0x0050($sp) +/* 002D0 809ECB50 46068100 */ add.s $f4, $f16, $f6 +/* 002D4 809ECB54 C7B00050 */ lwc1 $f16, 0x0050($sp) /* 002D8 809ECB58 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002DC 809ECB5C 11400007 */ beq $t2, $zero, .L809ECB7C -/* 002E0 809ECB60 E7A40054 */ swc1 $f4, 0x0054($sp) +/* 002DC 809ECB5C 11400007 */ beq $t2, $zero, .L809ECB7C +/* 002E0 809ECB60 E7A40054 */ swc1 $f4, 0x0054($sp) /* 002E4 809ECB64 3C014218 */ lui $at, 0x4218 ## $at = 42180000 /* 002E8 809ECB68 44815000 */ mtc1 $at, $f10 ## $f10 = 38.00 /* 002EC 809ECB6C 00000000 */ nop -/* 002F0 809ECB70 460A4480 */ add.s $f18, $f8, $f10 -/* 002F4 809ECB74 10000005 */ beq $zero, $zero, .L809ECB8C -/* 002F8 809ECB78 E7B20050 */ swc1 $f18, 0x0050($sp) +/* 002F0 809ECB70 460A4480 */ add.s $f18, $f8, $f10 +/* 002F4 809ECB74 10000005 */ beq $zero, $zero, .L809ECB8C +/* 002F8 809ECB78 E7B20050 */ swc1 $f18, 0x0050($sp) .L809ECB7C: /* 002FC 809ECB7C 44813000 */ mtc1 $at, $f6 ## $f6 = 38.00 /* 00300 809ECB80 00000000 */ nop -/* 00304 809ECB84 46068100 */ add.s $f4, $f16, $f6 -/* 00308 809ECB88 E7A40050 */ swc1 $f4, 0x0050($sp) +/* 00304 809ECB84 46068100 */ add.s $f4, $f16, $f6 +/* 00308 809ECB88 E7A40050 */ swc1 $f4, 0x0050($sp) .L809ECB8C: /* 0030C 809ECB8C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00310 809ECB90 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 00314 809ECB94 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 /* 00318 809ECB98 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0031C 809ECB9C 4608503E */ c.le.s $f10, $f8 +/* 0031C 809ECB9C 4608503E */ c.le.s $f10, $f8 /* 00320 809ECBA0 00000000 */ nop -/* 00324 809ECBA4 450200D2 */ bc1fl .L809ECEF0 +/* 00324 809ECBA4 450200D2 */ bc1fl .L809ECEF0 /* 00328 809ECBA8 8CC20680 */ lw $v0, 0x0680($a2) ## 00000680 /* 0032C 809ECBAC A60001D2 */ sh $zero, 0x01D2($s0) ## 000001D2 /* 00330 809ECBB0 860201D2 */ lh $v0, 0x01D2($s0) ## 000001D2 @@ -96,41 +96,41 @@ glabel func_809ECA50 /* 00338 809ECBB8 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 /* 0033C 809ECBBC A60201D4 */ sh $v0, 0x01D4($s0) ## 000001D4 /* 00340 809ECBC0 A60201D6 */ sh $v0, 0x01D6($s0) ## 000001D6 -/* 00344 809ECBC4 AFA60060 */ sw $a2, 0x0060($sp) +/* 00344 809ECBC4 AFA60060 */ sw $a2, 0x0060($sp) /* 00348 809ECBC8 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 0034C 809ECBCC AFA50030 */ sw $a1, 0x0030($sp) + +/* 0034C 809ECBCC AFA50030 */ sw $a1, 0x0030($sp) /* 00350 809ECBD0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 00354 809ECBD4 44819000 */ mtc1 $at, $f18 ## $f18 = 12.00 -/* 00358 809ECBD8 8FA60060 */ lw $a2, 0x0060($sp) -/* 0035C 809ECBDC 4612003E */ c.le.s $f0, $f18 +/* 00358 809ECBD8 8FA60060 */ lw $a2, 0x0060($sp) +/* 0035C 809ECBDC 4612003E */ c.le.s $f0, $f18 /* 00360 809ECBE0 00000000 */ nop -/* 00364 809ECBE4 4502004B */ bc1fl .L809ECD14 +/* 00364 809ECBE4 4502004B */ bc1fl .L809ECD14 /* 00368 809ECBE8 8CC20680 */ lw $v0, 0x0680($a2) ## 00000680 /* 0036C 809ECBEC 920B01CC */ lbu $t3, 0x01CC($s0) ## 000001CC -/* 00370 809ECBF0 8FA4008C */ lw $a0, 0x008C($sp) +/* 00370 809ECBF0 8FA4008C */ lw $a0, 0x008C($sp) /* 00374 809ECBF4 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00378 809ECBF8 15600013 */ bne $t3, $zero, .L809ECC48 -/* 0037C 809ECBFC 0324C821 */ addu $t9, $t9, $a0 +/* 00378 809ECBF8 15600013 */ bne $t3, $zero, .L809ECC48 +/* 0037C 809ECBFC 0324C821 */ addu $t9, $t9, $a0 /* 00380 809ECC00 8F391D4C */ lw $t9, 0x1D4C($t9) ## 00011D4C /* 00384 809ECC04 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00388 809ECC08 0320F809 */ jalr $ra, $t9 +/* 00388 809ECC08 0320F809 */ jalr $ra, $t9 /* 0038C 809ECC0C 00000000 */ nop -/* 00390 809ECC10 1040002B */ beq $v0, $zero, .L809ECCC0 +/* 00390 809ECC10 1040002B */ beq $v0, $zero, .L809ECCC0 /* 00394 809ECC14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00398 809ECC18 920C01CC */ lbu $t4, 0x01CC($s0) ## 000001CC /* 0039C 809ECC1C 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 /* 003A0 809ECC20 A60001CA */ sh $zero, 0x01CA($s0) ## 000001CA /* 003A4 809ECC24 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 003A8 809ECC28 10400003 */ beq $v0, $zero, .L809ECC38 +/* 003A8 809ECC28 10400003 */ beq $v0, $zero, .L809ECC38 /* 003AC 809ECC2C A20D01CC */ sb $t5, 0x01CC($s0) ## 000001CC /* 003B0 809ECC30 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 003B4 809ECC34 A44E001C */ sh $t6, 0x001C($v0) ## 0000001C .L809ECC38: /* 003B8 809ECC38 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 003BC 809ECC3C 24053902 */ addiu $a1, $zero, 0x3902 ## $a1 = 00003902 -/* 003C0 809ECC40 10000020 */ beq $zero, $zero, .L809ECCC4 +/* 003C0 809ECC40 10000020 */ beq $zero, $zero, .L809ECCC4 /* 003C4 809ECC44 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 .L809ECC48: /* 003C8 809ECC48 860F01CA */ lh $t7, 0x01CA($s0) ## 000001CA @@ -139,65 +139,65 @@ glabel func_809ECA50 /* 003D4 809ECC54 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 003D8 809ECC58 0C01DE1C */ jal Math_Sins ## sins? -/* 003DC 809ECC5C AFA60060 */ sw $a2, 0x0060($sp) +/* 003DC 809ECC5C AFA60060 */ sw $a2, 0x0060($sp) /* 003E0 809ECC60 3C01809F */ lui $at, %hi(D_809ED780) ## $at = 809F0000 -/* 003E4 809ECC64 C430D780 */ lwc1 $f16, %lo(D_809ED780)($at) -/* 003E8 809ECC68 8FA60060 */ lw $a2, 0x0060($sp) +/* 003E4 809ECC64 C430D780 */ lwc1 $f16, %lo(D_809ED780)($at) +/* 003E8 809ECC68 8FA60060 */ lw $a2, 0x0060($sp) /* 003EC 809ECC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003F0 809ECC70 46100182 */ mul.s $f6, $f0, $f16 -/* 003F4 809ECC74 4600310D */ trunc.w.s $f4, $f6 -/* 003F8 809ECC78 44092000 */ mfc1 $t1, $f4 +/* 003F0 809ECC70 46100182 */ mul.s $f6, $f0, $f16 +/* 003F4 809ECC74 4600310D */ trunc.w.s $f4, $f6 +/* 003F8 809ECC78 44092000 */ mfc1 $t1, $f4 /* 003FC 809ECC7C 00000000 */ nop /* 00400 809ECC80 A60901D2 */ sh $t1, 0x01D2($s0) ## 000001D2 /* 00404 809ECC84 8CCA0680 */ lw $t2, 0x0680($a2) ## 00000680 /* 00408 809ECC88 314B0080 */ andi $t3, $t2, 0x0080 ## $t3 = 00000000 -/* 0040C 809ECC8C 55600006 */ bnel $t3, $zero, .L809ECCA8 +/* 0040C 809ECC8C 55600006 */ bnel $t3, $zero, .L809ECCA8 /* 00410 809ECC90 861901CA */ lh $t9, 0x01CA($s0) ## 000001CA -/* 00414 809ECC94 0C27B3D8 */ jal func_809ECF60 +/* 00414 809ECC94 0C27B3D8 */ jal func_809ECF60 /* 00418 809ECC98 A20001CC */ sb $zero, 0x01CC($s0) ## 000001CC -/* 0041C 809ECC9C 100000AC */ beq $zero, $zero, .L809ECF50 -/* 00420 809ECCA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0041C 809ECC9C 100000AC */ beq $zero, $zero, .L809ECF50 +/* 00420 809ECCA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00424 809ECCA4 861901CA */ lh $t9, 0x01CA($s0) ## 000001CA .L809ECCA8: /* 00428 809ECCA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0042C 809ECCAC 2B219195 */ slti $at, $t9, 0x9195 -/* 00430 809ECCB0 50200004 */ beql $at, $zero, .L809ECCC4 +/* 0042C 809ECCAC 2B219195 */ slti $at, $t9, 0x9195 +/* 00430 809ECCB0 50200004 */ beql $at, $zero, .L809ECCC4 /* 00434 809ECCB4 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 00438 809ECCB8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0043C 809ECCBC 24053902 */ addiu $a1, $zero, 0x3902 ## $a1 = 00003902 .L809ECCC0: /* 00440 809ECCC0 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 .L809ECCC4: /* 00444 809ECCC4 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFC4 /* 00448 809ECCC8 260601D4 */ addiu $a2, $s0, 0x01D4 ## $a2 = 000001D4 -/* 0044C 809ECCCC 0C00D611 */ jal func_80035844 +/* 0044C 809ECCCC 0C00D611 */ jal func_80035844 /* 00450 809ECCD0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00454 809ECCD4 860C01D6 */ lh $t4, 0x01D6($s0) ## 000001D6 /* 00458 809ECCD8 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 /* 0045C 809ECCDC 860801D4 */ lh $t0, 0x01D4($s0) ## 000001D4 /* 00460 809ECCE0 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 /* 00464 809ECCE4 860B01CE */ lh $t3, 0x01CE($s0) ## 000001CE -/* 00468 809ECCE8 018D7023 */ subu $t6, $t4, $t5 +/* 00468 809ECCE8 018D7023 */ subu $t6, $t4, $t5 /* 0046C 809ECCEC 860F01D2 */ lh $t7, 0x01D2($s0) ## 000001D2 /* 00470 809ECCF0 860C01D0 */ lh $t4, 0x01D0($s0) ## 000001D0 -/* 00474 809ECCF4 01095023 */ subu $t2, $t0, $t1 -/* 00478 809ECCF8 014BC823 */ subu $t9, $t2, $t3 -/* 0047C 809ECCFC 01CFC023 */ subu $t8, $t6, $t7 -/* 00480 809ECD00 032C6823 */ subu $t5, $t9, $t4 +/* 00474 809ECCF4 01095023 */ subu $t2, $t0, $t1 +/* 00478 809ECCF8 014BC823 */ subu $t9, $t2, $t3 +/* 0047C 809ECCFC 01CFC023 */ subu $t8, $t6, $t7 +/* 00480 809ECD00 032C6823 */ subu $t5, $t9, $t4 /* 00484 809ECD04 A61801D6 */ sh $t8, 0x01D6($s0) ## 000001D6 -/* 00488 809ECD08 10000014 */ beq $zero, $zero, .L809ECD5C +/* 00488 809ECD08 10000014 */ beq $zero, $zero, .L809ECD5C /* 0048C 809ECD0C A60D01D4 */ sh $t5, 0x01D4($s0) ## 000001D4 /* 00490 809ECD10 8CC20680 */ lw $v0, 0x0680($a2) ## 00000680 .L809ECD14: /* 00494 809ECD14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00498 809ECD18 304E0080 */ andi $t6, $v0, 0x0080 ## $t6 = 00000000 -/* 0049C 809ECD1C 51C0000A */ beql $t6, $zero, .L809ECD48 +/* 0049C 809ECD1C 51C0000A */ beql $t6, $zero, .L809ECD48 /* 004A0 809ECD20 86090018 */ lh $t1, 0x0018($s0) ## 00000018 /* 004A4 809ECD24 8CCF0118 */ lw $t7, 0x0118($a2) ## 00000118 /* 004A8 809ECD28 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 004AC 809ECD2C 0041C024 */ and $t8, $v0, $at -/* 004B0 809ECD30 160F0004 */ bne $s0, $t7, .L809ECD44 +/* 004AC 809ECD2C 0041C024 */ and $t8, $v0, $at +/* 004B0 809ECD30 160F0004 */ bne $s0, $t7, .L809ECD44 /* 004B4 809ECD34 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 /* 004B8 809ECD38 ACD80680 */ sw $t8, 0x0680($a2) ## 00000680 /* 004BC 809ECD3C ACC00118 */ sw $zero, 0x0118($a2) ## 00000118 @@ -205,132 +205,132 @@ glabel func_809ECA50 .L809ECD44: /* 004C4 809ECD44 86090018 */ lh $t1, 0x0018($s0) ## 00000018 .L809ECD48: -/* 004C8 809ECD48 51200005 */ beql $t1, $zero, .L809ECD60 +/* 004C8 809ECD48 51200005 */ beql $t1, $zero, .L809ECD60 /* 004CC 809ECD4C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 004D0 809ECD50 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 004D4 809ECD54 24053903 */ addiu $a1, $zero, 0x3903 ## $a1 = 00003903 /* 004D8 809ECD58 A6000018 */ sh $zero, 0x0018($s0) ## 00000018 .L809ECD5C: /* 004DC 809ECD5C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 .L809ECD60: -/* 004E0 809ECD60 AFA4002C */ sw $a0, 0x002C($sp) +/* 004E0 809ECD60 AFA4002C */ sw $a0, 0x002C($sp) /* 004E4 809ECD64 0C01E01A */ jal Math_Vec3f_Yaw - + /* 004E8 809ECD68 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFC4 /* 004EC 809ECD6C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 004F0 809ECD70 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 004F4 809ECD74 8FA5004C */ lw $a1, 0x004C($sp) -/* 004F8 809ECD78 8FA40030 */ lw $a0, 0x0030($sp) +/* 004F4 809ECD74 8FA5004C */ lw $a1, 0x004C($sp) +/* 004F8 809ECD78 8FA40030 */ lw $a0, 0x0030($sp) /* 004FC 809ECD7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00500 809ECD80 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 /* 00504 809ECD84 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00508 809ECD88 E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 00508 809ECD88 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0050C 809ECD8C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00510 809ECD90 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 -/* 00514 809ECD94 8FA50050 */ lw $a1, 0x0050($sp) +/* 00514 809ECD94 8FA50050 */ lw $a1, 0x0050($sp) /* 00518 809ECD98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0051C 809ECD9C 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 /* 00520 809ECDA0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00524 809ECDA4 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 00524 809ECDA4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00528 809ECDA8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 0052C 809ECDAC 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 00530 809ECDB0 8FA50054 */ lw $a1, 0x0054($sp) +/* 00530 809ECDB0 8FA50054 */ lw $a1, 0x0054($sp) /* 00534 809ECDB4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00538 809ECDB8 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 /* 0053C 809ECDBC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00540 809ECDC0 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 00540 809ECDC0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00544 809ECDC4 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 -/* 00548 809ECDC8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0054C 809ECDCC 8FA50030 */ lw $a1, 0x0030($sp) +/* 00548 809ECDC8 AFA40028 */ sw $a0, 0x0028($sp) +/* 0054C 809ECDCC 8FA50030 */ lw $a1, 0x0030($sp) /* 00550 809ECDD0 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFBC -/* 00554 809ECDD4 0C00D611 */ jal func_80035844 +/* 00554 809ECDD4 0C00D611 */ jal func_80035844 /* 00558 809ECDD8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0055C 809ECDDC C60C01DC */ lwc1 $f12, 0x01DC($s0) ## 000001DC /* 00560 809ECDE0 C60E01E0 */ lwc1 $f14, 0x01E0($s0) ## 000001E0 /* 00564 809ECDE4 8E0601E4 */ lw $a2, 0x01E4($s0) ## 000001E4 -/* 00568 809ECDE8 0C034261 */ jal Matrix_Translate +/* 00568 809ECDE8 0C034261 */ jal Matrix_Translate /* 0056C 809ECDEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00570 809ECDF0 87A40044 */ lh $a0, 0x0044($sp) -/* 00574 809ECDF4 87A50046 */ lh $a1, 0x0046($sp) +/* 00570 809ECDF0 87A40044 */ lh $a0, 0x0044($sp) +/* 00574 809ECDF4 87A50046 */ lh $a1, 0x0046($sp) /* 00578 809ECDF8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0057C 809ECDFC 0C034421 */ jal Matrix_RotateXYZ +/* 0057C 809ECDFC 0C034421 */ jal Matrix_RotateZYX /* 00580 809ECE00 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00584 809ECE04 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC -/* 00588 809ECE08 0C0346BD */ jal Matrix_MultVec3f -/* 0058C 809ECE0C 8FA50028 */ lw $a1, 0x0028($sp) +/* 00588 809ECE08 0C0346BD */ jal Matrix_MultVec3f +/* 0058C 809ECE0C 8FA50028 */ lw $a1, 0x0028($sp) /* 00590 809ECE10 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 00594 809ECE14 C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 /* 00598 809ECE18 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 0059C 809ECE1C 0C034261 */ jal Matrix_Translate +/* 0059C 809ECE1C 0C034261 */ jal Matrix_Translate /* 005A0 809ECE20 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005A4 809ECE24 8FA4002C */ lw $a0, 0x002C($sp) -/* 005A8 809ECE28 8FA50028 */ lw $a1, 0x0028($sp) +/* 005A4 809ECE24 8FA4002C */ lw $a0, 0x002C($sp) +/* 005A8 809ECE28 8FA50028 */ lw $a1, 0x0028($sp) /* 005AC 809ECE2C 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFBC -/* 005B0 809ECE30 0C00D611 */ jal func_80035844 +/* 005B0 809ECE30 0C00D611 */ jal func_80035844 /* 005B4 809ECE34 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005B8 809ECE38 87A40044 */ lh $a0, 0x0044($sp) -/* 005BC 809ECE3C 87A50046 */ lh $a1, 0x0046($sp) +/* 005B8 809ECE38 87A40044 */ lh $a0, 0x0044($sp) +/* 005BC 809ECE3C 87A50046 */ lh $a1, 0x0046($sp) /* 005C0 809ECE40 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 005C4 809ECE44 0C034421 */ jal Matrix_RotateXYZ +/* 005C4 809ECE44 0C034421 */ jal Matrix_RotateZYX /* 005C8 809ECE48 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 005CC 809ECE4C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE8 -/* 005D0 809ECE50 0C0346BD */ jal Matrix_MultVec3f -/* 005D4 809ECE54 8FA50028 */ lw $a1, 0x0028($sp) -/* 005D8 809ECE58 8FA4002C */ lw $a0, 0x002C($sp) +/* 005D0 809ECE50 0C0346BD */ jal Matrix_MultVec3f +/* 005D4 809ECE54 8FA50028 */ lw $a1, 0x0028($sp) +/* 005D8 809ECE58 8FA4002C */ lw $a0, 0x002C($sp) /* 005DC 809ECE5C 0C01E027 */ jal Math_Vec3f_Pitch - -/* 005E0 809ECE60 8FA50028 */ lw $a1, 0x0028($sp) + +/* 005E0 809ECE60 8FA50028 */ lw $a1, 0x0028($sp) /* 005E4 809ECE64 A60201CE */ sh $v0, 0x01CE($s0) ## 000001CE -/* 005E8 809ECE68 8FA50028 */ lw $a1, 0x0028($sp) +/* 005E8 809ECE68 8FA50028 */ lw $a1, 0x0028($sp) /* 005EC 809ECE6C 0C01E01A */ jal Math_Vec3f_Yaw - -/* 005F0 809ECE70 8FA4002C */ lw $a0, 0x002C($sp) + +/* 005F0 809ECE70 8FA4002C */ lw $a0, 0x002C($sp) /* 005F4 809ECE74 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 005F8 809ECE78 004A1823 */ subu $v1, $v0, $t2 -/* 005FC 809ECE7C 00031C00 */ sll $v1, $v1, 16 -/* 00600 809ECE80 00031C03 */ sra $v1, $v1, 16 -/* 00604 809ECE84 04600003 */ bltz $v1, .L809ECE94 -/* 00608 809ECE88 00031023 */ subu $v0, $zero, $v1 -/* 0060C 809ECE8C 10000001 */ beq $zero, $zero, .L809ECE94 +/* 005F8 809ECE78 004A1823 */ subu $v1, $v0, $t2 +/* 005FC 809ECE7C 00031C00 */ sll $v1, $v1, 16 +/* 00600 809ECE80 00031C03 */ sra $v1, $v1, 16 +/* 00604 809ECE84 04600003 */ bltz $v1, .L809ECE94 +/* 00608 809ECE88 00031023 */ subu $v0, $zero, $v1 +/* 0060C 809ECE8C 10000001 */ beq $zero, $zero, .L809ECE94 /* 00610 809ECE90 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L809ECE94: -/* 00614 809ECE94 28414000 */ slti $at, $v0, 0x4000 -/* 00618 809ECE98 54200006 */ bnel $at, $zero, .L809ECEB4 -/* 0061C 809ECE9C 8FA40028 */ lw $a0, 0x0028($sp) +/* 00614 809ECE94 28414000 */ slti $at, $v0, 0x4000 +/* 00618 809ECE98 54200006 */ bnel $at, $zero, .L809ECEB4 +/* 0061C 809ECE9C 8FA40028 */ lw $a0, 0x0028($sp) /* 00620 809ECEA0 860B01CE */ lh $t3, 0x01CE($s0) ## 000001CE /* 00624 809ECEA4 24198000 */ addiu $t9, $zero, 0x8000 ## $t9 = FFFF8000 -/* 00628 809ECEA8 032B6023 */ subu $t4, $t9, $t3 +/* 00628 809ECEA8 032B6023 */ subu $t4, $t9, $t3 /* 0062C 809ECEAC A60C01CE */ sh $t4, 0x01CE($s0) ## 000001CE -/* 00630 809ECEB0 8FA40028 */ lw $a0, 0x0028($sp) +/* 00630 809ECEB0 8FA40028 */ lw $a0, 0x0028($sp) .L809ECEB4: /* 00634 809ECEB4 0C01E027 */ jal Math_Vec3f_Pitch - -/* 00638 809ECEB8 8FA50030 */ lw $a1, 0x0030($sp) + +/* 00638 809ECEB8 8FA50030 */ lw $a1, 0x0030($sp) /* 0063C 809ECEBC 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE -/* 00640 809ECEC0 00446823 */ subu $t5, $v0, $a0 +/* 00640 809ECEC0 00446823 */ subu $t5, $v0, $a0 /* 00644 809ECEC4 A60D01D0 */ sh $t5, 0x01D0($s0) ## 000001D0 /* 00648 809ECEC8 860301D0 */ lh $v1, 0x01D0($s0) ## 000001D0 -/* 0064C 809ECECC 0461001F */ bgez $v1, .L809ECF4C -/* 00650 809ECED0 00037040 */ sll $t6, $v1, 1 -/* 00654 809ECED4 00030823 */ subu $at, $zero, $v1 -/* 00658 809ECED8 008E7821 */ addu $t7, $a0, $t6 -/* 0065C 809ECEDC 0001C040 */ sll $t8, $at, 1 +/* 0064C 809ECECC 0461001F */ bgez $v1, .L809ECF4C +/* 00650 809ECED0 00037040 */ sll $t6, $v1, 1 +/* 00654 809ECED4 00030823 */ subu $at, $zero, $v1 +/* 00658 809ECED8 008E7821 */ addu $t7, $a0, $t6 +/* 0065C 809ECEDC 0001C040 */ sll $t8, $at, 1 /* 00660 809ECEE0 A60F01CE */ sh $t7, 0x01CE($s0) ## 000001CE -/* 00664 809ECEE4 10000019 */ beq $zero, $zero, .L809ECF4C +/* 00664 809ECEE4 10000019 */ beq $zero, $zero, .L809ECF4C /* 00668 809ECEE8 A61801D0 */ sh $t8, 0x01D0($s0) ## 000001D0 /* 0066C 809ECEEC 8CC20680 */ lw $v0, 0x0680($a2) ## 00000680 .L809ECEF0: /* 00670 809ECEF0 30480080 */ andi $t0, $v0, 0x0080 ## $t0 = 00000000 -/* 00674 809ECEF4 5100000A */ beql $t0, $zero, .L809ECF20 +/* 00674 809ECEF4 5100000A */ beql $t0, $zero, .L809ECF20 /* 00678 809ECEF8 A60B0018 */ sh $t3, 0x0018($s0) ## 00000018 /* 0067C 809ECEFC 8CC90118 */ lw $t1, 0x0118($a2) ## 00000118 /* 00680 809ECF00 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 00684 809ECF04 00415024 */ and $t2, $v0, $at -/* 00688 809ECF08 16090004 */ bne $s0, $t1, .L809ECF1C +/* 00684 809ECF04 00415024 */ and $t2, $v0, $at +/* 00688 809ECF08 16090004 */ bne $s0, $t1, .L809ECF1C /* 0068C 809ECF0C 241900C8 */ addiu $t9, $zero, 0x00C8 ## $t9 = 000000C8 /* 00690 809ECF10 ACCA0680 */ sw $t2, 0x0680($a2) ## 00000680 /* 00694 809ECF14 ACC00118 */ sw $zero, 0x0118($a2) ## 00000118 @@ -338,26 +338,26 @@ glabel func_809ECA50 .L809ECF1C: /* 0069C 809ECF1C A60B0018 */ sh $t3, 0x0018($s0) ## 00000018 .L809ECF20: -/* 006A0 809ECF20 AFA00010 */ sw $zero, 0x0010($sp) +/* 006A0 809ECF20 AFA00010 */ sw $zero, 0x0010($sp) /* 006A4 809ECF24 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 006A8 809ECF28 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 006AC 809ECF2C 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 006B0 809ECF30 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 /* 006B4 809ECF34 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 006B8 809ECF38 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 006BC 809ECF3C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 006C0 809ECF40 AFA00010 */ sw $zero, 0x0010($sp) + +/* 006C0 809ECF40 AFA00010 */ sw $zero, 0x0010($sp) /* 006C4 809ECF44 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 006C8 809ECF48 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L809ECF4C: -/* 006CC 809ECF4C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006CC 809ECF4C 8FBF0024 */ lw $ra, 0x0024($sp) .L809ECF50: -/* 006D0 809ECF50 8FB00020 */ lw $s0, 0x0020($sp) +/* 006D0 809ECF50 8FB00020 */ lw $s0, 0x0020($sp) /* 006D4 809ECF54 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 006D8 809ECF58 03E00008 */ jr $ra +/* 006D8 809ECF58 03E00008 */ jr $ra /* 006DC 809ECF5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s index 4b37460a64..658566ed54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s @@ -1,78 +1,78 @@ glabel func_80A1B9D8 /* 01038 80A1B9D8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0103C 80A1B9DC AFBF001C */ sw $ra, 0x001C($sp) -/* 01040 80A1B9E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01044 80A1B9E4 AFA50044 */ sw $a1, 0x0044($sp) +/* 0103C 80A1B9DC AFBF001C */ sw $ra, 0x001C($sp) +/* 01040 80A1B9E0 AFB00018 */ sw $s0, 0x0018($sp) +/* 01044 80A1B9E4 AFA50044 */ sw $a1, 0x0044($sp) /* 01048 80A1B9E8 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 /* 0104C 80A1B9EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01050 80A1B9F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01054 80A1B9F4 A7AE003E */ sh $t6, 0x003E($sp) +/* 01054 80A1B9F4 A7AE003E */ sh $t6, 0x003E($sp) /* 01058 80A1B9F8 848F03AA */ lh $t7, 0x03AA($a0) ## 000003AA /* 0105C 80A1B9FC 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C /* 01060 80A1BA00 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 /* 01064 80A1BA04 25F81000 */ addiu $t8, $t7, 0x1000 ## $t8 = 00001000 /* 01068 80A1BA08 A49803AA */ sh $t8, 0x03AA($a0) ## 000003AA -/* 0106C 80A1BA0C 0C034261 */ jal Matrix_Translate +/* 0106C 80A1BA0C 0C034261 */ jal Matrix_Translate /* 01070 80A1BA10 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 /* 01074 80A1BA14 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 01078 80A1BA18 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 0107C 80A1BA1C 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 01080 80A1BA20 0C034421 */ jal Matrix_RotateXYZ +/* 01080 80A1BA20 0C034421 */ jal Matrix_RotateZYX /* 01084 80A1BA24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01088 80A1BA28 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0108C 80A1BA2C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 01090 80A1BA30 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 /* 01094 80A1BA34 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 01098 80A1BA38 27A50020 */ addiu $a1, $sp, 0x0020 ## $a1 = FFFFFFE0 -/* 0109C 80A1BA3C E7A00030 */ swc1 $f0, 0x0030($sp) -/* 010A0 80A1BA40 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 010A4 80A1BA44 0C0346BD */ jal Matrix_MultVec3f -/* 010A8 80A1BA48 E7A40034 */ swc1 $f4, 0x0034($sp) +/* 0109C 80A1BA3C E7A00030 */ swc1 $f0, 0x0030($sp) +/* 010A0 80A1BA40 E7A0002C */ swc1 $f0, 0x002C($sp) +/* 010A4 80A1BA44 0C0346BD */ jal Matrix_MultVec3f +/* 010A8 80A1BA48 E7A40034 */ swc1 $f4, 0x0034($sp) /* 010AC 80A1BA4C 860403AA */ lh $a0, 0x03AA($s0) ## 000003AA -/* 010B0 80A1BA50 00042040 */ sll $a0, $a0, 1 -/* 010B4 80A1BA54 00042400 */ sll $a0, $a0, 16 +/* 010B0 80A1BA50 00042040 */ sll $a0, $a0, 1 +/* 010B4 80A1BA54 00042400 */ sll $a0, $a0, 16 /* 010B8 80A1BA58 0C01DE1C */ jal Math_Sins ## sins? -/* 010BC 80A1BA5C 00042403 */ sra $a0, $a0, 16 +/* 010BC 80A1BA5C 00042403 */ sra $a0, $a0, 16 /* 010C0 80A1BA60 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 010C4 80A1BA64 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 010C8 80A1BA68 87A4003E */ lh $a0, 0x003E($sp) -/* 010CC 80A1BA6C 46060202 */ mul.s $f8, $f0, $f6 +/* 010C8 80A1BA68 87A4003E */ lh $a0, 0x003E($sp) +/* 010CC 80A1BA6C 46060202 */ mul.s $f8, $f0, $f6 /* 010D0 80A1BA70 0C01DE1C */ jal Math_Sins ## sins? -/* 010D4 80A1BA74 E7A80038 */ swc1 $f8, 0x0038($sp) -/* 010D8 80A1BA78 C7AA0038 */ lwc1 $f10, 0x0038($sp) -/* 010DC 80A1BA7C C7B20020 */ lwc1 $f18, 0x0020($sp) +/* 010D4 80A1BA74 E7A80038 */ swc1 $f8, 0x0038($sp) +/* 010D8 80A1BA78 C7AA0038 */ lwc1 $f10, 0x0038($sp) +/* 010DC 80A1BA7C C7B20020 */ lwc1 $f18, 0x0020($sp) /* 010E0 80A1BA80 860403AA */ lh $a0, 0x03AA($s0) ## 000003AA -/* 010E4 80A1BA84 460A0402 */ mul.s $f16, $f0, $f10 -/* 010E8 80A1BA88 46128100 */ add.s $f4, $f16, $f18 +/* 010E4 80A1BA84 460A0402 */ mul.s $f16, $f0, $f10 +/* 010E8 80A1BA88 46128100 */ add.s $f4, $f16, $f18 /* 010EC 80A1BA8C 0C01DE0D */ jal Math_Coss ## coss? /* 010F0 80A1BA90 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC /* 010F4 80A1BA94 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 010F8 80A1BA98 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 010FC 80A1BA9C C6060390 */ lwc1 $f6, 0x0390($s0) ## 00000390 -/* 01100 80A1BAA0 46000400 */ add.s $f16, $f0, $f0 -/* 01104 80A1BAA4 46083280 */ add.s $f10, $f6, $f8 -/* 01108 80A1BAA8 460A8480 */ add.s $f18, $f16, $f10 +/* 01100 80A1BAA0 46000400 */ add.s $f16, $f0, $f0 +/* 01104 80A1BAA4 46083280 */ add.s $f10, $f6, $f8 +/* 01108 80A1BAA8 460A8480 */ add.s $f18, $f16, $f10 /* 0110C 80A1BAAC E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 /* 01110 80A1BAB0 0C01DE0D */ jal Math_Coss ## coss? -/* 01114 80A1BAB4 87A4003E */ lh $a0, 0x003E($sp) -/* 01118 80A1BAB8 C7A40038 */ lwc1 $f4, 0x0038($sp) -/* 0111C 80A1BABC C7A80028 */ lwc1 $f8, 0x0028($sp) +/* 01114 80A1BAB4 87A4003E */ lh $a0, 0x003E($sp) +/* 01118 80A1BAB8 C7A40038 */ lwc1 $f4, 0x0038($sp) +/* 0111C 80A1BABC C7A80028 */ lwc1 $f8, 0x0028($sp) /* 01120 80A1BAC0 C60C03AC */ lwc1 $f12, 0x03AC($s0) ## 000003AC -/* 01124 80A1BAC4 46040182 */ mul.s $f6, $f0, $f4 +/* 01124 80A1BAC4 46040182 */ mul.s $f6, $f0, $f4 /* 01128 80A1BAC8 C60E03B0 */ lwc1 $f14, 0x03B0($s0) ## 000003B0 /* 0112C 80A1BACC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01130 80A1BAD0 46083400 */ add.s $f16, $f6, $f8 +/* 01130 80A1BAD0 46083400 */ add.s $f16, $f6, $f8 /* 01134 80A1BAD4 E61003B4 */ swc1 $f16, 0x03B4($s0) ## 000003B4 -/* 01138 80A1BAD8 0C034261 */ jal Matrix_Translate +/* 01138 80A1BAD8 0C034261 */ jal Matrix_Translate /* 0113C 80A1BADC 8E0603B4 */ lw $a2, 0x03B4($s0) ## 000003B4 /* 01140 80A1BAE0 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 01144 80A1BAE4 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 01148 80A1BAE8 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 0114C 80A1BAEC 0C034421 */ jal Matrix_RotateXYZ +/* 0114C 80A1BAEC 0C034421 */ jal Matrix_RotateZYX /* 01150 80A1BAF0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01154 80A1BAF4 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 /* 01158 80A1BAF8 44819000 */ mtc1 $at, $f18 ## $f18 = -15.00 @@ -81,14 +81,14 @@ glabel func_80A1B9D8 /* 01164 80A1BB04 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 01168 80A1BB08 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 0116C 80A1BB0C 260503B8 */ addiu $a1, $s0, 0x03B8 ## $a1 = 000003B8 -/* 01170 80A1BB10 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 01174 80A1BB14 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 01178 80A1BB18 0C0346BD */ jal Matrix_MultVec3f -/* 0117C 80A1BB1C E7A40034 */ swc1 $f4, 0x0034($sp) -/* 01180 80A1BB20 8FBF001C */ lw $ra, 0x001C($sp) -/* 01184 80A1BB24 8FB00018 */ lw $s0, 0x0018($sp) +/* 01170 80A1BB10 E7B20030 */ swc1 $f18, 0x0030($sp) +/* 01174 80A1BB14 E7AA002C */ swc1 $f10, 0x002C($sp) +/* 01178 80A1BB18 0C0346BD */ jal Matrix_MultVec3f +/* 0117C 80A1BB1C E7A40034 */ swc1 $f4, 0x0034($sp) +/* 01180 80A1BB20 8FBF001C */ lw $ra, 0x001C($sp) +/* 01184 80A1BB24 8FB00018 */ lw $s0, 0x0018($sp) /* 01188 80A1BB28 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0118C 80A1BB2C 03E00008 */ jr $ra +/* 0118C 80A1BB2C 03E00008 */ jr $ra /* 01190 80A1BB30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s index a0de3320cd..646b2a8e73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s @@ -1,28 +1,28 @@ glabel func_80A1CD24 /* 02384 80A1CD24 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 02388 80A1CD28 AFBF002C */ sw $ra, 0x002C($sp) -/* 0238C 80A1CD2C AFB00028 */ sw $s0, 0x0028($sp) -/* 02390 80A1CD30 AFA5006C */ sw $a1, 0x006C($sp) +/* 02388 80A1CD28 AFBF002C */ sw $ra, 0x002C($sp) +/* 0238C 80A1CD2C AFB00028 */ sw $s0, 0x0028($sp) +/* 02390 80A1CD30 AFA5006C */ sw $a1, 0x006C($sp) /* 02394 80A1CD34 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 02398 80A1CD38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0239C 80A1CD3C 3C0680A2 */ lui $a2, %hi(D_80A1D268) ## $a2 = 80A20000 /* 023A0 80A1CD40 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 023A4 80A1CD44 A7AF005E */ sh $t7, 0x005E($sp) +/* 023A4 80A1CD44 A7AF005E */ sh $t7, 0x005E($sp) /* 023A8 80A1CD48 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 023AC 80A1CD4C 24C6D268 */ addiu $a2, $a2, %lo(D_80A1D268) ## $a2 = 80A1D268 /* 023B0 80A1CD50 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 023B4 80A1CD54 240706DA */ addiu $a3, $zero, 0x06DA ## $a3 = 000006DA -/* 023B8 80A1CD58 0C031AB1 */ jal func_800C6AC4 -/* 023BC 80A1CD5C AFA50058 */ sw $a1, 0x0058($sp) -/* 023C0 80A1CD60 8FB9006C */ lw $t9, 0x006C($sp) -/* 023C4 80A1CD64 0C024F46 */ jal func_80093D18 +/* 023B8 80A1CD58 0C031AB1 */ jal func_800C6AC4 +/* 023BC 80A1CD5C AFA50058 */ sw $a1, 0x0058($sp) +/* 023C0 80A1CD60 8FB9006C */ lw $t9, 0x006C($sp) +/* 023C4 80A1CD64 0C024F46 */ jal func_80093D18 /* 023C8 80A1CD68 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 023CC 80A1CD6C 920A03A8 */ lbu $t2, 0x03A8($s0) ## 000003A8 -/* 023D0 80A1CD70 8FA80058 */ lw $t0, 0x0058($sp) +/* 023D0 80A1CD70 8FA80058 */ lw $t0, 0x0058($sp) /* 023D4 80A1CD74 3C0CE700 */ lui $t4, 0xE700 ## $t4 = E7000000 -/* 023D8 80A1CD78 11400003 */ beq $t2, $zero, .L80A1CD88 +/* 023D8 80A1CD78 11400003 */ beq $t2, $zero, .L80A1CD88 /* 023DC 80A1CD7C 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 023E0 80A1CD80 10000002 */ beq $zero, $zero, .L80A1CD8C +/* 023E0 80A1CD80 10000002 */ beq $zero, $zero, .L80A1CD8C /* 023E4 80A1CD84 2409005F */ addiu $t1, $zero, 0x005F ## $t1 = 0000005F .L80A1CD88: /* 023E8 80A1CD88 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF @@ -44,27 +44,27 @@ glabel func_80A1CD24 /* 02424 80A1CDC4 C61003C0 */ lwc1 $f16, 0x03C0($s0) ## 000003C0 /* 02428 80A1CDC8 C60803BC */ lwc1 $f8, 0x03BC($s0) ## 000003BC /* 0242C 80A1CDCC C60403B8 */ lwc1 $f4, 0x03B8($s0) ## 000003B8 -/* 02430 80A1CDD0 4600848D */ trunc.w.s $f18, $f16 +/* 02430 80A1CDD0 4600848D */ trunc.w.s $f18, $f16 /* 02434 80A1CDD4 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 02438 80A1CDD8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0243C 80A1CDDC 4600428D */ trunc.w.s $f10, $f8 -/* 02440 80A1CDE0 44079000 */ mfc1 $a3, $f18 -/* 02444 80A1CDE4 AFA80058 */ sw $t0, 0x0058($sp) -/* 02448 80A1CDE8 4600218D */ trunc.w.s $f6, $f4 -/* 0244C 80A1CDEC 44065000 */ mfc1 $a2, $f10 -/* 02450 80A1CDF0 00073C00 */ sll $a3, $a3, 16 -/* 02454 80A1CDF4 00073C03 */ sra $a3, $a3, 16 -/* 02458 80A1CDF8 44053000 */ mfc1 $a1, $f6 -/* 0245C 80A1CDFC 00063400 */ sll $a2, $a2, 16 -/* 02460 80A1CE00 00063403 */ sra $a2, $a2, 16 -/* 02464 80A1CE04 00052C00 */ sll $a1, $a1, 16 -/* 02468 80A1CE08 00052C03 */ sra $a1, $a1, 16 -/* 0246C 80A1CE0C AFA9001C */ sw $t1, 0x001C($sp) -/* 02470 80A1CE10 AFAC0014 */ sw $t4, 0x0014($sp) +/* 02438 80A1CDD8 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0243C 80A1CDDC 4600428D */ trunc.w.s $f10, $f8 +/* 02440 80A1CDE0 44079000 */ mfc1 $a3, $f18 +/* 02444 80A1CDE4 AFA80058 */ sw $t0, 0x0058($sp) +/* 02448 80A1CDE8 4600218D */ trunc.w.s $f6, $f4 +/* 0244C 80A1CDEC 44065000 */ mfc1 $a2, $f10 +/* 02450 80A1CDF0 00073C00 */ sll $a3, $a3, 16 +/* 02454 80A1CDF4 00073C03 */ sra $a3, $a3, 16 +/* 02458 80A1CDF8 44053000 */ mfc1 $a1, $f6 +/* 0245C 80A1CDFC 00063400 */ sll $a2, $a2, 16 +/* 02460 80A1CE00 00063403 */ sra $a2, $a2, 16 +/* 02464 80A1CE04 00052C00 */ sll $a1, $a1, 16 +/* 02468 80A1CE08 00052C03 */ sra $a1, $a1, 16 +/* 0246C 80A1CE0C AFA9001C */ sw $t1, 0x001C($sp) +/* 02470 80A1CE10 AFAC0014 */ sw $t4, 0x0014($sp) /* 02474 80A1CE14 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 02478 80A1CE18 AFAB0010 */ sw $t3, 0x0010($sp) -/* 0247C 80A1CE1C 8FA80058 */ lw $t0, 0x0058($sp) + +/* 02478 80A1CE18 AFAB0010 */ sw $t3, 0x0010($sp) +/* 0247C 80A1CE1C 8FA80058 */ lw $t0, 0x0058($sp) /* 02480 80A1CE20 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 /* 02484 80A1CE24 3C0A80A2 */ lui $t2, %hi(D_80A1D054) ## $t2 = 80A20000 /* 02488 80A1CE28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -73,18 +73,18 @@ glabel func_80A1CD24 /* 02494 80A1CE34 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 02498 80A1CE38 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 0249C 80A1CE3C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 024A0 80A1CE40 87B8005E */ lh $t8, 0x005E($sp) +/* 024A0 80A1CE40 87B8005E */ lh $t8, 0x005E($sp) /* 024A4 80A1CE44 24A5D0FC */ addiu $a1, $a1, %lo(D_80A1D0FC) ## $a1 = 80A1D0FC /* 024A8 80A1CE48 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 024AC 80A1CE4C 0018C880 */ sll $t9, $t8, 2 -/* 024B0 80A1CE50 032A1821 */ addu $v1, $t9, $t2 +/* 024AC 80A1CE4C 0018C880 */ sll $t9, $t8, 2 +/* 024B0 80A1CE50 032A1821 */ addu $v1, $t9, $t2 /* 024B4 80A1CE54 906C0002 */ lbu $t4, 0x0002($v1) ## 00000002 /* 024B8 80A1CE58 906F0000 */ lbu $t7, 0x0000($v1) ## 00000000 /* 024BC 80A1CE5C 906B0001 */ lbu $t3, 0x0001($v1) ## 00000001 -/* 024C0 80A1CE60 000C6A00 */ sll $t5, $t4, 8 -/* 024C4 80A1CE64 000FC600 */ sll $t8, $t7, 24 +/* 024C0 80A1CE60 000C6A00 */ sll $t5, $t4, 8 +/* 024C4 80A1CE64 000FC600 */ sll $t8, $t7, 24 /* 024C8 80A1CE68 01B8C825 */ or $t9, $t5, $t8 ## $t9 = 00000000 -/* 024CC 80A1CE6C 000B6400 */ sll $t4, $t3, 16 +/* 024CC 80A1CE6C 000B6400 */ sll $t4, $t3, 16 /* 024D0 80A1CE70 032C7025 */ or $t6, $t9, $t4 ## $t6 = 00000000 /* 024D4 80A1CE74 35CF00FF */ ori $t7, $t6, 0x00FF ## $t7 = 000000FF /* 024D8 80A1CE78 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 @@ -97,20 +97,20 @@ glabel func_80A1CD24 /* 024F4 80A1CE94 920A0378 */ lbu $t2, 0x0378($s0) ## 00000378 /* 024F8 80A1CE98 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 /* 024FC 80A1CE9C 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 02500 80A1CEA0 000A5880 */ sll $t3, $t2, 2 -/* 02504 80A1CEA4 00ABC821 */ addu $t9, $a1, $t3 +/* 02500 80A1CEA0 000A5880 */ sll $t3, $t2, 2 +/* 02504 80A1CEA4 00ABC821 */ addu $t9, $a1, $t3 /* 02508 80A1CEA8 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 0250C 80A1CEAC 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF /* 02510 80A1CEB0 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 02514 80A1CEB4 00047100 */ sll $t6, $a0, 4 -/* 02518 80A1CEB8 000E7F02 */ srl $t7, $t6, 28 -/* 0251C 80A1CEBC 000F6880 */ sll $t5, $t7, 2 -/* 02520 80A1CEC0 00EDC021 */ addu $t8, $a3, $t5 +/* 02514 80A1CEB4 00047100 */ sll $t6, $a0, 4 +/* 02518 80A1CEB8 000E7F02 */ srl $t7, $t6, 28 +/* 0251C 80A1CEBC 000F6880 */ sll $t5, $t7, 2 +/* 02520 80A1CEC0 00EDC021 */ addu $t8, $a3, $t5 /* 02524 80A1CEC4 8F0A0000 */ lw $t2, 0x0000($t8) ## DB060020 -/* 02528 80A1CEC8 00866024 */ and $t4, $a0, $a2 +/* 02528 80A1CEC8 00866024 */ and $t4, $a0, $a2 /* 0252C 80A1CECC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 02530 80A1CED0 018A5821 */ addu $t3, $t4, $t2 -/* 02534 80A1CED4 0169C821 */ addu $t9, $t3, $t1 +/* 02530 80A1CED0 018A5821 */ addu $t3, $t4, $t2 +/* 02534 80A1CED4 0169C821 */ addu $t9, $t3, $t1 /* 02538 80A1CED8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 0253C 80A1CEDC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02540 80A1CEE0 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 @@ -118,18 +118,18 @@ glabel func_80A1CD24 /* 02548 80A1CEE8 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 0254C 80A1CEEC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02550 80A1CEF0 920D0378 */ lbu $t5, 0x0378($s0) ## 00000378 -/* 02554 80A1CEF4 000DC080 */ sll $t8, $t5, 2 -/* 02558 80A1CEF8 00B86021 */ addu $t4, $a1, $t8 +/* 02554 80A1CEF4 000DC080 */ sll $t8, $t5, 2 +/* 02558 80A1CEF8 00B86021 */ addu $t4, $a1, $t8 /* 0255C 80A1CEFC 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 02560 80A1CF00 00045900 */ sll $t3, $a0, 4 -/* 02564 80A1CF04 000BCF02 */ srl $t9, $t3, 28 -/* 02568 80A1CF08 00197080 */ sll $t6, $t9, 2 -/* 0256C 80A1CF0C 00EE7821 */ addu $t7, $a3, $t6 +/* 02560 80A1CF00 00045900 */ sll $t3, $a0, 4 +/* 02564 80A1CF04 000BCF02 */ srl $t9, $t3, 28 +/* 02568 80A1CF08 00197080 */ sll $t6, $t9, 2 +/* 0256C 80A1CF0C 00EE7821 */ addu $t7, $a3, $t6 /* 02570 80A1CF10 8DED0000 */ lw $t5, 0x0000($t7) ## DB060024 -/* 02574 80A1CF14 00865024 */ and $t2, $a0, $a2 +/* 02574 80A1CF14 00865024 */ and $t2, $a0, $a2 /* 02578 80A1CF18 3C1980A2 */ lui $t9, %hi(func_80A1CC2C) ## $t9 = 80A20000 -/* 0257C 80A1CF1C 014DC021 */ addu $t8, $t2, $t5 -/* 02580 80A1CF20 03096021 */ addu $t4, $t8, $t1 +/* 0257C 80A1CF1C 014DC021 */ addu $t8, $t2, $t5 +/* 02580 80A1CF20 03096021 */ addu $t4, $t8, $t1 /* 02584 80A1CF24 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 02588 80A1CF28 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 0258C 80A1CF2C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -137,50 +137,50 @@ glabel func_80A1CD24 /* 02594 80A1CF34 3C0B80A2 */ lui $t3, %hi(func_80A1CC04) ## $t3 = 80A20000 /* 02598 80A1CF38 256BCC04 */ addiu $t3, $t3, %lo(func_80A1CC04) ## $t3 = 80A1CC04 /* 0259C 80A1CF3C 2739CC2C */ addiu $t9, $t9, %lo(func_80A1CC2C) ## $t9 = 80A1CC2C -/* 025A0 80A1CF40 AFB90014 */ sw $t9, 0x0014($sp) -/* 025A4 80A1CF44 AFAB0010 */ sw $t3, 0x0010($sp) -/* 025A8 80A1CF48 AFB00018 */ sw $s0, 0x0018($sp) -/* 025AC 80A1CF4C 0C0286B2 */ jal func_800A1AC8 -/* 025B0 80A1CF50 8FA4006C */ lw $a0, 0x006C($sp) +/* 025A0 80A1CF40 AFB90014 */ sw $t9, 0x0014($sp) +/* 025A4 80A1CF44 AFAB0010 */ sw $t3, 0x0010($sp) +/* 025A8 80A1CF48 AFB00018 */ sw $s0, 0x0018($sp) +/* 025AC 80A1CF4C 0C0286B2 */ jal func_800A1AC8 +/* 025B0 80A1CF50 8FA4006C */ lw $a0, 0x006C($sp) /* 025B4 80A1CF54 920E03A8 */ lbu $t6, 0x03A8($s0) ## 000003A8 /* 025B8 80A1CF58 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 025BC 80A1CF5C 51C00018 */ beql $t6, $zero, .L80A1CFC0 -/* 025C0 80A1CF60 8FAF006C */ lw $t7, 0x006C($sp) +/* 025BC 80A1CF5C 51C00018 */ beql $t6, $zero, .L80A1CFC0 +/* 025C0 80A1CF60 8FAF006C */ lw $t7, 0x006C($sp) /* 025C4 80A1CF64 C60C03AC */ lwc1 $f12, 0x03AC($s0) ## 000003AC /* 025C8 80A1CF68 C60E03B0 */ lwc1 $f14, 0x03B0($s0) ## 000003B0 -/* 025CC 80A1CF6C 0C034261 */ jal Matrix_Translate +/* 025CC 80A1CF6C 0C034261 */ jal Matrix_Translate /* 025D0 80A1CF70 8E0603B4 */ lw $a2, 0x03B4($s0) ## 000003B4 /* 025D4 80A1CF74 3C0180A2 */ lui $at, %hi(D_80A1D304) ## $at = 80A20000 -/* 025D8 80A1CF78 C42CD304 */ lwc1 $f12, %lo(D_80A1D304)($at) +/* 025D8 80A1CF78 C42CD304 */ lwc1 $f12, %lo(D_80A1D304)($at) /* 025DC 80A1CF7C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 025E0 80A1CF80 44066000 */ mfc1 $a2, $f12 -/* 025E4 80A1CF84 0C0342A3 */ jal Matrix_Scale -/* 025E8 80A1CF88 46006386 */ mov.s $f14, $f12 +/* 025E0 80A1CF80 44066000 */ mfc1 $a2, $f12 +/* 025E4 80A1CF84 0C0342A3 */ jal Matrix_Scale +/* 025E8 80A1CF88 46006386 */ mov.s $f14, $f12 /* 025EC 80A1CF8C 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 025F0 80A1CF90 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 025F4 80A1CF94 860600B8 */ lh $a2, 0x00B8($s0) ## 000000B8 -/* 025F8 80A1CF98 0C034421 */ jal Matrix_RotateXYZ +/* 025F8 80A1CF98 0C034421 */ jal Matrix_RotateZYX /* 025FC 80A1CF9C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02600 80A1CFA0 8E0502B4 */ lw $a1, 0x02B4($s0) ## 000002B4 /* 02604 80A1CFA4 8E0602D0 */ lw $a2, 0x02D0($s0) ## 000002D0 -/* 02608 80A1CFA8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0260C 80A1CFAC AFA00010 */ sw $zero, 0x0010($sp) -/* 02610 80A1CFB0 8FA4006C */ lw $a0, 0x006C($sp) +/* 02608 80A1CFA8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0260C 80A1CFAC AFA00010 */ sw $zero, 0x0010($sp) +/* 02610 80A1CFB0 8FA4006C */ lw $a0, 0x006C($sp) /* 02614 80A1CFB4 0C028572 */ jal SkelAnime_Draw - + /* 02618 80A1CFB8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0261C 80A1CFBC 8FAF006C */ lw $t7, 0x006C($sp) +/* 0261C 80A1CFBC 8FAF006C */ lw $t7, 0x006C($sp) .L80A1CFC0: /* 02620 80A1CFC0 3C0680A2 */ lui $a2, %hi(D_80A1D278) ## $a2 = 80A20000 /* 02624 80A1CFC4 24C6D278 */ addiu $a2, $a2, %lo(D_80A1D278) ## $a2 = 80A1D278 /* 02628 80A1CFC8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 0262C 80A1CFCC 24070718 */ addiu $a3, $zero, 0x0718 ## $a3 = 00000718 -/* 02630 80A1CFD0 0C031AD5 */ jal func_800C6B54 +/* 02630 80A1CFD0 0C031AD5 */ jal func_800C6B54 /* 02634 80A1CFD4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 02638 80A1CFD8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0263C 80A1CFDC 8FB00028 */ lw $s0, 0x0028($sp) +/* 02638 80A1CFD8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0263C 80A1CFDC 8FB00028 */ lw $s0, 0x0028($sp) /* 02640 80A1CFE0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02644 80A1CFE4 03E00008 */ jr $ra +/* 02644 80A1CFE4 03E00008 */ jr $ra /* 02648 80A1CFE8 00000000 */ nop /* 0264C 80A1CFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s index 2ee617a79a..e8e1a83805 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s @@ -1,78 +1,78 @@ glabel func_80A1FF8C /* 001CC 80A1FF8C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 001D0 80A1FF90 AFBF0034 */ sw $ra, 0x0034($sp) -/* 001D4 80A1FF94 AFB00030 */ sw $s0, 0x0030($sp) -/* 001D8 80A1FF98 AFA5006C */ sw $a1, 0x006C($sp) +/* 001D0 80A1FF90 AFBF0034 */ sw $ra, 0x0034($sp) +/* 001D4 80A1FF94 AFB00030 */ sw $s0, 0x0030($sp) +/* 001D8 80A1FF98 AFA5006C */ sw $a1, 0x006C($sp) /* 001DC 80A1FF9C C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 /* 001E0 80A1FFA0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 001E4 80A1FFA4 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 001E8 80A1FFA8 E7A4005C */ swc1 $f4, 0x005C($sp) +/* 001E8 80A1FFA8 E7A4005C */ swc1 $f4, 0x005C($sp) /* 001EC 80A1FFAC C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 /* 001F0 80A1FFB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001F4 80A1FFB4 C7AC005C */ lwc1 $f12, 0x005C($sp) -/* 001F8 80A1FFB8 46083280 */ add.s $f10, $f6, $f8 +/* 001F4 80A1FFB4 C7AC005C */ lwc1 $f12, 0x005C($sp) +/* 001F8 80A1FFB8 46083280 */ add.s $f10, $f6, $f8 /* 001FC 80A1FFBC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00200 80A1FFC0 E7AA0060 */ swc1 $f10, 0x0060($sp) +/* 00200 80A1FFC0 E7AA0060 */ swc1 $f10, 0x0060($sp) /* 00204 80A1FFC4 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 00208 80A1FFC8 C7AE0060 */ lwc1 $f14, 0x0060($sp) -/* 0020C 80A1FFCC E7B00064 */ swc1 $f16, 0x0064($sp) -/* 00210 80A1FFD0 0C034261 */ jal Matrix_Translate -/* 00214 80A1FFD4 8FA60064 */ lw $a2, 0x0064($sp) +/* 00208 80A1FFC8 C7AE0060 */ lwc1 $f14, 0x0060($sp) +/* 0020C 80A1FFCC E7B00064 */ swc1 $f16, 0x0064($sp) +/* 00210 80A1FFD0 0C034261 */ jal Matrix_Translate +/* 00214 80A1FFD4 8FA60064 */ lw $a2, 0x0064($sp) /* 00218 80A1FFD8 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 0021C 80A1FFDC 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 00220 80A1FFE0 860600B8 */ lh $a2, 0x00B8($s0) ## 000000B8 -/* 00224 80A1FFE4 0C034421 */ jal Matrix_RotateXYZ +/* 00224 80A1FFE4 0C034421 */ jal Matrix_RotateZYX /* 00228 80A1FFE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0022C 80A1FFEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00230 80A1FFF0 3C01435C */ lui $at, 0x435C ## $at = 435C0000 /* 00234 80A1FFF4 44819000 */ mtc1 $at, $f18 ## $f18 = 220.00 /* 00238 80A1FFF8 26050264 */ addiu $a1, $s0, 0x0264 ## $a1 = 00000264 -/* 0023C 80A1FFFC AFA50038 */ sw $a1, 0x0038($sp) +/* 0023C 80A1FFFC AFA50038 */ sw $a1, 0x0038($sp) /* 00240 80A20000 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 00244 80A20004 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 00248 80A20008 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 0024C 80A2000C 0C0346BD */ jal Matrix_MultVec3f -/* 00250 80A20010 E7B2004C */ swc1 $f18, 0x004C($sp) -/* 00254 80A20014 8FA4006C */ lw $a0, 0x006C($sp) +/* 00244 80A20004 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 00248 80A20008 E7A00044 */ swc1 $f0, 0x0044($sp) +/* 0024C 80A2000C 0C0346BD */ jal Matrix_MultVec3f +/* 00250 80A20010 E7B2004C */ swc1 $f18, 0x004C($sp) +/* 00254 80A20014 8FA4006C */ lw $a0, 0x006C($sp) /* 00258 80A20018 27AE003C */ addiu $t6, $sp, 0x003C ## $t6 = FFFFFFD4 /* 0025C 80A2001C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00260 80A20020 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00264 80A20024 27B90040 */ addiu $t9, $sp, 0x0040 ## $t9 = FFFFFFD8 -/* 00268 80A20028 AFB90024 */ sw $t9, 0x0024($sp) -/* 0026C 80A2002C AFB80020 */ sw $t8, 0x0020($sp) -/* 00270 80A20030 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00274 80A20034 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00268 80A20028 AFB90024 */ sw $t9, 0x0024($sp) +/* 0026C 80A2002C AFB80020 */ sw $t8, 0x0020($sp) +/* 00270 80A20030 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00274 80A20034 AFAE0010 */ sw $t6, 0x0010($sp) /* 00278 80A20038 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFF4 -/* 0027C 80A2003C 8FA60038 */ lw $a2, 0x0038($sp) +/* 0027C 80A2003C 8FA60038 */ lw $a2, 0x0038($sp) /* 00280 80A20040 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 -/* 00284 80A20044 AFA00018 */ sw $zero, 0x0018($sp) -/* 00288 80A20048 AFA0001C */ sw $zero, 0x001C($sp) -/* 0028C 80A2004C 0C00F7A1 */ jal func_8003DE84 +/* 00284 80A20044 AFA00018 */ sw $zero, 0x0018($sp) +/* 00288 80A20048 AFA0001C */ sw $zero, 0x001C($sp) +/* 0028C 80A2004C 0C00F7A1 */ jal func_8003DE84 /* 00290 80A20050 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00294 80A20054 10400003 */ beq $v0, $zero, .L80A20064 -/* 00298 80A20058 8FA40038 */ lw $a0, 0x0038($sp) +/* 00294 80A20054 10400003 */ beq $v0, $zero, .L80A20064 +/* 00298 80A20058 8FA40038 */ lw $a0, 0x0038($sp) /* 0029C 80A2005C 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 002A0 80A20060 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 .L80A20064: /* 002A4 80A20064 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 002A8 80A20068 C6060264 */ lwc1 $f6, 0x0264($s0) ## 00000264 -/* 002AC 80A2006C 46062201 */ sub.s $f8, $f4, $f6 -/* 002B0 80A20070 E7A8005C */ swc1 $f8, 0x005C($sp) +/* 002AC 80A2006C 46062201 */ sub.s $f8, $f4, $f6 +/* 002B0 80A20070 E7A8005C */ swc1 $f8, 0x005C($sp) /* 002B4 80A20074 C610026C */ lwc1 $f16, 0x026C($s0) ## 0000026C /* 002B8 80A20078 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 002BC 80A2007C C7A4005C */ lwc1 $f4, 0x005C($sp) -/* 002C0 80A20080 46105481 */ sub.s $f18, $f10, $f16 -/* 002C4 80A20084 46042182 */ mul.s $f6, $f4, $f4 -/* 002C8 80A20088 E7B20064 */ swc1 $f18, 0x0064($sp) -/* 002CC 80A2008C C7A80064 */ lwc1 $f8, 0x0064($sp) -/* 002D0 80A20090 46084282 */ mul.s $f10, $f8, $f8 -/* 002D4 80A20094 460A3400 */ add.s $f16, $f6, $f10 +/* 002BC 80A2007C C7A4005C */ lwc1 $f4, 0x005C($sp) +/* 002C0 80A20080 46105481 */ sub.s $f18, $f10, $f16 +/* 002C4 80A20084 46042182 */ mul.s $f6, $f4, $f4 +/* 002C8 80A20088 E7B20064 */ swc1 $f18, 0x0064($sp) +/* 002CC 80A2008C C7A80064 */ lwc1 $f8, 0x0064($sp) +/* 002D0 80A20090 46084282 */ mul.s $f10, $f8, $f8 +/* 002D4 80A20094 460A3400 */ add.s $f16, $f6, $f10 /* 002D8 80A20098 E6100270 */ swc1 $f16, 0x0270($s0) ## 00000270 -/* 002DC 80A2009C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 002E0 80A200A0 8FB00030 */ lw $s0, 0x0030($sp) +/* 002DC 80A2009C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 002E0 80A200A0 8FB00030 */ lw $s0, 0x0030($sp) /* 002E4 80A200A4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 002E8 80A200A8 03E00008 */ jr $ra +/* 002E8 80A200A8 03E00008 */ jr $ra /* 002EC 80A200AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s index 95bca3c1ec..9b431fa834 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s @@ -1,62 +1,62 @@ glabel EnGb_Init /* 00030 80A2F1B0 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 00034 80A2F1B4 AFB30050 */ sw $s3, 0x0050($sp) +/* 00034 80A2F1B4 AFB30050 */ sw $s3, 0x0050($sp) /* 00038 80A2F1B8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0003C 80A2F1BC AFBF005C */ sw $ra, 0x005C($sp) -/* 00040 80A2F1C0 AFB2004C */ sw $s2, 0x004C($sp) +/* 0003C 80A2F1BC AFBF005C */ sw $ra, 0x005C($sp) +/* 00040 80A2F1C0 AFB2004C */ sw $s2, 0x004C($sp) /* 00044 80A2F1C4 3C0580A3 */ lui $a1, %hi(D_80A30740) ## $a1 = 80A30000 /* 00048 80A2F1C8 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 0004C 80A2F1CC AFB50058 */ sw $s5, 0x0058($sp) -/* 00050 80A2F1D0 AFB40054 */ sw $s4, 0x0054($sp) -/* 00054 80A2F1D4 AFB10048 */ sw $s1, 0x0048($sp) -/* 00058 80A2F1D8 AFB00044 */ sw $s0, 0x0044($sp) -/* 0005C 80A2F1DC F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 00060 80A2F1E0 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 00064 80A2F1E4 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 00068 80A2F1E8 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 0006C 80A2F1EC AFA00084 */ sw $zero, 0x0084($sp) +/* 0004C 80A2F1CC AFB50058 */ sw $s5, 0x0058($sp) +/* 00050 80A2F1D0 AFB40054 */ sw $s4, 0x0054($sp) +/* 00054 80A2F1D4 AFB10048 */ sw $s1, 0x0048($sp) +/* 00058 80A2F1D8 AFB00044 */ sw $s0, 0x0044($sp) +/* 0005C 80A2F1DC F7BA0038 */ sdc1 $f26, 0x0038($sp) +/* 00060 80A2F1E0 F7B80030 */ sdc1 $f24, 0x0030($sp) +/* 00064 80A2F1E4 F7B60028 */ sdc1 $f22, 0x0028($sp) +/* 00068 80A2F1E8 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 0006C 80A2F1EC AFA00084 */ sw $zero, 0x0084($sp) /* 00070 80A2F1F0 0C01E037 */ jal Actor_ProcessInitChain - + /* 00074 80A2F1F4 24A50740 */ addiu $a1, $a1, %lo(D_80A30740) ## $a1 = 80A30740 /* 00078 80A2F1F8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0007C 80A2F1FC 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 00080 80A2F200 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00084 80A2F204 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00088 80A2F208 2484C2D0 */ addiu $a0, $a0, 0xC2D0 ## $a0 = 0600C2D0 /* 0008C 80A2F20C 0C010620 */ jal DynaPolyInfo_Alloc - + /* 00090 80A2F210 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFF4 /* 00094 80A2F214 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00098 80A2F218 26650810 */ addiu $a1, $s3, 0x0810 ## $a1 = 00000810 /* 0009C 80A2F21C 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 000A0 80A2F220 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 000A4 80A2F224 8FA70084 */ lw $a3, 0x0084($sp) +/* 000A4 80A2F224 8FA70084 */ lw $a3, 0x0084($sp) /* 000A8 80A2F228 AE42014C */ sw $v0, 0x014C($s2) ## 0000014C /* 000AC 80A2F22C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 000B0 80A2F230 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 000B4 80A2F234 264E01A8 */ addiu $t6, $s2, 0x01A8 ## $t6 = 000001A8 /* 000B8 80A2F238 264F01F0 */ addiu $t7, $s2, 0x01F0 ## $t7 = 000001F0 /* 000BC 80A2F23C 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 000C0 80A2F240 AFB80018 */ sw $t8, 0x0018($sp) -/* 000C4 80A2F244 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000C8 80A2F248 AFAE0010 */ sw $t6, 0x0010($sp) +/* 000C0 80A2F240 AFB80018 */ sw $t8, 0x0018($sp) +/* 000C4 80A2F244 AFAF0014 */ sw $t7, 0x0014($sp) +/* 000C8 80A2F248 AFAE0010 */ sw $t6, 0x0010($sp) /* 000CC 80A2F24C 24E7049C */ addiu $a3, $a3, 0x049C ## $a3 = 0600049C /* 000D0 80A2F250 24C6C220 */ addiu $a2, $a2, 0xC220 ## $a2 = 0600C220 /* 000D4 80A2F254 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 000D8 80A2F258 0C0291BE */ jal func_800A46F8 +/* 000D8 80A2F258 0C0291BE */ jal func_800A46F8 /* 000DC 80A2F25C 26450164 */ addiu $a1, $s2, 0x0164 ## $a1 = 00000164 /* 000E0 80A2F260 2650023C */ addiu $s0, $s2, 0x023C ## $s0 = 0000023C /* 000E4 80A2F264 02002825 */ or $a1, $s0, $zero ## $a1 = 0000023C /* 000E8 80A2F268 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000EC 80A2F26C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000F0 80A2F270 3C0780A3 */ lui $a3, %hi(D_80A30690) ## $a3 = 80A30000 /* 000F4 80A2F274 24E70690 */ addiu $a3, $a3, %lo(D_80A30690) ## $a3 = 80A30690 /* 000F8 80A2F278 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000FC 80A2F27C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000023C -/* 00100 80A2F280 0C017114 */ jal func_8005C450 +/* 00100 80A2F280 0C017114 */ jal func_8005C450 /* 00104 80A2F284 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00108 80A2F288 3C1080A3 */ lui $s0, %hi(D_80A306BC) ## $s0 = 80A30000 /* 0010C 80A2F28C 3C1480A3 */ lui $s4, %hi(D_80A30740) ## $s4 = 80A30000 @@ -66,62 +66,62 @@ glabel EnGb_Init .L80A2F29C: /* 0011C 80A2F29C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00120 80A2F2A0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00124 80A2F2A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000288 /* 00128 80A2F2A8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0012C 80A2F2AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000288 /* 00130 80A2F2B0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00134 80A2F2B4 0C017114 */ jal func_8005C450 +/* 00134 80A2F2B4 0C017114 */ jal func_8005C450 /* 00138 80A2F2B8 02003825 */ or $a3, $s0, $zero ## $a3 = 80A306BC /* 0013C 80A2F2BC 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 80A306E8 -/* 00140 80A2F2C0 0214082B */ sltu $at, $s0, $s4 -/* 00144 80A2F2C4 1420FFF5 */ bne $at, $zero, .L80A2F29C +/* 00140 80A2F2C0 0214082B */ sltu $at, $s0, $s4 +/* 00144 80A2F2C4 1420FFF5 */ bne $at, $zero, .L80A2F29C /* 00148 80A2F2C8 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 000002D4 /* 0014C 80A2F2CC 26500370 */ addiu $s0, $s2, 0x0370 ## $s0 = 00000370 /* 00150 80A2F2D0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000370 /* 00154 80A2F2D4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00158 80A2F2D8 0C01E9D9 */ jal Lights_Insert - + /* 0015C 80A2F2DC 266507A8 */ addiu $a1, $s3, 0x07A8 ## $a1 = 000007A8 /* 00160 80A2F2E0 C6440008 */ lwc1 $f4, 0x0008($s2) ## 00000008 /* 00164 80A2F2E4 C648000C */ lwc1 $f8, 0x000C($s2) ## 0000000C /* 00168 80A2F2E8 C6500010 */ lwc1 $f16, 0x0010($s2) ## 00000010 -/* 0016C 80A2F2EC 4600218D */ trunc.w.s $f6, $f4 +/* 0016C 80A2F2EC 4600218D */ trunc.w.s $f6, $f4 /* 00170 80A2F2F0 AE42036C */ sw $v0, 0x036C($s2) ## 0000036C /* 00174 80A2F2F4 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00178 80A2F2F8 4600428D */ trunc.w.s $f10, $f8 -/* 0017C 80A2F2FC 44053000 */ mfc1 $a1, $f6 +/* 00178 80A2F2F8 4600428D */ trunc.w.s $f10, $f8 +/* 0017C 80A2F2FC 44053000 */ mfc1 $a1, $f6 /* 00180 80A2F300 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00184 80A2F304 4600848D */ trunc.w.s $f18, $f16 -/* 00188 80A2F308 44065000 */ mfc1 $a2, $f10 +/* 00184 80A2F304 4600848D */ trunc.w.s $f18, $f16 +/* 00188 80A2F308 44065000 */ mfc1 $a2, $f10 /* 0018C 80A2F30C 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 00190 80A2F310 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 -/* 00194 80A2F314 44079000 */ mfc1 $a3, $f18 -/* 00198 80A2F318 00052C00 */ sll $a1, $a1, 16 -/* 0019C 80A2F31C 00063400 */ sll $a2, $a2, 16 -/* 001A0 80A2F320 00073C00 */ sll $a3, $a3, 16 -/* 001A4 80A2F324 00073C03 */ sra $a3, $a3, 16 -/* 001A8 80A2F328 00063403 */ sra $a2, $a2, 16 -/* 001AC 80A2F32C 00052C03 */ sra $a1, $a1, 16 -/* 001B0 80A2F330 AFAD001C */ sw $t5, 0x001C($sp) -/* 001B4 80A2F334 AFAC0018 */ sw $t4, 0x0018($sp) -/* 001B8 80A2F338 AFAB0014 */ sw $t3, 0x0014($sp) -/* 001BC 80A2F33C AFAA0010 */ sw $t2, 0x0010($sp) +/* 00194 80A2F314 44079000 */ mfc1 $a3, $f18 +/* 00198 80A2F318 00052C00 */ sll $a1, $a1, 16 +/* 0019C 80A2F31C 00063400 */ sll $a2, $a2, 16 +/* 001A0 80A2F320 00073C00 */ sll $a3, $a3, 16 +/* 001A4 80A2F324 00073C03 */ sra $a3, $a3, 16 +/* 001A8 80A2F328 00063403 */ sra $a2, $a2, 16 +/* 001AC 80A2F32C 00052C03 */ sra $a1, $a1, 16 +/* 001B0 80A2F330 AFAD001C */ sw $t5, 0x001C($sp) +/* 001B4 80A2F334 AFAC0018 */ sw $t4, 0x0018($sp) +/* 001B8 80A2F338 AFAB0014 */ sw $t3, 0x0014($sp) +/* 001BC 80A2F33C AFAA0010 */ sw $t2, 0x0010($sp) /* 001C0 80A2F340 0C01E763 */ jal Lights_InitType0PositionalLight - + /* 001C4 80A2F344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000370 /* 001C8 80A2F348 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 /* 001CC 80A2F34C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001D0 80A2F350 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 001D4 80A2F354 4405C000 */ mfc1 $a1, $f24 +/* 001D4 80A2F354 4405C000 */ mfc1 $a1, $f24 /* 001D8 80A2F358 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 001DC 80A2F35C 0C00AC78 */ jal ActorShape_Init - + /* 001E0 80A2F360 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 /* 001E4 80A2F364 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 001E8 80A2F368 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001EC 80A2F36C 0C00B58B */ jal Actor_SetScale - + /* 001F0 80A2F370 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 001F4 80A2F374 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 001F8 80A2F378 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 @@ -132,18 +132,18 @@ glabel EnGb_Init /* 0020C 80A2F38C E6580068 */ swc1 $f24, 0x0068($s2) ## 00000068 /* 00210 80A2F390 E6580060 */ swc1 $f24, 0x0060($s2) ## 00000060 /* 00214 80A2F394 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00218 80A2F398 E644006C */ swc1 $f4, 0x006C($s2) ## 0000006C -/* 0021C 80A2F39C 4600018D */ trunc.w.s $f6, $f0 +/* 0021C 80A2F39C 4600018D */ trunc.w.s $f6, $f0 /* 00220 80A2F3A0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 00224 80A2F3A4 4481D000 */ mtc1 $at, $f26 ## $f26 = 30.00 /* 00228 80A2F3A8 3C0180A3 */ lui $at, %hi(D_80A307F0) ## $at = 80A30000 -/* 0022C 80A2F3AC 44083000 */ mfc1 $t0, $f6 +/* 0022C 80A2F3AC 44083000 */ mfc1 $t0, $f6 /* 00230 80A2F3B0 3C1180A3 */ lui $s1, %hi(D_80A30748) ## $s1 = 80A30000 /* 00234 80A2F3B4 3C1580A3 */ lui $s5, %hi(D_80A30778) ## $s5 = 80A30000 /* 00238 80A2F3B8 25090064 */ addiu $t1, $t0, 0x0064 ## $t1 = 00000064 /* 0023C 80A2F3BC A6490382 */ sh $t1, 0x0382($s2) ## 00000382 -/* 00240 80A2F3C0 C43607F0 */ lwc1 $f22, %lo(D_80A307F0)($at) +/* 00240 80A2F3C0 C43607F0 */ lwc1 $f22, %lo(D_80A307F0)($at) /* 00244 80A2F3C4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00248 80A2F3C8 4481A000 */ mtc1 $at, $f20 ## $f20 = 40.00 /* 0024C 80A2F3CC 26B50778 */ addiu $s5, $s5, %lo(D_80A30778) ## $s5 = 80A30778 @@ -153,124 +153,124 @@ glabel EnGb_Init /* 0025C 80A2F3DC 24130003 */ addiu $s3, $zero, 0x0003 ## $s3 = 00000003 .L80A2F3E0: /* 00260 80A2F3E0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00264 80A2F3E4 4600D306 */ mov.s $f12, $f26 -/* 00268 80A2F3E8 4600020D */ trunc.w.s $f8, $f0 + +/* 00264 80A2F3E4 4600D306 */ mov.s $f12, $f26 +/* 00268 80A2F3E8 4600020D */ trunc.w.s $f8, $f0 /* 0026C 80A2F3EC 00006825 */ or $t5, $zero, $zero ## $t5 = 00000000 -/* 00270 80A2F3F0 4600A306 */ mov.s $f12, $f20 -/* 00274 80A2F3F4 440B4000 */ mfc1 $t3, $f8 +/* 00270 80A2F3F0 4600A306 */ mov.s $f12, $f20 +/* 00274 80A2F3F4 440B4000 */ mfc1 $t3, $f8 /* 00278 80A2F3F8 00000000 */ nop -/* 0027C 80A2F3FC 0173001A */ div $zero, $t3, $s3 -/* 00280 80A2F400 00006010 */ mfhi $t4 +/* 0027C 80A2F3FC 0173001A */ div $zero, $t3, $s3 +/* 00280 80A2F400 00006010 */ mfhi $t4 /* 00284 80A2F404 A20C0388 */ sb $t4, 0x0388($s0) ## 00000388 /* 00288 80A2F408 C6500024 */ lwc1 $f16, 0x0024($s2) ## 00000024 /* 0028C 80A2F40C C62A0000 */ lwc1 $f10, 0x0000($s1) ## 80A30748 -/* 00290 80A2F410 16600002 */ bne $s3, $zero, .L80A2F41C +/* 00290 80A2F410 16600002 */ bne $s3, $zero, .L80A2F41C /* 00294 80A2F414 00000000 */ nop /* 00298 80A2F418 0007000D */ break 7 .L80A2F41C: /* 0029C 80A2F41C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 002A0 80A2F420 16610004 */ bne $s3, $at, .L80A2F434 +/* 002A0 80A2F420 16610004 */ bne $s3, $at, .L80A2F434 /* 002A4 80A2F424 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 002A8 80A2F428 15610002 */ bne $t3, $at, .L80A2F434 +/* 002A8 80A2F428 15610002 */ bne $t3, $at, .L80A2F434 /* 002AC 80A2F42C 00000000 */ nop /* 002B0 80A2F430 0006000D */ break 6 .L80A2F434: -/* 002B4 80A2F434 46105080 */ add.s $f2, $f10, $f16 +/* 002B4 80A2F434 46105080 */ add.s $f2, $f10, $f16 /* 002B8 80A2F438 E6020390 */ swc1 $f2, 0x0390($s0) ## 00000390 /* 002BC 80A2F43C E602039C */ swc1 $f2, 0x039C($s0) ## 0000039C /* 002C0 80A2F440 C6440028 */ lwc1 $f4, 0x0028($s2) ## 00000028 /* 002C4 80A2F444 C6320004 */ lwc1 $f18, 0x0004($s1) ## 80A3074C -/* 002C8 80A2F448 46049080 */ add.s $f2, $f18, $f4 +/* 002C8 80A2F448 46049080 */ add.s $f2, $f18, $f4 /* 002CC 80A2F44C E6020394 */ swc1 $f2, 0x0394($s0) ## 00000394 /* 002D0 80A2F450 E60203A0 */ swc1 $f2, 0x03A0($s0) ## 000003A0 /* 002D4 80A2F454 C648002C */ lwc1 $f8, 0x002C($s2) ## 0000002C /* 002D8 80A2F458 C6260008 */ lwc1 $f6, 0x0008($s1) ## 80A30750 /* 002DC 80A2F45C A2140389 */ sb $s4, 0x0389($s0) ## 00000389 /* 002E0 80A2F460 A20D038B */ sb $t5, 0x038B($s0) ## 0000038B -/* 002E4 80A2F464 46083080 */ add.s $f2, $f6, $f8 +/* 002E4 80A2F464 46083080 */ add.s $f2, $f6, $f8 /* 002E8 80A2F468 A200038A */ sb $zero, 0x038A($s0) ## 0000038A /* 002EC 80A2F46C E61803A8 */ swc1 $f24, 0x03A8($s0) ## 000003A8 /* 002F0 80A2F470 E61803AC */ swc1 $f24, 0x03AC($s0) ## 000003AC /* 002F4 80A2F474 E6020398 */ swc1 $f2, 0x0398($s0) ## 00000398 /* 002F8 80A2F478 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 002FC 80A2F47C E60203A4 */ swc1 $f2, 0x03A4($s0) ## 000003A4 -/* 00300 80A2F480 4600028D */ trunc.w.s $f10, $f0 +/* 00300 80A2F480 4600028D */ trunc.w.s $f10, $f0 /* 00304 80A2F484 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 80A30754 /* 00308 80A2F488 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 0000002C /* 0030C 80A2F48C E6160384 */ swc1 $f22, 0x0384($s0) ## 000003B0 -/* 00310 80A2F490 440F5000 */ mfc1 $t7, $f10 +/* 00310 80A2F490 440F5000 */ mfc1 $t7, $f10 /* 00314 80A2F494 00000000 */ nop /* 00318 80A2F498 A60F0362 */ sh $t7, 0x0362($s0) ## 0000038E /* 0031C 80A2F49C 86180362 */ lh $t8, 0x0362($s0) ## 0000038E /* 00320 80A2F4A0 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 00324 80A2F4A4 1635FFCE */ bne $s1, $s5, .L80A2F3E0 +/* 00324 80A2F4A4 1635FFCE */ bne $s1, $s5, .L80A2F3E0 /* 00328 80A2F4A8 A2190360 */ sb $t9, 0x0360($s0) ## 0000038C /* 0032C 80A2F4AC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00330 80A2F4B0 00000000 */ nop -/* 00334 80A2F4B4 461A0402 */ mul.s $f16, $f0, $f26 +/* 00334 80A2F4B4 461A0402 */ mul.s $f16, $f0, $f26 /* 00338 80A2F4B8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0033C 80A2F4BC 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00340 80A2F4C0 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00344 80A2F4C4 44815000 */ mtc1 $at, $f10 ## $f10 = 160.00 -/* 00348 80A2F4C8 46040182 */ mul.s $f6, $f0, $f4 +/* 00348 80A2F4C8 46040182 */ mul.s $f6, $f0, $f4 /* 0034C 80A2F4CC 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 /* 00350 80A2F4D0 A24D0387 */ sb $t5, 0x0387($s2) ## 00000387 /* 00354 80A2F4D4 C64C0024 */ lwc1 $f12, 0x0024($s2) ## 00000024 /* 00358 80A2F4D8 C64E0028 */ lwc1 $f14, 0x0028($s2) ## 00000028 /* 0035C 80A2F4DC 8E46002C */ lw $a2, 0x002C($s2) ## 0000002C -/* 00360 80A2F4E0 4600848D */ trunc.w.s $f18, $f16 -/* 00364 80A2F4E4 460A0402 */ mul.s $f16, $f0, $f10 +/* 00360 80A2F4E0 4600848D */ trunc.w.s $f18, $f16 +/* 00364 80A2F4E4 460A0402 */ mul.s $f16, $f0, $f10 /* 00368 80A2F4E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0036C 80A2F4EC 440B9000 */ mfc1 $t3, $f18 -/* 00370 80A2F4F0 4600320D */ trunc.w.s $f8, $f6 +/* 0036C 80A2F4EC 440B9000 */ mfc1 $t3, $f18 +/* 00370 80A2F4F0 4600320D */ trunc.w.s $f8, $f6 /* 00374 80A2F4F4 256C00E1 */ addiu $t4, $t3, 0x00E1 ## $t4 = 000000E1 /* 00378 80A2F4F8 A24C0384 */ sb $t4, 0x0384($s2) ## 00000384 -/* 0037C 80A2F4FC 4600848D */ trunc.w.s $f18, $f16 -/* 00380 80A2F500 44184000 */ mfc1 $t8, $f8 -/* 00384 80A2F504 440B9000 */ mfc1 $t3, $f18 +/* 0037C 80A2F4FC 4600848D */ trunc.w.s $f18, $f16 +/* 00380 80A2F500 44184000 */ mfc1 $t8, $f8 +/* 00384 80A2F504 440B9000 */ mfc1 $t3, $f18 /* 00388 80A2F508 2719009B */ addiu $t9, $t8, 0x009B ## $t9 = 0000009B /* 0038C 80A2F50C A2590385 */ sb $t9, 0x0385($s2) ## 00000385 /* 00390 80A2F510 256C005F */ addiu $t4, $t3, 0x005F ## $t4 = 0000005F -/* 00394 80A2F514 0C034261 */ jal Matrix_Translate +/* 00394 80A2F514 0C034261 */ jal Matrix_Translate /* 00398 80A2F518 A24C0386 */ sb $t4, 0x0386($s2) ## 00000386 /* 0039C 80A2F51C 86440030 */ lh $a0, 0x0030($s2) ## 00000030 /* 003A0 80A2F520 86450032 */ lh $a1, 0x0032($s2) ## 00000032 /* 003A4 80A2F524 86460034 */ lh $a2, 0x0034($s2) ## 00000034 -/* 003A8 80A2F528 0C034421 */ jal Matrix_RotateXYZ +/* 003A8 80A2F528 0C034421 */ jal Matrix_RotateZYX /* 003AC 80A2F52C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 003B0 80A2F530 3C014230 */ lui $at, 0x4230 ## $at = 42300000 /* 003B4 80A2F534 44812000 */ mtc1 $at, $f4 ## $f4 = 44.00 -/* 003B8 80A2F538 E7B80074 */ swc1 $f24, 0x0074($sp) -/* 003BC 80A2F53C E7B80070 */ swc1 $f24, 0x0070($sp) +/* 003B8 80A2F538 E7B80074 */ swc1 $f24, 0x0074($sp) +/* 003BC 80A2F53C E7B80070 */ swc1 $f24, 0x0070($sp) /* 003C0 80A2F540 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 003C4 80A2F544 26450038 */ addiu $a1, $s2, 0x0038 ## $a1 = 00000038 -/* 003C8 80A2F548 0C0346BD */ jal Matrix_MultVec3f -/* 003CC 80A2F54C E7A40078 */ swc1 $f4, 0x0078($sp) +/* 003C8 80A2F548 0C0346BD */ jal Matrix_MultVec3f +/* 003CC 80A2F54C E7A40078 */ swc1 $f4, 0x0078($sp) /* 003D0 80A2F550 3C01427A */ lui $at, 0x427A ## $at = 427A0000 /* 003D4 80A2F554 44814000 */ mtc1 $at, $f8 ## $f8 = 62.50 /* 003D8 80A2F558 C646003C */ lwc1 $f6, 0x003C($s2) ## 0000003C /* 003DC 80A2F55C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 003E0 80A2F560 46083280 */ add.s $f10, $f6, $f8 -/* 003E4 80A2F564 0C28BC60 */ jal func_80A2F180 +/* 003E0 80A2F560 46083280 */ add.s $f10, $f6, $f8 +/* 003E4 80A2F564 0C28BC60 */ jal func_80A2F180 /* 003E8 80A2F568 E64A003C */ swc1 $f10, 0x003C($s2) ## 0000003C /* 003EC 80A2F56C 3C0E80A3 */ lui $t6, %hi(func_80A2F83C) ## $t6 = 80A30000 /* 003F0 80A2F570 25CEF83C */ addiu $t6, $t6, %lo(func_80A2F83C) ## $t6 = 80A2F83C /* 003F4 80A2F574 AE4E0238 */ sw $t6, 0x0238($s2) ## 00000238 -/* 003F8 80A2F578 8FBF005C */ lw $ra, 0x005C($sp) -/* 003FC 80A2F57C 8FB50058 */ lw $s5, 0x0058($sp) -/* 00400 80A2F580 8FB40054 */ lw $s4, 0x0054($sp) -/* 00404 80A2F584 8FB30050 */ lw $s3, 0x0050($sp) -/* 00408 80A2F588 8FB2004C */ lw $s2, 0x004C($sp) -/* 0040C 80A2F58C 8FB10048 */ lw $s1, 0x0048($sp) -/* 00410 80A2F590 8FB00044 */ lw $s0, 0x0044($sp) -/* 00414 80A2F594 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 00418 80A2F598 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 0041C 80A2F59C D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 00420 80A2F5A0 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 00424 80A2F5A4 03E00008 */ jr $ra +/* 003F8 80A2F578 8FBF005C */ lw $ra, 0x005C($sp) +/* 003FC 80A2F57C 8FB50058 */ lw $s5, 0x0058($sp) +/* 00400 80A2F580 8FB40054 */ lw $s4, 0x0054($sp) +/* 00404 80A2F584 8FB30050 */ lw $s3, 0x0050($sp) +/* 00408 80A2F588 8FB2004C */ lw $s2, 0x004C($sp) +/* 0040C 80A2F58C 8FB10048 */ lw $s1, 0x0048($sp) +/* 00410 80A2F590 8FB00044 */ lw $s0, 0x0044($sp) +/* 00414 80A2F594 D7BA0038 */ ldc1 $f26, 0x0038($sp) +/* 00418 80A2F598 D7B80030 */ ldc1 $f24, 0x0030($sp) +/* 0041C 80A2F59C D7B60028 */ ldc1 $f22, 0x0028($sp) +/* 00420 80A2F5A0 D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 00424 80A2F5A4 03E00008 */ jr $ra /* 00428 80A2F5A8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s index c9e7bb4a57..f721750c1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s @@ -1,21 +1,21 @@ glabel func_80A2F608 /* 00488 80A2F608 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0048C 80A2F60C AFBF002C */ sw $ra, 0x002C($sp) -/* 00490 80A2F610 AFB1001C */ sw $s1, 0x001C($sp) -/* 00494 80A2F614 AFB40028 */ sw $s4, 0x0028($sp) -/* 00498 80A2F618 AFB30024 */ sw $s3, 0x0024($sp) -/* 0049C 80A2F61C AFB20020 */ sw $s2, 0x0020($sp) -/* 004A0 80A2F620 AFB00018 */ sw $s0, 0x0018($sp) +/* 0048C 80A2F60C AFBF002C */ sw $ra, 0x002C($sp) +/* 00490 80A2F610 AFB1001C */ sw $s1, 0x001C($sp) +/* 00494 80A2F614 AFB40028 */ sw $s4, 0x0028($sp) +/* 00498 80A2F618 AFB30024 */ sw $s3, 0x0024($sp) +/* 0049C 80A2F61C AFB20020 */ sw $s2, 0x0020($sp) +/* 004A0 80A2F620 AFB00018 */ sw $s0, 0x0018($sp) /* 004A4 80A2F624 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 004A8 80A2F628 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C /* 004AC 80A2F62C C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 /* 004B0 80A2F630 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 004B4 80A2F634 0C034261 */ jal Matrix_Translate +/* 004B4 80A2F634 0C034261 */ jal Matrix_Translate /* 004B8 80A2F638 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004BC 80A2F63C 86240030 */ lh $a0, 0x0030($s1) ## 00000030 /* 004C0 80A2F640 86250032 */ lh $a1, 0x0032($s1) ## 00000032 /* 004C4 80A2F644 86260034 */ lh $a2, 0x0034($s1) ## 00000034 -/* 004C8 80A2F648 0C034421 */ jal Matrix_RotateXYZ +/* 004C8 80A2F648 0C034421 */ jal Matrix_RotateZYX /* 004CC 80A2F64C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 004D0 80A2F650 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 004D4 80A2F654 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -23,68 +23,68 @@ glabel func_80A2F608 /* 004DC 80A2F65C 27B4003C */ addiu $s4, $sp, 0x003C ## $s4 = FFFFFFE4 /* 004E0 80A2F660 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFE4 /* 004E4 80A2F664 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFF0 -/* 004E8 80A2F668 E7A0004C */ swc1 $f0, 0x004C($sp) -/* 004EC 80A2F66C E7A00048 */ swc1 $f0, 0x0048($sp) -/* 004F0 80A2F670 0C0346BD */ jal Matrix_MultVec3f -/* 004F4 80A2F674 E7A40050 */ swc1 $f4, 0x0050($sp) -/* 004F8 80A2F678 C7A6003C */ lwc1 $f6, 0x003C($sp) +/* 004E8 80A2F668 E7A0004C */ swc1 $f0, 0x004C($sp) +/* 004EC 80A2F66C E7A00048 */ swc1 $f0, 0x0048($sp) +/* 004F0 80A2F670 0C0346BD */ jal Matrix_MultVec3f +/* 004F4 80A2F674 E7A40050 */ swc1 $f4, 0x0050($sp) +/* 004F8 80A2F678 C7A6003C */ lwc1 $f6, 0x003C($sp) /* 004FC 80A2F67C 3C1280A3 */ lui $s2, %hi(D_80A30778) ## $s2 = 80A30000 /* 00500 80A2F680 3C1380A3 */ lui $s3, %hi(D_80A3079C) ## $s3 = 80A30000 -/* 00504 80A2F684 4600320D */ trunc.w.s $f8, $f6 +/* 00504 80A2F684 4600320D */ trunc.w.s $f8, $f6 /* 00508 80A2F688 2673079C */ addiu $s3, $s3, %lo(D_80A3079C) ## $s3 = 80A3079C /* 0050C 80A2F68C 26520778 */ addiu $s2, $s2, %lo(D_80A30778) ## $s2 = 80A30778 /* 00510 80A2F690 02208025 */ or $s0, $s1, $zero ## $s0 = 00000000 -/* 00514 80A2F694 440F4000 */ mfc1 $t7, $f8 +/* 00514 80A2F694 440F4000 */ mfc1 $t7, $f8 /* 00518 80A2F698 00000000 */ nop /* 0051C 80A2F69C A62F0282 */ sh $t7, 0x0282($s1) ## 00000282 -/* 00520 80A2F6A0 C7AA0040 */ lwc1 $f10, 0x0040($sp) -/* 00524 80A2F6A4 4600540D */ trunc.w.s $f16, $f10 -/* 00528 80A2F6A8 44198000 */ mfc1 $t9, $f16 +/* 00520 80A2F6A0 C7AA0040 */ lwc1 $f10, 0x0040($sp) +/* 00524 80A2F6A4 4600540D */ trunc.w.s $f16, $f10 +/* 00528 80A2F6A8 44198000 */ mfc1 $t9, $f16 /* 0052C 80A2F6AC 00000000 */ nop /* 00530 80A2F6B0 A6390284 */ sh $t9, 0x0284($s1) ## 00000284 -/* 00534 80A2F6B4 C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 00538 80A2F6B8 4600910D */ trunc.w.s $f4, $f18 -/* 0053C 80A2F6BC 44092000 */ mfc1 $t1, $f4 +/* 00534 80A2F6B4 C7B20044 */ lwc1 $f18, 0x0044($sp) +/* 00538 80A2F6B8 4600910D */ trunc.w.s $f4, $f18 +/* 0053C 80A2F6BC 44092000 */ mfc1 $t1, $f4 /* 00540 80A2F6C0 00000000 */ nop /* 00544 80A2F6C4 A6290286 */ sh $t1, 0x0286($s1) ## 00000286 .L80A2F6C8: /* 00548 80A2F6C8 C62C0024 */ lwc1 $f12, 0x0024($s1) ## 00000024 /* 0054C 80A2F6CC C62E0028 */ lwc1 $f14, 0x0028($s1) ## 00000028 /* 00550 80A2F6D0 8E26002C */ lw $a2, 0x002C($s1) ## 0000002C -/* 00554 80A2F6D4 0C034261 */ jal Matrix_Translate +/* 00554 80A2F6D4 0C034261 */ jal Matrix_Translate /* 00558 80A2F6D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0055C 80A2F6DC 86240030 */ lh $a0, 0x0030($s1) ## 00000030 /* 00560 80A2F6E0 86250032 */ lh $a1, 0x0032($s1) ## 00000032 /* 00564 80A2F6E4 86260034 */ lh $a2, 0x0034($s1) ## 00000034 -/* 00568 80A2F6E8 0C034421 */ jal Matrix_RotateXYZ +/* 00568 80A2F6E8 0C034421 */ jal Matrix_RotateZYX /* 0056C 80A2F6EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00570 80A2F6F0 02402025 */ or $a0, $s2, $zero ## $a0 = 80A30778 -/* 00574 80A2F6F4 0C0346BD */ jal Matrix_MultVec3f +/* 00574 80A2F6F4 0C0346BD */ jal Matrix_MultVec3f /* 00578 80A2F6F8 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFE4 -/* 0057C 80A2F6FC C7A6003C */ lwc1 $f6, 0x003C($sp) +/* 0057C 80A2F6FC C7A6003C */ lwc1 $f6, 0x003C($sp) /* 00580 80A2F700 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 80A30784 /* 00584 80A2F704 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C -/* 00588 80A2F708 4600320D */ trunc.w.s $f8, $f6 -/* 0058C 80A2F70C 440B4000 */ mfc1 $t3, $f8 +/* 00588 80A2F708 4600320D */ trunc.w.s $f8, $f6 +/* 0058C 80A2F70C 440B4000 */ mfc1 $t3, $f8 /* 00590 80A2F710 00000000 */ nop /* 00594 80A2F714 A60B0282 */ sh $t3, 0x0282($s0) ## 000002CE -/* 00598 80A2F718 C7AA0040 */ lwc1 $f10, 0x0040($sp) -/* 0059C 80A2F71C 4600540D */ trunc.w.s $f16, $f10 -/* 005A0 80A2F720 440D8000 */ mfc1 $t5, $f16 +/* 00598 80A2F718 C7AA0040 */ lwc1 $f10, 0x0040($sp) +/* 0059C 80A2F71C 4600540D */ trunc.w.s $f16, $f10 +/* 005A0 80A2F720 440D8000 */ mfc1 $t5, $f16 /* 005A4 80A2F724 00000000 */ nop /* 005A8 80A2F728 A60D0284 */ sh $t5, 0x0284($s0) ## 000002D0 -/* 005AC 80A2F72C C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 005B0 80A2F730 4600910D */ trunc.w.s $f4, $f18 -/* 005B4 80A2F734 440F2000 */ mfc1 $t7, $f4 -/* 005B8 80A2F738 1653FFE3 */ bne $s2, $s3, .L80A2F6C8 +/* 005AC 80A2F72C C7B20044 */ lwc1 $f18, 0x0044($sp) +/* 005B0 80A2F730 4600910D */ trunc.w.s $f4, $f18 +/* 005B4 80A2F734 440F2000 */ mfc1 $t7, $f4 +/* 005B8 80A2F738 1653FFE3 */ bne $s2, $s3, .L80A2F6C8 /* 005BC 80A2F73C A60F0286 */ sh $t7, 0x0286($s0) ## 000002D2 -/* 005C0 80A2F740 8FBF002C */ lw $ra, 0x002C($sp) -/* 005C4 80A2F744 8FB00018 */ lw $s0, 0x0018($sp) -/* 005C8 80A2F748 8FB1001C */ lw $s1, 0x001C($sp) -/* 005CC 80A2F74C 8FB20020 */ lw $s2, 0x0020($sp) -/* 005D0 80A2F750 8FB30024 */ lw $s3, 0x0024($sp) -/* 005D4 80A2F754 8FB40028 */ lw $s4, 0x0028($sp) -/* 005D8 80A2F758 03E00008 */ jr $ra +/* 005C0 80A2F740 8FBF002C */ lw $ra, 0x002C($sp) +/* 005C4 80A2F744 8FB00018 */ lw $s0, 0x0018($sp) +/* 005C8 80A2F748 8FB1001C */ lw $s1, 0x001C($sp) +/* 005CC 80A2F74C 8FB20020 */ lw $s2, 0x0020($sp) +/* 005D0 80A2F750 8FB30024 */ lw $s3, 0x0024($sp) +/* 005D4 80A2F754 8FB40028 */ lw $s4, 0x0028($sp) +/* 005D8 80A2F758 03E00008 */ jr $ra /* 005DC 80A2F75C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s index bf395ff513..60c1716e87 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s @@ -1,44 +1,44 @@ glabel func_80A30350 /* 011D0 80A30350 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 011D4 80A30354 AFB5005C */ sw $s5, 0x005C($sp) +/* 011D4 80A30354 AFB5005C */ sw $s5, 0x005C($sp) /* 011D8 80A30358 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 011DC 80A3035C AFBF006C */ sw $ra, 0x006C($sp) -/* 011E0 80A30360 AFBE0068 */ sw $s8, 0x0068($sp) -/* 011E4 80A30364 AFB70064 */ sw $s7, 0x0064($sp) -/* 011E8 80A30368 AFB60060 */ sw $s6, 0x0060($sp) -/* 011EC 80A3036C AFB40058 */ sw $s4, 0x0058($sp) -/* 011F0 80A30370 AFB30054 */ sw $s3, 0x0054($sp) -/* 011F4 80A30374 AFB20050 */ sw $s2, 0x0050($sp) -/* 011F8 80A30378 AFB1004C */ sw $s1, 0x004C($sp) -/* 011FC 80A3037C AFB00048 */ sw $s0, 0x0048($sp) -/* 01200 80A30380 F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 01204 80A30384 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 01208 80A30388 AFA400C0 */ sw $a0, 0x00C0($sp) +/* 011DC 80A3035C AFBF006C */ sw $ra, 0x006C($sp) +/* 011E0 80A30360 AFBE0068 */ sw $s8, 0x0068($sp) +/* 011E4 80A30364 AFB70064 */ sw $s7, 0x0064($sp) +/* 011E8 80A30368 AFB60060 */ sw $s6, 0x0060($sp) +/* 011EC 80A3036C AFB40058 */ sw $s4, 0x0058($sp) +/* 011F0 80A30370 AFB30054 */ sw $s3, 0x0054($sp) +/* 011F4 80A30374 AFB20050 */ sw $s2, 0x0050($sp) +/* 011F8 80A30378 AFB1004C */ sw $s1, 0x004C($sp) +/* 011FC 80A3037C AFB00048 */ sw $s0, 0x0048($sp) +/* 01200 80A30380 F7B60040 */ sdc1 $f22, 0x0040($sp) +/* 01204 80A30384 F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 01208 80A30388 AFA400C0 */ sw $a0, 0x00C0($sp) /* 0120C 80A3038C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01210 80A30390 3C0680A3 */ lui $a2, %hi(D_80A307C0) ## $a2 = 80A30000 /* 01214 80A30394 24C607C0 */ addiu $a2, $a2, %lo(D_80A307C0) ## $a2 = 80A307C0 /* 01218 80A30398 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 0121C 80A3039C 24070392 */ addiu $a3, $zero, 0x0392 ## $a3 = 00000392 -/* 01220 80A303A0 0C031AB1 */ jal func_800C6AC4 +/* 01220 80A303A0 0C031AB1 */ jal func_800C6AC4 /* 01224 80A303A4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01228 80A303A8 0C024F61 */ jal func_80093D84 +/* 01228 80A303A8 0C024F61 */ jal func_80093D84 /* 0122C 80A303AC 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 /* 01230 80A303B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01234 80A303B4 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 01238 80A303B8 02A1B021 */ addu $s6, $s5, $at +/* 01238 80A303B8 02A1B021 */ addu $s6, $s5, $at /* 0123C 80A303BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01240 80A303C0 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 /* 01244 80A303C4 3C0180A3 */ lui $at, %hi(D_80A30800) ## $at = 80A30000 /* 01248 80A303C8 3C170601 */ lui $s7, 0x0601 ## $s7 = 06010000 /* 0124C 80A303CC 3C1EDB06 */ lui $s8, 0xDB06 ## $s8 = DB060000 -/* 01250 80A303D0 8FB300C0 */ lw $s3, 0x00C0($sp) +/* 01250 80A303D0 8FB300C0 */ lw $s3, 0x00C0($sp) /* 01254 80A303D4 37DE0020 */ ori $s8, $s8, 0x0020 ## $s8 = DB060020 /* 01258 80A303D8 26F7C0B0 */ addiu $s7, $s7, 0xC0B0 ## $s7 = 0600C0B0 -/* 0125C 80A303DC C4340800 */ lwc1 $f20, %lo(D_80A30800)($at) +/* 0125C 80A303DC C4340800 */ lwc1 $f20, %lo(D_80A30800)($at) /* 01260 80A303E0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 .L80A303E4: /* 01264 80A303E4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 01268 80A303E8 8FA800C0 */ lw $t0, 0x00C0($sp) +/* 01268 80A303E8 8FA800C0 */ lw $t0, 0x00C0($sp) /* 0126C 80A303EC 92630388 */ lbu $v1, 0x0388($s3) ## 00000388 /* 01270 80A303F0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 01274 80A303F4 AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 @@ -49,26 +49,26 @@ glabel func_80A30350 /* 01288 80A30408 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 /* 0128C 80A3040C 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 /* 01290 80A30410 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01294 80A30414 00034900 */ sll $t1, $v1, 4 -/* 01298 80A30418 012A8021 */ addu $s0, $t1, $t2 -/* 0129C 80A3041C AFB90018 */ sw $t9, 0x0018($sp) -/* 012A0 80A30420 AFB80014 */ sw $t8, 0x0014($sp) -/* 012A4 80A30424 AFAF0010 */ sw $t7, 0x0010($sp) -/* 012A8 80A30428 AFA0001C */ sw $zero, 0x001C($sp) +/* 01294 80A30414 00034900 */ sll $t1, $v1, 4 +/* 01298 80A30418 012A8021 */ addu $s0, $t1, $t2 +/* 0129C 80A3041C AFB90018 */ sw $t9, 0x0018($sp) +/* 012A0 80A30420 AFB80014 */ sw $t8, 0x0014($sp) +/* 012A4 80A30424 AFAF0010 */ sw $t7, 0x0010($sp) +/* 012A8 80A30428 AFA0001C */ sw $zero, 0x001C($sp) /* 012AC 80A3042C 860B000C */ lh $t3, 0x000C($s0) ## 0000000C /* 012B0 80A30430 850C0380 */ lh $t4, 0x0380($t0) ## 00000380 /* 012B4 80A30434 24180080 */ addiu $t8, $zero, 0x0080 ## $t8 = 00000080 -/* 012B8 80A30438 AFB80028 */ sw $t8, 0x0028($sp) -/* 012BC 80A3043C 016C0019 */ multu $t3, $t4 -/* 012C0 80A30440 AFAF0024 */ sw $t7, 0x0024($sp) +/* 012B8 80A30438 AFB80028 */ sw $t8, 0x0028($sp) +/* 012BC 80A3043C 016C0019 */ multu $t3, $t4 +/* 012C0 80A30440 AFAF0024 */ sw $t7, 0x0024($sp) /* 012C4 80A30444 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 012C8 80A30448 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 012CC 80A3044C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 012D0 80A30450 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000 -/* 012D4 80A30454 00006812 */ mflo $t5 +/* 012D4 80A30454 00006812 */ mflo $t5 /* 012D8 80A30458 31AE01FF */ andi $t6, $t5, 0x01FF ## $t6 = 00000000 -/* 012DC 80A3045C 0C0253D0 */ jal Draw_TwoTexScroll -/* 012E0 80A30460 AFAE0020 */ sw $t6, 0x0020($sp) +/* 012DC 80A3045C 0C0253D0 */ jal Draw_TwoTexScroll +/* 012E0 80A30460 AFAE0020 */ sw $t6, 0x0020($sp) /* 012E4 80A30464 AE420004 */ sw $v0, 0x0004($s2) ## 00000004 /* 012E8 80A30468 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 012EC 80A3046C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -79,16 +79,16 @@ glabel func_80A30350 /* 01300 80A30480 8E040008 */ lw $a0, 0x0008($s0) ## 00000008 /* 01304 80A30484 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 01308 80A30488 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0130C 80A3048C 00045900 */ sll $t3, $a0, 4 -/* 01310 80A30490 000B6702 */ srl $t4, $t3, 28 -/* 01314 80A30494 000C6880 */ sll $t5, $t4, 2 -/* 01318 80A30498 01CD7021 */ addu $t6, $t6, $t5 +/* 0130C 80A3048C 00045900 */ sll $t3, $a0, 4 +/* 01310 80A30490 000B6702 */ srl $t4, $t3, 28 +/* 01314 80A30494 000C6880 */ sll $t5, $t4, 2 +/* 01318 80A30498 01CD7021 */ addu $t6, $t6, $t5 /* 0131C 80A3049C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 /* 01320 80A304A0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01324 80A304A4 00815024 */ and $t2, $a0, $at +/* 01324 80A304A4 00815024 */ and $t2, $a0, $at /* 01328 80A304A8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0132C 80A304AC 014E7821 */ addu $t7, $t2, $t6 -/* 01330 80A304B0 01E1C021 */ addu $t8, $t7, $at +/* 0132C 80A304AC 014E7821 */ addu $t7, $t2, $t6 +/* 01330 80A304B0 01E1C021 */ addu $t8, $t7, $at /* 01334 80A304B4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01338 80A304B8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0133C 80A304BC 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 @@ -99,12 +99,12 @@ glabel func_80A30350 /* 01350 80A304D0 920A0000 */ lbu $t2, 0x0000($s0) ## 00000000 /* 01354 80A304D4 920C0003 */ lbu $t4, 0x0003($s0) ## 00000003 /* 01358 80A304D8 92190001 */ lbu $t9, 0x0001($s0) ## 00000001 -/* 0135C 80A304DC 000A7600 */ sll $t6, $t2, 24 +/* 0135C 80A304DC 000A7600 */ sll $t6, $t2, 24 /* 01360 80A304E0 920A0002 */ lbu $t2, 0x0002($s0) ## 00000002 /* 01364 80A304E4 018E7825 */ or $t7, $t4, $t6 ## $t7 = 80160000 -/* 01368 80A304E8 00194C00 */ sll $t1, $t9, 16 +/* 01368 80A304E8 00194C00 */ sll $t1, $t9, 16 /* 0136C 80A304EC 01E95825 */ or $t3, $t7, $t1 ## $t3 = FA168080 -/* 01370 80A304F0 000A6200 */ sll $t4, $t2, 8 +/* 01370 80A304F0 000A6200 */ sll $t4, $t2, 8 /* 01374 80A304F4 016C7025 */ or $t6, $t3, $t4 ## $t6 = FA168080 /* 01378 80A304F8 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 0137C 80A304FC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -115,34 +115,34 @@ glabel func_80A30350 /* 01390 80A30510 920A0004 */ lbu $t2, 0x0004($s0) ## 00000004 /* 01394 80A30514 92090007 */ lbu $t1, 0x0007($s0) ## 00000007 /* 01398 80A30518 92180005 */ lbu $t8, 0x0005($s0) ## 00000005 -/* 0139C 80A3051C 000A5E00 */ sll $t3, $t2, 24 +/* 0139C 80A3051C 000A5E00 */ sll $t3, $t2, 24 /* 013A0 80A30520 920A0006 */ lbu $t2, 0x0006($s0) ## 00000006 /* 013A4 80A30524 012B6025 */ or $t4, $t1, $t3 ## $t4 = FA168080 -/* 013A8 80A30528 0018CC00 */ sll $t9, $t8, 16 +/* 013A8 80A30528 0018CC00 */ sll $t9, $t8, 16 /* 013AC 80A3052C 01997825 */ or $t7, $t4, $t9 ## $t7 = FB168080 -/* 013B0 80A30530 000A4A00 */ sll $t1, $t2, 8 +/* 013B0 80A30530 000A4A00 */ sll $t1, $t2, 8 /* 013B4 80A30534 01E95825 */ or $t3, $t7, $t1 ## $t3 = FB168080 -/* 013B8 80A30538 0C034213 */ jal Matrix_Push +/* 013B8 80A30538 0C034213 */ jal Matrix_Push /* 013BC 80A3053C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 013C0 80A30540 C66C0390 */ lwc1 $f12, 0x0390($s3) ## 00000390 /* 013C4 80A30544 C66E0394 */ lwc1 $f14, 0x0394($s3) ## 00000394 /* 013C8 80A30548 8E660398 */ lw $a2, 0x0398($s3) ## 00000398 -/* 013CC 80A3054C 0C034261 */ jal Matrix_Translate +/* 013CC 80A3054C 0C034261 */ jal Matrix_Translate /* 013D0 80A30550 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 013D4 80A30554 0C0347F5 */ jal func_800D1FD4 +/* 013D4 80A30554 0C0347F5 */ jal func_800D1FD4 /* 013D8 80A30558 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 013DC 80A3055C 926E038C */ lbu $t6, 0x038C($s3) ## 0000038C /* 013E0 80A30560 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 013E4 80A30564 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 -/* 013E8 80A30568 11C00003 */ beq $t6, $zero, .L80A30578 +/* 013E8 80A30568 11C00003 */ beq $t6, $zero, .L80A30578 /* 013EC 80A3056C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013F0 80A30570 0C034421 */ jal Matrix_RotateXYZ +/* 013F0 80A30570 0C034421 */ jal Matrix_RotateZYX /* 013F4 80A30574 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 .L80A30578: -/* 013F8 80A30578 4406B000 */ mfc1 $a2, $f22 -/* 013FC 80A3057C 4600A306 */ mov.s $f12, $f20 -/* 01400 80A30580 4600A386 */ mov.s $f14, $f20 -/* 01404 80A30584 0C0342A3 */ jal Matrix_Scale +/* 013F8 80A30578 4406B000 */ mfc1 $a2, $f22 +/* 013FC 80A3057C 4600A306 */ mov.s $f12, $f20 +/* 01400 80A30580 4600A386 */ mov.s $f14, $f20 +/* 01404 80A30584 0C0342A3 */ jal Matrix_Scale /* 01408 80A30588 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0140C 80A3058C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 01410 80A30590 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -154,7 +154,7 @@ glabel func_80A30350 /* 01428 80A305A8 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 /* 0142C 80A305AC 24A507D0 */ addiu $a1, $a1, %lo(D_80A307D0) ## $a1 = 80A307D0 /* 01430 80A305B0 240603BB */ addiu $a2, $zero, 0x03BB ## $a2 = 000003BB -/* 01434 80A305B4 0C0346A2 */ jal Matrix_NewMtx +/* 01434 80A305B4 0C0346A2 */ jal Matrix_NewMtx /* 01438 80A305B8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 0143C 80A305BC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01440 80A305C0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -162,31 +162,31 @@ glabel func_80A30350 /* 01448 80A305C8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0144C 80A305CC AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 /* 01450 80A305D0 AC570004 */ sw $s7, 0x0004($v0) ## 00000004 -/* 01454 80A305D4 0C034221 */ jal Matrix_Pull +/* 01454 80A305D4 0C034221 */ jal Matrix_Pull /* 01458 80A305D8 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 0145C 80A305DC 2694002C */ addiu $s4, $s4, 0x002C ## $s4 = 0000002C /* 01460 80A305E0 240100B0 */ addiu $at, $zero, 0x00B0 ## $at = 000000B0 -/* 01464 80A305E4 1681FF7F */ bne $s4, $at, .L80A303E4 +/* 01464 80A305E4 1681FF7F */ bne $s4, $at, .L80A303E4 /* 01468 80A305E8 2673002C */ addiu $s3, $s3, 0x002C ## $s3 = 0000002C /* 0146C 80A305EC 3C0680A3 */ lui $a2, %hi(D_80A307E0) ## $a2 = 80A30000 /* 01470 80A305F0 24C607E0 */ addiu $a2, $a2, %lo(D_80A307E0) ## $a2 = 80A307E0 /* 01474 80A305F4 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 01478 80A305F8 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 0147C 80A305FC 0C031AD5 */ jal func_800C6B54 +/* 0147C 80A305FC 0C031AD5 */ jal func_800C6B54 /* 01480 80A30600 240703C2 */ addiu $a3, $zero, 0x03C2 ## $a3 = 000003C2 -/* 01484 80A30604 8FBF006C */ lw $ra, 0x006C($sp) -/* 01488 80A30608 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 0148C 80A3060C D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 01490 80A30610 8FB00048 */ lw $s0, 0x0048($sp) -/* 01494 80A30614 8FB1004C */ lw $s1, 0x004C($sp) -/* 01498 80A30618 8FB20050 */ lw $s2, 0x0050($sp) -/* 0149C 80A3061C 8FB30054 */ lw $s3, 0x0054($sp) -/* 014A0 80A30620 8FB40058 */ lw $s4, 0x0058($sp) -/* 014A4 80A30624 8FB5005C */ lw $s5, 0x005C($sp) -/* 014A8 80A30628 8FB60060 */ lw $s6, 0x0060($sp) -/* 014AC 80A3062C 8FB70064 */ lw $s7, 0x0064($sp) -/* 014B0 80A30630 8FBE0068 */ lw $s8, 0x0068($sp) -/* 014B4 80A30634 03E00008 */ jr $ra +/* 01484 80A30604 8FBF006C */ lw $ra, 0x006C($sp) +/* 01488 80A30608 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 0148C 80A3060C D7B60040 */ ldc1 $f22, 0x0040($sp) +/* 01490 80A30610 8FB00048 */ lw $s0, 0x0048($sp) +/* 01494 80A30614 8FB1004C */ lw $s1, 0x004C($sp) +/* 01498 80A30618 8FB20050 */ lw $s2, 0x0050($sp) +/* 0149C 80A3061C 8FB30054 */ lw $s3, 0x0054($sp) +/* 014A0 80A30620 8FB40058 */ lw $s4, 0x0058($sp) +/* 014A4 80A30624 8FB5005C */ lw $s5, 0x005C($sp) +/* 014A8 80A30628 8FB60060 */ lw $s6, 0x0060($sp) +/* 014AC 80A3062C 8FB70064 */ lw $s7, 0x0064($sp) +/* 014B0 80A30630 8FBE0068 */ lw $s8, 0x0068($sp) +/* 014B4 80A30634 03E00008 */ jr $ra /* 014B8 80A30638 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 /* 014BC 80A3063C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s index b04df2ce6d..c251734a2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s @@ -1,90 +1,90 @@ glabel func_80A3E090 /* 009B0 80A3E090 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 009B4 80A3E094 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009B8 80A3E098 AFB00020 */ sw $s0, 0x0020($sp) +/* 009B4 80A3E094 AFBF0024 */ sw $ra, 0x0024($sp) +/* 009B8 80A3E098 AFB00020 */ sw $s0, 0x0020($sp) /* 009BC 80A3E09C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009C0 80A3E0A0 0C034213 */ jal Matrix_Push -/* 009C4 80A3E0A4 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 009C0 80A3E0A0 0C034213 */ jal Matrix_Push +/* 009C4 80A3E0A4 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 009C8 80A3E0A8 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 009CC 80A3E0AC 3C064522 */ lui $a2, 0x4522 ## $a2 = 45220000 /* 009D0 80A3E0B0 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 45228000 /* 009D4 80A3E0B4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 009D8 80A3E0B8 4600A306 */ mov.s $f12, $f20 -/* 009DC 80A3E0BC 0C034261 */ jal Matrix_Translate -/* 009E0 80A3E0C0 4600A386 */ mov.s $f14, $f20 +/* 009D8 80A3E0B8 4600A306 */ mov.s $f12, $f20 +/* 009DC 80A3E0BC 0C034261 */ jal Matrix_Translate +/* 009E0 80A3E0C0 4600A386 */ mov.s $f14, $f20 /* 009E4 80A3E0C4 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 009E8 80A3E0C8 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 009EC 80A3E0CC 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 009F0 80A3E0D0 0C034421 */ jal Matrix_RotateXYZ +/* 009F0 80A3E0D0 0C034421 */ jal Matrix_RotateZYX /* 009F4 80A3E0D4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 009F8 80A3E0D8 E7B4003C */ swc1 $f20, 0x003C($sp) -/* 009FC 80A3E0DC E7B40038 */ swc1 $f20, 0x0038($sp) -/* 00A00 80A3E0E0 E7B40034 */ swc1 $f20, 0x0034($sp) +/* 009F8 80A3E0D8 E7B4003C */ swc1 $f20, 0x003C($sp) +/* 009FC 80A3E0DC E7B40038 */ swc1 $f20, 0x0038($sp) +/* 00A00 80A3E0E0 E7B40034 */ swc1 $f20, 0x0034($sp) /* 00A04 80A3E0E4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFF4 -/* 00A08 80A3E0E8 0C0346BD */ jal Matrix_MultVec3f +/* 00A08 80A3E0E8 0C0346BD */ jal Matrix_MultVec3f /* 00A0C 80A3E0EC 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFE8 -/* 00A10 80A3E0F0 C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 00A14 80A3E0F4 4600218D */ trunc.w.s $f6, $f4 -/* 00A18 80A3E0F8 440F3000 */ mfc1 $t7, $f6 +/* 00A10 80A3E0F0 C7A40028 */ lwc1 $f4, 0x0028($sp) +/* 00A14 80A3E0F4 4600218D */ trunc.w.s $f6, $f4 +/* 00A18 80A3E0F8 440F3000 */ mfc1 $t7, $f6 /* 00A1C 80A3E0FC 00000000 */ nop /* 00A20 80A3E100 A60F02B6 */ sh $t7, 0x02B6($s0) ## 000002B6 -/* 00A24 80A3E104 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 00A28 80A3E108 4600428D */ trunc.w.s $f10, $f8 -/* 00A2C 80A3E10C 44195000 */ mfc1 $t9, $f10 +/* 00A24 80A3E104 C7A8002C */ lwc1 $f8, 0x002C($sp) +/* 00A28 80A3E108 4600428D */ trunc.w.s $f10, $f8 +/* 00A2C 80A3E10C 44195000 */ mfc1 $t9, $f10 /* 00A30 80A3E110 00000000 */ nop /* 00A34 80A3E114 A61902B8 */ sh $t9, 0x02B8($s0) ## 000002B8 -/* 00A38 80A3E118 C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 00A3C 80A3E11C 4600848D */ trunc.w.s $f18, $f16 -/* 00A40 80A3E120 44099000 */ mfc1 $t1, $f18 -/* 00A44 80A3E124 0C034221 */ jal Matrix_Pull +/* 00A38 80A3E118 C7B00030 */ lwc1 $f16, 0x0030($sp) +/* 00A3C 80A3E11C 4600848D */ trunc.w.s $f18, $f16 +/* 00A40 80A3E120 44099000 */ mfc1 $t1, $f18 +/* 00A44 80A3E124 0C034221 */ jal Matrix_Pull /* 00A48 80A3E128 A60902BA */ sh $t1, 0x02BA($s0) ## 000002BA -/* 00A4C 80A3E12C 0C034213 */ jal Matrix_Push +/* 00A4C 80A3E12C 0C034213 */ jal Matrix_Push /* 00A50 80A3E130 00000000 */ nop /* 00A54 80A3E134 3C064586 */ lui $a2, 0x4586 ## $a2 = 45860000 /* 00A58 80A3E138 34C66000 */ ori $a2, $a2, 0x6000 ## $a2 = 45866000 -/* 00A5C 80A3E13C 4600A306 */ mov.s $f12, $f20 -/* 00A60 80A3E140 4600A386 */ mov.s $f14, $f20 -/* 00A64 80A3E144 0C034261 */ jal Matrix_Translate +/* 00A5C 80A3E13C 4600A306 */ mov.s $f12, $f20 +/* 00A60 80A3E140 4600A386 */ mov.s $f14, $f20 +/* 00A64 80A3E144 0C034261 */ jal Matrix_Translate /* 00A68 80A3E148 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00A6C 80A3E14C 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 00A70 80A3E150 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00A74 80A3E154 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 00A78 80A3E158 0C034421 */ jal Matrix_RotateXYZ +/* 00A78 80A3E158 0C034421 */ jal Matrix_RotateZYX /* 00A7C 80A3E15C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00A80 80A3E160 E7B4003C */ swc1 $f20, 0x003C($sp) -/* 00A84 80A3E164 E7B40038 */ swc1 $f20, 0x0038($sp) -/* 00A88 80A3E168 E7B40034 */ swc1 $f20, 0x0034($sp) +/* 00A80 80A3E160 E7B4003C */ swc1 $f20, 0x003C($sp) +/* 00A84 80A3E164 E7B40038 */ swc1 $f20, 0x0038($sp) +/* 00A88 80A3E168 E7B40034 */ swc1 $f20, 0x0034($sp) /* 00A8C 80A3E16C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFF4 -/* 00A90 80A3E170 0C0346BD */ jal Matrix_MultVec3f +/* 00A90 80A3E170 0C0346BD */ jal Matrix_MultVec3f /* 00A94 80A3E174 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 -/* 00A98 80A3E178 0C034221 */ jal Matrix_Pull +/* 00A98 80A3E178 0C034221 */ jal Matrix_Pull /* 00A9C 80A3E17C 00000000 */ nop /* 00AA0 80A3E180 3C06456D */ lui $a2, 0x456D ## $a2 = 456D0000 /* 00AA4 80A3E184 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 456D8000 -/* 00AA8 80A3E188 4600A306 */ mov.s $f12, $f20 -/* 00AAC 80A3E18C 4600A386 */ mov.s $f14, $f20 -/* 00AB0 80A3E190 0C034261 */ jal Matrix_Translate +/* 00AA8 80A3E188 4600A306 */ mov.s $f12, $f20 +/* 00AAC 80A3E18C 4600A386 */ mov.s $f14, $f20 +/* 00AB0 80A3E190 0C034261 */ jal Matrix_Translate /* 00AB4 80A3E194 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00AB8 80A3E198 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 00ABC 80A3E19C 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00AC0 80A3E1A0 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 00AC4 80A3E1A4 0C034421 */ jal Matrix_RotateXYZ +/* 00AC4 80A3E1A4 0C034421 */ jal Matrix_RotateZYX /* 00AC8 80A3E1A8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00ACC 80A3E1AC E7B4003C */ swc1 $f20, 0x003C($sp) -/* 00AD0 80A3E1B0 E7B40038 */ swc1 $f20, 0x0038($sp) -/* 00AD4 80A3E1B4 E7B40034 */ swc1 $f20, 0x0034($sp) +/* 00ACC 80A3E1AC E7B4003C */ swc1 $f20, 0x003C($sp) +/* 00AD0 80A3E1B0 E7B40038 */ swc1 $f20, 0x0038($sp) +/* 00AD4 80A3E1B4 E7B40034 */ swc1 $f20, 0x0034($sp) /* 00AD8 80A3E1B8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFF4 -/* 00ADC 80A3E1BC 0C0346BD */ jal Matrix_MultVec3f +/* 00ADC 80A3E1BC 0C0346BD */ jal Matrix_MultVec3f /* 00AE0 80A3E1C0 26050038 */ addiu $a1, $s0, 0x0038 ## $a1 = 00000038 /* 00AE4 80A3E1C4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00AE8 80A3E1C8 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 00AEC 80A3E1CC C604003C */ lwc1 $f4, 0x003C($s0) ## 0000003C -/* 00AF0 80A3E1D0 46062200 */ add.s $f8, $f4, $f6 +/* 00AF0 80A3E1D0 46062200 */ add.s $f8, $f4, $f6 /* 00AF4 80A3E1D4 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C -/* 00AF8 80A3E1D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AFC 80A3E1DC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00B00 80A3E1E0 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00B04 80A3E1E4 03E00008 */ jr $ra +/* 00AF8 80A3E1D8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00AFC 80A3E1DC 8FB00020 */ lw $s0, 0x0020($sp) +/* 00B00 80A3E1E0 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 00B04 80A3E1E4 03E00008 */ jr $ra /* 00B08 80A3E1E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s index 47bf37ac49..566e96524e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s @@ -1,10 +1,10 @@ glabel func_80A41068 /* 02AF8 80A41068 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 02AFC 80A4106C 3C0F80A4 */ lui $t7, %hi(D_80A41BC0) ## $t7 = 80A40000 -/* 02B00 80A41070 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B04 80A41074 AFB10018 */ sw $s1, 0x0018($sp) -/* 02B08 80A41078 AFB00014 */ sw $s0, 0x0014($sp) -/* 02B0C 80A4107C AFA40050 */ sw $a0, 0x0050($sp) +/* 02B00 80A41070 AFBF001C */ sw $ra, 0x001C($sp) +/* 02B04 80A41074 AFB10018 */ sw $s1, 0x0018($sp) +/* 02B08 80A41078 AFB00014 */ sw $s0, 0x0014($sp) +/* 02B0C 80A4107C AFA40050 */ sw $a0, 0x0050($sp) /* 02B10 80A41080 25EF1BC0 */ addiu $t7, $t7, %lo(D_80A41BC0) ## $t7 = 80A41BC0 /* 02B14 80A41084 8DF90000 */ lw $t9, 0x0000($t7) ## 80A41BC0 /* 02B18 80A41088 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 @@ -19,35 +19,35 @@ glabel func_80A41068 /* 02B3C 80A410AC 24C61C30 */ addiu $a2, $a2, %lo(D_80A41C30) ## $a2 = 80A41C30 /* 02B40 80A410B0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02B44 80A410B4 24070933 */ addiu $a3, $zero, 0x0933 ## $a3 = 00000933 -/* 02B48 80A410B8 0C031AB1 */ jal func_800C6AC4 +/* 02B48 80A410B8 0C031AB1 */ jal func_800C6AC4 /* 02B4C 80A410BC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02B50 80A410C0 0C034213 */ jal Matrix_Push +/* 02B50 80A410C0 0C034213 */ jal Matrix_Push /* 02B54 80A410C4 00000000 */ nop -/* 02B58 80A410C8 0C024F46 */ jal func_80093D18 +/* 02B58 80A410C8 0C024F46 */ jal func_80093D18 /* 02B5C 80A410CC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02B60 80A410D0 8FA20050 */ lw $v0, 0x0050($sp) +/* 02B60 80A410D0 8FA20050 */ lw $v0, 0x0050($sp) /* 02B64 80A410D4 8E28009C */ lw $t0, 0x009C($s1) ## 0000009C /* 02B68 80A410D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02B6C 80A410DC C4440068 */ lwc1 $f4, 0x0068($v0) ## 00000068 /* 02B70 80A410E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02B74 80A410E4 844600B8 */ lh $a2, 0x00B8($v0) ## 000000B8 -/* 02B78 80A410E8 4600218D */ trunc.w.s $f6, $f4 -/* 02B7C 80A410EC 440A3000 */ mfc1 $t2, $f6 +/* 02B78 80A410E8 4600218D */ trunc.w.s $f6, $f4 +/* 02B7C 80A410EC 440A3000 */ mfc1 $t2, $f6 /* 02B80 80A410F0 00000000 */ nop -/* 02B84 80A410F4 000A5C00 */ sll $t3, $t2, 16 -/* 02B88 80A410F8 000B6403 */ sra $t4, $t3, 16 -/* 02B8C 80A410FC 000C6880 */ sll $t5, $t4, 2 -/* 02B90 80A41100 01AC6823 */ subu $t5, $t5, $t4 -/* 02B94 80A41104 000D6880 */ sll $t5, $t5, 2 -/* 02B98 80A41108 01AC6823 */ subu $t5, $t5, $t4 -/* 02B9C 80A4110C 000D6900 */ sll $t5, $t5, 4 -/* 02BA0 80A41110 01AC6823 */ subu $t5, $t5, $t4 -/* 02BA4 80A41114 000D68C0 */ sll $t5, $t5, 3 -/* 02BA8 80A41118 010D0019 */ multu $t0, $t5 -/* 02BAC 80A4111C 00002012 */ mflo $a0 -/* 02BB0 80A41120 00042400 */ sll $a0, $a0, 16 -/* 02BB4 80A41124 0C034421 */ jal Matrix_RotateXYZ -/* 02BB8 80A41128 00042403 */ sra $a0, $a0, 16 +/* 02B84 80A410F4 000A5C00 */ sll $t3, $t2, 16 +/* 02B88 80A410F8 000B6403 */ sra $t4, $t3, 16 +/* 02B8C 80A410FC 000C6880 */ sll $t5, $t4, 2 +/* 02B90 80A41100 01AC6823 */ subu $t5, $t5, $t4 +/* 02B94 80A41104 000D6880 */ sll $t5, $t5, 2 +/* 02B98 80A41108 01AC6823 */ subu $t5, $t5, $t4 +/* 02B9C 80A4110C 000D6900 */ sll $t5, $t5, 4 +/* 02BA0 80A41110 01AC6823 */ subu $t5, $t5, $t4 +/* 02BA4 80A41114 000D68C0 */ sll $t5, $t5, 3 +/* 02BA8 80A41118 010D0019 */ multu $t0, $t5 +/* 02BAC 80A4111C 00002012 */ mflo $a0 +/* 02BB0 80A41120 00042400 */ sll $a0, $a0, 16 +/* 02BB4 80A41124 0C034421 */ jal Matrix_RotateZYX +/* 02BB8 80A41128 00042403 */ sra $a0, $a0, 16 /* 02BBC 80A4112C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 02BC0 80A41130 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 02BC4 80A41134 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 @@ -58,9 +58,9 @@ glabel func_80A41068 /* 02BD8 80A41148 3C0580A4 */ lui $a1, %hi(D_80A41C40) ## $a1 = 80A40000 /* 02BDC 80A4114C 24A51C40 */ addiu $a1, $a1, %lo(D_80A41C40) ## $a1 = 80A41C40 /* 02BE0 80A41150 24060940 */ addiu $a2, $zero, 0x0940 ## $a2 = 00000940 -/* 02BE4 80A41154 0C0346A2 */ jal Matrix_NewMtx -/* 02BE8 80A41158 AFA2002C */ sw $v0, 0x002C($sp) -/* 02BEC 80A4115C 8FA3002C */ lw $v1, 0x002C($sp) +/* 02BE4 80A41154 0C0346A2 */ jal Matrix_NewMtx +/* 02BE8 80A41158 AFA2002C */ sw $v0, 0x002C($sp) +/* 02BEC 80A4115C 8FA3002C */ lw $v1, 0x002C($sp) /* 02BF0 80A41160 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 /* 02BF4 80A41164 2529C140 */ addiu $t1, $t1, 0xC140 ## $t1 = 0600C140 /* 02BF8 80A41168 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -71,21 +71,21 @@ glabel func_80A41068 /* 02C0C 80A4117C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 02C10 80A41180 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 02C14 80A41184 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02C18 80A41188 8FA50050 */ lw $a1, 0x0050($sp) -/* 02C1C 80A4118C 0C0346BD */ jal Matrix_MultVec3f +/* 02C18 80A41188 8FA50050 */ lw $a1, 0x0050($sp) +/* 02C1C 80A4118C 0C0346BD */ jal Matrix_MultVec3f /* 02C20 80A41190 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 02C24 80A41194 0C034221 */ jal Matrix_Pull +/* 02C24 80A41194 0C034221 */ jal Matrix_Pull /* 02C28 80A41198 00000000 */ nop /* 02C2C 80A4119C 3C0680A4 */ lui $a2, %hi(D_80A41C50) ## $a2 = 80A40000 /* 02C30 80A411A0 24C61C50 */ addiu $a2, $a2, %lo(D_80A41C50) ## $a2 = 80A41C50 /* 02C34 80A411A4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02C38 80A411A8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02C3C 80A411AC 0C031AD5 */ jal func_800C6B54 +/* 02C3C 80A411AC 0C031AD5 */ jal func_800C6B54 /* 02C40 80A411B0 2407094F */ addiu $a3, $zero, 0x094F ## $a3 = 0000094F -/* 02C44 80A411B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02C48 80A411B8 8FB00014 */ lw $s0, 0x0014($sp) -/* 02C4C 80A411BC 8FB10018 */ lw $s1, 0x0018($sp) -/* 02C50 80A411C0 03E00008 */ jr $ra +/* 02C44 80A411B4 8FBF001C */ lw $ra, 0x001C($sp) +/* 02C48 80A411B8 8FB00014 */ lw $s0, 0x0014($sp) +/* 02C4C 80A411BC 8FB10018 */ lw $s1, 0x0018($sp) +/* 02C50 80A411C0 03E00008 */ jr $ra /* 02C54 80A411C4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s index ad3db466a2..66682b911b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s @@ -1,10 +1,10 @@ glabel func_80A47AB0 /* 04D80 80A47AB0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 04D84 80A47AB4 3C0F80A5 */ lui $t7, %hi(D_80A48560) ## $t7 = 80A50000 -/* 04D88 80A47AB8 AFBF001C */ sw $ra, 0x001C($sp) -/* 04D8C 80A47ABC AFB10018 */ sw $s1, 0x0018($sp) -/* 04D90 80A47AC0 AFB00014 */ sw $s0, 0x0014($sp) -/* 04D94 80A47AC4 AFA40058 */ sw $a0, 0x0058($sp) +/* 04D88 80A47AB8 AFBF001C */ sw $ra, 0x001C($sp) +/* 04D8C 80A47ABC AFB10018 */ sw $s1, 0x0018($sp) +/* 04D90 80A47AC0 AFB00014 */ sw $s0, 0x0014($sp) +/* 04D94 80A47AC4 AFA40058 */ sw $a0, 0x0058($sp) /* 04D98 80A47AC8 25EF8560 */ addiu $t7, $t7, %lo(D_80A48560) ## $t7 = 80A48560 /* 04D9C 80A47ACC 8DF90000 */ lw $t9, 0x0000($t7) ## 80A48560 /* 04DA0 80A47AD0 27AE0048 */ addiu $t6, $sp, 0x0048 ## $t6 = FFFFFFF0 @@ -19,42 +19,42 @@ glabel func_80A47AB0 /* 04DC4 80A47AF4 24C685FC */ addiu $a2, $a2, %lo(D_80A485FC) ## $a2 = 80A485FC /* 04DC8 80A47AF8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 /* 04DCC 80A47AFC 24070B62 */ addiu $a3, $zero, 0x0B62 ## $a3 = 00000B62 -/* 04DD0 80A47B00 0C031AB1 */ jal func_800C6AC4 +/* 04DD0 80A47B00 0C031AB1 */ jal func_800C6AC4 /* 04DD4 80A47B04 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04DD8 80A47B08 0C024F46 */ jal func_80093D18 +/* 04DD8 80A47B08 0C024F46 */ jal func_80093D18 /* 04DDC 80A47B0C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04DE0 80A47B10 8FA20058 */ lw $v0, 0x0058($sp) +/* 04DE0 80A47B10 8FA20058 */ lw $v0, 0x0058($sp) /* 04DE4 80A47B14 3C0880A4 */ lui $t0, %hi(func_80A47024) ## $t0 = 80A40000 /* 04DE8 80A47B18 25087024 */ addiu $t0, $t0, %lo(func_80A47024) ## $t0 = 80A47024 /* 04DEC 80A47B1C 8C490190 */ lw $t1, 0x0190($v0) ## 00000190 -/* 04DF0 80A47B20 55090005 */ bnel $t0, $t1, .L80A47B38 +/* 04DF0 80A47B20 55090005 */ bnel $t0, $t1, .L80A47B38 /* 04DF4 80A47B24 C4400068 */ lwc1 $f0, 0x0068($v0) ## 00000068 /* 04DF8 80A47B28 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04DFC 80A47B2C 10000003 */ beq $zero, $zero, .L80A47B3C -/* 04E00 80A47B30 4600010D */ trunc.w.s $f4, $f0 +/* 04DFC 80A47B2C 10000003 */ beq $zero, $zero, .L80A47B3C +/* 04E00 80A47B30 4600010D */ trunc.w.s $f4, $f0 /* 04E04 80A47B34 C4400068 */ lwc1 $f0, 0x0068($v0) ## 00000068 .L80A47B38: -/* 04E08 80A47B38 4600010D */ trunc.w.s $f4, $f0 +/* 04E08 80A47B38 4600010D */ trunc.w.s $f4, $f0 .L80A47B3C: /* 04E0C 80A47B3C 8E2A009C */ lw $t2, 0x009C($s1) ## 0000009C /* 04E10 80A47B40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04E14 80A47B44 844600B8 */ lh $a2, 0x00B8($v0) ## 000000B8 -/* 04E18 80A47B48 440C2000 */ mfc1 $t4, $f4 +/* 04E18 80A47B48 440C2000 */ mfc1 $t4, $f4 /* 04E1C 80A47B4C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04E20 80A47B50 000C6C00 */ sll $t5, $t4, 16 -/* 04E24 80A47B54 000D7403 */ sra $t6, $t5, 16 -/* 04E28 80A47B58 000E7880 */ sll $t7, $t6, 2 -/* 04E2C 80A47B5C 01EE7823 */ subu $t7, $t7, $t6 -/* 04E30 80A47B60 000F7880 */ sll $t7, $t7, 2 -/* 04E34 80A47B64 01EE7823 */ subu $t7, $t7, $t6 -/* 04E38 80A47B68 000F7900 */ sll $t7, $t7, 4 -/* 04E3C 80A47B6C 01EE7823 */ subu $t7, $t7, $t6 -/* 04E40 80A47B70 000F78C0 */ sll $t7, $t7, 3 -/* 04E44 80A47B74 014F0019 */ multu $t2, $t7 -/* 04E48 80A47B78 00002012 */ mflo $a0 -/* 04E4C 80A47B7C 00042400 */ sll $a0, $a0, 16 -/* 04E50 80A47B80 0C034421 */ jal Matrix_RotateXYZ -/* 04E54 80A47B84 00042403 */ sra $a0, $a0, 16 +/* 04E20 80A47B50 000C6C00 */ sll $t5, $t4, 16 +/* 04E24 80A47B54 000D7403 */ sra $t6, $t5, 16 +/* 04E28 80A47B58 000E7880 */ sll $t7, $t6, 2 +/* 04E2C 80A47B5C 01EE7823 */ subu $t7, $t7, $t6 +/* 04E30 80A47B60 000F7880 */ sll $t7, $t7, 2 +/* 04E34 80A47B64 01EE7823 */ subu $t7, $t7, $t6 +/* 04E38 80A47B68 000F7900 */ sll $t7, $t7, 4 +/* 04E3C 80A47B6C 01EE7823 */ subu $t7, $t7, $t6 +/* 04E40 80A47B70 000F78C0 */ sll $t7, $t7, 3 +/* 04E44 80A47B74 014F0019 */ multu $t2, $t7 +/* 04E48 80A47B78 00002012 */ mflo $a0 +/* 04E4C 80A47B7C 00042400 */ sll $a0, $a0, 16 +/* 04E50 80A47B80 0C034421 */ jal Matrix_RotateZYX +/* 04E54 80A47B84 00042403 */ sra $a0, $a0, 16 /* 04E58 80A47B88 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 04E5C 80A47B8C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 /* 04E60 80A47B90 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 @@ -65,9 +65,9 @@ glabel func_80A47AB0 /* 04E74 80A47BA4 3C0580A5 */ lui $a1, %hi(D_80A4860C) ## $a1 = 80A50000 /* 04E78 80A47BA8 24A5860C */ addiu $a1, $a1, %lo(D_80A4860C) ## $a1 = 80A4860C /* 04E7C 80A47BAC 24060B6E */ addiu $a2, $zero, 0x0B6E ## $a2 = 00000B6E -/* 04E80 80A47BB0 0C0346A2 */ jal Matrix_NewMtx -/* 04E84 80A47BB4 AFA2002C */ sw $v0, 0x002C($sp) -/* 04E88 80A47BB8 8FA3002C */ lw $v1, 0x002C($sp) +/* 04E80 80A47BB0 0C0346A2 */ jal Matrix_NewMtx +/* 04E84 80A47BB4 AFA2002C */ sw $v0, 0x002C($sp) +/* 04E88 80A47BB8 8FA3002C */ lw $v1, 0x002C($sp) /* 04E8C 80A47BBC 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 /* 04E90 80A47BC0 256BC140 */ addiu $t3, $t3, 0xC140 ## $t3 = 0600C140 /* 04E94 80A47BC4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -81,17 +81,17 @@ glabel func_80A47AB0 /* 04EB4 80A47BE4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04EB8 80A47BE8 24C6861C */ addiu $a2, $a2, %lo(D_80A4861C) ## $a2 = 80A4861C /* 04EBC 80A47BEC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 -/* 04EC0 80A47BF0 0C031AD5 */ jal func_800C6B54 +/* 04EC0 80A47BF0 0C031AD5 */ jal func_800C6B54 /* 04EC4 80A47BF4 24070B72 */ addiu $a3, $zero, 0x0B72 ## $a3 = 00000B72 -/* 04EC8 80A47BF8 8FA50058 */ lw $a1, 0x0058($sp) +/* 04EC8 80A47BF8 8FA50058 */ lw $a1, 0x0058($sp) /* 04ECC 80A47BFC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFF0 -/* 04ED0 80A47C00 0C0346BD */ jal Matrix_MultVec3f +/* 04ED0 80A47C00 0C0346BD */ jal Matrix_MultVec3f /* 04ED4 80A47C04 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 04ED8 80A47C08 8FBF001C */ lw $ra, 0x001C($sp) -/* 04EDC 80A47C0C 8FB00014 */ lw $s0, 0x0014($sp) -/* 04EE0 80A47C10 8FB10018 */ lw $s1, 0x0018($sp) +/* 04ED8 80A47C08 8FBF001C */ lw $ra, 0x001C($sp) +/* 04EDC 80A47C0C 8FB00014 */ lw $s0, 0x0014($sp) +/* 04EE0 80A47C10 8FB10018 */ lw $s1, 0x0018($sp) /* 04EE4 80A47C14 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 04EE8 80A47C18 03E00008 */ jr $ra +/* 04EE8 80A47C18 03E00008 */ jr $ra /* 04EEC 80A47C1C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s index 83d57c949a..32a464bdda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s @@ -1,40 +1,40 @@ glabel EnKarebaba_Draw /* 01228 80A96578 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 0122C 80A9657C AFB40038 */ sw $s4, 0x0038($sp) +/* 0122C 80A9657C AFB40038 */ sw $s4, 0x0038($sp) /* 01230 80A96580 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 01234 80A96584 AFBF003C */ sw $ra, 0x003C($sp) -/* 01238 80A96588 AFB30034 */ sw $s3, 0x0034($sp) -/* 0123C 80A9658C AFB20030 */ sw $s2, 0x0030($sp) -/* 01240 80A96590 AFB1002C */ sw $s1, 0x002C($sp) -/* 01244 80A96594 AFB00028 */ sw $s0, 0x0028($sp) -/* 01248 80A96598 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 01234 80A96584 AFBF003C */ sw $ra, 0x003C($sp) +/* 01238 80A96588 AFB30034 */ sw $s3, 0x0034($sp) +/* 0123C 80A9658C AFB20030 */ sw $s2, 0x0030($sp) +/* 01240 80A96590 AFB1002C */ sw $s1, 0x002C($sp) +/* 01244 80A96594 AFB00028 */ sw $s0, 0x0028($sp) +/* 01248 80A96598 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 0124C 80A9659C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01250 80A965A0 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 /* 01254 80A965A4 3C0680A9 */ lui $a2, %hi(D_80A96ACC) ## $a2 = 80A90000 /* 01258 80A965A8 24C66ACC */ addiu $a2, $a2, %lo(D_80A96ACC) ## $a2 = 80A96ACC /* 0125C 80A965AC 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01260 80A965B0 24070420 */ addiu $a3, $zero, 0x0420 ## $a3 = 00000420 -/* 01264 80A965B4 0C031AB1 */ jal func_800C6AC4 +/* 01264 80A965B4 0C031AB1 */ jal func_800C6AC4 /* 01268 80A965B8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 0126C 80A965BC 0C024F46 */ jal func_80093D18 +/* 0126C 80A965BC 0C024F46 */ jal func_80093D18 /* 01270 80A965C0 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 01274 80A965C4 8E620190 */ lw $v0, 0x0190($s3) ## 00000190 /* 01278 80A965C8 3C0E80A9 */ lui $t6, %hi(func_80A96048) ## $t6 = 80A90000 /* 0127C 80A965CC 25CE6048 */ addiu $t6, $t6, %lo(func_80A96048) ## $t6 = 80A96048 -/* 01280 80A965D0 15C20021 */ bne $t6, $v0, .L80A96658 +/* 01280 80A965D0 15C20021 */ bne $t6, $v0, .L80A96658 /* 01284 80A965D4 00000000 */ nop /* 01288 80A965D8 8662001C */ lh $v0, 0x001C($s3) ## 0000001C /* 0128C 80A965DC 3C064348 */ lui $a2, 0x4348 ## $a2 = 43480000 -/* 01290 80A965E0 28410029 */ slti $at, $v0, 0x0029 -/* 01294 80A965E4 10200003 */ beq $at, $zero, .L80A965F4 +/* 01290 80A965E0 28410029 */ slti $at, $v0, 0x0029 +/* 01294 80A965E4 10200003 */ beq $at, $zero, .L80A965F4 /* 01298 80A965E8 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 0129C 80A965EC 11E00087 */ beq $t7, $zero, .L80A9680C +/* 0129C 80A965EC 11E00087 */ beq $t7, $zero, .L80A9680C /* 012A0 80A965F0 00000000 */ nop .L80A965F4: /* 012A4 80A965F4 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 012A8 80A965F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012AC 80A965FC 0C034261 */ jal Matrix_Translate -/* 012B0 80A96600 46007306 */ mov.s $f12, $f14 +/* 012AC 80A965FC 0C034261 */ jal Matrix_Translate +/* 012B0 80A96600 46007306 */ mov.s $f12, $f14 /* 012B4 80A96604 8E5002C0 */ lw $s0, 0x02C0($s2) ## 000002C0 /* 012B8 80A96608 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 /* 012BC 80A9660C 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 @@ -44,7 +44,7 @@ glabel EnKarebaba_Draw /* 012CC 80A9661C AE190000 */ sw $t9, 0x0000($s0) ## 00000000 /* 012D0 80A96620 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 012D4 80A96624 24A56AE0 */ addiu $a1, $a1, %lo(D_80A96AE0) ## $a1 = 80A96AE0 -/* 012D8 80A96628 0C0346A2 */ jal Matrix_NewMtx +/* 012D8 80A96628 0C0346A2 */ jal Matrix_NewMtx /* 012DC 80A9662C 2406042A */ addiu $a2, $zero, 0x042A ## $a2 = 0000042A /* 012E0 80A96630 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 012E4 80A96634 8E4302C0 */ lw $v1, 0x02C0($s2) ## 000002C0 @@ -54,88 +54,88 @@ glabel EnKarebaba_Draw /* 012F4 80A96644 AE4802C0 */ sw $t0, 0x02C0($s2) ## 000002C0 /* 012F8 80A96648 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 /* 012FC 80A9664C AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 01300 80A96650 1000006E */ beq $zero, $zero, .L80A9680C +/* 01300 80A96650 1000006E */ beq $zero, $zero, .L80A9680C /* 01304 80A96654 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 .L80A96658: /* 01308 80A96658 3C0B80A9 */ lui $t3, %hi(func_80A96184) ## $t3 = 80A90000 /* 0130C 80A9665C 256B6184 */ addiu $t3, $t3, %lo(func_80A96184) ## $t3 = 80A96184 -/* 01310 80A96660 1162006A */ beq $t3, $v0, .L80A9680C +/* 01310 80A96660 1162006A */ beq $t3, $v0, .L80A9680C /* 01314 80A96664 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01318 80A96668 3C0580A9 */ lui $a1, %hi(D_80A96A68) ## $a1 = 80A90000 /* 0131C 80A9666C 24A56A68 */ addiu $a1, $a1, %lo(D_80A96A68) ## $a1 = 80A96A68 /* 01320 80A96670 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01324 80A96674 0C00988C */ jal func_80026230 +/* 01324 80A96674 0C00988C */ jal func_80026230 /* 01328 80A96678 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 0132C 80A9667C 8E650150 */ lw $a1, 0x0150($s3) ## 00000150 /* 01330 80A96680 8E66016C */ lw $a2, 0x016C($s3) ## 0000016C -/* 01334 80A96684 AFA00014 */ sw $zero, 0x0014($sp) -/* 01338 80A96688 AFA00010 */ sw $zero, 0x0010($sp) +/* 01334 80A96684 AFA00014 */ sw $zero, 0x0014($sp) +/* 01338 80A96688 AFA00010 */ sw $zero, 0x0010($sp) /* 0133C 80A9668C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01340 80A96690 0C028572 */ jal SkelAnime_Draw - + /* 01344 80A96694 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01348 80A96698 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 /* 0134C 80A9669C C66E0028 */ lwc1 $f14, 0x0028($s3) ## 00000028 /* 01350 80A966A0 8E66002C */ lw $a2, 0x002C($s3) ## 0000002C -/* 01354 80A966A4 0C034261 */ jal Matrix_Translate +/* 01354 80A966A4 0C034261 */ jal Matrix_Translate /* 01358 80A966A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0135C 80A966AC 8E620190 */ lw $v0, 0x0190($s3) ## 00000190 /* 01360 80A966B0 3C0C80A9 */ lui $t4, %hi(func_80A961DC) ## $t4 = 80A90000 /* 01364 80A966B4 258C61DC */ addiu $t4, $t4, %lo(func_80A961DC) ## $t4 = 80A961DC -/* 01368 80A966B8 11820004 */ beq $t4, $v0, .L80A966CC +/* 01368 80A966B8 11820004 */ beq $t4, $v0, .L80A966CC /* 0136C 80A966BC 3C0D80A9 */ lui $t5, %hi(func_80A95940) ## $t5 = 80A90000 /* 01370 80A966C0 25AD5940 */ addiu $t5, $t5, %lo(func_80A95940) ## $t5 = 80A95940 -/* 01374 80A966C4 15A2000A */ bne $t5, $v0, .L80A966F0 +/* 01374 80A966C4 15A2000A */ bne $t5, $v0, .L80A966F0 /* 01378 80A966C8 3C0180A9 */ lui $at, %hi(D_80A96B68) ## $at = 80A90000 .L80A966CC: /* 0137C 80A966CC 866E001C */ lh $t6, 0x001C($s3) ## 0000001C /* 01380 80A966D0 3C0180A9 */ lui $at, %hi(D_80A96B64) ## $at = 80A90000 -/* 01384 80A966D4 C4286B64 */ lwc1 $f8, %lo(D_80A96B64)($at) +/* 01384 80A966D4 C4286B64 */ lwc1 $f8, %lo(D_80A96B64)($at) /* 01388 80A966D8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0138C 80A966DC 00000000 */ nop -/* 01390 80A966E0 468021A0 */ cvt.s.w $f6, $f4 -/* 01394 80A966E4 46083302 */ mul.s $f12, $f6, $f8 -/* 01398 80A966E8 10000003 */ beq $zero, $zero, .L80A966F8 -/* 0139C 80A966EC E7AC0088 */ swc1 $f12, 0x0088($sp) +/* 01390 80A966E0 468021A0 */ cvt.s.w $f6, $f4 +/* 01394 80A966E4 46083302 */ mul.s $f12, $f6, $f8 +/* 01398 80A966E8 10000003 */ beq $zero, $zero, .L80A966F8 +/* 0139C 80A966EC E7AC0088 */ swc1 $f12, 0x0088($sp) .L80A966F0: -/* 013A0 80A966F0 C42A6B68 */ lwc1 $f10, %lo(D_80A96B68)($at) -/* 013A4 80A966F4 E7AA0088 */ swc1 $f10, 0x0088($sp) +/* 013A0 80A966F0 C42A6B68 */ lwc1 $f10, %lo(D_80A96B68)($at) +/* 013A4 80A966F4 E7AA0088 */ swc1 $f10, 0x0088($sp) .L80A966F8: -/* 013A8 80A966F8 C7AC0088 */ lwc1 $f12, 0x0088($sp) +/* 013A8 80A966F8 C7AC0088 */ lwc1 $f12, 0x0088($sp) /* 013AC 80A966FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 013B0 80A96700 44066000 */ mfc1 $a2, $f12 -/* 013B4 80A96704 0C0342A3 */ jal Matrix_Scale -/* 013B8 80A96708 46006386 */ mov.s $f14, $f12 +/* 013B0 80A96700 44066000 */ mfc1 $a2, $f12 +/* 013B4 80A96704 0C0342A3 */ jal Matrix_Scale +/* 013B8 80A96708 46006386 */ mov.s $f14, $f12 /* 013BC 80A9670C 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 013C0 80A96710 866500B6 */ lh $a1, 0x00B6($s3) ## 000000B6 /* 013C4 80A96714 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013C8 80A96718 0C034421 */ jal Matrix_RotateXYZ +/* 013C8 80A96718 0C034421 */ jal Matrix_RotateZYX /* 013CC 80A9671C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013D0 80A96720 8E6F0190 */ lw $t7, 0x0190($s3) ## 00000190 /* 013D4 80A96724 3C0380A9 */ lui $v1, %hi(func_80A95D90) ## $v1 = 80A90000 /* 013D8 80A96728 24635D90 */ addiu $v1, $v1, %lo(func_80A95D90) ## $v1 = 80A95D90 -/* 013DC 80A9672C 146F0004 */ bne $v1, $t7, .L80A96740 +/* 013DC 80A9672C 146F0004 */ bne $v1, $t7, .L80A96740 /* 013E0 80A96730 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 013E4 80A96734 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 013E8 80A96738 10000002 */ beq $zero, $zero, .L80A96744 -/* 013EC 80A9673C AFB8008C */ sw $t8, 0x008C($sp) +/* 013E8 80A96738 10000002 */ beq $zero, $zero, .L80A96744 +/* 013EC 80A9673C AFB8008C */ sw $t8, 0x008C($sp) .L80A96740: -/* 013F0 80A96740 AFB9008C */ sw $t9, 0x008C($sp) +/* 013F0 80A96740 AFB9008C */ sw $t9, 0x008C($sp) .L80A96744: -/* 013F4 80A96744 8FA8008C */ lw $t0, 0x008C($sp) +/* 013F4 80A96744 8FA8008C */ lw $t0, 0x008C($sp) /* 013F8 80A96748 3C0980A9 */ lui $t1, %hi(D_80A96A6C) ## $t1 = 80A90000 /* 013FC 80A9674C 25316A6C */ addiu $s1, $t1, %lo(D_80A96A6C) ## $s1 = 80A96A6C -/* 01400 80A96750 1900002C */ blez $t0, .L80A96804 -/* 01404 80A96754 00085080 */ sll $t2, $t0, 2 -/* 01408 80A96758 01515821 */ addu $t3, $t2, $s1 +/* 01400 80A96750 1900002C */ blez $t0, .L80A96804 +/* 01404 80A96754 00085080 */ sll $t2, $t0, 2 +/* 01408 80A96758 01515821 */ addu $t3, $t2, $s1 /* 0140C 80A9675C 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 01410 80A96760 AFAB0048 */ sw $t3, 0x0048($sp) -/* 01414 80A96764 AFA3004C */ sw $v1, 0x004C($sp) -/* 01418 80A96768 4600A306 */ mov.s $f12, $f20 +/* 01410 80A96760 AFAB0048 */ sw $t3, 0x0048($sp) +/* 01414 80A96764 AFA3004C */ sw $v1, 0x004C($sp) +/* 01418 80A96768 4600A306 */ mov.s $f12, $f20 .L80A9676C: -/* 0141C 80A9676C 4600A386 */ mov.s $f14, $f20 +/* 0141C 80A9676C 4600A386 */ mov.s $f14, $f20 /* 01420 80A96770 3C06C4FA */ lui $a2, 0xC4FA ## $a2 = C4FA0000 -/* 01424 80A96774 0C034261 */ jal Matrix_Translate +/* 01424 80A96774 0C034261 */ jal Matrix_Translate /* 01428 80A96778 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0142C 80A9677C 8E5002C0 */ lw $s0, 0x02C0($s2) ## 000002C0 /* 01430 80A96780 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 @@ -146,7 +146,7 @@ glabel EnKarebaba_Draw /* 01444 80A96794 AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 /* 01448 80A96798 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 0144C 80A9679C 24A56AF4 */ addiu $a1, $a1, %lo(D_80A96AF4) ## $a1 = 80A96AF4 -/* 01450 80A967A0 0C0346A2 */ jal Matrix_NewMtx +/* 01450 80A967A0 0C0346A2 */ jal Matrix_NewMtx /* 01454 80A967A4 2406045C */ addiu $a2, $zero, 0x045C ## $a2 = 0000045C /* 01458 80A967A8 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0145C 80A967AC 8E4302C0 */ lw $v1, 0x02C0($s2) ## 000002C0 @@ -157,24 +157,24 @@ glabel EnKarebaba_Draw /* 01470 80A967C0 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 01474 80A967C4 8E380000 */ lw $t8, 0x0000($s1) ## 80A96A6C /* 01478 80A967C8 27396A6C */ addiu $t9, $t9, %lo(D_80A96A6C) ## $t9 = 80A96A6C -/* 0147C 80A967CC 16390009 */ bne $s1, $t9, .L80A967F4 +/* 0147C 80A967CC 16390009 */ bne $s1, $t9, .L80A967F4 /* 01480 80A967D0 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 01484 80A967D4 8FA8004C */ lw $t0, 0x004C($sp) +/* 01484 80A967D4 8FA8004C */ lw $t0, 0x004C($sp) /* 01488 80A967D8 8E6A0190 */ lw $t2, 0x0190($s3) ## 00000190 /* 0148C 80A967DC 3C0480A9 */ lui $a0, %hi(D_80A96A78) ## $a0 = 80A90000 /* 01490 80A967E0 24846A78 */ addiu $a0, $a0, %lo(D_80A96A78) ## $a0 = 80A96A78 -/* 01494 80A967E4 550A0004 */ bnel $t0, $t2, .L80A967F8 -/* 01498 80A967E8 8FA90048 */ lw $t1, 0x0048($sp) -/* 0149C 80A967EC 0C0346BD */ jal Matrix_MultVec3f +/* 01494 80A967E4 550A0004 */ bnel $t0, $t2, .L80A967F8 +/* 01498 80A967E8 8FA90048 */ lw $t1, 0x0048($sp) +/* 0149C 80A967EC 0C0346BD */ jal Matrix_MultVec3f /* 014A0 80A967F0 26650038 */ addiu $a1, $s3, 0x0038 ## $a1 = 00000038 .L80A967F4: -/* 014A4 80A967F4 8FA90048 */ lw $t1, 0x0048($sp) +/* 014A4 80A967F4 8FA90048 */ lw $t1, 0x0048($sp) .L80A967F8: /* 014A8 80A967F8 26310004 */ addiu $s1, $s1, 0x0004 ## $s1 = 80A96A70 -/* 014AC 80A967FC 5629FFDB */ bnel $s1, $t1, .L80A9676C -/* 014B0 80A96800 4600A306 */ mov.s $f12, $f20 +/* 014AC 80A967FC 5629FFDB */ bnel $s1, $t1, .L80A9676C +/* 014B0 80A96800 4600A306 */ mov.s $f12, $f20 .L80A96804: -/* 014B4 80A96804 0C009982 */ jal func_80026608 +/* 014B4 80A96804 0C009982 */ jal func_80026608 /* 014B8 80A96808 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 .L80A9680C: /* 014BC 80A9680C 3C0B80A9 */ lui $t3, %hi(func_80A95D90) ## $t3 = 80A90000 @@ -183,36 +183,36 @@ glabel EnKarebaba_Draw /* 014C8 80A96818 3C1080A9 */ lui $s0, %hi(func_80A95940) ## $s0 = 80A90000 /* 014CC 80A9681C 26105940 */ addiu $s0, $s0, %lo(func_80A95940) ## $s0 = 80A95940 /* 014D0 80A96820 24A56A68 */ addiu $a1, $a1, %lo(D_80A96A68) ## $a1 = 80A96A68 -/* 014D4 80A96824 AFAB004C */ sw $t3, 0x004C($sp) +/* 014D4 80A96824 AFAB004C */ sw $t3, 0x004C($sp) /* 014D8 80A96828 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 014DC 80A9682C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 014E0 80A96830 0C00988C */ jal func_80026230 +/* 014E0 80A96830 0C00988C */ jal func_80026230 /* 014E4 80A96834 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 014E8 80A96838 C66C0008 */ lwc1 $f12, 0x0008($s3) ## 00000008 /* 014EC 80A9683C C66E000C */ lwc1 $f14, 0x000C($s3) ## 0000000C /* 014F0 80A96840 8E660010 */ lw $a2, 0x0010($s3) ## 00000010 -/* 014F4 80A96844 0C034261 */ jal Matrix_Translate +/* 014F4 80A96844 0C034261 */ jal Matrix_Translate /* 014F8 80A96848 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 014FC 80A9684C 8E6C0190 */ lw $t4, 0x0190($s3) ## 00000190 /* 01500 80A96850 3C0180A9 */ lui $at, %hi(D_80A96B6C) ## $at = 80A90000 -/* 01504 80A96854 520C0004 */ beql $s0, $t4, .L80A96868 -/* 01508 80A96858 C7AC0088 */ lwc1 $f12, 0x0088($sp) -/* 0150C 80A9685C C42C6B6C */ lwc1 $f12, %lo(D_80A96B6C)($at) -/* 01510 80A96860 E7AC0088 */ swc1 $f12, 0x0088($sp) -/* 01514 80A96864 C7AC0088 */ lwc1 $f12, 0x0088($sp) +/* 01504 80A96854 520C0004 */ beql $s0, $t4, .L80A96868 +/* 01508 80A96858 C7AC0088 */ lwc1 $f12, 0x0088($sp) +/* 0150C 80A9685C C42C6B6C */ lwc1 $f12, %lo(D_80A96B6C)($at) +/* 01510 80A96860 E7AC0088 */ swc1 $f12, 0x0088($sp) +/* 01514 80A96864 C7AC0088 */ lwc1 $f12, 0x0088($sp) .L80A96868: /* 01518 80A96868 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0151C 80A9686C 44066000 */ mfc1 $a2, $f12 -/* 01520 80A96870 0C0342A3 */ jal Matrix_Scale -/* 01524 80A96874 46006386 */ mov.s $f14, $f12 +/* 0151C 80A9686C 44066000 */ mfc1 $a2, $f12 +/* 01520 80A96870 0C0342A3 */ jal Matrix_Scale +/* 01524 80A96874 46006386 */ mov.s $f14, $f12 /* 01528 80A96878 866D0016 */ lh $t5, 0x0016($s3) ## 00000016 /* 0152C 80A9687C 3C0180A9 */ lui $at, %hi(D_80A96B70) ## $at = 80A90000 -/* 01530 80A96880 C4246B70 */ lwc1 $f4, %lo(D_80A96B70)($at) +/* 01530 80A96880 C4246B70 */ lwc1 $f4, %lo(D_80A96B70)($at) /* 01534 80A96884 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 /* 01538 80A96888 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0153C 80A9688C 468084A0 */ cvt.s.w $f18, $f16 -/* 01540 80A96890 46049302 */ mul.s $f12, $f18, $f4 -/* 01544 80A96894 0C034348 */ jal Matrix_RotateY +/* 0153C 80A9688C 468084A0 */ cvt.s.w $f18, $f16 +/* 01540 80A96890 46049302 */ mul.s $f12, $f18, $f4 +/* 01544 80A96894 0C034348 */ jal Matrix_RotateY /* 01548 80A96898 00000000 */ nop /* 0154C 80A9689C 8E5002C0 */ lw $s0, 0x02C0($s2) ## 000002C0 /* 01550 80A968A0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -223,7 +223,7 @@ glabel EnKarebaba_Draw /* 01564 80A968B4 AE0F0000 */ sw $t7, 0x0000($s0) ## 80A95940 /* 01568 80A968B8 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 0156C 80A968BC 24A56B08 */ addiu $a1, $a1, %lo(D_80A96B08) ## $a1 = 80A96B08 -/* 01570 80A968C0 0C0346A2 */ jal Matrix_NewMtx +/* 01570 80A968C0 0C0346A2 */ jal Matrix_NewMtx /* 01574 80A968C4 24060478 */ addiu $a2, $zero, 0x0478 ## $a2 = 00000478 /* 01578 80A968C8 AE020004 */ sw $v0, 0x0004($s0) ## 80A95944 /* 0157C 80A968CC 8E4302C0 */ lw $v1, 0x02C0($s2) ## 000002C0 @@ -235,18 +235,18 @@ glabel EnKarebaba_Draw /* 01594 80A968E4 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 01598 80A968E8 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 0159C 80A968EC 8E690190 */ lw $t1, 0x0190($s3) ## 00000190 -/* 015A0 80A968F0 8FAA004C */ lw $t2, 0x004C($sp) +/* 015A0 80A968F0 8FAA004C */ lw $t2, 0x004C($sp) /* 015A4 80A968F4 2404C000 */ addiu $a0, $zero, 0xC000 ## $a0 = FFFFC000 -/* 015A8 80A968F8 1549001D */ bne $t2, $t1, .L80A96970 +/* 015A8 80A968F8 1549001D */ bne $t2, $t1, .L80A96970 /* 015AC 80A968FC 00000000 */ nop /* 015B0 80A96900 866B00B6 */ lh $t3, 0x00B6($s3) ## 000000B6 /* 015B4 80A96904 866C0016 */ lh $t4, 0x0016($s3) ## 00000016 /* 015B8 80A96908 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 015BC 80A9690C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 015C0 80A96910 016C2823 */ subu $a1, $t3, $t4 -/* 015C4 80A96914 00052C00 */ sll $a1, $a1, 16 -/* 015C8 80A96918 0C034421 */ jal Matrix_RotateXYZ -/* 015CC 80A9691C 00052C03 */ sra $a1, $a1, 16 +/* 015C0 80A96910 016C2823 */ subu $a1, $t3, $t4 +/* 015C4 80A96914 00052C00 */ sll $a1, $a1, 16 +/* 015C8 80A96918 0C034421 */ jal Matrix_RotateZYX +/* 015CC 80A9691C 00052C03 */ sra $a1, $a1, 16 /* 015D0 80A96920 8E5002C0 */ lw $s0, 0x02C0($s2) ## 000002C0 /* 015D4 80A96924 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 015D8 80A96928 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 @@ -256,7 +256,7 @@ glabel EnKarebaba_Draw /* 015E8 80A96938 AE0E0000 */ sw $t6, 0x0000($s0) ## 80A95940 /* 015EC 80A9693C 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 015F0 80A96940 24A56B1C */ addiu $a1, $a1, %lo(D_80A96B1C) ## $a1 = 80A96B1C -/* 015F4 80A96944 0C0346A2 */ jal Matrix_NewMtx +/* 015F4 80A96944 0C0346A2 */ jal Matrix_NewMtx /* 015F8 80A96948 24060483 */ addiu $a2, $zero, 0x0483 ## $a2 = 00000483 /* 015FC 80A9694C AE020004 */ sw $v0, 0x0004($s0) ## 80A95944 /* 01600 80A96950 8E4302C0 */ lw $v1, 0x02C0($s2) ## 000002C0 @@ -268,29 +268,29 @@ glabel EnKarebaba_Draw /* 01618 80A96968 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 0161C 80A9696C AC790004 */ sw $t9, 0x0004($v1) ## 00000004 .L80A96970: -/* 01620 80A96970 0C009982 */ jal func_80026608 +/* 01620 80A96970 0C009982 */ jal func_80026608 /* 01624 80A96974 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01628 80A96978 3C0680A9 */ lui $a2, %hi(D_80A96B30) ## $a2 = 80A90000 /* 0162C 80A9697C 24C66B30 */ addiu $a2, $a2, %lo(D_80A96B30) ## $a2 = 80A96B30 /* 01630 80A96980 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01634 80A96984 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 01638 80A96988 0C031AD5 */ jal func_800C6B54 +/* 01638 80A96988 0C031AD5 */ jal func_800C6B54 /* 0163C 80A9698C 2407048B */ addiu $a3, $zero, 0x048B ## $a3 = 0000048B /* 01640 80A96990 8E6801F4 */ lw $t0, 0x01F4($s3) ## 000001F4 /* 01644 80A96994 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01648 80A96998 51000004 */ beql $t0, $zero, .L80A969AC -/* 0164C 80A9699C 8FBF003C */ lw $ra, 0x003C($sp) -/* 01650 80A969A0 0C2A5913 */ jal func_80A9644C +/* 01648 80A96998 51000004 */ beql $t0, $zero, .L80A969AC +/* 0164C 80A9699C 8FBF003C */ lw $ra, 0x003C($sp) +/* 01650 80A969A0 0C2A5913 */ jal func_80A9644C /* 01654 80A969A4 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 01658 80A969A8 8FBF003C */ lw $ra, 0x003C($sp) +/* 01658 80A969A8 8FBF003C */ lw $ra, 0x003C($sp) .L80A969AC: -/* 0165C 80A969AC D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 01660 80A969B0 8FB00028 */ lw $s0, 0x0028($sp) -/* 01664 80A969B4 8FB1002C */ lw $s1, 0x002C($sp) -/* 01668 80A969B8 8FB20030 */ lw $s2, 0x0030($sp) -/* 0166C 80A969BC 8FB30034 */ lw $s3, 0x0034($sp) -/* 01670 80A969C0 8FB40038 */ lw $s4, 0x0038($sp) -/* 01674 80A969C4 03E00008 */ jr $ra +/* 0165C 80A969AC D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 01660 80A969B0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01664 80A969B4 8FB1002C */ lw $s1, 0x002C($sp) +/* 01668 80A969B8 8FB20030 */ lw $s2, 0x0030($sp) +/* 0166C 80A969BC 8FB30034 */ lw $s3, 0x0034($sp) +/* 01670 80A969C0 8FB40038 */ lw $s4, 0x0038($sp) +/* 01674 80A969C4 03E00008 */ jr $ra /* 01678 80A969C8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 0167C 80A969CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s index a0190d799f..e968af38cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s @@ -1,18 +1,18 @@ glabel EnPoSisters_Draw /* 040B4 80ADD044 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08 -/* 040B8 80ADD048 AFBF006C */ sw $ra, 0x006C($sp) -/* 040BC 80ADD04C AFB70068 */ sw $s7, 0x0068($sp) -/* 040C0 80ADD050 AFB60064 */ sw $s6, 0x0064($sp) -/* 040C4 80ADD054 AFB50060 */ sw $s5, 0x0060($sp) -/* 040C8 80ADD058 AFB4005C */ sw $s4, 0x005C($sp) -/* 040CC 80ADD05C AFB30058 */ sw $s3, 0x0058($sp) -/* 040D0 80ADD060 AFB20054 */ sw $s2, 0x0054($sp) -/* 040D4 80ADD064 AFB10050 */ sw $s1, 0x0050($sp) -/* 040D8 80ADD068 AFB0004C */ sw $s0, 0x004C($sp) -/* 040DC 80ADD06C F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 040E0 80ADD070 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 040E4 80ADD074 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 040E8 80ADD078 AFA400F4 */ sw $a0, 0x00F4($sp) +/* 040B8 80ADD048 AFBF006C */ sw $ra, 0x006C($sp) +/* 040BC 80ADD04C AFB70068 */ sw $s7, 0x0068($sp) +/* 040C0 80ADD050 AFB60064 */ sw $s6, 0x0064($sp) +/* 040C4 80ADD054 AFB50060 */ sw $s5, 0x0060($sp) +/* 040C8 80ADD058 AFB4005C */ sw $s4, 0x005C($sp) +/* 040CC 80ADD05C AFB30058 */ sw $s3, 0x0058($sp) +/* 040D0 80ADD060 AFB20054 */ sw $s2, 0x0054($sp) +/* 040D4 80ADD064 AFB10050 */ sw $s1, 0x0050($sp) +/* 040D8 80ADD068 AFB0004C */ sw $s0, 0x004C($sp) +/* 040DC 80ADD06C F7B80040 */ sdc1 $f24, 0x0040($sp) +/* 040E0 80ADD070 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 040E4 80ADD074 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 040E8 80ADD078 AFA400F4 */ sw $a0, 0x00F4($sp) /* 040EC 80ADD07C 90820194 */ lbu $v0, 0x0194($a0) ## 00000194 /* 040F0 80ADD080 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 /* 040F4 80ADD084 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 @@ -22,26 +22,26 @@ glabel EnPoSisters_Draw /* 04104 80ADD094 25CED700 */ addiu $t6, $t6, %lo(D_80ADD700) ## $t6 = 80ADD700 /* 04108 80ADD098 25EFD6F0 */ addiu $t7, $t7, %lo(D_80ADD6F0) ## $t7 = 80ADD6F0 /* 0410C 80ADD09C 3C0680AE */ lui $a2, %hi(D_80ADD828) ## $a2 = 80AE0000 -/* 04110 80ADD0A0 00021080 */ sll $v0, $v0, 2 -/* 04114 80ADD0A4 004E8821 */ addu $s1, $v0, $t6 -/* 04118 80ADD0A8 004FB821 */ addu $s7, $v0, $t7 +/* 04110 80ADD0A0 00021080 */ sll $v0, $v0, 2 +/* 04114 80ADD0A4 004E8821 */ addu $s1, $v0, $t6 +/* 04118 80ADD0A8 004FB821 */ addu $s7, $v0, $t7 /* 0411C 80ADD0AC 24C6D828 */ addiu $a2, $a2, %lo(D_80ADD828) ## $a2 = 80ADD828 /* 04120 80ADD0B0 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFCC /* 04124 80ADD0B4 24070BAD */ addiu $a3, $zero, 0x0BAD ## $a3 = 00000BAD -/* 04128 80ADD0B8 0C031AB1 */ jal func_800C6AC4 +/* 04128 80ADD0B8 0C031AB1 */ jal func_800C6AC4 /* 0412C 80ADD0BC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 04130 80ADD0C0 0C2B7157 */ jal func_80ADC55C +/* 04130 80ADD0C0 0C2B7157 */ jal func_80ADC55C /* 04134 80ADD0C4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 04138 80ADD0C8 0C024F46 */ jal func_80093D18 +/* 04138 80ADD0C8 0C024F46 */ jal func_80093D18 /* 0413C 80ADD0CC 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 04140 80ADD0D0 0C024F61 */ jal func_80093D84 +/* 04140 80ADD0D0 0C024F61 */ jal func_80093D84 /* 04144 80ADD0D4 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 04148 80ADD0D8 92820231 */ lbu $v0, 0x0231($s4) ## 00000231 /* 0414C 80ADD0DC 241200FF */ addiu $s2, $zero, 0x00FF ## $s2 = 000000FF /* 04150 80ADD0E0 3C15FB00 */ lui $s5, 0xFB00 ## $s5 = FB000000 -/* 04154 80ADD0E4 12420003 */ beq $s2, $v0, .L80ADD0F4 +/* 04154 80ADD0E4 12420003 */ beq $s2, $v0, .L80ADD0F4 /* 04158 80ADD0E8 3C0E8011 */ lui $t6, 0x8011 ## $t6 = 80110000 -/* 0415C 80ADD0EC 14400026 */ bne $v0, $zero, .L80ADD188 +/* 0415C 80ADD0EC 14400026 */ bne $v0, $zero, .L80ADD188 /* 04160 80ADD0F0 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 .L80ADD0F4: /* 04164 80ADD0F4 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 @@ -54,10 +54,10 @@ glabel EnPoSisters_Draw /* 04180 80ADD110 9288022E */ lbu $t0, 0x022E($s4) ## 0000022E /* 04184 80ADD114 928F0230 */ lbu $t7, 0x0230($s4) ## 00000230 /* 04188 80ADD118 928A0231 */ lbu $t2, 0x0231($s4) ## 00000231 -/* 0418C 80ADD11C 000B6400 */ sll $t4, $t3, 16 -/* 04190 80ADD120 00084E00 */ sll $t1, $t0, 24 +/* 0418C 80ADD11C 000B6400 */ sll $t4, $t3, 16 +/* 04190 80ADD120 00084E00 */ sll $t1, $t0, 24 /* 04194 80ADD124 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000000 -/* 04198 80ADD128 000FC200 */ sll $t8, $t7, 8 +/* 04198 80ADD128 000FC200 */ sll $t8, $t7, 8 /* 0419C 80ADD12C 01B8C825 */ or $t9, $t5, $t8 ## $t9 = 00000008 /* 041A0 80ADD130 032A5825 */ or $t3, $t9, $t2 ## $t3 = 00000008 /* 041A4 80ADD134 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 @@ -72,14 +72,14 @@ glabel EnPoSisters_Draw /* 041C8 80ADD158 8E850150 */ lw $a1, 0x0150($s4) ## 00000150 /* 041CC 80ADD15C 3C0F80AE */ lui $t7, %hi(func_80ADC970) ## $t7 = 80AE0000 /* 041D0 80ADD160 25EFC970 */ addiu $t7, $t7, %lo(func_80ADC970) ## $t7 = 80ADC970 -/* 041D4 80ADD164 AFAF0010 */ sw $t7, 0x0010($sp) -/* 041D8 80ADD168 AFB40014 */ sw $s4, 0x0014($sp) +/* 041D4 80ADD164 AFAF0010 */ sw $t7, 0x0010($sp) +/* 041D8 80ADD168 AFB40014 */ sw $s4, 0x0014($sp) /* 041DC 80ADD16C 8E6D02C0 */ lw $t5, 0x02C0($s3) ## 000002C0 /* 041E0 80ADD170 24E7C77C */ addiu $a3, $a3, %lo(func_80ADC77C) ## $a3 = 80ADC77C /* 041E4 80ADD174 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 041E8 80ADD178 0C0288A2 */ jal func_800A2288 -/* 041EC 80ADD17C AFAD0018 */ sw $t5, 0x0018($sp) -/* 041F0 80ADD180 1000001F */ beq $zero, $zero, .L80ADD200 +/* 041E8 80ADD178 0C0288A2 */ jal func_800A2288 +/* 041EC 80ADD17C AFAD0018 */ sw $t5, 0x0018($sp) +/* 041F0 80ADD180 1000001F */ beq $zero, $zero, .L80ADD200 /* 041F4 80ADD184 AE6202C0 */ sw $v0, 0x02C0($s3) ## 000002C0 .L80ADD188: /* 041F8 80ADD188 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 @@ -103,21 +103,21 @@ glabel EnPoSisters_Draw /* 04240 80ADD1D0 8E86016C */ lw $a2, 0x016C($s4) ## 0000016C /* 04244 80ADD1D4 8E850150 */ lw $a1, 0x0150($s4) ## 00000150 /* 04248 80ADD1D8 25CEC970 */ addiu $t6, $t6, %lo(func_80ADC970) ## $t6 = 80ADC970 -/* 0424C 80ADD1DC AFAE0010 */ sw $t6, 0x0010($sp) -/* 04250 80ADD1E0 AFB40014 */ sw $s4, 0x0014($sp) +/* 0424C 80ADD1DC AFAE0010 */ sw $t6, 0x0010($sp) +/* 04250 80ADD1E0 AFB40014 */ sw $s4, 0x0014($sp) /* 04254 80ADD1E4 8E6F02D0 */ lw $t7, 0x02D0($s3) ## 000002D0 /* 04258 80ADD1E8 3C0780AE */ lui $a3, %hi(func_80ADC77C) ## $a3 = 80AE0000 /* 0425C 80ADD1EC 24E7C77C */ addiu $a3, $a3, %lo(func_80ADC77C) ## $a3 = 80ADC77C /* 04260 80ADD1F0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 04264 80ADD1F4 0C0288A2 */ jal func_800A2288 -/* 04268 80ADD1F8 AFAF0018 */ sw $t7, 0x0018($sp) +/* 04264 80ADD1F4 0C0288A2 */ jal func_800A2288 +/* 04268 80ADD1F8 AFAF0018 */ sw $t7, 0x0018($sp) /* 0426C 80ADD1FC AE6202D0 */ sw $v0, 0x02D0($s3) ## 000002D0 .L80ADD200: /* 04270 80ADD200 928D0199 */ lbu $t5, 0x0199($s4) ## 00000199 /* 04274 80ADD204 31B80080 */ andi $t8, $t5, 0x0080 ## $t8 = 00000000 -/* 04278 80ADD208 57000019 */ bnel $t8, $zero, .L80ADD270 +/* 04278 80ADD208 57000019 */ bnel $t8, $zero, .L80ADD270 /* 0427C 80ADD20C 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 04280 80ADD210 0C03423F */ jal Matrix_Put +/* 04280 80ADD210 0C03423F */ jal Matrix_Put /* 04284 80ADD214 268402F8 */ addiu $a0, $s4, 0x02F8 ## $a0 = 000002F8 /* 04288 80ADD218 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 /* 0428C 80ADD21C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -129,7 +129,7 @@ glabel EnPoSisters_Draw /* 042A4 80ADD234 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 042A8 80ADD238 24A5D840 */ addiu $a1, $a1, %lo(D_80ADD840) ## $a1 = 80ADD840 /* 042AC 80ADD23C 24060BDA */ addiu $a2, $zero, 0x0BDA ## $a2 = 00000BDA -/* 042B0 80ADD240 0C0346A2 */ jal Matrix_NewMtx +/* 042B0 80ADD240 0C0346A2 */ jal Matrix_NewMtx /* 042B4 80ADD244 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 042B8 80ADD248 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 042BC 80ADD24C 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 @@ -152,26 +152,26 @@ glabel EnPoSisters_Draw /* 042FC 80ADD28C 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 /* 04300 80ADD290 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 04304 80ADD294 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 04308 80ADD298 01164021 */ addu $t0, $t0, $s6 -/* 0430C 80ADD29C AFB80018 */ sw $t8, 0x0018($sp) -/* 04310 80ADD2A0 AFAD0014 */ sw $t5, 0x0014($sp) -/* 04314 80ADD2A4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 04318 80ADD2A8 AFA0001C */ sw $zero, 0x001C($sp) +/* 04308 80ADD298 01164021 */ addu $t0, $t0, $s6 +/* 0430C 80ADD29C AFB80018 */ sw $t8, 0x0018($sp) +/* 04310 80ADD2A0 AFAD0014 */ sw $t5, 0x0014($sp) +/* 04314 80ADD2A4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 04318 80ADD2A8 AFA0001C */ sw $zero, 0x001C($sp) /* 0431C 80ADD2AC 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 /* 04320 80ADD2B0 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 /* 04324 80ADD2B4 24090080 */ addiu $t1, $zero, 0x0080 ## $t1 = 00000080 -/* 04328 80ADD2B8 00080823 */ subu $at, $zero, $t0 -/* 0432C 80ADD2BC 0001C880 */ sll $t9, $at, 2 -/* 04330 80ADD2C0 0321C821 */ addu $t9, $t9, $at -/* 04334 80ADD2C4 0019C880 */ sll $t9, $t9, 2 +/* 04328 80ADD2B8 00080823 */ subu $at, $zero, $t0 +/* 0432C 80ADD2BC 0001C880 */ sll $t9, $at, 2 +/* 04330 80ADD2C0 0321C821 */ addu $t9, $t9, $at +/* 04334 80ADD2C4 0019C880 */ sll $t9, $t9, 2 /* 04338 80ADD2C8 332A01FF */ andi $t2, $t9, 0x01FF ## $t2 = 00000000 -/* 0433C 80ADD2CC AFAA0020 */ sw $t2, 0x0020($sp) -/* 04340 80ADD2D0 AFA90028 */ sw $t1, 0x0028($sp) -/* 04344 80ADD2D4 AFAB0024 */ sw $t3, 0x0024($sp) +/* 0433C 80ADD2CC AFAA0020 */ sw $t2, 0x0020($sp) +/* 04340 80ADD2D0 AFA90028 */ sw $t1, 0x0028($sp) +/* 04344 80ADD2D4 AFAB0024 */ sw $t3, 0x0024($sp) /* 04348 80ADD2D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0434C 80ADD2DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04350 80ADD2E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04354 80ADD2E4 0C0253D0 */ jal Draw_TwoTexScroll +/* 04354 80ADD2E4 0C0253D0 */ jal Draw_TwoTexScroll /* 04358 80ADD2E8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 0435C 80ADD2EC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 04360 80ADD2F0 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 @@ -184,138 +184,138 @@ glabel EnPoSisters_Draw /* 0437C 80ADD30C 922F0000 */ lbu $t7, 0x0000($s1) ## 00000000 /* 04380 80ADD310 92290002 */ lbu $t1, 0x0002($s1) ## 00000002 /* 04384 80ADD314 92380003 */ lbu $t8, 0x0003($s1) ## 00000003 -/* 04388 80ADD318 0008CC00 */ sll $t9, $t0, 16 -/* 0438C 80ADD31C 000F6E00 */ sll $t5, $t7, 24 +/* 04388 80ADD318 0008CC00 */ sll $t9, $t0, 16 +/* 0438C 80ADD31C 000F6E00 */ sll $t5, $t7, 24 /* 04390 80ADD320 01B95025 */ or $t2, $t5, $t9 ## $t2 = 00000000 -/* 04394 80ADD324 00096200 */ sll $t4, $t1, 8 +/* 04394 80ADD324 00096200 */ sll $t4, $t1, 8 /* 04398 80ADD328 014C7025 */ or $t6, $t2, $t4 ## $t6 = 00000008 /* 0439C 80ADD32C 01D84025 */ or $t0, $t6, $t8 ## $t0 = 00000008 /* 043A0 80ADD330 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 043A4 80ADD334 8E820190 */ lw $v0, 0x0190($s4) ## 00000190 /* 043A8 80ADD338 3C0B80AE */ lui $t3, %hi(func_80ADBD38) ## $t3 = 80AE0000 /* 043AC 80ADD33C 256BBD38 */ addiu $t3, $t3, %lo(func_80ADBD38) ## $t3 = 80ADBD38 -/* 043B0 80ADD340 14A20020 */ bne $a1, $v0, .L80ADD3C4 +/* 043B0 80ADD340 14A20020 */ bne $a1, $v0, .L80ADD3C4 /* 043B4 80ADD344 00000000 */ nop /* 043B8 80ADD348 8682019A */ lh $v0, 0x019A($s4) ## 0000019A /* 043BC 80ADD34C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 043C0 80ADD350 28410020 */ slti $at, $v0, 0x0020 -/* 043C4 80ADD354 1020000D */ beq $at, $zero, .L80ADD38C -/* 043C8 80ADD358 01A2C823 */ subu $t9, $t5, $v0 -/* 043CC 80ADD35C 03320019 */ multu $t9, $s2 -/* 043D0 80ADD360 0000A812 */ mflo $s5 -/* 043D4 80ADD364 06A10002 */ bgez $s5, .L80ADD370 -/* 043D8 80ADD368 02A00821 */ addu $at, $s5, $zero +/* 043C0 80ADD350 28410020 */ slti $at, $v0, 0x0020 +/* 043C4 80ADD354 1020000D */ beq $at, $zero, .L80ADD38C +/* 043C8 80ADD358 01A2C823 */ subu $t9, $t5, $v0 +/* 043CC 80ADD35C 03320019 */ multu $t9, $s2 +/* 043D0 80ADD360 0000A812 */ mflo $s5 +/* 043D4 80ADD364 06A10002 */ bgez $s5, .L80ADD370 +/* 043D8 80ADD368 02A00821 */ addu $at, $s5, $zero /* 043DC 80ADD36C 26A1001F */ addiu $at, $s5, 0x001F ## $at = FB00001F .L80ADD370: -/* 043E0 80ADD370 0001A943 */ sra $s5, $at, 5 +/* 043E0 80ADD370 0001A943 */ sra $s5, $at, 5 /* 043E4 80ADD374 3C0180AE */ lui $at, %hi(D_80ADD8A8) ## $at = 80AE0000 -/* 043E8 80ADD378 C434D8A8 */ lwc1 $f20, %lo(D_80ADD8A8)($at) +/* 043E8 80ADD378 C434D8A8 */ lwc1 $f20, %lo(D_80ADD8A8)($at) /* 043EC 80ADD37C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 043F0 80ADD380 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 043F4 80ADD384 10000040 */ beq $zero, $zero, .L80ADD488 +/* 043F4 80ADD384 10000040 */ beq $zero, $zero, .L80ADD488 /* 043F8 80ADD388 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000000 .L80ADD38C: -/* 043FC 80ADD38C 00520019 */ multu $v0, $s2 -/* 04400 80ADD390 0000A812 */ mflo $s5 +/* 043FC 80ADD38C 00520019 */ multu $v0, $s2 +/* 04400 80ADD390 0000A812 */ mflo $s5 /* 04404 80ADD394 26B5E020 */ addiu $s5, $s5, 0xE020 ## $s5 = FFFFE020 -/* 04408 80ADD398 06A10002 */ bgez $s5, .L80ADD3A4 -/* 0440C 80ADD39C 02A00821 */ addu $at, $s5, $zero +/* 04408 80ADD398 06A10002 */ bgez $s5, .L80ADD3A4 +/* 0440C 80ADD39C 02A00821 */ addu $at, $s5, $zero /* 04410 80ADD3A0 26A1001F */ addiu $at, $s5, 0x001F ## $at = FFFFE03F .L80ADD3A4: -/* 04414 80ADD3A4 0001A943 */ sra $s5, $at, 5 +/* 04414 80ADD3A4 0001A943 */ sra $s5, $at, 5 /* 04418 80ADD3A8 3C0180AE */ lui $at, %hi(D_80ADD8AC) ## $at = 80AE0000 /* 0441C 80ADD3AC 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000020 -/* 04420 80ADD3B0 C434D8AC */ lwc1 $f20, %lo(D_80ADD8AC)($at) +/* 04420 80ADD3B0 C434D8AC */ lwc1 $f20, %lo(D_80ADD8AC)($at) /* 04424 80ADD3B4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 04428 80ADD3B8 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 0442C 80ADD3BC 10000033 */ beq $zero, $zero, .L80ADD48C +/* 0442C 80ADD3BC 10000033 */ beq $zero, $zero, .L80ADD48C /* 04430 80ADD3C0 92990198 */ lbu $t9, 0x0198($s4) ## 00000198 .L80ADD3C4: -/* 04434 80ADD3C4 15620010 */ bne $t3, $v0, .L80ADD408 +/* 04434 80ADD3C4 15620010 */ bne $t3, $v0, .L80ADD408 /* 04438 80ADD3C8 3C0F80AE */ lui $t7, %hi(func_80ADBEE8) ## $t7 = 80AE0000 /* 0443C 80ADD3CC 8689019A */ lh $t1, 0x019A($s4) ## 0000019A /* 04440 80ADD3D0 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 04444 80ADD3D4 01496023 */ subu $t4, $t2, $t1 -/* 04448 80ADD3D8 01920019 */ multu $t4, $s2 -/* 0444C 80ADD3DC 0000A812 */ mflo $s5 -/* 04450 80ADD3E0 06A10002 */ bgez $s5, .L80ADD3EC -/* 04454 80ADD3E4 02A00821 */ addu $at, $s5, $zero +/* 04444 80ADD3D4 01496023 */ subu $t4, $t2, $t1 +/* 04448 80ADD3D8 01920019 */ multu $t4, $s2 +/* 0444C 80ADD3DC 0000A812 */ mflo $s5 +/* 04450 80ADD3E0 06A10002 */ bgez $s5, .L80ADD3EC +/* 04454 80ADD3E4 02A00821 */ addu $at, $s5, $zero /* 04458 80ADD3E8 26A1001F */ addiu $at, $s5, 0x001F ## $at = 0000003F .L80ADD3EC: -/* 0445C 80ADD3EC 0001A943 */ sra $s5, $at, 5 +/* 0445C 80ADD3EC 0001A943 */ sra $s5, $at, 5 /* 04460 80ADD3F0 3C0180AE */ lui $at, %hi(D_80ADD8B0) ## $at = 80AE0000 -/* 04464 80ADD3F4 C434D8B0 */ lwc1 $f20, %lo(D_80ADD8B0)($at) +/* 04464 80ADD3F4 C434D8B0 */ lwc1 $f20, %lo(D_80ADD8B0)($at) /* 04468 80ADD3F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0446C 80ADD3FC 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 04470 80ADD400 10000021 */ beq $zero, $zero, .L80ADD488 +/* 04470 80ADD400 10000021 */ beq $zero, $zero, .L80ADD488 /* 04474 80ADD404 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000020 .L80ADD408: /* 04478 80ADD408 25EFBEE8 */ addiu $t7, $t7, %lo(func_80ADBEE8) ## $t7 = 80ADBEE8 -/* 0447C 80ADD40C 15E20010 */ bne $t7, $v0, .L80ADD450 +/* 0447C 80ADD40C 15E20010 */ bne $t7, $v0, .L80ADD450 /* 04480 80ADD410 3C0D80AE */ lui $t5, %hi(func_80ADBC88) ## $t5 = 80AE0000 /* 04484 80ADD414 868E019A */ lh $t6, 0x019A($s4) ## 0000019A /* 04488 80ADD418 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 0448C 80ADD41C 030E4023 */ subu $t0, $t8, $t6 -/* 04490 80ADD420 01120019 */ multu $t0, $s2 -/* 04494 80ADD424 0000A812 */ mflo $s5 -/* 04498 80ADD428 06A10002 */ bgez $s5, .L80ADD434 -/* 0449C 80ADD42C 02A00821 */ addu $at, $s5, $zero +/* 0448C 80ADD41C 030E4023 */ subu $t0, $t8, $t6 +/* 04490 80ADD420 01120019 */ multu $t0, $s2 +/* 04494 80ADD424 0000A812 */ mflo $s5 +/* 04498 80ADD428 06A10002 */ bgez $s5, .L80ADD434 +/* 0449C 80ADD42C 02A00821 */ addu $at, $s5, $zero /* 044A0 80ADD430 26A1001F */ addiu $at, $s5, 0x001F ## $at = 0000003F .L80ADD434: -/* 044A4 80ADD434 0001A943 */ sra $s5, $at, 5 +/* 044A4 80ADD434 0001A943 */ sra $s5, $at, 5 /* 044A8 80ADD438 3C0180AE */ lui $at, %hi(D_80ADD8B4) ## $at = 80AE0000 -/* 044AC 80ADD43C C434D8B4 */ lwc1 $f20, %lo(D_80ADD8B4)($at) +/* 044AC 80ADD43C C434D8B4 */ lwc1 $f20, %lo(D_80ADD8B4)($at) /* 044B0 80ADD440 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 044B4 80ADD444 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 044B8 80ADD448 1000000F */ beq $zero, $zero, .L80ADD488 +/* 044B8 80ADD448 1000000F */ beq $zero, $zero, .L80ADD488 /* 044BC 80ADD44C 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000020 .L80ADD450: /* 044C0 80ADD450 25ADBC88 */ addiu $t5, $t5, %lo(func_80ADBC88) ## $t5 = 80ADBC88 -/* 044C4 80ADD454 15A20007 */ bne $t5, $v0, .L80ADD474 +/* 044C4 80ADD454 15A20007 */ bne $t5, $v0, .L80ADD474 /* 044C8 80ADD458 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 044CC 80ADD45C 3C0180AE */ lui $at, %hi(D_80ADD8B8) ## $at = 80AE0000 -/* 044D0 80ADD460 C434D8B8 */ lwc1 $f20, %lo(D_80ADD8B8)($at) +/* 044D0 80ADD460 C434D8B8 */ lwc1 $f20, %lo(D_80ADD8B8)($at) /* 044D4 80ADD464 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 044D8 80ADD468 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 044DC 80ADD46C 10000006 */ beq $zero, $zero, .L80ADD488 -/* 044E0 80ADD470 93B500E7 */ lbu $s5, 0x00E7($sp) +/* 044DC 80ADD46C 10000006 */ beq $zero, $zero, .L80ADD488 +/* 044E0 80ADD470 93B500E7 */ lbu $s5, 0x00E7($sp) .L80ADD474: /* 044E4 80ADD474 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 /* 044E8 80ADD478 C6840050 */ lwc1 $f4, 0x0050($s4) ## 00000050 -/* 044EC 80ADD47C 93B500E7 */ lbu $s5, 0x00E7($sp) -/* 044F0 80ADD480 46162502 */ mul.s $f20, $f4, $f22 +/* 044EC 80ADD47C 93B500E7 */ lbu $s5, 0x00E7($sp) +/* 044F0 80ADD480 46162502 */ mul.s $f20, $f4, $f22 /* 044F4 80ADD484 00000000 */ nop .L80ADD488: /* 044F8 80ADD488 92990198 */ lbu $t9, 0x0198($s4) ## 00000198 .L80ADD48C: /* 044FC 80ADD48C 3C0B80AE */ lui $t3, %hi(func_80ADAFC0) ## $t3 = 80AE0000 /* 04500 80ADD490 256BAFC0 */ addiu $t3, $t3, %lo(func_80ADAFC0) ## $t3 = 80ADAFC0 -/* 04504 80ADD494 1B200081 */ blez $t9, .L80ADD69C +/* 04504 80ADD494 1B200081 */ blez $t9, .L80ADD69C /* 04508 80ADD498 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 0450C 80ADD49C 3C0A0405 */ lui $t2, 0x0405 ## $t2 = 04050000 /* 04510 80ADD4A0 254AD4E0 */ addiu $t2, $t2, 0xD4E0 ## $t2 = 0404D4E0 /* 04514 80ADD4A4 3C0180AE */ lui $at, %hi(D_80ADD8BC) ## $at = 80AE0000 -/* 04518 80ADD4A8 C438D8BC */ lwc1 $f24, %lo(D_80ADD8BC)($at) -/* 0451C 80ADD4AC AFAA0078 */ sw $t2, 0x0078($sp) -/* 04520 80ADD4B0 AFAB007C */ sw $t3, 0x007C($sp) +/* 04518 80ADD4A8 C438D8BC */ lwc1 $f24, %lo(D_80ADD8BC)($at) +/* 0451C 80ADD4AC AFAA0078 */ sw $t2, 0x0078($sp) +/* 04520 80ADD4B0 AFAB007C */ sw $t3, 0x007C($sp) /* 04524 80ADD4B4 02809025 */ or $s2, $s4, $zero ## $s2 = 00000000 -/* 04528 80ADD4B8 AFA50084 */ sw $a1, 0x0084($sp) -/* 0452C 80ADD4BC 8FA50084 */ lw $a1, 0x0084($sp) +/* 04528 80ADD4B8 AFA50084 */ sw $a1, 0x0084($sp) +/* 0452C 80ADD4BC 8FA50084 */ lw $a1, 0x0084($sp) .L80ADD4C0: /* 04530 80ADD4C0 8E820190 */ lw $v0, 0x0190($s4) ## 00000190 /* 04534 80ADD4C4 3C0980AE */ lui $t1, %hi(func_80ADBD38) ## $t1 = 80AE0000 /* 04538 80ADD4C8 2529BD38 */ addiu $t1, $t1, %lo(func_80ADBD38) ## $t1 = 80ADBD38 -/* 0453C 80ADD4CC 10A2000C */ beq $a1, $v0, .L80ADD500 +/* 0453C 80ADD4CC 10A2000C */ beq $a1, $v0, .L80ADD500 /* 04540 80ADD4D0 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 -/* 04544 80ADD4D4 1122000A */ beq $t1, $v0, .L80ADD500 +/* 04544 80ADD4D4 1122000A */ beq $t1, $v0, .L80ADD500 /* 04548 80ADD4D8 3C0C80AE */ lui $t4, %hi(func_80ADBEE8) ## $t4 = 80AE0000 /* 0454C 80ADD4DC 258CBEE8 */ addiu $t4, $t4, %lo(func_80ADBEE8) ## $t4 = 80ADBEE8 -/* 04550 80ADD4E0 51820008 */ beql $t4, $v0, .L80ADD504 +/* 04550 80ADD4E0 51820008 */ beql $t4, $v0, .L80ADD504 /* 04554 80ADD4E4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 04558 80ADD4E8 0011A823 */ subu $s5, $zero, $s1 -/* 0455C 80ADD4EC 02A00821 */ addu $at, $s5, $zero -/* 04560 80ADD4F0 0015A940 */ sll $s5, $s5, 5 -/* 04564 80ADD4F4 02A1A823 */ subu $s5, $s5, $at +/* 04558 80ADD4E8 0011A823 */ subu $s5, $zero, $s1 +/* 0455C 80ADD4EC 02A00821 */ addu $at, $s5, $zero +/* 04560 80ADD4F0 0015A940 */ sll $s5, $s5, 5 +/* 04564 80ADD4F4 02A1A823 */ subu $s5, $s5, $at /* 04568 80ADD4F8 26B500F8 */ addiu $s5, $s5, 0x00F8 ## $s5 = 00000118 /* 0456C 80ADD4FC 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000018 .L80ADD500: @@ -336,70 +336,70 @@ glabel EnPoSisters_Draw /* 045A4 80ADD534 92E90001 */ lbu $t1, 0x0001($s7) ## 00000001 /* 045A8 80ADD538 92F90000 */ lbu $t9, 0x0000($s7) ## 00000000 /* 045AC 80ADD53C 92EE0002 */ lbu $t6, 0x0002($s7) ## 00000002 -/* 045B0 80ADD540 00096400 */ sll $t4, $t1, 16 -/* 045B4 80ADD544 00195E00 */ sll $t3, $t9, 24 +/* 045B0 80ADD540 00096400 */ sll $t4, $t1, 16 +/* 045B4 80ADD544 00195E00 */ sll $t3, $t9, 24 /* 045B8 80ADD548 016C7825 */ or $t7, $t3, $t4 ## $t7 = 80ADBFE8 -/* 045BC 80ADD54C 000E4200 */ sll $t0, $t6, 8 +/* 045BC 80ADD54C 000E4200 */ sll $t0, $t6, 8 /* 045C0 80ADD550 01E86825 */ or $t5, $t7, $t0 ## $t5 = FAADBFE8 /* 045C4 80ADD554 01A4C825 */ or $t9, $t5, $a0 ## $t9 = FAADBFF8 /* 045C8 80ADD558 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 045CC 80ADD55C 8E46023C */ lw $a2, 0x023C($s2) ## 0000023C /* 045D0 80ADD560 C64E0238 */ lwc1 $f14, 0x0238($s2) ## 00000238 /* 045D4 80ADD564 C64C0234 */ lwc1 $f12, 0x0234($s2) ## 00000234 -/* 045D8 80ADD568 0C034261 */ jal Matrix_Translate -/* 045DC 80ADD56C AFA50084 */ sw $a1, 0x0084($sp) +/* 045D8 80ADD568 0C034261 */ jal Matrix_Translate +/* 045DC 80ADD56C AFA50084 */ sw $a1, 0x0084($sp) /* 045E0 80ADD570 86CA07A0 */ lh $t2, 0x07A0($s6) ## 000007A0 -/* 045E4 80ADD574 000A4880 */ sll $t1, $t2, 2 -/* 045E8 80ADD578 02C95821 */ addu $t3, $s6, $t1 -/* 045EC 80ADD57C 0C016A7D */ jal func_8005A9F4 +/* 045E4 80ADD574 000A4880 */ sll $t1, $t2, 2 +/* 045E8 80ADD578 02C95821 */ addu $t3, $s6, $t1 +/* 045EC 80ADD57C 0C016A7D */ jal func_8005A9F4 /* 045F0 80ADD580 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 /* 045F4 80ADD584 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 045F8 80ADD588 00412821 */ addu $a1, $v0, $at -/* 045FC 80ADD58C 00052C00 */ sll $a1, $a1, 16 -/* 04600 80ADD590 00052C03 */ sra $a1, $a1, 16 +/* 045F8 80ADD588 00412821 */ addu $a1, $v0, $at +/* 045FC 80ADD58C 00052C00 */ sll $a1, $a1, 16 +/* 04600 80ADD590 00052C03 */ sra $a1, $a1, 16 /* 04604 80ADD594 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 04608 80ADD598 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0460C 80ADD59C 0C034421 */ jal Matrix_RotateXYZ +/* 0460C 80ADD59C 0C034421 */ jal Matrix_RotateZYX /* 04610 80ADD5A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04614 80ADD5A4 8FAC007C */ lw $t4, 0x007C($sp) +/* 04614 80ADD5A4 8FAC007C */ lw $t4, 0x007C($sp) /* 04618 80ADD5A8 8E980190 */ lw $t8, 0x0190($s4) ## 00000190 /* 0461C 80ADD5AC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04620 80ADD5B0 5598001C */ bnel $t4, $t8, .L80ADD624 -/* 04624 80ADD5B4 4406A000 */ mfc1 $a2, $f20 +/* 04620 80ADD5B0 5598001C */ bnel $t4, $t8, .L80ADD624 +/* 04624 80ADD5B4 4406A000 */ mfc1 $a2, $f20 /* 04628 80ADD5B8 868E019A */ lh $t6, 0x019A($s4) ## 0000019A /* 0462C 80ADD5BC 3C0180AE */ lui $at, %hi(D_80ADD8C0) ## $at = 80AE0000 -/* 04630 80ADD5C0 C42AD8C0 */ lwc1 $f10, %lo(D_80ADD8C0)($at) -/* 04634 80ADD5C4 01D17823 */ subu $t7, $t6, $s1 +/* 04630 80ADD5C0 C42AD8C0 */ lwc1 $f10, %lo(D_80ADD8C0)($at) +/* 04634 80ADD5C4 01D17823 */ subu $t7, $t6, $s1 /* 04638 80ADD5C8 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 /* 0463C 80ADD5CC 3C0180AE */ lui $at, %hi(D_80ADD8C4) ## $at = 80AE0000 -/* 04640 80ADD5D0 46803220 */ cvt.s.w $f8, $f6 -/* 04644 80ADD5D4 460A4402 */ mul.s $f16, $f8, $f10 -/* 04648 80ADD5D8 46168500 */ add.s $f20, $f16, $f22 -/* 0464C 80ADD5DC 4616A03C */ c.lt.s $f20, $f22 +/* 04640 80ADD5D0 46803220 */ cvt.s.w $f8, $f6 +/* 04644 80ADD5D4 460A4402 */ mul.s $f16, $f8, $f10 +/* 04648 80ADD5D8 46168500 */ add.s $f20, $f16, $f22 +/* 0464C 80ADD5DC 4616A03C */ c.lt.s $f20, $f22 /* 04650 80ADD5E0 00000000 */ nop -/* 04654 80ADD5E4 45020004 */ bc1fl .L80ADD5F8 -/* 04658 80ADD5E8 4614C03C */ c.lt.s $f24, $f20 -/* 0465C 80ADD5EC 10000009 */ beq $zero, $zero, .L80ADD614 -/* 04660 80ADD5F0 4600B006 */ mov.s $f0, $f22 -/* 04664 80ADD5F4 4614C03C */ c.lt.s $f24, $f20 +/* 04654 80ADD5E4 45020004 */ bc1fl .L80ADD5F8 +/* 04658 80ADD5E8 4614C03C */ c.lt.s $f24, $f20 +/* 0465C 80ADD5EC 10000009 */ beq $zero, $zero, .L80ADD614 +/* 04660 80ADD5F0 4600B006 */ mov.s $f0, $f22 +/* 04664 80ADD5F4 4614C03C */ c.lt.s $f24, $f20 .L80ADD5F8: /* 04668 80ADD5F8 00000000 */ nop -/* 0466C 80ADD5FC 45020004 */ bc1fl .L80ADD610 -/* 04670 80ADD600 4600A086 */ mov.s $f2, $f20 -/* 04674 80ADD604 10000002 */ beq $zero, $zero, .L80ADD610 -/* 04678 80ADD608 4600C086 */ mov.s $f2, $f24 -/* 0467C 80ADD60C 4600A086 */ mov.s $f2, $f20 +/* 0466C 80ADD5FC 45020004 */ bc1fl .L80ADD610 +/* 04670 80ADD600 4600A086 */ mov.s $f2, $f20 +/* 04674 80ADD604 10000002 */ beq $zero, $zero, .L80ADD610 +/* 04678 80ADD608 4600C086 */ mov.s $f2, $f24 +/* 0467C 80ADD60C 4600A086 */ mov.s $f2, $f20 .L80ADD610: -/* 04680 80ADD610 46001006 */ mov.s $f0, $f2 +/* 04680 80ADD610 46001006 */ mov.s $f0, $f2 .L80ADD614: -/* 04684 80ADD614 C432D8C4 */ lwc1 $f18, %lo(D_80ADD8C4)($at) -/* 04688 80ADD618 46120502 */ mul.s $f20, $f0, $f18 +/* 04684 80ADD614 C432D8C4 */ lwc1 $f18, %lo(D_80ADD8C4)($at) +/* 04688 80ADD618 46120502 */ mul.s $f20, $f0, $f18 /* 0468C 80ADD61C 00000000 */ nop -/* 04690 80ADD620 4406A000 */ mfc1 $a2, $f20 +/* 04690 80ADD620 4406A000 */ mfc1 $a2, $f20 .L80ADD624: -/* 04694 80ADD624 4600A306 */ mov.s $f12, $f20 -/* 04698 80ADD628 0C0342A3 */ jal Matrix_Scale -/* 0469C 80ADD62C 4600A386 */ mov.s $f14, $f20 +/* 04694 80ADD624 4600A306 */ mov.s $f12, $f20 +/* 04698 80ADD628 0C0342A3 */ jal Matrix_Scale +/* 0469C 80ADD62C 4600A386 */ mov.s $f14, $f20 /* 046A0 80ADD630 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 /* 046A4 80ADD634 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 /* 046A8 80ADD638 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 @@ -410,7 +410,7 @@ glabel EnPoSisters_Draw /* 046BC 80ADD64C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 046C0 80ADD650 24A5D858 */ addiu $a1, $a1, %lo(D_80ADD858) ## $a1 = 80ADD858 /* 046C4 80ADD654 24060C3C */ addiu $a2, $zero, 0x0C3C ## $a2 = 00000C3C -/* 046C8 80ADD658 0C0346A2 */ jal Matrix_NewMtx +/* 046C8 80ADD658 0C0346A2 */ jal Matrix_NewMtx /* 046CC 80ADD65C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 046D0 80ADD660 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 046D4 80ADD664 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 @@ -419,34 +419,34 @@ glabel EnPoSisters_Draw /* 046E0 80ADD670 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 046E4 80ADD674 AE7902D0 */ sw $t9, 0x02D0($s3) ## 000002D0 /* 046E8 80ADD678 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 046EC 80ADD67C 8FA90078 */ lw $t1, 0x0078($sp) +/* 046EC 80ADD67C 8FA90078 */ lw $t1, 0x0078($sp) /* 046F0 80ADD680 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 0000000C /* 046F4 80ADD684 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 046F8 80ADD688 8FAB00F4 */ lw $t3, 0x00F4($sp) +/* 046F8 80ADD688 8FAB00F4 */ lw $t3, 0x00F4($sp) /* 046FC 80ADD68C 916C0198 */ lbu $t4, 0x0198($t3) ## 00000198 -/* 04700 80ADD690 022C082A */ slt $at, $s1, $t4 -/* 04704 80ADD694 5420FF8A */ bnel $at, $zero, .L80ADD4C0 -/* 04708 80ADD698 8FA50084 */ lw $a1, 0x0084($sp) +/* 04700 80ADD690 022C082A */ slt $at, $s1, $t4 +/* 04704 80ADD694 5420FF8A */ bnel $at, $zero, .L80ADD4C0 +/* 04708 80ADD698 8FA50084 */ lw $a1, 0x0084($sp) .L80ADD69C: /* 0470C 80ADD69C 3C0680AE */ lui $a2, %hi(D_80ADD870) ## $a2 = 80AE0000 /* 04710 80ADD6A0 24C6D870 */ addiu $a2, $a2, %lo(D_80ADD870) ## $a2 = 80ADD870 /* 04714 80ADD6A4 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFCC /* 04718 80ADD6A8 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 0471C 80ADD6AC 0C031AD5 */ jal func_800C6B54 +/* 0471C 80ADD6AC 0C031AD5 */ jal func_800C6B54 /* 04720 80ADD6B0 24070C43 */ addiu $a3, $zero, 0x0C43 ## $a3 = 00000C43 -/* 04724 80ADD6B4 8FBF006C */ lw $ra, 0x006C($sp) -/* 04728 80ADD6B8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 0472C 80ADD6BC D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 04730 80ADD6C0 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 04734 80ADD6C4 8FB0004C */ lw $s0, 0x004C($sp) -/* 04738 80ADD6C8 8FB10050 */ lw $s1, 0x0050($sp) -/* 0473C 80ADD6CC 8FB20054 */ lw $s2, 0x0054($sp) -/* 04740 80ADD6D0 8FB30058 */ lw $s3, 0x0058($sp) -/* 04744 80ADD6D4 8FB4005C */ lw $s4, 0x005C($sp) -/* 04748 80ADD6D8 8FB50060 */ lw $s5, 0x0060($sp) -/* 0474C 80ADD6DC 8FB60064 */ lw $s6, 0x0064($sp) -/* 04750 80ADD6E0 8FB70068 */ lw $s7, 0x0068($sp) -/* 04754 80ADD6E4 03E00008 */ jr $ra +/* 04724 80ADD6B4 8FBF006C */ lw $ra, 0x006C($sp) +/* 04728 80ADD6B8 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 0472C 80ADD6BC D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 04730 80ADD6C0 D7B80040 */ ldc1 $f24, 0x0040($sp) +/* 04734 80ADD6C4 8FB0004C */ lw $s0, 0x004C($sp) +/* 04738 80ADD6C8 8FB10050 */ lw $s1, 0x0050($sp) +/* 0473C 80ADD6CC 8FB20054 */ lw $s2, 0x0054($sp) +/* 04740 80ADD6D0 8FB30058 */ lw $s3, 0x0058($sp) +/* 04744 80ADD6D4 8FB4005C */ lw $s4, 0x005C($sp) +/* 04748 80ADD6D8 8FB50060 */ lw $s5, 0x0060($sp) +/* 0474C 80ADD6DC 8FB60064 */ lw $s6, 0x0064($sp) +/* 04750 80ADD6E0 8FB70068 */ lw $s7, 0x0068($sp) +/* 04754 80ADD6E4 03E00008 */ jr $ra /* 04758 80ADD6E8 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 /* 0475C 80ADD6EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s index 8a16cb8b26..c223ed93c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s @@ -1,32 +1,32 @@ glabel EnRr_Draw /* 01D94 80AEA1D4 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 -/* 01D98 80AEA1D8 AFB30054 */ sw $s3, 0x0054($sp) +/* 01D98 80AEA1D8 AFB30054 */ sw $s3, 0x0054($sp) /* 01D9C 80AEA1DC 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 01DA0 80AEA1E0 AFBF005C */ sw $ra, 0x005C($sp) -/* 01DA4 80AEA1E4 AFB40058 */ sw $s4, 0x0058($sp) -/* 01DA8 80AEA1E8 AFB20050 */ sw $s2, 0x0050($sp) -/* 01DAC 80AEA1EC AFB1004C */ sw $s1, 0x004C($sp) -/* 01DB0 80AEA1F0 AFB00048 */ sw $s0, 0x0048($sp) -/* 01DB4 80AEA1F4 F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 01DB8 80AEA1F8 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 01DBC 80AEA1FC AFA500CC */ sw $a1, 0x00CC($sp) +/* 01DA0 80AEA1E0 AFBF005C */ sw $ra, 0x005C($sp) +/* 01DA4 80AEA1E4 AFB40058 */ sw $s4, 0x0058($sp) +/* 01DA8 80AEA1E8 AFB20050 */ sw $s2, 0x0050($sp) +/* 01DAC 80AEA1EC AFB1004C */ sw $s1, 0x004C($sp) +/* 01DB0 80AEA1F0 AFB00048 */ sw $s0, 0x0048($sp) +/* 01DB4 80AEA1F4 F7B60040 */ sdc1 $f22, 0x0040($sp) +/* 01DB8 80AEA1F8 F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 01DBC 80AEA1FC AFA500CC */ sw $a1, 0x00CC($sp) /* 01DC0 80AEA200 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 01DC4 80AEA204 0C031A73 */ jal Graph_Alloc - + /* 01DC8 80AEA208 24050100 */ addiu $a1, $zero, 0x0100 ## $a1 = 00000100 -/* 01DCC 80AEA20C 8FAF00CC */ lw $t7, 0x00CC($sp) +/* 01DCC 80AEA20C 8FAF00CC */ lw $t7, 0x00CC($sp) /* 01DD0 80AEA210 3C0680AF */ lui $a2, %hi(D_80AEA838) ## $a2 = 80AF0000 /* 01DD4 80AEA214 0040A025 */ or $s4, $v0, $zero ## $s4 = 00000000 /* 01DD8 80AEA218 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 01DDC 80AEA21C 24C6A838 */ addiu $a2, $a2, %lo(D_80AEA838) ## $a2 = 80AEA838 /* 01DE0 80AEA220 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFD0 /* 01DE4 80AEA224 240705C6 */ addiu $a3, $zero, 0x05C6 ## $a3 = 000005C6 -/* 01DE8 80AEA228 0C031AB1 */ jal func_800C6AC4 -/* 01DEC 80AEA22C AFA500A8 */ sw $a1, 0x00A8($sp) -/* 01DF0 80AEA230 8FB800CC */ lw $t8, 0x00CC($sp) -/* 01DF4 80AEA234 0C024F61 */ jal func_80093D84 +/* 01DE8 80AEA228 0C031AB1 */ jal func_800C6AC4 +/* 01DEC 80AEA22C AFA500A8 */ sw $a1, 0x00A8($sp) +/* 01DF0 80AEA230 8FB800CC */ lw $t8, 0x00CC($sp) +/* 01DF4 80AEA234 0C024F61 */ jal func_80093D84 /* 01DF8 80AEA238 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 01DFC 80AEA23C 8FA900A8 */ lw $t1, 0x00A8($sp) +/* 01DFC 80AEA23C 8FA900A8 */ lw $t1, 0x00A8($sp) /* 01E00 80AEA240 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 01E04 80AEA244 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 /* 01E08 80AEA248 8D2202D0 */ lw $v0, 0x02D0($t1) ## 000002D0 @@ -42,51 +42,51 @@ glabel EnRr_Draw /* 01E30 80AEA270 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01E34 80AEA274 AD2B02D0 */ sw $t3, 0x02D0($t1) ## 000002D0 /* 01E38 80AEA278 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01E3C 80AEA27C 8FAD00CC */ lw $t5, 0x00CC($sp) +/* 01E3C 80AEA27C 8FAD00CC */ lw $t5, 0x00CC($sp) /* 01E40 80AEA280 866301EC */ lh $v1, 0x01EC($s3) ## 000001EC /* 01E44 80AEA284 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 /* 01E48 80AEA288 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 01E4C 80AEA28C 00030823 */ subu $at, $zero, $v1 -/* 01E50 80AEA290 0001C880 */ sll $t9, $at, 2 -/* 01E54 80AEA294 0321C823 */ subu $t9, $t9, $at -/* 01E58 80AEA298 0019C840 */ sll $t9, $t9, 1 +/* 01E4C 80AEA28C 00030823 */ subu $at, $zero, $v1 +/* 01E50 80AEA290 0001C880 */ sll $t9, $at, 2 +/* 01E54 80AEA294 0321C823 */ subu $t9, $t9, $at +/* 01E58 80AEA298 0019C840 */ sll $t9, $t9, 1 /* 01E5C 80AEA29C 332A007F */ andi $t2, $t9, 0x007F ## $t2 = 00000008 /* 01E60 80AEA2A0 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 /* 01E64 80AEA2A4 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 01E68 80AEA2A8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01E6C 80AEA2AC AFB80018 */ sw $t8, 0x0018($sp) -/* 01E70 80AEA2B0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01E74 80AEA2B4 AFAB0024 */ sw $t3, 0x0024($sp) -/* 01E78 80AEA2B8 AFAA0020 */ sw $t2, 0x0020($sp) -/* 01E7C 80AEA2BC AFAC0028 */ sw $t4, 0x0028($sp) -/* 01E80 80AEA2C0 AFA7001C */ sw $a3, 0x001C($sp) -/* 01E84 80AEA2C4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 01E6C 80AEA2AC AFB80018 */ sw $t8, 0x0018($sp) +/* 01E70 80AEA2B0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01E74 80AEA2B4 AFAB0024 */ sw $t3, 0x0024($sp) +/* 01E78 80AEA2B8 AFAA0020 */ sw $t2, 0x0020($sp) +/* 01E7C 80AEA2BC AFAC0028 */ sw $t4, 0x0028($sp) +/* 01E80 80AEA2C0 AFA7001C */ sw $a3, 0x001C($sp) +/* 01E84 80AEA2C4 AFAE0010 */ sw $t6, 0x0010($sp) /* 01E88 80AEA2C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01E8C 80AEA2CC 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 /* 01E90 80AEA2D0 3006007F */ andi $a2, $zero, 0x007F ## $a2 = 00000000 -/* 01E94 80AEA2D4 0C0253D0 */ jal Draw_TwoTexScroll +/* 01E94 80AEA2D4 0C0253D0 */ jal Draw_TwoTexScroll /* 01E98 80AEA2D8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01E9C 80AEA2DC 0C034213 */ jal Matrix_Push +/* 01E9C 80AEA2DC 0C034213 */ jal Matrix_Push /* 01EA0 80AEA2E0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01EA4 80AEA2E4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01EA8 80AEA2E8 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 /* 01EAC 80AEA2EC C6660244 */ lwc1 $f6, 0x0244($s3) ## 00000244 /* 01EB0 80AEA2F0 C664022C */ lwc1 $f4, 0x022C($s3) ## 0000022C /* 01EB4 80AEA2F4 C6700248 */ lwc1 $f16, 0x0248($s3) ## 00000248 -/* 01EB8 80AEA2F8 4606B200 */ add.s $f8, $f22, $f6 +/* 01EB8 80AEA2F8 4606B200 */ add.s $f8, $f22, $f6 /* 01EBC 80AEA2FC C66A0230 */ lwc1 $f10, 0x0230($s3) ## 00000230 /* 01EC0 80AEA300 C6660234 */ lwc1 $f6, 0x0234($s3) ## 00000234 -/* 01EC4 80AEA304 4610B480 */ add.s $f18, $f22, $f16 -/* 01EC8 80AEA308 46082302 */ mul.s $f12, $f4, $f8 +/* 01EC4 80AEA304 4610B480 */ add.s $f18, $f22, $f16 +/* 01EC8 80AEA308 46082302 */ mul.s $f12, $f4, $f8 /* 01ECC 80AEA30C C664024C */ lwc1 $f4, 0x024C($s3) ## 0000024C /* 01ED0 80AEA310 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01ED4 80AEA314 46125382 */ mul.s $f14, $f10, $f18 -/* 01ED8 80AEA318 4604B200 */ add.s $f8, $f22, $f4 -/* 01EDC 80AEA31C 46083402 */ mul.s $f16, $f6, $f8 -/* 01EE0 80AEA320 44068000 */ mfc1 $a2, $f16 -/* 01EE4 80AEA324 0C0342A3 */ jal Matrix_Scale +/* 01ED4 80AEA314 46125382 */ mul.s $f14, $f10, $f18 +/* 01ED8 80AEA318 4604B200 */ add.s $f8, $f22, $f4 +/* 01EDC 80AEA31C 46083402 */ mul.s $f16, $f6, $f8 +/* 01EE0 80AEA320 44068000 */ mfc1 $a2, $f16 +/* 01EE4 80AEA324 0C0342A3 */ jal Matrix_Scale /* 01EE8 80AEA328 00000000 */ nop -/* 01EEC 80AEA32C 8FA300A8 */ lw $v1, 0x00A8($sp) +/* 01EEC 80AEA32C 8FA300A8 */ lw $v1, 0x00A8($sp) /* 01EF0 80AEA330 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 01EF4 80AEA334 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 01EF8 80AEA338 8C6202D0 */ lw $v0, 0x02D0($v1) ## 000002D0 @@ -95,67 +95,67 @@ glabel EnRr_Draw /* 01F04 80AEA344 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01F08 80AEA348 AC6D02D0 */ sw $t5, 0x02D0($v1) ## 000002D0 /* 01F0C 80AEA34C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01F10 80AEA350 8FAF00CC */ lw $t7, 0x00CC($sp) +/* 01F10 80AEA350 8FAF00CC */ lw $t7, 0x00CC($sp) /* 01F14 80AEA354 240605DD */ addiu $a2, $zero, 0x05DD ## $a2 = 000005DD /* 01F18 80AEA358 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01F1C 80AEA35C 0C0346A2 */ jal Matrix_NewMtx +/* 01F1C 80AEA35C 0C0346A2 */ jal Matrix_NewMtx /* 01F20 80AEA360 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01F24 80AEA364 0C034221 */ jal Matrix_Pull +/* 01F24 80AEA364 0C034221 */ jal Matrix_Pull /* 01F28 80AEA368 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01F2C 80AEA36C 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 01F30 80AEA370 2411000C */ addiu $s1, $zero, 0x000C ## $s1 = 0000000C /* 01F34 80AEA374 26720394 */ addiu $s2, $s3, 0x0394 ## $s2 = 00000394 /* 01F38 80AEA378 26700040 */ addiu $s0, $s3, 0x0040 ## $s0 = 00000040 -/* 01F3C 80AEA37C E7B400B8 */ swc1 $f20, 0x00B8($sp) -/* 01F40 80AEA380 E7B400BC */ swc1 $f20, 0x00BC($sp) -/* 01F44 80AEA384 E7B400C0 */ swc1 $f20, 0x00C0($sp) +/* 01F3C 80AEA37C E7B400B8 */ swc1 $f20, 0x00B8($sp) +/* 01F40 80AEA380 E7B400BC */ swc1 $f20, 0x00BC($sp) +/* 01F44 80AEA384 E7B400C0 */ swc1 $f20, 0x00C0($sp) .L80AEA388: /* 01F48 80AEA388 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01F4C 80AEA38C 44819000 */ mtc1 $at, $f18 ## $f18 = 1000.00 /* 01F50 80AEA390 C60A0224 */ lwc1 $f10, 0x0224($s0) ## 00000264 -/* 01F54 80AEA394 4406A000 */ mfc1 $a2, $f20 -/* 01F58 80AEA398 4600A306 */ mov.s $f12, $f20 +/* 01F54 80AEA394 4406A000 */ mfc1 $a2, $f20 +/* 01F58 80AEA398 4600A306 */ mov.s $f12, $f20 /* 01F5C 80AEA39C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01F60 80AEA3A0 0C034261 */ jal Matrix_Translate -/* 01F64 80AEA3A4 46125380 */ add.s $f14, $f10, $f18 +/* 01F60 80AEA3A0 0C034261 */ jal Matrix_Translate +/* 01F64 80AEA3A4 46125380 */ add.s $f14, $f10, $f18 /* 01F68 80AEA3A8 8604025C */ lh $a0, 0x025C($s0) ## 0000029C /* 01F6C 80AEA3AC 8605025E */ lh $a1, 0x025E($s0) ## 0000029E /* 01F70 80AEA3B0 86060260 */ lh $a2, 0x0260($s0) ## 000002A0 -/* 01F74 80AEA3B4 0C034421 */ jal Matrix_RotateXYZ +/* 01F74 80AEA3B4 0C034421 */ jal Matrix_RotateZYX /* 01F78 80AEA3B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01F7C 80AEA3BC 0C034213 */ jal Matrix_Push +/* 01F7C 80AEA3BC 0C034213 */ jal Matrix_Push /* 01F80 80AEA3C0 00000000 */ nop /* 01F84 80AEA3C4 C6060244 */ lwc1 $f6, 0x0244($s0) ## 00000284 /* 01F88 80AEA3C8 C604022C */ lwc1 $f4, 0x022C($s0) ## 0000026C /* 01F8C 80AEA3CC C60A0248 */ lwc1 $f10, 0x0248($s0) ## 00000288 -/* 01F90 80AEA3D0 4606B200 */ add.s $f8, $f22, $f6 +/* 01F90 80AEA3D0 4606B200 */ add.s $f8, $f22, $f6 /* 01F94 80AEA3D4 C6100230 */ lwc1 $f16, 0x0230($s0) ## 00000270 /* 01F98 80AEA3D8 C6060234 */ lwc1 $f6, 0x0234($s0) ## 00000274 -/* 01F9C 80AEA3DC 460AB480 */ add.s $f18, $f22, $f10 -/* 01FA0 80AEA3E0 46082302 */ mul.s $f12, $f4, $f8 +/* 01F9C 80AEA3DC 460AB480 */ add.s $f18, $f22, $f10 +/* 01FA0 80AEA3E0 46082302 */ mul.s $f12, $f4, $f8 /* 01FA4 80AEA3E4 C604024C */ lwc1 $f4, 0x024C($s0) ## 0000028C /* 01FA8 80AEA3E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01FAC 80AEA3EC 46128382 */ mul.s $f14, $f16, $f18 -/* 01FB0 80AEA3F0 4604B200 */ add.s $f8, $f22, $f4 -/* 01FB4 80AEA3F4 46083282 */ mul.s $f10, $f6, $f8 -/* 01FB8 80AEA3F8 44065000 */ mfc1 $a2, $f10 -/* 01FBC 80AEA3FC 0C0342A3 */ jal Matrix_Scale +/* 01FAC 80AEA3EC 46128382 */ mul.s $f14, $f16, $f18 +/* 01FB0 80AEA3F0 4604B200 */ add.s $f8, $f22, $f4 +/* 01FB4 80AEA3F4 46083282 */ mul.s $f10, $f6, $f8 +/* 01FB8 80AEA3F8 44065000 */ mfc1 $a2, $f10 +/* 01FBC 80AEA3FC 0C0342A3 */ jal Matrix_Scale /* 01FC0 80AEA400 00000000 */ nop /* 01FC4 80AEA404 3C0580AF */ lui $a1, %hi(D_80AEA858) ## $a1 = 80AF0000 /* 01FC8 80AEA408 24A5A858 */ addiu $a1, $a1, %lo(D_80AEA858) ## $a1 = 80AEA858 /* 01FCC 80AEA40C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01FD0 80AEA410 0C034695 */ jal Matrix_ToMtx +/* 01FD0 80AEA410 0C034695 */ jal Matrix_ToMtx /* 01FD4 80AEA414 240605F7 */ addiu $a2, $zero, 0x05F7 ## $a2 = 000005F7 -/* 01FD8 80AEA418 0C034221 */ jal Matrix_Pull +/* 01FD8 80AEA418 0C034221 */ jal Matrix_Pull /* 01FDC 80AEA41C 00000000 */ nop /* 01FE0 80AEA420 26940040 */ addiu $s4, $s4, 0x0040 ## $s4 = 00000040 /* 01FE4 80AEA424 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFF0 -/* 01FE8 80AEA428 0C0346BD */ jal Matrix_MultVec3f +/* 01FE8 80AEA428 0C0346BD */ jal Matrix_MultVec3f /* 01FEC 80AEA42C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000394 /* 01FF0 80AEA430 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 00000018 /* 01FF4 80AEA434 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C /* 01FF8 80AEA438 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 000003A0 -/* 01FFC 80AEA43C 1621FFD2 */ bne $s1, $at, .L80AEA388 +/* 01FFC 80AEA43C 1621FFD2 */ bne $s1, $at, .L80AEA388 /* 02000 80AEA440 26100040 */ addiu $s0, $s0, 0x0040 ## $s0 = 00000080 /* 02004 80AEA444 8E790024 */ lw $t9, 0x0024($s3) ## 00000024 /* 02008 80AEA448 8E780028 */ lw $t8, 0x0028($s3) ## 00000028 @@ -164,9 +164,9 @@ glabel EnRr_Draw /* 02014 80AEA454 8E79002C */ lw $t9, 0x002C($s3) ## 0000002C /* 02018 80AEA458 2665037C */ addiu $a1, $s3, 0x037C ## $a1 = 0000037C /* 0201C 80AEA45C AE78038C */ sw $t8, 0x038C($s3) ## 0000038C -/* 02020 80AEA460 0C0346BD */ jal Matrix_MultVec3f +/* 02020 80AEA460 0C0346BD */ jal Matrix_MultVec3f /* 02024 80AEA464 AE790390 */ sw $t9, 0x0390($s3) ## 00000390 -/* 02028 80AEA468 8FAA00A8 */ lw $t2, 0x00A8($sp) +/* 02028 80AEA468 8FAA00A8 */ lw $t2, 0x00A8($sp) /* 0202C 80AEA46C 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 /* 02030 80AEA470 25AD0470 */ addiu $t5, $t5, 0x0470 ## $t5 = 06000470 /* 02034 80AEA474 8D4202D0 */ lw $v0, 0x02D0($t2) ## 000002D0 @@ -176,108 +176,108 @@ glabel EnRr_Draw /* 02044 80AEA484 AD4B02D0 */ sw $t3, 0x02D0($t2) ## 000002D0 /* 02048 80AEA488 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 0204C 80AEA48C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 02050 80AEA490 8FAE00CC */ lw $t6, 0x00CC($sp) +/* 02050 80AEA490 8FAE00CC */ lw $t6, 0x00CC($sp) /* 02054 80AEA494 24C6A868 */ addiu $a2, $a2, %lo(D_80AEA868) ## $a2 = 80AEA868 /* 02058 80AEA498 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFD0 /* 0205C 80AEA49C 2407060F */ addiu $a3, $zero, 0x060F ## $a3 = 0000060F -/* 02060 80AEA4A0 0C031AD5 */ jal func_800C6B54 +/* 02060 80AEA4A0 0C031AD5 */ jal func_800C6B54 /* 02064 80AEA4A4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02068 80AEA4A8 866201F2 */ lh $v0, 0x01F2($s3) ## 000001F2 -/* 0206C 80AEA4AC 1040004F */ beq $v0, $zero, .L80AEA5EC +/* 0206C 80AEA4AC 1040004F */ beq $v0, $zero, .L80AEA5EC /* 02070 80AEA4B0 2450FFFF */ addiu $s0, $v0, 0xFFFF ## $s0 = FFFFFFFF /* 02074 80AEA4B4 926F0114 */ lbu $t7, 0x0114($s3) ## 00000114 -/* 02078 80AEA4B8 00108400 */ sll $s0, $s0, 16 -/* 0207C 80AEA4BC 00108403 */ sra $s0, $s0, 16 +/* 02078 80AEA4B8 00108400 */ sll $s0, $s0, 16 +/* 0207C 80AEA4BC 00108403 */ sra $s0, $s0, 16 /* 02080 80AEA4C0 32190001 */ andi $t9, $s0, 0x0001 ## $t9 = 00000001 /* 02084 80AEA4C4 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 02088 80AEA4C8 17200048 */ bne $t9, $zero, .L80AEA5EC +/* 02088 80AEA4C8 17200048 */ bne $t9, $zero, .L80AEA5EC /* 0208C 80AEA4CC A2780114 */ sb $t8, 0x0114($s3) ## 00000114 /* 02090 80AEA4D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02094 80AEA4D4 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 /* 02098 80AEA4D8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0209C 80AEA4DC 4600A306 */ mov.s $f12, $f20 -/* 020A0 80AEA4E0 00105883 */ sra $t3, $s0, 2 + +/* 0209C 80AEA4DC 4600A306 */ mov.s $f12, $f20 +/* 020A0 80AEA4E0 00105883 */ sra $t3, $s0, 2 /* 020A4 80AEA4E4 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 020A8 80AEA4E8 014B6023 */ subu $t4, $t2, $t3 +/* 020A8 80AEA4E8 014B6023 */ subu $t4, $t2, $t3 /* 020AC 80AEA4EC 2402000C */ addiu $v0, $zero, 0x000C ## $v0 = 0000000C -/* 020B0 80AEA4F0 01820019 */ multu $t4, $v0 -/* 020B4 80AEA4F4 00107043 */ sra $t6, $s0, 1 +/* 020B0 80AEA4F0 01820019 */ multu $t4, $v0 +/* 020B4 80AEA4F4 00107043 */ sra $t6, $s0, 1 /* 020B8 80AEA4F8 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 /* 020BC 80AEA4FC 3C1980AF */ lui $t9, %hi(D_80AEA6F0) ## $t9 = 80AF0000 /* 020C0 80AEA500 2739A6F0 */ addiu $t9, $t9, %lo(D_80AEA6F0) ## $t9 = 80AEA6F0 -/* 020C4 80AEA504 4600A306 */ mov.s $f12, $f20 -/* 020C8 80AEA508 00006812 */ mflo $t5 -/* 020CC 80AEA50C 026D8821 */ addu $s1, $s3, $t5 +/* 020C4 80AEA504 4600A306 */ mov.s $f12, $f20 +/* 020C8 80AEA508 00006812 */ mflo $t5 +/* 020CC 80AEA50C 026D8821 */ addu $s1, $s3, $t5 /* 020D0 80AEA510 C6300388 */ lwc1 $f16, 0x0388($s1) ## 000003A0 -/* 020D4 80AEA514 01E20019 */ multu $t7, $v0 -/* 020D8 80AEA518 0000C012 */ mflo $t8 -/* 020DC 80AEA51C 03199021 */ addu $s2, $t8, $t9 +/* 020D4 80AEA514 01E20019 */ multu $t7, $v0 +/* 020D8 80AEA518 0000C012 */ mflo $t8 +/* 020DC 80AEA51C 03199021 */ addu $s2, $t8, $t9 /* 020E0 80AEA520 C6520000 */ lwc1 $f18, 0x0000($s2) ## 000003A0 -/* 020E4 80AEA524 46128100 */ add.s $f4, $f16, $f18 -/* 020E8 80AEA528 46040180 */ add.s $f6, $f0, $f4 +/* 020E4 80AEA524 46128100 */ add.s $f4, $f16, $f18 +/* 020E8 80AEA528 46040180 */ add.s $f6, $f0, $f4 /* 020EC 80AEA52C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 020F0 80AEA530 E7A6007C */ swc1 $f6, 0x007C($sp) + +/* 020F0 80AEA530 E7A6007C */ swc1 $f6, 0x007C($sp) /* 020F4 80AEA534 C628038C */ lwc1 $f8, 0x038C($s1) ## 000003A4 /* 020F8 80AEA538 C64A0004 */ lwc1 $f10, 0x0004($s2) ## 000003A4 -/* 020FC 80AEA53C 4600A306 */ mov.s $f12, $f20 -/* 02100 80AEA540 460A4400 */ add.s $f16, $f8, $f10 -/* 02104 80AEA544 46100480 */ add.s $f18, $f0, $f16 +/* 020FC 80AEA53C 4600A306 */ mov.s $f12, $f20 +/* 02100 80AEA540 460A4400 */ add.s $f16, $f8, $f10 +/* 02104 80AEA544 46100480 */ add.s $f18, $f0, $f16 /* 02108 80AEA548 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0210C 80AEA54C E7B20080 */ swc1 $f18, 0x0080($sp) + +/* 0210C 80AEA54C E7B20080 */ swc1 $f18, 0x0080($sp) /* 02110 80AEA550 C6240390 */ lwc1 $f4, 0x0390($s1) ## 000003A8 /* 02114 80AEA554 C6460008 */ lwc1 $f6, 0x0008($s2) ## 000003A8 -/* 02118 80AEA558 8FA400CC */ lw $a0, 0x00CC($sp) +/* 02118 80AEA558 8FA400CC */ lw $a0, 0x00CC($sp) /* 0211C 80AEA55C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 02120 80AEA560 46062200 */ add.s $f8, $f4, $f6 +/* 02120 80AEA560 46062200 */ add.s $f8, $f4, $f6 /* 02124 80AEA564 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFB4 /* 02128 80AEA568 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 0212C 80AEA56C 240D0096 */ addiu $t5, $zero, 0x0096 ## $t5 = 00000096 -/* 02130 80AEA570 46080280 */ add.s $f10, $f0, $f8 +/* 02130 80AEA570 46080280 */ add.s $f10, $f0, $f8 /* 02134 80AEA574 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 /* 02138 80AEA578 240F00FA */ addiu $t7, $zero, 0x00FA ## $t7 = 000000FA /* 0213C 80AEA57C 241800EB */ addiu $t8, $zero, 0x00EB ## $t8 = 000000EB -/* 02140 80AEA580 E7AA0084 */ swc1 $f10, 0x0084($sp) +/* 02140 80AEA580 E7AA0084 */ swc1 $f10, 0x0084($sp) /* 02144 80AEA584 966A0112 */ lhu $t2, 0x0112($s3) ## 00000112 /* 02148 80AEA588 241900F5 */ addiu $t9, $zero, 0x00F5 ## $t9 = 000000F5 /* 0214C 80AEA58C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 02150 80AEA590 314B4000 */ andi $t3, $t2, 0x4000 ## $t3 = 00000000 -/* 02154 80AEA594 1160000C */ beq $t3, $zero, .L80AEA5C8 +/* 02154 80AEA594 1160000C */ beq $t3, $zero, .L80AEA5C8 /* 02158 80AEA598 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF /* 0215C 80AEA59C 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 02160 80AEA5A0 AFAC0018 */ sw $t4, 0x0018($sp) -/* 02164 80AEA5A4 8FA400CC */ lw $a0, 0x00CC($sp) +/* 02160 80AEA5A0 AFAC0018 */ sw $t4, 0x0018($sp) +/* 02164 80AEA5A4 8FA400CC */ lw $a0, 0x00CC($sp) /* 02168 80AEA5A8 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 0216C 80AEA5AC 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFB4 /* 02170 80AEA5B0 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 02174 80AEA5B4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02178 80AEA5B8 0C00A935 */ jal func_8002A4D4 -/* 0217C 80AEA5BC AFA00014 */ sw $zero, 0x0014($sp) -/* 02180 80AEA5C0 1000000B */ beq $zero, $zero, .L80AEA5F0 -/* 02184 80AEA5C4 8FBF005C */ lw $ra, 0x005C($sp) +/* 02174 80AEA5B4 AFA00010 */ sw $zero, 0x0010($sp) +/* 02178 80AEA5B8 0C00A935 */ jal func_8002A4D4 +/* 0217C 80AEA5BC AFA00014 */ sw $zero, 0x0014($sp) +/* 02180 80AEA5C0 1000000B */ beq $zero, $zero, .L80AEA5F0 +/* 02184 80AEA5C4 8FBF005C */ lw $ra, 0x005C($sp) .L80AEA5C8: /* 02188 80AEA5C8 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -/* 0218C 80AEA5CC AFAD0010 */ sw $t5, 0x0010($sp) -/* 02190 80AEA5D0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02194 80AEA5D4 AFAF0018 */ sw $t7, 0x0018($sp) -/* 02198 80AEA5D8 AFB8001C */ sw $t8, 0x001C($sp) -/* 0219C 80AEA5DC AFB90020 */ sw $t9, 0x0020($sp) -/* 021A0 80AEA5E0 AFAA0024 */ sw $t2, 0x0024($sp) -/* 021A4 80AEA5E4 0C00A850 */ jal func_8002A140 -/* 021A8 80AEA5E8 E7B00028 */ swc1 $f16, 0x0028($sp) +/* 0218C 80AEA5CC AFAD0010 */ sw $t5, 0x0010($sp) +/* 02190 80AEA5D0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02194 80AEA5D4 AFAF0018 */ sw $t7, 0x0018($sp) +/* 02198 80AEA5D8 AFB8001C */ sw $t8, 0x001C($sp) +/* 0219C 80AEA5DC AFB90020 */ sw $t9, 0x0020($sp) +/* 021A0 80AEA5E0 AFAA0024 */ sw $t2, 0x0024($sp) +/* 021A4 80AEA5E4 0C00A850 */ jal func_8002A140 +/* 021A8 80AEA5E8 E7B00028 */ swc1 $f16, 0x0028($sp) .L80AEA5EC: -/* 021AC 80AEA5EC 8FBF005C */ lw $ra, 0x005C($sp) +/* 021AC 80AEA5EC 8FBF005C */ lw $ra, 0x005C($sp) .L80AEA5F0: -/* 021B0 80AEA5F0 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 021B4 80AEA5F4 D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 021B8 80AEA5F8 8FB00048 */ lw $s0, 0x0048($sp) -/* 021BC 80AEA5FC 8FB1004C */ lw $s1, 0x004C($sp) -/* 021C0 80AEA600 8FB20050 */ lw $s2, 0x0050($sp) -/* 021C4 80AEA604 8FB30054 */ lw $s3, 0x0054($sp) -/* 021C8 80AEA608 8FB40058 */ lw $s4, 0x0058($sp) -/* 021CC 80AEA60C 03E00008 */ jr $ra +/* 021B0 80AEA5F0 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 021B4 80AEA5F4 D7B60040 */ ldc1 $f22, 0x0040($sp) +/* 021B8 80AEA5F8 8FB00048 */ lw $s0, 0x0048($sp) +/* 021BC 80AEA5FC 8FB1004C */ lw $s1, 0x004C($sp) +/* 021C0 80AEA600 8FB20050 */ lw $s2, 0x0050($sp) +/* 021C4 80AEA604 8FB30054 */ lw $s3, 0x0054($sp) +/* 021C8 80AEA608 8FB40058 */ lw $s4, 0x0058($sp) +/* 021CC 80AEA60C 03E00008 */ jr $ra /* 021D0 80AEA610 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 /* 021D4 80AEA614 00000000 */ nop /* 021D8 80AEA618 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s index 6fab572f0c..843af339ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s @@ -1,36 +1,36 @@ glabel func_80B01360 /* 030B0 80B01360 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 030B4 80B01364 AFBF001C */ sw $ra, 0x001C($sp) -/* 030B8 80B01368 AFB00018 */ sw $s0, 0x0018($sp) -/* 030BC 80B0136C AFA40040 */ sw $a0, 0x0040($sp) -/* 030C0 80B01370 AFA50044 */ sw $a1, 0x0044($sp) -/* 030C4 80B01374 AFA60048 */ sw $a2, 0x0048($sp) -/* 030C8 80B01378 AFA7004C */ sw $a3, 0x004C($sp) +/* 030B4 80B01364 AFBF001C */ sw $ra, 0x001C($sp) +/* 030B8 80B01368 AFB00018 */ sw $s0, 0x0018($sp) +/* 030BC 80B0136C AFA40040 */ sw $a0, 0x0040($sp) +/* 030C0 80B01370 AFA50044 */ sw $a1, 0x0044($sp) +/* 030C4 80B01374 AFA60048 */ sw $a2, 0x0048($sp) +/* 030C8 80B01378 AFA7004C */ sw $a3, 0x004C($sp) /* 030CC 80B0137C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 030D0 80B01380 3C0680B0 */ lui $a2, %hi(D_80B01830) ## $a2 = 80B00000 /* 030D4 80B01384 24C61830 */ addiu $a2, $a2, %lo(D_80B01830) ## $a2 = 80B01830 /* 030D8 80B01388 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 030DC 80B0138C 24070971 */ addiu $a3, $zero, 0x0971 ## $a3 = 00000971 -/* 030E0 80B01390 0C031AB1 */ jal func_800C6AC4 +/* 030E0 80B01390 0C031AB1 */ jal func_800C6AC4 /* 030E4 80B01394 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 030E8 80B01398 8FAF0044 */ lw $t7, 0x0044($sp) +/* 030E8 80B01398 8FAF0044 */ lw $t7, 0x0044($sp) /* 030EC 80B0139C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B /* 030F0 80B013A0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 030F4 80B013A4 55E10028 */ bnel $t7, $at, .L80B01448 -/* 030F8 80B013A8 8FAF0040 */ lw $t7, 0x0040($sp) +/* 030F4 80B013A4 55E10028 */ bnel $t7, $at, .L80B01448 +/* 030F8 80B013A8 8FAF0040 */ lw $t7, 0x0040($sp) /* 030FC 80B013AC 9718F556 */ lhu $t8, -0x0AAA($t8) ## 8015F556 -/* 03100 80B013B0 8FA80040 */ lw $t0, 0x0040($sp) +/* 03100 80B013B0 8FA80040 */ lw $t0, 0x0040($sp) /* 03104 80B013B4 33190200 */ andi $t9, $t8, 0x0200 ## $t9 = 00000000 -/* 03108 80B013B8 53200023 */ beql $t9, $zero, .L80B01448 -/* 0310C 80B013BC 8FAF0040 */ lw $t7, 0x0040($sp) -/* 03110 80B013C0 0C024F46 */ jal func_80093D18 +/* 03108 80B013B8 53200023 */ beql $t9, $zero, .L80B01448 +/* 0310C 80B013BC 8FAF0040 */ lw $t7, 0x0040($sp) +/* 03110 80B013C0 0C024F46 */ jal func_80093D18 /* 03114 80B013C4 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 03118 80B013C8 0C034213 */ jal Matrix_Push +/* 03118 80B013C8 0C034213 */ jal Matrix_Push /* 0311C 80B013CC 00000000 */ nop /* 03120 80B013D0 2404C000 */ addiu $a0, $zero, 0xC000 ## $a0 = FFFFC000 /* 03124 80B013D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03128 80B013D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0312C 80B013DC 0C034421 */ jal Matrix_RotateXYZ +/* 0312C 80B013DC 0C034421 */ jal Matrix_RotateZYX /* 03130 80B013E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 03134 80B013E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03138 80B013E8 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 @@ -38,14 +38,14 @@ glabel func_80B01360 /* 03140 80B013F0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 03144 80B013F4 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 03148 80B013F8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0314C 80B013FC 8FAB0040 */ lw $t3, 0x0040($sp) +/* 0314C 80B013FC 8FAB0040 */ lw $t3, 0x0040($sp) /* 03150 80B01400 3C0580B0 */ lui $a1, %hi(D_80B01840) ## $a1 = 80B00000 /* 03154 80B01404 24A51840 */ addiu $a1, $a1, %lo(D_80B01840) ## $a1 = 80B01840 /* 03158 80B01408 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 0315C 80B0140C 2406097E */ addiu $a2, $zero, 0x097E ## $a2 = 0000097E -/* 03160 80B01410 0C0346A2 */ jal Matrix_NewMtx -/* 03164 80B01414 AFA20028 */ sw $v0, 0x0028($sp) -/* 03168 80B01418 8FA30028 */ lw $v1, 0x0028($sp) +/* 03160 80B01410 0C0346A2 */ jal Matrix_NewMtx +/* 03164 80B01414 AFA20028 */ sw $v0, 0x0028($sp) +/* 03168 80B01418 8FA30028 */ lw $v1, 0x0028($sp) /* 0316C 80B0141C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 /* 03170 80B01420 25CE14C8 */ addiu $t6, $t6, 0x14C8 ## $t6 = 060014C8 /* 03174 80B01424 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -54,20 +54,20 @@ glabel func_80B01360 /* 03180 80B01430 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 03184 80B01434 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 03188 80B01438 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0318C 80B0143C 0C034221 */ jal Matrix_Pull +/* 0318C 80B0143C 0C034221 */ jal Matrix_Pull /* 03190 80B01440 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03194 80B01444 8FAF0040 */ lw $t7, 0x0040($sp) +/* 03194 80B01444 8FAF0040 */ lw $t7, 0x0040($sp) .L80B01448: /* 03198 80B01448 3C0680B0 */ lui $a2, %hi(D_80B01850) ## $a2 = 80B00000 /* 0319C 80B0144C 24C61850 */ addiu $a2, $a2, %lo(D_80B01850) ## $a2 = 80B01850 /* 031A0 80B01450 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 031A4 80B01454 24070985 */ addiu $a3, $zero, 0x0985 ## $a3 = 00000985 -/* 031A8 80B01458 0C031AD5 */ jal func_800C6B54 +/* 031A8 80B01458 0C031AD5 */ jal func_800C6B54 /* 031AC 80B0145C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 031B0 80B01460 8FBF001C */ lw $ra, 0x001C($sp) -/* 031B4 80B01464 8FB00018 */ lw $s0, 0x0018($sp) +/* 031B0 80B01460 8FBF001C */ lw $ra, 0x001C($sp) +/* 031B4 80B01464 8FB00018 */ lw $s0, 0x0018($sp) /* 031B8 80B01468 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 031BC 80B0146C 03E00008 */ jr $ra +/* 031BC 80B0146C 03E00008 */ jr $ra /* 031C0 80B01470 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s index 7513cb160c..2686f2c953 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s @@ -1,21 +1,21 @@ glabel EnVm_Draw /* 011B8 80B2E618 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 011BC 80B2E61C AFB20028 */ sw $s2, 0x0028($sp) +/* 011BC 80B2E61C AFB20028 */ sw $s2, 0x0028($sp) /* 011C0 80B2E620 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 011C4 80B2E624 AFBF002C */ sw $ra, 0x002C($sp) -/* 011C8 80B2E628 AFB10024 */ sw $s1, 0x0024($sp) -/* 011CC 80B2E62C AFB00020 */ sw $s0, 0x0020($sp) +/* 011C4 80B2E624 AFBF002C */ sw $ra, 0x002C($sp) +/* 011C8 80B2E628 AFB10024 */ sw $s1, 0x0024($sp) +/* 011CC 80B2E62C AFB00020 */ sw $s0, 0x0020($sp) /* 011D0 80B2E630 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 011D4 80B2E634 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 011D8 80B2E638 3C0680B3 */ lui $a2, %hi(D_80B2EBBC) ## $a2 = 80B30000 /* 011DC 80B2E63C 24C6EBBC */ addiu $a2, $a2, %lo(D_80B2EBBC) ## $a2 = 80B2EBBC /* 011E0 80B2E640 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 011E4 80B2E644 240703F6 */ addiu $a3, $zero, 0x03F6 ## $a3 = 000003F6 -/* 011E8 80B2E648 0C031AB1 */ jal func_800C6AC4 +/* 011E8 80B2E648 0C031AB1 */ jal func_800C6AC4 /* 011EC 80B2E64C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 011F0 80B2E650 0C024F46 */ jal func_80093D18 +/* 011F0 80B2E650 0C024F46 */ jal func_80093D18 /* 011F4 80B2E654 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 011F8 80B2E658 0C024F61 */ jal func_80093D84 +/* 011F8 80B2E658 0C024F61 */ jal func_80093D84 /* 011FC 80B2E65C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01200 80B2E660 3C0E80B3 */ lui $t6, %hi(func_80B2E340) ## $t6 = 80B30000 /* 01204 80B2E664 25CEE340 */ addiu $t6, $t6, %lo(func_80B2E340) ## $t6 = 80B2E340 @@ -23,10 +23,10 @@ glabel EnVm_Draw /* 0120C 80B2E66C 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 01210 80B2E670 3C0780B3 */ lui $a3, %hi(func_80B2E2D8) ## $a3 = 80B30000 /* 01214 80B2E674 24E7E2D8 */ addiu $a3, $a3, %lo(func_80B2E2D8) ## $a3 = 80B2E2D8 -/* 01218 80B2E678 AFB10014 */ sw $s1, 0x0014($sp) -/* 0121C 80B2E67C AFAE0010 */ sw $t6, 0x0010($sp) +/* 01218 80B2E678 AFB10014 */ sw $s1, 0x0014($sp) +/* 0121C 80B2E67C AFAE0010 */ sw $t6, 0x0010($sp) /* 01220 80B2E680 0C028572 */ jal SkelAnime_Draw - + /* 01224 80B2E684 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01228 80B2E688 8E380024 */ lw $t8, 0x0024($s1) ## 00000024 /* 0122C 80B2E68C 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC @@ -38,25 +38,25 @@ glabel EnVm_Draw /* 01244 80B2E6A4 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF0 /* 01248 80B2E6A8 8E38002C */ lw $t8, 0x002C($s1) ## 0000002C /* 0124C 80B2E6AC 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 -/* 01250 80B2E6B0 0C00CF0C */ jal func_80033C30 +/* 01250 80B2E6B0 0C00CF0C */ jal func_80033C30 /* 01254 80B2E6B4 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF4 /* 01258 80B2E6B8 86390260 */ lh $t9, 0x0260($s1) ## 00000260 /* 0125C 80B2E6BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01260 80B2E6C0 2B210003 */ slti $at, $t9, 0x0003 -/* 01264 80B2E6C4 14200088 */ bne $at, $zero, .L80B2E8E8 +/* 01260 80B2E6C0 2B210003 */ slti $at, $t9, 0x0003 +/* 01264 80B2E6C4 14200088 */ bne $at, $zero, .L80B2E8E8 /* 01268 80B2E6C8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0126C 80B2E6CC 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 01270 80B2E6D0 C6240240 */ lwc1 $f4, 0x0240($s1) ## 00000240 /* 01274 80B2E6D4 C62C023C */ lwc1 $f12, 0x023C($s1) ## 0000023C /* 01278 80B2E6D8 8E260244 */ lw $a2, 0x0244($s1) ## 00000244 -/* 0127C 80B2E6DC 0C034261 */ jal Matrix_Translate -/* 01280 80B2E6E0 46062380 */ add.s $f14, $f4, $f6 +/* 0127C 80B2E6DC 0C034261 */ jal Matrix_Translate +/* 01280 80B2E6E0 46062380 */ add.s $f14, $f4, $f6 /* 01284 80B2E6E4 3C0180B3 */ lui $at, %hi(D_80B2EC30) ## $at = 80B30000 -/* 01288 80B2E6E8 C42CEC30 */ lwc1 $f12, %lo(D_80B2EC30)($at) +/* 01288 80B2E6E8 C42CEC30 */ lwc1 $f12, %lo(D_80B2EC30)($at) /* 0128C 80B2E6EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01290 80B2E6F0 44066000 */ mfc1 $a2, $f12 -/* 01294 80B2E6F4 0C0342A3 */ jal Matrix_Scale -/* 01298 80B2E6F8 46006386 */ mov.s $f14, $f12 +/* 01290 80B2E6F0 44066000 */ mfc1 $a2, $f12 +/* 01294 80B2E6F4 0C0342A3 */ jal Matrix_Scale +/* 01298 80B2E6F8 46006386 */ mov.s $f14, $f12 /* 0129C 80B2E6FC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 012A0 80B2E700 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 /* 012A4 80B2E704 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 @@ -67,9 +67,9 @@ glabel EnVm_Draw /* 012B8 80B2E718 3C0580B3 */ lui $a1, %hi(D_80B2EBCC) ## $a1 = 80B30000 /* 012BC 80B2E71C 24A5EBCC */ addiu $a1, $a1, %lo(D_80B2EBCC) ## $a1 = 80B2EBCC /* 012C0 80B2E720 24060409 */ addiu $a2, $zero, 0x0409 ## $a2 = 00000409 -/* 012C4 80B2E724 0C0346A2 */ jal Matrix_NewMtx -/* 012C8 80B2E728 AFA20064 */ sw $v0, 0x0064($sp) -/* 012CC 80B2E72C 8FA30064 */ lw $v1, 0x0064($sp) +/* 012C4 80B2E724 0C0346A2 */ jal Matrix_NewMtx +/* 012C8 80B2E728 AFA20064 */ sw $v0, 0x0064($sp) +/* 012CC 80B2E72C 8FA30064 */ lw $v1, 0x0064($sp) /* 012D0 80B2E730 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 /* 012D4 80B2E734 240DFFA8 */ addiu $t5, $zero, 0xFFA8 ## $t5 = FFFFFFA8 /* 012D8 80B2E738 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -78,7 +78,7 @@ glabel EnVm_Draw /* 012E4 80B2E744 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 012E8 80B2E748 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 012EC 80B2E74C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 012F0 80B2E750 0C0252F1 */ jal func_80094BC4 +/* 012F0 80B2E750 0C0252F1 */ jal func_80094BC4 /* 012F4 80B2E754 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 012F8 80B2E758 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 012FC 80B2E75C 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -93,26 +93,26 @@ glabel EnVm_Draw /* 01320 80B2E780 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01324 80B2E784 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 01328 80B2E788 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0132C 80B2E78C 02414021 */ addu $t0, $s2, $at +/* 0132C 80B2E78C 02414021 */ addu $t0, $s2, $at /* 01330 80B2E790 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 01334 80B2E794 8D0A1DE4 */ lw $t2, 0x1DE4($t0) ## 00001DE4 /* 01338 80B2E798 3C0480B3 */ lui $a0, %hi(D_80B2EB88) ## $a0 = 80B30000 /* 0133C 80B2E79C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 01340 80B2E7A0 314B0007 */ andi $t3, $t2, 0x0007 ## $t3 = 00000000 -/* 01344 80B2E7A4 000B6080 */ sll $t4, $t3, 2 -/* 01348 80B2E7A8 008C2021 */ addu $a0, $a0, $t4 -/* 0134C 80B2E7AC 8C84EB88 */ lw $a0, %lo(D_80B2EB88)($a0) +/* 01344 80B2E7A4 000B6080 */ sll $t4, $t3, 2 +/* 01348 80B2E7A8 008C2021 */ addu $a0, $a0, $t4 +/* 0134C 80B2E7AC 8C84EB88 */ lw $a0, %lo(D_80B2EB88)($a0) /* 01350 80B2E7B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01354 80B2E7B4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01358 80B2E7B8 00047100 */ sll $t6, $a0, 4 -/* 0135C 80B2E7BC 000E7F02 */ srl $t7, $t6, 28 -/* 01360 80B2E7C0 000FC080 */ sll $t8, $t7, 2 -/* 01364 80B2E7C4 0338C821 */ addu $t9, $t9, $t8 +/* 01358 80B2E7B8 00047100 */ sll $t6, $a0, 4 +/* 0135C 80B2E7BC 000E7F02 */ srl $t7, $t6, 28 +/* 01360 80B2E7C0 000FC080 */ sll $t8, $t7, 2 +/* 01364 80B2E7C4 0338C821 */ addu $t9, $t9, $t8 /* 01368 80B2E7C8 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 -/* 0136C 80B2E7CC 00816824 */ and $t5, $a0, $at +/* 0136C 80B2E7CC 00816824 */ and $t5, $a0, $at /* 01370 80B2E7D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01374 80B2E7D4 01B94821 */ addu $t1, $t5, $t9 -/* 01378 80B2E7D8 01215021 */ addu $t2, $t1, $at +/* 01374 80B2E7D4 01B94821 */ addu $t1, $t5, $t9 +/* 01378 80B2E7D8 01215021 */ addu $t2, $t1, $at /* 0137C 80B2E7DC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 01380 80B2E7E0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01384 80B2E7E4 3C070403 */ lui $a3, 0x0403 ## $a3 = 04030000 @@ -123,14 +123,14 @@ glabel EnVm_Draw /* 01398 80B2E7F8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 0139C 80B2E7FC AC470004 */ sw $a3, 0x0004($v0) ## 00000004 /* 013A0 80B2E800 3C0180B3 */ lui $at, %hi(D_80B2EC34) ## $at = 80B30000 -/* 013A4 80B2E804 C42CEC34 */ lwc1 $f12, %lo(D_80B2EC34)($at) -/* 013A8 80B2E808 AFA80034 */ sw $t0, 0x0034($sp) -/* 013AC 80B2E80C AFA70038 */ sw $a3, 0x0038($sp) -/* 013B0 80B2E810 0C034348 */ jal Matrix_RotateY +/* 013A4 80B2E804 C42CEC34 */ lwc1 $f12, %lo(D_80B2EC34)($at) +/* 013A8 80B2E808 AFA80034 */ sw $t0, 0x0034($sp) +/* 013AC 80B2E80C AFA70038 */ sw $a3, 0x0038($sp) +/* 013B0 80B2E810 0C034348 */ jal Matrix_RotateY /* 013B4 80B2E814 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 013B8 80B2E818 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 013BC 80B2E81C 8FA70038 */ lw $a3, 0x0038($sp) -/* 013C0 80B2E820 8FA80034 */ lw $t0, 0x0034($sp) +/* 013BC 80B2E81C 8FA70038 */ lw $a3, 0x0038($sp) +/* 013C0 80B2E820 8FA80034 */ lw $t0, 0x0034($sp) /* 013C4 80B2E824 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 013C8 80B2E828 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 013CC 80B2E82C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 @@ -140,13 +140,13 @@ glabel EnVm_Draw /* 013DC 80B2E83C 3C0580B3 */ lui $a1, %hi(D_80B2EBDC) ## $a1 = 80B30000 /* 013E0 80B2E840 24A5EBDC */ addiu $a1, $a1, %lo(D_80B2EBDC) ## $a1 = 80B2EBDC /* 013E4 80B2E844 24060414 */ addiu $a2, $zero, 0x0414 ## $a2 = 00000414 -/* 013E8 80B2E848 AFA20050 */ sw $v0, 0x0050($sp) -/* 013EC 80B2E84C AFA70038 */ sw $a3, 0x0038($sp) -/* 013F0 80B2E850 0C0346A2 */ jal Matrix_NewMtx -/* 013F4 80B2E854 AFA80034 */ sw $t0, 0x0034($sp) -/* 013F8 80B2E858 8FA30050 */ lw $v1, 0x0050($sp) -/* 013FC 80B2E85C 8FA70038 */ lw $a3, 0x0038($sp) -/* 01400 80B2E860 8FA80034 */ lw $t0, 0x0034($sp) +/* 013E8 80B2E848 AFA20050 */ sw $v0, 0x0050($sp) +/* 013EC 80B2E84C AFA70038 */ sw $a3, 0x0038($sp) +/* 013F0 80B2E850 0C0346A2 */ jal Matrix_NewMtx +/* 013F4 80B2E854 AFA80034 */ sw $t0, 0x0034($sp) +/* 013F8 80B2E858 8FA30050 */ lw $v1, 0x0050($sp) +/* 013FC 80B2E85C 8FA70038 */ lw $a3, 0x0038($sp) +/* 01400 80B2E860 8FA80034 */ lw $t0, 0x0034($sp) /* 01404 80B2E864 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01408 80B2E868 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0140C 80B2E86C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -159,20 +159,20 @@ glabel EnVm_Draw /* 01428 80B2E888 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 0142C 80B2E88C 27290004 */ addiu $t1, $t9, 0x0004 ## $t1 = 00000004 /* 01430 80B2E890 312A0007 */ andi $t2, $t1, 0x0007 ## $t2 = 00000004 -/* 01434 80B2E894 000A5880 */ sll $t3, $t2, 2 -/* 01438 80B2E898 008B2021 */ addu $a0, $a0, $t3 -/* 0143C 80B2E89C 8C84EB88 */ lw $a0, %lo(D_80B2EB88)($a0) +/* 01434 80B2E894 000A5880 */ sll $t3, $t2, 2 +/* 01438 80B2E898 008B2021 */ addu $a0, $a0, $t3 +/* 0143C 80B2E89C 8C84EB88 */ lw $a0, %lo(D_80B2EB88)($a0) /* 01440 80B2E8A0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01444 80B2E8A4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01448 80B2E8A8 00047100 */ sll $t6, $a0, 4 -/* 0144C 80B2E8AC 000E7F02 */ srl $t7, $t6, 28 -/* 01450 80B2E8B0 000FC080 */ sll $t8, $t7, 2 -/* 01454 80B2E8B4 01B86821 */ addu $t5, $t5, $t8 +/* 01448 80B2E8A8 00047100 */ sll $t6, $a0, 4 +/* 0144C 80B2E8AC 000E7F02 */ srl $t7, $t6, 28 +/* 01450 80B2E8B0 000FC080 */ sll $t8, $t7, 2 +/* 01454 80B2E8B4 01B86821 */ addu $t5, $t5, $t8 /* 01458 80B2E8B8 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 -/* 0145C 80B2E8BC 00816024 */ and $t4, $a0, $at +/* 0145C 80B2E8BC 00816024 */ and $t4, $a0, $at /* 01460 80B2E8C0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01464 80B2E8C4 018DC821 */ addu $t9, $t4, $t5 -/* 01468 80B2E8C8 03214821 */ addu $t1, $t9, $at +/* 01464 80B2E8C4 018DC821 */ addu $t9, $t4, $t5 +/* 01468 80B2E8C8 03214821 */ addu $t1, $t9, $at /* 0146C 80B2E8CC AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 01470 80B2E8D0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01474 80B2E8D4 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 @@ -190,32 +190,32 @@ glabel EnVm_Draw /* 014A0 80B2E900 8626025A */ lh $a2, 0x025A($s1) ## 0000025A /* 014A4 80B2E904 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 014A8 80B2E908 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 014AC 80B2E90C 0C02539E */ jal func_80094E78 -/* 014B0 80B2E910 AFA20044 */ sw $v0, 0x0044($sp) -/* 014B4 80B2E914 8FA30044 */ lw $v1, 0x0044($sp) +/* 014AC 80B2E90C 0C02539E */ jal func_80094E78 +/* 014B0 80B2E910 AFA20044 */ sw $v0, 0x0044($sp) +/* 014B4 80B2E914 8FA30044 */ lw $v1, 0x0044($sp) /* 014B8 80B2E918 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 014BC 80B2E91C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 014C0 80B2E920 8E26022C */ lw $a2, 0x022C($s1) ## 0000022C /* 014C4 80B2E924 C62E0228 */ lwc1 $f14, 0x0228($s1) ## 00000228 -/* 014C8 80B2E928 0C034261 */ jal Matrix_Translate +/* 014C8 80B2E928 0C034261 */ jal Matrix_Translate /* 014CC 80B2E92C C62C0224 */ lwc1 $f12, 0x0224($s1) ## 00000224 /* 014D0 80B2E930 86240254 */ lh $a0, 0x0254($s1) ## 00000254 /* 014D4 80B2E934 86250256 */ lh $a1, 0x0256($s1) ## 00000256 /* 014D8 80B2E938 86260258 */ lh $a2, 0x0258($s1) ## 00000258 -/* 014DC 80B2E93C 0C034421 */ jal Matrix_RotateXYZ +/* 014DC 80B2E93C 0C034421 */ jal Matrix_RotateZYX /* 014E0 80B2E940 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 014E4 80B2E944 3C0180B3 */ lui $at, %hi(D_80B2EC38) ## $at = 80B30000 -/* 014E8 80B2E948 C42AEC38 */ lwc1 $f10, %lo(D_80B2EC38)($at) +/* 014E8 80B2E948 C42AEC38 */ lwc1 $f10, %lo(D_80B2EC38)($at) /* 014EC 80B2E94C C6280248 */ lwc1 $f8, 0x0248($s1) ## 00000248 /* 014F0 80B2E950 3C0180B3 */ lui $at, %hi(D_80B2EC3C) ## $at = 80B30000 -/* 014F4 80B2E954 C432EC3C */ lwc1 $f18, %lo(D_80B2EC3C)($at) -/* 014F8 80B2E958 460A4302 */ mul.s $f12, $f8, $f10 +/* 014F4 80B2E954 C432EC3C */ lwc1 $f18, %lo(D_80B2EC3C)($at) +/* 014F8 80B2E958 460A4302 */ mul.s $f12, $f8, $f10 /* 014FC 80B2E95C C6300250 */ lwc1 $f16, 0x0250($s1) ## 00000250 /* 01500 80B2E960 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01504 80B2E964 46128102 */ mul.s $f4, $f16, $f18 -/* 01508 80B2E968 46006386 */ mov.s $f14, $f12 -/* 0150C 80B2E96C 44062000 */ mfc1 $a2, $f4 -/* 01510 80B2E970 0C0342A3 */ jal Matrix_Scale +/* 01504 80B2E964 46128102 */ mul.s $f4, $f16, $f18 +/* 01508 80B2E968 46006386 */ mov.s $f14, $f12 +/* 0150C 80B2E96C 44062000 */ mfc1 $a2, $f4 +/* 01510 80B2E970 0C0342A3 */ jal Matrix_Scale /* 01514 80B2E974 00000000 */ nop /* 01518 80B2E978 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0151C 80B2E97C 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -227,7 +227,7 @@ glabel EnVm_Draw /* 01534 80B2E994 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01538 80B2E998 24A5EBEC */ addiu $a1, $a1, %lo(D_80B2EBEC) ## $a1 = 80B2EBEC /* 0153C 80B2E99C 24060427 */ addiu $a2, $zero, 0x0427 ## $a2 = 00000427 -/* 01540 80B2E9A0 0C0346A2 */ jal Matrix_NewMtx +/* 01540 80B2E9A0 0C0346A2 */ jal Matrix_NewMtx /* 01544 80B2E9A4 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 01548 80B2E9A8 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 0154C 80B2E9AC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -242,13 +242,13 @@ glabel EnVm_Draw /* 01570 80B2E9D0 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 01574 80B2E9D4 24C6EBFC */ addiu $a2, $a2, %lo(D_80B2EBFC) ## $a2 = 80B2EBFC /* 01578 80B2E9D8 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 -/* 0157C 80B2E9DC 0C031AD5 */ jal func_800C6B54 +/* 0157C 80B2E9DC 0C031AD5 */ jal func_800C6B54 /* 01580 80B2E9E0 2407042C */ addiu $a3, $zero, 0x042C ## $a3 = 0000042C -/* 01584 80B2E9E4 8FBF002C */ lw $ra, 0x002C($sp) -/* 01588 80B2E9E8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0158C 80B2E9EC 8FB10024 */ lw $s1, 0x0024($sp) -/* 01590 80B2E9F0 8FB20028 */ lw $s2, 0x0028($sp) -/* 01594 80B2E9F4 03E00008 */ jr $ra +/* 01584 80B2E9E4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01588 80B2E9E8 8FB00020 */ lw $s0, 0x0020($sp) +/* 0158C 80B2E9EC 8FB10024 */ lw $s1, 0x0024($sp) +/* 01590 80B2E9F0 8FB20028 */ lw $s2, 0x0028($sp) +/* 01594 80B2E9F4 03E00008 */ jr $ra /* 01598 80B2E9F8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 0159C 80B2E9FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s index 2179cbe576..83eae285b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s @@ -1,32 +1,32 @@ glabel func_80B402C4 /* 040E4 80B402C4 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 040E8 80B402C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 040EC 80B402CC AFB10028 */ sw $s1, 0x0028($sp) -/* 040F0 80B402D0 AFB00024 */ sw $s0, 0x0024($sp) -/* 040F4 80B402D4 AFA5009C */ sw $a1, 0x009C($sp) +/* 040E8 80B402C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 040EC 80B402CC AFB10028 */ sw $s1, 0x0028($sp) +/* 040F0 80B402D0 AFB00024 */ sw $s0, 0x0024($sp) +/* 040F4 80B402D4 AFA5009C */ sw $a1, 0x009C($sp) /* 040F8 80B402D8 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 040FC 80B402DC 3C0F80B4 */ lui $t7, %hi(D_80B41D6C) ## $t7 = 80B40000 /* 04100 80B402E0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 04104 80B402E4 00027080 */ sll $t6, $v0, 2 -/* 04108 80B402E8 01EE7821 */ addu $t7, $t7, $t6 -/* 0410C 80B402EC 8DEF1D6C */ lw $t7, %lo(D_80B41D6C)($t7) +/* 04104 80B402E4 00027080 */ sll $t6, $v0, 2 +/* 04108 80B402E8 01EE7821 */ addu $t7, $t7, $t6 +/* 0410C 80B402EC 8DEF1D6C */ lw $t7, %lo(D_80B41D6C)($t7) /* 04110 80B402F0 3C0680B4 */ lui $a2, %hi(D_80B42070) ## $a2 = 80B40000 /* 04114 80B402F4 24C62070 */ addiu $a2, $a2, %lo(D_80B42070) ## $a2 = 80B42070 -/* 04118 80B402F8 AFAF0088 */ sw $t7, 0x0088($sp) +/* 04118 80B402F8 AFAF0088 */ sw $t7, 0x0088($sp) /* 0411C 80B402FC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 04120 80B40300 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 /* 04124 80B40304 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 -/* 04128 80B40308 0C031AB1 */ jal func_800C6AC4 +/* 04128 80B40308 0C031AB1 */ jal func_800C6AC4 /* 0412C 80B4030C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04130 80B40310 8E3902BC */ lw $t9, 0x02BC($s1) ## 000002BC /* 04134 80B40314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04138 80B40318 53200060 */ beql $t9, $zero, .L80B4049C +/* 04138 80B40318 53200060 */ beql $t9, $zero, .L80B4049C /* 0413C 80B4031C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04140 80B40320 0C031A73 */ jal Graph_Alloc - + /* 04144 80B40324 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 04148 80B40328 0C034213 */ jal Matrix_Push -/* 0414C 80B4032C AFA20064 */ sw $v0, 0x0064($sp) +/* 04148 80B40328 0C034213 */ jal Matrix_Push +/* 0414C 80B4032C AFA20064 */ sw $v0, 0x0064($sp) /* 04150 80B40330 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 04154 80B40334 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 04158 80B40338 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -36,42 +36,42 @@ glabel func_80B402C4 /* 04168 80B40348 84491476 */ lh $t1, 0x1476($v0) ## 80161476 /* 0416C 80B4034C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 /* 04170 80B40350 3C0180B4 */ lui $at, %hi(D_80B42258) ## $at = 80B40000 -/* 04174 80B40354 C4322258 */ lwc1 $f18, %lo(D_80B42258)($at) -/* 04178 80B40358 468021A0 */ cvt.s.w $f6, $f4 +/* 04174 80B40354 C4322258 */ lwc1 $f18, %lo(D_80B42258)($at) +/* 04178 80B40358 468021A0 */ cvt.s.w $f6, $f4 /* 0417C 80B4035C 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 /* 04180 80B40360 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 /* 04184 80B40364 3C0180B4 */ lui $at, %hi(D_80B4225C) ## $at = 80B40000 /* 04188 80B40368 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0418C 80B4036C 46805420 */ cvt.s.w $f16, $f10 -/* 04190 80B40370 46083300 */ add.s $f12, $f6, $f8 -/* 04194 80B40374 C428225C */ lwc1 $f8, %lo(D_80B4225C)($at) -/* 04198 80B40378 468021A0 */ cvt.s.w $f6, $f4 -/* 0419C 80B4037C 46128380 */ add.s $f14, $f16, $f18 -/* 041A0 80B40380 46083280 */ add.s $f10, $f6, $f8 -/* 041A4 80B40384 44065000 */ mfc1 $a2, $f10 -/* 041A8 80B40388 0C034261 */ jal Matrix_Translate +/* 0418C 80B4036C 46805420 */ cvt.s.w $f16, $f10 +/* 04190 80B40370 46083300 */ add.s $f12, $f6, $f8 +/* 04194 80B40374 C428225C */ lwc1 $f8, %lo(D_80B4225C)($at) +/* 04198 80B40378 468021A0 */ cvt.s.w $f6, $f4 +/* 0419C 80B4037C 46128380 */ add.s $f14, $f16, $f18 +/* 041A0 80B40380 46083280 */ add.s $f10, $f6, $f8 +/* 041A4 80B40384 44065000 */ mfc1 $a2, $f10 +/* 041A8 80B40388 0C034261 */ jal Matrix_Translate /* 041AC 80B4038C 00000000 */ nop /* 041B0 80B40390 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 041B4 80B40394 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 041B8 80B40398 862602A4 */ lh $a2, 0x02A4($s1) ## 000002A4 /* 041BC 80B4039C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 041C0 80B403A0 84441480 */ lh $a0, 0x1480($v0) ## 80161480 -/* 041C4 80B403A4 0C034421 */ jal Matrix_RotateXYZ +/* 041C4 80B403A4 0C034421 */ jal Matrix_RotateZYX /* 041C8 80B403A8 84451482 */ lh $a1, 0x1482($v0) ## 80161482 /* 041CC 80B403AC 26220298 */ addiu $v0, $s1, 0x0298 ## $v0 = 00000298 /* 041D0 80B403B0 C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000298 /* 041D4 80B403B4 C44E0004 */ lwc1 $f14, 0x0004($v0) ## 0000029C /* 041D8 80B403B8 8C460008 */ lw $a2, 0x0008($v0) ## 000002A0 -/* 041DC 80B403BC 0C0342A3 */ jal Matrix_Scale +/* 041DC 80B403BC 0C0342A3 */ jal Matrix_Scale /* 041E0 80B403C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 041E4 80B403C4 3C0580B4 */ lui $a1, %hi(D_80B42088) ## $a1 = 80B40000 /* 041E8 80B403C8 24A52088 */ addiu $a1, $a1, %lo(D_80B42088) ## $a1 = 80B42088 -/* 041EC 80B403CC 8FA40064 */ lw $a0, 0x0064($sp) -/* 041F0 80B403D0 0C034695 */ jal Matrix_ToMtx +/* 041EC 80B403CC 8FA40064 */ lw $a0, 0x0064($sp) +/* 041F0 80B403D0 0C034695 */ jal Matrix_ToMtx /* 041F4 80B403D4 2406025A */ addiu $a2, $zero, 0x025A ## $a2 = 0000025A -/* 041F8 80B403D8 0C034221 */ jal Matrix_Pull +/* 041F8 80B403D8 0C034221 */ jal Matrix_Pull /* 041FC 80B403DC 00000000 */ nop -/* 04200 80B403E0 0C024F61 */ jal func_80093D84 +/* 04200 80B403E0 0C024F61 */ jal func_80093D84 /* 04204 80B403E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04208 80B403E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0420C 80B403EC 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 @@ -86,7 +86,7 @@ glabel func_80B402C4 /* 04230 80B40410 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 /* 04234 80B40414 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 /* 04238 80B40418 01C17825 */ or $t7, $t6, $at ## $t7 = FFFF0000 -/* 0423C 80B4041C 00194200 */ sll $t0, $t9, 8 +/* 0423C 80B4041C 00194200 */ sll $t0, $t9, 8 /* 04240 80B40420 01E84825 */ or $t1, $t7, $t0 ## $t1 = FFFF0000 /* 04244 80B40424 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 04248 80B40428 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -99,7 +99,7 @@ glabel func_80B402C4 /* 04264 80B40444 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 /* 04268 80B40448 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 /* 0426C 80B4044C 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000080 -/* 04270 80B40450 000D7400 */ sll $t6, $t5, 16 +/* 04270 80B40450 000D7400 */ sll $t6, $t5, 16 /* 04274 80B40454 01C1C025 */ or $t8, $t6, $at ## $t8 = FF000000 /* 04278 80B40458 37190080 */ ori $t9, $t8, 0x0080 ## $t9 = FF000080 /* 0427C 80B4045C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 @@ -109,7 +109,7 @@ glabel func_80B402C4 /* 0428C 80B4046C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 04290 80B40470 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 04294 80B40474 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 04298 80B40478 8FA90064 */ lw $t1, 0x0064($sp) +/* 04298 80B40478 8FA90064 */ lw $t1, 0x0064($sp) /* 0429C 80B4047C 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 /* 042A0 80B40480 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 042A4 80B40484 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -119,32 +119,32 @@ glabel func_80B402C4 /* 042B4 80B40494 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 042B8 80B40498 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80B4049C: -/* 042BC 80B4049C 8FA5009C */ lw $a1, 0x009C($sp) -/* 042C0 80B404A0 0C00BAF3 */ jal func_8002EBCC +/* 042BC 80B4049C 8FA5009C */ lw $a1, 0x009C($sp) +/* 042C0 80B404A0 0C00BAF3 */ jal func_8002EBCC /* 042C4 80B404A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 042C8 80B404A8 8FAD009C */ lw $t5, 0x009C($sp) -/* 042CC 80B404AC 0C024F46 */ jal func_80093D18 +/* 042C8 80B404A8 8FAD009C */ lw $t5, 0x009C($sp) +/* 042CC 80B404AC 0C024F46 */ jal func_80093D18 /* 042D0 80B404B0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 042D4 80B404B4 8FA70088 */ lw $a3, 0x0088($sp) +/* 042D4 80B404B4 8FA70088 */ lw $a3, 0x0088($sp) /* 042D8 80B404B8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 042DC 80B404BC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 042E0 80B404C0 0007C900 */ sll $t9, $a3, 4 -/* 042E4 80B404C4 00197F02 */ srl $t7, $t9, 28 +/* 042E0 80B404C0 0007C900 */ sll $t9, $a3, 4 +/* 042E4 80B404C4 00197F02 */ srl $t7, $t9, 28 /* 042E8 80B404C8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 042EC 80B404CC 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 042F0 80B404D0 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 042F4 80B404D4 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 042F8 80B404D8 000F4080 */ sll $t0, $t7, 2 +/* 042F8 80B404D8 000F4080 */ sll $t0, $t7, 2 /* 042FC 80B404DC 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 04300 80B404E0 01092021 */ addu $a0, $t0, $t1 +/* 04300 80B404E0 01092021 */ addu $a0, $t0, $t1 /* 04304 80B404E4 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 04308 80B404E8 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 0430C 80B404EC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 04310 80B404F0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 04314 80B404F4 00E12824 */ and $a1, $a3, $at +/* 04314 80B404F4 00E12824 */ and $a1, $a3, $at /* 04318 80B404F8 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 0431C 80B404FC 01455821 */ addu $t3, $t2, $a1 -/* 04320 80B40500 01666021 */ addu $t4, $t3, $a2 +/* 0431C 80B404FC 01455821 */ addu $t3, $t2, $a1 +/* 04320 80B40500 01666021 */ addu $t4, $t3, $a2 /* 04324 80B40504 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 /* 04328 80B40508 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 0432C 80B4050C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -155,8 +155,8 @@ glabel func_80B402C4 /* 04340 80B40520 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 04344 80B40524 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C /* 04348 80B40528 3C0980B4 */ lui $t1, %hi(func_80B40248) ## $t1 = 80B40000 -/* 0434C 80B4052C 0305C821 */ addu $t9, $t8, $a1 -/* 04350 80B40530 03267821 */ addu $t7, $t9, $a2 +/* 0434C 80B4052C 0305C821 */ addu $t9, $t8, $a1 +/* 04350 80B40530 03267821 */ addu $t7, $t9, $a2 /* 04354 80B40534 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 /* 04358 80B40538 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 0435C 80B4053C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C @@ -164,21 +164,21 @@ glabel func_80B402C4 /* 04364 80B40544 3C0880B4 */ lui $t0, %hi(func_80B40224) ## $t0 = 80B40000 /* 04368 80B40548 25080224 */ addiu $t0, $t0, %lo(func_80B40224) ## $t0 = 80B40224 /* 0436C 80B4054C 25290248 */ addiu $t1, $t1, %lo(func_80B40248) ## $t1 = 80B40248 -/* 04370 80B40550 AFA90014 */ sw $t1, 0x0014($sp) -/* 04374 80B40554 AFA80010 */ sw $t0, 0x0010($sp) -/* 04378 80B40558 AFB10018 */ sw $s1, 0x0018($sp) -/* 0437C 80B4055C 0C0286B2 */ jal func_800A1AC8 -/* 04380 80B40560 8FA4009C */ lw $a0, 0x009C($sp) +/* 04370 80B40550 AFA90014 */ sw $t1, 0x0014($sp) +/* 04374 80B40554 AFA80010 */ sw $t0, 0x0010($sp) +/* 04378 80B40558 AFB10018 */ sw $s1, 0x0018($sp) +/* 0437C 80B4055C 0C0286B2 */ jal func_800A1AC8 +/* 04380 80B40560 8FA4009C */ lw $a0, 0x009C($sp) /* 04384 80B40564 3C0680B4 */ lui $a2, %hi(D_80B420A0) ## $a2 = 80B40000 /* 04388 80B40568 24C620A0 */ addiu $a2, $a2, %lo(D_80B420A0) ## $a2 = 80B420A0 /* 0438C 80B4056C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 /* 04390 80B40570 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04394 80B40574 0C031AD5 */ jal func_800C6B54 +/* 04394 80B40574 0C031AD5 */ jal func_800C6B54 /* 04398 80B40578 2407029C */ addiu $a3, $zero, 0x029C ## $a3 = 0000029C -/* 0439C 80B4057C 8FBF002C */ lw $ra, 0x002C($sp) -/* 043A0 80B40580 8FB00024 */ lw $s0, 0x0024($sp) -/* 043A4 80B40584 8FB10028 */ lw $s1, 0x0028($sp) -/* 043A8 80B40588 03E00008 */ jr $ra +/* 0439C 80B4057C 8FBF002C */ lw $ra, 0x002C($sp) +/* 043A0 80B40580 8FB00024 */ lw $s0, 0x0024($sp) +/* 043A4 80B40584 8FB10028 */ lw $s1, 0x0028($sp) +/* 043A8 80B40588 03E00008 */ jr $ra /* 043AC 80B4058C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s index 5263100779..2d46c24417 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s @@ -1,72 +1,72 @@ glabel func_80B4F45C /* 00ACC 80B4F45C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00AD0 80B4F460 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 00AD4 80B4F464 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80B4F468 AFA40080 */ sw $a0, 0x0080($sp) -/* 00ADC 80B4F46C AFA60088 */ sw $a2, 0x0088($sp) -/* 00AE0 80B4F470 14A101BB */ bne $a1, $at, .L80B4FB60 -/* 00AE4 80B4F474 AFA7008C */ sw $a3, 0x008C($sp) +/* 00AD4 80B4F464 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AD8 80B4F468 AFA40080 */ sw $a0, 0x0080($sp) +/* 00ADC 80B4F46C AFA60088 */ sw $a2, 0x0088($sp) +/* 00AE0 80B4F470 14A101BB */ bne $a1, $at, .L80B4FB60 +/* 00AE4 80B4F474 AFA7008C */ sw $a3, 0x008C($sp) /* 00AE8 80B4F478 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 /* 00AEC 80B4F47C 0C031A73 */ jal Graph_Alloc - + /* 00AF0 80B4F480 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 00AF4 80B4F484 8FA50098 */ lw $a1, 0x0098($sp) -/* 00AF8 80B4F488 AFA20074 */ sw $v0, 0x0074($sp) +/* 00AF4 80B4F484 8FA50098 */ lw $a1, 0x0098($sp) +/* 00AF8 80B4F488 AFA20074 */ sw $v0, 0x0074($sp) /* 00AFC 80B4F48C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 00B00 80B4F490 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 00B04 80B4F494 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 /* 00B08 80B4F498 248F0008 */ addiu $t7, $a0, 0x0008 ## $t7 = 00000008 /* 00B0C 80B4F49C ACAF0000 */ sw $t7, 0x0000($a1) ## 00000000 /* 00B10 80B4F4A0 AC820004 */ sw $v0, 0x0004($a0) ## 00000004 -/* 00B14 80B4F4A4 0C034213 */ jal Matrix_Push +/* 00B14 80B4F4A4 0C034213 */ jal Matrix_Push /* 00B18 80B4F4A8 AC980000 */ sw $t8, 0x0000($a0) ## 00000000 -/* 00B1C 80B4F4AC 8FA8008C */ lw $t0, 0x008C($sp) +/* 00B1C 80B4F4AC 8FA8008C */ lw $t0, 0x008C($sp) /* 00B20 80B4F4B0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00B24 80B4F4B4 C50C0000 */ lwc1 $f12, 0x0000($t0) ## 00000000 /* 00B28 80B4F4B8 C50E0004 */ lwc1 $f14, 0x0004($t0) ## 00000004 -/* 00B2C 80B4F4BC 0C034261 */ jal Matrix_Translate +/* 00B2C 80B4F4BC 0C034261 */ jal Matrix_Translate /* 00B30 80B4F4C0 8D060008 */ lw $a2, 0x0008($t0) ## 00000008 -/* 00B34 80B4F4C4 8FA20090 */ lw $v0, 0x0090($sp) +/* 00B34 80B4F4C4 8FA20090 */ lw $v0, 0x0090($sp) /* 00B38 80B4F4C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00B3C 80B4F4CC 84440000 */ lh $a0, 0x0000($v0) ## 00000000 /* 00B40 80B4F4D0 84450002 */ lh $a1, 0x0002($v0) ## 00000002 -/* 00B44 80B4F4D4 0C034421 */ jal Matrix_RotateXYZ +/* 00B44 80B4F4D4 0C034421 */ jal Matrix_RotateZYX /* 00B48 80B4F4D8 84460004 */ lh $a2, 0x0004($v0) ## 00000004 -/* 00B4C 80B4F4DC 0C034213 */ jal Matrix_Push +/* 00B4C 80B4F4DC 0C034213 */ jal Matrix_Push /* 00B50 80B4F4E0 00000000 */ nop /* 00B54 80B4F4E4 3C0143B5 */ lui $at, 0x43B5 ## $at = 43B50000 /* 00B58 80B4F4E8 44816000 */ mtc1 $at, $f12 ## $f12 = 362.00 /* 00B5C 80B4F4EC 3C01C305 */ lui $at, 0xC305 ## $at = C3050000 /* 00B60 80B4F4F0 44817000 */ mtc1 $at, $f14 ## $f14 = -133.00 /* 00B64 80B4F4F4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00B68 80B4F4F8 0C034261 */ jal Matrix_Translate +/* 00B68 80B4F4F8 0C034261 */ jal Matrix_Translate /* 00B6C 80B4F4FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B70 80B4F500 0C034236 */ jal Matrix_Get +/* 00B70 80B4F500 0C034236 */ jal Matrix_Get /* 00B74 80B4F504 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00B78 80B4F508 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00B7C 80B4F50C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00B80 80B4F510 0C034833 */ jal func_800D20CC +/* 00B80 80B4F510 0C034833 */ jal func_800D20CC /* 00B84 80B4F514 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00B88 80B4F518 0C03034A */ jal func_800C0D28 -/* 00B8C 80B4F51C 8FA40080 */ lw $a0, 0x0080($sp) -/* 00B90 80B4F520 1440000D */ bne $v0, $zero, .L80B4F558 +/* 00B88 80B4F518 0C03034A */ jal func_800C0D28 +/* 00B8C 80B4F51C 8FA40080 */ lw $a0, 0x0080($sp) +/* 00B90 80B4F520 1440000D */ bne $v0, $zero, .L80B4F558 /* 00B94 80B4F524 00000000 */ nop -/* 00B98 80B4F528 8FA40094 */ lw $a0, 0x0094($sp) -/* 00B9C 80B4F52C 87A5002E */ lh $a1, 0x002E($sp) -/* 00BA0 80B4F530 0C2D3B8E */ jal func_80B4EE38 +/* 00B98 80B4F528 8FA40094 */ lw $a0, 0x0094($sp) +/* 00B9C 80B4F52C 87A5002E */ lh $a1, 0x002E($sp) +/* 00BA0 80B4F530 0C2D3B8E */ jal func_80B4EE38 /* 00BA4 80B4F534 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BA8 80B4F538 8FA40094 */ lw $a0, 0x0094($sp) -/* 00BAC 80B4F53C 87A5002C */ lh $a1, 0x002C($sp) -/* 00BB0 80B4F540 0C2D3C8C */ jal func_80B4F230 +/* 00BA8 80B4F538 8FA40094 */ lw $a0, 0x0094($sp) +/* 00BAC 80B4F53C 87A5002C */ lh $a1, 0x002C($sp) +/* 00BB0 80B4F540 0C2D3C8C */ jal func_80B4F230 /* 00BB4 80B4F544 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00BB8 80B4F548 8FA40094 */ lw $a0, 0x0094($sp) -/* 00BBC 80B4F54C 87A50030 */ lh $a1, 0x0030($sp) -/* 00BC0 80B4F550 0C2D3BD9 */ jal func_80B4EF64 +/* 00BB8 80B4F548 8FA40094 */ lw $a0, 0x0094($sp) +/* 00BBC 80B4F54C 87A50030 */ lh $a1, 0x0030($sp) +/* 00BC0 80B4F550 0C2D3BD9 */ jal func_80B4EF64 /* 00BC4 80B4F554 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 .L80B4F558: /* 00BC8 80B4F558 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00BCC 80B4F55C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 00BD0 80B4F560 8FA30094 */ lw $v1, 0x0094($sp) +/* 00BD0 80B4F560 8FA30094 */ lw $v1, 0x0094($sp) /* 00BD4 80B4F564 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00BD8 80B4F568 84591492 */ lh $t9, 0x1492($v0) ## 80161492 /* 00BDC 80B4F56C 844A1494 */ lh $t2, 0x1494($v0) ## 80161494 @@ -74,51 +74,51 @@ glabel func_80B4F45C /* 00BE4 80B4F574 846D01E0 */ lh $t5, 0x01E0($v1) ## 000001E0 /* 00BE8 80B4F578 846B01DE */ lh $t3, 0x01DE($v1) ## 000001DE /* 00BEC 80B4F57C 846901DC */ lh $t1, 0x01DC($v1) ## 000001DC -/* 00BF0 80B4F580 018D3021 */ addu $a2, $t4, $t5 -/* 00BF4 80B4F584 014B2821 */ addu $a1, $t2, $t3 -/* 00BF8 80B4F588 03292021 */ addu $a0, $t9, $t1 -/* 00BFC 80B4F58C 00042400 */ sll $a0, $a0, 16 -/* 00C00 80B4F590 00052C00 */ sll $a1, $a1, 16 -/* 00C04 80B4F594 00063400 */ sll $a2, $a2, 16 +/* 00BF0 80B4F580 018D3021 */ addu $a2, $t4, $t5 +/* 00BF4 80B4F584 014B2821 */ addu $a1, $t2, $t3 +/* 00BF8 80B4F588 03292021 */ addu $a0, $t9, $t1 +/* 00BFC 80B4F58C 00042400 */ sll $a0, $a0, 16 +/* 00C00 80B4F590 00052C00 */ sll $a1, $a1, 16 +/* 00C04 80B4F594 00063400 */ sll $a2, $a2, 16 /* 00C08 80B4F598 246301DC */ addiu $v1, $v1, 0x01DC ## $v1 = 000001DC -/* 00C0C 80B4F59C AFA3001C */ sw $v1, 0x001C($sp) -/* 00C10 80B4F5A0 00063403 */ sra $a2, $a2, 16 -/* 00C14 80B4F5A4 00052C03 */ sra $a1, $a1, 16 -/* 00C18 80B4F5A8 0C034421 */ jal Matrix_RotateXYZ -/* 00C1C 80B4F5AC 00042403 */ sra $a0, $a0, 16 +/* 00C0C 80B4F59C AFA3001C */ sw $v1, 0x001C($sp) +/* 00C10 80B4F5A0 00063403 */ sra $a2, $a2, 16 +/* 00C14 80B4F5A4 00052C03 */ sra $a1, $a1, 16 +/* 00C18 80B4F5A8 0C034421 */ jal Matrix_RotateZYX +/* 00C1C 80B4F5AC 00042403 */ sra $a0, $a0, 16 /* 00C20 80B4F5B0 3C01C33C */ lui $at, 0xC33C ## $at = C33C0000 /* 00C24 80B4F5B4 44816000 */ mtc1 $at, $f12 ## $f12 = -188.00 /* 00C28 80B4F5B8 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 00C2C 80B4F5BC 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 00C30 80B4F5C0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00C34 80B4F5C4 0C034261 */ jal Matrix_Translate +/* 00C34 80B4F5C4 0C034261 */ jal Matrix_Translate /* 00C38 80B4F5C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00C3C 80B4F5CC 3C0580B5 */ lui $a1, %hi(D_80B52900) ## $a1 = 80B50000 /* 00C40 80B4F5D0 24A52900 */ addiu $a1, $a1, %lo(D_80B52900) ## $a1 = 80B52900 -/* 00C44 80B4F5D4 8FA40074 */ lw $a0, 0x0074($sp) -/* 00C48 80B4F5D8 0C034695 */ jal Matrix_ToMtx +/* 00C44 80B4F5D4 8FA40074 */ lw $a0, 0x0074($sp) +/* 00C48 80B4F5D8 0C034695 */ jal Matrix_ToMtx /* 00C4C 80B4F5DC 24060420 */ addiu $a2, $zero, 0x0420 ## $a2 = 00000420 -/* 00C50 80B4F5E0 0C034236 */ jal Matrix_Get +/* 00C50 80B4F5E0 0C034236 */ jal Matrix_Get /* 00C54 80B4F5E4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00C58 80B4F5E8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00C5C 80B4F5EC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00C60 80B4F5F0 0C034833 */ jal func_800D20CC +/* 00C60 80B4F5F0 0C034833 */ jal func_800D20CC /* 00C64 80B4F5F4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00C68 80B4F5F8 0C03034A */ jal func_800C0D28 -/* 00C6C 80B4F5FC 8FA40080 */ lw $a0, 0x0080($sp) -/* 00C70 80B4F600 14400009 */ bne $v0, $zero, .L80B4F628 +/* 00C68 80B4F5F8 0C03034A */ jal func_800C0D28 +/* 00C6C 80B4F5FC 8FA40080 */ lw $a0, 0x0080($sp) +/* 00C70 80B4F600 14400009 */ bne $v0, $zero, .L80B4F628 /* 00C74 80B4F604 00000000 */ nop -/* 00C78 80B4F608 8FA40094 */ lw $a0, 0x0094($sp) -/* 00C7C 80B4F60C 87A5002E */ lh $a1, 0x002E($sp) -/* 00C80 80B4F610 0C2D3B8E */ jal func_80B4EE38 +/* 00C78 80B4F608 8FA40094 */ lw $a0, 0x0094($sp) +/* 00C7C 80B4F60C 87A5002E */ lh $a1, 0x002E($sp) +/* 00C80 80B4F610 0C2D3B8E */ jal func_80B4EE38 /* 00C84 80B4F614 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00C88 80B4F618 8FA40094 */ lw $a0, 0x0094($sp) -/* 00C8C 80B4F61C 87A5002C */ lh $a1, 0x002C($sp) -/* 00C90 80B4F620 0C2D3C8C */ jal func_80B4F230 +/* 00C88 80B4F618 8FA40094 */ lw $a0, 0x0094($sp) +/* 00C8C 80B4F61C 87A5002C */ lh $a1, 0x002C($sp) +/* 00C90 80B4F620 0C2D3C8C */ jal func_80B4F230 /* 00C94 80B4F624 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L80B4F628: /* 00C98 80B4F628 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00C9C 80B4F62C 8FA3001C */ lw $v1, 0x001C($sp) +/* 00C9C 80B4F62C 8FA3001C */ lw $v1, 0x001C($sp) /* 00CA0 80B4F630 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00CA4 80B4F634 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CA8 80B4F638 846F0006 */ lh $t7, 0x0006($v1) ## 00000006 @@ -127,50 +127,50 @@ glabel func_80B4F45C /* 00CB4 80B4F644 844E1498 */ lh $t6, 0x1498($v0) ## 80161498 /* 00CB8 80B4F648 8458149A */ lh $t8, 0x149A($v0) ## 8016149A /* 00CBC 80B4F64C 8449149C */ lh $t1, 0x149C($v0) ## 8016149C -/* 00CC0 80B4F650 01CF2021 */ addu $a0, $t6, $t7 -/* 00CC4 80B4F654 03192821 */ addu $a1, $t8, $t9 -/* 00CC8 80B4F658 012A3021 */ addu $a2, $t1, $t2 -/* 00CCC 80B4F65C 00063400 */ sll $a2, $a2, 16 -/* 00CD0 80B4F660 00052C00 */ sll $a1, $a1, 16 -/* 00CD4 80B4F664 00042400 */ sll $a0, $a0, 16 -/* 00CD8 80B4F668 00042403 */ sra $a0, $a0, 16 -/* 00CDC 80B4F66C 00052C03 */ sra $a1, $a1, 16 -/* 00CE0 80B4F670 0C034421 */ jal Matrix_RotateXYZ -/* 00CE4 80B4F674 00063403 */ sra $a2, $a2, 16 +/* 00CC0 80B4F650 01CF2021 */ addu $a0, $t6, $t7 +/* 00CC4 80B4F654 03192821 */ addu $a1, $t8, $t9 +/* 00CC8 80B4F658 012A3021 */ addu $a2, $t1, $t2 +/* 00CCC 80B4F65C 00063400 */ sll $a2, $a2, 16 +/* 00CD0 80B4F660 00052C00 */ sll $a1, $a1, 16 +/* 00CD4 80B4F664 00042400 */ sll $a0, $a0, 16 +/* 00CD8 80B4F668 00042403 */ sra $a0, $a0, 16 +/* 00CDC 80B4F66C 00052C03 */ sra $a1, $a1, 16 +/* 00CE0 80B4F670 0C034421 */ jal Matrix_RotateZYX +/* 00CE4 80B4F674 00063403 */ sra $a2, $a2, 16 /* 00CE8 80B4F678 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 /* 00CEC 80B4F67C 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 /* 00CF0 80B4F680 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 00CF4 80B4F684 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 00CF8 80B4F688 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00CFC 80B4F68C 0C034261 */ jal Matrix_Translate +/* 00CFC 80B4F68C 0C034261 */ jal Matrix_Translate /* 00D00 80B4F690 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D04 80B4F694 8FA40074 */ lw $a0, 0x0074($sp) +/* 00D04 80B4F694 8FA40074 */ lw $a0, 0x0074($sp) /* 00D08 80B4F698 3C0580B5 */ lui $a1, %hi(D_80B52910) ## $a1 = 80B50000 /* 00D0C 80B4F69C 24A52910 */ addiu $a1, $a1, %lo(D_80B52910) ## $a1 = 80B52910 /* 00D10 80B4F6A0 2406044C */ addiu $a2, $zero, 0x044C ## $a2 = 0000044C -/* 00D14 80B4F6A4 0C034695 */ jal Matrix_ToMtx +/* 00D14 80B4F6A4 0C034695 */ jal Matrix_ToMtx /* 00D18 80B4F6A8 24840040 */ addiu $a0, $a0, 0x0040 ## $a0 = 00000040 -/* 00D1C 80B4F6AC 0C034236 */ jal Matrix_Get +/* 00D1C 80B4F6AC 0C034236 */ jal Matrix_Get /* 00D20 80B4F6B0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00D24 80B4F6B4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00D28 80B4F6B8 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00D2C 80B4F6BC 0C034833 */ jal func_800D20CC +/* 00D2C 80B4F6BC 0C034833 */ jal func_800D20CC /* 00D30 80B4F6C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D34 80B4F6C4 0C03034A */ jal func_800C0D28 -/* 00D38 80B4F6C8 8FA40080 */ lw $a0, 0x0080($sp) -/* 00D3C 80B4F6CC 14400009 */ bne $v0, $zero, .L80B4F6F4 +/* 00D34 80B4F6C4 0C03034A */ jal func_800C0D28 +/* 00D38 80B4F6C8 8FA40080 */ lw $a0, 0x0080($sp) +/* 00D3C 80B4F6CC 14400009 */ bne $v0, $zero, .L80B4F6F4 /* 00D40 80B4F6D0 00000000 */ nop -/* 00D44 80B4F6D4 8FA40094 */ lw $a0, 0x0094($sp) -/* 00D48 80B4F6D8 87A5002E */ lh $a1, 0x002E($sp) -/* 00D4C 80B4F6DC 0C2D3B8E */ jal func_80B4EE38 +/* 00D44 80B4F6D4 8FA40094 */ lw $a0, 0x0094($sp) +/* 00D48 80B4F6D8 87A5002E */ lh $a1, 0x002E($sp) +/* 00D4C 80B4F6DC 0C2D3B8E */ jal func_80B4EE38 /* 00D50 80B4F6E0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00D54 80B4F6E4 8FA40094 */ lw $a0, 0x0094($sp) -/* 00D58 80B4F6E8 87A5002C */ lh $a1, 0x002C($sp) -/* 00D5C 80B4F6EC 0C2D3C8C */ jal func_80B4F230 +/* 00D54 80B4F6E4 8FA40094 */ lw $a0, 0x0094($sp) +/* 00D58 80B4F6E8 87A5002C */ lh $a1, 0x002C($sp) +/* 00D5C 80B4F6EC 0C2D3C8C */ jal func_80B4F230 /* 00D60 80B4F6F0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 .L80B4F6F4: /* 00D64 80B4F6F4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D68 80B4F6F8 8FA3001C */ lw $v1, 0x001C($sp) +/* 00D68 80B4F6F8 8FA3001C */ lw $v1, 0x001C($sp) /* 00D6C 80B4F6FC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00D70 80B4F700 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00D74 80B4F704 846C000C */ lh $t4, 0x000C($v1) ## 0000000C @@ -179,66 +179,66 @@ glabel func_80B4F45C /* 00D80 80B4F710 844B149E */ lh $t3, 0x149E($v0) ## 8016149E /* 00D84 80B4F714 844D14A0 */ lh $t5, 0x14A0($v0) ## 801614A0 /* 00D88 80B4F718 844F14A2 */ lh $t7, 0x14A2($v0) ## 801614A2 -/* 00D8C 80B4F71C 016C2021 */ addu $a0, $t3, $t4 -/* 00D90 80B4F720 01AE2821 */ addu $a1, $t5, $t6 -/* 00D94 80B4F724 01F83021 */ addu $a2, $t7, $t8 -/* 00D98 80B4F728 00063400 */ sll $a2, $a2, 16 -/* 00D9C 80B4F72C 00052C00 */ sll $a1, $a1, 16 -/* 00DA0 80B4F730 00042400 */ sll $a0, $a0, 16 -/* 00DA4 80B4F734 00042403 */ sra $a0, $a0, 16 -/* 00DA8 80B4F738 00052C03 */ sra $a1, $a1, 16 -/* 00DAC 80B4F73C 0C034421 */ jal Matrix_RotateXYZ -/* 00DB0 80B4F740 00063403 */ sra $a2, $a2, 16 +/* 00D8C 80B4F71C 016C2021 */ addu $a0, $t3, $t4 +/* 00D90 80B4F720 01AE2821 */ addu $a1, $t5, $t6 +/* 00D94 80B4F724 01F83021 */ addu $a2, $t7, $t8 +/* 00D98 80B4F728 00063400 */ sll $a2, $a2, 16 +/* 00D9C 80B4F72C 00052C00 */ sll $a1, $a1, 16 +/* 00DA0 80B4F730 00042400 */ sll $a0, $a0, 16 +/* 00DA4 80B4F734 00042403 */ sra $a0, $a0, 16 +/* 00DA8 80B4F738 00052C03 */ sra $a1, $a1, 16 +/* 00DAC 80B4F73C 0C034421 */ jal Matrix_RotateZYX +/* 00DB0 80B4F740 00063403 */ sra $a2, $a2, 16 /* 00DB4 80B4F744 3C0180B5 */ lui $at, %hi(D_80B52BB4) ## $at = 80B50000 -/* 00DB8 80B4F748 C42C2BB4 */ lwc1 $f12, %lo(D_80B52BB4)($at) +/* 00DB8 80B4F748 C42C2BB4 */ lwc1 $f12, %lo(D_80B52BB4)($at) /* 00DBC 80B4F74C 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 00DC0 80B4F750 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 /* 00DC4 80B4F754 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00DC8 80B4F758 0C034261 */ jal Matrix_Translate +/* 00DC8 80B4F758 0C034261 */ jal Matrix_Translate /* 00DCC 80B4F75C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00DD0 80B4F760 8FA40074 */ lw $a0, 0x0074($sp) +/* 00DD0 80B4F760 8FA40074 */ lw $a0, 0x0074($sp) /* 00DD4 80B4F764 3C0580B5 */ lui $a1, %hi(D_80B52920) ## $a1 = 80B50000 /* 00DD8 80B4F768 24A52920 */ addiu $a1, $a1, %lo(D_80B52920) ## $a1 = 80B52920 /* 00DDC 80B4F76C 24060460 */ addiu $a2, $zero, 0x0460 ## $a2 = 00000460 -/* 00DE0 80B4F770 0C034695 */ jal Matrix_ToMtx +/* 00DE0 80B4F770 0C034695 */ jal Matrix_ToMtx /* 00DE4 80B4F774 24840080 */ addiu $a0, $a0, 0x0080 ## $a0 = 00000080 -/* 00DE8 80B4F778 0C034221 */ jal Matrix_Pull +/* 00DE8 80B4F778 0C034221 */ jal Matrix_Pull /* 00DEC 80B4F77C 00000000 */ nop -/* 00DF0 80B4F780 0C034213 */ jal Matrix_Push +/* 00DF0 80B4F780 0C034213 */ jal Matrix_Push /* 00DF4 80B4F784 00000000 */ nop /* 00DF8 80B4F788 3C0180B5 */ lui $at, %hi(D_80B52BB8) ## $at = 80B50000 -/* 00DFC 80B4F78C C42C2BB8 */ lwc1 $f12, %lo(D_80B52BB8)($at) +/* 00DFC 80B4F78C C42C2BB8 */ lwc1 $f12, %lo(D_80B52BB8)($at) /* 00E00 80B4F790 3C0180B5 */ lui $at, %hi(D_80B52BBC) ## $at = 80B50000 /* 00E04 80B4F794 3C0643C2 */ lui $a2, 0x43C2 ## $a2 = 43C20000 /* 00E08 80B4F798 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 43C28000 -/* 00E0C 80B4F79C C42E2BBC */ lwc1 $f14, %lo(D_80B52BBC)($at) -/* 00E10 80B4F7A0 0C034261 */ jal Matrix_Translate +/* 00E0C 80B4F79C C42E2BBC */ lwc1 $f14, %lo(D_80B52BBC)($at) +/* 00E10 80B4F7A0 0C034261 */ jal Matrix_Translate /* 00E14 80B4F7A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00E18 80B4F7A8 0C034236 */ jal Matrix_Get +/* 00E18 80B4F7A8 0C034236 */ jal Matrix_Get /* 00E1C 80B4F7AC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00E20 80B4F7B0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00E24 80B4F7B4 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00E28 80B4F7B8 0C034833 */ jal func_800D20CC +/* 00E28 80B4F7B8 0C034833 */ jal func_800D20CC /* 00E2C 80B4F7BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E30 80B4F7C0 0C03034A */ jal func_800C0D28 -/* 00E34 80B4F7C4 8FA40080 */ lw $a0, 0x0080($sp) -/* 00E38 80B4F7C8 1440000D */ bne $v0, $zero, .L80B4F800 +/* 00E30 80B4F7C0 0C03034A */ jal func_800C0D28 +/* 00E34 80B4F7C4 8FA40080 */ lw $a0, 0x0080($sp) +/* 00E38 80B4F7C8 1440000D */ bne $v0, $zero, .L80B4F800 /* 00E3C 80B4F7CC 00000000 */ nop -/* 00E40 80B4F7D0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E44 80B4F7D4 87A5002E */ lh $a1, 0x002E($sp) -/* 00E48 80B4F7D8 0C2D3B8E */ jal func_80B4EE38 +/* 00E40 80B4F7D0 8FA40094 */ lw $a0, 0x0094($sp) +/* 00E44 80B4F7D4 87A5002E */ lh $a1, 0x002E($sp) +/* 00E48 80B4F7D8 0C2D3B8E */ jal func_80B4EE38 /* 00E4C 80B4F7DC 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 00E50 80B4F7E0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E54 80B4F7E4 87A5002C */ lh $a1, 0x002C($sp) -/* 00E58 80B4F7E8 0C2D3C8C */ jal func_80B4F230 +/* 00E50 80B4F7E0 8FA40094 */ lw $a0, 0x0094($sp) +/* 00E54 80B4F7E4 87A5002C */ lh $a1, 0x002C($sp) +/* 00E58 80B4F7E8 0C2D3C8C */ jal func_80B4F230 /* 00E5C 80B4F7EC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00E60 80B4F7F0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E64 80B4F7F4 87A50030 */ lh $a1, 0x0030($sp) -/* 00E68 80B4F7F8 0C2D3BD9 */ jal func_80B4EF64 +/* 00E60 80B4F7F0 8FA40094 */ lw $a0, 0x0094($sp) +/* 00E64 80B4F7F4 87A50030 */ lh $a1, 0x0030($sp) +/* 00E68 80B4F7F8 0C2D3BD9 */ jal func_80B4EF64 /* 00E6C 80B4F7FC 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B .L80B4F800: /* 00E70 80B4F800 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00E74 80B4F804 8FA3001C */ lw $v1, 0x001C($sp) +/* 00E74 80B4F804 8FA3001C */ lw $v1, 0x001C($sp) /* 00E78 80B4F808 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00E7C 80B4F80C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00E80 80B4F810 84690012 */ lh $t1, 0x0012($v1) ## 00000012 @@ -247,54 +247,54 @@ glabel func_80B4F45C /* 00E8C 80B4F81C 845914A4 */ lh $t9, 0x14A4($v0) ## 801614A4 /* 00E90 80B4F820 844A14A6 */ lh $t2, 0x14A6($v0) ## 801614A6 /* 00E94 80B4F824 844C14A8 */ lh $t4, 0x14A8($v0) ## 801614A8 -/* 00E98 80B4F828 03292021 */ addu $a0, $t9, $t1 -/* 00E9C 80B4F82C 014B2821 */ addu $a1, $t2, $t3 -/* 00EA0 80B4F830 018D3021 */ addu $a2, $t4, $t5 -/* 00EA4 80B4F834 00063400 */ sll $a2, $a2, 16 -/* 00EA8 80B4F838 00052C00 */ sll $a1, $a1, 16 -/* 00EAC 80B4F83C 00042400 */ sll $a0, $a0, 16 -/* 00EB0 80B4F840 00042403 */ sra $a0, $a0, 16 -/* 00EB4 80B4F844 00052C03 */ sra $a1, $a1, 16 -/* 00EB8 80B4F848 0C034421 */ jal Matrix_RotateXYZ -/* 00EBC 80B4F84C 00063403 */ sra $a2, $a2, 16 +/* 00E98 80B4F828 03292021 */ addu $a0, $t9, $t1 +/* 00E9C 80B4F82C 014B2821 */ addu $a1, $t2, $t3 +/* 00EA0 80B4F830 018D3021 */ addu $a2, $t4, $t5 +/* 00EA4 80B4F834 00063400 */ sll $a2, $a2, 16 +/* 00EA8 80B4F838 00052C00 */ sll $a1, $a1, 16 +/* 00EAC 80B4F83C 00042400 */ sll $a0, $a0, 16 +/* 00EB0 80B4F840 00042403 */ sra $a0, $a0, 16 +/* 00EB4 80B4F844 00052C03 */ sra $a1, $a1, 16 +/* 00EB8 80B4F848 0C034421 */ jal Matrix_RotateZYX +/* 00EBC 80B4F84C 00063403 */ sra $a2, $a2, 16 /* 00EC0 80B4F850 3C0180B5 */ lui $at, %hi(D_80B52BC0) ## $at = 80B50000 -/* 00EC4 80B4F854 C42C2BC0 */ lwc1 $f12, %lo(D_80B52BC0)($at) +/* 00EC4 80B4F854 C42C2BC0 */ lwc1 $f12, %lo(D_80B52BC0)($at) /* 00EC8 80B4F858 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00ECC 80B4F85C 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 /* 00ED0 80B4F860 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00ED4 80B4F864 0C034261 */ jal Matrix_Translate +/* 00ED4 80B4F864 0C034261 */ jal Matrix_Translate /* 00ED8 80B4F868 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00EDC 80B4F86C 8FA40074 */ lw $a0, 0x0074($sp) +/* 00EDC 80B4F86C 8FA40074 */ lw $a0, 0x0074($sp) /* 00EE0 80B4F870 3C0580B5 */ lui $a1, %hi(D_80B52930) ## $a1 = 80B50000 /* 00EE4 80B4F874 24A52930 */ addiu $a1, $a1, %lo(D_80B52930) ## $a1 = 80B52930 /* 00EE8 80B4F878 24060479 */ addiu $a2, $zero, 0x0479 ## $a2 = 00000479 -/* 00EEC 80B4F87C 0C034695 */ jal Matrix_ToMtx +/* 00EEC 80B4F87C 0C034695 */ jal Matrix_ToMtx /* 00EF0 80B4F880 248400C0 */ addiu $a0, $a0, 0x00C0 ## $a0 = 000000C0 -/* 00EF4 80B4F884 0C034236 */ jal Matrix_Get +/* 00EF4 80B4F884 0C034236 */ jal Matrix_Get /* 00EF8 80B4F888 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00EFC 80B4F88C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00F00 80B4F890 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00F04 80B4F894 0C034833 */ jal func_800D20CC +/* 00F04 80B4F894 0C034833 */ jal func_800D20CC /* 00F08 80B4F898 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00F0C 80B4F89C 0C03034A */ jal func_800C0D28 -/* 00F10 80B4F8A0 8FA40080 */ lw $a0, 0x0080($sp) -/* 00F14 80B4F8A4 1440000D */ bne $v0, $zero, .L80B4F8DC +/* 00F0C 80B4F89C 0C03034A */ jal func_800C0D28 +/* 00F10 80B4F8A0 8FA40080 */ lw $a0, 0x0080($sp) +/* 00F14 80B4F8A4 1440000D */ bne $v0, $zero, .L80B4F8DC /* 00F18 80B4F8A8 00000000 */ nop -/* 00F1C 80B4F8AC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F20 80B4F8B0 87A5002E */ lh $a1, 0x002E($sp) -/* 00F24 80B4F8B4 0C2D3B8E */ jal func_80B4EE38 +/* 00F1C 80B4F8AC 8FA40094 */ lw $a0, 0x0094($sp) +/* 00F20 80B4F8B0 87A5002E */ lh $a1, 0x002E($sp) +/* 00F24 80B4F8B4 0C2D3B8E */ jal func_80B4EE38 /* 00F28 80B4F8B8 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 00F2C 80B4F8BC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F30 80B4F8C0 87A5002C */ lh $a1, 0x002C($sp) -/* 00F34 80B4F8C4 0C2D3C8C */ jal func_80B4F230 +/* 00F2C 80B4F8BC 8FA40094 */ lw $a0, 0x0094($sp) +/* 00F30 80B4F8C0 87A5002C */ lh $a1, 0x002C($sp) +/* 00F34 80B4F8C4 0C2D3C8C */ jal func_80B4F230 /* 00F38 80B4F8C8 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D -/* 00F3C 80B4F8CC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F40 80B4F8D0 87A50030 */ lh $a1, 0x0030($sp) -/* 00F44 80B4F8D4 0C2D3BD9 */ jal func_80B4EF64 +/* 00F3C 80B4F8CC 8FA40094 */ lw $a0, 0x0094($sp) +/* 00F40 80B4F8D0 87A50030 */ lh $a1, 0x0030($sp) +/* 00F44 80B4F8D4 0C2D3BD9 */ jal func_80B4EF64 /* 00F48 80B4F8D8 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E .L80B4F8DC: /* 00F4C 80B4F8DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00F50 80B4F8E0 8FA3001C */ lw $v1, 0x001C($sp) +/* 00F50 80B4F8E0 8FA3001C */ lw $v1, 0x001C($sp) /* 00F54 80B4F8E4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00F58 80B4F8E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00F5C 80B4F8EC 846F0018 */ lh $t7, 0x0018($v1) ## 00000018 @@ -303,66 +303,66 @@ glabel func_80B4F45C /* 00F68 80B4F8F8 844E14AA */ lh $t6, 0x14AA($v0) ## 801614AA /* 00F6C 80B4F8FC 845814AC */ lh $t8, 0x14AC($v0) ## 801614AC /* 00F70 80B4F900 844914AE */ lh $t1, 0x14AE($v0) ## 801614AE -/* 00F74 80B4F904 01CF2021 */ addu $a0, $t6, $t7 -/* 00F78 80B4F908 03192821 */ addu $a1, $t8, $t9 -/* 00F7C 80B4F90C 012A3021 */ addu $a2, $t1, $t2 -/* 00F80 80B4F910 00063400 */ sll $a2, $a2, 16 -/* 00F84 80B4F914 00052C00 */ sll $a1, $a1, 16 -/* 00F88 80B4F918 00042400 */ sll $a0, $a0, 16 -/* 00F8C 80B4F91C 00042403 */ sra $a0, $a0, 16 -/* 00F90 80B4F920 00052C03 */ sra $a1, $a1, 16 -/* 00F94 80B4F924 0C034421 */ jal Matrix_RotateXYZ -/* 00F98 80B4F928 00063403 */ sra $a2, $a2, 16 +/* 00F74 80B4F904 01CF2021 */ addu $a0, $t6, $t7 +/* 00F78 80B4F908 03192821 */ addu $a1, $t8, $t9 +/* 00F7C 80B4F90C 012A3021 */ addu $a2, $t1, $t2 +/* 00F80 80B4F910 00063400 */ sll $a2, $a2, 16 +/* 00F84 80B4F914 00052C00 */ sll $a1, $a1, 16 +/* 00F88 80B4F918 00042400 */ sll $a0, $a0, 16 +/* 00F8C 80B4F91C 00042403 */ sra $a0, $a0, 16 +/* 00F90 80B4F920 00052C03 */ sra $a1, $a1, 16 +/* 00F94 80B4F924 0C034421 */ jal Matrix_RotateZYX +/* 00F98 80B4F928 00063403 */ sra $a2, $a2, 16 /* 00F9C 80B4F92C 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 00FA0 80B4F930 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 00FA4 80B4F934 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 00FA8 80B4F938 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 00FAC 80B4F93C 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 00FB0 80B4F940 0C034261 */ jal Matrix_Translate +/* 00FB0 80B4F940 0C034261 */ jal Matrix_Translate /* 00FB4 80B4F944 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00FB8 80B4F948 8FA40074 */ lw $a0, 0x0074($sp) +/* 00FB8 80B4F948 8FA40074 */ lw $a0, 0x0074($sp) /* 00FBC 80B4F94C 3C0580B5 */ lui $a1, %hi(D_80B52940) ## $a1 = 80B50000 /* 00FC0 80B4F950 24A52940 */ addiu $a1, $a1, %lo(D_80B52940) ## $a1 = 80B52940 /* 00FC4 80B4F954 2406048C */ addiu $a2, $zero, 0x048C ## $a2 = 0000048C -/* 00FC8 80B4F958 0C034695 */ jal Matrix_ToMtx +/* 00FC8 80B4F958 0C034695 */ jal Matrix_ToMtx /* 00FCC 80B4F95C 24840100 */ addiu $a0, $a0, 0x0100 ## $a0 = 00000100 -/* 00FD0 80B4F960 0C034221 */ jal Matrix_Pull +/* 00FD0 80B4F960 0C034221 */ jal Matrix_Pull /* 00FD4 80B4F964 00000000 */ nop -/* 00FD8 80B4F968 0C034213 */ jal Matrix_Push +/* 00FD8 80B4F968 0C034213 */ jal Matrix_Push /* 00FDC 80B4F96C 00000000 */ nop /* 00FE0 80B4F970 3C0180B5 */ lui $at, %hi(D_80B52BC4) ## $at = 80B50000 -/* 00FE4 80B4F974 C42C2BC4 */ lwc1 $f12, %lo(D_80B52BC4)($at) +/* 00FE4 80B4F974 C42C2BC4 */ lwc1 $f12, %lo(D_80B52BC4)($at) /* 00FE8 80B4F978 3C0180B5 */ lui $at, %hi(D_80B52BC8) ## $at = 80B50000 /* 00FEC 80B4F97C 3C06C3C2 */ lui $a2, 0xC3C2 ## $a2 = C3C20000 /* 00FF0 80B4F980 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3C28000 -/* 00FF4 80B4F984 C42E2BC8 */ lwc1 $f14, %lo(D_80B52BC8)($at) -/* 00FF8 80B4F988 0C034261 */ jal Matrix_Translate +/* 00FF4 80B4F984 C42E2BC8 */ lwc1 $f14, %lo(D_80B52BC8)($at) +/* 00FF8 80B4F988 0C034261 */ jal Matrix_Translate /* 00FFC 80B4F98C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01000 80B4F990 0C034236 */ jal Matrix_Get +/* 01000 80B4F990 0C034236 */ jal Matrix_Get /* 01004 80B4F994 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 01008 80B4F998 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 0100C 80B4F99C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 01010 80B4F9A0 0C034833 */ jal func_800D20CC +/* 01010 80B4F9A0 0C034833 */ jal func_800D20CC /* 01014 80B4F9A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01018 80B4F9A8 0C03034A */ jal func_800C0D28 -/* 0101C 80B4F9AC 8FA40080 */ lw $a0, 0x0080($sp) -/* 01020 80B4F9B0 1440000D */ bne $v0, $zero, .L80B4F9E8 +/* 01018 80B4F9A8 0C03034A */ jal func_800C0D28 +/* 0101C 80B4F9AC 8FA40080 */ lw $a0, 0x0080($sp) +/* 01020 80B4F9B0 1440000D */ bne $v0, $zero, .L80B4F9E8 /* 01024 80B4F9B4 00000000 */ nop -/* 01028 80B4F9B8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0102C 80B4F9BC 87A5002E */ lh $a1, 0x002E($sp) -/* 01030 80B4F9C0 0C2D3B8E */ jal func_80B4EE38 +/* 01028 80B4F9B8 8FA40094 */ lw $a0, 0x0094($sp) +/* 0102C 80B4F9BC 87A5002E */ lh $a1, 0x002E($sp) +/* 01030 80B4F9C0 0C2D3B8E */ jal func_80B4EE38 /* 01034 80B4F9C4 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 01038 80B4F9C8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0103C 80B4F9CC 87A5002C */ lh $a1, 0x002C($sp) -/* 01040 80B4F9D0 0C2D3C8C */ jal func_80B4F230 +/* 01038 80B4F9C8 8FA40094 */ lw $a0, 0x0094($sp) +/* 0103C 80B4F9CC 87A5002C */ lh $a1, 0x002C($sp) +/* 01040 80B4F9D0 0C2D3C8C */ jal func_80B4F230 /* 01044 80B4F9D4 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01048 80B4F9D8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0104C 80B4F9DC 87A50030 */ lh $a1, 0x0030($sp) -/* 01050 80B4F9E0 0C2D3BD9 */ jal func_80B4EF64 +/* 01048 80B4F9D8 8FA40094 */ lw $a0, 0x0094($sp) +/* 0104C 80B4F9DC 87A50030 */ lh $a1, 0x0030($sp) +/* 01050 80B4F9E0 0C2D3BD9 */ jal func_80B4EF64 /* 01054 80B4F9E4 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 .L80B4F9E8: /* 01058 80B4F9E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0105C 80B4F9EC 8FA3001C */ lw $v1, 0x001C($sp) +/* 0105C 80B4F9EC 8FA3001C */ lw $v1, 0x001C($sp) /* 01060 80B4F9F0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 01064 80B4F9F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01068 80B4F9F8 846C001E */ lh $t4, 0x001E($v1) ## 0000001E @@ -371,54 +371,54 @@ glabel func_80B4F45C /* 01074 80B4FA04 844B14B0 */ lh $t3, 0x14B0($v0) ## 801614B0 /* 01078 80B4FA08 844D14B2 */ lh $t5, 0x14B2($v0) ## 801614B2 /* 0107C 80B4FA0C 844F14B4 */ lh $t7, 0x14B4($v0) ## 801614B4 -/* 01080 80B4FA10 016C2021 */ addu $a0, $t3, $t4 -/* 01084 80B4FA14 01AE2821 */ addu $a1, $t5, $t6 -/* 01088 80B4FA18 01F83021 */ addu $a2, $t7, $t8 -/* 0108C 80B4FA1C 00063400 */ sll $a2, $a2, 16 -/* 01090 80B4FA20 00052C00 */ sll $a1, $a1, 16 -/* 01094 80B4FA24 00042400 */ sll $a0, $a0, 16 -/* 01098 80B4FA28 00042403 */ sra $a0, $a0, 16 -/* 0109C 80B4FA2C 00052C03 */ sra $a1, $a1, 16 -/* 010A0 80B4FA30 0C034421 */ jal Matrix_RotateXYZ -/* 010A4 80B4FA34 00063403 */ sra $a2, $a2, 16 +/* 01080 80B4FA10 016C2021 */ addu $a0, $t3, $t4 +/* 01084 80B4FA14 01AE2821 */ addu $a1, $t5, $t6 +/* 01088 80B4FA18 01F83021 */ addu $a2, $t7, $t8 +/* 0108C 80B4FA1C 00063400 */ sll $a2, $a2, 16 +/* 01090 80B4FA20 00052C00 */ sll $a1, $a1, 16 +/* 01094 80B4FA24 00042400 */ sll $a0, $a0, 16 +/* 01098 80B4FA28 00042403 */ sra $a0, $a0, 16 +/* 0109C 80B4FA2C 00052C03 */ sra $a1, $a1, 16 +/* 010A0 80B4FA30 0C034421 */ jal Matrix_RotateZYX +/* 010A4 80B4FA34 00063403 */ sra $a2, $a2, 16 /* 010A8 80B4FA38 3C0180B5 */ lui $at, %hi(D_80B52BCC) ## $at = 80B50000 -/* 010AC 80B4FA3C C42C2BCC */ lwc1 $f12, %lo(D_80B52BCC)($at) +/* 010AC 80B4FA3C C42C2BCC */ lwc1 $f12, %lo(D_80B52BCC)($at) /* 010B0 80B4FA40 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 010B4 80B4FA44 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 /* 010B8 80B4FA48 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 010BC 80B4FA4C 0C034261 */ jal Matrix_Translate +/* 010BC 80B4FA4C 0C034261 */ jal Matrix_Translate /* 010C0 80B4FA50 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 010C4 80B4FA54 8FA40074 */ lw $a0, 0x0074($sp) +/* 010C4 80B4FA54 8FA40074 */ lw $a0, 0x0074($sp) /* 010C8 80B4FA58 3C0580B5 */ lui $a1, %hi(D_80B52950) ## $a1 = 80B50000 /* 010CC 80B4FA5C 24A52950 */ addiu $a1, $a1, %lo(D_80B52950) ## $a1 = 80B52950 /* 010D0 80B4FA60 240604A5 */ addiu $a2, $zero, 0x04A5 ## $a2 = 000004A5 -/* 010D4 80B4FA64 0C034695 */ jal Matrix_ToMtx +/* 010D4 80B4FA64 0C034695 */ jal Matrix_ToMtx /* 010D8 80B4FA68 24840140 */ addiu $a0, $a0, 0x0140 ## $a0 = 00000140 -/* 010DC 80B4FA6C 0C034236 */ jal Matrix_Get +/* 010DC 80B4FA6C 0C034236 */ jal Matrix_Get /* 010E0 80B4FA70 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 010E4 80B4FA74 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 010E8 80B4FA78 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 010EC 80B4FA7C 0C034833 */ jal func_800D20CC +/* 010EC 80B4FA7C 0C034833 */ jal func_800D20CC /* 010F0 80B4FA80 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 010F4 80B4FA84 0C03034A */ jal func_800C0D28 -/* 010F8 80B4FA88 8FA40080 */ lw $a0, 0x0080($sp) -/* 010FC 80B4FA8C 1440000C */ bne $v0, $zero, .L80B4FAC0 -/* 01100 80B4FA90 8FA40094 */ lw $a0, 0x0094($sp) -/* 01104 80B4FA94 87A5002E */ lh $a1, 0x002E($sp) -/* 01108 80B4FA98 0C2D3B8E */ jal func_80B4EE38 +/* 010F4 80B4FA84 0C03034A */ jal func_800C0D28 +/* 010F8 80B4FA88 8FA40080 */ lw $a0, 0x0080($sp) +/* 010FC 80B4FA8C 1440000C */ bne $v0, $zero, .L80B4FAC0 +/* 01100 80B4FA90 8FA40094 */ lw $a0, 0x0094($sp) +/* 01104 80B4FA94 87A5002E */ lh $a1, 0x002E($sp) +/* 01108 80B4FA98 0C2D3B8E */ jal func_80B4EE38 /* 0110C 80B4FA9C 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 01110 80B4FAA0 8FA40094 */ lw $a0, 0x0094($sp) -/* 01114 80B4FAA4 87A5002C */ lh $a1, 0x002C($sp) -/* 01118 80B4FAA8 0C2D3C8C */ jal func_80B4F230 +/* 01110 80B4FAA0 8FA40094 */ lw $a0, 0x0094($sp) +/* 01114 80B4FAA4 87A5002C */ lh $a1, 0x002C($sp) +/* 01118 80B4FAA8 0C2D3C8C */ jal func_80B4F230 /* 0111C 80B4FAAC 24060013 */ addiu $a2, $zero, 0x0013 ## $a2 = 00000013 -/* 01120 80B4FAB0 8FA40094 */ lw $a0, 0x0094($sp) -/* 01124 80B4FAB4 87A50030 */ lh $a1, 0x0030($sp) -/* 01128 80B4FAB8 0C2D3BD9 */ jal func_80B4EF64 +/* 01120 80B4FAB0 8FA40094 */ lw $a0, 0x0094($sp) +/* 01124 80B4FAB4 87A50030 */ lh $a1, 0x0030($sp) +/* 01128 80B4FAB8 0C2D3BD9 */ jal func_80B4EF64 /* 0112C 80B4FABC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 .L80B4FAC0: /* 01130 80B4FAC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01134 80B4FAC4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 01138 80B4FAC8 8FA9001C */ lw $t1, 0x001C($sp) +/* 01138 80B4FAC8 8FA9001C */ lw $t1, 0x001C($sp) /* 0113C 80B4FACC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01140 80B4FAD0 845914B6 */ lh $t9, 0x14B6($v0) ## 801614B6 /* 01144 80B4FAD4 844B14B8 */ lh $t3, 0x14B8($v0) ## 801614B8 @@ -426,41 +426,41 @@ glabel func_80B4F45C /* 0114C 80B4FADC 852A0024 */ lh $t2, 0x0024($t1) ## 00000024 /* 01150 80B4FAE0 852C0026 */ lh $t4, 0x0026($t1) ## 00000026 /* 01154 80B4FAE4 852E0028 */ lh $t6, 0x0028($t1) ## 00000028 -/* 01158 80B4FAE8 032A2021 */ addu $a0, $t9, $t2 -/* 0115C 80B4FAEC 016C2821 */ addu $a1, $t3, $t4 -/* 01160 80B4FAF0 01AE3021 */ addu $a2, $t5, $t6 -/* 01164 80B4FAF4 00063400 */ sll $a2, $a2, 16 -/* 01168 80B4FAF8 00052C00 */ sll $a1, $a1, 16 -/* 0116C 80B4FAFC 00042400 */ sll $a0, $a0, 16 -/* 01170 80B4FB00 00042403 */ sra $a0, $a0, 16 -/* 01174 80B4FB04 00052C03 */ sra $a1, $a1, 16 -/* 01178 80B4FB08 0C034421 */ jal Matrix_RotateXYZ -/* 0117C 80B4FB0C 00063403 */ sra $a2, $a2, 16 +/* 01158 80B4FAE8 032A2021 */ addu $a0, $t9, $t2 +/* 0115C 80B4FAEC 016C2821 */ addu $a1, $t3, $t4 +/* 01160 80B4FAF0 01AE3021 */ addu $a2, $t5, $t6 +/* 01164 80B4FAF4 00063400 */ sll $a2, $a2, 16 +/* 01168 80B4FAF8 00052C00 */ sll $a1, $a1, 16 +/* 0116C 80B4FAFC 00042400 */ sll $a0, $a0, 16 +/* 01170 80B4FB00 00042403 */ sra $a0, $a0, 16 +/* 01174 80B4FB04 00052C03 */ sra $a1, $a1, 16 +/* 01178 80B4FB08 0C034421 */ jal Matrix_RotateZYX +/* 0117C 80B4FB0C 00063403 */ sra $a2, $a2, 16 /* 01180 80B4FB10 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 01184 80B4FB14 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 01188 80B4FB18 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 0118C 80B4FB1C 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 01190 80B4FB20 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 01194 80B4FB24 0C034261 */ jal Matrix_Translate +/* 01194 80B4FB24 0C034261 */ jal Matrix_Translate /* 01198 80B4FB28 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0119C 80B4FB2C 8FA40074 */ lw $a0, 0x0074($sp) +/* 0119C 80B4FB2C 8FA40074 */ lw $a0, 0x0074($sp) /* 011A0 80B4FB30 3C0580B5 */ lui $a1, %hi(D_80B52960) ## $a1 = 80B50000 /* 011A4 80B4FB34 24A52960 */ addiu $a1, $a1, %lo(D_80B52960) ## $a1 = 80B52960 /* 011A8 80B4FB38 240604B8 */ addiu $a2, $zero, 0x04B8 ## $a2 = 000004B8 -/* 011AC 80B4FB3C 0C034695 */ jal Matrix_ToMtx +/* 011AC 80B4FB3C 0C034695 */ jal Matrix_ToMtx /* 011B0 80B4FB40 24840180 */ addiu $a0, $a0, 0x0180 ## $a0 = 00000180 -/* 011B4 80B4FB44 0C034221 */ jal Matrix_Pull +/* 011B4 80B4FB44 0C034221 */ jal Matrix_Pull /* 011B8 80B4FB48 00000000 */ nop -/* 011BC 80B4FB4C 0C034221 */ jal Matrix_Pull +/* 011BC 80B4FB4C 0C034221 */ jal Matrix_Pull /* 011C0 80B4FB50 00000000 */ nop -/* 011C4 80B4FB54 8FB80094 */ lw $t8, 0x0094($sp) +/* 011C4 80B4FB54 8FB80094 */ lw $t8, 0x0094($sp) /* 011C8 80B4FB58 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 011CC 80B4FB5C AF0F024C */ sw $t7, 0x024C($t8) ## 0000024C .L80B4FB60: -/* 011D0 80B4FB60 8FBF0014 */ lw $ra, 0x0014($sp) +/* 011D0 80B4FB60 8FBF0014 */ lw $ra, 0x0014($sp) /* 011D4 80B4FB64 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 011D8 80B4FB68 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 011DC 80B4FB6C 03E00008 */ jr $ra +/* 011DC 80B4FB6C 03E00008 */ jr $ra /* 011E0 80B4FB70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s index a96ef2c07a..f9f2c81dda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s @@ -1,19 +1,19 @@ glabel func_80B4FB74 /* 011E4 80B4FB74 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 011E8 80B4FB78 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 011EC 80B4FB7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 011F0 80B4FB80 AFA60040 */ sw $a2, 0x0040($sp) -/* 011F4 80B4FB84 14A1004D */ bne $a1, $at, .L80B4FCBC -/* 011F8 80B4FB88 AFA70044 */ sw $a3, 0x0044($sp) -/* 011FC 80B4FB8C 8FAE0048 */ lw $t6, 0x0048($sp) +/* 011EC 80B4FB7C AFBF0014 */ sw $ra, 0x0014($sp) +/* 011F0 80B4FB80 AFA60040 */ sw $a2, 0x0040($sp) +/* 011F4 80B4FB84 14A1004D */ bne $a1, $at, .L80B4FCBC +/* 011F8 80B4FB88 AFA70044 */ sw $a3, 0x0044($sp) +/* 011FC 80B4FB8C 8FAE0048 */ lw $t6, 0x0048($sp) /* 01200 80B4FB90 8DCF0254 */ lw $t7, 0x0254($t6) ## 00000254 -/* 01204 80B4FB94 51E0000F */ beql $t7, $zero, .L80B4FBD4 +/* 01204 80B4FB94 51E0000F */ beql $t7, $zero, .L80B4FBD4 /* 01208 80B4FB98 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 /* 0120C 80B4FB9C 94981D74 */ lhu $t8, 0x1D74($a0) ## 00001D74 -/* 01210 80B4FBA0 8FB9004C */ lw $t9, 0x004C($sp) +/* 01210 80B4FBA0 8FB9004C */ lw $t9, 0x004C($sp) /* 01214 80B4FBA4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 01218 80B4FBA8 2B010384 */ slti $at, $t8, 0x0384 -/* 0121C 80B4FBAC 54200009 */ bnel $at, $zero, .L80B4FBD4 +/* 01218 80B4FBA8 2B010384 */ slti $at, $t8, 0x0384 +/* 0121C 80B4FBAC 54200009 */ bnel $at, $zero, .L80B4FBD4 /* 01220 80B4FBB0 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 /* 01224 80B4FBB4 8F220000 */ lw $v0, 0x0000($t9) ## 00000000 /* 01228 80B4FBB8 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 @@ -24,39 +24,39 @@ glabel func_80B4FB74 /* 0123C 80B4FBCC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 01240 80B4FBD0 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 .L80B4FBD4: -/* 01244 80B4FBD4 AFA40038 */ sw $a0, 0x0038($sp) -/* 01248 80B4FBD8 0C034213 */ jal Matrix_Push -/* 0124C 80B4FBDC AFA20024 */ sw $v0, 0x0024($sp) -/* 01250 80B4FBE0 8FA20024 */ lw $v0, 0x0024($sp) +/* 01244 80B4FBD4 AFA40038 */ sw $a0, 0x0038($sp) +/* 01248 80B4FBD8 0C034213 */ jal Matrix_Push +/* 0124C 80B4FBDC AFA20024 */ sw $v0, 0x0024($sp) +/* 01250 80B4FBE0 8FA20024 */ lw $v0, 0x0024($sp) /* 01254 80B4FBE4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01258 80B4FBE8 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 0125C 80B4FBEC 904B015D */ lbu $t3, 0x015D($v0) ## 0000015D /* 01260 80B4FBF0 258CBAE8 */ addiu $t4, $t4, 0xBAE8 ## $t4 = 0600BAE8 /* 01264 80B4FBF4 24440A20 */ addiu $a0, $v0, 0x0A20 ## $a0 = 00000A20 -/* 01268 80B4FBF8 1561002E */ bne $t3, $at, .L80B4FCB4 +/* 01268 80B4FBF8 1561002E */ bne $t3, $at, .L80B4FCB4 /* 0126C 80B4FBFC 00000000 */ nop -/* 01270 80B4FC00 0C03423F */ jal Matrix_Put -/* 01274 80B4FC04 AFAC0018 */ sw $t4, 0x0018($sp) +/* 01270 80B4FC00 0C03423F */ jal Matrix_Put +/* 01274 80B4FC04 AFAC0018 */ sw $t4, 0x0018($sp) /* 01278 80B4FC08 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 0127C 80B4FC0C 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 /* 01280 80B4FC10 3C0180B5 */ lui $at, %hi(D_80B52BD0) ## $at = 80B50000 /* 01284 80B4FC14 3C06C3BB */ lui $a2, 0xC3BB ## $a2 = C3BB0000 /* 01288 80B4FC18 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3BB8000 -/* 0128C 80B4FC1C C42E2BD0 */ lwc1 $f14, %lo(D_80B52BD0)($at) -/* 01290 80B4FC20 0C034261 */ jal Matrix_Translate +/* 0128C 80B4FC1C C42E2BD0 */ lwc1 $f14, %lo(D_80B52BD0)($at) +/* 01290 80B4FC20 0C034261 */ jal Matrix_Translate /* 01294 80B4FC24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01298 80B4FC28 2404A219 */ addiu $a0, $zero, 0xA219 ## $a0 = FFFFA219 /* 0129C 80B4FC2C 2405AC17 */ addiu $a1, $zero, 0xAC17 ## $a1 = FFFFAC17 /* 012A0 80B4FC30 24063333 */ addiu $a2, $zero, 0x3333 ## $a2 = 00003333 -/* 012A4 80B4FC34 0C034421 */ jal Matrix_RotateXYZ +/* 012A4 80B4FC34 0C034421 */ jal Matrix_RotateZYX /* 012A8 80B4FC38 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 012AC 80B4FC3C 3C0180B5 */ lui $at, %hi(D_80B52BD4) ## $at = 80B50000 -/* 012B0 80B4FC40 C42C2BD4 */ lwc1 $f12, %lo(D_80B52BD4)($at) +/* 012B0 80B4FC40 C42C2BD4 */ lwc1 $f12, %lo(D_80B52BD4)($at) /* 012B4 80B4FC44 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012B8 80B4FC48 44066000 */ mfc1 $a2, $f12 -/* 012BC 80B4FC4C 0C0342A3 */ jal Matrix_Scale -/* 012C0 80B4FC50 46006386 */ mov.s $f14, $f12 -/* 012C4 80B4FC54 8FA7004C */ lw $a3, 0x004C($sp) +/* 012B8 80B4FC48 44066000 */ mfc1 $a2, $f12 +/* 012BC 80B4FC4C 0C0342A3 */ jal Matrix_Scale +/* 012C0 80B4FC50 46006386 */ mov.s $f14, $f12 +/* 012C4 80B4FC54 8FA7004C */ lw $a3, 0x004C($sp) /* 012C8 80B4FC58 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 012CC 80B4FC5C 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 012D0 80B4FC60 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 @@ -65,28 +65,28 @@ glabel func_80B4FB74 /* 012DC 80B4FC6C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 012E0 80B4FC70 ACED0000 */ sw $t5, 0x0000($a3) ## 00000000 /* 012E4 80B4FC74 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 012E8 80B4FC78 8FAF0038 */ lw $t7, 0x0038($sp) +/* 012E8 80B4FC78 8FAF0038 */ lw $t7, 0x0038($sp) /* 012EC 80B4FC7C 240604E5 */ addiu $a2, $zero, 0x04E5 ## $a2 = 000004E5 /* 012F0 80B4FC80 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 012F4 80B4FC84 0C0346A2 */ jal Matrix_NewMtx -/* 012F8 80B4FC88 AFA20020 */ sw $v0, 0x0020($sp) -/* 012FC 80B4FC8C 8FA30020 */ lw $v1, 0x0020($sp) +/* 012F4 80B4FC84 0C0346A2 */ jal Matrix_NewMtx +/* 012F8 80B4FC88 AFA20020 */ sw $v0, 0x0020($sp) +/* 012FC 80B4FC8C 8FA30020 */ lw $v1, 0x0020($sp) /* 01300 80B4FC90 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 01304 80B4FC94 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01308 80B4FC98 8FB8004C */ lw $t8, 0x004C($sp) +/* 01308 80B4FC98 8FB8004C */ lw $t8, 0x004C($sp) /* 0130C 80B4FC9C 8F020000 */ lw $v0, 0x0000($t8) ## 00000000 /* 01310 80B4FCA0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 01314 80B4FCA4 AF080000 */ sw $t0, 0x0000($t8) ## 00000000 /* 01318 80B4FCA8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0131C 80B4FCAC 8FA90018 */ lw $t1, 0x0018($sp) +/* 0131C 80B4FCAC 8FA90018 */ lw $t1, 0x0018($sp) /* 01320 80B4FCB0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 .L80B4FCB4: -/* 01324 80B4FCB4 0C034221 */ jal Matrix_Pull +/* 01324 80B4FCB4 0C034221 */ jal Matrix_Pull /* 01328 80B4FCB8 00000000 */ nop .L80B4FCBC: -/* 0132C 80B4FCBC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0132C 80B4FCBC 8FBF0014 */ lw $ra, 0x0014($sp) /* 01330 80B4FCC0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01334 80B4FCC4 03E00008 */ jr $ra +/* 01334 80B4FCC4 03E00008 */ jr $ra /* 01338 80B4FCC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s index 40b5d1f363..a80397ae19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s @@ -1,83 +1,83 @@ glabel func_80B5458C /* 011DC 80B5458C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 011E0 80B54590 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 011E4 80B54594 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011E8 80B54598 AFA40090 */ sw $a0, 0x0090($sp) -/* 011EC 80B5459C AFA60098 */ sw $a2, 0x0098($sp) -/* 011F0 80B545A0 14A101BF */ bne $a1, $at, .L80B54CA0 -/* 011F4 80B545A4 AFA7009C */ sw $a3, 0x009C($sp) +/* 011E4 80B54594 AFBF0014 */ sw $ra, 0x0014($sp) +/* 011E8 80B54598 AFA40090 */ sw $a0, 0x0090($sp) +/* 011EC 80B5459C AFA60098 */ sw $a2, 0x0098($sp) +/* 011F0 80B545A0 14A101BF */ bne $a1, $at, .L80B54CA0 +/* 011F4 80B545A4 AFA7009C */ sw $a3, 0x009C($sp) /* 011F8 80B545A8 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 /* 011FC 80B545AC 0C031A73 */ jal Graph_Alloc - + /* 01200 80B545B0 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 01204 80B545B4 8FA800A0 */ lw $t0, 0x00A0($sp) -/* 01208 80B545B8 8FA300A4 */ lw $v1, 0x00A4($sp) -/* 0120C 80B545BC AFA20078 */ sw $v0, 0x0078($sp) +/* 01204 80B545B4 8FA800A0 */ lw $t0, 0x00A0($sp) +/* 01208 80B545B8 8FA300A4 */ lw $v1, 0x00A4($sp) +/* 0120C 80B545BC AFA20078 */ sw $v0, 0x0078($sp) /* 01210 80B545C0 850F0000 */ lh $t7, 0x0000($t0) ## 00000000 /* 01214 80B545C4 84780402 */ lh $t8, 0x0402($v1) ## 00000402 /* 01218 80B545C8 850A0004 */ lh $t2, 0x0004($t0) ## 00000004 /* 0121C 80B545CC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 01220 80B545D0 01F8C821 */ addu $t9, $t7, $t8 +/* 01220 80B545D0 01F8C821 */ addu $t9, $t7, $t8 /* 01224 80B545D4 A5190000 */ sh $t9, 0x0000($t0) ## 00000000 /* 01228 80B545D8 846B0400 */ lh $t3, 0x0400($v1) ## 00000400 /* 0122C 80B545DC 35CE0030 */ ori $t6, $t6, 0x0030 ## $t6 = DB060030 /* 01230 80B545E0 24630400 */ addiu $v1, $v1, 0x0400 ## $v1 = 00000400 -/* 01234 80B545E4 014B6021 */ addu $t4, $t2, $t3 +/* 01234 80B545E4 014B6021 */ addu $t4, $t2, $t3 /* 01238 80B545E8 A50C0004 */ sh $t4, 0x0004($t0) ## 00000004 -/* 0123C 80B545EC 8FA500A8 */ lw $a1, 0x00A8($sp) +/* 0123C 80B545EC 8FA500A8 */ lw $a1, 0x00A8($sp) /* 01240 80B545F0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 01244 80B545F4 248D0008 */ addiu $t5, $a0, 0x0008 ## $t5 = 00000008 /* 01248 80B545F8 ACAD0000 */ sw $t5, 0x0000($a1) ## 00000000 /* 0124C 80B545FC AC820004 */ sw $v0, 0x0004($a0) ## 00000004 -/* 01250 80B54600 0C034213 */ jal Matrix_Push +/* 01250 80B54600 0C034213 */ jal Matrix_Push /* 01254 80B54604 AC8E0000 */ sw $t6, 0x0000($a0) ## 00000000 -/* 01258 80B54608 8FA9009C */ lw $t1, 0x009C($sp) +/* 01258 80B54608 8FA9009C */ lw $t1, 0x009C($sp) /* 0125C 80B5460C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01260 80B54610 C52C0000 */ lwc1 $f12, 0x0000($t1) ## 00000000 /* 01264 80B54614 C52E0004 */ lwc1 $f14, 0x0004($t1) ## 00000004 -/* 01268 80B54618 0C034261 */ jal Matrix_Translate +/* 01268 80B54618 0C034261 */ jal Matrix_Translate /* 0126C 80B5461C 8D260008 */ lw $a2, 0x0008($t1) ## 00000008 -/* 01270 80B54620 8FA800A0 */ lw $t0, 0x00A0($sp) +/* 01270 80B54620 8FA800A0 */ lw $t0, 0x00A0($sp) /* 01274 80B54624 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01278 80B54628 85040000 */ lh $a0, 0x0000($t0) ## 00000000 /* 0127C 80B5462C 85050002 */ lh $a1, 0x0002($t0) ## 00000002 -/* 01280 80B54630 0C034421 */ jal Matrix_RotateXYZ +/* 01280 80B54630 0C034421 */ jal Matrix_RotateZYX /* 01284 80B54634 85060004 */ lh $a2, 0x0004($t0) ## 00000004 -/* 01288 80B54638 0C034213 */ jal Matrix_Push +/* 01288 80B54638 0C034213 */ jal Matrix_Push /* 0128C 80B5463C 00000000 */ nop /* 01290 80B54640 3C0143B5 */ lui $at, 0x43B5 ## $at = 43B50000 /* 01294 80B54644 44816000 */ mtc1 $at, $f12 ## $f12 = 362.00 /* 01298 80B54648 3C01C305 */ lui $at, 0xC305 ## $at = C3050000 /* 0129C 80B5464C 44817000 */ mtc1 $at, $f14 ## $f14 = -133.00 /* 012A0 80B54650 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 012A4 80B54654 0C034261 */ jal Matrix_Translate +/* 012A4 80B54654 0C034261 */ jal Matrix_Translate /* 012A8 80B54658 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012AC 80B5465C 0C034236 */ jal Matrix_Get +/* 012AC 80B5465C 0C034236 */ jal Matrix_Get /* 012B0 80B54660 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 012B4 80B54664 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 012B8 80B54668 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 012BC 80B5466C 0C034833 */ jal func_800D20CC +/* 012BC 80B5466C 0C034833 */ jal func_800D20CC /* 012C0 80B54670 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 012C4 80B54674 0C03034A */ jal func_800C0D28 -/* 012C8 80B54678 8FA40090 */ lw $a0, 0x0090($sp) -/* 012CC 80B5467C 1440000D */ bne $v0, $zero, .L80B546B4 +/* 012C4 80B54674 0C03034A */ jal func_800C0D28 +/* 012C8 80B54678 8FA40090 */ lw $a0, 0x0090($sp) +/* 012CC 80B5467C 1440000D */ bne $v0, $zero, .L80B546B4 /* 012D0 80B54680 00000000 */ nop -/* 012D4 80B54684 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 012D8 80B54688 87A50032 */ lh $a1, 0x0032($sp) -/* 012DC 80B5468C 0C2D4E60 */ jal func_80B53980 +/* 012D4 80B54684 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 012D8 80B54688 87A50032 */ lh $a1, 0x0032($sp) +/* 012DC 80B5468C 0C2D4E60 */ jal func_80B53980 /* 012E0 80B54690 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 012E4 80B54694 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 012E8 80B54698 87A50030 */ lh $a1, 0x0030($sp) -/* 012EC 80B5469C 0C2D50D8 */ jal func_80B54360 +/* 012E4 80B54694 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 012E8 80B54698 87A50030 */ lh $a1, 0x0030($sp) +/* 012EC 80B5469C 0C2D50D8 */ jal func_80B54360 /* 012F0 80B546A0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 012F4 80B546A4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 012F8 80B546A8 87A50034 */ lh $a1, 0x0034($sp) -/* 012FC 80B546AC 0C2D4ED9 */ jal func_80B53B64 +/* 012F4 80B546A4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 012F8 80B546A8 87A50034 */ lh $a1, 0x0034($sp) +/* 012FC 80B546AC 0C2D4ED9 */ jal func_80B53B64 /* 01300 80B546B0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 .L80B546B4: /* 01304 80B546B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01308 80B546B8 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 0130C 80B546BC 8FA300A4 */ lw $v1, 0x00A4($sp) +/* 0130C 80B546BC 8FA300A4 */ lw $v1, 0x00A4($sp) /* 01310 80B546C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01314 80B546C4 844F1492 */ lh $t7, 0x1492($v0) ## 80161492 /* 01318 80B546C8 84591494 */ lh $t9, 0x1494($v0) ## 80161494 @@ -85,47 +85,47 @@ glabel func_80B5458C /* 01320 80B546D0 846C0290 */ lh $t4, 0x0290($v1) ## 00000290 /* 01324 80B546D4 846A028E */ lh $t2, 0x028E($v1) ## 0000028E /* 01328 80B546D8 8478028C */ lh $t8, 0x028C($v1) ## 0000028C -/* 0132C 80B546DC 016C3021 */ addu $a2, $t3, $t4 -/* 01330 80B546E0 032A2821 */ addu $a1, $t9, $t2 -/* 01334 80B546E4 01F82021 */ addu $a0, $t7, $t8 -/* 01338 80B546E8 00042400 */ sll $a0, $a0, 16 -/* 0133C 80B546EC 00052C00 */ sll $a1, $a1, 16 -/* 01340 80B546F0 00063400 */ sll $a2, $a2, 16 +/* 0132C 80B546DC 016C3021 */ addu $a2, $t3, $t4 +/* 01330 80B546E0 032A2821 */ addu $a1, $t9, $t2 +/* 01334 80B546E4 01F82021 */ addu $a0, $t7, $t8 +/* 01338 80B546E8 00042400 */ sll $a0, $a0, 16 +/* 0133C 80B546EC 00052C00 */ sll $a1, $a1, 16 +/* 01340 80B546F0 00063400 */ sll $a2, $a2, 16 /* 01344 80B546F4 2463028C */ addiu $v1, $v1, 0x028C ## $v1 = 0000028C -/* 01348 80B546F8 AFA30020 */ sw $v1, 0x0020($sp) -/* 0134C 80B546FC 00063403 */ sra $a2, $a2, 16 -/* 01350 80B54700 00052C03 */ sra $a1, $a1, 16 -/* 01354 80B54704 0C034421 */ jal Matrix_RotateXYZ -/* 01358 80B54708 00042403 */ sra $a0, $a0, 16 +/* 01348 80B546F8 AFA30020 */ sw $v1, 0x0020($sp) +/* 0134C 80B546FC 00063403 */ sra $a2, $a2, 16 +/* 01350 80B54700 00052C03 */ sra $a1, $a1, 16 +/* 01354 80B54704 0C034421 */ jal Matrix_RotateZYX +/* 01358 80B54708 00042403 */ sra $a0, $a0, 16 /* 0135C 80B5470C 3C01C33C */ lui $at, 0xC33C ## $at = C33C0000 /* 01360 80B54710 44816000 */ mtc1 $at, $f12 ## $f12 = -188.00 /* 01364 80B54714 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 01368 80B54718 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 0136C 80B5471C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01370 80B54720 0C034261 */ jal Matrix_Translate +/* 01370 80B54720 0C034261 */ jal Matrix_Translate /* 01374 80B54724 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01378 80B54728 3C0580B6 */ lui $a1, %hi(D_80B5A5A0) ## $a1 = 80B60000 /* 0137C 80B5472C 24A5A5A0 */ addiu $a1, $a1, %lo(D_80B5A5A0) ## $a1 = 80B5A5A0 -/* 01380 80B54730 8FA40078 */ lw $a0, 0x0078($sp) -/* 01384 80B54734 0C034695 */ jal Matrix_ToMtx +/* 01380 80B54730 8FA40078 */ lw $a0, 0x0078($sp) +/* 01384 80B54734 0C034695 */ jal Matrix_ToMtx /* 01388 80B54738 240605D2 */ addiu $a2, $zero, 0x05D2 ## $a2 = 000005D2 -/* 0138C 80B5473C 0C034236 */ jal Matrix_Get +/* 0138C 80B5473C 0C034236 */ jal Matrix_Get /* 01390 80B54740 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01394 80B54744 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01398 80B54748 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 0139C 80B5474C 0C034833 */ jal func_800D20CC +/* 0139C 80B5474C 0C034833 */ jal func_800D20CC /* 013A0 80B54750 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013A4 80B54754 0C03034A */ jal func_800C0D28 -/* 013A8 80B54758 8FA40090 */ lw $a0, 0x0090($sp) -/* 013AC 80B5475C 14400005 */ bne $v0, $zero, .L80B54774 +/* 013A4 80B54754 0C03034A */ jal func_800C0D28 +/* 013A8 80B54758 8FA40090 */ lw $a0, 0x0090($sp) +/* 013AC 80B5475C 14400005 */ bne $v0, $zero, .L80B54774 /* 013B0 80B54760 00000000 */ nop -/* 013B4 80B54764 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 013B8 80B54768 87A50032 */ lh $a1, 0x0032($sp) -/* 013BC 80B5476C 0C2D4E60 */ jal func_80B53980 +/* 013B4 80B54764 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 013B8 80B54768 87A50032 */ lh $a1, 0x0032($sp) +/* 013BC 80B5476C 0C2D4E60 */ jal func_80B53980 /* 013C0 80B54770 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 .L80B54774: /* 013C4 80B54774 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 013C8 80B54778 8FA30020 */ lw $v1, 0x0020($sp) +/* 013C8 80B54778 8FA30020 */ lw $v1, 0x0020($sp) /* 013CC 80B5477C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 013D0 80B54780 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013D4 80B54784 846E0006 */ lh $t6, 0x0006($v1) ## 00000006 @@ -134,46 +134,46 @@ glabel func_80B5458C /* 013E0 80B54790 844D1498 */ lh $t5, 0x1498($v0) ## 80161498 /* 013E4 80B54794 844F149A */ lh $t7, 0x149A($v0) ## 8016149A /* 013E8 80B54798 8459149C */ lh $t9, 0x149C($v0) ## 8016149C -/* 013EC 80B5479C 01AE2021 */ addu $a0, $t5, $t6 -/* 013F0 80B547A0 01F82821 */ addu $a1, $t7, $t8 -/* 013F4 80B547A4 032A3021 */ addu $a2, $t9, $t2 -/* 013F8 80B547A8 00063400 */ sll $a2, $a2, 16 -/* 013FC 80B547AC 00052C00 */ sll $a1, $a1, 16 -/* 01400 80B547B0 00042400 */ sll $a0, $a0, 16 -/* 01404 80B547B4 00042403 */ sra $a0, $a0, 16 -/* 01408 80B547B8 00052C03 */ sra $a1, $a1, 16 -/* 0140C 80B547BC 0C034421 */ jal Matrix_RotateXYZ -/* 01410 80B547C0 00063403 */ sra $a2, $a2, 16 +/* 013EC 80B5479C 01AE2021 */ addu $a0, $t5, $t6 +/* 013F0 80B547A0 01F82821 */ addu $a1, $t7, $t8 +/* 013F4 80B547A4 032A3021 */ addu $a2, $t9, $t2 +/* 013F8 80B547A8 00063400 */ sll $a2, $a2, 16 +/* 013FC 80B547AC 00052C00 */ sll $a1, $a1, 16 +/* 01400 80B547B0 00042400 */ sll $a0, $a0, 16 +/* 01404 80B547B4 00042403 */ sra $a0, $a0, 16 +/* 01408 80B547B8 00052C03 */ sra $a1, $a1, 16 +/* 0140C 80B547BC 0C034421 */ jal Matrix_RotateZYX +/* 01410 80B547C0 00063403 */ sra $a2, $a2, 16 /* 01414 80B547C4 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 /* 01418 80B547C8 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 /* 0141C 80B547CC 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 01420 80B547D0 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 01424 80B547D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01428 80B547D8 0C034261 */ jal Matrix_Translate +/* 01428 80B547D8 0C034261 */ jal Matrix_Translate /* 0142C 80B547DC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01430 80B547E0 8FA40078 */ lw $a0, 0x0078($sp) +/* 01430 80B547E0 8FA40078 */ lw $a0, 0x0078($sp) /* 01434 80B547E4 3C0580B6 */ lui $a1, %hi(D_80B5A5B0) ## $a1 = 80B60000 /* 01438 80B547E8 24A5A5B0 */ addiu $a1, $a1, %lo(D_80B5A5B0) ## $a1 = 80B5A5B0 /* 0143C 80B547EC 240605FE */ addiu $a2, $zero, 0x05FE ## $a2 = 000005FE -/* 01440 80B547F0 0C034695 */ jal Matrix_ToMtx +/* 01440 80B547F0 0C034695 */ jal Matrix_ToMtx /* 01444 80B547F4 24840040 */ addiu $a0, $a0, 0x0040 ## $a0 = 00000040 -/* 01448 80B547F8 0C034236 */ jal Matrix_Get +/* 01448 80B547F8 0C034236 */ jal Matrix_Get /* 0144C 80B547FC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01450 80B54800 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01454 80B54804 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01458 80B54808 0C034833 */ jal func_800D20CC +/* 01458 80B54808 0C034833 */ jal func_800D20CC /* 0145C 80B5480C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01460 80B54810 0C03034A */ jal func_800C0D28 -/* 01464 80B54814 8FA40090 */ lw $a0, 0x0090($sp) -/* 01468 80B54818 14400005 */ bne $v0, $zero, .L80B54830 +/* 01460 80B54810 0C03034A */ jal func_800C0D28 +/* 01464 80B54814 8FA40090 */ lw $a0, 0x0090($sp) +/* 01468 80B54818 14400005 */ bne $v0, $zero, .L80B54830 /* 0146C 80B5481C 00000000 */ nop -/* 01470 80B54820 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01474 80B54824 87A50030 */ lh $a1, 0x0030($sp) -/* 01478 80B54828 0C2D50D8 */ jal func_80B54360 +/* 01470 80B54820 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01474 80B54824 87A50030 */ lh $a1, 0x0030($sp) +/* 01478 80B54828 0C2D50D8 */ jal func_80B54360 /* 0147C 80B5482C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 .L80B54830: /* 01480 80B54830 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01484 80B54834 8FA30020 */ lw $v1, 0x0020($sp) +/* 01484 80B54834 8FA30020 */ lw $v1, 0x0020($sp) /* 01488 80B54838 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 0148C 80B5483C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01490 80B54840 846C000C */ lh $t4, 0x000C($v1) ## 0000000C @@ -182,66 +182,66 @@ glabel func_80B5458C /* 0149C 80B5484C 844B149E */ lh $t3, 0x149E($v0) ## 8016149E /* 014A0 80B54850 844D14A0 */ lh $t5, 0x14A0($v0) ## 801614A0 /* 014A4 80B54854 844F14A2 */ lh $t7, 0x14A2($v0) ## 801614A2 -/* 014A8 80B54858 016C2021 */ addu $a0, $t3, $t4 -/* 014AC 80B5485C 01AE2821 */ addu $a1, $t5, $t6 -/* 014B0 80B54860 01F83021 */ addu $a2, $t7, $t8 -/* 014B4 80B54864 00063400 */ sll $a2, $a2, 16 -/* 014B8 80B54868 00052C00 */ sll $a1, $a1, 16 -/* 014BC 80B5486C 00042400 */ sll $a0, $a0, 16 -/* 014C0 80B54870 00042403 */ sra $a0, $a0, 16 -/* 014C4 80B54874 00052C03 */ sra $a1, $a1, 16 -/* 014C8 80B54878 0C034421 */ jal Matrix_RotateXYZ -/* 014CC 80B5487C 00063403 */ sra $a2, $a2, 16 +/* 014A8 80B54858 016C2021 */ addu $a0, $t3, $t4 +/* 014AC 80B5485C 01AE2821 */ addu $a1, $t5, $t6 +/* 014B0 80B54860 01F83021 */ addu $a2, $t7, $t8 +/* 014B4 80B54864 00063400 */ sll $a2, $a2, 16 +/* 014B8 80B54868 00052C00 */ sll $a1, $a1, 16 +/* 014BC 80B5486C 00042400 */ sll $a0, $a0, 16 +/* 014C0 80B54870 00042403 */ sra $a0, $a0, 16 +/* 014C4 80B54874 00052C03 */ sra $a1, $a1, 16 +/* 014C8 80B54878 0C034421 */ jal Matrix_RotateZYX +/* 014CC 80B5487C 00063403 */ sra $a2, $a2, 16 /* 014D0 80B54880 3C0180B6 */ lui $at, %hi(D_80B5AAEC) ## $at = 80B60000 -/* 014D4 80B54884 C42CAAEC */ lwc1 $f12, %lo(D_80B5AAEC)($at) +/* 014D4 80B54884 C42CAAEC */ lwc1 $f12, %lo(D_80B5AAEC)($at) /* 014D8 80B54888 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 014DC 80B5488C 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 /* 014E0 80B54890 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 014E4 80B54894 0C034261 */ jal Matrix_Translate +/* 014E4 80B54894 0C034261 */ jal Matrix_Translate /* 014E8 80B54898 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 014EC 80B5489C 8FA40078 */ lw $a0, 0x0078($sp) +/* 014EC 80B5489C 8FA40078 */ lw $a0, 0x0078($sp) /* 014F0 80B548A0 3C0580B6 */ lui $a1, %hi(D_80B5A5C0) ## $a1 = 80B60000 /* 014F4 80B548A4 24A5A5C0 */ addiu $a1, $a1, %lo(D_80B5A5C0) ## $a1 = 80B5A5C0 /* 014F8 80B548A8 24060612 */ addiu $a2, $zero, 0x0612 ## $a2 = 00000612 -/* 014FC 80B548AC 0C034695 */ jal Matrix_ToMtx +/* 014FC 80B548AC 0C034695 */ jal Matrix_ToMtx /* 01500 80B548B0 24840080 */ addiu $a0, $a0, 0x0080 ## $a0 = 00000080 -/* 01504 80B548B4 0C034221 */ jal Matrix_Pull +/* 01504 80B548B4 0C034221 */ jal Matrix_Pull /* 01508 80B548B8 00000000 */ nop -/* 0150C 80B548BC 0C034213 */ jal Matrix_Push +/* 0150C 80B548BC 0C034213 */ jal Matrix_Push /* 01510 80B548C0 00000000 */ nop /* 01514 80B548C4 3C0180B6 */ lui $at, %hi(D_80B5AAF0) ## $at = 80B60000 -/* 01518 80B548C8 C42CAAF0 */ lwc1 $f12, %lo(D_80B5AAF0)($at) +/* 01518 80B548C8 C42CAAF0 */ lwc1 $f12, %lo(D_80B5AAF0)($at) /* 0151C 80B548CC 3C0180B6 */ lui $at, %hi(D_80B5AAF4) ## $at = 80B60000 /* 01520 80B548D0 3C0643C2 */ lui $a2, 0x43C2 ## $a2 = 43C20000 /* 01524 80B548D4 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 43C28000 -/* 01528 80B548D8 C42EAAF4 */ lwc1 $f14, %lo(D_80B5AAF4)($at) -/* 0152C 80B548DC 0C034261 */ jal Matrix_Translate +/* 01528 80B548D8 C42EAAF4 */ lwc1 $f14, %lo(D_80B5AAF4)($at) +/* 0152C 80B548DC 0C034261 */ jal Matrix_Translate /* 01530 80B548E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01534 80B548E4 0C034236 */ jal Matrix_Get +/* 01534 80B548E4 0C034236 */ jal Matrix_Get /* 01538 80B548E8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 0153C 80B548EC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01540 80B548F0 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01544 80B548F4 0C034833 */ jal func_800D20CC +/* 01544 80B548F4 0C034833 */ jal func_800D20CC /* 01548 80B548F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0154C 80B548FC 0C03034A */ jal func_800C0D28 -/* 01550 80B54900 8FA40090 */ lw $a0, 0x0090($sp) -/* 01554 80B54904 1440000D */ bne $v0, $zero, .L80B5493C +/* 0154C 80B548FC 0C03034A */ jal func_800C0D28 +/* 01550 80B54900 8FA40090 */ lw $a0, 0x0090($sp) +/* 01554 80B54904 1440000D */ bne $v0, $zero, .L80B5493C /* 01558 80B54908 00000000 */ nop -/* 0155C 80B5490C 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01560 80B54910 87A50032 */ lh $a1, 0x0032($sp) -/* 01564 80B54914 0C2D4E60 */ jal func_80B53980 +/* 0155C 80B5490C 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01560 80B54910 87A50032 */ lh $a1, 0x0032($sp) +/* 01564 80B54914 0C2D4E60 */ jal func_80B53980 /* 01568 80B54918 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 0156C 80B5491C 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01570 80B54920 87A50030 */ lh $a1, 0x0030($sp) -/* 01574 80B54924 0C2D50D8 */ jal func_80B54360 +/* 0156C 80B5491C 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01570 80B54920 87A50030 */ lh $a1, 0x0030($sp) +/* 01574 80B54924 0C2D50D8 */ jal func_80B54360 /* 01578 80B54928 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0157C 80B5492C 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01580 80B54930 87A50034 */ lh $a1, 0x0034($sp) -/* 01584 80B54934 0C2D4ED9 */ jal func_80B53B64 +/* 0157C 80B5492C 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01580 80B54930 87A50034 */ lh $a1, 0x0034($sp) +/* 01584 80B54934 0C2D4ED9 */ jal func_80B53B64 /* 01588 80B54938 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B .L80B5493C: /* 0158C 80B5493C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01590 80B54940 8FA30020 */ lw $v1, 0x0020($sp) +/* 01590 80B54940 8FA30020 */ lw $v1, 0x0020($sp) /* 01594 80B54944 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 01598 80B54948 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0159C 80B5494C 846A0012 */ lh $t2, 0x0012($v1) ## 00000012 @@ -250,54 +250,54 @@ glabel func_80B5458C /* 015A8 80B54958 845914A4 */ lh $t9, 0x14A4($v0) ## 801614A4 /* 015AC 80B5495C 844B14A6 */ lh $t3, 0x14A6($v0) ## 801614A6 /* 015B0 80B54960 844D14A8 */ lh $t5, 0x14A8($v0) ## 801614A8 -/* 015B4 80B54964 032A2021 */ addu $a0, $t9, $t2 -/* 015B8 80B54968 016C2821 */ addu $a1, $t3, $t4 -/* 015BC 80B5496C 01AE3021 */ addu $a2, $t5, $t6 -/* 015C0 80B54970 00063400 */ sll $a2, $a2, 16 -/* 015C4 80B54974 00052C00 */ sll $a1, $a1, 16 -/* 015C8 80B54978 00042400 */ sll $a0, $a0, 16 -/* 015CC 80B5497C 00042403 */ sra $a0, $a0, 16 -/* 015D0 80B54980 00052C03 */ sra $a1, $a1, 16 -/* 015D4 80B54984 0C034421 */ jal Matrix_RotateXYZ -/* 015D8 80B54988 00063403 */ sra $a2, $a2, 16 +/* 015B4 80B54964 032A2021 */ addu $a0, $t9, $t2 +/* 015B8 80B54968 016C2821 */ addu $a1, $t3, $t4 +/* 015BC 80B5496C 01AE3021 */ addu $a2, $t5, $t6 +/* 015C0 80B54970 00063400 */ sll $a2, $a2, 16 +/* 015C4 80B54974 00052C00 */ sll $a1, $a1, 16 +/* 015C8 80B54978 00042400 */ sll $a0, $a0, 16 +/* 015CC 80B5497C 00042403 */ sra $a0, $a0, 16 +/* 015D0 80B54980 00052C03 */ sra $a1, $a1, 16 +/* 015D4 80B54984 0C034421 */ jal Matrix_RotateZYX +/* 015D8 80B54988 00063403 */ sra $a2, $a2, 16 /* 015DC 80B5498C 3C0180B6 */ lui $at, %hi(D_80B5AAF8) ## $at = 80B60000 -/* 015E0 80B54990 C42CAAF8 */ lwc1 $f12, %lo(D_80B5AAF8)($at) +/* 015E0 80B54990 C42CAAF8 */ lwc1 $f12, %lo(D_80B5AAF8)($at) /* 015E4 80B54994 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 015E8 80B54998 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 /* 015EC 80B5499C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 015F0 80B549A0 0C034261 */ jal Matrix_Translate +/* 015F0 80B549A0 0C034261 */ jal Matrix_Translate /* 015F4 80B549A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 015F8 80B549A8 8FA40078 */ lw $a0, 0x0078($sp) +/* 015F8 80B549A8 8FA40078 */ lw $a0, 0x0078($sp) /* 015FC 80B549AC 3C0580B6 */ lui $a1, %hi(D_80B5A5D0) ## $a1 = 80B60000 /* 01600 80B549B0 24A5A5D0 */ addiu $a1, $a1, %lo(D_80B5A5D0) ## $a1 = 80B5A5D0 /* 01604 80B549B4 2406062B */ addiu $a2, $zero, 0x062B ## $a2 = 0000062B -/* 01608 80B549B8 0C034695 */ jal Matrix_ToMtx +/* 01608 80B549B8 0C034695 */ jal Matrix_ToMtx /* 0160C 80B549BC 248400C0 */ addiu $a0, $a0, 0x00C0 ## $a0 = 000000C0 -/* 01610 80B549C0 0C034236 */ jal Matrix_Get +/* 01610 80B549C0 0C034236 */ jal Matrix_Get /* 01614 80B549C4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01618 80B549C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 0161C 80B549CC 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01620 80B549D0 0C034833 */ jal func_800D20CC +/* 01620 80B549D0 0C034833 */ jal func_800D20CC /* 01624 80B549D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01628 80B549D8 0C03034A */ jal func_800C0D28 -/* 0162C 80B549DC 8FA40090 */ lw $a0, 0x0090($sp) -/* 01630 80B549E0 1440000D */ bne $v0, $zero, .L80B54A18 +/* 01628 80B549D8 0C03034A */ jal func_800C0D28 +/* 0162C 80B549DC 8FA40090 */ lw $a0, 0x0090($sp) +/* 01630 80B549E0 1440000D */ bne $v0, $zero, .L80B54A18 /* 01634 80B549E4 00000000 */ nop -/* 01638 80B549E8 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0163C 80B549EC 87A50032 */ lh $a1, 0x0032($sp) -/* 01640 80B549F0 0C2D4E60 */ jal func_80B53980 +/* 01638 80B549E8 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 0163C 80B549EC 87A50032 */ lh $a1, 0x0032($sp) +/* 01640 80B549F0 0C2D4E60 */ jal func_80B53980 /* 01644 80B549F4 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 01648 80B549F8 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0164C 80B549FC 87A50030 */ lh $a1, 0x0030($sp) -/* 01650 80B54A00 0C2D50D8 */ jal func_80B54360 +/* 01648 80B549F8 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 0164C 80B549FC 87A50030 */ lh $a1, 0x0030($sp) +/* 01650 80B54A00 0C2D50D8 */ jal func_80B54360 /* 01654 80B54A04 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D -/* 01658 80B54A08 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0165C 80B54A0C 87A50034 */ lh $a1, 0x0034($sp) -/* 01660 80B54A10 0C2D4ED9 */ jal func_80B53B64 +/* 01658 80B54A08 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 0165C 80B54A0C 87A50034 */ lh $a1, 0x0034($sp) +/* 01660 80B54A10 0C2D4ED9 */ jal func_80B53B64 /* 01664 80B54A14 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E .L80B54A18: /* 01668 80B54A18 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0166C 80B54A1C 8FA30020 */ lw $v1, 0x0020($sp) +/* 0166C 80B54A1C 8FA30020 */ lw $v1, 0x0020($sp) /* 01670 80B54A20 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 01674 80B54A24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01678 80B54A28 84780018 */ lh $t8, 0x0018($v1) ## 00000018 @@ -306,66 +306,66 @@ glabel func_80B5458C /* 01684 80B54A34 844F14AA */ lh $t7, 0x14AA($v0) ## 801614AA /* 01688 80B54A38 845914AC */ lh $t9, 0x14AC($v0) ## 801614AC /* 0168C 80B54A3C 844B14AE */ lh $t3, 0x14AE($v0) ## 801614AE -/* 01690 80B54A40 01F82021 */ addu $a0, $t7, $t8 -/* 01694 80B54A44 032A2821 */ addu $a1, $t9, $t2 -/* 01698 80B54A48 016C3021 */ addu $a2, $t3, $t4 -/* 0169C 80B54A4C 00063400 */ sll $a2, $a2, 16 -/* 016A0 80B54A50 00052C00 */ sll $a1, $a1, 16 -/* 016A4 80B54A54 00042400 */ sll $a0, $a0, 16 -/* 016A8 80B54A58 00042403 */ sra $a0, $a0, 16 -/* 016AC 80B54A5C 00052C03 */ sra $a1, $a1, 16 -/* 016B0 80B54A60 0C034421 */ jal Matrix_RotateXYZ -/* 016B4 80B54A64 00063403 */ sra $a2, $a2, 16 +/* 01690 80B54A40 01F82021 */ addu $a0, $t7, $t8 +/* 01694 80B54A44 032A2821 */ addu $a1, $t9, $t2 +/* 01698 80B54A48 016C3021 */ addu $a2, $t3, $t4 +/* 0169C 80B54A4C 00063400 */ sll $a2, $a2, 16 +/* 016A0 80B54A50 00052C00 */ sll $a1, $a1, 16 +/* 016A4 80B54A54 00042400 */ sll $a0, $a0, 16 +/* 016A8 80B54A58 00042403 */ sra $a0, $a0, 16 +/* 016AC 80B54A5C 00052C03 */ sra $a1, $a1, 16 +/* 016B0 80B54A60 0C034421 */ jal Matrix_RotateZYX +/* 016B4 80B54A64 00063403 */ sra $a2, $a2, 16 /* 016B8 80B54A68 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 016BC 80B54A6C 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 016C0 80B54A70 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 016C4 80B54A74 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 016C8 80B54A78 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 016CC 80B54A7C 0C034261 */ jal Matrix_Translate +/* 016CC 80B54A7C 0C034261 */ jal Matrix_Translate /* 016D0 80B54A80 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 016D4 80B54A84 8FA40078 */ lw $a0, 0x0078($sp) +/* 016D4 80B54A84 8FA40078 */ lw $a0, 0x0078($sp) /* 016D8 80B54A88 3C0580B6 */ lui $a1, %hi(D_80B5A5E0) ## $a1 = 80B60000 /* 016DC 80B54A8C 24A5A5E0 */ addiu $a1, $a1, %lo(D_80B5A5E0) ## $a1 = 80B5A5E0 /* 016E0 80B54A90 2406063E */ addiu $a2, $zero, 0x063E ## $a2 = 0000063E -/* 016E4 80B54A94 0C034695 */ jal Matrix_ToMtx +/* 016E4 80B54A94 0C034695 */ jal Matrix_ToMtx /* 016E8 80B54A98 24840100 */ addiu $a0, $a0, 0x0100 ## $a0 = 00000100 -/* 016EC 80B54A9C 0C034221 */ jal Matrix_Pull +/* 016EC 80B54A9C 0C034221 */ jal Matrix_Pull /* 016F0 80B54AA0 00000000 */ nop -/* 016F4 80B54AA4 0C034213 */ jal Matrix_Push +/* 016F4 80B54AA4 0C034213 */ jal Matrix_Push /* 016F8 80B54AA8 00000000 */ nop /* 016FC 80B54AAC 3C0180B6 */ lui $at, %hi(D_80B5AAFC) ## $at = 80B60000 -/* 01700 80B54AB0 C42CAAFC */ lwc1 $f12, %lo(D_80B5AAFC)($at) +/* 01700 80B54AB0 C42CAAFC */ lwc1 $f12, %lo(D_80B5AAFC)($at) /* 01704 80B54AB4 3C0180B6 */ lui $at, %hi(D_80B5AB00) ## $at = 80B60000 /* 01708 80B54AB8 3C06C3C2 */ lui $a2, 0xC3C2 ## $a2 = C3C20000 /* 0170C 80B54ABC 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3C28000 -/* 01710 80B54AC0 C42EAB00 */ lwc1 $f14, %lo(D_80B5AB00)($at) -/* 01714 80B54AC4 0C034261 */ jal Matrix_Translate +/* 01710 80B54AC0 C42EAB00 */ lwc1 $f14, %lo(D_80B5AB00)($at) +/* 01714 80B54AC4 0C034261 */ jal Matrix_Translate /* 01718 80B54AC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0171C 80B54ACC 0C034236 */ jal Matrix_Get +/* 0171C 80B54ACC 0C034236 */ jal Matrix_Get /* 01720 80B54AD0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01724 80B54AD4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01728 80B54AD8 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 0172C 80B54ADC 0C034833 */ jal func_800D20CC +/* 0172C 80B54ADC 0C034833 */ jal func_800D20CC /* 01730 80B54AE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01734 80B54AE4 0C03034A */ jal func_800C0D28 -/* 01738 80B54AE8 8FA40090 */ lw $a0, 0x0090($sp) -/* 0173C 80B54AEC 1440000D */ bne $v0, $zero, .L80B54B24 +/* 01734 80B54AE4 0C03034A */ jal func_800C0D28 +/* 01738 80B54AE8 8FA40090 */ lw $a0, 0x0090($sp) +/* 0173C 80B54AEC 1440000D */ bne $v0, $zero, .L80B54B24 /* 01740 80B54AF0 00000000 */ nop -/* 01744 80B54AF4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01748 80B54AF8 87A50032 */ lh $a1, 0x0032($sp) -/* 0174C 80B54AFC 0C2D4E60 */ jal func_80B53980 +/* 01744 80B54AF4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01748 80B54AF8 87A50032 */ lh $a1, 0x0032($sp) +/* 0174C 80B54AFC 0C2D4E60 */ jal func_80B53980 /* 01750 80B54B00 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 01754 80B54B04 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01758 80B54B08 87A50030 */ lh $a1, 0x0030($sp) -/* 0175C 80B54B0C 0C2D50D8 */ jal func_80B54360 +/* 01754 80B54B04 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01758 80B54B08 87A50030 */ lh $a1, 0x0030($sp) +/* 0175C 80B54B0C 0C2D50D8 */ jal func_80B54360 /* 01760 80B54B10 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01764 80B54B14 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01768 80B54B18 87A50034 */ lh $a1, 0x0034($sp) -/* 0176C 80B54B1C 0C2D4ED9 */ jal func_80B53B64 +/* 01764 80B54B14 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01768 80B54B18 87A50034 */ lh $a1, 0x0034($sp) +/* 0176C 80B54B1C 0C2D4ED9 */ jal func_80B53B64 /* 01770 80B54B20 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 .L80B54B24: /* 01774 80B54B24 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01778 80B54B28 8FA30020 */ lw $v1, 0x0020($sp) +/* 01778 80B54B28 8FA30020 */ lw $v1, 0x0020($sp) /* 0177C 80B54B2C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 01780 80B54B30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01784 80B54B34 846E001E */ lh $t6, 0x001E($v1) ## 0000001E @@ -374,54 +374,54 @@ glabel func_80B5458C /* 01790 80B54B40 844D14B0 */ lh $t5, 0x14B0($v0) ## 801614B0 /* 01794 80B54B44 844F14B2 */ lh $t7, 0x14B2($v0) ## 801614B2 /* 01798 80B54B48 845914B4 */ lh $t9, 0x14B4($v0) ## 801614B4 -/* 0179C 80B54B4C 01AE2021 */ addu $a0, $t5, $t6 -/* 017A0 80B54B50 01F82821 */ addu $a1, $t7, $t8 -/* 017A4 80B54B54 032A3021 */ addu $a2, $t9, $t2 -/* 017A8 80B54B58 00063400 */ sll $a2, $a2, 16 -/* 017AC 80B54B5C 00052C00 */ sll $a1, $a1, 16 -/* 017B0 80B54B60 00042400 */ sll $a0, $a0, 16 -/* 017B4 80B54B64 00042403 */ sra $a0, $a0, 16 -/* 017B8 80B54B68 00052C03 */ sra $a1, $a1, 16 -/* 017BC 80B54B6C 0C034421 */ jal Matrix_RotateXYZ -/* 017C0 80B54B70 00063403 */ sra $a2, $a2, 16 +/* 0179C 80B54B4C 01AE2021 */ addu $a0, $t5, $t6 +/* 017A0 80B54B50 01F82821 */ addu $a1, $t7, $t8 +/* 017A4 80B54B54 032A3021 */ addu $a2, $t9, $t2 +/* 017A8 80B54B58 00063400 */ sll $a2, $a2, 16 +/* 017AC 80B54B5C 00052C00 */ sll $a1, $a1, 16 +/* 017B0 80B54B60 00042400 */ sll $a0, $a0, 16 +/* 017B4 80B54B64 00042403 */ sra $a0, $a0, 16 +/* 017B8 80B54B68 00052C03 */ sra $a1, $a1, 16 +/* 017BC 80B54B6C 0C034421 */ jal Matrix_RotateZYX +/* 017C0 80B54B70 00063403 */ sra $a2, $a2, 16 /* 017C4 80B54B74 3C0180B6 */ lui $at, %hi(D_80B5AB04) ## $at = 80B60000 -/* 017C8 80B54B78 C42CAB04 */ lwc1 $f12, %lo(D_80B5AB04)($at) +/* 017C8 80B54B78 C42CAB04 */ lwc1 $f12, %lo(D_80B5AB04)($at) /* 017CC 80B54B7C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 017D0 80B54B80 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 /* 017D4 80B54B84 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 017D8 80B54B88 0C034261 */ jal Matrix_Translate +/* 017D8 80B54B88 0C034261 */ jal Matrix_Translate /* 017DC 80B54B8C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 017E0 80B54B90 8FA40078 */ lw $a0, 0x0078($sp) +/* 017E0 80B54B90 8FA40078 */ lw $a0, 0x0078($sp) /* 017E4 80B54B94 3C0580B6 */ lui $a1, %hi(D_80B5A5F0) ## $a1 = 80B60000 /* 017E8 80B54B98 24A5A5F0 */ addiu $a1, $a1, %lo(D_80B5A5F0) ## $a1 = 80B5A5F0 /* 017EC 80B54B9C 24060657 */ addiu $a2, $zero, 0x0657 ## $a2 = 00000657 -/* 017F0 80B54BA0 0C034695 */ jal Matrix_ToMtx +/* 017F0 80B54BA0 0C034695 */ jal Matrix_ToMtx /* 017F4 80B54BA4 24840140 */ addiu $a0, $a0, 0x0140 ## $a0 = 00000140 -/* 017F8 80B54BA8 0C034236 */ jal Matrix_Get +/* 017F8 80B54BA8 0C034236 */ jal Matrix_Get /* 017FC 80B54BAC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01800 80B54BB0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01804 80B54BB4 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01808 80B54BB8 0C034833 */ jal func_800D20CC +/* 01808 80B54BB8 0C034833 */ jal func_800D20CC /* 0180C 80B54BBC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01810 80B54BC0 0C03034A */ jal func_800C0D28 -/* 01814 80B54BC4 8FA40090 */ lw $a0, 0x0090($sp) -/* 01818 80B54BC8 1440000C */ bne $v0, $zero, .L80B54BFC -/* 0181C 80B54BCC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01820 80B54BD0 87A50032 */ lh $a1, 0x0032($sp) -/* 01824 80B54BD4 0C2D4E60 */ jal func_80B53980 +/* 01810 80B54BC0 0C03034A */ jal func_800C0D28 +/* 01814 80B54BC4 8FA40090 */ lw $a0, 0x0090($sp) +/* 01818 80B54BC8 1440000C */ bne $v0, $zero, .L80B54BFC +/* 0181C 80B54BCC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01820 80B54BD0 87A50032 */ lh $a1, 0x0032($sp) +/* 01824 80B54BD4 0C2D4E60 */ jal func_80B53980 /* 01828 80B54BD8 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 0182C 80B54BDC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01830 80B54BE0 87A50030 */ lh $a1, 0x0030($sp) -/* 01834 80B54BE4 0C2D50D8 */ jal func_80B54360 +/* 0182C 80B54BDC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01830 80B54BE0 87A50030 */ lh $a1, 0x0030($sp) +/* 01834 80B54BE4 0C2D50D8 */ jal func_80B54360 /* 01838 80B54BE8 24060013 */ addiu $a2, $zero, 0x0013 ## $a2 = 00000013 -/* 0183C 80B54BEC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01840 80B54BF0 87A50034 */ lh $a1, 0x0034($sp) -/* 01844 80B54BF4 0C2D4ED9 */ jal func_80B53B64 +/* 0183C 80B54BEC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01840 80B54BF0 87A50034 */ lh $a1, 0x0034($sp) +/* 01844 80B54BF4 0C2D4ED9 */ jal func_80B53B64 /* 01848 80B54BF8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 .L80B54BFC: /* 0184C 80B54BFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01850 80B54C00 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 01854 80B54C04 8FAC0020 */ lw $t4, 0x0020($sp) +/* 01854 80B54C04 8FAC0020 */ lw $t4, 0x0020($sp) /* 01858 80B54C08 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0185C 80B54C0C 844B14B6 */ lh $t3, 0x14B6($v0) ## 801614B6 /* 01860 80B54C10 844E14B8 */ lh $t6, 0x14B8($v0) ## 801614B8 @@ -429,56 +429,56 @@ glabel func_80B5458C /* 01868 80B54C18 858D0024 */ lh $t5, 0x0024($t4) ## 00000024 /* 0186C 80B54C1C 858F0026 */ lh $t7, 0x0026($t4) ## 00000026 /* 01870 80B54C20 85990028 */ lh $t9, 0x0028($t4) ## 00000028 -/* 01874 80B54C24 016D2021 */ addu $a0, $t3, $t5 -/* 01878 80B54C28 01CF2821 */ addu $a1, $t6, $t7 -/* 0187C 80B54C2C 03193021 */ addu $a2, $t8, $t9 -/* 01880 80B54C30 00063400 */ sll $a2, $a2, 16 -/* 01884 80B54C34 00052C00 */ sll $a1, $a1, 16 -/* 01888 80B54C38 00042400 */ sll $a0, $a0, 16 -/* 0188C 80B54C3C 00042403 */ sra $a0, $a0, 16 -/* 01890 80B54C40 00052C03 */ sra $a1, $a1, 16 -/* 01894 80B54C44 0C034421 */ jal Matrix_RotateXYZ -/* 01898 80B54C48 00063403 */ sra $a2, $a2, 16 +/* 01874 80B54C24 016D2021 */ addu $a0, $t3, $t5 +/* 01878 80B54C28 01CF2821 */ addu $a1, $t6, $t7 +/* 0187C 80B54C2C 03193021 */ addu $a2, $t8, $t9 +/* 01880 80B54C30 00063400 */ sll $a2, $a2, 16 +/* 01884 80B54C34 00052C00 */ sll $a1, $a1, 16 +/* 01888 80B54C38 00042400 */ sll $a0, $a0, 16 +/* 0188C 80B54C3C 00042403 */ sra $a0, $a0, 16 +/* 01890 80B54C40 00052C03 */ sra $a1, $a1, 16 +/* 01894 80B54C44 0C034421 */ jal Matrix_RotateZYX +/* 01898 80B54C48 00063403 */ sra $a2, $a2, 16 /* 0189C 80B54C4C 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 018A0 80B54C50 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 018A4 80B54C54 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 018A8 80B54C58 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 018AC 80B54C5C 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 018B0 80B54C60 0C034261 */ jal Matrix_Translate +/* 018B0 80B54C60 0C034261 */ jal Matrix_Translate /* 018B4 80B54C64 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 018B8 80B54C68 8FA40078 */ lw $a0, 0x0078($sp) +/* 018B8 80B54C68 8FA40078 */ lw $a0, 0x0078($sp) /* 018BC 80B54C6C 3C0580B6 */ lui $a1, %hi(D_80B5A600) ## $a1 = 80B60000 /* 018C0 80B54C70 24A5A600 */ addiu $a1, $a1, %lo(D_80B5A600) ## $a1 = 80B5A600 /* 018C4 80B54C74 2406066A */ addiu $a2, $zero, 0x066A ## $a2 = 0000066A -/* 018C8 80B54C78 0C034695 */ jal Matrix_ToMtx +/* 018C8 80B54C78 0C034695 */ jal Matrix_ToMtx /* 018CC 80B54C7C 24840180 */ addiu $a0, $a0, 0x0180 ## $a0 = 00000180 -/* 018D0 80B54C80 0C034221 */ jal Matrix_Pull +/* 018D0 80B54C80 0C034221 */ jal Matrix_Pull /* 018D4 80B54C84 00000000 */ nop -/* 018D8 80B54C88 0C034221 */ jal Matrix_Pull +/* 018D8 80B54C88 0C034221 */ jal Matrix_Pull /* 018DC 80B54C8C 00000000 */ nop -/* 018E0 80B54C90 8FAB00A4 */ lw $t3, 0x00A4($sp) +/* 018E0 80B54C90 8FAB00A4 */ lw $t3, 0x00A4($sp) /* 018E4 80B54C94 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 018E8 80B54C98 1000000E */ beq $zero, $zero, .L80B54CD4 +/* 018E8 80B54C98 1000000E */ beq $zero, $zero, .L80B54CD4 /* 018EC 80B54C9C AD6A02FC */ sw $t2, 0x02FC($t3) ## 000002FC .L80B54CA0: /* 018F0 80B54CA0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 018F4 80B54CA4 14A1000B */ bne $a1, $at, .L80B54CD4 -/* 018F8 80B54CA8 8FA800A0 */ lw $t0, 0x00A0($sp) -/* 018FC 80B54CAC 8FA200A4 */ lw $v0, 0x00A4($sp) +/* 018F4 80B54CA4 14A1000B */ bne $a1, $at, .L80B54CD4 +/* 018F8 80B54CA8 8FA800A0 */ lw $t0, 0x00A0($sp) +/* 018FC 80B54CAC 8FA200A4 */ lw $v0, 0x00A4($sp) /* 01900 80B54CB0 850D0000 */ lh $t5, 0x0000($t0) ## 00000000 /* 01904 80B54CB4 850C0002 */ lh $t4, 0x0002($t0) ## 00000002 /* 01908 80B54CB8 844E0408 */ lh $t6, 0x0408($v0) ## 00000408 /* 0190C 80B54CBC 24420406 */ addiu $v0, $v0, 0x0406 ## $v0 = 00000406 -/* 01910 80B54CC0 01AE7821 */ addu $t7, $t5, $t6 +/* 01910 80B54CC0 01AE7821 */ addu $t7, $t5, $t6 /* 01914 80B54CC4 A50F0000 */ sh $t7, 0x0000($t0) ## 00000000 /* 01918 80B54CC8 84580000 */ lh $t8, 0x0000($v0) ## 00000406 -/* 0191C 80B54CCC 0198C823 */ subu $t9, $t4, $t8 +/* 0191C 80B54CCC 0198C823 */ subu $t9, $t4, $t8 /* 01920 80B54CD0 A5190002 */ sh $t9, 0x0002($t0) ## 00000002 .L80B54CD4: -/* 01924 80B54CD4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01924 80B54CD4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01928 80B54CD8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 0192C 80B54CDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01930 80B54CE0 03E00008 */ jr $ra +/* 01930 80B54CE0 03E00008 */ jr $ra /* 01934 80B54CE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s index 42cf92c819..03994238ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s @@ -1,17 +1,17 @@ glabel func_80B5944C /* 0609C 80B5944C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 060A0 80B59450 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 060A4 80B59454 AFBF001C */ sw $ra, 0x001C($sp) -/* 060A8 80B59458 AFB00018 */ sw $s0, 0x0018($sp) -/* 060AC 80B5945C AFA40020 */ sw $a0, 0x0020($sp) -/* 060B0 80B59460 AFA60028 */ sw $a2, 0x0028($sp) -/* 060B4 80B59464 14A10087 */ bne $a1, $at, .L80B59684 -/* 060B8 80B59468 AFA7002C */ sw $a3, 0x002C($sp) +/* 060A4 80B59454 AFBF001C */ sw $ra, 0x001C($sp) +/* 060A8 80B59458 AFB00018 */ sw $s0, 0x0018($sp) +/* 060AC 80B5945C AFA40020 */ sw $a0, 0x0020($sp) +/* 060B0 80B59460 AFA60028 */ sw $a2, 0x0028($sp) +/* 060B4 80B59464 14A10087 */ bne $a1, $at, .L80B59684 +/* 060B8 80B59468 AFA7002C */ sw $a3, 0x002C($sp) /* 060BC 80B5946C 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 /* 060C0 80B59470 0C031A73 */ jal Graph_Alloc - + /* 060C4 80B59474 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 060C8 80B59478 8FA50038 */ lw $a1, 0x0038($sp) +/* 060C8 80B59478 8FA50038 */ lw $a1, 0x0038($sp) /* 060CC 80B5947C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 060D0 80B59480 35EF0030 */ ori $t7, $t7, 0x0030 ## $t7 = DB060030 /* 060D4 80B59484 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 @@ -20,133 +20,133 @@ glabel func_80B5944C /* 060E0 80B59490 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 /* 060E4 80B59494 AC820004 */ sw $v0, 0x0004($a0) ## 00000004 /* 060E8 80B59498 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 060EC 80B5949C 8FA30030 */ lw $v1, 0x0030($sp) -/* 060F0 80B594A0 8FA20034 */ lw $v0, 0x0034($sp) +/* 060EC 80B5949C 8FA30030 */ lw $v1, 0x0030($sp) +/* 060F0 80B594A0 8FA20034 */ lw $v0, 0x0034($sp) /* 060F4 80B594A4 84780000 */ lh $t8, 0x0000($v1) ## 00000000 /* 060F8 80B594A8 84590402 */ lh $t9, 0x0402($v0) ## 00000402 /* 060FC 80B594AC 846A0004 */ lh $t2, 0x0004($v1) ## 00000004 /* 06100 80B594B0 24420400 */ addiu $v0, $v0, 0x0400 ## $v0 = 00000400 -/* 06104 80B594B4 03194821 */ addu $t1, $t8, $t9 +/* 06104 80B594B4 03194821 */ addu $t1, $t8, $t9 /* 06108 80B594B8 A4690000 */ sh $t1, 0x0000($v1) ## 00000000 /* 0610C 80B594BC 844B0000 */ lh $t3, 0x0000($v0) ## 00000400 -/* 06110 80B594C0 014B6021 */ addu $t4, $t2, $t3 -/* 06114 80B594C4 0C034213 */ jal Matrix_Push +/* 06110 80B594C0 014B6021 */ addu $t4, $t2, $t3 +/* 06114 80B594C4 0C034213 */ jal Matrix_Push /* 06118 80B594C8 A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 -/* 0611C 80B594CC 8FA8002C */ lw $t0, 0x002C($sp) +/* 0611C 80B594CC 8FA8002C */ lw $t0, 0x002C($sp) /* 06120 80B594D0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06124 80B594D4 C50C0000 */ lwc1 $f12, 0x0000($t0) ## 00000000 /* 06128 80B594D8 C50E0004 */ lwc1 $f14, 0x0004($t0) ## 00000004 -/* 0612C 80B594DC 0C034261 */ jal Matrix_Translate +/* 0612C 80B594DC 0C034261 */ jal Matrix_Translate /* 06130 80B594E0 8D060008 */ lw $a2, 0x0008($t0) ## 00000008 -/* 06134 80B594E4 8FA30030 */ lw $v1, 0x0030($sp) +/* 06134 80B594E4 8FA30030 */ lw $v1, 0x0030($sp) /* 06138 80B594E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0613C 80B594EC 84640000 */ lh $a0, 0x0000($v1) ## 00000000 /* 06140 80B594F0 84650002 */ lh $a1, 0x0002($v1) ## 00000002 -/* 06144 80B594F4 0C034421 */ jal Matrix_RotateXYZ +/* 06144 80B594F4 0C034421 */ jal Matrix_RotateZYX /* 06148 80B594F8 84660004 */ lh $a2, 0x0004($v1) ## 00000004 -/* 0614C 80B594FC 0C034213 */ jal Matrix_Push +/* 0614C 80B594FC 0C034213 */ jal Matrix_Push /* 06150 80B59500 00000000 */ nop /* 06154 80B59504 3C01432E */ lui $at, 0x432E ## $at = 432E0000 /* 06158 80B59508 44816000 */ mtc1 $at, $f12 ## $f12 = 174.00 /* 0615C 80B5950C 3C0180B6 */ lui $at, %hi(D_80B5AB94) ## $at = 80B60000 -/* 06160 80B59510 C42EAB94 */ lwc1 $f14, %lo(D_80B5AB94)($at) +/* 06160 80B59510 C42EAB94 */ lwc1 $f14, %lo(D_80B5AB94)($at) /* 06164 80B59514 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 06168 80B59518 0C034261 */ jal Matrix_Translate +/* 06168 80B59518 0C034261 */ jal Matrix_Translate /* 0616C 80B5951C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06170 80B59520 3C0580B6 */ lui $a1, %hi(D_80B5A824) ## $a1 = 80B60000 /* 06174 80B59524 24A5A824 */ addiu $a1, $a1, %lo(D_80B5A824) ## $a1 = 80B5A824 /* 06178 80B59528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0617C 80B5952C 0C034695 */ jal Matrix_ToMtx +/* 0617C 80B5952C 0C034695 */ jal Matrix_ToMtx /* 06180 80B59530 240609A7 */ addiu $a2, $zero, 0x09A7 ## $a2 = 000009A7 /* 06184 80B59534 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 /* 06188 80B59538 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 /* 0618C 80B5953C 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 06190 80B59540 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 06194 80B59544 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 06198 80B59548 0C034261 */ jal Matrix_Translate +/* 06198 80B59548 0C034261 */ jal Matrix_Translate /* 0619C 80B5954C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 061A0 80B59550 3C0580B6 */ lui $a1, %hi(D_80B5A83C) ## $a1 = 80B60000 /* 061A4 80B59554 24A5A83C */ addiu $a1, $a1, %lo(D_80B5A83C) ## $a1 = 80B5A83C /* 061A8 80B59558 26040040 */ addiu $a0, $s0, 0x0040 ## $a0 = 00000040 -/* 061AC 80B5955C 0C034695 */ jal Matrix_ToMtx +/* 061AC 80B5955C 0C034695 */ jal Matrix_ToMtx /* 061B0 80B59560 240609AA */ addiu $a2, $zero, 0x09AA ## $a2 = 000009AA /* 061B4 80B59564 3C0180B6 */ lui $at, %hi(D_80B5AB98) ## $at = 80B60000 -/* 061B8 80B59568 C42CAB98 */ lwc1 $f12, %lo(D_80B5AB98)($at) +/* 061B8 80B59568 C42CAB98 */ lwc1 $f12, %lo(D_80B5AB98)($at) /* 061BC 80B5956C 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 061C0 80B59570 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 /* 061C4 80B59574 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 061C8 80B59578 0C034261 */ jal Matrix_Translate +/* 061C8 80B59578 0C034261 */ jal Matrix_Translate /* 061CC 80B5957C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 061D0 80B59580 3C0580B6 */ lui $a1, %hi(D_80B5A854) ## $a1 = 80B60000 /* 061D4 80B59584 24A5A854 */ addiu $a1, $a1, %lo(D_80B5A854) ## $a1 = 80B5A854 /* 061D8 80B59588 26040080 */ addiu $a0, $s0, 0x0080 ## $a0 = 00000080 -/* 061DC 80B5958C 0C034695 */ jal Matrix_ToMtx +/* 061DC 80B5958C 0C034695 */ jal Matrix_ToMtx /* 061E0 80B59590 240609AD */ addiu $a2, $zero, 0x09AD ## $a2 = 000009AD -/* 061E4 80B59594 0C034221 */ jal Matrix_Pull +/* 061E4 80B59594 0C034221 */ jal Matrix_Pull /* 061E8 80B59598 00000000 */ nop -/* 061EC 80B5959C 0C034213 */ jal Matrix_Push +/* 061EC 80B5959C 0C034213 */ jal Matrix_Push /* 061F0 80B595A0 00000000 */ nop /* 061F4 80B595A4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 061F8 80B595A8 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 061FC 80B595AC 3C014384 */ lui $at, 0x4384 ## $at = 43840000 /* 06200 80B595B0 44817000 */ mtc1 $at, $f14 ## $f14 = 264.00 /* 06204 80B595B4 3C0643C1 */ lui $a2, 0x43C1 ## $a2 = 43C10000 -/* 06208 80B595B8 0C034261 */ jal Matrix_Translate +/* 06208 80B595B8 0C034261 */ jal Matrix_Translate /* 0620C 80B595BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06210 80B595C0 3C0580B6 */ lui $a1, %hi(D_80B5A86C) ## $a1 = 80B60000 /* 06214 80B595C4 24A5A86C */ addiu $a1, $a1, %lo(D_80B5A86C) ## $a1 = 80B5A86C /* 06218 80B595C8 260400C0 */ addiu $a0, $s0, 0x00C0 ## $a0 = 000000C0 -/* 0621C 80B595CC 0C034695 */ jal Matrix_ToMtx +/* 0621C 80B595CC 0C034695 */ jal Matrix_ToMtx /* 06220 80B595D0 240609B3 */ addiu $a2, $zero, 0x09B3 ## $a2 = 000009B3 /* 06224 80B595D4 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 06228 80B595D8 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 0622C 80B595DC 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 06230 80B595E0 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 06234 80B595E4 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 06238 80B595E8 0C034261 */ jal Matrix_Translate +/* 06238 80B595E8 0C034261 */ jal Matrix_Translate /* 0623C 80B595EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06240 80B595F0 3C0580B6 */ lui $a1, %hi(D_80B5A884) ## $a1 = 80B60000 /* 06244 80B595F4 24A5A884 */ addiu $a1, $a1, %lo(D_80B5A884) ## $a1 = 80B5A884 /* 06248 80B595F8 26040100 */ addiu $a0, $s0, 0x0100 ## $a0 = 00000100 -/* 0624C 80B595FC 0C034695 */ jal Matrix_ToMtx +/* 0624C 80B595FC 0C034695 */ jal Matrix_ToMtx /* 06250 80B59600 240609B6 */ addiu $a2, $zero, 0x09B6 ## $a2 = 000009B6 -/* 06254 80B59604 0C034221 */ jal Matrix_Pull +/* 06254 80B59604 0C034221 */ jal Matrix_Pull /* 06258 80B59608 00000000 */ nop -/* 0625C 80B5960C 0C034213 */ jal Matrix_Push +/* 0625C 80B5960C 0C034213 */ jal Matrix_Push /* 06260 80B59610 00000000 */ nop /* 06264 80B59614 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 06268 80B59618 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 0626C 80B5961C 3C014384 */ lui $at, 0x4384 ## $at = 43840000 /* 06270 80B59620 44817000 */ mtc1 $at, $f14 ## $f14 = 264.00 /* 06274 80B59624 3C06C3C1 */ lui $a2, 0xC3C1 ## $a2 = C3C10000 -/* 06278 80B59628 0C034261 */ jal Matrix_Translate +/* 06278 80B59628 0C034261 */ jal Matrix_Translate /* 0627C 80B5962C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06280 80B59630 3C0580B6 */ lui $a1, %hi(D_80B5A89C) ## $a1 = 80B60000 /* 06284 80B59634 24A5A89C */ addiu $a1, $a1, %lo(D_80B5A89C) ## $a1 = 80B5A89C /* 06288 80B59638 26040140 */ addiu $a0, $s0, 0x0140 ## $a0 = 00000140 -/* 0628C 80B5963C 0C034695 */ jal Matrix_ToMtx +/* 0628C 80B5963C 0C034695 */ jal Matrix_ToMtx /* 06290 80B59640 240609BC */ addiu $a2, $zero, 0x09BC ## $a2 = 000009BC /* 06294 80B59644 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 06298 80B59648 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 0629C 80B5964C 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 062A0 80B59650 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 062A4 80B59654 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 062A8 80B59658 0C034261 */ jal Matrix_Translate +/* 062A8 80B59658 0C034261 */ jal Matrix_Translate /* 062AC 80B5965C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 062B0 80B59660 3C0580B6 */ lui $a1, %hi(D_80B5A8B4) ## $a1 = 80B60000 /* 062B4 80B59664 24A5A8B4 */ addiu $a1, $a1, %lo(D_80B5A8B4) ## $a1 = 80B5A8B4 /* 062B8 80B59668 26040180 */ addiu $a0, $s0, 0x0180 ## $a0 = 00000180 -/* 062BC 80B5966C 0C034695 */ jal Matrix_ToMtx +/* 062BC 80B5966C 0C034695 */ jal Matrix_ToMtx /* 062C0 80B59670 240609BF */ addiu $a2, $zero, 0x09BF ## $a2 = 000009BF -/* 062C4 80B59674 0C034221 */ jal Matrix_Pull +/* 062C4 80B59674 0C034221 */ jal Matrix_Pull /* 062C8 80B59678 00000000 */ nop -/* 062CC 80B5967C 0C034221 */ jal Matrix_Pull +/* 062CC 80B5967C 0C034221 */ jal Matrix_Pull /* 062D0 80B59680 00000000 */ nop .L80B59684: -/* 062D4 80B59684 8FBF001C */ lw $ra, 0x001C($sp) -/* 062D8 80B59688 8FB00018 */ lw $s0, 0x0018($sp) +/* 062D4 80B59684 8FBF001C */ lw $ra, 0x001C($sp) +/* 062D8 80B59688 8FB00018 */ lw $s0, 0x0018($sp) /* 062DC 80B5968C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 062E0 80B59690 03E00008 */ jr $ra +/* 062E0 80B59690 03E00008 */ jr $ra /* 062E4 80B59694 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s index 3795396727..6b11cee4be 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s @@ -1,27 +1,27 @@ glabel ObjIcePoly_Draw /* 0071C 80B9497C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00720 80B94980 AFB10038 */ sw $s1, 0x0038($sp) +/* 00720 80B94980 AFB10038 */ sw $s1, 0x0038($sp) /* 00724 80B94984 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00728 80B94988 AFBF003C */ sw $ra, 0x003C($sp) -/* 0072C 80B9498C AFB00034 */ sw $s0, 0x0034($sp) -/* 00730 80B94990 AFA40070 */ sw $a0, 0x0070($sp) +/* 00728 80B94988 AFBF003C */ sw $ra, 0x003C($sp) +/* 0072C 80B9498C AFB00034 */ sw $s0, 0x0034($sp) +/* 00730 80B94990 AFA40070 */ sw $a0, 0x0070($sp) /* 00734 80B94994 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00738 80B94998 3C0680B9 */ lui $a2, %hi(D_80B94BB0) ## $a2 = 80B90000 /* 0073C 80B9499C 24C64BB0 */ addiu $a2, $a2, %lo(D_80B94BB0) ## $a2 = 80B94BB0 /* 00740 80B949A0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 00744 80B949A4 240701A5 */ addiu $a3, $zero, 0x01A5 ## $a3 = 000001A5 -/* 00748 80B949A8 0C031AB1 */ jal func_800C6AC4 +/* 00748 80B949A8 0C031AB1 */ jal func_800C6AC4 /* 0074C 80B949AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00750 80B949B0 0C024F61 */ jal func_80093D84 +/* 00750 80B949B0 0C024F61 */ jal func_80093D84 /* 00754 80B949B4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00758 80B949B8 8FA40070 */ lw $a0, 0x0070($sp) +/* 00758 80B949B8 8FA40070 */ lw $a0, 0x0070($sp) /* 0075C 80B949BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00760 80B949C0 0C00BB60 */ jal func_8002ED80 +/* 00760 80B949C0 0C00BB60 */ jal func_8002ED80 /* 00764 80B949C4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00768 80B949C8 24040500 */ addiu $a0, $zero, 0x0500 ## $a0 = 00000500 /* 0076C 80B949CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00770 80B949D0 2406FB00 */ addiu $a2, $zero, 0xFB00 ## $a2 = FFFFFB00 -/* 00774 80B949D4 0C034421 */ jal Matrix_RotateXYZ +/* 00774 80B949D4 0C034421 */ jal Matrix_RotateZYX /* 00778 80B949D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0077C 80B949DC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00780 80B949E0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -33,40 +33,40 @@ glabel ObjIcePoly_Draw /* 00798 80B949F8 3C0580B9 */ lui $a1, %hi(D_80B94BC4) ## $a1 = 80B90000 /* 0079C 80B949FC 24A54BC4 */ addiu $a1, $a1, %lo(D_80B94BC4) ## $a1 = 80B94BC4 /* 007A0 80B94A00 240601AC */ addiu $a2, $zero, 0x01AC ## $a2 = 000001AC -/* 007A4 80B94A04 0C0346A2 */ jal Matrix_NewMtx -/* 007A8 80B94A08 AFA20050 */ sw $v0, 0x0050($sp) -/* 007AC 80B94A0C 8FA30050 */ lw $v1, 0x0050($sp) +/* 007A4 80B94A04 0C0346A2 */ jal Matrix_NewMtx +/* 007A8 80B94A08 AFA20050 */ sw $v0, 0x0050($sp) +/* 007AC 80B94A0C 8FA30050 */ lw $v1, 0x0050($sp) /* 007B0 80B94A10 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 007B4 80B94A14 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 007B8 80B94A18 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 007BC 80B94A1C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 007C0 80B94A20 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 007C4 80B94A24 00711821 */ addu $v1, $v1, $s1 +/* 007C4 80B94A24 00711821 */ addu $v1, $v1, $s1 /* 007C8 80B94A28 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 007CC 80B94A2C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 007D0 80B94A30 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 007D4 80B94A34 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 /* 007D8 80B94A38 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 007DC 80B94A3C 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 007E0 80B94A40 00036040 */ sll $t4, $v1, 1 +/* 007E0 80B94A40 00036040 */ sll $t4, $v1, 1 /* 007E4 80B94A44 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000000 /* 007E8 80B94A48 240A0010 */ addiu $t2, $zero, 0x0010 ## $t2 = 00000010 /* 007EC 80B94A4C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 007F0 80B94A50 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 /* 007F4 80B94A54 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 007F8 80B94A58 AFAF0028 */ sw $t7, 0x0028($sp) -/* 007FC 80B94A5C AFAE0024 */ sw $t6, 0x0024($sp) -/* 00800 80B94A60 AFAB0018 */ sw $t3, 0x0018($sp) -/* 00804 80B94A64 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00808 80B94A68 AFAD0020 */ sw $t5, 0x0020($sp) -/* 0080C 80B94A6C AFA90010 */ sw $t1, 0x0010($sp) -/* 00810 80B94A70 AFA0001C */ sw $zero, 0x001C($sp) +/* 007F8 80B94A58 AFAF0028 */ sw $t7, 0x0028($sp) +/* 007FC 80B94A5C AFAE0024 */ sw $t6, 0x0024($sp) +/* 00800 80B94A60 AFAB0018 */ sw $t3, 0x0018($sp) +/* 00804 80B94A64 AFAA0014 */ sw $t2, 0x0014($sp) +/* 00808 80B94A68 AFAD0020 */ sw $t5, 0x0020($sp) +/* 0080C 80B94A6C AFA90010 */ sw $t1, 0x0010($sp) +/* 00810 80B94A70 AFA0001C */ sw $zero, 0x001C($sp) /* 00814 80B94A74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00818 80B94A78 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0081C 80B94A7C AFA2004C */ sw $v0, 0x004C($sp) -/* 00820 80B94A80 0C0253D0 */ jal Draw_TwoTexScroll +/* 0081C 80B94A7C AFA2004C */ sw $v0, 0x004C($sp) +/* 00820 80B94A80 0C0253D0 */ jal Draw_TwoTexScroll /* 00824 80B94A84 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 -/* 00828 80B94A88 8FA8004C */ lw $t0, 0x004C($sp) +/* 00828 80B94A88 8FA8004C */ lw $t0, 0x004C($sp) /* 0082C 80B94A8C 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 00830 80B94A90 3C010032 */ lui $at, 0x0032 ## $at = 00320000 /* 00834 80B94A94 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -76,7 +76,7 @@ glabel ObjIcePoly_Draw /* 00844 80B94AA4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00848 80B94AA8 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 0084C 80B94AAC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00850 80B94AB0 8FA90070 */ lw $t1, 0x0070($sp) +/* 00850 80B94AB0 8FA90070 */ lw $t1, 0x0070($sp) /* 00854 80B94AB4 25EF3EE0 */ addiu $t7, $t7, 0x3EE0 ## $t7 = 04033EE0 /* 00858 80B94AB8 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 0085C 80B94ABC 912B0150 */ lbu $t3, 0x0150($t1) ## 00000150 @@ -91,12 +91,12 @@ glabel ObjIcePoly_Draw /* 00880 80B94AE0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 00884 80B94AE4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 00888 80B94AE8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0088C 80B94AEC 0C031AD5 */ jal func_800C6B54 +/* 0088C 80B94AEC 0C031AD5 */ jal func_800C6B54 /* 00890 80B94AF0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00894 80B94AF4 8FBF003C */ lw $ra, 0x003C($sp) -/* 00898 80B94AF8 8FB00034 */ lw $s0, 0x0034($sp) -/* 0089C 80B94AFC 8FB10038 */ lw $s1, 0x0038($sp) -/* 008A0 80B94B00 03E00008 */ jr $ra +/* 00894 80B94AF4 8FBF003C */ lw $ra, 0x003C($sp) +/* 00898 80B94AF8 8FB00034 */ lw $s0, 0x0034($sp) +/* 0089C 80B94AFC 8FB10038 */ lw $s1, 0x0038($sp) +/* 008A0 80B94B00 03E00008 */ jr $ra /* 008A4 80B94B04 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 008A8 80B94B08 00000000 */ nop /* 008AC 80B94B0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s index dd676e7874..890b763027 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s @@ -1,27 +1,27 @@ glabel func_809A16F4 /* 000E4 809A16F4 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 -/* 000E8 809A16F8 AFB00024 */ sw $s0, 0x0024($sp) -/* 000EC 809A16FC AFBF002C */ sw $ra, 0x002C($sp) -/* 000F0 809A1700 AFB10028 */ sw $s1, 0x0028($sp) -/* 000F4 809A1704 AFA400D8 */ sw $a0, 0x00D8($sp) -/* 000F8 809A1708 AFA500DC */ sw $a1, 0x00DC($sp) +/* 000E8 809A16F8 AFB00024 */ sw $s0, 0x0024($sp) +/* 000EC 809A16FC AFBF002C */ sw $ra, 0x002C($sp) +/* 000F0 809A1700 AFB10028 */ sw $s1, 0x0028($sp) +/* 000F4 809A1704 AFA400D8 */ sw $a0, 0x00D8($sp) +/* 000F8 809A1708 AFA500DC */ sw $a1, 0x00DC($sp) /* 000FC 809A170C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 00100 809A1710 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 /* 00104 809A1714 3C06809A */ lui $a2, %hi(D_809A1A80) ## $a2 = 809A0000 /* 00108 809A1718 24C61A80 */ addiu $a2, $a2, %lo(D_809A1A80) ## $a2 = 809A1A80 /* 0010C 809A171C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFF88 /* 00110 809A1720 2407009D */ addiu $a3, $zero, 0x009D ## $a3 = 0000009D -/* 00114 809A1724 0C031AB1 */ jal func_800C6AC4 +/* 00114 809A1724 0C031AB1 */ jal func_800C6AC4 /* 00118 809A1728 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0011C 809A172C 860F0040 */ lh $t7, 0x0040($s0) ## 00000040 /* 00120 809A1730 3C01809A */ lui $at, %hi(D_809A1AC8) ## $at = 809A0000 -/* 00124 809A1734 C4281AC8 */ lwc1 $f8, %lo(D_809A1AC8)($at) +/* 00124 809A1734 C4281AC8 */ lwc1 $f8, %lo(D_809A1AC8)($at) /* 00128 809A1738 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0012C 809A173C 8FB800D8 */ lw $t8, 0x00D8($sp) -/* 00130 809A1740 468021A0 */ cvt.s.w $f6, $f4 -/* 00134 809A1744 46083282 */ mul.s $f10, $f6, $f8 -/* 00138 809A1748 E7AA00D0 */ swc1 $f10, 0x00D0($sp) -/* 0013C 809A174C 0C0252F1 */ jal func_80094BC4 +/* 0012C 809A173C 8FB800D8 */ lw $t8, 0x00D8($sp) +/* 00130 809A1740 468021A0 */ cvt.s.w $f6, $f4 +/* 00134 809A1744 46083282 */ mul.s $f10, $f6, $f8 +/* 00138 809A1748 E7AA00D0 */ swc1 $f10, 0x00D0($sp) +/* 0013C 809A174C 0C0252F1 */ jal func_80094BC4 /* 00140 809A1750 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 00144 809A1754 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00148 809A1758 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 @@ -46,129 +46,129 @@ glabel func_809A16F4 /* 00194 809A17A4 8E0E0008 */ lw $t6, 0x0008($s0) ## 00000008 /* 00198 809A17A8 ACCE0008 */ sw $t6, 0x0008($a2) ## FFFFFFA8 /* 0019C 809A17AC 860F0042 */ lh $t7, 0x0042($s0) ## 00000042 -/* 001A0 809A17B0 C7B00078 */ lwc1 $f16, 0x0078($sp) -/* 001A4 809A17B4 55E00057 */ bnel $t7, $zero, .L809A1914 +/* 001A0 809A17B0 C7B00078 */ lwc1 $f16, 0x0078($sp) +/* 001A4 809A17B4 55E00057 */ bnel $t7, $zero, .L809A1914 /* 001A8 809A17B8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 001AC 809A17BC C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 001B0 809A17C0 C7A6007C */ lwc1 $f6, 0x007C($sp) +/* 001B0 809A17C0 C7A6007C */ lwc1 $f6, 0x007C($sp) /* 001B4 809A17C4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 001B8 809A17C8 46128101 */ sub.s $f4, $f16, $f18 -/* 001BC 809A17CC C7B00080 */ lwc1 $f16, 0x0080($sp) -/* 001C0 809A17D0 8FA400D8 */ lw $a0, 0x00D8($sp) +/* 001B8 809A17C8 46128101 */ sub.s $f4, $f16, $f18 +/* 001BC 809A17CC C7B00080 */ lwc1 $f16, 0x0080($sp) +/* 001C0 809A17D0 8FA400D8 */ lw $a0, 0x00D8($sp) /* 001C4 809A17D4 27B80074 */ addiu $t8, $sp, 0x0074 ## $t8 = FFFFFF9C -/* 001C8 809A17D8 E7A40044 */ swc1 $f4, 0x0044($sp) +/* 001C8 809A17D8 E7A40044 */ swc1 $f4, 0x0044($sp) /* 001CC 809A17DC C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 /* 001D0 809A17E0 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 /* 001D4 809A17E4 27A70044 */ addiu $a3, $sp, 0x0044 ## $a3 = FFFFFF6C -/* 001D8 809A17E8 46083281 */ sub.s $f10, $f6, $f8 +/* 001D8 809A17E8 46083281 */ sub.s $f10, $f6, $f8 /* 001DC 809A17EC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 001E0 809A17F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 001E4 809A17F4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 001E8 809A17F8 E7AA0048 */ swc1 $f10, 0x0048($sp) +/* 001E8 809A17F8 E7AA0048 */ swc1 $f10, 0x0048($sp) /* 001EC 809A17FC C6120014 */ lwc1 $f18, 0x0014($s0) ## 00000014 -/* 001F0 809A1800 AFA40034 */ sw $a0, 0x0034($sp) -/* 001F4 809A1804 AFB80014 */ sw $t8, 0x0014($sp) -/* 001F8 809A1808 46128101 */ sub.s $f4, $f16, $f18 -/* 001FC 809A180C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00200 809A1810 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00204 809A1814 0C00F519 */ jal func_8003D464 -/* 00208 809A1818 E7A4004C */ swc1 $f4, 0x004C($sp) -/* 0020C 809A181C 1040000C */ beq $v0, $zero, .L809A1850 -/* 00210 809A1820 8FA40034 */ lw $a0, 0x0034($sp) +/* 001F0 809A1800 AFA40034 */ sw $a0, 0x0034($sp) +/* 001F4 809A1804 AFB80014 */ sw $t8, 0x0014($sp) +/* 001F8 809A1808 46128101 */ sub.s $f4, $f16, $f18 +/* 001FC 809A180C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00200 809A1810 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00204 809A1814 0C00F519 */ jal func_8003D464 +/* 00208 809A1818 E7A4004C */ swc1 $f4, 0x004C($sp) +/* 0020C 809A181C 1040000C */ beq $v0, $zero, .L809A1850 +/* 00210 809A1820 8FA40034 */ lw $a0, 0x0034($sp) /* 00214 809A1824 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 00218 809A1828 8E060004 */ lw $a2, 0x0004($s0) ## 00000004 /* 0021C 809A182C 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 /* 00220 809A1830 27B90088 */ addiu $t9, $sp, 0x0088 ## $t9 = FFFFFFB0 -/* 00224 809A1834 AFB90010 */ sw $t9, 0x0010($sp) -/* 00228 809A1838 0C00E28A */ jal func_80038A28 -/* 0022C 809A183C 8FA40074 */ lw $a0, 0x0074($sp) -/* 00230 809A1840 0C03423F */ jal Matrix_Put +/* 00224 809A1834 AFB90010 */ sw $t9, 0x0010($sp) +/* 00228 809A1838 0C00E28A */ jal func_80038A28 +/* 0022C 809A183C 8FA40074 */ lw $a0, 0x0074($sp) +/* 00230 809A1840 0C03423F */ jal Matrix_Put /* 00234 809A1844 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -/* 00238 809A1848 10000023 */ beq $zero, $zero, .L809A18D8 +/* 00238 809A1848 10000023 */ beq $zero, $zero, .L809A18D8 /* 0023C 809A184C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 .L809A1850: /* 00240 809A1850 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00244 809A1854 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00248 809A1858 C7AA007C */ lwc1 $f10, 0x007C($sp) +/* 00248 809A1858 C7AA007C */ lwc1 $f10, 0x007C($sp) /* 0024C 809A185C 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFF9C /* 00250 809A1860 27A60078 */ addiu $a2, $sp, 0x0078 ## $a2 = FFFFFFA0 -/* 00254 809A1864 46105480 */ add.s $f18, $f10, $f16 -/* 00258 809A1868 0C00F224 */ jal func_8003C890 -/* 0025C 809A186C E7B2007C */ swc1 $f18, 0x007C($sp) -/* 00260 809A1870 8FA80074 */ lw $t0, 0x0074($sp) +/* 00254 809A1864 46105480 */ add.s $f18, $f10, $f16 +/* 00258 809A1868 0C00F224 */ jal func_8003C890 +/* 0025C 809A186C E7B2007C */ swc1 $f18, 0x007C($sp) +/* 00260 809A1870 8FA80074 */ lw $t0, 0x0074($sp) /* 00264 809A1874 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 00268 809A1878 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0026C 809A187C 51000010 */ beql $t0, $zero, .L809A18C0 +/* 0026C 809A187C 51000010 */ beql $t0, $zero, .L809A18C0 /* 00270 809A1880 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 00274 809A1884 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 00278 809A1888 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 0027C 809A188C 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00280 809A1890 46040180 */ add.s $f6, $f0, $f4 +/* 00280 809A1890 46040180 */ add.s $f6, $f0, $f4 /* 00284 809A1894 27A90088 */ addiu $t1, $sp, 0x0088 ## $t1 = FFFFFFB0 -/* 00288 809A1898 AFA90010 */ sw $t1, 0x0010($sp) +/* 00288 809A1898 AFA90010 */ sw $t1, 0x0010($sp) /* 0028C 809A189C 01002025 */ or $a0, $t0, $zero ## $a0 = 00000000 -/* 00290 809A18A0 44063000 */ mfc1 $a2, $f6 -/* 00294 809A18A4 0C00E28A */ jal func_80038A28 +/* 00290 809A18A0 44063000 */ mfc1 $a2, $f6 +/* 00294 809A18A4 0C00E28A */ jal func_80038A28 /* 00298 809A18A8 00000000 */ nop -/* 0029C 809A18AC 0C03423F */ jal Matrix_Put +/* 0029C 809A18AC 0C03423F */ jal Matrix_Put /* 002A0 809A18B0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -/* 002A4 809A18B4 10000008 */ beq $zero, $zero, .L809A18D8 +/* 002A4 809A18B4 10000008 */ beq $zero, $zero, .L809A18D8 /* 002A8 809A18B8 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 /* 002AC 809A18BC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 .L809A18C0: /* 002B0 809A18C0 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 002B4 809A18C4 0C034261 */ jal Matrix_Translate +/* 002B4 809A18C4 0C034261 */ jal Matrix_Translate /* 002B8 809A18C8 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 002BC 809A18CC 0C034236 */ jal Matrix_Get +/* 002BC 809A18CC 0C034236 */ jal Matrix_Get /* 002C0 809A18D0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 /* 002C4 809A18D4 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 .L809A18D8: /* 002C8 809A18D8 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFF78 -/* 002CC 809A18DC 0C034899 */ jal func_800D2264 +/* 002CC 809A18DC 0C034899 */ jal func_800D2264 /* 002D0 809A18E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 002D4 809A18E4 87AA0050 */ lh $t2, 0x0050($sp) +/* 002D4 809A18E4 87AA0050 */ lh $t2, 0x0050($sp) /* 002D8 809A18E8 860D0042 */ lh $t5, 0x0042($s0) ## 00000042 /* 002DC 809A18EC A60A0044 */ sh $t2, 0x0044($s0) ## 00000044 -/* 002E0 809A18F0 87AB0052 */ lh $t3, 0x0052($sp) +/* 002E0 809A18F0 87AB0052 */ lh $t3, 0x0052($sp) /* 002E4 809A18F4 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 /* 002E8 809A18F8 A60B0046 */ sh $t3, 0x0046($s0) ## 00000046 -/* 002EC 809A18FC 87AC0054 */ lh $t4, 0x0054($sp) +/* 002EC 809A18FC 87AC0054 */ lh $t4, 0x0054($sp) /* 002F0 809A1900 A60C0048 */ sh $t4, 0x0048($s0) ## 00000048 -/* 002F4 809A1904 C7A800BC */ lwc1 $f8, 0x00BC($sp) +/* 002F4 809A1904 C7A800BC */ lwc1 $f8, 0x00BC($sp) /* 002F8 809A1908 A60E0042 */ sh $t6, 0x0042($s0) ## 00000042 /* 002FC 809A190C E6080004 */ swc1 $f8, 0x0004($s0) ## 00000004 /* 00300 809A1910 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 .L809A1914: /* 00304 809A1914 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 /* 00308 809A1918 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 0030C 809A191C 0C034261 */ jal Matrix_Translate +/* 0030C 809A191C 0C034261 */ jal Matrix_Translate /* 00310 809A1920 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00314 809A1924 86040044 */ lh $a0, 0x0044($s0) ## 00000044 /* 00318 809A1928 86050046 */ lh $a1, 0x0046($s0) ## 00000046 /* 0031C 809A192C 86060048 */ lh $a2, 0x0048($s0) ## 00000048 -/* 00320 809A1930 0C034421 */ jal Matrix_RotateXYZ +/* 00320 809A1930 0C034421 */ jal Matrix_RotateZYX /* 00324 809A1934 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00328 809A1938 3C01809A */ lui $at, %hi(D_809A1ACC) ## $at = 809A0000 -/* 0032C 809A193C C42C1ACC */ lwc1 $f12, %lo(D_809A1ACC)($at) -/* 00330 809A1940 0C0342DC */ jal Matrix_RotateX +/* 0032C 809A193C C42C1ACC */ lwc1 $f12, %lo(D_809A1ACC)($at) +/* 00330 809A1940 0C0342DC */ jal Matrix_RotateX /* 00334 809A1944 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00338 809A1948 C7AC00D0 */ lwc1 $f12, 0x00D0($sp) +/* 00338 809A1948 C7AC00D0 */ lwc1 $f12, 0x00D0($sp) /* 0033C 809A194C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00340 809A1950 44066000 */ mfc1 $a2, $f12 -/* 00344 809A1954 0C0342A3 */ jal Matrix_Scale -/* 00348 809A1958 46006386 */ mov.s $f14, $f12 +/* 00340 809A1950 44066000 */ mfc1 $a2, $f12 +/* 00344 809A1954 0C0342A3 */ jal Matrix_Scale +/* 00348 809A1958 46006386 */ mov.s $f14, $f12 /* 0034C 809A195C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00350 809A1960 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 /* 00354 809A1964 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 /* 00358 809A1968 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0035C 809A196C AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 /* 00360 809A1970 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00364 809A1974 8FB900D8 */ lw $t9, 0x00D8($sp) +/* 00364 809A1974 8FB900D8 */ lw $t9, 0x00D8($sp) /* 00368 809A1978 3C05809A */ lui $a1, %hi(D_809A1A98) ## $a1 = 809A0000 /* 0036C 809A197C 24A51A98 */ addiu $a1, $a1, %lo(D_809A1A98) ## $a1 = 809A1A98 /* 00370 809A1980 240600F6 */ addiu $a2, $zero, 0x00F6 ## $a2 = 000000F6 /* 00374 809A1984 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00378 809A1988 0C0346A2 */ jal Matrix_NewMtx +/* 00378 809A1988 0C0346A2 */ jal Matrix_NewMtx /* 0037C 809A198C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 00380 809A1990 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 00384 809A1994 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -188,17 +188,17 @@ glabel func_809A16F4 /* 003BC 809A19CC 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 003C0 809A19D0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 003C4 809A19D4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 003C8 809A19D8 8FAE00D8 */ lw $t6, 0x00D8($sp) +/* 003C8 809A19D8 8FAE00D8 */ lw $t6, 0x00D8($sp) /* 003CC 809A19DC 3C06809A */ lui $a2, %hi(D_809A1AB0) ## $a2 = 809A0000 /* 003D0 809A19E0 24C61AB0 */ addiu $a2, $a2, %lo(D_809A1AB0) ## $a2 = 809A1AB0 /* 003D4 809A19E4 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFF88 /* 003D8 809A19E8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 003DC 809A19EC 0C031AD5 */ jal func_800C6B54 +/* 003DC 809A19EC 0C031AD5 */ jal func_800C6B54 /* 003E0 809A19F0 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 003E4 809A19F4 8FBF002C */ lw $ra, 0x002C($sp) -/* 003E8 809A19F8 8FB00024 */ lw $s0, 0x0024($sp) -/* 003EC 809A19FC 8FB10028 */ lw $s1, 0x0028($sp) -/* 003F0 809A1A00 03E00008 */ jr $ra +/* 003E4 809A19F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 003E8 809A19F8 8FB00024 */ lw $s0, 0x0024($sp) +/* 003EC 809A19FC 8FB10028 */ lw $s1, 0x0028($sp) +/* 003F0 809A1A00 03E00008 */ jr $ra /* 003F4 809A1A04 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s index d160ce4a5c..23d1c37714 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s @@ -1,64 +1,64 @@ glabel func_809AC42C /* 0015C 809AC42C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00160 809AC430 AFB10018 */ sw $s1, 0x0018($sp) -/* 00164 809AC434 AFBF001C */ sw $ra, 0x001C($sp) -/* 00168 809AC438 AFB00014 */ sw $s0, 0x0014($sp) -/* 0016C 809AC43C AFA40050 */ sw $a0, 0x0050($sp) -/* 00170 809AC440 AFA50054 */ sw $a1, 0x0054($sp) +/* 00160 809AC430 AFB10018 */ sw $s1, 0x0018($sp) +/* 00164 809AC434 AFBF001C */ sw $ra, 0x001C($sp) +/* 00168 809AC438 AFB00014 */ sw $s0, 0x0014($sp) +/* 0016C 809AC43C AFA40050 */ sw $a0, 0x0050($sp) +/* 00170 809AC440 AFA50054 */ sw $a1, 0x0054($sp) /* 00174 809AC444 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 /* 00178 809AC448 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 /* 0017C 809AC44C 3C06809B */ lui $a2, %hi(D_809AC640) ## $a2 = 809B0000 /* 00180 809AC450 24C6C640 */ addiu $a2, $a2, %lo(D_809AC640) ## $a2 = 809AC640 /* 00184 809AC454 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00188 809AC458 24070099 */ addiu $a3, $zero, 0x0099 ## $a3 = 00000099 -/* 0018C 809AC45C 0C031AB1 */ jal func_800C6AC4 +/* 0018C 809AC45C 0C031AB1 */ jal func_800C6AC4 /* 00190 809AC460 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00194 809AC464 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 00198 809AC468 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 /* 0019C 809AC46C 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 001A0 809AC470 0C034261 */ jal Matrix_Translate +/* 001A0 809AC470 0C034261 */ jal Matrix_Translate /* 001A4 809AC474 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 001A8 809AC478 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 001AC 809AC47C 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 /* 001B0 809AC480 3C01809B */ lui $at, %hi(D_809AC684) ## $at = 809B0000 -/* 001B4 809AC484 11E0000F */ beq $t7, $zero, .L809AC4C4 +/* 001B4 809AC484 11E0000F */ beq $t7, $zero, .L809AC4C4 /* 001B8 809AC488 00000000 */ nop /* 001BC 809AC48C 3C01809B */ lui $at, %hi(D_809AC67C) ## $at = 809B0000 -/* 001C0 809AC490 C42CC67C */ lwc1 $f12, %lo(D_809AC67C)($at) +/* 001C0 809AC490 C42CC67C */ lwc1 $f12, %lo(D_809AC67C)($at) /* 001C4 809AC494 3C01809B */ lui $at, %hi(D_809AC680) ## $at = 809B0000 -/* 001C8 809AC498 C42EC680 */ lwc1 $f14, %lo(D_809AC680)($at) -/* 001CC 809AC49C 44066000 */ mfc1 $a2, $f12 -/* 001D0 809AC4A0 0C0342A3 */ jal Matrix_Scale +/* 001C8 809AC498 C42EC680 */ lwc1 $f14, %lo(D_809AC680)($at) +/* 001CC 809AC49C 44066000 */ mfc1 $a2, $f12 +/* 001D0 809AC4A0 0C0342A3 */ jal Matrix_Scale /* 001D4 809AC4A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 001D8 809AC4A8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 001DC 809AC4AC 86250042 */ lh $a1, 0x0042($s1) ## 00000042 /* 001E0 809AC4B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001E4 809AC4B4 0C034421 */ jal Matrix_RotateXYZ +/* 001E4 809AC4B4 0C034421 */ jal Matrix_RotateZYX /* 001E8 809AC4B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 001EC 809AC4BC 10000017 */ beq $zero, $zero, .L809AC51C +/* 001EC 809AC4BC 10000017 */ beq $zero, $zero, .L809AC51C /* 001F0 809AC4C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L809AC4C4: -/* 001F4 809AC4C4 C42CC684 */ lwc1 $f12, %lo(D_809AC684)($at) +/* 001F4 809AC4C4 C42CC684 */ lwc1 $f12, %lo(D_809AC684)($at) /* 001F8 809AC4C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 001FC 809AC4CC 44066000 */ mfc1 $a2, $f12 -/* 00200 809AC4D0 0C0342A3 */ jal Matrix_Scale -/* 00204 809AC4D4 46006386 */ mov.s $f14, $f12 -/* 00208 809AC4D8 8FB80050 */ lw $t8, 0x0050($sp) +/* 001FC 809AC4CC 44066000 */ mfc1 $a2, $f12 +/* 00200 809AC4D0 0C0342A3 */ jal Matrix_Scale +/* 00204 809AC4D4 46006386 */ mov.s $f14, $f12 +/* 00208 809AC4D8 8FB80050 */ lw $t8, 0x0050($sp) /* 0020C 809AC4DC 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00210 809AC4E0 86250042 */ lh $a1, 0x0042($s1) ## 00000042 /* 00214 809AC4E4 8F06009C */ lw $a2, 0x009C($t8) ## 0000009C /* 00218 809AC4E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0021C 809AC4EC 00C00821 */ addu $at, $a2, $zero -/* 00220 809AC4F0 00063080 */ sll $a2, $a2, 2 -/* 00224 809AC4F4 00C13021 */ addu $a2, $a2, $at -/* 00228 809AC4F8 000630C0 */ sll $a2, $a2, 3 -/* 0022C 809AC4FC 00C13023 */ subu $a2, $a2, $at -/* 00230 809AC500 00063100 */ sll $a2, $a2, 4 -/* 00234 809AC504 00C13021 */ addu $a2, $a2, $at -/* 00238 809AC508 00063100 */ sll $a2, $a2, 4 -/* 0023C 809AC50C 00063400 */ sll $a2, $a2, 16 -/* 00240 809AC510 0C034421 */ jal Matrix_RotateXYZ -/* 00244 809AC514 00063403 */ sra $a2, $a2, 16 +/* 0021C 809AC4EC 00C00821 */ addu $at, $a2, $zero +/* 00220 809AC4F0 00063080 */ sll $a2, $a2, 2 +/* 00224 809AC4F4 00C13021 */ addu $a2, $a2, $at +/* 00228 809AC4F8 000630C0 */ sll $a2, $a2, 3 +/* 0022C 809AC4FC 00C13023 */ subu $a2, $a2, $at +/* 00230 809AC500 00063100 */ sll $a2, $a2, 4 +/* 00234 809AC504 00C13021 */ addu $a2, $a2, $at +/* 00238 809AC508 00063100 */ sll $a2, $a2, 4 +/* 0023C 809AC50C 00063400 */ sll $a2, $a2, 16 +/* 00240 809AC510 0C034421 */ jal Matrix_RotateZYX +/* 00244 809AC514 00063403 */ sra $a2, $a2, 16 /* 00248 809AC518 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L809AC51C: /* 0024C 809AC51C 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 @@ -70,11 +70,11 @@ glabel func_809AC42C /* 00264 809AC534 24A5C654 */ addiu $a1, $a1, %lo(D_809AC654) ## $a1 = 809AC654 /* 00268 809AC538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0026C 809AC53C 240600B0 */ addiu $a2, $zero, 0x00B0 ## $a2 = 000000B0 -/* 00270 809AC540 0C0346A2 */ jal Matrix_NewMtx -/* 00274 809AC544 AFA20030 */ sw $v0, 0x0030($sp) -/* 00278 809AC548 8FA30030 */ lw $v1, 0x0030($sp) +/* 00270 809AC540 0C0346A2 */ jal Matrix_NewMtx +/* 00274 809AC544 AFA20030 */ sw $v0, 0x0030($sp) +/* 00278 809AC548 8FA30030 */ lw $v1, 0x0030($sp) /* 0027C 809AC54C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00280 809AC550 0C024F46 */ jal func_80093D18 +/* 00280 809AC550 0C024F46 */ jal func_80093D18 /* 00284 809AC554 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00288 809AC558 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0028C 809AC55C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -83,13 +83,13 @@ glabel func_809AC42C /* 00298 809AC568 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 0029C 809AC56C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 002A0 809AC570 862C0040 */ lh $t4, 0x0040($s1) ## 00000040 -/* 002A4 809AC574 8FAB0050 */ lw $t3, 0x0050($sp) +/* 002A4 809AC574 8FAB0050 */ lw $t3, 0x0050($sp) /* 002A8 809AC578 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 002AC 809AC57C 000C6900 */ sll $t5, $t4, 4 -/* 002B0 809AC580 01AC6821 */ addu $t5, $t5, $t4 -/* 002B4 809AC584 000D6880 */ sll $t5, $t5, 2 -/* 002B8 809AC588 016D7021 */ addu $t6, $t3, $t5 -/* 002BC 809AC58C 01EE7821 */ addu $t7, $t7, $t6 +/* 002AC 809AC57C 000C6900 */ sll $t5, $t4, 4 +/* 002B0 809AC580 01AC6821 */ addu $t5, $t5, $t4 +/* 002B4 809AC584 000D6880 */ sll $t5, $t5, 2 +/* 002B8 809AC588 016D7021 */ addu $t6, $t3, $t5 +/* 002BC 809AC58C 01EE7821 */ addu $t7, $t7, $t6 /* 002C0 809AC590 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 /* 002C4 809AC594 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 002C8 809AC598 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 @@ -112,12 +112,12 @@ glabel func_809AC42C /* 0030C 809AC5DC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00310 809AC5E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00314 809AC5E4 240700BC */ addiu $a3, $zero, 0x00BC ## $a3 = 000000BC -/* 00318 809AC5E8 0C031AD5 */ jal func_800C6B54 +/* 00318 809AC5E8 0C031AD5 */ jal func_800C6B54 /* 0031C 809AC5EC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00320 809AC5F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00324 809AC5F4 8FB00014 */ lw $s0, 0x0014($sp) -/* 00328 809AC5F8 8FB10018 */ lw $s1, 0x0018($sp) -/* 0032C 809AC5FC 03E00008 */ jr $ra +/* 00320 809AC5F0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00324 809AC5F4 8FB00014 */ lw $s0, 0x0014($sp) +/* 00328 809AC5F8 8FB10018 */ lw $s1, 0x0018($sp) +/* 0032C 809AC5FC 03E00008 */ jr $ra /* 00330 809AC600 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/include/functions.h b/include/functions.h index 0e703d2a2d..11b24b3dc1 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1133,8 +1133,9 @@ void Scene_Draw(GlobalContext* globalCtx); // ? func_800A0D94(?); // ? func_800A106C(?); // ? func_800A1344(?); -void SkelAnime_Draw(GlobalContext* globalCtx, u32 limbIndex, u32 adt, u8 limbDListCnt, void* internal0, - void* internal1); +void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor); // ? func_800A180C(?); void func_800A1AC8(GlobalContext* globalCtx, u32 limbIndex, u32 actorDrawTbl, u32 dListCount, void* posUpdateFunc, void* drawFunc, Actor* actor); @@ -1642,8 +1643,8 @@ void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode); void Matrix_RotateX(f32 x, u8 mode); void Matrix_RotateY(f32 y, u8 mode); void Matrix_RotateZ(f32 z, u8 mode); -void Matrix_RotateXYZ(s16 x, s16 y, s16 z, u8 mode); -void func_800D1340(Vec3f* arg0, Vec3s* arg1); +void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode); +void Matrix_TranslateThenRotateZYX(Vec3f* arg0, Vec3s* arg1); void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec); Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest); Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line); diff --git a/include/z64animation.h b/include/z64animation.h index 993faa78fb..47720bc4ac 100755 --- a/include/z64animation.h +++ b/include/z64animation.h @@ -8,18 +8,6 @@ struct GlobalContext; struct Actor; -typedef s32 (*SkelAnime_LimbUpdateMatrix)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, - Vec3f* pos, Vec3s* rot, struct Actor* actor); - -typedef void (*SkelAnime_LimbAppendDlist)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, - Vec3s* rot, struct Actor* actor); - -typedef s32 (*SkelAnime_LimbUpdateMatrix2)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, - Vec3f* pos, Vec3s* rot, struct Actor* actor, Gfx** gfx); - -typedef void (*SkelAnime_LimbAppendDlist2)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, - Vec3s* rot, struct Actor* actor, Gfx** gfx); - typedef struct { /* 0x000 */ u32 limbs[1]; // One ore more limbs, index 0 is the root limb. @@ -51,8 +39,8 @@ typedef struct SkelAnime /* 0x04 */ u32 limbIndex; /* 0x08 */ u32* animCurrent; /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 animFrameCount; // ending frame? - /* 0x14 */ f32 unk_14; // Loop frame? + /* 0x10 */ f32 animFrameCount; // ending frame? + /* 0x14 */ f32 unk_14; // Loop frame? /* 0x18 */ f32 animCurrentFrame; /* 0x1C */ f32 animPlaybackSpeed; /* 0x20 */ Vec3s* actorDrawTbl; // now_joint @@ -80,7 +68,7 @@ typedef struct u16 z; } AnimationRotationIndex; -typedef struct +typedef struct { /* 0x000 */ s16 frameCount; /* 0x002 */ char pad[2]; @@ -116,7 +104,7 @@ typedef struct char unk_0C[0x30]; } AnimationEntryType1; -typedef struct +typedef struct { u8 unk_00; u8 unk_01; @@ -127,7 +115,7 @@ typedef struct char unk_10[0x2C]; } AnimationEntryType2; -typedef struct +typedef struct { u8 unk_00; u8 vecCount; @@ -138,7 +126,7 @@ typedef struct char unk_10[0x2C]; } AnimationEntryType3; -typedef struct +typedef struct { u8 unk_00; u8 vecCount; @@ -149,7 +137,7 @@ typedef struct char unk_10[0x2C]; } AnimationEntryType4; -typedef struct +typedef struct { struct Actor* actor; SkelAnime* skelAnime; @@ -195,7 +183,20 @@ typedef struct u32 animationSegAddress; } LinkAnimetionEntry; -#endif +typedef s32 (*SkelAnime_LimbUpdateMatrix)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, + Vec3f* pos, Vec3s* rot, struct Actor* actor); + +typedef void (*SkelAnime_LimbAppendDlist)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, + Vec3s* rot, struct Actor* actor); + +typedef s32 (*SkelAnime_LimbUpdateMatrix2)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, + Vec3f* pos, Vec3s* rot, struct Actor* actor, Gfx** gfx); + +typedef void (*SkelAnime_LimbAppendDlist2)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, + Vec3s* rot, struct Actor* actor, Gfx** gfx); + +typedef void (*AnimationEntryCallback)(struct GlobalContext*, AnimationEntryType*); + extern u32 link_animetion_segment; // 0x07000000 #define LINK_ANIMETION_OFFSET(addr,offset) (((u32)&_link_animetionSegmentRomStart)+((u32)addr)-((u32)&link_animetion_segment)+((u32)offset)) @@ -203,3 +204,5 @@ extern u32 link_animetion_segment; // 0x07000000 #define LIMB_DONE 0xFF #define LOG(file,line,msg,arg) LogUtils_LogThreadId(file, line); osSyncPrintf(msg, arg) + +#endif diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index b300f189d1..688b215008 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -2,13 +2,16 @@ #include // clang-format off -Mtx gMtxClear = { +Mtx gMtxClear = +{ 65536, 0, 1, 0, 0, 65536, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, }; -MtxF gMtxFClear = { + +MtxF gMtxFClear = +{ 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, @@ -19,67 +22,88 @@ MtxF gMtxFClear = { MtxF* sMatrixStack; // "Matrix_stack" MtxF* sCurrentMatrix; // "Matrix_now" -void Matrix_Init(GameState* gameState) { +void Matrix_Init(GameState* gameState) +{ sCurrentMatrix = Game_Alloc(gameState, 20 * sizeof(MtxF), "../sys_matrix.c", 153); sMatrixStack = sCurrentMatrix; } -void Matrix_Push(void) { +void Matrix_Push(void) +{ Matrix_MtxFCopy(sCurrentMatrix + 1, sCurrentMatrix); sCurrentMatrix++; } -void Matrix_Pull(void) { +void Matrix_Pull(void) +{ sCurrentMatrix--; - if (sCurrentMatrix < sMatrixStack) { + if (sCurrentMatrix < sMatrixStack) + { __assert("Matrix_now >= Matrix_stack", "../sys_matrix.c", 176); } } -void Matrix_Get(MtxF* dest) { +void Matrix_Get(MtxF* dest) +{ Matrix_MtxFCopy(dest, sCurrentMatrix); } -void Matrix_Put(MtxF* src) { +void Matrix_Put(MtxF* src) +{ Matrix_MtxFCopy(sCurrentMatrix, src); } -MtxF* Matrix_GetCurrent(void) { +MtxF* Matrix_GetCurrent(void) +{ return sCurrentMatrix; } -void Matrix_Mult(MtxF* mf, u8 mode) { +void Matrix_Mult(MtxF* mf, u8 mode) +{ MtxF* cmf = Matrix_GetCurrent(); - if (mode == MTXMODE_APPLY) { + if (mode == MTXMODE_APPLY) + { func_800A6FA0(cmf, mf, cmf); - } else { + } + else + { Matrix_MtxFCopy(sCurrentMatrix, mf); } } -#ifdef NON_MATCHING -// minor ordering and regalloc differences void Matrix_Translate(f32 x, f32 y, f32 z, u8 mode) { MtxF* cmf = sCurrentMatrix; + f32 tx; + f32 ty; - if (mode == MTXMODE_APPLY) { - cmf->wx += cmf->xx * x + cmf->yx * y + cmf->zx * z; - cmf->wy += cmf->xy * x + cmf->yy * y + cmf->zy * z; - cmf->wz += cmf->xz * x + cmf->yz * y + cmf->zz * z; - cmf->ww += cmf->xw * x + cmf->yw * y + cmf->zw * z; - } else { + if (mode == MTXMODE_APPLY) + { + tx = cmf->xx; + ty = cmf->yx; + cmf->wx += tx * x + ty * y + cmf->zx * z; + tx = cmf->xy; + ty = cmf->yy; + cmf->wy += tx * x + ty * y + cmf->zy * z; + tx = cmf->xz; + ty = cmf->yz; + cmf->wz += tx * x + ty * y + cmf->zz * z; + tx = cmf->xw; + ty = cmf->yw; + cmf->ww += tx * x + ty * y + cmf->zw * z; + } + else + { func_800A7A24(cmf, x, y, z); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/Matrix_Translate.s") -#endif -void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode) { +void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode) +{ MtxF* cmf = sCurrentMatrix; - if (mode == MTXMODE_APPLY) { + if (mode == MTXMODE_APPLY) + { cmf->xx *= x; cmf->xy *= x; cmf->xz *= x; @@ -92,20 +116,25 @@ void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode) { cmf->xw *= x; cmf->yw *= y; cmf->zw *= z; - } else { + } + else + { func_800A76A4(cmf, x, y, z); } } -void Matrix_RotateX(f32 x, u8 mode) { +void Matrix_RotateX(f32 x, u8 mode) +{ MtxF* cmf; f32 sin; f32 cos; f32 temp1; f32 temp2; - if (mode == MTXMODE_APPLY) { - if (x != 0) { + if (mode == MTXMODE_APPLY) + { + if (x != 0) + { cmf = sCurrentMatrix; sin = sinf(x); @@ -131,13 +160,18 @@ void Matrix_RotateX(f32 x, u8 mode) { cmf->yw = temp1 * cos + temp2 * sin; cmf->zw = temp2 * cos - temp1 * sin; } - } else { + } + else + { cmf = sCurrentMatrix; - if (x != 0) { + if (x != 0) + { sin = sinf(x); cos = cosf(x); - } else { + } + else + { sin = 0.0f; cos = 1.0f; } @@ -161,15 +195,18 @@ void Matrix_RotateX(f32 x, u8 mode) { } } -void Matrix_RotateY(f32 y, u8 mode) { +void Matrix_RotateY(f32 y, u8 mode) +{ MtxF* cmf; f32 sin; f32 cos; f32 temp1; f32 temp2; - if (mode == MTXMODE_APPLY) { - if (y != 0) { + if (mode == MTXMODE_APPLY) + { + if (y != 0) + { cmf = sCurrentMatrix; sin = sinf(y); @@ -195,13 +232,18 @@ void Matrix_RotateY(f32 y, u8 mode) { cmf->xw = temp1 * cos - temp2 * sin; cmf->zw = temp1 * sin + temp2 * cos; } - } else { + } + else + { cmf = sCurrentMatrix; - if (y != 0) { + if (y != 0) + { sin = sinf(y); cos = cosf(y); - } else { + } + else + { sin = 0.0f; cos = 1.0f; } @@ -225,15 +267,18 @@ void Matrix_RotateY(f32 y, u8 mode) { } } -void Matrix_RotateZ(f32 z, u8 mode) { +void Matrix_RotateZ(f32 z, u8 mode) +{ MtxF* cmf; f32 sin; f32 cos; f32 temp1; f32 temp2; - if (mode == MTXMODE_APPLY) { - if (z != 0) { + if (mode == MTXMODE_APPLY) + { + if (z != 0) + { cmf = sCurrentMatrix; sin = sinf(z); @@ -289,7 +334,13 @@ void Matrix_RotateZ(f32 z, u8 mode) { } } -void Matrix_RotateXYZ(s16 x, s16 y, s16 z, u8 mode) { +/* + * Rotates the top of the matrix stack by `z` degrees, then + * rotates that matrix by `y` degrees, then rotates that matrix + * by `x` degrees. + * Original Name: Matrix_RotateXYZ, changed to reflect rotation order. +*/ +void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode) { MtxF* cmf = sCurrentMatrix; f32 temp1; f32 temp2; @@ -374,43 +425,48 @@ void Matrix_RotateXYZ(s16 x, s16 y, s16 z, u8 mode) { } } -void func_800D1340(Vec3f* arg0, Vec3s* arg1) { +/* + * Translates the top of the matrix stack by `translation` units, + * then rotates that matrix by `rotation` in Z-Y-X order +*/ +void Matrix_TranslateThenRotateZYX(Vec3f* translation, Vec3s* rotation) +{ MtxF* cmf = sCurrentMatrix; f32 sin; f32 cos; f32 temp1; f32 temp2; - sin = Math_Sins(arg1->z); - cos = Math_Coss(arg1->z); + sin = Math_Sins(rotation->z); + cos = Math_Coss(rotation->z); temp1 = cmf->xx; temp2 = cmf->yx; - cmf->wx += temp1 * arg0->x + temp2 * arg0->y + cmf->zx * arg0->z; + cmf->wx += temp1 * translation->x + temp2 * translation->y + cmf->zx * translation->z; cmf->xx = temp1 * cos + temp2 * sin; cmf->yx = temp2 * cos - temp1 * sin; temp1 = cmf->xy; temp2 = cmf->yy; - cmf->wy += temp1 * arg0->x + temp2 * arg0->y + cmf->zy * arg0->z; + cmf->wy += temp1 * translation->x + temp2 * translation->y + cmf->zy * translation->z; cmf->xy = temp1 * cos + temp2 * sin; cmf->yy = temp2 * cos - temp1 * sin; temp1 = cmf->xz; temp2 = cmf->yz; - cmf->wz += temp1 * arg0->x + temp2 * arg0->y + cmf->zz * arg0->z; + cmf->wz += temp1 * translation->x + temp2 * translation->y + cmf->zz * translation->z; cmf->xz = temp1 * cos + temp2 * sin; cmf->yz = temp2 * cos - temp1 * sin; temp1 = cmf->xw; temp2 = cmf->yw; - cmf->ww += temp1 * arg0->x + temp2 * arg0->y + cmf->zw * arg0->z; + cmf->ww += temp1 * translation->x + temp2 * translation->y + cmf->zw * translation->z; cmf->xw = temp1 * cos + temp2 * sin; cmf->yw = temp2 * cos - temp1 * sin; - if (arg1->y != 0) { - sin = Math_Sins(arg1->y); - cos = Math_Coss(arg1->y); + if (rotation->y != 0) { + sin = Math_Sins(rotation->y); + cos = Math_Coss(rotation->y); temp1 = cmf->xx; temp2 = cmf->zx; @@ -433,9 +489,9 @@ void func_800D1340(Vec3f* arg0, Vec3s* arg1) { cmf->zw = temp1 * sin + temp2 * cos; } - if (arg1->x != 0) { - sin = Math_Sins(arg1->x); - cos = Math_Coss(arg1->x); + if (rotation->x != 0) { + sin = Math_Sins(rotation->x); + cos = Math_Coss(rotation->x); temp1 = cmf->yx; temp2 = cmf->zx; diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index e27afafeb7..e96ccdc2fe 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -83,7 +83,7 @@ static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, Glo Matrix_Translate(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, MTXMODE_NEW); Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY); Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); - Matrix_RotateXYZ(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY); + Matrix_RotateZYX(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY); gDPLoadTextureBlock(gfxCtx->polyXlu.p++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index b258a412aa..97dd3fb9e5 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -15,28 +15,25 @@ void func_800A1D8C(u32 animation, s32 currentFrame, s32 limbCount, Vec3s *arg3); void func_800A2E70(u8,Vec3s*,Vec3s*,Vec3s*,f32); void func_800A49B0(SkelAnime*); void func_800A3478(GlobalContext*,s32,Vec3s*,Vec3s*); -void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 arg4, f32 frameCount, u8 arg6, f32 arg7); +void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32* animation, f32 playbackSpeed, f32 arg4, f32 frameCount, u8 arg6, f32 arg7); void func_800A4FE4(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 unk0, f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2); -Gfx* func_800A24A0(GlobalContext*, u8, u32*, Vec3s*, SkelAnime_LimbUpdateMatrix2, SkelAnime_LimbAppendDlist2, Actor*, Mtx**, Gfx*); //.data u32 D_8012A480 = 0; -typedef void (*testfunc)(GlobalContext*, AnimationEntryType*); -static testfunc D_8012A484[] = +static AnimationEntryCallback D_8012A484[] = { - (testfunc)0x800A3678, - (testfunc)0x800A36A4, - (testfunc)0x800A3714, - (testfunc)0x800A3770, - (testfunc)0x800A37F0, - (testfunc)0x800A3874, + (AnimationEntryCallback)0x800A3678, + (AnimationEntryCallback)0x800A36A4, + (AnimationEntryCallback)0x800A3714, + (AnimationEntryCallback)0x800A3770, + (AnimationEntryCallback)0x800A37F0, + (AnimationEntryCallback)0x800A3874, }; //.bss u32 D_801600B0; // SkelAnime_LodDrawLimb -// func_800A08A0 void func_800A08A0(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable , Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex) { SkelLimbEntry* limbEntry; @@ -60,7 +57,7 @@ void func_800A08A0(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable , Vec dList = limbEntry->displayLists[dListIndex]; if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList, &pos, &rot, actor) == 0)) { - func_800D1340(&pos, &rot); + Matrix_TranslateThenRotateZYX(&pos, &rot); if (dList != NULL) { do @@ -94,7 +91,6 @@ void func_800A08A0(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable , Vec } // SkelAnime_LodDraw -// func_800A0B40 void func_800A0B40(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex) { SkelLimbEntry* limbEntry; @@ -115,18 +111,18 @@ void func_800A0B40(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTab gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 0x351); Matrix_Push(); - + limbEntry = SEGMENTED_TO_VIRTUAL(*limbIndex); pos.x = (f32) actorDrawTable->x; pos.y = (f32) actorDrawTable->y; pos.z = (f32) actorDrawTable->z; - rot = actorDrawTable[1]; + rot = actorDrawTable[1]; dList = limbEntry->displayLists[dListIndex]; if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList, &pos, &rot, actor) == 0)) { - func_800D1340(&pos, &rot); + Matrix_TranslateThenRotateZYX(&pos, &rot); if (dList != NULL) { gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 0x371), G_MTX_LOAD); @@ -147,16 +143,15 @@ void func_800A0B40(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTab #ifdef NON_MATCHING // SkelAnime_LodDrawLimbSV -// func_800A0D94 void func_800A0D94(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex, Mtx** mtx) { - Gfx* dList[2]; - GraphicsContext* gfxCtx; SkelLimbEntry* limbEntry; + Gfx* dList[2]; Vec3f pos; Vec3s rot; + GraphicsContext* gfxCtx; Gfx* gfx[3]; Matrix_Push(); @@ -165,16 +160,18 @@ void func_800A0D94(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 limbIndex++; rot = actorDrawTable[limbIndex]; - pos.x = limbEntry->pos.x; - pos.y = limbEntry->pos.y; - pos.z = limbEntry->pos.z; + + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; dList[1] = dList[0] = limbEntry->displayLists[dListIndex]; + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList[1], &pos, &rot, actor) == 0)) { - func_800D1340(&pos, &rot); + Matrix_TranslateThenRotateZYX(&pos, &rot); if (dList[1] != NULL) { - Matrix_ToMtx(*mtx, "../z_skelanime.c", 945); gfxCtx = globalCtx->state.gfxCtx; + Matrix_ToMtx(*mtx, "../z_skelanime.c", 945); gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 946); gSPMatrix(gfxCtx->polyOpa.p++, *mtx, G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); @@ -189,7 +186,7 @@ void func_800A0D94(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 } if (appendDlistFunc != NULL) { - appendDlistFunc(globalCtx, limbIndex, &dList[1], &rot, actor); + appendDlistFunc(globalCtx, limbIndex, &dList[0], &rot, actor); } if (limbEntry->firstChildIndex != LIMB_DONE) { @@ -198,7 +195,7 @@ void func_800A0D94(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 } Matrix_Pull(); - + if (limbEntry->nextLimbIndex != LIMB_DONE) { func_800A0D94(globalCtx, limbEntry->nextLimbIndex, limbTable, @@ -208,13 +205,12 @@ void func_800A0D94(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A0D94.s") #endif -#undef NON_MATCHING #ifdef NON_MATCHING // SkelAnime_LodDrawSV // func_800A106C void func_800A106C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 limbCount, - SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex) { SkelLimbEntry *limbEntry; @@ -232,7 +228,7 @@ void func_800A106C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab mtx = Graph_Alloc(globalCtx->state.gfxCtx, limbCount * 0x40); } } while(0); - + if (limbTable == NULL) { osSyncPrintf("\x1b[31m"); @@ -252,27 +248,30 @@ void func_800A106C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab pos.z = actorDrawTable->z; rot = actorDrawTable[1]; - - dList[0] = dList[1] = limbEntry->displayLists[dListIndex]; - + + dList[1] = dList[0] = limbEntry->displayLists[dListIndex]; + if ((updateMtxFunc == 0) || (updateMtxFunc(globalCtx, 1, &dList[1], &pos, &rot, actor) == 0)) { - func_800D1340(&pos, &rot); + Matrix_TranslateThenRotateZYX(&pos, &rot); if (dList[1] != NULL) { - mtx = Matrix_ToMtx(mtx, "../z_skelanime.c", 1033); + Matrix_ToMtx(mtx, "../z_skelanime.c", 1033); gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); mtx++; } - else if (dList[0] != NULL) + else { - Matrix_ToMtx(mtx, "../z_skelanime.c", 1040); - mtx++; + if (dList[0] != NULL) + { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1040); + mtx++; + } } } - if (appendDlistFunc != 0) + if (appendDlistFunc != NULL) { appendDlistFunc(globalCtx, 1, &dList[0], &rot, actor); } @@ -280,43 +279,52 @@ void func_800A106C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab { func_800A0D94(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex, &mtx); } + Matrix_Pull(); + func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1053); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A106C.s") #endif -#undef NON_MATCHING -#ifdef NON_MATCHING // SkelAnime_DrawLimb // func_800A1344 void func_800A1344(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) { + SkelLimbEntry* limbEntry; + Gfx* dList; + Vec3f pos; + Vec3s rot; GraphicsContext* gfxCtx; Gfx* gfx[4]; - SkelLimbEntry* limbEntry; - Vec3s rot; - Vec3f pos; - Gfx* dList; gfxCtx = globalCtx->state.gfxCtx; + func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 0x434); Matrix_Push(); + limbEntry = SEGMENTED_TO_VIRTUAL(limbTable[limbIndex]); limbIndex++; rot = actorDrawTable[limbIndex]; - pos.x = (f32) limbEntry->pos.x; - pos.y = (f32) limbEntry->pos.y; - pos.z = (f32) limbEntry->pos.z; - dList = limbEntry->dList; + pos.x = (f32) limbEntry->translation.x; + pos.y = (f32) limbEntry->translation.y; + pos.z = (f32) limbEntry->translation.z; + dList = limbEntry->displayLists[0]; + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList, &pos, &rot, actor) == 0)) { - func_800D1340(&pos, &rot); + Matrix_TranslateThenRotateZYX(&pos, &rot); if (dList != NULL) { - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_skelanime.c", 0x44F), G_MTX_LOAD); - gSPDisplayList(gfxCtx->polyOpa.p++, dList); + do + { + if(1) + { + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1103), G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList); + } + } while(0); } } @@ -339,21 +347,18 @@ void func_800A1344(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3 actorDrawTable, updateMtxFunc, appendDlistFunc, actor); } - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 0x461); + func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A1344.s") -#endif -#ifdef NON_MATCHING void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) { SkelLimbEntry* rootLimb; - Vec3s rot; - Vec3f pos; + char pad[4]; Gfx* dList; + Vec3f pos; + Vec3s rot; GraphicsContext* gfxCtx; - Gfx* gfx[5]; + Gfx* gfx[4]; if (limbTable == NULL) { @@ -374,11 +379,11 @@ void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTa pos.z = (f32) actorDrawTable[0].z; rot = actorDrawTable[1]; - dList = rootLimb->dList; + dList = rootLimb->displayLists[0]; if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList, &pos, &rot, actor) == 0)) { - func_800D1340(&pos, &rot); + Matrix_TranslateThenRotateZYX(&pos, &rot); if (dList != NULL) { gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1176), G_MTX_LOAD); @@ -398,11 +403,9 @@ void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTa } Matrix_Pull(); + func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1190); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s") -#endif #ifdef NON_MATCHING // SkelAnime_Draw2Limb @@ -430,7 +433,7 @@ void func_800A180C(GlobalContext *globalCtx, u32 limbIndex, u32* limbTable, Vec3 if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &limbDlist[0], &limbPos, &limbRot, actor) == 0)) { - func_800D1340(&limbPos, &limbRot); + Matrix_TranslateThenRotateZYX(&limbPos, &limbRot); if (limbDlist[0] != NULL) { Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 0x4DA); @@ -512,7 +515,7 @@ void func_800A1AC8(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &skelDlist[0], &pos, &rot, actor) == 0)) { - func_800D1340(&pos, &rot); + Matrix_TranslateThenRotateZYX(&pos, &rot); if (skelDlist[0] != NULL) { Matrix_ToMtx(limbMatricies, "../z_skelanime.c", 1327); @@ -560,7 +563,7 @@ void func_800A1D8C(u32 animation, s32 currentFrame, s32 limbCount, Vec3s *dst) AnimationRotationValue* rotationValueTable; AnimationRotationValue* frameRotationValueTable; AnimationHeader *animationHeader; - + s32 i; u16 limit; @@ -573,7 +576,7 @@ void func_800A1D8C(u32 animation, s32 currentFrame, s32 limbCount, Vec3s *dst) for(i = 0; i < limbCount; i++, dst++, index++) { if ((dst == NULL) || (index == NULL) || - (frameRotationValueTable == NULL) || + (frameRotationValueTable == NULL) || (rotationValueTable == NULL)) { if(1) { } // Necessary to match. @@ -602,11 +605,172 @@ s32 SkelAnime_GetFrameCount(u32 animation) return (s16)(*virt - 1); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2044.s") +// SkelAnime_DrawLimb2 +Gfx* func_800A2044(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx) +{ + SkelLimbEntry* limbEntry; + Gfx* dList; + Vec3f pos; + Vec3s rot; + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(limbTable[limbIndex]); + limbIndex++; + + rot = actorDrawTable[limbIndex]; + + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; + + dList = limbEntry->displayLists[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList, &pos, &rot, actor, &gfx) == 0)) + { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList != NULL) + { + gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 0x5D1), G_MTX_LOAD); + gSPDisplayList(gfx++, dList); + } + } + + if (appendDlistFunc != NULL) + { + appendDlistFunc(globalCtx, limbIndex, &dList, &rot, actor, &gfx); + } + + if (limbEntry->firstChildIndex != LIMB_DONE) + { + gfx = func_800A2044(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, gfx); + } + + Matrix_Pull(); + + if (limbEntry->nextLimbIndex != LIMB_DONE) + { + gfx = func_800A2044(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, gfx); + } + + return gfx; +} + +#ifdef NON_MATCHING +// Some regalloc, and nonmatching stack usage +// SkelAnime_Draw2 +Gfx* func_800A2288(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx) +{ + SkelLimbEntry* limbEntry; + Vec3f pos; + Vec3s rot; + Gfx* dList; + + if (limbTable == NULL) + { + osSyncPrintf("\x1b[31m"); + osSyncPrintf("Si2_draw2():skelがNULLです。NULLを返します。\n"); + osSyncPrintf("\x1b[m"); + return NULL; + } + + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(*limbTable); + + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; + + rot = actorDrawTable[1]; + + dList = limbEntry->displayLists[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList, &pos, &rot, actor, &gfx) == 0)) + { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList != NULL) + { + gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 0x616), G_MTX_LOAD); + gSPDisplayList(gfx++, dList); + } + } + + if (appendDlistFunc != NULL) + { + appendDlistFunc(globalCtx, 1, &dList, &rot, actor, &gfx); + } + + if (limbEntry->firstChildIndex != LIMB_DONE) + { + gfx = func_800A2044(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, gfx); + } + + Matrix_Pull(); + + return gfx; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2288.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A24A0.s") +// SkelAnime_DrawLimbSV2 +Gfx* func_800A24A0(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Mtx** mtx, Gfx* gfx) +{ + SkelLimbEntry* limbEntry; + Gfx* dList1; + Gfx* dList2; + Vec3f pos; + Vec3s rot; + char pad[4]; + + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(limbTable[limbIndex]); + limbIndex++; + rot = actorDrawTable[limbIndex]; + + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; + + dList1 = dList2 = limbEntry->displayLists[0]; + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList1, &pos, &rot, actor, &gfx) == 0)) + { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList1 != NULL) + { + Matrix_ToMtx(*mtx, "../z_skelanime.c", 0x657); + gSPMatrix(gfx++, *mtx, G_MTX_LOAD); + gSPDisplayList(gfx++, dList1); + (*mtx)++; + } + else + { + if (dList2 != NULL) + { + Matrix_ToMtx(*mtx, "../z_skelanime.c", 0x65E); + (*mtx)++; + } + } + } + if (appendDlistFunc != 0) + { + appendDlistFunc(globalCtx, limbIndex, &dList2, &rot, actor, &gfx); + } + if (limbEntry->firstChildIndex != LIMB_DONE) + { + gfx = func_800A24A0(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, mtx, gfx); + } + + Matrix_Pull(); + + if (limbEntry->nextLimbIndex != LIMB_DONE) + { + gfx = func_800A24A0(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, mtx, gfx); + } + return gfx; +} // SkelAnime_DrawSV2 Gfx* func_800A273C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 dListCount, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx) @@ -634,14 +798,14 @@ Gfx* func_800A273C(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTab pos.x = actorDrawTable->x; pos.y = actorDrawTable->y; pos.z = actorDrawTable->z; - + rot = actorDrawTable[1]; dList1 = dList2 = limbEntry->displayLists[0]; if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList1, &pos, &rot, actor, &gfx) == 0)) { - func_800D1340(&pos, &rot); + Matrix_TranslateThenRotateZYX(&pos, &rot); if (dList1 != NULL) { Matrix_ToMtx(mtx, "../z_skelanime.c", 0x6AE); @@ -733,7 +897,7 @@ AnimationEntry* func_800A3334(AnimationContext* animationCtx, AnimationType type * animation context. */ -// SkelAnime_AnimationEntryType0Init +// SkelAnime_LinkAnimetionDma void func_800A336C(GlobalContext* globalCtx, u32 linkAnimetionSeg, s32 frame, s32 limbCount, void* ram) { AnimationEntry* entry; @@ -746,7 +910,7 @@ void func_800A336C(GlobalContext* globalCtx, u32 linkAnimetionSeg, s32 frame, s3 linkAnimetionEntry = SEGMENTED_TO_VIRTUAL(linkAnimetionSeg); osCreateMesgQueue(&entry->types.type0.msgQueue, &entry->types.type0.msg, 1); DmaMgr_SendRequest2(&entry->types.type0.req, ram, LINK_ANIMETION_OFFSET(linkAnimetionEntry->animationSegAddress, ((sizeof(Vec3s) * limbCount + 2) * frame)), - sizeof(Vec3s) * limbCount + 2, 0, &entry->types.type0.msgQueue, NULL, + sizeof(Vec3s) * limbCount + 2, 0, &entry->types.type0.msgQueue, NULL, "../z_skelanime.c" , 0x7D4); } } @@ -920,60 +1084,55 @@ void func_800A390C(GlobalContext* globalCtx, AnimationContext* animationCtx) D_8012A480 = 0; } -#ifdef NON_MATCHING -// some kind of init -void func_800A39AC(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, s32 arg3, s8 arg4, Vec3s* actorDrawTable, s32 arg6, s32 arg7) +void func_800A39AC(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 limbHeaderSeg, u32* animation, s32 flags, Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount) { - SkelAnimeLimbHeader* limbHeader; - u8 flag; - size_t size; + char pad[8]; + SkelAnimeLimbHeader *limbHeader; + size_t allocSize; + s32 limbCount; + s32 headerCount; limbHeader = SEGMENTED_TO_VIRTUAL(limbHeaderSeg); - skelAnime->unk_34 = arg4; - flag = arg4 & 2 == 0 ? 1U : limbHeader->limbCount; - if ((arg4 & 2) != 0) + headerCount = limbHeader->limbCount; + skelAnime->unk_34 = flags; + limbCount = (flags & 2) != 0 ? headerCount : 1; + + if ((flags & 1) != 0) { - flag = limbHeader->limbCount; + limbCount += headerCount; } - else + if ((flags & 4) != 0) { - flag = 1; + limbCount += headerCount; } - if((arg4 & 1) != 0) - { - flag += limbHeader->limbCount; - } - - if((arg4 & 4) != 0) - { - flag += limbHeader->limbCount; - } - - skelAnime->limbCount = flag; + skelAnime->limbCount = (u8)limbCount; skelAnime->dListCount = limbHeader->dListCount; + + allocSize = limbCount * sizeof(Vec3s); skelAnime->limbIndex = SEGMENTED_TO_VIRTUAL(limbHeader->limbIndexSeg); - size = sizeof(Vec3s); - if ((arg4 & 8) != 0) + + if ((flags & 8) != 0) { - size += 2; + allocSize += 2; } - if (actorDrawTable == NULL) + if (actorDrawTbl == NULL) { - skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(size, "../z_skelanime.c", 2364); - skelAnime->unk_24 = ZeldaArena_MallocDebug(size, "../z_skelanime.c", 2365); + skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(allocSize, "../z_skelanime.c", 2364); + skelAnime->unk_24 = ZeldaArena_MallocDebug(allocSize, "../z_skelanime.c", 2365); } else { - if (arg7 != flag) + if (limbBufCount != limbCount) { __assert("joint_buff_num == joint_num", "../z_skelanime.c", 2369); } - skelAnime->actorDrawTbl = ALIGN16((u32)actorDrawTable); - skelAnime->unk_24 = ALIGN16(arg6); + skelAnime->actorDrawTbl = (Vec3s*)ALIGN16((u32)actorDrawTbl); + skelAnime->unk_24 = (Vec3s*)ALIGN16((u32)arg6); } + if ((skelAnime->actorDrawTbl == NULL) || (skelAnime->unk_24 == NULL)) { osSyncPrintf("\x1b[31m"); @@ -981,12 +1140,8 @@ void func_800A39AC(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeade osSyncPrintf("\x1b[m"); } - func_800A3F08(globalCtx, skelAnime, arg3, 1.0f, 0.0f, 0.0f, 0, 0.0f); + func_800A3F08(globalCtx, skelAnime, animation, 1.0f, 0.0f, 0.0f, 0, 0.0f); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A39AC.s") -#endif -#undef NON_MATCHING // SkelAnime_SetUpdateFunc void func_800A3B8C(SkelAnime* skelAnime) @@ -1008,21 +1163,21 @@ void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime) skelAnime->animUpdate(globalCtx, skelAnime); } -#ifdef NON_MATCHING s32 func_800A3BE4(GlobalContext* globalCtx, SkelAnime* skelAnime) { f32 prevUnk28 = skelAnime->unk_28; - skelAnime->unk_28 -= skelAnime->unk_2C * (R_UPDATE_RATE * 0.5f); + f32 updateRate = R_UPDATE_RATE * 0.5f; + + skelAnime->unk_28 -= skelAnime->unk_2C * updateRate; + if (skelAnime->unk_28 <= 0.0f) { func_800A3B8C(skelAnime); } + func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, 1.0f - (skelAnime->unk_28 / prevUnk28)); return 0; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3BE4.s") -#endif void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime) { @@ -1089,7 +1244,7 @@ s32 func_800A3E0C(GlobalContext* globalCtx, SkelAnime* skelAnime) skelAnime->animCurrentFrame -= skelAnime->unk_14; } } - } + } func_800A3C9C(globalCtx, skelAnime); return 0; } @@ -1102,7 +1257,7 @@ void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2) } #ifdef NON_MATCHING -void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 arg4, f32 frameCount, u8 arg6, f32 arg7) +void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32* animation, f32 playbackSpeed, f32 arg4, f32 frameCount, u8 arg6, f32 arg7) { skelAnime->unk_01 = arg6; @@ -1117,7 +1272,7 @@ void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation } else { - skelAnime->mtxUpdate = &func_800A3BE4; + skelAnime->animUpdate = &func_800A3BE4; func_800A336C(globalCtx, animation, (s32) arg4, skelAnime->limbCount, skelAnime->unk_24); } skelAnime->unk_28 = 1.0f; @@ -1130,7 +1285,7 @@ void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation skelAnime->unk_28 = 0.0f; } - skelAnime->animCurrentFrame = animation; + skelAnime->animCurrentFrame = 0.0f; skelAnime->unk_0C = arg4; skelAnime->animCurrentFrame = arg4; skelAnime->animFrameCount = frameCount; @@ -1140,7 +1295,6 @@ void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3F08.s") #endif -#undef NON_MATCHING void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation) { @@ -1198,7 +1352,17 @@ void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, s32 arg2, f32 func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, alignedAddr, arg6); } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A43B8.s") +void func_800A43B8(GlobalContext* globalCtx, SkelAnime *skelAnime, u32 animation, f32 frame, s32 arg4, f32 arg5, f32 arg6, s32 arg7) +{ + s32 alignedAddr; + + func_800A336C(globalCtx, animation, (s32)frame, skelAnime->limbCount, skelAnime->unk_24); + + alignedAddr = ALIGN16(arg7); + + func_800A336C(globalCtx, arg4, (s32)arg5, skelAnime->limbCount, alignedAddr); + func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->unk_24, alignedAddr, arg6); +} void func_800A4454(SkelAnime* skelAnime) { @@ -1775,7 +1939,7 @@ void func_800A56F0(SkelAnime *skelAnime, s32 arg1) } // SkelAnime_CopyVec3s -void func_800A5774(SkelAnime* skelAnime, Vec3s *dst, Vec3s *src) +void func_800A5774(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src) { s32 i; for(i = 0; i < skelAnime->limbCount; i++) diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 0ed42a3925..e417cbbd25 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -95,7 +95,7 @@ void Title_Draw(TitleContext* this) { func_80093D18(this->state.gfxCtx); Matrix_Translate(-53.0, -5.0, 0, MTXMODE_NEW); Matrix_Scale(1.0, 1.0, 1.0, MTXMODE_APPLY); - Matrix_RotateXYZ(0, sTitleRotY, 0, MTXMODE_APPLY); + Matrix_RotateZYX(0, sTitleRotY, 0, MTXMODE_APPLY); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(this->state.gfxCtx, "../z_title.c", 424), G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_01002720);