d_a_bgn & d_a_bgn2 - 99% matching, d_a_bgn3 - 100% matching (#894)

Co-authored-by: ‎ ‎ ‎ <‎ ‎ ‎>

5 files changed, 298 insertions, 91 deletions

diff --git a/include/d/actor/d_a_bgn.h b/include/d/actor/d_a_bgn.h
index db61e731..96a060e4 100644
--- a/include/d/actor/d_a_bgn.h
+++ b/include/d/actor/d_a_bgn.h
@@ -7,78 +7,178 @@
 #include "d/d_particle.h"
 
 struct part_s {
-    /* 0x000 */ u8 m000[0x004 - 0x000];
+    /* 0x000 */ J3DModel* mpPartModel;
     /* 0x004 */ mDoExt_J3DModelPacketS m004;
-    /* 0x014 */ u8 m014[0x018 - 0x014];
-    /* 0x018 */ J3DLightObj m018;
-    /* 0x08C */ u8 m08C[0x0F8 - 0x08C];
-    /* 0x0F8 */ dCcD_Sph m0F8;
-    /* 0x224 */ u8 m224[0x23C - 0x224];
-};  // Size: 0x23C
+    /* 0x018 */ dKy_tevstr_c mPartTevStr;
+    /* 0x0C8 */ s16 m0C8;
+    /* 0x0C8 */ u8 m0CA[0x0CC - 0x0CA];
+    /* 0x0CC */ f32 m0CC;
+    /* 0x0D0 */ s16 mPartArrowHitFlashTimer;
+    /* 0x0D2 */ s8 m0D2;
+    /* 0x0D3 */ u8 m0D3[0x0D4 - 0x0D3];
+    /* 0x0D4 */ cXyz m0D4;
+    /* 0x0E0 */ csXyz m0E0;
+    /* 0x0E6 */ u8 m0E6[0x0F4 - 0x0E6];
+    /* 0x0F4 */ f32 m0F4;
+    /* 0x0F8 */ dCcD_Sph mPartSph;
+    /* 0x224 */ cXyz m224;
+#if VERSION > VERSION_DEMO
+    /* 0x230 */ JPABaseEmitter* mpPartArrowHitEmitter1;
+    /* 0x234 */ JPABaseEmitter* mpPartArrowHitEmitter2;
+    /* 0x238 */ s16 mPartArrowHitEffectTimer;
+    /* 0x23A */ u8 m23A[0x23C - 0x23A];
+#endif
+}; // Size: 0x23C
 
 struct move_s {
-    /* 0x000 */ cXyz m000[60];
+    struct bgn_himo_s {
+        /* 0x000 */ cXyz m000[60];
+    };
+    bgn_himo_s mHimo;
     /* 0x2D0 */ u8 m2D0;
-    /* 0x2D1 */ u8 m2D1[0x2EC - 0x2D1];
+    /* 0x2D1 */ u8 m2D1[0x2D4 - 0x2D1];
+    /* 0x2D4 */ cXyz m2D4;
+    /* 0x2E0 */ csXyz m2E0;
+    /* 0x2E6 */ u8 m2E6[0x2E8 - 0x2E6];
+    /* 0x2E8 */ f32 m2E8;
     /* 0x2EC */ f32 m2EC;
-    /* 0x2F0 */ u8 m2F0[0x300 - 0x2F0];
+    /* 0x2F0 */ u8 m2F0[0x2F4 - 0x2F0];
+    /* 0x2F4 */ f32 m2F4;
+    /* 0x2F8 */ s16 m2F8;
+    /* 0x2FA */ s16 m2FA;
+    /* 0x2FC */ s16 m2FC;
+    /* 0x2FE */ s16 m2FE;
     /* 0x300 */ s16 m300;
     /* 0x302 */ u8 m302[0x304 - 0x302];
     /* 0x304 */ f32 m304;
     /* 0x308 */ s8 m308;
     /* 0x309 */ u8 m309[0x30C - 0x309];
-};  // Size: 0x30C
+}; // Size: 0x30C
 
-class bgn_class : public fopAc_ac_c {
-public:
-    /* 0x0290 */ u8 m0290[0x02B5 - 0x0290];
+struct bgn_class {
+    /* 0x0000 */ fopEn_enemy_c actor;
+    /* 0x02AC */ request_of_phase_process_class mPhase;
+    /* 0x02B4 */ u8 m02B4;
     /* 0x02B5 */ s8 m02B5;
-    /* 0x02B6 */ u8 m02B6[0x02C0 - 0x02B6];
+    /* 0x02B6 */ u8 m02B6[0x02B8 - 0x02B6];
+    /* 0x02B8 */ mDoExt_McaMorf* mpMorf;
+    /* 0x02BC */ J3DModel* mpChestModel;
     /* 0x02C0 */ mDoExt_J3DModelPacketS m02C0;
-    /* 0x02D0 */ u8 m02D0[0x0314 - 0x02D0];
-    /* 0x0314 */ part_s m0314[2];
-    /* 0x078C */ part_s m078C[2];
-    /* 0x0C04 */ part_s m0C04[21];
-    /* 0x3AF0 */ part_s m3AF0[21];
-    /* 0x69DC */ part_s m69DC[4];
-    /* 0x72CC */ part_s m72CC[4];
-    /* 0x7BBC */ part_s m7BBC[21];
+#if VERSION > VERSION_DEMO
+    /* 0x02D4 */ JPABaseEmitter* mpArrowHitEmitter1;
+    /* 0x02D8 */ JPABaseEmitter* mpArrowHitEmitter2;
+    /* 0x02DC */ s16 mArrowHitEffectTimer;
+    /* 0x02DE */ u8 m02DE[0x02E0 - 0x02DE];
+#endif
+    /* 0x02E0 */ J3DModel* mpJyakutenCModel; // Weak point (1 hit left)
+    /* 0x02E4 */ J3DModel* mpJyakutenBModel; // Weak point (2 hits left)
+    /* 0x02E8 */ J3DModel* mpJyakutenAModel; // Weak point (3 hits left)
+    /* 0x02EC */ mDoExt_brkAnm* mJyakutenCBrkAnm;
+    /* 0x02F0 */ mDoExt_brkAnm* mJyakutenBBrkAnm;
+    /* 0x02F4 */ u8 m02F4[0x02F8 - 0x02F4];
+    /* 0x02F8 */ s16 m02F8;
+    /* 0x02FA */ u8 m02FA[0x02FC - 0x02FA];
+    /* 0x02FC */ f32 m02FC;
+    /* 0x0300 */ s16 mArrowHitFlashTimer;
+    /* 0x0302 */ s16 m0302;
+    /* 0x0304 */ s16 m0304;
+    /* 0x0306 */ u8 m0306[0x0308 - 0x0306];
+    /* 0x0308 */ cXyz m0308;
+    /* 0x0314 */ part_s mHeadParts[2];
+    /* 0x078C */ part_s mPelvisParts[2];
+    /* 0x0C04 */ part_s mLeftArmParts[21];
+    /* 0x3AF0 */ part_s mRightArmParts[21];
+    /* 0x69DC */ part_s mLeftLegParts[4];
+    /* 0x72CC */ part_s mRightLegParts[4];
+    /* 0x7BBC */ part_s mTailParts[21];
     /* 0xAAA8 */ move_s mAAA8[8];
-    /* 0xC308 */ u8 mC308[0xC33C - 0xC308];
+    /* 0xC308 */ cXyz mC308;
+    /* 0xC314 */ csXyz mC314;
+    /* 0xC31A */ s16 mC31A;
+    /* 0xC31C */ u8 mC31C[0xC324 - 0xC31C];
+    /* 0xC324 */ f32 mC324[2];
+    /* 0xC32C */ f32 mC32C[2];
+    /* 0xC334 */ f32 mC334;
+    /* 0xC338 */ f32 mC338;
     /* 0xC33C */ cXyz mC33C[8];
-    /* 0xC39C */ mDoExt_3DlineMat1_c mC39C;
-    /* 0xC3D8 */ mDoExt_3DlineMat1_c mC3D8;
-    /* 0xC414 */ mDoExt_3DlineMat1_c mC414;
+    /* 0xC39C */ mDoExt_3DlineMat1_c mBlueRopeMat;
+    /* 0xC3D8 */ mDoExt_3DlineMat1_c mRedRopeMat;
+#if VERSION > VERSION_DEMO
+    /* 0xC414 */ mDoExt_3DlineMat1_c mDefeatCSRopeMat; // Only used when Puppet Ganon disappears
     /* 0xC450 */ cXyz mC450[60];
-    /* 0xC720 */ u8 mC720[0xC748 - 0xC720];
+    /* 0xC720 */ s8 mC720;
+    /* 0xC721 */ u8 mC721[0xC724 - 0xC721];
+    /* 0xC724 */ f32 mC724;
+#endif
+    /* 0xC728 */ cXyz mC728;
+    /* 0xC734 */ cXyz mC734;
+    /* 0xC740 */ u8 mC740[0xC744 - 0xC740];
+    /* 0xC744 */ s16 mC744;
+    /* 0xC746 */ s16 mC746;
     /* 0xC748 */ s16 mC748;
-    /* 0xC74A */ u8 mC74A[0xC74C - 0xC74A];
+    /* 0xC74A */ s16 mC74A;
     /* 0xC74C */ s16 mC74C;
-    /* 0xC74E */ u8 mC74E[0xC7B0 - 0xC74E];
-    /* 0xC7B0 */ u16 mC7B0;
-    /* 0xC7B2 */ u8 mC7B2[0xC7C0 - 0xC7B2];
-    /* 0xC7C0 */ dCcD_Stts mC7C0;
+    /* 0xC74E */ s16 mC74E;
+    /* 0xC750 */ s16 mC750;
+    /* 0xC752 */ s16 mC752;
+    /* 0xC754 */ s16 mC754;
+    /* 0xC756 */ u8 mC756[0xC758 - 0xC756];
+    /* 0xC758 */ cXyz mC758;
+    /* 0xC764 */ s16 mC764;
+    /* 0xC766 */ u8 mC766[0xC76C - 0xC766];
+    /* 0xC76C */ f32 mC76C;
+    /* 0xC770 */ s16 mC770;
+    /* 0xC772 */ u8 mC772[0xC774 - 0xC772];
+    /* 0xC774 */ f32 mC774;
+    /* 0xC778 */ s8 mC778;
+    /* 0xC779 */ s8 mC779;
+    /* 0xC772 */ u8 mC77A[0xC77C - 0xC77A];
+    /* 0xC77C */ cXyz mC77C;
+    /* 0xC788 */ cXyz mC788;
+    /* 0xC794 */ cXyz mC794;
+    /* 0xC7A0 */ cXyz mC7A0;
+    /* 0xC7AC */ s16 mC7AC[5];
+    /* 0xC7B6 */ s16 mC7B6;
+    /* 0xC7B8 */ s16 mC7B8;
+    /* 0xC7BA */ u8 mC7BA[0xC7BC - 0xC7BA];
+    /* 0xC7BC */ f32 mC7BC;
+    /* 0xC7C0 */ dCcD_Stts mStts;
     /* 0xC7FC */ dCcD_Sph mC7FC;
-    /* 0xC928 */ dCcD_Sph mC928;
-    /* 0xCA54 */ u8 mCA54[0xCAAC - 0xCA54];
-    /* 0xCAAC */ J3DLightObj mCAAC;
-    /* 0xCB20 */ u8 mCB20[0xCB60 - 0xCB20];
+    /* 0xC928 */ dCcD_Sph mCoreSph;
+    /* 0xCA54 */ cXyz mCA54;
+#if VERSION > VERSION_DEMO
+    /* 0xCA60 */ s16 mCA60;
+#endif
+    /* 0xCA62 */ s8 mCSMode;
+    /* 0xCA63 */ u8 mCA63[0xCA64 - 0xCA63];
+    /* 0xCA64 */ s16 mKSubCount;
+    /* 0xCA66 */ u8 mCA66[0xCA68 - 0xCA66];
+    /* 0xCA68 */ cXyz mCSCamEye;
+    /* 0xCA74 */ cXyz mCA74;
+    /* 0xCA80 */ cXyz mCSCamCenter;
+    /* 0xCA8C */ u8 mCA8C[0xCA98 - 0xCA8C];
+    /* 0xCA98 */ f32 mCA98;
+    /* 0xCA9C */ f32 mCA9C;
+    /* 0xCAA0 */ f32 mCSFovY;
+    /* 0xCAA4 */ J3DModel* mpWater0Model;
+    /* 0xCAA8 */ J3DModel* mpWater1Model;
+    /* 0xCAAC */ dKy_tevstr_c mWaterTevStr;
+    /* 0xCB5C */ J3DModel* mpRoomReflectionModel;
     /* 0xCB60 */ mDoExt_J3DModelPacketS mCB60;
-    /* 0xCB70 */ u8 mCB70[0xCB74 - 0xCB70];
-    /* 0xCB74 */ J3DLightObj mCB74;
-    /* 0xCBE8 */ u8 mCBE8[0xCC24 - 0xCBE8];
+    /* 0xCB74 */ dKy_tevstr_c mRoomTevStr;
     /* 0xCC24 */ mDoExt_J3DModelPacketS mCC24;
-    /* 0xCC34 */ u8 mCC34[0xCC3C - 0xCC34];
-    /* 0xCC3C */ dPa_smokeEcallBack mCC3C[2];
-    /* 0xCC7C */ u8 mCC7C[0xCC94 - 0xCC7C];
-};  // Size: 0xCC94
-
-class daBgn_HIO_c {
-public:
-    daBgn_HIO_c();
-
-public:
-    /* Place member variables here */
-};
+    /* 0xCC38 */ s8 mCC38;
+    /* 0xCC39 */ u8 mCC39[0xCC3C - 0xCC39];
+    /* 0xCC3C */ dPa_smokeEcallBack mPunchSmokeCb[2];
+    /* 0xCC7C */ s8 mKeeseSpawnNum;
+    /* 0xCC7D */ u8 mCC7D[0xCC80 - 0xCC7D];
+    /* 0xCC80 */ f32 mCC80;
+    /* 0xCC84 */ f32 mCC84;
+    /* 0xCC88 */ f32 mCC88;
+    /* 0xCC8C */ JPABaseEmitter* mCC8C;
+    /* 0xCC90 */ s8 mCC90;
+    /* 0xCC91 */ u8 mCC91;
+    /* 0xCC92 */ u8 mCC92[0xCC94 - 0xCC92];
+}; // Size: 0xCC94
 
 #endif /* D_A_BGN_H */
diff --git a/include/d/actor/d_a_bgn2.h b/include/d/actor/d_a_bgn2.h
index def74a24..c7a7adef 100644
--- a/include/d/actor/d_a_bgn2.h
+++ b/include/d/actor/d_a_bgn2.h
@@ -1,19 +1,75 @@
 #ifndef D_A_BGN2_H
 #define D_A_BGN2_H
 
+#include "JSystem/JParticle/JPAEmitter.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
 #include "f_op/f_op_actor.h"
+#include "m_Do/m_Do_ext.h"
 
-class bgn2_class : public fopAc_ac_c {
-public:
-    /* Place member variables here */
-};
-
-class daBgn2_HIO_c {
-public:
-    daBgn2_HIO_c();
-
-public:
-    /* Place member variables here */
-};
+struct bgn2_class {
+    /* 0x0000 */ fopEn_enemy_c actor;
+    /* 0x02AC */ request_of_phase_process_class mPhase;
+    /* 0x02B4 */ mDoExt_McaMorf* mpHeadMorf;
+    /* 0x02B8 */ mDoExt_J3DModelPacketS m02B8;
+    /* 0x02CC */ mDoExt_McaMorf* mpBodyMorf;
+    /* 0x02D0 */ mDoExt_J3DModelPacketS m02D0;
+    /* 0x02E4 */ mDoExt_J3DModelPacketS m02E4;
+    /* 0x02F8 */ J3DModel* mpJyakutenModel[3];
+    /* 0x0304 */ mDoExt_brkAnm* mJyakutenCBrkAnm;
+    /* 0x0308 */ mDoExt_brkAnm* mJyakutenBBrkAnm;
+    /* 0x030C */ u8 m030C[0x0310 - 0x030C];
+    /* 0x0310 */ s16 m0310;
+    /* 0x0312 */ s16 m0312;
+    /* 0x0314 */ s16 m0314;
+    /* 0x0316 */ u8 m0316[0x0318 - 0x0316];
+    /* 0x0318 */ cXyz m0318;
+    /* 0x0324 */ u8 m0324[0x0330 - 0x0324];
+    /* 0x0330 */ s16 m0330[5];
+    /* 0x033A */ s16 m033A;
+    /* 0x033C */ s16 m033C;
+    /* 0x0334 */ u8 m033E[0x0340 - 0x033E];
+    /* 0x0340 */ cXyz m0340;
+    /* 0x034C */ cXyz m034C;
+    /* 0x0358 */ s16 m0358;
+    /* 0x035A */ u8 m035A[0x0360 - 0x035A];
+    /* 0x037C */ dCcD_Stts mStts;
+    /* 0x039C */ dCcD_Sph m039C;
+    /* 0x04C8 */ dCcD_Sph m04C8[2];
+    /* 0x0720 */ dCcD_Sph m0720[30];
+    /* 0x2A48 */ dCcD_Sph m2A48;
+    /* 0x2B74 */ cXyz m2B74;
+    /* 0x2B80 */ cXyz m2B80[2];
+    /* 0x2B98 */ cXyz m2B98[30];
+#if VERSION > VERSION_DEMO
+    /* 0x2D00 */ s16 mArrowHitEffectTimer[32];
+    /* 0x2D40 */ u8 m2D40[0x2D60 - 0x2D40];
+    /* 0x2D60 */ s16 m2D60;
+    /* 0x2D62 */ u8 m2D62[0x2D64 - 0x2D62];
+    /* 0x2D64 */ f32 m2D64;
+    /* 0x2D68 */ s16 mArrowHitFlashTimer;
+    /* 0x2D6A */ s16 m2D6A;
+    /* 0x2D6C */ JPABaseEmitter* mpArrowHitEmitter1[32];
+    /* 0x2DEC */ JPABaseEmitter* mpArrowHitEmitter2[32];
+#endif
+    /* 0x2E6C */ cXyz m2E6C;
+    /* 0x2E78 */ s8 m2E78;
+    /* 0x2E79 */ s8 m2E79;
+    /* 0x2E7A */ u8 m2E7A[0x2E7C - 0x2E7A];
+    /* 0x2E7C */ f32 m2E7C;
+    /* 0x2E80 */ s16 m2E80;
+    /* 0x2E82 */ s16 m2E82;
+    /* 0x2E84 */ u8 m2E84[0x2E88 - 0x2E84];
+    /* 0x2E88 */ mDoExt_3DlineMat1_c mRedRopeMat;
+    /* 0x2EC4 */ f32 m2EC4;
+    /* 0x2EC8 */ JPABaseEmitter* m2EC8[2];
+    /* 0x2ED0 */ s8 m2ED0;
+    /* 0x2ED1 */ u8 m2ED1[0x2ED2 - 0x2ED1];
+    /* 0x2ED2 */ s16 m2ED2;
+    /* 0x2ED4 */ dBgS_AcchCir mAcchCir;
+    /* 0x2F14 */ dBgS_ObjAcch mAcch;
+    /* 0x30D8 */ u8 m30D8;
+    /* 0x30D9 */ u8 m30D9[0x30DC - 0x30D9];
+}; // Size: 0x30DC
 
 #endif /* D_A_BGN2_H */
diff --git a/include/d/actor/d_a_bgn3.h b/include/d/actor/d_a_bgn3.h
index 6b42fab2..fd5f4571 100644
--- a/include/d/actor/d_a_bgn3.h
+++ b/include/d/actor/d_a_bgn3.h
@@ -8,38 +8,91 @@
 struct bgn3_ke_s {
     /* 0x00 */ cXyz m00[5];
     /* 0x3C */ cXyz m3C[5];
-    /* 0x78 */ u8 m78[0x84 - 0x78];
+    /* 0x78 */ cXyz m78;
 };
 
 struct part_s3 {
-    /* 0x0000 */ u8 m0000[0x00F8 - 0x0000];
-    /* 0x00F8 */ dCcD_GObjInf m00F8;
-    /* 0x01F0 */ u8 m01F0[0x023C - 0x01F0];
-    /* 0x023C */ bgn3_ke_s mHairs[40];
-    /* 0x16DC */ mDoExt_3DlineMat0_c mLineMat;
+    /* 0x0000 */ J3DModel* mpPart3Model;
+    /* 0x0004 */ mDoExt_J3DModelPacketS m0004;
+    /* 0x0018 */ dKy_tevstr_c mPart3TevStr;
+    /* 0x00C8 */ s16 m00C8;
+    /* 0x00CA */ u8 m00CA[0x00CC - 0x00CA];
+    /* 0x00CC */ f32 m00CC;
+    /* 0x00D0 */ s16 mPart3ArrowHitFlashTimer;
+    /* 0x00D2 */ u8 m00D2[0x00D4 - 0x00D2];
+    /* 0x00D4 */ cXyz m00D4;
+    /* 0x00E0 */ s16 m00E0;
+    /* 0x00E2 */ s16 m00E2;
+    /* 0x00E4 */ u8 m00E4[0x00E8 - 0x00E4];
+    /* 0x00E8 */ cXyz m00E8;
+    /* 0x00F4 */ f32 m00F4;
+    /* 0x00F8 */ dCcD_Sph mPart3Sph;
+    /* 0x0224 */ u8 m0224[0x0230 - 0x0224];
+#if VERSION > VERSION_DEMO
+    /* 0x0230 */ JPABaseEmitter* mpPart3ArrowHitEmitter1;
+    /* 0x0234 */ JPABaseEmitter* mpPart3ArrowHitEmitter2;
+    /* 0x0238 */ s16 mPart3ArrowHitEffectTimer;
+    /* 0x023A */ u8 m023A[0x023C - 0x023A];
+#endif
+    /* 0x023C */ bgn3_ke_s mPart3Hairs[40];
+    /* 0x16DC */ mDoExt_3DlineMat0_c mPart3LineMat;
 };
 
-class bgn3_class : public fopAc_ac_c {
-public:
-    /* 0x00290 */ u8 m00290[0x002E4 - 0x00290];
+struct bgn3_class {
+    /* 0x00000 */ fopEn_enemy_c actor;
+    /* 0x002AC */ request_of_phase_process_class mPhase;
+    /* 0x002B4 */ mDoExt_McaMorf* mpMorf;
+    /* 0x002B8 */ mDoExt_J3DModelPacketS m002B8;
+    /* 0x002CC */ J3DModel* m002CC;
+    /* 0x002D0 */ mDoExt_J3DModelPacketS m002D0;
     /* 0x002E4 */ bgn3_ke_s mHairs[40];
     /* 0x01784 */ mDoExt_3DlineMat0_c mLineMat;
-    /* 0x017A0 */ u8 m017A0[0x017CC - 0x017A0];
+    /* 0x017A0 */ mDoExt_J3DModelPacketS m017A0;
+    /* 0x017B4 */ J3DModel* mpJyakutenCModel; // Weak point (1 hit left)
+    /* 0x017B8 */ J3DModel* mpJyakutenBModel; // Weak point (2 hits left)
+    /* 0x017BC */ J3DModel* mpJyakutenAModel; // Weak point (3 hits left)
+    /* 0x017C0 */ mDoExt_brkAnm* mJyakutenCBrkAnm;
+    /* 0x017C4 */ mDoExt_brkAnm* mJyakutenBBrkAnm;
+    /* 0x017C8 */ u8 m017C8[0x017CC - 0x017C8];
     /* 0x017CC */ part_s3 mParts[10];
-    /* 0x0FD7C */ u8 m0FD7C[0x0FDDC - 0x0FD7C];
-    /* 0x0FDDC */ dCcD_GStts m0FDDC;
-    /* 0x0FDFC */ dCcD_GObjInf m0FDFC;
-    /* 0x0FEF4 */ u8 m0FEF4[0x0FF28 - 0x0FEF4];
-    /* 0x0FF28 */ dCcD_GObjInf m0FF28;
-    /* 0x10020 */ u8 m10020[0x100B4 - 0x10020];
-};
-
-class daBgn3_HIO_c {
-public:
-    daBgn3_HIO_c();
-
-public:
-    /* Place member variables here */
-};
+    /* 0x0FD7C */ cXyz m0FD7C;
+    /* 0x0FD88 */ s16 m0FD88;
+    /* 0x0FD8A */ s16 m0FD8A;
+    /* 0x0FD8C */ s16 m0FD8C;
+    /* 0x0FD8E */ s16 m0FD8E;
+    /* 0x0FD90 */ s16 m0FD90;
+    /* 0x0FD92 */ s16 m0FD92;
+    /* 0x0FD94 */ s16 m0FD94;
+#if VERSION > VERSION_DEMO
+    /* 0x0FD96 */ s16 m0FD96;
+    /* 0x0FD98 */ f32 m0FD98;
+    /* 0x0FD9C */ s16 mArrowHitFlashTimer;
+    /* 0x0FD9E */ s16 m0FD9E;
+    /* 0x0FDA0 */ JPABaseEmitter* mpArrowHitEmitter1;
+    /* 0x0FDA4 */ JPABaseEmitter* mpArrowHitEmitter2;
+    /* 0x0FDA8 */ s16 mArrowHitEffectTimer;
+#endif
+    /* 0x0FDAA */ s16 m0FDAA[2];
+    /* 0x0FDAE */ s16 m0FDAE;
+    /* 0x0FDB0 */ s16 m0FDB0;
+    /* 0x0FDB2 */ u8 m0FDB2[0x0FDB4 - 0x0FDB2];
+    /* 0x0FDB4 */ s16 m0FDB4;
+    /* 0x0FDB6 */ s16 m0FDB6;
+    /* 0x0FDB8 */ f32 m0FDB8;
+    /* 0x0FDBC */ f32 m0FDBC;
+    /* 0x0FDC0 */ dCcD_Stts mStts;
+    /* 0x0FDFC */ dCcD_Sph m0FDFC;
+    /* 0x0FF28 */ dCcD_Sph m0FF28;
+    /* 0x10054 */ cXyz m10054;
+    /* 0x10060 */ f32 m10060;
+    /* 0x10064 */ mDoExt_3DlineMat1_c mRedRopeMat;
+    /* 0x100A0 */ f32 m100A0;
+    /* 0x100A4 */ u8 m100A4[0x100A8 - 0x100A4];
+    /* 0x100A8 */ s16 m100A8;
+    /* 0x100AA */ u8 m100AA[0x100AC - 0x100AA];
+    /* 0x100AC */ s32 m100AC;
+    /* 0x100B0 */ u8 m100B0;
+    /* 0x100B1 */ u8 m100B1[0x100B4 - 0x100B1];
+}; // Size: 0x100B4
 
 #endif /* D_A_BGN3_H */
diff --git a/include/d/actor/d_a_cc.h b/include/d/actor/d_a_cc.h
index 7673aafc..1586488a 100644
--- a/include/d/actor/d_a_cc.h
+++ b/include/d/actor/d_a_cc.h
@@ -24,7 +24,6 @@ struct cc_class {
     /* 0x2D4 */ mDoExt_btkAnm* m2D4;
     /* 0x2D8 */ mDoExt_McaMorf* m2D8;
     /* 0x2DC */ mDoExt_J3DModelPacketS m2DC;
-    /* 0x2EC */ u8 m2EC[0x2F0 - 0x2EC];
     /* 0x2F0 */ u8 mBehaviorType;
     /* 0x2F1 */ u8 mColorType;
     /* 0x2F2 */ u8 mNoticeRangeByte;
diff --git a/include/d/actor/d_a_ki.h b/include/d/actor/d_a_ki.h
index 04bc1bf0..68e97d45 100644
--- a/include/d/actor/d_a_ki.h
+++ b/include/d/actor/d_a_ki.h
@@ -25,7 +25,6 @@ struct ki_class {
     /* 0x2AC */ request_of_phase_process_class mPhase;
     /* 0x2B4 */ mDoExt_McaMorf* mpMorf;
     /* 0x2B8 */ mDoExt_J3DModelPacketS m2B8;
-    /* 0x2C8 */ u8 m2C8[0x2CC - 0x2C8];
     /* 0x2CC */ u8 mParameters;
     /* 0x2CD */ u8 m2CD;
     /* 0x2CE */ u8 mKiPathIndex;