ovl_En_Hs (#508)

* ovl_En_Hs

* PR review

2 files changed, 259 insertions, 27 deletions

diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c
index 9287714e0..018f75786 100644
--- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c
+++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c
@@ -1,4 +1,11 @@
+/*
+ * File: z_en_hs.c
+ * Overlay: ovl_En_Hs
+ * Description: Carpenter's Son
+ */
+
 #include "z_en_hs.h"
+#include "vt.h"
 
 #define FLAGS 0x00000009
 
@@ -9,12 +16,9 @@ void EnHs_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnHs_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnHs_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_06000304;
-extern UNK_TYPE D_06000528;
-extern UNK_TYPE D_060005C0;
-extern UNK_TYPE D_06006260;
+void func_80A6E9AC(EnHs* this, GlobalContext* globalCtx);
+void func_80A6E6B0(EnHs* this, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Hs_InitVars = {
     ACTOR_EN_HS,
     ACTORTYPE_NPC,
@@ -26,43 +30,261 @@ const ActorInit En_Hs_InitVars = {
     (ActorFunc)EnHs_Update,
     (ActorFunc)EnHs_Draw,
 };
-*/
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E3A0.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s")
+static ColliderCylinderInit sCylinderInit = {
+    { COLTYPE_UNK10, 0x00, 0x11, 0x39, 0x10, COLSHAPE_CYLINDER },
+    { 0x00, { 0x00000000, 0x00, 0x00 }, { 0xFFCFFFFF, 0x00, 0x00 }, 0x00, 0x01, 0x01 },
+    { 40, 40, 0, { 0, 0, 0 } },
+};
+
+extern AnimationHeader D_06000304;
+extern AnimationHeader D_06000528;
+extern AnimationHeader D_060005C0;
+extern FlexSkeletonHeader D_06006260;
+
+void func_80A6E3A0(EnHs* this, EnHsActionFunc actionFunc) {
+    this->actionFunc = actionFunc;
+}
+
+void EnHs_Init(Actor* thisx, GlobalContext* globalCtx) {
+    EnHs* this = THIS;
+    s32 pad;
+
+    ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 36.0f);
+    SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06006260, &D_060005C0, this->limbDrawTable,
+                       this->transitionDrawTable, 16);
+    SkelAnime_ChangeAnimDefaultRepeat(&this->skelAnime, &D_060005C0);
+    Collider_InitCylinder(globalCtx, &this->collider);
+    Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
+    this->actor.colChkInfo.mass = 0xFF;
+    Actor_SetScale(&this->actor, 0.01f);
+
+    if (LINK_IS_CHILD) {
+        this->actor.params = 0;
+    } else {
+        this->actor.params = 1;
+    }
+
+    if (this->actor.params == 1) {
+        // chicken shop (adult era)
+        osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(大人の時) \n" VT_RST);
+        func_80A6E3A0(this, func_80A6E9AC);
+        if (gSaveContext.itemGetInf[3] & 1) {
+            // chicken shop closed
+            osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコ屋閉店 \n" VT_RST);
+            Actor_Kill(&this->actor);
+        }
+    } else {
+        // chicken shop (child era)
+        osSyncPrintf(VT_FGCOL(CYAN) " ヒヨコの店(子人の時) \n" VT_RST);
+        func_80A6E3A0(this, func_80A6E9AC);
+    }
+
+    this->unk_2A8 = 0;
+    this->actor.unk_1F = 6;
+}
+
+void EnHs_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    EnHs* this = THIS;
+
+    Collider_DestroyCylinder(globalCtx, &this->collider);
+}
+
+s32 func_80A6E53C(EnHs* this, GlobalContext* globalCtx, u16 textId, EnHsActionFunc actionFunc) {
+    s16 yawDiff;
+
+    if (func_8002F194(&this->actor, globalCtx)) {
+        func_80A6E3A0(this, actionFunc);
+        return 1;
+    }
+
+    this->actor.textId = textId;
+    yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y;
+    if ((ABS(yawDiff) <= 0x2150) && (this->actor.xzDistFromLink < 100.0f)) {
+        this->unk_2A8 |= 1;
+        func_8002F2CC(&this->actor, globalCtx, 100.0f);
+    }
+
+    return 0;
+}
+
+void func_80A6E5EC(EnHs* this, GlobalContext* globalCtx) {
+    if (func_8002F334(&this->actor, globalCtx)) {
+        func_80A6E3A0(this, func_80A6E6B0);
+    }
+
+    this->unk_2A8 |= 1;
+}
+
+void func_80A6E630(EnHs* this, GlobalContext* globalCtx) {
+    if ((func_8010BDBC(&globalCtx->msgCtx) == 6) && func_80106BC8(globalCtx)) {
+        func_80088AA0(180);
+        func_80A6E3A0(this, func_80A6E6B0);
+        gSaveContext.eventInf[1] &= ~1;
+    }
+
+    this->unk_2A8 |= 1;
+}
+
+void func_80A6E6B0(EnHs* this, GlobalContext* globalCtx) {
+    func_80A6E53C(this, globalCtx, 0x10B6, func_80A6E5EC);
+}
+
+void func_80A6E6D8(EnHs* this, GlobalContext* globalCtx) {
+    if (func_8002F334(&this->actor, globalCtx)) {
+        func_80A6E3A0(this, func_80A6E9AC);
+    }
+}
+
+void func_80A6E70C(EnHs* this, GlobalContext* globalCtx) {
+    if (func_8002F334(&this->actor, globalCtx)) {
+        func_80A6E3A0(this, func_80A6E9AC);
+    }
+}
+
+void func_80A6E740(EnHs* this, GlobalContext* globalCtx) {
+    if (Actor_HasParent(&this->actor, globalCtx)) {
+        this->actor.parent = NULL;
+        func_80A6E3A0(this, func_80A6E630);
+    } else {
+        func_8002F434(&this->actor, globalCtx, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
+    }
+
+    this->unk_2A8 |= 1;
+}
+
+void func_80A6E7BC(EnHs* this, GlobalContext* globalCtx) {
+    if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && func_80106BC8(globalCtx)) {
+        switch (globalCtx->msgCtx.choiceIndex) {
+            case 0:
+                func_80A6E3A0(this, func_80A6E740);
+                func_8002F434(&this->actor, globalCtx, GI_ODD_MUSHROOM, 10000.0f, 50.0f);
+                break;
+            case 1:
+                func_8010B720(globalCtx, 0x10B4);
+                func_80A6E3A0(this, func_80A6E70C);
+                break;
+        }
+
+        SkelAnime_ChangeAnim(&this->skelAnime, &D_060005C0, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_060005C0), 0, 8.0f);
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Destroy.s")
+    this->unk_2A8 |= 1;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E53C.s")
+void func_80A6E8CC(EnHs* this, GlobalContext* globalCtx) {
+    Player* player = PLAYER;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E5EC.s")
+    if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) {
+        func_8010B720(globalCtx, 0x10B3);
+        func_80A6E3A0(this, func_80A6E7BC);
+        SkelAnime_ChangeAnim(&this->skelAnime, &D_06000528, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06000528), 0, 8.0f);
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E630.s")
+    if (this->unk_2AA > 0) {
+        this->unk_2AA--;
+        if (this->unk_2AA == 0) {
+            func_8002F7DC(&player->actor, NA_SE_EV_CHICKEN_CRY_M);
+        }
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6B0.s")
+    this->unk_2A8 |= 1;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E6D8.s")
+void func_80A6E9AC(EnHs* this, GlobalContext* globalCtx) {
+    Player* player = PLAYER;
+    s16 yawDiff;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E70C.s")
+    if (func_8002F194(&this->actor, globalCtx)) {
+        if (func_8002F368(globalCtx) == 7) {
+            player->actor.textId = 0x10B2;
+            func_80A6E3A0(this, func_80A6E8CC);
+            SkelAnime_ChangeAnim(&this->skelAnime, &D_06000304, 1.0f, 0.0f, SkelAnime_GetFrameCount(&D_06000304), 0,
+                                 8.0f);
+            this->unk_2AA = 40;
+            func_80078884(NA_SE_SY_TRE_BOX_APPEAR);
+        } else {
+            player->actor.textId = 0x10B1;
+            func_80A6E3A0(this, func_80A6E6D8);
+        }
+    } else {
+        yawDiff = this->actor.yawTowardsLink - this->actor.shape.rot.y;
+        this->actor.textId = 0x10B1;
+        if ((ABS(yawDiff) <= 0x2150) && (this->actor.xzDistFromLink < 100.0f)) {
+            func_8002F298(&this->actor, globalCtx, 100.0f, 7);
+        }
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E740.s")
+void EnHs_Update(Actor* thisx, GlobalContext* globalCtx) {
+    EnHs* this = THIS;
+    s32 pad;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E7BC.s")
+    Collider_CylinderUpdate(thisx, &this->collider);
+    CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+    Actor_MoveForward(&this->actor);
+    func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
+    if (SkelAnime_FrameUpdateMatrix(&this->skelAnime)) {
+        this->skelAnime.animCurrentFrame = 0.0f;
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E8CC.s")
+    this->actionFunc(this, globalCtx);
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E9AC.s")
+    if (this->unk_2A8 & 1) {
+        func_80038290(globalCtx, &this->actor, &this->unk_29C, &this->unk_2A2, this->actor.posRot2.pos);
+        this->unk_2A8 &= ~1;
+    } else {
+        Math_SmoothScaleMaxMinS(&this->unk_29C.x, 12800, 6, 6200, 100);
+        Math_SmoothScaleMaxMinS(&this->unk_29C.y, 0, 6, 6200, 100);
+        Math_SmoothScaleMaxMinS(&this->unk_2A2.x, 0, 6, 6200, 100);
+        Math_SmoothScaleMaxMinS(&this->unk_2A2.y, 0, 6, 6200, 100);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Update.s")
+s32 EnHs_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
+    EnHs* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6EC58.s")
+    switch (limbIndex) {
+        case 9:
+            rot->x += this->unk_29C.y;
+            rot->z += this->unk_29C.x;
+            break;
+        case 10:
+            *dList = NULL;
+            return 0;
+        case 11:
+            *dList = NULL;
+            return 0;
+        case 12:
+            if (this->actor.params == 1) {
+                *dList = NULL;
+                return 0;
+            }
+            break;
+        case 13:
+            if (this->actor.params == 1) {
+                *dList = NULL;
+                return 0;
+            }
+            break;
+    }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECBC.s")
+    return 0;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECC8.s")
+void EnHs_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
+    static Vec3f D_80A6EDFC = { 300.0f, 1000.0f, 0.0f };
+    EnHs* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ECE8.s")
+    if (limbIndex == 9) {
+        Matrix_MultVec3f(&D_80A6EDFC, &this->actor.posRot2.pos);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6ED14.s")
+void EnHs_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    EnHs* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s")
+    func_800943C8(globalCtx->state.gfxCtx);
+    SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.limbDrawTbl, this->skelAnime.dListCount,
+                          EnHs_OverrideLimbDraw, EnHs_PostLimbDraw, this);
+}
diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
index 707a137c0..b1311861f 100644
--- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h
+++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h
@@ -6,9 +6,19 @@
 
 struct EnHs;
 
+typedef void (*EnHsActionFunc)(struct EnHs*, GlobalContext*);
+
 typedef struct EnHs {
     /* 0x0000 */ Actor actor;
-    /* 0x014C */ char unk_14C[0x164];
+    /* 0x014C */ ColliderCylinder collider;
+    /* 0x0198 */ SkelAnime skelAnime;
+    /* 0x01DC */ Vec3s limbDrawTable[16];
+    /* 0x023C */ Vec3s transitionDrawTable[16];
+    /* 0x029C */ Vec3s unk_29C;
+    /* 0x02A2 */ Vec3s unk_2A2;
+    /* 0x02A8 */ u16 unk_2A8;
+    /* 0x02AA */ s16 unk_2AA;
+    /* 0x02AC */ EnHsActionFunc actionFunc;
 } EnHs; // size = 0x02B0
 
 extern const ActorInit En_Hs_InitVars;