En_Syateki_Okuta (Shooting Gallery Octorok) OK (#772)

* EnSyatekiOkuta_Init and EnSyatekiOkuta_Destroy OK * func_80A36260, func_80A362A8, func_80A362F8, and func_80A36350 OK * func_80A361F4 OK * Decomp a bunch of functions * Better match for func_80A368E0 * func_80A36CB0 OK * Draw functions OK * All functions OK * Import data to C * Use object symbols * Final cleanup and generated spec * Remove something I missed * char -> UNK_TYPE1 * Respond to reviews * Remove static from unnamed variables, whoops
2026-06-11 13:09:54 -04:00 · 2022-04-07 11:23:13 -07:00
parent 50c5ab0fc7
commit 8a0b0b7ec8
6 changed files with 481 additions and 48 deletions
@@ -0,0 +1,13 @@
+<Root>
+    <!-- Shooting Gallery Octorok assets -->
+    <File Name="ovl_En_Syateki_Okuta" BaseAddress="0x80A35FF0" RangeStart="0x1640" RangeEnd="0x1B98">
+        <DList Name="ovl_En_Syateki_Okuta_DL_001640" Offset="0x1640"/>
+        <Texture Name="ovl_En_Syateki_Okuta_Tex_001658" OutName="tex_001658" Format="ia16" Width="16" Height="16" Offset="0x1658"/>
+        <Texture Name="ovl_En_Syateki_Okuta_Tex_001858" OutName="tex_001858" Format="ia16" Width="16" Height="16" Offset="0x1858"/>
+        <Array Name="ovl_En_Syateki_Okuta_Vtx_001A58" Count="4" Offset="0x1A58">
+            <Vtx/>
+        </Array>
+        <DList Name="ovl_En_Syateki_Okuta_DL_001A98" Offset="0x1A98"/>
+        <DList Name="ovl_En_Syateki_Okuta_DL_001B18" Offset="0x1B18"/>
+    </File>
+</Root>
@@ -2722,8 +2722,7 @@ beginseg
    name "ovl_En_Syateki_Okuta"
    compress
    include "build/src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.o"
-    include "build/data/ovl_En_Syateki_Okuta/ovl_En_Syateki_Okuta.data.o"
-    include "build/data/ovl_En_Syateki_Okuta/ovl_En_Syateki_Okuta.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Syateki_Okuta/ovl_En_Syateki_Okuta_reloc.o"
 endseg

 beginseg
@@ -5,6 +5,7 @@
 */

 #include "z_en_syateki_okuta.h"
+#include "overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h"

 #define FLAGS (ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_8000000)

@@ -15,14 +16,18 @@ void EnSyatekiOkuta_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnSyatekiOkuta_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnSyatekiOkuta_Draw(Actor* thisx, GlobalContext* globalCtx);

+void func_80A36260(EnSyatekiOkuta* this);
 void func_80A362A8(EnSyatekiOkuta* this, GlobalContext* globalCtx);
+void func_80A362F8(EnSyatekiOkuta* this);
 void func_80A36350(EnSyatekiOkuta* this, GlobalContext* globalCtx);
 void func_80A363B4(EnSyatekiOkuta* this, GlobalContext* globalCtx);
+void func_80A36444(EnSyatekiOkuta* this);
 void func_80A36488(EnSyatekiOkuta* this, GlobalContext* globalCtx);
+void func_80A364C0(EnSyatekiOkuta* this);
 void func_80A36504(EnSyatekiOkuta* this, GlobalContext* globalCtx);
 void func_80A365EC(EnSyatekiOkuta* this, GlobalContext* globalCtx);
+void func_80A36CB0(EnSyatekiOkuta* this);

-#if 0
 const ActorInit En_Syateki_Okuta_InitVars = {
    ACTOR_EN_SYATEKI_OKUTA,
    ACTORCAT_ENEMY,
@@ -35,72 +40,483 @@ const ActorInit En_Syateki_Okuta_InitVars = {
    (ActorFunc)EnSyatekiOkuta_Draw,
 };

-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_80A37570 = {
-    { COLTYPE_HIT3, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
-    { ELEMTYPE_UNK1, { 0x00000000, 0x00, 0x00 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, },
+static ColliderCylinderInit sCylinderInit = {
+    {
+        COLTYPE_HIT3,
+        AT_NONE,
+        AC_ON | AC_TYPE_PLAYER,
+        OC1_ON | OC1_TYPE_ALL,
+        OC2_TYPE_1,
+        COLSHAPE_CYLINDER,
+    },
+    {
+        ELEMTYPE_UNK1,
+        { 0x00000000, 0x00, 0x00 },
+        { 0xF7CFFFFF, 0x00, 0x00 },
+        TOUCH_NONE | TOUCH_SFX_NORMAL,
+        BUMP_ON,
+        OCELEM_ON,
+    },
    { 20, 40, -30, { 0, 0, 0 } },
 };

-// static InitChainEntry sInitChain[] = {
-static InitChainEntry D_80A37B88[] = {
+static AnimationInfo sAnimations[] = {
+    { &object_okuta_Anim_00044C, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -1.0f },
+    { &object_okuta_Anim_003958, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -1.0f },
+    { &object_okuta_Anim_003B24, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -1.0f },
+    { &object_okuta_Anim_003EE4, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, -1.0f },
+    { &object_okuta_Anim_00466C, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -1.0f },
+    { &object_okuta_Anim_004204, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, -1.0f },
+};
+
+#include "assets/overlays/ovl_En_Syateki_Okuta/ovl_En_Syateki_Okuta.c"
+
+static InitChainEntry sInitChain[] = {
    ICHAIN_S8(hintId, 66, ICHAIN_CONTINUE),
    ICHAIN_F32(targetArrowOffset, 6500, ICHAIN_STOP),
 };

-#endif
+Color_RGBA8 D_80A37B90 = { 255, 255, 255, 255 };

-extern ColliderCylinderInit D_80A37570;
-extern InitChainEntry D_80A37B88[];
+Color_RGBA8 D_80A37B94 = { 150, 150, 150, 255 };

-extern UNK_TYPE D_0600466C;
+Vec3f D_80A37B98 = { 0.0f, -0.5, 0.0f };

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/EnSyatekiOkuta_Init.s")
+Color_RGBA8 D_80A37BA4 = { 255, 255, 255, 255 };

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/EnSyatekiOkuta_Destroy.s")
+Color_RGBA8 D_80A37BA8 = { 150, 150, 150, 0 };

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36148.s")
+void EnSyatekiOkuta_Init(Actor* thisx, GlobalContext* globalCtx) {
+    s32 pad;
+    EnSyatekiOkuta* this = THIS;
+    WaterBox* waterbox;
+    f32 ySurface;
+    s32 bgId;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A361B0.s")
+    Actor_ProcessInitChain(&this->actor, sInitChain);
+    SkelAnime_Init(globalCtx, &this->skelAnime, &object_okuta_Skel_0033D0, &object_okuta_Anim_00466C, this->jointTable,
+                   this->morphTable, OBJECT_OKUTA_LIMB_MAX);
+    Collider_InitCylinder(globalCtx, &this->collider);
+    Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A361F4.s")
+    this->actor.floorHeight = BgCheck_EntityRaycastFloor5(&globalCtx->colCtx, &this->actor.floorPoly, &bgId,
+                                                          &this->actor, &this->actor.world.pos);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36260.s")
+    if (!(WaterBox_GetSurface1_2(globalCtx, &globalCtx->colCtx, this->actor.world.pos.x, this->actor.world.pos.z,
+                                 &ySurface, &waterbox)) ||
+        (ySurface <= this->actor.floorHeight)) {
+        Actor_MarkForDeath(&this->actor);
+    } else {
+        this->actor.world.pos.y = this->actor.home.pos.y = ySurface;
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A362A8.s")
+    this->unk_2A4 = 0;
+    this->unk_2AA = 0;
+    func_80A36260(this);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A362F8.s")
+void EnSyatekiOkuta_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    EnSyatekiOkuta* this = THIS;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36350.s")
+    Collider_DestroyCylinder(globalCtx, &this->collider);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36360.s")
+void func_80A36148(Vec3f* pos, Vec3f* velocity, s16 scaleStep, GlobalContext* globalCtx) {
+    func_800B0DE0(globalCtx, pos, velocity, &gZeroVec3f, &D_80A37B90, &D_80A37B94, 400, scaleStep);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A363B4.s")
+void func_80A361B0(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+    EffectSsGSplash_Spawn(globalCtx, &this->actor.home.pos, NULL, NULL, 0, 800);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36444.s")
+s32 func_80A361F4(EnSyatekiOkuta* this) {
+    s32 temp_a0;
+    s32 temp_a1;
+    s32 temp_v1;
+    EnSyatekiMan* syatekiMan = (EnSyatekiMan*)this->actor.parent;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36488.s")
+    temp_v1 = EN_SYATEKI_OKUTA_GET_F(&this->actor);
+    if ((temp_v1 == 1) || (temp_v1 == 4)) {
+        temp_a0 = syatekiMan->unk_190;
+        temp_a1 = (temp_v1 * 2) + 6;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A364C0.s")
+        if ((temp_a0 >> temp_a1) & 3) {
+            return true;
+        }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36504.s")
+        if ((temp_a1 == 8) && ((temp_a0 >> 0xE) & 3)) {
+            return true;
+        }
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A3657C.s")
+    return false;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A365EC.s")
+void func_80A36260(EnSyatekiOkuta* this) {
+    Animation_PlayOnceSetSpeed(&this->skelAnime, &object_okuta_Anim_00466C, 0.0f);
+    this->actor.draw = NULL;
+    this->actionFunc = func_80A362A8;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A368E0.s")
+void func_80A362A8(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+    Actor* actorIt = globalCtx->actorCtx.actorLists[ACTORCAT_NPC].first;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36A90.s")
+    while (actorIt != NULL) {
+        if (actorIt->id == ACTOR_EN_SYATEKI_MAN) {
+            this->actor.parent = actorIt;
+            func_80A362F8(this);
+            break;
+        } else {
+            actorIt = actorIt->next;
+        }
+    }
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36AF8.s")
+void func_80A362F8(EnSyatekiOkuta* this) {
+    Animation_PlayOnceSetSpeed(&this->skelAnime, &object_okuta_Anim_00466C, 0.0f);
+    this->actor.draw = NULL;
+    Actor_SetScale(&this->actor, 0.01f);
+    this->actionFunc = func_80A36350;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/EnSyatekiOkuta_Update.s")
+void func_80A36350(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A36CB0.s")
+void func_80A36360(EnSyatekiOkuta* this) {
+    this->actor.draw = EnSyatekiOkuta_Draw;
+    this->unk_2AA = 0;
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 4);
+    this->actionFunc = func_80A363B4;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A370EC.s")
+void func_80A363B4(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+    if ((Animation_OnFrame(&this->skelAnime, 2.0f)) || (Animation_OnFrame(&this->skelAnime, 15.0f))) {
+        if (func_80A361F4(this)) {
+            return;
+        } else {
+            func_80A361B0(this, globalCtx);
+            Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_OCTAROCK_JUMP);
+        }
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/func_80A37294.s")
+    if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+        func_80A36444(this);
+    }
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Syateki_Okuta/EnSyatekiOkuta_Draw.s")
+void func_80A36444(EnSyatekiOkuta* this) {
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 3);
+    this->actionFunc = func_80A36488;
+}
+
+void func_80A36488(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+    EnSyatekiMan* syatekiMan = (EnSyatekiMan*)this->actor.parent;
+
+    if (syatekiMan->unk_26C >= 0x46) {
+        func_80A364C0(this);
+    }
+}
+
+void func_80A364C0(EnSyatekiOkuta* this) {
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 2);
+    this->actionFunc = func_80A36504;
+}
+
+void func_80A36504(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+    if (Animation_OnFrame(&this->skelAnime, 4.0f)) {
+        func_80A361B0(this, globalCtx);
+        Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_DAIOCTA_LAND);
+    } else if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+        func_80A362F8(this);
+    }
+}
+
+void func_80A3657C(EnSyatekiOkuta* this) {
+    this->unk_2A4 = 0;
+    this->unk_2AA = 300;
+    if (this->unk_2A6 == 1) {
+        Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_OCTAROCK_DEAD1);
+    }
+
+    Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 1);
+    this->actionFunc = func_80A365EC;
+}
+
+void func_80A365EC(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+    Vec3f sp84;
+    Vec3f sp78;
+    s32 pad;
+    s32 i;
+
+    if (this->unk_2AA > 0) {
+        this->unk_2AA -= 15;
+    }
+
+    if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
+        if (this->unk_2A4 == 0) {
+            sp78.x = this->actor.world.pos.x;
+            sp78.y = this->actor.world.pos.y + 40.0f;
+            sp78.z = this->actor.world.pos.z;
+            sp84.x = 0.0f;
+            sp84.y = -0.5f;
+            sp84.z = 0.0f;
+            func_80A36148(&sp78, &sp84, -20, globalCtx);
+            Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_OCTAROCK_DEAD2);
+        }
+
+        this->unk_2A4++;
+    }
+
+    if (Animation_OnFrame(&this->skelAnime, 15.0f)) {
+        func_80A361B0(this, globalCtx);
+    }
+
+    if (this->unk_2A4 < 3) {
+        Actor_SetScale(&this->actor, ((this->unk_2A4 * 0.25f) + 1.0f) * 0.01f);
+    } else if (this->unk_2A4 < 6) {
+        Actor_SetScale(&this->actor, (1.5f - ((this->unk_2A4 - 2) * 0.2333f)) * 0.01f);
+    } else if (this->unk_2A4 < 11) {
+        Actor_SetScale(&this->actor, (((this->unk_2A4 - 5) * 0.04f) + 0.8f) * 0.01f);
+    } else {
+        if (Math_StepToF(&this->actor.scale.x, 0.0f, 0.002f)) {
+            SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &this->actor.world.pos, 30, NA_SE_EN_COMMON_WATER_MID);
+            for (i = 0; i < 10; i++) {
+                sp84.x = (Rand_ZeroOne() - 0.5f) * 7.0f;
+                sp84.y = Rand_ZeroOne() * 7.0f;
+                sp84.z = (Rand_ZeroOne() - 0.5f) * 7.0f;
+                EffectSsDtBubble_SpawnCustomColor(globalCtx, &this->actor.world.pos, &sp84, &D_80A37B98, &D_80A37BA4,
+                                                  &D_80A37BA8, Rand_S16Offset(100, 50), 25, 0);
+            }
+
+            func_80A362F8(this);
+        }
+
+        this->actor.scale.y = this->actor.scale.x;
+        this->actor.scale.z = this->actor.scale.x;
+    }
+}
+
+void func_80A368E0(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+    this->collider.dim.height =
+        (sCylinderInit.dim.height - this->collider.dim.yShift) * this->unk_1D8.y * this->actor.scale.y * 100.0f;
+    this->collider.dim.radius = sCylinderInit.dim.radius * this->actor.scale.x * 100.0f;
+
+    if (this->actionFunc == func_80A363B4) {
+        if ((this->unk_2A6 == 2) && func_80A361F4(this)) {
+            return;
+        }
+
+        if (this->skelAnime.curFrame < (this->skelAnime.endFrame - 5.0f)) {
+            this->collider.dim.height *= 1.35f;
+        }
+    }
+
+    if (this->unk_2A6 == 1) {
+        this->collider.dim.radius += 10;
+        this->collider.dim.height += 15;
+    }
+
+    this->collider.dim.pos.x = this->actor.world.pos.x;
+    // jointTable->y is the y-translation of the skeleton root
+    this->collider.dim.pos.y = this->actor.world.pos.y + (this->skelAnime.jointTable->y * this->actor.scale.y);
+    this->collider.dim.pos.z = this->actor.world.pos.z;
+    CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+}
+
+s32 func_80A36A90(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+    if ((this->actionFunc == func_80A365EC) || (this->actionFunc == func_80A36350)) {
+        return false;
+    }
+
+    if (this->collider.base.acFlags & AC_HIT) {
+        this->collider.base.acFlags &= ~AC_HIT;
+        return true;
+    }
+
+    func_80A368E0(this, globalCtx);
+    return false;
+}
+
+void func_80A36AF8(EnSyatekiOkuta* this, GlobalContext* globalCtx) {
+    EnSyatekiMan* syatekiMan = (EnSyatekiMan*)this->actor.parent;
+    s16 temp_v1_2;
+
+    if ((this->actionFunc != func_80A36488) && (this->actionFunc != func_80A363B4) && (syatekiMan->unk_26A == 1) &&
+        (syatekiMan->unk_26C == 0)) {
+        temp_v1_2 = (syatekiMan->unk_190 >> (EN_SYATEKI_OKUTA_GET_F(&this->actor) * 2)) & 3;
+        if (temp_v1_2 > 0) {
+            Actor_SetScale(&this->actor, 0.01f);
+            this->unk_2A6 = temp_v1_2;
+            func_80A36360(this);
+        }
+    }
+}
+
+void EnSyatekiOkuta_Update(Actor* thisx, GlobalContext* globalCtx) {
+    s32 pad;
+    EnSyatekiOkuta* this = THIS;
+    EnSyatekiMan* syatekiMan;
+
+    this->actionFunc(this, globalCtx);
+
+    if (this->actionFunc != func_80A36350) {
+        SkelAnime_Update(&this->skelAnime);
+    }
+
+    func_80A36AF8(this, globalCtx);
+
+    if (func_80A36A90(this, globalCtx)) {
+        syatekiMan = (EnSyatekiMan*)this->actor.parent;
+        if (this->unk_2A6 == 1) {
+            Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_TRE_BOX_APPEAR);
+            globalCtx->interfaceCtx.unk_25C++;
+            syatekiMan->unk_280++;
+            syatekiMan->unk_26E = 1;
+        } else {
+            Actor_PlaySfxAtPos(&this->actor, NA_SE_SY_ERROR);
+            syatekiMan->unk_26E = 2;
+        }
+
+        func_80A3657C(this);
+    } else {
+        this->collider.base.acFlags &= ~AC_HIT;
+    }
+
+    func_80A36CB0(this);
+}
+
+void func_80A36CB0(EnSyatekiOkuta* this) {
+    f32 curFrame = this->skelAnime.curFrame;
+
+    if (this->actionFunc == func_80A363B4) {
+        if (curFrame < 8.0f) {
+            this->unk_1D8.x = this->unk_1D8.y = this->unk_1D8.z = 1.0f;
+        } else if (curFrame < 10.0f) {
+            this->unk_1D8.x = this->unk_1D8.z = 1.0f;
+            this->unk_1D8.y = ((curFrame - 7.0f) * 0.4f) + 1.0f;
+        } else if (curFrame < 14.0f) {
+            this->unk_1D8.x = this->unk_1D8.z = ((curFrame - 9.0f) * 0.075f) + 1.0f;
+            this->unk_1D8.y = 1.8f - ((curFrame - 9.0f) * 0.25f);
+        } else {
+            this->unk_1D8.x = this->unk_1D8.z = 1.3f - ((curFrame - 13.0f) * 0.05f);
+            this->unk_1D8.y = ((curFrame - 13.0f) * 0.0333f) + 0.8f;
+        }
+    } else if (this->actionFunc == func_80A36488) {
+        this->unk_1D8.x = this->unk_1D8.z = 1.0f;
+        this->unk_1D8.y = (sin_rad((M_PI / 16) * curFrame) * 0.2f) + 1.0f;
+    } else if (this->actionFunc == func_80A36504) {
+        if (curFrame < 3.0f) {
+            this->unk_1D8.y = 1.0f;
+        } else if (curFrame < 4.0f) {
+            this->unk_1D8.y = (curFrame - 2.0f) + 1.0f;
+        } else {
+            this->unk_1D8.y = 2.0f - ((curFrame - 3.0f) * 0.333f);
+        }
+        this->unk_1D8.x = this->unk_1D8.z = 1.0f;
+    } else if (this->actionFunc == func_80A365EC) {
+        curFrame += this->unk_2A4;
+        if (curFrame >= 35.0f) {
+            this->unk_1D8.x = this->unk_1D8.y = this->unk_1D8.z = 1.0f;
+        } else if (curFrame < 4.0f) {
+            this->unk_1D8.x = this->unk_1D8.z = 1.0f - (curFrame * 0.0666f);
+            this->unk_1D8.y = (curFrame * 0.1666f) + 1.0f;
+        } else if (curFrame < 25.0f) {
+            this->unk_1D8.x = this->unk_1D8.z = ((curFrame - 4.0f) * 0.01f) + 0.8f;
+            this->unk_1D8.y = 1.5f - ((curFrame - 4.0f) * 0.025f);
+        } else if (curFrame < 27.0f) {
+            this->unk_1D8.x = this->unk_1D8.y = this->unk_1D8.z = ((curFrame - 24.0f) * 0.25f) + 1.0f;
+        } else if (curFrame < 30.0f) {
+            this->unk_1D8.x = this->unk_1D8.y = this->unk_1D8.z = 1.5f - ((curFrame - 26.0f) * 0.233f);
+        } else {
+            this->unk_1D8.x = this->unk_1D8.y = this->unk_1D8.z = ((curFrame - 29.0f) * 0.04f) + 0.8f;
+        }
+    } else {
+        this->unk_1D8.x = this->unk_1D8.y = this->unk_1D8.z = 1.0f;
+    }
+}
+
+s32 func_80A370EC(EnSyatekiOkuta* this, f32 arg1, Vec3f* arg2) {
+    if (this->actionFunc == func_80A363B4) {
+        arg2->y = 1.0f;
+        arg2->z = 1.0f;
+        arg2->x = (sin_rad((M_PI / 16) * arg1) * 0.4f) + 1.0f;
+    } else if (this->actionFunc == func_80A365EC) {
+        if ((arg1 >= 35.0f) || (arg1 < 25.0f)) {
+            return false;
+        }
+
+        if (arg1 < 27.0f) {
+            arg2->z = 1.0f;
+            arg2->x = arg2->y = ((arg1 - 24.0f) * 0.5f) + 1.0f;
+        } else if (arg1 < 30.0f) {
+            arg2->z = (arg1 - 26.0f) * 0.333f + 1.0f;
+            arg2->x = arg2->y = 2.0f - (arg1 - 26.0f) * 0.333f;
+        } else {
+            arg2->z = 2.0f - ((arg1 - 29.0f) * 0.2f);
+            arg2->x = arg2->y = 1.0f;
+        }
+    } else {
+        return false;
+    }
+
+    return true;
+}
+
+s32 EnSyatekiOkuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                                    Actor* thisx) {
+    s32 pad;
+    Vec3f sp20;
+    f32 curFrame;
+    EnSyatekiOkuta* this = THIS;
+
+    curFrame = this->skelAnime.curFrame;
+    if (this->actionFunc == func_80A365EC) {
+        curFrame += this->unk_2A4;
+    }
+
+    if (limbIndex == OBJECT_OKUTA_LIMB_0E) {
+        sp20 = this->unk_1D8;
+        Matrix_Scale(sp20.x, sp20.y, sp20.z, MTXMODE_APPLY);
+    } else if ((limbIndex == OBJECT_OKUTA_LIMB_0F) && (func_80A370EC(this, curFrame, &sp20))) {
+        Matrix_Scale(sp20.x, sp20.y, sp20.z, MTXMODE_APPLY);
+    }
+
+    return false;
+}
+
+void EnSyatekiOkuta_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    EnSyatekiOkuta* this = THIS;
+
+    OPEN_DISPS(globalCtx->state.gfxCtx);
+
+    func_8012C28C(globalCtx->state.gfxCtx);
+    if (this->unk_2A6 == 1) {
+        gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
+    } else {
+        gSPSegment(POLY_OPA_DISP++, 0x08, ovl_En_Syateki_Okuta_DL_001640);
+    }
+
+    SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnSyatekiOkuta_OverrideLimbDraw,
+                      NULL, &this->actor);
+    func_8012C2DC(globalCtx->state.gfxCtx);
+    if (this->actionFunc == func_80A365EC) {
+        Matrix_InsertTranslation(this->actor.world.pos.x, this->actor.world.pos.y + 30.0f,
+                                 this->actor.world.pos.z + 20.0f, 0);
+
+        if (this->unk_2AA >= 256) {
+            gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 210, 64, 32, 255);
+        } else {
+            gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 210, 64, 32, this->unk_2AA);
+        }
+
+        gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+
+        if (this->unk_2A6 == 2) {
+            gSPDisplayList(POLY_XLU_DISP++, ovl_En_Syateki_Okuta_DL_001A98);
+        } else {
+            gSPDisplayList(POLY_XLU_DISP++, ovl_En_Syateki_Okuta_DL_001B18);
+        }
+    }
+
+    CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
@@ -2,16 +2,26 @@
 #define Z_EN_SYATEKI_OKUTA_H

 #include "global.h"
+#include "objects/object_okuta/object_okuta.h"
+
+#define EN_SYATEKI_OKUTA_GET_F(thisx) ((thisx)->params & 0xF)

 struct EnSyatekiOkuta;

 typedef void (*EnSyatekiOkutaActionFunc)(struct EnSyatekiOkuta*, GlobalContext*);

 typedef struct EnSyatekiOkuta {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x44];
-    /* 0x0188 */ EnSyatekiOkutaActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x120];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ SkelAnime skelAnime;
+    /* 0x188 */ EnSyatekiOkutaActionFunc actionFunc;
+    /* 0x18C */ ColliderCylinder collider;
+    /* 0x1DC */ Vec3f unk_1D8;
+    /* 0x1E4 */ Vec3s jointTable[OBJECT_OKUTA_LIMB_MAX];
+    /* 0x244 */ Vec3s morphTable[OBJECT_OKUTA_LIMB_MAX];
+    /* 0x2A4 */ s16 unk_2A4;
+    /* 0x2A6 */ s16 unk_2A6;
+    /* 0x2A8 */ UNK_TYPE1 unk_2A8[0x2];
+    /* 0x2AA */ s16 unk_2AA;
 } EnSyatekiOkuta; // size = 0x2AC

 extern const ActorInit En_Syateki_Okuta_InitVars;
@@ -10238,7 +10238,7 @@
    0x80A36B9C:("EnSyatekiOkuta_Update",),
    0x80A36CB0:("func_80A36CB0",),
    0x80A370EC:("func_80A370EC",),
-    0x80A37294:("func_80A37294",),
+    0x80A37294:("EnSyatekiOkuta_OverrideLimbDraw",),
    0x80A3735C:("EnSyatekiOkuta_Draw",),
    0x80A37ED0:("ObjShutter_Init",),
    0x80A37EE0:("ObjShutter_Destroy",),
@@ -1527,11 +1527,6 @@ D_0600D640 = 0x0600D640;
 D_06006C18 = 0x06006C18;
 D_0600D640 = 0x0600D640;

-// ovl_En_Syateki_Okuta
-
-D_060033D0 = 0x060033D0;
-D_0600466C = 0x0600466C;
-
 // ovl_En_S_Goro

 D_060091A8 = 0x060091A8;