d_a_cc (#867)

configure.py

@@ -1491,7 +1491,7 @@ config.libs = [
     ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d_a_beam"),
     ActorRel(NonMatching, "d_a_boko"),
     ActorRel(Matching,    "d_a_canon"),
-    ActorRel(NonMatching, "d_a_cc"),
+    ActorRel(Matching,    "d_a_cc"),
     ActorRel(NonMatching, "d_a_dai"),
     ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d_a_demo_item"),
     ActorRel(NonMatching, "d_a_door12"),

include/SSystem/SComponent/c_cc_d.h

@@ -431,7 +431,7 @@ public:
 protected:
     /* 0x10 */ u32 mType;
     /* 0x14 */ u8 mAtp;
-};
+}; // size = 0x18
 
 STATIC_ASSERT(0x18 == sizeof(cCcD_ObjAt));
 

include/d/actor/d_a_cc.h

@@ -4,23 +4,26 @@
 #include "f_op/f_op_actor.h"
 #include "d/d_cc_d.h"
 #include "d/d_bg_s_acch.h"
+#include "d/d_particle.h"
 #include "c/c_damagereaction.h"
-#include "SSystem/SComponent/c_phase.h"
 
-class cc_class : public fopAc_ac_c {
-public:
-    /* 0x2AC */ request_of_phase_process_class mPhs;
+class mDoExt_McaMorf;
+class mDoExt_brkAnm;
+
+struct cc_class {
+    /* 0x000 */ fopEn_enemy_c actor;
+    /* 0x2AC */ request_of_phase_process_class mPhase;
     /* 0x2B4 */ mDoExt_McaMorf* m2B4;
-    /* 0x2B8 */ u8 m2B8[0x2BC - 0x2B8];
+    /* 0x2B8 */ mDoExt_brkAnm* m2B8;
     /* 0x2BC */ mDoExt_McaMorf* m2BC;
-    /* 0x2C0 */ u8 m2C0[0x2C4 - 0x2C0];
+    /* 0x2C0 */ mDoExt_brkAnm* m2C0;
     /* 0x2C4 */ mDoExt_McaMorf* m2C4;
-    /* 0x2C8 */ u8 m2C8[0x2D8 - 0x2C8];
+    /* 0x2C8 */ mDoExt_brkAnm* m2C8;
+    /* 0x2CC */ mDoExt_brkAnm* m2CC;
+    /* 0x2D0 */ mDoExt_btkAnm* m2D0;
+    /* 0x2D4 */ mDoExt_btkAnm* m2D4;
     /* 0x2D8 */ mDoExt_McaMorf* m2D8;
-    /* 0x2DC */ u32 m2DC;
-    /* 0x2E0 */ u32 m2E0;
-    /* 0x2E4 */ u32 m2E4;
-    /* 0x2E8 */ u32 m2E8;
+    /* 0x2DC */ mDoExt_J3DModelPacketS m2DC;
     /* 0x2EC */ u8 m2EC[0x2F0 - 0x2EC];
     /* 0x2F0 */ u8 mBehaviorType;
     /* 0x2F1 */ u8 mColorType;
@@ -28,68 +31,67 @@ public:
     /* 0x2F3 */ u8 mDisableSpawnSwitchNo;
     /* 0x2F4 */ u8 mCurrAction;
     /* 0x2F5 */ u8 m2F5;
-    /* 0x2F6 */ u8 m2F6[0x2F7 - 0x2F6];
+    /* 0x2F6 */ u8 m2F6;
     /* 0x2F7 */ u8 m2F7;
     /* 0x2F8 */ u8 m2F8;
     /* 0x2F9 */ u8 m2F9;
-    /* 0x2FA */ u8 m2FA[0x2FB - 0x2FA];
+    /* 0x2FA */ u8 m2FA;
     /* 0x2FB */ u8 m2FB;
-    /* 0x2FC */ u8 m2FC[0x2FE - 0x2FC];
+    /* 0x2FC */ u8 m2FC;
+    /* 0x2FD */ u8 m2FD;
     /* 0x2FE */ u8 m2FE;
-    /* 0x2FF */ u8 m2FF[0x301 - 0x2FF];
+    /* 0x2FF */ u8 m2FF;
+    /* 0x300 */ bool m300;
     /* 0x301 */ u8 m301;
     /* 0x302 */ u8 m302;
-    /* 0x303 */ u8 m303[0x316 - 0x303];
-    /* 0x316 */ s16 m316;
-    /* 0x318 */ u8 m318[0x31A - 0x318];
-    /* 0x31A */ s16 m31A;
+    /* 0x303 */ u8 m303[0x304 - 0x303];
+    /* 0x304 */ u8 m304;
+    /* 0x306 */ s16 m306;
+    /* 0x308 */ s16 m308;
+    /* 0x30C */ fpc_ProcID m30C;
+    /* 0x310 */ csXyz m310;
+    /* 0x316 */ csXyz m316;
     /* 0x31C */ s16 m31C;
-    /* 0x31E */ u8 m31E[0x328 - 0x31E];
+    /* 0x320 */ s32 m320;
+    /* 0x324 */ f32 m324;
     /* 0x328 */ f32 m328;
-    /* 0x32C */ u8 m32C[0x334 - 0x32C];
+    /* 0x32C */ f32 m32C;
+    /* 0x330 */ f32 m330;
     /* 0x334 */ f32 m334;
-    /* 0x338 */ u8 m338[0x33C - 0x338];
+    /* 0x338 */ f32 m338;
     /* 0x33C */ f32 mNoticeRange;
-    /* 0x340 */ u32 m340;
-    /* 0x344 */ u8 m344[0x34C - 0x344];
+    /* 0x340 */ f32 m340;
+    /* 0x344 */ f32 m344;
+    /* 0x348 */ s16 m348;
+    /* 0x34A */ s16 m34A;
     /* 0x34C */ s16 m34C;
-    /* 0x34E */ u8 m34E[0x356 - 0x34E];
-    /* 0x356 */ s16 m356;
-    /* 0x358 */ u8 m358[0x390 - 0x358];
-    /* 0x390 */ u32 m390;
-    /* 0x394 */ u32 m394;
-    /* 0x398 */ u8 m398[0x3BC - 0x398];
+    /* 0x34E */ s16 m34E[7];
+    /* 0x35C */ s16 m35C[5];
+#if VERSION == VERSION_DEMO
+    /* 0x368 */ JPABaseEmitter* mpEmitter1;
+    /* 0x36C */ JPABaseEmitter* mpEmitter2;
+    /* 0x370 */ dPa_rippleEcallBack m368;
+#else
+    /* 0x368 */ dPa_followEcallBack m368;
+    /* 0x37C */ dPa_followEcallBack m37C;
+    /* 0x390 */ dPa_rippleEcallBack m390;
+#endif
+    /* 0x3A4 */ cXyz m3A4;
+    /* 0x3B0 */ u8 m3B0[0x3BA - 0x3B0];
+    /* 0x3BA */ s16 m3BA;
     /* 0x3BC */ cXyz m3BC;
     /* 0x3C8 */ u8 m3C8[0x3E0 - 0x3C8];
     /* 0x3E0 */ cXyz m3E0[6];
     /* 0x428 */ cXyz m428[6];
-    /* 0x470 */ u8 m470[0x47C - 0x470];
-    /* 0x47C */ dBgS_AcchCir m47C;
-    /* 0x4BC */ dBgS_Acch m4BC;
-    /* 0x680 */ dCcD_Stts m680;
-    /* 0x6BC */ dCcD_Cyl m6BC;
-    /* 0x7EC */ u8 m7EC[0x81C - 0x7EC];
-    /* 0x81C */ cc_class* m81C;
-    /* 0x820 */ u8 m820[0x864 - 0x820];
-    /* 0x864 */ u32 m864;
-    /* 0x868 */ u32 m868;
-    /* 0x86C */ u8 m86C[0x8C4 - 0x86C];
-    /* 0x8C4 */ u32 m8C4;
-    /* 0x8C8 */ u8 m8C8[0x998 - 0x8C8];
-    /* 0x998 */ u32 m998;
-    /* 0x99C */ u32 m99C;
-    /* 0x9A0 */ u8 m9A0[0x9B4 - 0x9A0];
-    /* 0x9B4 */ u32 m9B4;
-    /* 0x9B8 */ u32 m9B8;
-    /* 0x9BC */ u32 m9BC;
-    /* 0x9C0 */ u8 m9C0[0xA20 - 0x9C0];
-    /* 0xA20 */ u32 mA20;
-    /* 0xA24 */ u32 mA24;
-    /* 0xA28 */ u8 mA28[0xA30 - 0xA28];
-    /* 0xA30 */ u32 mA30;
-    /* 0xA34 */ u8 mA34[0xBD4 - 0xA34];
+    /* 0x470 */ cXyz m470;
+    /* 0x47C */ dBgS_AcchCir mAcchCir;
+    /* 0x4BC */ dBgS_ObjAcch mAcch;
+    /* 0x680 */ dCcD_Stts mStts;
+    /* 0x6BC */ dCcD_Cyl mCyl;
+    /* 0x7EC */ Mtx m7EC;
+    /* 0x81C */ enemyice mEnemyIce;
     /* 0xBD4 */ enemyfire mEnemyFire;
-    /* 0xDFC */ u8 mDFC[0xE04 - 0xDFC];
+    /* 0xDFC */ mDoExt_invisibleModel mDFC;
 };  // Size: 0xE04
 
 #endif /* D_A_CC_H */

include/m_Do/m_Do_ext.h

@@ -574,7 +574,7 @@ public:
     
     void draw();
     void setMaterial();
-};
+}; // Size: 0x10
 
 class mDoExt_3Dline_c {
 public: