En_Baba (#592)

* En_Baba * Merge * Merge * PR * PR * Apply suggestions from code review Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Baba/z_en_baba.c * format Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: angie <angheloalf95@gmail.com>
2022-02-19 20:38:52 +00:00 · 2022-02-19 20:38:52 +00:00 · c91423abae
parent 2b5fe949fe
commit c91423abae
5 changed files with 706 additions and 57 deletions
--- a/3
+++ b/3
@ -4508,8 +4508,7 @@ beginseg
    name "ovl_En_Baba"
    compress
    include "build/src/overlays/actors/ovl_En_Baba/z_en_baba.o"
-    include "build/data/ovl_En_Baba/ovl_En_Baba.data.o"
-    include "build/data/ovl_En_Baba/ovl_En_Baba.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Baba/ovl_En_Baba_reloc.o"
 endseg

 beginseg
--- a/src/overlays/actors/ovl_En_Baba/z_en_baba.c
+++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.c
@ -5,8 +5,10 @@
 */

 #include "z_en_baba.h"
+#include "overlays/actors/ovl_En_Ossan/z_en_ossan.h"
+#include "objects/object_bba/object_bba.h"

-#define FLAGS 0x00000019
+#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_8 | ACTOR_FLAG_10)

 #define THIS ((EnBaba*)thisx)

@ -27,7 +29,6 @@ void func_80BA9E00(EnBaba* this, GlobalContext* globalCtx);
 void func_80BA9E10(EnBaba* this, GlobalContext* globalCtx);
 void func_80BA9E48(EnBaba* this, GlobalContext* globalCtx);

-#if 0
 const ActorInit En_Baba_InitVars = {
    ACTOR_EN_BABA,
    ACTORCAT_NPC,
@ -40,18 +41,38 @@ const ActorInit En_Baba_InitVars = {
    (ActorFunc)EnBaba_Draw,
 };

-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_80BAA430 = {
-    { COLTYPE_NONE, 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 AnimationInfo sAnimations[] = {
+    { &object_bba_Anim_005DC4, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f },
+    { &object_bba_Anim_006550, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f },
+    { &object_bba_Anim_006B10, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f },
+    { &object_bba_Anim_005154, 1.0f, 0.0f, 0.0f, ANIMMODE_ONCE, 0.0f },
+    { &object_bba_Anim_0058B8, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f },
+    { &object_bba_Anim_004910, 1.0f, 0.0f, 0.0f, ANIMMODE_LOOP, 0.0f },
+};
+
+static ColliderCylinderInit sCylinderInit = {
+    {
+        COLTYPE_NONE,
+        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,
+    },
    { 18, 64, 0, { 0, 0, 0 } },
 };

-// sColChkInfoInit
-static CollisionCheckInfoInit2 D_80BAA45C = { 0, 0, 0, 0, MASS_IMMOVABLE };
+static CollisionCheckInfoInit2 sColChkInfoInit = { 0, 0, 0, 0, MASS_IMMOVABLE };

-// static DamageTable sDamageTable = {
-static DamageTable D_80BAA468 = {
+static DamageTable sDamageTable = {
    /* Deku Nut       */ DMG_ENTRY(1, 0x0),
    /* Deku Stick     */ DMG_ENTRY(1, 0x0),
    /* Horse trample  */ DMG_ENTRY(1, 0x0),
@ -86,67 +107,660 @@ static DamageTable D_80BAA468 = {
    /* Powder Keg     */ DMG_ENTRY(1, 0x0),
 };

-#endif
+s32 D_80BAA488[] = {
+    0x0C000119, 0x0A006E14, 0x02000000, 0x1E080F00, 0x1E030400, 0x01050E00, 0x00001E02, 0x05050000,
+};

-extern ColliderCylinderInit D_80BAA430;
-extern CollisionCheckInfoInit2 D_80BAA45C;
-extern DamageTable D_80BAA468;
+s32 D_80BAA4A8[] = { -1, -1, 0 };

-extern UNK_TYPE D_06006B10;
-extern UNK_TYPE D_060092A0;
+u16 D_80BAA4B4[] = { 4000, 4, 1, 3, 6000, 4, 1, 6, 4000, 4, 1, 3, 6000, 4, 1, 6 };

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA8820.s")
+s32 func_80BA8820(EnBaba* this, GlobalContext* globalCtx) {
+    this->unk_144 = (EnOssan*)SubS_FindActor(globalCtx, &this->unk_144->actor, ACTORCAT_NPC, ACTOR_EN_OSSAN);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA886C.s")
+    if (this->unk_144 != NULL) {
+        return true;
+    }
+    return false;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA8C4C.s")
+void func_80BA886C(EnBaba* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA8C90.s")
+    switch (this->unk_1E0) {
+        case 0:
+            if (this->unk_40A & 8) {
+                if (gSaveContext.weekEventReg[33] & 8) {
+                    this->unk_1E0 = 0x2A34;
+                    break;
+                }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA8D2C.s")
+                if (gSaveContext.weekEventReg[79] & 0x40) {
+                    this->unk_40A |= 1;
+                    this->unk_1E0 = 0x2A33;
+                    break;
+                }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA8DF4.s")
+                this->unk_40A |= 1;
+                this->unk_1E0 = 0x2A32;
+                break;
+            } else if (player->transformation == PLAYER_FORM_DEKU) {
+                if (!(gSaveContext.weekEventReg[79] & 0x20)) {
+                    gSaveContext.weekEventReg[79] |= 0x20;
+                    this->unk_40A |= 1;
+                    this->unk_1E0 = 0x2A37;
+                    break;
+                } else {
+                    this->unk_40A |= 1;
+                    this->unk_1E0 = 0x2A38;
+                }
+                break;
+            } else if (!(gSaveContext.weekEventReg[33] & 8)) {
+                if (!(gSaveContext.weekEventReg[73] & 1)) {
+                    this->unk_1E0 = 0x660;
+                    break;
+                }
+                this->unk_1E0 = 0x662;
+                break;
+            } else {
+                if (!(gSaveContext.weekEventReg[73] & 2)) {
+                    this->unk_1E0 = 0x65A;
+                    break;
+                }
+                this->unk_1E0 = 0x65E;
+                break;
+            }
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA8F88.s")
+        case 0x660:
+            Actor_ChangeFocus(&this->actor, globalCtx, &this->unk_144->actor);
+            this->unk_1E0 = 0x661;
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9110.s")
+        case 0x661:
+            Actor_ChangeFocus(&this->unk_144->actor, globalCtx, &this->actor);
+            this->unk_1E0 = 0x662;
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9160.s")
+        case 0x662:
+            Actor_ChangeFocus(&this->actor, globalCtx, &this->unk_144->actor);
+            this->unk_1E0 = 0x663;
+            gSaveContext.weekEventReg[73] |= 1;
+            this->unk_40A |= 1;
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA93AC.s")
+        case 0x65A:
+            Actor_ChangeFocus(&this->actor, globalCtx, &this->unk_144->actor);
+            this->unk_1E0 = 0x65B;
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9480.s")
+        case 0x65B:
+            Actor_ChangeFocus(&this->unk_144->actor, globalCtx, &this->actor);
+            this->unk_1E0 = 0x65C;
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9758.s")
+        case 0x65C:
+            Actor_ChangeFocus(&this->actor, globalCtx, &this->unk_144->actor);
+            this->unk_1E0 = 0x65D;
+            gSaveContext.weekEventReg[73] |= 2;
+            this->unk_40A |= 1;
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9848.s")
+        case 0x65E:
+            Actor_ChangeFocus(&this->actor, globalCtx, &this->unk_144->actor);
+            this->unk_1E0 = 0x65F;
+            this->unk_40A |= 1;
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA98EC.s")
+        case 0x2A34:
+            if (INV_CONTENT(ITEM_MASK_BLAST) == ITEM_MASK_BLAST) {
+                this->unk_40A |= 1;
+                this->unk_1E0 = 0x2A36;
+                break;
+            }
+            this->unk_40A |= 0x20;
+            this->unk_1E0 = 0x2A35;
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9AB8.s")
+        case 0x2A35:
+            this->unk_40A |= 1;
+            this->unk_1E0 = 0x2A36;
+            break;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9B24.s")
+        case 0x2A30:
+        case 0x2A31:
+            this->unk_40A |= 1;
+            break;
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9B80.s")
+    func_801518B0(globalCtx, this->unk_1E0, &this->actor);
+    if (this->unk_40A & 1) {
+        if (this->unk_40A & 0x40) {
+            this->unk_40A &= ~0x40;
+            func_80151BB4(globalCtx, 0x33);
+        }
+        func_80151BB4(globalCtx, 4);
+    }
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9CD4.s")
+void func_80BA8C4C(GlobalContext* globalCtx, u16 nextEntrance) {
+    globalCtx->nextEntranceIndex = nextEntrance;
+    globalCtx->unk_1887F = 0x40;
+    gSaveContext.nextTransition = 0x40;
+    globalCtx->sceneLoadFlag = 0x14;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9E00.s")
+void func_80BA8C90(EnBaba* this, GlobalContext* globalCtx) {
+    this->collider.dim.pos.x = this->actor.world.pos.x + 5.0f;
+    this->collider.dim.pos.y = this->actor.world.pos.y;
+    this->collider.dim.pos.z = this->actor.world.pos.z + 22.0f;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9E10.s")
+    CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+    CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9E48.s")
+s32 func_80BA8D2C(EnBaba* this, f32 arg1) {
+    s16 sp3E;
+    s32 ret = false;
+    Vec3f sp2C;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/EnBaba_Init.s")
+    Math_SmoothStepToF(&this->actor.speedXZ, arg1, 0.4f, 1000.0f, 0.0f);
+    sp3E = this->actor.speedXZ * 400.0f;
+    if (func_8013D68C(this->path, this->unk_1E8, &sp2C) && func_8013D768(&this->actor, &sp2C, sp3E)) {
+        this->unk_1E8++;
+        if (this->unk_1E8 >= this->path->count) {
+            ret = true;
+        }
+    }
+    return ret;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/EnBaba_Destroy.s")
+void func_80BA8DF4(EnBaba* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);
+    Vec3f sp30;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/EnBaba_Update.s")
+    SkelAnime_Update(&this->skelAnime);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BA9FB0.s")
+    if (func_8013D5E8(this->actor.shape.rot.y, 0x36B0, this->actor.yawTowardsPlayer) && !(this->unk_40A & 4)) {
+        sp30.x = player->actor.world.pos.x;
+        sp30.y = player->bodyPartsPos[7].y + 3.0f;
+        sp30.z = player->actor.world.pos.z;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BAA198.s")
+        func_8013D2E0(&sp30, &this->actor.focus.pos, &this->actor.shape.rot, &this->unk_2DE, &this->unk_2E4,
+                      &this->unk_2EA, D_80BAA4B4);
+    } else {
+        Math_SmoothStepToS(&this->unk_2DE.x, 0, 4, 1000, 1);
+        Math_SmoothStepToS(&this->unk_2DE.y, 0, 4, 1000, 1);
+        Math_SmoothStepToS(&this->unk_2E4.x, 0, 4, 1000, 1);
+        Math_SmoothStepToS(&this->unk_2E4.y, 0, 4, 1000, 1);
+        Math_SmoothStepToS(&this->unk_2EA.x, 0, 4, 1000, 1);
+        Math_SmoothStepToS(&this->unk_2EA.y, 0, 4, 1000, 1);
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/func_80BAA20C.s")
+    SubS_FillLimbRotTables(globalCtx, this->unk_302, this->unk_326, ARRAY_COUNT(this->unk_302));

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Baba/EnBaba_Draw.s")
+    if (this->unk_40A & 2) {
+        func_80BA8C90(this, globalCtx);
+    }
+}
+
+s32 func_80BA8F88(EnBaba* this, GlobalContext* globalCtx, struct_80133038_arg2* arg2) {
+    u16 sp26 = (u16)(gSaveContext.time - 0x3FFC);
+    u16 temp;
+    u8 sp23 = ENBABA_GET_3F00(&this->actor);
+
+    if (D_80BAA4A8[arg2->unk0] >= 0) {
+        this->unk_410 = func_8013BB34(globalCtx, sp23, D_80BAA4A8[arg2->unk0]);
+    }
+
+    if (this->unk_410 == NULL) {
+        return false;
+    }
+
+    if ((this->unk_434 != 0) && (this->unk_436 >= 0)) {
+        temp = sp26;
+    } else {
+        temp = arg2->unk4;
+    }
+
+    if (arg2->unk8 < temp) {
+        this->unk_424 = (temp - arg2->unk8) + 0xFFFF;
+    } else {
+        this->unk_424 = arg2->unk8 - temp;
+    }
+
+    this->unk_430 = sp26 - temp;
+    temp = this->unk_410->count - 2;
+    this->unk_428 = this->unk_424 / temp;
+    this->unk_438 = 0;
+    this->unk_42C = (this->unk_430 / this->unk_428) + 2;
+    this->unk_43C = 0;
+    return true;
+}
+
+s32 func_80BA9110(EnBaba* this, GlobalContext* globalCtx, struct_80133038_arg2* arg2) {
+    s32 ret;
+
+    switch (arg2->unk0) {
+        default:
+            ret = false;
+            break;
+
+        case 2:
+            ret = func_80BA8F88(this, globalCtx, arg2);
+            break;
+
+        case 1:
+            ret = true;
+            break;
+    }
+    return ret;
+}
+
+s32 func_80BA9160(EnBaba* this, GlobalContext* globalCtx) {
+    f32 sp7C[265];
+    Vec3f sp70;
+    Vec3f sp64;
+    Vec3f sp58;
+    s32 sp54 = 0;
+    s32 sp50 = 0;
+    s32 pad;
+
+    func_8013AF00(sp7C, 3, this->unk_410->count + 3);
+
+    if (this->unk_438 == 0) {
+        sp58 = gZeroVec3f;
+
+        func_8013B6B0(this->unk_410, &this->unk_420, &this->unk_430, this->unk_428, this->unk_424, &this->unk_42C, sp7C,
+                      &sp58, this->unk_436);
+        func_8013B878(globalCtx, this->unk_410, this->unk_42C, &sp58);
+        this->actor.world.pos.y = sp58.y;
+        this->unk_438 = 1;
+    } else {
+        sp58 = this->unk_414;
+    }
+
+    this->actor.world.pos.x = sp58.x;
+    this->actor.world.pos.z = sp58.z;
+
+    if (func_8013AD6C(globalCtx)) {
+        sp54 = this->unk_430;
+        sp50 = this->unk_42C;
+        sp58 = this->actor.world.pos;
+    }
+
+    this->unk_414 = gZeroVec3f;
+
+    if (func_8013B6B0(this->unk_410, &this->unk_420, &this->unk_430, this->unk_428, this->unk_424, &this->unk_42C, sp7C,
+                      &this->unk_414, this->unk_436)) {
+        this->unk_43C = 1;
+    } else {
+        sp70 = this->actor.world.pos;
+        sp64 = this->unk_414;
+        this->actor.world.rot.y = Math_Vec3f_Yaw(&sp70, &sp64);
+    }
+
+    if (func_8013AD6C(globalCtx)) {
+        this->unk_430 = sp54;
+        this->unk_42C = sp50;
+        this->unk_414 = sp58;
+    }
+
+    return false;
+}
+
+void func_80BA93AC(EnBaba* this, GlobalContext* globalCtx) {
+    if (this->unk_434 != 1) {
+        if (this->unk_434 == 2) {
+            gSaveContext.weekEventReg[58] |= 0x40;
+            this->unk_40A |= 2;
+            func_80BA9160(this, globalCtx);
+        }
+    } else {
+        this->unk_40C = 3;
+        this->unk_1E0 = 10800;
+        this->actor.speedXZ = 0.0f;
+        Enemy_StartFinishingBlow(globalCtx, &this->actor);
+        this->unk_40A |= 4;
+        Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, this->unk_40C);
+        this->actionFunc = func_80BA9CD4;
+    }
+    Math_ApproachS(&this->actor.shape.rot.y, this->actor.world.rot.y, 4, 0x1554);
+}
+
+void func_80BA9480(EnBaba* this, GlobalContext* globalCtx) {
+    SkelAnime_InitFlex(globalCtx, &this->skelAnime, &object_bba_Skel_005EF0, &object_bba_Anim_006B10, this->jointTable,
+                       this->morphTable, 0x12);
+
+    this->actor.draw = EnBaba_Draw;
+    this->unk_40A |= 0x80;
+    this->actor.flags |= ACTOR_FLAG_1;
+
+    if (globalCtx->sceneNum == SCENE_BOMYA) {
+        this->unk_40A |= 2;
+        this->unk_40C = 1;
+        Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 1);
+        this->actionFunc = func_80BA9758;
+    } else if (globalCtx->sceneNum == SCENE_BACKTOWN) {
+        if ((ENBABA_GET_C000(&this->actor) == ENBABA_C000_0) && (gSaveContext.entranceIndex != 0xD670) &&
+            ((ENBABA_GET_3F00(&this->actor)) != ENBABA_3F00_3F)) {
+            if ((gSaveContext.weekEventReg[58] & 0x40) ||
+                (!(gSaveContext.time < CLOCK_TIME(0, 20)) && (gSaveContext.time < CLOCK_TIME(6, 0)))) {
+                Actor_MarkForDeath(&this->actor);
+                return;
+            }
+
+            this->unk_404 = 50;
+            this->unk_40C = 2;
+            Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 2);
+            this->actionFunc = func_80BA9B80;
+        } else if ((ENBABA_GET_C000(&this->actor) == ENBABA_C000_1) && (gSaveContext.entranceIndex == 0xD670)) {
+            if (gSaveContext.weekEventReg[81] & 2) {
+                Actor_MarkForDeath(&this->actor);
+                return;
+            }
+
+            this->unk_40A |= 2;
+            if (gSaveContext.weekEventReg[33] & 8) {
+                this->unk_40C = 0;
+            } else {
+                this->unk_40C = 1;
+            }
+
+            Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, this->unk_40C);
+            this->unk_40A |= 8;
+            this->actionFunc = func_80BA9758;
+        } else {
+            Actor_MarkForDeath(&this->actor);
+            return;
+        }
+    } else {
+        this->unk_40A |= 2;
+        if (ENBABA_GET_C000(&this->actor) == ENBABA_C000_2) {
+            this->actor.flags &= ~ACTOR_FLAG_1;
+            this->unk_40C = 5;
+            Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 5);
+            this->actionFunc = func_80BA9E00;
+        } else if ((ENBABA_GET_3F00(&this->actor)) != ENBABA_3F00_3F) {
+            this->unk_40C = 2;
+            Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 2);
+            this->actionFunc = func_80BA9E10;
+        } else {
+            this->unk_40C = 0;
+            Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 0);
+            this->actionFunc = func_80BA9E48;
+        }
+    }
+}
+
+void func_80BA9758(EnBaba* this, GlobalContext* globalCtx) {
+    if ((this->unk_40A & 8) || (this->unk_144 != NULL) || func_80BA8820(this, globalCtx)) {
+        if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
+            func_80BA886C(this, globalCtx);
+            if (this->unk_40A & 8) {
+                this->actor.flags &= ~ACTOR_FLAG_10000;
+            }
+            this->actionFunc = func_80BA98EC;
+        } else if (this->actor.xzDistToPlayer < 100.0f) {
+            if (this->unk_40A & 8) {
+                this->actor.flags |= ACTOR_FLAG_10000;
+            }
+            func_800B8614(&this->actor, globalCtx, 100.0f);
+        }
+    }
+}
+
+void func_80BA9848(EnBaba* this, GlobalContext* globalCtx) {
+    u8 temp_v0 = Message_GetState(&globalCtx->msgCtx);
+
+    if (((temp_v0 == 5) || (temp_v0 == 6)) && func_80147624(globalCtx)) {
+        globalCtx->msgCtx.msgMode = 0x43;
+        globalCtx->msgCtx.unk12023 = 4;
+        this->actionFunc = func_80BA9B80;
+    }
+    Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 5, 0x1000, 0x100);
+}
+
+void func_80BA98EC(EnBaba* this, GlobalContext* globalCtx) {
+    u8 temp_v0 = Message_GetState(&globalCtx->msgCtx);
+
+    if (temp_v0 == 5) {
+        if (func_80147624(globalCtx)) {
+            if (this->unk_40A & 1) {
+                this->unk_40A &= ~1;
+                globalCtx->msgCtx.msgMode = 0x43;
+                globalCtx->msgCtx.unk12023 = 4;
+                if (this->unk_40A & 8) {
+                    if (CHECK_QUEST_ITEM(QUEST_BOMBERS_NOTEBOOK)) {
+                        if (globalCtx->msgCtx.unk120B1 == 0) {
+                            gSaveContext.weekEventReg[81] |= 2;
+                            func_80BA8C4C(globalCtx, 0xD670);
+                            return;
+                        }
+                    } else {
+                        gSaveContext.weekEventReg[81] |= 2;
+                        func_80BA8C4C(globalCtx, 0xD670);
+                    }
+                } else {
+                    this->unk_1E0 = 0;
+                    this->actionFunc = func_80BA9758;
+                }
+            } else if (this->unk_40A & 0x20) {
+                this->unk_40A &= ~0x20;
+                globalCtx->msgCtx.msgMode = 0x43;
+                globalCtx->msgCtx.unk12023 = 4;
+                this->actionFunc = func_80BA9AB8;
+            } else {
+                func_80BA886C(this, globalCtx);
+            }
+        }
+    } else if (temp_v0 == 6) {
+        if (func_80147624(globalCtx) && (globalCtx->msgCtx.unk120B1 == 0)) {
+            gSaveContext.weekEventReg[81] |= 2;
+            func_80BA8C4C(globalCtx, 0xD670);
+        }
+    }
+}
+
+void func_80BA9AB8(EnBaba* this, GlobalContext* globalCtx) {
+    if (Actor_HasParent(&this->actor, globalCtx)) {
+        this->actor.parent = NULL;
+        this->unk_40A |= 0x40;
+        this->actionFunc = func_80BA9B24;
+    } else {
+        Actor_PickUp(&this->actor, globalCtx, GI_MASK_BLAST, 300.0f, 300.0f);
+    }
+}
+
+void func_80BA9B24(EnBaba* this, GlobalContext* globalCtx) {
+    if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
+        func_80BA886C(this, globalCtx);
+        this->actionFunc = func_80BA98EC;
+    } else {
+        func_800B85E0(&this->actor, globalCtx, 400.0f, -1);
+    }
+}
+
+void func_80BA9B80(EnBaba* this, GlobalContext* globalCtx) {
+    u32* unk14 = &gSaveContext.unk_14;
+    struct_80133038_arg2 sp20;
+
+    this->unk_436 = REG(15) + *unk14;
+
+    if (!func_80133038(globalCtx, D_80BAA488, &sp20) ||
+        ((this->unk_434 != sp20.unk0) && !func_80BA9110(this, globalCtx, &sp20))) {
+        this->unk_40A &= ~0x80;
+        this->actor.flags &= ~ACTOR_FLAG_1;
+        sp20.unk0 = false;
+    } else {
+        this->unk_40A |= 0x80;
+        this->actor.flags |= ACTOR_FLAG_1;
+    }
+    this->unk_434 = sp20.unk0;
+
+    func_80BA93AC(this, globalCtx);
+
+    if (this->unk_40A & 2) {
+        if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
+            func_801518B0(globalCtx, 0x2A39, &this->actor); // "I'm sorry"
+            this->actionFunc = func_80BA9848;
+        } else if ((this->actor.xzDistToPlayer < 100.0f) || this->actor.isTargeted) {
+            func_800B863C(&this->actor, globalCtx);
+        }
+    }
+    Actor_MoveWithGravity(&this->actor);
+}
+
+void func_80BA9CD4(EnBaba* this, GlobalContext* globalCtx) {
+    s16 sp2E = this->skelAnime.curFrame;
+    s16 sp2C = Animation_GetLastFrame(sAnimations[this->unk_40C].animation);
+
+    this->collider.dim.height = 37;
+    this->collider.dim.radius = 23;
+
+    if (this->unk_40C == 3) {
+        if (Animation_OnFrame(&this->skelAnime, 0.0f)) {
+            Actor_PlaySfxAtPos(&this->actor, NA_SE_VO_BBVO00);
+        }
+
+        if (sp2E == sp2C) {
+            this->unk_40C = 4;
+            Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimations, 4);
+        }
+    } else {
+        if ((gSaveContext.weekEventReg[79] & 0x40) && (DECR(this->unk_404) == 0)) {
+            Audio_QueueSeqCmd(0x101400FF);
+            func_80BA8C4C(globalCtx, 0xD670);
+        } else {
+            Actor_MoveWithGravity(&this->actor);
+        }
+    }
+}
+
+void func_80BA9E00(EnBaba* this, GlobalContext* globalCtx) {
+}
+
+void func_80BA9E10(EnBaba* this, GlobalContext* globalCtx) {
+    if (func_80BA8D2C(this, 1.0f)) {
+        this->unk_1E8 = 0;
+    }
+}
+
+void func_80BA9E48(EnBaba* this, GlobalContext* globalCtx) {
+    this->actor.shape.rot = this->actor.world.rot;
+}
+
+void EnBaba_Init(Actor* thisx, GlobalContext* globalCtx) {
+    s32 pad;
+    EnBaba* this = THIS;
+
+    Collider_InitCylinder(globalCtx, &this->collider);
+    Collider_SetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
+    CollisionCheck_SetInfo2(&this->actor.colChkInfo, &sDamageTable, &sColChkInfoInit);
+
+    this->path = func_8013D648(globalCtx, ENBABA_GET_3F00(&this->actor), ENBABA_3F00_3F);
+
+    Actor_SetScale(&this->actor, 0.01f);
+
+    this->actor.targetMode = 0;
+    this->actor.gravity = -4.0f;
+    this->actionFunc = func_80BA9480;
+}
+
+void EnBaba_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    EnBaba* this = THIS;
+
+    Collider_DestroyCylinder(globalCtx, &this->collider);
+}
+
+void EnBaba_Update(Actor* thisx, GlobalContext* globalCtx) {
+    EnBaba* this = THIS;
+
+    this->actionFunc(this, globalCtx);
+
+    Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4);
+    func_80BA8DF4(this, globalCtx);
+}
+
+s32 EnBaba_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
+                            Actor* thisx) {
+    EnBaba* this = THIS;
+
+    if (limbIndex == 6) {
+        Matrix_InsertTranslation(1500.0f, 0.0f, 0.0f, MTXMODE_APPLY);
+        Matrix_InsertXRotation_s(this->unk_2E4.y, MTXMODE_APPLY);
+        Matrix_InsertZRotation_s(-this->unk_2E4.x, MTXMODE_APPLY);
+        Matrix_InsertTranslation(-1500.0f, 0.0f, 0.0f, MTXMODE_APPLY);
+    }
+
+    if (limbIndex == 5) {
+        Matrix_InsertXRotation_s(-this->unk_2EA.y, MTXMODE_APPLY);
+        Matrix_InsertZRotation_s(-this->unk_2EA.x, MTXMODE_APPLY);
+    }
+
+    if ((limbIndex == 6) && (this->unk_1E2 != 0) && ((globalCtx->state.frames % 2) == 0)) {
+        Matrix_InsertTranslation(40.0f, 0.0f, 0.0f, MTXMODE_APPLY);
+    }
+
+    if ((limbIndex == 5) || (limbIndex == 10) || (limbIndex == 14)) {
+        rot->y += (s16)(Math_SinS(this->unk_302[limbIndex]) * 200.0f);
+        rot->z += (s16)(Math_CosS(this->unk_326[limbIndex]) * 200.0f);
+    }
+
+    if (((this->unk_40C == 1) || (this->unk_40C == 3) || (this->unk_40C == 4) ||
+         (ENBABA_GET_C000(&this->actor) == ENBABA_C000_2)) &&
+        (limbIndex == 8)) {
+        *dList = NULL;
+    }
+    return 0;
+}
+
+void EnBaba_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* thisx) {
+    EnBaba* this = THIS;
+    Vec3f sp18 = { 0.0f, 0.0f, 0.0f };
+
+    if (limbIndex == 7) {
+        this->actor.focus.pos.x = this->actor.world.pos.x;
+        this->actor.focus.pos.y = this->actor.world.pos.y;
+        this->actor.focus.pos.z = this->actor.world.pos.z;
+        Matrix_MultiplyVector3fByState(&sp18, &this->actor.focus.pos);
+    }
+}
+
+void EnBaba_TransformLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Actor* thisx) {
+}
+
+void EnBaba_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    s32 pad;
+    EnBaba* this = THIS;
+    Vec3f sp4C;
+    Vec3f sp40;
+
+    if (this->unk_40A & 2) {
+        OPEN_DISPS(globalCtx->state.gfxCtx);
+
+        func_8012C5B0(globalCtx->state.gfxCtx);
+
+        gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(&object_bba_Tex_0092A0));
+
+        SkelAnime_DrawTransformFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
+                                       this->skelAnime.dListCount, EnBaba_OverrideLimbDraw, EnBaba_PostLimbDraw,
+                                       EnBaba_TransformLimbDraw, &this->actor);
+
+        if (this->unk_40A & 0x80) {
+            if ((this->unk_40C == 3) || (this->unk_40C == 4)) {
+                func_8012C2DC(globalCtx->state.gfxCtx);
+                sp4C.x = this->actor.world.pos.x + 20.0f;
+                sp4C.y = this->actor.world.pos.y;
+                sp4C.z = this->actor.world.pos.z + 20.0f;
+            } else {
+                sp4C = this->actor.world.pos;
+            }
+
+            sp40.x = sp40.y = sp40.z = 0.3f;
+            func_800BC620(&sp4C, &sp40, 255, globalCtx);
+        }
+
+        CLOSE_DISPS(globalCtx->state.gfxCtx);
+    }
+}
--- a/src/overlays/actors/ovl_En_Baba/z_en_baba.h
+++ b/src/overlays/actors/ovl_En_Baba/z_en_baba.h
@ -7,11 +7,53 @@ struct EnBaba;

 typedef void (*EnBabaActionFunc)(struct EnBaba*, GlobalContext*);

+#define ENBABA_GET_3F00(thisx) (((thisx)->params & 0x3F00) >> 8)
+#define ENBABA_GET_C000(thisx) (((thisx)->params & 0xC000) >> 0xE)
+
+#define ENBABA_3F00_3F 0x3F
+
+enum {
+    /* 0 */ ENBABA_C000_0,
+    /* 1 */ ENBABA_C000_1,
+    /* 2 */ ENBABA_C000_2,
+};
+
 typedef struct EnBaba {
    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ char unk_144[0x4];
+    /* 0x0144 */ struct EnOssan* unk_144;
    /* 0x0148 */ EnBabaActionFunc actionFunc;
-    /* 0x014C */ char unk_14C[0x2F4];
+    /* 0x014C */ UNK_TYPE1 unk14C[4];
+    /* 0x0150 */ SkelAnime skelAnime;
+    /* 0x0194 */ ColliderCylinder collider;
+    /* 0x01E0 */ u16 unk_1E0;
+    /* 0x01E2 */ u8 unk_1E2;
+    /* 0x01E4 */ Path* path;
+    /* 0x01E8 */ s16 unk_1E8;
+    /* 0x01EA */ UNK_TYPE1 unk1EA[0x1C];
+    /* 0x0206 */ Vec3s jointTable[18];
+    /* 0x0272 */ Vec3s morphTable[18];
+    /* 0x02DE */ Vec3s unk_2DE;
+    /* 0x02E4 */ Vec3s unk_2E4;
+    /* 0x02EA */ Vec3s unk_2EA;
+    /* 0x02F0 */ UNK_TYPE1 unk2F0[0x12];
+    /* 0x0302 */ s16 unk_302[18];
+    /* 0x0326 */ s16 unk_326[18];
+    /* 0x034A */ UNK_TYPE1 unk34A[0xBA];
+    /* 0x0404 */ s16 unk_404;
+    /* 0x0406 */ UNK_TYPE1 unk406[4];
+    /* 0x040A */ u16 unk_40A;
+    /* 0x040C */ s32 unk_40C;
+    /* 0x0410 */ Path* unk_410;
+    /* 0x0414 */ Vec3f unk_414;
+    /* 0x0420 */ f32 unk_420;
+    /* 0x0424 */ s32 unk_424;
+    /* 0x0428 */ s32 unk_428;
+    /* 0x042C */ s32 unk_42C;
+    /* 0x0430 */ s32 unk_430;
+    /* 0x0434 */ u8 unk_434;
+    /* 0x0436 */ s16 unk_436;
+    /* 0x0438 */ s32 unk_438;
+    /* 0x043C */ s32 unk_43C;
 } EnBaba; // size = 0x440

 extern const ActorInit En_Baba_InitVars;
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@ -15192,9 +15192,9 @@
    0x80BA9E6C:("EnBaba_Init",),
    0x80BA9F24:("EnBaba_Destroy",),
    0x80BA9F50:("EnBaba_Update",),
-    0x80BA9FB0:("func_80BA9FB0",),
-    0x80BAA198:("func_80BAA198",),
-    0x80BAA20C:("func_80BAA20C",),
+    0x80BA9FB0:("EnBaba_OverrideLimbDraw",),
+    0x80BAA198:("EnBaba_PostLimbDraw",),
+    0x80BAA20C:("EnBaba_TransformDraw",),
    0x80BAA220:("EnBaba_Draw",),
    0x80BAA6D0:("EnSuttari_UpdateCollider",),
    0x80BAA848:("EnSuttari_GetActorById",),
--- a/undefined_syms.txt
+++ b/undefined_syms.txt
@ -1128,12 +1128,6 @@ D_06017990 = 0x06017990;
 D_0601ABF0 = 0x0601ABF0;
 D_0601AD00 = 0x0601AD00;

-// ovl_En_Baba
-
-D_06005EF0 = 0x06005EF0;
-D_06006B10 = 0x06006B10;
-D_060092A0 = 0x060092A0;
-
 // ovl_En_Bal

 D_060005FC = 0x060005FC;