d_a_fr and d_a_obj_lp work (#2372)

* Initial d_a_fr work

* general d_a_fr work

* Pull request cleanup

* d_a_obj_lp almost matching

* Fixed compile error

3 files changed, 108 insertions, 14 deletions

diff --git a/include/d/actor/d_a_fr.h b/include/d/actor/d_a_fr.h
index 1a6505643c..09684b1122 100644
--- a/include/d/actor/d_a_fr.h
+++ b/include/d/actor/d_a_fr.h
@@ -1,7 +1,11 @@
 #ifndef D_A_FR_H
 #define D_A_FR_H
 
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_msg_flow.h"
 #include "dolphin/types.h"
+#include "SSystem/SComponent/c_phase.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -13,16 +17,66 @@
  *
  */
 class fr_class : public fopAc_ac_c {
-private:
-    /* 0x568 */ u8 field_0x568[0x9e8 - 0x568];
+public:
+    /* 0x568 */ u8 field_0x568[0x5ac - 0x568];
+    /* 0x5AC */ request_of_phase_process_class mPhase;
+    /* 0x5B4 */ u8 field_0x5b4;
+    /* 0x5B5 */ u8 field_0x5b5[0x5c4 - 0x5b5];
+    /* 0x5C4 */ mDoExt_McaMorf* mMorf;
+    /* 0x5C8 */ mDoExt_btkAnm* mBtkAnm;
+    /* 0x5CC */ u8 field_0x5cc;
+    /* 0x5CD */ s8 field_0x5cd;
+    /* 0x5CE */ s8 field_0x5ce;
+    /* 0x5CF */ u8 field_0x5cf;
+    /* 0x5D0 */ s16 field_0x5d0;
+    /* 0x5D2 */ s16 field_0x5d2;
+    /* 0x5D4 */ s16 field_0x5d4;
+    /* 0x5D6 */ u8 field_0x5d6[0x5d8 - 0x5d6];
+    /* 0x5D8 */ f32 field_0x5d8;
+    /* 0x5DC */ s16 field_0x5dc[4];
+    /* 0x5E4 */ s16 field_0x5e4;
+    /* 0x5E6 */ u8 field_0x5e6[0x5e8 - 0x5e6];
+    /* 0x5E8 */ f32 field_0x5e8;
+    /* 0x5EC */ s8 field_0x5ec;
+    /* 0x5ED */ u8 field_0x5ed[0x5f0 - 0x5ed];
+    /* 0x5F0 */ f32 field_0x5f0;
+    /* 0x5F4 */ f32 field_0x5f4;
+    /* 0x5F8 */ fpc_ProcID field_0x5f8;
+    /* 0x5FC */ s16 field_0x5fc;
+    /* 0x5FE */ u8 field_0x5fe[0x600 - 0x5fe];
+    /* 0x600 */ f32 field_0x600;
+    /* 0x604 */ dBgS_AcchCir mAcchCir;
+    /* 0x644 */ dBgS_ObjAcch mAcch;
+    /* 0x81C */ dCcD_Stts mStts;
+    /* 0x858 */ dCcD_Sph mSph;
+    /* 0x990 */ u8 field_0x990;
+    /* 0x991 */ s8 field_0x991;
+    /* 0x992 */ s16 field_0x992;
+    /* 0x994 */ s16 field_0x994;
+    /* 0x998 */ dMsgFlow_c mMsgFlow;
+    /* 0x9E4 */ u8 field_0x9e4;
+    /* 0x9E5 */ u8 field_0x9e5[0x9e8 - 0x9e5];
 };
 
 STATIC_ASSERT(sizeof(fr_class) == 0x9e8);
 
-class daFr_HIO_c {
+class daFr_HIO_c : public JORReflexible {
 public:
     /* 805198EC */ daFr_HIO_c();
-    /* 8051B920 */ ~daFr_HIO_c();
+    /* 8051B920 */ virtual ~daFr_HIO_c() {};
+
+    void genMessage(JORMContext*);
+    
+    /* 0x04 */ s8 field_0x4;
+    /* 0x08 */ f32 field_0x8;
+    /* 0x0C */ f32 field_0xc;
+    /* 0x10 */ f32 field_0x10;
+    /* 0x14 */ f32 field_0x14;
+    /* 0x18 */ f32 field_0x18;
+    /* 0x1C */ f32 field_0x1c;
+    /* 0x20 */ f32 field_0x20;
+    /* 0x24 */ f32 field_0x24;
+    /* 0x28 */ f32 field_0x28;
 };
 
 
diff --git a/include/d/actor/d_a_mg_rod.h b/include/d/actor/d_a_mg_rod.h
index 721dd52fbc..20963aebf0 100644
--- a/include/d/actor/d_a_mg_rod.h
+++ b/include/d/actor/d_a_mg_rod.h
@@ -24,7 +24,7 @@ struct mg_hook_s {
     /* 0x18 */ u8 field_0x18[0x20 - 0x18];
 };
 
-struct wd_ss {};
+struct wd_ss;
 
 /**
  * @ingroup actors-items
@@ -78,7 +78,8 @@ public:
     /* 0x11D0 */ dBgS_ObjAcch field_0x11d0;
     /* 0x13A8 */ u8 field_0x13a8[0x13B4 - 0x13A8];
     /* 0x13B4 */ s16 field_0x13b4;
-    /* 0x13B6 */ u8 field_0x13b6[0x1474 - 0x13B6];
+    /* 0x13B6 */ s16 field_0x13b6;
+    /* 0x13B8 */ u8 field_0x13b8[0x1474 - 0x13B8];
     /* 0x1474 */ dMsgFlow_c mMsgFlow;
     /* 0x14C0 */ u8 field_0x14c0[0x14C8 - 0x14C0];
     /* 0x14C8 */ f32 mRodStickX;
diff --git a/include/d/actor/d_a_obj_lp.h b/include/d/actor/d_a_obj_lp.h
index 86a8502899..dcba5ac809 100644
--- a/include/d/actor/d_a_obj_lp.h
+++ b/include/d/actor/d_a_obj_lp.h
@@ -3,12 +3,6 @@
 
 #include "f_op/f_op_actor_mng.h"
 
-struct wd_ss {
-public:
-    /* 80C559C8 */ ~wd_ss();
-    /* 80C55A04 */ wd_ss();
-};
-
 /**
  * @ingroup actors-objects
  * @class obj_lp_class
@@ -17,9 +11,54 @@ public:
  * @details
  *
  */
+ 
+struct wd_ss {
+public:
+    /* 80C559C8 */ ~wd_ss() {};
+    /* 80C55A04 */ wd_ss() {};
+    
+    /* 0x00 */ J3DModel* mpModel;
+    /* 0x04 */ cXyz field_0x4;
+    /* 0x10 */ cXyz field_0x10;
+    /* 0x1C */ cXyz field_0x1c;
+    /* 0x28 */ cXyz field_0x28;
+    /* 0x34 */ s16 field_0x34;
+    /* 0x36 */ s16 field_0x36;
+    /* 0x38 */ s16 field_0x38;
+    /* 0x3A */ u8 field_0x3a[0x3c - 0x3a];
+    /* 0x3C */ f32 field_0x3c;
+    /* 0x40 */ s16 field_0x40;
+    /* 0x42 */ s16 field_0x42;
+    /* 0x44 */ s16 field_0x44;
+    /* 0x46 */ u8 field_0x46[0x4e - 0x46];
+    /* 0x4E */ u8 field_0x4e;
+    /* 0x4F */ u8 field_0x4f;
+    /* 0x50 */ int field_0x50;
+};
+
+STATIC_ASSERT(sizeof(wd_ss) == 0x54);
+
 class obj_lp_class : public fopAc_ac_c {
-private:
-    /* 0x568 */ u8 field_0x568[0xadb8 - 0x568];
+public:
+    /* 0x0568 */ request_of_phase_process_class mPhase;
+    /* 0x0570 */ u8 field_0x570;
+    /* 0x0571 */ u8 field_0x571;
+    /* 0x0572 */ u8 field_0x572;
+    /* 0x0573 */ u8 field_0x573;
+    /* 0x0574 */ s16 field_0x574;
+    /* 0x0576 */ u8 field_0x576[0x57c - 0x576];
+    /* 0x057C */ wd_ss mWdSs[512];
+    /* 0xAD7C */ mDoExt_3DlineMat0_c field_0xad7c;
+    /* 0xAD98 */ int field_0xad98;
+    /* 0xAD9C */ cXyz field_0xad9c;
+    /* 0xADA8 */ f32 field_0xada8;
+    /* 0xADAC */ f32 field_0xadac;
+    /* 0xADB0 */ u8 field_0xadb0;
+    /* 0xADB1 */ u8 field_0xadb1;
+    /* 0xADB2 */ u8 field_0xadb2;
+    /* 0xADB3 */ u8 field_0xadb3;
+    /* 0xADB4 */ u8 field_0xadb4;
+    /* 0xADB5 */ u8 field_0xadb5[0xadb8 - 0xadb5];
 };
 
 STATIC_ASSERT(sizeof(obj_lp_class) == 0xadb8);