From 864cb28e272d68deaf1805dc62286531854edb48 Mon Sep 17 00:00:00 2001
From: KrimtonZ <krimtonz@gmail.com>
Date: Wed, 25 Mar 2020 14:38:16 -0500
Subject: [PATCH] remove skelanime data files, few extra namings, add
 non_matching for func_800A2E70

---
 asm/non_matchings/code/z_play/func_800BCA64.s |  26 ++--
 asm/non_matchings/code/z_play/func_800BD314.s | 136 +++++++++---------
 data/z_skelanime.bss.s                        |  11 --
 data/z_skelanime.data.s                       |  14 --
 include/functions.h                           |   8 +-
 include/variables.h                           |   3 -
 include/z64animation.h                        |   2 +-
 src/code/z_skelanime.c                        |  43 ++++--
 8 files changed, 120 insertions(+), 123 deletions(-)
 delete mode 100644 data/z_skelanime.bss.s
 delete mode 100644 data/z_skelanime.data.s

diff --git a/asm/non_matchings/code/z_play/func_800BCA64.s b/asm/non_matchings/code/z_play/func_800BCA64.s
index 875a374029..51173f7073 100644
--- a/asm/non_matchings/code/z_play/func_800BCA64.s
+++ b/asm/non_matchings/code/z_play/func_800BCA64.s
@@ -58,7 +58,7 @@ glabel func_800BCA64
 /* B33C50 800BCAB0 AC8F000C */   sw    $t7, 0xc($a0)
 .L800BCAB4:
 /* B33C54 800BCAB4 0C03F616 */  jal   SystemArena_Display
-/* B33C58 800BCAB8 00000000 */   nop   
+/* B33C58 800BCAB8 00000000 */   nop
 /* B33C5C 800BCABC 3C05001D */  lui   $a1, (0x001D4790 >> 16) # lui $a1, 0x1d
 /* B33C60 800BCAC0 34A54790 */  ori   $a1, (0x001D4790 & 0xFFFF) # ori $a1, $a1, 0x4790
 /* B33C64 800BCAC4 0C0313C8 */  jal   func_800C4F20
@@ -72,7 +72,7 @@ glabel func_800BCA64
 /* B33C84 800BCAE4 0C03DA0A */  jal   func_800F6828
 /* B33C88 800BCAE8 00002025 */   move  $a0, $zero
 /* B33C8C 800BCAEC 0C024BCE */  jal   func_80092F38
-/* B33C90 800BCAF0 00000000 */   nop   
+/* B33C90 800BCAF0 00000000 */   nop
 /* B33C94 800BCAF4 00002025 */  move  $a0, $zero
 /* B33C98 800BCAF8 02201025 */  move  $v0, $s1
 .L800BCAFC:
@@ -139,7 +139,7 @@ glabel func_800BCA64
 /* B33D88 800BCBE8 3C010001 */  lui   $at, (0x00010B20 >> 16) # lui $at, 1
 /* B33D8C 800BCBEC 34210B20 */  ori   $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20
 /* B33D90 800BCBF0 02212021 */  addu  $a0, $s1, $at
-/* B33D94 800BCBF4 0C028CBB */  jal   func_800A32EC
+/* B33D94 800BCBF4 0C028CBB */  jal   SkelAnime_AnimationCtxReset
 /* B33D98 800BCBF8 AFA4003C */   sw    $a0, 0x3c($sp)
 /* B33D9C 800BCBFC 02202025 */  move  $a0, $s1
 /* B33DA0 800BCC00 0C019143 */  jal   func_8006450C
@@ -199,19 +199,19 @@ glabel func_800BCA64
 /* B33E5C 800BCCBC 8E420004 */  lw    $v0, 4($s2)
 .L800BCCC0:
 /* B33E60 800BCCC0 10400006 */  beqz  $v0, .L800BCCDC
-/* B33E64 800BCCC4 00000000 */   nop   
+/* B33E64 800BCCC4 00000000 */   nop
 /* B33E68 800BCCC8 8E580010 */  lw    $t8, 0x10($s2)
 /* B33E6C 800BCCCC 17000003 */  bnez  $t8, .L800BCCDC
-/* B33E70 800BCCD0 00000000 */   nop   
+/* B33E70 800BCCD0 00000000 */   nop
 /* B33E74 800BCCD4 10000012 */  b     .L800BCD20
 /* B33E78 800BCCD8 AE401360 */   sw    $zero, 0x1360($s2)
 .L800BCCDC:
 /* B33E7C 800BCCDC 10400007 */  beqz  $v0, .L800BCCFC
-/* B33E80 800BCCE0 00000000 */   nop   
+/* B33E80 800BCCE0 00000000 */   nop
 /* B33E84 800BCCE4 8E590010 */  lw    $t9, 0x10($s2)
 /* B33E88 800BCCE8 24090001 */  li    $t1, 1
 /* B33E8C 800BCCEC 13200003 */  beqz  $t9, .L800BCCFC
-/* B33E90 800BCCF0 00000000 */   nop   
+/* B33E90 800BCCF0 00000000 */   nop
 /* B33E94 800BCCF4 1000000A */  b     .L800BCD20
 /* B33E98 800BCCF8 AE491360 */   sw    $t1, 0x1360($s2)
 .L800BCCFC:
@@ -310,17 +310,17 @@ glabel func_800BCA64
 /* B33FF0 800BCE50 01394821 */  addu  $t1, $t1, $t9
 /* B33FF4 800BCE54 812981C0 */  lb    $t1, %lo(gEntranceTable)($t1)
 /* B33FF8 800BCE58 1521000E */  bne   $t1, $at, .L800BCE94
-/* B33FFC 800BCE5C 00000000 */   nop   
+/* B33FFC 800BCE5C 00000000 */   nop
 /* B34000 800BCE60 8E4A1360 */  lw    $t2, 0x1360($s2)
 /* B34004 800BCE64 24010006 */  li    $at, 6
 /* B34008 800BCE68 3C048014 */  lui   $a0, %hi(D_80144204) # $a0, 0x8014
 /* B3400C 800BCE6C 15410009 */  bne   $t2, $at, .L800BCE94
-/* B34010 800BCE70 00000000 */   nop   
+/* B34010 800BCE70 00000000 */   nop
 /* B34014 800BCE74 0C00084C */  jal   osSyncPrintf
 /* B34018 800BCE78 24844204 */   addiu $a0, %lo(D_80144204) # addiu $a0, $a0, 0x4204
 /* B3401C 800BCE7C 3C198100 */  lui   $t9, 0x8100
 /* B34020 800BCE80 0320F809 */  jalr  $t9
-/* B34024 800BCE84 00000000 */  nop   
+/* B34024 800BCE84 00000000 */  nop
 /* B34028 800BCE88 3C048014 */  lui   $a0, %hi(D_80144220) # $a0, 0x8014
 /* B3402C 800BCE8C 0C00084C */  jal   osSyncPrintf
 /* B34030 800BCE90 24844220 */   addiu $a0, %lo(D_80144220) # addiu $a0, $a0, 0x4220
@@ -400,7 +400,7 @@ glabel func_800BCA64
 /* B34144 800BCFA4 0C0239A8 */  jal   func_8008E6A0
 /* B34148 800BCFA8 262407B8 */   addiu $a0, $s1, 0x7b8
 /* B3414C 800BCFAC 0C001A78 */  jal   osGetTime
-/* B34150 800BCFB0 00000000 */   nop   
+/* B34150 800BCFB0 00000000 */   nop
 /* B34154 800BCFB4 0C03F668 */  jal   func_800FD9A0
 /* B34158 800BCFB8 00602025 */   move  $a0, $v1
 /* B3415C 800BCFBC 0C034204 */  jal   Matrix_Init
@@ -459,7 +459,7 @@ glabel func_800BCA64
 /* B34228 800BD088 A02F1E5E */  sb    $t7, 0x1e5e($at)
 .L800BD08C:
 /* B3422C 800BD08C 0C02CE42 */  jal   func_800B3908
-/* B34230 800BD090 00000000 */   nop   
+/* B34230 800BD090 00000000 */   nop
 /* B34234 800BD094 3C010001 */  lui   $at, (0x0001241C >> 16) # lui $at, 1
 /* B34238 800BD098 3421241C */  ori   $at, (0x0001241C & 0xFFFF) # ori $at, $at, 0x241c
 /* B3423C 800BD09C 02218021 */  addu  $s0, $s1, $at
@@ -556,7 +556,7 @@ glabel func_800BCA64
 /* B343A0 800BD200 24844268 */  addiu $a0, %lo(D_80144268) # addiu $a0, $a0, 0x4268
 /* B343A4 800BD204 321000FF */  andi  $s0, $s0, 0xff
 /* B343A8 800BD208 12010006 */  beq   $s0, $at, .L800BD224
-/* B343AC 800BD20C 00000000 */   nop   
+/* B343AC 800BD20C 00000000 */   nop
 /* B343B0 800BD210 0C00084C */  jal   osSyncPrintf
 /* B343B4 800BD214 02002825 */   move  $a1, $s0
 /* B343B8 800BD218 8FA40038 */  lw    $a0, 0x38($sp)
diff --git a/asm/non_matchings/code/z_play/func_800BD314.s b/asm/non_matchings/code/z_play/func_800BD314.s
index 57a45d94b5..25170f5a22 100644
--- a/asm/non_matchings/code/z_play/func_800BD314.s
+++ b/asm/non_matchings/code/z_play/func_800BD314.s
@@ -389,7 +389,7 @@ glabel func_800BD314
 /* B344CC 800BD32C 844E00D6 */  lh    $t6, 0xd6($v0)
 /* B344D0 800BD330 00808025 */  move  $s0, $a0
 /* B344D4 800BD334 05C00004 */  bltz  $t6, .L800BD348
-/* B344D8 800BD338 00000000 */   nop   
+/* B344D8 800BD338 00000000 */   nop
 /* B344DC 800BD33C 844F0554 */  lh    $t7, 0x554($v0)
 /* B344E0 800BD340 51E00006 */  beql  $t7, $zero, .L800BD35C
 /* B344E4 800BD344 84581074 */   lh    $t8, 0x1074($v0)
@@ -494,11 +494,11 @@ glabel func_800BD314
 /* B34654 800BD4B4 0C0239AB */  jal   func_8008E6AC
 /* B34658 800BD4B8 AC590008 */   sw    $t9, 8($v0)
 /* B3465C 800BD4BC 1040059C */  beqz  $v0, .L800BEB30
-/* B34660 800BD4C0 00000000 */   nop   
+/* B34660 800BD4C0 00000000 */   nop
 /* B34664 800BD4C4 9229241B */  lbu   $t1, 0x241b($s1)
 /* B34668 800BD4C8 3C028016 */  lui   $v0, %hi(D_80161490) # $v0, 0x8016
 /* B3466C 800BD4CC 15200007 */  bnez  $t1, .L800BD4EC
-/* B34670 800BD4D0 00000000 */   nop   
+/* B34670 800BD4D0 00000000 */   nop
 /* B34674 800BD4D4 822A1E15 */  lb    $t2, 0x1e15($s1)
 /* B34678 800BD4D8 3C010001 */  lui   $at, 1
 /* B3467C 800BD4DC 00300821 */  addu  $at, $at, $s0
@@ -550,7 +550,7 @@ glabel func_800BD314
 .L800BD580:
 /* B34720 800BD580 24010001 */  li    $at, 1
 /* B34724 800BD584 108002F0 */  beqz  $a0, .L800BE148
-/* B34728 800BD588 00000000 */   nop   
+/* B34728 800BD588 00000000 */   nop
 /* B3472C 800BD58C 10810008 */  beq   $a0, $at, .L800BD5B0
 /* B34730 800BD590 00801025 */   move  $v0, $a0
 /* B34734 800BD594 24010002 */  li    $at, 2
@@ -565,7 +565,7 @@ glabel func_800BD314
 /* B34754 800BD5B4 2401FFEC */  li    $at, -20
 /* B34758 800BD5B8 24040001 */  li    $a0, 1
 /* B3475C 800BD5BC 1301002C */  beq   $t8, $at, .L800BD670
-/* B34760 800BD5C0 00000000 */   nop   
+/* B34760 800BD5C0 00000000 */   nop
 /* B34764 800BD5C4 0C020978 */  jal   Interface_ChangeAlpha
 /* B34768 800BD5C8 A7A0006E */   sh    $zero, 0x6e($sp)
 /* B3476C 800BD5CC 3C038016 */  lui   $v1, %hi(gSaveContext+8) # $v1, 0x8016
@@ -589,15 +589,15 @@ glabel func_800BD314
 /* B347B0 800BD610 958C81C2 */  lhu   $t4, %lo(gEntranceTable+2)($t4)
 /* B347B4 800BD614 318D8000 */  andi  $t5, $t4, 0x8000
 /* B347B8 800BD618 15A00015 */  bnez  $t5, .L800BD670
-/* B347BC 800BD61C 00000000 */   nop   
+/* B347BC 800BD61C 00000000 */   nop
 /* B347C0 800BD620 0C00084C */  jal   osSyncPrintf
 /* B347C4 800BD624 2484431C */   addiu $a0, %lo(D_8014431C) # addiu $a0, $a0, 0x431c
 /* B347C8 800BD628 922E1E5E */  lbu   $t6, 0x1e5e($s1)
 /* B347CC 800BD62C 29C10038 */  slti  $at, $t6, 0x38
 /* B347D0 800BD630 1020000F */  beqz  $at, .L800BD670
-/* B347D4 800BD634 00000000 */   nop   
+/* B347D4 800BD634 00000000 */   nop
 /* B347D8 800BD638 0C01DD80 */  jal   func_80077600
-/* B347DC 800BD63C 00000000 */   nop   
+/* B347DC 800BD63C 00000000 */   nop
 /* B347E0 800BD640 1440000B */  bnez  $v0, .L800BD670
 /* B347E4 800BD644 3C048014 */   lui   $a0, %hi(D_80144340) # $a0, 0x8014
 /* B347E8 800BD648 0C00084C */  jal   osSyncPrintf
@@ -616,7 +616,7 @@ glabel func_800BD314
 /* B34818 800BD678 02002025 */  move  $a0, $s0
 /* B3481C 800BD67C 8459086A */  lh    $t9, 0x86a($v0)
 /* B34820 800BD680 17200006 */  bnez  $t9, .L800BD69C
-/* B34824 800BD684 00000000 */   nop   
+/* B34824 800BD684 00000000 */   nop
 /* B34828 800BD688 02002025 */  move  $a0, $s0
 /* B3482C 800BD68C 0C02F178 */  jal   func_800BC5E0
 /* B34830 800BD690 92251E5E */   lbu   $a1, 0x1e5e($s1)
@@ -636,17 +636,17 @@ glabel func_800BD314
 /* B3485C 800BD6BC AFA40040 */  sw    $a0, 0x40($sp)
 /* B34860 800BD6C0 8E3923F4 */  lw    $t9, 0x23f4($s1)
 /* B34864 800BD6C4 0320F809 */  jalr  $t9
-/* B34868 800BD6C8 00000000 */  nop   
+/* B34868 800BD6C8 00000000 */  nop
 /* B3486C 800BD6CC 8E2323F0 */  lw    $v1, 0x23f0($s1)
 /* B34870 800BD6D0 24010001 */  li    $at, 1
 /* B34874 800BD6D4 00034943 */  sra   $t1, $v1, 5
 /* B34878 800BD6D8 15210006 */  bne   $t1, $at, .L800BD6F4
-/* B3487C 800BD6DC 00000000 */   nop   
+/* B3487C 800BD6DC 00000000 */   nop
 /* B34880 800BD6E0 8E392408 */  lw    $t9, 0x2408($s1)
 /* B34884 800BD6E4 8FA40040 */  lw    $a0, 0x40($sp)
 /* B34888 800BD6E8 34650080 */  ori   $a1, $v1, 0x80
 /* B3488C 800BD6EC 0320F809 */  jalr  $t9
-/* B34890 800BD6F0 00000000 */  nop   
+/* B34890 800BD6F0 00000000 */  nop
 .L800BD6F4:
 /* B34894 800BD6F4 3C028016 */  lui   $v0, %hi(gSaveContext) # $v0, 0x8016
 /* B34898 800BD6F8 2442E660 */  addiu $v0, %lo(gSaveContext) # addiu $v0, $v0, -0x19a0
@@ -760,7 +760,7 @@ glabel func_800BD314
 /* B34A1C 800BD87C 8FA40040 */  lw    $a0, 0x40($sp)
 /* B34A20 800BD880 00002825 */  move  $a1, $zero
 /* B34A24 800BD884 0320F809 */  jalr  $t9
-/* B34A28 800BD888 00000000 */  nop   
+/* B34A28 800BD888 00000000 */  nop
 /* B34A2C 800BD88C 8E222410 */  lw    $v0, 0x2410($s1)
 /* B34A30 800BD890 8FA40040 */  lw    $a0, 0x40($sp)
 /* B34A34 800BD894 50400004 */  beql  $v0, $zero, .L800BD8A8
@@ -776,7 +776,7 @@ glabel func_800BD314
 /* B34A58 800BD8B8 8FA40040 */  lw    $a0, 0x40($sp)
 /* B34A5C 800BD8BC 24050001 */  li    $a1, 1
 /* B34A60 800BD8C0 0320F809 */  jalr  $t9
-/* B34A64 800BD8C4 00000000 */  nop   
+/* B34A64 800BD8C4 00000000 */  nop
 /* B34A68 800BD8C8 10000007 */  b     .L800BD8E8
 /* B34A6C 800BD8CC 8E392404 */   lw    $t9, 0x2404($s1)
 /* B34A70 800BD8D0 8E392408 */  lw    $t9, 0x2408($s1)
@@ -784,12 +784,12 @@ glabel func_800BD314
 /* B34A74 800BD8D4 8FA40040 */  lw    $a0, 0x40($sp)
 /* B34A78 800BD8D8 24050002 */  li    $a1, 2
 /* B34A7C 800BD8DC 0320F809 */  jalr  $t9
-/* B34A80 800BD8E0 00000000 */  nop   
+/* B34A80 800BD8E0 00000000 */  nop
 /* B34A84 800BD8E4 8E392404 */  lw    $t9, 0x2404($s1)
 .L800BD8E8:
 /* B34A88 800BD8E8 8FA40040 */  lw    $a0, 0x40($sp)
 /* B34A8C 800BD8EC 0320F809 */  jalr  $t9
-/* B34A90 800BD8F0 00000000 */  nop   
+/* B34A90 800BD8F0 00000000 */  nop
 /* B34A94 800BD8F4 8E2923F0 */  lw    $t1, 0x23f0($s1)
 /* B34A98 800BD8F8 2401000D */  li    $at, 13
 /* B34A9C 800BD8FC 240A000B */  li    $t2, 11
@@ -813,7 +813,7 @@ glabel func_800BD314
 /* B34AD8 800BD938 AFA40040 */  sw    $a0, 0x40($sp)
 /* B34ADC 800BD93C 8E392414 */  lw    $t9, 0x2414($s1)
 /* B34AE0 800BD940 0320F809 */  jalr  $t9
-/* B34AE4 800BD944 00000000 */  nop   
+/* B34AE4 800BD944 00000000 */  nop
 /* B34AE8 800BD948 1040004F */  beqz  $v0, .L800BDA88
 /* B34AEC 800BD94C 3C098016 */   lui   $t1, %hi(gGameInfo)
 /* B34AF0 800BD950 8E2C23F0 */  lw    $t4, 0x23f0($s1)
@@ -827,7 +827,7 @@ glabel func_800BD314
 /* B34B10 800BD970 8E3923F8 */  lw    $t9, 0x23f8($s1)
 /* B34B14 800BD974 8FA40040 */  lw    $a0, 0x40($sp)
 /* B34B18 800BD978 0320F809 */  jalr  $t9
-/* B34B1C 800BD97C 00000000 */  nop   
+/* B34B1C 800BD97C 00000000 */  nop
 /* B34B20 800BD980 0C02F223 */  jal   func_800BC88C
 /* B34B24 800BD984 02002025 */   move  $a0, $s0
 /* B34B28 800BD988 3C010001 */  lui   $at, 1
@@ -873,7 +873,7 @@ glabel func_800BD314
 .L800BDA20:
 /* B34BC0 800BDA20 8FA40040 */  lw    $a0, 0x40($sp)
 /* B34BC4 800BDA24 0320F809 */  jalr  $t9
-/* B34BC8 800BDA28 00000000 */  nop   
+/* B34BC8 800BDA28 00000000 */  nop
 /* B34BCC 800BDA2C 0C02F223 */  jal   func_800BC88C
 /* B34BD0 800BDA30 02002025 */   move  $a0, $s0
 /* B34BD4 800BDA34 3C010001 */  lui   $at, 1
@@ -917,7 +917,7 @@ glabel func_800BD314
 /* B34C54 800BDAB4 002A0821 */  addu  $at, $at, $t2
 /* B34C58 800BDAB8 8C2A49D0 */  lw    $t2, %lo(jtbl_801449D0)($at)
 /* B34C5C 800BDABC 01400008 */  jr    $t2
-/* B34C60 800BDAC0 00000000 */   nop   
+/* B34C60 800BDAC0 00000000 */   nop
 glabel L800BDAC4
 /* B34C64 800BDAC4 3C038016 */  lui   $v1, %hi(D_801614C8) # $v1, 0x8016
 /* B34C68 800BDAC8 246314C8 */  addiu $v1, %lo(D_801614C8) # addiu $v1, $v1, 0x14c8
@@ -965,10 +965,10 @@ glabel L800BDB30
 /* B34D08 800BDB68 460A4402 */  mul.s $f16, $f8, $f10
 /* B34D0C 800BDB6C 4449F800 */  cfc1  $t1, $31
 /* B34D10 800BDB70 44D9F800 */  ctc1  $t9, $31
-/* B34D14 800BDB74 00000000 */  nop   
+/* B34D14 800BDB74 00000000 */  nop
 /* B34D18 800BDB78 460084A4 */  cvt.w.s $f18, $f16
 /* B34D1C 800BDB7C 4459F800 */  cfc1  $t9, $31
-/* B34D20 800BDB80 00000000 */  nop   
+/* B34D20 800BDB80 00000000 */  nop
 /* B34D24 800BDB84 33390078 */  andi  $t9, $t9, 0x78
 /* B34D28 800BDB88 53200013 */  beql  $t9, $zero, .L800BDBD8
 /* B34D2C 800BDB8C 44199000 */   mfc1  $t9, $f18
@@ -976,13 +976,13 @@ glabel L800BDB30
 /* B34D34 800BDB94 24190001 */  li    $t9, 1
 /* B34D38 800BDB98 46128481 */  sub.s $f18, $f16, $f18
 /* B34D3C 800BDB9C 44D9F800 */  ctc1  $t9, $31
-/* B34D40 800BDBA0 00000000 */  nop   
+/* B34D40 800BDBA0 00000000 */  nop
 /* B34D44 800BDBA4 460094A4 */  cvt.w.s $f18, $f18
 /* B34D48 800BDBA8 4459F800 */  cfc1  $t9, $31
-/* B34D4C 800BDBAC 00000000 */  nop   
+/* B34D4C 800BDBAC 00000000 */  nop
 /* B34D50 800BDBB0 33390078 */  andi  $t9, $t9, 0x78
 /* B34D54 800BDBB4 17200005 */  bnez  $t9, .L800BDBCC
-/* B34D58 800BDBB8 00000000 */   nop   
+/* B34D58 800BDBB8 00000000 */   nop
 /* B34D5C 800BDBBC 44199000 */  mfc1  $t9, $f18
 /* B34D60 800BDBC0 3C018000 */  lui   $at, 0x8000
 /* B34D64 800BDBC4 10000007 */  b     .L800BDBE4
@@ -992,9 +992,9 @@ glabel L800BDB30
 /* B34D70 800BDBD0 2419FFFF */   li    $t9, -1
 /* B34D74 800BDBD4 44199000 */  mfc1  $t9, $f18
 .L800BDBD8:
-/* B34D78 800BDBD8 00000000 */  nop   
+/* B34D78 800BDBD8 00000000 */  nop
 /* B34D7C 800BDBDC 0720FFFB */  bltz  $t9, .L800BDBCC
-/* B34D80 800BDBE0 00000000 */   nop   
+/* B34D80 800BDBE0 00000000 */   nop
 .L800BDBE4:
 /* B34D84 800BDBE4 A2390B09 */  sb    $t9, 0xb09($s1)
 /* B34D88 800BDBE8 84620000 */  lh    $v0, ($v1)
@@ -1041,10 +1041,10 @@ glabel L800BDC40
 /* B34E24 800BDC84 46049182 */  mul.s $f6, $f18, $f4
 /* B34E28 800BDC88 444EF800 */  cfc1  $t6, $31
 /* B34E2C 800BDC8C 44CFF800 */  ctc1  $t7, $31
-/* B34E30 800BDC90 00000000 */  nop   
+/* B34E30 800BDC90 00000000 */  nop
 /* B34E34 800BDC94 46003224 */  cvt.w.s $f8, $f6
 /* B34E38 800BDC98 444FF800 */  cfc1  $t7, $31
-/* B34E3C 800BDC9C 00000000 */  nop   
+/* B34E3C 800BDC9C 00000000 */  nop
 /* B34E40 800BDCA0 31EF0078 */  andi  $t7, $t7, 0x78
 /* B34E44 800BDCA4 51E00013 */  beql  $t7, $zero, .L800BDCF4
 /* B34E48 800BDCA8 440F4000 */   mfc1  $t7, $f8
@@ -1052,13 +1052,13 @@ glabel L800BDC40
 /* B34E50 800BDCB0 240F0001 */  li    $t7, 1
 /* B34E54 800BDCB4 46083201 */  sub.s $f8, $f6, $f8
 /* B34E58 800BDCB8 44CFF800 */  ctc1  $t7, $31
-/* B34E5C 800BDCBC 00000000 */  nop   
+/* B34E5C 800BDCBC 00000000 */  nop
 /* B34E60 800BDCC0 46004224 */  cvt.w.s $f8, $f8
 /* B34E64 800BDCC4 444FF800 */  cfc1  $t7, $31
-/* B34E68 800BDCC8 00000000 */  nop   
+/* B34E68 800BDCC8 00000000 */  nop
 /* B34E6C 800BDCCC 31EF0078 */  andi  $t7, $t7, 0x78
 /* B34E70 800BDCD0 15E00005 */  bnez  $t7, .L800BDCE8
-/* B34E74 800BDCD4 00000000 */   nop   
+/* B34E74 800BDCD4 00000000 */   nop
 /* B34E78 800BDCD8 440F4000 */  mfc1  $t7, $f8
 /* B34E7C 800BDCDC 3C018000 */  lui   $at, 0x8000
 /* B34E80 800BDCE0 10000007 */  b     .L800BDD00
@@ -1068,9 +1068,9 @@ glabel L800BDC40
 /* B34E8C 800BDCEC 240FFFFF */   li    $t7, -1
 /* B34E90 800BDCF0 440F4000 */  mfc1  $t7, $f8
 .L800BDCF4:
-/* B34E94 800BDCF4 00000000 */  nop   
+/* B34E94 800BDCF4 00000000 */  nop
 /* B34E98 800BDCF8 05E0FFFB */  bltz  $t7, .L800BDCE8
-/* B34E9C 800BDCFC 00000000 */   nop   
+/* B34E9C 800BDCFC 00000000 */   nop
 .L800BDD00:
 /* B34EA0 800BDD00 A22F0B09 */  sb    $t7, 0xb09($s1)
 /* B34EA4 800BDD04 84620000 */  lh    $v0, ($v1)
@@ -1221,7 +1221,7 @@ glabel L800BDEE0
 /* B350C4 800BDF24 3C188016 */  lui   $t8, %hi(gGameInfo) # $t8, 0x8016
 /* B350C8 800BDF28 29C1006E */  slti  $at, $t6, 0x6e
 /* B350CC 800BDF2C 10200086 */  beqz  $at, .L800BE148
-/* B350D0 800BDF30 00000000 */   nop   
+/* B350D0 800BDF30 00000000 */   nop
 /* B350D4 800BDF34 8F18FA90 */  lw    $t8, %lo(gGameInfo)($t8)
 /* B350D8 800BDF38 3C018016 */  lui   $at, %hi(D_80161490) # $at, 0x8016
 /* B350DC 800BDF3C AC201490 */  sw    $zero, %lo(D_80161490)($at)
@@ -1304,7 +1304,7 @@ glabel L800BE034
 /* B35200 800BE060 82381E15 */  lb    $t8, 0x1e15($s1)
 /* B35204 800BE064 2401FFEC */  li    $at, -20
 /* B35208 800BE068 17010037 */  bne   $t8, $at, .L800BE148
-/* B3520C 800BE06C 00000000 */   nop   
+/* B3520C 800BE06C 00000000 */   nop
 /* B35210 800BE070 92290B0B */  lbu   $t1, 0xb0b($s1)
 /* B35214 800BE074 3C018016 */  lui   $at, %hi(D_80161490) # $at, 0x8016
 /* B35218 800BE078 24190003 */  li    $t9, 3
@@ -1342,7 +1342,7 @@ glabel L800BE0F0
 /* B35290 800BE0F0 3C028016 */  lui   $v0, %hi(gSaveContext+0x1410) # $v0, 0x8016
 /* B35294 800BE0F4 9042FA70 */  lbu   $v0, %lo(gSaveContext+0x1410)($v0)
 /* B35298 800BE0F8 10400013 */  beqz  $v0, .L800BE148
-/* B3529C 800BE0FC 00000000 */   nop   
+/* B3529C 800BE0FC 00000000 */   nop
 /* B352A0 800BE100 A2220B09 */  sb    $v0, 0xb09($s1)
 /* B352A4 800BE104 3C0E8016 */  lui   $t6, %hi(gSaveContext+0x1410) # $t6, 0x8016
 /* B352A8 800BE108 91CEFA70 */  lbu   $t6, %lo(gSaveContext+0x1410)($t6)
@@ -1350,7 +1350,7 @@ glabel L800BE0F0
 /* B352B0 800BE110 3C188016 */  lui   $t8, %hi(gGameInfo) # $t8, 0x8016
 /* B352B4 800BE114 29C10065 */  slti  $at, $t6, 0x65
 /* B352B8 800BE118 1020000B */  beqz  $at, .L800BE148
-/* B352BC 800BE11C 00000000 */   nop   
+/* B352BC 800BE11C 00000000 */   nop
 /* B352C0 800BE120 8F18FA90 */  lw    $t8, %lo(gGameInfo)($t8)
 /* B352C4 800BE124 3C018016 */  lui   $at, %hi(D_80161490) # $at, 0x8016
 /* B352C8 800BE128 AC201490 */  sw    $zero, %lo(D_80161490)($at)
@@ -1367,7 +1367,7 @@ glabel L800BE148
 /* B352EC 800BE14C 8D29FA90 */  lw    $t1, %lo(gGameInfo)($t1)
 /* B352F0 800BE150 85241052 */  lh    $a0, 0x1052($t1)
 /* B352F4 800BE154 1080000C */  beqz  $a0, .L800BE188
-/* B352F8 800BE158 00000000 */   nop   
+/* B352F8 800BE158 00000000 */   nop
 /* B352FC 800BE15C 3C048014 */  lui   $a0, %hi(D_801443B0) # $a0, 0x8014
 /* B35300 800BE160 248443B0 */  addiu $a0, %lo(D_801443B0) # addiu $a0, $a0, 0x43b0
 /* B35304 800BE164 0C000B84 */  jal   LogUtils_LogThreadId
@@ -1384,7 +1384,7 @@ glabel L800BE148
 /* B3532C 800BE18C 8C421490 */  lw    $v0, %lo(D_80161490)($v0)
 /* B35330 800BE190 24010003 */  li    $at, 3
 /* B35334 800BE194 10410276 */  beq   $v0, $at, .L800BEB70
-/* B35338 800BE198 00000000 */   nop   
+/* B35338 800BE198 00000000 */   nop
 /* B3533C 800BE19C 10800008 */  beqz  $a0, .L800BE1C0
 /* B35340 800BE1A0 3C048014 */   lui   $a0, %hi(D_801443C4) # $a0, 0x8014
 /* B35344 800BE1A4 248443C4 */  addiu $a0, %lo(D_801443C4) # addiu $a0, $a0, 0x43c4
@@ -1398,13 +1398,13 @@ glabel L800BE148
 /* B35360 800BE1C0 3C0A8016 */  lui   $t2, %hi(gSaveContext+0x135c) # $t2, 0x8016
 /* B35364 800BE1C4 8D4AF9BC */  lw    $t2, %lo(gSaveContext+0x135c)($t2)
 /* B35368 800BE1C8 15400009 */  bnez  $t2, .L800BE1F0
-/* B3536C 800BE1CC 00000000 */   nop   
+/* B3536C 800BE1CC 00000000 */   nop
 /* B35370 800BE1D0 922B03DC */  lbu   $t3, 0x3dc($s1)
 /* B35374 800BE1D4 15600006 */  bnez  $t3, .L800BE1F0
-/* B35378 800BE1D8 00000000 */   nop   
+/* B35378 800BE1D8 00000000 */   nop
 /* B3537C 800BE1DC 962C0A20 */  lhu   $t4, 0xa20($s1)
 /* B35380 800BE1E0 15800003 */  bnez  $t4, .L800BE1F0
-/* B35384 800BE1E4 00000000 */   nop   
+/* B35384 800BE1E4 00000000 */   nop
 /* B35388 800BE1E8 0C01BA8C */  jal   func_8006EA30
 /* B3538C 800BE1EC 02002025 */   move  $a0, $s0
 .L800BE1F0:
@@ -1428,7 +1428,7 @@ glabel L800BE148
 .L800BE234:
 /* B353D4 800BE234 0003182B */  sltu  $v1, $zero, $v1
 /* B353D8 800BE238 14600003 */  bnez  $v1, .L800BE248
-/* B353DC 800BE23C 00000000 */   nop   
+/* B353DC 800BE23C 00000000 */   nop
 /* B353E0 800BE240 96230936 */  lhu   $v1, 0x936($s1)
 /* B353E4 800BE244 0003182B */  sltu  $v1, $zero, $v1
 .L800BE248:
@@ -1449,7 +1449,7 @@ glabel L800BE148
 /* B3541C 800BE27C 34210B20 */  ori   $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20
 /* B35420 800BE280 02012021 */  addu  $a0, $s0, $at
 /* B35424 800BE284 AFA40034 */  sw    $a0, 0x34($sp)
-/* B35428 800BE288 0C028CBB */  jal   func_800A32EC
+/* B35428 800BE288 0C028CBB */  jal   SkelAnime_AnimationCtxReset
 /* B3542C 800BE28C AFA30050 */   sw    $v1, 0x50($sp)
 /* B35430 800BE290 3C0F8016 */  lui   $t7, %hi(gGameInfo) # $t7, 0x8016
 /* B35434 800BE294 8DEFFA90 */  lw    $t7, %lo(gGameInfo)($t7)
@@ -1493,7 +1493,7 @@ glabel L800BE148
 /* B354C4 800BE324 8C42FA90 */  lw    $v0, %lo(gGameInfo)($v0)
 /* B354C8 800BE328 844A0764 */  lh    $t2, 0x764($v0)
 /* B354CC 800BE32C 154000E9 */  bnez  $t2, .L800BE6D4
-/* B354D0 800BE330 00000000 */   nop   
+/* B354D0 800BE330 00000000 */   nop
 /* B354D4 800BE334 84441052 */  lh    $a0, 0x1052($v0)
 /* B354D8 800BE338 24050DFC */  li    $a1, 3580
 /* B354DC 800BE33C 10800007 */  beqz  $a0, .L800BE35C
@@ -1654,7 +1654,7 @@ glabel L800BE148
 .L800BE584:
 /* B35724 800BE584 02002025 */  move  $a0, $s0
 /* B35728 800BE588 15E00003 */  bnez  $t7, .L800BE598
-/* B3572C 800BE58C 00000000 */   nop   
+/* B3572C 800BE58C 00000000 */   nop
 /* B35730 800BE590 0C00C18C */  jal   Actor_UpdateAll
 /* B35734 800BE594 26051C24 */   addiu $a1, $s0, 0x1c24
 .L800BE598:
@@ -1698,7 +1698,7 @@ glabel L800BE148
 /* B357C4 800BE624 248444E8 */  addiu $a0, %lo(D_801444E8) # addiu $a0, $a0, 0x44e8
 /* B357C8 800BE628 854B1052 */  lh    $t3, 0x1052($t2)
 /* B357CC 800BE62C 11600007 */  beqz  $t3, .L800BE64C
-/* B357D0 800BE630 00000000 */   nop   
+/* B357D0 800BE630 00000000 */   nop
 /* B357D4 800BE634 0C000B84 */  jal   LogUtils_LogThreadId
 /* B357D8 800BE638 24050E43 */   li    $a1, 3651
 /* B357DC 800BE63C 3C048014 */  lui   $a0, %hi(D_801444F4) # $a0, 0x8014
@@ -1714,7 +1714,7 @@ glabel L800BE148
 /* B35800 800BE660 248444FC */  addiu $a0, %lo(D_801444FC) # addiu $a0, $a0, 0x44fc
 /* B35804 800BE664 858D1052 */  lh    $t5, 0x1052($t4)
 /* B35808 800BE668 11A00007 */  beqz  $t5, .L800BE688
-/* B3580C 800BE66C 00000000 */   nop   
+/* B3580C 800BE66C 00000000 */   nop
 /* B35810 800BE670 0C000B84 */  jal   LogUtils_LogThreadId
 /* B35814 800BE674 24050E49 */   li    $a1, 3657
 /* B35818 800BE678 3C048014 */  lui   $a0, %hi(D_80144508) # $a0, 0x8014
@@ -1729,7 +1729,7 @@ glabel L800BE148
 /* B35838 800BE698 24050E4E */  li    $a1, 3662
 /* B3583C 800BE69C 85C41052 */  lh    $a0, 0x1052($t6)
 /* B35840 800BE6A0 10800015 */  beqz  $a0, .L800BE6F8
-/* B35844 800BE6A4 00000000 */   nop   
+/* B35844 800BE6A4 00000000 */   nop
 /* B35848 800BE6A8 3C048014 */  lui   $a0, %hi(D_80144510) # $a0, 0x8014
 /* B3584C 800BE6AC 0C000B84 */  jal   LogUtils_LogThreadId
 /* B35850 800BE6B0 24844510 */   addiu $a0, %lo(D_80144510) # addiu $a0, $a0, 0x4510
@@ -1802,25 +1802,25 @@ glabel L800BE148
 .L800BE7AC:
 /* B3594C 800BE7AC 922D242B */  lbu   $t5, 0x242b($s1)
 /* B35950 800BE7B0 11A00034 */  beqz  $t5, .L800BE884
-/* B35954 800BE7B4 00000000 */   nop   
+/* B35954 800BE7B4 00000000 */   nop
 /* B35958 800BE7B8 8FAE0044 */  lw    $t6, 0x44($sp)
 /* B3595C 800BE7BC 2401FFF7 */  li    $at, -9
 /* B35960 800BE7C0 95CF000C */  lhu   $t7, 0xc($t6)
 /* B35964 800BE7C4 01E1C027 */  nor   $t8, $t7, $at
 /* B35968 800BE7C8 1700002C */  bnez  $t8, .L800BE87C
-/* B3596C 800BE7CC 00000000 */   nop   
+/* B3596C 800BE7CC 00000000 */   nop
 /* B35970 800BE7D0 96290934 */  lhu   $t1, 0x934($s1)
 /* B35974 800BE7D4 3C048014 */  lui   $a0, %hi(D_80144560) # $a0, 0x8014
 /* B35978 800BE7D8 15200004 */  bnez  $t1, .L800BE7EC
-/* B3597C 800BE7DC 00000000 */   nop   
+/* B3597C 800BE7DC 00000000 */   nop
 /* B35980 800BE7E0 96390936 */  lhu   $t9, 0x936($s1)
 /* B35984 800BE7E4 13200005 */  beqz  $t9, .L800BE7FC
-/* B35988 800BE7E8 00000000 */   nop   
+/* B35988 800BE7E8 00000000 */   nop
 .L800BE7EC:
 /* B3598C 800BE7EC 0C00084C */  jal   osSyncPrintf
 /* B35990 800BE7F0 24844560 */   addiu $a0, %lo(D_80144560) # addiu $a0, $a0, 0x4560
 /* B35994 800BE7F4 10000021 */  b     .L800BE87C
-/* B35998 800BE7F8 00000000 */   nop   
+/* B35998 800BE7F8 00000000 */   nop
 .L800BE7FC:
 /* B3599C 800BE7FC 0C023A62 */  jal   func_8008E988
 /* B359A0 800BE800 02002025 */   move  $a0, $s0
@@ -1830,7 +1830,7 @@ glabel L800BE148
 /* B359B0 800BE810 0C00084C */  jal   osSyncPrintf
 /* B359B4 800BE814 2484459C */   addiu $a0, %lo(D_8014459C) # addiu $a0, $a0, 0x459c
 /* B359B8 800BE818 10000018 */  b     .L800BE87C
-/* B359BC 800BE81C 00000000 */   nop   
+/* B359BC 800BE81C 00000000 */   nop
 .L800BE820:
 /* B359C0 800BE820 8D4AFA90 */  lw    $t2, %lo(gGameInfo)($t2)
 /* B359C4 800BE824 24010010 */  li    $at, 16
@@ -1848,7 +1848,7 @@ glabel L800BE148
 /* B359F4 800BE854 0C03DCE3 */  jal   Audio_PlaySoundGeneral
 /* B359F8 800BE858 AFA70010 */   sw    $a3, 0x10($sp)
 /* B359FC 800BE85C 10000007 */  b     .L800BE87C
-/* B35A00 800BE860 00000000 */   nop   
+/* B35A00 800BE860 00000000 */   nop
 .L800BE864:
 /* B35A04 800BE864 9225242B */  lbu   $a1, 0x242b($s1)
 /* B35A08 800BE868 02002025 */  move  $a0, $s0
@@ -1894,7 +1894,7 @@ glabel L800BE148
 /* B35A9C 800BE8FC 96380934 */  lhu   $t8, 0x934($s1)
 .L800BE900:
 /* B35AA0 800BE900 17000004 */  bnez  $t8, .L800BE914
-/* B35AA4 800BE904 00000000 */   nop   
+/* B35AA4 800BE904 00000000 */   nop
 /* B35AA8 800BE908 96290936 */  lhu   $t1, 0x936($s1)
 /* B35AAC 800BE90C 5120000F */  beql  $t1, $zero, .L800BE94C
 /* B35AB0 800BE910 96390A20 */   lhu   $t9, 0xa20($s1)
@@ -1912,11 +1912,11 @@ glabel L800BE148
 /* B35AD8 800BE938 0C02F05A */  jal   KaleidoScopeCall_Update
 /* B35ADC 800BE93C 02002025 */   move  $a0, $s0
 /* B35AE0 800BE940 1000001C */  b     .L800BE9B4
-/* B35AE4 800BE944 00000000 */   nop   
+/* B35AE4 800BE944 00000000 */   nop
 /* B35AE8 800BE948 96390A20 */  lhu   $t9, 0xa20($s1)
 .L800BE94C:
 /* B35AEC 800BE94C 1320000E */  beqz  $t9, .L800BE988
-/* B35AF0 800BE950 00000000 */   nop   
+/* B35AF0 800BE950 00000000 */   nop
 /* B35AF4 800BE954 10800008 */  beqz  $a0, .L800BE978
 /* B35AF8 800BE958 24050E8F */   li    $a1, 3727
 /* B35AFC 800BE95C 3C048014 */  lui   $a0, %hi(D_80144608) # $a0, 0x8014
@@ -1930,7 +1930,7 @@ glabel L800BE148
 /* B35B18 800BE978 0C044132 */  jal   func_801104C8
 /* B35B1C 800BE97C 02002025 */   move  $a0, $s0
 /* B35B20 800BE980 1000000C */  b     .L800BE9B4
-/* B35B24 800BE984 00000000 */   nop   
+/* B35B24 800BE984 00000000 */   nop
 .L800BE988:
 /* B35B28 800BE988 10800008 */  beqz  $a0, .L800BE9AC
 /* B35B2C 800BE98C 24050E95 */   li    $a1, 3733
@@ -1950,7 +1950,7 @@ glabel L800BE148
 /* B35B5C 800BE9BC 24050E99 */  li    $a1, 3737
 /* B35B60 800BE9C0 85441052 */  lh    $a0, 0x1052($t2)
 /* B35B64 800BE9C4 1080000B */  beqz  $a0, .L800BE9F4
-/* B35B68 800BE9C8 00000000 */   nop   
+/* B35B68 800BE9C8 00000000 */   nop
 /* B35B6C 800BE9CC 3C048014 */  lui   $a0, %hi(D_80144630) # $a0, 0x8014
 /* B35B70 800BE9D0 0C000B84 */  jal   LogUtils_LogThreadId
 /* B35B74 800BE9D4 24844630 */   addiu $a0, %lo(D_80144630) # addiu $a0, $a0, 0x4630
@@ -1997,7 +1997,7 @@ glabel L800BE148
 /* B35C0C 800BEA6C 2484466C */  addiu $a0, %lo(D_8014466C) # addiu $a0, $a0, 0x466c
 /* B35C10 800BEA70 85CF1052 */  lh    $t7, 0x1052($t6)
 /* B35C14 800BEA74 11E00007 */  beqz  $t7, .L800BEA94
-/* B35C18 800BEA78 00000000 */   nop   
+/* B35C18 800BEA78 00000000 */   nop
 /* B35C1C 800BEA7C 0C000B84 */  jal   LogUtils_LogThreadId
 /* B35C20 800BEA80 24050EBB */   li    $a1, 3771
 /* B35C24 800BEA84 3C048014 */  lui   $a0, %hi(D_80144678) # $a0, 0x8014
@@ -2013,7 +2013,7 @@ glabel L800BE148
 /* B35C48 800BEAA8 24844680 */  addiu $a0, %lo(D_80144680) # addiu $a0, $a0, 0x4680
 /* B35C4C 800BEAAC 84581052 */  lh    $t8, 0x1052($v0)
 /* B35C50 800BEAB0 13000009 */  beqz  $t8, .L800BEAD8
-/* B35C54 800BEAB4 00000000 */   nop   
+/* B35C54 800BEAB4 00000000 */   nop
 /* B35C58 800BEAB8 0C000B84 */  jal   LogUtils_LogThreadId
 /* B35C5C 800BEABC 24050EC1 */   li    $a1, 3777
 /* B35C60 800BEAC0 3C048014 */  lui   $a0, %hi(D_8014468C) # $a0, 0x8014
@@ -2051,7 +2051,7 @@ glabel L800BE148
 /* B35CD4 800BEB34 8F39FA90 */  lw    $t9, %lo(gGameInfo)($t9)
 /* B35CD8 800BEB38 87241052 */  lh    $a0, 0x1052($t9)
 /* B35CDC 800BEB3C 1080000C */  beqz  $a0, .L800BEB70
-/* B35CE0 800BEB40 00000000 */   nop   
+/* B35CE0 800BEB40 00000000 */   nop
 /* B35CE4 800BEB44 3C048014 */  lui   $a0, %hi(D_801446A8) # $a0, 0x8014
 /* B35CE8 800BEB48 248446A8 */  addiu $a0, %lo(D_801446A8) # addiu $a0, $a0, 0x46a8
 /* B35CEC 800BEB4C 0C000B84 */  jal   LogUtils_LogThreadId
@@ -2079,7 +2079,7 @@ glabel L800BE148
 /* B35D3C 800BEB9C 3C0C8012 */   lui   $t4, %hi(D_8011D394) # $t4, 0x8012
 /* B35D40 800BEBA0 8D8CD394 */  lw    $t4, %lo(D_8011D394)($t4)
 /* B35D44 800BEBA4 11800044 */  beqz  $t4, .L800BECB8
-/* B35D48 800BEBA8 00000000 */   nop   
+/* B35D48 800BEBA8 00000000 */   nop
 .L800BEBAC:
 /* B35D4C 800BEBAC 860D07A0 */  lh    $t5, 0x7a0($s0)
 /* B35D50 800BEBB0 3C0E8016 */  lui   $t6, %hi(gGameInfo) # $t6, 0x8016
@@ -2134,7 +2134,7 @@ glabel L800BE148
 .L800BEC64:
 /* B35E04 800BEC64 24010004 */  li    $at, 4
 /* B35E08 800BEC68 1461FFE1 */  bne   $v1, $at, .L800BEBF0
-/* B35E0C 800BEC6C 00000000 */   nop   
+/* B35E0C 800BEC6C 00000000 */   nop
 /* B35E10 800BEC70 0006C880 */  sll   $t9, $a2, 2
 /* B35E14 800BEC74 02195021 */  addu  $t2, $s0, $t9
 /* B35E18 800BEC78 8D450790 */  lw    $a1, 0x790($t2)
@@ -2146,7 +2146,7 @@ glabel L800BE148
 /* B35E30 800BEC90 248446F8 */  addiu $a0, %lo(D_801446F8) # addiu $a0, $a0, 0x46f8
 /* B35E34 800BEC94 856C1052 */  lh    $t4, 0x1052($t3)
 /* B35E38 800BEC98 11800007 */  beqz  $t4, .L800BECB8
-/* B35E3C 800BEC9C 00000000 */   nop   
+/* B35E3C 800BEC9C 00000000 */   nop
 /* B35E40 800BECA0 0C000B84 */  jal   LogUtils_LogThreadId
 /* B35E44 800BECA4 24050EE6 */   li    $a1, 3814
 /* B35E48 800BECA8 3C048014 */  lui   $a0, %hi(D_80144704) # $a0, 0x8014
diff --git a/data/z_skelanime.bss.s b/data/z_skelanime.bss.s
deleted file mode 100644
index 4bab651776..0000000000
--- a/data/z_skelanime.bss.s
+++ /dev/null
@@ -1,11 +0,0 @@
-.include "macro.inc"
-
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purposee registers
-
-.section .bss
-
-glabel D_801600B0
-    .space 0x10
diff --git a/data/z_skelanime.data.s b/data/z_skelanime.data.s
deleted file mode 100644
index bfb86bc3c6..0000000000
--- a/data/z_skelanime.data.s
+++ /dev/null
@@ -1,14 +0,0 @@
-.include "macro.inc"
-
-# assembler directives
-.set noat      # allow manual use of $at
-.set noreorder # don't insert nops after branches
-.set gp=64     # allow use of 64-bit general purposee registers
-
-.section .data
-
-glabel D_8012A480
-    .incbin "baserom.z64", 0xBA1620, 0x4
-
-glabel D_8012A484
-    .incbin "baserom.z64", 0xBA1624, 0x1C
diff --git a/include/functions.h b/include/functions.h
index ea2e8d888e..d4b4502b67 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -1149,10 +1149,10 @@ Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorD
 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_800A2E70(s32, Vec3s*, Vec3s*, Vec3s*, f32);
+void SkelAnime_AnimationCtxReset(AnimationContext* animationCtx);
+void func_800A32F4(GlobalContext* globalCtx);
+void func_800A3310(GlobalContext* globalCtx);
 void SkelAnime_LoadLinkAnimetion(GlobalContext* globalCtx, LinkAnimetionEntry* linkAnimetionSeg, s32 frame,
                                  s32 limbCount, void* ram);
 void SkelAnime_LoadAnimationType1(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src);
diff --git a/include/variables.h b/include/variables.h
index 8405e82f29..3b708c37b2 100644
--- a/include/variables.h
+++ b/include/variables.h
@@ -544,8 +544,6 @@ extern u32 gObjectTableSize;
 extern RomFile gObjectTable[402];
 extern EntranceInfo gEntranceTable[1556];
 extern Scene gSceneTable[110];
-//extern ? D_8012A480;
-//extern ? D_8012A484;
 //extern ? D_8012A4A0;
 //extern ? D_8012A4E0;
 //extern ? D_8012A4EC;
@@ -3506,7 +3504,6 @@ extern u8 D_8015FD70;
 //extern ? D_80160014;
 //extern ? D_80160018;
 //extern ? D_80160020;
-//extern ? D_801600B0;
 //extern ? D_801600C0;
 extern u8 D_80161010;
 extern u8 D_801610D4;
diff --git a/include/z64animation.h b/include/z64animation.h
index 927aaa1b55..9076056446 100755
--- a/include/z64animation.h
+++ b/include/z64animation.h
@@ -7,7 +7,7 @@
 
 #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
+#define ANIMATION_ENTRY_MAX 50
 
 struct GlobalContext;
 struct Actor;
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index bf0a195674..f7eae881a3 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -18,7 +18,7 @@ void SkelAnime_AnimationType5Loaded(GlobalContext* globalCtx, AnimationEntryType
 
 //.data
 u32 D_8012A480 = 0;
-static AnimationEntryCallback D_8012A484[] = {
+static AnimationEntryCallback AnimationLoadDone[] = {
     &SkelAnime_LinkAnimetionLoaded,  &SkelAnime_AnimationType1Loaded, &SkelAnime_AnimationType2Loaded,
     &SkelAnime_AnimationType3Loaded, &SkelAnime_AnimationType4Loaded, &SkelAnime_AnimationType5Loaded,
 };
@@ -131,7 +131,6 @@ void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* acto
     func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_skelanime.c", 894);
 }
 
-//#define NON_MATCHING
 #ifdef NON_MATCHING
 // regalloc
 void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable,
@@ -776,18 +775,44 @@ s16 func_800A2E2C(GenericAnimationHeader* animationSeg) {
     return animation->frameCount - 1;
 }
 
-// Very large update function
+#ifdef NON_MATCHING
+// Functionally equal, but loop unrolling is way off.
+void func_800A2E70(s32 limbCount, Vec3s* vec1, Vec3s* vec2, Vec3s* vec3, f32 unkf) {
+    Vec3s* pvec1;
+    Vec3s* pvec2;
+    Vec3s* pvec3;
+    s32 iVar3;
+
+    if (unkf < 1.0f) {
+        for (iVar3 = 0, pvec1 = vec1, pvec2 = vec2, pvec3 = vec3; iVar3 < limbCount;
+             iVar3++, pvec1++, pvec2++, pvec3++) {
+            pvec1->x = pvec2->x + ((s16)(pvec3->x - pvec2->x) * unkf);
+            pvec1->y = pvec2->y + ((s16)(pvec3->y - pvec2->y) * unkf);
+            pvec1->z = pvec2->z + ((s16)(pvec3->z - pvec2->z) * unkf);
+        }
+    } else {
+        for (iVar3 = 0; iVar3 < limbCount; iVar3++) {
+            pvec1 = &vec1[iVar3];
+            pvec3 = &vec3[iVar3];
+            pvec1->x = pvec3->x;
+            pvec1->y = pvec3->y;
+            pvec1->z = pvec3->z;
+        }
+    }
+}
+#else
 #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2E70.s")
+#endif
 
-void func_800A32EC(u16* arg0) {
-    *arg0 = 0;
+void SkelAnime_AnimationCtxReset(AnimationContext* animationCtx) {
+    animationCtx->animationCount = 0;
 }
 
-void func_800A32F4(s32 arg0) {
-    D_801600B0 *= 2;
+void func_800A32F4(GlobalContext* globalCtx) {
+    D_801600B0 <<= 1;
 }
 
-void func_800A3310(void* arg0) {
+void func_800A3310(GlobalContext* globalCtx) {
     u32* D_8012A480Ptr = &D_8012A480;
 
     *D_8012A480Ptr |= D_801600B0;
@@ -954,7 +979,7 @@ void func_800A390C(GlobalContext* globalCtx, AnimationContext* animationCtx) {
     AnimationEntry* entry;
 
     for (entry = animationCtx->entries; animationCtx->animationCount != 0; entry++, animationCtx->animationCount--) {
-        D_8012A484[entry->type](globalCtx, &entry->types);
+        AnimationLoadDone[entry->type](globalCtx, &entry->types);
     }
 
     D_801600B0 = 1;