3 files changed, 71 insertions, 9 deletions
diff --git a/include/d/actor/d_a_e_cr.h b/include/d/actor/d_a_e_cr.h
index 106648e1bf..503e40c633 100644
--- a/include/d/actor/d_a_e_cr.h
+++ b/include/d/actor/d_a_e_cr.h
@@ -1,6 +1,10 @@
 #ifndef D_A_E_CR_H
 #define D_A_E_CR_H
+
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 
 /**
  * @ingroup actors-enemies
@@ -10,16 +14,54 @@
  * @details 
  * 
  */
-class e_cr_class : public fopEn_enemy_c {
-private:
-    /* 0x5ac */ u8 field_0x5ac[0xa60 - 0x5ac];
+class e_cr_class {
+public:
+    /* 0x000 */ fopEn_enemy_c enemy;
+    /* 0x5AC */ request_of_phase_process_class phase;
+    /* 0x5B4 */ u8 field_0x5b4;
+    /* 0x5B5 */ u8 field_0x5b5;
+    /* 0x5B8 */ mDoExt_McaMorfSO* modelMorf;
+    /* 0x5BC */ Z2CreatureEnemy sound;
+    /* 0x660 */ int anm;
+    /* 0x664 */ s16 lifetime;
+    /* 0x666 */ s16 action;
+    /* 0x668 */ s16 mode;
+    /* 0x66A */ u8 field_0x66A[0x678 - 0x66A];
+    /* 0x678 */ s16 angle_target;
+    /* 0x67A */ u8 field_0x67A[0x67C - 0x67A];
+    /* 0x67C */ s16 angle_to_pl;
+    /* 0x680 */ f32 dist_to_pl;
+    /* 0x684 */ s16 timers[4];
+    /* 0x68C */ s16 invulnerabilityTimer;
+    /* 0x68E */ s16 field_0x68e;
+    /* 0x690 */ s8 field_0x690;
+    /* 0x692 */ s16 field_0x692;
+    /* 0x694 */ s16 head_rot;
+    /* 0x696 */ s16 head_rot_target;
+    /* 0x698 */ dBgS_AcchCir acchcir;
+    /* 0x6D8 */ dBgS_ObjAcch acch;
+    /* 0x8B0 */ dCcD_Stts ccStts;
+    /* 0x8EC */ dCcD_Sph ccSph;
+    /* 0xA24 */ dCcU_AtInfo atInfo;
+    /* 0xA48 */ u32 field_0xa48;
+    /* 0xA4C */ u32 field_0xa4c;
+    /* 0xA50 */ u8 field_0xA50[0xA5C - 0xA50];
+    /* 0xA5C */ u8 HIOInit;
 };
 
 STATIC_ASSERT(sizeof(e_cr_class) == 0xa60);
 
-class daE_CR_HIO_c {
+class daE_CR_HIO_c : public JORReflexible {
+public:
     /* 8069800C */ daE_CR_HIO_c();
-    /* 806997F4 */ ~daE_CR_HIO_c();
+    /* 806997F4 */ virtual ~daE_CR_HIO_c() {}
+
+    void genMessage(JORMContext*);
+
+    /* 0x04 */ s8 id;
+    /* 0x08 */ f32 base_size;
+    /* 0x0C */ f32 move_speed;
+    /* 0x10 */ f32 pl_search_range;
 };
 
 
diff --git a/include/d/actor/d_a_e_cr_egg.h b/include/d/actor/d_a_e_cr_egg.h
index 6bf9a5178b..a4e50e1607 100644
--- a/include/d/actor/d_a_e_cr_egg.h
+++ b/include/d/actor/d_a_e_cr_egg.h
@@ -1,6 +1,10 @@
 #ifndef D_A_E_CR_EGG_H
 #define D_A_E_CR_EGG_H
+
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 
 /**
  * @ingroup actors-enemies
@@ -10,9 +14,25 @@
  * @details 
  * 
  */
-class e_cr_egg_class : public fopEn_enemy_c {
-private:
-    /* 0x5ac */ u8 field_0x5ac[0xa0c - 0x5ac];
+class e_cr_egg_class {
+public:
+    /* 0x000 */ fopEn_enemy_c enemy;
+    /* 0x5AC */ request_of_phase_process_class phase;
+    /* 0x5B4 */ u8 field_0x5b4;
+    /* 0x5B5 */ u8 field_0x5b5;
+    /* 0x5B8 */ J3DModel* model;
+    /* 0x5BC */ Z2Creature sound;
+    /* 0x64C */ s16 lifetime;
+    /* 0x64E */ s16 action;
+    /* 0x650 */ s16 mode;
+    /* 0x652 */ s16 timers[2];
+    /* 0x656 */ s16 field_0x656;
+    /* 0x658 */ u8 field_0x658[0x65C - 0x658];
+    /* 0x65C */ dBgS_AcchCir acchcir;
+    /* 0x69C */ dBgS_ObjAcch acch;
+    /* 0x874 */ dCcD_Stts ccStts;
+    /* 0x8B0 */ dCcD_Sph ccSph;
+    /* 0x9E8 */ dCcU_AtInfo atInfo;
 };
 
 STATIC_ASSERT(sizeof(e_cr_egg_class) == 0xa0c);
diff --git a/include/d/actor/d_a_e_ws.h b/include/d/actor/d_a_e_ws.h
index 1fc5dd814b..f3440c2b5e 100644
--- a/include/d/actor/d_a_e_ws.h
+++ b/include/d/actor/d_a_e_ws.h
@@ -61,7 +61,7 @@ public:
     /* 0x684 */ u32 mShadowId;
     /* 0x688 */ s16 mTargetAngle;
     /* 0x68A */ s16 mTargetStep;
-    /* 0x68C */ u8 field_0x68c;
+    /* 0x68C */ u8 mMoveWaitTimer;
     /* 0x68E */ s16 mInvulnerabilityTimer;
     /* 0x690 */ u8 field_0x690;
     /* 0x691 */ u8 field_0x691;