diff --git a/spec b/spec
index a605ba93a7..f3cd6c8ba9 100644
--- a/spec
+++ b/spec
@@ -3984,8 +3984,7 @@ beginseg
     name "ovl_En_Hakurock"
     compress
     include "build/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.o"
-    include "build/data/ovl_En_Hakurock/ovl_En_Hakurock.data.o"
-    include "build/data/ovl_En_Hakurock/ovl_En_Hakurock.reloc.o"
+    include "build/src/overlays/actors/ovl_En_Hakurock/ovl_En_Hakurock_reloc.o"
 endseg
 
 beginseg
diff --git a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
index 4f5686aea8..5e29a38156 100644
--- a/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
+++ b/src/overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h
@@ -7,11 +7,22 @@ struct BossHakugin;
 
 typedef void (*BossHakuginActionFunc)(struct BossHakugin*, GlobalContext*);
 
+typedef struct BossHakuginParticle {
+    /* 0x00 */ Vec3f unk_0;
+    /* 0x0C */ Vec3f unk_C;
+    /* 0x18 */ s16 unk_18;
+    /* 0x1A */ s16 unk_1A;
+    /* 0x1C */ Vec3s unk_1C;
+    /* 0x22 */ f32 unk_24;
+} BossHakuginParticle; // size = 0x28
+
 typedef struct BossHakugin {
     /* 0x0000 */ Actor actor;
     /* 0x0144 */ char unk_144[0x44];
     /* 0x0188 */ BossHakuginActionFunc actionFunc;
-    /* 0x018C */ char unk_18C[0x3684];
+    /* 0x018C */ char unk_18C[0x86C];
+    /* 0x09F8 */ BossHakuginParticle unk_9F8[180];
+    /* 0x0A14 */ char unk_A04[0x2DFC];
 } BossHakugin; // size = 0x3810
 
 extern const ActorInit Boss_Hakugin_InitVars;
diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
index 0393978027..167180dabe 100644
--- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
+++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.c
@@ -1,10 +1,11 @@
 /*
  * File: z_en_hakurock.c
- * Overlay: ovl_En_Hakurock
- * Description: Rocks Kicked Up by Goht
+ * Overlay: En_Hakurock
+ * Description: Goht Debris
  */
 
 #include "z_en_hakurock.h"
+#include "overlays/actors/ovl_Boss_Hakugin/z_boss_hakugin.h"
 
 #define FLAGS 0x00000030
 
@@ -14,13 +15,21 @@ void EnHakurock_Init(Actor* thisx, GlobalContext* globalCtx);
 void EnHakurock_Destroy(Actor* thisx, GlobalContext* globalCtx);
 void EnHakurock_Update(Actor* thisx, GlobalContext* globalCtx);
 
+void func_80B21BE0(BossHakugin* parent, Vec3f* arg1, s32 arg2);
+void func_80B21EA4(EnHakurock* this, s32 arg1);
+void func_80B21FFC(EnHakurock* this);
 void func_80B22040(EnHakurock* this, GlobalContext* globalCtx);
+void func_80B220A8(EnHakurock* this);
 void func_80B221E8(EnHakurock* this, GlobalContext* globalCtx);
+void func_80B222AC(EnHakurock* this, GlobalContext* globalCtx);
 void func_80B2242C(EnHakurock* this, GlobalContext* globalCtx);
+void func_80B224C0(EnHakurock* this);
 void func_80B22500(EnHakurock* this, GlobalContext* globalCtx);
+void func_80B226AC(EnHakurock* this);
 void func_80B22750(EnHakurock* this, GlobalContext* globalCtx);
+void func_80B228F4(Actor* thisx, GlobalContext* globalCtx);
+void EnHakurock_Draw(Actor* thisx, GlobalContext* globalCtx);
 
-#if 0
 const ActorInit En_Hakurock_InitVars = {
     ACTOR_EN_HAKUROCK,
     ACTORCAT_ITEMACTION,
@@ -33,53 +42,318 @@ const ActorInit En_Hakurock_InitVars = {
     (ActorFunc)NULL,
 };
 
-// static ColliderCylinderInit sCylinderInit = {
-static ColliderCylinderInit D_80B22A80 = {
-    { COLTYPE_HARD, AT_ON | AT_TYPE_ENEMY, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
-    { ELEMTYPE_UNK0, { 0x20000000, 0x00, 0x00 }, { 0xF3CFBBFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_HARD, BUMP_ON, OCELEM_ON, },
+static ColliderCylinderInit sCylinderInit = {
+    {
+        COLTYPE_HARD,
+        AT_ON | AT_TYPE_ENEMY,
+        AC_ON | AC_HARD | AC_TYPE_PLAYER,
+        OC1_ON | OC1_NO_PUSH | OC1_TYPE_ALL,
+        OC2_TYPE_1,
+        COLSHAPE_CYLINDER,
+    },
+    {
+        ELEMTYPE_UNK0,
+        { 0x20000000, 0x00, 0x00 },
+        { 0xF3CFBBFF, 0x00, 0x00 },
+        TOUCH_ON | TOUCH_SFX_HARD,
+        BUMP_ON,
+        OCELEM_ON,
+    },
     { 60, 60, -30, { 0, 0, 0 } },
 };
 
-// sColChkInfoInit
-static CollisionCheckInfoInit D_80B22AAC = { 0, 60, 60, MASS_IMMOVABLE };
+static CollisionCheckInfoInit sColChkInfoInit = { 0, 60, 60, MASS_IMMOVABLE };
 
-#endif
+extern Gfx D_06011100[];
 
-extern ColliderCylinderInit D_80B22A80;
-extern CollisionCheckInfoInit D_80B22AAC;
+// Stalactite
+extern Gfx D_06011178[];
 
-extern UNK_TYPE D_06011100;
+void EnHakurock_Init(Actor* thisx, GlobalContext* globalCtx) {
+    EnHakurock* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/EnHakurock_Init.s")
+    ActorShape_Init(&this->actor.shape, 0.0f, func_800B3FC0, 52.0f);
+    Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->actor, &sCylinderInit);
+    CollisionCheck_SetInfo(&this->actor.colChkInfo, NULL, &sColChkInfoInit);
+    if (this->actor.params == EN_HAKUROCK_TYPE_BOULDER) {
+        this->actor.gravity = -1.5f;
+    } else {
+        this->collider.base.ocFlags1 &= ~OC1_NO_PUSH;
+        this->actor.minVelocityY = -100.0f;
+        this->actor.gravity = -7.0f;
+    }
+    func_80B21FFC(this);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/EnHakurock_Destroy.s")
+void EnHakurock_Destroy(Actor* thisx, GlobalContext* globalCtx) {
+    EnHakurock* this = THIS;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B21BE0.s")
+    Collider_DestroyCylinder(globalCtx, &this->collider);
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B21EA4.s")
+void func_80B21BE0(BossHakugin* parent, Vec3f* arg1, s32 arg2) {
+    s32 i;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B21FFC.s")
+    for (i = 0; i < ARRAY_COUNT(parent->unk_9F8); i++) {
+        BossHakuginParticle* gohtParticle = &parent->unk_9F8[i];
+        if (gohtParticle->unk_18 < 0) {
+            s16 sp2E;
+            s16 sp2C;
+            f32 sp28;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B22040.s")
+            Math_Vec3f_Copy(&gohtParticle->unk_0, arg1);
+            sp2C = Rand_S16Offset(0x1000, 0x3000);
+            sp2E = (u32)Rand_Next() >> 0x10;
+            sp28 = Rand_ZeroFloat(5.0f) + 10.0f;
+            gohtParticle->unk_C.x = (sp28 * Math_CosS(sp2C)) * Math_SinS(sp2E);
+            gohtParticle->unk_C.y = (Math_SinS(sp2C) * sp28);
+            gohtParticle->unk_C.z = (sp28 * Math_CosS(sp2C)) * Math_CosS(sp2E);
+            if ((arg2 == 1) || (arg2 == 3)) {
+                gohtParticle->unk_24 = ((Rand_ZeroFloat(5.0f) + 25.0f) * 0.0012f);
+                gohtParticle->unk_0.x = ((Rand_ZeroFloat(2.0f) + 9.0f) * gohtParticle->unk_C.x) + arg1->x;
+                gohtParticle->unk_0.y = ((Rand_ZeroFloat(2.0f) + 3.0f) * gohtParticle->unk_C.y) + arg1->y;
+                gohtParticle->unk_0.z = ((Rand_ZeroFloat(2.0f) + 9.0f) * gohtParticle->unk_C.z) + arg1->z;
+                gohtParticle->unk_1A = 1;
+            } else {
+                gohtParticle->unk_24 = ((Rand_ZeroFloat(5.0f) + 18.0f) * 0.0001f);
+                gohtParticle->unk_0.x = ((Rand_ZeroFloat(2.0f) + 3.0f) * gohtParticle->unk_C.x) + arg1->x;
+                gohtParticle->unk_0.y = ((Rand_ZeroFloat(3.0f) + 1.0f) * gohtParticle->unk_C.y) + arg1->y;
+                gohtParticle->unk_0.z = ((Rand_ZeroFloat(2.0f) + 3.0f) * gohtParticle->unk_C.z) + arg1->z;
+                gohtParticle->unk_1A = 0;
+            }
+            gohtParticle->unk_1C.x = Rand_Next() >> 0x10;
+            gohtParticle->unk_1C.y = Rand_Next() >> 0x10;
+            gohtParticle->unk_1C.z = Rand_Next() >> 0x10;
+            gohtParticle->unk_18 = 0x28;
+            return;
+        }
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B220A8.s")
+void func_80B21EA4(EnHakurock* this, s32 arg1) {
+    Vec3f sp4C;
+    s32 i;
+    f32 scaleFactor;
+    s32 tmp;
+    s32 phi_s5;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B221E8.s")
+    if (arg1 == 0) {
+        for (i = 0; i < 20; i++) {
+            func_80B21BE0((BossHakugin*)this->actor.parent, &this->actor.world.pos, arg1);
+        }
+    } else if (arg1 == 2) {
+        for (i = 0; i < 10; i++) {
+            func_80B21BE0((BossHakugin*)this->actor.parent, &this->actor.world.pos, arg1);
+        }
+    } else {
+        Math_Vec3f_Copy(&sp4C, &this->actor.world.pos);
+        scaleFactor = this->actor.scale.x * 600.0f;
+        if (arg1 == 1) {
+            sp4C.y -= scaleFactor;
+            i = 0;
+        } else {
+            i = 1;
+        }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B222AC.s")
+        for (; i < 3; i++) {
+            tmp = (i * 5) + 5;
+            for (phi_s5 = 0; phi_s5 < tmp; phi_s5++) {
+                func_80B21BE0((BossHakugin*)this->actor.parent, &sp4C, arg1);
+            }
+            sp4C.y += scaleFactor;
+        }
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B2242C.s")
+void func_80B21FFC(EnHakurock* this) {
+    this->actor.bgCheckFlags &= ~1;
+    this->collider.base.atFlags &= ~AT_HIT;
+    this->collider.base.ocFlags1 &= ~OC1_HIT;
+    this->actor.draw = NULL;
+    this->actor.params = EN_HAKUROCK_TYPE_UNK_0;
+    this->actionFunc = func_80B22040;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B224C0.s")
+void func_80B22040(EnHakurock* this, GlobalContext* globalCtx) {
+    if (this->actor.params == EN_HAKUROCK_TYPE_BOULDER) {
+        func_80B220A8(this);
+    } else if (this->actor.params == EN_HAKUROCK_TYPE_UNK_2) {
+        func_80B222AC(this, globalCtx);
+    } else if (this->actor.params == EN_HAKUROCK_TYPE_FENCE_PILLAR) {
+        func_80B226AC(this);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B22500.s")
+void func_80B220A8(EnHakurock* this) {
+    this->actor.params = EN_HAKUROCK_TYPE_BOULDER;
+    this->actor.draw = func_80B228F4;
+    this->actor.speedXZ = Rand_ZeroFloat(3.5f) + 2.5f;
+    this->actor.velocity.y = Rand_ZeroFloat(4.5f) + 18.0f;
+    Actor_SetScale(&this->actor, (Rand_ZeroFloat(5.0f) + 15.0f) * 0.001f);
+    this->actor.world.rot.y = (Rand_Next() >> 0x12) + this->actor.parent->shape.rot.y + 0x8000;
+    this->actor.shape.rot.x = Rand_Next() >> 0x10;
+    this->actor.shape.rot.y = Rand_Next() >> 0x10;
+    this->actor.shape.rot.z = Rand_Next() >> 0x10;
+    this->collider.dim.radius = (this->actor.scale.x * 2500.0f);
+    this->collider.dim.yShift = -this->collider.dim.radius;
+    this->collider.dim.height = this->collider.dim.radius * 2;
+    this->counter = 10;
+    Math_Vec3f_Copy(&this->actor.prevPos, &this->actor.world.pos);
+    this->actionFunc = func_80B221E8;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B226AC.s")
+void func_80B221E8(EnHakurock* this, GlobalContext* globalCtx) {
+    if (this->counter > 0) {
+        this->counter--;
+    }
+    this->actor.shape.rot.x += 0x700;
+    this->actor.shape.rot.y += 0x900;
+    this->actor.shape.rot.z += 0xB00;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B22750.s")
+    if (this->collider.base.atFlags & AT_HIT || ((this->counter == 0) && (this->collider.base.ocFlags1 & OC1_HIT)) ||
+        ((this->actor.bgCheckFlags & 1) && (this->actor.velocity.y < 0.0f))) {
+        Audio_PlayActorSound2(&this->actor, NA_SE_EV_ROCK_BROKEN);
+        func_80B21EA4(this, 0);
+        func_80B21FFC(this);
+    }
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/EnHakurock_Update.s")
+void func_80B222AC(EnHakurock* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);
+    s16 angle;
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B228F4.s")
+    this->actor.draw = EnHakurock_Draw;
+    angle = (Rand_Next() >> 0x13) + player->actor.shape.rot.y;
+    this->actor.shape.rot.y = Rand_Next() >> 0x10;
+    this->actor.world.pos.x = (Math_SinS(angle) * 600.0f) + player->actor.world.pos.x;
+    this->actor.world.pos.y = player->actor.world.pos.y + 700.0f;
+    this->actor.world.pos.z = (Math_CosS(angle) * 600.0f) + player->actor.world.pos.z;
+    this->actor.shape.shadowScale = 5.0f;
+    this->actor.velocity.y = -10.0f;
+    Actor_SetScale(&this->actor, (Rand_ZeroFloat(5.0f) + 17.0f) * 0.01f);
+    this->actor.scale.x *= 0.6f;
+    this->actor.scale.z *= 0.6f;
+    this->collider.dim.radius = (this->actor.scale.x * 150.0f);
+    this->collider.dim.yShift = (this->actor.scale.y * -750.0f);
+    this->collider.dim.height = this->collider.dim.yShift * -2;
+    Math_Vec3f_Copy(&this->actor.prevPos, &this->actor.world.pos);
+    this->actor.params = EN_HAKUROCK_TYPE_UNK_2;
+    this->actionFunc = func_80B2242C;
+}
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Hakurock/func_80B229A4.s")
+void func_80B2242C(EnHakurock* this, GlobalContext* globalCtx) {
+    if ((this->collider.base.ocFlags1 & OC1_HIT) && (this->collider.base.oc == this->actor.parent)) {
+        func_80B21EA4(this, 1);
+        func_80B21FFC(this);
+    } else if ((this->actor.bgCheckFlags & 1)) {
+        func_80B21EA4(this, 2);
+        Audio_PlayActorSound2(&this->actor, NA_SE_EV_OBJECT_STICK);
+        func_80B224C0(this);
+    }
+}
+
+void func_80B224C0(EnHakurock* this) {
+    this->actor.params = EN_HAKUROCK_TYPE_STALACTITE;
+    this->counter = 10;
+    this->actor.shape.shadowScale = 0.0f;
+    this->actor.world.pos.y += 4.0f;
+    this->actionFunc = func_80B22500;
+}
+
+void func_80B22500(EnHakurock* this, GlobalContext* globalCtx) {
+    Player* player = GET_PLAYER(globalCtx);
+
+    if (this->counter > 0) {
+        this->counter--;
+        if ((this->counter & 1) == 0) {
+            this->actor.world.pos.y = (sin_rad(this->counter * (M_PI / 20)) * 4.0f) + this->actor.floorHeight;
+        } else {
+            this->actor.world.pos.y = this->actor.floorHeight;
+        }
+    }
+    if (this->collider.base.ocFlags1 & OC1_HIT) {
+        if ((this->collider.base.oc == this->actor.parent) ||
+            ((this->collider.base.oc->id == ACTOR_EN_HAKUROCK) &&
+             (this->collider.base.oc->params == EN_HAKUROCK_TYPE_UNK_2))) {
+            func_80B21EA4(this, 3);
+            func_80B21FFC(this);
+        } else if ((&player->actor == this->collider.base.oc) && ((player->stateFlags3 & 0x81000) != 0) &&
+                   (player->linearVelocity > 8.0f)) {
+            player->unk_B08[0] = player->linearVelocity = -5.0f;
+            player->unk_B08[1] += (player->linearVelocity * 0.05f);
+            player->actor.velocity.y = 5.0f;
+            player->currentYaw = player->actor.world.rot.y;
+            player->actor.home.rot.y = player->actor.world.rot.y;
+            player->actor.shape.rot.y = player->actor.world.rot.y;
+            player->unk_B8C = 4;
+        }
+
+    } else if ((this->actor.xzDistToPlayer > 1000.0f) && (this->actor.projectedPos.z < 0.0f)) {
+        func_80B21FFC(this);
+    }
+}
+
+void func_80B226AC(EnHakurock* this) {
+    f32 shiftFactor;
+
+    this->actor.draw = EnHakurock_Draw;
+    Actor_SetScale(&this->actor, 0.35f);
+    this->actor.scale.y = 0.5f;
+    this->collider.dim.radius = this->actor.scale.x * 270.0f;
+    shiftFactor = -750.0f;
+    this->collider.dim.yShift = 0.5f * shiftFactor;
+    this->counter = 0;
+    this->actor.shape.shadowScale = 0.0f;
+    this->collider.dim.height = this->collider.dim.yShift * -2;
+    this->actionFunc = func_80B22750;
+}
+
+void func_80B22750(EnHakurock* this, GlobalContext* globalCtx) {
+    if (this->actor.params == EN_HAKUROCK_TYPE_UNK_0) {
+        func_80B21EA4(this, 3);
+        func_80B21FFC(this);
+    }
+}
+
+void EnHakurock_Update(Actor* thisx, GlobalContext* globalCtx) {
+    EnHakurock* this = THIS;
+    s16 rockParams;
+
+    this->actionFunc(this, globalCtx);
+    rockParams = this->actor.params;
+    if ((rockParams == EN_HAKUROCK_TYPE_BOULDER) || (rockParams == EN_HAKUROCK_TYPE_UNK_2)) {
+        Actor_SetVelocityAndMoveYRotationAndGravity(&this->actor);
+        Actor_UpdateBgCheckInfo(globalCtx, &this->actor, 30.0f, this->collider.dim.radius, 0.0f, 0x85);
+        if (this->actor.floorHeight == BGCHECK_Y_MIN) {
+            func_80B21FFC(this);
+        } else {
+            Collider_UpdateCylinder(&this->actor, &this->collider);
+            CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+            CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+            CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+        }
+    } else if ((rockParams == EN_HAKUROCK_TYPE_STALACTITE) || (rockParams == EN_HAKUROCK_TYPE_FENCE_PILLAR)) {
+        Collider_UpdateCylinder(&this->actor, &this->collider);
+        CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+        CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
+    }
+}
+
+void func_80B228F4(Actor* thisx, GlobalContext* globalCtx) {
+    OPEN_DISPS(globalCtx->state.gfxCtx);
+    func_8012C28C(globalCtx->state.gfxCtx);
+    gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, 255, 185, 24, 255);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, &D_0406AB30);
+    CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
+
+void EnHakurock_Draw(Actor* thisx, GlobalContext* globalCtx) {
+    OPEN_DISPS(globalCtx->state.gfxCtx);
+    func_8012C28C(globalCtx->state.gfxCtx);
+    Matrix_InsertTranslation(-100.0f, 0.0f, 0.0f, 1);
+    gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
+    gSPDisplayList(POLY_OPA_DISP++, D_06011100);
+    gSPDisplayList(POLY_OPA_DISP++, D_06011178);
+    CLOSE_DISPS(globalCtx->state.gfxCtx);
+}
diff --git a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h
index 4890438aa0..eb1c4eb5d4 100644
--- a/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h
+++ b/src/overlays/actors/ovl_En_Hakurock/z_en_hakurock.h
@@ -7,10 +7,19 @@ struct EnHakurock;
 
 typedef void (*EnHakurockActionFunc)(struct EnHakurock*, GlobalContext*);
 
+typedef enum {
+    /* 0x0 */ EN_HAKUROCK_TYPE_UNK_0,
+    /* 0x1 */ EN_HAKUROCK_TYPE_BOULDER,
+    /* 0x2 */ EN_HAKUROCK_TYPE_UNK_2,
+    /* 0x3 */ EN_HAKUROCK_TYPE_STALACTITE,
+    /* 0x4 */ EN_HAKUROCK_TYPE_FENCE_PILLAR
+} EnHakurockType;
+
 typedef struct EnHakurock {
-    /* 0x0000 */ Actor actor;
-    /* 0x0144 */ EnHakurockActionFunc actionFunc;
-    /* 0x0148 */ char unk_144[0x50];
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnHakurockActionFunc actionFunc;
+    /* 0x148 */ s32 counter;
+    /* 0x14C */ ColliderCylinder collider;
 } EnHakurock; // size = 0x198
 
 extern const ActorInit En_Hakurock_InitVars;
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index 60dc19acae..b6ec70b65b 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -13250,7 +13250,7 @@
     0x80B22750:("func_80B22750",),
     0x80B2278C:("EnHakurock_Update",),
     0x80B228F4:("func_80B228F4",),
-    0x80B229A4:("func_80B229A4",),
+    0x80B229A4:("EnHakurock_Draw",),
     0x80B22C00:("func_80B22C00",),
     0x80B22C2C:("func_80B22C2C",),
     0x80B22C80:("func_80B22C80",),