mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-08-05 01:29:54 -04:00
Code Issues Packages 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
asm/non_matchings/code/z_player_lib/func_80091738.s
+1 -1
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
asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimationImpl.s
-122
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
asm/non_matchings/code/z_skelanime/func_800A3F08.s → asm/non_matchings/code/z_skelanime/SkelAnime_LinkChangeAnimation.s
+3 -3
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
asm/non_matchings/code/z_skelanime/func_800A4A20.s
-53
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
asm/non_matchings/code/z_skelanime/func_800A4D9C.s
-48
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
asm/non_matchings/code/z_skelanime/func_800A4E38.s
-51
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