d_a_obj_ito work (#2583)

* All functions worked on

* padding cleanup

2 files changed, 107 insertions, 9 deletions

diff --git a/include/d/actor/d_a_obj_gm.h b/include/d/actor/d_a_obj_gm.h
index 94f38e46f3..4b76deada2 100644
--- a/include/d/actor/d_a_obj_gm.h
+++ b/include/d/actor/d_a_obj_gm.h
@@ -1,6 +1,9 @@
 #ifndef D_A_OBJ_GM_H
 #define D_A_OBJ_GM_H
 
+#include "d/d_bg_s_acch.h"
+#include "d/d_cc_d.h"
+#include "d/d_cc_uty.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -12,8 +15,59 @@
  *
  */
 class obj_gm_class : public fopAc_ac_c {
-private:
-    /* 0x568 */ u8 field_0x568[0xaf4 - 0x568];
+public:
+    /* 0x568 */ request_of_phase_process_class mPhase;
+    /* 0x570 */ u8 field_0x570;
+    /* 0x571 */ u8 field_0x571;
+    /* 0x572 */ u8 field_0x572;
+    /* 0x573 */ u8 field_0x573;
+    /* 0x574 */ J3DModel* field_0x574;
+    /* 0x578 */ Z2Creature mSound;
+    /* 0x608 */ s16 field_0x608;
+    /* 0x60A */ s16 field_0x60a;
+    /* 0x60C */ s16 field_0x60c;
+    /* 0x60E */ s16 field_0x60e;
+    /* 0x610 */ u8 field_0x610[0x614 - 0x610];
+    /* 0x614 */ cXyz field_0x614[2];
+    /* 0x62C */ f32 field_0x62c;
+    /* 0x630 */ f32 field_0x630;
+    /* 0x634 */ f32 field_0x634;
+    /* 0x638 */ f32 field_0x638;
+    /* 0x63C */ s16 field_0x63c;
+    /* 0x63E */ s16 field_0x63e;
+    /* 0x640 */ s16 field_0x640;
+    /* 0x642 */ s16 field_0x642;
+    /* 0x644 */ s16 field_0x644;
+    /* 0x646 */ u8 field_0x646[0x648 - 0x646];
+    /* 0x648 */ f32 field_0x648;
+    /* 0x64C */ s16 field_0x64c[4];
+    /* 0x654 */ cXyz field_0x654[2];
+    /* 0x66C */ cXyz field_0x66c[2];
+    /* 0x684 */ cXyz field_0x684[6];
+    /* 0x6CC */ cXyz field_0x6cc[6];
+    /* 0x714 */ u8 field_0x714[0x720 - 0x714];
+    /* 0x720 */ s16 field_0x720;
+    /* 0x722 */ s16 field_0x722;
+    /* 0x724 */ u8 field_0x724[0x726 - 0x724];
+    /* 0x726 */ u8 field_0x726;
+    /* 0x727 */ u8 field_0x727;
+    /* 0x728 */ f32 field_0x728;
+    /* 0x72C */ u8 field_0x72c;
+    /* 0x72D */ u8 field_0x72d[0x730 - 0x72d];
+    /* 0x730 */ dBgS_AcchCir mAcchCir;
+    /* 0x770 */ dBgS_ObjAcch mObjAcch;
+    /* 0x948 */ s16 field_0x948;
+    /* 0x94A */ u8 field_0x94a[0x94c - 0x94a];
+    /* 0x94C */ dCcD_Stts mStts;
+    /* 0x988 */ dCcD_Sph field_0x988;
+    /* 0xAC0 */ dCcU_AtInfo mAtInfo;
+    /* 0xAE4 */ u8 field_0xae4;
+    /* 0xAE5 */ u8 field_0xae5[0xae8 - 0xae5];
+    /* 0xAE8 */ u32 field_0xae8;
+    /* 0xAEC */ u32 field_0xaec;
+    /* 0xAF0 */ u8 field_0xaf0;
+    /* 0xAF1 */ u8 field_0xaf1[0xaf4 - 0xaf1];
+
 };
 
 STATIC_ASSERT(sizeof(obj_gm_class) == 0xaf4);
diff --git a/include/d/actor/d_a_obj_ito.h b/include/d/actor/d_a_obj_ito.h
index de00fe4f64..86b00b1721 100644
--- a/include/d/actor/d_a_obj_ito.h
+++ b/include/d/actor/d_a_obj_ito.h
@@ -1,6 +1,7 @@
 #ifndef D_A_OBJ_ITO_H
 #define D_A_OBJ_ITO_H
 
+#include "d/d_cc_d.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -10,20 +11,63 @@
  *
  * @details
  *
- */
-class obj_ito_class : public fopAc_ac_c {
-private:
-    /* 0x568 */ u8 field_0x568[0x150c - 0x568];
+*/
+
+struct ito_s {
+    /* 0x000 */ mDoExt_3DlineMat0_c mLineMat;
+    /* 0x01C */ f32 field_0x1c[120];
+    /* 0x1FC */ cXyz field_0x1fc[6];
+    /* 0x244 */ s16 field_0x244[6];
+    /* 0x250 */ f32 field_0x250;
+    /* 0x254 */ f32 field_0x254;
+    /* 0x258 */ f32 field_0x258;
 };
 
-STATIC_ASSERT(sizeof(obj_ito_class) == 0x150c);
+class obj_ito_class {
+public:
+    /* 0x0000 */ fopAc_ac_c actor;
+    /* 0x0568 */ request_of_phase_process_class mPhase;
+    /* 0x0570 */ u8 field_0x570;
+    /* 0x0571 */ u8 field_0x571;
+    /* 0x0574 */ J3DModel* field_0x574[2];
+    /* 0x057C */ Z2Creature mSound;
+    /* 0x060C */ s16 field_0x60c;
+    /* 0x060E */ u8 field_0x60e[0x610 - 0x60e];
+    /* 0x0610 */ s16 field_0x610;
+    /* 0x0612 */ s16 field_0x612[2];
+    /* 0x0618 */ cXyz field_0x618;
+    /* 0x0624 */ cXyz field_0x624;
+    /* 0x0630 */ f32 field_0x630;
+    /* 0x0634 */ f32 field_0x634;
+    /* 0x0638 */ s8 field_0x638;
+    /* 0x0639 */ s8 field_0x639;
+    /* 0x063A */ s16 field_0x63a;
+    /* 0x063C */ dCcD_Stts mStts;
+    /* 0x0678 */ dCcD_Sph field_0x678[8];
+    /* 0x1038 */ s8 field_0x1038;
+    /* 0x103C */ ito_s field_0x103c;
+    /* 0x1298 */ ito_s field_0x1298;
+    /* 0x14F4 */ u32 field_0x14f4;
+    /* 0x14F8 */ cXyz field_0x14f8;
+    /* 0x1504 */ f32 field_0x1504;
+    /* 0x1508 */ s8 field_0x1508;
+    /* 0x1509 */ s8 field_0x1509;
+    /* 0x150A */ s8 field_0x150a;
+    /* 0x150B */ u8 field_0x150b;
+};
 
-struct ito_s {};
+STATIC_ASSERT(sizeof(obj_ito_class) == 0x150c);
 
 class daObj_Ito_HIO_c {
 public:
     /* 8047B2EC */ daObj_Ito_HIO_c();
-    /* 8047D778 */ ~daObj_Ito_HIO_c();
+    /* 8047D778 */ virtual ~daObj_Ito_HIO_c() {}
+
+    /* ぶら下りＯＢＪ糸 */
+    /* 0x04 */ s8 field_0x4;
+    /* 0x08 */ f32 field_0x8;   // 糸長さ基準値 - Thread Length Reference Value
+    /* 0x0C */ f32 field_0xc;   // 糸位置補正値 - Thread Position Correction Value
+    /* 0x10 */ s16 field_0x10;
 };