mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 22:44:30 +00:00
Code Issues Projects Releases Wiki Activity

name SkelAnime_InitLinkAnimetion, name load animation types and callbacks, rename several segement addresses in decompiled actors

Browse source
This commit is contained in:
KrimtonZ 2020-03-25 10:51:25 -05:00
parent a99840162b
commit 8970968cfc
67 changed files with 2727 additions and 3007 deletions
Download patch file Download diff file Expand all files Collapse all files

2
asm/non_matchings/code/z_player_lib/func_80091738.s
View file

@ -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

122
asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s
View file

@ -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

6
asm/non_matchings/code/z_skelanime/func_800A3F08.s → asm/non_matchings/code/z_skelanime/SkelAnime_LinkChangeAnimation.s
View file

@ -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

53
asm/non_matchings/code/z_skelanime/func_800A4A20.s
View file

@ -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

48
asm/non_matchings/code/z_skelanime/func_800A4D9C.s
View file

@ -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

51
asm/non_matchings/code/z_skelanime/func_800A4E38.s
View file

@ -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

2
asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s
View file

@ -9,7 +9,7 @@ glabel func_8096D594
/* 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
/* 0010C 8096D5BC 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 00110 8096D5C0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000
/* 00114 8096D5C4 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00118 8096D5C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s
View file

@ -23,7 +23,7 @@ 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s
View file

@ -9,7 +9,7 @@ glabel func_8096D64C
/* 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
/* 001C4 8096D674 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 001C8 8096D678 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000
/* 001CC 8096D67C 8FBF0014 */ lw $ra, 0x0014($sp)
/* 001D0 8096D680 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s
View file

@ -9,7 +9,7 @@ glabel func_809833D8
/* 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
/* 00100 80983400 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 00104 80983404 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000
/* 00108 80983408 8FBF0014 */ lw $ra, 0x0014($sp)
/* 0010C 8098340C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s
View file

@ -15,7 +15,7 @@ glabel func_80A79690
/* 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
/* 00720 80A796D0 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 00724 80A796D4 8FA40028 */ lw $a0, 0x0028($sp)
/* 00728 80A796D8 8FBF001C */ lw $ra, 0x001C($sp)
.L80A796DC:

2
asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s
View file

@ -9,7 +9,7 @@ glabel func_80AB2688
/* 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
/* 01920 80AB26B0 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 01924 80AB26B4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000
/* 01928 80AB26B8 8FBF0014 */ lw $ra, 0x0014($sp)
/* 0192C 80AB26BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s
View file

@ -9,7 +9,7 @@ glabel func_80AEB364
/* 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
/* 0077C 80AEB38C 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 00780 80AEB390 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000
/* 00784 80AEB394 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00788 80AEB398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s
View file

@ -15,7 +15,7 @@ glabel func_80AEB6E0
/* 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
/* 00B10 80AEB720 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 00B14 80AEB724 8FA4001C */ lw $a0, 0x001C($sp)
/* 00B18 80AEB728 8FBF0014 */ lw $ra, 0x0014($sp)
.L80AEB72C:

2
asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s
View file

@ -30,7 +30,7 @@ glabel func_80AEB738
/* 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
/* 00BA4 80AEB7B4 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 00BA8 80AEB7B8 8FA40024 */ lw $a0, 0x0024($sp)
/* 00BAC 80AEB7BC 8FBF001C */ lw $ra, 0x001C($sp)
.L80AEB7C0:

2
asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s
View file

@ -112,7 +112,7 @@ glabel L808637D4
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s
View file

@ -15,7 +15,7 @@ glabel func_80B3C8CC
/* 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
/* 0072C 80B3C90C 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 00730 80B3C910 8FA4001C */ lw $a0, 0x001C($sp)
/* 00734 80B3C914 8FBF0014 */ lw $ra, 0x0014($sp)
.L80B3C918:

2
asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s
View file

@ -9,7 +9,7 @@ glabel func_80B3C924
/* 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
/* 0076C 80B3C94C 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 00770 80B3C950 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000
/* 00774 80B3C954 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00778 80B3C958 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s
View file

@ -23,7 +23,7 @@ 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s
View file

@ -9,7 +9,7 @@ glabel func_80B4B874
/* 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
/* 00D5C 80B4B89C 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 00D60 80B4B8A0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000
/* 00D64 80B4B8A4 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00D68 80B4B8A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s
View file

@ -9,7 +9,7 @@ glabel func_80B5BB38
/* 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
/* 003B0 80B5BB60 0C028D88 */ jal SkelAnime_LoadAnimationType5
/* 003B4 80B5BB64 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000
/* 003B8 80B5BB68 8FBF0014 */ lw $ra, 0x0014($sp)
/* 003BC 80B5BB6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s
View file

@ -21,7 +21,7 @@ glabel func_80832B0C
/* 00944 80832B54 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000
/* 00948 80832B58 E7AA001C */ swc1 $f10, 0x001C($sp)
/* 0094C 80832B5C 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4
/* 00950 80832B60 0C028FC2 */ jal func_800A3F08
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s
View file

@ -22,7 +22,7 @@ glabel func_80832B78
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s
View file

@ -10,7 +10,7 @@ glabel func_80832BE8
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s
View file

@ -9,7 +9,7 @@ glabel func_80832C2C
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s
View file

@ -10,7 +10,7 @@ glabel func_80832C6C
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s
View file

@ -108,7 +108,7 @@ glabel func_808340DC
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s
View file

@ -52,7 +52,7 @@ glabel func_80834758
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s
View file

@ -27,7 +27,7 @@ glabel func_80834BD4
/* 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
/* 02A30 80834C40 0C028FC2 */ jal SkelAnime_LinkChangeAnimation
/* 02A34 80834C44 E7A6001C */ swc1 $f6, 0x001C($sp)
.L80834C48:
/* 02A38 80834C48 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s
View file

@ -30,7 +30,7 @@ glabel func_808358F0
.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
/* 03764 80835974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000

8
asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s
View file

@ -95,7 +95,7 @@ glabel func_80836670
/* 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
/* 045CC 808367DC 0C028D6D */ jal SkelAnime_LoadAnimationType4
/* 045D0 808367E0 AFB80010 */ sw $t8, 0x0010($sp)
.L808367E4:
/* 045D4 808367E4 26040830 */ addiu $a0, $s0, 0x0830 ## $a0 = 00000830
@ -111,7 +111,7 @@ glabel func_80836670
/* 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
/* 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
@ -131,7 +131,7 @@ glabel func_80836670
/* 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
/* 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
@ -139,7 +139,7 @@ glabel func_80836670
/* 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:

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s
View file

@ -45,7 +45,7 @@ glabel func_80837704
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s
View file

@ -86,7 +86,7 @@ glabel func_8083BF50
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s
View file

@ -103,7 +103,7 @@ glabel func_8083C2B0
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s
View file

@ -30,7 +30,7 @@ glabel func_8083CBF0
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s
View file

@ -38,7 +38,7 @@ glabel func_8083CD54
/* 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
/* 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)

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s
View file

@ -90,7 +90,7 @@ glabel func_8083F570
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s
View file

@ -133,7 +133,7 @@ glabel func_808409CC
/* 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
/* 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)

4
asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s
View file

@ -19,7 +19,7 @@ glabel func_80841BA8
/* 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
/* 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
@ -27,7 +27,7 @@ glabel func_80841BA8
/* 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
/* 0FA08 80841C18 0C028D52 */ jal SkelAnime_LoadAnimationType3
/* 0FA0C 80841C1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 0FA10 80841C20 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000
.L80841C24:

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s
View file

@ -249,7 +249,7 @@ glabel func_80843188
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s
View file

@ -78,7 +78,7 @@ glabel func_808435C4
/* 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
/* 114E0 808436F0 0C028FC2 */ jal SkelAnime_LinkChangeAnimation
/* 114E4 808436F4 E7A6001C */ swc1 $f6, 0x001C($sp)
.L808436F8:
/* 114E8 808436F8 8FBF002C */ lw $ra, 0x002C($sp)

4
asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s
View file

@ -37,7 +37,7 @@ glabel func_80843AE8
/* 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
/* 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
@ -59,7 +59,7 @@ glabel func_80843AE8
/* 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
/* 119BC 80843BCC 0C028FC2 */ jal SkelAnime_LinkChangeAnimation
/* 119C0 80843BD0 E7A6001C */ swc1 $f6, 0x001C($sp)
/* 119C4 80843BD4 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140
.L80843BD8:

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s
View file

@ -149,7 +149,7 @@ glabel func_8084411C
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s
View file

@ -37,7 +37,7 @@ glabel func_80846660
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s
View file

@ -32,7 +32,7 @@ glabel func_808467D4
/* 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
/* 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

4
asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s
View file

@ -45,7 +45,7 @@ glabel func_80846AAC
/* 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
/* 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
@ -67,7 +67,7 @@ glabel func_80846AAC
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s
View file

@ -883,7 +883,7 @@ glabel func_80848F9C
/* 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

4
asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s
View file

@ -336,7 +336,7 @@ glabel func_8084BF1C
/* 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
/* 1A1E4 8084C3F4 0C028FC2 */ jal SkelAnime_LinkChangeAnimation
/* 1A1E8 8084C3F8 E7A0001C */ swc1 $f0, 0x001C($sp)
.L8084C3FC:
/* 1A1EC 8084C3FC 860F0850 */ lh $t7, 0x0850($s0) ## 00000850
@ -397,7 +397,7 @@ glabel func_8084BF1C
/* 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
/* 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)

6
asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s
View file

@ -208,7 +208,7 @@ glabel func_8084CC98
.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)
/* 1AD88 8084CF98 912A1D6C */ lbu $t2, 0x1D6C($t1) ## 00001D6C
@ -328,7 +328,7 @@ glabel func_8084CC98
/* 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
/* 1AF40 8084D150 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C
@ -349,7 +349,7 @@ glabel func_8084CC98
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s
View file

@ -24,7 +24,7 @@ glabel func_80850F1C
/* 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
/* 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)

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s
View file

@ -18,7 +18,7 @@ glabel func_80850F9C
/* 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
/* 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)

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s
View file

@ -51,7 +51,7 @@ glabel func_808515A4
/* 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
/* 1F454 80851664 0C028FC2 */ jal SkelAnime_LinkChangeAnimation
/* 1F458 80851668 E7A40010 */ swc1 $f4, 0x0010($sp)
.L8085166C:
/* 1F45C 8085166C 0C20C884 */ jal func_80832210

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s
View file

@ -15,7 +15,7 @@ glabel func_80851B90
/* 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
/* 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

2
asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s
View file

@ -36,7 +36,7 @@ glabel func_80851BE8
/* 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
/* 1FA68 80851C78 0C028FC2 */ jal SkelAnime_LinkChangeAnimation
/* 1FA6C 80851C7C E7AA001C */ swc1 $f10, 0x001C($sp)
.L80851C80:
/* 1FA70 80851C80 3C058085 */ lui $a1, %hi(D_808551B4) ## $a1 = 80850000

85
include/functions.h
View file

@ -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);

2
include/variables.h
View file

@ -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;

2
include/z64.h
View file

@ -956,7 +956,7 @@ typedef struct LoadedParticleEntry {
// Some animation related structure
typedef struct {
/* 0x00 */ u32 animation;
/* 0x00 */ AnimationHeader* animation;
/* 0x04 */ f32 playbackSpeed;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 frameCount;

91
include/z64animation.h
View file

@ -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);

8
src/code/z_actor.c
View file

@ -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);

546
src/code/z_skelanime.c
View file

File diff suppressed because it is too large Load diff

16
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -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);

2
src/overlays/actors/ovl_En_Bird/z_en_bird.c
View file

@ -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);
}

20
src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -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);
}

2
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -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);
}

42
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -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);

37
src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
View file

@ -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);
}

1
undefined_syms.txt
View file

@ -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;