ovl_En_Du (#630)

* Decompiled

* asm

Co-authored-by: Thar0 <maximilianc64@gmail.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>

2 files changed, 575 insertions, 61 deletions

diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c
index eb2aba76c..b9b8b0f11 100644
--- a/src/overlays/actors/ovl_En_Du/z_en_du.c
+++ b/src/overlays/actors/ovl_En_Du/z_en_du.c
@@ -9,13 +9,19 @@ void EnDu_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnDu_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnDu_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-extern UNK_TYPE D_020059E0;
-extern UNK_TYPE D_02006930;
-extern UNK_TYPE D_02007DE0;
-extern UNK_TYPE D_060041F4;
-extern UNK_TYPE D_06011CA8;
+void func_809FE3B4(EnDu* this, GlobalContext* globalCtx);
+void func_809FE3C0(EnDu* this, GlobalContext* globalCtx);
+void func_809FE638(EnDu* this, GlobalContext* globalCtx);
+void func_809FE890(EnDu* this, GlobalContext* globalCtx);
+void func_809FE4A4(EnDu* this, GlobalContext* globalCtx);
+void func_809FE6CC(EnDu* this, GlobalContext* globalCtx);
+void func_809FE740(EnDu* this, GlobalContext* globalCtx);
+void func_809FE798(EnDu* this, GlobalContext* globalCtx);
+void func_809FEC14(EnDu* this, GlobalContext* globalCtx);
+void func_809FEC70(EnDu* this, GlobalContext* globalCtx);
+void func_809FECE4(EnDu* this, GlobalContext* globalCtx);
+void func_809FEB08(EnDu* this, GlobalContext* globalCtx);
 
-/*
 const ActorInit En_Du_InitVars = {
     ACTOR_EN_DU,
     ACTORCAT_NPC,
@@ -28,7 +34,7 @@ const ActorInit En_Du_InitVars = {
     (ActorFunc)EnDu_Draw,
 };
 
-static ColliderCylinderInit D_809FF230 = {
+static ColliderCylinderInit sCylinderInit = {
     {
         COLTYPE_NONE,
         AT_NONE,
@@ -47,59 +53,549 @@ static ColliderCylinderInit D_809FF230 = {
     },
     { 20, 46, 0, { 0, 0, 0 } },
 };
-*/
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC30.s")
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDCDC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDDB4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE24.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDE9C.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDFC0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE000.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE040.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE104.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3B4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE3C0.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE4A4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE638.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE6CC.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE740.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE798.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FE890.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEB08.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC14.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEC70.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FECE4.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Update.s")
-
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FEEA4.s")
+static CollisionCheckInfoInit2 sColChkInfoInit = {
+    0, 0, 0, 0, MASS_IMMOVABLE,
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/func_809FF018.s")
+static struct_80034EC0_Entry sAnimations[] = {
+    { 0x06006EB0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },   { 0x06006EB0, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
+    { 0x06000800, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, { 0x06000D00, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
+    { 0x06001D70, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, { 0x06002374, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f },
+    { 0x0600288C, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, -10.0f }, { 0x06002D94, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -10.0f },
+    { 0x06002D94, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },   { 0x06003D48, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+    { 0x06004C04, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },   { 0x06003A30, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+    { 0x060046F4, 1.0f, 0.0f, -1.0f, ANIMMODE_LOOP, 0.0f },   { 0x06004ED8, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, 0.0f },
+    { 0x060041F4, 1.0f, 0.0f, -1.0f, ANIMMODE_ONCE, -6.0f },
+};
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s")
+extern CutsceneData D_020059E0[];
+extern CutsceneData D_02006930[];
+extern CutsceneData D_02007DE0[];
+
+extern AnimationHeader D_060041F4;
+extern FlexSkeletonHeader D_06011CA8;
+
+void EnDu_SetupAction(EnDu* this, EnDuActionFunc actionFunc) {
+    this->actionFunc = actionFunc;
+}
+
+u16 func_809FDC38(GlobalContext* globalCtx, Actor* actor) {
+    u16 reaction = Text_GetFaceReaction(globalCtx, 0x21);
+
+    if (reaction != 0) {
+        return reaction;
+    }
+    if (CUR_UPG_VALUE(UPG_STRENGTH)) {
+        if (CHECK_QUEST_ITEM(QUEST_GORON_RUBY)) {
+            return 0x301E;
+        } else {
+            return 0x301D;
+        }
+    }
+    if (gSaveContext.infTable[0x11] & 8) {
+        return 0x301B;
+    } else {
+        return 0x301A;
+    }
+}
+
+s16 func_809FDCDC(GlobalContext* globalCtx, Actor* actor) {
+    switch (func_8010BDBC(&globalCtx->msgCtx)) {
+        case 0:
+        case 1:
+            break;
+        case 2:
+            switch (actor->textId) {
+                case 0x301A:
+                    gSaveContext.infTable[0x11] |= 8;
+                    break;
+                case 0x301C:
+                case 0x301F:
+                    return 2;
+                case 0x3020:
+                    gSaveContext.eventChkInf[0x2] |= 4;
+                    break;
+            }
+            return 0;
+        case 3:
+        case 4:
+        case 5:
+            break;
+        case 6:
+            if (func_80106BC8(globalCtx)) {
+                return 3;
+            }
+            break;
+        case 7:
+        case 8:
+        case 9:
+            break;
+    }
+    return 1;
+}
+
+s32 func_809FDDB4(EnDu* this, GlobalContext* globalCtx) {
+    if (globalCtx->sceneNum == SCENE_SPOT18 && gSaveContext.linkAge == 1) {
+        return 1;
+    } else if (globalCtx->sceneNum == SCENE_HIDAN && !(gSaveContext.infTable[0x11] & 0x400) && LINK_IS_ADULT) {
+        return 1;
+    }
+    return 0;
+}
+
+void func_809FDE24(EnDu* this, GlobalContext* globalCtx) {
+    Player* player = PLAYER;
+    s16 phi_a3 = 0;
+
+    if (this->unk_1F4.unk_00 == 0) {
+        phi_a3 = 1;
+    }
+    if (this->actionFunc == func_809FE890) {
+        phi_a3 = 1;
+    }
+    this->unk_1F4.unk_18 = player->actor.world.pos;
+    this->unk_1F4.unk_14 = 10.0f;
+    func_80034A14(&this->actor, &this->unk_1F4, 3, phi_a3);
+}
+
+void func_809FDE9C(EnDu* this) {
+    if (this->unk_1F2 > 0) {
+        this->unk_1F2--;
+    } else {
+        this->unk_1F2 = 0;
+    }
+    if (this->unk_1F2 < 3) {
+        this->unk_1EF = this->unk_1F2;
+    }
+
+    switch (this->unk_1EC) {
+        case 0:
+            if (this->unk_1F2 == 0) {
+                this->unk_1F2 = Rand_S16Offset(0x1E, 0x1E);
+            }
+            break;
+        case 1:
+            if (this->unk_1F2 == 0) {
+                this->unk_1EF = 2;
+            }
+            break;
+        case 2:
+            if (this->unk_1F2 == 0) {
+                this->unk_1EF = 2;
+            }
+            break;
+        case 3:
+            if (this->unk_1F2 == 0) {
+                this->unk_1EF = 0;
+            }
+            break;
+    }
+
+    switch (this->unk_1ED) {
+        case 1:
+            this->unk_1F0 = 1;
+            break;
+        case 2:
+            this->unk_1F0 = 2;
+            break;
+        case 3:
+            this->unk_1F0 = 3;
+            break;
+        default:
+            this->unk_1F0 = 0;
+            break;
+    }
+    if (this->unk_1EE == 1) {
+        this->unk_1F1 = 1;
+    } else {
+        this->unk_1F1 = 0;
+    }
+}
+
+void func_809FDFC0(CsCmdActorAction* csAction, Vec3f* dst) {
+    dst->x = csAction->startPos.x;
+    dst->y = csAction->startPos.y;
+    dst->z = csAction->startPos.z;
+}
+
+void func_809FE000(CsCmdActorAction* csAction, Vec3f* dst) {
+    dst->x = csAction->endPos.x;
+    dst->y = csAction->endPos.y;
+    dst->z = csAction->endPos.z;
+}
+
+void func_809FE040(EnDu* this) {
+    s32 animationIndices[] = { 8, 8, 8, 8, 9, 10, 10, 13 };
+
+    if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+        this->unk_1E6++;
+        if (this->unk_1E6 >= 8) {
+            this->unk_1E6 = 0;
+        }
+        func_80034EC0(&this->skelAnime, sAnimations, animationIndices[this->unk_1E6]);
+    }
+}
+
+void func_809FE104(EnDu* this) {
+    s32 animationIndices[] = { 8, 8, 11, 12 };
+
+    if (this->unk_1E6 < 4) {
+        if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+            this->unk_1E6++;
+            if (this->unk_1E6 < 4) {
+                func_80034EC0(&this->skelAnime, sAnimations, animationIndices[this->unk_1E6]);
+            }
+        }
+    }
+}
+
+void EnDu_Init(Actor* thisx, GlobalContext* globalCtx) {
+    EnDu* this = THIS;
+    s32 pad;
+
+    ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawCircle, 30.0f);
+    SkelAnime_InitFlex(globalCtx, &this->skelAnime, &D_06011CA8, NULL, 0, 0, 0);
+    Collider_InitCylinder(globalCtx, &this->collider);
+    Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
+    CollisionCheck_SetInfo2(&this->actor.colChkInfo, DamageTable_Get(0x16), &sColChkInfoInit);
+    if (func_809FDDB4(this, globalCtx) == 0) {
+        Actor_Kill(&this->actor);
+        return;
+    }
+    func_80034EC0(&this->skelAnime, sAnimations, 0);
+    Actor_SetScale(&this->actor, 0.01f);
+    this->actor.targetMode = 1;
+    this->unk_1F4.unk_00 = 0;
+
+    if (gSaveContext.cutsceneIndex >= 0xFFF0) {
+        globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_02006930);
+        gSaveContext.cutsceneTrigger = 1;
+        EnDu_SetupAction(this, func_809FE890);
+    } else if (globalCtx->sceneNum == 4) {
+        EnDu_SetupAction(this, func_809FE638);
+    } else if (gSaveContext.linkAge != 0) {
+        EnDu_SetupAction(this, func_809FE3C0);
+    } else {
+        EnDu_SetupAction(this, func_809FE3B4);
+    }
+}
+
+void EnDu_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    EnDu* this = THIS;
+
+    SkelAnime_Free(&this->skelAnime, globalCtx);
+    Collider_DestroyCylinder(globalCtx, &this->collider);
+}
+
+void func_809FE3B4(EnDu* this, GlobalContext* globalCtx) {
+}
+
+void func_809FE3C0(EnDu* this, GlobalContext* globalCtx) {
+    Player* player = PLAYER;
+
+    if (player->stateFlags2 & 0x1000000) {
+        func_8010BD88(globalCtx, 0x22);
+        player->stateFlags2 |= 0x2000000;
+        player->unk_6A8 = &this->actor;
+        EnDu_SetupAction(this, func_809FE4A4);
+        return;
+    }
+    if (this->unk_1F4.unk_00 == 2) {
+        func_8002DF54(globalCtx, &this->actor, 7);
+        this->unk_1F4.unk_00 = 0;
+    }
+    if (this->actor.xzDistToPlayer < 116.0f + this->collider.dim.radius) {
+        player->stateFlags2 |= 0x800000;
+    }
+}
+
+void func_809FE4A4(EnDu* this, GlobalContext* globalCtx) {
+    Player* player = PLAYER;
+
+    if (globalCtx->msgCtx.unk_E3EE == 4) {
+        globalCtx->msgCtx.unk_E3EE = 0;
+        EnDu_SetupAction(this, func_809FE3C0);
+    } else if (globalCtx->msgCtx.unk_E3EE >= 6) {
+        globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_02007DE0);
+        gSaveContext.cutsceneTrigger = 1;
+        this->unk_1E8 = 1;
+        EnDu_SetupAction(this, func_809FE890);
+        globalCtx->msgCtx.unk_E3EE = 4;
+    } else if (globalCtx->msgCtx.unk_E3EE == 3) {
+        Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
+        globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(D_020059E0);
+        gSaveContext.cutsceneTrigger = 1;
+        this->unk_1E8 = 0;
+        EnDu_SetupAction(this, func_809FE890);
+        globalCtx->msgCtx.unk_E3EE = 4;
+    } else {
+        player->stateFlags2 |= 0x800000;
+    }
+}
+
+void func_809FE638(EnDu* this, GlobalContext* globalCtx) {
+    Player* player = PLAYER;
+
+    if (!(player->stateFlags1 & 0x20000000)) {
+        func_800800F8(globalCtx, 0xD02, -0x63, &this->actor, 0);
+        player->actor.shape.rot.y = player->actor.world.rot.y = this->actor.world.rot.y + 0x7FFF;
+        func_800F5C64(0x51);
+        EnDu_SetupAction(this, func_809FE6CC);
+        this->unk_1E2 = 0x32;
+    }
+}
+
+void func_809FE6CC(EnDu* this, GlobalContext* globalCtx) {
+    s16 phi_v1;
+
+    if (this->unk_1E2 == 0) {
+        phi_v1 = 0;
+    } else {
+        this->unk_1E2--;
+        phi_v1 = this->unk_1E2;
+    }
+    if (phi_v1 == 0) {
+        this->actor.textId = 0x3039;
+        func_8010B680(globalCtx, this->actor.textId, NULL);
+        this->unk_1F4.unk_00 = 1;
+        EnDu_SetupAction(this, func_809FE740);
+    }
+}
+
+void func_809FE740(EnDu* this, GlobalContext* globalCtx) {
+    if (this->unk_1F4.unk_00 == 0) {
+        func_8005B1A4(ACTIVE_CAM);
+        this->unk_1E2 = 0x5A;
+        EnDu_SetupAction(this, func_809FE798);
+    }
+}
+
+void func_809FE798(EnDu* this, GlobalContext* globalCtx) {
+    s32 phi_v0;
+
+    if (this->unk_1E2 == 0) {
+        phi_v0 = 0;
+    } else {
+        this->unk_1E2--;
+        phi_v0 = this->unk_1E2;
+    }
+    if (phi_v0 != 0) {
+        switch (this->unk_1E2) {
+            case 0x50:
+                Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHAIN_KEY_UNLOCK_B);
+                break;
+            case 0x3C:
+                Audio_PlayActorSound2(&this->actor, NA_SE_EV_SLIDE_DOOR_OPEN);
+                break;
+            case 0xF:
+                Audio_PlayActorSound2(&this->actor, NA_SE_EV_SLIDE_DOOR_CLOSE);
+                break;
+            case 5:
+                Audio_PlayActorSound2(&this->actor, NA_SE_EV_STONE_BOUND);
+                break;
+        }
+        if (this->unk_1E2 >= 0x3D) {
+            this->actor.world.pos.x -= 10.0f;
+        }
+    } else {
+        Actor_Kill(&this->actor);
+        gSaveContext.infTable[0x11] |= 0x400;
+    }
+}
+
+void func_809FE890(EnDu* this, GlobalContext* globalCtx) {
+    f32 frame;
+    Vec3f startPos;
+    Vec3f endPos;
+    Vec3f velocity = { 0.0f, 0.0f, 0.0f };
+    CsCmdActorAction* csAction;
+
+    if (globalCtx->csCtx.state == 0) {
+        func_8002DF54(globalCtx, &this->actor, 1);
+        EnDu_SetupAction(this, func_809FEB08);
+        return;
+    }
+    csAction = globalCtx->csCtx.npcActions[2];
+
+    if (csAction != NULL) {
+        func_809FDFC0(csAction, &startPos);
+        func_809FE000(csAction, &endPos);
+        if (this->unk_1EA == 0) {
+            func_809FDFC0(csAction, &startPos);
+            this->actor.world.pos = startPos;
+        }
+        if (this->unk_1EA != csAction->action) {
+            if (csAction->action == 1) {
+                func_80034EC0(&this->skelAnime, sAnimations, 1);
+            }
+            if (csAction->action == 7 || csAction->action == 8) {
+                this->unk_1E6 = 0;
+                func_80034EC0(&this->skelAnime, sAnimations, 7);
+            }
+            this->unk_1EA = csAction->action;
+            if (this->unk_1EA == 7) {
+                this->unk_1F2 = 0xB;
+                this->unk_1EC = 2;
+                this->unk_1ED = 2;
+                this->unk_1EE = 1;
+            }
+            if (this->unk_1EA == 8) {
+                this->unk_1F2 = 0xB;
+                this->unk_1EC = 3;
+                this->unk_1ED = 3;
+                this->unk_1EE = 0;
+            }
+        }
+        if (this->unk_1EA == 7) {
+            func_809FE040(this);
+        }
+        if (this->unk_1EA == 8) {
+            func_809FE104(this);
+        }
+        this->actor.shape.rot.x = csAction->urot.x;
+        this->actor.shape.rot.y = csAction->urot.y;
+        this->actor.shape.rot.z = csAction->urot.z;
+        this->actor.velocity = velocity;
+
+        if (globalCtx->csCtx.frames < csAction->endFrame) {
+            frame = csAction->endFrame - csAction->startFrame;
+
+            this->actor.velocity.x = (endPos.x - startPos.x) / frame;
+            this->actor.velocity.y = (endPos.y - startPos.y) / frame;
+            this->actor.velocity.y += this->actor.gravity;
+            if (this->actor.velocity.y < this->actor.minVelocityY) {
+                this->actor.velocity.y = this->actor.minVelocityY;
+            }
+            this->actor.velocity.z = (endPos.z - startPos.z) / frame;
+        }
+    }
+}
+
+void func_809FEB08(EnDu* this, GlobalContext* globalCtx) {
+    this->unk_1F2 = 0xB;
+    this->unk_1EC = 0;
+    this->unk_1ED = 0;
+    this->unk_1EE = 0;
+
+    if (this->unk_1E8 == 1) {
+        func_8002DF54(globalCtx, &this->actor, 7);
+        func_80034EC0(&this->skelAnime, sAnimations, 1);
+        EnDu_SetupAction(this, func_809FE3C0);
+        return;
+    }
+    if (CUR_UPG_VALUE(UPG_STRENGTH) <= 0) {
+        this->actor.textId = 0x301C;
+        EnDu_SetupAction(this, func_809FEC14);
+    } else {
+        this->actor.textId = 0x301F;
+        EnDu_SetupAction(this, func_809FE3C0);
+    }
+    func_8010B680(globalCtx, this->actor.textId, NULL);
+    func_80034EC0(&this->skelAnime, sAnimations, 0xE);
+    this->unk_1F4.unk_00 = 1;
+}
+
+void func_809FEC14(EnDu* this, GlobalContext* globalCtx) {
+    if (this->unk_1F4.unk_00 == 2) {
+        func_8002DF54(globalCtx, &this->actor, 7);
+        EnDu_SetupAction(this, func_809FEC70);
+        func_809FEC70(this, globalCtx);
+    }
+}
+
+void func_809FEC70(EnDu* this, GlobalContext* globalCtx) {
+    if (Actor_HasParent(&this->actor, globalCtx)) {
+        this->actor.parent = NULL;
+        EnDu_SetupAction(this, func_809FECE4);
+    } else {
+        f32 xzRange = this->actor.xzDistToPlayer + 1.0f;
+        func_8002F434(&this->actor, globalCtx, 0x54, xzRange, fabsf(this->actor.yDistToPlayer) + 1.0f);
+    }
+}
+
+void func_809FECE4(EnDu* this, GlobalContext* globalCtx) {
+    if (this->unk_1F4.unk_00 == 3) {
+        this->unk_1F4.unk_00 = 0;
+        EnDu_SetupAction(this, func_809FE3C0);
+    }
+}
+
+void EnDu_Update(Actor* thisx, GlobalContext* globalCtx) {
+    EnDu* this = THIS;
+    s32 pad;
+
+    Collider_UpdateCylinder(&this->actor, &this->collider);
+    CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+
+    if (this->skelAnime.animation == &D_060041F4 && Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+        func_80034EC0(&this->skelAnime, sAnimations, 1);
+    }
+
+    SkelAnime_Update(&this->skelAnime);
+    func_809FDE9C(this);
+    func_809FDE24(this, globalCtx);
+
+    if (this->actionFunc == func_809FE890) {
+        this->actor.world.pos.x += this->actor.velocity.x;
+        this->actor.world.pos.y += this->actor.velocity.y;
+        this->actor.world.pos.z += this->actor.velocity.z;
+    } else {
+        func_8002D7EC(&this->actor);
+    }
+
+    Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
+
+    if (this->actionFunc != func_809FE4A4) {
+        func_800343CC(globalCtx, &this->actor, &this->unk_1F4.unk_00, this->collider.dim.radius + 116.0f, func_809FDC38,
+                      func_809FDCDC);
+    }
+    this->actionFunc(this, globalCtx);
+}
+
+s32 EnDu_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx,
+                          Gfx** gfx) {
+    EnDu* this = THIS;
+    Vec3s sp1C;
+
+    if (limbIndex == 16) {
+        Matrix_Translate(2400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
+        sp1C = this->unk_1F4.unk_08;
+        Matrix_RotateX(BINANG_TO_RAD(sp1C.y), MTXMODE_APPLY);
+        Matrix_RotateZ(BINANG_TO_RAD(sp1C.x), MTXMODE_APPLY);
+        Matrix_Translate(-2400.0f, 0.0f, 0.0f, MTXMODE_APPLY);
+    }
+    if (limbIndex == 8) {
+        sp1C = this->unk_1F4.unk_0E;
+        Matrix_RotateY(BINANG_TO_RAD(sp1C.y), MTXMODE_APPLY);
+        Matrix_RotateX(BINANG_TO_RAD(sp1C.x), MTXMODE_APPLY);
+    }
+    return 0;
+}
+
+void EnDu_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx, Gfx** gfx) {
+    EnDu* this = THIS;
+    Vec3f D_809FF40C = { 0.0f, -1000.0f, 0.0f };
+
+    if (limbIndex == 16) {
+        Matrix_MultVec3f(&D_809FF40C, &this->actor.focus.pos);
+    }
+}
+
+void EnDu_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    static UNK_TYPE D_809FF418[] = { 0x06008080, 0x06008480, 0x06008880, 0x0600A540 };
+    static UNK_TYPE D_809FF428[] = { 0x06008C80, 0x06009D40, 0x0600A940, 0x0600B180 };
+    static UNK_TYPE D_809FF438[] = { 0x06007FC0, 0x0600B140 };
+
+    EnDu* this = THIS;
+
+    OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_du.c", 1470);
+
+    gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809FF418[this->unk_1EF]));
+    gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(D_809FF428[this->unk_1F0]));
+    gSPSegment(POLY_OPA_DISP++, 0x0A, SEGMENTED_TO_VIRTUAL(D_809FF438[this->unk_1F1]));
+
+    func_80034BA0(globalCtx, &this->skelAnime, EnDu_OverrideLimbDraw, EnDu_PostLimbDraw, &this->actor, 255);
+
+    CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_du.c", 1487);
+}
diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.h b/src/overlays/actors/ovl_En_Du/z_en_du.h
index f2fe848d0..0b9ffcbd8 100644
--- a/src/overlays/actors/ovl_En_Du/z_en_du.h
+++ b/src/overlays/actors/ovl_En_Du/z_en_du.h
@@ -6,9 +6,27 @@
 
 struct EnDu;
 
+typedef void (*EnDuActionFunc)(struct EnDu*, GlobalContext*);
+
 typedef struct EnDu {
     /* 0x0000 */ Actor actor;
-    /* 0x014C */ char unk_14C[0xD0];
+    /* 0x014C */ SkelAnime skelAnime;
+    /* 0x0190 */ EnDuActionFunc actionFunc;
+    /* 0x0194 */ ColliderCylinder collider;
+    /* 0x01E0 */ char unk_1E0[0x2];
+    /* 0x01E2 */ s16 unk_1E2;
+    /* 0x01E4 */ char unk_1E4[0x2];
+    /* 0x01E6 */ s16 unk_1E6;
+    /* 0x01E8 */ s16 unk_1E8;
+    /* 0x01EA */ s16 unk_1EA;
+    /* 0x01EC */ u8 unk_1EC;
+    /* 0x01ED */ u8 unk_1ED;
+    /* 0x01EE */ u8 unk_1EE;
+    /* 0x01EF */ u8 unk_1EF;
+    /* 0x01F0 */ u8 unk_1F0;
+    /* 0x01F1 */ u8 unk_1F1;
+    /* 0x01F2 */ s16 unk_1F2;
+    /* 0x01F4 */ struct_80034A14_arg1 unk_1F4;
 } EnDu; // size = 0x021C
 
 extern const ActorInit En_Du_InitVars;