diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c
index 69af552c00..4ec04ba3f9 100644
--- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c
+++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c
@@ -194,7 +194,7 @@ void EnDh_Wait(EnDh* this, GlobalContext* globalCtx) {
 
 void EnDh_SetupWalk(EnDh* this) {
     SkelAnime_ChangeAnim(&this->skelAnime, &D_06003A8C, 1.0f, 0.0f,
-                         SkelAnime_GetFrameCount(&D_06003A8C.genericHeader) - 3.0f, 0, -6.0f);
+                         SkelAnime_GetFrameCount(&D_06003A8C) - 3.0f, 0, -6.0f);
     this->curAction = DH_WALK;
     this->timer = 300;
     this->actor.speedXZ = 1.0f;
@@ -287,11 +287,11 @@ void EnDh_Attack(EnDh* this, GlobalContext* globalCtx) {
         case 3:
             if ((this->actor.xzDistFromLink <= 100.0f) && (func_8002E084(&this->actor, 60 * 0x10000 / 360) != 0)) {
                 SkelAnime_ChangeAnim(&this->skelAnime, &D_06004658, 1.0f, 20.0f,
-                                     SkelAnime_GetFrameCount(&D_06004658.genericHeader), 2, -6.0f);
+                                     SkelAnime_GetFrameCount(&D_06004658), 2, -6.0f);
                 this->actionState = 0;
             } else {
                 SkelAnime_ChangeAnim(&this->skelAnime, &D_06004658, -1.0f,
-                                     SkelAnime_GetFrameCount(&D_06004658.genericHeader), 0.0f, 2, -4.0f);
+                                     SkelAnime_GetFrameCount(&D_06004658), 0.0f, 2, -4.0f);
                 this->actionState++;
                 this->collider2.base.atFlags = this->collider2.list[0].body.toucherFlags = 0;
                 this->collider2.list[0].body.toucher.flags = this->collider2.list[0].body.toucher.damage = 0;
@@ -367,7 +367,7 @@ void EnDh_Damage(EnDh* this, GlobalContext* globalCtx) {
         if (this->retreat) {
             EnDh_SetupRetreat(this, globalCtx);
         } else if ((this->actor.xzDistFromLink <= 105.0f) && func_8002E084(&this->actor, 60 * 0x10000 / 360)) {
-            f32 frames = SkelAnime_GetFrameCount(&D_06004658.genericHeader);
+            f32 frames = SkelAnime_GetFrameCount(&D_06004658);
 
             EnDh_SetupAttack(this);
             SkelAnime_ChangeAnim(&this->skelAnime, &D_06004658, 1.0f, 20.0f, frames, 2, -6.0f);
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index 4fabc690de..b5f45842cd 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -99,7 +99,7 @@ void func_80A3D838(EnGm* this, GlobalContext* globalCtx) {
                            this->transitionDrawTable, 18);
         gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[this->objGmBankIndex].segment);
         SkelAnime_ChangeAnim(&this->skelAnime, &D_060002B8, 1.0f, 0.0f,
-                             SkelAnime_GetFrameCount(&D_060002B8.genericHeader), 0, 0.0f);
+                             SkelAnime_GetFrameCount(&D_060002B8), 0, 0.0f);
         this->actor.draw = EnGm_Draw;
         Collider_InitCylinder(globalCtx, &this->collider);
         Collider_SetCylinder_Set3(globalCtx, &this->collider, &this->actor, &sCylinderInit);
diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
index 1a955b2f10..87a5a542fa 100644
--- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
@@ -202,7 +202,7 @@ f32 EnSsh_SetAnimation(EnSsh* this, s32 animIndex) {
     };
     f32 playbackSpeed[] = { 1.0f, 4.0f, 1.0f, 1.0f, 8.0f, 6.0f, 2.0f };
     u8 mode[] = { 3, 3, 1, 3, 1, 1, 1 };
-    f32 frameCount = SkelAnime_GetFrameCount(&animation[animIndex]->genericHeader);
+    f32 frameCount = SkelAnime_GetFrameCount(animation[animIndex]);
     s32 pad;
 
     SkelAnime_ChangeAnim(&this->skelAnime, animation[animIndex], playbackSpeed[animIndex], 0.0f, frameCount,
@@ -587,7 +587,7 @@ void EnSsh_Init(Actor* thisx, GlobalContext* globalCtx) {
     s32 pad;
     EnSsh* this = THIS;
 
-    frameCount = SkelAnime_GetFrameCount(&D_06000304.genericHeader);
+    frameCount = SkelAnime_GetFrameCount(&D_06000304);
     if (this->actor.params == ENSSH_FATHER) {
         if (gSaveContext.inventory.gsTokens >= 100) {
             Actor_Kill(&this->actor);
diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
index 515243ee36..c9ede614e5 100644
--- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
+++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
@@ -306,7 +306,6 @@ void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) {
     s32 phi_t1;
     s32 phi_v0;
     s32 phi_a0;
-    u32 zero;
     f32 animCurrentFrame;
     f32 unk_278;
 
@@ -366,34 +365,24 @@ void func_80B4EF64(EnZl2* this, s16 arg1, s32 arg2) {
             phi_v0 = 0;
         }
 
-        zero = 0;
         if (arg2 == 2) {
             if ((this->action == 5) || (this->action == 30)) {
                 animCurrentFrame = this->skelAnime.animCurrentFrame;
                 unk_278 = this->unk_278;
                 temp_t0 = (s32)((3500.0f * animCurrentFrame) / unk_278) + phi_a0;
                 if (temp_t0 >= temp_v1) {
-                    if (phi_v0 < zero) {
-                        phi_v0 += 1;
-                    }
                     temp_v1 = temp_t0;
                     phi_v0 /= -2;
                 }
             } else if ((this->action == 6) || (this->action == 31)) {
                 temp_t0 = phi_a0 + 0xDAC;
                 if (temp_t0 >= temp_v1) {
-                    if (phi_v0 < zero) {
-                        phi_v0 += 1;
-                    }
                     temp_v1 = temp_t0;
                     phi_v0 /= -2;
                 }
             } else if (this->action == 20) {
                 temp_t0 = phi_a0 - 0x3E8;
                 if (temp_t0 >= temp_v1) {
-                    if (phi_v0 < zero) {
-                        phi_v0 += 1;
-                    }
                     temp_v1 = temp_t0;
                     phi_v0 /= -2;
                 }