From e8b24178843128f729a8040a96906e262b52ceee Mon Sep 17 00:00:00 2001
From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com>
Date: Thu, 15 Oct 2020 14:24:09 -0700
Subject: [PATCH] Progress

---
 src/overlays/actors/ovl_En_Ik/z_en_ik.c | 32 +++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
index 7c435be3bb..cce8b7dab8 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -866,8 +866,11 @@ void func_80A77434(EnIk* this, GlobalContext* globalCtx) {
     this->actor.shape.unk_14 = 0xFF;
 }
 
-void func_80A77474(EnIk* this, GlobalContext* globalCtx);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77474.s")
+void func_80A77474(EnIk* this, GlobalContext* globalCtx) {
+    this->action = 5;
+    this->drawMode = 0;
+    this->actor.shape.unk_14 = 0;
+}
 
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7748C.s")
 
@@ -979,8 +982,29 @@ void EnIk_Update(Actor* thisx, GlobalContext* globalCtx) {
     sActionFuncs[this->action](this, globalCtx);
 }
 
-s32 EnIk_OverrideLimbDraw1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor);
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_OverrideLimbDraw1.s")
+void func_80A76E2C(EnIk* this, GlobalContext* globalCtx, Vec3f* pos);
+
+s32 EnIk_OverrideLimbDraw1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) {
+    EnIk* this = (EnIk*)actor;
+    f32 animCurrentFrame;
+
+    switch (limbIndex) {
+        case 0x11:
+            animCurrentFrame = this->skelAnime.animCurrentFrame;
+            if (animCurrentFrame < 120.0f) {
+                *dList = NULL;
+            } else {
+                func_80A76E2C(this, globalCtx, pos);
+            }
+            break;
+        case 0x1D:
+        case 0x1E:
+            *dList = NULL;
+            break;
+    }
+
+    return 0;
+}
 
 void EnIk_PostLimbDraw1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor);
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_PostLimbDraw1.s")