diff options
| author | KrimtonZ <krimtonz@gmail.com> | 2020-03-25 10:51:25 -0500 |
|---|---|---|
| committer | KrimtonZ <krimtonz@gmail.com> | 2020-03-25 10:51:25 -0500 |
| commit | 8970968cfcfcfb86b70eec9b26528d7d9d2c160e (patch) | |
| tree | 9dfe3b86138473692467f6b53019f4823fc0fbb6 | |
| parent | a99840162b2ab08125bc09fa5ec7aa47a8466e21 (diff) | |
name SkelAnime_InitLinkAnimetion, name load animation types and callbacks, rename several segement addresses in decompiled actors
67 files changed, 2726 insertions, 3006 deletions
diff --git a/asm/non_matchings/code/z_player_lib/func_80091738.s b/asm/non_matchings/code/z_player_lib/func_80091738.s index cc4fe918a..68482d397 100644 --- a/asm/non_matchings/code/z_player_lib/func_80091738.s +++ b/asm/non_matchings/code/z_player_lib/func_80091738.s @@ -83,7 +83,7 @@ glabel func_80091738 /* B089F4 80091854 AFA30014 */ sw $v1, 0x14($sp) /* B089F8 80091858 AFA30018 */ sw $v1, 0x18($sp) /* B089FC 8009185C 8FA40048 */ lw $a0, 0x48($sp) -/* B08A00 80091860 0C028E6B */ jal func_800A39AC +/* B08A00 80091860 0C028E6B */ jal SkelAnime_InitLinkAnimetion /* B08A04 80091864 8FA50050 */ lw $a1, 0x50($sp) /* B08A08 80091868 8FBF002C */ lw $ra, 0x2c($sp) /* B08A0C 8009186C 34018890 */ li $at, 34960 diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s b/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s deleted file mode 100644 index a6d9eac99..000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s +++ /dev/null @@ -1,122 +0,0 @@ -glabel SkelAnime_ChangeAnimationImpl -/* B1C184 800A4FE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1C188 800A4FE8 C7AC0038 */ lwc1 $f12, 0x38($sp) -/* B1C18C 800A4FEC 44802000 */ mtc1 $zero, $f4 -/* B1C190 800A4FF0 93AE0037 */ lbu $t6, 0x37($sp) -/* B1C194 800A4FF4 AFBF001C */ sw $ra, 0x1c($sp) -/* B1C198 800A4FF8 46046032 */ c.eq.s $f12, $f4 -/* B1C19C 800A4FFC AFB00018 */ sw $s0, 0x18($sp) -/* B1C1A0 800A5000 AFA50024 */ sw $a1, 0x24($sp) -/* B1C1A4 800A5004 AFA60028 */ sw $a2, 0x28($sp) -/* B1C1A8 800A5008 AFA7002C */ sw $a3, 0x2c($sp) -/* B1C1AC 800A500C 00808025 */ move $s0, $a0 -/* B1C1B0 800A5010 45010035 */ bc1t .L800A50E8 -/* B1C1B4 800A5014 A08E0001 */ sb $t6, 1($a0) -/* B1C1B8 800A5018 8FAF0024 */ lw $t7, 0x24($sp) -/* B1C1BC 800A501C 8C980008 */ lw $t8, 8($a0) -/* B1C1C0 800A5020 C7A6002C */ lwc1 $f6, 0x2c($sp) -/* B1C1C4 800A5024 55F80007 */ bnel $t7, $t8, .L800A5044 -/* B1C1C8 800A5028 44805000 */ mtc1 $zero, $f10 -/* B1C1CC 800A502C C4880018 */ lwc1 $f8, 0x18($a0) -/* B1C1D0 800A5030 46083032 */ c.eq.s $f6, $f8 -/* B1C1D4 800A5034 00000000 */ nop -/* B1C1D8 800A5038 4501002B */ bc1t .L800A50E8 -/* B1C1DC 800A503C 00000000 */ nop -/* B1C1E0 800A5040 44805000 */ mtc1 $zero, $f10 -.L800A5044: -/* B1C1E4 800A5044 02002025 */ move $a0, $s0 -/* B1C1E8 800A5048 83A2003F */ lb $v0, 0x3f($sp) -/* B1C1EC 800A504C 460A603C */ c.lt.s $f12, $f10 -/* B1C1F0 800A5050 00000000 */ nop -/* B1C1F4 800A5054 4500000A */ bc1f .L800A5080 -/* B1C1F8 800A5058 00000000 */ nop -/* B1C1FC 800A505C 0C02926C */ jal func_800A49B0 -/* B1C200 800A5060 E7AC0038 */ swc1 $f12, 0x38($sp) -/* B1C204 800A5064 02002025 */ move $a0, $s0 -/* B1C208 800A5068 8E050024 */ lw $a1, 0x24($s0) -/* B1C20C 800A506C 0C0295DD */ jal SkelAnime_CopyVec3s -/* B1C210 800A5070 8E060020 */ lw $a2, 0x20($s0) -/* B1C214 800A5074 C7AC0038 */ lwc1 $f12, 0x38($sp) -/* B1C218 800A5078 10000014 */ b .L800A50CC -/* B1C21C 800A507C 46006307 */ neg.s $f12, $f12 -.L800A5080: -/* B1C220 800A5080 10400006 */ beqz $v0, .L800A509C -/* B1C224 800A5084 3C08800A */ lui $t0, %hi(func_800A4A20) # $t0, 0x800A -/* B1C228 800A5088 3C19800A */ lui $t9, %hi(func_800A4AD8) # $t9, 0x800A -/* B1C22C 800A508C 27394AD8 */ addiu $t9, %lo(func_800A4AD8) # addiu $t9, $t9, 0x4ad8 -/* B1C230 800A5090 AE190030 */ sw $t9, 0x30($s0) -/* B1C234 800A5094 10000003 */ b .L800A50A4 -/* B1C238 800A5098 A2020003 */ sb $v0, 3($s0) -.L800A509C: -/* B1C23C 800A509C 25084A20 */ addiu $t0, %lo(func_800A4A20) # addiu $t0, $t0, 0x4a20 -/* B1C240 800A50A0 AE080030 */ sw $t0, 0x30($s0) -.L800A50A4: -/* B1C244 800A50A4 C7B0002C */ lwc1 $f16, 0x2c($sp) -/* B1C248 800A50A8 92060000 */ lbu $a2, ($s0) -/* B1C24C 800A50AC 8E070024 */ lw $a3, 0x24($s0) -/* B1C250 800A50B0 4600848D */ trunc.w.s $f18, $f16 -/* B1C254 800A50B4 E7AC0038 */ swc1 $f12, 0x38($sp) -/* B1C258 800A50B8 8FA40024 */ lw $a0, 0x24($sp) -/* B1C25C 800A50BC 44059000 */ mfc1 $a1, $f18 -/* B1C260 800A50C0 0C028763 */ jal SkelAnime_AnimateFrame -/* B1C264 800A50C4 00000000 */ nop -/* B1C268 800A50C8 C7AC0038 */ lwc1 $f12, 0x38($sp) -.L800A50CC: -/* B1C26C 800A50CC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1C270 800A50D0 44813000 */ mtc1 $at, $f6 -/* B1C274 800A50D4 44812000 */ mtc1 $at, $f4 -/* B1C278 800A50D8 460C3203 */ div.s $f8, $f6, $f12 -/* B1C27C 800A50DC E6040028 */ swc1 $f4, 0x28($s0) -/* B1C280 800A50E0 1000000E */ b .L800A511C -/* B1C284 800A50E4 E608002C */ swc1 $f8, 0x2c($s0) -.L800A50E8: -/* B1C288 800A50E8 0C02926C */ jal func_800A49B0 -/* B1C28C 800A50EC 02002025 */ move $a0, $s0 -/* B1C290 800A50F0 C7AA002C */ lwc1 $f10, 0x2c($sp) -/* B1C294 800A50F4 8FA40024 */ lw $a0, 0x24($sp) -/* B1C298 800A50F8 92060000 */ lbu $a2, ($s0) -/* B1C29C 800A50FC 4600540D */ trunc.w.s $f16, $f10 -/* B1C2A0 800A5100 8E070020 */ lw $a3, 0x20($s0) -/* B1C2A4 800A5104 44058000 */ mfc1 $a1, $f16 -/* B1C2A8 800A5108 0C028763 */ jal SkelAnime_AnimateFrame -/* B1C2AC 800A510C 00000000 */ nop -/* B1C2B0 800A5110 44809000 */ mtc1 $zero, $f18 -/* B1C2B4 800A5114 00000000 */ nop -/* B1C2B8 800A5118 E6120028 */ swc1 $f18, 0x28($s0) -.L800A511C: -/* B1C2BC 800A511C 8FAB0024 */ lw $t3, 0x24($sp) -/* B1C2C0 800A5120 AE0B0008 */ sw $t3, 8($s0) -/* B1C2C4 800A5124 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* B1C2C8 800A5128 E604000C */ swc1 $f4, 0xc($s0) -/* B1C2CC 800A512C C7A60030 */ lwc1 $f6, 0x30($sp) -/* B1C2D0 800A5130 E6060010 */ swc1 $f6, 0x10($s0) -/* B1C2D4 800A5134 0C0287F2 */ jal func_800A1FC8 -/* B1C2D8 800A5138 8FA40024 */ lw $a0, 0x24($sp) -/* B1C2DC 800A513C 44824000 */ mtc1 $v0, $f8 -/* B1C2E0 800A5140 92030001 */ lbu $v1, 1($s0) -/* B1C2E4 800A5144 468042A0 */ cvt.s.w $f10, $f8 -/* B1C2E8 800A5148 28610004 */ slti $at, $v1, 4 -/* B1C2EC 800A514C 14200004 */ bnez $at, .L800A5160 -/* B1C2F0 800A5150 E60A0014 */ swc1 $f10, 0x14($s0) -/* B1C2F4 800A5154 44808000 */ mtc1 $zero, $f16 -/* B1C2F8 800A5158 1000000A */ b .L800A5184 -/* B1C2FC 800A515C E6100018 */ swc1 $f16, 0x18($s0) -.L800A5160: -/* B1C300 800A5160 C7B2002C */ lwc1 $f18, 0x2c($sp) -/* B1C304 800A5164 28610002 */ slti $at, $v1, 2 -/* B1C308 800A5168 10200006 */ beqz $at, .L800A5184 -/* B1C30C 800A516C E6120018 */ swc1 $f18, 0x18($s0) -/* B1C310 800A5170 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1C314 800A5174 44813000 */ mtc1 $at, $f6 -/* B1C318 800A5178 C6040014 */ lwc1 $f4, 0x14($s0) -/* B1C31C 800A517C 46062201 */ sub.s $f8, $f4, $f6 -/* B1C320 800A5180 E6080010 */ swc1 $f8, 0x10($s0) -.L800A5184: -/* B1C324 800A5184 C7AA0028 */ lwc1 $f10, 0x28($sp) -/* B1C328 800A5188 E60A001C */ swc1 $f10, 0x1c($s0) -/* B1C32C 800A518C 8FBF001C */ lw $ra, 0x1c($sp) -/* B1C330 800A5190 8FB00018 */ lw $s0, 0x18($sp) -/* B1C334 800A5194 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1C338 800A5198 03E00008 */ jr $ra -/* B1C33C 800A519C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3F08.s b/asm/non_matchings/code/z_skelanime/SkelAnime_LinkChangeAnimation.s index c5c403665..3fec49947 100644 --- a/asm/non_matchings/code/z_skelanime/func_800A3F08.s +++ b/asm/non_matchings/code/z_skelanime/SkelAnime_LinkChangeAnimation.s @@ -1,4 +1,4 @@ -glabel func_800A3F08 +glabel SkelAnime_LinkChangeAnimation /* B1B0A8 800A3F08 27BDFFD8 */ addiu $sp, $sp, -0x28 /* B1B0AC 800A3F0C C7AC0044 */ lwc1 $f12, 0x44($sp) /* B1B0B0 800A3F10 44802000 */ mtc1 $zero, $f4 @@ -49,7 +49,7 @@ glabel func_800A3F08 /* B1B15C 800A3FBC 8FA40028 */ lw $a0, 0x28($sp) /* B1B160 800A3FC0 02202825 */ move $a1, $s1 /* B1B164 800A3FC4 44069000 */ mfc1 $a2, $f18 -/* B1B168 800A3FC8 0C028CDB */ jal func_800A336C +/* B1B168 800A3FC8 0C028CDB */ jal SkelAnime_LoadLinkAnimetion /* B1B16C 800A3FCC AFA80010 */ sw $t0, 0x10($sp) /* B1B170 800A3FD0 C7AC0044 */ lwc1 $f12, 0x44($sp) .L800A3FD4: @@ -71,7 +71,7 @@ glabel func_800A3F08 /* B1B1AC 800A400C 02202825 */ move $a1, $s1 /* B1B1B0 800A4010 AFAA0010 */ sw $t2, 0x10($sp) /* B1B1B4 800A4014 44064000 */ mfc1 $a2, $f8 -/* B1B1B8 800A4018 0C028CDB */ jal func_800A336C +/* B1B1B8 800A4018 0C028CDB */ jal SkelAnime_LoadLinkAnimetion /* B1B1BC 800A401C 00000000 */ nop /* B1B1C0 800A4020 44805000 */ mtc1 $zero, $f10 /* B1B1C4 800A4024 00000000 */ nop diff --git a/asm/non_matchings/code/z_skelanime/func_800A4A20.s b/asm/non_matchings/code/z_skelanime/func_800A4A20.s deleted file mode 100644 index 637bf1a0d..000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4A20.s +++ /dev/null @@ -1,53 +0,0 @@ -.late_rodata -glabel D_80140668 - .float 0.33333334 - -.text -glabel func_800A4A20 -/* B1BBC0 800A4A20 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1BBC4 800A4A24 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1BBC8 800A4A28 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1BBCC 800A4A2C AFBF0024 */ sw $ra, 0x24($sp) -/* B1BBD0 800A4A30 AFB00020 */ sw $s0, 0x20($sp) -/* B1BBD4 800A4A34 85CF0110 */ lh $t7, 0x110($t6) -/* B1BBD8 800A4A38 3C018014 */ lui $at, %hi(D_80140668) -/* B1BBDC 800A4A3C C4280668 */ lwc1 $f8, %lo(D_80140668)($at) -/* B1BBE0 800A4A40 448F2000 */ mtc1 $t7, $f4 -/* B1BBE4 800A4A44 C48A002C */ lwc1 $f10, 0x2c($a0) -/* B1BBE8 800A4A48 C4800028 */ lwc1 $f0, 0x28($a0) -/* B1BBEC 800A4A4C 468021A0 */ cvt.s.w $f6, $f4 -/* B1BBF0 800A4A50 44802000 */ mtc1 $zero, $f4 -/* B1BBF4 800A4A54 46000306 */ mov.s $f12, $f0 -/* B1BBF8 800A4A58 00808025 */ move $s0, $a0 -/* B1BBFC 800A4A5C 46083082 */ mul.s $f2, $f6, $f8 -/* B1BC00 800A4A60 00000000 */ nop -/* B1BC04 800A4A64 46025402 */ mul.s $f16, $f10, $f2 -/* B1BC08 800A4A68 46100481 */ sub.s $f18, $f0, $f16 -/* B1BC0C 800A4A6C E4920028 */ swc1 $f18, 0x28($a0) -/* B1BC10 800A4A70 C4800028 */ lwc1 $f0, 0x28($a0) -/* B1BC14 800A4A74 4604003E */ c.le.s $f0, $f4 -/* B1BC18 800A4A78 00000000 */ nop -/* B1BC1C 800A4A7C 45000007 */ bc1f .L800A4A9C -/* B1BC20 800A4A80 00000000 */ nop -/* B1BC24 800A4A84 0C02926C */ jal func_800A49B0 -/* B1BC28 800A4A88 E7AC002C */ swc1 $f12, 0x2c($sp) -/* B1BC2C 800A4A8C 44803000 */ mtc1 $zero, $f6 -/* B1BC30 800A4A90 C7AC002C */ lwc1 $f12, 0x2c($sp) -/* B1BC34 800A4A94 E6060028 */ swc1 $f6, 0x28($s0) -/* B1BC38 800A4A98 C6000028 */ lwc1 $f0, 0x28($s0) -.L800A4A9C: -/* B1BC3C 800A4A9C 460C0283 */ div.s $f10, $f0, $f12 -/* B1BC40 800A4AA0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1BC44 800A4AA4 44814000 */ mtc1 $at, $f8 -/* B1BC48 800A4AA8 8E050020 */ lw $a1, 0x20($s0) -/* B1BC4C 800A4AAC 92040000 */ lbu $a0, ($s0) -/* B1BC50 800A4AB0 8E070024 */ lw $a3, 0x24($s0) -/* B1BC54 800A4AB4 00A03025 */ move $a2, $a1 -/* B1BC58 800A4AB8 460A4401 */ sub.s $f16, $f8, $f10 -/* B1BC5C 800A4ABC 0C028B9C */ jal func_800A2E70 -/* B1BC60 800A4AC0 E7B00010 */ swc1 $f16, 0x10($sp) -/* B1BC64 800A4AC4 8FBF0024 */ lw $ra, 0x24($sp) -/* B1BC68 800A4AC8 8FB00020 */ lw $s0, 0x20($sp) -/* B1BC6C 800A4ACC 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1BC70 800A4AD0 03E00008 */ jr $ra -/* B1BC74 800A4AD4 00001025 */ move $v0, $zero diff --git a/asm/non_matchings/code/z_skelanime/func_800A4D9C.s b/asm/non_matchings/code/z_skelanime/func_800A4D9C.s deleted file mode 100644 index a061493ac..000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4D9C.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_80140674 - .float 0.33333334 - -.text -glabel func_800A4D9C -/* B1BF3C 800A4D9C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1BF40 800A4DA0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1BF44 800A4DA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BF48 800A4DA8 AFBF0014 */ sw $ra, 0x14($sp) -/* B1BF4C 800A4DAC 85CF0110 */ lh $t7, 0x110($t6) -/* B1BF50 800A4DB0 3C018014 */ lui $at, %hi(D_80140674) -/* B1BF54 800A4DB4 C4280674 */ lwc1 $f8, %lo(D_80140674)($at) -/* B1BF58 800A4DB8 448F2000 */ mtc1 $t7, $f4 -/* B1BF5C 800A4DBC C490001C */ lwc1 $f16, 0x1c($a0) -/* B1BF60 800A4DC0 C48A0018 */ lwc1 $f10, 0x18($a0) -/* B1BF64 800A4DC4 468021A0 */ cvt.s.w $f6, $f4 -/* B1BF68 800A4DC8 46083082 */ mul.s $f2, $f6, $f8 -/* B1BF6C 800A4DCC 44803000 */ mtc1 $zero, $f6 -/* B1BF70 800A4DD0 46028482 */ mul.s $f18, $f16, $f2 -/* B1BF74 800A4DD4 46125100 */ add.s $f4, $f10, $f18 -/* B1BF78 800A4DD8 E4840018 */ swc1 $f4, 0x18($a0) -/* B1BF7C 800A4DDC C4800018 */ lwc1 $f0, 0x18($a0) -/* B1BF80 800A4DE0 4606003C */ c.lt.s $f0, $f6 -/* B1BF84 800A4DE4 00000000 */ nop -/* B1BF88 800A4DE8 45020006 */ bc1fl .L800A4E04 -/* B1BF8C 800A4DEC C4820014 */ lwc1 $f2, 0x14($a0) -/* B1BF90 800A4DF0 C4880014 */ lwc1 $f8, 0x14($a0) -/* B1BF94 800A4DF4 46080400 */ add.s $f16, $f0, $f8 -/* B1BF98 800A4DF8 10000008 */ b .L800A4E1C -/* B1BF9C 800A4DFC E4900018 */ swc1 $f16, 0x18($a0) -/* B1BFA0 800A4E00 C4820014 */ lwc1 $f2, 0x14($a0) -.L800A4E04: -/* B1BFA4 800A4E04 4600103E */ c.le.s $f2, $f0 -/* B1BFA8 800A4E08 00000000 */ nop -/* B1BFAC 800A4E0C 45000003 */ bc1f .L800A4E1C -/* B1BFB0 800A4E10 00000000 */ nop -/* B1BFB4 800A4E14 46020281 */ sub.s $f10, $f0, $f2 -/* B1BFB8 800A4E18 E48A0018 */ swc1 $f10, 0x18($a0) -.L800A4E1C: -/* B1BFBC 800A4E1C 0C029316 */ jal func_800A4C58 -/* B1BFC0 800A4E20 00000000 */ nop -/* B1BFC4 800A4E24 8FBF0014 */ lw $ra, 0x14($sp) -/* B1BFC8 800A4E28 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1BFCC 800A4E2C 00001025 */ move $v0, $zero -/* B1BFD0 800A4E30 03E00008 */ jr $ra -/* B1BFD4 800A4E34 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4E38.s b/asm/non_matchings/code/z_skelanime/func_800A4E38.s deleted file mode 100644 index 4415188d3..000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4E38.s +++ /dev/null @@ -1,51 +0,0 @@ -.late_rodata -glabel D_80140678 - .float 0.33333334 - -.text -glabel func_800A4E38 -/* B1BFD8 800A4E38 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* B1BFDC 800A4E3C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1BFE0 800A4E40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BFE4 800A4E44 AFBF0014 */ sw $ra, 0x14($sp) -/* B1BFE8 800A4E48 85CF0110 */ lh $t7, 0x110($t6) -/* B1BFEC 800A4E4C 3C018014 */ lui $at, %hi(D_80140678) -/* B1BFF0 800A4E50 C4280678 */ lwc1 $f8, %lo(D_80140678)($at) -/* B1BFF4 800A4E54 448F2000 */ mtc1 $t7, $f4 -/* B1BFF8 800A4E58 C490001C */ lwc1 $f16, 0x1c($a0) -/* B1BFFC 800A4E5C C48A0018 */ lwc1 $f10, 0x18($a0) -/* B1C000 800A4E60 468021A0 */ cvt.s.w $f6, $f4 -/* B1C004 800A4E64 C48C000C */ lwc1 $f12, 0xc($a0) -/* B1C008 800A4E68 46083082 */ mul.s $f2, $f6, $f8 -/* B1C00C 800A4E6C 00000000 */ nop -/* B1C010 800A4E70 46028482 */ mul.s $f18, $f16, $f2 -/* B1C014 800A4E74 46125100 */ add.s $f4, $f10, $f18 -/* B1C018 800A4E78 E4840018 */ swc1 $f4, 0x18($a0) -/* B1C01C 800A4E7C C4800018 */ lwc1 $f0, 0x18($a0) -/* B1C020 800A4E80 460C003C */ c.lt.s $f0, $f12 -/* B1C024 800A4E84 00000000 */ nop -/* B1C028 800A4E88 45000006 */ bc1f .L800A4EA4 -/* B1C02C 800A4E8C 00000000 */ nop -/* B1C030 800A4E90 460C0181 */ sub.s $f6, $f0, $f12 -/* B1C034 800A4E94 C4880010 */ lwc1 $f8, 0x10($a0) -/* B1C038 800A4E98 46083400 */ add.s $f16, $f6, $f8 -/* B1C03C 800A4E9C 10000009 */ b .L800A4EC4 -/* B1C040 800A4EA0 E4900018 */ swc1 $f16, 0x18($a0) -.L800A4EA4: -/* B1C044 800A4EA4 C4820010 */ lwc1 $f2, 0x10($a0) -/* B1C048 800A4EA8 4600103E */ c.le.s $f2, $f0 -/* B1C04C 800A4EAC 00000000 */ nop -/* B1C050 800A4EB0 45000004 */ bc1f .L800A4EC4 -/* B1C054 800A4EB4 00000000 */ nop -/* B1C058 800A4EB8 46020281 */ sub.s $f10, $f0, $f2 -/* B1C05C 800A4EBC 460C5480 */ add.s $f18, $f10, $f12 -/* B1C060 800A4EC0 E4920018 */ swc1 $f18, 0x18($a0) -.L800A4EC4: -/* B1C064 800A4EC4 0C029316 */ jal func_800A4C58 -/* B1C068 800A4EC8 00000000 */ nop -/* B1C06C 800A4ECC 8FBF0014 */ lw $ra, 0x14($sp) -/* B1C070 800A4ED0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1C074 800A4ED4 00001025 */ move $v0, $zero -/* B1C078 800A4ED8 03E00008 */ jr $ra -/* B1C07C 800A4EDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s index 157b64583..d27115799 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s @@ -1,19 +1,19 @@ glabel func_8096D594 /* 000E4 8096D594 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000E8 8096D598 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000EC 8096D59C AFA40018 */ sw $a0, 0x0018($sp) -/* 000F0 8096D5A0 AFA5001C */ sw $a1, 0x001C($sp) +/* 000E8 8096D598 AFBF0014 */ sw $ra, 0x0014($sp) +/* 000EC 8096D59C AFA40018 */ sw $a0, 0x0018($sp) +/* 000F0 8096D5A0 AFA5001C */ sw $a1, 0x001C($sp) /* 000F4 8096D5A4 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 000F8 8096D5A8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 000FC 8096D5AC 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 00100 8096D5B0 35CF0003 */ ori $t7, $t6, 0x0003 ## $t7 = 00000003 /* 00104 8096D5B4 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00108 8096D5B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0010C 8096D5BC 0C028D88 */ jal func_800A3620 +/* 00108 8096D5B8 8FA4001C */ lw $a0, 0x001C($sp) +/* 0010C 8096D5BC 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00110 8096D5C0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00114 8096D5C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00114 8096D5C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00118 8096D5C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0011C 8096D5CC 03E00008 */ jr $ra +/* 0011C 8096D5CC 03E00008 */ jr $ra /* 00120 8096D5D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s index e20e9b9a1..f3a8de083 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s @@ -1,8 +1,8 @@ glabel func_8096D5D4 /* 00124 8096D5D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00128 8096D5D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0012C 8096D5DC AFA40018 */ sw $a0, 0x0018($sp) -/* 00130 8096D5E0 AFA5001C */ sw $a1, 0x001C($sp) +/* 00128 8096D5D8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0012C 8096D5DC AFA40018 */ sw $a0, 0x0018($sp) +/* 00130 8096D5E0 AFA5001C */ sw $a1, 0x001C($sp) /* 00134 8096D5E4 8C8E016C */ lw $t6, 0x016C($a0) ## 0000016C /* 00138 8096D5E8 8C99016C */ lw $t9, 0x016C($a0) ## 0000016C /* 0013C 8096D5EC 908A0181 */ lbu $t2, 0x0181($a0) ## 00000181 @@ -23,11 +23,11 @@ glabel func_8096D5D4 /* 00178 8096D628 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 /* 0017C 8096D62C A08B0181 */ sb $t3, 0x0181($a0) ## 00000181 /* 00180 8096D630 A4890188 */ sh $t1, 0x0188($a0) ## 00000188 -/* 00184 8096D634 0C028D88 */ jal func_800A3620 -/* 00188 8096D638 8FA4001C */ lw $a0, 0x001C($sp) -/* 0018C 8096D63C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00184 8096D634 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00188 8096D638 8FA4001C */ lw $a0, 0x001C($sp) +/* 0018C 8096D63C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00190 8096D640 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00194 8096D644 03E00008 */ jr $ra +/* 00194 8096D644 03E00008 */ jr $ra /* 00198 8096D648 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s index 7966ded64..97fa0be67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s @@ -1,19 +1,19 @@ glabel func_8096D64C /* 0019C 8096D64C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001A0 8096D650 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A4 8096D654 AFA40018 */ sw $a0, 0x0018($sp) -/* 001A8 8096D658 AFA5001C */ sw $a1, 0x001C($sp) +/* 001A0 8096D650 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001A4 8096D654 AFA40018 */ sw $a0, 0x0018($sp) +/* 001A8 8096D658 AFA5001C */ sw $a1, 0x001C($sp) /* 001AC 8096D65C 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 001B0 8096D660 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 001B4 8096D664 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 001B8 8096D668 35CF0003 */ ori $t7, $t6, 0x0003 ## $t7 = 00000003 /* 001BC 8096D66C A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 001C0 8096D670 8FA4001C */ lw $a0, 0x001C($sp) -/* 001C4 8096D674 0C028D88 */ jal func_800A3620 +/* 001C0 8096D670 8FA4001C */ lw $a0, 0x001C($sp) +/* 001C4 8096D674 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 001C8 8096D678 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 001CC 8096D67C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 001CC 8096D67C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001D0 8096D680 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001D4 8096D684 03E00008 */ jr $ra +/* 001D4 8096D684 03E00008 */ jr $ra /* 001D8 8096D688 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s index 1b887ef80..eb0de7523 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s @@ -1,19 +1,19 @@ glabel func_809833D8 /* 000D8 809833D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000DC 809833DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 000E0 809833E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 000E4 809833E4 AFA5001C */ sw $a1, 0x001C($sp) +/* 000DC 809833DC AFBF0014 */ sw $ra, 0x0014($sp) +/* 000E0 809833E0 AFA40018 */ sw $a0, 0x0018($sp) +/* 000E4 809833E4 AFA5001C */ sw $a1, 0x001C($sp) /* 000E8 809833E8 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 000EC 809833EC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 000F0 809833F0 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 000F4 809833F4 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 000F8 809833F8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 000FC 809833FC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00100 80983400 0C028D88 */ jal func_800A3620 +/* 000FC 809833FC 8FA4001C */ lw $a0, 0x001C($sp) +/* 00100 80983400 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00104 80983404 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00108 80983408 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00108 80983408 8FBF0014 */ lw $ra, 0x0014($sp) /* 0010C 8098340C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00110 80983410 03E00008 */ jr $ra +/* 00110 80983410 03E00008 */ jr $ra /* 00114 80983414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s index 38b76ca15..9b1e611e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s @@ -1,27 +1,27 @@ glabel func_80A79690 /* 006E0 80A79690 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006E4 80A79694 AFBF001C */ sw $ra, 0x001C($sp) -/* 006E8 80A79698 AFB00018 */ sw $s0, 0x0018($sp) -/* 006EC 80A7969C AFA60028 */ sw $a2, 0x0028($sp) +/* 006E4 80A79694 AFBF001C */ sw $ra, 0x001C($sp) +/* 006E8 80A79698 AFB00018 */ sw $s0, 0x0018($sp) +/* 006EC 80A7969C AFA60028 */ sw $a2, 0x0028($sp) /* 006F0 80A796A0 8C8F0020 */ lw $t7, 0x0020($a0) ## 00000020 /* 006F4 80A796A4 848E0040 */ lh $t6, 0x0040($a0) ## 00000040 /* 006F8 80A796A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006FC 80A796AC 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 -/* 00700 80A796B0 01D8082A */ slt $at, $t6, $t8 -/* 00704 80A796B4 50200009 */ beql $at, $zero, .L80A796DC -/* 00708 80A796B8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00700 80A796B0 01D8082A */ slt $at, $t6, $t8 +/* 00704 80A796B4 50200009 */ beql $at, $zero, .L80A796DC +/* 00708 80A796B8 8FBF001C */ lw $ra, 0x001C($sp) /* 0070C 80A796BC 90990035 */ lbu $t9, 0x0035($a0) ## 00000035 /* 00710 80A796C0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00714 80A796C4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00718 80A796C8 37280003 */ ori $t0, $t9, 0x0003 ## $t0 = 00000003 /* 0071C 80A796CC A0880035 */ sb $t0, 0x0035($a0) ## 00000035 -/* 00720 80A796D0 0C028D88 */ jal func_800A3620 -/* 00724 80A796D4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00728 80A796D8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00720 80A796D0 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00724 80A796D4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00728 80A796D8 8FBF001C */ lw $ra, 0x001C($sp) .L80A796DC: -/* 0072C 80A796DC 8FB00018 */ lw $s0, 0x0018($sp) +/* 0072C 80A796DC 8FB00018 */ lw $s0, 0x0018($sp) /* 00730 80A796E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00734 80A796E4 03E00008 */ jr $ra +/* 00734 80A796E4 03E00008 */ jr $ra /* 00738 80A796E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s index 824108a80..63b26dbcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s @@ -1,19 +1,19 @@ glabel func_80AB2688 /* 018F8 80AB2688 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018FC 80AB268C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01900 80AB2690 AFA40018 */ sw $a0, 0x0018($sp) -/* 01904 80AB2694 AFA5001C */ sw $a1, 0x001C($sp) +/* 018FC 80AB268C AFBF0014 */ sw $ra, 0x0014($sp) +/* 01900 80AB2690 AFA40018 */ sw $a0, 0x0018($sp) +/* 01904 80AB2694 AFA5001C */ sw $a1, 0x001C($sp) /* 01908 80AB2698 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 0190C 80AB269C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 01910 80AB26A0 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 01914 80AB26A4 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01918 80AB26A8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 0191C 80AB26AC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01920 80AB26B0 0C028D88 */ jal func_800A3620 +/* 0191C 80AB26AC 8FA4001C */ lw $a0, 0x001C($sp) +/* 01920 80AB26B0 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 01924 80AB26B4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 01928 80AB26B8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01928 80AB26B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0192C 80AB26BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01930 80AB26C0 03E00008 */ jr $ra +/* 01930 80AB26C0 03E00008 */ jr $ra /* 01934 80AB26C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s index 6078fecc6..c5f6d0383 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s @@ -1,19 +1,19 @@ glabel func_80AEB364 /* 00754 80AEB364 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00758 80AEB368 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0075C 80AEB36C AFA40018 */ sw $a0, 0x0018($sp) -/* 00760 80AEB370 AFA5001C */ sw $a1, 0x001C($sp) +/* 00758 80AEB368 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0075C 80AEB36C AFA40018 */ sw $a0, 0x0018($sp) +/* 00760 80AEB370 AFA5001C */ sw $a1, 0x001C($sp) /* 00764 80AEB374 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 00768 80AEB378 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 0076C 80AEB37C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 00770 80AEB380 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00774 80AEB384 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00778 80AEB388 8FA4001C */ lw $a0, 0x001C($sp) -/* 0077C 80AEB38C 0C028D88 */ jal func_800A3620 +/* 00778 80AEB388 8FA4001C */ lw $a0, 0x001C($sp) +/* 0077C 80AEB38C 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00780 80AEB390 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00784 80AEB394 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00784 80AEB394 8FBF0014 */ lw $ra, 0x0014($sp) /* 00788 80AEB398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0078C 80AEB39C 03E00008 */ jr $ra +/* 0078C 80AEB39C 03E00008 */ jr $ra /* 00790 80AEB3A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s index 6730b2ae8..76399e782 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s @@ -1,26 +1,26 @@ glabel func_80AEB6E0 /* 00AD0 80AEB6E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AD4 80AEB6E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80AEB6E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00ADC 80AEB6EC AFA5001C */ sw $a1, 0x001C($sp) +/* 00AD4 80AEB6E4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AD8 80AEB6E8 AFA40018 */ sw $a0, 0x0018($sp) +/* 00ADC 80AEB6EC AFA5001C */ sw $a1, 0x001C($sp) /* 00AE0 80AEB6F0 8C98016C */ lw $t8, 0x016C($a0) ## 0000016C /* 00AE4 80AEB6F4 848F018C */ lh $t7, 0x018C($a0) ## 0000018C /* 00AE8 80AEB6F8 2486014C */ addiu $a2, $a0, 0x014C ## $a2 = 0000014C /* 00AEC 80AEB6FC 87190002 */ lh $t9, 0x0002($t8) ## 00000002 -/* 00AF0 80AEB700 01F9082A */ slt $at, $t7, $t9 -/* 00AF4 80AEB704 50200009 */ beql $at, $zero, .L80AEB72C -/* 00AF8 80AEB708 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00AF0 80AEB700 01F9082A */ slt $at, $t7, $t9 +/* 00AF4 80AEB704 50200009 */ beql $at, $zero, .L80AEB72C +/* 00AF8 80AEB708 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AFC 80AEB70C 90C80035 */ lbu $t0, 0x0035($a2) ## 00000181 /* 00B00 80AEB710 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00B04 80AEB714 35090003 */ ori $t1, $t0, 0x0003 ## $t1 = 00000003 /* 00B08 80AEB718 A0C90035 */ sb $t1, 0x0035($a2) ## 00000181 -/* 00B0C 80AEB71C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00B10 80AEB720 0C028D88 */ jal func_800A3620 -/* 00B14 80AEB724 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B18 80AEB728 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00B0C 80AEB71C 8FA50018 */ lw $a1, 0x0018($sp) +/* 00B10 80AEB720 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00B14 80AEB724 8FA4001C */ lw $a0, 0x001C($sp) +/* 00B18 80AEB728 8FBF0014 */ lw $ra, 0x0014($sp) .L80AEB72C: /* 00B1C 80AEB72C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B20 80AEB730 03E00008 */ jr $ra +/* 00B20 80AEB730 03E00008 */ jr $ra /* 00B24 80AEB734 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s index 54bf10247..cbc385747 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s @@ -1,8 +1,8 @@ glabel func_80AEB738 /* 00B28 80AEB738 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B2C 80AEB73C AFBF001C */ sw $ra, 0x001C($sp) -/* 00B30 80AEB740 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B34 80AEB744 AFA50024 */ sw $a1, 0x0024($sp) +/* 00B2C 80AEB73C AFBF001C */ sw $ra, 0x001C($sp) +/* 00B30 80AEB740 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B34 80AEB744 AFA50024 */ sw $a1, 0x0024($sp) /* 00B38 80AEB748 8C8E016C */ lw $t6, 0x016C($a0) ## 0000016C /* 00B3C 80AEB74C 8C99016C */ lw $t9, 0x016C($a0) ## 0000016C /* 00B40 80AEB750 8C8B016C */ lw $t3, 0x016C($a0) ## 0000016C @@ -22,21 +22,21 @@ glabel func_80AEB738 /* 00B78 80AEB788 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 /* 00B7C 80AEB78C A4890188 */ sh $t1, 0x0188($a0) ## 00000188 /* 00B80 80AEB790 856C0002 */ lh $t4, 0x0002($t3) ## 00000002 -/* 00B84 80AEB794 014C082A */ slt $at, $t2, $t4 -/* 00B88 80AEB798 50200009 */ beql $at, $zero, .L80AEB7C0 -/* 00B8C 80AEB79C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B84 80AEB794 014C082A */ slt $at, $t2, $t4 +/* 00B88 80AEB798 50200009 */ beql $at, $zero, .L80AEB7C0 +/* 00B8C 80AEB79C 8FBF001C */ lw $ra, 0x001C($sp) /* 00B90 80AEB7A0 90CD0035 */ lbu $t5, 0x0035($a2) ## 00000181 /* 00B94 80AEB7A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00B98 80AEB7A8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00B9C 80AEB7AC 35AE0003 */ ori $t6, $t5, 0x0003 ## $t6 = 00000003 /* 00BA0 80AEB7B0 A0CE0035 */ sb $t6, 0x0035($a2) ## 00000181 -/* 00BA4 80AEB7B4 0C028D88 */ jal func_800A3620 -/* 00BA8 80AEB7B8 8FA40024 */ lw $a0, 0x0024($sp) -/* 00BAC 80AEB7BC 8FBF001C */ lw $ra, 0x001C($sp) +/* 00BA4 80AEB7B4 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00BA8 80AEB7B8 8FA40024 */ lw $a0, 0x0024($sp) +/* 00BAC 80AEB7BC 8FBF001C */ lw $ra, 0x001C($sp) .L80AEB7C0: -/* 00BB0 80AEB7C0 8FB00018 */ lw $s0, 0x0018($sp) +/* 00BB0 80AEB7C0 8FB00018 */ lw $s0, 0x0018($sp) /* 00BB4 80AEB7C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00BB8 80AEB7C8 03E00008 */ jr $ra +/* 00BB8 80AEB7C8 03E00008 */ jr $ra /* 00BBC 80AEB7CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s index 5de292d8b..2171f44ba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s @@ -1,134 +1,134 @@ glabel EnTest_Update /* 04044 80863694 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 04048 80863698 AFBF002C */ sw $ra, 0x002C($sp) -/* 0404C 8086369C AFB00028 */ sw $s0, 0x0028($sp) +/* 04048 80863698 AFBF002C */ sw $ra, 0x002C($sp) +/* 0404C 8086369C AFB00028 */ sw $s0, 0x0028($sp) /* 04050 808636A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04054 808636A4 0C218D3E */ jal func_808634F8 -/* 04058 808636A8 AFA50054 */ sw $a1, 0x0054($sp) +/* 04054 808636A4 0C218D3E */ jal func_808634F8 +/* 04058 808636A8 AFA50054 */ sw $a1, 0x0054($sp) /* 0405C 808636AC 920E00B1 */ lbu $t6, 0x00B1($s0) ## 000000B1 /* 04060 808636B0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04064 808636B4 51C100A7 */ beql $t6, $at, .L80863954 +/* 04064 808636B4 51C100A7 */ beql $t6, $at, .L80863954 /* 04068 808636B8 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 /* 0406C 808636BC 0C00B638 */ jal Actor_MoveForward - + /* 04070 808636C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04074 808636C4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 04078 808636C8 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 /* 0407C 808636CC 240F001D */ addiu $t7, $zero, 0x001D ## $t7 = 0000001D -/* 04080 808636D0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 04084 808636D4 44070000 */ mfc1 $a3, $f0 -/* 04088 808636D8 8FA40054 */ lw $a0, 0x0054($sp) +/* 04080 808636D0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 04084 808636D4 44070000 */ mfc1 $a3, $f0 +/* 04088 808636D8 8FA40054 */ lw $a0, 0x0054($sp) /* 0408C 808636DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04090 808636E0 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 04094 808636E4 0C00B92D */ jal func_8002E4B4 -/* 04098 808636E8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 04094 808636E4 0C00B92D */ jal func_8002E4B4 +/* 04098 808636E8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0409C 808636EC 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 040A0 808636F0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 040A4 808636F4 5701001F */ bnel $t8, $at, .L80863774 +/* 040A4 808636F4 5701001F */ bnel $t8, $at, .L80863774 /* 040A8 808636F8 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 /* 040AC 808636FC C600000C */ lwc1 $f0, 0x000C($s0) ## 0000000C /* 040B0 80863700 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 040B4 80863704 4600203E */ c.le.s $f4, $f0 +/* 040B4 80863704 4600203E */ c.le.s $f4, $f0 /* 040B8 80863708 00000000 */ nop -/* 040BC 8086370C 45020005 */ bc1fl .L80863724 +/* 040BC 8086370C 45020005 */ bc1fl .L80863724 /* 040C0 80863710 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 /* 040C4 80863714 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 040C8 80863718 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 /* 040CC 8086371C E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 /* 040D0 80863720 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 .L80863724: -/* 040D4 80863724 4600403E */ c.le.s $f8, $f0 +/* 040D4 80863724 4600403E */ c.le.s $f8, $f0 /* 040D8 80863728 00000000 */ nop -/* 040DC 8086372C 45020003 */ bc1fl .L8086373C +/* 040DC 8086372C 45020003 */ bc1fl .L8086373C /* 040E0 80863730 8E1907CC */ lw $t9, 0x07CC($s0) ## 000007CC /* 040E4 80863734 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 .L80863738: /* 040E8 80863738 8E1907CC */ lw $t9, 0x07CC($s0) ## 000007CC .L8086373C: /* 040EC 8086373C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040F0 80863740 8FA50054 */ lw $a1, 0x0054($sp) -/* 040F4 80863744 0320F809 */ jalr $ra, $t9 +/* 040F0 80863740 8FA50054 */ lw $a1, 0x0054($sp) +/* 040F4 80863744 0320F809 */ jalr $ra, $t9 /* 040F8 80863748 00000000 */ nop /* 040FC 8086374C 920207DE */ lbu $v0, 0x07DE($s0) ## 000007DE -/* 04100 80863750 2C410005 */ sltiu $at, $v0, 0x0005 -/* 04104 80863754 10200067 */ beq $at, $zero, .L808638F4 -/* 04108 80863758 00024080 */ sll $t0, $v0, 2 +/* 04100 80863750 2C410005 */ sltiu $at, $v0, 0x0005 +/* 04104 80863754 10200067 */ beq $at, $zero, .L808638F4 +/* 04108 80863758 00024080 */ sll $t0, $v0, 2 /* 0410C 8086375C 3C018086 */ lui $at, %hi(jtbl_808647E4) ## $at = 80860000 -/* 04110 80863760 00280821 */ addu $at, $at, $t0 -/* 04114 80863764 8C2847E4 */ lw $t0, %lo(jtbl_808647E4)($at) -/* 04118 80863768 01000008 */ jr $t0 +/* 04110 80863760 00280821 */ addu $at, $at, $t0 +/* 04114 80863764 8C2847E4 */ lw $t0, %lo(jtbl_808647E4)($at) +/* 04118 80863768 01000008 */ jr $t0 /* 0411C 8086376C 00000000 */ nop /* 04120 80863770 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 .L80863774: -/* 04124 80863774 8FA40054 */ lw $a0, 0x0054($sp) +/* 04124 80863774 8FA40054 */ lw $a0, 0x0054($sp) /* 04128 80863778 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 0412C 8086377C 1140FFEE */ beq $t2, $zero, .L80863738 +/* 0412C 8086377C 1140FFEE */ beq $t2, $zero, .L80863738 /* 04130 80863780 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 /* 04134 80863784 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 /* 04138 80863788 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 0413C 8086378C 0C0107A9 */ jal func_80041EA4 -/* 04140 80863790 AFA40038 */ sw $a0, 0x0038($sp) +/* 0413C 8086378C 0C0107A9 */ jal func_80041EA4 +/* 04140 80863790 AFA40038 */ sw $a0, 0x0038($sp) /* 04144 80863794 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04148 80863798 1041000A */ beq $v0, $at, .L808637C4 -/* 0414C 8086379C 8FA40038 */ lw $a0, 0x0038($sp) +/* 04148 80863798 1041000A */ beq $v0, $at, .L808637C4 +/* 0414C 8086379C 8FA40038 */ lw $a0, 0x0038($sp) /* 04150 808637A0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 04154 808637A4 10410007 */ beq $v0, $at, .L808637C4 +/* 04154 808637A4 10410007 */ beq $v0, $at, .L808637C4 /* 04158 808637A8 00000000 */ nop /* 0415C 808637AC 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 04160 808637B0 0C010753 */ jal func_80041D4C +/* 04160 808637B0 0C010753 */ jal func_80041D4C /* 04164 808637B4 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D /* 04168 808637B8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0416C 808637BC 5441FFDF */ bnel $v0, $at, .L8086373C +/* 0416C 808637BC 5441FFDF */ bnel $v0, $at, .L8086373C /* 04170 808637C0 8E1907CC */ lw $t9, 0x07CC($s0) ## 000007CC .L808637C4: /* 04174 808637C4 0C00B55C */ jal Actor_Kill - + /* 04178 808637C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0417C 808637CC 100000B6 */ beq $zero, $zero, .L80863AA8 -/* 04180 808637D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0417C 808637CC 100000B6 */ beq $zero, $zero, .L80863AA8 +/* 04180 808637D0 8FBF002C */ lw $ra, 0x002C($sp) glabel L808637D4 /* 04184 808637D4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04188 808637D8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0418C 808637DC 24841C20 */ addiu $a0, $a0, 0x1C20 ## $a0 = 06001C20 /* 04190 808637E0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04194 808637E4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 04198 808637E8 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 0419C 808637EC 46805420 */ cvt.s.w $f16, $f10 +/* 0419C 808637EC 46805420 */ cvt.s.w $f16, $f10 /* 041A0 808637F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 041A4 808637F4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 041A8 808637F8 44060000 */ mfc1 $a2, $f0 -/* 041AC 808637FC AFAB0014 */ sw $t3, 0x0014($sp) +/* 041A8 808637F8 44060000 */ mfc1 $a2, $f0 +/* 041AC 808637FC AFAB0014 */ sw $t3, 0x0014($sp) /* 041B0 80863800 24A51C20 */ addiu $a1, $a1, 0x1C20 ## $a1 = 06001C20 -/* 041B4 80863804 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 041B4 80863804 E7B00010 */ swc1 $f16, 0x0010($sp) /* 041B8 80863808 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 /* 041BC 8086380C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 041C0 80863810 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 041C4 80863814 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 041C4 80863814 E7A00018 */ swc1 $f0, 0x0018($sp) /* 041C8 80863818 3C0C8086 */ lui $t4, %hi(D_80864510) ## $t4 = 80860000 /* 041CC 8086381C 258C4510 */ addiu $t4, $t4, %lo(D_80864510) ## $t4 = 80864510 /* 041D0 80863820 92050188 */ lbu $a1, 0x0188($s0) ## 00000188 /* 041D4 80863824 8E0601A8 */ lw $a2, 0x01A8($s0) ## 000001A8 /* 041D8 80863828 8E0704C8 */ lw $a3, 0x04C8($s0) ## 000004C8 -/* 041DC 8086382C AFAC0010 */ sw $t4, 0x0010($sp) -/* 041E0 80863830 0C028D52 */ jal func_800A3548 -/* 041E4 80863834 8FA40054 */ lw $a0, 0x0054($sp) +/* 041DC 8086382C AFAC0010 */ sw $t4, 0x0010($sp) +/* 041E0 80863830 0C028D52 */ jal SkelAnime_LoadAnimationType3 +/* 041E4 80863834 8FA40054 */ lw $a0, 0x0054($sp) /* 041E8 80863838 920D07DE */ lbu $t5, 0x07DE($s0) ## 000007DE /* 041EC 8086383C 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 041F0 80863840 1000002C */ beq $zero, $zero, .L808638F4 +/* 041F0 80863840 1000002C */ beq $zero, $zero, .L808638F4 /* 041F4 80863844 A20E07DE */ sb $t6, 0x07DE($s0) ## 000007DE glabel L80863848 /* 041F8 80863848 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 041FC 8086384C 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 /* 04200 80863850 3C078086 */ lui $a3, %hi(D_80864510) ## $a3 = 80860000 /* 04204 80863854 24E74510 */ addiu $a3, $a3, %lo(D_80864510) ## $a3 = 80864510 /* 04208 80863858 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 0420C 8086385C 8E0501A8 */ lw $a1, 0x01A8($s0) ## 000001A8 -/* 04210 80863860 0C02950A */ jal func_800A5428 +/* 04210 80863860 0C02950A */ jal func_800A5428 /* 04214 80863864 8E0604C8 */ lw $a2, 0x04C8($s0) ## 000004C8 -/* 04218 80863868 10000023 */ beq $zero, $zero, .L808638F8 +/* 04218 80863868 10000023 */ beq $zero, $zero, .L808638F8 /* 0421C 8086386C 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 glabel L80863870 /* 04220 80863870 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -141,65 +141,65 @@ glabel L80863884 /* 04238 80863888 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 0423C 8086388C C60004D0 */ lwc1 $f0, 0x04D0($s0) ## 000004D0 /* 04240 80863890 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04244 80863894 460C0101 */ sub.s $f4, $f0, $f12 -/* 04248 80863898 46000086 */ mov.s $f2, $f0 +/* 04244 80863894 460C0101 */ sub.s $f4, $f0, $f12 +/* 04248 80863898 46000086 */ mov.s $f2, $f0 /* 0424C 8086389C E60404D0 */ swc1 $f4, 0x04D0($s0) ## 000004D0 /* 04250 808638A0 C60004D0 */ lwc1 $f0, 0x04D0($s0) ## 000004D0 -/* 04254 808638A4 4606003E */ c.le.s $f0, $f6 +/* 04254 808638A4 4606003E */ c.le.s $f0, $f6 /* 04258 808638A8 00000000 */ nop -/* 0425C 808638AC 45020004 */ bc1fl .L808638C0 -/* 04260 808638B0 46020203 */ div.s $f8, $f0, $f2 +/* 0425C 808638AC 45020004 */ bc1fl .L808638C0 +/* 04260 808638B0 46020203 */ div.s $f8, $f0, $f2 /* 04264 808638B4 A20007DE */ sb $zero, 0x07DE($s0) ## 000007DE /* 04268 808638B8 C60004D0 */ lwc1 $f0, 0x04D0($s0) ## 000004D0 -/* 0426C 808638BC 46020203 */ div.s $f8, $f0, $f2 +/* 0426C 808638BC 46020203 */ div.s $f8, $f0, $f2 .L808638C0: /* 04270 808638C0 8E0504C8 */ lw $a1, 0x04C8($s0) ## 000004C8 /* 04274 808638C4 92040188 */ lbu $a0, 0x0188($s0) ## 00000188 /* 04278 808638C8 8E0701A8 */ lw $a3, 0x01A8($s0) ## 000001A8 /* 0427C 808638CC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 04280 808638D0 46086281 */ sub.s $f10, $f12, $f8 -/* 04284 808638D4 0C028B9C */ jal func_800A2E70 -/* 04288 808638D8 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 04280 808638D0 46086281 */ sub.s $f10, $f12, $f8 +/* 04284 808638D4 0C028B9C */ jal func_800A2E70 +/* 04288 808638D8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 0428C 808638DC 3C078086 */ lui $a3, %hi(D_80864510) ## $a3 = 80860000 /* 04290 808638E0 24E74510 */ addiu $a3, $a3, %lo(D_80864510) ## $a3 = 80864510 /* 04294 808638E4 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 04298 808638E8 8E0501A8 */ lw $a1, 0x01A8($s0) ## 000001A8 -/* 0429C 808638EC 0C02950A */ jal func_800A5428 +/* 0429C 808638EC 0C02950A */ jal func_800A5428 /* 042A0 808638F0 8E0604C8 */ lw $a2, 0x04C8($s0) ## 000004C8 glabel L808638F4 .L808638F4: /* 042A4 808638F4 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 .L808638F8: -/* 042A8 808638F8 57000016 */ bnel $t8, $zero, .L80863954 +/* 042A8 808638F8 57000016 */ bnel $t8, $zero, .L80863954 /* 042AC 808638FC 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 /* 042B0 80863900 921900AF */ lbu $t9, 0x00AF($s0) ## 000000AF -/* 042B4 80863904 53200013 */ beql $t9, $zero, .L80863954 +/* 042B4 80863904 53200013 */ beql $t9, $zero, .L80863954 /* 042B8 80863908 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 /* 042BC 8086390C 920207C8 */ lbu $v0, 0x07C8($s0) ## 000007C8 /* 042C0 80863910 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 042C4 80863914 260407D2 */ addiu $a0, $s0, 0x07D2 ## $a0 = 000007D2 -/* 042C8 80863918 10410009 */ beq $v0, $at, .L80863940 +/* 042C8 80863918 10410009 */ beq $v0, $at, .L80863940 /* 042CC 8086391C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 042D0 80863920 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 042D4 80863924 50410007 */ beql $v0, $at, .L80863944 +/* 042D4 80863924 50410007 */ beql $v0, $at, .L80863944 /* 042D8 80863928 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 042DC 8086392C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042E0 80863930 0C218D18 */ jal func_80863460 -/* 042E4 80863934 8FA50054 */ lw $a1, 0x0054($sp) -/* 042E8 80863938 10000006 */ beq $zero, $zero, .L80863954 +/* 042E0 80863930 0C218D18 */ jal func_80863460 +/* 042E4 80863934 8FA50054 */ lw $a1, 0x0054($sp) +/* 042E8 80863938 10000006 */ beq $zero, $zero, .L80863954 /* 042EC 8086393C 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 .L80863940: /* 042F0 80863940 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L80863944: /* 042F4 80863944 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 042F8 80863948 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 042FC 8086394C AFA00010 */ sw $zero, 0x0010($sp) + +/* 042FC 8086394C AFA00010 */ sw $zero, 0x0010($sp) /* 04300 80863950 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 .L80863954: -/* 04304 80863954 AFA50034 */ sw $a1, 0x0034($sp) +/* 04304 80863954 AFA50034 */ sw $a1, 0x0034($sp) /* 04308 80863958 0C0189B7 */ jal ActorCollider_Cylinder_Update - + /* 0430C 8086395C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04310 80863960 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 /* 04314 80863964 3C014234 */ lui $at, 0x4234 ## $at = 42340000 @@ -209,44 +209,44 @@ glabel L808638F4 /* 04324 80863974 44819000 */ mtc1 $at, $f18 ## $f18 = 45.00 /* 04328 80863978 AE090038 */ sw $t1, 0x0038($s0) ## 00000038 /* 0432C 8086397C 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C -/* 04330 80863980 46128100 */ add.s $f4, $f16, $f18 +/* 04330 80863980 46128100 */ add.s $f4, $f16, $f18 /* 04334 80863984 920A00AF */ lbu $t2, 0x00AF($s0) ## 000000AF /* 04338 80863988 AE090040 */ sw $t1, 0x0040($s0) ## 00000040 /* 0433C 8086398C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04340 80863990 E604003C */ swc1 $f4, 0x003C($s0) ## 0000003C -/* 04344 80863994 1D400003 */ bgtz $t2, .L808639A4 -/* 04348 80863998 8FA40054 */ lw $a0, 0x0054($sp) +/* 04344 80863994 1D400003 */ bgtz $t2, .L808639A4 +/* 04348 80863998 8FA40054 */ lw $a0, 0x0054($sp) /* 0434C 8086399C 920B0114 */ lbu $t3, 0x0114($s0) ## 00000114 -/* 04350 808639A0 1160001B */ beq $t3, $zero, .L80863A10 +/* 04350 808639A0 1160001B */ beq $t3, $zero, .L80863A10 .L808639A4: /* 04354 808639A4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 04358 808639A8 00812821 */ addu $a1, $a0, $at -/* 0435C 808639AC AFA50038 */ sw $a1, 0x0038($sp) +/* 04358 808639A8 00812821 */ addu $a1, $a0, $at +/* 0435C 808639AC AFA50038 */ sw $a1, 0x0038($sp) /* 04360 808639B0 0C017713 */ jal Actor_CollisionCheck_SetOT ## CollisionCheck_setOT -/* 04364 808639B4 8FA60034 */ lw $a2, 0x0034($sp) +/* 04364 808639B4 8FA60034 */ lw $a2, 0x0034($sp) /* 04368 808639B8 920C07C8 */ lbu $t4, 0x07C8($s0) ## 000007C8 -/* 0436C 808639BC 2981000A */ slti $at, $t4, 0x000A -/* 04370 808639C0 5420000D */ bnel $at, $zero, .L808639F8 +/* 0436C 808639BC 2981000A */ slti $at, $t4, 0x000A +/* 04370 808639C0 5420000D */ bnel $at, $zero, .L808639F8 /* 04374 808639C4 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE /* 04378 808639C8 920D0114 */ lbu $t5, 0x0114($s0) ## 00000114 -/* 0437C 808639CC 8FA40054 */ lw $a0, 0x0054($sp) -/* 04380 808639D0 8FA50038 */ lw $a1, 0x0038($sp) -/* 04384 808639D4 11A00005 */ beq $t5, $zero, .L808639EC +/* 0437C 808639CC 8FA40054 */ lw $a0, 0x0054($sp) +/* 04380 808639D0 8FA50038 */ lw $a1, 0x0038($sp) +/* 04384 808639D4 11A00005 */ beq $t5, $zero, .L808639EC /* 04388 808639D8 00000000 */ nop /* 0438C 808639DC 960E0112 */ lhu $t6, 0x0112($s0) ## 00000112 /* 04390 808639E0 31CF4000 */ andi $t7, $t6, 0x4000 ## $t7 = 00000000 -/* 04394 808639E4 55E00004 */ bnel $t7, $zero, .L808639F8 +/* 04394 808639E4 55E00004 */ bnel $t7, $zero, .L808639F8 /* 04398 808639E8 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE .L808639EC: /* 0439C 808639EC 0C01767D */ jal Actor_CollisionCheck_SetAC ## CollisionCheck_setAC -/* 043A0 808639F0 8FA60034 */ lw $a2, 0x0034($sp) +/* 043A0 808639F0 8FA60034 */ lw $a2, 0x0034($sp) /* 043A4 808639F4 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE .L808639F8: -/* 043A8 808639F8 8FA40054 */ lw $a0, 0x0054($sp) -/* 043AC 808639FC 8FA50038 */ lw $a1, 0x0038($sp) -/* 043B0 80863A00 53000004 */ beql $t8, $zero, .L80863A14 +/* 043A8 808639F8 8FA40054 */ lw $a0, 0x0054($sp) +/* 043AC 808639FC 8FA50038 */ lw $a1, 0x0038($sp) +/* 043B0 80863A00 53000004 */ beql $t8, $zero, .L80863A14 /* 043B4 80863A04 82190808 */ lb $t9, 0x0808($s0) ## 00000808 /* 043B8 80863A08 0C01767D */ jal Actor_CollisionCheck_SetAC ## CollisionCheck_setAC @@ -254,52 +254,52 @@ glabel L808638F4 .L80863A10: /* 043C0 80863A10 82190808 */ lb $t9, 0x0808($s0) ## 00000808 .L80863A14: -/* 043C4 80863A14 5B200011 */ blezl $t9, .L80863A5C +/* 043C4 80863A14 5B200011 */ blezl $t9, .L80863A5C /* 043C8 80863A18 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 043CC 80863A1C 9202086C */ lbu $v0, 0x086C($s0) ## 0000086C /* 043D0 80863A20 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 043D4 80863A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 043D8 80863A28 30480004 */ andi $t0, $v0, 0x0004 ## $t0 = 00000000 -/* 043DC 80863A2C 15000008 */ bne $t0, $zero, .L80863A50 +/* 043DC 80863A2C 15000008 */ bne $t0, $zero, .L80863A50 /* 043E0 80863A30 304AFFFB */ andi $t2, $v0, 0xFFFB ## $t2 = 00000000 -/* 043E4 80863A34 8FA40054 */ lw $a0, 0x0054($sp) +/* 043E4 80863A34 8FA40054 */ lw $a0, 0x0054($sp) /* 043E8 80863A38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 043EC 80863A3C 2606085C */ addiu $a2, $s0, 0x085C ## $a2 = 0000085C /* 043F0 80863A40 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT -/* 043F4 80863A44 00812821 */ addu $a1, $a0, $at -/* 043F8 80863A48 10000004 */ beq $zero, $zero, .L80863A5C +/* 043F4 80863A44 00812821 */ addu $a1, $a0, $at +/* 043F8 80863A48 10000004 */ beq $zero, $zero, .L80863A5C /* 043FC 80863A4C 860B001C */ lh $t3, 0x001C($s0) ## 0000001C .L80863A50: -/* 04400 80863A50 0C218C90 */ jal func_80863240 +/* 04400 80863A50 0C218C90 */ jal func_80863240 /* 04404 80863A54 A20A086C */ sb $t2, 0x086C($s0) ## 0000086C /* 04408 80863A58 860B001C */ lh $t3, 0x001C($s0) ## 0000001C .L80863A5C: -/* 0440C 80863A5C 8FAC0054 */ lw $t4, 0x0054($sp) -/* 04410 80863A60 55600011 */ bnel $t3, $zero, .L80863AA8 -/* 04414 80863A64 8FBF002C */ lw $ra, 0x002C($sp) +/* 0440C 80863A5C 8FAC0054 */ lw $t4, 0x0054($sp) +/* 04410 80863A60 55600011 */ bnel $t3, $zero, .L80863AA8 +/* 04414 80863A64 8FBF002C */ lw $ra, 0x002C($sp) /* 04418 80863A68 918D1C27 */ lbu $t5, 0x1C27($t4) ## 00001C27 /* 0441C 80863A6C 3C188003 */ lui $t8, 0x8003 ## $t8 = 80030000 -/* 04420 80863A70 51A00008 */ beql $t5, $zero, .L80863A94 +/* 04420 80863A70 51A00008 */ beql $t5, $zero, .L80863A94 /* 04424 80863A74 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 04428 80863A78 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 0442C 80863A7C 2718B8C4 */ addiu $t8, $t8, 0xB8C4 ## $t8 = 8002B8C4 /* 04430 80863A80 AE1800C0 */ sw $t8, 0x00C0($s0) ## 000000C0 /* 04434 80863A84 35CF0081 */ ori $t7, $t6, 0x0081 ## $t7 = 00000081 -/* 04438 80863A88 10000006 */ beq $zero, $zero, .L80863AA4 +/* 04438 80863A88 10000006 */ beq $zero, $zero, .L80863AA4 /* 0443C 80863A8C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 04440 80863A90 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 .L80863A94: /* 04444 80863A94 2401FF7E */ addiu $at, $zero, 0xFF7E ## $at = FFFFFF7E /* 04448 80863A98 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -/* 0444C 80863A9C 03214024 */ and $t0, $t9, $at +/* 0444C 80863A9C 03214024 */ and $t0, $t9, $at /* 04450 80863AA0 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 .L80863AA4: -/* 04454 80863AA4 8FBF002C */ lw $ra, 0x002C($sp) +/* 04454 80863AA4 8FBF002C */ lw $ra, 0x002C($sp) .L80863AA8: -/* 04458 80863AA8 8FB00028 */ lw $s0, 0x0028($sp) +/* 04458 80863AA8 8FB00028 */ lw $s0, 0x0028($sp) /* 0445C 80863AAC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 04460 80863AB0 03E00008 */ jr $ra +/* 04460 80863AB0 03E00008 */ jr $ra /* 04464 80863AB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s index 0903eefa5..bc2092b8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s @@ -1,26 +1,26 @@ glabel func_80B3C8CC /* 006EC 80B3C8CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006F0 80B3C8D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006F4 80B3C8D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 006F8 80B3C8D8 AFA5001C */ sw $a1, 0x001C($sp) +/* 006F0 80B3C8D0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 006F4 80B3C8D4 AFA40018 */ sw $a0, 0x0018($sp) +/* 006F8 80B3C8D8 AFA5001C */ sw $a1, 0x001C($sp) /* 006FC 80B3C8DC 8C8F016C */ lw $t7, 0x016C($a0) ## 0000016C /* 00700 80B3C8E0 8499018C */ lh $t9, 0x018C($a0) ## 0000018C /* 00704 80B3C8E4 2486014C */ addiu $a2, $a0, 0x014C ## $a2 = 0000014C /* 00708 80B3C8E8 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 -/* 0070C 80B3C8EC 0319082A */ slt $at, $t8, $t9 -/* 00710 80B3C8F0 54200009 */ bnel $at, $zero, .L80B3C918 -/* 00714 80B3C8F4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0070C 80B3C8EC 0319082A */ slt $at, $t8, $t9 +/* 00710 80B3C8F0 54200009 */ bnel $at, $zero, .L80B3C918 +/* 00714 80B3C8F4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00718 80B3C8F8 90C80035 */ lbu $t0, 0x0035($a2) ## 00000181 /* 0071C 80B3C8FC 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00720 80B3C900 35090003 */ ori $t1, $t0, 0x0003 ## $t1 = 00000003 /* 00724 80B3C904 A0C90035 */ sb $t1, 0x0035($a2) ## 00000181 -/* 00728 80B3C908 8FA50018 */ lw $a1, 0x0018($sp) -/* 0072C 80B3C90C 0C028D88 */ jal func_800A3620 -/* 00730 80B3C910 8FA4001C */ lw $a0, 0x001C($sp) -/* 00734 80B3C914 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00728 80B3C908 8FA50018 */ lw $a1, 0x0018($sp) +/* 0072C 80B3C90C 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00730 80B3C910 8FA4001C */ lw $a0, 0x001C($sp) +/* 00734 80B3C914 8FBF0014 */ lw $ra, 0x0014($sp) .L80B3C918: /* 00738 80B3C918 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0073C 80B3C91C 03E00008 */ jr $ra +/* 0073C 80B3C91C 03E00008 */ jr $ra /* 00740 80B3C920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s index 57cde32fb..7d719b979 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s @@ -1,19 +1,19 @@ glabel func_80B3C924 /* 00744 80B3C924 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00748 80B3C928 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0074C 80B3C92C AFA40018 */ sw $a0, 0x0018($sp) -/* 00750 80B3C930 AFA5001C */ sw $a1, 0x001C($sp) +/* 00748 80B3C928 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0074C 80B3C92C AFA40018 */ sw $a0, 0x0018($sp) +/* 00750 80B3C930 AFA5001C */ sw $a1, 0x001C($sp) /* 00754 80B3C934 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 00758 80B3C938 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 0075C 80B3C93C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 00760 80B3C940 35CF0003 */ ori $t7, $t6, 0x0003 ## $t7 = 00000003 /* 00764 80B3C944 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00768 80B3C948 8FA4001C */ lw $a0, 0x001C($sp) -/* 0076C 80B3C94C 0C028D88 */ jal func_800A3620 +/* 00768 80B3C948 8FA4001C */ lw $a0, 0x001C($sp) +/* 0076C 80B3C94C 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00770 80B3C950 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00774 80B3C954 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00774 80B3C954 8FBF0014 */ lw $ra, 0x0014($sp) /* 00778 80B3C958 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 80B3C95C 03E00008 */ jr $ra +/* 0077C 80B3C95C 03E00008 */ jr $ra /* 00780 80B3C960 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s index bb9bf80e4..75e738f2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s @@ -1,8 +1,8 @@ glabel func_80B3C964 /* 00784 80B3C964 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00788 80B3C968 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0078C 80B3C96C AFA40018 */ sw $a0, 0x0018($sp) -/* 00790 80B3C970 AFA5001C */ sw $a1, 0x001C($sp) +/* 00788 80B3C968 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0078C 80B3C96C AFA40018 */ sw $a0, 0x0018($sp) +/* 00790 80B3C970 AFA5001C */ sw $a1, 0x001C($sp) /* 00794 80B3C974 8C8E016C */ lw $t6, 0x016C($a0) ## 0000016C /* 00798 80B3C978 8C99016C */ lw $t9, 0x016C($a0) ## 0000016C /* 0079C 80B3C97C 908A0181 */ lbu $t2, 0x0181($a0) ## 00000181 @@ -23,11 +23,11 @@ glabel func_80B3C964 /* 007D8 80B3C9B8 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 /* 007DC 80B3C9BC A08B0181 */ sb $t3, 0x0181($a0) ## 00000181 /* 007E0 80B3C9C0 A4890188 */ sh $t1, 0x0188($a0) ## 00000188 -/* 007E4 80B3C9C4 0C028D88 */ jal func_800A3620 -/* 007E8 80B3C9C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 007EC 80B3C9CC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007E4 80B3C9C4 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 007E8 80B3C9C8 8FA4001C */ lw $a0, 0x001C($sp) +/* 007EC 80B3C9CC 8FBF0014 */ lw $ra, 0x0014($sp) /* 007F0 80B3C9D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F4 80B3C9D4 03E00008 */ jr $ra +/* 007F4 80B3C9D4 03E00008 */ jr $ra /* 007F8 80B3C9D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s index 1a151fdeb..2a587fa04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s @@ -1,19 +1,19 @@ glabel func_80B4B874 /* 00D34 80B4B874 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D38 80B4B878 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D3C 80B4B87C AFA40018 */ sw $a0, 0x0018($sp) -/* 00D40 80B4B880 AFA5001C */ sw $a1, 0x001C($sp) +/* 00D38 80B4B878 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00D3C 80B4B87C AFA40018 */ sw $a0, 0x0018($sp) +/* 00D40 80B4B880 AFA5001C */ sw $a1, 0x001C($sp) /* 00D44 80B4B884 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 00D48 80B4B888 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 00D4C 80B4B88C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 00D50 80B4B890 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00D54 80B4B894 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00D58 80B4B898 8FA4001C */ lw $a0, 0x001C($sp) -/* 00D5C 80B4B89C 0C028D88 */ jal func_800A3620 +/* 00D58 80B4B898 8FA4001C */ lw $a0, 0x001C($sp) +/* 00D5C 80B4B89C 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00D60 80B4B8A0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00D64 80B4B8A4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00D64 80B4B8A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00D68 80B4B8A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D6C 80B4B8AC 03E00008 */ jr $ra +/* 00D6C 80B4B8AC 03E00008 */ jr $ra /* 00D70 80B4B8B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s index c8deb3fa9..d274d6aec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s @@ -1,19 +1,19 @@ glabel func_80B5BB38 /* 00388 80B5BB38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0038C 80B5BB3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00390 80B5BB40 AFA40018 */ sw $a0, 0x0018($sp) -/* 00394 80B5BB44 AFA5001C */ sw $a1, 0x001C($sp) +/* 0038C 80B5BB3C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00390 80B5BB40 AFA40018 */ sw $a0, 0x0018($sp) +/* 00394 80B5BB44 AFA5001C */ sw $a1, 0x001C($sp) /* 00398 80B5BB48 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 0039C 80B5BB4C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 003A0 80B5BB50 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 003A4 80B5BB54 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 003A8 80B5BB58 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 003AC 80B5BB5C 8FA4001C */ lw $a0, 0x001C($sp) -/* 003B0 80B5BB60 0C028D88 */ jal func_800A3620 +/* 003AC 80B5BB5C 8FA4001C */ lw $a0, 0x001C($sp) +/* 003B0 80B5BB60 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 003B4 80B5BB64 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 003B8 80B5BB68 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003B8 80B5BB68 8FBF0014 */ lw $ra, 0x0014($sp) /* 003BC 80B5BB6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003C0 80B5BB70 03E00008 */ jr $ra +/* 003C0 80B5BB70 03E00008 */ jr $ra /* 003C4 80B5BB74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s index 9f72d5385..e7396b8b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s @@ -1,31 +1,31 @@ glabel func_80832B0C /* 008FC 80832B0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00900 80832B10 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00904 80832B14 AFA40028 */ sw $a0, 0x0028($sp) -/* 00908 80832B18 AFA5002C */ sw $a1, 0x002C($sp) -/* 0090C 80832B1C AFA60030 */ sw $a2, 0x0030($sp) +/* 00900 80832B10 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00904 80832B14 AFA40028 */ sw $a0, 0x0028($sp) +/* 00908 80832B18 AFA5002C */ sw $a1, 0x002C($sp) +/* 0090C 80832B1C AFA60030 */ sw $a2, 0x0030($sp) /* 00910 80832B20 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00914 80832B24 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00918 80832B28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0091C 80832B2C 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00920 80832B30 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 00924 80832B34 46803220 */ cvt.s.w $f8, $f6 -/* 00928 80832B38 8FA5002C */ lw $a1, 0x002C($sp) +/* 00924 80832B34 46803220 */ cvt.s.w $f8, $f6 +/* 00928 80832B38 8FA5002C */ lw $a1, 0x002C($sp) /* 0092C 80832B3C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00930 80832B40 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00934 80832B44 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00938 80832B48 8FA40028 */ lw $a0, 0x0028($sp) -/* 0093C 80832B4C E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00940 80832B50 8FA60030 */ lw $a2, 0x0030($sp) +/* 00934 80832B44 AFAE0018 */ sw $t6, 0x0018($sp) +/* 00938 80832B48 8FA40028 */ lw $a0, 0x0028($sp) +/* 0093C 80832B4C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 00940 80832B50 8FA60030 */ lw $a2, 0x0030($sp) /* 00944 80832B54 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00948 80832B58 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 00948 80832B58 E7AA001C */ swc1 $f10, 0x001C($sp) /* 0094C 80832B5C 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00950 80832B60 0C028FC2 */ jal func_800A3F08 -/* 00954 80832B64 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00958 80832B68 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00950 80832B60 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 00954 80832B64 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00958 80832B68 8FBF0024 */ lw $ra, 0x0024($sp) /* 0095C 80832B6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00960 80832B70 03E00008 */ jr $ra +/* 00960 80832B70 03E00008 */ jr $ra /* 00964 80832B74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s index 783288abf..3559a550f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s @@ -1,32 +1,32 @@ glabel func_80832B78 /* 00968 80832B78 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0096C 80832B7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00970 80832B80 AFA40028 */ sw $a0, 0x0028($sp) -/* 00974 80832B84 AFA5002C */ sw $a1, 0x002C($sp) -/* 00978 80832B88 AFA60030 */ sw $a2, 0x0030($sp) +/* 0096C 80832B7C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00970 80832B80 AFA40028 */ sw $a0, 0x0028($sp) +/* 00974 80832B84 AFA5002C */ sw $a1, 0x002C($sp) +/* 00978 80832B88 AFA60030 */ sw $a2, 0x0030($sp) /* 0097C 80832B8C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00980 80832B90 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00984 80832B94 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00988 80832B98 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 0098C 80832B9C 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 00990 80832BA0 46803220 */ cvt.s.w $f8, $f6 -/* 00994 80832BA4 8FA5002C */ lw $a1, 0x002C($sp) +/* 00990 80832BA0 46803220 */ cvt.s.w $f8, $f6 +/* 00994 80832BA4 8FA5002C */ lw $a1, 0x002C($sp) /* 00998 80832BA8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0099C 80832BAC 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 009A0 80832BB0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 009A4 80832BB4 AFAE0018 */ sw $t6, 0x0018($sp) +/* 009A4 80832BB4 AFAE0018 */ sw $t6, 0x0018($sp) /* 009A8 80832BB8 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 009AC 80832BBC E7A80014 */ swc1 $f8, 0x0014($sp) -/* 009B0 80832BC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 009B4 80832BC4 8FA60030 */ lw $a2, 0x0030($sp) -/* 009B8 80832BC8 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 009AC 80832BBC E7A80014 */ swc1 $f8, 0x0014($sp) +/* 009B0 80832BC0 8FA40028 */ lw $a0, 0x0028($sp) +/* 009B4 80832BC4 8FA60030 */ lw $a2, 0x0030($sp) +/* 009B8 80832BC8 E7AA001C */ swc1 $f10, 0x001C($sp) /* 009BC 80832BCC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 009C0 80832BD0 0C028FC2 */ jal func_800A3F08 -/* 009C4 80832BD4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 009C8 80832BD8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009C0 80832BD0 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 009C4 80832BD4 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 009C8 80832BD8 8FBF0024 */ lw $ra, 0x0024($sp) /* 009CC 80832BDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009D0 80832BE0 03E00008 */ jr $ra +/* 009D0 80832BE0 03E00008 */ jr $ra /* 009D4 80832BE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s index 531dec816..51de71c2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s @@ -3,18 +3,18 @@ glabel func_80832BE8 /* 009DC 80832BEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 009E0 80832BF0 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 009E4 80832BF4 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 -/* 009E8 80832BF8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009EC 80832BFC AFA5002C */ sw $a1, 0x002C($sp) +/* 009E8 80832BF8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 009EC 80832BFC AFA5002C */ sw $a1, 0x002C($sp) /* 009F0 80832C00 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 009F4 80832C04 AFA00018 */ sw $zero, 0x0018($sp) +/* 009F4 80832C04 AFA00018 */ sw $zero, 0x0018($sp) /* 009F8 80832C08 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 009FC 80832C0C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A00 80832C10 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00A04 80832C14 0C028FC2 */ jal func_800A3F08 -/* 00A08 80832C18 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00A0C 80832C1C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009FC 80832C0C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00A00 80832C10 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00A04 80832C14 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 00A08 80832C18 E7A4001C */ swc1 $f4, 0x001C($sp) +/* 00A0C 80832C1C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A10 80832C20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A14 80832C24 03E00008 */ jr $ra +/* 00A14 80832C24 03E00008 */ jr $ra /* 00A18 80832C28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s index d8b76c236..127e5255a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s @@ -1,19 +1,19 @@ glabel func_80832C2C /* 00A1C 80832C2C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00A20 80832C30 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A24 80832C34 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A28 80832C38 AFA5002C */ sw $a1, 0x002C($sp) +/* 00A24 80832C34 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A28 80832C38 AFA5002C */ sw $a1, 0x002C($sp) /* 00A2C 80832C3C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00A30 80832C40 AFAE0018 */ sw $t6, 0x0018($sp) +/* 00A30 80832C40 AFAE0018 */ sw $t6, 0x0018($sp) /* 00A34 80832C44 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 /* 00A38 80832C48 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00A3C 80832C4C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A40 80832C50 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00A44 80832C54 0C028FC2 */ jal func_800A3F08 -/* 00A48 80832C58 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00A4C 80832C5C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A3C 80832C4C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00A40 80832C50 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00A44 80832C54 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 00A48 80832C58 E7A0001C */ swc1 $f0, 0x001C($sp) +/* 00A4C 80832C5C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A50 80832C60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A54 80832C64 03E00008 */ jr $ra +/* 00A54 80832C64 03E00008 */ jr $ra /* 00A58 80832C68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s index 9a858b814..a27716ac7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s @@ -3,18 +3,18 @@ glabel func_80832C6C /* 00A60 80832C70 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A64 80832C74 3C01C180 */ lui $at, 0xC180 ## $at = C1800000 /* 00A68 80832C78 44812000 */ mtc1 $at, $f4 ## $f4 = -16.00 -/* 00A6C 80832C7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A70 80832C80 AFA5002C */ sw $a1, 0x002C($sp) +/* 00A6C 80832C7C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A70 80832C80 AFA5002C */ sw $a1, 0x002C($sp) /* 00A74 80832C84 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00A78 80832C88 AFA00018 */ sw $zero, 0x0018($sp) +/* 00A78 80832C88 AFA00018 */ sw $zero, 0x0018($sp) /* 00A7C 80832C8C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00A80 80832C90 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A84 80832C94 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00A88 80832C98 0C028FC2 */ jal func_800A3F08 -/* 00A8C 80832C9C E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00A90 80832CA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A80 80832C90 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00A84 80832C94 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00A88 80832C98 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 00A8C 80832C9C E7A4001C */ swc1 $f4, 0x001C($sp) +/* 00A90 80832CA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A94 80832CA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A98 80832CA8 03E00008 */ jr $ra +/* 00A98 80832CA8 03E00008 */ jr $ra /* 00A9C 80832CAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s index cbba9105e..bc71e83a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s @@ -1,58 +1,58 @@ glabel func_808340DC /* 01ECC 808340DC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01ED0 808340E0 AFB00028 */ sw $s0, 0x0028($sp) +/* 01ED0 808340E0 AFB00028 */ sw $s0, 0x0028($sp) /* 01ED4 808340E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01ED8 808340E8 AFBF002C */ sw $ra, 0x002C($sp) -/* 01EDC 808340EC AFA50054 */ sw $a1, 0x0054($sp) -/* 01EE0 808340F0 0C20CDC9 */ jal func_80833724 +/* 01ED8 808340E8 AFBF002C */ sw $ra, 0x002C($sp) +/* 01EDC 808340EC AFA50054 */ sw $a1, 0x0054($sp) +/* 01EE0 808340F0 0C20CDC9 */ jal func_80833724 /* 01EE4 808340F4 90840152 */ lbu $a0, 0x0152($a0) ## 00000152 /* 01EE8 808340F8 3C058083 */ lui $a1, %hi(func_80834A2C) ## $a1 = 80830000 /* 01EEC 808340FC 24A54A2C */ addiu $a1, $a1, %lo(func_80834A2C) ## $a1 = 80834A2C /* 01EF0 80834100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EF4 80834104 0C20CD8E */ jal func_80833638 -/* 01EF8 80834108 A3A20037 */ sb $v0, 0x0037($sp) +/* 01EF4 80834104 0C20CD8E */ jal func_80833638 +/* 01EF8 80834108 A3A20037 */ sb $v0, 0x0037($sp) /* 01EFC 8083410C 920E0159 */ lbu $t6, 0x0159($s0) ## 00000159 /* 01F00 80834110 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 01F04 80834114 92190158 */ lbu $t9, 0x0158($s0) ## 00000158 -/* 01F08 80834118 01C50019 */ multu $t6, $a1 +/* 01F08 80834118 01C50019 */ multu $t6, $a1 /* 01F0C 8083411C 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 /* 01F10 80834120 24845C98 */ addiu $a0, $a0, 0x5C98 ## $a0 = 80125C98 -/* 01F14 80834124 83A70037 */ lb $a3, 0x0037($sp) +/* 01F14 80834124 83A70037 */ lb $a3, 0x0037($sp) /* 01F18 80834128 3C038085 */ lui $v1, %hi(D_80854164) ## $v1 = 80850000 /* 01F1C 8083412C 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 01F20 80834130 00007812 */ mflo $t7 -/* 01F24 80834134 008FC021 */ addu $t8, $a0, $t7 +/* 01F20 80834130 00007812 */ mflo $t7 +/* 01F24 80834134 008FC021 */ addu $t8, $a0, $t7 /* 01F28 80834138 93020000 */ lbu $v0, 0x0000($t8) ## 00000000 -/* 01F2C 8083413C 03250019 */ multu $t9, $a1 -/* 01F30 80834140 00004012 */ mflo $t0 -/* 01F34 80834144 00884821 */ addu $t1, $a0, $t0 +/* 01F2C 8083413C 03250019 */ multu $t9, $a1 +/* 01F30 80834140 00004012 */ mflo $t0 +/* 01F34 80834144 00884821 */ addu $t1, $a0, $t0 /* 01F38 80834148 912A0000 */ lbu $t2, 0x0000($t1) ## 00000000 /* 01F3C 8083414C 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 01F40 80834150 000A5880 */ sll $t3, $t2, 2 -/* 01F44 80834154 016A5823 */ subu $t3, $t3, $t2 -/* 01F48 80834158 000B5840 */ sll $t3, $t3, 1 -/* 01F4C 8083415C 01626021 */ addu $t4, $t3, $v0 -/* 01F50 80834160 006C1821 */ addu $v1, $v1, $t4 -/* 01F54 80834164 10E6000A */ beq $a3, $a2, .L80834190 -/* 01F58 80834168 80634164 */ lb $v1, %lo(D_80854164)($v1) -/* 01F5C 8083416C 10E40008 */ beq $a3, $a0, .L80834190 +/* 01F40 80834150 000A5880 */ sll $t3, $t2, 2 +/* 01F44 80834154 016A5823 */ subu $t3, $t3, $t2 +/* 01F48 80834158 000B5840 */ sll $t3, $t3, 1 +/* 01F4C 8083415C 01626021 */ addu $t4, $t3, $v0 +/* 01F50 80834160 006C1821 */ addu $v1, $v1, $t4 +/* 01F54 80834164 10E6000A */ beq $a3, $a2, .L80834190 +/* 01F58 80834168 80634164 */ lb $v1, %lo(D_80854164)($v1) +/* 01F5C 8083416C 10E40008 */ beq $a3, $a0, .L80834190 /* 01F60 80834170 00000000 */ nop -/* 01F64 80834174 14E0000A */ bne $a3, $zero, .L808341A0 +/* 01F64 80834174 14E0000A */ bne $a3, $zero, .L808341A0 /* 01F68 80834178 00000000 */ nop /* 01F6C 8083417C 82020151 */ lb $v0, 0x0151($s0) ## 00000151 -/* 01F70 80834180 10C20003 */ beq $a2, $v0, .L80834190 +/* 01F70 80834180 10C20003 */ beq $a2, $v0, .L80834190 /* 01F74 80834184 00000000 */ nop -/* 01F78 80834188 14820005 */ bne $a0, $v0, .L808341A0 +/* 01F78 80834188 14820005 */ bne $a0, $v0, .L808341A0 /* 01F7C 8083418C 00000000 */ nop .L80834190: -/* 01F80 80834190 14E00003 */ bne $a3, $zero, .L808341A0 +/* 01F80 80834190 14E00003 */ bne $a3, $zero, .L808341A0 /* 01F84 80834194 2403000D */ addiu $v1, $zero, 0x000D ## $v1 = 0000000D -/* 01F88 80834198 10000001 */ beq $zero, $zero, .L808341A0 +/* 01F88 80834198 10000001 */ beq $zero, $zero, .L808341A0 /* 01F8C 8083419C 2403FFF3 */ addiu $v1, $zero, 0xFFF3 ## $v1 = FFFFFFF3 .L808341A0: -/* 01F90 808341A0 04600003 */ bltz $v1, .L808341B0 -/* 01F94 808341A4 00036823 */ subu $t5, $zero, $v1 -/* 01F98 808341A8 10000002 */ beq $zero, $zero, .L808341B4 +/* 01F90 808341A0 04600003 */ bltz $v1, .L808341B0 +/* 01F94 808341A4 00036823 */ subu $t5, $zero, $v1 +/* 01F98 808341A8 10000002 */ beq $zero, $zero, .L808341B4 /* 01F9C 808341AC A203015A */ sb $v1, 0x015A($s0) ## 0000015A .L808341B0: /* 01FA0 808341B0 A20D015A */ sb $t5, 0x015A($s0) ## 0000015A @@ -60,64 +60,64 @@ glabel func_808340DC /* 01FA4 808341B4 820E015A */ lb $t6, 0x015A($s0) ## 0000015A /* 01FA8 808341B8 3C068085 */ lui $a2, %hi(D_808540F4) ## $a2 = 80850000 /* 01FAC 808341BC 3C180400 */ lui $t8, 0x0400 ## $t8 = 04000000 -/* 01FB0 808341C0 000E78C0 */ sll $t7, $t6, 3 -/* 01FB4 808341C4 00CF3021 */ addu $a2, $a2, $t7 -/* 01FB8 808341C8 8CC640F4 */ lw $a2, %lo(D_808540F4)($a2) +/* 01FB0 808341C0 000E78C0 */ sll $t7, $t6, 3 +/* 01FB4 808341C4 00CF3021 */ addu $a2, $a2, $t7 +/* 01FB8 808341C8 8CC640F4 */ lw $a2, %lo(D_808540F4)($a2) /* 01FBC 808341CC 27182F30 */ addiu $t8, $t8, 0x2F30 ## $t8 = 04002F30 -/* 01FC0 808341D0 54D80007 */ bnel $a2, $t8, .L808341F0 +/* 01FC0 808341D0 54D80007 */ bnel $a2, $t8, .L808341F0 /* 01FC4 808341D4 00C02025 */ or $a0, $a2, $zero ## $a0 = 80850000 /* 01FC8 808341D8 8219014E */ lb $t9, 0x014E($s0) ## 0000014E -/* 01FCC 808341DC 57200004 */ bnel $t9, $zero, .L808341F0 +/* 01FCC 808341DC 57200004 */ bnel $t9, $zero, .L808341F0 /* 01FD0 808341E0 00C02025 */ or $a0, $a2, $zero ## $a0 = 80850000 /* 01FD4 808341E4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 01FD8 808341E8 24C62F40 */ addiu $a2, $a2, 0x2F40 ## $a2 = 04002F40 /* 01FDC 808341EC 00C02025 */ or $a0, $a2, $zero ## $a0 = 04002F40 .L808341F0: -/* 01FE0 808341F0 AFA30038 */ sw $v1, 0x0038($sp) -/* 01FE4 808341F4 AFA6004C */ sw $a2, 0x004C($sp) +/* 01FE0 808341F0 AFA30038 */ sw $v1, 0x0038($sp) +/* 01FE4 808341F4 AFA6004C */ sw $a2, 0x004C($sp) /* 01FE8 808341F8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01FEC 808341FC A3A70037 */ sb $a3, 0x0037($sp) + +/* 01FEC 808341FC A3A70037 */ sb $a3, 0x0037($sp) /* 01FF0 80834200 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01FF4 80834204 8FA30038 */ lw $v1, 0x0038($sp) -/* 01FF8 80834208 8FA6004C */ lw $a2, 0x004C($sp) -/* 01FFC 8083420C 468020A0 */ cvt.s.w $f2, $f4 -/* 02000 80834210 83A70037 */ lb $a3, 0x0037($sp) -/* 02004 80834214 8FA40054 */ lw $a0, 0x0054($sp) +/* 01FF4 80834204 8FA30038 */ lw $v1, 0x0038($sp) +/* 01FF8 80834208 8FA6004C */ lw $a2, 0x004C($sp) +/* 01FFC 8083420C 468020A0 */ cvt.s.w $f2, $f4 +/* 02000 80834210 83A70037 */ lb $a3, 0x0037($sp) +/* 02004 80834214 8FA40054 */ lw $a0, 0x0054($sp) /* 02008 80834218 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 0200C 8083421C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 02010 80834220 04600006 */ bltz $v1, .L8083423C -/* 02014 80834224 46001386 */ mov.s $f14, $f2 +/* 02010 80834220 04600006 */ bltz $v1, .L8083423C +/* 02014 80834224 46001386 */ mov.s $f14, $f2 /* 02018 80834228 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0201C 8083422C 3C018085 */ lui $at, %hi(D_8085535C) ## $at = 80850000 -/* 02020 80834230 C420535C */ lwc1 $f0, %lo(D_8085535C)($at) -/* 02024 80834234 10000006 */ beq $zero, $zero, .L80834250 -/* 02028 80834238 46008306 */ mov.s $f12, $f16 +/* 02020 80834230 C420535C */ lwc1 $f0, %lo(D_8085535C)($at) +/* 02024 80834234 10000006 */ beq $zero, $zero, .L80834250 +/* 02028 80834238 46008306 */ mov.s $f12, $f16 .L8083423C: /* 0202C 8083423C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 02030 80834240 3C018085 */ lui $at, %hi(D_80855360) ## $at = 80850000 -/* 02034 80834244 C4205360 */ lwc1 $f0, %lo(D_80855360)($at) -/* 02038 80834248 46001306 */ mov.s $f12, $f2 -/* 0203C 8083424C 46008386 */ mov.s $f14, $f16 +/* 02034 80834244 C4205360 */ lwc1 $f0, %lo(D_80855360)($at) +/* 02038 80834248 46001306 */ mov.s $f12, $f2 +/* 0203C 8083424C 46008386 */ mov.s $f14, $f16 .L80834250: -/* 02040 80834250 50E00003 */ beql $a3, $zero, .L80834260 -/* 02044 80834254 44070000 */ mfc1 $a3, $f0 -/* 02048 80834258 46000000 */ add.s $f0, $f0, $f0 -/* 0204C 8083425C 44070000 */ mfc1 $a3, $f0 +/* 02040 80834250 50E00003 */ beql $a3, $zero, .L80834260 +/* 02044 80834254 44070000 */ mfc1 $a3, $f0 +/* 02048 80834258 46000000 */ add.s $f0, $f0, $f0 +/* 0204C 8083425C 44070000 */ mfc1 $a3, $f0 .L80834260: -/* 02050 80834260 E7AC0010 */ swc1 $f12, 0x0010($sp) -/* 02054 80834264 E7AE0014 */ swc1 $f14, 0x0014($sp) -/* 02058 80834268 AFA80018 */ sw $t0, 0x0018($sp) -/* 0205C 8083426C 0C028FC2 */ jal func_800A3F08 -/* 02060 80834270 E7B0001C */ swc1 $f16, 0x001C($sp) +/* 02050 80834260 E7AC0010 */ swc1 $f12, 0x0010($sp) +/* 02054 80834264 E7AE0014 */ swc1 $f14, 0x0014($sp) +/* 02058 80834268 AFA80018 */ sw $t0, 0x0018($sp) +/* 0205C 8083426C 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 02060 80834270 E7B0001C */ swc1 $f16, 0x001C($sp) /* 02064 80834274 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C /* 02068 80834278 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 0206C 8083427C 01215024 */ and $t2, $t1, $at +/* 0206C 8083427C 01215024 */ and $t2, $t1, $at /* 02070 80834280 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -/* 02074 80834284 8FBF002C */ lw $ra, 0x002C($sp) -/* 02078 80834288 8FB00028 */ lw $s0, 0x0028($sp) +/* 02074 80834284 8FBF002C */ lw $ra, 0x002C($sp) +/* 02078 80834288 8FB00028 */ lw $s0, 0x0028($sp) /* 0207C 8083428C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 02080 80834290 03E00008 */ jr $ra +/* 02080 80834290 03E00008 */ jr $ra /* 02084 80834294 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s index 49fa92595..ad5adf59c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s @@ -1,71 +1,71 @@ glabel func_80834758 /* 02548 80834758 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0254C 8083475C AFBF002C */ sw $ra, 0x002C($sp) -/* 02550 80834760 AFB00028 */ sw $s0, 0x0028($sp) -/* 02554 80834764 AFA40038 */ sw $a0, 0x0038($sp) +/* 0254C 8083475C AFBF002C */ sw $ra, 0x002C($sp) +/* 02550 80834760 AFB00028 */ sw $s0, 0x0028($sp) +/* 02554 80834764 AFA40038 */ sw $a0, 0x0038($sp) /* 02558 80834768 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C /* 0255C 8083476C 3C0120C0 */ lui $at, 0x20C0 ## $at = 20C00000 /* 02560 80834770 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02564 80834774 01C17824 */ and $t7, $t6, $at -/* 02568 80834778 15E00032 */ bne $t7, $zero, .L80834844 +/* 02564 80834774 01C17824 */ and $t7, $t6, $at +/* 02568 80834778 15E00032 */ bne $t7, $zero, .L80834844 /* 0256C 8083477C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 02570 80834780 0324C821 */ addu $t9, $t9, $a0 +/* 02570 80834780 0324C821 */ addu $t9, $t9, $a0 /* 02574 80834784 83391E5C */ lb $t9, 0x1E5C($t9) ## 00011E5C -/* 02578 80834788 5720002F */ bnel $t9, $zero, .L80834848 +/* 02578 80834788 5720002F */ bnel $t9, $zero, .L80834848 /* 0257C 8083478C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02580 80834790 80A80154 */ lb $t0, 0x0154($a1) ## 00000154 /* 02584 80834794 80A90151 */ lb $t1, 0x0151($a1) ## 00000151 -/* 02588 80834798 5509002B */ bnel $t0, $t1, .L80834848 +/* 02588 80834798 5509002B */ bnel $t0, $t1, .L80834848 /* 0258C 8083479C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02590 808347A0 80AA014E */ lb $t2, 0x014E($a1) ## 0000014E -/* 02594 808347A4 51400028 */ beql $t2, $zero, .L80834848 +/* 02594 808347A4 51400028 */ beql $t2, $zero, .L80834848 /* 02598 808347A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0259C 808347AC 0C023A74 */ jal func_8008E9D0 +/* 0259C 808347AC 0C023A74 */ jal func_8008E9D0 /* 025A0 808347B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 025A4 808347B4 54400024 */ bnel $v0, $zero, .L80834848 +/* 025A4 808347B4 54400024 */ bnel $v0, $zero, .L80834848 /* 025A8 808347B8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 025AC 808347BC 0C20CEF3 */ jal func_80833BCC +/* 025AC 808347BC 0C20CEF3 */ jal func_80833BCC /* 025B0 808347C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025B4 808347C4 1040001F */ beq $v0, $zero, .L80834844 +/* 025B4 808347C4 1040001F */ beq $v0, $zero, .L80834844 /* 025B8 808347C8 3C0B8086 */ lui $t3, %hi(D_80858AB4) ## $t3 = 80860000 -/* 025BC 808347CC 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) +/* 025BC 808347CC 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) /* 025C0 808347D0 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 025C4 808347D4 8FA40038 */ lw $a0, 0x0038($sp) +/* 025C4 808347D4 8FA40038 */ lw $a0, 0x0038($sp) /* 025C8 808347D8 956C0000 */ lhu $t4, 0x0000($t3) ## 80860000 -/* 025CC 808347DC 01816827 */ nor $t5, $t4, $at -/* 025D0 808347E0 55A00019 */ bnel $t5, $zero, .L80834848 +/* 025CC 808347DC 01816827 */ nor $t5, $t4, $at +/* 025D0 808347E0 55A00019 */ bnel $t5, $zero, .L80834848 /* 025D4 808347E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 025D8 808347E8 0C20D1B1 */ jal func_808346C4 +/* 025D8 808347E8 0C20D1B1 */ jal func_808346C4 /* 025DC 808347EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 025E0 808347F0 AFA20034 */ sw $v0, 0x0034($sp) +/* 025E0 808347F0 AFA20034 */ sw $v0, 0x0034($sp) /* 025E4 808347F4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 025E8 808347F8 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 025EC 808347FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 025F0 80834800 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 025F4 80834804 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 025F8 80834808 46802020 */ cvt.s.w $f0, $f4 -/* 025FC 8083480C AFAE0018 */ sw $t6, 0x0018($sp) -/* 02600 80834810 8FA40038 */ lw $a0, 0x0038($sp) +/* 025F8 80834808 46802020 */ cvt.s.w $f0, $f4 +/* 025FC 8083480C AFAE0018 */ sw $t6, 0x0018($sp) +/* 02600 80834810 8FA40038 */ lw $a0, 0x0038($sp) /* 02604 80834814 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02608 80834818 8FA60034 */ lw $a2, 0x0034($sp) +/* 02608 80834818 8FA60034 */ lw $a2, 0x0034($sp) /* 0260C 8083481C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 02610 80834820 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02614 80834824 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 02618 80834828 0C028FC2 */ jal func_800A3F08 -/* 0261C 8083482C E7A6001C */ swc1 $f6, 0x001C($sp) +/* 02610 80834820 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 02614 80834824 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 02618 80834828 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 0261C 8083482C E7A6001C */ swc1 $f6, 0x001C($sp) /* 02620 80834830 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02624 80834834 0C00BDF7 */ jal func_8002F7DC +/* 02624 80834834 0C00BDF7 */ jal func_8002F7DC /* 02628 80834838 2405181F */ addiu $a1, $zero, 0x181F ## $a1 = 0000181F -/* 0262C 8083483C 10000002 */ beq $zero, $zero, .L80834848 +/* 0262C 8083483C 10000002 */ beq $zero, $zero, .L80834848 /* 02630 80834840 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834844: /* 02634 80834844 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80834848: -/* 02638 80834848 8FBF002C */ lw $ra, 0x002C($sp) -/* 0263C 8083484C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02638 80834848 8FBF002C */ lw $ra, 0x002C($sp) +/* 0263C 8083484C 8FB00028 */ lw $s0, 0x0028($sp) /* 02640 80834850 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02644 80834854 03E00008 */ jr $ra +/* 02644 80834854 03E00008 */ jr $ra /* 02648 80834858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s index 4c275ba1f..1b8542270 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s @@ -1,45 +1,45 @@ glabel func_80834BD4 /* 029C4 80834BD4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 029C8 80834BD8 AFB00028 */ sw $s0, 0x0028($sp) +/* 029C8 80834BD8 AFB00028 */ sw $s0, 0x0028($sp) /* 029CC 80834BDC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 029D0 80834BE0 AFA50044 */ sw $a1, 0x0044($sp) +/* 029D0 80834BE0 AFA50044 */ sw $a1, 0x0044($sp) /* 029D4 80834BE4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 029D8 80834BE8 AFBF002C */ sw $ra, 0x002C($sp) +/* 029D8 80834BE8 AFBF002C */ sw $ra, 0x002C($sp) /* 029DC 80834BEC 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 029E0 80834BF0 0C028EF0 */ jal func_800A3BC0 -/* 029E4 80834BF4 AFA50034 */ sw $a1, 0x0034($sp) -/* 029E8 80834BF8 10400013 */ beq $v0, $zero, .L80834C48 -/* 029EC 80834BFC 8FA40044 */ lw $a0, 0x0044($sp) -/* 029F0 80834C00 0C20D1B1 */ jal func_808346C4 +/* 029E0 80834BF0 0C028EF0 */ jal func_800A3BC0 +/* 029E4 80834BF4 AFA50034 */ sw $a1, 0x0034($sp) +/* 029E8 80834BF8 10400013 */ beq $v0, $zero, .L80834C48 +/* 029EC 80834BFC 8FA40044 */ lw $a0, 0x0044($sp) +/* 029F0 80834C00 0C20D1B1 */ jal func_808346C4 /* 029F4 80834C04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 029F8 80834C08 AFA2003C */ sw $v0, 0x003C($sp) +/* 029F8 80834C08 AFA2003C */ sw $v0, 0x003C($sp) /* 029FC 80834C0C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02A00 80834C10 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 02A04 80834C14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02A08 80834C18 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02A0C 80834C1C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02A10 80834C20 46802020 */ cvt.s.w $f0, $f4 -/* 02A14 80834C24 AFAE0018 */ sw $t6, 0x0018($sp) -/* 02A18 80834C28 8FA40044 */ lw $a0, 0x0044($sp) -/* 02A1C 80834C2C 8FA50034 */ lw $a1, 0x0034($sp) -/* 02A20 80834C30 8FA6003C */ lw $a2, 0x003C($sp) +/* 02A10 80834C20 46802020 */ cvt.s.w $f0, $f4 +/* 02A14 80834C24 AFAE0018 */ sw $t6, 0x0018($sp) +/* 02A18 80834C28 8FA40044 */ lw $a0, 0x0044($sp) +/* 02A1C 80834C2C 8FA50034 */ lw $a1, 0x0034($sp) +/* 02A20 80834C30 8FA6003C */ lw $a2, 0x003C($sp) /* 02A24 80834C34 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 02A28 80834C38 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02A2C 80834C3C E7A00014 */ swc1 $f0, 0x0014($sp) -/* 02A30 80834C40 0C028FC2 */ jal func_800A3F08 -/* 02A34 80834C44 E7A6001C */ swc1 $f6, 0x001C($sp) +/* 02A28 80834C38 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 02A2C 80834C3C E7A00014 */ swc1 $f0, 0x0014($sp) +/* 02A30 80834C40 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 02A34 80834C44 E7A6001C */ swc1 $f6, 0x001C($sp) .L80834C48: /* 02A38 80834C48 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C /* 02A3C 80834C4C 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 02A40 80834C50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A44 80834C54 01E1C025 */ or $t8, $t7, $at ## $t8 = 00400000 -/* 02A48 80834C58 0C023A90 */ jal func_8008EA40 +/* 02A48 80834C58 0C023A90 */ jal func_8008EA40 /* 02A4C 80834C5C AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 02A50 80834C60 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A54 80834C64 8FB00028 */ lw $s0, 0x0028($sp) +/* 02A50 80834C60 8FBF002C */ lw $ra, 0x002C($sp) +/* 02A54 80834C64 8FB00028 */ lw $s0, 0x0028($sp) /* 02A58 80834C68 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02A5C 80834C6C 03E00008 */ jr $ra +/* 02A5C 80834C6C 03E00008 */ jr $ra /* 02A60 80834C70 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s index a7d29168e..48ad61b41 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s @@ -1,75 +1,75 @@ glabel func_808358F0 /* 036E0 808358F0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 036E4 808358F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 036E8 808358F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 036EC 808358FC AFA50034 */ sw $a1, 0x0034($sp) +/* 036E4 808358F4 AFBF001C */ sw $ra, 0x001C($sp) +/* 036E8 808358F8 AFB00018 */ sw $s0, 0x0018($sp) +/* 036EC 808358FC AFA50034 */ sw $a1, 0x0034($sp) /* 036F0 80835900 8C8E01BC */ lw $t6, 0x01BC($a0) ## 000001BC /* 036F4 80835904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 036F8 80835908 0C20CD39 */ jal func_808334E4 -/* 036FC 8083590C AFAE002C */ sw $t6, 0x002C($sp) -/* 03700 80835910 8FAF002C */ lw $t7, 0x002C($sp) -/* 03704 80835914 504F0012 */ beql $v0, $t7, .L80835960 -/* 03708 80835918 8FA40034 */ lw $a0, 0x0034($sp) -/* 0370C 8083591C 0C20CD4A */ jal func_80833528 +/* 036F8 80835908 0C20CD39 */ jal func_808334E4 +/* 036FC 8083590C AFAE002C */ sw $t6, 0x002C($sp) +/* 03700 80835910 8FAF002C */ lw $t7, 0x002C($sp) +/* 03704 80835914 504F0012 */ beql $v0, $t7, .L80835960 +/* 03708 80835918 8FA40034 */ lw $a0, 0x0034($sp) +/* 0370C 8083591C 0C20CD4A */ jal func_80833528 /* 03710 80835920 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03714 80835924 8FB8002C */ lw $t8, 0x002C($sp) -/* 03718 80835928 5058000D */ beql $v0, $t8, .L80835960 -/* 0371C 8083592C 8FA40034 */ lw $a0, 0x0034($sp) -/* 03720 80835930 0C20CD6C */ jal func_808335B0 +/* 03714 80835924 8FB8002C */ lw $t8, 0x002C($sp) +/* 03718 80835928 5058000D */ beql $v0, $t8, .L80835960 +/* 0371C 8083592C 8FA40034 */ lw $a0, 0x0034($sp) +/* 03720 80835930 0C20CD6C */ jal func_808335B0 /* 03724 80835934 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03728 80835938 8FB9002C */ lw $t9, 0x002C($sp) -/* 0372C 8083593C 50590008 */ beql $v0, $t9, .L80835960 -/* 03730 80835940 8FA40034 */ lw $a0, 0x0034($sp) -/* 03734 80835944 0C20CD7D */ jal func_808335F4 +/* 03728 80835938 8FB9002C */ lw $t9, 0x002C($sp) +/* 0372C 8083593C 50590008 */ beql $v0, $t9, .L80835960 +/* 03730 80835940 8FA40034 */ lw $a0, 0x0034($sp) +/* 03734 80835944 0C20CD7D */ jal func_808335F4 /* 03738 80835948 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0373C 8083594C 8FA8002C */ lw $t0, 0x002C($sp) -/* 03740 80835950 8FA40034 */ lw $a0, 0x0034($sp) -/* 03744 80835954 14480008 */ bne $v0, $t0, .L80835978 +/* 0373C 8083594C 8FA8002C */ lw $t0, 0x002C($sp) +/* 03740 80835950 8FA40034 */ lw $a0, 0x0034($sp) +/* 03744 80835954 14480008 */ bne $v0, $t0, .L80835978 /* 03748 80835958 00000000 */ nop -/* 0374C 8083595C 8FA40034 */ lw $a0, 0x0034($sp) +/* 0374C 8083595C 8FA40034 */ lw $a0, 0x0034($sp) .L80835960: /* 03750 80835960 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 03754 80835964 8E0606E8 */ lw $a2, 0x06E8($s0) ## 000006E8 -/* 03758 80835968 0C028D1E */ jal func_800A3478 +/* 03758 80835968 0C028D1E */ jal SkelAnime_LoadAnimationType1 /* 0375C 8083596C 8E0701D4 */ lw $a3, 0x01D4($s0) ## 000001D4 -/* 03760 80835970 10000004 */ beq $zero, $zero, .L80835984 +/* 03760 80835970 10000004 */ beq $zero, $zero, .L80835984 /* 03764 80835974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80835978: -/* 03768 80835978 0C028EF0 */ jal func_800A3BC0 +/* 03768 80835978 0C028EF0 */ jal func_800A3BC0 /* 0376C 8083597C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 03770 80835980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80835984: -/* 03774 80835984 0C20D3AE */ jal func_80834EB8 -/* 03778 80835988 8FA50034 */ lw $a1, 0x0034($sp) +/* 03774 80835984 0C20D3AE */ jal func_80834EB8 +/* 03778 80835988 8FA50034 */ lw $a1, 0x0034($sp) /* 0377C 8083598C 3C098085 */ lui $t1, %hi(D_80853618) ## $t1 = 80850000 -/* 03780 80835990 8D293618 */ lw $t1, %lo(D_80853618)($t1) +/* 03780 80835990 8D293618 */ lw $t1, %lo(D_80853618)($t1) /* 03784 80835994 3C058083 */ lui $a1, %hi(func_808359FC) ## $a1 = 80830000 /* 03788 80835998 24A559FC */ addiu $a1, $a1, %lo(func_808359FC) ## $a1 = 808359FC -/* 0378C 8083599C 15200012 */ bne $t1, $zero, .L808359E8 +/* 0378C 8083599C 15200012 */ bne $t1, $zero, .L808359E8 /* 03790 808359A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03794 808359A4 260A06C8 */ addiu $t2, $s0, 0x06C8 ## $t2 = 000006C8 -/* 03798 808359A8 0C20CD8E */ jal func_80833638 -/* 0379C 808359AC AFAA0024 */ sw $t2, 0x0024($sp) +/* 03798 808359A8 0C20CD8E */ jal func_80833638 +/* 0379C 808359AC AFAA0024 */ sw $t2, 0x0024($sp) /* 037A0 808359B0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 037A4 808359B4 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 037A8 808359B8 C6040870 */ lwc1 $f4, 0x0870($s0) ## 00000870 /* 037AC 808359BC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 037B0 808359C0 24C62600 */ addiu $a2, $a2, 0x2600 ## $a2 = 04002600 -/* 037B4 808359C4 4606203C */ c.lt.s $f4, $f6 -/* 037B8 808359C8 8FA40034 */ lw $a0, 0x0034($sp) -/* 037BC 808359CC 45000004 */ bc1f .L808359E0 +/* 037B4 808359C4 4606203C */ c.lt.s $f4, $f6 +/* 037B8 808359C8 8FA40034 */ lw $a0, 0x0034($sp) +/* 037BC 808359CC 45000004 */ bc1f .L808359E0 /* 037C0 808359D0 00000000 */ nop /* 037C4 808359D4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 037C8 808359D8 10000001 */ beq $zero, $zero, .L808359E0 +/* 037C8 808359D8 10000001 */ beq $zero, $zero, .L808359E0 /* 037CC 808359DC 24C62608 */ addiu $a2, $a2, 0x2608 ## $a2 = 04002608 .L808359E0: -/* 037D0 808359E0 0C02901F */ jal func_800A407C -/* 037D4 808359E4 8FA50024 */ lw $a1, 0x0024($sp) +/* 037D0 808359E0 0C02901F */ jal func_800A407C +/* 037D4 808359E4 8FA50024 */ lw $a1, 0x0024($sp) .L808359E8: -/* 037D8 808359E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 037DC 808359EC 8FB00018 */ lw $s0, 0x0018($sp) +/* 037D8 808359E8 8FBF001C */ lw $ra, 0x001C($sp) +/* 037DC 808359EC 8FB00018 */ lw $s0, 0x0018($sp) /* 037E0 808359F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 037E4 808359F4 03E00008 */ jr $ra +/* 037E4 808359F4 03E00008 */ jr $ra /* 037E8 808359F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s index b25d84a2a..d3be2da42 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s @@ -1,38 +1,38 @@ glabel func_80836670 /* 04460 80836670 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04464 80836674 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04468 80836678 AFB00020 */ sw $s0, 0x0020($sp) -/* 0446C 8083667C AFA5002C */ sw $a1, 0x002C($sp) +/* 04464 80836674 AFBF0024 */ sw $ra, 0x0024($sp) +/* 04468 80836678 AFB00020 */ sw $s0, 0x0020($sp) +/* 0446C 8083667C AFA5002C */ sw $a1, 0x002C($sp) /* 04470 80836680 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C /* 04474 80836684 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04478 80836688 000E7A00 */ sll $t7, $t6, 8 -/* 0447C 8083668C 05E00029 */ bltz $t7, .L80836734 +/* 04478 80836688 000E7A00 */ sll $t7, $t6, 8 +/* 0447C 8083668C 05E00029 */ bltz $t7, .L80836734 /* 04480 80836690 00000000 */ nop /* 04484 80836694 8C980118 */ lw $t8, 0x0118($a0) ## 00000118 -/* 04488 80836698 13000026 */ beq $t8, $zero, .L80836734 +/* 04488 80836698 13000026 */ beq $t8, $zero, .L80836734 /* 0448C 8083669C 00000000 */ nop -/* 04490 808366A0 0C023C41 */ jal func_8008F104 +/* 04490 808366A0 0C023C41 */ jal func_8008F104 /* 04494 808366A4 00000000 */ nop -/* 04498 808366A8 10400022 */ beq $v0, $zero, .L80836734 -/* 0449C 808366AC 8FA4002C */ lw $a0, 0x002C($sp) +/* 04498 808366A8 10400022 */ beq $v0, $zero, .L80836734 +/* 0449C 808366AC 8FA4002C */ lw $a0, 0x002C($sp) /* 044A0 808366B0 3C068085 */ lui $a2, %hi(func_80850AEC) ## $a2 = 80850000 /* 044A4 808366B4 24C60AEC */ addiu $a2, $a2, %lo(func_80850AEC) ## $a2 = 80850AEC /* 044A8 808366B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044AC 808366BC 0C20D716 */ jal func_80835C58 +/* 044AC 808366BC 0C20D716 */ jal func_80835C58 /* 044B0 808366C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 044B4 808366C4 92190692 */ lbu $t9, 0x0692($s0) ## 00000692 /* 044B8 808366C8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 044BC 808366CC 24C62C90 */ addiu $a2, $a2, 0x2C90 ## $a2 = 04002C90 /* 044C0 808366D0 37280080 */ ori $t0, $t9, 0x0080 ## $t0 = 00000080 /* 044C4 808366D4 A2080692 */ sb $t0, 0x0692($s0) ## 00000692 -/* 044C8 808366D8 8FA4002C */ lw $a0, 0x002C($sp) -/* 044CC 808366DC 0C20C899 */ jal func_80832264 +/* 044C8 808366D8 8FA4002C */ lw $a0, 0x002C($sp) +/* 044CC 808366DC 0C20C899 */ jal func_80832264 /* 044D0 808366E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044D4 808366E4 8FA4002C */ lw $a0, 0x002C($sp) +/* 044D4 808366E4 8FA4002C */ lw $a0, 0x002C($sp) /* 044D8 808366E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044DC 808366EC 0C20CBD5 */ jal func_80832F54 +/* 044DC 808366EC 0C20CBD5 */ jal func_80832F54 /* 044E0 808366F0 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B -/* 044E4 808366F4 0C20C889 */ jal func_80832224 +/* 044E4 808366F4 0C20C889 */ jal func_80832224 /* 044E8 808366F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 044EC 808366FC 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 /* 044F0 80836700 960C06AE */ lhu $t4, 0x06AE($s0) ## 000006AE @@ -44,109 +44,109 @@ glabel func_80836670 /* 04508 80836718 A60D06AE */ sh $t5, 0x06AE($s0) ## 000006AE /* 0450C 8083671C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04510 80836720 24056802 */ addiu $a1, $zero, 0x6802 ## $a1 = 00006802 -/* 04514 80836724 0C20C9A6 */ jal func_80832698 +/* 04514 80836724 0C20C9A6 */ jal func_80832698 /* 04518 80836728 A609083C */ sh $t1, 0x083C($s0) ## 0000083C -/* 0451C 8083672C 10000055 */ beq $zero, $zero, .L80836884 +/* 0451C 8083672C 10000055 */ beq $zero, $zero, .L80836884 /* 04520 80836730 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80836734: -/* 04524 80836734 0C20D972 */ jal func_808365C8 +/* 04524 80836734 0C20D972 */ jal func_808365C8 /* 04528 80836738 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0452C 8083673C 1040000A */ beq $v0, $zero, .L80836768 +/* 0452C 8083673C 1040000A */ beq $v0, $zero, .L80836768 /* 04530 80836740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04534 80836744 0C20D0A6 */ jal func_80834298 -/* 04538 80836748 8FA5002C */ lw $a1, 0x002C($sp) +/* 04534 80836744 0C20D0A6 */ jal func_80834298 +/* 04538 80836748 8FA5002C */ lw $a1, 0x002C($sp) /* 0453C 8083674C 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 /* 04540 80836750 3C0F8085 */ lui $t7, %hi(func_8084E604) ## $t7 = 80850000 /* 04544 80836754 25EFE604 */ addiu $t7, $t7, %lo(func_8084E604) ## $t7 = 8084E604 -/* 04548 80836758 55CF0004 */ bnel $t6, $t7, .L8083676C +/* 04548 80836758 55CF0004 */ bnel $t6, $t7, .L8083676C /* 0454C 8083675C 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C -/* 04550 80836760 10000048 */ beq $zero, $zero, .L80836884 +/* 04550 80836760 10000048 */ beq $zero, $zero, .L80836884 /* 04554 80836764 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80836768: /* 04558 80836768 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C .L8083676C: /* 0455C 8083676C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04560 80836770 8FA5002C */ lw $a1, 0x002C($sp) -/* 04564 80836774 0320F809 */ jalr $ra, $t9 +/* 04560 80836770 8FA5002C */ lw $a1, 0x002C($sp) +/* 04564 80836774 0320F809 */ jalr $ra, $t9 /* 04568 80836778 00000000 */ nop -/* 0456C 8083677C 54400004 */ bnel $v0, $zero, .L80836790 +/* 0456C 8083677C 54400004 */ bnel $v0, $zero, .L80836790 /* 04570 80836780 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04574 80836784 1000003F */ beq $zero, $zero, .L80836884 +/* 04574 80836784 1000003F */ beq $zero, $zero, .L80836884 /* 04578 80836788 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0457C 8083678C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80836790: /* 04580 80836790 C6060830 */ lwc1 $f6, 0x0830($s0) ## 00000830 -/* 04584 80836794 46062032 */ c.eq.s $f4, $f6 +/* 04584 80836794 46062032 */ c.eq.s $f4, $f6 /* 04588 80836798 00000000 */ nop -/* 0458C 8083679C 45010021 */ bc1t .L80836824 +/* 0458C 8083679C 45010021 */ bc1t .L80836824 /* 04590 808367A0 00000000 */ nop -/* 04594 808367A4 0C20CCD4 */ jal func_80833350 +/* 04594 808367A4 0C20CCD4 */ jal func_80833350 /* 04598 808367A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0459C 808367AC 10400006 */ beq $v0, $zero, .L808367C8 -/* 045A0 808367B0 8FA4002C */ lw $a0, 0x002C($sp) +/* 0459C 808367AC 10400006 */ beq $v0, $zero, .L808367C8 +/* 045A0 808367B0 8FA4002C */ lw $a0, 0x002C($sp) /* 045A4 808367B4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 045A8 808367B8 C60A0838 */ lwc1 $f10, 0x0838($s0) ## 00000838 -/* 045AC 808367BC 460A4032 */ c.eq.s $f8, $f10 +/* 045AC 808367BC 460A4032 */ c.eq.s $f8, $f10 /* 045B0 808367C0 00000000 */ nop -/* 045B4 808367C4 45010007 */ bc1t .L808367E4 +/* 045B4 808367C4 45010007 */ bc1t .L808367E4 .L808367C8: /* 045B8 808367C8 3C188085 */ lui $t8, %hi(D_80853410) ## $t8 = 80850000 /* 045BC 808367CC 27183410 */ addiu $t8, $t8, %lo(D_80853410) ## $t8 = 80853410 /* 045C0 808367D0 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 045C4 808367D4 8E0606E8 */ lw $a2, 0x06E8($s0) ## 000006E8 /* 045C8 808367D8 8E0701D4 */ lw $a3, 0x01D4($s0) ## 000001D4 -/* 045CC 808367DC 0C028D6D */ jal func_800A35B4 -/* 045D0 808367E0 AFB80010 */ sw $t8, 0x0010($sp) +/* 045CC 808367DC 0C028D6D */ jal SkelAnime_LoadAnimationType4 +/* 045D0 808367E0 AFB80010 */ sw $t8, 0x0010($sp) .L808367E4: /* 045D4 808367E4 26040830 */ addiu $a0, $s0, 0x0830 ## $a0 = 00000830 /* 045D8 808367E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 045DC 808367EC 0C01DE80 */ jal Math_ApproxF - + /* 045E0 808367F0 3C063E80 */ lui $a2, 0x3E80 ## $a2 = 3E800000 /* 045E4 808367F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 045E8 808367F8 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 045EC 808367FC C6120830 */ lwc1 $f18, 0x0830($s0) ## 00000830 /* 045F0 80836800 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 045F4 80836804 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 045F8 80836808 46128101 */ sub.s $f4, $f16, $f18 +/* 045F8 80836808 46128101 */ sub.s $f4, $f16, $f18 /* 045FC 8083680C 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 04600 80836810 8FA4002C */ lw $a0, 0x002C($sp) -/* 04604 80836814 0C028D37 */ jal func_800A34DC -/* 04608 80836818 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0460C 8083681C 10000019 */ beq $zero, $zero, .L80836884 +/* 04600 80836810 8FA4002C */ lw $a0, 0x002C($sp) +/* 04604 80836814 0C028D37 */ jal SkelAnime_LoadAnimationType2 +/* 04608 80836818 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 0460C 8083681C 10000019 */ beq $zero, $zero, .L80836884 /* 04610 80836820 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80836824: -/* 04614 80836824 0C20CCD4 */ jal func_80833350 +/* 04614 80836824 0C20CCD4 */ jal func_80833350 /* 04618 80836828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0461C 8083682C 10400006 */ beq $v0, $zero, .L80836848 -/* 04620 80836830 8FA4002C */ lw $a0, 0x002C($sp) +/* 0461C 8083682C 10400006 */ beq $v0, $zero, .L80836848 +/* 04620 80836830 8FA4002C */ lw $a0, 0x002C($sp) /* 04624 80836834 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 04628 80836838 C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -/* 0462C 8083683C 46083032 */ c.eq.s $f6, $f8 +/* 0462C 8083683C 46083032 */ c.eq.s $f6, $f8 /* 04630 80836840 00000000 */ nop -/* 04634 80836844 45010009 */ bc1t .L8083686C +/* 04634 80836844 45010009 */ bc1t .L8083686C .L80836848: /* 04638 80836848 3C088085 */ lui $t0, %hi(D_80853410) ## $t0 = 80850000 /* 0463C 8083684C 25083410 */ addiu $t0, $t0, %lo(D_80853410) ## $t0 = 80853410 /* 04640 80836850 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 04644 80836854 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 /* 04648 80836858 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 0464C 8083685C 0C028D52 */ jal func_800A3548 -/* 04650 80836860 AFA80010 */ sw $t0, 0x0010($sp) -/* 04654 80836864 10000007 */ beq $zero, $zero, .L80836884 +/* 0464C 8083685C 0C028D52 */ jal SkelAnime_LoadAnimationType3 +/* 04650 80836860 AFA80010 */ sw $t0, 0x0010($sp) +/* 04654 80836864 10000007 */ beq $zero, $zero, .L80836884 /* 04658 80836868 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083686C: -/* 0465C 8083686C 8FA4002C */ lw $a0, 0x002C($sp) +/* 0465C 8083686C 8FA4002C */ lw $a0, 0x002C($sp) /* 04660 80836870 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 04664 80836874 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 04668 80836878 0C028D1E */ jal func_800A3478 +/* 04668 80836878 0C028D1E */ jal SkelAnime_LoadAnimationType1 /* 0466C 8083687C 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 /* 04670 80836880 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80836884: -/* 04674 80836884 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04678 80836888 8FB00020 */ lw $s0, 0x0020($sp) +/* 04674 80836884 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04678 80836888 8FB00020 */ lw $s0, 0x0020($sp) /* 0467C 8083688C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04680 80836890 03E00008 */ jr $ra +/* 04680 80836890 03E00008 */ jr $ra /* 04684 80836894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s index 4e17eafd3..968e29375 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s @@ -1,60 +1,60 @@ glabel func_80837704 /* 054F4 80837704 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 054F8 80837708 AFBF002C */ sw $ra, 0x002C($sp) -/* 054FC 8083770C AFB00028 */ sw $s0, 0x0028($sp) -/* 05500 80837710 AFA40038 */ sw $a0, 0x0038($sp) +/* 054F8 80837708 AFBF002C */ sw $ra, 0x002C($sp) +/* 054FC 8083770C AFB00028 */ sw $s0, 0x0028($sp) +/* 05500 80837710 AFA40038 */ sw $a0, 0x0038($sp) /* 05504 80837714 80A20842 */ lb $v0, 0x0842($a1) ## 00000842 /* 05508 80837718 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0550C 8083771C 28410004 */ slti $at, $v0, 0x0004 -/* 05510 80837720 1420000A */ bne $at, $zero, .L8083774C -/* 05514 80837724 28410008 */ slti $at, $v0, 0x0008 -/* 05518 80837728 10200008 */ beq $at, $zero, .L8083774C +/* 0550C 8083771C 28410004 */ slti $at, $v0, 0x0004 +/* 05510 80837720 1420000A */ bne $at, $zero, .L8083774C +/* 05514 80837724 28410008 */ slti $at, $v0, 0x0008 +/* 05518 80837728 10200008 */ beq $at, $zero, .L8083774C /* 0551C 8083772C 00000000 */ nop -/* 05520 80837730 0C023C68 */ jal func_8008F1A0 +/* 05520 80837730 0C023C68 */ jal func_8008F1A0 /* 05524 80837734 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 05528 80837738 00027080 */ sll $t6, $v0, 2 +/* 05528 80837738 00027080 */ sll $t6, $v0, 2 /* 0552C 8083773C 3C068085 */ lui $a2, %hi(D_80854358) ## $a2 = 80850000 -/* 05530 80837740 00CE3021 */ addu $a2, $a2, $t6 -/* 05534 80837744 10000007 */ beq $zero, $zero, .L80837764 -/* 05538 80837748 8CC64358 */ lw $a2, %lo(D_80854358)($a2) +/* 05530 80837740 00CE3021 */ addu $a2, $a2, $t6 +/* 05534 80837744 10000007 */ beq $zero, $zero, .L80837764 +/* 05538 80837748 8CC64358 */ lw $a2, %lo(D_80854358)($a2) .L8083774C: -/* 0553C 8083774C 0C023C68 */ jal func_8008F1A0 +/* 0553C 8083774C 0C023C68 */ jal func_8008F1A0 /* 05540 80837750 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05544 80837754 00027880 */ sll $t7, $v0, 2 +/* 05544 80837754 00027880 */ sll $t7, $v0, 2 /* 05548 80837758 3C068085 */ lui $a2, %hi(D_80854350) ## $a2 = 80850000 -/* 0554C 8083775C 00CF3021 */ addu $a2, $a2, $t7 -/* 05550 80837760 8CC64350 */ lw $a2, %lo(D_80854350)($a2) +/* 0554C 8083775C 00CF3021 */ addu $a2, $a2, $t7 +/* 05550 80837760 8CC64350 */ lw $a2, %lo(D_80854350)($a2) .L80837764: /* 05554 80837764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05558 80837768 0C20C8C6 */ jal func_80832318 -/* 0555C 8083776C AFA60034 */ sw $a2, 0x0034($sp) +/* 05558 80837768 0C20C8C6 */ jal func_80832318 +/* 0555C 8083776C AFA60034 */ sw $a2, 0x0034($sp) /* 05560 80837770 0C028800 */ jal SkelAnime_GetFrameCount - -/* 05564 80837774 8FA40034 */ lw $a0, 0x0034($sp) + +/* 05564 80837774 8FA40034 */ lw $a0, 0x0034($sp) /* 05568 80837778 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0556C 8083777C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 05570 80837780 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 05574 80837784 46803220 */ cvt.s.w $f8, $f6 +/* 05574 80837784 46803220 */ cvt.s.w $f8, $f6 /* 05578 80837788 3C01C110 */ lui $at, 0xC110 ## $at = C1100000 /* 0557C 8083778C 44815000 */ mtc1 $at, $f10 ## $f10 = -9.00 /* 05580 80837790 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 05584 80837794 AFB80018 */ sw $t8, 0x0018($sp) -/* 05588 80837798 8FA60034 */ lw $a2, 0x0034($sp) -/* 0558C 8083779C E7A80014 */ swc1 $f8, 0x0014($sp) -/* 05590 808377A0 8FA40038 */ lw $a0, 0x0038($sp) +/* 05584 80837794 AFB80018 */ sw $t8, 0x0018($sp) +/* 05588 80837798 8FA60034 */ lw $a2, 0x0034($sp) +/* 0558C 8083779C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 05590 808377A0 8FA40038 */ lw $a0, 0x0038($sp) /* 05594 808377A4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 05598 808377A8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0559C 808377AC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 055A0 808377B0 0C028FC2 */ jal func_800A3F08 -/* 055A4 808377B4 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 055A8 808377B8 8FA40038 */ lw $a0, 0x0038($sp) +/* 0559C 808377AC E7A40010 */ swc1 $f4, 0x0010($sp) +/* 055A0 808377B0 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 055A4 808377B4 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 055A8 808377B8 8FA40038 */ lw $a0, 0x0038($sp) /* 055AC 808377BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 055B0 808377C0 0C20DD4C */ jal func_80837530 +/* 055B0 808377C0 0C20DD4C */ jal func_80837530 /* 055B4 808377C4 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 055B8 808377C8 8FBF002C */ lw $ra, 0x002C($sp) -/* 055BC 808377CC 8FB00028 */ lw $s0, 0x0028($sp) +/* 055B8 808377C8 8FBF002C */ lw $ra, 0x002C($sp) +/* 055BC 808377CC 8FB00028 */ lw $s0, 0x0028($sp) /* 055C0 808377D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 055C4 808377D4 03E00008 */ jr $ra +/* 055C4 808377D4 03E00008 */ jr $ra /* 055C8 808377D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s index 05ceb2df9..fa87d19c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s @@ -1,99 +1,99 @@ glabel func_8083BF50 /* 09D40 8083BF50 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 09D44 8083BF54 AFBF002C */ sw $ra, 0x002C($sp) -/* 09D48 8083BF58 AFB00028 */ sw $s0, 0x0028($sp) -/* 09D4C 8083BF5C AFA5003C */ sw $a1, 0x003C($sp) +/* 09D44 8083BF54 AFBF002C */ sw $ra, 0x002C($sp) +/* 09D48 8083BF58 AFB00028 */ sw $s0, 0x0028($sp) +/* 09D4C 8083BF5C AFA5003C */ sw $a1, 0x003C($sp) /* 09D50 8083BF60 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 09D54 8083BF64 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 09D58 8083BF68 C4840868 */ lwc1 $f4, 0x0868($a0) ## 00000868 /* 09D5C 8083BF6C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 09D60 8083BF70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 09D64 8083BF74 46062001 */ sub.s $f0, $f4, $f6 +/* 09D64 8083BF74 46062001 */ sub.s $f0, $f4, $f6 /* 09D68 8083BF78 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 09D6C 8083BF7C 4602003C */ c.lt.s $f0, $f2 +/* 09D6C 8083BF7C 4602003C */ c.lt.s $f0, $f2 /* 09D70 8083BF80 00000000 */ nop -/* 09D74 8083BF84 45020005 */ bc1fl .L8083BF9C +/* 09D74 8083BF84 45020005 */ bc1fl .L8083BF9C /* 09D78 8083BF88 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 09D7C 8083BF8C 44814000 */ mtc1 $at, $f8 ## $f8 = 14.00 /* 09D80 8083BF90 00000000 */ nop -/* 09D84 8083BF94 46080000 */ add.s $f0, $f0, $f8 +/* 09D84 8083BF94 46080000 */ add.s $f0, $f0, $f8 /* 09D88 8083BF98 3C014160 */ lui $at, 0x4160 ## $at = 41600000 .L8083BF9C: /* 09D8C 8083BF9C 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 /* 09D90 8083BFA0 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 09D94 8083BFA4 460A003C */ c.lt.s $f0, $f10 +/* 09D94 8083BFA4 460A003C */ c.lt.s $f0, $f10 /* 09D98 8083BFA8 00000000 */ nop -/* 09D9C 8083BFAC 45020014 */ bc1fl .L8083C000 +/* 09D9C 8083BFAC 45020014 */ bc1fl .L8083C000 /* 09DA0 8083BFB0 44812000 */ mtc1 $at, $f4 ## $f4 = 26.00 /* 09DA4 8083BFB4 3C014130 */ lui $at, 0x4130 ## $at = 41300000 /* 09DA8 8083BFB8 44816000 */ mtc1 $at, $f12 ## $f12 = 11.00 /* 09DAC 8083BFBC 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B /* 09DB0 8083BFC0 3C068085 */ lui $a2, %hi(D_80853AC4) ## $a2 = 80850000 -/* 09DB4 8083BFC4 46006001 */ sub.s $f0, $f12, $f0 -/* 09DB8 8083BFC8 000E7880 */ sll $t7, $t6, 2 -/* 09DBC 8083BFCC 00CF3021 */ addu $a2, $a2, $t7 -/* 09DC0 8083BFD0 8CC63AC4 */ lw $a2, %lo(D_80853AC4)($a2) -/* 09DC4 8083BFD4 4602003C */ c.lt.s $f0, $f2 +/* 09DB4 8083BFC4 46006001 */ sub.s $f0, $f12, $f0 +/* 09DB8 8083BFC8 000E7880 */ sll $t7, $t6, 2 +/* 09DBC 8083BFCC 00CF3021 */ addu $a2, $a2, $t7 +/* 09DC0 8083BFD0 8CC63AC4 */ lw $a2, %lo(D_80853AC4)($a2) +/* 09DC4 8083BFD4 4602003C */ c.lt.s $f0, $f2 /* 09DC8 8083BFD8 3C013FB0 */ lui $at, 0x3FB0 ## $at = 3FB00000 -/* 09DCC 8083BFDC 45000005 */ bc1f .L8083BFF4 +/* 09DCC 8083BFDC 45000005 */ bc1f .L8083BFF4 /* 09DD0 8083BFE0 00000000 */ nop /* 09DD4 8083BFE4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.38 -/* 09DD8 8083BFE8 46000407 */ neg.s $f16, $f0 -/* 09DDC 8083BFEC 46128002 */ mul.s $f0, $f16, $f18 +/* 09DD8 8083BFE8 46000407 */ neg.s $f16, $f0 +/* 09DDC 8083BFEC 46128002 */ mul.s $f0, $f16, $f18 /* 09DE0 8083BFF0 00000000 */ nop .L8083BFF4: -/* 09DE4 8083BFF4 10000014 */ beq $zero, $zero, .L8083C048 -/* 09DE8 8083BFF8 460C0003 */ div.s $f0, $f0, $f12 +/* 09DE4 8083BFF4 10000014 */ beq $zero, $zero, .L8083C048 +/* 09DE8 8083BFF8 460C0003 */ div.s $f0, $f0, $f12 /* 09DEC 8083BFFC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.38 .L8083C000: /* 09DF0 8083C000 9218015B */ lbu $t8, 0x015B($s0) ## 0000015B /* 09DF4 8083C004 3C068085 */ lui $a2, %hi(D_80853ADC) ## $a2 = 80850000 -/* 09DF8 8083C008 46002001 */ sub.s $f0, $f4, $f0 -/* 09DFC 8083C00C 0018C880 */ sll $t9, $t8, 2 -/* 09E00 8083C010 00D93021 */ addu $a2, $a2, $t9 -/* 09E04 8083C014 8CC63ADC */ lw $a2, %lo(D_80853ADC)($a2) -/* 09E08 8083C018 4602003C */ c.lt.s $f0, $f2 +/* 09DF8 8083C008 46002001 */ sub.s $f0, $f4, $f0 +/* 09DFC 8083C00C 0018C880 */ sll $t9, $t8, 2 +/* 09E00 8083C010 00D93021 */ addu $a2, $a2, $t9 +/* 09E04 8083C014 8CC63ADC */ lw $a2, %lo(D_80853ADC)($a2) +/* 09E08 8083C018 4602003C */ c.lt.s $f0, $f2 /* 09E0C 8083C01C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 09E10 8083C020 45020006 */ bc1fl .L8083C03C +/* 09E10 8083C020 45020006 */ bc1fl .L8083C03C /* 09E14 8083C024 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 09E18 8083C028 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 09E1C 8083C02C 46000187 */ neg.s $f6, $f0 -/* 09E20 8083C030 46083002 */ mul.s $f0, $f6, $f8 +/* 09E1C 8083C02C 46000187 */ neg.s $f6, $f0 +/* 09E20 8083C030 46083002 */ mul.s $f0, $f6, $f8 /* 09E24 8083C034 00000000 */ nop /* 09E28 8083C038 3C014140 */ lui $at, 0x4140 ## $at = 41400000 .L8083C03C: /* 09E2C 8083C03C 44815000 */ mtc1 $at, $f10 ## $f10 = 12.00 /* 09E30 8083C040 00000000 */ nop -/* 09E34 8083C044 460A0003 */ div.s $f0, $f0, $f10 +/* 09E34 8083C044 460A0003 */ div.s $f0, $f0, $f10 .L8083C048: /* 09E38 8083C048 00C02025 */ or $a0, $a2, $zero ## $a0 = 80850000 -/* 09E3C 8083C04C AFA60034 */ sw $a2, 0x0034($sp) +/* 09E3C 8083C04C AFA60034 */ sw $a2, 0x0034($sp) /* 09E40 8083C050 0C028800 */ jal SkelAnime_GetFrameCount - -/* 09E44 8083C054 E7A00030 */ swc1 $f0, 0x0030($sp) -/* 09E48 8083C058 C7B20030 */ lwc1 $f18, 0x0030($sp) + +/* 09E44 8083C054 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 09E48 8083C058 C7B20030 */ lwc1 $f18, 0x0030($sp) /* 09E4C 8083C05C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 09E50 8083C060 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 09E54 8083C064 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 09E58 8083C068 46808420 */ cvt.s.w $f16, $f16 +/* 09E58 8083C068 46808420 */ cvt.s.w $f16, $f16 /* 09E5C 8083C06C 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 /* 09E60 8083C070 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 09E64 8083C074 8FA60034 */ lw $a2, 0x0034($sp) -/* 09E68 8083C078 46126482 */ mul.s $f18, $f12, $f18 -/* 09E6C 8083C07C E7AE0010 */ swc1 $f14, 0x0010($sp) -/* 09E70 8083C080 8FA4003C */ lw $a0, 0x003C($sp) +/* 09E64 8083C074 8FA60034 */ lw $a2, 0x0034($sp) +/* 09E68 8083C078 46126482 */ mul.s $f18, $f12, $f18 +/* 09E6C 8083C07C E7AE0010 */ swc1 $f14, 0x0010($sp) +/* 09E70 8083C080 8FA4003C */ lw $a0, 0x003C($sp) /* 09E74 8083C084 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 09E78 8083C088 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 09E7C 8083C08C E7B00014 */ swc1 $f16, 0x0014($sp) -/* 09E80 8083C090 AFA80018 */ sw $t0, 0x0018($sp) -/* 09E84 8083C094 0C028FC2 */ jal func_800A3F08 -/* 09E88 8083C098 E7B2001C */ swc1 $f18, 0x001C($sp) +/* 09E7C 8083C08C E7B00014 */ swc1 $f16, 0x0014($sp) +/* 09E80 8083C090 AFA80018 */ sw $t0, 0x0018($sp) +/* 09E84 8083C094 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 09E88 8083C098 E7B2001C */ swc1 $f18, 0x001C($sp) /* 09E8C 8083C09C 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 /* 09E90 8083C0A0 A609083C */ sh $t1, 0x083C($s0) ## 0000083C -/* 09E94 8083C0A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 09E98 8083C0A8 8FB00028 */ lw $s0, 0x0028($sp) +/* 09E94 8083C0A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 09E98 8083C0A8 8FB00028 */ lw $s0, 0x0028($sp) /* 09E9C 8083C0AC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 09EA0 8083C0B0 03E00008 */ jr $ra +/* 09EA0 8083C0B0 03E00008 */ jr $ra /* 09EA4 8083C0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s index b981cc4f2..415685995 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s @@ -1,87 +1,87 @@ glabel func_8083C2B0 /* 0A0A0 8083C2B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0A0A4 8083C2B4 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 0A0A8 8083C2B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0A0AC 8083C2BC AFB00028 */ sw $s0, 0x0028($sp) -/* 0A0B0 8083C2C0 AFA5003C */ sw $a1, 0x003C($sp) -/* 0A0B4 8083C2C4 01E57821 */ addu $t7, $t7, $a1 +/* 0A0A8 8083C2B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0A0AC 8083C2BC AFB00028 */ sw $s0, 0x0028($sp) +/* 0A0B0 8083C2C0 AFA5003C */ sw $a1, 0x003C($sp) +/* 0A0B4 8083C2C4 01E57821 */ addu $t7, $t7, $a1 /* 0A0B8 8083C2C8 81EF1E5C */ lb $t7, 0x1E5C($t7) ## 00011E5C /* 0A0BC 8083C2CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A0C0 8083C2D0 55E00067 */ bnel $t7, $zero, .L8083C470 +/* 0A0C0 8083C2D0 55E00067 */ bnel $t7, $zero, .L8083C470 /* 0A0C4 8083C2D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0A0C8 8083C2D8 8098014E */ lb $t8, 0x014E($a0) ## 0000014E /* 0A0CC 8083C2DC 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 0A0D0 8083C2E0 53000063 */ beql $t8, $zero, .L8083C470 +/* 0A0D0 8083C2E0 53000063 */ beql $t8, $zero, .L8083C470 /* 0A0D4 8083C2E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A0D8 8083C2E8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) +/* 0A0D8 8083C2E8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) /* 0A0DC 8083C2EC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 0A0E0 8083C2F0 97280000 */ lhu $t0, 0x0000($t9) ## 80860000 -/* 0A0E4 8083C2F4 01014827 */ nor $t1, $t0, $at -/* 0A0E8 8083C2F8 5520005D */ bnel $t1, $zero, .L8083C470 +/* 0A0E4 8083C2F4 01014827 */ nor $t1, $t0, $at +/* 0A0E8 8083C2F8 5520005D */ bnel $t1, $zero, .L8083C470 /* 0A0EC 8083C2FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A0F0 8083C300 0C023A74 */ jal func_8008E9D0 +/* 0A0F0 8083C300 0C023A74 */ jal func_8008E9D0 /* 0A0F4 8083C304 00000000 */ nop -/* 0A0F8 8083C308 14400008 */ bne $v0, $zero, .L8083C32C +/* 0A0F8 8083C308 14400008 */ bne $v0, $zero, .L8083C32C /* 0A0FC 8083C30C 00000000 */ nop -/* 0A100 8083C310 0C20CECB */ jal func_80833B2C +/* 0A100 8083C310 0C20CECB */ jal func_80833B2C /* 0A104 8083C314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A108 8083C318 54400055 */ bnel $v0, $zero, .L8083C470 +/* 0A108 8083C318 54400055 */ bnel $v0, $zero, .L8083C470 /* 0A10C 8083C31C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0A110 8083C320 8E0A0664 */ lw $t2, 0x0664($s0) ## 00000664 -/* 0A114 8083C324 55400052 */ bnel $t2, $zero, .L8083C470 +/* 0A114 8083C324 55400052 */ bnel $t2, $zero, .L8083C470 /* 0A118 8083C328 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8083C32C: -/* 0A11C 8083C32C 0C20C8C6 */ jal func_80832318 +/* 0A11C 8083C32C 0C20C8C6 */ jal func_80832318 /* 0A120 8083C330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A124 8083C334 8FA4003C */ lw $a0, 0x003C($sp) -/* 0A128 8083C338 0C20C8ED */ jal func_808323B4 +/* 0A124 8083C334 8FA4003C */ lw $a0, 0x003C($sp) +/* 0A128 8083C338 0C20C8ED */ jal func_808323B4 /* 0A12C 8083C33C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0A130 8083C340 3C068084 */ lui $a2, %hi(func_80843188) ## $a2 = 80840000 /* 0A134 8083C344 24C63188 */ addiu $a2, $a2, %lo(func_80843188) ## $a2 = 80843188 -/* 0A138 8083C348 8FA4003C */ lw $a0, 0x003C($sp) +/* 0A138 8083C348 8FA4003C */ lw $a0, 0x003C($sp) /* 0A13C 8083C34C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A140 8083C350 0C20D716 */ jal func_80835C58 +/* 0A140 8083C350 0C20D716 */ jal func_80835C58 /* 0A144 8083C354 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A148 8083C358 10400042 */ beq $v0, $zero, .L8083C464 +/* 0A148 8083C358 10400042 */ beq $v0, $zero, .L8083C464 /* 0A14C 8083C35C 00000000 */ nop /* 0A150 8083C360 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C /* 0A154 8083C364 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 0A158 8083C368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0A15C 8083C36C 01616025 */ or $t4, $t3, $at ## $t4 = 00400000 -/* 0A160 8083C370 0C023A74 */ jal func_8008E9D0 +/* 0A160 8083C370 0C023A74 */ jal func_8008E9D0 /* 0A164 8083C374 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 0A168 8083C378 14400009 */ bne $v0, $zero, .L8083C3A0 +/* 0A168 8083C378 14400009 */ bne $v0, $zero, .L8083C3A0 /* 0A16C 8083C37C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0A170 8083C380 0C023A90 */ jal func_8008EA40 +/* 0A170 8083C380 0C023A90 */ jal func_8008EA40 /* 0A174 8083C384 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0A178 8083C388 920D015B */ lbu $t5, 0x015B($s0) ## 0000015B /* 0A17C 8083C38C 3C068085 */ lui $a2, %hi(D_80853AF4) ## $a2 = 80850000 -/* 0A180 8083C390 000D7080 */ sll $t6, $t5, 2 -/* 0A184 8083C394 00CE3021 */ addu $a2, $a2, $t6 -/* 0A188 8083C398 10000002 */ beq $zero, $zero, .L8083C3A4 -/* 0A18C 8083C39C 8CC63AF4 */ lw $a2, %lo(D_80853AF4)($a2) +/* 0A180 8083C390 000D7080 */ sll $t6, $t5, 2 +/* 0A184 8083C394 00CE3021 */ addu $a2, $a2, $t6 +/* 0A188 8083C398 10000002 */ beq $zero, $zero, .L8083C3A4 +/* 0A18C 8083C39C 8CC63AF4 */ lw $a2, %lo(D_80853AF4)($a2) .L8083C3A0: /* 0A190 8083C3A0 24C62400 */ addiu $a2, $a2, 0x2400 ## $a2 = 80852400 .L8083C3A4: /* 0A194 8083C3A4 8E0F01BC */ lw $t7, 0x01BC($s0) ## 000001BC /* 0A198 8083C3A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A19C 8083C3AC 50CF0014 */ beql $a2, $t7, .L8083C400 +/* 0A19C 8083C3AC 50CF0014 */ beql $a2, $t7, .L8083C400 /* 0A1A0 8083C3B0 00C02025 */ or $a0, $a2, $zero ## $a0 = 80852400 -/* 0A1A4 8083C3B4 0C023A71 */ jal func_8008E9C4 -/* 0A1A8 8083C3B8 AFA60034 */ sw $a2, 0x0034($sp) -/* 0A1AC 8083C3BC 10400005 */ beq $v0, $zero, .L8083C3D4 -/* 0A1B0 8083C3C0 8FA60034 */ lw $a2, 0x0034($sp) +/* 0A1A4 8083C3B4 0C023A71 */ jal func_8008E9C4 +/* 0A1A8 8083C3B8 AFA60034 */ sw $a2, 0x0034($sp) +/* 0A1AC 8083C3BC 10400005 */ beq $v0, $zero, .L8083C3D4 +/* 0A1B0 8083C3C0 8FA60034 */ lw $a2, 0x0034($sp) /* 0A1B4 8083C3C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0A1B8 8083C3C8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0A1BC 8083C3CC 10000007 */ beq $zero, $zero, .L8083C3EC +/* 0A1BC 8083C3CC 10000007 */ beq $zero, $zero, .L8083C3EC /* 0A1C0 8083C3D0 E604086C */ swc1 $f4, 0x086C($s0) ## 0000086C .L8083C3D4: /* 0A1C4 8083C3D4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 0A1C8 8083C3D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0A1CC 8083C3DC E606086C */ swc1 $f6, 0x086C($s0) ## 0000086C -/* 0A1D0 8083C3E0 0C20CF0F */ jal func_80833C3C -/* 0A1D4 8083C3E4 AFA60034 */ sw $a2, 0x0034($sp) -/* 0A1D8 8083C3E8 8FA60034 */ lw $a2, 0x0034($sp) +/* 0A1D0 8083C3E0 0C20CF0F */ jal func_80833C3C +/* 0A1D4 8083C3E4 AFA60034 */ sw $a2, 0x0034($sp) +/* 0A1D8 8083C3E8 8FA60034 */ lw $a2, 0x0034($sp) .L8083C3EC: /* 0A1DC 8083C3EC A60006C0 */ sh $zero, 0x06C0($s0) ## 000006C0 /* 0A1E0 8083C3F0 860206C0 */ lh $v0, 0x06C0($s0) ## 000006C0 @@ -90,41 +90,41 @@ glabel func_8083C2B0 /* 0A1EC 8083C3FC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 .L8083C400: /* 0A1F0 8083C400 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0A1F4 8083C404 AFA60034 */ sw $a2, 0x0034($sp) + +/* 0A1F4 8083C404 AFA60034 */ sw $a2, 0x0034($sp) /* 0A1F8 8083C408 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 0A1FC 8083C40C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0A200 8083C410 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0A204 8083C414 46804020 */ cvt.s.w $f0, $f8 -/* 0A208 8083C418 8FA60034 */ lw $a2, 0x0034($sp) -/* 0A20C 8083C41C AFB80018 */ sw $t8, 0x0018($sp) -/* 0A210 8083C420 8FA4003C */ lw $a0, 0x003C($sp) +/* 0A204 8083C414 46804020 */ cvt.s.w $f0, $f8 +/* 0A208 8083C418 8FA60034 */ lw $a2, 0x0034($sp) +/* 0A20C 8083C41C AFB80018 */ sw $t8, 0x0018($sp) +/* 0A210 8083C420 8FA4003C */ lw $a0, 0x003C($sp) /* 0A214 8083C424 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 0A218 8083C428 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0A21C 8083C42C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0A220 8083C430 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0A224 8083C434 0C028FC2 */ jal func_800A3F08 -/* 0A228 8083C438 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 0A22C 8083C43C 0C023A74 */ jal func_8008E9D0 +/* 0A21C 8083C42C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0A220 8083C430 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 0A224 8083C434 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 0A228 8083C438 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 0A22C 8083C43C 0C023A74 */ jal func_8008E9D0 /* 0A230 8083C440 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A234 8083C444 10400004 */ beq $v0, $zero, .L8083C458 -/* 0A238 8083C448 8FA4003C */ lw $a0, 0x003C($sp) +/* 0A234 8083C444 10400004 */ beq $v0, $zero, .L8083C458 +/* 0A238 8083C448 8FA4003C */ lw $a0, 0x003C($sp) /* 0A23C 8083C44C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A240 8083C450 0C20CBD5 */ jal func_80832F54 +/* 0A240 8083C450 0C20CBD5 */ jal func_80832F54 /* 0A244 8083C454 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L8083C458: /* 0A248 8083C458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A24C 8083C45C 0C00BDF7 */ jal func_8002F7DC +/* 0A24C 8083C45C 0C00BDF7 */ jal func_8002F7DC /* 0A250 8083C460 2405181F */ addiu $a1, $zero, 0x181F ## $a1 = 0000181F .L8083C464: -/* 0A254 8083C464 10000002 */ beq $zero, $zero, .L8083C470 +/* 0A254 8083C464 10000002 */ beq $zero, $zero, .L8083C470 /* 0A258 8083C468 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 0A25C 8083C46C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8083C470: -/* 0A260 8083C470 8FBF002C */ lw $ra, 0x002C($sp) -/* 0A264 8083C474 8FB00028 */ lw $s0, 0x0028($sp) +/* 0A260 8083C470 8FBF002C */ lw $ra, 0x002C($sp) +/* 0A264 8083C474 8FB00028 */ lw $s0, 0x0028($sp) /* 0A268 8083C478 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0A26C 8083C47C 03E00008 */ jr $ra +/* 0A26C 8083C47C 03E00008 */ jr $ra /* 0A270 8083C480 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s index 5bf0b0232..4a3a0a0ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s @@ -1,47 +1,47 @@ glabel func_8083CBF0 /* 0A9E0 8083CBF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0A9E4 8083CBF4 AFA40028 */ sw $a0, 0x0028($sp) -/* 0A9E8 8083CBF8 AFA60030 */ sw $a2, 0x0030($sp) +/* 0A9E4 8083CBF4 AFA40028 */ sw $a0, 0x0028($sp) +/* 0A9E8 8083CBF8 AFA60030 */ sw $a2, 0x0030($sp) /* 0A9EC 8083CBFC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0A9F0 8083CC00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0A9F4 8083CC04 AFA5002C */ sw $a1, 0x002C($sp) +/* 0A9F0 8083CC00 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0A9F4 8083CC04 AFA5002C */ sw $a1, 0x002C($sp) /* 0A9F8 8083CC08 3C068084 */ lui $a2, %hi(func_808423EC) ## $a2 = 80840000 /* 0A9FC 8083CC0C 24C623EC */ addiu $a2, $a2, %lo(func_808423EC) ## $a2 = 808423EC -/* 0AA00 8083CC10 8FA50028 */ lw $a1, 0x0028($sp) -/* 0AA04 8083CC14 0C20D716 */ jal func_80835C58 +/* 0AA00 8083CC10 8FA50028 */ lw $a1, 0x0028($sp) +/* 0AA04 8083CC14 0C20D716 */ jal func_80835C58 /* 0AA08 8083CC18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0AA0C 8083CC1C 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 /* 0AA10 8083CC20 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0AA14 8083CC24 248424F8 */ addiu $a0, $a0, 0x24F8 ## $a0 = 040024F8 /* 0AA18 8083CC28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0AA1C 8083CC2C 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 0AA20 8083CC30 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 0AA24 8083CC34 46803220 */ cvt.s.w $f8, $f6 -/* 0AA28 8083CC38 8FA50028 */ lw $a1, 0x0028($sp) +/* 0AA24 8083CC34 46803220 */ cvt.s.w $f8, $f6 +/* 0AA28 8083CC38 8FA50028 */ lw $a1, 0x0028($sp) /* 0AA2C 8083CC3C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0AA30 8083CC40 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 0AA34 8083CC44 3C07400C */ lui $a3, 0x400C ## $a3 = 400C0000 /* 0AA38 8083CC48 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0AA3C 8083CC4C AFAE0018 */ sw $t6, 0x0018($sp) +/* 0AA3C 8083CC4C AFAE0018 */ sw $t6, 0x0018($sp) /* 0AA40 8083CC50 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 400CCCCD /* 0AA44 8083CC54 24C624F8 */ addiu $a2, $a2, 0x24F8 ## $a2 = 040024F8 -/* 0AA48 8083CC58 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 0AA4C 8083CC5C 8FA40030 */ lw $a0, 0x0030($sp) -/* 0AA50 8083CC60 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 0AA48 8083CC58 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 0AA4C 8083CC5C 8FA40030 */ lw $a0, 0x0030($sp) +/* 0AA50 8083CC60 E7AA001C */ swc1 $f10, 0x001C($sp) /* 0AA54 8083CC64 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0AA58 8083CC68 0C028FC2 */ jal func_800A3F08 -/* 0AA5C 8083CC6C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 0AA58 8083CC68 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 0AA5C 8083CC6C E7A40010 */ swc1 $f4, 0x0010($sp) /* 0AA60 8083CC70 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 0AA64 8083CC74 44818000 */ mtc1 $at, $f16 ## $f16 = 8.00 -/* 0AA68 8083CC78 8FAF0028 */ lw $t7, 0x0028($sp) +/* 0AA68 8083CC78 8FAF0028 */ lw $t7, 0x0028($sp) /* 0AA6C 8083CC7C E5F00838 */ swc1 $f16, 0x0838($t7) ## 00000838 -/* 0AA70 8083CC80 8FB90028 */ lw $t9, 0x0028($sp) -/* 0AA74 8083CC84 87B8002E */ lh $t8, 0x002E($sp) +/* 0AA70 8083CC80 8FB90028 */ lw $t9, 0x0028($sp) +/* 0AA74 8083CC84 87B8002E */ lh $t8, 0x002E($sp) /* 0AA78 8083CC88 A738083C */ sh $t8, 0x083C($t9) ## 0000083C -/* 0AA7C 8083CC8C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0AA7C 8083CC8C 8FBF0024 */ lw $ra, 0x0024($sp) /* 0AA80 8083CC90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0AA84 8083CC94 03E00008 */ jr $ra +/* 0AA84 8083CC94 03E00008 */ jr $ra /* 0AA88 8083CC98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s index db7b9fb64..ab1035fe3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s @@ -1,49 +1,49 @@ glabel func_8083CD54 /* 0AB44 8083CD54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0AB48 8083CD58 AFA60038 */ sw $a2, 0x0038($sp) -/* 0AB4C 8083CD5C 87AE003A */ lh $t6, 0x003A($sp) -/* 0AB50 8083CD60 AFBF002C */ sw $ra, 0x002C($sp) -/* 0AB54 8083CD64 AFB00028 */ sw $s0, 0x0028($sp) -/* 0AB58 8083CD68 AFA40030 */ sw $a0, 0x0030($sp) +/* 0AB48 8083CD58 AFA60038 */ sw $a2, 0x0038($sp) +/* 0AB4C 8083CD5C 87AE003A */ lh $t6, 0x003A($sp) +/* 0AB50 8083CD60 AFBF002C */ sw $ra, 0x002C($sp) +/* 0AB54 8083CD64 AFB00028 */ sw $s0, 0x0028($sp) +/* 0AB58 8083CD68 AFA40030 */ sw $a0, 0x0030($sp) /* 0AB5C 8083CD6C 3C068084 */ lui $a2, %hi(func_80841BA8) ## $a2 = 80840000 /* 0AB60 8083CD70 A4AE083C */ sh $t6, 0x083C($a1) ## 0000083C /* 0AB64 8083CD74 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0AB68 8083CD78 8FA40030 */ lw $a0, 0x0030($sp) +/* 0AB68 8083CD78 8FA40030 */ lw $a0, 0x0030($sp) /* 0AB6C 8083CD7C 24C61BA8 */ addiu $a2, $a2, %lo(func_80841BA8) ## $a2 = 80841BA8 -/* 0AB70 8083CD80 0C20D716 */ jal func_80835C58 +/* 0AB70 8083CD80 0C20D716 */ jal func_80835C58 /* 0AB74 8083CD84 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0AB78 8083CD88 240F04B0 */ addiu $t7, $zero, 0x04B0 ## $t7 = 000004B0 /* 0AB7C 8083CD8C A60F087E */ sh $t7, 0x087E($s0) ## 0000087E /* 0AB80 8083CD90 8618087E */ lh $t8, 0x087E($s0) ## 0000087E /* 0AB84 8083CD94 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 0AB88 8083CD98 C42835E8 */ lwc1 $f8, %lo(D_808535E8)($at) +/* 0AB88 8083CD98 C42835E8 */ lwc1 $f8, %lo(D_808535E8)($at) /* 0AB8C 8083CD9C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 0AB90 8083CDA0 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B /* 0AB94 8083CDA4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0AB98 8083CDA8 468021A0 */ cvt.s.w $f6, $f4 +/* 0AB98 8083CDA8 468021A0 */ cvt.s.w $f6, $f4 /* 0AB9C 8083CDAC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 0ABA0 8083CDB0 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 /* 0ABA4 8083CDB4 3C068085 */ lui $a2, %hi(D_80853B84) ## $a2 = 80850000 -/* 0ABA8 8083CDB8 00095080 */ sll $t2, $t1, 2 -/* 0ABAC 8083CDBC 00CA3021 */ addu $a2, $a2, $t2 -/* 0ABB0 8083CDC0 46083282 */ mul.s $f10, $f6, $f8 +/* 0ABA8 8083CDB8 00095080 */ sll $t2, $t1, 2 +/* 0ABAC 8083CDBC 00CA3021 */ addu $a2, $a2, $t2 +/* 0ABB0 8083CDC0 46083282 */ mul.s $f10, $f6, $f8 /* 0ABB4 8083CDC4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 0ABB8 8083CDC8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0ABBC 8083CDCC 4600540D */ trunc.w.s $f16, $f10 -/* 0ABC0 8083CDD0 44088000 */ mfc1 $t0, $f16 +/* 0ABBC 8083CDCC 4600540D */ trunc.w.s $f16, $f10 +/* 0ABC0 8083CDD0 44088000 */ mfc1 $t0, $f16 /* 0ABC4 8083CDD4 00000000 */ nop /* 0ABC8 8083CDD8 A608087E */ sh $t0, 0x087E($s0) ## 0000087E -/* 0ABCC 8083CDDC AFA00018 */ sw $zero, 0x0018($sp) -/* 0ABD0 8083CDE0 8CC63B84 */ lw $a2, %lo(D_80853B84)($a2) -/* 0ABD4 8083CDE4 8FA40030 */ lw $a0, 0x0030($sp) -/* 0ABD8 8083CDE8 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0ABDC 8083CDEC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0ABE0 8083CDF0 0C028FC2 */ jal func_800A3F08 -/* 0ABE4 8083CDF4 E7B2001C */ swc1 $f18, 0x001C($sp) -/* 0ABE8 8083CDF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0ABEC 8083CDFC 8FB00028 */ lw $s0, 0x0028($sp) +/* 0ABCC 8083CDDC AFA00018 */ sw $zero, 0x0018($sp) +/* 0ABD0 8083CDE0 8CC63B84 */ lw $a2, %lo(D_80853B84)($a2) +/* 0ABD4 8083CDE4 8FA40030 */ lw $a0, 0x0030($sp) +/* 0ABD8 8083CDE8 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 0ABDC 8083CDEC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0ABE0 8083CDF0 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 0ABE4 8083CDF4 E7B2001C */ swc1 $f18, 0x001C($sp) +/* 0ABE8 8083CDF8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0ABEC 8083CDFC 8FB00028 */ lw $s0, 0x0028($sp) /* 0ABF0 8083CE00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0ABF4 8083CE04 03E00008 */ jr $ra +/* 0ABF4 8083CE04 03E00008 */ jr $ra /* 0ABF8 8083CE08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s index 209048dd2..668e7d160 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s @@ -1,121 +1,121 @@ glabel func_8083F570 /* 0D360 8083F570 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0D364 8083F574 AFBF002C */ sw $ra, 0x002C($sp) -/* 0D368 8083F578 AFB10028 */ sw $s1, 0x0028($sp) -/* 0D36C 8083F57C AFB00024 */ sw $s0, 0x0024($sp) +/* 0D364 8083F574 AFBF002C */ sw $ra, 0x002C($sp) +/* 0D368 8083F578 AFB10028 */ sw $s1, 0x0028($sp) +/* 0D36C 8083F57C AFB00024 */ sw $s0, 0x0024($sp) /* 0D370 8083F580 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 0D374 8083F584 C4800838 */ lwc1 $f0, 0x0838($a0) ## 00000838 /* 0D378 8083F588 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0D37C 8083F58C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0D380 8083F590 46001032 */ c.eq.s $f2, $f0 +/* 0D380 8083F590 46001032 */ c.eq.s $f2, $f0 /* 0D384 8083F594 00000000 */ nop -/* 0D388 8083F598 4503005F */ bc1tl .L8083F718 +/* 0D388 8083F598 4503005F */ bc1tl .L8083F718 /* 0D38C 8083F59C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0D390 8083F5A0 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 /* 0D394 8083F5A4 3C188085 */ lui $t8, %hi(D_808535F0) ## $t8 = 80850000 /* 0D398 8083F5A8 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 0D39C 8083F5AC 51E0005A */ beql $t7, $zero, .L8083F718 +/* 0D39C 8083F5AC 51E0005A */ beql $t7, $zero, .L8083F718 /* 0D3A0 8083F5B0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D3A4 8083F5B4 8F1835F0 */ lw $t8, %lo(D_808535F0)($t8) +/* 0D3A4 8083F5B4 8F1835F0 */ lw $t8, %lo(D_808535F0)($t8) /* 0D3A8 8083F5B8 33190030 */ andi $t9, $t8, 0x0030 ## $t9 = 00000000 -/* 0D3AC 8083F5BC 53200056 */ beql $t9, $zero, .L8083F718 +/* 0D3AC 8083F5BC 53200056 */ beql $t9, $zero, .L8083F718 /* 0D3B0 8083F5C0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0D3B4 8083F5C4 848800B6 */ lh $t0, 0x00B6($a0) ## 000000B6 /* 0D3B8 8083F5C8 8489007E */ lh $t1, 0x007E($a0) ## 0000007E -/* 0D3BC 8083F5CC 4602003C */ c.lt.s $f0, $f2 +/* 0D3BC 8083F5CC 4602003C */ c.lt.s $f0, $f2 /* 0D3C0 8083F5D0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0D3C4 8083F5D4 01091023 */ subu $v0, $t0, $t1 -/* 0D3C8 8083F5D8 00021400 */ sll $v0, $v0, 16 -/* 0D3CC 8083F5DC 45000004 */ bc1f .L8083F5F0 -/* 0D3D0 8083F5E0 00021403 */ sra $v0, $v0, 16 -/* 0D3D4 8083F5E4 00411021 */ addu $v0, $v0, $at -/* 0D3D8 8083F5E8 00021400 */ sll $v0, $v0, 16 -/* 0D3DC 8083F5EC 00021403 */ sra $v0, $v0, 16 +/* 0D3C4 8083F5D4 01091023 */ subu $v0, $t0, $t1 +/* 0D3C8 8083F5D8 00021400 */ sll $v0, $v0, 16 +/* 0D3CC 8083F5DC 45000004 */ bc1f .L8083F5F0 +/* 0D3D0 8083F5E0 00021403 */ sra $v0, $v0, 16 +/* 0D3D4 8083F5E4 00411021 */ addu $v0, $v0, $at +/* 0D3D8 8083F5E8 00021400 */ sll $v0, $v0, 16 +/* 0D3DC 8083F5EC 00021403 */ sra $v0, $v0, 16 .L8083F5F0: -/* 0D3E0 8083F5F0 04400003 */ bltz $v0, .L8083F600 -/* 0D3E4 8083F5F4 00021823 */ subu $v1, $zero, $v0 -/* 0D3E8 8083F5F8 10000001 */ beq $zero, $zero, .L8083F600 +/* 0D3E0 8083F5F0 04400003 */ bltz $v0, .L8083F600 +/* 0D3E4 8083F5F4 00021823 */ subu $v1, $zero, $v0 +/* 0D3E8 8083F5F8 10000001 */ beq $zero, $zero, .L8083F600 /* 0D3EC 8083F5FC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L8083F600: -/* 0D3F0 8083F600 28614001 */ slti $at, $v1, 0x4001 -/* 0D3F4 8083F604 14200043 */ bne $at, $zero, .L8083F714 +/* 0D3F0 8083F600 28614001 */ slti $at, $v1, 0x4001 +/* 0D3F4 8083F604 14200043 */ bne $at, $zero, .L8083F714 /* 0D3F8 8083F608 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D3FC 8083F60C 3C068085 */ lui $a2, %hi(func_8084C81C) ## $a2 = 80850000 /* 0D400 8083F610 24C6C81C */ addiu $a2, $a2, %lo(func_8084C81C) ## $a2 = 8084C81C /* 0D404 8083F614 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D408 8083F618 0C20D716 */ jal func_80835C58 +/* 0D408 8083F618 0C20D716 */ jal func_80835C58 /* 0D40C 8083F61C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0D410 8083F620 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 0D414 8083F624 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 /* 0D418 8083F628 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 0D41C 8083F62C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D420 8083F630 4604103C */ c.lt.s $f2, $f4 +/* 0D420 8083F630 4604103C */ c.lt.s $f2, $f4 /* 0D424 8083F634 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 0D428 8083F638 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 0D42C 8083F63C 45020014 */ bc1fl .L8083F690 +/* 0D42C 8083F63C 45020014 */ bc1fl .L8083F690 /* 0D430 8083F640 860C007E */ lh $t4, 0x007E($s0) ## 0000007E /* 0D434 8083F644 860A007E */ lh $t2, 0x007E($s0) ## 0000007E /* 0D438 8083F648 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D43C 8083F64C 24C62700 */ addiu $a2, $a2, 0x2700 ## $a2 = 04002700 -/* 0D440 8083F650 01415821 */ addu $t3, $t2, $at -/* 0D444 8083F654 0C20C899 */ jal func_80832264 +/* 0D440 8083F650 01415821 */ addu $t3, $t2, $at +/* 0D444 8083F654 0C20C899 */ jal func_80832264 /* 0D448 8083F658 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 /* 0D44C 8083F65C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D450 8083F660 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D454 8083F664 0C20CBD5 */ jal func_80832F54 +/* 0D454 8083F664 0C20CBD5 */ jal func_80832F54 /* 0D458 8083F668 2406009D */ addiu $a2, $zero, 0x009D ## $a2 = 0000009D /* 0D45C 8083F66C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D460 8083F670 24052581 */ addiu $a1, $zero, 0x2581 ## $a1 = 00002581 /* 0D464 8083F674 240603E7 */ addiu $a2, $zero, 0x03E7 ## $a2 = 000003E7 /* 0D468 8083F678 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0D46C 8083F67C 0C02003E */ jal func_800800F8 -/* 0D470 8083F680 AFA00010 */ sw $zero, 0x0010($sp) -/* 0D474 8083F684 1000001E */ beq $zero, $zero, .L8083F700 +/* 0D46C 8083F67C 0C02003E */ jal func_800800F8 +/* 0D470 8083F680 AFA00010 */ sw $zero, 0x0010($sp) +/* 0D474 8083F684 1000001E */ beq $zero, $zero, .L8083F700 /* 0D478 8083F688 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 /* 0D47C 8083F68C 860C007E */ lh $t4, 0x007E($s0) ## 0000007E .L8083F690: /* 0D480 8083F690 24842708 */ addiu $a0, $a0, 0x2708 ## $a0 = 00002708 /* 0D484 8083F694 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0D488 8083F698 A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 /* 0D48C 8083F69C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0D490 8083F6A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 0D494 8083F6A4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0D498 8083F6A8 46803220 */ cvt.s.w $f8, $f6 +/* 0D498 8083F6A8 46803220 */ cvt.s.w $f8, $f6 /* 0D49C 8083F6AC 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 0D4A0 8083F6B0 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0D4A0 8083F6B0 AFAD0018 */ sw $t5, 0x0018($sp) /* 0D4A4 8083F6B4 24C62708 */ addiu $a2, $a2, 0x2708 ## $a2 = 04002708 /* 0D4A8 8083F6B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D4AC 8083F6BC 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0D4B0 8083F6C0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0D4B0 8083F6C0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0D4B4 8083F6C4 3C07BF80 */ lui $a3, 0xBF80 ## $a3 = BF800000 -/* 0D4B8 8083F6C8 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 0D4BC 8083F6CC 0C028FC2 */ jal func_800A3F08 -/* 0D4C0 8083F6D0 E7A2001C */ swc1 $f2, 0x001C($sp) +/* 0D4B8 8083F6C8 E7A20014 */ swc1 $f2, 0x0014($sp) +/* 0D4BC 8083F6CC 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 0D4C0 8083F6D0 E7A2001C */ swc1 $f2, 0x001C($sp) /* 0D4C4 8083F6D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D4C8 8083F6D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D4CC 8083F6DC 0C20CBD5 */ jal func_80832F54 +/* 0D4CC 8083F6DC 0C20CBD5 */ jal func_80832F54 /* 0D4D0 8083F6E0 2406009D */ addiu $a2, $zero, 0x009D ## $a2 = 0000009D /* 0D4D4 8083F6E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D4D8 8083F6E8 24052582 */ addiu $a1, $zero, 0x2582 ## $a1 = 00002582 /* 0D4DC 8083F6EC 240603E7 */ addiu $a2, $zero, 0x03E7 ## $a2 = 000003E7 /* 0D4E0 8083F6F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0D4E4 8083F6F4 0C02003E */ jal func_800800F8 -/* 0D4E8 8083F6F8 AFA00010 */ sw $zero, 0x0010($sp) +/* 0D4E4 8083F6F4 0C02003E */ jal func_800800F8 +/* 0D4E8 8083F6F8 AFA00010 */ sw $zero, 0x0010($sp) /* 0D4EC 8083F6FC 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 .L8083F700: /* 0D4F0 8083F700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D4F4 8083F704 0C20C884 */ jal func_80832210 +/* 0D4F4 8083F704 0C20C884 */ jal func_80832210 /* 0D4F8 8083F708 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 0D4FC 8083F70C 10000002 */ beq $zero, $zero, .L8083F718 +/* 0D4FC 8083F70C 10000002 */ beq $zero, $zero, .L8083F718 /* 0D500 8083F710 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083F714: /* 0D504 8083F714 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8083F718: -/* 0D508 8083F718 8FBF002C */ lw $ra, 0x002C($sp) -/* 0D50C 8083F71C 8FB00024 */ lw $s0, 0x0024($sp) -/* 0D510 8083F720 8FB10028 */ lw $s1, 0x0028($sp) -/* 0D514 8083F724 03E00008 */ jr $ra +/* 0D508 8083F718 8FBF002C */ lw $ra, 0x002C($sp) +/* 0D50C 8083F71C 8FB00024 */ lw $s0, 0x0024($sp) +/* 0D510 8083F720 8FB10028 */ lw $s1, 0x0028($sp) +/* 0D514 8083F724 03E00008 */ jr $ra /* 0D518 8083F728 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s index 600aea03c..65eac8052 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s @@ -1,32 +1,32 @@ glabel func_808409CC /* 0E7BC 808409CC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0E7C0 808409D0 AFBF002C */ sw $ra, 0x002C($sp) -/* 0E7C4 808409D4 AFB00028 */ sw $s0, 0x0028($sp) -/* 0E7C8 808409D8 AFA40048 */ sw $a0, 0x0048($sp) +/* 0E7C0 808409D0 AFBF002C */ sw $ra, 0x002C($sp) +/* 0E7C4 808409D4 AFB00028 */ sw $s0, 0x0028($sp) +/* 0E7C8 808409D8 AFA40048 */ sw $a0, 0x0048($sp) /* 0E7CC 808409DC 8CAE0664 */ lw $t6, 0x0664($a1) ## 00000664 /* 0E7D0 808409E0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0E7D4 808409E4 55C0000D */ bnel $t6, $zero, .L80840A1C +/* 0E7D4 808409E4 55C0000D */ bnel $t6, $zero, .L80840A1C /* 0E7D8 808409E8 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 /* 0E7DC 808409EC 0C01E72D */ jal Health_IsCritical /* 0E7E0 808409F0 00000000 */ nop -/* 0E7E4 808409F4 54400012 */ bnel $v0, $zero, .L80840A40 +/* 0E7E4 808409F4 54400012 */ bnel $v0, $zero, .L80840A40 /* 0E7E8 808409F8 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 /* 0E7EC 808409FC 820306AC */ lb $v1, 0x06AC($s0) ## 000006AC /* 0E7F0 80840A00 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 /* 0E7F4 80840A04 30630001 */ andi $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 0E7F8 80840A08 00031E00 */ sll $v1, $v1, 24 -/* 0E7FC 80840A0C 00031E03 */ sra $v1, $v1, 24 -/* 0E800 80840A10 1060000A */ beq $v1, $zero, .L80840A3C +/* 0E7F8 80840A08 00031E00 */ sll $v1, $v1, 24 +/* 0E7FC 80840A0C 00031E03 */ sra $v1, $v1, 24 +/* 0E800 80840A10 1060000A */ beq $v1, $zero, .L80840A3C /* 0E804 80840A14 A20306AC */ sb $v1, 0x06AC($s0) ## 000006AC /* 0E808 80840A18 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 .L80840A1C: /* 0E80C 80840A1C 3C01EFFF */ lui $at, 0xEFFF ## $at = EFFF0000 /* 0E810 80840A20 3421FFFF */ ori $at, $at, 0xFFFF ## $at = EFFFFFFF -/* 0E814 80840A24 01E1C024 */ and $t8, $t7, $at +/* 0E814 80840A24 01E1C024 */ and $t8, $t7, $at /* 0E818 80840A28 AE180680 */ sw $t8, 0x0680($s0) ## 00000680 -/* 0E81C 80840A2C 0C20CCCE */ jal func_80833338 +/* 0E81C 80840A2C 0C20CCCE */ jal func_80833338 /* 0E820 80840A30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E824 80840A34 10000048 */ beq $zero, $zero, .L80840B58 +/* 0E824 80840A34 10000048 */ beq $zero, $zero, .L80840B58 /* 0E828 80840A38 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 .L80840A3C: /* 0E82C 80840A3C 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 @@ -35,66 +35,66 @@ glabel func_808409CC /* 0E834 80840A44 3C011000 */ lui $at, 0x1000 ## $at = 10000000 /* 0E838 80840A48 03214025 */ or $t0, $t9, $at ## $t0 = 10000000 /* 0E83C 80840A4C 312A0800 */ andi $t2, $t1, 0x0800 ## $t2 = 00000000 -/* 0E840 80840A50 11400005 */ beq $t2, $zero, .L80840A68 +/* 0E840 80840A50 11400005 */ beq $t2, $zero, .L80840A68 /* 0E844 80840A54 AE080680 */ sw $t0, 0x0680($s0) ## 00000680 -/* 0E848 80840A58 0C20CCCE */ jal func_80833338 +/* 0E848 80840A58 0C20CCCE */ jal func_80833338 /* 0E84C 80840A5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E850 80840A60 1000003D */ beq $zero, $zero, .L80840B58 +/* 0E850 80840A60 1000003D */ beq $zero, $zero, .L80840B58 /* 0E854 80840A64 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 .L80840A68: -/* 0E858 80840A68 8FAB0048 */ lw $t3, 0x0048($sp) +/* 0E858 80840A68 8FAB0048 */ lw $t3, 0x0048($sp) /* 0E85C 80840A6C 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 0E860 80840A70 00AB2821 */ addu $a1, $a1, $t3 -/* 0E864 80840A74 1040000A */ beq $v0, $zero, .L80840AA0 +/* 0E860 80840A70 00AB2821 */ addu $a1, $a1, $t3 +/* 0E864 80840A74 1040000A */ beq $v0, $zero, .L80840AA0 /* 0E868 80840A78 90A51CBE */ lbu $a1, 0x1CBE($a1) ## 00011CBE /* 0E86C 80840A7C 820C06AC */ lb $t4, 0x06AC($s0) ## 000006AC /* 0E870 80840A80 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 0E874 80840A84 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 0E878 80840A88 05800003 */ bltz $t4, .L80840A98 +/* 0E878 80840A88 05800003 */ bltz $t4, .L80840A98 /* 0E87C 80840A8C 00000000 */ nop -/* 0E880 80840A90 10000027 */ beq $zero, $zero, .L80840B30 +/* 0E880 80840A90 10000027 */ beq $zero, $zero, .L80840B30 /* 0E884 80840A94 A20D06AC */ sb $t5, 0x06AC($s0) ## 000006AC .L80840A98: -/* 0E888 80840A98 10000025 */ beq $zero, $zero, .L80840B30 +/* 0E888 80840A98 10000025 */ beq $zero, $zero, .L80840B30 /* 0E88C 80840A9C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 .L80840AA0: /* 0E890 80840AA0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 0E894 80840AA4 AFA50038 */ sw $a1, 0x0038($sp) +/* 0E894 80840AA4 AFA50038 */ sw $a1, 0x0038($sp) /* 0E898 80840AA8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0E89C 80840AAC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0E8A0 80840AB0 8FA50038 */ lw $a1, 0x0038($sp) -/* 0E8A4 80840AB4 46040182 */ mul.s $f6, $f0, $f4 -/* 0E8A8 80840AB8 4600320D */ trunc.w.s $f8, $f6 -/* 0E8AC 80840ABC 44024000 */ mfc1 $v0, $f8 +/* 0E8A0 80840AB0 8FA50038 */ lw $a1, 0x0038($sp) +/* 0E8A4 80840AB4 46040182 */ mul.s $f6, $f0, $f4 +/* 0E8A8 80840AB8 4600320D */ trunc.w.s $f8, $f6 +/* 0E8AC 80840ABC 44024000 */ mfc1 $v0, $f8 /* 0E8B0 80840AC0 00000000 */ nop -/* 0E8B4 80840AC4 28410004 */ slti $at, $v0, 0x0004 -/* 0E8B8 80840AC8 10200019 */ beq $at, $zero, .L80840B30 +/* 0E8B4 80840AC4 28410004 */ slti $at, $v0, 0x0004 +/* 0E8B8 80840AC8 10200019 */ beq $at, $zero, .L80840B30 /* 0E8BC 80840ACC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 0E8C0 80840AD0 10400003 */ beq $v0, $zero, .L80840AE0 +/* 0E8C0 80840AD0 10400003 */ beq $v0, $zero, .L80840AE0 /* 0E8C4 80840AD4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0E8C8 80840AD8 1441000D */ bne $v0, $at, .L80840B10 +/* 0E8C8 80840AD8 1441000D */ bne $v0, $at, .L80840B10 /* 0E8CC 80840ADC 00000000 */ nop .L80840AE0: /* 0E8D0 80840AE0 920F015D */ lbu $t7, 0x015D($s0) ## 0000015D /* 0E8D4 80840AE4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0E8D8 80840AE8 15E10011 */ bne $t7, $at, .L80840B30 +/* 0E8D8 80840AE8 15E10011 */ bne $t7, $at, .L80840B30 /* 0E8DC 80840AEC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0E8E0 80840AF0 10410007 */ beq $v0, $at, .L80840B10 +/* 0E8E0 80840AF0 10410007 */ beq $v0, $at, .L80840B10 /* 0E8E4 80840AF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E8E8 80840AF8 AFA30034 */ sw $v1, 0x0034($sp) -/* 0E8EC 80840AFC 0C023C60 */ jal func_8008F180 -/* 0E8F0 80840B00 AFA50038 */ sw $a1, 0x0038($sp) -/* 0E8F4 80840B04 8FA30034 */ lw $v1, 0x0034($sp) -/* 0E8F8 80840B08 10400009 */ beq $v0, $zero, .L80840B30 -/* 0E8FC 80840B0C 8FA50038 */ lw $a1, 0x0038($sp) +/* 0E8E8 80840AF8 AFA30034 */ sw $v1, 0x0034($sp) +/* 0E8EC 80840AFC 0C023C60 */ jal func_8008F180 +/* 0E8F0 80840B00 AFA50038 */ sw $a1, 0x0038($sp) +/* 0E8F4 80840B04 8FA30034 */ lw $v1, 0x0034($sp) +/* 0E8F8 80840B08 10400009 */ beq $v0, $zero, .L80840B30 +/* 0E8FC 80840B0C 8FA50038 */ lw $a1, 0x0038($sp) .L80840B10: -/* 0E900 80840B10 14600006 */ bne $v1, $zero, .L80840B2C +/* 0E900 80840B10 14600006 */ bne $v1, $zero, .L80840B2C /* 0E904 80840B14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E908 80840B18 0C023C68 */ jal func_8008F1A0 -/* 0E90C 80840B1C AFA30034 */ sw $v1, 0x0034($sp) -/* 0E910 80840B20 10400002 */ beq $v0, $zero, .L80840B2C -/* 0E914 80840B24 8FA30034 */ lw $v1, 0x0034($sp) +/* 0E908 80840B18 0C023C68 */ jal func_8008F1A0 +/* 0E90C 80840B1C AFA30034 */ sw $v1, 0x0034($sp) +/* 0E910 80840B20 10400002 */ beq $v0, $zero, .L80840B2C +/* 0E914 80840B24 8FA30034 */ lw $v1, 0x0034($sp) /* 0E918 80840B28 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 .L80840B2C: /* 0E91C 80840B2C 24650009 */ addiu $a1, $v1, 0x0009 ## $a1 = 0000000D @@ -102,10 +102,10 @@ glabel func_808409CC /* 0E920 80840B30 9208015B */ lbu $t0, 0x015B($s0) ## 0000015B /* 0E924 80840B34 3C198085 */ lui $t9, %hi(D_80853D7C) ## $t9 = 80850000 /* 0E928 80840B38 27393D7C */ addiu $t9, $t9, %lo(D_80853D7C) ## $t9 = 80853D7C -/* 0E92C 80840B3C 0005C0C0 */ sll $t8, $a1, 3 -/* 0E930 80840B40 03191821 */ addu $v1, $t8, $t9 +/* 0E92C 80840B3C 0005C0C0 */ sll $t8, $a1, 3 +/* 0E930 80840B40 03191821 */ addu $v1, $t8, $t9 /* 0E934 80840B44 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0E938 80840B48 11010002 */ beq $t0, $at, .L80840B54 +/* 0E938 80840B48 11010002 */ beq $t0, $at, .L80840B54 /* 0E93C 80840B4C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000004 /* 0E940 80840B50 24620004 */ addiu $v0, $v1, 0x0004 ## $v0 = 00000008 .L80840B54: @@ -113,32 +113,32 @@ glabel func_808409CC .L80840B58: /* 0E948 80840B58 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 0E94C 80840B5C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0E950 80840B60 AFA60044 */ sw $a2, 0x0044($sp) + +/* 0E950 80840B60 AFA60044 */ sw $a2, 0x0044($sp) /* 0E954 80840B64 3C018085 */ lui $at, %hi(D_8085540C) ## $at = 80850000 -/* 0E958 80840B68 C42A540C */ lwc1 $f10, %lo(D_8085540C)($at) +/* 0E958 80840B68 C42A540C */ lwc1 $f10, %lo(D_8085540C)($at) /* 0E95C 80840B6C 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 0E960 80840B70 C43035E8 */ lwc1 $f16, %lo(D_808535E8)($at) +/* 0E960 80840B70 C43035E8 */ lwc1 $f16, %lo(D_808535E8)($at) /* 0E964 80840B74 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0E968 80840B78 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 0E96C 80840B7C 46105482 */ mul.s $f18, $f10, $f16 +/* 0E96C 80840B7C 46105482 */ mul.s $f18, $f10, $f16 /* 0E970 80840B80 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 /* 0E974 80840B84 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0E978 80840B88 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 0E97C 80840B8C AFA90018 */ sw $t1, 0x0018($sp) -/* 0E980 80840B90 8FA60044 */ lw $a2, 0x0044($sp) -/* 0E984 80840B94 46803220 */ cvt.s.w $f8, $f6 -/* 0E988 80840B98 44079000 */ mfc1 $a3, $f18 -/* 0E98C 80840B9C 8FA40048 */ lw $a0, 0x0048($sp) +/* 0E97C 80840B8C AFA90018 */ sw $t1, 0x0018($sp) +/* 0E980 80840B90 8FA60044 */ lw $a2, 0x0044($sp) +/* 0E984 80840B94 46803220 */ cvt.s.w $f8, $f6 +/* 0E988 80840B98 44079000 */ mfc1 $a3, $f18 +/* 0E98C 80840B9C 8FA40048 */ lw $a0, 0x0048($sp) /* 0E990 80840BA0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0E994 80840BA4 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 0E998 80840BA8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0E99C 80840BAC 0C028FC2 */ jal func_800A3F08 -/* 0E9A0 80840BB0 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 0E9A4 80840BB4 8FBF002C */ lw $ra, 0x002C($sp) -/* 0E9A8 80840BB8 8FB00028 */ lw $s0, 0x0028($sp) +/* 0E994 80840BA4 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 0E998 80840BA8 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 0E99C 80840BAC 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 0E9A0 80840BB0 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 0E9A4 80840BB4 8FBF002C */ lw $ra, 0x002C($sp) +/* 0E9A8 80840BB8 8FB00028 */ lw $s0, 0x0028($sp) /* 0E9AC 80840BBC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0E9B0 80840BC0 03E00008 */ jr $ra +/* 0E9B0 80840BC0 03E00008 */ jr $ra /* 0E9B4 80840BC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s index 220fb321f..19a9cbe87 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s @@ -1,33 +1,33 @@ glabel func_80841BA8 /* 0F998 80841BA8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0F99C 80841BAC AFB0001C */ sw $s0, 0x001C($sp) +/* 0F99C 80841BAC AFB0001C */ sw $s0, 0x001C($sp) /* 0F9A0 80841BB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0F9A4 80841BB4 AFB10020 */ sw $s1, 0x0020($sp) +/* 0F9A4 80841BB4 AFB10020 */ sw $s1, 0x0020($sp) /* 0F9A8 80841BB8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0F9AC 80841BBC AFBF0024 */ sw $ra, 0x0024($sp) +/* 0F9AC 80841BBC AFBF0024 */ sw $ra, 0x0024($sp) /* 0F9B0 80841BC0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0F9B4 80841BC4 0C028EF0 */ jal func_800A3BC0 +/* 0F9B4 80841BC4 0C028EF0 */ jal func_800A3BC0 /* 0F9B8 80841BC8 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0F9BC 80841BCC 0C023C68 */ jal func_8008F1A0 +/* 0F9BC 80841BCC 0C023C68 */ jal func_8008F1A0 /* 0F9C0 80841BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F9C4 80841BD4 50400013 */ beql $v0, $zero, .L80841C24 +/* 0F9C4 80841BD4 50400013 */ beql $v0, $zero, .L80841C24 /* 0F9C8 80841BD8 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 -/* 0F9CC 80841BDC 0C20CCCE */ jal func_80833338 +/* 0F9CC 80841BDC 0C20CCCE */ jal func_80833338 /* 0F9D0 80841BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F9D4 80841BE4 8E0E01D8 */ lw $t6, 0x01D8($s0) ## 000001D8 /* 0F9D8 80841BE8 920701B4 */ lbu $a3, 0x01B4($s0) ## 000001B4 /* 0F9DC 80841BEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0F9E0 80841BF0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 0F9E4 80841BF4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0F9E8 80841BF8 0C028CDB */ jal func_800A336C -/* 0F9EC 80841BFC AFAE0010 */ sw $t6, 0x0010($sp) +/* 0F9E8 80841BF8 0C028CDB */ jal SkelAnime_LoadLinkAnimetion +/* 0F9EC 80841BFC AFAE0010 */ sw $t6, 0x0010($sp) /* 0F9F0 80841C00 3C0F8085 */ lui $t7, %hi(D_80853410) ## $t7 = 80850000 /* 0F9F4 80841C04 25EF3410 */ addiu $t7, $t7, %lo(D_80853410) ## $t7 = 80853410 /* 0F9F8 80841C08 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 0F9FC 80841C0C 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 /* 0FA00 80841C10 8E0701D8 */ lw $a3, 0x01D8($s0) ## 000001D8 -/* 0FA04 80841C14 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0FA08 80841C18 0C028D52 */ jal func_800A3548 +/* 0FA04 80841C14 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0FA08 80841C18 0C028D52 */ jal SkelAnime_LoadAnimationType3 /* 0FA0C 80841C1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0FA10 80841C20 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 .L80841C24: @@ -35,46 +35,46 @@ glabel func_80841BA8 /* 0FA18 80841C28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0FA1C 80841C2C 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC /* 0FA20 80841C30 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 0FA24 80841C34 0C20DC9A */ jal func_80837268 -/* 0FA28 80841C38 AFB10010 */ sw $s1, 0x0010($sp) +/* 0FA24 80841C34 0C20DC9A */ jal func_80837268 +/* 0FA28 80841C38 AFB10010 */ sw $s1, 0x0010($sp) /* 0FA2C 80841C3C 3C068085 */ lui $a2, %hi(D_80854414) ## $a2 = 80850000 /* 0FA30 80841C40 24C64414 */ addiu $a2, $a2, %lo(D_80854414) ## $a2 = 80854414 /* 0FA34 80841C44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0FA38 80841C48 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0FA3C 80841C4C 0C20DCD2 */ jal func_80837348 +/* 0FA3C 80841C4C 0C20DCD2 */ jal func_80837348 /* 0FA40 80841C50 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0FA44 80841C54 14400016 */ bne $v0, $zero, .L80841CB0 -/* 0FA48 80841C58 C7A40034 */ lwc1 $f4, 0x0034($sp) +/* 0FA44 80841C54 14400016 */ bne $v0, $zero, .L80841CB0 +/* 0FA48 80841C58 C7A40034 */ lwc1 $f4, 0x0034($sp) /* 0FA4C 80841C5C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0FA50 80841C60 87B80032 */ lh $t8, 0x0032($sp) +/* 0FA50 80841C60 87B80032 */ lh $t8, 0x0032($sp) /* 0FA54 80841C64 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0FA58 80841C68 46062032 */ c.eq.s $f4, $f6 -/* 0FA5C 80841C6C 87A50032 */ lh $a1, 0x0032($sp) -/* 0FA60 80841C70 45010007 */ bc1t .L80841C90 +/* 0FA58 80841C68 46062032 */ c.eq.s $f4, $f6 +/* 0FA5C 80841C6C 87A50032 */ lh $a1, 0x0032($sp) +/* 0FA60 80841C70 45010007 */ bc1t .L80841C90 /* 0FA64 80841C74 00000000 */ nop /* 0FA68 80841C78 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 /* 0FA6C 80841C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FA70 80841C80 0C20F216 */ jal func_8083C858 +/* 0FA70 80841C80 0C20F216 */ jal func_8083C858 /* 0FA74 80841C84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0FA78 80841C88 10000008 */ beq $zero, $zero, .L80841CAC +/* 0FA78 80841C88 10000008 */ beq $zero, $zero, .L80841CAC /* 0FA7C 80841C8C 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 .L80841C90: /* 0FA80 80841C90 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 0FA84 80841C94 8606087E */ lh $a2, 0x087E($s0) ## 0000087E -/* 0FA88 80841C98 10400003 */ beq $v0, $zero, .L80841CA8 +/* 0FA88 80841C98 10400003 */ beq $v0, $zero, .L80841CA8 /* 0FA8C 80841C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FA90 80841CA0 0C20F03A */ jal func_8083C0E8 +/* 0FA90 80841CA0 0C20F03A */ jal func_8083C0E8 /* 0FA94 80841CA4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80841CA8: /* 0FA98 80841CA8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 .L80841CAC: /* 0FA9C 80841CAC A619083C */ sh $t9, 0x083C($s0) ## 0000083C .L80841CB0: -/* 0FAA0 80841CB0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0FAA4 80841CB4 8FB0001C */ lw $s0, 0x001C($sp) -/* 0FAA8 80841CB8 8FB10020 */ lw $s1, 0x0020($sp) -/* 0FAAC 80841CBC 03E00008 */ jr $ra +/* 0FAA0 80841CB0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0FAA4 80841CB4 8FB0001C */ lw $s0, 0x001C($sp) +/* 0FAA8 80841CB8 8FB10020 */ lw $s1, 0x0020($sp) +/* 0FAAC 80841CBC 03E00008 */ jr $ra /* 0FAB0 80841CC0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s index 28be69e1b..9228f8274 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s @@ -1,300 +1,300 @@ glabel func_80843188 /* 10F78 80843188 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 10F7C 8084318C AFB00028 */ sw $s0, 0x0028($sp) +/* 10F7C 8084318C AFB00028 */ sw $s0, 0x0028($sp) /* 10F80 80843190 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 10F84 80843194 AFA5005C */ sw $a1, 0x005C($sp) +/* 10F84 80843194 AFA5005C */ sw $a1, 0x005C($sp) /* 10F88 80843198 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 10F8C 8084319C AFBF002C */ sw $ra, 0x002C($sp) +/* 10F8C 8084319C AFBF002C */ sw $ra, 0x002C($sp) /* 10F90 808431A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 10F94 808431A4 0C028EF0 */ jal func_800A3BC0 -/* 10F98 808431A8 AFA50034 */ sw $a1, 0x0034($sp) -/* 10F9C 808431AC 1040000F */ beq $v0, $zero, .L808431EC +/* 10F94 808431A4 0C028EF0 */ jal func_800A3BC0 +/* 10F98 808431A8 AFA50034 */ sw $a1, 0x0034($sp) +/* 10F9C 808431AC 1040000F */ beq $v0, $zero, .L808431EC /* 10FA0 808431B0 00000000 */ nop -/* 10FA4 808431B4 0C023A74 */ jal func_8008E9D0 +/* 10FA4 808431B4 0C023A74 */ jal func_8008E9D0 /* 10FA8 808431B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10FAC 808431BC 14400008 */ bne $v0, $zero, .L808431E0 -/* 10FB0 808431C0 8FA4005C */ lw $a0, 0x005C($sp) +/* 10FAC 808431BC 14400008 */ bne $v0, $zero, .L808431E0 +/* 10FB0 808431C0 8FA4005C */ lw $a0, 0x005C($sp) /* 10FB4 808431C4 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B /* 10FB8 808431C8 3C068085 */ lui $a2, %hi(D_80853B0C) ## $a2 = 80850000 /* 10FBC 808431CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10FC0 808431D0 000E7880 */ sll $t7, $t6, 2 -/* 10FC4 808431D4 00CF3021 */ addu $a2, $a2, $t7 -/* 10FC8 808431D8 0C20C8A1 */ jal func_80832284 -/* 10FCC 808431DC 8CC63B0C */ lw $a2, %lo(D_80853B0C)($a2) +/* 10FC0 808431D0 000E7880 */ sll $t7, $t6, 2 +/* 10FC4 808431D4 00CF3021 */ addu $a2, $a2, $t7 +/* 10FC8 808431D8 0C20C8A1 */ jal func_80832284 +/* 10FCC 808431DC 8CC63B0C */ lw $a2, %lo(D_80853B0C)($a2) .L808431E0: /* 10FD0 808431E0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 10FD4 808431E4 A6180850 */ sh $t8, 0x0850($s0) ## 00000850 /* 10FD8 808431E8 A200084F */ sb $zero, 0x084F($s0) ## 0000084F .L808431EC: -/* 10FDC 808431EC 0C023A74 */ jal func_8008E9D0 +/* 10FDC 808431EC 0C023A74 */ jal func_8008E9D0 /* 10FE0 808431F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10FE4 808431F4 1440000D */ bne $v0, $zero, .L8084322C +/* 10FE4 808431F4 1440000D */ bne $v0, $zero, .L8084322C /* 10FE8 808431F8 00000000 */ nop /* 10FEC 808431FC 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 10FF0 80843200 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 10FF4 80843204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10FF8 80843208 03214025 */ or $t0, $t9, $at ## $t0 = 00400000 /* 10FFC 8084320C AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 11000 80843210 0C20D99C */ jal func_80836670 -/* 11004 80843214 8FA5005C */ lw $a1, 0x005C($sp) +/* 11000 80843210 0C20D99C */ jal func_80836670 +/* 11004 80843214 8FA5005C */ lw $a1, 0x005C($sp) /* 11008 80843218 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C /* 1100C 8084321C 3C01FFBF */ lui $at, 0xFFBF ## $at = FFBF0000 /* 11010 80843220 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFBFFFFF -/* 11014 80843224 01215024 */ and $t2, $t1, $at +/* 11014 80843224 01215024 */ and $t2, $t1, $at /* 11018 80843228 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C .L8084322C: -/* 1101C 8084322C 0C20DC87 */ jal func_8083721C +/* 1101C 8084322C 0C20DC87 */ jal func_8083721C /* 11020 80843230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 11024 80843234 860B0850 */ lh $t3, 0x0850($s0) ## 00000850 /* 11028 80843238 3C028086 */ lui $v0, %hi(D_80858AB4) ## $v0 = 80860000 -/* 1102C 8084323C 516000D4 */ beql $t3, $zero, .L80843590 +/* 1102C 8084323C 516000D4 */ beql $t3, $zero, .L80843590 /* 11030 80843240 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 11034 80843244 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) -/* 11038 80843248 8FA3005C */ lw $v1, 0x005C($sp) +/* 11034 80843244 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) +/* 11038 80843248 8FA3005C */ lw $v1, 0x005C($sp) /* 1103C 8084324C 804C0015 */ lb $t4, 0x0015($v0) ## 80860015 -/* 11040 80843250 000C6880 */ sll $t5, $t4, 2 -/* 11044 80843254 01AC6823 */ subu $t5, $t5, $t4 -/* 11048 80843258 000D68C0 */ sll $t5, $t5, 3 -/* 1104C 8084325C 01AC6821 */ addu $t5, $t5, $t4 -/* 11050 80843260 000D6880 */ sll $t5, $t5, 2 +/* 11040 80843250 000C6880 */ sll $t5, $t4, 2 +/* 11044 80843254 01AC6823 */ subu $t5, $t5, $t4 +/* 11048 80843258 000D68C0 */ sll $t5, $t5, 3 +/* 1104C 8084325C 01AC6821 */ addu $t5, $t5, $t4 +/* 11050 80843260 000D6880 */ sll $t5, $t5, 2 /* 11054 80843264 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 /* 11058 80843268 00000000 */ nop -/* 1105C 8084326C 468021A0 */ cvt.s.w $f6, $f4 -/* 11060 80843270 E7A60054 */ swc1 $f6, 0x0054($sp) +/* 1105C 8084326C 468021A0 */ cvt.s.w $f6, $f4 +/* 11060 80843270 E7A60054 */ swc1 $f6, 0x0054($sp) /* 11064 80843274 804E0014 */ lb $t6, 0x0014($v0) ## 80860014 -/* 11068 80843278 000E0823 */ subu $at, $zero, $t6 -/* 1106C 8084327C 00017900 */ sll $t7, $at, 4 -/* 11070 80843280 01E17823 */ subu $t7, $t7, $at -/* 11074 80843284 000F78C0 */ sll $t7, $t7, 3 +/* 11068 80843278 000E0823 */ subu $at, $zero, $t6 +/* 1106C 8084327C 00017900 */ sll $t7, $at, 4 +/* 11070 80843280 01E17823 */ subu $t7, $t7, $at +/* 11074 80843284 000F78C0 */ sll $t7, $t7, 3 /* 11078 80843288 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 /* 1107C 8084328C 00000000 */ nop -/* 11080 80843290 468042A0 */ cvt.s.w $f10, $f8 -/* 11084 80843294 E7AA0050 */ swc1 $f10, 0x0050($sp) +/* 11080 80843290 468042A0 */ cvt.s.w $f10, $f8 +/* 11084 80843294 E7AA0050 */ swc1 $f10, 0x0050($sp) /* 11088 80843298 847807A0 */ lh $t8, 0x07A0($v1) ## 000007A0 -/* 1108C 8084329C 0018C880 */ sll $t9, $t8, 2 -/* 11090 808432A0 00794021 */ addu $t0, $v1, $t9 -/* 11094 808432A4 0C016A52 */ jal func_8005A948 +/* 1108C 8084329C 0018C880 */ sll $t9, $t8, 2 +/* 11090 808432A0 00794021 */ addu $t0, $v1, $t9 +/* 11094 808432A4 0C016A52 */ jal func_8005A948 /* 11098 808432A8 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 /* 1109C 808432AC 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 110A0 808432B0 01222023 */ subu $a0, $t1, $v0 -/* 110A4 808432B4 00042400 */ sll $a0, $a0, 16 -/* 110A8 808432B8 00042403 */ sra $a0, $a0, 16 +/* 110A0 808432B0 01222023 */ subu $a0, $t1, $v0 +/* 110A4 808432B4 00042400 */ sll $a0, $a0, 16 +/* 110A8 808432B8 00042403 */ sra $a0, $a0, 16 /* 110AC 808432BC 0C01DE0D */ jal Math_Coss ## coss? -/* 110B0 808432C0 A7A4004E */ sh $a0, 0x004E($sp) -/* 110B4 808432C4 E7A00040 */ swc1 $f0, 0x0040($sp) +/* 110B0 808432C0 A7A4004E */ sh $a0, 0x004E($sp) +/* 110B4 808432C4 E7A00040 */ swc1 $f0, 0x0040($sp) /* 110B8 808432C8 0C01DE1C */ jal Math_Sins ## sins? -/* 110BC 808432CC 87A4004E */ lh $a0, 0x004E($sp) -/* 110C0 808432D0 C7B00054 */ lwc1 $f16, 0x0054($sp) -/* 110C4 808432D4 C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 110C8 808432D8 C7A60050 */ lwc1 $f6, 0x0050($sp) -/* 110CC 808432DC 87A4004E */ lh $a0, 0x004E($sp) -/* 110D0 808432E0 46128102 */ mul.s $f4, $f16, $f18 +/* 110BC 808432CC 87A4004E */ lh $a0, 0x004E($sp) +/* 110C0 808432D0 C7B00054 */ lwc1 $f16, 0x0054($sp) +/* 110C4 808432D4 C7B20040 */ lwc1 $f18, 0x0040($sp) +/* 110C8 808432D8 C7A60050 */ lwc1 $f6, 0x0050($sp) +/* 110CC 808432DC 87A4004E */ lh $a0, 0x004E($sp) +/* 110D0 808432E0 46128102 */ mul.s $f4, $f16, $f18 /* 110D4 808432E4 00000000 */ nop -/* 110D8 808432E8 46060202 */ mul.s $f8, $f0, $f6 -/* 110DC 808432EC 46044280 */ add.s $f10, $f8, $f4 -/* 110E0 808432F0 4600540D */ trunc.w.s $f16, $f10 -/* 110E4 808432F4 44058000 */ mfc1 $a1, $f16 +/* 110D8 808432E8 46060202 */ mul.s $f8, $f0, $f6 +/* 110DC 808432EC 46044280 */ add.s $f10, $f8, $f4 +/* 110E0 808432F0 4600540D */ trunc.w.s $f16, $f10 +/* 110E4 808432F4 44058000 */ mfc1 $a1, $f16 /* 110E8 808432F8 00000000 */ nop -/* 110EC 808432FC 00052C00 */ sll $a1, $a1, 16 -/* 110F0 80843300 00052C03 */ sra $a1, $a1, 16 +/* 110EC 808432FC 00052C00 */ sll $a1, $a1, 16 +/* 110F0 80843300 00052C03 */ sra $a1, $a1, 16 /* 110F4 80843304 0C01DE0D */ jal Math_Coss ## coss? -/* 110F8 80843308 A7A5004C */ sh $a1, 0x004C($sp) -/* 110FC 8084330C E7A00040 */ swc1 $f0, 0x0040($sp) +/* 110F8 80843308 A7A5004C */ sh $a1, 0x004C($sp) +/* 110FC 8084330C E7A00040 */ swc1 $f0, 0x0040($sp) /* 11100 80843310 0C01DE1C */ jal Math_Sins ## sins? -/* 11104 80843314 87A4004E */ lh $a0, 0x004E($sp) -/* 11108 80843318 C7B20050 */ lwc1 $f18, 0x0050($sp) -/* 1110C 8084331C C7A60040 */ lwc1 $f6, 0x0040($sp) -/* 11110 80843320 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 11114 80843324 87A5004C */ lh $a1, 0x004C($sp) -/* 11118 80843328 46069202 */ mul.s $f8, $f18, $f6 -/* 1111C 8084332C 28A10DAD */ slti $at, $a1, 0x0DAD -/* 11120 80843330 46040282 */ mul.s $f10, $f0, $f4 -/* 11124 80843334 460A4401 */ sub.s $f16, $f8, $f10 -/* 11128 80843338 4600848D */ trunc.w.s $f18, $f16 -/* 1112C 8084333C 44049000 */ mfc1 $a0, $f18 -/* 11130 80843340 14200002 */ bne $at, $zero, .L8084334C -/* 11134 80843344 A7A4004A */ sh $a0, 0x004A($sp) +/* 11104 80843314 87A4004E */ lh $a0, 0x004E($sp) +/* 11108 80843318 C7B20050 */ lwc1 $f18, 0x0050($sp) +/* 1110C 8084331C C7A60040 */ lwc1 $f6, 0x0040($sp) +/* 11110 80843320 C7A40054 */ lwc1 $f4, 0x0054($sp) +/* 11114 80843324 87A5004C */ lh $a1, 0x004C($sp) +/* 11118 80843328 46069202 */ mul.s $f8, $f18, $f6 +/* 1111C 8084332C 28A10DAD */ slti $at, $a1, 0x0DAD +/* 11120 80843330 46040282 */ mul.s $f10, $f0, $f4 +/* 11124 80843334 460A4401 */ sub.s $f16, $f8, $f10 +/* 11128 80843338 4600848D */ trunc.w.s $f18, $f16 +/* 1112C 8084333C 44049000 */ mfc1 $a0, $f18 +/* 11130 80843340 14200002 */ bne $at, $zero, .L8084334C +/* 11134 80843344 A7A4004A */ sh $a0, 0x004A($sp) /* 11138 80843348 24050DAC */ addiu $a1, $zero, 0x0DAC ## $a1 = 00000DAC .L8084334C: /* 1113C 8084334C 860C0044 */ lh $t4, 0x0044($s0) ## 00000044 -/* 11140 80843350 00AC1023 */ subu $v0, $a1, $t4 -/* 11144 80843354 04400003 */ bltz $v0, .L80843364 -/* 11148 80843358 00021823 */ subu $v1, $zero, $v0 -/* 1114C 8084335C 10000001 */ beq $zero, $zero, .L80843364 +/* 11140 80843350 00AC1023 */ subu $v0, $a1, $t4 +/* 11144 80843354 04400003 */ bltz $v0, .L80843364 +/* 11148 80843358 00021823 */ subu $v1, $zero, $v0 +/* 1114C 8084335C 10000001 */ beq $zero, $zero, .L80843364 /* 11150 80843360 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L80843364: /* 11154 80843364 44833000 */ mtc1 $v1, $f6 ## $f6 = 0.00 /* 11158 80843368 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 1115C 8084336C 44810000 */ mtc1 $at, $f0 ## $f0 = 0.25 -/* 11160 80843370 46803120 */ cvt.s.w $f4, $f6 -/* 11164 80843374 46002202 */ mul.s $f8, $f4, $f0 -/* 11168 80843378 4600428D */ trunc.w.s $f10, $f8 -/* 1116C 8084337C 44025000 */ mfc1 $v0, $f10 +/* 11160 80843370 46803120 */ cvt.s.w $f4, $f6 +/* 11164 80843374 46002202 */ mul.s $f8, $f4, $f0 +/* 11168 80843378 4600428D */ trunc.w.s $f10, $f8 +/* 1116C 8084337C 44025000 */ mfc1 $v0, $f10 /* 11170 80843380 00000000 */ nop -/* 11174 80843384 00027400 */ sll $t6, $v0, 16 -/* 11178 80843388 000E7C03 */ sra $t7, $t6, 16 -/* 1117C 8084338C 29E10064 */ slti $at, $t7, 0x0064 -/* 11180 80843390 00023400 */ sll $a2, $v0, 16 -/* 11184 80843394 10200002 */ beq $at, $zero, .L808433A0 -/* 11188 80843398 00063403 */ sra $a2, $a2, 16 +/* 11174 80843384 00027400 */ sll $t6, $v0, 16 +/* 11178 80843388 000E7C03 */ sra $t7, $t6, 16 +/* 1117C 8084338C 29E10064 */ slti $at, $t7, 0x0064 +/* 11180 80843390 00023400 */ sll $a2, $v0, 16 +/* 11184 80843394 10200002 */ beq $at, $zero, .L808433A0 +/* 11188 80843398 00063403 */ sra $a2, $a2, 16 /* 1118C 8084339C 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 .L808433A0: /* 11190 808433A0 860806BE */ lh $t0, 0x06BE($s0) ## 000006BE -/* 11194 808433A4 0004C400 */ sll $t8, $a0, 16 -/* 11198 808433A8 0018CC03 */ sra $t9, $t8, 16 -/* 1119C 808433AC 03281023 */ subu $v0, $t9, $t0 -/* 111A0 808433B0 04400003 */ bltz $v0, .L808433C0 +/* 11194 808433A4 0004C400 */ sll $t8, $a0, 16 +/* 11198 808433A8 0018CC03 */ sra $t9, $t8, 16 +/* 1119C 808433AC 03281023 */ subu $v0, $t9, $t0 +/* 111A0 808433B0 04400003 */ bltz $v0, .L808433C0 /* 111A4 808433B4 26040044 */ addiu $a0, $s0, 0x0044 ## $a0 = 00000044 -/* 111A8 808433B8 10000002 */ beq $zero, $zero, .L808433C4 +/* 111A8 808433B8 10000002 */ beq $zero, $zero, .L808433C4 /* 111AC 808433BC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L808433C0: -/* 111B0 808433C0 00021823 */ subu $v1, $zero, $v0 +/* 111B0 808433C0 00021823 */ subu $v1, $zero, $v0 .L808433C4: /* 111B4 808433C4 44838000 */ mtc1 $v1, $f16 ## $f16 = 0.00 /* 111B8 808433C8 00000000 */ nop -/* 111BC 808433CC 468084A0 */ cvt.s.w $f18, $f16 -/* 111C0 808433D0 46009182 */ mul.s $f6, $f18, $f0 -/* 111C4 808433D4 4600310D */ trunc.w.s $f4, $f6 -/* 111C8 808433D8 44022000 */ mfc1 $v0, $f4 +/* 111BC 808433CC 468084A0 */ cvt.s.w $f18, $f16 +/* 111C0 808433D0 46009182 */ mul.s $f6, $f18, $f0 +/* 111C4 808433D4 4600310D */ trunc.w.s $f4, $f6 +/* 111C8 808433D8 44022000 */ mfc1 $v0, $f4 /* 111CC 808433DC 00000000 */ nop -/* 111D0 808433E0 00025400 */ sll $t2, $v0, 16 -/* 111D4 808433E4 000A5C03 */ sra $t3, $t2, 16 -/* 111D8 808433E8 29610032 */ slti $at, $t3, 0x0032 -/* 111DC 808433EC 00023C00 */ sll $a3, $v0, 16 -/* 111E0 808433F0 10200002 */ beq $at, $zero, .L808433FC -/* 111E4 808433F4 00073C03 */ sra $a3, $a3, 16 +/* 111D0 808433E0 00025400 */ sll $t2, $v0, 16 +/* 111D4 808433E4 000A5C03 */ sra $t3, $t2, 16 +/* 111D8 808433E8 29610032 */ slti $at, $t3, 0x0032 +/* 111DC 808433EC 00023C00 */ sll $a3, $v0, 16 +/* 111E0 808433F0 10200002 */ beq $at, $zero, .L808433FC +/* 111E4 808433F4 00073C03 */ sra $a3, $a3, 16 /* 111E8 808433F8 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 .L808433FC: /* 111EC 808433FC 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 111F0 80843400 A7A70046 */ sh $a3, 0x0046($sp) -/* 111F4 80843404 87A70046 */ lh $a3, 0x0046($sp) + +/* 111F0 80843400 A7A70046 */ sh $a3, 0x0046($sp) +/* 111F4 80843404 87A70046 */ lh $a3, 0x0046($sp) /* 111F8 80843408 860C0044 */ lh $t4, 0x0044($s0) ## 00000044 /* 111FC 8084340C 260406BE */ addiu $a0, $s0, 0x06BE ## $a0 = 000006BE -/* 11200 80843410 00073400 */ sll $a2, $a3, 16 +/* 11200 80843410 00073400 */ sll $a2, $a3, 16 /* 11204 80843414 A60C06BC */ sh $t4, 0x06BC($s0) ## 000006BC -/* 11208 80843418 87A5004A */ lh $a1, 0x004A($sp) +/* 11208 80843418 87A5004A */ lh $a1, 0x004A($sp) /* 1120C 8084341C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 11210 80843420 00063403 */ sra $a2, $a2, 16 + +/* 11210 80843420 00063403 */ sra $a2, $a2, 16 /* 11214 80843424 820D084F */ lb $t5, 0x084F($s0) ## 0000084F /* 11218 80843428 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1121C 8084342C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11220 80843430 11A00014 */ beq $t5, $zero, .L80843484 +/* 11220 80843430 11A00014 */ beq $t5, $zero, .L80843484 /* 11224 80843434 00000000 */ nop -/* 11228 80843438 0C210B7D */ jal func_80842DF4 -/* 1122C 8084343C 8FA4005C */ lw $a0, 0x005C($sp) -/* 11230 80843440 1440000D */ bne $v0, $zero, .L80843478 +/* 11228 80843438 0C210B7D */ jal func_80842DF4 +/* 1122C 8084343C 8FA4005C */ lw $a0, 0x005C($sp) +/* 11230 80843440 1440000D */ bne $v0, $zero, .L80843478 /* 11234 80843444 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 11238 80843448 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 1123C 8084344C 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 /* 11240 80843450 C60801CC */ lwc1 $f8, 0x01CC($s0) ## 000001CC /* 11244 80843454 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11248 80843458 460A403C */ c.lt.s $f8, $f10 +/* 11248 80843458 460A403C */ c.lt.s $f8, $f10 /* 1124C 8084345C 00000000 */ nop -/* 11250 80843460 4502004B */ bc1fl .L80843590 +/* 11250 80843460 4502004B */ bc1fl .L80843590 /* 11254 80843464 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 11258 80843468 0C20CE88 */ jal func_80833A20 +/* 11258 80843468 0C20CE88 */ jal func_80833A20 /* 1125C 8084346C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 11260 80843470 10000047 */ beq $zero, $zero, .L80843590 +/* 11260 80843470 10000047 */ beq $zero, $zero, .L80843590 /* 11264 80843474 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C .L80843478: /* 11268 80843478 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 1126C 8084347C 10000043 */ beq $zero, $zero, .L8084358C +/* 1126C 8084347C 10000043 */ beq $zero, $zero, .L8084358C /* 11270 80843480 A200084F */ sb $zero, 0x084F($s0) ## 0000084F .L80843484: -/* 11274 80843484 0C210A59 */ jal func_80842964 -/* 11278 80843488 8FA5005C */ lw $a1, 0x005C($sp) -/* 1127C 8084348C 14400048 */ bne $v0, $zero, .L808435B0 +/* 11274 80843484 0C210A59 */ jal func_80842964 +/* 11278 80843488 8FA5005C */ lw $a1, 0x005C($sp) +/* 1127C 8084348C 14400048 */ bne $v0, $zero, .L808435B0 /* 11280 80843490 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11284 80843494 0C20F0AC */ jal func_8083C2B0 -/* 11288 80843498 8FA5005C */ lw $a1, 0x005C($sp) -/* 1128C 8084349C 10400006 */ beq $v0, $zero, .L808434B8 +/* 11284 80843494 0C20F0AC */ jal func_8083C2B0 +/* 11288 80843498 8FA5005C */ lw $a1, 0x005C($sp) +/* 1128C 8084349C 10400006 */ beq $v0, $zero, .L808434B8 /* 11290 808434A0 3C01FFBF */ lui $at, 0xFFBF ## $at = FFBF0000 /* 11294 808434A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11298 808434A8 0C210A36 */ jal func_808428D8 -/* 1129C 808434AC 8FA5005C */ lw $a1, 0x005C($sp) -/* 112A0 808434B0 10000037 */ beq $zero, $zero, .L80843590 +/* 11298 808434A8 0C210A36 */ jal func_808428D8 +/* 1129C 808434AC 8FA5005C */ lw $a1, 0x005C($sp) +/* 112A0 808434B0 10000037 */ beq $zero, $zero, .L80843590 /* 112A4 808434B4 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C .L808434B8: /* 112A8 808434B8 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C /* 112AC 808434BC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 0000FFFF /* 112B0 808434C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 112B4 808434C4 01E1C024 */ and $t8, $t7, $at -/* 112B8 808434C8 0C20C8C6 */ jal func_80832318 +/* 112B4 808434C4 01E1C024 */ and $t8, $t7, $at +/* 112B8 808434C8 0C20C8C6 */ jal func_80832318 /* 112BC 808434CC AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 112C0 808434D0 0C023A74 */ jal func_8008E9D0 +/* 112C0 808434D0 0C023A74 */ jal func_8008E9D0 /* 112C4 808434D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 112C8 808434D8 1040001A */ beq $v0, $zero, .L80843544 +/* 112C8 808434D8 1040001A */ beq $v0, $zero, .L80843544 /* 112CC 808434DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 112D0 808434E0 0C20E818 */ jal func_8083A060 -/* 112D4 808434E4 8FA5005C */ lw $a1, 0x005C($sp) +/* 112D0 808434E0 0C20E818 */ jal func_8083A060 +/* 112D4 808434E4 8FA5005C */ lw $a1, 0x005C($sp) /* 112D8 808434E8 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 /* 112DC 808434EC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 112E0 808434F0 24842400 */ addiu $a0, $a0, 0x2400 ## $a0 = 04002400 /* 112E4 808434F4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 112E8 808434F8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 112EC 808434FC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 112F0 80843500 468084A0 */ cvt.s.w $f18, $f16 +/* 112F0 80843500 468084A0 */ cvt.s.w $f18, $f16 /* 112F4 80843504 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 112F8 80843508 AFB90018 */ sw $t9, 0x0018($sp) +/* 112F8 80843508 AFB90018 */ sw $t9, 0x0018($sp) /* 112FC 8084350C 24C62400 */ addiu $a2, $a2, 0x2400 ## $a2 = 04002400 -/* 11300 80843510 8FA4005C */ lw $a0, 0x005C($sp) -/* 11304 80843514 8FA50034 */ lw $a1, 0x0034($sp) -/* 11308 80843518 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 11300 80843510 8FA4005C */ lw $a0, 0x005C($sp) +/* 11304 80843514 8FA50034 */ lw $a1, 0x0034($sp) +/* 11308 80843518 E7B20010 */ swc1 $f18, 0x0010($sp) /* 1130C 8084351C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 11310 80843520 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 11314 80843524 0C028FC2 */ jal func_800A3F08 -/* 11318 80843528 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 1131C 8084352C 8FA4005C */ lw $a0, 0x005C($sp) +/* 11310 80843520 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 11314 80843524 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 11318 80843528 E7A0001C */ swc1 $f0, 0x001C($sp) +/* 1131C 8084352C 8FA4005C */ lw $a0, 0x005C($sp) /* 11320 80843530 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11324 80843534 0C20CBD5 */ jal func_80832F54 +/* 11324 80843534 0C20CBD5 */ jal func_80832F54 /* 11328 80843538 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 1132C 8084353C 1000000F */ beq $zero, $zero, .L8084357C +/* 1132C 8084353C 1000000F */ beq $zero, $zero, .L8084357C /* 11330 80843540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80843544: /* 11334 80843544 82080154 */ lb $t0, 0x0154($s0) ## 00000154 -/* 11338 80843548 05030004 */ bgezl $t0, .L8084355C +/* 11338 80843548 05030004 */ bgezl $t0, .L8084355C /* 1133C 8084354C 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 11340 80843550 0C023B1C */ jal func_8008EC70 +/* 11340 80843550 0C023B1C */ jal func_8008EC70 /* 11344 80843554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 11348 80843558 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B .L8084355C: /* 1134C 8084355C 3C058085 */ lui $a1, %hi(D_80853B24) ## $a1 = 80850000 /* 11350 80843560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11354 80843564 00095080 */ sll $t2, $t1, 2 -/* 11358 80843568 00AA2821 */ addu $a1, $a1, $t2 -/* 1135C 8084356C 8CA53B24 */ lw $a1, %lo(D_80853B24)($a1) -/* 11360 80843570 0C20E826 */ jal func_8083A098 -/* 11364 80843574 8FA6005C */ lw $a2, 0x005C($sp) +/* 11354 80843564 00095080 */ sll $t2, $t1, 2 +/* 11358 80843568 00AA2821 */ addu $a1, $a1, $t2 +/* 1135C 8084356C 8CA53B24 */ lw $a1, %lo(D_80853B24)($a1) +/* 11360 80843570 0C20E826 */ jal func_8083A098 +/* 11364 80843574 8FA6005C */ lw $a2, 0x005C($sp) /* 11368 80843578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8084357C: -/* 1136C 8084357C 0C00BDF7 */ jal func_8002F7DC +/* 1136C 8084357C 0C00BDF7 */ jal func_8002F7DC /* 11370 80843580 24051826 */ addiu $a1, $zero, 0x1826 ## $a1 = 00001826 -/* 11374 80843584 1000000B */ beq $zero, $zero, .L808435B4 -/* 11378 80843588 8FBF002C */ lw $ra, 0x002C($sp) +/* 11374 80843584 1000000B */ beq $zero, $zero, .L808435B4 +/* 11378 80843588 8FBF002C */ lw $ra, 0x002C($sp) .L8084358C: /* 1137C 8084358C 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C .L80843590: /* 11380 80843590 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 11384 80843594 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 11388 80843598 01616025 */ or $t4, $t3, $at ## $t4 = 00400000 -/* 1138C 8084359C 0C023A90 */ jal func_8008EA40 +/* 1138C 8084359C 0C023A90 */ jal func_8008EA40 /* 11390 808435A0 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C /* 11394 808435A4 960D06AE */ lhu $t5, 0x06AE($s0) ## 000006AE /* 11398 808435A8 35AE00C1 */ ori $t6, $t5, 0x00C1 ## $t6 = 000000C1 /* 1139C 808435AC A60E06AE */ sh $t6, 0x06AE($s0) ## 000006AE .L808435B0: -/* 113A0 808435B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 113A0 808435B0 8FBF002C */ lw $ra, 0x002C($sp) .L808435B4: -/* 113A4 808435B4 8FB00028 */ lw $s0, 0x0028($sp) +/* 113A4 808435B4 8FB00028 */ lw $s0, 0x0028($sp) /* 113A8 808435B8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 113AC 808435BC 03E00008 */ jr $ra +/* 113AC 808435BC 03E00008 */ jr $ra /* 113B0 808435C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s index bdeedcc42..1744f8e4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s @@ -1,91 +1,91 @@ glabel func_808435C4 /* 113B4 808435C4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 113B8 808435C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 113BC 808435CC AFB10028 */ sw $s1, 0x0028($sp) -/* 113C0 808435D0 AFB00024 */ sw $s0, 0x0024($sp) +/* 113B8 808435C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 113BC 808435CC AFB10028 */ sw $s1, 0x0028($sp) +/* 113C0 808435D0 AFB00024 */ sw $s0, 0x0024($sp) /* 113C4 808435D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 113C8 808435D8 0C20DC87 */ jal func_8083721C +/* 113C8 808435D8 0C20DC87 */ jal func_8083721C /* 113CC 808435DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 113D0 808435E0 820E084F */ lb $t6, 0x084F($s0) ## 0000084F /* 113D4 808435E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 113D8 808435E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 113DC 808435EC 15C00018 */ bne $t6, $zero, .L80843650 +/* 113DC 808435EC 15C00018 */ bne $t6, $zero, .L80843650 /* 113E0 808435F0 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 /* 113E4 808435F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 113E8 808435F8 0C20D99C */ jal func_80836670 +/* 113E8 808435F8 0C20D99C */ jal func_80836670 /* 113EC 808435FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 113F0 80843600 3C018085 */ lui $at, %hi(D_808535E0) ## $at = 80850000 -/* 113F4 80843604 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) +/* 113F4 80843604 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) /* 113F8 80843608 8E0F082C */ lw $t7, 0x082C($s0) ## 0000082C /* 113FC 8084360C 3C188083 */ lui $t8, %hi(func_80834B5C) ## $t8 = 80830000 /* 11400 80843610 27184B5C */ addiu $t8, $t8, %lo(func_80834B5C) ## $t8 = 80834B5C -/* 11404 80843614 11F80006 */ beq $t7, $t8, .L80843630 +/* 11404 80843614 11F80006 */ beq $t7, $t8, .L80843630 /* 11408 80843618 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 1140C 8084361C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 11410 80843620 260606C8 */ addiu $a2, $s0, 0x06C8 ## $a2 = 000006C8 -/* 11414 80843624 0C20DD28 */ jal func_808374A0 +/* 11414 80843624 0C20DD28 */ jal func_808374A0 /* 11418 80843628 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 1141C 8084362C 18400032 */ blez $v0, .L808436F8 +/* 1141C 8084362C 18400032 */ blez $v0, .L808436F8 .L80843630: /* 11420 80843630 3C068084 */ lui $a2, %hi(func_80840450) ## $a2 = 80840000 /* 11424 80843634 24C60450 */ addiu $a2, $a2, %lo(func_80840450) ## $a2 = 80840450 /* 11428 80843638 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 1142C 8084363C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11430 80843640 0C20D716 */ jal func_80835C58 +/* 11430 80843640 0C20D716 */ jal func_80835C58 /* 11434 80843644 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 11438 80843648 1000002C */ beq $zero, $zero, .L808436FC -/* 1143C 8084364C 8FBF002C */ lw $ra, 0x002C($sp) +/* 11438 80843648 1000002C */ beq $zero, $zero, .L808436FC +/* 1143C 8084364C 8FBF002C */ lw $ra, 0x002C($sp) .L80843650: /* 11440 80843650 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 11444 80843654 0C20DD28 */ jal func_808374A0 -/* 11448 80843658 AFA60030 */ sw $a2, 0x0030($sp) -/* 1144C 8084365C 50400027 */ beql $v0, $zero, .L808436FC -/* 11450 80843660 8FBF002C */ lw $ra, 0x002C($sp) -/* 11454 80843664 1C400004 */ bgtz $v0, .L80843678 +/* 11444 80843654 0C20DD28 */ jal func_808374A0 +/* 11448 80843658 AFA60030 */ sw $a2, 0x0030($sp) +/* 1144C 8084365C 50400027 */ beql $v0, $zero, .L808436FC +/* 11450 80843660 8FBF002C */ lw $ra, 0x002C($sp) +/* 11454 80843664 1C400004 */ bgtz $v0, .L80843678 /* 11458 80843668 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1145C 8084366C 0C028EF0 */ jal func_800A3BC0 -/* 11460 80843670 8FA50030 */ lw $a1, 0x0030($sp) -/* 11464 80843674 10400020 */ beq $v0, $zero, .L808436F8 +/* 1145C 8084366C 0C028EF0 */ jal func_800A3BC0 +/* 11460 80843670 8FA50030 */ lw $a1, 0x0030($sp) +/* 11464 80843674 10400020 */ beq $v0, $zero, .L808436F8 .L80843678: /* 11468 80843678 3C068084 */ lui $a2, %hi(func_80843188) ## $a2 = 80840000 /* 1146C 8084367C 24C63188 */ addiu $a2, $a2, %lo(func_80843188) ## $a2 = 80843188 /* 11470 80843680 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 11474 80843684 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11478 80843688 0C20D716 */ jal func_80835C58 +/* 11478 80843688 0C20D716 */ jal func_80835C58 /* 1147C 8084368C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 11480 80843690 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 11484 80843694 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 11488 80843698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1148C 8084369C 03214025 */ or $t0, $t9, $at ## $t0 = 00400000 -/* 11490 808436A0 0C023A90 */ jal func_8008EA40 +/* 11490 808436A0 0C023A90 */ jal func_8008EA40 /* 11494 808436A4 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C /* 11498 808436A8 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B /* 1149C 808436AC 3C068085 */ lui $a2, %hi(D_80853AF4) ## $a2 = 80850000 -/* 114A0 808436B0 00095080 */ sll $t2, $t1, 2 -/* 114A4 808436B4 00CA3021 */ addu $a2, $a2, $t2 -/* 114A8 808436B8 8CC43AF4 */ lw $a0, %lo(D_80853AF4)($a2) +/* 114A0 808436B0 00095080 */ sll $t2, $t1, 2 +/* 114A4 808436B4 00CA3021 */ addu $a2, $a2, $t2 +/* 114A8 808436B8 8CC43AF4 */ lw $a0, %lo(D_80853AF4)($a2) /* 114AC 808436BC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 114B0 808436C0 AFA40038 */ sw $a0, 0x0038($sp) + +/* 114B0 808436C0 AFA40038 */ sw $a0, 0x0038($sp) /* 114B4 808436C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 114B8 808436C8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 114BC 808436CC 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 114C0 808436D0 46802020 */ cvt.s.w $f0, $f4 -/* 114C4 808436D4 8FA60038 */ lw $a2, 0x0038($sp) -/* 114C8 808436D8 AFAB0018 */ sw $t3, 0x0018($sp) +/* 114C0 808436D0 46802020 */ cvt.s.w $f0, $f4 +/* 114C4 808436D4 8FA60038 */ lw $a2, 0x0038($sp) +/* 114C8 808436D8 AFAB0018 */ sw $t3, 0x0018($sp) /* 114CC 808436DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 114D0 808436E0 8FA50030 */ lw $a1, 0x0030($sp) +/* 114D0 808436E0 8FA50030 */ lw $a1, 0x0030($sp) /* 114D4 808436E4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 114D8 808436E8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 114DC 808436EC E7A00014 */ swc1 $f0, 0x0014($sp) -/* 114E0 808436F0 0C028FC2 */ jal func_800A3F08 -/* 114E4 808436F4 E7A6001C */ swc1 $f6, 0x001C($sp) +/* 114D8 808436E8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 114DC 808436EC E7A00014 */ swc1 $f0, 0x0014($sp) +/* 114E0 808436F0 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 114E4 808436F4 E7A6001C */ swc1 $f6, 0x001C($sp) .L808436F8: -/* 114E8 808436F8 8FBF002C */ lw $ra, 0x002C($sp) +/* 114E8 808436F8 8FBF002C */ lw $ra, 0x002C($sp) .L808436FC: -/* 114EC 808436FC 8FB00024 */ lw $s0, 0x0024($sp) -/* 114F0 80843700 8FB10028 */ lw $s1, 0x0028($sp) -/* 114F4 80843704 03E00008 */ jr $ra +/* 114EC 808436FC 8FB00024 */ lw $s0, 0x0024($sp) +/* 114F0 80843700 8FB10028 */ lw $s1, 0x0028($sp) +/* 114F4 80843704 03E00008 */ jr $ra /* 114F8 80843708 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s index eb4f623f2..d1de836a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s @@ -1,143 +1,143 @@ glabel func_80843AE8 /* 118D8 80843AE8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 118DC 80843AEC AFBF002C */ sw $ra, 0x002C($sp) -/* 118E0 80843AF0 AFB00028 */ sw $s0, 0x0028($sp) -/* 118E4 80843AF4 AFA40030 */ sw $a0, 0x0030($sp) +/* 118DC 80843AEC AFBF002C */ sw $ra, 0x002C($sp) +/* 118E0 80843AF0 AFB00028 */ sw $s0, 0x0028($sp) +/* 118E4 80843AF4 AFA40030 */ sw $a0, 0x0030($sp) /* 118E8 80843AF8 84A20850 */ lh $v0, 0x0850($a1) ## 00000850 /* 118EC 80843AFC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 118F0 80843B00 50400055 */ beql $v0, $zero, .L80843C58 +/* 118F0 80843B00 50400055 */ beql $v0, $zero, .L80843C58 /* 118F4 80843B04 8208084F */ lb $t0, 0x084F($s0) ## 0000084F -/* 118F8 80843B08 18400038 */ blez $v0, .L80843BEC +/* 118F8 80843B08 18400038 */ blez $v0, .L80843BEC /* 118FC 80843B0C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 11900 80843B10 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 11904 80843B14 A4AE0850 */ sh $t6, 0x0850($a1) ## 00000850 /* 11908 80843B18 84AF0850 */ lh $t7, 0x0850($a1) ## 00000850 -/* 1190C 80843B1C 55E0006F */ bnel $t7, $zero, .L80843CDC -/* 11910 80843B20 8FBF002C */ lw $ra, 0x002C($sp) +/* 1190C 80843B1C 55E0006F */ bnel $t7, $zero, .L80843CDC +/* 11910 80843B20 8FBF002C */ lw $ra, 0x002C($sp) /* 11914 80843B24 8CB8067C */ lw $t8, 0x067C($a1) ## 0000067C /* 11918 80843B28 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 1191C 80843B2C 0018C900 */ sll $t9, $t8, 4 -/* 11920 80843B30 07210016 */ bgez $t9, .L80843B8C +/* 1191C 80843B2C 0018C900 */ sll $t9, $t8, 4 +/* 11920 80843B30 07210016 */ bgez $t9, .L80843B8C /* 11924 80843B34 00000000 */ nop /* 11928 80843B38 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 /* 1192C 80843B3C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 11930 80843B40 24843328 */ addiu $a0, $a0, 0x3328 ## $a0 = 04003328 /* 11934 80843B44 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 11938 80843B48 3C01C180 */ lui $at, 0xC180 ## $at = C1800000 /* 1193C 80843B4C 44815000 */ mtc1 $at, $f10 ## $f10 = -16.00 -/* 11940 80843B50 46803220 */ cvt.s.w $f8, $f6 +/* 11940 80843B50 46803220 */ cvt.s.w $f8, $f6 /* 11944 80843B54 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 11948 80843B58 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1194C 80843B5C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 11950 80843B60 AFA80018 */ sw $t0, 0x0018($sp) +/* 11950 80843B60 AFA80018 */ sw $t0, 0x0018($sp) /* 11954 80843B64 24C63328 */ addiu $a2, $a2, 0x3328 ## $a2 = 04003328 -/* 11958 80843B68 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1195C 80843B6C 8FA40030 */ lw $a0, 0x0030($sp) +/* 11958 80843B68 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 1195C 80843B6C 8FA40030 */ lw $a0, 0x0030($sp) /* 11960 80843B70 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 11964 80843B74 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 11968 80843B78 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 1196C 80843B7C 0C028FC2 */ jal func_800A3F08 -/* 11970 80843B80 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 11974 80843B84 10000014 */ beq $zero, $zero, .L80843BD8 +/* 11968 80843B78 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 1196C 80843B7C 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 11970 80843B80 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 11974 80843B84 10000014 */ beq $zero, $zero, .L80843BD8 /* 11978 80843B88 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 .L80843B8C: /* 1197C 80843B8C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 11980 80843B90 24842878 */ addiu $a0, $a0, 0x2878 ## $a0 = 00002878 /* 11984 80843B94 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 11988 80843B98 3C0142C6 */ lui $at, 0x42C6 ## $at = 42C60000 /* 1198C 80843B9C 44818000 */ mtc1 $at, $f16 ## $f16 = 99.00 -/* 11990 80843BA0 46809120 */ cvt.s.w $f4, $f18 +/* 11990 80843BA0 46809120 */ cvt.s.w $f4, $f18 /* 11994 80843BA4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 11998 80843BA8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1199C 80843BAC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 119A0 80843BB0 AFA90018 */ sw $t1, 0x0018($sp) +/* 119A0 80843BB0 AFA90018 */ sw $t1, 0x0018($sp) /* 119A4 80843BB4 24C62878 */ addiu $a2, $a2, 0x2878 ## $a2 = 04002878 -/* 119A8 80843BB8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 119AC 80843BBC 8FA40030 */ lw $a0, 0x0030($sp) +/* 119A8 80843BB8 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 119AC 80843BBC 8FA40030 */ lw $a0, 0x0030($sp) /* 119B0 80843BC0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 119B4 80843BC4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 119B8 80843BC8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 119BC 80843BCC 0C028FC2 */ jal func_800A3F08 -/* 119C0 80843BD0 E7A6001C */ swc1 $f6, 0x001C($sp) +/* 119B8 80843BC8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 119BC 80843BCC 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 119C0 80843BD0 E7A6001C */ swc1 $f6, 0x001C($sp) /* 119C4 80843BD4 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 .L80843BD8: /* 119C8 80843BD8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 119CC 80843BDC A42AFA84 */ sh $t2, -0x057C($at) ## 8015FA84 /* 119D0 80843BE0 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 119D4 80843BE4 1000003C */ beq $zero, $zero, .L80843CD8 +/* 119D4 80843BE4 1000003C */ beq $zero, $zero, .L80843CD8 /* 119D8 80843BE8 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 .L80843BEC: /* 119DC 80843BEC 858CFA84 */ lh $t4, -0x057C($t4) ## FFFFFA84 -/* 119E0 80843BF0 5580003A */ bnel $t4, $zero, .L80843CDC -/* 119E4 80843BF4 8FBF002C */ lw $ra, 0x002C($sp) +/* 119E0 80843BF0 5580003A */ bnel $t4, $zero, .L80843CDC +/* 119E4 80843BF4 8FBF002C */ lw $ra, 0x002C($sp) /* 119E8 80843BF8 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C /* 119EC 80843BFC 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F /* 119F0 80843C00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 119F4 80843C04 01A17024 */ and $t6, $t5, $at -/* 119F8 80843C08 000EC100 */ sll $t8, $t6, 4 -/* 119FC 80843C0C 07010006 */ bgez $t8, .L80843C28 +/* 119F4 80843C04 01A17024 */ and $t6, $t5, $at +/* 119F8 80843C08 000EC100 */ sll $t8, $t6, 4 +/* 119FC 80843C0C 07010006 */ bgez $t8, .L80843C28 /* 11A00 80843C10 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C -/* 11A04 80843C14 8FA40030 */ lw $a0, 0x0030($sp) -/* 11A08 80843C18 0C20E3C6 */ jal func_80838F18 +/* 11A04 80843C14 8FA40030 */ lw $a0, 0x0030($sp) +/* 11A08 80843C18 0C20E3C6 */ jal func_80838F18 /* 11A0C 80843C1C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11A10 80843C20 10000004 */ beq $zero, $zero, .L80843C34 +/* 11A10 80843C20 10000004 */ beq $zero, $zero, .L80843C34 /* 11A14 80843C24 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 .L80843C28: -/* 11A18 80843C28 0C214C20 */ jal func_80853080 -/* 11A1C 80843C2C 8FA50030 */ lw $a1, 0x0030($sp) +/* 11A18 80843C28 0C214C20 */ jal func_80853080 +/* 11A1C 80843C2C 8FA50030 */ lw $a1, 0x0030($sp) /* 11A20 80843C30 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 .L80843C34: /* 11A24 80843C34 A2190A87 */ sb $t9, 0x0A87($s0) ## 00000A87 /* 11A28 80843C38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11A2C 80843C3C 0C20DEBF */ jal func_80837AFC +/* 11A2C 80843C3C 0C20DEBF */ jal func_80837AFC /* 11A30 80843C40 2405FFEC */ addiu $a1, $zero, 0xFFEC ## $a1 = FFFFFFEC -/* 11A34 80843C44 0C03D1FF */ jal func_800F47FC +/* 11A34 80843C44 0C03D1FF */ jal func_800F47FC /* 11A38 80843C48 00000000 */ nop -/* 11A3C 80843C4C 10000023 */ beq $zero, $zero, .L80843CDC -/* 11A40 80843C50 8FBF002C */ lw $ra, 0x002C($sp) +/* 11A3C 80843C4C 10000023 */ beq $zero, $zero, .L80843CDC +/* 11A40 80843C50 8FBF002C */ lw $ra, 0x002C($sp) /* 11A44 80843C54 8208084F */ lb $t0, 0x084F($s0) ## 0000084F .L80843C58: -/* 11A48 80843C58 8FAB0030 */ lw $t3, 0x0030($sp) +/* 11A48 80843C58 8FAB0030 */ lw $t3, 0x0030($sp) /* 11A4C 80843C5C 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 11A50 80843C60 11000016 */ beq $t0, $zero, .L80843CBC -/* 11A54 80843C64 018B6021 */ addu $t4, $t4, $t3 +/* 11A50 80843C60 11000016 */ beq $t0, $zero, .L80843CBC +/* 11A54 80843C64 018B6021 */ addu $t4, $t4, $t3 /* 11A58 80843C68 2409003C */ addiu $t1, $zero, 0x003C ## $t1 = 0000003C /* 11A5C 80843C6C A6090850 */ sh $t1, 0x0850($s0) ## 00000850 /* 11A60 80843C70 3C078085 */ lui $a3, %hi(D_808545E4) ## $a3 = 80850000 /* 11A64 80843C74 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 11A68 80843C78 AFAA0010 */ sw $t2, 0x0010($sp) +/* 11A68 80843C78 AFAA0010 */ sw $t2, 0x0010($sp) /* 11A6C 80843C7C 24E745E4 */ addiu $a3, $a3, %lo(D_808545E4) ## $a3 = 808545E4 -/* 11A70 80843C80 8FA40030 */ lw $a0, 0x0030($sp) +/* 11A70 80843C80 8FA40030 */ lw $a0, 0x0030($sp) /* 11A74 80843C84 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11A78 80843C88 0C20E5A0 */ jal func_80839680 +/* 11A78 80843C88 0C20E5A0 */ jal func_80839680 /* 11A7C 80843C8C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 11A80 80843C90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11A84 80843C94 0C00BDF7 */ jal func_8002F7DC +/* 11A84 80843C94 0C00BDF7 */ jal func_8002F7DC /* 11A88 80843C98 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 11A8C 80843C9C 8FA40030 */ lw $a0, 0x0030($sp) +/* 11A8C 80843C9C 8FA40030 */ lw $a0, 0x0030($sp) /* 11A90 80843CA0 240526B4 */ addiu $a1, $zero, 0x26B4 ## $a1 = 000026B4 /* 11A94 80843CA4 2406007D */ addiu $a2, $zero, 0x007D ## $a2 = 0000007D /* 11A98 80843CA8 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 11A9C 80843CAC 0C02003E */ jal func_800800F8 -/* 11AA0 80843CB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 11AA4 80843CB4 10000009 */ beq $zero, $zero, .L80843CDC -/* 11AA8 80843CB8 8FBF002C */ lw $ra, 0x002C($sp) +/* 11A9C 80843CAC 0C02003E */ jal func_800800F8 +/* 11AA0 80843CB0 AFA00010 */ sw $zero, 0x0010($sp) +/* 11AA4 80843CB4 10000009 */ beq $zero, $zero, .L80843CDC +/* 11AA8 80843CB8 8FBF002C */ lw $ra, 0x002C($sp) .L80843CBC: /* 11AAC 80843CBC 958C0A20 */ lhu $t4, 0x0A20($t4) ## 00000A20 /* 11AB0 80843CC0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 11AB4 80843CC4 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 11AB8 80843CC8 15810003 */ bne $t4, $at, .L80843CD8 +/* 11AB8 80843CC8 15810003 */ bne $t4, $at, .L80843CD8 /* 11ABC 80843CCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 11AC0 80843CD0 002B0821 */ addu $at, $at, $t3 +/* 11AC0 80843CD0 002B0821 */ addu $at, $at, $t3 /* 11AC4 80843CD4 A42D0A20 */ sh $t5, 0x0A20($at) ## 00010A20 .L80843CD8: -/* 11AC8 80843CD8 8FBF002C */ lw $ra, 0x002C($sp) +/* 11AC8 80843CD8 8FBF002C */ lw $ra, 0x002C($sp) .L80843CDC: -/* 11ACC 80843CDC 8FB00028 */ lw $s0, 0x0028($sp) +/* 11ACC 80843CDC 8FB00028 */ lw $s0, 0x0028($sp) /* 11AD0 80843CE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 11AD4 80843CE4 03E00008 */ jr $ra +/* 11AD4 80843CE4 03E00008 */ jr $ra /* 11AD8 80843CE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s index e38aa00a3..d4fc9bf67 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s @@ -2,408 +2,408 @@ glabel func_8084411C /* 11F0C 8084411C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 11F10 80844120 81CEFA13 */ lb $t6, -0x05ED($t6) ## 8015FA13 /* 11F14 80844124 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 11F18 80844128 AFB00028 */ sw $s0, 0x0028($sp) -/* 11F1C 8084412C 29C10029 */ slti $at, $t6, 0x0029 +/* 11F18 80844128 AFB00028 */ sw $s0, 0x0028($sp) +/* 11F1C 8084412C 29C10029 */ slti $at, $t6, 0x0029 /* 11F20 80844130 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 11F24 80844134 AFBF002C */ sw $ra, 0x002C($sp) -/* 11F28 80844138 14200004 */ bne $at, $zero, .L8084414C -/* 11F2C 8084413C AFA50054 */ sw $a1, 0x0054($sp) +/* 11F24 80844134 AFBF002C */ sw $ra, 0x002C($sp) +/* 11F28 80844138 14200004 */ bne $at, $zero, .L8084414C +/* 11F2C 8084413C AFA50054 */ sw $a1, 0x0054($sp) /* 11F30 80844140 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 11F34 80844144 10000007 */ beq $zero, $zero, .L80844164 +/* 11F34 80844144 10000007 */ beq $zero, $zero, .L80844164 /* 11F38 80844148 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C .L8084414C: -/* 11F3C 8084414C 0C023A71 */ jal func_8008E9C4 +/* 11F3C 8084414C 0C023A71 */ jal func_8008E9C4 /* 11F40 80844150 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11F44 80844154 10400003 */ beq $v0, $zero, .L80844164 +/* 11F44 80844154 10400003 */ beq $v0, $zero, .L80844164 /* 11F48 80844158 3C018085 */ lui $at, %hi(D_80855450) ## $at = 80850000 -/* 11F4C 8084415C C4265450 */ lwc1 $f6, %lo(D_80855450)($at) +/* 11F4C 8084415C C4265450 */ lwc1 $f6, %lo(D_80855450)($at) /* 11F50 80844160 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C .L80844164: -/* 11F54 80844164 8FAF0054 */ lw $t7, 0x0054($sp) +/* 11F54 80844164 8FAF0054 */ lw $t7, 0x0054($sp) /* 11F58 80844168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 11F5C 8084416C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFFC /* 11F60 80844170 27A6004A */ addiu $a2, $sp, 0x004A ## $a2 = FFFFFFFA /* 11F64 80844174 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 11F68 80844178 0C20DC9A */ jal func_80837268 -/* 11F6C 8084417C AFAF0010 */ sw $t7, 0x0010($sp) +/* 11F68 80844178 0C20DC9A */ jal func_80837268 +/* 11F6C 8084417C AFAF0010 */ sw $t7, 0x0010($sp) /* 11F70 80844180 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 11F74 80844184 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 11F78 80844188 572000F0 */ bnel $t9, $zero, .L8084454C +/* 11F78 80844188 572000F0 */ bnel $t9, $zero, .L8084454C /* 11F7C 8084418C 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B /* 11F80 80844190 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 11F84 80844194 8FA40054 */ lw $a0, 0x0054($sp) +/* 11F84 80844194 8FA40054 */ lw $a0, 0x0054($sp) /* 11F88 80844198 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 11F8C 8084419C 5120001E */ beql $t1, $zero, .L80844218 +/* 11F8C 8084419C 5120001E */ beql $t1, $zero, .L80844218 /* 11F90 808441A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 11F94 808441A4 8E0603AC */ lw $a2, 0x03AC($s0) ## 000003AC /* 11F98 808441A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11F9C 808441AC 0C20D591 */ jal func_80835644 -/* 11FA0 808441B0 AFA60044 */ sw $a2, 0x0044($sp) -/* 11FA4 808441B4 14400017 */ bne $v0, $zero, .L80844214 -/* 11FA8 808441B8 8FA60044 */ lw $a2, 0x0044($sp) +/* 11F9C 808441AC 0C20D591 */ jal func_80835644 +/* 11FA0 808441B0 AFA60044 */ sw $a2, 0x0044($sp) +/* 11FA4 808441B4 14400017 */ bne $v0, $zero, .L80844214 +/* 11FA8 808441B8 8FA60044 */ lw $a2, 0x0044($sp) /* 11FAC 808441BC 84CA0000 */ lh $t2, 0x0000($a2) ## 00000000 /* 11FB0 808441C0 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 11FB4 808441C4 3C0B8086 */ lui $t3, %hi(D_80858AB4) ## $t3 = 80860000 -/* 11FB8 808441C8 55410013 */ bnel $t2, $at, .L80844218 +/* 11FB8 808441C8 55410013 */ bnel $t2, $at, .L80844218 /* 11FBC 808441CC 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 11FC0 808441D0 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) +/* 11FC0 808441D0 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) /* 11FC4 808441D4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 11FC8 808441D8 956C000C */ lhu $t4, 0x000C($t3) ## 8086000C /* 11FCC 808441DC 318DC007 */ andi $t5, $t4, 0xC007 ## $t5 = 00000000 -/* 11FD0 808441E0 51A0000D */ beql $t5, $zero, .L80844218 +/* 11FD0 808441E0 51A0000D */ beql $t5, $zero, .L80844218 /* 11FD4 808441E4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 11FD8 808441E8 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 11FDC 808441EC C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 /* 11FE0 808441F0 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 11FE4 808441F4 8FA40054 */ lw $a0, 0x0054($sp) -/* 11FE8 808441F8 46004280 */ add.s $f10, $f8, $f0 +/* 11FE4 808441F4 8FA40054 */ lw $a0, 0x0054($sp) +/* 11FE8 808441F8 46004280 */ add.s $f10, $f8, $f0 /* 11FEC 808441FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11FF0 80844200 46008480 */ add.s $f18, $f16, $f0 -/* 11FF4 80844204 44065000 */ mfc1 $a2, $f10 -/* 11FF8 80844208 44079000 */ mfc1 $a3, $f18 -/* 11FFC 8084420C 0C211027 */ jal func_8084409C +/* 11FF0 80844200 46008480 */ add.s $f18, $f16, $f0 +/* 11FF4 80844204 44065000 */ mfc1 $a2, $f10 +/* 11FF8 80844208 44079000 */ mfc1 $a3, $f18 +/* 11FFC 8084420C 0C211027 */ jal func_8084409C /* 12000 80844210 00000000 */ nop .L80844214: /* 12004 80844214 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 .L80844218: -/* 12008 80844218 AFA50038 */ sw $a1, 0x0038($sp) -/* 1200C 8084421C 0C028EF0 */ jal func_800A3BC0 -/* 12010 80844220 8FA40054 */ lw $a0, 0x0054($sp) +/* 12008 80844218 AFA50038 */ sw $a1, 0x0038($sp) +/* 1200C 8084421C 0C028EF0 */ jal func_800A3BC0 +/* 12010 80844220 8FA40054 */ lw $a0, 0x0054($sp) /* 12014 80844224 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 /* 12018 80844228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1201C 8084422C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFFC -/* 12020 80844230 000E7B00 */ sll $t7, $t6, 12 -/* 12024 80844234 05E20004 */ bltzl $t7, .L80844248 +/* 12020 80844230 000E7B00 */ sll $t7, $t6, 12 +/* 12024 80844234 05E20004 */ bltzl $t7, .L80844248 /* 12028 80844238 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1202C 8084423C 0C20F7F8 */ jal func_8083DFE0 +/* 1202C 8084423C 0C20F7F8 */ jal func_8083DFE0 /* 12030 80844240 27A6004A */ addiu $a2, $sp, 0x004A ## $a2 = FFFFFFFA /* 12034 80844244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80844248: -/* 12038 80844248 0C20D99C */ jal func_80836670 -/* 1203C 8084424C 8FA50054 */ lw $a1, 0x0054($sp) +/* 12038 80844248 0C20D99C */ jal func_80836670 +/* 1203C 8084424C 8FA50054 */ lw $a1, 0x0054($sp) /* 12040 80844250 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 /* 12044 80844254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12048 80844258 0018CB00 */ sll $t9, $t8, 12 -/* 1204C 8084425C 07210005 */ bgez $t9, .L80844274 +/* 12048 80844258 0018CB00 */ sll $t9, $t8, 12 +/* 1204C 8084425C 07210005 */ bgez $t9, .L80844274 /* 12050 80844260 00000000 */ nop /* 12054 80844264 8208084F */ lb $t0, 0x084F($s0) ## 0000084F /* 12058 80844268 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1205C 8084426C 51010006 */ beql $t0, $at, .L80844288 +/* 1205C 8084426C 51010006 */ beql $t0, $at, .L80844288 /* 12060 80844270 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80844274: -/* 12064 80844274 0C20EEE8 */ jal func_8083BBA0 -/* 12068 80844278 8FA50054 */ lw $a1, 0x0054($sp) -/* 1206C 8084427C 5440011E */ bnel $v0, $zero, .L808446F8 -/* 12070 80844280 8FBF002C */ lw $ra, 0x002C($sp) +/* 12064 80844274 0C20EEE8 */ jal func_8083BBA0 +/* 12068 80844278 8FA50054 */ lw $a1, 0x0054($sp) +/* 1206C 8084427C 5440011E */ bnel $v0, $zero, .L808446F8 +/* 12070 80844280 8FBF002C */ lw $ra, 0x002C($sp) /* 12074 80844284 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80844288: /* 12078 80844288 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 1207C 8084428C 4600203C */ c.lt.s $f4, $f0 +/* 1207C 8084428C 4600203C */ c.lt.s $f4, $f0 /* 12080 80844290 00000000 */ nop -/* 12084 80844294 45020118 */ bc1fl .L808446F8 -/* 12088 80844298 8FBF002C */ lw $ra, 0x002C($sp) +/* 12084 80844294 45020118 */ bc1fl .L808446F8 +/* 12088 80844298 8FBF002C */ lw $ra, 0x002C($sp) /* 1208C 8084429C 86020850 */ lh $v0, 0x0850($s0) ## 00000850 /* 12090 808442A0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 12094 808442A4 0440002E */ bltz $v0, .L80844360 +/* 12094 808442A4 0440002E */ bltz $v0, .L80844360 /* 12098 808442A8 00000000 */ nop /* 1209C 808442AC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 /* 120A0 808442B0 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 120A4 808442B4 312A0008 */ andi $t2, $t1, 0x0008 ## $t2 = 00000000 -/* 120A8 808442B8 55400007 */ bnel $t2, $zero, .L808442D8 +/* 120A8 808442B8 55400007 */ bnel $t2, $zero, .L808442D8 /* 120AC 808442BC 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 -/* 120B0 808442C0 50400005 */ beql $v0, $zero, .L808442D8 +/* 120B0 808442C0 50400005 */ beql $v0, $zero, .L808442D8 /* 120B4 808442C4 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 /* 120B8 808442C8 860B0896 */ lh $t3, 0x0896($s0) ## 00000896 -/* 120BC 808442CC 5960010A */ blezl $t3, .L808446F8 -/* 120C0 808442D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 120BC 808442CC 5960010A */ blezl $t3, .L808446F8 +/* 120C0 808442D0 8FBF002C */ lw $ra, 0x002C($sp) /* 120C4 808442D4 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 .L808442D8: /* 120C8 808442D8 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 120CC 808442DC C4283600 */ lwc1 $f8, %lo(D_80853600)($at) +/* 120CC 808442DC C4283600 */ lwc1 $f8, %lo(D_80853600)($at) /* 120D0 808442E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 120D4 808442E4 4608303C */ c.lt.s $f6, $f8 +/* 120D4 808442E4 4608303C */ c.lt.s $f6, $f8 /* 120D8 808442E8 00000000 */ nop -/* 120DC 808442EC 45010005 */ bc1t .L80844304 +/* 120DC 808442EC 45010005 */ bc1t .L80844304 /* 120E0 808442F0 00000000 */ nop /* 120E4 808442F4 8E0C067C */ lw $t4, 0x067C($s0) ## 0000067C /* 120E8 808442F8 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 120EC 808442FC 51A00009 */ beql $t5, $zero, .L80844324 +/* 120EC 808442FC 51A00009 */ beql $t5, $zero, .L80844324 /* 120F0 80844300 3C014100 */ lui $at, 0x4100 ## $at = 41000000 .L80844304: -/* 120F4 80844304 0C210F85 */ jal func_80843E14 +/* 120F4 80844304 0C210F85 */ jal func_80843E14 /* 120F8 80844308 24056807 */ addiu $a1, $zero, 0x6807 ## $a1 = 00006807 /* 120FC 8084430C 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 12100 80844310 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB /* 12104 80844314 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 12108 80844318 01C17824 */ and $t7, $t6, $at +/* 12108 80844318 01C17824 */ and $t7, $t6, $at /* 1210C 8084431C AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C /* 12110 80844320 3C014100 */ lui $at, 0x4100 ## $at = 41000000 .L80844324: /* 12114 80844324 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 /* 12118 80844328 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1211C 8084432C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 12120 80844330 AFB80018 */ sw $t8, 0x0018($sp) +/* 12120 80844330 AFB80018 */ sw $t8, 0x0018($sp) /* 12124 80844334 24C63020 */ addiu $a2, $a2, 0x3020 ## $a2 = 04003020 -/* 12128 80844338 8FA40054 */ lw $a0, 0x0054($sp) -/* 1212C 8084433C 8FA50038 */ lw $a1, 0x0038($sp) +/* 12128 80844338 8FA40054 */ lw $a0, 0x0054($sp) +/* 1212C 8084433C 8FA50038 */ lw $a1, 0x0038($sp) /* 12130 80844340 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 12134 80844344 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 12138 80844348 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1213C 8084434C 0C028FC2 */ jal func_800A3F08 -/* 12140 80844350 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 12134 80844344 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 12138 80844348 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 1213C 8084434C 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 12140 80844350 E7AA001C */ swc1 $f10, 0x001C($sp) /* 12144 80844354 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 12148 80844358 100000E6 */ beq $zero, $zero, .L808446F4 +/* 12148 80844358 100000E6 */ beq $zero, $zero, .L808446F4 /* 1214C 8084435C A6190850 */ sh $t9, 0x0850($s0) ## 00000850 .L80844360: -/* 12150 80844360 54410019 */ bnel $v0, $at, .L808443C8 +/* 12150 80844360 54410019 */ bnel $v0, $at, .L808443C8 /* 12154 80844364 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 /* 12158 80844368 86080896 */ lh $t0, 0x0896($s0) ## 00000896 /* 1215C 8084436C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 12160 80844370 44818000 */ mtc1 $at, $f16 ## $f16 = 120.00 /* 12164 80844374 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 /* 12168 80844378 3C01438C */ lui $at, 0x438C ## $at = 438C0000 -/* 1216C 8084437C 46809120 */ cvt.s.w $f4, $f18 -/* 12170 80844380 4604803C */ c.lt.s $f16, $f4 +/* 1216C 8084437C 46809120 */ cvt.s.w $f4, $f18 +/* 12170 80844380 4604803C */ c.lt.s $f16, $f4 /* 12174 80844384 00000000 */ nop -/* 12178 80844388 4502000F */ bc1fl .L808443C8 +/* 12178 80844388 4502000F */ bc1fl .L808443C8 /* 1217C 8084438C 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 /* 12180 80844390 44813000 */ mtc1 $at, $f6 ## $f6 = 280.00 /* 12184 80844394 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 12188 80844398 C4283600 */ lwc1 $f8, %lo(D_80853600)($at) +/* 12188 80844398 C4283600 */ lwc1 $f8, %lo(D_80853600)($at) /* 1218C 8084439C 2409FFFE */ addiu $t1, $zero, 0xFFFE ## $t1 = FFFFFFFE /* 12190 808443A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12194 808443A4 4608303C */ c.lt.s $f6, $f8 +/* 12194 808443A4 4608303C */ c.lt.s $f6, $f8 /* 12198 808443A8 24056808 */ addiu $a1, $zero, 0x6808 ## $a1 = 00006808 -/* 1219C 808443AC 45020006 */ bc1fl .L808443C8 +/* 1219C 808443AC 45020006 */ bc1fl .L808443C8 /* 121A0 808443B0 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 121A4 808443B4 0C210F85 */ jal func_80843E14 +/* 121A4 808443B4 0C210F85 */ jal func_80843E14 /* 121A8 808443B8 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 /* 121AC 808443BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 121B0 808443C0 00000000 */ nop /* 121B4 808443C4 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 .L808443C8: /* 121B8 808443C8 314B0200 */ andi $t3, $t2, 0x0200 ## $t3 = 00000000 -/* 121BC 808443CC 516000CA */ beql $t3, $zero, .L808446F8 -/* 121C0 808443D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 121BC 808443CC 516000CA */ beql $t3, $zero, .L808446F8 +/* 121C0 808443D0 8FBF002C */ lw $ra, 0x002C($sp) /* 121C4 808443D4 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 -/* 121C8 808443D8 000C6B00 */ sll $t5, $t4, 12 -/* 121CC 808443DC 05A200C6 */ bltzl $t5, .L808446F8 -/* 121D0 808443E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 121C8 808443D8 000C6B00 */ sll $t5, $t4, 12 +/* 121CC 808443DC 05A200C6 */ bltzl $t5, .L808446F8 +/* 121D0 808443E0 8FBF002C */ lw $ra, 0x002C($sp) /* 121D4 808443E4 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 121D8 808443E8 3C010800 */ lui $at, 0x0800 ## $at = 08000000 /* 121DC 808443EC 34210800 */ ori $at, $at, 0x0800 ## $at = 08000800 -/* 121E0 808443F0 01C17824 */ and $t7, $t6, $at -/* 121E4 808443F4 55E000C0 */ bnel $t7, $zero, .L808446F8 -/* 121E8 808443F8 8FBF002C */ lw $ra, 0x002C($sp) +/* 121E0 808443F0 01C17824 */ and $t7, $t6, $at +/* 121E4 808443F4 55E000C0 */ bnel $t7, $zero, .L808446F8 +/* 121E8 808443F8 8FBF002C */ lw $ra, 0x002C($sp) /* 121EC 808443FC C60A0838 */ lwc1 $f10, 0x0838($s0) ## 00000838 /* 121F0 80844400 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 121F4 80844404 460A003C */ c.lt.s $f0, $f10 +/* 121F4 80844404 460A003C */ c.lt.s $f0, $f10 /* 121F8 80844408 00000000 */ nop -/* 121FC 8084440C 450200BA */ bc1fl .L808446F8 -/* 12200 80844410 8FBF002C */ lw $ra, 0x002C($sp) +/* 121FC 8084440C 450200BA */ bc1fl .L808446F8 +/* 12200 80844410 8FBF002C */ lw $ra, 0x002C($sp) /* 12204 80844414 44811000 */ mtc1 $at, $f2 ## $f2 = 150.00 /* 12208 80844418 C6000884 */ lwc1 $f0, 0x0884($s0) ## 00000884 -/* 1220C 8084441C 4600103E */ c.le.s $f2, $f0 +/* 1220C 8084441C 4600103E */ c.le.s $f2, $f0 /* 12210 80844420 00000000 */ nop -/* 12214 80844424 4502000E */ bc1fl .L80844460 +/* 12214 80844424 4502000E */ bc1fl .L80844460 /* 12218 80844428 9209088C */ lbu $t1, 0x088C($s0) ## 0000088C /* 1221C 8084442C 92180846 */ lbu $t8, 0x0846($s0) ## 00000846 /* 12220 80844430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12224 80844434 8FA50054 */ lw $a1, 0x0054($sp) -/* 12228 80844438 0218C821 */ addu $t9, $s0, $t8 +/* 12224 80844434 8FA50054 */ lw $a1, 0x0054($sp) +/* 12228 80844438 0218C821 */ addu $t9, $s0, $t8 /* 1222C 8084443C 8328084B */ lb $t0, 0x084B($t9) ## 0000084B /* 12230 80844440 3C068085 */ lui $a2, %hi(D_808535F0) ## $a2 = 80850000 -/* 12234 80844444 55000006 */ bnel $t0, $zero, .L80844460 +/* 12234 80844444 55000006 */ bnel $t0, $zero, .L80844460 /* 12238 80844448 9209088C */ lbu $t1, 0x088C($s0) ## 0000088C -/* 1223C 8084444C 0C20FB06 */ jal func_8083EC18 -/* 12240 80844450 8CC635F0 */ lw $a2, %lo(D_808535F0)($a2) -/* 12244 80844454 100000A8 */ beq $zero, $zero, .L808446F8 -/* 12248 80844458 8FBF002C */ lw $ra, 0x002C($sp) +/* 1223C 8084444C 0C20FB06 */ jal func_8083EC18 +/* 12240 80844450 8CC635F0 */ lw $a2, %lo(D_808535F0)($a2) +/* 12244 80844454 100000A8 */ beq $zero, $zero, .L808446F8 +/* 12248 80844458 8FBF002C */ lw $ra, 0x002C($sp) /* 1224C 8084445C 9209088C */ lbu $t1, 0x088C($s0) ## 0000088C .L80844460: -/* 12250 80844460 29210002 */ slti $at, $t1, 0x0002 -/* 12254 80844464 542000A4 */ bnel $at, $zero, .L808446F8 -/* 12258 80844468 8FBF002C */ lw $ra, 0x002C($sp) -/* 1225C 8084446C 4602003C */ c.lt.s $f0, $f2 +/* 12250 80844460 29210002 */ slti $at, $t1, 0x0002 +/* 12254 80844464 542000A4 */ bnel $at, $zero, .L808446F8 +/* 12258 80844468 8FBF002C */ lw $ra, 0x002C($sp) +/* 1225C 8084446C 4602003C */ c.lt.s $f0, $f2 /* 12260 80844470 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 12264 80844474 450200A0 */ bc1fl .L808446F8 -/* 12268 80844478 8FBF002C */ lw $ra, 0x002C($sp) +/* 12264 80844474 450200A0 */ bc1fl .L808446F8 +/* 12268 80844478 8FBF002C */ lw $ra, 0x002C($sp) /* 1226C 8084447C 8E0A0678 */ lw $t2, 0x0678($s0) ## 00000678 /* 12270 80844480 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 12274 80844484 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 /* 12278 80844488 44819000 */ mtc1 $at, $f18 ## $f18 = 70.00 /* 1227C 8084448C C5500008 */ lwc1 $f16, 0x0008($t2) ## 00000008 -/* 12280 80844490 46083281 */ sub.s $f10, $f6, $f8 -/* 12284 80844494 46109102 */ mul.s $f4, $f18, $f16 -/* 12288 80844498 46005480 */ add.s $f18, $f10, $f0 -/* 1228C 8084449C 4612203C */ c.lt.s $f4, $f18 +/* 12280 80844490 46083281 */ sub.s $f10, $f6, $f8 +/* 12284 80844494 46109102 */ mul.s $f4, $f18, $f16 +/* 12288 80844498 46005480 */ add.s $f18, $f10, $f0 +/* 1228C 8084449C 4612203C */ c.lt.s $f4, $f18 /* 12290 808444A0 00000000 */ nop -/* 12294 808444A4 45020094 */ bc1fl .L808446F8 -/* 12298 808444A8 8FBF002C */ lw $ra, 0x002C($sp) -/* 1229C 808444AC 0C028CC4 */ jal func_800A3310 -/* 122A0 808444B0 8FA40054 */ lw $a0, 0x0054($sp) +/* 12294 808444A4 45020094 */ bc1fl .L808446F8 +/* 12298 808444A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 1229C 808444AC 0C028CC4 */ jal func_800A3310 +/* 122A0 808444B0 8FA40054 */ lw $a0, 0x0054($sp) /* 122A4 808444B4 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C /* 122A8 808444B8 24056819 */ addiu $a1, $zero, 0x6819 ## $a1 = 00006819 /* 122AC 808444BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 122B0 808444C0 316C0004 */ andi $t4, $t3, 0x0004 ## $t4 = 00000000 -/* 122B4 808444C4 11800005 */ beq $t4, $zero, .L808444DC +/* 122B4 808444C4 11800005 */ beq $t4, $zero, .L808444DC /* 122B8 808444C8 00000000 */ nop -/* 122BC 808444CC 0C20C9A6 */ jal func_80832698 +/* 122BC 808444CC 0C20C9A6 */ jal func_80832698 /* 122C0 808444D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 122C4 808444D4 10000004 */ beq $zero, $zero, .L808444E8 +/* 122C4 808444D4 10000004 */ beq $zero, $zero, .L808444E8 /* 122C8 808444D8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 .L808444DC: -/* 122CC 808444DC 0C20C9A6 */ jal func_80832698 +/* 122CC 808444DC 0C20C9A6 */ jal func_80832698 /* 122D0 808444E0 24056803 */ addiu $a1, $zero, 0x6803 ## $a1 = 00006803 /* 122D4 808444E4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 .L808444E8: /* 122D8 808444E8 C6060884 */ lwc1 $f6, 0x0884($s0) ## 00000884 /* 122DC 808444EC 920D015B */ lbu $t5, 0x015B($s0) ## 0000015B /* 122E0 808444F0 3C0F8085 */ lui $t7, %hi(D_80853CBC) ## $t7 = 80850000 -/* 122E4 808444F4 46068200 */ add.s $f8, $f16, $f6 -/* 122E8 808444F8 000D7080 */ sll $t6, $t5, 2 -/* 122EC 808444FC 01EE7821 */ addu $t7, $t7, $t6 +/* 122E4 808444F4 46068200 */ add.s $f8, $f16, $f6 +/* 122E8 808444F8 000D7080 */ sll $t6, $t5, 2 +/* 122EC 808444FC 01EE7821 */ addu $t7, $t7, $t6 /* 122F0 80844500 8E060074 */ lw $a2, 0x0074($s0) ## 00000074 /* 122F4 80844504 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 122F8 80844508 8DEF3CBC */ lw $t7, %lo(D_80853CBC)($t7) +/* 122F8 80844508 8DEF3CBC */ lw $t7, %lo(D_80853CBC)($t7) /* 122FC 8084450C 8E070888 */ lw $a3, 0x0888($s0) ## 00000888 -/* 12300 80844510 8FA40054 */ lw $a0, 0x0054($sp) +/* 12300 80844510 8FA40054 */ lw $a0, 0x0054($sp) /* 12304 80844514 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12308 80844518 0C20E971 */ jal func_8083A5C4 -/* 1230C 8084451C AFAF0010 */ sw $t7, 0x0010($sp) +/* 12308 80844518 0C20E971 */ jal func_8083A5C4 +/* 1230C 8084451C AFAF0010 */ sw $t7, 0x0010($sp) /* 12310 80844520 8618083C */ lh $t8, 0x083C($s0) ## 0000083C /* 12314 80844524 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 12318 80844528 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1231C 8084452C 0301C821 */ addu $t9, $t8, $at +/* 1231C 8084452C 0301C821 */ addu $t9, $t8, $at /* 12320 80844530 A619083C */ sh $t9, 0x083C($s0) ## 0000083C /* 12324 80844534 8608083C */ lh $t0, 0x083C($s0) ## 0000083C /* 12328 80844538 352A2000 */ ori $t2, $t1, 0x2000 ## $t2 = 00002000 /* 1232C 8084453C AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -/* 12330 80844540 1000006C */ beq $zero, $zero, .L808446F4 +/* 12330 80844540 1000006C */ beq $zero, $zero, .L808446F4 /* 12334 80844544 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 /* 12338 80844548 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B .L8084454C: /* 1233C 8084454C 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 /* 12340 80844550 3C078085 */ lui $a3, %hi(D_80853A64) ## $a3 = 80850000 -/* 12344 80844554 000B6080 */ sll $t4, $t3, 2 -/* 12348 80844558 00EC3821 */ addu $a3, $a3, $t4 -/* 1234C 8084455C 000D7300 */ sll $t6, $t5, 12 -/* 12350 80844560 05C10015 */ bgez $t6, .L808445B8 -/* 12354 80844564 8CE73A64 */ lw $a3, %lo(D_80853A64)($a3) -/* 12358 80844568 0C023A71 */ jal func_8008E9C4 +/* 12344 80844554 000B6080 */ sll $t4, $t3, 2 +/* 12348 80844558 00EC3821 */ addu $a3, $a3, $t4 +/* 1234C 8084455C 000D7300 */ sll $t6, $t5, 12 +/* 12350 80844560 05C10015 */ bgez $t6, .L808445B8 +/* 12354 80844564 8CE73A64 */ lw $a3, %lo(D_80853A64)($a3) +/* 12358 80844568 0C023A71 */ jal func_8008E9C4 /* 1235C 8084456C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12360 80844570 5040000A */ beql $v0, $zero, .L8084459C +/* 12360 80844570 5040000A */ beql $v0, $zero, .L8084459C /* 12364 80844574 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 12368 80844578 820F084F */ lb $t7, 0x084F($s0) ## 0000084F /* 1236C 8084457C 3C078085 */ lui $a3, %hi(D_80853D54) ## $a3 = 80850000 -/* 12370 80844580 000FC080 */ sll $t8, $t7, 2 -/* 12374 80844584 030FC023 */ subu $t8, $t8, $t7 -/* 12378 80844588 0018C080 */ sll $t8, $t8, 2 -/* 1237C 8084458C 00F83821 */ addu $a3, $a3, $t8 -/* 12380 80844590 10000037 */ beq $zero, $zero, .L80844670 -/* 12384 80844594 8CE73D54 */ lw $a3, %lo(D_80853D54)($a3) +/* 12370 80844580 000FC080 */ sll $t8, $t7, 2 +/* 12374 80844584 030FC023 */ subu $t8, $t8, $t7 +/* 12378 80844588 0018C080 */ sll $t8, $t8, 2 +/* 1237C 8084458C 00F83821 */ addu $a3, $a3, $t8 +/* 12380 80844590 10000037 */ beq $zero, $zero, .L80844670 +/* 12384 80844594 8CE73D54 */ lw $a3, %lo(D_80853D54)($a3) /* 12388 80844598 8219084F */ lb $t9, 0x084F($s0) ## 0000084F .L8084459C: /* 1238C 8084459C 3C078085 */ lui $a3, %hi(D_80853D50) ## $a3 = 80850000 -/* 12390 808445A0 00194080 */ sll $t0, $t9, 2 -/* 12394 808445A4 01194023 */ subu $t0, $t0, $t9 -/* 12398 808445A8 00084080 */ sll $t0, $t0, 2 -/* 1239C 808445AC 00E83821 */ addu $a3, $a3, $t0 -/* 123A0 808445B0 1000002F */ beq $zero, $zero, .L80844670 -/* 123A4 808445B4 8CE73D50 */ lw $a3, %lo(D_80853D50)($a3) +/* 12390 808445A0 00194080 */ sll $t0, $t9, 2 +/* 12394 808445A4 01194023 */ subu $t0, $t0, $t9 +/* 12398 808445A8 00084080 */ sll $t0, $t0, 2 +/* 1239C 808445AC 00E83821 */ addu $a3, $a3, $t0 +/* 123A0 808445B0 1000002F */ beq $zero, $zero, .L80844670 +/* 123A4 808445B4 8CE73D50 */ lw $a3, %lo(D_80853D50)($a3) .L808445B8: /* 123A8 808445B8 8E0A01BC */ lw $t2, 0x01BC($s0) ## 000001BC /* 123AC 808445BC 3C090400 */ lui $t1, 0x0400 ## $t1 = 04000000 /* 123B0 808445C0 25293148 */ addiu $t1, $t1, 0x3148 ## $t1 = 04003148 -/* 123B4 808445C4 152A0004 */ bne $t1, $t2, .L808445D8 +/* 123B4 808445C4 152A0004 */ bne $t1, $t2, .L808445D8 /* 123B8 808445C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 123BC 808445CC 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 123C0 808445D0 10000027 */ beq $zero, $zero, .L80844670 +/* 123C0 808445D0 10000027 */ beq $zero, $zero, .L80844670 /* 123C4 808445D4 24E73150 */ addiu $a3, $a3, 0x3150 ## $a3 = 04003150 .L808445D8: -/* 123C8 808445D8 0C023A71 */ jal func_8008E9C4 -/* 123CC 808445DC AFA70040 */ sw $a3, 0x0040($sp) -/* 123D0 808445E0 10400008 */ beq $v0, $zero, .L80844604 -/* 123D4 808445E4 8FA70040 */ lw $a3, 0x0040($sp) +/* 123C8 808445D8 0C023A71 */ jal func_8008E9C4 +/* 123CC 808445DC AFA70040 */ sw $a3, 0x0040($sp) +/* 123D0 808445E0 10400008 */ beq $v0, $zero, .L80844604 +/* 123D4 808445E4 8FA70040 */ lw $a3, 0x0040($sp) /* 123D8 808445E8 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 /* 123DC 808445EC 24E72538 */ addiu $a3, $a3, 0x2538 ## $a3 = 04002538 -/* 123E0 808445F0 AFA70040 */ sw $a3, 0x0040($sp) -/* 123E4 808445F4 0C20CF0F */ jal func_80833C3C +/* 123E0 808445F0 AFA70040 */ sw $a3, 0x0040($sp) +/* 123E4 808445F4 0C20CF0F */ jal func_80833C3C /* 123E8 808445F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 123EC 808445FC 1000001C */ beq $zero, $zero, .L80844670 -/* 123F0 80844600 8FA70040 */ lw $a3, 0x0040($sp) +/* 123EC 808445FC 1000001C */ beq $zero, $zero, .L80844670 +/* 123F0 80844600 8FA70040 */ lw $a3, 0x0040($sp) .L80844604: /* 123F4 80844604 86020896 */ lh $v0, 0x0896($s0) ## 00000896 -/* 123F8 80844608 28410051 */ slti $at, $v0, 0x0051 -/* 123FC 8084460C 50200008 */ beql $at, $zero, .L80844630 -/* 12400 80844610 28410320 */ slti $at, $v0, 0x0320 +/* 123F8 80844608 28410051 */ slti $at, $v0, 0x0051 +/* 123FC 8084460C 50200008 */ beql $at, $zero, .L80844630 +/* 12400 80844610 28410320 */ slti $at, $v0, 0x0320 /* 12404 80844614 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B /* 12408 80844618 3C078085 */ lui $a3, %hi(D_80853A7C) ## $a3 = 80850000 -/* 1240C 8084461C 000B6080 */ sll $t4, $t3, 2 -/* 12410 80844620 00EC3821 */ addu $a3, $a3, $t4 -/* 12414 80844624 10000012 */ beq $zero, $zero, .L80844670 -/* 12418 80844628 8CE73A7C */ lw $a3, %lo(D_80853A7C)($a3) -/* 1241C 8084462C 28410320 */ slti $at, $v0, 0x0320 +/* 1240C 8084461C 000B6080 */ sll $t4, $t3, 2 +/* 12410 80844620 00EC3821 */ addu $a3, $a3, $t4 +/* 12414 80844624 10000012 */ beq $zero, $zero, .L80844670 +/* 12418 80844628 8CE73A7C */ lw $a3, %lo(D_80853A7C)($a3) +/* 1241C 8084462C 28410320 */ slti $at, $v0, 0x0320 .L80844630: -/* 12420 80844630 50200010 */ beql $at, $zero, .L80844674 -/* 12424 80844634 8FA40054 */ lw $a0, 0x0054($sp) +/* 12420 80844630 50200010 */ beql $at, $zero, .L80844674 +/* 12424 80844634 8FA40054 */ lw $a0, 0x0054($sp) /* 12428 80844638 920D0846 */ lbu $t5, 0x0846($s0) ## 00000846 -/* 1242C 8084463C 020D7021 */ addu $t6, $s0, $t5 +/* 1242C 8084463C 020D7021 */ addu $t6, $s0, $t5 /* 12430 80844640 81CF084B */ lb $t7, 0x084B($t6) ## 0000084B -/* 12434 80844644 55E0000B */ bnel $t7, $zero, .L80844674 -/* 12438 80844648 8FA40054 */ lw $a0, 0x0054($sp) +/* 12434 80844644 55E0000B */ bnel $t7, $zero, .L80844674 +/* 12438 80844648 8FA40054 */ lw $a0, 0x0054($sp) /* 1243C 8084464C 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C /* 12440 80844650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 12444 80844654 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 12448 80844658 57200006 */ bnel $t9, $zero, .L80844674 -/* 1244C 8084465C 8FA40054 */ lw $a0, 0x0054($sp) -/* 12450 80844660 0C20EF01 */ jal func_8083BC04 -/* 12454 80844664 8FA50054 */ lw $a1, 0x0054($sp) -/* 12458 80844668 10000023 */ beq $zero, $zero, .L808446F8 -/* 1245C 8084466C 8FBF002C */ lw $ra, 0x002C($sp) +/* 12448 80844658 57200006 */ bnel $t9, $zero, .L80844674 +/* 1244C 8084465C 8FA40054 */ lw $a0, 0x0054($sp) +/* 12450 80844660 0C20EF01 */ jal func_8083BC04 +/* 12454 80844664 8FA50054 */ lw $a1, 0x0054($sp) +/* 12458 80844668 10000023 */ beq $zero, $zero, .L808446F8 +/* 1245C 8084466C 8FBF002C */ lw $ra, 0x002C($sp) .L80844670: -/* 12460 80844670 8FA40054 */ lw $a0, 0x0054($sp) +/* 12460 80844670 8FA40054 */ lw $a0, 0x0054($sp) .L80844674: /* 12464 80844674 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12468 80844678 0C210F99 */ jal func_80843E64 -/* 1246C 8084467C AFA70040 */ sw $a3, 0x0040($sp) -/* 12470 80844680 8FA70040 */ lw $a3, 0x0040($sp) -/* 12474 80844684 18400016 */ blez $v0, .L808446E0 +/* 12468 80844678 0C210F99 */ jal func_80843E64 +/* 1246C 8084467C AFA70040 */ sw $a3, 0x0040($sp) +/* 12470 80844680 8FA70040 */ lw $a3, 0x0040($sp) +/* 12474 80844684 18400016 */ blez $v0, .L808446E0 /* 12478 80844688 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 /* 1247C 8084468C 9208015B */ lbu $t0, 0x015B($s0) ## 0000015B /* 12480 80844690 3C058085 */ lui $a1, %hi(D_80853A64) ## $a1 = 80850000 -/* 12484 80844694 AFA3003C */ sw $v1, 0x003C($sp) -/* 12488 80844698 00084880 */ sll $t1, $t0, 2 -/* 1248C 8084469C 00A92821 */ addu $a1, $a1, $t1 -/* 12490 808446A0 8CA53A64 */ lw $a1, %lo(D_80853A64)($a1) +/* 12484 80844694 AFA3003C */ sw $v1, 0x003C($sp) +/* 12488 80844698 00084880 */ sll $t1, $t0, 2 +/* 1248C 8084469C 00A92821 */ addu $a1, $a1, $t1 +/* 12490 808446A0 8CA53A64 */ lw $a1, %lo(D_80853A64)($a1) /* 12494 808446A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12498 808446A8 0C20E826 */ jal func_8083A098 -/* 1249C 808446AC 8FA60054 */ lw $a2, 0x0054($sp) +/* 12498 808446A8 0C20E826 */ jal func_8083A098 +/* 1249C 808446AC 8FA60054 */ lw $a2, 0x0054($sp) /* 124A0 808446B0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 124A4 808446B4 8FA3003C */ lw $v1, 0x003C($sp) +/* 124A4 808446B4 8FA3003C */ lw $v1, 0x003C($sp) /* 124A8 808446B8 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 /* 124AC 808446BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 124B0 808446C0 14610004 */ bne $v1, $at, .L808446D4 +/* 124B0 808446C0 14610004 */ bne $v1, $at, .L808446D4 /* 124B4 808446C4 E60A01C4 */ swc1 $f10, 0x01C4($s0) ## 000001C4 /* 124B8 808446C8 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 124BC 808446CC 10000009 */ beq $zero, $zero, .L808446F4 +/* 124BC 808446CC 10000009 */ beq $zero, $zero, .L808446F4 /* 124C0 808446D0 A60A0850 */ sh $t2, 0x0850($s0) ## 00000850 .L808446D4: /* 124C4 808446D4 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 124C8 808446D8 10000006 */ beq $zero, $zero, .L808446F4 +/* 124C8 808446D8 10000006 */ beq $zero, $zero, .L808446F4 /* 124CC 808446DC A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 .L808446E0: -/* 124D0 808446E0 14400004 */ bne $v0, $zero, .L808446F4 +/* 124D0 808446E0 14400004 */ bne $v0, $zero, .L808446F4 /* 124D4 808446E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 124D8 808446E8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 124DC 808446EC 0C20E826 */ jal func_8083A098 -/* 124E0 808446F0 8FA60054 */ lw $a2, 0x0054($sp) +/* 124DC 808446EC 0C20E826 */ jal func_8083A098 +/* 124E0 808446F0 8FA60054 */ lw $a2, 0x0054($sp) .L808446F4: -/* 124E4 808446F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 124E4 808446F4 8FBF002C */ lw $ra, 0x002C($sp) .L808446F8: -/* 124E8 808446F8 8FB00028 */ lw $s0, 0x0028($sp) +/* 124E8 808446F8 8FB00028 */ lw $s0, 0x0028($sp) /* 124EC 808446FC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 124F0 80844700 03E00008 */ jr $ra +/* 124F0 80844700 03E00008 */ jr $ra /* 124F4 80844704 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s index affbe2ced..7a05c2573 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s @@ -1,26 +1,26 @@ glabel func_80846660 /* 14450 80846660 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 14454 80846664 AFBF002C */ sw $ra, 0x002C($sp) -/* 14458 80846668 AFB00028 */ sw $s0, 0x0028($sp) +/* 14454 80846664 AFBF002C */ sw $ra, 0x002C($sp) +/* 14458 80846668 AFB00028 */ sw $s0, 0x0028($sp) /* 1445C 8084666C 3C068085 */ lui $a2, %hi(func_8084F710) ## $a2 = 80850000 /* 14460 80846670 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 14464 80846674 24C6F710 */ addiu $a2, $a2, %lo(func_8084F710) ## $a2 = 8084F710 -/* 14468 80846678 AFA40030 */ sw $a0, 0x0030($sp) -/* 1446C 8084667C 0C20D716 */ jal func_80835C58 +/* 14468 80846678 AFA40030 */ sw $a0, 0x0030($sp) +/* 1446C 8084667C 0C20D716 */ jal func_80835C58 /* 14470 80846680 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 14474 80846684 8FA40030 */ lw $a0, 0x0030($sp) +/* 14474 80846684 8FA40030 */ lw $a0, 0x0030($sp) /* 14478 80846688 24010057 */ addiu $at, $zero, 0x0057 ## $at = 00000057 /* 1447C 8084668C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 14480 80846690 848E00A4 */ lh $t6, 0x00A4($a0) ## 000000A4 /* 14484 80846694 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 14488 80846698 24C63298 */ addiu $a2, $a2, 0x3298 ## $a2 = 04003298 -/* 1448C 8084669C 15C10008 */ bne $t6, $at, .L808466C0 +/* 1448C 8084669C 15C10008 */ bne $t6, $at, .L808466C0 /* 14490 808466A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 14494 808466A4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 14498 808466A8 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 /* 1449C 808466AC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 144A0 808466B0 29E10004 */ slti $at, $t7, 0x0004 -/* 144A4 808466B4 54200003 */ bnel $at, $zero, .L808466C4 +/* 144A0 808466B0 29E10004 */ slti $at, $t7, 0x0004 +/* 144A4 808466B4 54200003 */ bnel $at, $zero, .L808466C4 /* 144A8 808466B8 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 144AC 808466BC A218084F */ sb $t8, 0x084F($s0) ## 0000084F .L808466C0: @@ -33,21 +33,21 @@ glabel func_80846660 /* 144C4 808466D4 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 /* 144C8 808466D8 44812000 */ mtc1 $at, $f4 ## $f4 = 24.00 /* 144CC 808466DC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 144D0 808466E0 AFA90018 */ sw $t1, 0x0018($sp) -/* 144D4 808466E4 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 144D8 808466E8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 144D0 808466E0 AFA90018 */ sw $t1, 0x0018($sp) +/* 144D4 808466E4 E7A0001C */ swc1 $f0, 0x001C($sp) +/* 144D8 808466E8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 144DC 808466EC 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 144E0 808466F0 0C028FC2 */ jal func_800A3F08 -/* 144E4 808466F4 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 144E0 808466F0 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 144E4 808466F4 E7A40014 */ swc1 $f4, 0x0014($sp) /* 144E8 808466F8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 144EC 808466FC 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 /* 144F0 80846700 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 144F4 80846704 46083280 */ add.s $f10, $f6, $f8 +/* 144F4 80846704 46083280 */ add.s $f10, $f6, $f8 /* 144F8 80846708 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 144FC 8084670C 8FBF002C */ lw $ra, 0x002C($sp) -/* 14500 80846710 8FB00028 */ lw $s0, 0x0028($sp) +/* 144FC 8084670C 8FBF002C */ lw $ra, 0x002C($sp) +/* 14500 80846710 8FB00028 */ lw $s0, 0x0028($sp) /* 14504 80846714 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 14508 80846718 03E00008 */ jr $ra +/* 14508 80846718 03E00008 */ jr $ra /* 1450C 8084671C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s index 29d336d62..95e4893dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s @@ -1,12 +1,12 @@ glabel func_808467D4 /* 145C4 808467D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 145C8 808467D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 145CC 808467DC AFB00028 */ sw $s0, 0x0028($sp) +/* 145C8 808467D8 AFBF002C */ sw $ra, 0x002C($sp) +/* 145CC 808467DC AFB00028 */ sw $s0, 0x0028($sp) /* 145D0 808467E0 3C068085 */ lui $a2, %hi(func_8084E9AC) ## $a2 = 80850000 /* 145D4 808467E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 145D8 808467E8 AFA40030 */ sw $a0, 0x0030($sp) +/* 145D8 808467E8 AFA40030 */ sw $a0, 0x0030($sp) /* 145DC 808467EC 24C6E9AC */ addiu $a2, $a2, %lo(func_8084E9AC) ## $a2 = 8084E9AC -/* 145E0 808467F0 0C20D716 */ jal func_80835C58 +/* 145E0 808467F0 0C20D716 */ jal func_80835C58 /* 145E4 808467F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 145E8 808467F8 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 145EC 808467FC 3C012000 */ lui $at, 0x2000 ## $at = 20000000 @@ -26,33 +26,33 @@ glabel func_808467D4 /* 14620 80846830 8D0600A0 */ lw $a2, 0x00A0($t0) ## 000000A0 /* 14624 80846834 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 14628 80846838 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 1462C 8084683C AFA90018 */ sw $t1, 0x0018($sp) +/* 1462C 8084683C AFA90018 */ sw $t1, 0x0018($sp) /* 14630 80846840 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 14634 80846844 8FA40030 */ lw $a0, 0x0030($sp) +/* 14634 80846844 8FA40030 */ lw $a0, 0x0030($sp) /* 14638 80846848 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1463C 8084684C E7A0001C */ swc1 $f0, 0x001C($sp) -/* 14640 80846850 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 14644 80846854 0C028FC2 */ jal func_800A3F08 -/* 14648 80846858 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1464C 8084685C 8FA40030 */ lw $a0, 0x0030($sp) +/* 1463C 8084684C E7A0001C */ swc1 $f0, 0x001C($sp) +/* 14640 80846850 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 14644 80846854 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 14648 80846858 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 1464C 8084685C 8FA40030 */ lw $a0, 0x0030($sp) /* 14650 80846860 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14654 80846864 0C20CBD5 */ jal func_80832F54 +/* 14654 80846864 0C20CBD5 */ jal func_80832F54 /* 14658 80846868 2406028F */ addiu $a2, $zero, 0x028F ## $a2 = 0000028F /* 1465C 8084686C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 14660 80846870 8D4AE664 */ lw $t2, -0x199C($t2) ## 8015E664 -/* 14664 80846874 8FA40030 */ lw $a0, 0x0030($sp) +/* 14664 80846874 8FA40030 */ lw $a0, 0x0030($sp) /* 14668 80846878 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1466C 8084687C 55400004 */ bnel $t2, $zero, .L80846890 +/* 1466C 8084687C 55400004 */ bnel $t2, $zero, .L80846890 /* 14670 80846880 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 14674 80846884 0C2119C8 */ jal func_80846720 +/* 14674 80846884 0C2119C8 */ jal func_80846720 /* 14678 80846888 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 1467C 8084688C 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 .L80846890: /* 14680 80846890 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -/* 14684 80846894 8FBF002C */ lw $ra, 0x002C($sp) -/* 14688 80846898 8FB00028 */ lw $s0, 0x0028($sp) +/* 14684 80846894 8FBF002C */ lw $ra, 0x002C($sp) +/* 14688 80846898 8FB00028 */ lw $s0, 0x0028($sp) /* 1468C 8084689C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 14690 808468A0 03E00008 */ jr $ra +/* 14690 808468A0 03E00008 */ jr $ra /* 14694 808468A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s index 04c7b0b14..cb66c1a07 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s @@ -2,51 +2,51 @@ glabel func_80846AAC /* 1489C 80846AAC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 148A0 80846AB0 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 /* 148A4 80846AB4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 148A8 80846AB8 AFB10028 */ sw $s1, 0x0028($sp) -/* 148AC 80846ABC 000E7880 */ sll $t7, $t6, 2 -/* 148B0 80846AC0 01EE7823 */ subu $t7, $t7, $t6 -/* 148B4 80846AC4 000F7880 */ sll $t7, $t7, 2 -/* 148B8 80846AC8 01EE7821 */ addu $t7, $t7, $t6 -/* 148BC 80846ACC 000F7880 */ sll $t7, $t7, 2 +/* 148A8 80846AB8 AFB10028 */ sw $s1, 0x0028($sp) +/* 148AC 80846ABC 000E7880 */ sll $t7, $t6, 2 +/* 148B0 80846AC0 01EE7823 */ subu $t7, $t7, $t6 +/* 148B4 80846AC4 000F7880 */ sll $t7, $t7, 2 +/* 148B8 80846AC8 01EE7821 */ addu $t7, $t7, $t6 +/* 148BC 80846ACC 000F7880 */ sll $t7, $t7, 2 /* 148C0 80846AD0 3C188085 */ lui $t8, %hi(D_80853428) ## $t8 = 80850000 -/* 148C4 80846AD4 01EE7821 */ addu $t7, $t7, $t6 +/* 148C4 80846AD4 01EE7821 */ addu $t7, $t7, $t6 /* 148C8 80846AD8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 148CC 80846ADC 000F7880 */ sll $t7, $t7, 2 +/* 148CC 80846ADC 000F7880 */ sll $t7, $t7, 2 /* 148D0 80846AE0 27183428 */ addiu $t8, $t8, %lo(D_80853428) ## $t8 = 80853428 -/* 148D4 80846AE4 AFBF002C */ sw $ra, 0x002C($sp) -/* 148D8 80846AE8 AFB00024 */ sw $s0, 0x0024($sp) -/* 148DC 80846AEC AFA60040 */ sw $a2, 0x0040($sp) -/* 148E0 80846AF0 01F8C821 */ addu $t9, $t7, $t8 +/* 148D4 80846AE4 AFBF002C */ sw $ra, 0x002C($sp) +/* 148D8 80846AE8 AFB00024 */ sw $s0, 0x0024($sp) +/* 148DC 80846AEC AFA60040 */ sw $a2, 0x0040($sp) +/* 148E0 80846AF0 01F8C821 */ addu $t9, $t7, $t8 /* 148E4 80846AF4 3C058085 */ lui $a1, %hi(D_80854708) ## $a1 = 80850000 /* 148E8 80846AF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 148EC 80846AFC AC990678 */ sw $t9, 0x0678($a0) ## 00000678 /* 148F0 80846B00 0C01E037 */ jal Actor_ProcessInitChain - + /* 148F4 80846B04 24A54708 */ addiu $a1, $a1, %lo(D_80854708) ## $a1 = 80854708 /* 148F8 80846B08 86090032 */ lh $t1, 0x0032($s0) ## 00000032 /* 148FC 80846B0C 2408001F */ addiu $t0, $zero, 0x001F ## $t0 = 0000001F /* 14900 80846B10 AE080670 */ sw $t0, 0x0670($s0) ## 00000670 /* 14904 80846B14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14908 80846B18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1490C 80846B1C 0C20D191 */ jal func_80834644 +/* 1490C 80846B1C 0C20D191 */ jal func_80834644 /* 14910 80846B20 A609083C */ sh $t1, 0x083C($s0) ## 0000083C /* 14914 80846B24 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B /* 14918 80846B28 3C078085 */ lui $a3, %hi(D_80853914) ## $a3 = 80850000 /* 1491C 80846B2C 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 -/* 14920 80846B30 000A5880 */ sll $t3, $t2, 2 -/* 14924 80846B34 00EB3821 */ addu $a3, $a3, $t3 +/* 14920 80846B30 000A5880 */ sll $t3, $t2, 2 +/* 14924 80846B34 00EB3821 */ addu $a3, $a3, $t3 /* 14928 80846B38 260D01F8 */ addiu $t5, $s0, 0x01F8 ## $t5 = 000001F8 /* 1492C 80846B3C 260E0288 */ addiu $t6, $s0, 0x0288 ## $t6 = 00000288 /* 14930 80846B40 240F0016 */ addiu $t7, $zero, 0x0016 ## $t7 = 00000016 -/* 14934 80846B44 AFAF001C */ sw $t7, 0x001C($sp) -/* 14938 80846B48 AFAE0018 */ sw $t6, 0x0018($sp) -/* 1493C 80846B4C AFAD0014 */ sw $t5, 0x0014($sp) -/* 14940 80846B50 8CE73914 */ lw $a3, %lo(D_80853914)($a3) -/* 14944 80846B54 AFAC0010 */ sw $t4, 0x0010($sp) +/* 14934 80846B44 AFAF001C */ sw $t7, 0x001C($sp) +/* 14938 80846B48 AFAE0018 */ sw $t6, 0x0018($sp) +/* 1493C 80846B4C AFAD0014 */ sw $t5, 0x0014($sp) +/* 14940 80846B50 8CE73914 */ lw $a3, %lo(D_80853914)($a3) +/* 14944 80846B54 AFAC0010 */ sw $t4, 0x0010($sp) /* 14948 80846B58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 1494C 80846B5C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 14950 80846B60 0C028E6B */ jal func_800A39AC -/* 14954 80846B64 8FA60040 */ lw $a2, 0x0040($sp) +/* 14950 80846B60 0C028E6B */ jal SkelAnime_InitLinkAnimetion +/* 14954 80846B64 8FA60040 */ lw $a2, 0x0040($sp) /* 14958 80846B68 3C188085 */ lui $t8, %hi(D_80854730) ## $t8 = 80850000 /* 1495C 80846B6C 27184730 */ addiu $t8, $t8, %lo(D_80854730) ## $t8 = 80854730 /* 14960 80846B70 8F080000 */ lw $t0, 0x0000($t8) ## 80854730 @@ -54,20 +54,20 @@ glabel func_80846AAC /* 14968 80846B78 AA0801F2 */ swl $t0, 0x01F2($s0) ## 000001F2 /* 1496C 80846B7C BA0801F5 */ swr $t0, 0x01F5($s0) ## 000001F5 /* 14970 80846B80 97080004 */ lhu $t0, 0x0004($t8) ## 80854734 -/* 14974 80846B84 0C20CCCE */ jal func_80833338 +/* 14974 80846B84 0C20CCCE */ jal func_80833338 /* 14978 80846B88 A60801F6 */ sh $t0, 0x01F6($s0) ## 000001F6 /* 1497C 80846B8C 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 /* 14980 80846B90 260A070C */ addiu $t2, $s0, 0x070C ## $t2 = 0000070C /* 14984 80846B94 260B079C */ addiu $t3, $s0, 0x079C ## $t3 = 0000079C /* 14988 80846B98 240C0016 */ addiu $t4, $zero, 0x0016 ## $t4 = 00000016 -/* 1498C 80846B9C AFAC001C */ sw $t4, 0x001C($sp) -/* 14990 80846BA0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 14994 80846BA4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 14998 80846BA8 AFA90010 */ sw $t1, 0x0010($sp) +/* 1498C 80846B9C AFAC001C */ sw $t4, 0x001C($sp) +/* 14990 80846BA0 AFAB0018 */ sw $t3, 0x0018($sp) +/* 14994 80846BA4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 14998 80846BA8 AFA90010 */ sw $t1, 0x0010($sp) /* 1499C 80846BAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 149A0 80846BB0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 149A4 80846BB4 8FA60040 */ lw $a2, 0x0040($sp) -/* 149A8 80846BB8 0C028E6B */ jal func_800A39AC +/* 149A4 80846BB4 8FA60040 */ lw $a2, 0x0040($sp) +/* 149A8 80846BB8 0C028E6B */ jal SkelAnime_InitLinkAnimetion /* 149AC 80846BBC 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 /* 149B0 80846BC0 3C0D8085 */ lui $t5, %hi(D_80854730) ## $t5 = 80850000 /* 149B4 80846BC4 25AD4730 */ addiu $t5, $t5, %lo(D_80854730) ## $t5 = 80854730 @@ -80,8 +80,8 @@ glabel func_80846AAC /* 149D0 80846BE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 149D4 80846BE4 26050670 */ addiu $a1, $s0, 0x0670 ## $a1 = 00000670 /* 149D8 80846BE8 A60F070A */ sh $t7, 0x070A($s0) ## 0000070A -/* 149DC 80846BEC AFB80014 */ sw $t8, 0x0014($sp) -/* 149E0 80846BF0 AFA00010 */ sw $zero, 0x0010($sp) +/* 149DC 80846BEC AFB80014 */ sw $t8, 0x0014($sp) +/* 149E0 80846BF0 AFA00010 */ sw $zero, 0x0010($sp) /* 149E4 80846BF4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 149E8 80846BF8 0C009B35 */ jal Effect_Add ## Effect_Add @@ -92,56 +92,56 @@ glabel func_80846AAC /* 149FC 80846C0C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 14A00 80846C10 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 14A04 80846C14 0C00AC78 */ jal ActorShape_Init - + /* 14A08 80846C18 8F270004 */ lw $a3, 0x0004($t9) ## 00000004 /* 14A0C 80846C1C 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF /* 14A10 80846C20 A608046C */ sh $t0, 0x046C($s0) ## 0000046C /* 14A14 80846C24 26050498 */ addiu $a1, $s0, 0x0498 ## $a1 = 00000498 -/* 14A18 80846C28 AFA50030 */ sw $a1, 0x0030($sp) +/* 14A18 80846C28 AFA50030 */ sw $a1, 0x0030($sp) /* 14A1C 80846C2C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 14A20 80846C30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A24 80846C34 3C078085 */ lui $a3, %hi(D_80854624) ## $a3 = 80850000 -/* 14A28 80846C38 8FA50030 */ lw $a1, 0x0030($sp) +/* 14A28 80846C38 8FA50030 */ lw $a1, 0x0030($sp) /* 14A2C 80846C3C 24E74624 */ addiu $a3, $a3, %lo(D_80854624) ## $a3 = 80854624 /* 14A30 80846C40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A34 80846C44 0C01712B */ jal ActorCollider_InitCylinder - + /* 14A38 80846C48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14A3C 80846C4C 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 -/* 14A40 80846C50 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A44 80846C54 0C017406 */ jal func_8005D018 +/* 14A40 80846C50 AFA50030 */ sw $a1, 0x0030($sp) +/* 14A44 80846C54 0C017406 */ jal func_8005D018 /* 14A48 80846C58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A4C 80846C5C 3C078085 */ lui $a3, %hi(D_80854650) ## $a3 = 80850000 -/* 14A50 80846C60 8FA50030 */ lw $a1, 0x0030($sp) +/* 14A50 80846C60 8FA50030 */ lw $a1, 0x0030($sp) /* 14A54 80846C64 24E74650 */ addiu $a3, $a3, %lo(D_80854650) ## $a3 = 80854650 /* 14A58 80846C68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A5C 80846C6C 0C017441 */ jal func_8005D104 +/* 14A5C 80846C6C 0C017441 */ jal func_8005D104 /* 14A60 80846C70 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14A64 80846C74 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 -/* 14A68 80846C78 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A6C 80846C7C 0C017406 */ jal func_8005D018 +/* 14A68 80846C78 AFA50030 */ sw $a1, 0x0030($sp) +/* 14A6C 80846C7C 0C017406 */ jal func_8005D018 /* 14A70 80846C80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A74 80846C84 3C078085 */ lui $a3, %hi(D_80854650) ## $a3 = 80850000 -/* 14A78 80846C88 8FA50030 */ lw $a1, 0x0030($sp) +/* 14A78 80846C88 8FA50030 */ lw $a1, 0x0030($sp) /* 14A7C 80846C8C 24E74650 */ addiu $a3, $a3, %lo(D_80854650) ## $a3 = 80854650 /* 14A80 80846C90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A84 80846C94 0C017441 */ jal func_8005D104 +/* 14A84 80846C94 0C017441 */ jal func_8005D104 /* 14A88 80846C98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14A8C 80846C9C 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 -/* 14A90 80846CA0 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A94 80846CA4 0C017406 */ jal func_8005D018 +/* 14A90 80846CA0 AFA50030 */ sw $a1, 0x0030($sp) +/* 14A94 80846CA4 0C017406 */ jal func_8005D018 /* 14A98 80846CA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A9C 80846CAC 3C078085 */ lui $a3, %hi(D_808546A0) ## $a3 = 80850000 -/* 14AA0 80846CB0 8FA50030 */ lw $a1, 0x0030($sp) +/* 14AA0 80846CB0 8FA50030 */ lw $a1, 0x0030($sp) /* 14AA4 80846CB4 24E746A0 */ addiu $a3, $a3, %lo(D_808546A0) ## $a3 = 808546A0 /* 14AA8 80846CB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14AAC 80846CBC 0C017441 */ jal func_8005D104 +/* 14AAC 80846CBC 0C017441 */ jal func_8005D104 /* 14AB0 80846CC0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 14AB4 80846CC4 8FBF002C */ lw $ra, 0x002C($sp) -/* 14AB8 80846CC8 8FB00024 */ lw $s0, 0x0024($sp) -/* 14ABC 80846CCC 8FB10028 */ lw $s1, 0x0028($sp) -/* 14AC0 80846CD0 03E00008 */ jr $ra +/* 14AB4 80846CC4 8FBF002C */ lw $ra, 0x002C($sp) +/* 14AB8 80846CC8 8FB00024 */ lw $s0, 0x0024($sp) +/* 14ABC 80846CCC 8FB10028 */ lw $s1, 0x0028($sp) +/* 14AC0 80846CD0 03E00008 */ jr $ra /* 14AC4 80846CD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s index 0328921d1..233edb27d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s @@ -1,118 +1,118 @@ glabel func_80848F9C /* 16D8C 80848F9C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 16D90 80848FA0 3C018086 */ lui $at, %hi(D_80858AB4) ## $at = 80860000 -/* 16D94 80848FA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 16D98 80848FA8 AFB00020 */ sw $s0, 0x0020($sp) -/* 16D9C 80848FAC AFA50084 */ sw $a1, 0x0084($sp) -/* 16DA0 80848FB0 AC268AB4 */ sw $a2, %lo(D_80858AB4)($at) +/* 16D94 80848FA4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 16D98 80848FA8 AFB00020 */ sw $s0, 0x0020($sp) +/* 16D9C 80848FAC AFA50084 */ sw $a1, 0x0084($sp) +/* 16DA0 80848FB0 AC268AB4 */ sw $a2, %lo(D_80858AB4)($at) /* 16DA4 80848FB4 80820A86 */ lb $v0, 0x0A86($a0) ## 00000A86 /* 16DA8 80848FB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 16DAC 80848FBC 04410009 */ bgez $v0, .L80848FE4 +/* 16DAC 80848FBC 04410009 */ bgez $v0, .L80848FE4 /* 16DB0 80848FC0 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 /* 16DB4 80848FC4 A08E0A86 */ sb $t6, 0x0A86($a0) ## 00000A86 /* 16DB8 80848FC8 808F0A86 */ lb $t7, 0x0A86($a0) ## 00000A86 /* 16DBC 80848FCC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 16DC0 80848FD0 55E00005 */ bnel $t7, $zero, .L80848FE8 +/* 16DC0 80848FD0 55E00005 */ bnel $t7, $zero, .L80848FE8 /* 16DC4 80848FD4 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 /* 16DC8 80848FD8 A0980A86 */ sb $t8, 0x0A86($a0) ## 00000A86 -/* 16DCC 80848FDC 0C01E221 */ jal func_80078884 +/* 16DCC 80848FDC 0C01E221 */ jal func_80078884 /* 16DD0 80848FE0 24045806 */ addiu $a0, $zero, 0x5806 ## $a0 = 00005806 .L80848FE4: /* 16DD4 80848FE4 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 .L80848FE8: -/* 16DD8 80848FE8 AFA50034 */ sw $a1, 0x0034($sp) +/* 16DD8 80848FE8 AFA50034 */ sw $a1, 0x0034($sp) /* 16DDC 80848FEC 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 16DE0 80848FF0 26040100 */ addiu $a0, $s0, 0x0100 ## $a0 = 00000100 /* 16DE4 80848FF4 92020A73 */ lbu $v0, 0x0A73($s0) ## 00000A73 /* 16DE8 80848FF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 16DEC 80848FFC 10400002 */ beq $v0, $zero, .L80849008 +/* 16DEC 80848FFC 10400002 */ beq $v0, $zero, .L80849008 /* 16DF0 80849000 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF /* 16DF4 80849004 A2190A73 */ sb $t9, 0x0A73($s0) ## 00000A73 .L80849008: /* 16DF8 80849008 9202088E */ lbu $v0, 0x088E($s0) ## 0000088E -/* 16DFC 8084900C 10400002 */ beq $v0, $zero, .L80849018 +/* 16DFC 8084900C 10400002 */ beq $v0, $zero, .L80849018 /* 16E00 80849010 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 16E04 80849014 A208088E */ sb $t0, 0x088E($s0) ## 0000088E .L80849018: /* 16E08 80849018 92020A87 */ lbu $v0, 0x0A87($s0) ## 00000A87 -/* 16E0C 8084901C 10400002 */ beq $v0, $zero, .L80849028 +/* 16E0C 8084901C 10400002 */ beq $v0, $zero, .L80849028 /* 16E10 80849020 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF /* 16E14 80849024 A2090A87 */ sb $t1, 0x0A87($s0) ## 00000A87 .L80849028: /* 16E18 80849028 82020A78 */ lb $v0, 0x0A78($s0) ## 00000A78 -/* 16E1C 8084902C 04410003 */ bgez $v0, .L8084903C +/* 16E1C 8084902C 04410003 */ bgez $v0, .L8084903C /* 16E20 80849030 244A0001 */ addiu $t2, $v0, 0x0001 ## $t2 = 00000001 -/* 16E24 80849034 10000004 */ beq $zero, $zero, .L80849048 +/* 16E24 80849034 10000004 */ beq $zero, $zero, .L80849048 /* 16E28 80849038 A20A0A78 */ sb $t2, 0x0A78($s0) ## 00000A78 .L8084903C: -/* 16E2C 8084903C 18400002 */ blez $v0, .L80849048 +/* 16E2C 8084903C 18400002 */ blez $v0, .L80849048 /* 16E30 80849040 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF /* 16E34 80849044 A20B0A78 */ sb $t3, 0x0A78($s0) ## 00000A78 .L80849048: /* 16E38 80849048 92020890 */ lbu $v0, 0x0890($s0) ## 00000890 -/* 16E3C 8084904C 10400002 */ beq $v0, $zero, .L80849058 +/* 16E3C 8084904C 10400002 */ beq $v0, $zero, .L80849058 /* 16E40 80849050 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF /* 16E44 80849054 A20C0890 */ sb $t4, 0x0890($s0) ## 00000890 .L80849058: -/* 16E48 80849058 0C211CF5 */ jal func_808473D4 -/* 16E4C 8084905C 8FA40084 */ lw $a0, 0x0084($sp) +/* 16E48 80849058 0C211CF5 */ jal func_808473D4 +/* 16E4C 8084905C 8FA40084 */ lw $a0, 0x0084($sp) /* 16E50 80849060 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 16E54 80849064 0C20DAFB */ jal func_80836BEC -/* 16E58 80849068 8FA50084 */ lw $a1, 0x0084($sp) +/* 16E54 80849064 0C20DAFB */ jal func_80836BEC +/* 16E58 80849068 8FA50084 */ lw $a1, 0x0084($sp) /* 16E5C 8084906C 82020151 */ lb $v0, 0x0151($s0) ## 00000151 /* 16E60 80849070 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 16E64 80849074 5441000A */ bnel $v0, $at, .L808490A0 +/* 16E64 80849074 5441000A */ bnel $v0, $at, .L808490A0 /* 16E68 80849078 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 16E6C 8084907C 860D0860 */ lh $t5, 0x0860($s0) ## 00000860 -/* 16E70 80849080 8FA40084 */ lw $a0, 0x0084($sp) -/* 16E74 80849084 51A00006 */ beql $t5, $zero, .L808490A0 +/* 16E70 80849080 8FA40084 */ lw $a0, 0x0084($sp) +/* 16E74 80849084 51A00006 */ beql $t5, $zero, .L808490A0 /* 16E78 80849088 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 16E7C 8084908C 0C212281 */ jal func_80848A04 +/* 16E7C 8084908C 0C212281 */ jal func_80848A04 /* 16E80 80849090 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 16E84 80849094 10000009 */ beq $zero, $zero, .L808490BC +/* 16E84 80849094 10000009 */ beq $zero, $zero, .L808490BC /* 16E88 80849098 920F0891 */ lbu $t7, 0x0891($s0) ## 00000891 /* 16E8C 8084909C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L808490A0: -/* 16E90 808490A0 54410006 */ bnel $v0, $at, .L808490BC +/* 16E90 808490A0 54410006 */ bnel $v0, $at, .L808490BC /* 16E94 808490A4 920F0891 */ lbu $t7, 0x0891($s0) ## 00000891 /* 16E98 808490A8 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -/* 16E9C 808490AC 04410002 */ bgez $v0, .L808490B8 +/* 16E9C 808490AC 04410002 */ bgez $v0, .L808490B8 /* 16EA0 808490B0 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 /* 16EA4 808490B4 A60E0860 */ sh $t6, 0x0860($s0) ## 00000860 .L808490B8: /* 16EA8 808490B8 920F0891 */ lbu $t7, 0x0891($s0) ## 00000891 .L808490BC: -/* 16EAC 808490BC 51E00005 */ beql $t7, $zero, .L808490D4 +/* 16EAC 808490BC 51E00005 */ beql $t7, $zero, .L808490D4 /* 16EB0 808490C0 92180A60 */ lbu $t8, 0x0A60($s0) ## 00000A60 -/* 16EB4 808490C4 8FA40084 */ lw $a0, 0x0084($sp) -/* 16EB8 808490C8 0C2122D1 */ jal func_80848B44 +/* 16EB4 808490C4 8FA40084 */ lw $a0, 0x0084($sp) +/* 16EB8 808490C8 0C2122D1 */ jal func_80848B44 /* 16EBC 808490CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16EC0 808490D0 92180A60 */ lbu $t8, 0x0A60($s0) ## 00000A60 .L808490D4: -/* 16EC4 808490D4 53000005 */ beql $t8, $zero, .L808490EC +/* 16EC4 808490D4 53000005 */ beql $t8, $zero, .L808490EC /* 16EC8 808490D8 92190692 */ lbu $t9, 0x0692($s0) ## 00000692 -/* 16ECC 808490DC 8FA40084 */ lw $a0, 0x0084($sp) -/* 16ED0 808490E0 0C21231D */ jal func_80848C74 +/* 16ECC 808490DC 8FA40084 */ lw $a0, 0x0084($sp) +/* 16ED0 808490E0 0C21231D */ jal func_80848C74 /* 16ED4 808490E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16ED8 808490E8 92190692 */ lbu $t9, 0x0692($s0) ## 00000692 .L808490EC: /* 16EDC 808490EC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 16EE0 808490F0 33280040 */ andi $t0, $t9, 0x0040 ## $t0 = 00000000 -/* 16EE4 808490F4 51000012 */ beql $t0, $zero, .L80849140 +/* 16EE4 808490F4 51000012 */ beql $t0, $zero, .L80849140 /* 16EE8 808490F8 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 /* 16EEC 808490FC 8529FA28 */ lh $t1, -0x05D8($t1) ## 8015FA28 /* 16EF0 80849100 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 16EF4 80849104 5120000E */ beql $t1, $zero, .L80849140 +/* 16EF4 80849104 5120000E */ beql $t1, $zero, .L80849140 /* 16EF8 80849108 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 /* 16EFC 8084910C 854AFA50 */ lh $t2, -0x05B0($t2) ## 8015FA50 /* 16F00 80849110 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 /* 16F04 80849114 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 16F08 80849118 15400008 */ bne $t2, $zero, .L8084913C +/* 16F08 80849118 15400008 */ bne $t2, $zero, .L8084913C /* 16F0C 8084911C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16F10 80849120 A42BFA50 */ sh $t3, -0x05B0($at) ## 8015FA50 -/* 16F14 80849124 8FA40084 */ lw $a0, 0x0084($sp) -/* 16F18 80849128 0C211A80 */ jal func_80846A00 +/* 16F14 80849124 8FA40084 */ lw $a0, 0x0084($sp) +/* 16F18 80849128 0C211A80 */ jal func_80846A00 /* 16F1C 8084912C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 16F20 80849130 920C0692 */ lbu $t4, 0x0692($s0) ## 00000692 /* 16F24 80849134 318DFFBF */ andi $t5, $t4, 0xFFBF ## $t5 = 00000000 @@ -121,98 +121,98 @@ glabel func_80848F9C /* 16F2C 8084913C 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 .L80849140: /* 16F30 80849140 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 -/* 16F34 80849144 51E00010 */ beql $t7, $zero, .L80849188 +/* 16F34 80849144 51E00010 */ beql $t7, $zero, .L80849188 /* 16F38 80849148 82030153 */ lb $v1, 0x0153($s0) ## 00000153 /* 16F3C 8084914C 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 16F40 80849150 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 16F44 80849154 57200006 */ bnel $t9, $zero, .L80849170 -/* 16F48 80849158 8FA40084 */ lw $a0, 0x0084($sp) -/* 16F4C 8084915C 0C20C884 */ jal func_80832210 +/* 16F44 80849154 57200006 */ bnel $t9, $zero, .L80849170 +/* 16F48 80849158 8FA40084 */ lw $a0, 0x0084($sp) +/* 16F4C 8084915C 0C20C884 */ jal func_80832210 /* 16F50 80849160 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 16F54 80849164 0C00B638 */ jal Actor_MoveForward - + /* 16F58 80849168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 16F5C 8084916C 8FA40084 */ lw $a0, 0x0084($sp) +/* 16F5C 8084916C 8FA40084 */ lw $a0, 0x0084($sp) .L80849170: -/* 16F60 80849170 0C211EE8 */ jal func_80847BA0 +/* 16F60 80849170 0C211EE8 */ jal func_80847BA0 /* 16F64 80849174 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16F68 80849178 26080498 */ addiu $t0, $s0, 0x0498 ## $t0 = 00000498 -/* 16F6C 8084917C 10000322 */ beq $zero, $zero, .L80849E08 -/* 16F70 80849180 AFA8002C */ sw $t0, 0x002C($sp) +/* 16F6C 8084917C 10000322 */ beq $zero, $zero, .L80849E08 +/* 16F70 80849180 AFA8002C */ sw $t0, 0x002C($sp) /* 16F74 80849184 82030153 */ lb $v1, 0x0153($s0) ## 00000153 .L80849188: /* 16F78 80849188 8202014F */ lb $v0, 0x014F($s0) ## 0000014F -/* 16F7C 8084918C 10620029 */ beq $v1, $v0, .L80849234 +/* 16F7C 8084918C 10620029 */ beq $v1, $v0, .L80849234 /* 16F80 80849190 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 16F84 80849194 54410015 */ bnel $v0, $at, .L808491EC +/* 16F84 80849194 54410015 */ bnel $v0, $at, .L808491EC /* 16F88 80849198 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 16F8C 8084919C 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 16F90 808491A0 8FA40084 */ lw $a0, 0x0084($sp) -/* 16F94 808491A4 00095100 */ sll $t2, $t1, 4 -/* 16F98 808491A8 0541000D */ bgez $t2, .L808491E0 +/* 16F90 808491A0 8FA40084 */ lw $a0, 0x0084($sp) +/* 16F94 808491A4 00095100 */ sll $t2, $t1, 4 +/* 16F98 808491A8 0541000D */ bgez $t2, .L808491E0 /* 16F9C 808491AC 00000000 */ nop -/* 16FA0 808491B0 0C20C8D0 */ jal func_80832340 +/* 16FA0 808491B0 0C20C8D0 */ jal func_80832340 /* 16FA4 808491B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16FA8 808491B8 8E0B0678 */ lw $t3, 0x0678($s0) ## 00000678 /* 16FAC 808491BC C6060084 */ lwc1 $f6, 0x0084($s0) ## 00000084 /* 16FB0 808491C0 C564002C */ lwc1 $f4, 0x002C($t3) ## 0000002C -/* 16FB4 808491C4 4606203C */ c.lt.s $f4, $f6 +/* 16FB4 808491C4 4606203C */ c.lt.s $f4, $f6 /* 16FB8 808491C8 00000000 */ nop -/* 16FBC 808491CC 45000004 */ bc1f .L808491E0 +/* 16FBC 808491CC 45000004 */ bc1f .L808491E0 /* 16FC0 808491D0 00000000 */ nop /* 16FC4 808491D4 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 /* 16FC8 808491D8 358D0400 */ ori $t5, $t4, 0x0400 ## $t5 = 00000400 /* 16FCC 808491DC AE0D0680 */ sw $t5, 0x0680($s0) ## 00000680 .L808491E0: -/* 16FD0 808491E0 10000013 */ beq $zero, $zero, .L80849230 +/* 16FD0 808491E0 10000013 */ beq $zero, $zero, .L80849230 /* 16FD4 808491E4 8202014F */ lb $v0, 0x014F($s0) ## 0000014F /* 16FD8 808491E8 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C .L808491EC: /* 16FDC 808491EC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 16FE0 808491F0 000E7900 */ sll $t7, $t6, 4 -/* 16FE4 808491F4 05E3000F */ bgezl $t7, .L80849234 +/* 16FE0 808491F0 000E7900 */ sll $t7, $t6, 4 +/* 16FE4 808491F4 05E3000F */ bgezl $t7, .L80849234 /* 16FE8 808491F8 A2020153 */ sb $v0, 0x0153($s0) ## 00000153 -/* 16FEC 808491FC 10610005 */ beq $v1, $at, .L80849214 -/* 16FF0 80849200 8FA40084 */ lw $a0, 0x0084($sp) +/* 16FEC 808491FC 10610005 */ beq $v1, $at, .L80849214 +/* 16FF0 80849200 8FA40084 */ lw $a0, 0x0084($sp) /* 16FF4 80849204 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 16FF8 80849208 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 16FFC 8084920C 53200009 */ beql $t9, $zero, .L80849234 +/* 16FFC 8084920C 53200009 */ beql $t9, $zero, .L80849234 /* 17000 80849210 A2020153 */ sb $v0, 0x0153($s0) ## 00000153 .L80849214: -/* 17004 80849214 0C20F4DB */ jal func_8083D36C +/* 17004 80849214 0C20F4DB */ jal func_8083D36C /* 17008 80849218 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1700C 8084921C 8E080680 */ lw $t0, 0x0680($s0) ## 00000680 /* 17010 80849220 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF /* 17014 80849224 8202014F */ lb $v0, 0x014F($s0) ## 0000014F -/* 17018 80849228 01014824 */ and $t1, $t0, $at +/* 17018 80849228 01014824 */ and $t1, $t0, $at /* 1701C 8084922C AE090680 */ sw $t1, 0x0680($s0) ## 00000680 .L80849230: /* 17020 80849230 A2020153 */ sb $v0, 0x0153($s0) ## 00000153 .L80849234: /* 17024 80849234 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -/* 17028 80849238 5540001A */ bnel $t2, $zero, .L808492A4 +/* 17028 80849238 5540001A */ bnel $t2, $zero, .L808492A4 /* 1702C 8084923C 82020844 */ lb $v0, 0x0844($s0) ## 00000844 /* 17030 80849240 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 17034 80849244 000B6200 */ sll $t4, $t3, 8 -/* 17038 80849248 05830016 */ bgezl $t4, .L808492A4 +/* 17034 80849244 000B6200 */ sll $t4, $t3, 8 +/* 17038 80849248 05830016 */ bgezl $t4, .L808492A4 /* 1703C 8084924C 82020844 */ lb $v0, 0x0844($s0) ## 00000844 /* 17040 80849250 8E0D0440 */ lw $t5, 0x0440($s0) ## 00000440 /* 17044 80849254 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17048 80849258 AE0D0118 */ sw $t5, 0x0118($s0) ## 00000118 -/* 1704C 8084925C 0C20E8D8 */ jal func_8083A360 -/* 17050 80849260 8FA40084 */ lw $a0, 0x0084($sp) +/* 1704C 8084925C 0C20E8D8 */ jal func_8083A360 +/* 17050 80849260 8FA40084 */ lw $a0, 0x0084($sp) /* 17054 80849264 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 17058 80849268 3C010080 */ lui $at, 0x0080 ## $at = 00800000 /* 1705C 8084926C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 17060 80849270 01C17825 */ or $t7, $t6, $at ## $t7 = 00800000 /* 17064 80849274 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -/* 17068 80849278 8FA40084 */ lw $a0, 0x0084($sp) +/* 17068 80849278 8FA40084 */ lw $a0, 0x0084($sp) /* 1706C 8084927C 24C633B8 */ addiu $a2, $a2, 0x33B8 ## $a2 = 040033B8 -/* 17070 80849280 0C20C899 */ jal func_80832264 +/* 17070 80849280 0C20C899 */ jal func_80832264 /* 17074 80849284 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17078 80849288 8FA40084 */ lw $a0, 0x0084($sp) +/* 17078 80849288 8FA40084 */ lw $a0, 0x0084($sp) /* 1707C 8084928C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17080 80849290 0C20CBD5 */ jal func_80832F54 +/* 17080 80849290 0C20CBD5 */ jal func_80832F54 /* 17084 80849294 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B /* 17088 80849298 24180063 */ addiu $t8, $zero, 0x0063 ## $t8 = 00000063 /* 1708C 8084929C A6180850 */ sh $t8, 0x0850($s0) ## 00000850 @@ -220,127 +220,127 @@ glabel func_80848F9C .L808492A4: /* 17094 808492A4 260406C2 */ addiu $a0, $s0, 0x06C2 ## $a0 = 000006C2 /* 17098 808492A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1709C 808492AC 14400003 */ bne $v0, $zero, .L808492BC +/* 1709C 808492AC 14400003 */ bne $v0, $zero, .L808492BC /* 170A0 808492B0 00000000 */ nop -/* 170A4 808492B4 10000007 */ beq $zero, $zero, .L808492D4 +/* 170A4 808492B4 10000007 */ beq $zero, $zero, .L808492D4 /* 170A8 808492B8 A2000845 */ sb $zero, 0x0845($s0) ## 00000845 .L808492BC: -/* 170AC 808492BC 04410004 */ bgez $v0, .L808492D0 +/* 170AC 808492BC 04410004 */ bgez $v0, .L808492D0 /* 170B0 808492C0 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 170B4 808492C4 24590001 */ addiu $t9, $v0, 0x0001 ## $t9 = 00000001 -/* 170B8 808492C8 10000002 */ beq $zero, $zero, .L808492D4 +/* 170B8 808492C8 10000002 */ beq $zero, $zero, .L808492D4 /* 170BC 808492CC A2190844 */ sb $t9, 0x0844($s0) ## 00000844 .L808492D0: /* 170C0 808492D0 A2080844 */ sb $t0, 0x0844($s0) ## 00000844 .L808492D4: /* 170C4 808492D4 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 170C8 808492D8 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 /* 170CC 808492DC 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 /* 170D0 808492E0 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 170D4 808492E4 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 170D8 808492E8 0C00CB2D */ jal func_80032CB4 +/* 170D8 808492E8 0C00CB2D */ jal func_80032CB4 /* 170DC 808492EC 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 170E0 808492F0 8FA90084 */ lw $t1, 0x0084($sp) +/* 170E0 808492F0 8FA90084 */ lw $t1, 0x0084($sp) /* 170E4 808492F4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 170E8 808492F8 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 170EC 808492FC 01215021 */ addu $t2, $t1, $at -/* 170F0 80849300 AFAA002C */ sw $t2, 0x002C($sp) -/* 170F4 80849304 01695821 */ addu $t3, $t3, $t1 +/* 170EC 808492FC 01215021 */ addu $t2, $t1, $at +/* 170F0 80849300 AFAA002C */ sw $t2, 0x002C($sp) +/* 170F4 80849304 01695821 */ addu $t3, $t3, $t1 /* 170F8 80849308 8D6B1DE4 */ lw $t3, 0x1DE4($t3) ## 00011DE4 /* 170FC 8084930C 316C0020 */ andi $t4, $t3, 0x0020 ## $t4 = 00000000 -/* 17100 80849310 51800004 */ beql $t4, $zero, .L80849324 +/* 17100 80849310 51800004 */ beql $t4, $zero, .L80849324 /* 17104 80849314 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 17108 80849318 10000002 */ beq $zero, $zero, .L80849324 +/* 17108 80849318 10000002 */ beq $zero, $zero, .L80849324 /* 1710C 8084931C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 17110 80849320 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 .L80849324: /* 17114 80849324 860D03A8 */ lh $t5, 0x03A8($s0) ## 000003A8 /* 17118 80849328 920F015F */ lbu $t7, 0x015F($s0) ## 0000015F /* 1711C 8084932C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 17120 80849330 00CD7021 */ addu $t6, $a2, $t5 -/* 17124 80849334 15E10003 */ bne $t7, $at, .L80849344 +/* 17120 80849330 00CD7021 */ addu $t6, $a2, $t5 +/* 17124 80849334 15E10003 */ bne $t7, $at, .L80849344 /* 17128 80849338 A60E00BA */ sh $t6, 0x00BA($s0) ## 000000BA -/* 1712C 8084933C 0C21400B */ jal func_8085002C +/* 1712C 8084933C 0C21400B */ jal func_8085002C /* 17130 80849340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80849344: -/* 17134 80849344 0C00B75B */ jal func_8002DD6C +/* 17134 80849344 0C00B75B */ jal func_8002DD6C /* 17138 80849348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1713C 8084934C 50400004 */ beql $v0, $zero, .L80849360 +/* 1713C 8084934C 50400004 */ beql $v0, $zero, .L80849360 /* 17140 80849350 921801E9 */ lbu $t8, 0x01E9($s0) ## 000001E9 -/* 17144 80849354 0C213FDF */ jal func_8084FF7C +/* 17144 80849354 0C213FDF */ jal func_8084FF7C /* 17148 80849358 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1714C 8084935C 921801E9 */ lbu $t8, 0x01E9($s0) ## 000001E9 .L80849360: /* 17150 80849360 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 -/* 17154 80849364 172000A8 */ bne $t9, $zero, .L80849608 +/* 17154 80849364 172000A8 */ bne $t9, $zero, .L80849608 /* 17158 80849368 00000000 */ nop /* 1715C 8084936C 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 /* 17160 80849370 3C098085 */ lui $t1, %hi(D_808535E4) ## $t1 = 80850000 /* 17164 80849374 310A0001 */ andi $t2, $t0, 0x0001 ## $t2 = 00000000 -/* 17168 80849378 5140000A */ beql $t2, $zero, .L808493A4 +/* 17168 80849378 5140000A */ beql $t2, $zero, .L808493A4 /* 1716C 8084937C 820C014F */ lb $t4, 0x014F($s0) ## 0000014F -/* 17170 80849380 8D2935E4 */ lw $t1, %lo(D_808535E4)($t1) +/* 17170 80849380 8D2935E4 */ lw $t1, %lo(D_808535E4)($t1) /* 17174 80849384 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 17178 80849388 55210006 */ bnel $t1, $at, .L808493A4 +/* 17178 80849388 55210006 */ bnel $t1, $at, .L808493A4 /* 1717C 8084938C 820C014F */ lb $t4, 0x014F($s0) ## 0000014F /* 17180 80849390 820B014F */ lb $t3, 0x014F($s0) ## 0000014F /* 17184 80849394 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 17188 80849398 5561000B */ bnel $t3, $at, .L808493C8 +/* 17188 80849398 5561000B */ bnel $t3, $at, .L808493C8 /* 1718C 8084939C 8607083C */ lh $a3, 0x083C($s0) ## 0000083C /* 17190 808493A0 820C014F */ lb $t4, 0x014F($s0) ## 0000014F .L808493A4: /* 17194 808493A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 17198 808493A8 55810064 */ bnel $t4, $at, .L8084953C +/* 17198 808493A8 55810064 */ bnel $t4, $at, .L8084953C /* 1719C 808493AC C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 /* 171A0 808493B0 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C /* 171A4 808493B4 3C012800 */ lui $at, 0x2800 ## $at = 28000000 -/* 171A8 808493B8 01A17024 */ and $t6, $t5, $at -/* 171AC 808493BC 55C0005F */ bnel $t6, $zero, .L8084953C +/* 171A8 808493B8 01A17024 */ and $t6, $t5, $at +/* 171AC 808493BC 55C0005F */ bnel $t6, $zero, .L8084953C /* 171B0 808493C0 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 /* 171B4 808493C4 8607083C */ lh $a3, 0x083C($s0) ## 0000083C .L808493C8: /* 171B8 808493C8 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 /* 171BC 808493CC C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 /* 171C0 808493D0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 171C4 808493D4 01E71023 */ subu $v0, $t7, $a3 -/* 171C8 808493D8 00021400 */ sll $v0, $v0, 16 -/* 171CC 808493DC 00021403 */ sra $v0, $v0, 16 -/* 171D0 808493E0 04400003 */ bltz $v0, .L808493F0 -/* 171D4 808493E4 00023023 */ subu $a2, $zero, $v0 -/* 171D8 808493E8 10000001 */ beq $zero, $zero, .L808493F0 +/* 171C4 808493D4 01E71023 */ subu $v0, $t7, $a3 +/* 171C8 808493D8 00021400 */ sll $v0, $v0, 16 +/* 171CC 808493DC 00021403 */ sra $v0, $v0, 16 +/* 171D0 808493E0 04400003 */ bltz $v0, .L808493F0 +/* 171D4 808493E4 00023023 */ subu $a2, $zero, $v0 +/* 171D8 808493E8 10000001 */ beq $zero, $zero, .L808493F0 /* 171DC 808493EC 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 .L808493F0: -/* 171E0 808493F0 28C16001 */ slti $at, $a2, 0x6001 -/* 171E4 808493F4 1420000C */ bne $at, $zero, .L80849428 +/* 171E0 808493F0 28C16001 */ slti $at, $a2, 0x6001 +/* 171E4 808493F4 1420000C */ bne $at, $zero, .L80849428 /* 171E8 808493F8 3C063EB3 */ lui $a2, 0x3EB3 ## $a2 = 3EB30000 /* 171EC 808493FC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 171F0 80849400 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 171F4 80849404 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 171F8 80849408 460A4032 */ c.eq.s $f8, $f10 +/* 171F8 80849408 460A4032 */ c.eq.s $f8, $f10 /* 171FC 8084940C 00000000 */ nop -/* 17200 80849410 45030006 */ bc1tl .L8084942C -/* 17204 80849414 44050000 */ mfc1 $a1, $f0 -/* 17208 80849418 00E13821 */ addu $a3, $a3, $at -/* 1720C 8084941C 00073C00 */ sll $a3, $a3, 16 +/* 17200 80849410 45030006 */ bc1tl .L8084942C +/* 17204 80849414 44050000 */ mfc1 $a1, $f0 +/* 17208 80849418 00E13821 */ addu $a3, $a3, $at +/* 1720C 8084941C 00073C00 */ sll $a3, $a3, 16 /* 17210 80849420 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 17214 80849424 00073C03 */ sra $a3, $a3, 16 +/* 17214 80849424 00073C03 */ sra $a3, $a3, 16 .L80849428: -/* 17218 80849428 44050000 */ mfc1 $a1, $f0 +/* 17218 80849428 44050000 */ mfc1 $a1, $f0 .L8084942C: /* 1721C 8084942C 34C63333 */ ori $a2, $a2, 0x3333 ## $a2 = 3EB33333 -/* 17220 80849430 A7A7006E */ sh $a3, 0x006E($sp) +/* 17220 80849430 A7A7006E */ sh $a3, 0x006E($sp) /* 17224 80849434 0C01DE80 */ jal Math_ApproxF - -/* 17228 80849438 E7A00070 */ swc1 $f0, 0x0070($sp) -/* 1722C 8084943C 87A7006E */ lh $a3, 0x006E($sp) -/* 17230 80849440 10400009 */ beq $v0, $zero, .L80849468 -/* 17234 80849444 C7A00070 */ lwc1 $f0, 0x0070($sp) + +/* 17228 80849438 E7A00070 */ swc1 $f0, 0x0070($sp) +/* 1722C 8084943C 87A7006E */ lh $a3, 0x006E($sp) +/* 17230 80849440 10400009 */ beq $v0, $zero, .L80849468 +/* 17234 80849444 C7A00070 */ lwc1 $f0, 0x0070($sp) /* 17238 80849448 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 1723C 8084944C 00000000 */ nop -/* 17240 80849450 46100032 */ c.eq.s $f0, $f16 +/* 17240 80849450 46100032 */ c.eq.s $f0, $f16 /* 17244 80849454 00000000 */ nop -/* 17248 80849458 45020004 */ bc1fl .L8084946C +/* 17248 80849458 45020004 */ bc1fl .L8084946C /* 1724C 8084945C C60C0838 */ lwc1 $f12, 0x0838($s0) ## 00000838 /* 17250 80849460 8618083C */ lh $t8, 0x083C($s0) ## 0000083C /* 17254 80849464 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 @@ -348,60 +348,60 @@ glabel func_80848F9C /* 17258 80849468 C60C0838 */ lwc1 $f12, 0x0838($s0) ## 00000838 .L8084946C: /* 1725C 8084946C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 17260 80849470 00072C00 */ sll $a1, $a3, 16 +/* 17260 80849470 00072C00 */ sll $a1, $a3, 16 /* 17264 80849474 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 17268 80849478 460C9032 */ c.eq.s $f18, $f12 -/* 1726C 8084947C 00052C03 */ sra $a1, $a1, 16 +/* 17268 80849478 460C9032 */ c.eq.s $f18, $f12 +/* 1726C 8084947C 00052C03 */ sra $a1, $a1, 16 /* 17270 80849480 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 17274 80849484 4503001B */ bc1tl .L808494F4 +/* 17274 80849484 4503001B */ bc1tl .L808494F4 /* 17278 80849488 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1727C 8084948C 44812000 */ mtc1 $at, $f4 ## $f4 = 700.00 /* 17280 80849490 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 17284 80849494 46006085 */ abs.s $f2, $f12 +/* 17284 80849494 46006085 */ abs.s $f2, $f12 /* 17288 80849498 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 1728C 8084949C 46041182 */ mul.s $f6, $f2, $f4 +/* 1728C 8084949C 46041182 */ mul.s $f6, $f2, $f4 /* 17290 808494A0 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 17294 808494A4 46000005 */ abs.s $f0, $f0 -/* 17298 808494A8 46080282 */ mul.s $f10, $f0, $f8 -/* 1729C 808494AC 460A3401 */ sub.s $f16, $f6, $f10 -/* 172A0 808494B0 4600848D */ trunc.w.s $f18, $f16 -/* 172A4 808494B4 44029000 */ mfc1 $v0, $f18 +/* 17294 808494A4 46000005 */ abs.s $f0, $f0 +/* 17298 808494A8 46080282 */ mul.s $f10, $f0, $f8 +/* 1729C 808494AC 460A3401 */ sub.s $f16, $f6, $f10 +/* 172A0 808494B0 4600848D */ trunc.w.s $f18, $f16 +/* 172A4 808494B4 44029000 */ mfc1 $v0, $f18 /* 172A8 808494B8 00000000 */ nop -/* 172AC 808494BC 04410003 */ bgez $v0, .L808494CC -/* 172B0 808494C0 28410547 */ slti $at, $v0, 0x0547 -/* 172B4 808494C4 10000006 */ beq $zero, $zero, .L808494E0 +/* 172AC 808494BC 04410003 */ bgez $v0, .L808494CC +/* 172B0 808494C0 28410547 */ slti $at, $v0, 0x0547 +/* 172B4 808494C4 10000006 */ beq $zero, $zero, .L808494E0 /* 172B8 808494C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L808494CC: -/* 172BC 808494CC 14200003 */ bne $at, $zero, .L808494DC +/* 172BC 808494CC 14200003 */ bne $at, $zero, .L808494DC /* 172C0 808494D0 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 172C4 808494D4 10000001 */ beq $zero, $zero, .L808494DC +/* 172C4 808494D4 10000001 */ beq $zero, $zero, .L808494DC /* 172C8 808494D8 24060546 */ addiu $a2, $zero, 0x0546 ## $a2 = 00000546 .L808494DC: /* 172CC 808494DC 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000546 .L808494E0: -/* 172D0 808494E0 00023400 */ sll $a2, $v0, 16 +/* 172D0 808494E0 00023400 */ sll $a2, $v0, 16 /* 172D4 808494E4 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 172D8 808494E8 00063403 */ sra $a2, $a2, 16 + +/* 172D8 808494E8 00063403 */ sra $a2, $a2, 16 /* 172DC 808494EC C60C0838 */ lwc1 $f12, 0x0838($s0) ## 00000838 /* 172E0 808494F0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L808494F4: /* 172E4 808494F4 00000000 */ nop -/* 172E8 808494F8 460C2032 */ c.eq.s $f4, $f12 +/* 172E8 808494F8 460C2032 */ c.eq.s $f4, $f12 /* 172EC 808494FC 00000000 */ nop -/* 172F0 80849500 45000011 */ bc1f .L80849548 +/* 172F0 80849500 45000011 */ bc1f .L80849548 /* 172F4 80849504 00000000 */ nop /* 172F8 80849508 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 /* 172FC 8084950C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 17300 80849510 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 17304 80849514 46004032 */ c.eq.s $f8, $f0 +/* 17304 80849514 46004032 */ c.eq.s $f8, $f0 /* 17308 80849518 00000000 */ nop -/* 1730C 8084951C 4501000A */ bc1t .L80849548 +/* 1730C 8084951C 4501000A */ bc1t .L80849548 /* 17310 80849520 00000000 */ nop -/* 17314 80849524 44060000 */ mfc1 $a2, $f0 -/* 17318 80849528 0C03D04E */ jal func_800F4138 +/* 17314 80849524 44060000 */ mfc1 $a2, $f0 +/* 17318 80849528 0C03D04E */ jal func_800F4138 /* 1731C 8084952C 240500D0 */ addiu $a1, $zero, 0x00D0 ## $a1 = 000000D0 -/* 17320 80849530 10000005 */ beq $zero, $zero, .L80849548 +/* 17320 80849530 10000005 */ beq $zero, $zero, .L80849548 /* 17324 80849534 00000000 */ nop /* 17328 80849538 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 .L8084953C: @@ -409,31 +409,31 @@ glabel func_80848F9C /* 17330 80849540 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 17334 80849544 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 .L80849548: -/* 17338 80849548 0C00B61A */ jal func_8002D868 +/* 17338 80849548 0C00B61A */ jal func_8002D868 /* 1733C 8084954C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 17340 80849550 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 17344 80849554 C61008AC */ lwc1 $f16, 0x08AC($s0) ## 000008AC -/* 17348 80849558 46105032 */ c.eq.s $f10, $f16 +/* 17348 80849558 46105032 */ c.eq.s $f10, $f16 /* 1734C 8084955C 00000000 */ nop -/* 17350 80849560 45010021 */ bc1t .L808495E8 +/* 17350 80849560 45010021 */ bc1t .L808495E8 /* 17354 80849564 00000000 */ nop -/* 17358 80849568 0C023A62 */ jal func_8008E988 -/* 1735C 8084956C 8FA40084 */ lw $a0, 0x0084($sp) -/* 17360 80849570 1440001D */ bne $v0, $zero, .L808495E8 +/* 17358 80849568 0C023A62 */ jal func_8008E988 +/* 1735C 8084956C 8FA40084 */ lw $a0, 0x0084($sp) +/* 17360 80849570 1440001D */ bne $v0, $zero, .L808495E8 /* 17364 80849574 00000000 */ nop /* 17368 80849578 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C /* 1736C 8084957C 3C010020 */ lui $at, 0x0020 ## $at = 00200000 /* 17370 80849580 34216000 */ ori $at, $at, 0x6000 ## $at = 00206000 -/* 17374 80849584 01414824 */ and $t1, $t2, $at -/* 17378 80849588 15200017 */ bne $t1, $zero, .L808495E8 +/* 17374 80849584 01414824 */ and $t1, $t2, $at +/* 17378 80849588 15200017 */ bne $t1, $zero, .L808495E8 /* 1737C 8084958C 00000000 */ nop /* 17380 80849590 8E020674 */ lw $v0, 0x0674($s0) ## 00000674 /* 17384 80849594 3C0B8084 */ lui $t3, %hi(func_80845668) ## $t3 = 80840000 /* 17388 80849598 256B5668 */ addiu $t3, $t3, %lo(func_80845668) ## $t3 = 80845668 -/* 1738C 8084959C 104B0012 */ beq $v0, $t3, .L808495E8 +/* 1738C 8084959C 104B0012 */ beq $v0, $t3, .L808495E8 /* 17390 808495A0 3C0C8085 */ lui $t4, %hi(func_808507F4) ## $t4 = 80850000 /* 17394 808495A4 258C07F4 */ addiu $t4, $t4, %lo(func_808507F4) ## $t4 = 808507F4 -/* 17398 808495A8 104C000F */ beq $v0, $t4, .L808495E8 +/* 17398 808495A8 104C000F */ beq $v0, $t4, .L808495E8 /* 1739C 808495AC 00000000 */ nop /* 173A0 808495B0 0C01DE1C */ jal Math_Sins ## sins? @@ -441,72 +441,72 @@ glabel func_80848F9C /* 173A8 808495B8 C60408AC */ lwc1 $f4, 0x08AC($s0) ## 000008AC /* 173AC 808495BC C612005C */ lwc1 $f18, 0x005C($s0) ## 0000005C /* 173B0 808495C0 860408B0 */ lh $a0, 0x08B0($s0) ## 000008B0 -/* 173B4 808495C4 46002202 */ mul.s $f8, $f4, $f0 -/* 173B8 808495C8 46089180 */ add.s $f6, $f18, $f8 +/* 173B4 808495C4 46002202 */ mul.s $f8, $f4, $f0 +/* 173B8 808495C8 46089180 */ add.s $f6, $f18, $f8 /* 173BC 808495CC 0C01DE0D */ jal Math_Coss ## coss? /* 173C0 808495D0 E606005C */ swc1 $f6, 0x005C($s0) ## 0000005C /* 173C4 808495D4 C61008AC */ lwc1 $f16, 0x08AC($s0) ## 000008AC /* 173C8 808495D8 C60A0064 */ lwc1 $f10, 0x0064($s0) ## 00000064 -/* 173CC 808495DC 46008102 */ mul.s $f4, $f16, $f0 -/* 173D0 808495E0 46045480 */ add.s $f18, $f10, $f4 +/* 173CC 808495DC 46008102 */ mul.s $f4, $f16, $f0 +/* 173D0 808495E0 46045480 */ add.s $f18, $f10, $f4 /* 173D4 808495E4 E6120064 */ swc1 $f18, 0x0064($s0) ## 00000064 .L808495E8: -/* 173D8 808495E8 0C00B5FB */ jal func_8002D7EC +/* 173D8 808495E8 0C00B5FB */ jal func_8002D7EC /* 173DC 808495EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 173E0 808495F0 8FA40084 */ lw $a0, 0x0084($sp) -/* 173E4 808495F4 0C211EE8 */ jal func_80847BA0 +/* 173E0 808495F0 8FA40084 */ lw $a0, 0x0084($sp) +/* 173E4 808495F4 0C211EE8 */ jal func_80847BA0 /* 173E8 808495F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 173EC 808495FC 3C038085 */ lui $v1, %hi(D_808535F4) ## $v1 = 80850000 -/* 173F0 80849600 10000034 */ beq $zero, $zero, .L808496D4 +/* 173F0 80849600 10000034 */ beq $zero, $zero, .L808496D4 /* 173F4 80849604 246335F4 */ addiu $v1, $v1, %lo(D_808535F4) ## $v1 = 808535F4 .L80849608: /* 173F8 80849608 3C018085 */ lui $at, %hi(D_808535E4) ## $at = 80850000 -/* 173FC 8084960C AC2035E4 */ sw $zero, %lo(D_808535E4)($at) +/* 173FC 8084960C AC2035E4 */ sw $zero, %lo(D_808535E4)($at) /* 17400 80849610 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C /* 17404 80849614 A2000A7A */ sb $zero, 0x0A7A($s0) ## 00000A7A /* 17408 80849618 306D0001 */ andi $t5, $v1, 0x0001 ## $t5 = 00000000 -/* 1740C 8084961C 15A00028 */ bne $t5, $zero, .L808496C0 -/* 17410 80849620 00037200 */ sll $t6, $v1, 8 -/* 17414 80849624 05C30027 */ bgezl $t6, .L808496C4 +/* 1740C 8084961C 15A00028 */ bne $t5, $zero, .L808496C0 +/* 17410 80849620 00037200 */ sll $t6, $v1, 8 +/* 17414 80849624 05C30027 */ bgezl $t6, .L808496C4 /* 17418 80849628 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 1741C 8084962C 8E020440 */ lw $v0, 0x0440($s0) ## 00000440 /* 17420 80849630 3C068085 */ lui $a2, %hi(D_80854814) ## $a2 = 80850000 /* 17424 80849634 24C64814 */ addiu $a2, $a2, %lo(D_80854814) ## $a2 = 80854814 /* 17428 80849638 944F0088 */ lhu $t7, 0x0088($v0) ## 00000088 -/* 1742C 8084963C 8FA40084 */ lw $a0, 0x0084($sp) +/* 1742C 8084963C 8FA40084 */ lw $a0, 0x0084($sp) /* 17430 80849640 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17434 80849644 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 17438 80849648 17000008 */ bne $t8, $zero, .L8084966C +/* 17438 80849648 17000008 */ bne $t8, $zero, .L8084966C /* 1743C 8084964C 27A7004C */ addiu $a3, $sp, 0x004C ## $a3 = FFFFFFCC /* 17440 80849650 27B9005C */ addiu $t9, $sp, 0x005C ## $t9 = FFFFFFDC /* 17444 80849654 27A80058 */ addiu $t0, $sp, 0x0058 ## $t0 = FFFFFFD8 -/* 17448 80849658 AFA80014 */ sw $t0, 0x0014($sp) -/* 1744C 8084965C 0C20E5BD */ jal func_808396F4 -/* 17450 80849660 AFB90010 */ sw $t9, 0x0010($sp) -/* 17454 80849664 10000006 */ beq $zero, $zero, .L80849680 -/* 17458 80849668 8FA6005C */ lw $a2, 0x005C($sp) +/* 17448 80849658 AFA80014 */ sw $t0, 0x0014($sp) +/* 1744C 8084965C 0C20E5BD */ jal func_808396F4 +/* 17450 80849660 AFB90010 */ sw $t9, 0x0010($sp) +/* 17454 80849664 10000006 */ beq $zero, $zero, .L80849680 +/* 17458 80849668 8FA6005C */ lw $a2, 0x005C($sp) .L8084966C: /* 1745C 8084966C 8C4A0078 */ lw $t2, 0x0078($v0) ## 00000078 -/* 17460 80849670 AFAA005C */ sw $t2, 0x005C($sp) +/* 17460 80849670 AFAA005C */ sw $t2, 0x005C($sp) /* 17464 80849674 9049007D */ lbu $t1, 0x007D($v0) ## 0000007D -/* 17468 80849678 AFA90058 */ sw $t1, 0x0058($sp) -/* 1746C 8084967C 8FA6005C */ lw $a2, 0x005C($sp) +/* 17468 80849678 AFA90058 */ sw $t1, 0x0058($sp) +/* 1746C 8084967C 8FA6005C */ lw $a2, 0x005C($sp) .L80849680: -/* 17470 80849680 8FA40084 */ lw $a0, 0x0084($sp) +/* 17470 80849680 8FA40084 */ lw $a0, 0x0084($sp) /* 17474 80849684 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17478 80849688 50C0000E */ beql $a2, $zero, .L808496C4 +/* 17478 80849688 50C0000E */ beql $a2, $zero, .L808496C4 /* 1747C 8084968C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 17480 80849690 0C20E40D */ jal func_80839034 -/* 17484 80849694 8FA70058 */ lw $a3, 0x0058($sp) -/* 17488 80849698 10400009 */ beq $v0, $zero, .L808496C0 +/* 17480 80849690 0C20E40D */ jal func_80839034 +/* 17484 80849694 8FA70058 */ lw $a3, 0x0058($sp) +/* 17488 80849698 10400009 */ beq $v0, $zero, .L808496C0 /* 1748C 8084969C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 17490 808496A0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 17494 808496A4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 17498 808496A8 844B0586 */ lh $t3, 0x0586($v0) ## 80160586 -/* 1749C 808496AC 51600004 */ beql $t3, $zero, .L808496C0 +/* 1749C 808496AC 51600004 */ beql $t3, $zero, .L808496C0 /* 174A0 808496B0 A44C0E60 */ sh $t4, 0x0E60($v0) ## 80160E60 -/* 174A4 808496B4 10000002 */ beq $zero, $zero, .L808496C0 +/* 174A4 808496B4 10000002 */ beq $zero, $zero, .L808496C0 /* 174A8 808496B8 A4400586 */ sh $zero, 0x0586($v0) ## 80160586 /* 174AC 808496BC A44C0E60 */ sh $t4, 0x0E60($v0) ## 80160E60 .L808496C0: @@ -518,293 +518,293 @@ glabel func_80848F9C /* 174C0 808496D0 E60808AC */ swc1 $f8, 0x08AC($s0) ## 000008AC .L808496D4: /* 174C4 808496D4 8C620000 */ lw $v0, 0x0000($v1) ## 808535F4 -/* 174C8 808496D8 5040003E */ beql $v0, $zero, .L808497D4 +/* 174C8 808496D8 5040003E */ beql $v0, $zero, .L808497D4 /* 174CC 808496DC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 174D0 808496E0 820D014F */ lb $t5, 0x014F($s0) ## 0000014F /* 174D4 808496E4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 174D8 808496E8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = 8015FFFF -/* 174DC 808496EC 11A10038 */ beq $t5, $at, .L808497D0 +/* 174DC 808496EC 11A10038 */ beq $t5, $at, .L808497D0 /* 174E0 808496F0 3C0F8085 */ lui $t7, %hi(D_808535F8) ## $t7 = 80850000 /* 174E4 808496F4 AC6E0000 */ sw $t6, 0x0000($v1) ## 808535F4 -/* 174E8 808496F8 85EF35F8 */ lh $t7, %lo(D_808535F8)($t7) -/* 174EC 808496FC 000EC880 */ sll $t9, $t6, 2 -/* 174F0 80849700 55E0000E */ bnel $t7, $zero, .L8084973C +/* 174E8 808496F8 85EF35F8 */ lh $t7, %lo(D_808535F8)($t7) +/* 174EC 808496FC 000EC880 */ sll $t9, $t6, 2 +/* 174F0 80849700 55E0000E */ bnel $t7, $zero, .L8084973C /* 174F4 80849704 8C690000 */ lw $t1, 0x0000($v1) ## 808535F4 /* 174F8 80849708 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 174FC 8084970C 3C018085 */ lui $at, %hi(D_80854820) ## $at = 80850000 -/* 17500 80849710 00390821 */ addu $at, $at, $t9 -/* 17504 80849714 00085100 */ sll $t2, $t0, 4 -/* 17508 80849718 0540000C */ bltz $t2, .L8084974C -/* 1750C 8084971C C4204820 */ lwc1 $f0, %lo(D_80854820)($at) +/* 17500 80849710 00390821 */ addu $at, $at, $t9 +/* 17504 80849714 00085100 */ sll $t2, $t0, 4 +/* 17508 80849718 0540000C */ bltz $t2, .L8084974C +/* 1750C 8084971C C4204820 */ lwc1 $f0, %lo(D_80854820)($at) /* 17510 80849720 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 17514 80849724 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 /* 17518 80849728 00000000 */ nop -/* 1751C 8084972C 46060002 */ mul.s $f0, $f0, $f6 -/* 17520 80849730 10000006 */ beq $zero, $zero, .L8084974C +/* 1751C 8084972C 46060002 */ mul.s $f0, $f0, $f6 +/* 17520 80849730 10000006 */ beq $zero, $zero, .L8084974C /* 17524 80849734 00000000 */ nop /* 17528 80849738 8C690000 */ lw $t1, 0x0000($v1) ## 808535F4 .L8084973C: /* 1752C 8084973C 3C018085 */ lui $at, %hi(D_8085482C) ## $at = 80850000 -/* 17530 80849740 00095880 */ sll $t3, $t1, 2 -/* 17534 80849744 002B0821 */ addu $at, $at, $t3 -/* 17538 80849748 C420482C */ lwc1 $f0, %lo(D_8085482C)($at) +/* 17530 80849740 00095880 */ sll $t3, $t1, 2 +/* 17534 80849744 002B0821 */ addu $at, $at, $t3 +/* 17538 80849748 C420482C */ lwc1 $f0, %lo(D_8085482C)($at) .L8084974C: /* 1753C 8084974C 3C018085 */ lui $at, %hi(D_808554CC) ## $at = 80850000 -/* 17540 80849750 C43054CC */ lwc1 $f16, %lo(D_808554CC)($at) -/* 17544 80849754 44050000 */ mfc1 $a1, $f0 +/* 17540 80849750 C43054CC */ lwc1 $f16, %lo(D_808554CC)($at) +/* 17544 80849754 44050000 */ mfc1 $a1, $f0 /* 17548 80849758 260408AC */ addiu $a0, $s0, 0x08AC ## $a0 = 000008AC -/* 1754C 8084975C 46100282 */ mul.s $f10, $f0, $f16 -/* 17550 80849760 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 17554 80849764 44065000 */ mfc1 $a2, $f10 +/* 1754C 8084975C 46100282 */ mul.s $f10, $f0, $f16 +/* 17550 80849760 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 17554 80849764 44065000 */ mfc1 $a2, $f10 /* 17558 80849768 0C01DE80 */ jal Math_ApproxF - + /* 1755C 8084976C 00000000 */ nop /* 17560 80849770 8E0C067C */ lw $t4, 0x067C($s0) ## 0000067C -/* 17564 80849774 C7A00048 */ lwc1 $f0, 0x0048($sp) +/* 17564 80849774 C7A00048 */ lwc1 $f0, 0x0048($sp) /* 17568 80849778 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 1756C 8084977C 000C6900 */ sll $t5, $t4, 4 -/* 17570 80849780 05A30006 */ bgezl $t5, .L8084979C +/* 1756C 8084977C 000C6900 */ sll $t5, $t4, 4 +/* 17570 80849780 05A30006 */ bgezl $t5, .L8084979C /* 17574 80849784 44811000 */ mtc1 $at, $f2 ## $f2 = 800.00 /* 17578 80849788 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 1757C 8084978C 44811000 */ mtc1 $at, $f2 ## $f2 = 400.00 -/* 17580 80849790 10000003 */ beq $zero, $zero, .L808497A0 +/* 17580 80849790 10000003 */ beq $zero, $zero, .L808497A0 /* 17584 80849794 00000000 */ nop /* 17588 80849798 44811000 */ mtc1 $at, $f2 ## $f2 = 400.00 .L8084979C: /* 1758C 8084979C 00000000 */ nop .L808497A0: -/* 17590 808497A0 46001102 */ mul.s $f4, $f2, $f0 +/* 17590 808497A0 46001102 */ mul.s $f4, $f2, $f0 /* 17594 808497A4 3C058085 */ lui $a1, %hi(D_808535FC) ## $a1 = 80850000 -/* 17598 808497A8 84A535FC */ lh $a1, %lo(D_808535FC)($a1) +/* 17598 808497A8 84A535FC */ lh $a1, %lo(D_808535FC)($a1) /* 1759C 808497AC 260408B0 */ addiu $a0, $s0, 0x08B0 ## $a0 = 000008B0 -/* 175A0 808497B0 4600248D */ trunc.w.s $f18, $f4 -/* 175A4 808497B4 44069000 */ mfc1 $a2, $f18 +/* 175A0 808497B0 4600248D */ trunc.w.s $f18, $f4 +/* 175A4 808497B4 44069000 */ mfc1 $a2, $f18 /* 175A8 808497B8 00000000 */ nop -/* 175AC 808497BC 00063400 */ sll $a2, $a2, 16 +/* 175AC 808497BC 00063400 */ sll $a2, $a2, 16 /* 175B0 808497C0 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 175B4 808497C4 00063403 */ sra $a2, $a2, 16 -/* 175B8 808497C8 10000017 */ beq $zero, $zero, .L80849828 -/* 175BC 808497CC 8FA40084 */ lw $a0, 0x0084($sp) + +/* 175B4 808497C4 00063403 */ sra $a2, $a2, 16 +/* 175B8 808497C8 10000017 */ beq $zero, $zero, .L80849828 +/* 175BC 808497CC 8FA40084 */ lw $a0, 0x0084($sp) .L808497D0: /* 175C0 808497D0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 .L808497D4: /* 175C4 808497D4 C60608AC */ lwc1 $f6, 0x08AC($s0) ## 000008AC /* 175C8 808497D8 260408AC */ addiu $a0, $s0, 0x08AC ## $a0 = 000008AC -/* 175CC 808497DC 46064032 */ c.eq.s $f8, $f6 +/* 175CC 808497DC 46064032 */ c.eq.s $f8, $f6 /* 175D0 808497E0 00000000 */ nop -/* 175D4 808497E4 45030010 */ bc1tl .L80849828 -/* 175D8 808497E8 8FA40084 */ lw $a0, 0x0084($sp) +/* 175D4 808497E4 45030010 */ bc1tl .L80849828 +/* 175D8 808497E8 8FA40084 */ lw $a0, 0x0084($sp) /* 175DC 808497EC 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C /* 175E0 808497F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 175E4 808497F4 000FC100 */ sll $t8, $t7, 4 -/* 175E8 808497F8 07030006 */ bgezl $t8, .L80849814 +/* 175E4 808497F4 000FC100 */ sll $t8, $t7, 4 +/* 175E8 808497F8 07030006 */ bgezl $t8, .L80849814 /* 175EC 808497FC 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 175F0 80849800 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 175F4 80849804 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 -/* 175F8 80849808 10000004 */ beq $zero, $zero, .L8084981C -/* 175FC 8084980C 44061000 */ mfc1 $a2, $f2 +/* 175F8 80849808 10000004 */ beq $zero, $zero, .L8084981C +/* 175FC 8084980C 44061000 */ mfc1 $a2, $f2 /* 17600 80849810 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 .L80849814: /* 17604 80849814 00000000 */ nop -/* 17608 80849818 44061000 */ mfc1 $a2, $f2 +/* 17608 80849818 44061000 */ mfc1 $a2, $f2 .L8084981C: /* 1760C 8084981C 0C01DE80 */ jal Math_ApproxF - + /* 17610 80849820 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 17614 80849824 8FA40084 */ lw $a0, 0x0084($sp) +/* 17614 80849824 8FA40084 */ lw $a0, 0x0084($sp) .L80849828: -/* 17618 80849828 0C023A37 */ jal func_8008E8DC +/* 17618 80849828 0C023A37 */ jal func_8008E8DC /* 1761C 8084982C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17620 80849830 54400054 */ bnel $v0, $zero, .L80849984 -/* 17624 80849834 8FA70084 */ lw $a3, 0x0084($sp) +/* 17620 80849830 54400054 */ bnel $v0, $zero, .L80849984 +/* 17624 80849834 8FA70084 */ lw $a3, 0x0084($sp) /* 17628 80849838 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 -/* 1762C 8084983C 8FA40084 */ lw $a0, 0x0084($sp) -/* 17630 80849840 00194340 */ sll $t0, $t9, 13 -/* 17634 80849844 0502004F */ bltzl $t0, .L80849984 -/* 17638 80849848 8FA70084 */ lw $a3, 0x0084($sp) -/* 1763C 8084984C 0C20F54F */ jal func_8083D53C +/* 1762C 8084983C 8FA40084 */ lw $a0, 0x0084($sp) +/* 17630 80849840 00194340 */ sll $t0, $t9, 13 +/* 17634 80849844 0502004F */ bltzl $t0, .L80849984 +/* 17638 80849848 8FA70084 */ lw $a3, 0x0084($sp) +/* 1763C 8084984C 0C20F54F */ jal func_8083D53C /* 17640 80849850 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17644 80849854 920A0002 */ lbu $t2, 0x0002($s0) ## 00000002 /* 17648 80849858 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 1764C 8084985C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 17650 80849860 5541002D */ bnel $t2, $at, .L80849918 +/* 17650 80849860 5541002D */ bnel $t2, $at, .L80849918 /* 17654 80849864 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 /* 17658 80849868 8529E690 */ lh $t1, -0x1970($t1) ## 8015E690 -/* 1765C 8084986C 5520002A */ bnel $t1, $zero, .L80849918 +/* 1765C 8084986C 5520002A */ bnel $t1, $zero, .L80849918 /* 17660 80849870 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 /* 17664 80849874 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C /* 17668 80849878 3C010020 */ lui $at, 0x0020 ## $at = 00200000 /* 1766C 8084987C 34216000 */ ori $at, $at, 0x6000 ## $at = 00206000 -/* 17670 80849880 00615824 */ and $t3, $v1, $at -/* 17674 80849884 11600008 */ beq $t3, $zero, .L808498A8 -/* 17678 80849888 8FA40084 */ lw $a0, 0x0084($sp) -/* 1767C 8084988C 0C20C910 */ jal func_80832440 +/* 17670 80849880 00615824 */ and $t3, $v1, $at +/* 17674 80849884 11600008 */ beq $t3, $zero, .L808498A8 +/* 17678 80849888 8FA40084 */ lw $a0, 0x0084($sp) +/* 1767C 8084988C 0C20C910 */ jal func_80832440 /* 17680 80849890 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17684 80849894 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17688 80849898 0C20DEE7 */ jal func_80837B9C -/* 1768C 8084989C 8FA50084 */ lw $a1, 0x0084($sp) -/* 17690 808498A0 10000038 */ beq $zero, $zero, .L80849984 -/* 17694 808498A4 8FA70084 */ lw $a3, 0x0084($sp) +/* 17688 80849898 0C20DEE7 */ jal func_80837B9C +/* 1768C 8084989C 8FA50084 */ lw $a1, 0x0084($sp) +/* 17690 808498A0 10000038 */ beq $zero, $zero, .L80849984 +/* 17694 808498A4 8FA70084 */ lw $a3, 0x0084($sp) .L808498A8: /* 17698 808498A8 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 1769C 808498AC 00037100 */ sll $t6, $v1, 4 +/* 1769C 808498AC 00037100 */ sll $t6, $v1, 4 /* 176A0 808498B0 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 176A4 808498B4 15A00003 */ bne $t5, $zero, .L808498C4 +/* 176A4 808498B4 15A00003 */ bne $t5, $zero, .L808498C4 /* 176A8 808498B8 00000000 */ nop -/* 176AC 808498BC 05C30031 */ bgezl $t6, .L80849984 -/* 176B0 808498C0 8FA70084 */ lw $a3, 0x0084($sp) +/* 176AC 808498BC 05C30031 */ bgezl $t6, .L80849984 +/* 176B0 808498C0 8FA70084 */ lw $a3, 0x0084($sp) .L808498C4: -/* 176B4 808498C4 0C20CCAE */ jal func_808332B8 +/* 176B4 808498C4 0C20CCAE */ jal func_808332B8 /* 176B8 808498C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 176BC 808498CC 10400004 */ beq $v0, $zero, .L808498E0 -/* 176C0 808498D0 8FA40084 */ lw $a0, 0x0084($sp) +/* 176BC 808498CC 10400004 */ beq $v0, $zero, .L808498E0 +/* 176C0 808498D0 8FA40084 */ lw $a0, 0x0084($sp) /* 176C4 808498D4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 176C8 808498D8 1000000A */ beq $zero, $zero, .L80849904 +/* 176C8 808498D8 1000000A */ beq $zero, $zero, .L80849904 /* 176CC 808498DC 24C63310 */ addiu $a2, $a2, 0x3310 ## $a2 = 04003310 .L808498E0: /* 176D0 808498E0 920F0891 */ lbu $t7, 0x0891($s0) ## 00000891 /* 176D4 808498E4 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 /* 176D8 808498E8 24422878 */ addiu $v0, $v0, 0x2878 ## $v0 = 04002878 -/* 176DC 808498EC 11E00004 */ beq $t7, $zero, .L80849900 +/* 176DC 808498EC 11E00004 */ beq $t7, $zero, .L80849900 /* 176E0 808498F0 00000000 */ nop /* 176E4 808498F4 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 176E8 808498F8 10000001 */ beq $zero, $zero, .L80849900 +/* 176E8 808498F8 10000001 */ beq $zero, $zero, .L80849900 /* 176EC 808498FC 24422F08 */ addiu $v0, $v0, 0x2F08 ## $v0 = 04002F08 .L80849900: /* 176F0 80849900 00403025 */ or $a2, $v0, $zero ## $a2 = 04002F08 .L80849904: -/* 176F4 80849904 0C20D912 */ jal func_80836448 +/* 176F4 80849904 0C20D912 */ jal func_80836448 /* 176F8 80849908 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 176FC 8084990C 1000001D */ beq $zero, $zero, .L80849984 -/* 17700 80849910 8FA70084 */ lw $a3, 0x0084($sp) +/* 176FC 8084990C 1000001D */ beq $zero, $zero, .L80849984 +/* 17700 80849910 8FA70084 */ lw $a3, 0x0084($sp) /* 17704 80849914 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 .L80849918: -/* 17708 80849918 8FB9002C */ lw $t9, 0x002C($sp) -/* 1770C 8084991C 57000012 */ bnel $t8, $zero, .L80849968 +/* 17708 80849918 8FB9002C */ lw $t9, 0x002C($sp) +/* 1770C 8084991C 57000012 */ bnel $t8, $zero, .L80849968 /* 17710 80849920 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 17714 80849924 83281E15 */ lb $t0, 0x1E15($t9) ## 00001E15 /* 17718 80849928 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 1771C 8084992C 51010009 */ beql $t0, $at, .L80849954 +/* 1771C 8084992C 51010009 */ beql $t0, $at, .L80849954 /* 17720 80849930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 17724 80849934 920A0A87 */ lbu $t2, 0x0A87($s0) ## 00000A87 /* 17728 80849938 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1772C 8084993C 55400005 */ bnel $t2, $zero, .L80849954 +/* 1772C 8084993C 55400005 */ bnel $t2, $zero, .L80849954 /* 17730 80849940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17734 80849944 0C20E0B7 */ jal func_808382DC -/* 17738 80849948 8FA50084 */ lw $a1, 0x0084($sp) -/* 1773C 8084994C 14400005 */ bne $v0, $zero, .L80849964 +/* 17734 80849944 0C20E0B7 */ jal func_808382DC +/* 17738 80849948 8FA50084 */ lw $a1, 0x0084($sp) +/* 1773C 8084994C 14400005 */ bne $v0, $zero, .L80849964 /* 17740 80849950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80849954: -/* 17744 80849954 0C20EA84 */ jal func_8083AA10 -/* 17748 80849958 8FA50084 */ lw $a1, 0x0084($sp) -/* 1774C 8084995C 10000006 */ beq $zero, $zero, .L80849978 +/* 17744 80849954 0C20EA84 */ jal func_8083AA10 +/* 17748 80849958 8FA50084 */ lw $a1, 0x0084($sp) +/* 1774C 8084995C 10000006 */ beq $zero, $zero, .L80849978 /* 17750 80849960 00000000 */ nop .L80849964: /* 17754 80849964 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 .L80849968: -/* 17758 80849968 4600828D */ trunc.w.s $f10, $f16 -/* 1775C 8084996C 440B5000 */ mfc1 $t3, $f10 +/* 17758 80849968 4600828D */ trunc.w.s $f10, $f16 +/* 1775C 8084996C 440B5000 */ mfc1 $t3, $f10 /* 17760 80849970 00000000 */ nop /* 17764 80849974 A60B0894 */ sh $t3, 0x0894($s0) ## 00000894 .L80849978: -/* 17768 80849978 0C2123BE */ jal func_80848EF8 +/* 17768 80849978 0C2123BE */ jal func_80848EF8 /* 1776C 8084997C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17770 80849980 8FA70084 */ lw $a3, 0x0084($sp) +/* 17770 80849980 8FA70084 */ lw $a3, 0x0084($sp) .L80849984: /* 17774 80849984 90E51D6C */ lbu $a1, 0x1D6C($a3) ## 00001D6C -/* 17778 80849988 50A0002F */ beql $a1, $zero, .L80849A48 +/* 17778 80849988 50A0002F */ beql $a1, $zero, .L80849A48 /* 1777C 8084998C 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 17780 80849990 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 17784 80849994 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 17788 80849998 5061002B */ beql $v1, $at, .L80849A48 +/* 17788 80849998 5061002B */ beql $v1, $at, .L80849A48 /* 1778C 8084999C 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 17790 808499A0 8E0C067C */ lw $t4, 0x067C($s0) ## 0000067C -/* 17794 808499A4 000C6A00 */ sll $t5, $t4, 8 -/* 17798 808499A8 05A20027 */ bltzl $t5, .L80849A48 +/* 17794 808499A4 000C6A00 */ sll $t5, $t4, 8 +/* 17798 808499A8 05A20027 */ bltzl $t5, .L80849A48 /* 1779C 808499AC 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 177A0 808499B0 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 /* 177A4 808499B4 304E0080 */ andi $t6, $v0, 0x0080 ## $t6 = 00000000 -/* 177A8 808499B8 55C00023 */ bnel $t6, $zero, .L80849A48 +/* 177A8 808499B8 55C00023 */ bnel $t6, $zero, .L80849A48 /* 177AC 808499BC 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 177B0 808499C0 920F0002 */ lbu $t7, 0x0002($s0) ## 00000002 /* 177B4 808499C4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 177B8 808499C8 55E1001F */ bnel $t7, $at, .L80849A48 +/* 177B8 808499C8 55E1001F */ bnel $t7, $at, .L80849A48 /* 177BC 808499CC 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 177C0 808499D0 8CE41D88 */ lw $a0, 0x1D88($a3) ## 00001D88 -/* 177C4 808499D4 1080000F */ beq $a0, $zero, .L80849A14 +/* 177C4 808499D4 1080000F */ beq $a0, $zero, .L80849A14 /* 177C8 808499D8 00000000 */ nop /* 177CC 808499DC 94980000 */ lhu $t8, 0x0000($a0) ## 00000000 /* 177D0 808499E0 3C198085 */ lui $t9, %hi(D_808547C4) ## $t9 = 80850000 /* 177D4 808499E4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 177D8 808499E8 0338C821 */ addu $t9, $t9, $t8 -/* 177DC 808499EC 833947C4 */ lb $t9, %lo(D_808547C4)($t9) +/* 177D8 808499E8 0338C821 */ addu $t9, $t9, $t8 +/* 177DC 808499EC 833947C4 */ lb $t9, %lo(D_808547C4)($t9) /* 177E0 808499F0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 177E4 808499F4 13200007 */ beq $t9, $zero, .L80849A14 +/* 177E4 808499F4 13200007 */ beq $t9, $zero, .L80849A14 /* 177E8 808499F8 00000000 */ nop -/* 177EC 808499FC 0C00B7D5 */ jal func_8002DF54 +/* 177EC 808499FC 0C00B7D5 */ jal func_8002DF54 /* 177F0 80849A00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 177F4 80849A04 0C20C884 */ jal func_80832210 +/* 177F4 80849A04 0C20C884 */ jal func_80832210 /* 177F8 80849A08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 177FC 80849A0C 1000000D */ beq $zero, $zero, .L80849A44 -/* 17800 80849A10 8FA70084 */ lw $a3, 0x0084($sp) +/* 177FC 80849A0C 1000000D */ beq $zero, $zero, .L80849A44 +/* 17800 80849A10 8FA70084 */ lw $a3, 0x0084($sp) .L80849A14: -/* 17804 80849A14 1460000B */ bne $v1, $zero, .L80849A44 +/* 17804 80849A14 1460000B */ bne $v1, $zero, .L80849A44 /* 17808 80849A18 30480400 */ andi $t0, $v0, 0x0400 ## $t0 = 00000000 -/* 1780C 80849A1C 15000009 */ bne $t0, $zero, .L80849A44 +/* 1780C 80849A1C 15000009 */ bne $t0, $zero, .L80849A44 /* 17810 80849A20 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 17814 80849A24 10A10007 */ beq $a1, $at, .L80849A44 +/* 17814 80849A24 10A10007 */ beq $a1, $at, .L80849A44 /* 17818 80849A28 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 1781C 80849A2C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 17820 80849A30 0C00B7D5 */ jal func_8002DF54 +/* 17820 80849A30 0C00B7D5 */ jal func_8002DF54 /* 17824 80849A34 24060031 */ addiu $a2, $zero, 0x0031 ## $a2 = 00000031 -/* 17828 80849A38 0C20C884 */ jal func_80832210 +/* 17828 80849A38 0C20C884 */ jal func_80832210 /* 1782C 80849A3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17830 80849A40 8FA70084 */ lw $a3, 0x0084($sp) +/* 17830 80849A40 8FA70084 */ lw $a3, 0x0084($sp) .L80849A44: /* 17834 80849A44 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 .L80849A48: -/* 17838 80849A48 10600015 */ beq $v1, $zero, .L80849AA0 +/* 17838 80849A48 10600015 */ beq $v1, $zero, .L80849AA0 /* 1783C 80849A4C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 17840 80849A50 14610007 */ bne $v1, $at, .L80849A70 +/* 17840 80849A50 14610007 */ bne $v1, $at, .L80849A70 /* 17844 80849A54 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 /* 17848 80849A58 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C /* 1784C 80849A5C 3C010420 */ lui $at, 0x0420 ## $at = 04200000 /* 17850 80849A60 34216000 */ ori $at, $at, 0x6000 ## $at = 04206000 -/* 17854 80849A64 01414824 */ and $t1, $t2, $at -/* 17858 80849A68 55200004 */ bnel $t1, $zero, .L80849A7C +/* 17854 80849A64 01414824 */ and $t1, $t2, $at +/* 17858 80849A68 55200004 */ bnel $t1, $zero, .L80849A7C /* 1785C 80849A6C 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 .L80849A70: -/* 17860 80849A70 1000000C */ beq $zero, $zero, .L80849AA4 +/* 17860 80849A70 1000000C */ beq $zero, $zero, .L80849AA4 /* 17864 80849A74 A20B06AD */ sb $t3, 0x06AD($s0) ## 000006AD /* 17868 80849A78 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 .L80849A7C: /* 1786C 80849A7C 3C0D8085 */ lui $t5, %hi(func_80852E14) ## $t5 = 80850000 /* 17870 80849A80 25AD2E14 */ addiu $t5, $t5, %lo(func_80852E14) ## $t5 = 80852E14 -/* 17874 80849A84 118D0007 */ beq $t4, $t5, .L80849AA4 +/* 17874 80849A84 118D0007 */ beq $t4, $t5, .L80849AA4 /* 17878 80849A88 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 1787C 80849A8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17880 80849A90 0C214A51 */ jal func_80852944 +/* 17880 80849A90 0C214A51 */ jal func_80852944 /* 17884 80849A94 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 17888 80849A98 10000002 */ beq $zero, $zero, .L80849AA4 -/* 1788C 80849A9C 8FA70084 */ lw $a3, 0x0084($sp) +/* 17888 80849A98 10000002 */ beq $zero, $zero, .L80849AA4 +/* 1788C 80849A9C 8FA70084 */ lw $a3, 0x0084($sp) .L80849AA0: /* 17890 80849AA0 A2000445 */ sb $zero, 0x0445($s0) ## 00000445 .L80849AA4: /* 17894 80849AA4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 17898 80849AA8 0C20F5BB */ jal func_8083D6EC +/* 17898 80849AA8 0C20F5BB */ jal func_8083D6EC /* 1789C 80849AAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 178A0 80849AB0 8E0E0664 */ lw $t6, 0x0664($s0) ## 00000664 /* 178A4 80849AB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 178A8 80849AB8 55C0000A */ bnel $t6, $zero, .L80849AE4 +/* 178A8 80849AB8 55C0000A */ bnel $t6, $zero, .L80849AE4 /* 178AC 80849ABC 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 178B0 80849AC0 860F0690 */ lh $t7, 0x0690($s0) ## 00000690 -/* 178B4 80849AC4 55E00007 */ bnel $t7, $zero, .L80849AE4 +/* 178B4 80849AC4 55E00007 */ bnel $t7, $zero, .L80849AE4 /* 178B8 80849AC8 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 178BC 80849ACC 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 /* 178C0 80849AD0 3C01FFDF */ lui $at, 0xFFDF ## $at = FFDF0000 /* 178C4 80849AD4 3421FFFD */ ori $at, $at, 0xFFFD ## $at = FFDFFFFD -/* 178C8 80849AD8 0301C824 */ and $t9, $t8, $at +/* 178C8 80849AD8 0301C824 */ and $t9, $t8, $at /* 178CC 80849ADC AE190680 */ sw $t9, 0x0680($s0) ## 00000680 /* 178D0 80849AE0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C .L80849AE4: @@ -812,26 +812,26 @@ glabel func_80848F9C /* 178D8 80849AE8 3421EDFD */ ori $at, $at, 0xEDFD ## $at = FFBFEDFD /* 178DC 80849AEC 8E090680 */ lw $t1, 0x0680($s0) ## 00000680 /* 178E0 80849AF0 920C0692 */ lbu $t4, 0x0692($s0) ## 00000692 -/* 178E4 80849AF4 01015024 */ and $t2, $t0, $at +/* 178E4 80849AF4 01015024 */ and $t2, $t0, $at /* 178E8 80849AF8 3C01FBBE */ lui $at, 0xFBBE ## $at = FBBE0000 /* 178EC 80849AFC 3421AC92 */ ori $at, $at, 0xAC92 ## $at = FBBEAC92 -/* 178F0 80849B00 01215824 */ and $t3, $t1, $at +/* 178F0 80849B00 01215824 */ and $t3, $t1, $at /* 178F4 80849B04 318DFFEF */ andi $t5, $t4, 0xFFEF ## $t5 = 00000000 /* 178F8 80849B08 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C /* 178FC 80849B0C AE0B0680 */ sw $t3, 0x0680($s0) ## 00000680 -/* 17900 80849B10 0C211CA6 */ jal func_80847298 +/* 17900 80849B10 0C211CA6 */ jal func_80847298 /* 17904 80849B14 A20D0692 */ sb $t5, 0x0692($s0) ## 00000692 -/* 17908 80849B18 8FA40084 */ lw $a0, 0x0084($sp) -/* 1790C 80849B1C 0C20CC57 */ jal func_8083315C +/* 17908 80849B18 8FA40084 */ lw $a0, 0x0084($sp) +/* 1790C 80849B1C 0C20CC57 */ jal func_8083315C /* 17910 80849B20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17914 80849B24 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 17918 80849B28 000E7900 */ sll $t7, $t6, 4 -/* 1791C 80849B2C 05E10006 */ bgez $t7, .L80849B48 +/* 17918 80849B28 000E7900 */ sll $t7, $t6, 4 +/* 1791C 80849B2C 05E10006 */ bgez $t7, .L80849B48 /* 17920 80849B30 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 17924 80849B34 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 17928 80849B38 3C038085 */ lui $v1, %hi(D_808535E8) ## $v1 = 80850000 /* 1792C 80849B3C 246335E8 */ addiu $v1, $v1, %lo(D_808535E8) ## $v1 = 808535E8 -/* 17930 80849B40 10000006 */ beq $zero, $zero, .L80849B5C +/* 17930 80849B40 10000006 */ beq $zero, $zero, .L80849B5C /* 17934 80849B44 E4640000 */ swc1 $f4, 0x0000($v1) ## 808535E8 .L80849B48: /* 17938 80849B48 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -845,63 +845,63 @@ glabel func_80848F9C /* 17954 80849B64 C4660000 */ lwc1 $f6, 0x0000($v1) ## 808535E8 /* 17958 80849B68 3C018085 */ lui $at, %hi(D_808535EC) ## $at = 80850000 /* 1795C 80849B6C 3C028085 */ lui $v0, %hi(D_80853618) ## $v0 = 80850000 -/* 17960 80849B70 46064403 */ div.s $f16, $f8, $f6 +/* 17960 80849B70 46064403 */ div.s $f16, $f8, $f6 /* 17964 80849B74 24423618 */ addiu $v0, $v0, %lo(D_80853618) ## $v0 = 80853618 -/* 17968 80849B78 E43035EC */ swc1 $f16, %lo(D_808535EC)($at) +/* 17968 80849B78 E43035EC */ swc1 $f16, %lo(D_808535EC)($at) /* 1796C 80849B7C AC400000 */ sw $zero, 0x0000($v0) ## 80853618 /* 17970 80849B80 3C018085 */ lui $at, %hi(D_80853614) ## $at = 80850000 -/* 17974 80849B84 AC203614 */ sw $zero, %lo(D_80853614)($at) +/* 17974 80849B84 AC203614 */ sw $zero, %lo(D_80853614)($at) /* 17978 80849B88 9219015F */ lbu $t9, 0x015F($s0) ## 0000015F /* 1797C 80849B8C 3C018086 */ lui $at, %hi(D_80858AA4) ## $at = 80860000 -/* 17980 80849B90 AC398AA4 */ sw $t9, %lo(D_80858AA4)($at) +/* 17980 80849B90 AC398AA4 */ sw $t9, %lo(D_80858AA4)($at) /* 17984 80849B94 92080692 */ lbu $t0, 0x0692($s0) ## 00000692 /* 17988 80849B98 310A0004 */ andi $t2, $t0, 0x0004 ## $t2 = 00000000 -/* 1798C 80849B9C 55400007 */ bnel $t2, $zero, .L80849BBC -/* 17990 80849BA0 8FA40084 */ lw $a0, 0x0084($sp) +/* 1798C 80849B9C 55400007 */ bnel $t2, $zero, .L80849BBC +/* 17990 80849BA0 8FA40084 */ lw $a0, 0x0084($sp) /* 17994 80849BA4 8E190674 */ lw $t9, 0x0674($s0) ## 00000674 /* 17998 80849BA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1799C 80849BAC 8FA50084 */ lw $a1, 0x0084($sp) -/* 179A0 80849BB0 0320F809 */ jalr $ra, $t9 +/* 1799C 80849BAC 8FA50084 */ lw $a1, 0x0084($sp) +/* 179A0 80849BB0 0320F809 */ jalr $ra, $t9 /* 179A4 80849BB4 00000000 */ nop -/* 179A8 80849BB8 8FA40084 */ lw $a0, 0x0084($sp) +/* 179A8 80849BB8 8FA40084 */ lw $a0, 0x0084($sp) .L80849BBC: -/* 179AC 80849BBC 0C2121AA */ jal func_808486A8 +/* 179AC 80849BBC 0C2121AA */ jal func_808486A8 /* 179B0 80849BC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 179B4 80849BC4 920201E9 */ lbu $v0, 0x01E9($s0) ## 000001E9 /* 179B8 80849BC8 30490008 */ andi $t1, $v0, 0x0008 ## $t1 = 00000000 -/* 179BC 80849BCC 1120000D */ beq $t1, $zero, .L80849C04 +/* 179BC 80849BCC 1120000D */ beq $t1, $zero, .L80849C04 /* 179C0 80849BD0 304B0004 */ andi $t3, $v0, 0x0004 ## $t3 = 00000000 -/* 179C4 80849BD4 11600005 */ beq $t3, $zero, .L80849BEC -/* 179C8 80849BD8 8FA40084 */ lw $a0, 0x0084($sp) +/* 179C4 80849BD4 11600005 */ beq $t3, $zero, .L80849BEC +/* 179C8 80849BD8 8FA40084 */ lw $a0, 0x0084($sp) /* 179CC 80849BDC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 179D0 80849BE0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 179D4 80849BE4 10000004 */ beq $zero, $zero, .L80849BF8 -/* 179D8 80849BE8 44071000 */ mfc1 $a3, $f2 +/* 179D4 80849BE4 10000004 */ beq $zero, $zero, .L80849BF8 +/* 179D8 80849BE8 44071000 */ mfc1 $a3, $f2 .L80849BEC: /* 179DC 80849BEC 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 /* 179E0 80849BF0 C5820008 */ lwc1 $f2, 0x0008($t4) ## 00000008 -/* 179E4 80849BF4 44071000 */ mfc1 $a3, $f2 +/* 179E4 80849BF4 44071000 */ mfc1 $a3, $f2 .L80849BF8: /* 179E8 80849BF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 179EC 80849BFC 0C028D88 */ jal func_800A3620 +/* 179EC 80849BFC 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 179F0 80849C00 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 .L80849C04: /* 179F4 80849C04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 179F8 80849C08 0C20DA3B */ jal func_808368EC -/* 179FC 80849C0C 8FA50084 */ lw $a1, 0x0084($sp) +/* 179F8 80849C08 0C20DA3B */ jal func_808368EC +/* 179FC 80849C0C 8FA50084 */ lw $a1, 0x0084($sp) /* 17A00 80849C10 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 /* 17A04 80849C14 24010100 */ addiu $at, $zero, 0x0100 ## $at = 00000100 /* 17A08 80849C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 17A0C 80849C1C 31AE0100 */ andi $t6, $t5, 0x0100 ## $t6 = 00000000 -/* 17A10 80849C20 15C10004 */ bne $t6, $at, .L80849C34 +/* 17A10 80849C20 15C10004 */ bne $t6, $at, .L80849C34 /* 17A14 80849C24 26050498 */ addiu $a1, $s0, 0x0498 ## $a1 = 00000498 /* 17A18 80849C28 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 17A1C 80849C2C 10000006 */ beq $zero, $zero, .L80849C48 +/* 17A1C 80849C2C 10000006 */ beq $zero, $zero, .L80849C48 /* 17A20 80849C30 E60A0698 */ swc1 $f10, 0x0698($s0) ## 00000698 .L80849C34: /* 17A24 80849C34 AE000694 */ sw $zero, 0x0694($s0) ## 00000694 /* 17A28 80849C38 3C018085 */ lui $at, %hi(D_808554D0) ## $at = 80850000 -/* 17A2C 80849C3C C42454D0 */ lwc1 $f4, %lo(D_808554D0)($at) +/* 17A2C 80849C3C C42454D0 */ lwc1 $f4, %lo(D_808554D0)($at) /* 17A30 80849C40 A2000693 */ sb $zero, 0x0693($s0) ## 00000693 /* 17A34 80849C44 E6040698 */ swc1 $f4, 0x0698($s0) ## 00000698 .L80849C48: @@ -909,127 +909,127 @@ glabel func_80848F9C /* 17A3C 80849C4C 3C01FF7F */ lui $at, 0xFF7F ## $at = FF7F0000 /* 17A40 80849C50 24086000 */ addiu $t0, $zero, 0x6000 ## $t0 = 00006000 /* 17A44 80849C54 31F80800 */ andi $t8, $t7, 0x0800 ## $t8 = 00000000 -/* 17A48 80849C58 17000003 */ bne $t8, $zero, .L80849C68 +/* 17A48 80849C58 17000003 */ bne $t8, $zero, .L80849C68 /* 17A4C 80849C5C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FF7FFFFF /* 17A50 80849C60 AE000438 */ sw $zero, 0x0438($s0) ## 00000438 /* 17A54 80849C64 A6080436 */ sh $t0, 0x0436($s0) ## 00000436 .L80849C68: /* 17A58 80849C68 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -/* 17A5C 80849C6C 55400003 */ bnel $t2, $zero, .L80849C7C +/* 17A5C 80849C6C 55400003 */ bnel $t2, $zero, .L80849C7C /* 17A60 80849C70 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 /* 17A64 80849C74 AE000440 */ sw $zero, 0x0440($s0) ## 00000440 /* 17A68 80849C78 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 .L80849C7C: /* 17A6C 80849C7C A6000690 */ sh $zero, 0x0690($s0) ## 00000690 -/* 17A70 80849C80 0002C980 */ sll $t9, $v0, 6 -/* 17A74 80849C84 07220004 */ bltzl $t9, .L80849C98 -/* 17A78 80849C88 00414824 */ and $t1, $v0, $at +/* 17A70 80849C80 0002C980 */ sll $t9, $v0, 6 +/* 17A74 80849C84 07220004 */ bltzl $t9, .L80849C98 +/* 17A78 80849C88 00414824 */ and $t1, $v0, $at /* 17A7C 80849C8C AE0006A8 */ sw $zero, 0x06A8($s0) ## 000006A8 /* 17A80 80849C90 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 -/* 17A84 80849C94 00414824 */ and $t1, $v0, $at +/* 17A84 80849C94 00414824 */ and $t1, $v0, $at .L80849C98: /* 17A88 80849C98 C6060930 */ lwc1 $f6, 0x0930($s0) ## 00000930 /* 17A8C 80849C9C C6100954 */ lwc1 $f16, 0x0954($s0) ## 00000954 /* 17A90 80849CA0 AE090680 */ sw $t1, 0x0680($s0) ## 00000680 /* 17A94 80849CA4 3C018085 */ lui $at, %hi(D_808554D4) ## $at = 80850000 -/* 17A98 80849CA8 C43254D4 */ lwc1 $f18, %lo(D_808554D4)($at) -/* 17A9C 80849CAC 46103280 */ add.s $f10, $f6, $f16 +/* 17A98 80849CA8 C43254D4 */ lwc1 $f18, %lo(D_808554D4)($at) +/* 17A9C 80849CAC 46103280 */ add.s $f10, $f6, $f16 /* 17AA0 80849CB0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 17AA4 80849CB4 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 /* 17AA8 80849CB8 C6080104 */ lwc1 $f8, 0x0104($s0) ## 00000104 /* 17AAC 80849CBC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 17AB0 80849CC0 E61206A4 */ swc1 $f18, 0x06A4($s0) ## 000006A4 -/* 17AB4 80849CC4 46081001 */ sub.s $f0, $f2, $f8 -/* 17AB8 80849CC8 46045482 */ mul.s $f18, $f10, $f4 +/* 17AB4 80849CC4 46081001 */ sub.s $f0, $f2, $f8 +/* 17AB8 80849CC8 46045482 */ mul.s $f18, $f10, $f4 /* 17ABC 80849CCC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 17AC0 80849CD0 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 17AC4 80849CD4 C6080960 */ lwc1 $f8, 0x0960($s0) ## 00000960 /* 17AC8 80849CD8 A200042C */ sb $zero, 0x042C($s0) ## 0000042C /* 17ACC 80849CDC A20008A1 */ sb $zero, 0x08A1($s0) ## 000008A1 -/* 17AD0 80849CE0 46064400 */ add.s $f16, $f8, $f6 +/* 17AD0 80849CE0 46064400 */ add.s $f16, $f8, $f6 /* 17AD4 80849CE4 AE000684 */ sw $zero, 0x0684($s0) ## 00000684 -/* 17AD8 80849CE8 46009300 */ add.s $f12, $f18, $f0 -/* 17ADC 80849CEC 46100000 */ add.s $f0, $f0, $f16 -/* 17AE0 80849CF0 460C0281 */ sub.s $f10, $f0, $f12 -/* 17AE4 80849CF4 4600510D */ trunc.w.s $f4, $f10 -/* 17AE8 80849CF8 440C2000 */ mfc1 $t4, $f4 +/* 17AD8 80849CE8 46009300 */ add.s $f12, $f18, $f0 +/* 17ADC 80849CEC 46100000 */ add.s $f0, $f0, $f16 +/* 17AE0 80849CF0 460C0281 */ sub.s $f10, $f0, $f12 +/* 17AE4 80849CF4 4600510D */ trunc.w.s $f4, $f10 +/* 17AE8 80849CF8 440C2000 */ mfc1 $t4, $f4 /* 17AEC 80849CFC 00000000 */ nop /* 17AF0 80849D00 A60C04DA */ sh $t4, 0x04DA($s0) ## 000004DA /* 17AF4 80849D04 860304DA */ lh $v1, 0x04DA($s0) ## 000004DA -/* 17AF8 80849D08 04610004 */ bgez $v1, .L80849D1C -/* 17AFC 80849D0C 00036823 */ subu $t5, $zero, $v1 -/* 17B00 80849D10 46000306 */ mov.s $f12, $f0 +/* 17AF8 80849D08 04610004 */ bgez $v1, .L80849D1C +/* 17AFC 80849D0C 00036823 */ subu $t5, $zero, $v1 +/* 17B00 80849D10 46000306 */ mov.s $f12, $f0 /* 17B04 80849D14 A60D04DA */ sh $t5, 0x04DA($s0) ## 000004DA /* 17B08 80849D18 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 .L80849D1C: -/* 17B0C 80849D1C 46026481 */ sub.s $f18, $f12, $f2 +/* 17B0C 80849D1C 46026481 */ sub.s $f18, $f12, $f2 /* 17B10 80849D20 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 17B14 80849D24 4600920D */ trunc.w.s $f8, $f18 -/* 17B18 80849D28 00184240 */ sll $t0, $t8, 9 -/* 17B1C 80849D2C 440F4000 */ mfc1 $t7, $f8 -/* 17B20 80849D30 0501000C */ bgez $t0, .L80849D64 +/* 17B14 80849D24 4600920D */ trunc.w.s $f8, $f18 +/* 17B18 80849D28 00184240 */ sll $t0, $t8, 9 +/* 17B1C 80849D2C 440F4000 */ mfc1 $t7, $f8 +/* 17B20 80849D30 0501000C */ bgez $t0, .L80849D64 /* 17B24 80849D34 A60F04DC */ sh $t7, 0x04DC($s0) ## 000004DC /* 17B28 80849D38 860A04DA */ lh $t2, 0x04DA($s0) ## 000004DA /* 17B2C 80849D3C 3C018085 */ lui $at, %hi(D_808554D8) ## $at = 80850000 -/* 17B30 80849D40 C42A54D8 */ lwc1 $f10, %lo(D_808554D8)($at) +/* 17B30 80849D40 C42A54D8 */ lwc1 $f10, %lo(D_808554D8)($at) /* 17B34 80849D44 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 17B38 80849D48 00000000 */ nop -/* 17B3C 80849D4C 46803420 */ cvt.s.w $f16, $f6 -/* 17B40 80849D50 460A8102 */ mul.s $f4, $f16, $f10 -/* 17B44 80849D54 4600248D */ trunc.w.s $f18, $f4 -/* 17B48 80849D58 44099000 */ mfc1 $t1, $f18 +/* 17B3C 80849D4C 46803420 */ cvt.s.w $f16, $f6 +/* 17B40 80849D50 460A8102 */ mul.s $f4, $f16, $f10 +/* 17B44 80849D54 4600248D */ trunc.w.s $f18, $f4 +/* 17B48 80849D58 44099000 */ mfc1 $t1, $f18 /* 17B4C 80849D5C 00000000 */ nop /* 17B50 80849D60 A60904DA */ sh $t1, 0x04DA($s0) ## 000004DA .L80849D64: /* 17B54 80849D64 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 17B58 80849D68 AFA5002C */ sw $a1, 0x002C($sp) + +/* 17B58 80849D68 AFA5002C */ sw $a1, 0x002C($sp) /* 17B5C 80849D6C 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 /* 17B60 80849D70 316C4000 */ andi $t4, $t3, 0x4000 ## $t4 = 00000000 -/* 17B64 80849D74 15800022 */ bne $t4, $zero, .L80849E00 +/* 17B64 80849D74 15800022 */ bne $t4, $zero, .L80849E00 /* 17B68 80849D78 00000000 */ nop /* 17B6C 80849D7C 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C /* 17B70 80849D80 3C010080 */ lui $at, 0x0080 ## $at = 00800000 /* 17B74 80849D84 34216080 */ ori $at, $at, 0x6080 ## $at = 00806080 -/* 17B78 80849D88 00616824 */ and $t5, $v1, $at -/* 17B7C 80849D8C 15A00007 */ bne $t5, $zero, .L80849DAC -/* 17B80 80849D90 8FA40084 */ lw $a0, 0x0084($sp) +/* 17B78 80849D88 00616824 */ and $t5, $v1, $at +/* 17B7C 80849D8C 15A00007 */ bne $t5, $zero, .L80849DAC +/* 17B80 80849D90 8FA40084 */ lw $a0, 0x0084($sp) /* 17B84 80849D94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 17B88 80849D98 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 17B8C 80849D9C 00812821 */ addu $a1, $a0, $at +/* 17B8C 80849D9C 00812821 */ addu $a1, $a0, $at /* 17B90 80849DA0 0C017713 */ jal Actor_CollisionCheck_SetOT ## CollisionCheck_setOT -/* 17B94 80849DA4 8FA6002C */ lw $a2, 0x002C($sp) +/* 17B94 80849DA4 8FA6002C */ lw $a2, 0x002C($sp) /* 17B98 80849DA8 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C .L80849DAC: /* 17B9C 80849DAC 3C010400 */ lui $at, 0x0400 ## $at = 04000000 /* 17BA0 80849DB0 34210080 */ ori $at, $at, 0x0080 ## $at = 04000080 -/* 17BA4 80849DB4 00617824 */ and $t7, $v1, $at -/* 17BA8 80849DB8 15E00011 */ bne $t7, $zero, .L80849E00 +/* 17BA4 80849DB4 00617824 */ and $t7, $v1, $at +/* 17BA8 80849DB8 15E00011 */ bne $t7, $zero, .L80849E00 /* 17BAC 80849DBC 00000000 */ nop /* 17BB0 80849DC0 82180A78 */ lb $t8, 0x0A78($s0) ## 00000A78 /* 17BB4 80849DC4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 17BB8 80849DC8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 17BBC 80849DCC 1F00000C */ bgtz $t8, .L80849E00 -/* 17BC0 80849DD0 8FA40084 */ lw $a0, 0x0084($sp) -/* 17BC4 80849DD4 00812821 */ addu $a1, $a0, $at -/* 17BC8 80849DD8 AFA50030 */ sw $a1, 0x0030($sp) +/* 17BBC 80849DCC 1F00000C */ bgtz $t8, .L80849E00 +/* 17BC0 80849DD0 8FA40084 */ lw $a0, 0x0084($sp) +/* 17BC4 80849DD4 00812821 */ addu $a1, $a0, $at +/* 17BC8 80849DD8 AFA50030 */ sw $a1, 0x0030($sp) /* 17BCC 80849DDC 0C01767D */ jal Actor_CollisionCheck_SetAC ## CollisionCheck_setAC -/* 17BD0 80849DE0 8FA6002C */ lw $a2, 0x002C($sp) +/* 17BD0 80849DE0 8FA6002C */ lw $a2, 0x002C($sp) /* 17BD4 80849DE4 820A0A78 */ lb $t2, 0x0A78($s0) ## 00000A78 -/* 17BD8 80849DE8 8FA50030 */ lw $a1, 0x0030($sp) -/* 17BDC 80849DEC 8FA40084 */ lw $a0, 0x0084($sp) -/* 17BE0 80849DF0 05410003 */ bgez $t2, .L80849E00 +/* 17BD8 80849DE8 8FA50030 */ lw $a1, 0x0030($sp) +/* 17BDC 80849DEC 8FA40084 */ lw $a0, 0x0084($sp) +/* 17BE0 80849DF0 05410003 */ bgez $t2, .L80849E00 /* 17BE4 80849DF4 00000000 */ nop /* 17BE8 80849DF8 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT -/* 17BEC 80849DFC 8FA6002C */ lw $a2, 0x002C($sp) +/* 17BEC 80849DFC 8FA6002C */ lw $a2, 0x002C($sp) .L80849E00: -/* 17BF0 80849E00 0C028CBD */ jal func_800A32F4 -/* 17BF4 80849E04 8FA40084 */ lw $a0, 0x0084($sp) +/* 17BF0 80849E00 0C028CBD */ jal func_800A32F4 +/* 17BF4 80849E04 8FA40084 */ lw $a0, 0x0084($sp) .L80849E08: -/* 17BF8 80849E08 8FA40034 */ lw $a0, 0x0034($sp) +/* 17BF8 80849E08 8FA40034 */ lw $a0, 0x0034($sp) /* 17BFC 80849E0C 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 17C00 80849E10 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 @@ -1040,11 +1040,11 @@ glabel func_80848F9C /* 17C10 80849E20 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 17C14 80849E24 3C013000 */ lui $at, 0x3000 ## $at = 30000000 /* 17C18 80849E28 34210080 */ ori $at, $at, 0x0080 ## $at = 30000080 -/* 17C1C 80849E2C 03214824 */ and $t1, $t9, $at -/* 17C20 80849E30 11200004 */ beq $t1, $zero, .L80849E44 +/* 17C1C 80849E2C 03214824 */ and $t1, $t9, $at +/* 17C20 80849E30 11200004 */ beq $t1, $zero, .L80849E44 /* 17C24 80849E34 240C0032 */ addiu $t4, $zero, 0x0032 ## $t4 = 00000032 /* 17C28 80849E38 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 17C2C 80849E3C 10000002 */ beq $zero, $zero, .L80849E48 +/* 17C2C 80849E3C 10000002 */ beq $zero, $zero, .L80849E48 /* 17C30 80849E40 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE .L80849E44: /* 17C34 80849E44 A20C00AE */ sb $t4, 0x00AE($s0) ## 000000AE @@ -1052,26 +1052,26 @@ glabel func_80848F9C /* 17C38 80849E48 920D0692 */ lbu $t5, 0x0692($s0) ## 00000692 /* 17C3C 80849E4C 31AEFFFB */ andi $t6, $t5, 0xFFFB ## $t6 = 00000000 /* 17C40 80849E50 A20E0692 */ sb $t6, 0x0692($s0) ## 00000692 -/* 17C44 80849E54 8FA5002C */ lw $a1, 0x002C($sp) -/* 17C48 80849E58 0C017150 */ jal func_8005C540 -/* 17C4C 80849E5C 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C50 80849E60 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C54 80849E64 0C017458 */ jal func_8005D160 +/* 17C44 80849E54 8FA5002C */ lw $a1, 0x002C($sp) +/* 17C48 80849E58 0C017150 */ jal func_8005C540 +/* 17C4C 80849E5C 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C50 80849E60 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C54 80849E64 0C017458 */ jal func_8005D160 /* 17C58 80849E68 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 -/* 17C5C 80849E6C 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C60 80849E70 0C017458 */ jal func_8005D160 +/* 17C5C 80849E6C 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C60 80849E70 0C017458 */ jal func_8005D160 /* 17C64 80849E74 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 /* 17C68 80849E78 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 -/* 17C6C 80849E7C AFA50034 */ sw $a1, 0x0034($sp) -/* 17C70 80849E80 0C01746A */ jal func_8005D1A8 -/* 17C74 80849E84 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C78 80849E88 8FA50034 */ lw $a1, 0x0034($sp) -/* 17C7C 80849E8C 0C017458 */ jal func_8005D160 -/* 17C80 80849E90 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C84 80849E94 8FBF0024 */ lw $ra, 0x0024($sp) -/* 17C88 80849E98 8FB00020 */ lw $s0, 0x0020($sp) +/* 17C6C 80849E7C AFA50034 */ sw $a1, 0x0034($sp) +/* 17C70 80849E80 0C01746A */ jal func_8005D1A8 +/* 17C74 80849E84 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C78 80849E88 8FA50034 */ lw $a1, 0x0034($sp) +/* 17C7C 80849E8C 0C017458 */ jal func_8005D160 +/* 17C80 80849E90 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C84 80849E94 8FBF0024 */ lw $ra, 0x0024($sp) +/* 17C88 80849E98 8FB00020 */ lw $s0, 0x0020($sp) /* 17C8C 80849E9C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 17C90 80849EA0 03E00008 */ jr $ra +/* 17C90 80849EA0 03E00008 */ jr $ra /* 17C94 80849EA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s index af1ccab35..7051b4497 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s @@ -1,293 +1,293 @@ glabel func_8084BF1C /* 19D0C 8084BF1C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 19D10 8084BF20 AFBF002C */ sw $ra, 0x002C($sp) -/* 19D14 8084BF24 AFB00028 */ sw $s0, 0x0028($sp) -/* 19D18 8084BF28 AFA5008C */ sw $a1, 0x008C($sp) +/* 19D10 8084BF20 AFBF002C */ sw $ra, 0x002C($sp) +/* 19D14 8084BF24 AFB00028 */ sw $s0, 0x0028($sp) +/* 19D18 8084BF28 AFA5008C */ sw $a1, 0x008C($sp) /* 19D1C 8084BF2C C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 /* 19D20 8084BF30 3C028086 */ lui $v0, %hi(D_80858AB4) ## $v0 = 80860000 -/* 19D24 8084BF34 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) -/* 19D28 8084BF38 4600218D */ trunc.w.s $f6, $f4 +/* 19D24 8084BF34 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) +/* 19D28 8084BF38 4600218D */ trunc.w.s $f6, $f4 /* 19D2C 8084BF3C 8C980680 */ lw $t8, 0x0680($a0) ## 00000680 /* 19D30 8084BF40 808A084F */ lb $t2, 0x084F($a0) ## 0000084F /* 19D34 8084BF44 80480015 */ lb $t0, 0x0015($v0) ## 80860015 -/* 19D38 8084BF48 440F3000 */ mfc1 $t7, $f6 +/* 19D38 8084BF48 440F3000 */ mfc1 $t7, $f6 /* 19D3C 8084BF4C 80490014 */ lb $t1, 0x0014($v0) ## 80860014 /* 19D40 8084BF50 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 /* 19D44 8084BF54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 19D48 8084BF58 AC990680 */ sw $t9, 0x0680($a0) ## 00000680 -/* 19D4C 8084BF5C 11400018 */ beq $t2, $zero, .L8084BFC0 +/* 19D4C 8084BF5C 11400018 */ beq $t2, $zero, .L8084BFC0 /* 19D50 8084BF60 A48F0894 */ sh $t7, 0x0894($a0) ## 00000894 -/* 19D54 8084BF64 05000003 */ bltz $t0, .L8084BF74 -/* 19D58 8084BF68 00081823 */ subu $v1, $zero, $t0 -/* 19D5C 8084BF6C 10000001 */ beq $zero, $zero, .L8084BF74 +/* 19D54 8084BF64 05000003 */ bltz $t0, .L8084BF74 +/* 19D58 8084BF68 00081823 */ subu $v1, $zero, $t0 +/* 19D5C 8084BF6C 10000001 */ beq $zero, $zero, .L8084BF74 /* 19D60 8084BF70 01001825 */ or $v1, $t0, $zero ## $v1 = 00000000 .L8084BF74: -/* 19D64 8084BF74 05200003 */ bltz $t1, .L8084BF84 -/* 19D68 8084BF78 00091023 */ subu $v0, $zero, $t1 -/* 19D6C 8084BF7C 10000001 */ beq $zero, $zero, .L8084BF84 +/* 19D64 8084BF74 05200003 */ bltz $t1, .L8084BF84 +/* 19D68 8084BF78 00091023 */ subu $v0, $zero, $t1 +/* 19D6C 8084BF7C 10000001 */ beq $zero, $zero, .L8084BF84 /* 19D70 8084BF80 01201025 */ or $v0, $t1, $zero ## $v0 = 00000000 .L8084BF84: -/* 19D74 8084BF84 0062082A */ slt $at, $v1, $v0 -/* 19D78 8084BF88 1020000D */ beq $at, $zero, .L8084BFC0 +/* 19D74 8084BF84 0062082A */ slt $at, $v1, $v0 +/* 19D78 8084BF88 1020000D */ beq $at, $zero, .L8084BFC0 /* 19D7C 8084BF8C 00000000 */ nop -/* 19D80 8084BF90 05200003 */ bltz $t1, .L8084BFA0 -/* 19D84 8084BF94 00091023 */ subu $v0, $zero, $t1 -/* 19D88 8084BF98 10000001 */ beq $zero, $zero, .L8084BFA0 +/* 19D80 8084BF90 05200003 */ bltz $t1, .L8084BFA0 +/* 19D84 8084BF94 00091023 */ subu $v0, $zero, $t1 +/* 19D88 8084BF98 10000001 */ beq $zero, $zero, .L8084BFA0 /* 19D8C 8084BF9C 01201025 */ or $v0, $t1, $zero ## $v0 = 00000000 .L8084BFA0: /* 19D90 8084BFA0 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 19D94 8084BFA4 3C018085 */ lui $at, %hi(D_80855520) ## $at = 80850000 -/* 19D98 8084BFA8 C4305520 */ lwc1 $f16, %lo(D_80855520)($at) -/* 19D9C 8084BFAC 468042A0 */ cvt.s.w $f10, $f8 +/* 19D98 8084BFA8 C4305520 */ lwc1 $f16, %lo(D_80855520)($at) +/* 19D9C 8084BFAC 468042A0 */ cvt.s.w $f10, $f8 /* 19DA0 8084BFB0 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 19DA4 8084BFB4 46105002 */ mul.s $f0, $f10, $f16 -/* 19DA8 8084BFB8 1000000D */ beq $zero, $zero, .L8084BFF0 +/* 19DA4 8084BFB4 46105002 */ mul.s $f0, $f10, $f16 +/* 19DA8 8084BFB8 1000000D */ beq $zero, $zero, .L8084BFF0 /* 19DAC 8084BFBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 .L8084BFC0: -/* 19DB0 8084BFC0 05000003 */ bltz $t0, .L8084BFD0 -/* 19DB4 8084BFC4 00081023 */ subu $v0, $zero, $t0 -/* 19DB8 8084BFC8 10000001 */ beq $zero, $zero, .L8084BFD0 +/* 19DB0 8084BFC0 05000003 */ bltz $t0, .L8084BFD0 +/* 19DB4 8084BFC4 00081023 */ subu $v0, $zero, $t0 +/* 19DB8 8084BFC8 10000001 */ beq $zero, $zero, .L8084BFD0 /* 19DBC 8084BFCC 01001025 */ or $v0, $t0, $zero ## $v0 = 00000000 .L8084BFD0: /* 19DC0 8084BFD0 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 19DC4 8084BFD4 3C018085 */ lui $at, %hi(D_80855524) ## $at = 80850000 -/* 19DC8 8084BFD8 C4265524 */ lwc1 $f6, %lo(D_80855524)($at) -/* 19DCC 8084BFDC 46809120 */ cvt.s.w $f4, $f18 +/* 19DC8 8084BFD8 C4265524 */ lwc1 $f6, %lo(D_80855524)($at) +/* 19DCC 8084BFDC 46809120 */ cvt.s.w $f4, $f18 /* 19DD0 8084BFE0 00004825 */ or $t1, $zero, $zero ## $t1 = 00000000 -/* 19DD4 8084BFE4 46062002 */ mul.s $f0, $f4, $f6 +/* 19DD4 8084BFE4 46062002 */ mul.s $f0, $f4, $f6 /* 19DD8 8084BFE8 00000000 */ nop /* 19DDC 8084BFEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 .L8084BFF0: /* 19DE0 8084BFF0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 19DE4 8084BFF4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 19DE8 8084BFF8 3C018085 */ lui $at, %hi(D_80855528) ## $at = 80850000 -/* 19DEC 8084BFFC 460C003C */ c.lt.s $f0, $f12 +/* 19DEC 8084BFFC 460C003C */ c.lt.s $f0, $f12 /* 19DF0 8084C000 00000000 */ nop -/* 19DF4 8084C004 45000003 */ bc1f .L8084C014 +/* 19DF4 8084C004 45000003 */ bc1f .L8084C014 /* 19DF8 8084C008 00000000 */ nop -/* 19DFC 8084C00C 10000007 */ beq $zero, $zero, .L8084C02C -/* 19E00 8084C010 46006006 */ mov.s $f0, $f12 +/* 19DFC 8084C00C 10000007 */ beq $zero, $zero, .L8084C02C +/* 19E00 8084C010 46006006 */ mov.s $f0, $f12 .L8084C014: -/* 19E04 8084C014 C4225528 */ lwc1 $f2, %lo(D_80855528)($at) -/* 19E08 8084C018 4600103C */ c.lt.s $f2, $f0 +/* 19E04 8084C014 C4225528 */ lwc1 $f2, %lo(D_80855528)($at) +/* 19E08 8084C018 4600103C */ c.lt.s $f2, $f0 /* 19E0C 8084C01C 00000000 */ nop -/* 19E10 8084C020 45020003 */ bc1fl .L8084C030 +/* 19E10 8084C020 45020003 */ bc1fl .L8084C030 /* 19E14 8084C024 C60801D0 */ lwc1 $f8, 0x01D0($s0) ## 000001D0 -/* 19E18 8084C028 46001006 */ mov.s $f0, $f2 +/* 19E18 8084C028 46001006 */ mov.s $f0, $f2 .L8084C02C: /* 19E1C 8084C02C C60801D0 */ lwc1 $f8, 0x01D0($s0) ## 000001D0 .L8084C030: /* 19E20 8084C030 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 19E24 8084C034 4608503E */ c.le.s $f10, $f8 +/* 19E24 8084C034 4608503E */ c.le.s $f10, $f8 /* 19E28 8084C038 00000000 */ nop -/* 19E2C 8084C03C 45020004 */ bc1fl .L8084C050 +/* 19E2C 8084C03C 45020004 */ bc1fl .L8084C050 /* 19E30 8084C040 44811000 */ mtc1 $at, $f2 ## $f2 = -1.00 -/* 19E34 8084C044 10000003 */ beq $zero, $zero, .L8084C054 -/* 19E38 8084C048 46006086 */ mov.s $f2, $f12 +/* 19E34 8084C044 10000003 */ beq $zero, $zero, .L8084C054 +/* 19E38 8084C048 46006086 */ mov.s $f2, $f12 /* 19E3C 8084C04C 44811000 */ mtc1 $at, $f2 ## $f2 = -1.00 .L8084C050: /* 19E40 8084C050 00000000 */ nop .L8084C054: -/* 19E44 8084C054 46001402 */ mul.s $f16, $f2, $f0 +/* 19E44 8084C054 46001402 */ mul.s $f16, $f2, $f0 /* 19E48 8084C058 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 19E4C 8084C05C 04600036 */ bltz $v1, .L8084C138 +/* 19E4C 8084C05C 04600036 */ bltz $v1, .L8084C138 /* 19E50 8084C060 E61001D0 */ swc1 $f16, 0x01D0($s0) ## 000001D0 /* 19E54 8084C064 8E0B0074 */ lw $t3, 0x0074($s0) ## 00000074 -/* 19E58 8084C068 51600019 */ beql $t3, $zero, .L8084C0D0 +/* 19E58 8084C068 51600019 */ beql $t3, $zero, .L8084C0D0 /* 19E5C 8084C06C 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 /* 19E60 8084C070 9205007C */ lbu $a1, 0x007C($s0) ## 0000007C -/* 19E64 8084C074 8FA4008C */ lw $a0, 0x008C($sp) +/* 19E64 8084C074 8FA4008C */ lw $a0, 0x008C($sp) /* 19E68 8084C078 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 19E6C 8084C07C 10A10013 */ beq $a1, $at, .L8084C0CC +/* 19E6C 8084C07C 10A10013 */ beq $a1, $at, .L8084C0CC /* 19E70 8084C080 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 19E74 8084C084 AFA80084 */ sw $t0, 0x0084($sp) +/* 19E74 8084C084 AFA80084 */ sw $t0, 0x0084($sp) /* 19E78 8084C088 0C00FAE1 */ jal DynaPolyInfo_GetActor ## DynaPolyInfo_getActor -/* 19E7C 8084C08C AFA90080 */ sw $t1, 0x0080($sp) -/* 19E80 8084C090 8FA80084 */ lw $t0, 0x0084($sp) -/* 19E84 8084C094 1040000D */ beq $v0, $zero, .L8084C0CC -/* 19E88 8084C098 8FA90080 */ lw $t1, 0x0080($sp) +/* 19E7C 8084C08C AFA90080 */ sw $t1, 0x0080($sp) +/* 19E80 8084C090 8FA80084 */ lw $t0, 0x0084($sp) +/* 19E84 8084C094 1040000D */ beq $v0, $zero, .L8084C0CC +/* 19E88 8084C098 8FA90080 */ lw $t1, 0x0080($sp) /* 19E8C 8084C09C 24440024 */ addiu $a0, $v0, 0x0024 ## $a0 = 00000024 /* 19E90 8084C0A0 24450100 */ addiu $a1, $v0, 0x0100 ## $a1 = 00000100 /* 19E94 8084C0A4 27A6006C */ addiu $a2, $sp, 0x006C ## $a2 = FFFFFFE4 -/* 19E98 8084C0A8 AFA80084 */ sw $t0, 0x0084($sp) +/* 19E98 8084C0A8 AFA80084 */ sw $t0, 0x0084($sp) /* 19E9C 8084C0AC 0C01DFB4 */ jal Math_Vec3f_Diff ## Vec3f_Sub -/* 19EA0 8084C0B0 AFA90080 */ sw $t1, 0x0080($sp) +/* 19EA0 8084C0B0 AFA90080 */ sw $t1, 0x0080($sp) /* 19EA4 8084C0B4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 19EA8 8084C0B8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000024 /* 19EAC 8084C0BC 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add /* 19EB0 8084C0C0 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFE4 -/* 19EB4 8084C0C4 8FA80084 */ lw $t0, 0x0084($sp) -/* 19EB8 8084C0C8 8FA90080 */ lw $t1, 0x0080($sp) +/* 19EB4 8084C0C4 8FA80084 */ lw $t0, 0x0084($sp) +/* 19EB8 8084C0C8 8FA90080 */ lw $t1, 0x0080($sp) .L8084C0CC: /* 19EBC 8084C0CC 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 .L8084C0D0: /* 19EC0 8084C0D0 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 -/* 19EC4 8084C0D4 8FA4008C */ lw $a0, 0x008C($sp) +/* 19EC4 8084C0D4 8FA4008C */ lw $a0, 0x008C($sp) /* 19EC8 8084C0D8 C5920000 */ lwc1 $f18, 0x0000($t4) ## 00000000 -/* 19ECC 8084C0DC AFA90080 */ sw $t1, 0x0080($sp) -/* 19ED0 8084C0E0 AFA80084 */ sw $t0, 0x0084($sp) -/* 19ED4 8084C0E4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 19ECC 8084C0DC AFA90080 */ sw $t1, 0x0080($sp) +/* 19ED0 8084C0E0 AFA80084 */ sw $t0, 0x0084($sp) +/* 19ED4 8084C0E4 AFAD0014 */ sw $t5, 0x0014($sp) /* 19ED8 8084C0E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 19EDC 8084C0EC 3C0641D0 */ lui $a2, 0x41D0 ## $a2 = 41D00000 /* 19EE0 8084C0F0 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 19EE4 8084C0F4 0C00B92D */ jal func_8002E4B4 -/* 19EE8 8084C0F8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 19EE4 8084C0F4 0C00B92D */ jal func_8002E4B4 +/* 19EE8 8084C0F8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 19EEC 8084C0FC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 19EF0 8084C100 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 /* 19EF4 8084C104 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 /* 19EF8 8084C108 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 /* 19EFC 8084C10C 44813000 */ mtc1 $at, $f6 ## $f6 = -20.00 /* 19F00 8084C110 8DC7003C */ lw $a3, 0x003C($t6) ## 0000003C -/* 19F04 8084C114 8FA4008C */ lw $a0, 0x008C($sp) +/* 19F04 8084C114 8FA4008C */ lw $a0, 0x008C($sp) /* 19F08 8084C118 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 19F0C 8084C11C 3C0641D0 */ lui $a2, 0x41D0 ## $a2 = 41D00000 -/* 19F10 8084C120 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 19F14 8084C124 0C20FCD8 */ jal func_8083F360 -/* 19F18 8084C128 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 19F1C 8084C12C 8FA80084 */ lw $t0, 0x0084($sp) -/* 19F20 8084C130 8FA90080 */ lw $t1, 0x0080($sp) +/* 19F10 8084C120 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 19F14 8084C124 0C20FCD8 */ jal func_8083F360 +/* 19F18 8084C128 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 19F1C 8084C12C 8FA80084 */ lw $t0, 0x0084($sp) +/* 19F20 8084C130 8FA90080 */ lw $t1, 0x0080($sp) /* 19F24 8084C134 86030850 */ lh $v1, 0x0850($s0) ## 00000850 .L8084C138: -/* 19F28 8084C138 04600008 */ bltz $v1, .L8084C15C +/* 19F28 8084C138 04600008 */ bltz $v1, .L8084C15C /* 19F2C 8084C13C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19F30 8084C140 8FA5008C */ lw $a1, 0x008C($sp) -/* 19F34 8084C144 AFA80084 */ sw $t0, 0x0084($sp) -/* 19F38 8084C148 0C20FEF0 */ jal func_8083FBC0 -/* 19F3C 8084C14C AFA90080 */ sw $t1, 0x0080($sp) -/* 19F40 8084C150 8FA80084 */ lw $t0, 0x0084($sp) -/* 19F44 8084C154 144000E7 */ bne $v0, $zero, .L8084C4F4 -/* 19F48 8084C158 8FA90080 */ lw $t1, 0x0080($sp) +/* 19F30 8084C140 8FA5008C */ lw $a1, 0x008C($sp) +/* 19F34 8084C144 AFA80084 */ sw $t0, 0x0084($sp) +/* 19F38 8084C148 0C20FEF0 */ jal func_8083FBC0 +/* 19F3C 8084C14C AFA90080 */ sw $t1, 0x0080($sp) +/* 19F40 8084C150 8FA80084 */ lw $t0, 0x0084($sp) +/* 19F44 8084C154 144000E7 */ bne $v0, $zero, .L8084C4F4 +/* 19F48 8084C158 8FA90080 */ lw $t1, 0x0080($sp) .L8084C15C: /* 19F4C 8084C15C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 19F50 8084C160 AFA50030 */ sw $a1, 0x0030($sp) -/* 19F54 8084C164 8FA4008C */ lw $a0, 0x008C($sp) -/* 19F58 8084C168 AFA80084 */ sw $t0, 0x0084($sp) -/* 19F5C 8084C16C 0C028EF0 */ jal func_800A3BC0 -/* 19F60 8084C170 AFA90080 */ sw $t1, 0x0080($sp) -/* 19F64 8084C174 8FA80084 */ lw $t0, 0x0084($sp) -/* 19F68 8084C178 104000DE */ beq $v0, $zero, .L8084C4F4 -/* 19F6C 8084C17C 8FA90080 */ lw $t1, 0x0080($sp) +/* 19F50 8084C160 AFA50030 */ sw $a1, 0x0030($sp) +/* 19F54 8084C164 8FA4008C */ lw $a0, 0x008C($sp) +/* 19F58 8084C168 AFA80084 */ sw $t0, 0x0084($sp) +/* 19F5C 8084C16C 0C028EF0 */ jal func_800A3BC0 +/* 19F60 8084C170 AFA90080 */ sw $t1, 0x0080($sp) +/* 19F64 8084C174 8FA80084 */ lw $t0, 0x0084($sp) +/* 19F68 8084C178 104000DE */ beq $v0, $zero, .L8084C4F4 +/* 19F6C 8084C17C 8FA90080 */ lw $t1, 0x0080($sp) /* 19F70 8084C180 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 19F74 8084C184 04610008 */ bgez $v1, .L8084C1A8 +/* 19F74 8084C184 04610008 */ bgez $v1, .L8084C1A8 /* 19F78 8084C188 00000000 */ nop -/* 19F7C 8084C18C 04600003 */ bltz $v1, .L8084C19C -/* 19F80 8084C190 00031023 */ subu $v0, $zero, $v1 -/* 19F84 8084C194 10000001 */ beq $zero, $zero, .L8084C19C +/* 19F7C 8084C18C 04600003 */ bltz $v1, .L8084C19C +/* 19F80 8084C190 00031023 */ subu $v0, $zero, $v1 +/* 19F84 8084C194 10000001 */ beq $zero, $zero, .L8084C19C /* 19F88 8084C198 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L8084C19C: /* 19F8C 8084C19C 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 19F90 8084C1A0 10000110 */ beq $zero, $zero, .L8084C5E4 +/* 19F90 8084C1A0 10000110 */ beq $zero, $zero, .L8084C5E4 /* 19F94 8084C1A4 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 .L8084C1A8: -/* 19F98 8084C1A8 51000099 */ beql $t0, $zero, .L8084C410 +/* 19F98 8084C1A8 51000099 */ beql $t0, $zero, .L8084C410 /* 19F9C 8084C1AC 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 19FA0 8084C1B0 8204084F */ lb $a0, 0x084F($s0) ## 0000084F /* 19FA4 8084C1B4 3C018085 */ lui $at, %hi(D_80854890) ## $at = 80850000 -/* 19FA8 8084C1B8 1900004F */ blez $t0, .L8084C2F8 -/* 19FAC 8084C1BC 00831021 */ addu $v0, $a0, $v1 +/* 19FA8 8084C1B8 1900004F */ blez $t0, .L8084C2F8 +/* 19FAC 8084C1BC 00831021 */ addu $v0, $a0, $v1 /* 19FB0 8084C1C0 8E180678 */ lw $t8, 0x0678($s0) ## 00000678 /* 19FB4 8084C1C4 3C068085 */ lui $a2, %hi(D_8085488C) ## $a2 = 80850000 /* 19FB8 8084C1C8 24C6488C */ addiu $a2, $a2, %lo(D_8085488C) ## $a2 = 8085488C /* 19FBC 8084C1CC C7080040 */ lwc1 $f8, 0x0040($t8) ## 00000040 -/* 19FC0 8084C1D0 AFA20068 */ sw $v0, 0x0068($sp) -/* 19FC4 8084C1D4 8FA4008C */ lw $a0, 0x008C($sp) +/* 19FC0 8084C1D0 AFA20068 */ sw $v0, 0x0068($sp) +/* 19FC4 8084C1D4 8FA4008C */ lw $a0, 0x008C($sp) /* 19FC8 8084C1D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 19FCC 8084C1DC 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFD4 -/* 19FD0 8084C1E0 0C20E5CF */ jal func_8083973C -/* 19FD4 8084C1E4 E4284890 */ swc1 $f8, %lo(D_80854890)($at) +/* 19FD0 8084C1E0 0C20E5CF */ jal func_8083973C +/* 19FD4 8084C1E4 E4284890 */ swc1 $f8, %lo(D_80854890)($at) /* 19FD8 8084C1E8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 19FDC 8084C1EC 8FA20068 */ lw $v0, 0x0068($sp) -/* 19FE0 8084C1F0 46000086 */ mov.s $f2, $f0 -/* 19FE4 8084C1F4 4600503C */ c.lt.s $f10, $f0 -/* 19FE8 8084C1F8 0002C080 */ sll $t8, $v0, 2 -/* 19FEC 8084C1FC 4502002C */ bc1fl .L8084C2B0 +/* 19FDC 8084C1EC 8FA20068 */ lw $v0, 0x0068($sp) +/* 19FE0 8084C1F0 46000086 */ mov.s $f2, $f0 +/* 19FE4 8084C1F4 4600503C */ c.lt.s $f10, $f0 +/* 19FE8 8084C1F8 0002C080 */ sll $t8, $v0, 2 +/* 19FEC 8084C1FC 4502002C */ bc1fl .L8084C2B0 /* 19FF0 8084C200 8E0F0678 */ lw $t7, 0x0678($s0) ## 00000678 /* 19FF4 8084C204 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 19FF8 8084C208 3C01FFDF */ lui $at, 0xFFDF ## $at = FFDF0000 /* 19FFC 8084C20C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFDFFFFF -/* 1A000 8084C210 1320001D */ beq $t9, $zero, .L8084C288 +/* 1A000 8084C210 1320001D */ beq $t9, $zero, .L8084C288 /* 1A004 8084C214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1A008 8084C218 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C /* 1A00C 8084C21C 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 /* 1A010 8084C220 E6020028 */ swc1 $f2, 0x0028($s0) ## 00000028 -/* 1A014 8084C224 01415824 */ and $t3, $t2, $at +/* 1A014 8084C224 01415824 */ and $t3, $t2, $at /* 1A018 8084C228 AE0B067C */ sw $t3, 0x067C($s0) ## 0000067C /* 1A01C 8084C22C 3C0D0400 */ lui $t5, 0x0400 ## $t5 = 04000000 /* 1A020 8084C230 25AD3000 */ addiu $t5, $t5, 0x3000 ## $t5 = 04003000 /* 1A024 8084C234 8E060074 */ lw $a2, 0x0074($s0) ## 00000074 /* 1A028 8084C238 8D87003C */ lw $a3, 0x003C($t4) ## 0000003C -/* 1A02C 8084C23C AFAD0010 */ sw $t5, 0x0010($sp) -/* 1A030 8084C240 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A034 8084C244 0C20E971 */ jal func_8083A5C4 +/* 1A02C 8084C23C AFAD0010 */ sw $t5, 0x0010($sp) +/* 1A030 8084C240 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A034 8084C244 0C20E971 */ jal func_8083A5C4 /* 1A038 8084C248 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1A03C 8084C24C 860E083C */ lh $t6, 0x083C($s0) ## 0000083C /* 1A040 8084C250 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 1A044 8084C254 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 1A048 8084C258 01C17821 */ addu $t7, $t6, $at +/* 1A048 8084C258 01C17821 */ addu $t7, $t6, $at /* 1A04C 8084C25C A60F083C */ sh $t7, 0x083C($s0) ## 0000083C /* 1A050 8084C260 8618083C */ lh $t8, 0x083C($s0) ## 0000083C /* 1A054 8084C264 24A53000 */ addiu $a1, $a1, 0x3000 ## $a1 = 04003000 /* 1A058 8084C268 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1A05C 8084C26C A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 1A060 8084C270 0C20EA6E */ jal func_8083A9B8 -/* 1A064 8084C274 8FA6008C */ lw $a2, 0x008C($sp) +/* 1A060 8084C270 0C20EA6E */ jal func_8083A9B8 +/* 1A064 8084C274 8FA6008C */ lw $a2, 0x008C($sp) /* 1A068 8084C278 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 1A06C 8084C27C 372A4000 */ ori $t2, $t9, 0x4000 ## $t2 = 00004000 -/* 1A070 8084C280 1000005E */ beq $zero, $zero, .L8084C3FC +/* 1A070 8084C280 1000005E */ beq $zero, $zero, .L8084C3FC /* 1A074 8084C284 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C .L8084C288: /* 1A078 8084C288 860C0850 */ lh $t4, 0x0850($s0) ## 00000850 /* 1A07C 8084C28C 8E0B0678 */ lw $t3, 0x0678($s0) ## 00000678 -/* 1A080 8084C290 8FA6008C */ lw $a2, 0x008C($sp) -/* 1A084 8084C294 000C6880 */ sll $t5, $t4, 2 -/* 1A088 8084C298 016D7021 */ addu $t6, $t3, $t5 -/* 1A08C 8084C29C 0C20FC1C */ jal func_8083F070 +/* 1A080 8084C290 8FA6008C */ lw $a2, 0x008C($sp) +/* 1A084 8084C294 000C6880 */ sll $t5, $t4, 2 +/* 1A088 8084C298 016D7021 */ addu $t6, $t3, $t5 +/* 1A08C 8084C29C 0C20FC1C */ jal func_8083F070 /* 1A090 8084C2A0 8DC500CC */ lw $a1, 0x00CC($t6) ## 000000CC -/* 1A094 8084C2A4 10000056 */ beq $zero, $zero, .L8084C400 +/* 1A094 8084C2A4 10000056 */ beq $zero, $zero, .L8084C400 /* 1A098 8084C2A8 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 /* 1A09C 8084C2AC 8E0F0678 */ lw $t7, 0x0678($s0) ## 00000678 .L8084C2B0: -/* 1A0A0 8084C2B0 0302C023 */ subu $t8, $t8, $v0 -/* 1A0A4 8084C2B4 0018C040 */ sll $t8, $t8, 1 -/* 1A0A8 8084C2B8 01F8C821 */ addu $t9, $t7, $t8 +/* 1A0A0 8084C2B0 0302C023 */ subu $t8, $t8, $v0 +/* 1A0A4 8084C2B4 0018C040 */ sll $t8, $t8, 1 +/* 1A0A8 8084C2B8 01F8C821 */ addu $t9, $t7, $t8 /* 1A0AC 8084C2BC 8B2C004A */ lwl $t4, 0x004A($t9) ## 0000004A /* 1A0B0 8084C2C0 9B2C004D */ lwr $t4, 0x004D($t9) ## 0000004D /* 1A0B4 8084C2C4 8E0B0678 */ lw $t3, 0x0678($s0) ## 00000678 -/* 1A0B8 8084C2C8 00026880 */ sll $t5, $v0, 2 +/* 1A0B8 8084C2C8 00026880 */ sll $t5, $v0, 2 /* 1A0BC 8084C2CC AA0C01EC */ swl $t4, 0x01EC($s0) ## 000001EC /* 1A0C0 8084C2D0 BA0C01EF */ swr $t4, 0x01EF($s0) ## 000001EF /* 1A0C4 8084C2D4 972C004E */ lhu $t4, 0x004E($t9) ## 0000004E -/* 1A0C8 8084C2D8 016D7021 */ addu $t6, $t3, $t5 +/* 1A0C8 8084C2D8 016D7021 */ addu $t6, $t3, $t5 /* 1A0CC 8084C2DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1A0D0 8084C2E0 A60C01F0 */ sh $t4, 0x01F0($s0) ## 000001F0 /* 1A0D4 8084C2E4 8DC600AC */ lw $a2, 0x00AC($t6) ## 000000AC -/* 1A0D8 8084C2E8 0C20C899 */ jal func_80832264 -/* 1A0DC 8084C2EC 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A0E0 8084C2F0 10000043 */ beq $zero, $zero, .L8084C400 +/* 1A0D8 8084C2E8 0C20C899 */ jal func_80832264 +/* 1A0DC 8084C2EC 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A0E0 8084C2F0 10000043 */ beq $zero, $zero, .L8084C400 /* 1A0E4 8084C2F4 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 .L8084C2F8: /* 1A0E8 8084C2F8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 1A0EC 8084C2FC C6120080 */ lwc1 $f18, 0x0080($s0) ## 00000080 /* 1A0F0 8084C300 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 1A0F4 8084C304 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 1A0F8 8084C308 46128101 */ sub.s $f4, $f16, $f18 +/* 1A0F8 8084C308 46128101 */ sub.s $f4, $f16, $f18 /* 1A0FC 8084C30C 38420001 */ xori $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 1A100 8084C310 00027880 */ sll $t7, $v0, 2 -/* 1A104 8084C314 4606203C */ c.lt.s $f4, $f6 +/* 1A100 8084C310 00027880 */ sll $t7, $v0, 2 +/* 1A104 8084C314 4606203C */ c.lt.s $f4, $f6 /* 1A108 8084C318 00000000 */ nop -/* 1A10C 8084C31C 4502001B */ bc1fl .L8084C38C +/* 1A10C 8084C31C 4502001B */ bc1fl .L8084C38C /* 1A110 8084C320 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 -/* 1A114 8084C324 10800005 */ beq $a0, $zero, .L8084C33C -/* 1A118 8084C328 8FA5008C */ lw $a1, 0x008C($sp) -/* 1A11C 8084C32C 0C20FEDF */ jal func_8083FB7C +/* 1A114 8084C324 10800005 */ beq $a0, $zero, .L8084C33C +/* 1A118 8084C328 8FA5008C */ lw $a1, 0x008C($sp) +/* 1A11C 8084C32C 0C20FEDF */ jal func_8083FB7C /* 1A120 8084C330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A124 8084C334 10000032 */ beq $zero, $zero, .L8084C400 +/* 1A124 8084C334 10000032 */ beq $zero, $zero, .L8084C400 /* 1A128 8084C338 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 .L8084C33C: -/* 1A12C 8084C33C 10600009 */ beq $v1, $zero, .L8084C364 +/* 1A12C 8084C33C 10600009 */ beq $v1, $zero, .L8084C364 /* 1A130 8084C340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1A134 8084C344 8E0F0678 */ lw $t7, 0x0678($s0) ## 00000678 /* 1A138 8084C348 86030850 */ lh $v1, 0x0850($s0) ## 00000850 @@ -299,67 +299,67 @@ glabel func_8084BF1C /* 1A150 8084C360 A61901F0 */ sh $t9, 0x01F0($s0) ## 000001F0 .L8084C364: /* 1A154 8084C364 8E0A0678 */ lw $t2, 0x0678($s0) ## 00000678 -/* 1A158 8084C368 00036080 */ sll $t4, $v1, 2 -/* 1A15C 8084C36C 8FA6008C */ lw $a2, 0x008C($sp) -/* 1A160 8084C370 014C5821 */ addu $t3, $t2, $t4 -/* 1A164 8084C374 0C20FC1C */ jal func_8083F070 +/* 1A158 8084C368 00036080 */ sll $t4, $v1, 2 +/* 1A15C 8084C36C 8FA6008C */ lw $a2, 0x008C($sp) +/* 1A160 8084C370 014C5821 */ addu $t3, $t2, $t4 +/* 1A164 8084C374 0C20FC1C */ jal func_8083F070 /* 1A168 8084C378 8D6500C4 */ lw $a1, 0x00C4($t3) ## 000000C4 /* 1A16C 8084C37C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 1A170 8084C380 1000001E */ beq $zero, $zero, .L8084C3FC +/* 1A170 8084C380 1000001E */ beq $zero, $zero, .L8084C3FC /* 1A174 8084C384 A60D0850 */ sh $t5, 0x0850($s0) ## 00000850 /* 1A178 8084C388 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 .L8084C38C: -/* 1A17C 8084C38C 01E27823 */ subu $t7, $t7, $v0 -/* 1A180 8084C390 000F7840 */ sll $t7, $t7, 1 -/* 1A184 8084C394 01CFC021 */ addu $t8, $t6, $t7 +/* 1A17C 8084C38C 01E27823 */ subu $t7, $t7, $v0 +/* 1A180 8084C390 000F7840 */ sll $t7, $t7, 1 +/* 1A184 8084C394 01CFC021 */ addu $t8, $t6, $t7 /* 1A188 8084C398 8B0A0062 */ lwl $t2, 0x0062($t8) ## 00000062 /* 1A18C 8084C39C 9B0A0065 */ lwr $t2, 0x0065($t8) ## 00000065 /* 1A190 8084C3A0 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 -/* 1A194 8084C3A4 00025880 */ sll $t3, $v0, 2 +/* 1A194 8084C3A4 00025880 */ sll $t3, $v0, 2 /* 1A198 8084C3A8 AA0A01EC */ swl $t2, 0x01EC($s0) ## 000001EC /* 1A19C 8084C3AC BA0A01EF */ swr $t2, 0x01EF($s0) ## 000001EF /* 1A1A0 8084C3B0 970A0066 */ lhu $t2, 0x0066($t8) ## 00000066 -/* 1A1A4 8084C3B4 018B6821 */ addu $t5, $t4, $t3 +/* 1A1A4 8084C3B4 018B6821 */ addu $t5, $t4, $t3 /* 1A1A8 8084C3B8 A60A01F0 */ sh $t2, 0x01F0($s0) ## 000001F0 /* 1A1AC 8084C3BC 8DA400AC */ lw $a0, 0x00AC($t5) ## 000000AD /* 1A1B0 8084C3C0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1A1B4 8084C3C4 AFA40054 */ sw $a0, 0x0054($sp) + +/* 1A1B4 8084C3C4 AFA40054 */ sw $a0, 0x0054($sp) /* 1A1B8 8084C3C8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 1A1BC 8084C3CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 1A1C0 8084C3D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1A1C4 8084C3D4 468042A0 */ cvt.s.w $f10, $f8 -/* 1A1C8 8084C3D8 AFAE0018 */ sw $t6, 0x0018($sp) -/* 1A1CC 8084C3DC 8FA60054 */ lw $a2, 0x0054($sp) -/* 1A1D0 8084C3E0 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A1D4 8084C3E4 8FA50030 */ lw $a1, 0x0030($sp) +/* 1A1C4 8084C3D4 468042A0 */ cvt.s.w $f10, $f8 +/* 1A1C8 8084C3D8 AFAE0018 */ sw $t6, 0x0018($sp) +/* 1A1CC 8084C3DC 8FA60054 */ lw $a2, 0x0054($sp) +/* 1A1D0 8084C3E0 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A1D4 8084C3E4 8FA50030 */ lw $a1, 0x0030($sp) /* 1A1D8 8084C3E8 3C07BF80 */ lui $a3, 0xBF80 ## $a3 = BF800000 -/* 1A1DC 8084C3EC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 1A1E0 8084C3F0 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1A1E4 8084C3F4 0C028FC2 */ jal func_800A3F08 -/* 1A1E8 8084C3F8 E7A0001C */ swc1 $f0, 0x001C($sp) +/* 1A1DC 8084C3EC E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 1A1E0 8084C3F0 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 1A1E4 8084C3F4 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 1A1E8 8084C3F8 E7A0001C */ swc1 $f0, 0x001C($sp) .L8084C3FC: /* 1A1EC 8084C3FC 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 .L8084C400: /* 1A1F0 8084C400 39F80001 */ xori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 1A1F4 8084C404 10000077 */ beq $zero, $zero, .L8084C5E4 +/* 1A1F4 8084C404 10000077 */ beq $zero, $zero, .L8084C5E4 /* 1A1F8 8084C408 A6180850 */ sh $t8, 0x0850($s0) ## 00000850 /* 1A1FC 8084C40C 8219084F */ lb $t9, 0x084F($s0) ## 0000084F .L8084C410: -/* 1A200 8084C410 53200035 */ beql $t9, $zero, .L8084C4E8 +/* 1A200 8084C410 53200035 */ beql $t9, $zero, .L8084C4E8 /* 1A204 8084C414 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 -/* 1A208 8084C418 51200033 */ beql $t1, $zero, .L8084C4E8 +/* 1A208 8084C418 51200033 */ beql $t1, $zero, .L8084C4E8 /* 1A20C 8084C41C 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 /* 1A210 8084C420 8E020678 */ lw $v0, 0x0678($s0) ## 00000678 -/* 1A214 8084C424 00035080 */ sll $t2, $v1, 2 -/* 1A218 8084C428 0003C080 */ sll $t8, $v1, 2 -/* 1A21C 8084C42C 004A6021 */ addu $t4, $v0, $t2 -/* 1A220 8084C430 19200010 */ blez $t1, .L8084C474 +/* 1A214 8084C424 00035080 */ sll $t2, $v1, 2 +/* 1A218 8084C428 0003C080 */ sll $t8, $v1, 2 +/* 1A21C 8084C42C 004A6021 */ addu $t4, $v0, $t2 +/* 1A220 8084C430 19200010 */ blez $t1, .L8084C474 /* 1A224 8084C434 8D8600BC */ lw $a2, 0x00BC($t4) ## 000000BC -/* 1A228 8084C438 00035880 */ sll $t3, $v1, 2 -/* 1A22C 8084C43C 01635823 */ subu $t3, $t3, $v1 -/* 1A230 8084C440 000B5840 */ sll $t3, $t3, 1 -/* 1A234 8084C444 004B6821 */ addu $t5, $v0, $t3 +/* 1A228 8084C438 00035880 */ sll $t3, $v1, 2 +/* 1A22C 8084C43C 01635823 */ subu $t3, $t3, $v1 +/* 1A230 8084C440 000B5840 */ sll $t3, $t3, 1 +/* 1A234 8084C444 004B6821 */ addu $t5, $v0, $t3 /* 1A238 8084C448 89AF007A */ lwl $t7, 0x007A($t5) ## 0000007A /* 1A23C 8084C44C 99AF007D */ lwr $t7, 0x007D($t5) ## 0000007D /* 1A240 8084C450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -367,14 +367,14 @@ glabel func_8084BF1C /* 1A248 8084C458 BA0F01EF */ swr $t7, 0x01EF($s0) ## 000001EF /* 1A24C 8084C45C 95AF007E */ lhu $t7, 0x007E($t5) ## 0000007E /* 1A250 8084C460 A60F01F0 */ sh $t7, 0x01F0($s0) ## 000001F0 -/* 1A254 8084C464 0C20C899 */ jal func_80832264 -/* 1A258 8084C468 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A25C 8084C46C 1000005E */ beq $zero, $zero, .L8084C5E8 -/* 1A260 8084C470 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A254 8084C464 0C20C899 */ jal func_80832264 +/* 1A258 8084C468 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A25C 8084C46C 1000005E */ beq $zero, $zero, .L8084C5E8 +/* 1A260 8084C470 8FBF002C */ lw $ra, 0x002C($sp) .L8084C474: -/* 1A264 8084C474 0303C023 */ subu $t8, $t8, $v1 -/* 1A268 8084C478 0018C040 */ sll $t8, $t8, 1 -/* 1A26C 8084C47C 0058C821 */ addu $t9, $v0, $t8 +/* 1A264 8084C474 0303C023 */ subu $t8, $t8, $v1 +/* 1A268 8084C478 0018C040 */ sll $t8, $t8, 1 +/* 1A26C 8084C47C 0058C821 */ addu $t9, $v0, $t8 /* 1A270 8084C480 8B2C0086 */ lwl $t4, 0x0086($t9) ## 00000086 /* 1A274 8084C484 9B2C0089 */ lwr $t4, 0x0089($t9) ## 00000089 /* 1A278 8084C488 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 @@ -383,101 +383,101 @@ glabel func_8084BF1C /* 1A284 8084C494 972C008A */ lhu $t4, 0x008A($t9) ## 0000008A /* 1A288 8084C498 A60C01F0 */ sh $t4, 0x01F0($s0) ## 000001F0 /* 1A28C 8084C49C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1A290 8084C4A0 AFA60050 */ sw $a2, 0x0050($sp) + +/* 1A290 8084C4A0 AFA60050 */ sw $a2, 0x0050($sp) /* 1A294 8084C4A4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 1A298 8084C4A8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1A29C 8084C4AC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 1A2A0 8084C4B0 468084A0 */ cvt.s.w $f18, $f16 +/* 1A2A0 8084C4B0 468084A0 */ cvt.s.w $f18, $f16 /* 1A2A4 8084C4B4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 1A2A8 8084C4B8 AFAB0018 */ sw $t3, 0x0018($sp) -/* 1A2AC 8084C4BC 8FA60050 */ lw $a2, 0x0050($sp) -/* 1A2B0 8084C4C0 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A2B4 8084C4C4 8FA50030 */ lw $a1, 0x0030($sp) -/* 1A2B8 8084C4C8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 1A2A8 8084C4B8 AFAB0018 */ sw $t3, 0x0018($sp) +/* 1A2AC 8084C4BC 8FA60050 */ lw $a2, 0x0050($sp) +/* 1A2B0 8084C4C0 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A2B4 8084C4C4 8FA50030 */ lw $a1, 0x0030($sp) +/* 1A2B8 8084C4C8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 1A2BC 8084C4CC 3C07BF80 */ lui $a3, 0xBF80 ## $a3 = BF800000 -/* 1A2C0 8084C4D0 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 1A2C4 8084C4D4 0C028FC2 */ jal func_800A3F08 -/* 1A2C8 8084C4D8 E7A6001C */ swc1 $f6, 0x001C($sp) -/* 1A2CC 8084C4DC 10000042 */ beq $zero, $zero, .L8084C5E8 -/* 1A2D0 8084C4E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A2C0 8084C4D0 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 1A2C4 8084C4D4 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 1A2C8 8084C4D8 E7A6001C */ swc1 $f6, 0x001C($sp) +/* 1A2CC 8084C4DC 10000042 */ beq $zero, $zero, .L8084C5E8 +/* 1A2D0 8084C4E0 8FBF002C */ lw $ra, 0x002C($sp) /* 1A2D4 8084C4E4 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 .L8084C4E8: /* 1A2D8 8084C4E8 35AE1000 */ ori $t6, $t5, 0x1000 ## $t6 = 00001000 -/* 1A2DC 8084C4EC 1000003D */ beq $zero, $zero, .L8084C5E4 +/* 1A2DC 8084C4EC 1000003D */ beq $zero, $zero, .L8084C5E4 /* 1A2E0 8084C4F0 AE0E0680 */ sw $t6, 0x0680($s0) ## 00000680 .L8084C4F4: /* 1A2E4 8084C4F4 86030850 */ lh $v1, 0x0850($s0) ## 00000850 /* 1A2E8 8084C4F8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 1A2EC 8084C4FC 04630026 */ bgezl $v1, .L8084C598 +/* 1A2EC 8084C4FC 04630026 */ bgezl $v1, .L8084C598 /* 1A2F0 8084C500 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 1A2F4 8084C504 1461000B */ bne $v1, $at, .L8084C534 +/* 1A2F4 8084C504 1461000B */ bne $v1, $at, .L8084C534 /* 1A2F8 8084C508 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 /* 1A2FC 8084C50C 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 -/* 1A300 8084C510 0C02914C */ jal func_800A4530 -/* 1A304 8084C514 AFA40030 */ sw $a0, 0x0030($sp) -/* 1A308 8084C518 1440001A */ bne $v0, $zero, .L8084C584 -/* 1A30C 8084C51C 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A310 8084C520 0C02914C */ jal func_800A4530 +/* 1A300 8084C510 0C02914C */ jal func_800A4530 +/* 1A304 8084C514 AFA40030 */ sw $a0, 0x0030($sp) +/* 1A308 8084C518 1440001A */ bne $v0, $zero, .L8084C584 +/* 1A30C 8084C51C 8FA40030 */ lw $a0, 0x0030($sp) +/* 1A310 8084C520 0C02914C */ jal func_800A4530 /* 1A314 8084C524 3C0541E8 */ lui $a1, 0x41E8 ## $a1 = 41E80000 -/* 1A318 8084C528 14400016 */ bne $v0, $zero, .L8084C584 +/* 1A318 8084C528 14400016 */ bne $v0, $zero, .L8084C584 /* 1A31C 8084C52C 00000000 */ nop /* 1A320 8084C530 86030850 */ lh $v1, 0x0850($s0) ## 00000850 .L8084C534: /* 1A324 8084C534 2401FFFC */ addiu $at, $zero, 0xFFFC ## $at = FFFFFFFC -/* 1A328 8084C538 1461002A */ bne $v1, $at, .L8084C5E4 +/* 1A328 8084C538 1461002A */ bne $v1, $at, .L8084C5E4 /* 1A32C 8084C53C 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 /* 1A330 8084C540 3C0541B0 */ lui $a1, 0x41B0 ## $a1 = 41B00000 -/* 1A334 8084C544 0C02914C */ jal func_800A4530 -/* 1A338 8084C548 AFA40030 */ sw $a0, 0x0030($sp) -/* 1A33C 8084C54C 1440000D */ bne $v0, $zero, .L8084C584 -/* 1A340 8084C550 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A344 8084C554 0C02914C */ jal func_800A4530 +/* 1A334 8084C544 0C02914C */ jal func_800A4530 +/* 1A338 8084C548 AFA40030 */ sw $a0, 0x0030($sp) +/* 1A33C 8084C54C 1440000D */ bne $v0, $zero, .L8084C584 +/* 1A340 8084C550 8FA40030 */ lw $a0, 0x0030($sp) +/* 1A344 8084C554 0C02914C */ jal func_800A4530 /* 1A348 8084C558 3C05420C */ lui $a1, 0x420C ## $a1 = 420C0000 -/* 1A34C 8084C55C 14400009 */ bne $v0, $zero, .L8084C584 -/* 1A350 8084C560 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A354 8084C564 0C02914C */ jal func_800A4530 +/* 1A34C 8084C55C 14400009 */ bne $v0, $zero, .L8084C584 +/* 1A350 8084C560 8FA40030 */ lw $a0, 0x0030($sp) +/* 1A354 8084C564 0C02914C */ jal func_800A4530 /* 1A358 8084C568 3C054244 */ lui $a1, 0x4244 ## $a1 = 42440000 -/* 1A35C 8084C56C 14400005 */ bne $v0, $zero, .L8084C584 -/* 1A360 8084C570 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A364 8084C574 0C02914C */ jal func_800A4530 +/* 1A35C 8084C56C 14400005 */ bne $v0, $zero, .L8084C584 +/* 1A360 8084C570 8FA40030 */ lw $a0, 0x0030($sp) +/* 1A364 8084C574 0C02914C */ jal func_800A4530 /* 1A368 8084C578 3C05425C */ lui $a1, 0x425C ## $a1 = 425C0000 -/* 1A36C 8084C57C 5040001A */ beql $v0, $zero, .L8084C5E8 -/* 1A370 8084C580 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A36C 8084C57C 5040001A */ beql $v0, $zero, .L8084C5E8 +/* 1A370 8084C580 8FBF002C */ lw $ra, 0x002C($sp) .L8084C584: -/* 1A374 8084C584 0C212FB9 */ jal func_8084BEE4 +/* 1A374 8084C584 0C212FB9 */ jal func_8084BEE4 /* 1A378 8084C588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A37C 8084C58C 10000016 */ beq $zero, $zero, .L8084C5E8 -/* 1A380 8084C590 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A37C 8084C58C 10000016 */ beq $zero, $zero, .L8084C5E8 +/* 1A380 8084C590 8FBF002C */ lw $ra, 0x002C($sp) /* 1A384 8084C594 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 .L8084C598: /* 1A388 8084C598 C60A01D0 */ lwc1 $f10, 0x01D0($s0) ## 000001D0 /* 1A38C 8084C59C 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 /* 1A390 8084C5A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 1A394 8084C5A4 460A403C */ c.lt.s $f8, $f10 +/* 1A394 8084C5A4 460A403C */ c.lt.s $f8, $f10 /* 1A398 8084C5A8 00000000 */ nop -/* 1A39C 8084C5AC 45020005 */ bc1fl .L8084C5C4 +/* 1A39C 8084C5AC 45020005 */ bc1fl .L8084C5C4 /* 1A3A0 8084C5B0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 1A3A4 8084C5B4 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 1A3A8 8084C5B8 10000004 */ beq $zero, $zero, .L8084C5CC -/* 1A3AC 8084C5BC 44050000 */ mfc1 $a1, $f0 +/* 1A3A8 8084C5B8 10000004 */ beq $zero, $zero, .L8084C5CC +/* 1A3AC 8084C5BC 44050000 */ mfc1 $a1, $f0 /* 1A3B0 8084C5C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L8084C5C4: /* 1A3B4 8084C5C4 00000000 */ nop -/* 1A3B8 8084C5C8 44050000 */ mfc1 $a1, $f0 +/* 1A3B8 8084C5C8 44050000 */ mfc1 $a1, $f0 .L8084C5CC: -/* 1A3BC 8084C5CC 0C02914C */ jal func_800A4530 +/* 1A3BC 8084C5CC 0C02914C */ jal func_800A4530 /* 1A3C0 8084C5D0 00000000 */ nop -/* 1A3C4 8084C5D4 50400004 */ beql $v0, $zero, .L8084C5E8 -/* 1A3C8 8084C5D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 1A3CC 8084C5DC 0C212FB9 */ jal func_8084BEE4 +/* 1A3C4 8084C5D4 50400004 */ beql $v0, $zero, .L8084C5E8 +/* 1A3C8 8084C5D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A3CC 8084C5DC 0C212FB9 */ jal func_8084BEE4 /* 1A3D0 8084C5E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8084C5E4: -/* 1A3D4 8084C5E4 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A3D4 8084C5E4 8FBF002C */ lw $ra, 0x002C($sp) .L8084C5E8: -/* 1A3D8 8084C5E8 8FB00028 */ lw $s0, 0x0028($sp) +/* 1A3D8 8084C5E8 8FB00028 */ lw $s0, 0x0028($sp) /* 1A3DC 8084C5EC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 1A3E0 8084C5F0 03E00008 */ jr $ra +/* 1A3E0 8084C5F0 03E00008 */ jr $ra /* 1A3E4 8084C5F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s index 71878a029..4ca89fda3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s @@ -1,88 +1,88 @@ glabel func_8084CC98 /* 1AA88 8084CC98 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 1AA8C 8084CC9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 1AA90 8084CCA0 AFB00020 */ sw $s0, 0x0020($sp) -/* 1AA94 8084CCA4 AFA50054 */ sw $a1, 0x0054($sp) +/* 1AA8C 8084CC9C AFBF0024 */ sw $ra, 0x0024($sp) +/* 1AA90 8084CCA0 AFB00020 */ sw $s0, 0x0020($sp) +/* 1AA94 8084CCA4 AFA50054 */ sw $a1, 0x0054($sp) /* 1AA98 8084CCA8 8C8E0440 */ lw $t6, 0x0440($a0) ## 00000440 /* 1AA9C 8084CCAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 1AAA0 8084CCB0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 1AAA4 8084CCB4 AFAE004C */ sw $t6, 0x004C($sp) +/* 1AAA4 8084CCB4 AFAE004C */ sw $t6, 0x004C($sp) /* 1AAA8 8084CCB8 8C8F0680 */ lw $t7, 0x0680($a0) ## 00000680 /* 1AAAC 8084CCBC 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 1AAB0 8084CCC0 35F80040 */ ori $t8, $t7, 0x0040 ## $t8 = 00000040 -/* 1AAB4 8084CCC4 0C2132FD */ jal func_8084CBF4 +/* 1AAB4 8084CCC4 0C2132FD */ jal func_8084CBF4 /* 1AAB8 8084CCC8 AC980680 */ sw $t8, 0x0680($a0) ## 00000680 /* 1AABC 8084CCCC 86190850 */ lh $t9, 0x0850($s0) ## 00000850 /* 1AAC0 8084CCD0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AAC4 8084CCD4 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AAC8 8084CCD8 1720003C */ bne $t9, $zero, .L8084CDCC +/* 1AAC4 8084CCD4 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AAC8 8084CCD8 1720003C */ bne $t9, $zero, .L8084CDCC /* 1AACC 8084CCDC 00000000 */ nop -/* 1AAD0 8084CCE0 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AAD4 8084CCE4 0C028EF0 */ jal func_800A3BC0 -/* 1AAD8 8084CCE8 AFA50030 */ sw $a1, 0x0030($sp) -/* 1AADC 8084CCEC 10400007 */ beq $v0, $zero, .L8084CD0C +/* 1AAD0 8084CCE0 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AAD4 8084CCE4 0C028EF0 */ jal func_800A3BC0 +/* 1AAD8 8084CCE8 AFA50030 */ sw $a1, 0x0030($sp) +/* 1AADC 8084CCEC 10400007 */ beq $v0, $zero, .L8084CD0C /* 1AAE0 8084CCF0 3C0C8085 */ lui $t4, %hi(D_80854998) ## $t4 = 80850000 /* 1AAE4 8084CCF4 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 /* 1AAE8 8084CCF8 250833B8 */ addiu $t0, $t0, 0x33B8 ## $t0 = 040033B8 /* 1AAEC 8084CCFC 24090063 */ addiu $t1, $zero, 0x0063 ## $t1 = 00000063 /* 1AAF0 8084CD00 AE0801BC */ sw $t0, 0x01BC($s0) ## 000001BC -/* 1AAF4 8084CD04 100001B2 */ beq $zero, $zero, .L8084D3D0 +/* 1AAF4 8084CD04 100001B2 */ beq $zero, $zero, .L8084D3D0 /* 1AAF8 8084CD08 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 .L8084CD0C: /* 1AAFC 8084CD0C 820A043C */ lb $t2, 0x043C($s0) ## 0000043C /* 1AB00 8084CD10 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 1AB04 8084CD14 258C4998 */ addiu $t4, $t4, %lo(D_80854998) ## $t4 = 80854998 -/* 1AB08 8084CD18 05410003 */ bgez $t2, .L8084CD28 +/* 1AB08 8084CD18 05410003 */ bgez $t2, .L8084CD28 /* 1AB0C 8084CD1C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 1AB10 8084CD20 10000001 */ beq $zero, $zero, .L8084CD28 +/* 1AB10 8084CD20 10000001 */ beq $zero, $zero, .L8084CD28 /* 1AB14 8084CD24 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8084CD28: -/* 1AB18 8084CD28 00025840 */ sll $t3, $v0, 1 -/* 1AB1C 8084CD2C 016C1821 */ addu $v1, $t3, $t4 +/* 1AB18 8084CD28 00025840 */ sll $t3, $v0, 1 +/* 1AB1C 8084CD2C 016C1821 */ addu $v1, $t3, $t4 /* 1AB20 8084CD30 906D0000 */ lbu $t5, 0x0000($v1) ## 00000000 -/* 1AB24 8084CD34 8FA40030 */ lw $a0, 0x0030($sp) +/* 1AB24 8084CD34 8FA40030 */ lw $a0, 0x0030($sp) /* 1AB28 8084CD38 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 1AB2C 8084CD3C 05A10004 */ bgez $t5, .L8084CD50 -/* 1AB30 8084CD40 46802120 */ cvt.s.w $f4, $f4 +/* 1AB2C 8084CD3C 05A10004 */ bgez $t5, .L8084CD50 +/* 1AB30 8084CD40 46802120 */ cvt.s.w $f4, $f4 /* 1AB34 8084CD44 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 1AB38 8084CD48 00000000 */ nop -/* 1AB3C 8084CD4C 46062100 */ add.s $f4, $f4, $f6 +/* 1AB3C 8084CD4C 46062100 */ add.s $f4, $f4, $f6 .L8084CD50: -/* 1AB40 8084CD50 44052000 */ mfc1 $a1, $f4 -/* 1AB44 8084CD54 0C02914C */ jal func_800A4530 -/* 1AB48 8084CD58 AFA3002C */ sw $v1, 0x002C($sp) -/* 1AB4C 8084CD5C 10400006 */ beq $v0, $zero, .L8084CD78 -/* 1AB50 8084CD60 8FA3002C */ lw $v1, 0x002C($sp) +/* 1AB40 8084CD50 44052000 */ mfc1 $a1, $f4 +/* 1AB44 8084CD54 0C02914C */ jal func_800A4530 +/* 1AB48 8084CD58 AFA3002C */ sw $v1, 0x002C($sp) +/* 1AB4C 8084CD5C 10400006 */ beq $v0, $zero, .L8084CD78 +/* 1AB50 8084CD60 8FA3002C */ lw $v1, 0x002C($sp) /* 1AB54 8084CD64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AB58 8084CD68 0C00BDF7 */ jal func_8002F7DC +/* 1AB58 8084CD68 0C00BDF7 */ jal func_8002F7DC /* 1AB5C 8084CD6C 24050831 */ addiu $a1, $zero, 0x0831 ## $a1 = 00000831 -/* 1AB60 8084CD70 10000198 */ beq $zero, $zero, .L8084D3D4 -/* 1AB64 8084CD74 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1AB60 8084CD70 10000198 */ beq $zero, $zero, .L8084D3D4 +/* 1AB64 8084CD74 8FBF0024 */ lw $ra, 0x0024($sp) .L8084CD78: /* 1AB68 8084CD78 906E0001 */ lbu $t6, 0x0001($v1) ## 00000001 -/* 1AB6C 8084CD7C 8FA40030 */ lw $a0, 0x0030($sp) +/* 1AB6C 8084CD7C 8FA40030 */ lw $a0, 0x0030($sp) /* 1AB70 8084CD80 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 1AB74 8084CD84 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 1AB78 8084CD88 05C10004 */ bgez $t6, .L8084CD9C -/* 1AB7C 8084CD8C 46804220 */ cvt.s.w $f8, $f8 +/* 1AB78 8084CD88 05C10004 */ bgez $t6, .L8084CD9C +/* 1AB7C 8084CD8C 46804220 */ cvt.s.w $f8, $f8 /* 1AB80 8084CD90 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 1AB84 8084CD94 00000000 */ nop -/* 1AB88 8084CD98 460A4200 */ add.s $f8, $f8, $f10 +/* 1AB88 8084CD98 460A4200 */ add.s $f8, $f8, $f10 .L8084CD9C: -/* 1AB8C 8084CD9C 44054000 */ mfc1 $a1, $f8 -/* 1AB90 8084CDA0 0C02914C */ jal func_800A4530 +/* 1AB8C 8084CD9C 44054000 */ mfc1 $a1, $f8 +/* 1AB90 8084CDA0 0C02914C */ jal func_800A4530 /* 1AB94 8084CDA4 00000000 */ nop -/* 1AB98 8084CDA8 10400189 */ beq $v0, $zero, .L8084D3D0 -/* 1AB9C 8084CDAC 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ABA0 8084CDB0 0C00B79D */ jal func_8002DE74 +/* 1AB98 8084CDA8 10400189 */ beq $v0, $zero, .L8084D3D0 +/* 1AB9C 8084CDAC 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ABA0 8084CDB0 0C00B79D */ jal func_8002DE74 /* 1ABA4 8084CDB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1ABA8 8084CDB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1ABAC 8084CDBC 0C00BDF7 */ jal func_8002F7DC +/* 1ABAC 8084CDBC 0C00BDF7 */ jal func_8002F7DC /* 1ABB0 8084CDC0 24050832 */ addiu $a1, $zero, 0x0832 ## $a1 = 00000832 -/* 1ABB4 8084CDC4 10000183 */ beq $zero, $zero, .L8084D3D4 -/* 1ABB8 8084CDC8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1ABB4 8084CDC4 10000183 */ beq $zero, $zero, .L8084D3D4 +/* 1ABB8 8084CDC8 8FBF0024 */ lw $ra, 0x0024($sp) .L8084CDCC: -/* 1ABBC 8084CDCC 0C00B79D */ jal func_8002DE74 +/* 1ABBC 8084CDCC 0C00B79D */ jal func_8002DE74 /* 1ABC0 8084CDD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1ABC4 8084CDD4 3C0F8085 */ lui $t7, %hi(D_8085499C) ## $t7 = 80850000 /* 1ABC8 8084CDD8 25EF499C */ addiu $t7, $t7, %lo(D_8085499C) ## $t7 = 8085499C @@ -92,19 +92,19 @@ glabel func_8084CC98 /* 1ABD8 8084CDE8 BA1901EF */ swr $t9, 0x01EF($s0) ## 000001EF /* 1ABDC 8084CDEC 95F90004 */ lhu $t9, 0x0004($t7) ## 808549A0 /* 1ABE0 8084CDF0 A61901F0 */ sh $t9, 0x01F0($s0) ## 000001F0 -/* 1ABE4 8084CDF4 8FA8004C */ lw $t0, 0x004C($sp) +/* 1ABE4 8084CDF4 8FA8004C */ lw $t0, 0x004C($sp) /* 1ABE8 8084CDF8 8D030210 */ lw $v1, 0x0210($t0) ## 00000210 -/* 1ABEC 8084CDFC 10430039 */ beq $v0, $v1, .L8084CEE4 -/* 1ABF0 8084CE00 28610002 */ slti $at, $v1, 0x0002 -/* 1ABF4 8084CE04 10200003 */ beq $at, $zero, .L8084CE14 -/* 1ABF8 8084CE08 28410002 */ slti $at, $v0, 0x0002 -/* 1ABFC 8084CE0C 54200036 */ bnel $at, $zero, .L8084CEE8 +/* 1ABEC 8084CDFC 10430039 */ beq $v0, $v1, .L8084CEE4 +/* 1ABF0 8084CE00 28610002 */ slti $at, $v1, 0x0002 +/* 1ABF4 8084CE04 10200003 */ beq $at, $zero, .L8084CE14 +/* 1ABF8 8084CE08 28410002 */ slti $at, $v0, 0x0002 +/* 1ABFC 8084CE0C 54200036 */ bnel $at, $zero, .L8084CEE8 /* 1AC00 8084CE10 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L8084CE14: -/* 1AC04 8084CE14 00031400 */ sll $v0, $v1, 16 -/* 1AC08 8084CE18 00021403 */ sra $v0, $v0, 16 -/* 1AC0C 8084CE1C 28410002 */ slti $at, $v0, 0x0002 -/* 1AC10 8084CE20 1020001D */ beq $at, $zero, .L8084CE98 +/* 1AC04 8084CE14 00031400 */ sll $v0, $v1, 16 +/* 1AC08 8084CE18 00021403 */ sra $v0, $v0, 16 +/* 1AC0C 8084CE1C 28410002 */ slti $at, $v0, 0x0002 +/* 1AC10 8084CE20 1020001D */ beq $at, $zero, .L8084CE98 /* 1AC14 8084CE24 A6020850 */ sh $v0, 0x0850($s0) ## 00000850 /* 1AC18 8084CE28 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -112,235 +112,235 @@ glabel func_8084CC98 /* 1AC20 8084CE30 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 1AC24 8084CE34 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 /* 1AC28 8084CE38 3C018085 */ lui $at, %hi(D_80855530) ## $at = 80850000 -/* 1AC2C 8084CE3C C4305530 */ lwc1 $f16, %lo(D_80855530)($at) +/* 1AC2C 8084CE3C C4305530 */ lwc1 $f16, %lo(D_80855530)($at) /* 1AC30 8084CE40 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 1AC34 8084CE44 3C018085 */ lui $at, %hi(D_80855534) ## $at = 80850000 -/* 1AC38 8084CE48 4610003C */ c.lt.s $f0, $f16 -/* 1AC3C 8084CE4C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AC38 8084CE48 4610003C */ c.lt.s $f0, $f16 +/* 1AC3C 8084CE4C 8FA40054 */ lw $a0, 0x0054($sp) /* 1AC40 8084CE50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1AC44 8084CE54 3C068085 */ lui $a2, %hi(D_8085498C) ## $a2 = 80850000 -/* 1AC48 8084CE58 45000003 */ bc1f .L8084CE68 +/* 1AC48 8084CE58 45000003 */ bc1f .L8084CE68 /* 1AC4C 8084CE5C 00000000 */ nop -/* 1AC50 8084CE60 10000007 */ beq $zero, $zero, .L8084CE80 +/* 1AC50 8084CE60 10000007 */ beq $zero, $zero, .L8084CE80 /* 1AC54 8084CE64 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 .L8084CE68: -/* 1AC58 8084CE68 C4325534 */ lwc1 $f18, %lo(D_80855534)($at) -/* 1AC5C 8084CE6C 4612003C */ c.lt.s $f0, $f18 +/* 1AC58 8084CE68 C4325534 */ lwc1 $f18, %lo(D_80855534)($at) +/* 1AC5C 8084CE6C 4612003C */ c.lt.s $f0, $f18 /* 1AC60 8084CE70 00000000 */ nop -/* 1AC64 8084CE74 45020003 */ bc1fl .L8084CE84 -/* 1AC68 8084CE78 00025080 */ sll $t2, $v0, 2 +/* 1AC64 8084CE74 45020003 */ bc1fl .L8084CE84 +/* 1AC68 8084CE78 00025080 */ sll $t2, $v0, 2 /* 1AC6C 8084CE7C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8084CE80: -/* 1AC70 8084CE80 00025080 */ sll $t2, $v0, 2 +/* 1AC70 8084CE80 00025080 */ sll $t2, $v0, 2 .L8084CE84: -/* 1AC74 8084CE84 00CA3021 */ addu $a2, $a2, $t2 -/* 1AC78 8084CE88 0C20C899 */ jal func_80832264 -/* 1AC7C 8084CE8C 8CC6498C */ lw $a2, %lo(D_8085498C)($a2) -/* 1AC80 8084CE90 10000014 */ beq $zero, $zero, .L8084CEE4 +/* 1AC74 8084CE84 00CA3021 */ addu $a2, $a2, $t2 +/* 1AC78 8084CE88 0C20C899 */ jal func_80832264 +/* 1AC7C 8084CE8C 8CC6498C */ lw $a2, %lo(D_8085498C)($a2) +/* 1AC80 8084CE90 10000014 */ beq $zero, $zero, .L8084CEE4 /* 1AC84 8084CE94 86020850 */ lh $v0, 0x0850($s0) ## 00000850 .L8084CE98: /* 1AC88 8084CE98 860B0850 */ lh $t3, 0x0850($s0) ## 00000850 /* 1AC8C 8084CE9C 3C0D8085 */ lui $t5, %hi(D_8085493C) ## $t5 = 80850000 /* 1AC90 8084CEA0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AC94 8084CEA4 000B6080 */ sll $t4, $t3, 2 -/* 1AC98 8084CEA8 01AC6821 */ addu $t5, $t5, $t4 -/* 1AC9C 8084CEAC 8DAD493C */ lw $t5, %lo(D_8085493C)($t5) +/* 1AC94 8084CEA4 000B6080 */ sll $t4, $t3, 2 +/* 1AC98 8084CEA8 01AC6821 */ addu $t5, $t5, $t4 +/* 1AC9C 8084CEAC 8DAD493C */ lw $t5, %lo(D_8085493C)($t5) /* 1ACA0 8084CEB0 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 /* 1ACA4 8084CEB4 AE0D01BC */ sw $t5, 0x01BC($s0) ## 000001BC -/* 1ACA8 8084CEB8 0C028FBA */ jal func_800A3EE8 -/* 1ACAC 8084CEBC 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ACA8 8084CEB8 0C028FBA */ jal func_800A3EE8 +/* 1ACAC 8084CEBC 8FA40054 */ lw $a0, 0x0054($sp) /* 1ACB0 8084CEC0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1ACB4 8084CEC4 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ACB8 8084CEC8 28410004 */ slti $at, $v0, 0x0004 -/* 1ACBC 8084CECC 50200006 */ beql $at, $zero, .L8084CEE8 +/* 1ACB4 8084CEC4 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ACB8 8084CEC8 28410004 */ slti $at, $v0, 0x0004 +/* 1ACBC 8084CECC 50200006 */ beql $at, $zero, .L8084CEE8 /* 1ACC0 8084CED0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1ACC4 8084CED4 0C20D191 */ jal func_80834644 +/* 1ACC4 8084CED4 0C20D191 */ jal func_80834644 /* 1ACC8 8084CED8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1ACCC 8084CEDC A200084F */ sb $zero, 0x084F($s0) ## 0000084F /* 1ACD0 8084CEE0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 .L8084CEE4: /* 1ACD4 8084CEE4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L8084CEE8: -/* 1ACD8 8084CEE8 14410020 */ bne $v0, $at, .L8084CF6C -/* 1ACDC 8084CEEC 8FA8004C */ lw $t0, 0x004C($sp) +/* 1ACD8 8084CEE8 14410020 */ bne $v0, $at, .L8084CF6C +/* 1ACDC 8084CEEC 8FA8004C */ lw $t0, 0x004C($sp) /* 1ACE0 8084CEF0 3C0E8085 */ lui $t6, %hi(D_808535E0) ## $t6 = 80850000 -/* 1ACE4 8084CEF4 8DCE35E0 */ lw $t6, %lo(D_808535E0)($t6) -/* 1ACE8 8084CEF8 15C00005 */ bne $t6, $zero, .L8084CF10 +/* 1ACE4 8084CEF4 8DCE35E0 */ lw $t6, %lo(D_808535E0)($t6) +/* 1ACE8 8084CEF8 15C00005 */ bne $t6, $zero, .L8084CF10 /* 1ACEC 8084CEFC 00000000 */ nop -/* 1ACF0 8084CF00 0C20C893 */ jal func_8083224C -/* 1ACF4 8084CF04 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ACF8 8084CF08 10400008 */ beq $v0, $zero, .L8084CF2C -/* 1ACFC 8084CF0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ACF0 8084CF00 0C20C893 */ jal func_8083224C +/* 1ACF4 8084CF04 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ACF8 8084CF08 10400008 */ beq $v0, $zero, .L8084CF2C +/* 1ACFC 8084CF0C 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF10: /* 1AD00 8084CF10 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1AD04 8084CF14 24C633C8 */ addiu $a2, $a2, 0x33C8 ## $a2 = 040033C8 -/* 1AD08 8084CF18 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AD0C 8084CF1C 0C20C899 */ jal func_80832264 +/* 1AD08 8084CF18 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD0C 8084CF1C 0C20C899 */ jal func_80832264 /* 1AD10 8084CF20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1AD14 8084CF24 10000017 */ beq $zero, $zero, .L8084CF84 -/* 1AD18 8084CF28 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD14 8084CF24 10000017 */ beq $zero, $zero, .L8084CF84 +/* 1AD18 8084CF28 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF2C: -/* 1AD1C 8084CF2C 0C028EF0 */ jal func_800A3BC0 +/* 1AD1C 8084CF2C 0C028EF0 */ jal func_800A3BC0 /* 1AD20 8084CF30 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AD24 8084CF34 10400003 */ beq $v0, $zero, .L8084CF44 +/* 1AD24 8084CF34 10400003 */ beq $v0, $zero, .L8084CF44 /* 1AD28 8084CF38 240F0063 */ addiu $t7, $zero, 0x0063 ## $t7 = 00000063 -/* 1AD2C 8084CF3C 10000010 */ beq $zero, $zero, .L8084CF80 +/* 1AD2C 8084CF3C 10000010 */ beq $zero, $zero, .L8084CF80 /* 1AD30 8084CF40 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 .L8084CF44: /* 1AD34 8084CF44 8E1901BC */ lw $t9, 0x01BC($s0) ## 000001BC /* 1AD38 8084CF48 3C180400 */ lui $t8, 0x0400 ## $t8 = 04000000 /* 1AD3C 8084CF4C 271833B8 */ addiu $t8, $t8, 0x33B8 ## $t8 = 040033B8 -/* 1AD40 8084CF50 1719000B */ bne $t8, $t9, .L8084CF80 +/* 1AD40 8084CF50 1719000B */ bne $t8, $t9, .L8084CF80 /* 1AD44 8084CF54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1AD48 8084CF58 3C058085 */ lui $a1, %hi(D_808549A4) ## $a1 = 80850000 -/* 1AD4C 8084CF5C 0C20CA49 */ jal func_80832924 +/* 1AD4C 8084CF5C 0C20CA49 */ jal func_80832924 /* 1AD50 8084CF60 24A549A4 */ addiu $a1, $a1, %lo(D_808549A4) ## $a1 = 808549A4 -/* 1AD54 8084CF64 10000007 */ beq $zero, $zero, .L8084CF84 -/* 1AD58 8084CF68 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD54 8084CF64 10000007 */ beq $zero, $zero, .L8084CF84 +/* 1AD58 8084CF68 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF6C: /* 1AD5C 8084CF6C C5040214 */ lwc1 $f4, 0x0214($t0) ## 00000214 /* 1AD60 8084CF70 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 1AD64 8084CF74 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC -/* 1AD68 8084CF78 0C028F27 */ jal func_800A3C9C -/* 1AD6C 8084CF7C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD68 8084CF78 0C028F27 */ jal func_800A3C9C +/* 1AD6C 8084CF7C 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF80: -/* 1AD70 8084CF80 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD70 8084CF80 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF84: /* 1AD74 8084CF84 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 1AD78 8084CF88 8E0601D8 */ lw $a2, 0x01D8($s0) ## 000001D8 -/* 1AD7C 8084CF8C 0C028D1E */ jal func_800A3478 +/* 1AD7C 8084CF8C 0C028D1E */ jal SkelAnime_LoadAnimationType1 /* 1AD80 8084CF90 8E0701D4 */ lw $a3, 0x01D4($s0) ## 000001D4 -/* 1AD84 8084CF94 8FA90054 */ lw $t1, 0x0054($sp) +/* 1AD84 8084CF94 8FA90054 */ lw $t1, 0x0054($sp) /* 1AD88 8084CF98 912A1D6C */ lbu $t2, 0x1D6C($t1) ## 00001D6C -/* 1AD8C 8084CF9C 55400005 */ bnel $t2, $zero, .L8084CFB4 +/* 1AD8C 8084CF9C 55400005 */ bnel $t2, $zero, .L8084CFB4 /* 1AD90 8084CFA0 920C0444 */ lbu $t4, 0x0444($s0) ## 00000444 /* 1AD94 8084CFA4 920B0444 */ lbu $t3, 0x0444($s0) ## 00000444 -/* 1AD98 8084CFA8 5160000A */ beql $t3, $zero, .L8084CFD4 +/* 1AD98 8084CFA8 5160000A */ beql $t3, $zero, .L8084CFD4 /* 1AD9C 8084CFAC 86020850 */ lh $v0, 0x0850($s0) ## 00000850 /* 1ADA0 8084CFB0 920C0444 */ lbu $t4, 0x0444($s0) ## 00000444 .L8084CFB4: /* 1ADA4 8084CFB4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 1ADA8 8084CFB8 55810003 */ bnel $t4, $at, .L8084CFC8 +/* 1ADA8 8084CFB8 55810003 */ bnel $t4, $at, .L8084CFC8 /* 1ADAC 8084CFBC A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD /* 1ADB0 8084CFC0 A2000444 */ sb $zero, 0x0444($s0) ## 00000444 /* 1ADB4 8084CFC4 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD .L8084CFC8: -/* 1ADB8 8084CFC8 10000011 */ beq $zero, $zero, .L8084D010 +/* 1ADB8 8084CFC8 10000011 */ beq $zero, $zero, .L8084D010 /* 1ADBC 8084CFCC A200084F */ sb $zero, 0x084F($s0) ## 0000084F /* 1ADC0 8084CFD0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 .L8084CFD4: /* 1ADC4 8084CFD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1ADC8 8084CFD8 28410002 */ slti $at, $v0, 0x0002 -/* 1ADCC 8084CFDC 14200003 */ bne $at, $zero, .L8084CFEC -/* 1ADD0 8084CFE0 28410004 */ slti $at, $v0, 0x0004 -/* 1ADD4 8084CFE4 5420000B */ bnel $at, $zero, .L8084D014 -/* 1ADD8 8084CFE8 8FA7004C */ lw $a3, 0x004C($sp) +/* 1ADC8 8084CFD8 28410002 */ slti $at, $v0, 0x0002 +/* 1ADCC 8084CFDC 14200003 */ bne $at, $zero, .L8084CFEC +/* 1ADD0 8084CFE0 28410004 */ slti $at, $v0, 0x0004 +/* 1ADD4 8084CFE4 5420000B */ bnel $at, $zero, .L8084D014 +/* 1ADD8 8084CFE8 8FA7004C */ lw $a3, 0x004C($sp) .L8084CFEC: -/* 1ADDC 8084CFEC 0C20D99C */ jal func_80836670 -/* 1ADE0 8084CFF0 8FA50054 */ lw $a1, 0x0054($sp) +/* 1ADDC 8084CFEC 0C20D99C */ jal func_80836670 +/* 1ADE0 8084CFF0 8FA50054 */ lw $a1, 0x0054($sp) /* 1ADE4 8084CFF4 3C018085 */ lui $at, %hi(D_808535E0) ## $at = 80850000 -/* 1ADE8 8084CFF8 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) +/* 1ADE8 8084CFF8 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) /* 1ADEC 8084CFFC 3C0D8085 */ lui $t5, %hi(D_808535E0) ## $t5 = 80850000 -/* 1ADF0 8084D000 8DAD35E0 */ lw $t5, %lo(D_808535E0)($t5) -/* 1ADF4 8084D004 51A00003 */ beql $t5, $zero, .L8084D014 -/* 1ADF8 8084D008 8FA7004C */ lw $a3, 0x004C($sp) +/* 1ADF0 8084D000 8DAD35E0 */ lw $t5, %lo(D_808535E0)($t5) +/* 1ADF4 8084D004 51A00003 */ beql $t5, $zero, .L8084D014 +/* 1ADF8 8084D008 8FA7004C */ lw $a3, 0x004C($sp) /* 1ADFC 8084D00C A200084F */ sb $zero, 0x084F($s0) ## 0000084F .L8084D010: -/* 1AE00 8084D010 8FA7004C */ lw $a3, 0x004C($sp) +/* 1AE00 8084D010 8FA7004C */ lw $a3, 0x004C($sp) .L8084D014: /* 1AE04 8084D014 3C0141D8 */ lui $at, 0x41D8 ## $at = 41D80000 /* 1AE08 8084D018 920E0444 */ lbu $t6, 0x0444($s0) ## 00000444 /* 1AE0C 8084D01C C4E60024 */ lwc1 $f6, 0x0024($a3) ## 00000024 /* 1AE10 8084D020 C4E80258 */ lwc1 $f8, 0x0258($a3) ## 00000258 -/* 1AE14 8084D024 46083280 */ add.s $f10, $f6, $f8 +/* 1AE14 8084D024 46083280 */ add.s $f10, $f6, $f8 /* 1AE18 8084D028 44813000 */ mtc1 $at, $f6 ## $f6 = 27.00 /* 1AE1C 8084D02C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 1AE20 8084D030 C4F2025C */ lwc1 $f18, 0x025C($a3) ## 0000025C /* 1AE24 8084D034 C4F00028 */ lwc1 $f16, 0x0028($a3) ## 00000028 -/* 1AE28 8084D038 46128100 */ add.s $f4, $f16, $f18 -/* 1AE2C 8084D03C 46062201 */ sub.s $f8, $f4, $f6 +/* 1AE28 8084D038 46128100 */ add.s $f4, $f16, $f18 +/* 1AE2C 8084D03C 46062201 */ sub.s $f8, $f4, $f6 /* 1AE30 8084D040 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 1AE34 8084D044 C4F00260 */ lwc1 $f16, 0x0260($a3) ## 00000260 /* 1AE38 8084D048 C4EA002C */ lwc1 $f10, 0x002C($a3) ## 0000002C -/* 1AE3C 8084D04C 46105480 */ add.s $f18, $f10, $f16 +/* 1AE3C 8084D04C 46105480 */ add.s $f18, $f10, $f16 /* 1AE40 8084D050 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 1AE44 8084D054 84E200B6 */ lh $v0, 0x00B6($a3) ## 000000B6 /* 1AE48 8084D058 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 1AE4C 8084D05C 15C00014 */ bne $t6, $zero, .L8084D0B0 +/* 1AE4C 8084D05C 15C00014 */ bne $t6, $zero, .L8084D0B0 /* 1AE50 8084D060 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -/* 1AE54 8084D064 0C20C893 */ jal func_8083224C -/* 1AE58 8084D068 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AE5C 8084D06C 144000D8 */ bne $v0, $zero, .L8084D3D0 -/* 1AE60 8084D070 8FAF004C */ lw $t7, 0x004C($sp) +/* 1AE54 8084D064 0C20C893 */ jal func_8083224C +/* 1AE58 8084D068 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AE5C 8084D06C 144000D8 */ bne $v0, $zero, .L8084D3D0 +/* 1AE60 8084D070 8FAF004C */ lw $t7, 0x004C($sp) /* 1AE64 8084D074 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1AE68 8084D078 C5E60068 */ lwc1 $f6, 0x0068($t7) ## 00000068 /* 1AE6C 8084D07C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AE70 8084D080 46062032 */ c.eq.s $f4, $f6 +/* 1AE70 8084D080 46062032 */ c.eq.s $f4, $f6 /* 1AE74 8084D084 00000000 */ nop -/* 1AE78 8084D088 45020005 */ bc1fl .L8084D0A0 +/* 1AE78 8084D088 45020005 */ bc1fl .L8084D0A0 /* 1AE7C 8084D08C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AE80 8084D090 0C20ED91 */ jal func_8083B644 -/* 1AE84 8084D094 8FA50054 */ lw $a1, 0x0054($sp) -/* 1AE88 8084D098 144000CD */ bne $v0, $zero, .L8084D3D0 +/* 1AE80 8084D090 0C20ED91 */ jal func_8083B644 +/* 1AE84 8084D094 8FA50054 */ lw $a1, 0x0054($sp) +/* 1AE88 8084D098 144000CD */ bne $v0, $zero, .L8084D3D0 /* 1AE8C 8084D09C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8084D0A0: -/* 1AE90 8084D0A0 0C20F077 */ jal func_8083C1DC -/* 1AE94 8084D0A4 8FA50054 */ lw $a1, 0x0054($sp) -/* 1AE98 8084D0A8 144000C9 */ bne $v0, $zero, .L8084D3D0 -/* 1AE9C 8084D0AC 8FA7004C */ lw $a3, 0x004C($sp) +/* 1AE90 8084D0A0 0C20F077 */ jal func_8083C1DC +/* 1AE94 8084D0A4 8FA50054 */ lw $a1, 0x0054($sp) +/* 1AE98 8084D0A8 144000C9 */ bne $v0, $zero, .L8084D3D0 +/* 1AE9C 8084D0AC 8FA7004C */ lw $a3, 0x004C($sp) .L8084D0B0: /* 1AEA0 8084D0B0 3C188085 */ lui $t8, %hi(D_808535E0) ## $t8 = 80850000 -/* 1AEA4 8084D0B4 8F1835E0 */ lw $t8, %lo(D_808535E0)($t8) -/* 1AEA8 8084D0B8 5700005C */ bnel $t8, $zero, .L8084D22C +/* 1AEA4 8084D0B4 8F1835E0 */ lw $t8, %lo(D_808535E0)($t8) +/* 1AEA8 8084D0B8 5700005C */ bnel $t8, $zero, .L8084D22C /* 1AEAC 8084D0BC 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C /* 1AEB0 8084D0C0 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 1AEB4 8084D0C4 260606C8 */ addiu $a2, $s0, 0x06C8 ## $a2 = 000006C8 /* 1AEB8 8084D0C8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000006C8 -/* 1AEBC 8084D0CC 13200034 */ beq $t9, $zero, .L8084D1A0 -/* 1AEC0 8084D0D0 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AEC4 8084D0D4 0C028EF0 */ jal func_800A3BC0 -/* 1AEC8 8084D0D8 AFA60030 */ sw $a2, 0x0030($sp) -/* 1AECC 8084D0DC 10400007 */ beq $v0, $zero, .L8084D0FC -/* 1AED0 8084D0E0 8FA60030 */ lw $a2, 0x0030($sp) -/* 1AED4 8084D0E4 8FA8004C */ lw $t0, 0x004C($sp) +/* 1AEBC 8084D0CC 13200034 */ beq $t9, $zero, .L8084D1A0 +/* 1AEC0 8084D0D0 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AEC4 8084D0D4 0C028EF0 */ jal func_800A3BC0 +/* 1AEC8 8084D0D8 AFA60030 */ sw $a2, 0x0030($sp) +/* 1AECC 8084D0DC 10400007 */ beq $v0, $zero, .L8084D0FC +/* 1AED0 8084D0E0 8FA60030 */ lw $a2, 0x0030($sp) +/* 1AED4 8084D0E4 8FA8004C */ lw $t0, 0x004C($sp) /* 1AED8 8084D0E8 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF /* 1AEDC 8084D0EC 8D0901F0 */ lw $t1, 0x01F0($t0) ## 000001F0 -/* 1AEE0 8084D0F0 01215024 */ and $t2, $t1, $at +/* 1AEE0 8084D0F0 01215024 */ and $t2, $t1, $at /* 1AEE4 8084D0F4 AD0A01F0 */ sw $t2, 0x01F0($t0) ## 000001F0 /* 1AEE8 8084D0F8 A200084F */ sb $zero, 0x084F($s0) ## 0000084F .L8084D0FC: /* 1AEEC 8084D0FC 8E0C06D0 */ lw $t4, 0x06D0($s0) ## 000006D0 /* 1AEF0 8084D100 3C0B0400 */ lui $t3, 0x0400 ## $t3 = 04000000 /* 1AEF4 8084D104 256B33B0 */ addiu $t3, $t3, 0x33B0 ## $t3 = 040033B0 -/* 1AEF8 8084D108 156C0012 */ bne $t3, $t4, .L8084D154 +/* 1AEF8 8084D108 156C0012 */ bne $t3, $t4, .L8084D154 /* 1AEFC 8084D10C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 1AF00 8084D110 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1AF04 8084D114 0C02914C */ jal func_800A4530 +/* 1AF04 8084D114 0C02914C */ jal func_800A4530 /* 1AF08 8084D118 3C0541B8 */ lui $a1, 0x41B8 ## $a1 = 41B80000 -/* 1AF0C 8084D11C 10400006 */ beq $v0, $zero, .L8084D138 +/* 1AF0C 8084D11C 10400006 */ beq $v0, $zero, .L8084D138 /* 1AF10 8084D120 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF14 8084D124 0C00BDF7 */ jal func_8002F7DC +/* 1AF14 8084D124 0C00BDF7 */ jal func_8002F7DC /* 1AF18 8084D128 2405181E */ addiu $a1, $zero, 0x181E ## $a1 = 0000181E /* 1AF1C 8084D12C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF20 8084D130 0C20C9A6 */ jal func_80832698 +/* 1AF20 8084D130 0C20C9A6 */ jal func_80832698 /* 1AF24 8084D134 24056802 */ addiu $a1, $zero, 0x6802 ## $a1 = 00006802 .L8084D138: -/* 1AF28 8084D138 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AF28 8084D138 8FA40054 */ lw $a0, 0x0054($sp) /* 1AF2C 8084D13C 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 1AF30 8084D140 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 1AF34 8084D144 0C028D1E */ jal func_800A3478 +/* 1AF34 8084D144 0C028D1E */ jal SkelAnime_LoadAnimationType1 /* 1AF38 8084D148 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 1AF3C 8084D14C 10000037 */ beq $zero, $zero, .L8084D22C +/* 1AF3C 8084D14C 10000037 */ beq $zero, $zero, .L8084D22C /* 1AF40 8084D150 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C .L8084D154: -/* 1AF44 8084D154 0C02914C */ jal func_800A4530 +/* 1AF44 8084D154 0C02914C */ jal func_800A4530 /* 1AF48 8084D158 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 1AF4C 8084D15C 10400006 */ beq $v0, $zero, .L8084D178 +/* 1AF4C 8084D15C 10400006 */ beq $v0, $zero, .L8084D178 /* 1AF50 8084D160 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF54 8084D164 0C00BDF7 */ jal func_8002F7DC +/* 1AF54 8084D164 0C00BDF7 */ jal func_8002F7DC /* 1AF58 8084D168 2405181E */ addiu $a1, $zero, 0x181E ## $a1 = 0000181E /* 1AF5C 8084D16C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF60 8084D170 0C20C9A6 */ jal func_80832698 +/* 1AF60 8084D170 0C20C9A6 */ jal func_80832698 /* 1AF64 8084D174 24056802 */ addiu $a1, $zero, 0x6802 ## $a1 = 00006802 .L8084D178: /* 1AF68 8084D178 3C0D8085 */ lui $t5, %hi(D_80853410) ## $t5 = 80850000 @@ -348,131 +348,131 @@ glabel func_8084CC98 /* 1AF70 8084D180 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 1AF74 8084D184 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 /* 1AF78 8084D188 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 1AF7C 8084D18C AFAD0010 */ sw $t5, 0x0010($sp) -/* 1AF80 8084D190 0C028D52 */ jal func_800A3548 -/* 1AF84 8084D194 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AF88 8084D198 10000024 */ beq $zero, $zero, .L8084D22C +/* 1AF7C 8084D18C AFAD0010 */ sw $t5, 0x0010($sp) +/* 1AF80 8084D190 0C028D52 */ jal SkelAnime_LoadAnimationType3 +/* 1AF84 8084D194 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AF88 8084D198 10000024 */ beq $zero, $zero, .L8084D22C /* 1AF8C 8084D19C 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C .L8084D1A0: /* 1AF90 8084D1A0 8CE301F0 */ lw $v1, 0x01F0($a3) ## 000001F0 /* 1AF94 8084D1A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 1AF98 8084D1A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 1AF9C 8084D1AC 306E0200 */ andi $t6, $v1, 0x0200 ## $t6 = 00000000 -/* 1AFA0 8084D1B0 11C00003 */ beq $t6, $zero, .L8084D1C0 +/* 1AFA0 8084D1B0 11C00003 */ beq $t6, $zero, .L8084D1C0 /* 1AFA4 8084D1B4 306F0100 */ andi $t7, $v1, 0x0100 ## $t7 = 00000000 -/* 1AFA8 8084D1B8 10000001 */ beq $zero, $zero, .L8084D1C0 +/* 1AFA8 8084D1B8 10000001 */ beq $zero, $zero, .L8084D1C0 /* 1AFAC 8084D1BC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8084D1C0: -/* 1AFB0 8084D1C0 10400004 */ beq $v0, $zero, .L8084D1D4 -/* 1AFB4 8084D1C4 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AFB0 8084D1C0 10400004 */ beq $v0, $zero, .L8084D1D4 +/* 1AFB4 8084D1C4 8FA40054 */ lw $a0, 0x0054($sp) /* 1AFB8 8084D1C8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1AFBC 8084D1CC 10000010 */ beq $zero, $zero, .L8084D210 +/* 1AFBC 8084D1CC 10000010 */ beq $zero, $zero, .L8084D210 /* 1AFC0 8084D1D0 24C633B0 */ addiu $a2, $a2, 0x33B0 ## $a2 = 040033B0 .L8084D1D4: -/* 1AFC4 8084D1D4 11E00003 */ beq $t7, $zero, .L8084D1E4 +/* 1AFC4 8084D1D4 11E00003 */ beq $t7, $zero, .L8084D1E4 /* 1AFC8 8084D1D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1AFCC 8084D1DC 10000001 */ beq $zero, $zero, .L8084D1E4 +/* 1AFCC 8084D1DC 10000001 */ beq $zero, $zero, .L8084D1E4 /* 1AFD0 8084D1E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8084D1E4: -/* 1AFD4 8084D1E4 1040000A */ beq $v0, $zero, .L8084D210 +/* 1AFD4 8084D1E4 1040000A */ beq $v0, $zero, .L8084D210 /* 1AFD8 8084D1E8 00000000 */ nop /* 1AFDC 8084D1EC 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1AFE0 8084D1F0 28410002 */ slti $at, $v0, 0x0002 -/* 1AFE4 8084D1F4 14200006 */ bne $at, $zero, .L8084D210 +/* 1AFE0 8084D1F0 28410002 */ slti $at, $v0, 0x0002 +/* 1AFE4 8084D1F4 14200006 */ bne $at, $zero, .L8084D210 /* 1AFE8 8084D1F8 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 1AFEC 8084D1FC 10410004 */ beq $v0, $at, .L8084D210 -/* 1AFF0 8084D200 0002C080 */ sll $t8, $v0, 2 +/* 1AFEC 8084D1FC 10410004 */ beq $v0, $at, .L8084D210 +/* 1AFF0 8084D200 0002C080 */ sll $t8, $v0, 2 /* 1AFF4 8084D204 3C068085 */ lui $a2, %hi(D_80854960) ## $a2 = 80850000 -/* 1AFF8 8084D208 00D83021 */ addu $a2, $a2, $t8 -/* 1AFFC 8084D20C 8CC64960 */ lw $a2, %lo(D_80854960)($a2) +/* 1AFF8 8084D208 00D83021 */ addu $a2, $a2, $t8 +/* 1AFFC 8084D20C 8CC64960 */ lw $a2, %lo(D_80854960)($a2) .L8084D210: -/* 1B000 8084D210 50C00006 */ beql $a2, $zero, .L8084D22C +/* 1B000 8084D210 50C00006 */ beql $a2, $zero, .L8084D22C /* 1B004 8084D214 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1B008 8084D218 0C02901F */ jal func_800A407C +/* 1B008 8084D218 0C02901F */ jal func_800A407C /* 1B00C 8084D21C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 1B010 8084D220 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 1B014 8084D224 A219084F */ sb $t9, 0x084F($s0) ## 0000084F /* 1B018 8084D228 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C .L8084D22C: -/* 1B01C 8084D22C 8FA40054 */ lw $a0, 0x0054($sp) -/* 1B020 8084D230 000952C0 */ sll $t2, $t1, 11 -/* 1B024 8084D234 05430023 */ bgezl $t2, .L8084D2C4 +/* 1B01C 8084D22C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1B020 8084D230 000952C0 */ sll $t2, $t1, 11 +/* 1B024 8084D234 05430023 */ bgezl $t2, .L8084D2C4 /* 1B028 8084D238 92080444 */ lbu $t0, 0x0444($s0) ## 00000444 -/* 1B02C 8084D23C 0C20EB53 */ jal func_8083AD4C +/* 1B02C 8084D23C 0C20EB53 */ jal func_8083AD4C /* 1B030 8084D240 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B034 8084D244 1040000A */ beq $v0, $zero, .L8084D270 +/* 1B034 8084D244 1040000A */ beq $v0, $zero, .L8084D270 /* 1B038 8084D248 3C088086 */ lui $t0, %hi(D_80858AB4) ## $t0 = 80860000 -/* 1B03C 8084D24C 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) +/* 1B03C 8084D24C 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) /* 1B040 8084D250 950B000C */ lhu $t3, 0x000C($t0) ## 8086000C /* 1B044 8084D254 316C8000 */ andi $t4, $t3, 0x8000 ## $t4 = 00000000 -/* 1B048 8084D258 55800006 */ bnel $t4, $zero, .L8084D274 +/* 1B048 8084D258 55800006 */ bnel $t4, $zero, .L8084D274 /* 1B04C 8084D25C 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -/* 1B050 8084D260 0C20CEF3 */ jal func_80833BCC +/* 1B050 8084D260 0C20CEF3 */ jal func_80833BCC /* 1B054 8084D264 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B058 8084D268 10400008 */ beq $v0, $zero, .L8084D28C -/* 1B05C 8084D26C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1B058 8084D268 10400008 */ beq $v0, $zero, .L8084D28C +/* 1B05C 8084D26C 8FA40054 */ lw $a0, 0x0054($sp) .L8084D270: /* 1B060 8084D270 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C .L8084D274: /* 1B064 8084D274 3C01FFEF */ lui $at, 0xFFEF ## $at = FFEF0000 /* 1B068 8084D278 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFEFFFFF -/* 1B06C 8084D27C 01A17024 */ and $t6, $t5, $at +/* 1B06C 8084D27C 01A17024 */ and $t6, $t5, $at /* 1B070 8084D280 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -/* 1B074 8084D284 10000052 */ beq $zero, $zero, .L8084D3D0 +/* 1B074 8084D284 10000052 */ beq $zero, $zero, .L8084D3D0 /* 1B078 8084D288 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C .L8084D28C: /* 1B07C 8084D28C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1B080 8084D290 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1B084 8084D294 0C212AF6 */ jal func_8084ABD8 +/* 1B084 8084D294 0C212AF6 */ jal func_8084ABD8 /* 1B088 8084D298 2407EC78 */ addiu $a3, $zero, 0xEC78 ## $a3 = FFFFEC78 /* 1B08C 8084D29C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 1B090 8084D2A0 240AEC78 */ addiu $t2, $zero, 0xEC78 ## $t2 = FFFFEC78 /* 1B094 8084D2A4 A60A06B0 */ sh $t2, 0x06B0($s0) ## 000006B0 -/* 1B098 8084D2A8 004FC023 */ subu $t8, $v0, $t7 +/* 1B098 8084D2A8 004FC023 */ subu $t8, $v0, $t7 /* 1B09C 8084D2AC A61806BE */ sh $t8, 0x06BE($s0) ## 000006BE /* 1B0A0 8084D2B0 861906BE */ lh $t9, 0x06BE($s0) ## 000006BE /* 1B0A4 8084D2B4 27291388 */ addiu $t1, $t9, 0x1388 ## $t1 = 00001388 -/* 1B0A8 8084D2B8 10000045 */ beq $zero, $zero, .L8084D3D0 +/* 1B0A8 8084D2B8 10000045 */ beq $zero, $zero, .L8084D3D0 /* 1B0AC 8084D2BC A60906BE */ sh $t1, 0x06BE($s0) ## 000006BE /* 1B0B0 8084D2C0 92080444 */ lbu $t0, 0x0444($s0) ## 00000444 .L8084D2C4: /* 1B0B4 8084D2C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0B8 8084D2C8 5500000A */ bnel $t0, $zero, .L8084D2F4 +/* 1B0B8 8084D2C8 5500000A */ bnel $t0, $zero, .L8084D2F4 /* 1B0BC 8084D2CC 8E0B0664 */ lw $t3, 0x0664($s0) ## 00000664 -/* 1B0C0 8084D2D0 0C21326F */ jal func_8084C9BC -/* 1B0C4 8084D2D4 8FA50054 */ lw $a1, 0x0054($sp) -/* 1B0C8 8084D2D8 1440003D */ bne $v0, $zero, .L8084D3D0 +/* 1B0C0 8084D2D0 0C21326F */ jal func_8084C9BC +/* 1B0C4 8084D2D4 8FA50054 */ lw $a1, 0x0054($sp) +/* 1B0C8 8084D2D8 1440003D */ bne $v0, $zero, .L8084D3D0 /* 1B0CC 8084D2DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0D0 8084D2E0 0C20EC10 */ jal func_8083B040 -/* 1B0D4 8084D2E4 8FA50054 */ lw $a1, 0x0054($sp) -/* 1B0D8 8084D2E8 5440003A */ bnel $v0, $zero, .L8084D3D4 -/* 1B0DC 8084D2EC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1B0D0 8084D2E0 0C20EC10 */ jal func_8083B040 +/* 1B0D4 8084D2E4 8FA50054 */ lw $a1, 0x0054($sp) +/* 1B0D8 8084D2E8 5440003A */ bnel $v0, $zero, .L8084D3D4 +/* 1B0DC 8084D2EC 8FBF0024 */ lw $ra, 0x0024($sp) /* 1B0E0 8084D2F0 8E0B0664 */ lw $t3, 0x0664($s0) ## 00000664 .L8084D2F4: -/* 1B0E4 8084D2F4 11600026 */ beq $t3, $zero, .L8084D390 +/* 1B0E4 8084D2F4 11600026 */ beq $t3, $zero, .L8084D390 /* 1B0E8 8084D2F8 00000000 */ nop -/* 1B0EC 8084D2FC 0C00B75E */ jal func_8002DD78 +/* 1B0EC 8084D2FC 0C00B75E */ jal func_8002DD78 /* 1B0F0 8084D300 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0F4 8084D304 1040001E */ beq $v0, $zero, .L8084D380 +/* 1B0F4 8084D304 1040001E */ beq $v0, $zero, .L8084D380 /* 1B0F8 8084D308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1B0FC 8084D30C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B100 8084D310 0C20F6E6 */ jal func_8083DB98 +/* 1B100 8084D310 0C20F6E6 */ jal func_8083DB98 /* 1B104 8084D314 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 1B108 8084D318 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 /* 1B10C 8084D31C 240EB556 */ addiu $t6, $zero, 0xB556 ## $t6 = FFFFB556 -/* 1B110 8084D320 004C6823 */ subu $t5, $v0, $t4 +/* 1B110 8084D320 004C6823 */ subu $t5, $v0, $t4 /* 1B114 8084D324 A60D06BE */ sh $t5, 0x06BE($s0) ## 000006BE /* 1B118 8084D328 860306BE */ lh $v1, 0x06BE($s0) ## 000006BE -/* 1B11C 8084D32C 2861B556 */ slti $at, $v1, 0xB556 -/* 1B120 8084D330 50200004 */ beql $at, $zero, .L8084D344 -/* 1B124 8084D334 28614AAB */ slti $at, $v1, 0x4AAB -/* 1B128 8084D338 10000007 */ beq $zero, $zero, .L8084D358 +/* 1B11C 8084D32C 2861B556 */ slti $at, $v1, 0xB556 +/* 1B120 8084D330 50200004 */ beql $at, $zero, .L8084D344 +/* 1B124 8084D334 28614AAB */ slti $at, $v1, 0x4AAB +/* 1B128 8084D338 10000007 */ beq $zero, $zero, .L8084D358 /* 1B12C 8084D33C A60E06BE */ sh $t6, 0x06BE($s0) ## 000006BE -/* 1B130 8084D340 28614AAB */ slti $at, $v1, 0x4AAB +/* 1B130 8084D340 28614AAB */ slti $at, $v1, 0x4AAB .L8084D344: -/* 1B134 8084D344 14200003 */ bne $at, $zero, .L8084D354 +/* 1B134 8084D344 14200003 */ bne $at, $zero, .L8084D354 /* 1B138 8084D348 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 1B13C 8084D34C 10000001 */ beq $zero, $zero, .L8084D354 +/* 1B13C 8084D34C 10000001 */ beq $zero, $zero, .L8084D354 /* 1B140 8084D350 24024AAA */ addiu $v0, $zero, 0x4AAA ## $v0 = 00004AAA .L8084D354: /* 1B144 8084D354 A60206BE */ sh $v0, 0x06BE($s0) ## 000006BE @@ -481,40 +481,40 @@ glabel func_8084CC98 /* 1B14C 8084D35C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 1B150 8084D360 960906AE */ lhu $t1, 0x06AE($s0) ## 000006AE /* 1B154 8084D364 24791388 */ addiu $t9, $v1, 0x1388 ## $t9 = 00001388 -/* 1B158 8084D368 01E3C021 */ addu $t8, $t7, $v1 +/* 1B158 8084D368 01E3C021 */ addu $t8, $t7, $v1 /* 1B15C 8084D36C 352A0080 */ ori $t2, $t1, 0x0080 ## $t2 = 00000080 /* 1B160 8084D370 A6180046 */ sh $t8, 0x0046($s0) ## 00000046 /* 1B164 8084D374 A61906BE */ sh $t9, 0x06BE($s0) ## 000006BE -/* 1B168 8084D378 10000015 */ beq $zero, $zero, .L8084D3D0 +/* 1B168 8084D378 10000015 */ beq $zero, $zero, .L8084D3D0 /* 1B16C 8084D37C A60A06AE */ sh $t2, 0x06AE($s0) ## 000006AE .L8084D380: -/* 1B170 8084D380 0C20F6E6 */ jal func_8083DB98 +/* 1B170 8084D380 0C20F6E6 */ jal func_8083DB98 /* 1B174 8084D384 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1B178 8084D388 10000012 */ beq $zero, $zero, .L8084D3D4 -/* 1B17C 8084D38C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1B178 8084D388 10000012 */ beq $zero, $zero, .L8084D3D4 +/* 1B17C 8084D38C 8FBF0024 */ lw $ra, 0x0024($sp) .L8084D390: -/* 1B180 8084D390 0C00B75E */ jal func_8002DD78 +/* 1B180 8084D390 0C00B75E */ jal func_8002DD78 /* 1B184 8084D394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B188 8084D398 1040000D */ beq $v0, $zero, .L8084D3D0 -/* 1B18C 8084D39C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1B188 8084D398 1040000D */ beq $v0, $zero, .L8084D3D0 +/* 1B18C 8084D39C 8FA40054 */ lw $a0, 0x0054($sp) /* 1B190 8084D3A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1B194 8084D3A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1B198 8084D3A8 0C212AF6 */ jal func_8084ABD8 +/* 1B198 8084D3A8 0C212AF6 */ jal func_8084ABD8 /* 1B19C 8084D3AC 2407EC78 */ addiu $a3, $zero, 0xEC78 ## $a3 = FFFFEC78 /* 1B1A0 8084D3B0 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 1B1A4 8084D3B4 240EEC78 */ addiu $t6, $zero, 0xEC78 ## $t6 = FFFFEC78 /* 1B1A8 8084D3B8 A60E06B0 */ sh $t6, 0x06B0($s0) ## 000006B0 -/* 1B1AC 8084D3BC 00485823 */ subu $t3, $v0, $t0 +/* 1B1AC 8084D3BC 00485823 */ subu $t3, $v0, $t0 /* 1B1B0 8084D3C0 A60B06BE */ sh $t3, 0x06BE($s0) ## 000006BE /* 1B1B4 8084D3C4 860C06BE */ lh $t4, 0x06BE($s0) ## 000006BE /* 1B1B8 8084D3C8 258D1388 */ addiu $t5, $t4, 0x1388 ## $t5 = 00001388 /* 1B1BC 8084D3CC A60D06BE */ sh $t5, 0x06BE($s0) ## 000006BE .L8084D3D0: -/* 1B1C0 8084D3D0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1B1C0 8084D3D0 8FBF0024 */ lw $ra, 0x0024($sp) .L8084D3D4: -/* 1B1C4 8084D3D4 8FB00020 */ lw $s0, 0x0020($sp) +/* 1B1C4 8084D3D4 8FB00020 */ lw $s0, 0x0020($sp) /* 1B1C8 8084D3D8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 1B1CC 8084D3DC 03E00008 */ jr $ra +/* 1B1CC 8084D3DC 03E00008 */ jr $ra /* 1B1D0 8084D3E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s index d3bbedfe2..7d5eb0757 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s @@ -1,36 +1,36 @@ glabel func_80850F1C /* 1ED0C 80850F1C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1ED10 80850F20 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1ED14 80850F24 AFA40028 */ sw $a0, 0x0028($sp) -/* 1ED18 80850F28 AFA5002C */ sw $a1, 0x002C($sp) -/* 1ED1C 80850F2C AFA60030 */ sw $a2, 0x0030($sp) -/* 1ED20 80850F30 0C20CB6C */ jal func_80832DB0 +/* 1ED10 80850F20 AFBF0024 */ sw $ra, 0x0024($sp) +/* 1ED14 80850F24 AFA40028 */ sw $a0, 0x0028($sp) +/* 1ED18 80850F28 AFA5002C */ sw $a1, 0x002C($sp) +/* 1ED1C 80850F2C AFA60030 */ sw $a2, 0x0030($sp) +/* 1ED20 80850F30 0C20CB6C */ jal func_80832DB0 /* 1ED24 80850F34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 1ED28 80850F38 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1ED2C 80850F3C 8FA40030 */ lw $a0, 0x0030($sp) + +/* 1ED2C 80850F3C 8FA40030 */ lw $a0, 0x0030($sp) /* 1ED30 80850F40 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 1ED34 80850F44 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 1ED38 80850F48 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 -/* 1ED3C 80850F4C 46803220 */ cvt.s.w $f8, $f6 -/* 1ED40 80850F50 8FA5002C */ lw $a1, 0x002C($sp) +/* 1ED3C 80850F4C 46803220 */ cvt.s.w $f8, $f6 +/* 1ED40 80850F50 8FA5002C */ lw $a1, 0x002C($sp) /* 1ED44 80850F54 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1ED48 80850F58 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 1ED4C 80850F5C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1ED50 80850F60 AFAE0018 */ sw $t6, 0x0018($sp) +/* 1ED50 80850F60 AFAE0018 */ sw $t6, 0x0018($sp) /* 1ED54 80850F64 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1ED58 80850F68 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1ED5C 80850F6C 8FA40028 */ lw $a0, 0x0028($sp) -/* 1ED60 80850F70 8FA60030 */ lw $a2, 0x0030($sp) -/* 1ED64 80850F74 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 1ED58 80850F68 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 1ED5C 80850F6C 8FA40028 */ lw $a0, 0x0028($sp) +/* 1ED60 80850F70 8FA60030 */ lw $a2, 0x0030($sp) +/* 1ED64 80850F74 E7AA001C */ swc1 $f10, 0x001C($sp) /* 1ED68 80850F78 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1ED6C 80850F7C 0C028FC2 */ jal func_800A3F08 -/* 1ED70 80850F80 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 1ED74 80850F84 0C20C884 */ jal func_80832210 -/* 1ED78 80850F88 8FA4002C */ lw $a0, 0x002C($sp) -/* 1ED7C 80850F8C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1ED6C 80850F7C 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 1ED70 80850F80 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 1ED74 80850F84 0C20C884 */ jal func_80832210 +/* 1ED78 80850F88 8FA4002C */ lw $a0, 0x002C($sp) +/* 1ED7C 80850F8C 8FBF0024 */ lw $ra, 0x0024($sp) /* 1ED80 80850F90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1ED84 80850F94 03E00008 */ jr $ra +/* 1ED84 80850F94 03E00008 */ jr $ra /* 1ED88 80850F98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s index dd7b44a2f..731412ab9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s @@ -1,30 +1,30 @@ glabel func_80850F9C /* 1ED8C 80850F9C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1ED90 80850FA0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1ED94 80850FA4 AFA40028 */ sw $a0, 0x0028($sp) -/* 1ED98 80850FA8 AFA5002C */ sw $a1, 0x002C($sp) -/* 1ED9C 80850FAC AFA60030 */ sw $a2, 0x0030($sp) -/* 1EDA0 80850FB0 0C20CB6C */ jal func_80832DB0 +/* 1ED90 80850FA0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 1ED94 80850FA4 AFA40028 */ sw $a0, 0x0028($sp) +/* 1ED98 80850FA8 AFA5002C */ sw $a1, 0x002C($sp) +/* 1ED9C 80850FAC AFA60030 */ sw $a2, 0x0030($sp) +/* 1EDA0 80850FB0 0C20CB6C */ jal func_80832DB0 /* 1EDA4 80850FB4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 1EDA8 80850FB8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 1EDAC 80850FBC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 1EDB0 80850FC0 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 1EDB4 80850FC4 8FA5002C */ lw $a1, 0x002C($sp) +/* 1EDB4 80850FC4 8FA5002C */ lw $a1, 0x002C($sp) /* 1EDB8 80850FC8 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 1EDBC 80850FCC 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1EDC0 80850FD0 8FA40028 */ lw $a0, 0x0028($sp) -/* 1EDC4 80850FD4 8FA60030 */ lw $a2, 0x0030($sp) -/* 1EDC8 80850FD8 AFA00018 */ sw $zero, 0x0018($sp) -/* 1EDCC 80850FDC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1EDD0 80850FE0 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 1EDC0 80850FD0 8FA40028 */ lw $a0, 0x0028($sp) +/* 1EDC4 80850FD4 8FA60030 */ lw $a2, 0x0030($sp) +/* 1EDC8 80850FD8 AFA00018 */ sw $zero, 0x0018($sp) +/* 1EDCC 80850FDC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 1EDD0 80850FE0 E7A00014 */ swc1 $f0, 0x0014($sp) /* 1EDD4 80850FE4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1EDD8 80850FE8 0C028FC2 */ jal func_800A3F08 -/* 1EDDC 80850FEC E7A4001C */ swc1 $f4, 0x001C($sp) -/* 1EDE0 80850FF0 0C20C884 */ jal func_80832210 -/* 1EDE4 80850FF4 8FA4002C */ lw $a0, 0x002C($sp) -/* 1EDE8 80850FF8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1EDD8 80850FE8 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 1EDDC 80850FEC E7A4001C */ swc1 $f4, 0x001C($sp) +/* 1EDE0 80850FF0 0C20C884 */ jal func_80832210 +/* 1EDE4 80850FF4 8FA4002C */ lw $a0, 0x002C($sp) +/* 1EDE8 80850FF8 8FBF0024 */ lw $ra, 0x0024($sp) /* 1EDEC 80850FFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1EDF0 80851000 03E00008 */ jr $ra +/* 1EDF0 80851000 03E00008 */ jr $ra /* 1EDF4 80851004 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s index c6402f57d..c7f5fa1fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s @@ -1,66 +1,66 @@ glabel func_808515A4 /* 1F394 808515A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1F398 808515A8 AFBF002C */ sw $ra, 0x002C($sp) -/* 1F39C 808515AC AFB00028 */ sw $s0, 0x0028($sp) -/* 1F3A0 808515B0 AFA40038 */ sw $a0, 0x0038($sp) +/* 1F398 808515A8 AFBF002C */ sw $ra, 0x002C($sp) +/* 1F39C 808515AC AFB00028 */ sw $s0, 0x0028($sp) +/* 1F3A0 808515B0 AFA40038 */ sw $a0, 0x0038($sp) /* 1F3A4 808515B4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F3A8 808515B8 AFA60040 */ sw $a2, 0x0040($sp) -/* 1F3AC 808515BC 0C20CCAE */ jal func_808332B8 +/* 1F3A8 808515B8 AFA60040 */ sw $a2, 0x0040($sp) +/* 1F3AC 808515BC 0C20CCAE */ jal func_808332B8 /* 1F3B0 808515C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1F3B4 808515C4 10400007 */ beq $v0, $zero, .L808515E4 +/* 1F3B4 808515C4 10400007 */ beq $v0, $zero, .L808515E4 /* 1F3B8 808515C8 3C068085 */ lui $a2, %hi(D_80853D34) ## $a2 = 80850000 -/* 1F3BC 808515CC 8FA40038 */ lw $a0, 0x0038($sp) +/* 1F3BC 808515CC 8FA40038 */ lw $a0, 0x0038($sp) /* 1F3C0 808515D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F3C4 808515D4 0C2144DA */ jal func_80851368 +/* 1F3C4 808515D4 0C2144DA */ jal func_80851368 /* 1F3C8 808515D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1F3CC 808515DC 10000026 */ beq $zero, $zero, .L80851678 -/* 1F3D0 808515E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 1F3CC 808515DC 10000026 */ beq $zero, $zero, .L80851678 +/* 1F3D0 808515E0 8FBF002C */ lw $ra, 0x002C($sp) .L808515E4: /* 1F3D4 808515E4 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B /* 1F3D8 808515E8 92020446 */ lbu $v0, 0x0446($s0) ## 00000446 /* 1F3DC 808515EC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 1F3E0 808515F0 000E7880 */ sll $t7, $t6, 2 -/* 1F3E4 808515F4 00CF3021 */ addu $a2, $a2, $t7 -/* 1F3E8 808515F8 10410004 */ beq $v0, $at, .L8085160C -/* 1F3EC 808515FC 8CC63D34 */ lw $a2, %lo(D_80853D34)($a2) +/* 1F3E0 808515F0 000E7880 */ sll $t7, $t6, 2 +/* 1F3E4 808515F4 00CF3021 */ addu $a2, $a2, $t7 +/* 1F3E8 808515F8 10410004 */ beq $v0, $at, .L8085160C +/* 1F3EC 808515FC 8CC63D34 */ lw $a2, %lo(D_80853D34)($a2) /* 1F3F0 80851600 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E -/* 1F3F4 80851604 14410006 */ bne $v0, $at, .L80851620 +/* 1F3F4 80851604 14410006 */ bne $v0, $at, .L80851620 /* 1F3F8 80851608 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8085160C: -/* 1F3FC 8085160C 8FA40038 */ lw $a0, 0x0038($sp) -/* 1F400 80851610 0C20C899 */ jal func_80832264 +/* 1F3FC 8085160C 8FA40038 */ lw $a0, 0x0038($sp) +/* 1F400 80851610 0C20C899 */ jal func_80832264 /* 1F404 80851614 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F408 80851618 10000014 */ beq $zero, $zero, .L8085166C +/* 1F408 80851618 10000014 */ beq $zero, $zero, .L8085166C /* 1F40C 8085161C 00000000 */ nop .L80851620: -/* 1F410 80851620 0C20CB6C */ jal func_80832DB0 -/* 1F414 80851624 AFA60034 */ sw $a2, 0x0034($sp) +/* 1F410 80851620 0C20CB6C */ jal func_80832DB0 +/* 1F414 80851624 AFA60034 */ sw $a2, 0x0034($sp) /* 1F418 80851628 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1F41C 8085162C 8FA40034 */ lw $a0, 0x0034($sp) + +/* 1F41C 8085162C 8FA40034 */ lw $a0, 0x0034($sp) /* 1F420 80851630 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 1F424 80851634 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 1F428 80851638 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 -/* 1F42C 8085163C 46803220 */ cvt.s.w $f8, $f6 +/* 1F42C 8085163C 46803220 */ cvt.s.w $f8, $f6 /* 1F430 80851640 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1F434 80851644 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 1F438 80851648 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1F43C 8085164C 8FA60034 */ lw $a2, 0x0034($sp) -/* 1F440 80851650 8FA40038 */ lw $a0, 0x0038($sp) -/* 1F444 80851654 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 1F43C 8085164C 8FA60034 */ lw $a2, 0x0034($sp) +/* 1F440 80851650 8FA40038 */ lw $a0, 0x0038($sp) +/* 1F444 80851654 E7A80014 */ swc1 $f8, 0x0014($sp) /* 1F448 80851658 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1F44C 8085165C AFA00018 */ sw $zero, 0x0018($sp) -/* 1F450 80851660 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 1F454 80851664 0C028FC2 */ jal func_800A3F08 -/* 1F458 80851668 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 1F44C 8085165C AFA00018 */ sw $zero, 0x0018($sp) +/* 1F450 80851660 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 1F454 80851664 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 1F458 80851668 E7A40010 */ swc1 $f4, 0x0010($sp) .L8085166C: -/* 1F45C 8085166C 0C20C884 */ jal func_80832210 +/* 1F45C 8085166C 0C20C884 */ jal func_80832210 /* 1F460 80851670 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F464 80851674 8FBF002C */ lw $ra, 0x002C($sp) +/* 1F464 80851674 8FBF002C */ lw $ra, 0x002C($sp) .L80851678: -/* 1F468 80851678 8FB00028 */ lw $s0, 0x0028($sp) +/* 1F468 80851678 8FB00028 */ lw $s0, 0x0028($sp) /* 1F46C 8085167C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 1F470 80851680 03E00008 */ jr $ra +/* 1F470 80851680 03E00008 */ jr $ra /* 1F474 80851684 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s index a83cabefc..c377a6e28 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s @@ -3,23 +3,23 @@ glabel func_80851B90 /* 1F984 80851B94 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 1F988 80851B98 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 /* 1F98C 80851B9C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1F990 80851BA0 AFA60030 */ sw $a2, 0x0030($sp) -/* 1F994 80851BA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1F998 80851BA8 AFA5002C */ sw $a1, 0x002C($sp) +/* 1F990 80851BA0 AFA60030 */ sw $a2, 0x0030($sp) +/* 1F994 80851BA4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 1F998 80851BA8 AFA5002C */ sw $a1, 0x002C($sp) /* 1F99C 80851BAC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1F9A0 80851BB0 3C07BF2A */ lui $a3, 0xBF2A ## $a3 = BF2A0000 /* 1F9A4 80851BB4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1F9A8 80851BB8 AFAE0018 */ sw $t6, 0x0018($sp) +/* 1F9A8 80851BB8 AFAE0018 */ sw $t6, 0x0018($sp) /* 1F9AC 80851BBC 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = BF2AAAAB /* 1F9B0 80851BC0 24C62860 */ addiu $a2, $a2, 0x2860 ## $a2 = 04002860 /* 1F9B4 80851BC4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F9B8 80851BC8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1F9BC 80851BCC E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1F9C0 80851BD0 0C028FC2 */ jal func_800A3F08 -/* 1F9C4 80851BD4 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 1F9C8 80851BD8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1F9B8 80851BC8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 1F9BC 80851BCC E7A00014 */ swc1 $f0, 0x0014($sp) +/* 1F9C0 80851BD0 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 1F9C4 80851BD4 E7A4001C */ swc1 $f4, 0x001C($sp) +/* 1F9C8 80851BD8 8FBF0024 */ lw $ra, 0x0024($sp) /* 1F9CC 80851BDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1F9D0 80851BE0 03E00008 */ jr $ra +/* 1F9D0 80851BE0 03E00008 */ jr $ra /* 1F9D4 80851BE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s index 3c358d9f1..244bfd055 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s @@ -1,53 +1,53 @@ glabel func_80851BE8 /* 1F9D8 80851BE8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1F9DC 80851BEC AFB00028 */ sw $s0, 0x0028($sp) +/* 1F9DC 80851BEC AFB00028 */ sw $s0, 0x0028($sp) /* 1F9E0 80851BF0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F9E4 80851BF4 AFBF002C */ sw $ra, 0x002C($sp) +/* 1F9E4 80851BF4 AFBF002C */ sw $ra, 0x002C($sp) /* 1F9E8 80851BF8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F9EC 80851BFC AFA40038 */ sw $a0, 0x0038($sp) -/* 1F9F0 80851C00 AFA60040 */ sw $a2, 0x0040($sp) -/* 1F9F4 80851C04 0C028EF0 */ jal func_800A3BC0 -/* 1F9F8 80851C08 AFA50030 */ sw $a1, 0x0030($sp) +/* 1F9EC 80851BFC AFA40038 */ sw $a0, 0x0038($sp) +/* 1F9F0 80851C00 AFA60040 */ sw $a2, 0x0040($sp) +/* 1F9F4 80851C04 0C028EF0 */ jal func_800A3BC0 +/* 1F9F8 80851C08 AFA50030 */ sw $a1, 0x0030($sp) /* 1F9FC 80851C0C 860E0850 */ lh $t6, 0x0850($s0) ## 00000850 /* 1FA00 80851C10 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 1FA04 80851C14 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 /* 1FA08 80851C18 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 1FA0C 80851C1C 286100B4 */ slti $at, $v1, 0x00B4 -/* 1FA10 80851C20 1420001B */ bne $at, $zero, .L80851C90 +/* 1FA0C 80851C1C 286100B4 */ slti $at, $v1, 0x00B4 +/* 1FA10 80851C20 1420001B */ bne $at, $zero, .L80851C90 /* 1FA14 80851C24 240100B4 */ addiu $at, $zero, 0x00B4 ## $at = 000000B4 -/* 1FA18 80851C28 14610015 */ bne $v1, $at, .L80851C80 +/* 1FA18 80851C28 14610015 */ bne $v1, $at, .L80851C80 /* 1FA1C 80851C2C 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 /* 1FA20 80851C30 0C028800 */ jal SkelAnime_GetFrameCount - + /* 1FA24 80851C34 24843298 */ addiu $a0, $a0, 0x3298 ## $a0 = 04003298 /* 1FA28 80851C38 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 1FA2C 80851C3C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 1FA30 80851C40 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 1FA34 80851C44 46803220 */ cvt.s.w $f8, $f6 +/* 1FA34 80851C44 46803220 */ cvt.s.w $f8, $f6 /* 1FA38 80851C48 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 1FA3C 80851C4C 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 /* 1FA40 80851C50 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1FA44 80851C54 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 1FA48 80851C58 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 1FA4C 80851C5C AFB80018 */ sw $t8, 0x0018($sp) +/* 1FA4C 80851C5C AFB80018 */ sw $t8, 0x0018($sp) /* 1FA50 80851C60 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB /* 1FA54 80851C64 24C63298 */ addiu $a2, $a2, 0x3298 ## $a2 = 04003298 -/* 1FA58 80851C68 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1FA5C 80851C6C 8FA40038 */ lw $a0, 0x0038($sp) -/* 1FA60 80851C70 8FA50030 */ lw $a1, 0x0030($sp) -/* 1FA64 80851C74 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 1FA68 80851C78 0C028FC2 */ jal func_800A3F08 -/* 1FA6C 80851C7C E7AA001C */ swc1 $f10, 0x001C($sp) +/* 1FA58 80851C68 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 1FA5C 80851C6C 8FA40038 */ lw $a0, 0x0038($sp) +/* 1FA60 80851C70 8FA50030 */ lw $a1, 0x0030($sp) +/* 1FA64 80851C74 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 1FA68 80851C78 0C028FC2 */ jal SkelAnime_LinkChangeAnimation +/* 1FA6C 80851C7C E7AA001C */ swc1 $f10, 0x001C($sp) .L80851C80: /* 1FA70 80851C80 3C058085 */ lui $a1, %hi(D_808551B4) ## $a1 = 80850000 /* 1FA74 80851C84 24A551B4 */ addiu $a1, $a1, %lo(D_808551B4) ## $a1 = 808551B4 -/* 1FA78 80851C88 0C20CA49 */ jal func_80832924 +/* 1FA78 80851C88 0C20CA49 */ jal func_80832924 /* 1FA7C 80851C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80851C90: -/* 1FA80 80851C90 8FBF002C */ lw $ra, 0x002C($sp) -/* 1FA84 80851C94 8FB00028 */ lw $s0, 0x0028($sp) +/* 1FA80 80851C90 8FBF002C */ lw $ra, 0x002C($sp) +/* 1FA84 80851C94 8FB00028 */ lw $s0, 0x0028($sp) /* 1FA88 80851C98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 1FA8C 80851C9C 03E00008 */ jr $ra +/* 1FA8C 80851C9C 03E00008 */ jr $ra /* 1FA90 80851CA0 00000000 */ nop diff --git a/include/functions.h b/include/functions.h index 95459c4fe..109b29b71 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1131,72 +1131,73 @@ s32 Scene_ExecuteCommands(GlobalContext* globalCtx, SceneCmd* sceneCmd); void func_80098CBC(GlobalContext* globalCtx, u8* nbTransitionActors); void func_800994A0(GlobalContext* globalCtx); void Scene_Draw(GlobalContext* globalCtx); -void SkelAnime_LodDraw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTable, +void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex); -void SkelAnime_LodDrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 limbCount, +void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 limbCount, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex); -void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTable, +void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor); -void SkelAnime_DrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, u32 dListCount, +void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 limbCount, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor); -s32 SkelAnime_GetFrameCount(u32 animation); -Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, +s16 SkelAnime_GetFrameCount(GenericAnimationHeader* animationSeg); +Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx); -Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 dListCount, +Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx); void func_800A2E70(u8, Vec3s*, Vec3s*, Vec3s*, f32); void func_800A32EC(u16* arg0); void func_800A32F4(s32 arg0); void func_800A3310(void* arg0); -void func_800A336C(GlobalContext* globalCtx, u32 linkAnimetionSeg, s32 frame, s32 limbCount, void* ram); -void func_800A3478(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src); -void func_800A34DC(GlobalContext* globalCtx, s32 arg1, Vec3s* arg2, Vec3s* arg3, f32 arg4); -void func_800A3548(GlobalContext* globalCtx, s32 vecCount, s32 dst, s32 src, s32 index); -void func_800A35B4(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index); -void func_800A3620(GlobalContext* globalCtx, Actor* actor, SkelAnime* skelAnime, f32 arg3); +void SkelAnime_LoadLinkAnimetion(GlobalContext* globalCtx, LinkAnimetionEntry* linkAnimetionSeg, s32 frame, s32 limbCount, void* ram); +void SkelAnime_LoadAnimationType1(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src); +void SkelAnime_LoadAnimationType2(GlobalContext* globalCtx, s32 limbCount, Vec3s* arg2, Vec3s* arg3, f32 arg4); +void SkelAnime_LoadAnimationType3(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index); +void SkelAnime_LoadAnimationType4(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index); +void SkelAnime_LoadAnimationType5(GlobalContext* globalCtx, Actor* actor, SkelAnime* skelAnime, f32 arg3); void func_800A390C(GlobalContext* globalCtx, AnimationContext* animationCtx); -void func_800A39AC(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32* animation, s32 flags, - Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount); +void SkelAnime_InitLinkAnimetion(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + LinkAnimetionEntry* linkAnimetionEntrySeg, s32 flags, Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount); void func_800A3B8C(SkelAnime* skelAnime); void func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime); void func_800A3EE8(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2); -void func_800A3F08(GlobalContext* globalCtx, SkelAnime* skelAnime, u32* animation, f32 playbackSpeed, f32 arg4, - f32 frameCount, u8 arg6, f32 arg7); -void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation); -void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 playbackSpeed); -void func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation); -void func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 playbackSpeed); +void SkelAnime_LinkChangeAnimation(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed, + f32 arg4, f32 frameCount, u8 arg6, f32 arg7); +void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); +void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed); +void func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg); +void func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed); void func_800A41FC(GlobalContext* globalCtx, SkelAnime* skelAnime); -void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame); -void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame); +void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 frame); +void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 frame); void func_800A42E4(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 frame); -void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animationSeg, f32 frame, s32 arg4, f32 arg5, - f32 arg6, s32 arg7); -void func_800A43B8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame, s32 arg4, f32 arg5, - f32 arg6, s32 arg7); +void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 frame, LinkAnimetionEntry* linkAnimetionEntrySeg2, + f32 arg5, f32 arg6, Vec3s* arg7); +void func_800A43B8(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 frame, LinkAnimetionEntry* linkAnimetionEntrySeg2, + f32 arg5, f32 arg6, Vec3s* arg7); s32 func_800A4530(SkelAnime* skelAnime, f32 arg1); -void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32 animation, - Vec3s* actorDrawTable, s32 arg5, s32 limbCount); -void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32 animation, - Vec3s* actorDrawTable, s32 arg5, s32 limbCount); -void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32 animation); +void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationseg, Vec3s* actorDrawTable, Vec3s* arg5, s32 limbCount); +void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationseg, Vec3s* actorDrawTable, Vec3s* arg5, s32 limbCount); +void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationseg); s32 SkelAnime_FrameUpdateMatrix(SkelAnime* skelAnime); -void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, u32* animation, f32 playbackSpeed, f32 unk0, f32 frameCount, - u8 unk1, f32 transitionRate, s8 unk2); -void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 unk0, f32 frameCount, - u8 unk1, f32 transitionRate); -void func_800A51E8(SkelAnime* skelAnime, u32 animation); -void func_800A5240(SkelAnime* skelAnime, u32 animation, f32 transitionRate); -void func_800A529C(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed); -void SkelAnime_ChangeAnimationDefault(SkelAnime* skelAnime, u32 animation); -void SkelAnime_ChangeAnimationTransitionRate(SkelAnime* skelAnime, u32 animation, f32 transitionRate); -void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed); +void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 frame, + f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2); +void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 unk0, + f32 frameCount, u8 unk1, f32 transitionRate); +void func_800A51E8(SkelAnime* skelAnime, AnimationHeader* animationseg); +void func_800A5240(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); +void func_800A529C(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); +void SkelAnime_ChangeAnimationDefault(SkelAnime* skelAnime, AnimationHeader* animationseg); +void SkelAnime_ChangeAnimationTransitionRate(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); +void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); void func_800A5408(SkelAnime* skelAnime); void func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* index); void func_800A54FC(SkelAnime* skelAnime, Vec3f* pos, s16 angle); diff --git a/include/variables.h b/include/variables.h index 7c876e9a9..8405e82f2 100644 --- a/include/variables.h +++ b/include/variables.h @@ -54,7 +54,7 @@ extern u32 D_0403F070; extern u32 D_04042440; //extern ? D_04048160; extern u32 D_04048180; -extern u32 D_04049210; +extern Gfx D_04049210[]; extern u32 D_04049AD0; //extern ? D_0404D1C0; extern u32 D_0404D450; diff --git a/include/z64.h b/include/z64.h index d75cbb87a..c6ff0a172 100644 --- a/include/z64.h +++ b/include/z64.h @@ -956,12 +956,12 @@ typedef struct LoadedParticleEntry { // Some animation related structure typedef struct { - /* 0x00 */ u32 animation; - /* 0x04 */ f32 playbackSpeed; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 frameCount; - /* 0x10 */ u8 unk_10; - /* 0x14 */ f32 transitionRate; + /* 0x00 */ AnimationHeader* animation; + /* 0x04 */ f32 playbackSpeed; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 frameCount; + /* 0x10 */ u8 unk_10; + /* 0x14 */ f32 transitionRate; } struct_80034EC0_Entry; // size = 0x18 typedef struct { diff --git a/include/z64animation.h b/include/z64animation.h index 5ab05d42e..927aaa1b5 100755 --- a/include/z64animation.h +++ b/include/z64animation.h @@ -7,13 +7,11 @@ #define LINK_ANIMETION_OFFSET(addr,offset) (((u32)&_link_animetionSegmentRomStart)+((u32)addr)-((u32)&link_animetion_segment)+((u32)offset)) #define LIMB_DONE 0xFF +#define ANIMATION_ENTRY_MAX 0x32 struct GlobalContext; struct Actor; - -typedef struct { - /* 0x000 */ u32 limbs[1]; // One ore more limbs, index 0 is the root limb. -} SkelLimbTable; // Size >= 4 +typedef struct SkelAnime SkelAnime; typedef struct { /* 0x000 */ Vec3s translation; // Translation relative to parent limb. root limb is a tranlation for entire model. @@ -23,39 +21,15 @@ typedef struct { } SkelLimbEntry; // Size = 0xC or 0x10 typedef struct { - /* 0x000 */ u32 limbIndexSeg; // Segment address of SkelLimbIndex. + /* 0x000 */ SkelLimbEntry* limbs[1]; // One ore more limbs, index 0 is the root limb. +} Skeleton; // Size >= 4 + +typedef struct { + /* 0x000 */ Skeleton* skeletonSeg; // Segment address of SkelLimbIndex. /* 0x004 */ u8 limbCount; // Number of limbs in the model. /* 0x005 */ char unk_05[3]; // unknown, maybe padding? /* 0x008 */ u8 dListCount; // Number of display lists in the model. -} SkelAnimeLimbHeader; // Size = 0xC - -typedef struct SkelAnime { - /* 0x00 */ u8 limbCount; // joint_Num - /* 0x01 */ u8 unk_01; // state? 00 = loop 02 = don't loop ? - /* 0x02 */ u8 dListCount; - /* 0x03 */ s8 unk_03; - /* 0x04 */ u32 limbIndex; - /* 0x08 */ u32* animCurrent; - /* 0x0C */ f32 unk_0C; - /* 0x10 */ f32 animFrameCount; // ending frame? - /* 0x14 */ f32 unk_14; // Loop frame? - /* 0x18 */ f32 animCurrentFrame; - /* 0x1C */ f32 animPlaybackSpeed; - /* 0x20 */ Vec3s* actorDrawTbl; // now_joint - /* 0x24 */ Vec3s* unk_24; // morf_joint - /* 0x28 */ f32 unk_28; - /* 0x2C */ f32 unk_2C; - /* 0x30 */ s32 (*animUpdate)(); - /* 0x34 */ s8 unk_34; - /* 0x35 */ u8 unk_35; // flags - /* 0x36 */ s16 unk_36; - /* 0x38 */ s16 unk_38; - /* 0x3A */ s16 unk_3A; - /* 0x3C */ s16 unk_3C; - /* 0x3E */ s16 unk_3E; - /* 0x40 */ s16 unk_40; - /* 0x42 */ s16 unk_42; -} SkelAnime; // size = 0x44 +} SkeletonHeader; // Size = 0xC typedef s16 AnimationRotationValue; @@ -66,15 +40,19 @@ typedef struct { } AnimationRotationIndex; // size = 0x06 typedef struct { - /* 0x000 */ s16 frameCount; - /* 0x002 */ s16 unk_02; + s16 frameCount; + s16 unk_02; +} GenericAnimationHeader; + +typedef struct { + /* 0x000 */ GenericAnimationHeader genericHeader; /* 0x004 */ u32 rotationValueSeg; // referenced as tbl /* 0x008 */ u32 rotationIndexSeg; // referenced as ref_tbl /* 0x00C */ u16 limit; } AnimationHeader; // size = 0x10 typedef enum { - ANIMATION_TYPE0, + ANIMATION_LINKANIMETION, ANIMATION_TYPE1, ANIMATION_TYPE2, ANIMATION_TYPE3, @@ -98,7 +76,7 @@ typedef struct { typedef struct { /* 0x000 */ u8 unk_00; - /* 0x001 */ u8 unk_01; + /* 0x001 */ u8 limbCount; /* 0x004 */ Vec3s* unk_04; /* 0x008 */ Vec3s* unk_08; /* 0x00C */ f32 unk_0C; @@ -154,14 +132,47 @@ typedef struct { typedef struct AnimationContext { s16 animationCount; char unk_02[2]; - AnimationEntry entries[0x32]; + AnimationEntry entries[ANIMATION_ENTRY_MAX]; } AnimationContext; typedef struct { - u16 frameCount; + GenericAnimationHeader genericHeader; u32 animationSegAddress; } LinkAnimetionEntry; +struct SkelAnime { + /* 0x00 */ u8 limbCount; // joint_Num + /* 0x01 */ u8 unk_01; // state? 00 = loop 02 = don't loop ? + /* 0x02 */ u8 dListCount; + /* 0x03 */ s8 unk_03; + /* 0x04 */ Skeleton* skeleton; + /* 0x08 */ + union { + AnimationHeader* animCurrentSeg; + LinkAnimetionEntry* linkAnimetionSeg; + GenericAnimationHeader* genericSeg; + }; + /* 0x0C */ f32 unk_0C; + /* 0x10 */ f32 animFrameCount; // ending frame? + /* 0x14 */ f32 unk_14; // Loop frame? + /* 0x18 */ f32 animCurrentFrame; + /* 0x1C */ f32 animPlaybackSpeed; + /* 0x20 */ Vec3s* actorDrawTbl; // now_joint + /* 0x24 */ Vec3s* unk_24; // morf_joint + /* 0x28 */ f32 unk_28; + /* 0x2C */ f32 unk_2C; + /* 0x30 */ s32 (*animUpdate)(); + /* 0x34 */ s8 unk_34; + /* 0x35 */ u8 unk_35; // flags + /* 0x36 */ s16 unk_36; + /* 0x38 */ s16 unk_38; + /* 0x3A */ s16 unk_3A; + /* 0x3C */ s16 unk_3C; + /* 0x3E */ s16 unk_3E; + /* 0x40 */ s16 unk_40; + /* 0x42 */ s16 unk_42; +}; // size = 0x44 + typedef s32 (*SkelAnime_LimbUpdateMatrix)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, struct Actor* actor); diff --git a/src/code/z_actor.c b/src/code/z_actor.c index eec16df03..9928be4d9 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -9,7 +9,7 @@ void ActorShape_Init(ActorShape* shape, f32 arg1, void* shadowDrawFunc, f32 arg3 shape->unk_14 = -1; } -void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx, u32 dlist, Color_RGBA8* color) { +void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx, Gfx* dlist, Color_RGBA8* color) { f32 temp1; f32 temp2; MtxF sp60; @@ -41,7 +41,7 @@ void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* global func_80038A28(actor->floorPoly, actor->posRot.pos.x, actor->unk_80, actor->posRot.pos.z, &sp60); Matrix_Put(&sp60); - if (dlist != (u32)&D_04049210) { + if (dlist != D_04049210) { Matrix_RotateY(actor->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); } @@ -3898,7 +3898,7 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc gDPPipeSync(gfxCtx->polyOpa.p++); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, func_80034B28(globalCtx->state.gfxCtx)); - gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, + gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyOpa.p); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8860); @@ -3917,7 +3917,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, alpha); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, func_80034B54(globalCtx->state.gfxCtx)); - gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyXlu.p); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8904); diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index a919d43f5..e625a3784 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -7,26 +7,27 @@ s32 func_800A3E0C(GlobalContext*, SkelAnime*); s32 func_800A4D9C(SkelAnime* skelAnime); s32 func_800A4EE0(SkelAnime* skelAnime); s32 func_800A4E38(SkelAnime* skelAnime); +s32 func_800A4AD8(SkelAnime* skelAnime); void SkelAnime_CopyVec3s(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src); -void func_800A3678(GlobalContext* globalCtx, AnimationEntryType0* entry); -void func_800A36A4(GlobalContext* globalCtx, AnimationEntryType1* entry); -void func_800A3714(GlobalContext* globalCtx, AnimationEntryType2* entry); -void func_800A3770(GlobalContext* globalCtx, AnimationEntryType3* entry); -void func_800A37F0(GlobalContext* globalCtx, AnimationEntryType4* entry); -void func_800A3874(GlobalContext* globalCtx, AnimationEntryType5* entry); +void SkelAnime_LinkAnimetionLoaded(GlobalContext* globalCtx, AnimationEntryType0* entry); +void SkelAnime_AnimationType1Loaded(GlobalContext* globalCtx, AnimationEntryType1* entry); +void SkelAnime_AnimationType2Loaded(GlobalContext* globalCtx, AnimationEntryType2* entry); +void SkelAnime_AnimationType3Loaded(GlobalContext* globalCtx, AnimationEntryType3* entry); +void SkelAnime_AnimationType4Loaded(GlobalContext* globalCtx, AnimationEntryType4* entry); +void SkelAnime_AnimationType5Loaded(GlobalContext* globalCtx, AnimationEntryType5* entry); //.data u32 D_8012A480 = 0; static AnimationEntryCallback D_8012A484[] = { - (AnimationEntryCallback)&func_800A3678, (AnimationEntryCallback)&func_800A36A4, - (AnimationEntryCallback)&func_800A3714, (AnimationEntryCallback)&func_800A3770, - (AnimationEntryCallback)&func_800A37F0, (AnimationEntryCallback)&func_800A3874, + &SkelAnime_LinkAnimetionLoaded, &SkelAnime_AnimationType1Loaded, + &SkelAnime_AnimationType2Loaded, &SkelAnime_AnimationType3Loaded, + &SkelAnime_AnimationType4Loaded, &SkelAnime_AnimationType5Loaded, }; //.bss u32 D_801600B0; -void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, +void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex) { SkelLimbEntry* limbEntry; @@ -39,7 +40,7 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTab gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 773); Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(limbTable[limbIndex]); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); limbIndex++; rot = actorDrawTable[limbIndex]; @@ -67,21 +68,21 @@ void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTab } if (limbEntry->firstChildIndex != LIMB_DONE) { - SkelAnime_LodDrawLimb(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_LodDrawLimb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - SkelAnime_LodDrawLimb(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_LodDrawLimb(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex); } func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 821); } -void SkelAnime_LodDraw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDrawTable, +void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex) { SkelLimbEntry* limbEntry; @@ -92,7 +93,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDra GraphicsContext* gfxCtx; Gfx* gfx[4]; - if (limbIndex == NULL) { + if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf("Si2_Lod_draw():skelがNULLです。\n"); osSyncPrintf(VT_RST); @@ -102,7 +103,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDra func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 849); Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(*limbIndex); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); pos.x = actorDrawTable->x; pos.y = actorDrawTable->y; pos.z = actorDrawTable->z; @@ -113,8 +114,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDra if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList, &pos, &rot, actor) == 0)) { Matrix_TranslateThenRotateZYX(&pos, &rot); if (dList != NULL) { - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 881), - G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 881), G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dList); } @@ -124,7 +124,7 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDra } if (limbEntry->firstChildIndex != 0xFF) { - SkelAnime_LodDrawLimb(globalCtx, limbEntry->firstChildIndex, limbIndex, actorDrawTable, updateMtxFunc, + SkelAnime_LodDrawLimb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex); } @@ -132,9 +132,10 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, u32* limbIndex, Vec3s* actorDra func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 894); } +//#define NON_MATCHING #ifdef NON_MATCHING -//regalloc -void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, +// regalloc +void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex, Mtx** mtx) { SkelLimbEntry* limbEntry; @@ -146,7 +147,7 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, u32* limbT Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(limbTable[limbIndex]); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); limbIndex++; rot = actorDrawTable[limbIndex]; @@ -166,7 +167,7 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, u32* limbT gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 949); (*mtx)++; - } else if (dList[0] != 0) { + } else if (dList[0] != NULL) { Matrix_ToMtx(*mtx, "../z_skelanime.c", 954); (*mtx)++; } @@ -175,14 +176,14 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, u32* limbT appendDlistFunc(globalCtx, limbIndex, &dList[0], &rot, actor); } if (limbEntry->firstChildIndex != LIMB_DONE) { - SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex, mtx); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex, mtx); } } @@ -191,8 +192,8 @@ void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, u32* limbT #endif #ifdef NON_MATCHING -//regalloc -void SkelAnime_LodDrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 limbCount, +// regalloc +void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 limbCount, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, s32 dListIndex) { SkelLimbEntry* limbEntry; @@ -203,13 +204,9 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorD GraphicsContext* gfxCtx; Gfx* gfx[4]; - do { - if (1) { - mtx = Graph_Alloc(globalCtx->state.gfxCtx, limbCount * sizeof(Mtx)); - } - } while (0); + mtx = Graph_Alloc(globalCtx->state.gfxCtx, limbCount * sizeof(Mtx)); - if (limbTable == NULL) { + if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf("Si2_Lod_draw_SV():skelがNULLです。\n"); osSyncPrintf(VT_RST); @@ -220,15 +217,15 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorD gSPSegment(gfxCtx->polyOpa.p++, 0xD, mtx); Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(*limbTable); - + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); + if (limbEntry) {} pos.x = actorDrawTable->x; pos.y = actorDrawTable->y; pos.z = actorDrawTable->z; rot = actorDrawTable[1]; - dList[1] = dList[0] = limbEntry->displayLists[dListIndex]; + dList[0] = dList[1] = limbEntry->displayLists[dListIndex]; if ((updateMtxFunc == 0) || (updateMtxFunc(globalCtx, 1, &dList[1], &pos, &rot, actor) == 0)) { Matrix_TranslateThenRotateZYX(&pos, &rot); @@ -237,11 +234,9 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorD gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); mtx++; - } else { - if (dList[0] != NULL) { - Matrix_ToMtx(mtx, "../z_skelanime.c", 1040); - mtx++; - } + } else if (dList[0] != NULL) { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1040); + mtx++; } } @@ -249,7 +244,7 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorD appendDlistFunc(globalCtx, 1, &dList[0], &rot, actor); } if (limbEntry->firstChildIndex != LIMB_DONE) { - SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, dListIndex, &mtx); } @@ -261,7 +256,7 @@ void SkelAnime_LodDrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorD #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_LodDrawSV.s") #endif -void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, +void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) { SkelLimbEntry* limbEntry; @@ -276,7 +271,7 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1076); Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(limbTable[limbIndex]); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); limbIndex++; rot = actorDrawTable[limbIndex]; pos.x = limbEntry->translation.x; @@ -302,21 +297,21 @@ void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, } if (limbEntry->firstChildIndex != LIMB_DONE) { - SkelAnime_DrawLimb(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_DrawLimb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - SkelAnime_DrawLimb(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_DrawLimb(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor); } func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121); } -void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, +void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) { SkelLimbEntry* rootLimb; char pad[4]; @@ -326,7 +321,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTa GraphicsContext* gfxCtx; Gfx* gfx[4]; - if (limbTable == NULL) { + if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf("Si2_draw():skelがNULLです。\n"); // Si2_draw (): skel is NULL. osSyncPrintf(VT_RST); @@ -337,7 +332,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTa func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1148); Matrix_Push(); - rootLimb = SEGMENTED_TO_VIRTUAL(*limbTable); + rootLimb = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); pos.x = actorDrawTable[0].x; pos.y = actorDrawTable[0].y; @@ -360,7 +355,7 @@ void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTa } if (rootLimb->firstChildIndex != LIMB_DONE) { - SkelAnime_DrawLimb(globalCtx, rootLimb->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_DrawLimb(globalCtx, rootLimb->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor); } @@ -371,61 +366,60 @@ void SkelAnime_Draw(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTa #ifdef NON_MATCHING // close, needs a bit bmore work. Mainly seems centered around SEGMENTED_TO_VIRTUAL -void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, u32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, +void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor, Mtx** limbMatricies) { - Gfx* limbDlist[2]; - Vec3f limbPos; - Vec3s limbRot; - GraphicsContext* gfxCtx; - Gfx* sp34[3]; SkelLimbEntry* limbEntry; + Gfx* dList[2]; + Vec3f pos; + Vec3s rot; + GraphicsContext* gfxCtx; + Gfx* gfx[3]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(sp34, globalCtx->state.gfxCtx, "../z_skelanime.c", 1214); + func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1214); Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(limbTable[limbIndex]); - limbRot = actorDrawTable[++limbIndex]; - limbPos.x = limbEntry->translation.x; - limbPos.y = limbEntry->translation.y; - limbPos.z = limbEntry->translation.z; + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); + limbIndex++; + rot = actorDrawTable[limbIndex]; + + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; - limbDlist[0] = limbDlist[1] = limbEntry->displayLists[0]; + dList[0] = dList[1] = limbEntry->displayLists[0]; - if ((updateMtxFunc == NULL) || - (updateMtxFunc(globalCtx, limbIndex, &limbDlist[0], &limbPos, &limbRot, actor) == 0)) { - Matrix_TranslateThenRotateZYX(&limbPos, &limbRot); - if (limbDlist[0] != NULL) { + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList[1], &pos, &rot, actor) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList[1] != NULL) { Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1242); gSPMatrix(gfxCtx->polyOpa.p++, *limbMatricies, G_MTX_LOAD); - gSPDisplayList(gfxCtx->polyOpa.p++, &limbDlist[0]); + gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); + (*limbMatricies)++; + } else if (dList[0] != NULL) { + Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1249); (*limbMatricies)++; - } else { - if (&limbDlist[1] != 0) { - Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1249); - (*limbMatricies)++; - } } } if (appendDlistFunc != NULL) { - appendDlistFunc(globalCtx, limbIndex, &limbDlist[1], &limbRot, actor); + appendDlistFunc(globalCtx, limbIndex, &dList[0], &rot, actor); } if (limbEntry->firstChildIndex != LIMB_DONE) { - SkelAnime_DrawLimbSV(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_DrawLimbSV(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, limbMatricies); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - SkelAnime_DrawLimbSV(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, + SkelAnime_DrawLimbSV(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, limbMatricies); } - func_800C6B54(sp34, globalCtx->state.gfxCtx, "../z_skelanime.c", 1265); + func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1265); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_DrawLimbSV.s") @@ -433,20 +427,21 @@ void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, u32 limbIndex, u32* limbTabl #ifdef NON_MATCHING // Regalloc, pretty much same as SkelAnime_LodDrawSV -void SkelAnime_DrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, u32 dListCount, +void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 limbCount, SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) { - SkelLimbEntry* rootLimb; - Gfx* skelDlist[2]; + SkelLimbEntry* limbEntry; + char pad[4]; + Gfx* dList[2]; Vec3f pos; Vec3s rot; + Mtx* mtx; GraphicsContext* gfxCtx; - Mtx* limbMatricies; - Gfx* gfx[5]; + Gfx* gfx[4]; - limbMatricies = Graph_Alloc(globalCtx->state.gfxCtx, dListCount << 6); + mtx = Graph_Alloc(globalCtx->state.gfxCtx, limbCount * sizeof(Mtx)); - if (limbTable == NULL) { + if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf("Si2_draw_SV():skelがNULLです。\n"); // Si2_draw_SV (): skel is NULL. osSyncPrintf(VT_RST); @@ -457,40 +452,42 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDraw func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 1294); - gSPSegment(gfxCtx->polyOpa.p++, 0xD, limbMatricies); + gSPSegment(gfxCtx->polyOpa.p++, 0xD, mtx); + Matrix_Push(); - rootLimb = SEGMENTED_TO_VIRTUAL(*limbTable); - pos.x = actorDrawTable[0].x; - pos.y = actorDrawTable[0].y; - pos.z = actorDrawTable[0].z; + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); + + pos.x = actorDrawTable->x; + pos.y = actorDrawTable->x; + pos.z = actorDrawTable->z; rot = actorDrawTable[1]; - skelDlist[0] = skelDlist[1] = rootLimb->displayLists[0]; + dList[0] = dList[1] = limbEntry->displayLists[0]; - if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &skelDlist[0], &pos, &rot, actor) == 0)) { + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList[1], &pos, &rot, actor) == 0)) { Matrix_TranslateThenRotateZYX(&pos, &rot); - if (skelDlist[0] != NULL) { - Matrix_ToMtx(limbMatricies, "../z_skelanime.c", 1327); - gSPMatrix(gfxCtx->polyOpa.p++, limbMatricies, G_MTX_LOAD); - gSPDisplayList(gfxCtx->polyOpa.p++, skelDlist[0]); - limbMatricies++; + if (dList[1] != NULL) { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1327); + gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); + mtx++; } else { - if (skelDlist[1] != NULL) { - Matrix_ToMtx(limbMatricies, "../z_skelanime.c", 1334); - limbMatricies++; + if (dList[0] != NULL) { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1334); + mtx++; } } } - if (appendDlistFunc != 0) { - appendDlistFunc(globalCtx, 1, &skelDlist[1], &rot, actor); + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, 1, &dList[0], &rot, actor); } - if (rootLimb->firstChildIndex != LIMB_DONE) { - SkelAnime_DrawLimbSV(globalCtx, rootLimb->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, - appendDlistFunc, actor, &limbMatricies); + if (limbEntry->firstChildIndex != LIMB_DONE) { + SkelAnime_DrawLimbSV(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, &mtx); } Matrix_Pull(); @@ -505,7 +502,7 @@ void SkelAnime_DrawSV(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDraw * When a rotation index is >= the animation limit, the output rotation value is copied from the frame's * rotation value list, otherwise it is copied from the initial rotation value list */ -void SkelAnime_AnimateFrame(u32 animation, s32 currentFrame, s32 limbCount, Vec3s* dst) { +void SkelAnime_AnimateFrame(AnimationHeader* animationSeg, s32 currentFrame, s32 limbCount, Vec3s* dst) { AnimationRotationIndex* index; AnimationRotationValue* rotationValueTable; AnimationRotationValue* frameRotationValueTable; @@ -514,7 +511,7 @@ void SkelAnime_AnimateFrame(u32 animation, s32 currentFrame, s32 limbCount, Vec3 s32 i; u16 limit; - animationHeader = SEGMENTED_TO_VIRTUAL(animation); + animationHeader = SEGMENTED_TO_VIRTUAL(animationSeg); index = SEGMENTED_TO_VIRTUAL(animationHeader->rotationIndexSeg); rotationValueTable = SEGMENTED_TO_VIRTUAL(animationHeader->rotationValueSeg); frameRotationValueTable = &rotationValueTable[currentFrame]; @@ -539,18 +536,18 @@ void SkelAnime_AnimateFrame(u32 animation, s32 currentFrame, s32 limbCount, Vec3 } } -s16 func_800A1FC8(u32 animationSeg) { - AnimationHeader* animation = (u16*)SEGMENTED_TO_VIRTUAL(animationSeg); +s16 func_800A1FC8(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); return animation->frameCount; } -s32 SkelAnime_GetFrameCount(u32 animationSeg) { - AnimationHeader* animation = (u16*)SEGMENTED_TO_VIRTUAL(animationSeg); +s16 SkelAnime_GetFrameCount(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); - return (s16)((u16)animation->frameCount - 1); + return (u16)animation->frameCount - 1; } -Gfx* SkelAnime_Draw2Limb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, +Gfx* SkelAnime_Draw2Limb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx) { SkelLimbEntry* limbEntry; @@ -560,7 +557,7 @@ Gfx* SkelAnime_Draw2Limb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(limbTable[limbIndex]); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); limbIndex++; rot = actorDrawTable[limbIndex]; @@ -584,31 +581,30 @@ Gfx* SkelAnime_Draw2Limb(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable } if (limbEntry->firstChildIndex != LIMB_DONE) { - gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, gfx); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, + gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, gfx); } return gfx; } -#ifdef NON_MATCHING -// Some regalloc, and nonmatching stack usage -Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, +Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx) { SkelLimbEntry* limbEntry; + char pad[4]; + Gfx* dList; Vec3f pos; Vec3s rot; - Gfx* dList; - if (limbTable == NULL) { + if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf("Si2_draw2():skelがNULLです。NULLを返します。\n"); osSyncPrintf(VT_RST); @@ -617,11 +613,11 @@ Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawT Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(*limbTable); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); - pos.x = limbEntry->translation.x; - pos.y = limbEntry->translation.y; - pos.z = limbEntry->translation.z; + pos.x = actorDrawTable->x; + pos.y = actorDrawTable->y; + pos.z = actorDrawTable->z; rot = actorDrawTable[1]; @@ -640,7 +636,7 @@ Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawT } if (limbEntry->firstChildIndex != LIMB_DONE) { - gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, gfx); } @@ -648,11 +644,8 @@ Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawT return gfx; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_Draw2.s") -#endif -Gfx* SkelAnime_DrawLimbSV2(GlobalContext* globalCtx, s32 limbIndex, u32* limbTable, Vec3s* actorDrawTable, +Gfx* SkelAnime_DrawLimbSV2(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Mtx** mtx, Gfx* gfx) { SkelLimbEntry* limbEntry; @@ -664,7 +657,7 @@ Gfx* SkelAnime_DrawLimbSV2(GlobalContext* globalCtx, s32 limbIndex, u32* limbTab Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(limbTable[limbIndex]); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); limbIndex++; rot = actorDrawTable[limbIndex]; @@ -687,25 +680,25 @@ Gfx* SkelAnime_DrawLimbSV2(GlobalContext* globalCtx, s32 limbIndex, u32* limbTab } } } - if (appendDlistFunc != 0) { + if (appendDlistFunc != NULL) { appendDlistFunc(globalCtx, limbIndex, &dList2, &rot, actor, &gfx); } if (limbEntry->firstChildIndex != LIMB_DONE) { - gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, mtx, gfx); } Matrix_Pull(); if (limbEntry->nextLimbIndex != LIMB_DONE) { - gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->nextLimbIndex, limbTable, actorDrawTable, updateMtxFunc, + gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, mtx, gfx); } return gfx; } -Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDrawTable, s32 dListCount, +Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, Actor* actor, Gfx* gfx) { SkelLimbEntry* limbEntry; @@ -717,7 +710,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDra Mtx* mtx; mtx = Graph_Alloc(globalCtx->state.gfxCtx, dListCount * sizeof(*mtx)); - if (limbTable == NULL) { + if (skeleton == NULL) { osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf("Si2_draw2_SV():skelがNULLです。NULLを返します。\n"); osSyncPrintf(VT_RST); @@ -726,7 +719,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDra gSPSegment(gfx++, 0xD, mtx); Matrix_Push(); - limbEntry = SEGMENTED_TO_VIRTUAL(*limbTable); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); pos.x = actorDrawTable->x; pos.y = actorDrawTable->y; @@ -754,7 +747,7 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDra appendDlistFunc(globalCtx, 1, &dList2, &rot, actor, &gfx); } if (limbEntry->firstChildIndex != LIMB_DONE) { - gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->firstChildIndex, limbTable, actorDrawTable, updateMtxFunc, + gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, appendDlistFunc, actor, &mtx, gfx); } @@ -766,22 +759,22 @@ Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, u32* limbTable, Vec3s* actorDra // Seems to be some kind of rotations update, somewhat large. #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A29BC.s") -s16 func_800A2DBC(u32 animationSeg) { - AnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); +s16 func_800A2DBC(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); return animation->unk_02; } -s16 func_800A2DF4(u32 animationSeg) { - AnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); +s16 func_800A2DF4(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); return animation->frameCount; } -s16 func_800A2E2C(u32 animationSeg) { - AnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); +s16 func_800A2E2C(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); - return (s16)(animation->frameCount - 1); + return animation->frameCount - 1; } // Very large update function @@ -805,7 +798,7 @@ AnimationEntry* SkelAnime_NextEntry(AnimationContext* animationCtx, AnimationTyp AnimationEntry* entry; s16 index = animationCtx->animationCount; - if (index >= 0x32) { + if (index >= ANIMATION_ENTRY_MAX) { return NULL; } animationCtx->animationCount = index + 1; @@ -818,12 +811,13 @@ AnimationEntry* SkelAnime_NextEntry(AnimationContext* animationCtx, AnimationTyp * The next 6 functions are coordinate with the AnimationType enum */ -void func_800A336C(GlobalContext* globalCtx, u32 linkAnimetionSeg, s32 frame, s32 limbCount, void* ram) { +void SkelAnime_LoadLinkAnimetion(GlobalContext* globalCtx, LinkAnimetionEntry* linkAnimetionSeg, s32 frame, s32 limbCount, + void* ram) { AnimationEntry* entry; LinkAnimetionEntry* linkAnimetionEntry; char pad[4]; - entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE0); + entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_LINKANIMETION); if (entry != NULL) { linkAnimetionEntry = SEGMENTED_TO_VIRTUAL(linkAnimetionSeg); @@ -835,7 +829,7 @@ void func_800A336C(GlobalContext* globalCtx, u32 linkAnimetionSeg, s32 frame, s3 } } -void func_800A3478(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src) { +void SkelAnime_LoadAnimationType1(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src) { AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE1); if (entry != NULL) { entry->types.type1.unk_00 = D_801600B0; @@ -845,18 +839,18 @@ void func_800A3478(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* sr } } -void func_800A34DC(GlobalContext* globalCtx, s32 arg1, Vec3s* arg2, Vec3s* arg3, f32 arg4) { +void SkelAnime_LoadAnimationType2(GlobalContext* globalCtx, s32 limbCount, Vec3s* arg2, Vec3s* arg3, f32 arg4) { AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE2); if (entry != NULL) { entry->types.type2.unk_00 = D_801600B0; - entry->types.type2.unk_01 = arg1; + entry->types.type2.limbCount = limbCount; entry->types.type2.unk_04 = arg2; entry->types.type2.unk_08 = arg3; entry->types.type2.unk_0C = arg4; } } -void func_800A3548(GlobalContext* globalCtx, s32 vecCount, s32 dst, s32 src, s32 index) { +void SkelAnime_LoadAnimationType3(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index) { AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE3); if (entry != NULL) { entry->types.type3.unk_00 = D_801600B0; @@ -867,7 +861,7 @@ void func_800A3548(GlobalContext* globalCtx, s32 vecCount, s32 dst, s32 src, s32 } } -void func_800A35B4(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index) { +void SkelAnime_LoadAnimationType4(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index) { AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE4); if (entry != NULL) { entry->types.type4.unk_00 = D_801600B0; @@ -878,7 +872,7 @@ void func_800A35B4(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* sr } } -void func_800A3620(GlobalContext* globalCtx, Actor* actor, SkelAnime* skelAnime, f32 arg3) { +void SkelAnime_LoadAnimationType5(GlobalContext* globalCtx, Actor* actor, SkelAnime* skelAnime, f32 arg3) { AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE5); if (entry != NULL) { entry->types.type5.actor = actor; @@ -889,11 +883,11 @@ void func_800A3620(GlobalContext* globalCtx, Actor* actor, SkelAnime* skelAnime, /* The next functions are callbacks to loading animations */ -void func_800A3678(GlobalContext* globalCtx, AnimationEntryType0* entry) { +void SkelAnime_LinkAnimetionLoaded(GlobalContext* globalCtx, AnimationEntryType0* entry) { osRecvMesg(&entry->msgQueue, NULL, OS_MESG_BLOCK); } -void func_800A36A4(GlobalContext* globalCtx, AnimationEntryType1* entry) { +void SkelAnime_AnimationType1Loaded(GlobalContext* globalCtx, AnimationEntryType1* entry) { s32 i; Vec3s* dst; Vec3s* src; @@ -908,13 +902,13 @@ void func_800A36A4(GlobalContext* globalCtx, AnimationEntryType1* entry) { } } -void func_800A3714(GlobalContext* globalCtx, AnimationEntryType2* entry) { +void SkelAnime_AnimationType2Loaded(GlobalContext* globalCtx, AnimationEntryType2* entry) { if ((entry->unk_00 & D_8012A480) == 0) { - func_800A2E70(entry->unk_01, entry->unk_04, entry->unk_04, entry->unk_08, entry->unk_0C); + func_800A2E70(entry->limbCount, entry->unk_04, entry->unk_04, entry->unk_08, entry->unk_0C); } } -void func_800A3770(GlobalContext* globalCtx, AnimationEntryType3* entry) { +void SkelAnime_AnimationType3Loaded(GlobalContext* globalCtx, AnimationEntryType3* entry) { s32 i; Vec3s* dst; Vec3s* src; @@ -930,7 +924,7 @@ void func_800A3770(GlobalContext* globalCtx, AnimationEntryType3* entry) { } } -void func_800A37F0(GlobalContext* globalCtx, AnimationEntryType4* entry) { +void SkelAnime_AnimationType4Loaded(GlobalContext* globalCtx, AnimationEntryType4* entry) { s32 i; Vec3s* dst; Vec3s* src; @@ -946,7 +940,7 @@ void func_800A37F0(GlobalContext* globalCtx, AnimationEntryType4* entry) { } } -void func_800A3874(GlobalContext* globalCtx, AnimationEntryType5* entry) { +void SkelAnime_AnimationType5Loaded(GlobalContext* globalCtx, AnimationEntryType5* entry) { char pad[4]; Actor* actor = entry->actor; Vec3f pos; @@ -968,16 +962,16 @@ void func_800A390C(GlobalContext* globalCtx, AnimationContext* animationCtx) { D_8012A480 = 0; } -void func_800A39AC(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32* animation, s32 flags, - Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount) { +void SkelAnime_InitLinkAnimetion(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + LinkAnimetionEntry* linkAnimetionEntrySeg, s32 flags, Vec3s* actorDrawTbl, Vec3s* arg6, s32 limbBufCount) { char pad[8]; - SkelAnimeLimbHeader* limbHeader; + SkeletonHeader* skeletonHeader; size_t allocSize; s32 limbCount; s32 headerCount; - limbHeader = SEGMENTED_TO_VIRTUAL(limbHeaderSeg); - headerCount = limbHeader->limbCount; + skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); + headerCount = skeletonHeader->limbCount; skelAnime->unk_34 = flags; limbCount = (flags & 2) ? headerCount : 1; @@ -988,11 +982,11 @@ void func_800A39AC(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeade limbCount += headerCount; } - skelAnime->limbCount = (u8)limbCount; - skelAnime->dListCount = limbHeader->dListCount; + skelAnime->limbCount = limbCount; + skelAnime->dListCount = skeletonHeader->dListCount; allocSize = limbCount * sizeof(Vec3s); - skelAnime->limbIndex = SEGMENTED_TO_VIRTUAL(limbHeader->limbIndexSeg); + skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->skeletonSeg); if (flags & 8) { allocSize += 2; @@ -1017,7 +1011,7 @@ void func_800A39AC(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeade osSyncPrintf(VT_RST); } - func_800A3F08(globalCtx, skelAnime, animation, 1.0f, 0.0f, 0.0f, 0, 0.0f); + SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, 0.0f, 0, 0.0f); } void func_800A3B8C(SkelAnime* skelAnime) { @@ -1043,7 +1037,7 @@ s32 func_800A3BE4(GlobalContext* globalCtx, SkelAnime* skelAnime) { func_800A3B8C(skelAnime); } - func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, 1.0f - (skelAnime->unk_28 / prevUnk28)); return 0; } @@ -1051,7 +1045,7 @@ s32 func_800A3BE4(GlobalContext* globalCtx, SkelAnime* skelAnime) { void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime) { f32 updateRate; - func_800A336C(globalCtx, skelAnime->animCurrent, skelAnime->animCurrentFrame, skelAnime->limbCount, + SkelAnime_LoadLinkAnimetion(globalCtx, skelAnime->linkAnimetionSeg, skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); if (skelAnime->unk_28 != 0) { updateRate = R_UPDATE_RATE * 0.5f; @@ -1060,7 +1054,7 @@ void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime) { skelAnime->unk_28 = 0.0f; return; } - func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, skelAnime->unk_28); + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, skelAnime->unk_28); } } @@ -1104,97 +1098,97 @@ 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 SkelAnime_LinkChangeAnimation(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed, + f32 frame, f32 frameCount, u8 arg6, f32 arg7) { skelAnime->unk_01 = arg6; - if ((arg7 != 0.0f) && ((animation == skelAnime->animCurrent) || (arg4 != skelAnime->animCurrentFrame))) { + if ((arg7 != 0.0f) && ((linkAnimetionEntrySeg == skelAnime->linkAnimetionSeg) || (frame != skelAnime->animCurrentFrame))) { if (arg7 < 0.0f) { func_800A3B8C(skelAnime); SkelAnime_CopyVec3s(skelAnime, skelAnime->unk_24, skelAnime->actorDrawTbl); arg7 = -arg7; } else { skelAnime->animUpdate = &func_800A3BE4; - func_800A336C(globalCtx, animation, (s32)arg4, skelAnime->limbCount, skelAnime->unk_24); + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, skelAnime->unk_24); } skelAnime->unk_28 = 1.0f; skelAnime->unk_2C = 1.0f / arg7; } else { func_800A3B8C(skelAnime); - func_800A336C(globalCtx, animation, (s32)arg4, skelAnime->limbCount, skelAnime->actorDrawTbl); + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, skelAnime->actorDrawTbl); skelAnime->unk_28 = 0.0f; } skelAnime->animCurrentFrame = 0.0f; - skelAnime->unk_0C = arg4; - skelAnime->animCurrentFrame = arg4; + skelAnime->unk_0C = frame; + skelAnime->animCurrentFrame = frame; skelAnime->animFrameCount = frameCount; - skelAnime->unk_14 = func_800A1FC8(animation); + skelAnime->unk_14 = func_800A1FC8(&linkAnimetionEntrySeg->genericHeader); skelAnime->animPlaybackSpeed = playbackSpeed; } #else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3F08.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_LinkChangeAnimation.s") #endif -void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation) { - func_800A3F08(globalCtx, skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f); +void func_800A407C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg) { + SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 2, 0.0f); } -void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 playbackSpeed) { - func_800A3F08(globalCtx, skelAnime, animation, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(animation), 2, +void func_800A40DC(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed) { + SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 2, 0.0f); } -void func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation) { - func_800A3F08(globalCtx, skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 0, 0.0f); +void func_800A4140(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg) { + SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 0, 0.0f); } -void func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 playbackSpeed) { - func_800A3F08(globalCtx, skelAnime, animation, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(animation), 0, +void func_800A419C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed) { + SkelAnime_LinkChangeAnimation(globalCtx, skelAnime, linkAnimetionEntrySeg, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 0, 0.0f); } void func_800A41FC(GlobalContext* globalCtx, SkelAnime* skelAnime) { - func_800A3478(globalCtx, skelAnime->limbCount, skelAnime->unk_24, skelAnime->actorDrawTbl); + SkelAnime_LoadAnimationType1(globalCtx, skelAnime->limbCount, skelAnime->unk_24, skelAnime->actorDrawTbl); } void func_800A422C(GlobalContext* globalCtx, SkelAnime* skelAnime) { - func_800A3478(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24); + SkelAnime_LoadAnimationType1(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24); } -void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame) { - func_800A336C(globalCtx, animation, (s32)frame, skelAnime->limbCount, skelAnime->unk_24); +void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 frame) { + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, skelAnime->unk_24); } -void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame) { - func_800A336C(globalCtx, animation, (s32)frame, skelAnime->limbCount, skelAnime->actorDrawTbl); +void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 frame) { + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, skelAnime->actorDrawTbl); } void func_800A42E4(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 arg2) { - func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, arg2); + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->unk_24, arg2); } -void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animationSeg, f32 frame, s32 arg4, f32 arg5, - f32 arg6, s32 arg7) { - s32 alignedAddr; - func_800A336C(globalCtx, animationSeg, (s32)frame, skelAnime->limbCount, skelAnime->actorDrawTbl); +void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 frame, LinkAnimetionEntry* linkAnimetionEntrySeg2, + f32 arg5, f32 arg6, Vec3s* arg7) { + Vec3s* alignedArg7; + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, skelAnime->actorDrawTbl); - alignedAddr = ALIGN16(arg7); + alignedArg7 = (Vec3s*)ALIGN16((u32)arg7); - func_800A336C(globalCtx, arg4, (s32)arg5, skelAnime->limbCount, alignedAddr); - func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, alignedAddr, arg6); + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg2, (s32)arg5, skelAnime->limbCount, alignedArg7); + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, alignedArg7, arg6); } -void func_800A43B8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 animation, f32 frame, s32 arg4, f32 arg5, - f32 arg6, s32 arg7) { - s32 alignedAddr; +void func_800A43B8(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, f32 frame, LinkAnimetionEntry* linkAnimetionEntrySeg2, + f32 arg5, f32 arg6, Vec3s* arg7) { + Vec3s* alignedArg7; - func_800A336C(globalCtx, animation, (s32)frame, skelAnime->limbCount, skelAnime->unk_24); + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, skelAnime->unk_24); - alignedAddr = ALIGN16(arg7); + alignedArg7 = (Vec3s*)ALIGN16((u32)arg7); - func_800A336C(globalCtx, arg4, (s32)arg5, skelAnime->limbCount, alignedAddr); - func_800A34DC(globalCtx, skelAnime->limbCount, skelAnime->unk_24, alignedAddr, arg6); + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg2, (s32)arg5, skelAnime->limbCount, alignedArg7); + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->unk_24, alignedArg7, arg6); } void func_800A4454(SkelAnime* skelAnime) { @@ -1236,13 +1230,13 @@ s32 func_800A4530(SkelAnime* skelAnime, f32 arg1) { return func_800A4478(skelAnime, arg1, updateRate); } -void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32 animation, - Vec3s* actorDrawTable, s32 arg5, s32 limbCount) { - SkelAnimeLimbHeader* limbHeader; +void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationSeg, Vec3s* actorDrawTable, Vec3s* arg5, s32 limbCount) { + SkeletonHeader* skeletonHeader; - limbHeader = SEGMENTED_TO_VIRTUAL(limbHeaderSeg); - skelAnime->limbCount = limbHeader->limbCount + 1; - skelAnime->limbIndex = SEGMENTED_TO_VIRTUAL(limbHeader->limbIndexSeg); + skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); + skelAnime->limbCount = skeletonHeader->limbCount + 1; + skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->skeletonSeg); if (actorDrawTable == NULL) { skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), "../z_skelanime.c", 2968); @@ -1261,19 +1255,19 @@ void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHead osSyncPrintf(VT_RST); } - if (animation != 0) { - SkelAnime_ChangeAnimationDefault(skelAnime, animation); + if (animationSeg != NULL) { + SkelAnime_ChangeAnimationDefault(skelAnime, animationSeg); } } -void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32 animation, - Vec3s* actorDrawTable, s32 arg5, s32 limbCount) { - SkelAnimeLimbHeader* limbHeader; +void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationSeg, Vec3s* actorDrawTable, Vec3s* arg5, s32 limbCount) { + SkeletonHeader* skeletonHeader; - limbHeader = SEGMENTED_TO_VIRTUAL(limbHeaderSeg); - skelAnime->limbCount = limbHeader->limbCount + 1; - skelAnime->dListCount = limbHeader->dListCount; - skelAnime->limbIndex = SEGMENTED_TO_VIRTUAL(limbHeader->limbIndexSeg); + skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); + skelAnime->limbCount = skeletonHeader->limbCount + 1; + skelAnime->dListCount = skeletonHeader->dListCount; + skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->skeletonSeg); if (actorDrawTable == NULL) { skelAnime->actorDrawTbl = @@ -1295,17 +1289,18 @@ void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHe osSyncPrintf(VT_RST); } - if (animation != 0) { - SkelAnime_ChangeAnimationDefault(skelAnime, animation); + if (animationSeg != NULL) { + SkelAnime_ChangeAnimationDefault(skelAnime, animationSeg); } } -void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limbHeaderSeg, u32 animation) { - SkelAnimeLimbHeader* limbHeader; +void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationSeg) { + SkeletonHeader* skeletonHeader; - limbHeader = SEGMENTED_TO_VIRTUAL(limbHeaderSeg); - skelAnime->limbCount = limbHeader->limbCount + 1; - skelAnime->limbIndex = SEGMENTED_TO_VIRTUAL(limbHeader->limbIndexSeg); + skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); + skelAnime->limbCount = skeletonHeader->limbCount + 1; + skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->skeletonSeg); skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), "../z_skelanime.c", 3120); skelAnime->unk_24 = @@ -1317,8 +1312,8 @@ void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 limb osSyncPrintf(VT_RST); } - if (animation != 0) { - SkelAnime_ChangeAnimationDefault(skelAnime, animation); + if (animationSeg != NULL) { + SkelAnime_ChangeAnimationDefault(skelAnime, animationSeg); } } @@ -1390,6 +1385,7 @@ s32 func_800A4AD8(SkelAnime* skelAnime) { #endif #ifdef NON_MATCHING +// regalloc void func_800A4C58(SkelAnime* skelAnime) { char pad[6]; f32 temp_f0; @@ -1398,9 +1394,9 @@ void func_800A4C58(SkelAnime* skelAnime) { s32 temp_f8; f32 temp_f2; - SkelAnime_AnimateFrame(skelAnime->animCurrent, (s32)skelAnime->animCurrentFrame, skelAnime->limbCount, + SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); - if ((skelAnime->unk_01 & 1) != 0) { + if (skelAnime->unk_01) { temp_f8 = (s32)skelAnime->animCurrentFrame; temp_f10 = temp_f8; temp_f8++; @@ -1408,7 +1404,7 @@ void func_800A4C58(SkelAnime* skelAnime) { if (temp_f8 >= (s32)skelAnime->unk_14) { temp_f8 = 0; } - SkelAnime_AnimateFrame(skelAnime->animCurrent, temp_f8, skelAnime->limbCount, sp38); + SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, temp_f8, skelAnime->limbCount, sp38); func_800A2E70(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, sp38, temp_f2); } if (skelAnime->unk_28 != 0) { @@ -1426,9 +1422,9 @@ void func_800A4C58(SkelAnime* skelAnime) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4C58.s") #endif -#ifdef NON_MATCHING s32 func_800A4D9C(SkelAnime* skelAnime) { - skelAnime->animCurrentFrame += (R_UPDATE_RATE * 0.33333334f) + skelAnime->animPlaybackSpeed; + f32 updateRate = R_UPDATE_RATE * 0.33333334f; + skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; if (skelAnime->animCurrentFrame < 0.0f) { skelAnime->animCurrentFrame += skelAnime->unk_14; } else if (skelAnime->unk_14 <= skelAnime->animCurrentFrame) { @@ -1437,26 +1433,19 @@ s32 func_800A4D9C(SkelAnime* skelAnime) { func_800A4C58(skelAnime); return 0; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4D9C.s") -#endif -#ifdef NON_MATCHING s32 func_800A4E38(SkelAnime* skelAnime) { - skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * (R_UPDATE_RATE * 0.33333334f); + f32 updateRate = R_UPDATE_RATE * 0.33333334f; + skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; if (skelAnime->animCurrentFrame < skelAnime->unk_0C) { skelAnime->animCurrentFrame = (skelAnime->animCurrentFrame - skelAnime->unk_0C) + skelAnime->animFrameCount; - } else { - if (skelAnime->animFrameCount <= skelAnime->animCurrentFrame) { - skelAnime->animCurrentFrame = (skelAnime->animCurrentFrame - skelAnime->animFrameCount) + skelAnime->unk_0C; - } + } else if (skelAnime->animFrameCount <= skelAnime->animCurrentFrame) { + skelAnime->animCurrentFrame = (skelAnime->animCurrentFrame - skelAnime->animFrameCount) + skelAnime->unk_0C; } + func_800A4C58(skelAnime); return 0; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4E38.s") -#endif s32 func_800A4EE0(SkelAnime* skelAnime) { f32 temp_f14; @@ -1464,7 +1453,7 @@ s32 func_800A4EE0(SkelAnime* skelAnime) { temp_f14 = R_UPDATE_RATE * 0.33333334f; if (skelAnime->animCurrentFrame == skelAnime->animFrameCount) { - SkelAnime_AnimateFrame(skelAnime->animCurrent, (s32)skelAnime->animCurrentFrame, skelAnime->limbCount, + SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, (s32)skelAnime->animCurrentFrame, skelAnime->limbCount, skelAnime->actorDrawTbl); func_800A4C58(skelAnime); return 1; @@ -1485,79 +1474,76 @@ s32 func_800A4EE0(SkelAnime* skelAnime) { return 0; } -#ifdef NON_MATCHING -void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, u32* animation, f32 playbackSpeed, f32 unk0, f32 frameCount, - u8 unk1, f32 transitionRate, s8 unk2) { +void SkelAnime_ChangeAnimationImpl(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed, f32 frame, + f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2) { skelAnime->unk_01 = unk1; - if ((transitionRate != 0.0f) && ((animation != skelAnime->animCurrent) || (unk0 != skelAnime->animCurrentFrame))) { - if (transitionRate < 0.0f) { + if ((transitionRate != 0.0f) && + ((animationSeg != skelAnime->animCurrentSeg) || (frame != skelAnime->animCurrentFrame))) { + if (transitionRate < 0) { func_800A49B0(skelAnime); SkelAnime_CopyVec3s(skelAnime, skelAnime->unk_24, skelAnime->actorDrawTbl); transitionRate = -transitionRate; } else { if (unk2 != 0) { - skelAnime->animUpdate = (void*)&func_800A4AD8; + skelAnime->animUpdate = &func_800A4AD8; skelAnime->unk_03 = unk2; } else { - skelAnime->animUpdate = (void*)&func_800A4A20; + skelAnime->animUpdate = &func_800A4A20; } - SkelAnime_AnimateFrame(animation, (s32)unk0, skelAnime->limbCount, skelAnime->actorDrawTbl); + SkelAnime_AnimateFrame(animationSeg, frame, skelAnime->limbCount, skelAnime->unk_24); } skelAnime->unk_28 = 1.0f; skelAnime->unk_2C = 1.0f / transitionRate; } else { func_800A49B0(skelAnime); - SkelAnime_AnimateFrame(animation, (s32)unk0, skelAnime->limbCount, skelAnime->actorDrawTbl); + SkelAnime_AnimateFrame(animationSeg, frame, skelAnime->limbCount, skelAnime->actorDrawTbl); skelAnime->unk_28 = 0.0f; } - skelAnime->animCurrent = animation; - skelAnime->unk_0C = unk0; + skelAnime->animCurrentSeg = animationSeg; + skelAnime->unk_0C = frame; skelAnime->animFrameCount = frameCount; - skelAnime->unk_14 = func_800A1FC8(animation); + skelAnime->unk_14 = func_800A1FC8(&animationSeg->genericHeader); if (skelAnime->unk_01 >= 4) { skelAnime->animCurrentFrame = 0.0f; } else { - skelAnime->animCurrentFrame = unk0; + skelAnime->animCurrentFrame = frame; if (skelAnime->unk_01 < 2) { skelAnime->animFrameCount = skelAnime->unk_14 - 1.0f; } } skelAnime->animPlaybackSpeed = playbackSpeed; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s") -#endif -void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 unk0, f32 frameCount, - u8 unk1, f32 transitionRate) { - SkelAnime_ChangeAnimationImpl(skelAnime, animation, playbackSpeed, unk0, frameCount, unk1, transitionRate, 0); +void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed, f32 frame, + f32 frameCount, u8 unk1, f32 transitionRate) { + SkelAnime_ChangeAnimationImpl(skelAnime, animationSeg, playbackSpeed, frame, frameCount, unk1, transitionRate, 0); } -void func_800A51E8(SkelAnime* skelAnime, u32 animation) { - SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f); +void func_800A51E8(SkelAnime* skelAnime, AnimationHeader* animationSeg) { + SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, 0.0f); } -void func_800A5240(SkelAnime* skelAnime, u32 animation, f32 transitionRate) { - SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0, SkelAnime_GetFrameCount(animation), 2, +void func_800A5240(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { + SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, transitionRate); } -void func_800A529C(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed) { - SkelAnime_ChangeAnimation(skelAnime, animation, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(animation), 2, +void func_800A529C(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { + SkelAnime_ChangeAnimation(skelAnime, animationSeg, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, 0.0f); } -void SkelAnime_ChangeAnimationDefault(SkelAnime* skelAnime, u32 animation) { - SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 0, 0.0f); +void SkelAnime_ChangeAnimationDefault(SkelAnime* skelAnime, AnimationHeader* animationSeg) { + SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, 0.0f); } -void SkelAnime_ChangeAnimationTransitionRate(SkelAnime* skelAnime, u32 animation, f32 transitionRate) { - SkelAnime_ChangeAnimation(skelAnime, animation, 1.0f, 0.0f, 0.0f, 0, transitionRate); +void SkelAnime_ChangeAnimationTransitionRate(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { + SkelAnime_ChangeAnimation(skelAnime, animationSeg, 1.0f, 0.0f, 0.0f, 0, transitionRate); } -void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed) { - SkelAnime_ChangeAnimation(skelAnime, animation, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(animation), 0, +void SkelAnime_ChangeAnimationPlaybackSpeed(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { + SkelAnime_ChangeAnimation(skelAnime, animationSeg, playbackSpeed, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, 0.0f); } @@ -1570,12 +1556,10 @@ void func_800A53DC(SkelAnime* skelAnime) { #ifdef NON_MATCHING // regalloc void func_800A5408(SkelAnime* skelAnime) { - f32 animPlaybackSpeed = skelAnime->animPlaybackSpeed; - f32 unk_C = skelAnime->unk_0C; f32 frameCount = skelAnime->animFrameCount; - skelAnime->animFrameCount = unk_C; - skelAnime->animPlaybackSpeed = -animPlaybackSpeed; + skelAnime->animFrameCount = skelAnime->unk_0C; + skelAnime->animPlaybackSpeed = -skelAnime->animPlaybackSpeed; skelAnime->unk_0C = frameCount; } #else @@ -1630,7 +1614,7 @@ void func_800A54FC(SkelAnime* skelAnime, Vec3f* pos, s16 angle) { skelAnime->unk_3C = skelAnime->actorDrawTbl->z; skelAnime->actorDrawTbl->z = skelAnime->unk_42; if (skelAnime->unk_35 & 2) { - if ((skelAnime->unk_35 & 0x10) != 0) { + if (skelAnime->unk_35 & 0x10) { pos->y = 0.0f; } else { pos->y = skelAnime->actorDrawTbl->y - skelAnime->unk_3A; diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c index 318d74e3c..d0b335ed3 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -51,10 +51,10 @@ const ActorInit Demo_Go_InitVars = { (ActorFunc)DemoGo_Draw, }; -extern UNK_TYPE D_060029A8; -extern UNK_TYPE D_06004930; +extern AnimationHeader D_060029A8; +extern AnimationHeader D_06004930; extern UNK_TYPE D_0600E680; -extern UNK_TYPE D_0600FEF0; +extern SkeletonHeader D_0600FEF0; UNK_TYPE func_8097C870(DemoGo* this) { s32 ret; @@ -246,9 +246,9 @@ void func_8097CEEC(DemoGo* this, GlobalContext* globalCtx) { } void func_8097CF20(DemoGo* this, GlobalContext* globalCtx, UNK_TYPE arg2) { - UNK_PTR animation = &D_060029A8; + AnimationHeader* animation = &D_060029A8; if (arg2 != 0) { - SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 0, + SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animation->genericHeader), 0, -8.0f); this->action = 5; this->unk_19C = 0.0f; @@ -316,12 +316,12 @@ void DemoGo_Update(DemoGo* this, GlobalContext* globalCtx) { } void DemoGo_Init(DemoGo* this, GlobalContext* globalCtx) { - UNK_PTR animation = &D_06004930; s16 pad; + AnimationHeader* animation = &D_06004930; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600FEF0, 0, 0, 0, 0); - SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f); + SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animation->genericHeader), 2, 0.0f); this->action = 0; } @@ -343,7 +343,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(srcSegment8)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(srcSegment9)); - SkelAnime_DrawSV(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, + SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, &this->actor); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 746); diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index 93c064596..7869933fb 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -150,5 +150,5 @@ void EnBird_Update(EnBird* this, GlobalContext* globalCtx) { } void EnBird_Draw(EnBird* this, GlobalContext* globalCtx) { - SkelAnime_Draw(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, 0, NULL, NULL); + SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, 0, NULL, NULL); } diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.c b/src/overlays/actors/ovl_En_Dog/z_en_dog.c index d3839913f..782b572a6 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -80,13 +80,13 @@ typedef enum { } DogBehavior; extern UNK_PTR D_06007290; -extern UNK_PTR D_06001368; -extern UNK_PTR D_06000D78; -extern UNK_PTR D_06000278; +extern AnimationHeader D_06001368; +extern AnimationHeader D_06000D78; +extern AnimationHeader D_06000278; static void EnDog_PlayWalkSFX(EnDog* this) { - u32* walk = &D_06001368; - if (this->skelAnime.animCurrent == walk) { + AnimationHeader* walk = &D_06001368; + if (this->skelAnime.animCurrentSeg == walk) { if ((this->skelAnime.animCurrentFrame == 1.0f) || (this->skelAnime.animCurrentFrame == 7.0f)) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHIBI_WALK); } @@ -94,8 +94,8 @@ static void EnDog_PlayWalkSFX(EnDog* this) { } static void EnDog_PlayRunSFX(EnDog* this) { - u32* run = &D_06000D78; - if (this->skelAnime.animCurrent == run) { + AnimationHeader* run = &D_06000D78; + if (this->skelAnime.animCurrentSeg == run) { if ((this->skelAnime.animCurrentFrame == 2.0f) || (this->skelAnime.animCurrentFrame == 4.0f)) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHIBI_WALK); } @@ -103,8 +103,8 @@ static void EnDog_PlayRunSFX(EnDog* this) { } static void EnDog_PlayBarkSFX(EnDog* this) { - u32* bark = &D_06000278; - if (this->skelAnime.animCurrent == bark) { + AnimationHeader* bark = &D_06000278; + if (this->skelAnime.animCurrentSeg == bark) { if ((this->skelAnime.animCurrentFrame == 13.0f) || (this->skelAnime.animCurrentFrame == 19.0f)) { Audio_PlayActorSound2(&this->actor, NA_SE_EV_SMALL_DOG_BARK); } @@ -479,7 +479,7 @@ static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { gDPSetEnvColor(gfxCtx->polyOpa.p++, colors[this->actor.params & 0xF].r, colors[this->actor.params & 0xF].g, colors[this->actor.params & 0xF].b, colors[this->actor.params & 0xF].a); - SkelAnime_DrawSV(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, EnDog_Callback1, EnDog_Callback2, &this->actor); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_dog.c", 994); } diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index db449cdb6..30a64142a 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -191,6 +191,6 @@ static void EnMs_Update(EnMs* this, GlobalContext* globalCtx) { void EnMs_Draw(EnMs* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - SkelAnime_DrawSV(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, 0, + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, 0, 0, &this->actor); } diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 7dd4f8da3..d16780c51 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -31,16 +31,16 @@ extern UNK_TYPE D_04052DB0; extern UNK_TYPE D_040531B0; extern UNK_TYPE D_040535B0; extern UNK_TYPE D_040539B0; -extern UNK_TYPE D_06001144; -extern UNK_TYPE D_06001FA8; -extern UNK_TYPE D_06002F84; +extern AnimationHeader D_06001144; +extern AnimationHeader D_06001FA8; +extern AnimationHeader D_06002F84; extern UNK_TYPE D_06003B40; extern UNK_TYPE D_06004340; extern UNK_TYPE D_06004B40; -extern UNK_TYPE D_0600ACE0; -extern UNK_TYPE D_0600BC90; -extern UNK_TYPE D_0600BCA0; -extern UNK_TYPE D_0600BE40; +extern Gfx D_0600ACE0[]; +extern Gfx D_0600BC90[]; +extern Gfx D_0600BCA0[]; +extern SkeletonHeader D_0600BE40; const ActorInit En_Tk_InitVars = { ACTOR_EN_TK, @@ -136,7 +136,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { if (eff->active != 0) { if (gfxSetup == 0) { gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0); - gSPDisplayList(gfxCtx->polyXlu.p++, &D_0600BC90); + gSPDisplayList(gfxCtx->polyXlu.p++, D_0600BC90); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x64, 0x3C, 0x14, 0x00); gfxSetup = 1; } @@ -154,7 +154,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { imageIdx = eff->timeLeft * ((f32)ARRAY_COUNT(images) / eff->timeTotal); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(images[imageIdx])); - gSPDisplayList(gfxCtx->polyXlu.p++, &D_0600BCA0); + gSPDisplayList(gfxCtx->polyXlu.p++, D_0600BCA0); } eff++; } @@ -186,9 +186,9 @@ static EnTk_SubActorStruct98Init D_80B1D534 = { }; void EnTk_RestAnim(EnTk* this, GlobalContext* globalCtx) { - UNK_PTR anim = &D_06002F84; + AnimationHeader* anim = &D_06002F84; - SkelAnime_ChangeAnimation(&this->skelAnim, (u32)anim, 1.f, 0.f, SkelAnime_GetFrameCount((u32)&D_06002F84), 0, + SkelAnime_ChangeAnimation(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, -10.f); this->actionCountdown = Math_Rand_S16Offset(60, 60); @@ -196,18 +196,18 @@ void EnTk_RestAnim(EnTk* this, GlobalContext* globalCtx) { } void EnTk_WalkAnim(EnTk* this, GlobalContext* globalCtx) { - UNK_PTR anim = &D_06001FA8; + AnimationHeader* anim = &D_06001FA8; - SkelAnime_ChangeAnimation(&this->skelAnim, (u32)anim, 1.f, 0.f, SkelAnime_GetFrameCount((u32)&D_06002F84), 0, + SkelAnime_ChangeAnimation(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, -10.f); this->actionCountdown = Math_Rand_S16Offset(240, 240); } void EnTk_DigAnim(EnTk* this, GlobalContext* globalCtx) { - UNK_PTR anim = &D_06001144; + AnimationHeader* anim = &D_06001144; - SkelAnime_ChangeAnimation(&this->skelAnim, (u32)anim, 1.f, 0.f, SkelAnime_GetFrameCount((u32)&D_06001144), 0, + SkelAnime_ChangeAnimation(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06001144.genericHeader), 0, -10.f); if (EnTk_CheckNextSpot(this, globalCtx) >= 0) { @@ -306,7 +306,7 @@ f32 EnTk_Step(EnTk* this, GlobalContext* globalCtx) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK); } - if (this->skelAnim.animCurrent != (u32*)&D_06001FA8) { + if (this->skelAnim.animCurrentSeg != &D_06001FA8) { return 0.f; } @@ -504,12 +504,12 @@ void EnTk_DigEff(EnTk* this) { void EnTk_Init(EnTk* this, GlobalContext* globalCtx) { EnTk* thisAgain = this; - UNK_PTR anim = &D_06002F84; + AnimationHeader* anim = &D_06002F84; ActorShape_Init(&thisAgain->actor.shape, 0, ActorShadow_DrawFunc_Circle, 24.f); - SkelAnime_InitSV(globalCtx, &thisAgain->skelAnim, (u32)&D_0600BE40, 0, thisAgain->hz_22A, thisAgain->hz_296, 18); - SkelAnime_ChangeAnimation(&thisAgain->skelAnim, (u32)anim, 1.f, 0.f, SkelAnime_GetFrameCount((u32)&D_06002F84), 0, + SkelAnime_InitSV(globalCtx, &thisAgain->skelAnim, &D_0600BE40, 0, thisAgain->hz_22A, thisAgain->hz_296, 18); + SkelAnime_ChangeAnimation(&thisAgain->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, 0.f); ActorCollider_AllocCylinder(globalCtx, &thisAgain->collider); @@ -707,7 +707,7 @@ void func_80B1D200(GlobalContext* globalCtx) { gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188); - gSPDisplayList(gfxCtx->polyOpa.p++, &D_0600ACE0); + gSPDisplayList(gfxCtx->polyOpa.p++, D_0600ACE0); func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190); } @@ -769,7 +769,7 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(eyeImages[thisAgain->eyeImageIdx])); - SkelAnime_DrawSV(globalCtx, thisAgain->skelAnim.limbIndex, thisAgain->skelAnim.actorDrawTbl, + SkelAnime_DrawSV(globalCtx, thisAgain->skelAnim.skeleton, thisAgain->skelAnim.actorDrawTbl, thisAgain->skelAnim.dListCount, func_80B1D278, func_80B1D2E4, &thisAgain->actor); func_800C6B54(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312); diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c index 521d74241..e4ac503ae 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -76,18 +76,17 @@ static InitChainEntry initChain[3] = { static Vec3f D_80B30D70 = { 0.0f, 0.0f, 0.0f }; -extern u32 D_06000EA4; -extern u32 D_06000590; -extern u32 D_0600299C; -extern u32 D_06008FB0; -extern u32 D_06009DB0; -extern u32 D_060019CC; -extern u32 D_06009520; -extern u32 D_06009244; -extern u32 D_060041F4; -extern u32 D_0600A054; -extern u32 D_06008688; -extern u32 D_04049210; +extern AnimationHeader D_06000EA4; +extern AnimationHeader D_06000590; +extern AnimationHeader D_0600299C; +extern SkeletonHeader D_06008FB0; +extern AnimationHeader D_06009DB0; +extern AnimationHeader D_060019CC; +extern AnimationHeader D_06009520; +extern AnimationHeader D_06009244; +extern AnimationHeader D_060041F4; +extern AnimationHeader D_0600A054; +extern Gfx D_06008688[]; static void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) { EnWallmas* this2 = this; @@ -137,7 +136,7 @@ static void EnWallmas_TimerInit(EnWallmas* this, GlobalContext* globalCtx) { static void EnWallmas_DropStart(EnWallmas* this, GlobalContext* globalCtx) { Player* player = PLAYER; - u32* objSegChangeAnime = &D_0600299C; + AnimationHeader* objSegChangeAnime = &D_0600299C; SkelAnime_ChangeAnimation(&this->skelAnime, objSegChangeAnime, 0.0f, 20.0f, (f32)SkelAnime_GetFrameCount(&D_0600299C), 2, 0.0f); @@ -152,8 +151,8 @@ static void EnWallmas_DropStart(EnWallmas* this, GlobalContext* globalCtx) { } static void EnWallmas_LandStart(EnWallmas* this, GlobalContext* globalCtx) { - u32* objSegFrameCount = &D_060019CC; - u32* objSegChangeAnime = &D_060019CC; + AnimationHeader* objSegFrameCount = &D_060019CC; + AnimationHeader* objSegChangeAnime = &D_060019CC; SkelAnime_ChangeAnimation(&this->skelAnime, objSegChangeAnime, 1.0f, 41.0f, SkelAnime_GetFrameCount(objSegFrameCount), 2, -3.0f); @@ -180,8 +179,8 @@ static void EnWallmas_JumpToCeilingStart(EnWallmas* this) { this->actor.speedXZ = 0.0f; } static void EnWallmas_ReturnToCeilingStart(EnWallmas* this) { - u32* objSegFrameCount = &D_060019CC; - u32* objSegChangeAnime = &D_060019CC; + AnimationHeader* objSegFrameCount = &D_060019CC; + AnimationHeader* objSegChangeAnime = &D_060019CC; this->timer = 0; this->actor.speedXZ = 0.0f; @@ -620,7 +619,7 @@ static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 arg1, s32 arg2, s32 Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1489), G_MTX_LOAD); - gSPDisplayList(gfxCtx->polyOpa.p++, &D_06008688); + gSPDisplayList(gfxCtx->polyOpa.p++, D_06008688); Matrix_Pull(); func_800C6B54(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495); @@ -630,7 +629,7 @@ static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 arg1, s32 arg2, s32 static void EnWallmas_Draw(EnWallmas* this, GlobalContext* globalCtx) { if (this->actionFunc != (ActorFunc)&EnWallmas_WaitToDrop) { func_80093D18(globalCtx->state.gfxCtx); - SkelAnime_DrawSV(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, &EnWallMas_UpdatePos, &EnWallmas_DrawOpa, &this->actor); } diff --git a/undefined_syms.txt b/undefined_syms.txt index 192527371..adb2c8f3a 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -421,7 +421,6 @@ D_06009244 = 0x06009244; D_060041F4 = 0x060041F4; D_0600A054 = 0x0600A054; D_06008688 = 0x06008688; -D_04049210 = 0x04049210; // z_en_lightbox D_06000B70 = 0x06000B70; |