4 files changed, 38 insertions, 9 deletions
diff --git a/include/d/a/e/d_a_e_bc.h b/include/d/a/e/d_a_e_bc.h
index 520aa7d9..bf5671ad 100644
--- a/include/d/a/e/d_a_e_bc.h
+++ b/include/d/a/e/d_a_e_bc.h
@@ -45,8 +45,14 @@ public:
     STATE_FUNC_DECLARE(dAcEbc_c, AAttack);
     STATE_FUNC_DECLARE(dAcEbc_c, ADamage);
 
+    u8 getField_0x130D() const {
+        return field_0x130D;
+    }
+
 private:
     /* 0x??? */ STATE_MGR_DECLARE(dAcEbc_c);
+    /* 0x??? */ u8 field_unk[0xF59];
+    /* 0x130D */ u8 field_0x130D;
 };
 
 #endif
diff --git a/include/d/a/npc/d_a_npc_bee.h b/include/d/a/npc/d_a_npc_bee.h
index 6d161ac1..4c840438 100644
--- a/include/d/a/npc/d_a_npc_bee.h
+++ b/include/d/a/npc/d_a_npc_bee.h
@@ -4,6 +4,7 @@
 #include "common.h"
 #include "d/a/d_a_base.h"
 #include "d/a/e/d_a_en_base.h"
+#include "d/a/npc/d_a_npc_honeycomb.h"
 #include "d/a/obj/d_a_obj_base.h"
 #include "d/col/cc/d_cc_d.h"
 #include "d/d_cc.h"
@@ -12,6 +13,8 @@
 #include "m/m_vec.h"
 #include "nw4r/g3d/res/g3d_resfile.h"
 
+class dAcOSpore_c;
+
 class dAcNpcBeeSingleBee {
 public:
     enum State {
@@ -35,14 +38,16 @@ public:
     /* 0x009 */ u8 field_0x009[0xc-9];
     /* 0x00C */ s16 mRotY;
     /* 0x00E */ s16 field_0x00E;
-    /* 0x010 */ u8 field_0x010[0x18-0x10];
+    /* 0x010 */ f32 field_0x010;
+    /* 0x014 */ f32 field_0x014;
     /* 0x018 */ mVec3_c mPos;
-    /* 0x024 */ u8 field_0x024[0x3C-0x24];
+    /* 0x024 */ mVec3_c field_0x024;
+    /* 0x030 */ u8 field_0x030[0x3C-0x30];
     /* 0x03C */ mVec3_c field_0x03C;
     /* 0x048 */ mVec3_c field_0x048;
     /* 0x054 */ mVec3_c field_0x054;
     /* 0x060 */ mAng3_c field_0x060;
-    /* 0x066 */ u8 field_0x066[0x6C-0x66];
+    /* 0x066 */ mAng3_c field_0x066;
     /* 0x06C */ dCcD_Linked_Sph mCollider;
 };
 
@@ -53,11 +58,16 @@ public:
     virtual ~dAcNpcBee_c() {}
     virtual bool createHeap() override;
     virtual int create() override;
-    virtual int execute() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
     void updateSwarmBeeColliders();
     void actuallyUpdateSwarmBees();
+    void handleBeeCrawlingOnHive(dAcNpcBeeSingleBee* bee);
+    void fn_14_1350(dAcNpcBeeSingleBee* bee);
     void fn_14_1F40(dAcNpcBeeSingleBee* bee);
+    u32 fn_14_2630();
     u32 fn_14_2690(dAcNpcBeeSingleBee* bee);
+    void fn_14_20F0(dAcNpcBeeSingleBee* bee);
 
 private:
     /* 0x0378 */ u8 mSwarmBeeCount;
@@ -65,16 +75,18 @@ private:
     /* 0x037A */ u8 mSceneflag;
     /* 0x037B */ u8 field_0x037B;
     /* 0x037C */ s16 field_0x037C;
-    /* 0x037E */ u8 field_0x037E[0x388-0x37E];
+    /* 0x037E */ u8 field_0x037E[0x380-0x37E];
+    /* 0x0380 */ f32 field_0x0380;
+    /* 0x0384 */ u8 field_0x0384[0x388-0x384];
     /* 0x0388 */ nw4r::g3d::ResFile mRes;
     /* 0x038C */ dShpProc1_c mBeeModels[4];
     /* 0x045C */ dAcNpcBeeSingleBee mBees[100];
-    /* 0xB80C */ dAcRef_c<dAcObjBase_c> mHiveRef;
+    /* 0xB80C */ dAcRef_c<dAcNpcHc_c> mHiveRef;
     /* 0xB818 */ dAcRef_c<dAcObjBase_c> mAttackRef;
     /* 0xB824 */ dColliderLinkedList mColliderList;
     /* 0xB830 */ mVec3_c field_0xB830;
-    /* 0xB834 */ dAcObjBase_c* mAttackActor;
-    /* 0xB838 */ u8 field_0xB838[0xB844-0xB838];
+    /* 0xB83C */ dAcObjBase_c* mAttackActor;
+    /* 0xB840 */ dAcOSpore_c* field_0xB840;
 };
 
 #endif
diff --git a/include/d/a/npc/d_a_npc_honeycomb.h b/include/d/a/npc/d_a_npc_honeycomb.h
index a0c3c7dd..79e6c142 100644
--- a/include/d/a/npc/d_a_npc_honeycomb.h
+++ b/include/d/a/npc/d_a_npc_honeycomb.h
@@ -2,13 +2,19 @@
 #define D_A_NPC_HONEYCOMB_H
 
 #include "d/a/e/d_a_en_base.h"
+#include "m/m_vec.h"
 
 class dAcNpcHc_c : public dAcEnBase_c {
 public:
     dAcNpcHc_c() {}
     virtual ~dAcNpcHc_c() {}
 
-private:
+// private:
+/* 0x378 */ u8 field_0x378[0x915-0x378];
+/* 0x915 */ u8 field_0x915;
+/* 0x916 */ u8 field_0x916;
+/* 0x917 */ u8 field_0x917[0x928-0x917];
+/* 0x928 */ mVec3_c field_0x928;
 };
 
 #endif
diff --git a/include/d/a/obj/d_a_obj_spore.h b/include/d/a/obj/d_a_obj_spore.h
index 1f787c6e..2f5418c7 100644
--- a/include/d/a/obj/d_a_obj_spore.h
+++ b/include/d/a/obj/d_a_obj_spore.h
@@ -2,12 +2,17 @@
 #define D_A_O_SPORE_H
 
 #include "d/a/obj/d_a_obj_base.h"
+#include "f/f_list_mg.h"
 class dAcOSpore_c : public dAcObjBase_c {
 public:
     dAcOSpore_c() {}
     virtual ~dAcOSpore_c() {}
 
+    static fLiNdBa_c* getListHead();
+
+
 private:
+static fLiMgBa_c sSpores;
 };
 
 #endif