En_Tanron2 (#615)

* En_Tanron2 * Format * PR
2026-08-18 05:08:48 -04:00 · 2022-02-19 20:27:21 +00:00
parent 320a1a3030
commit 2b5fe949fe
5 changed files with 612 additions and 40 deletions
@@ -13,7 +13,7 @@ typedef struct Boss04 {
    /* 0x0188 */ Vec3s jointTable[9];
    /* 0x01BE */ Vec3s morphtable[9];
    /* 0x01F4 */ s16 unk_1F4;
-    /* 0x01F6 */ s8 unk_1F6;
+    /* 0x01F6 */ u8 unk_1F6;
    /* 0x01F7 */ u8 unk_1F7;
    /* 0x01F8 */ s16 unk_1F8;
    /* 0x01FA */ s16 unk_1FA;
@@ -5,8 +5,11 @@
 */

 #include "z_en_tanron2.h"
+#include "overlays/actors/ovl_Boss_04/z_boss_04.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
+#include "objects/object_boss04/object_boss04.h"

-#define FLAGS 0x00000035
+#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_4 | ACTOR_FLAG_10 | ACTOR_FLAG_20)

 #define THIS ((EnTanron2*)thisx)

@@ -15,12 +18,18 @@ void EnTanron2_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnTanron2_Update(Actor* thisx, GlobalContext* globalCtx);
 void EnTanron2_Draw(Actor* thisx, GlobalContext* globalCtx);

+void func_80BB69C0(EnTanron2* this);
 void func_80BB69FC(EnTanron2* this, GlobalContext* globalCtx);
 void func_80BB6BD8(EnTanron2* this, GlobalContext* globalCtx);
+void func_80BB6F64(EnTanron2* this);
 void func_80BB6F78(EnTanron2* this, GlobalContext* globalCtx);
 void func_80BB7408(EnTanron2* this, GlobalContext* globalCtx);
+void func_80BB7B90(Actor* thisx, GlobalContext* globalCtx);
+
+Boss04* D_80BB8450;
+f32 D_80BB8454;
+EnTanron2* D_80BB8458[82];

-#if 0
 const ActorInit En_Tanron2_InitVars = {
    ACTOR_EN_TANRON2,
    ACTORCAT_BOSS,
@@ -33,8 +42,7 @@ const ActorInit En_Tanron2_InitVars = {
    (ActorFunc)EnTanron2_Draw,
 };

-// static DamageTable sDamageTable = {
-static DamageTable D_80BB8170 = {
+static DamageTable sDamageTable = {
    /* Deku Nut       */ DMG_ENTRY(1, 0xF),
    /* Deku Stick     */ DMG_ENTRY(1, 0xF),
    /* Horse trample  */ DMG_ENTRY(0, 0x0),
@@ -69,54 +77,607 @@ static DamageTable D_80BB8170 = {
    /* Powder Keg     */ DMG_ENTRY(1, 0xF),
 };

-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_80BB8190 = {
-    { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
-    { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xFFFFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON | BUMP_HOOKABLE, OCELEM_ON, },
+static ColliderCylinderInit sCylinderInit1 = {
+    {
+        COLTYPE_HIT3,
+        AT_ON | AT_TYPE_ENEMY,
+        AC_ON | AC_TYPE_PLAYER,
+        OC1_ON | OC1_TYPE_ALL,
+        OC2_TYPE_1,
+        COLSHAPE_CYLINDER,
+    },
+    {
+        ELEMTYPE_UNK3,
+        { 0xF7CFFFFF, 0x00, 0x04 },
+        { 0xFFFFFFFF, 0x00, 0x00 },
+        TOUCH_ON | TOUCH_SFX_NORMAL,
+        BUMP_ON | BUMP_HOOKABLE,
+        OCELEM_ON,
+    },
    { 30, 50, -25, { 0, 0, 0 } },
 };

-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_80BB81BC = {
-    { COLTYPE_HIT3, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
-    { ELEMTYPE_UNK3, { 0xF7CFFFFF, 0x00, 0x04 }, { 0xF7FFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_ON | BUMP_HOOKABLE, OCELEM_ON, },
+static ColliderCylinderInit sCylinderInit2 = {
+    {
+        COLTYPE_HIT3,
+        AT_ON | AT_TYPE_ENEMY,
+        AC_ON | AC_TYPE_PLAYER,
+        OC1_ON | OC1_TYPE_ALL,
+        OC2_TYPE_1,
+        COLSHAPE_CYLINDER,
+    },
+    {
+        ELEMTYPE_UNK3,
+        { 0xF7CFFFFF, 0x00, 0x04 },
+        { 0xF7FFFFFF, 0x00, 0x00 },
+        TOUCH_ON | TOUCH_SFX_NORMAL,
+        BUMP_ON | BUMP_HOOKABLE,
+        OCELEM_ON,
+    },
    { 22, 42, -21, { 0, 0, 0 } },
 };

-#endif
+Color_RGBA8 D_80BB81E8 = { 255, 255, 255, 255 };
+Color_RGBA8 D_80BB81EC = { 255, 100, 100, 255 };

-extern DamageTable D_80BB8170;
-extern ColliderCylinderInit D_80BB8190;
-extern ColliderCylinderInit D_80BB81BC;
+void EnTanron2_Init(Actor* thisx, GlobalContext* globalCtx) {
+    EnTanron2* this = THIS;

-extern UNK_TYPE D_06003450;
+    D_80BB8450 = (Boss04*)this->actor.parent;
+    this->actor.flags &= ~ACTOR_FLAG_1;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/EnTanron2_Init.s")
+    if (this->actor.params == 100) {
+        this->actor.update = func_80BB7B90;
+        func_800BC154(globalCtx, &globalCtx->actorCtx, &this->actor, 5);
+        return;
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/EnTanron2_Destroy.s")
+    this->actor.flags |= ACTOR_FLAG_200;
+    Actor_SetScale(&this->actor, 1.0f);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB69C0.s")
+    this->actor.draw = NULL;
+    this->actor.colChkInfo.health = 1;
+    this->actor.colChkInfo.damageTable = &sDamageTable;
+    this->actor.targetMode = 5;

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB69FC.s")
+    Collider_InitAndSetCylinder(globalCtx, &this->collider1, &this->actor, &sCylinderInit1);
+    Collider_InitAndSetCylinder(globalCtx, &this->collider2, &this->actor, &sCylinderInit2);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB6B80.s")
+    if ((KREG(64) != 0) || (gSaveContext.eventInf[6] & 1)) {
+        func_80BB69C0(this);
+    } else {
+        func_80BB6F64(this);
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB6BD8.s")
+    this->unk_14A = Rand_ZeroFloat(0x10000);
+    this->unk_14C = Rand_ZeroFloat(800.0f) + 1400.0f;
+    if (Rand_ZeroOne() < 0.5f) {
+        this->unk_14C = -this->unk_14C;
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB6F64.s")
+    Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 35.0f, 60.0f, 60.0f, 4);
+    this->actor.floorHeight += 20.0f;
+    this->unk_148 = Rand_ZeroFloat(32.0f);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB6F78.s")
+void EnTanron2_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB71C8.s")
+void func_80BB69C0(EnTanron2* this) {
+    this->actionFunc = func_80BB69FC;
+    this->unk_160 = 0.0f;
+    this->unk_15C = 0.0f;
+    this->collider1.dim.radius = 25;
+    this->collider1.dim.height = 46;
+    this->collider1.dim.yShift = -23;
+    this->unk_158 = 0;
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB7398.s")
+void func_80BB69FC(EnTanron2* this, GlobalContext* globalCtx) {
+    f32 sp34;
+    f32 sp30;
+    f32 sp2C;
+    Vec3f* temp_s1 = &D_80BB8450->unk_2E4[this->actor.params];

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB7408.s")
+    if (this->unk_15C == 1.0f) {
+        Math_Vec3f_Copy(&this->actor.world.pos, temp_s1);
+    } else {
+        sp34 = Math_SmoothStepToF(&this->actor.world.pos.x, temp_s1->x, this->unk_15C, this->unk_160, 0.0f);
+        sp30 = Math_SmoothStepToF(&this->actor.world.pos.y, temp_s1->y, this->unk_15C, this->unk_160, 0.0f);
+        sp2C = Math_SmoothStepToF(&this->actor.world.pos.z, temp_s1->z, this->unk_15C, this->unk_160, 0.0f);

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB7578.s")
+        if ((this->unk_158 == 0) && ((sp34 + sp30 + sp2C) < 2.0f)) {
+            this->unk_158 = 1;
+            Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_B_SLIME_EAT);
+        }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/EnTanron2_Update.s")
+        Math_ApproachF(&this->unk_15C, 1.0f, 1.0f, 0.02f);
+        Math_ApproachF(&this->unk_160, 20.0f, 1.0f, 1.0f);
+    }

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/func_80BB7B90.s")
+    Math_ApproachF(&this->actor.scale.x, 1.0f, 0.1f, 0.2f);
+    Math_ApproachF(&this->actor.scale.y, 1.0f, 0.1f, 0.2f);
+}

-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Tanron2/EnTanron2_Draw.s")
+void func_80BB6B80(EnTanron2* this) {
+    this->actionFunc = func_80BB6BD8;
+    this->actor.speedXZ = 0.0f;
+    this->actor.velocity.z = 0.0f;
+    this->actor.velocity.y = 0.0f;
+    this->actor.velocity.x = 0.0f;
+    this->unk_158 = 0;
+    this->unk_159 = 1;
+    this->actor.flags |= ACTOR_FLAG_1;
+    this->collider1.dim.radius = 30;
+    this->collider1.dim.height = 50;
+    this->collider1.dim.yShift = -25;
+}
+
+void func_80BB6BD8(EnTanron2* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);
+    s16 sp32;
+    f32 sp2C;
+    f32 sp28;
+
+    if (this->unk_14E == 0) {
+        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;
+        this->actor.velocity.y = this->actor.velocity.y - 2.0f;
+
+        if (this->actor.world.pos.y <= this->actor.floorHeight) {
+            this->actor.world.pos.y = this->actor.floorHeight;
+
+            Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_JUMP2);
+
+            sp2C = D_80BB8450->unk_6BC.x - this->actor.world.pos.x;
+            sp28 = D_80BB8450->unk_6BC.z - this->actor.world.pos.z;
+
+            switch (this->unk_158) {
+                case 0:
+                    if (Rand_ZeroOne() > 0.2f) {
+                        sp32 = Rand_ZeroFloat(65536.0f);
+                    } else {
+                        sp32 = Math_Atan2S(sp2C, sp28);
+                    }
+                    this->actor.speedXZ = Rand_ZeroFloat(5.0f) + 5.0f;
+                    break;
+
+                case 1:
+                    sp32 = Math_Atan2S(sp2C, sp28);
+                    this->actor.speedXZ += 2.0f;
+                    if (this->actor.speedXZ > 10.0f) {
+                        this->actor.speedXZ = 10.0f;
+                    }
+                    break;
+
+                case 2:
+                    sp32 = Math_Atan2S(player->actor.world.pos.x - this->actor.world.pos.x,
+                                       player->actor.world.pos.z - this->actor.world.pos.z) +
+                           (s16)Rand_ZeroFloat(20000.0f);
+                    this->actor.speedXZ = Rand_ZeroFloat(7.0f) + 7.0f;
+                    if ((this->unk_152 == 0) && (D_80BB8450->unk_1F6 == 0)) {
+                        this->unk_158 = 1;
+                    }
+                    break;
+            }
+            Matrix_RotateY(sp32, MTXMODE_NEW);
+            Matrix_GetStateTranslationAndScaledZ(this->actor.speedXZ, &this->actor.velocity);
+            this->actor.velocity.y = Rand_ZeroFloat(5.0f) + 12.0f;
+            this->unk_14E = 5;
+        }
+
+        if (this->unk_150 != 0) {
+            Math_ApproachF(&this->actor.scale.x, 0.75f, 0.5f, 1.0f);
+            Math_ApproachF(&this->actor.scale.y, 1.2f, 0.5f, 1.0f);
+        } else {
+            Math_ApproachF(&this->actor.scale.x, 1.0f, 0.1f, 0.2f);
+            Math_ApproachF(&this->actor.scale.y, 1.0f, 0.1f, 0.2f);
+        }
+    } else {
+        Math_ApproachF(&this->actor.scale.x, 1.2f, 0.75f, 1.5f);
+        Math_ApproachF(&this->actor.scale.y, 0.75f, 0.75f, 1.5f);
+        if (this->unk_14E == 1) {
+            sp2C = D_80BB8450->unk_6BC.x - this->actor.world.pos.x;
+            sp28 = D_80BB8450->unk_6BC.z - this->actor.world.pos.z;
+
+            if ((this->unk_158 != 0) && ((SQ(sp2C) + SQ(sp28)) < 14400.0f)) {
+                func_80BB69C0(this);
+            } else {
+                this->unk_150 = 10;
+                Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_JUMP1);
+            }
+        }
+    }
+}
+
+void func_80BB6F64(EnTanron2* this) {
+    this->actionFunc = func_80BB6F78;
+}
+
+void func_80BB6F78(EnTanron2* this, GlobalContext* globalCtx) {
+    switch (this->unk_158) {
+        case 0:
+            if (D_80BB8450->unk_708 == 13) {
+                this->unk_158 = 10;
+                this->unk_14E = Rand_ZeroFloat(50.0f);
+            }
+            break;
+
+        case 10:
+            if (this->unk_14E == 0) {
+                this->unk_150 = 10;
+                this->unk_158 = 1;
+            }
+            break;
+
+        case 1:
+            if (this->unk_14E == 0) {
+                this->actor.world.pos.y += this->actor.velocity.y;
+                this->actor.velocity.y = this->actor.velocity.y - 2.0f;
+
+                if (this->actor.world.pos.y <= this->actor.floorHeight) {
+                    this->actor.world.pos.y = this->actor.floorHeight;
+                    Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_JUMP2);
+                    if (D_80BB8450->unk_6F8 > 0.1f) {
+                        Actor_PlaySfxAtPos(&this->actor, NA_SE_EV_OUT_OF_WATER_L);
+                    }
+                    this->actor.velocity.y = Rand_ZeroFloat(5.0f) + 12.0f;
+                    this->unk_14E = 5;
+                }
+
+                if (this->unk_150 != 0) {
+                    Math_ApproachF(&this->actor.scale.x, 0.75f, 0.5f, 1.0f);
+                    Math_ApproachF(&this->actor.scale.y, 1.2f, 0.5f, 1.0f);
+                } else {
+                    Math_ApproachF(&this->actor.scale.x, 1.0f, 0.1f, 0.2f);
+                    Math_ApproachF(&this->actor.scale.y, 1.0f, 0.1f, 0.2f);
+                }
+            } else {
+                Math_ApproachF(&this->actor.scale.x, 1.2f, 0.75f, 1.5f);
+                Math_ApproachF(&this->actor.scale.y, 0.75f, 0.75f, 1.5f);
+
+                if (this->unk_14E == 1) {
+                    if (D_80BB8450->unk_708 == 3) {
+                        func_80BB6B80(this);
+                        this->unk_158 = 1;
+                        this->unk_159 = 0;
+                    } else {
+                        this->unk_150 = 0xA;
+                        Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_JUMP1);
+                    }
+                }
+            }
+            break;
+    }
+}
+
+void func_80BB71C8(EnTanron2* this, GlobalContext* globalCtx) {
+    s32 i;
+    Vec3f spA8;
+    Vec3f sp9C;
+    Vec3f sp90;
+
+    for (i = 0; i < 15; i++) {
+        Matrix_InsertYRotation_f(Rand_ZeroFloat(6.2831855f), MTXMODE_NEW);
+        Matrix_RotateStateAroundXAxis(Rand_ZeroFloat(6.2831855f));
+        Matrix_GetStateTranslationAndScaledZ(Rand_ZeroFloat(10.0f) + 5.0f, &spA8);
+        sp90.x = this->actor.world.pos.x + spA8.x;
+        sp90.y = this->actor.world.pos.y + spA8.y;
+        sp90.z = this->actor.world.pos.z + spA8.z;
+
+        sp9C.x = spA8.x * -0.03f;
+        sp9C.y = spA8.y * -0.03f;
+        sp9C.z = spA8.z * -0.03f;
+
+        EffectSsDtBubble_SpawnCustomColor(globalCtx, &sp90, &spA8, &sp9C, &D_80BB81E8, &D_80BB81EC,
+                                          Rand_ZeroFloat(100.0f) + 200.0f, Rand_ZeroFloat(5.0f) + 15.0f, 0);
+    }
+}
+
+void func_80BB7398(EnTanron2* this, GlobalContext* globalCtx) {
+    this->actionFunc = func_80BB7408;
+    if ((s8)this->actor.colChkInfo.health <= 0) {
+        Enemy_StartFinishingBlow(globalCtx, &this->actor);
+        SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &this->actor.world.pos, 30, NA_SE_EN_IKURA_DEAD);
+    } else {
+        Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_DAMAGE);
+    }
+}
+
+void func_80BB7408(EnTanron2* this, GlobalContext* globalCtx) {
+    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;
+    this->actor.velocity.y -= 2.0f;
+
+    if (this->actor.world.pos.y <= this->actor.floorHeight) {
+        this->actor.world.pos.y = this->actor.floorHeight;
+        if ((s8)this->actor.colChkInfo.health <= 0) {
+            Actor_MarkForDeath(&this->actor);
+            func_80BB71C8(this, globalCtx);
+            D_80BB8450->unk_6F6--;
+            D_80BB8450->unk_2E2 += 4;
+            D_80BB8450->unk_2E0 += 4;
+        } else {
+            this->actor.velocity.x *= 0.5f;
+            this->actor.velocity.z *= 0.5f;
+            Math_ApproachF(&this->actor.scale.x, 1.2f, 0.75f, 1.5f);
+            Math_ApproachF(&this->actor.scale.y, 0.75f, 0.75f, 1.5f);
+            if ((this->actor.velocity.x < 0.1f) && (this->actor.velocity.z < 0.1f)) {
+                func_80BB6B80(this);
+                this->unk_158 = 1;
+            }
+        }
+    }
+}
+
+void func_80BB7578(EnTanron2* this, GlobalContext* globalCtx) {
+    ColliderInfo* acHitInfo;
+    s32 pad;
+    Player* player = GET_PLAYER(globalCtx);
+    s32 pad2;
+    s32 pad3;
+    u8 damage;
+
+    if (this->unk_154 == 0) {
+        if (this->collider1.base.acFlags & AC_HIT) {
+            this->collider1.base.acFlags &= ~AC_HIT;
+            acHitInfo = this->collider1.info.acHitInfo;
+            if (acHitInfo->toucher.dmgFlags & 0x80) {
+                func_80BB6B80(this);
+                this->unk_158 = 1;
+                Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_DAMAGE);
+                if ((player->unk_730 != 0) && (&this->actor != player->unk_730)) {
+                    player->unk_730 = &this->actor;
+                    globalCtx->actorCtx.targetContext.arrowPointedActor = &this->actor;
+                    globalCtx->actorCtx.targetContext.targetedActor = &this->actor;
+                }
+            } else {
+                this->unk_154 = 15;
+                if (this->actionFunc != func_80BB69FC) {
+                    Matrix_RotateY(this->actor.yawTowardsPlayer, MTXMODE_NEW);
+                    if ((acHitInfo->toucher.dmgFlags & 0x300000) != 0) {
+                        this->unk_154 = 10;
+                        Matrix_GetStateTranslationAndScaledZ(-10.0f, &this->actor.velocity);
+                    } else {
+                        this->unk_156 = 15;
+                        Matrix_GetStateTranslationAndScaledZ(-20.0f, &this->actor.velocity);
+                        damage = this->actor.colChkInfo.damage;
+                        this->actor.colChkInfo.health -= damage;
+                        func_80BB7398(this, globalCtx);
+                    }
+                } else {
+                    Actor_PlaySfxAtPos(&this->actor, NA_SE_EN_IKURA_DAMAGE);
+                    goto block_18;
+                }
+            }
+        }
+    }
+
+    if ((this->actionFunc == func_80BB69FC) &&
+        ((D_80BB8450->unk_1F6 == 1) || ((D_80BB8450->unk_1F7 != 0) && (Rand_ZeroOne() < 0.1f)))) {
+        if (D_80BB8450->unk_1F7 != 0) {
+            D_80BB8450->unk_1F7--;
+        }
+
+    block_18:
+        func_80BB6B80(this);
+        this->unk_158 = 2;
+        Matrix_RotateY(Math_Atan2S(this->actor.world.pos.x - D_80BB8450->unk_6BC.x,
+                                   this->actor.world.pos.z - D_80BB8450->unk_6BC.z),
+                       MTXMODE_NEW);
+        Matrix_GetStateTranslationAndScaledZ(10.0f, &this->actor.velocity);
+        this->unk_152 = Rand_ZeroFloat(100.0f) + 200.0f;
+    } else if (D_80BB8450->unk_1F6 == 10) {
+        Actor_MarkForDeath(&this->actor);
+        func_80BB71C8(this, globalCtx);
+    }
+}
+
+void EnTanron2_Update(Actor* thisx, GlobalContext* globalCtx) {
+    s32 pad;
+    EnTanron2* this = THIS;
+    s32 pad2[2];
+    Input* input;
+
+    this->unk_148++;
+    Actor_SetFocus(&this->actor, 0.0f);
+
+    if (this->unk_14E != 0) {
+        this->unk_14E--;
+    }
+
+    if (this->unk_150 != 0) {
+        this->unk_150--;
+    }
+
+    if (this->unk_152 != 0) {
+        this->unk_152--;
+    }
+
+    if (this->unk_154 != 0) {
+        this->unk_154--;
+    }
+
+    if (this->unk_156 != 0) {
+        this->unk_156--;
+    }
+
+    this->actionFunc(this, globalCtx);
+
+    if (this->actionFunc != func_80BB69FC) {
+        if ((this->actor.world.pos.x < (D_80BB8450->unk_6D8 + 20.0f)) ||
+            ((D_80BB8450->unk_6DC - 20.0f) < this->actor.world.pos.x)) {
+            this->actor.world.pos.x = this->actor.prevPos.x;
+            this->actor.velocity.x *= -1.0f;
+        }
+
+        if ((this->actor.world.pos.z < (D_80BB8450->unk_6E0 + 20.0f)) ||
+            ((D_80BB8450->unk_6E4 - 20.0f) < this->actor.world.pos.z)) {
+            this->actor.world.pos.z = this->actor.prevPos.z;
+            this->actor.velocity.z *= -1.0f;
+        }
+    }
+
+    this->unk_14A += this->unk_14C;
+    func_80BB7578(this, globalCtx);
+
+    if (this->unk_159 != 0) {
+        if (this->actor.xzDistToPlayer < 100.0f) {
+            if (this->unk_15A == 0) {
+                Collider_UpdateCylinder(&this->actor, &this->collider2);
+                CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider2.base);
+            } else {
+                this->unk_15A--;
+            }
+        }
+
+        Collider_UpdateCylinder(&this->actor, &this->collider1);
+        CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider1.base);
+    }
+
+    if (!(this->unk_148 & 0x1F)) {
+        if ((this->actionFunc != func_80BB69FC) && (this->actor.xyzDistToPlayerSq < SQ(200.0f))) {
+            this->unk_15B = 1;
+        } else {
+            this->unk_15B = 0;
+        }
+
+        if (this->actionFunc == func_80BB69FC) {
+            s16 atan = Math_Atan2S(this->actor.world.pos.x - D_80BB8450->unk_6BC.x,
+                                   this->actor.world.pos.z - D_80BB8450->unk_6BC.z);
+
+            if (ABS_ALT(BINANG_SUB(D_80BB8450->actor.yawTowardsPlayer, atan)) > 0x3000) {
+                this->unk_159 = 0;
+                this->actor.flags &= ~ACTOR_FLAG_1;
+            } else {
+                this->unk_159 = 1;
+                this->actor.flags |= ACTOR_FLAG_1;
+            }
+        }
+    }
+
+    if (CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_2000) && (this->actor.xzDistToPlayer < 80.0f)) {
+        this->actor.flags &= ~ACTOR_FLAG_2000;
+        this->unk_15A = 25;
+        this->unk_159 = 1;
+    }
+
+    input = CONTROLLER3(globalCtx);
+    if (CHECK_BTN_ALL(input->press.button, BTN_L)) {
+        this->unk_158 = 1;
+    }
+
+    if (CHECK_BTN_ALL(input->press.button, BTN_R)) {
+        func_80BB6B80(this);
+    }
+}
+
+void func_80BB7B90(Actor* thisx, GlobalContext* globalCtx) {
+    EnTanron2* this = THIS;
+
+    D_80BB8454 = (Math_SinS(globalCtx->gameplayFrames * 0x3000) * 0.1f) + 1.0f;
+    if (D_80BB8450->unk_1F6 == 11) {
+        Actor_MarkForDeath(&this->actor);
+    }
+}
+
+void EnTanron2_Draw(Actor* thisx, GlobalContext* globalCtx2) {
+    GlobalContext* globalCtx = globalCtx2;
+    s32 i;
+    s32 j;
+    s32 found;
+    Actor* tanron2;
+
+    OPEN_DISPS(globalCtx->state.gfxCtx);
+
+    func_8012C2DC(globalCtx->state.gfxCtx);
+
+    gSPDisplayList(POLY_XLU_DISP++, object_boss04_DL_003450);
+    gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 150);
+
+    tanron2 = globalCtx->actorCtx.actorLists[ACTORCAT_BOSS].first;
+
+    for (i = 0; i < ARRAY_COUNT(D_80BB8458); i++) {
+        D_80BB8458[i] = NULL;
+    }
+
+    found = 0;
+    while (tanron2 != NULL) {
+        if (tanron2->params < 100) {
+            D_80BB8458[found] = (EnTanron2*)tanron2;
+            found++;
+        }
+        tanron2 = tanron2->next;
+    }
+
+    for (j = 0; j < found - 1; j++) {
+        for (i = 0; i < found - 1; i++) {
+            if (D_80BB8458[i + 1] != NULL) {
+                if (D_80BB8458[i]->actor.projectedPos.z < D_80BB8458[i + 1]->actor.projectedPos.z) {
+                    SWAP(EnTanron2*, D_80BB8458[i], D_80BB8458[i + 1]);
+                }
+            }
+        }
+    }
+
+    for (i = 0; i < ARRAY_COUNT(D_80BB8458); i++) {
+        if (D_80BB8458[i] != NULL) {
+            Matrix_InsertTranslation(D_80BB8458[i]->actor.world.pos.x, D_80BB8458[i]->actor.world.pos.y,
+                                     D_80BB8458[i]->actor.world.pos.z, MTXMODE_NEW);
+            Matrix_NormalizeXYZ(&globalCtx->billboardMtxF);
+            Matrix_Scale(D_80BB8458[i]->actor.scale.x, D_80BB8458[i]->actor.scale.y, 0.0f, MTXMODE_APPLY);
+            Matrix_InsertZRotation_s(D_80BB8458[i]->unk_14A, MTXMODE_APPLY);
+            Matrix_Scale(0.13f, 0.14299999f, 0.13f, MTXMODE_APPLY);
+            Matrix_InsertZRotation_s(-D_80BB8458[i]->unk_14A, MTXMODE_APPLY);
+
+            gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
+                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPDisplayList(POLY_XLU_DISP++, object_boss04_DL_0034C8);
+        }
+    }
+
+    func_8012C448(globalCtx->state.gfxCtx);
+
+    gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 150);
+    gSPDisplayList(POLY_XLU_DISP++, object_boss04_DL_004510);
+
+    tanron2 = globalCtx->actorCtx.actorLists[ACTORCAT_BOSS].first;
+    while (tanron2 != NULL) {
+        if ((tanron2->params < 100) && (((EnTanron2*)tanron2)->unk_15B != 0)) {
+            Matrix_InsertTranslation(tanron2->world.pos.x, D_80BB8450->actor.floorHeight, tanron2->world.pos.z,
+                                     MTXMODE_NEW);
+            Matrix_Scale(0.6f, 0.0f, 0.6f, MTXMODE_APPLY);
+
+            gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
+                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPDisplayList(POLY_XLU_DISP++, object_boss04_DL_004550);
+        }
+        tanron2 = tanron2->next;
+    }
+
+    func_8012C974(globalCtx->state.gfxCtx);
+
+    gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
+    gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 255);
+    gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE);
+    gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE);
+
+    tanron2 = globalCtx->actorCtx.actorLists[ACTORCAT_BOSS].first;
+    while (tanron2 != NULL) {
+        if ((tanron2->params < 100) && (((EnTanron2*)tanron2)->unk_15B != 0) &&
+            (tanron2->world.pos.y <= tanron2->floorHeight)) {
+            Matrix_InsertTranslation(tanron2->world.pos.x, D_80BB8450->actor.floorHeight + 2.0f, tanron2->world.pos.z,
+                                     MTXMODE_NEW);
+            Matrix_Scale(D_80BB8454, 0.0f, D_80BB8454, MTXMODE_APPLY);
+
+            gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx),
+                      G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+            gSPDisplayList(POLY_XLU_DISP++, gameplay_keep_DL_0377B0);
+        }
+        tanron2 = tanron2->next;
+    }
+
+    CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
@@ -10,7 +10,22 @@ typedef void (*EnTanron2ActionFunc)(struct EnTanron2*, GlobalContext*);
 typedef struct EnTanron2 {
    /* 0x0000 */ Actor actor;
    /* 0x0144 */ EnTanron2ActionFunc actionFunc;
-    /* 0x0148 */ char unk_148[0xB4];
+    /* 0x0148 */ s16 unk_148;
+    /* 0x014A */ s16 unk_14A;
+    /* 0x014C */ s16 unk_14C;
+    /* 0x014E */ s16 unk_14E;
+    /* 0x0150 */ s16 unk_150;
+    /* 0x0152 */ s16 unk_152;
+    /* 0x0154 */ s16 unk_154;
+    /* 0x0156 */ s16 unk_156;
+    /* 0x0158 */ u8 unk_158;
+    /* 0x0159 */ u8 unk_159;
+    /* 0x015A */ u8 unk_15A;
+    /* 0x015B */ u8 unk_15B;
+    /* 0x015C */ f32 unk_15C;
+    /* 0x0160 */ f32 unk_160;
+    /* 0x0164 */ ColliderCylinder collider1;
+    /* 0x01B0 */ ColliderCylinder collider2;
 } EnTanron2; // size = 0x1FC

 extern const ActorInit En_Tanron2_InitVars;