EnHintnuts OK (#154)

* merged from upstream

* matching

* named functions

* made suggested changes

2 files changed, 539 insertions, 55 deletions

diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
index c44e49ee3..20a90a02a 100644
--- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
+++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c
@@ -15,7 +15,31 @@ void EnHintnuts_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnHintnuts_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnHintnuts_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-/*
+void EnHintnuts_SetupWait(EnHintnuts* this);
+void EnHintnuts_Wait(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_LookAround(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_Stand(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_ThrowNut(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_Burrow(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_BeginRun(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_BeginFreeze(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_Run(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_Talk(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_Leave(EnHintnuts* this, GlobalContext* globalCtx);
+void EnHintnuts_Freeze(EnHintnuts* this, GlobalContext* globalCtx);
+
+extern AnimationHeader D_06000168;
+extern Gfx D_060014E0[];
+extern SkeletonHeader D_060023B8;
+extern AnimationHeader D_060024CC;
+extern AnimationHeader D_060026C4;
+extern AnimationHeader D_06002B90;
+extern AnimationHeader D_06002894;
+extern AnimationHeader D_060029BC;
+extern AnimationHeader D_06002E84;
+extern AnimationHeader D_06002F7C;
+extern AnimationHeader D_06003128;
+
 const ActorInit En_Hintnuts_InitVars = {
     ACTOR_EN_HINTNUTS,
     ACTORTYPE_ENEMY,
@@ -27,61 +51,512 @@ const ActorInit En_Hintnuts_InitVars = {
     (ActorFunc)EnHintnuts_Update,
     (ActorFunc)EnHintnuts_Draw,
 };
-*/
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Init.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Destroy.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A573D0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A578FC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57B60.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57BE4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57CA8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57DE4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57EF8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F5C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57F94.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58028.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A582B8.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58320.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A584DC.s")
+static ColliderCylinderInit sCylinderInit = {
+    { COLTYPE_UNK6, 0x00, 0x09, 0x39, 0x10, COLSHAPE_CYLINDER },
+    { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 },
+    { 18, 32, 0, { 0, 0, 0 } }
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58608.s")
+static CollisionCheckInfoInit sColChkInfoInit = {
+    0x01,
+    0x0012,
+    0x0020,
+    0xFE,
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Update.s")
+static s16 sPuzzleCounter = 0;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A58838.s")
+static InitChainEntry sInitChain[] = {
+    ICHAIN_F32(gravity, -1, ICHAIN_CONTINUE),
+    ICHAIN_S8(naviEnemyId, 10, ICHAIN_CONTINUE),
+    ICHAIN_F32(unk_4C, 2600, ICHAIN_STOP),
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s")
+void EnHintnuts_Init(Actor* thisx, GlobalContext* globalCtx) {
+    EnHintnuts* this = THIS;
+    s32 pad;
+
+    Actor_ProcessInitChain(&this->actor, sInitChain);
+    if (this->actor.params == 0xA) {
+        this->actor.flags &= ~5;
+    } else {
+        ActorShape_Init(&this->actor.shape, 0x0, ActorShadow_DrawFunc_Circle, 35.0f);
+        SkelAnime_Init(globalCtx, &this->skelAnime, &D_060023B8, &D_06002F7C, this->limbDrawTable,
+                       this->transitionDrawTable, 10);
+        Collider_InitCylinder(globalCtx, &this->collider);
+        Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
+        func_80061ED4(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
+        Actor_SetTextWithPrefix(globalCtx, &this->actor, (this->actor.params >> 8) & 0xFF);
+        this->textIdCopy = this->actor.textId;
+        this->actor.params &= 0xFF;
+        sPuzzleCounter = 0;
+        if (this->actor.textId == 0x109B) { // "Please forgive me, master!..."
+            if (Flags_GetClear(globalCtx, 0x9) != 0) {
+                Actor_Kill(&this->actor);
+                return;
+            }
+        }
+        EnHintnuts_SetupWait(this);
+        Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_HINTNUTS, this->actor.posRot.pos.x,
+                            this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.posRot.rot.y, 0, 0xA);
+    }
+}
+
+void EnHintnuts_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    EnHintnuts* this = THIS;
+    if (this->actor.params != 0xA) {
+        Collider_DestroyCylinder(globalCtx, &this->collider);
+    }
+}
+
+void EnHintnuts_HitByScrubProjectile1(EnHintnuts* this, GlobalContext* globalCtx) {
+    if (this->actor.textId != 0 && this->actor.type == ACTORTYPE_ENEMY &&
+        ((this->actor.params == 0) || (sPuzzleCounter == 2))) {
+        this->actor.flags &= ~0x5;
+        this->actor.flags |= 0x9;
+        Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_BG);
+    }
+}
+
+void EnHintnuts_SetupWait(EnHintnuts* this) {
+    SkelAnime_ChangeAnimPlaybackStop(&this->skelAnime, &D_06002B90, 0.0f);
+    this->animFlagAndTimer = Math_Rand_S16Offset(100, 50);
+    this->collider.dim.height = 5;
+    this->actor.posRot.pos = this->actor.initPosRot.pos;
+    this->collider.base.acFlags &= ~1;
+    this->actionFunc = EnHintnuts_Wait;
+}
+
+void EnHintnuts_SetupLookAround(EnHintnuts* this) {
+    SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06002894);
+    this->animFlagAndTimer = 2;
+    this->actionFunc = EnHintnuts_LookAround;
+}
+
+void EnHintnuts_SetupThrowScrubProjectile(EnHintnuts* this) {
+    SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06000168);
+    this->actionFunc = EnHintnuts_ThrowNut;
+}
+
+void EnHintnuts_SetupStand(EnHintnuts* this) {
+    SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06002F7C, -3.0f);
+    if (this->actionFunc == EnHintnuts_ThrowNut) {
+        this->animFlagAndTimer = 2 | 0x1000; // sets timer and flag
+    } else {
+        this->animFlagAndTimer = 1;
+    }
+    this->actionFunc = EnHintnuts_Stand;
+}
+
+void EnHintnuts_SetupBurrow(EnHintnuts* this) {
+    SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_060024CC, -5.0f);
+    Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DOWN);
+    this->actionFunc = EnHintnuts_Burrow;
+}
+
+void EnHintnuts_HitByScrubProjectile2(EnHintnuts* this) {
+    SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_060026C4, -3.0f);
+    this->collider.dim.height = 0x25;
+    Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DAMAGE);
+    this->collider.base.acFlags &= ~1;
+
+    if (this->actor.params > 0 && this->actor.params < 4 && this->actor.type == ACTORTYPE_ENEMY) {
+        if (sPuzzleCounter == -4) {
+            sPuzzleCounter = 0;
+        }
+        if (this->actor.params == sPuzzleCounter + 1) {
+            sPuzzleCounter++;
+        } else {
+            if (sPuzzleCounter > 0) {
+                sPuzzleCounter = -sPuzzleCounter;
+            }
+            sPuzzleCounter--;
+        }
+        this->actor.flags |= 0x10;
+        this->actionFunc = EnHintnuts_BeginFreeze;
+    } else {
+        this->actionFunc = EnHintnuts_BeginRun;
+    }
+}
+
+void EnHintnuts_SetupRun(EnHintnuts* this) {
+    SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_06003128);
+    this->animFlagAndTimer = 5;
+    this->actionFunc = EnHintnuts_Run;
+}
+
+void EnHintnuts_SetupTalk(EnHintnuts* this) {
+    SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06002E84, -5.0f);
+    this->actionFunc = EnHintnuts_Talk;
+    this->actor.speedXZ = 0.0f;
+}
+
+void EnHintnuts_SetupLeave(EnHintnuts* this, GlobalContext* globalCtx) {
+    SkelAnime_ChangeAnimTransitionRepeat(&this->skelAnime, &D_06003128, -5.0f);
+    this->actor.speedXZ = 3.0f;
+    this->animFlagAndTimer = 100;
+    this->actor.posRot.rot.y = this->actor.shape.rot.y;
+    this->collider.base.maskA &= ~1;
+    this->actor.flags |= 0x10;
+    Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_DAMAGE);
+    Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, this->actor.posRot.pos.x, this->actor.posRot.pos.y,
+                this->actor.posRot.pos.z, 0x0, 0x0, 0x0, 0x3); // recovery heart
+    this->actionFunc = EnHintnuts_Leave;
+}
+
+void EnHintnuts_SetupFreeze(EnHintnuts* this) {
+    SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_060029BC);
+    this->actor.flags &= ~1;
+    func_8003426C(&this->actor, 0, 0xFF, 0, 100);
+    this->actor.unk_114 = 1;
+    this->animFlagAndTimer = 0;
+    Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_FAINT);
+    if (sPuzzleCounter == -3) {
+        func_80078884(NA_SE_SY_ERROR);
+        sPuzzleCounter = -4;
+    }
+    this->actionFunc = EnHintnuts_Freeze;
+}
+
+void EnHintnuts_Wait(EnHintnuts* this, GlobalContext* globalCtx) {
+    s32 hasSlowPlaybackSpeed;
+    f32 boundedCurrentFrame;
+    f32 boundedCurrentFrameTemp;
+
+    hasSlowPlaybackSpeed = 0;
+    if (this->skelAnime.animPlaybackSpeed < 0.5f) {
+        hasSlowPlaybackSpeed = 1;
+    }
+    if (hasSlowPlaybackSpeed && this->animFlagAndTimer != 0) {
+        this->animFlagAndTimer--;
+    }
+    if (func_800A56C8(&this->skelAnime, 9.0f) != 0) {
+        this->collider.base.acFlags |= 1;
+    } else if (func_800A56C8(&this->skelAnime, 8.0f) != 0) {
+            Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_UP);
+    }
+    if (this->skelAnime.animCurrentFrame < 9.0f) {
+        boundedCurrentFrame = 9.0f;
+    } else {
+        if (this->skelAnime.animCurrentFrame > 12.0f) {
+            boundedCurrentFrameTemp = 12.0f;
+        } else {
+            boundedCurrentFrameTemp = this->skelAnime.animCurrentFrame;
+        }
+        boundedCurrentFrame = boundedCurrentFrameTemp;
+    }
+    this->collider.dim.height = (((boundedCurrentFrame - 9.0f) * 9.0f) + 5.0f);
+    if (!hasSlowPlaybackSpeed && (this->actor.xzDistanceFromLink < 120.0f)) {
+        EnHintnuts_SetupBurrow(this);
+    } else if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) {
+        if (this->actor.xzDistanceFromLink < 120.0f) {
+            EnHintnuts_SetupBurrow(this);
+        } else if ((this->animFlagAndTimer == 0) && (320.0f < this->actor.xzDistanceFromLink)) {
+            EnHintnuts_SetupLookAround(this);
+        } else {
+            EnHintnuts_SetupStand(this);
+        }
+    }
+    if (hasSlowPlaybackSpeed && 160.0f < this->actor.xzDistanceFromLink &&
+        fabsf(this->actor.yDistanceFromLink) < 120.0f &&
+        ((this->animFlagAndTimer == 0) || (this->actor.xzDistanceFromLink < 480.0f))) {
+        this->skelAnime.animPlaybackSpeed = 1.0f;
+    }
+}
+
+void EnHintnuts_LookAround(EnHintnuts* this, GlobalContext* globalCtx) {
+    SkelAnime_FrameUpdateMatrix(&this->skelAnime);
+    if (func_800A56C8(&this->skelAnime, 0.0f) != 0 && this->animFlagAndTimer != 0) {
+        this->animFlagAndTimer--;
+    }
+    if ((this->actor.xzDistanceFromLink < 120.0f) || (this->animFlagAndTimer == 0)) {
+        EnHintnuts_SetupBurrow(this);
+    }
+}
+
+void EnHintnuts_Stand(EnHintnuts* this, GlobalContext* globalCtx) {
+    SkelAnime_FrameUpdateMatrix(&this->skelAnime);
+    if (func_800A56C8(&this->skelAnime, 0.0f) != 0 && this->animFlagAndTimer != 0) {
+        this->animFlagAndTimer--;
+    }
+    if (!(this->animFlagAndTimer & 0x1000)) {
+        Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 2, 0xE38);
+    }
+    if (this->actor.xzDistanceFromLink < 120.0f || this->animFlagAndTimer == 0x1000) {
+        EnHintnuts_SetupBurrow(this);
+    } else if (this->animFlagAndTimer == 0) {
+        EnHintnuts_SetupThrowScrubProjectile(this);
+    }
+}
+
+void EnHintnuts_ThrowNut(EnHintnuts* this, GlobalContext* globalCtx) {
+    Vec3f nutPos;
+
+    Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 2, 0xE38);
+    if (this->actor.xzDistanceFromLink < 120.0f) {
+        EnHintnuts_SetupBurrow(this);
+    } else if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) {
+        EnHintnuts_SetupStand(this);
+    } else if (func_800A56C8(&this->skelAnime, 6.0f) != 0) {
+        nutPos.x = (Math_Sins(this->actor.shape.rot.y) * 23.0f) + this->actor.posRot.pos.x;
+        nutPos.y = this->actor.posRot.pos.y + 12.0f;
+        nutPos.z = (Math_Coss(this->actor.shape.rot.y) * 23.0f) + this->actor.posRot.pos.z;
+        if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_NUTSBALL, nutPos.x, nutPos.y, nutPos.z,
+                        this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, 1) != NULL) {
+            Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_THROW);
+        }
+    }
+}
+
+void EnHintnuts_Burrow(EnHintnuts* this, GlobalContext* globalCtx) {
+    f32 boundedCurrentFrame;
+
+    if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) {
+        EnHintnuts_SetupWait(this);
+    } else {
+        boundedCurrentFrame = this->skelAnime.animCurrentFrame < 1.0f
+                                  ? 1.0f
+                                  : this->skelAnime.animCurrentFrame > 3.0f ? 3.0f : this->skelAnime.animCurrentFrame;
+        this->collider.dim.height = (((3.0f - boundedCurrentFrame) * 12.0f) + 5.0f);
+    }
+    if (func_800A56C8(&this->skelAnime, 4.0f) != 0) {
+        this->collider.base.acFlags &= ~1;
+    }
+
+    Math_SmoothScaleMaxF(&this->actor.posRot.pos.x, this->actor.initPosRot.pos.x, 0.5f, 3.0f);
+    Math_SmoothScaleMaxF(&this->actor.posRot.pos.z, this->actor.initPosRot.pos.z, 0.5f, 3.0f);
+}
+
+void EnHintnuts_BeginRun(EnHintnuts* this, GlobalContext* globalCtx) {
+    if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) {
+        this->unk_196 = this->actor.rotTowardsLinkY + 0x8000;
+        EnHintnuts_SetupRun(this);
+    }
+    Math_SmoothScaleMaxS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 2, 0xE38);
+}
+
+void EnHintnuts_BeginFreeze(EnHintnuts* this, GlobalContext* globalCtx) {
+    if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) {
+        EnHintnuts_SetupFreeze(this);
+    }
+}
+
+void EnHintnuts_CheckProximity(EnHintnuts* this, GlobalContext* globalCtx) {
+    if (this->actor.type != ACTORTYPE_ENEMY) {
+        if ((this->collider.base.maskA & 2) || (this->actor.unk_10C != 0)) {
+            this->actor.flags |= 0x10000;
+        } else {
+            this->actor.flags &= ~0x10000;
+        }
+        if (this->actor.xzDistanceFromLink < 130.0f) {
+            this->actor.textId = this->textIdCopy;
+            func_8002F2F4(&this->actor, globalCtx);
+        }
+    }
+}
+
+void EnHintnuts_Run(EnHintnuts* this, GlobalContext* globalCtx) {
+    s32 temp_ret;
+    s16 diffRotInit;
+    s16 diffRot;
+    f32 phi_f0;
+
+    SkelAnime_FrameUpdateMatrix(&this->skelAnime);
+    temp_ret = func_800A56C8(&this->skelAnime, 0.0f);
+    if (temp_ret != 0 && this->animFlagAndTimer != 0) {
+        this->animFlagAndTimer--;
+    }
+    if ((temp_ret != 0) || (func_800A56C8(&this->skelAnime, 6.0f) != 0)) {
+        Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK);
+    }
+
+    Math_ApproxF(&this->actor.speedXZ, 7.5f, 1.0f);
+    if (Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->unk_196, 1, 0xE38, 0xB6) == 0) {
+        if (this->actor.bgCheckFlags & 0x20) {
+            this->unk_196 = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos);
+        } else if (this->actor.bgCheckFlags & 8) {
+            this->unk_196 = this->actor.wallPolyRot;
+        } else if (this->animFlagAndTimer == 0) {
+            diffRotInit = func_8002DAC0(&this->actor, &this->actor.initPosRot.pos);
+            diffRot = diffRotInit - this->actor.rotTowardsLinkY;
+            if (ABS(diffRot) >= 0x2001) {
+                this->unk_196 = diffRotInit;
+            } else {
+                phi_f0 = (0.0f <= (f32)diffRot) ? 1.0f : -1.0f;
+                this->unk_196 = (s16)((phi_f0 * -8192.0f) + (f32)this->actor.rotTowardsLinkY);
+            }
+        } else {
+            this->unk_196 = (s16)(this->actor.rotTowardsLinkY + 0x8000);
+        }
+    }
+
+    this->actor.shape.rot.y = this->actor.posRot.rot.y + 0x8000;
+    if (func_8002F194(&this->actor, globalCtx) != 0) {
+        EnHintnuts_SetupTalk(this);
+    } else if (this->animFlagAndTimer == 0 && func_8002DBB0(&this->actor, &this->actor.initPosRot.pos) < 20.0f &&
+               fabsf(this->actor.posRot.pos.y - this->actor.initPosRot.pos.y) < 2.0f) {
+        this->actor.speedXZ = 0.0f;
+        if (this->actor.type == ACTORTYPE_BG) {
+            this->actor.flags &= ~0x00010009;
+            this->actor.flags |= 0x5;
+            Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_ENEMY);
+        }
+        EnHintnuts_SetupBurrow(this);
+    } else {
+        EnHintnuts_CheckProximity(this, globalCtx);
+    }
+}
+
+void EnHintnuts_Talk(EnHintnuts* this, GlobalContext* globalCtx) {
+    SkelAnime_FrameUpdateMatrix(&this->skelAnime);
+    Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, this->actor.rotTowardsLinkY, 0x3, 0x400, 0x100);
+    if (func_8010BDBC(&globalCtx->msgCtx) == 5) {
+        EnHintnuts_SetupLeave(this, globalCtx);
+    }
+}
+
+void EnHintnuts_Leave(EnHintnuts* this, GlobalContext* globalCtx) {
+    s16 temp_a1;
+
+    SkelAnime_FrameUpdateMatrix(&this->skelAnime);
+    if (this->animFlagAndTimer != 0) {
+        this->animFlagAndTimer--;
+    }
+    if ((func_800A56C8(&this->skelAnime, 0.0f) != 0) || (func_800A56C8(&this->skelAnime, 6.0f) != 0)) {
+        Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_WALK);
+    }
+    if (this->actor.bgCheckFlags & 8) {
+        temp_a1 = this->actor.wallPolyRot;
+    } else {
+        temp_a1 = this->actor.rotTowardsLinkY - func_8005A9F4(globalCtx->cameraPtrs[globalCtx->activeCamera]) - 0x8000;
+        if (ABS(temp_a1) >= 0x4001) {
+            temp_a1 = func_8005A9F4(globalCtx->cameraPtrs[globalCtx->activeCamera]) + 0x8000;
+        } else {
+            temp_a1 = func_8005A9F4(globalCtx->cameraPtrs[globalCtx->activeCamera]) - (temp_a1 >> 1) + 0x8000;
+        }
+    }
+    Math_ApproxUpdateScaledS(&this->actor.shape.rot.y, temp_a1, 0x800);
+    this->actor.posRot.rot.y = this->actor.shape.rot.y;
+    if ((this->animFlagAndTimer == 0) || (this->actor.unk_E4.z < 0.0f)) {
+        func_80106CCC(globalCtx);
+        if (this->actor.params == 3) {
+            Flags_SetClear(globalCtx, this->actor.room);
+            sPuzzleCounter = 3;
+        }
+        if (this->actor.attachedB != NULL) {
+            Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this->actor.attachedB, ACTORTYPE_PROP);
+        }
+        Actor_Kill(&this->actor);
+    }
+}
+
+void EnHintnuts_Freeze(EnHintnuts* this, GlobalContext* globalCtx) {
+    this->actor.unk_114 = 1;
+    SkelAnime_FrameUpdateMatrix(&this->skelAnime);
+    if (func_800A56C8(&this->skelAnime, 0.0f) != 0) {
+        Audio_PlayActorSound2(&this->actor, NA_SE_EN_NUTS_FAINT);
+    }
+    if (this->animFlagAndTimer == 0) {
+        if (sPuzzleCounter == 3) {
+            if (this->actor.attachedB != NULL) {
+                Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this->actor.attachedB, ACTORTYPE_PROP);
+            }
+            this->animFlagAndTimer = 1;
+        } else if (sPuzzleCounter == -4) {
+            this->animFlagAndTimer = 2;
+        }
+    } else if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y - 35.0f, 7.0f) != 0) {
+        if (this->animFlagAndTimer == 1) {
+            Actor_Kill(&this->actor);
+        } else {
+            this->actor.flags |= 1;
+            this->actor.flags &= ~0x10;
+            this->actor.colChkInfo.health = sColChkInfoInit.health;
+            this->actor.unk_114 = 0;
+            EnHintnuts_SetupWait(this);
+        }
+    }
+}
+
+void EnHintnuts_ColliderCheck(EnHintnuts* this, GlobalContext* globalCtx) {
+    if (this->collider.base.acFlags & 2) {
+        this->collider.base.acFlags &= ~2;
+        func_80035650(&this->actor, &this->collider.body, 1);
+        if (this->collider.base.ac->id != ACTOR_EN_NUTSBALL) {
+            EnHintnuts_SetupBurrow(this);
+        } else {
+            EnHintnuts_HitByScrubProjectile1(this, globalCtx);
+            EnHintnuts_HitByScrubProjectile2(this);
+        }
+    } else if (globalCtx->actorCtx.unk_02 != 0) {
+        EnHintnuts_HitByScrubProjectile1(this, globalCtx);
+        EnHintnuts_HitByScrubProjectile2(this);
+    }
+}
+
+void EnHintnuts_Update(Actor* thisx, GlobalContext* globalCtx) {
+    EnHintnuts* this = THIS;
+    s32 pad;
+
+    if (this->actor.params != 0xA) {
+        EnHintnuts_ColliderCheck(this, globalCtx);
+        this->actionFunc(this, globalCtx);
+        if (this->actionFunc != EnHintnuts_Freeze && this->actionFunc != EnHintnuts_BeginFreeze) {
+            Actor_MoveForward(&this->actor);
+            func_8002E4B4(globalCtx, &this->actor, 20.0f, this->collider.dim.radius, this->collider.dim.height, 0x1D);
+        }
+        Collider_CylinderUpdate(&this->actor, &this->collider);
+        if (this->collider.base.acFlags & 1) {
+            CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+        }
+        CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+        if (this->actionFunc == EnHintnuts_Wait) {
+            Actor_SetHeight(&this->actor, this->skelAnime.animCurrentFrame);
+        } else if (this->actionFunc == EnHintnuts_Burrow) {
+            Actor_SetHeight(&this->actor, 20.0f - ((this->skelAnime.animCurrentFrame * 20.0f) /
+                                                   (f32)SkelAnime_GetFrameCount(&D_060024CC.genericHeader)));
+        } else {
+            Actor_SetHeight(&this->actor, 20.0f);
+        }
+    }
+}
+
+s32 EnHintnuts_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                Actor* thisx) {
+    Vec3f vec;
+    f32 animCurrentFrame;
+    EnHintnuts* this = THIS;
+
+    if (limbIndex == 5 && this->actionFunc == EnHintnuts_ThrowNut) {
+        animCurrentFrame = this->skelAnime.animCurrentFrame;
+        if (animCurrentFrame <= 6.0f) {
+            vec.y = 1.0f - (animCurrentFrame * 0.0833f);
+            vec.z = 1.0f + (animCurrentFrame * 0.1167f);
+            vec.x = 1.0f + (animCurrentFrame * 0.1167f);
+        } else if (animCurrentFrame <= 7.0f) {
+            animCurrentFrame -= 6.0f;
+            vec.y = 0.5f + animCurrentFrame;
+            vec.z = 1.7f - (animCurrentFrame * 0.7f);
+            vec.x = 1.7f - (animCurrentFrame * 0.7f);
+        } else if (animCurrentFrame <= 10.0f) {
+            vec.y = 1.5f - ((animCurrentFrame - 7.0f) * 0.1667f);
+            vec.z = 1.0f;
+            vec.x = 1.0f;
+        } else {
+            return 0;
+        }
+        Matrix_Scale(vec.x, vec.y, vec.z, MTXMODE_APPLY);
+    }
+    return 0;
+}
+
+void EnHintnuts_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    EnHintnuts* this = THIS;
+    if (this->actor.params == 0xA) {
+        Gfx_DrawDListOpa(globalCtx, D_060014E0);
+    } else {
+        SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, EnHintnuts_OverrideLimbDraw,
+                       NULL, &this->actor);
+    }
+}
diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h
index bbe7e33b7..aa97beb7a 100644
--- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h
+++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h
@@ -6,9 +6,18 @@
 
 struct EnHintnuts;
 
+typedef void (*EnHintnutsActionFunc)(struct EnHintnuts*, GlobalContext*);
+
 typedef struct EnHintnuts {
     /* 0x0000 */ Actor actor;
-    /* 0x014C */ char unk_14C[0x114];
+    /* 0x014C */ SkelAnime skelAnime;
+    /* 0x0190 */ EnHintnutsActionFunc actionFunc;
+    /* 0x0194 */ s16 animFlagAndTimer; // 0x1000 bit denotes which animation
+    /* 0x0196 */ s16 unk_196;
+    /* 0x0198 */ u16 textIdCopy;
+    /* 0x019A */ Vec3s limbDrawTable[10];
+    /* 0x01D6 */ Vec3s transitionDrawTable[10];
+    /* 0x0214 */ ColliderCylinder collider;
 } EnHintnuts; // size = 0x0260
 
 extern const ActorInit En_Hintnuts_InitVars;