d_a_e_sh matching (#2772)

config/GZ2E01/rels/d_a_e_sh/symbols.txt

@@ -144,6 +144,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global
 __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global
 __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_230_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
 @3918 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte

config/GZ2J01/rels/d_a_e_sh/symbols.txt

@@ -143,6 +143,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global
 __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global
 __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_230_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
 @3918 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte

config/GZ2P01/rels/d_a_e_sh/symbols.txt

@@ -143,6 +143,6 @@ __vt__8cM3dGAab = .data:0x000001E8; // type:object size:0xC scope:global
 __vt__12dBgS_ObjAcch = .data:0x000001F4; // type:object size:0x24 scope:global
 __vt__12daE_SH_HIO_c = .data:0x00000218; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
-lbl_230_bss_8 = .bss:0x00000008; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000008; // type:object size:0x1 data:byte
 @3918 = .bss:0x0000000C; // type:object size:0xC scope:local
 l_HIO = .bss:0x00000018; // type:object size:0x2C scope:global data:byte

config/ShieldD/rels/d_a_e_shD/symbols.txt

@@ -173,5 +173,5 @@ lbl_221_data_340 = .data:0x00000340; // type:object size:0x24
 @120143 = .data:0x00000528; // type:object size:0xC scope:local
 @120144 = .data:0x0000054C; // type:object size:0x11 scope:local data:string
 lbl_221_data_55D = .data:0x0000055D; // type:object size:0x8F
-lbl_221_bss_0 = .bss:0x00000000; // type:object size:0x1 data:byte
+l_HIOInit = .bss:0x00000000; // type:object size:0x1 data:byte
 l_HIO = .bss:0x00000004; // type:object size:0x2C scope:global data:byte

configure.py

@@ -1786,7 +1786,7 @@ config.libs = [
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_sb"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_sf"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_sg"),
-    ActorRel(NonMatching, "d_a_e_sh"),
+    ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_sh"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_sm"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_sm2"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_e_st"),

include/SSystem/SComponent/c_cc_d.h

@@ -248,6 +248,7 @@ protected:
     /* 0x14 */ u8 mAtp;
     /* 0x15 */ u8 field_0x15[3];
 };
+#pragma pack()
 #pragma pop
 
 STATIC_ASSERT(0x18 == sizeof(cCcD_ObjAt));

include/d/actor/d_a_e_sh.h

@@ -1,5 +1,6 @@
 #ifndef D_A_E_SH_H
 #define D_A_E_SH_H
+#include "d/d_cc_uty.h"
 #include "f_op/f_op_actor_mng.h"
 
 /**
@@ -10,17 +11,57 @@
  * @details 
  * 
  */
-class e_sh_class : public fopEn_enemy_c {
-private:
-    /* 0x5ac */ u8 field_0x5ac[0xd0c - 0x5ac];
+class e_sh_class {
+public:
+    /* 0x000 */ fopEn_enemy_c enemy;
+    /* 0x5AC */ request_of_phase_process_class mPhase;
+    /* 0x5B4 */ u8 field_0x5b4;
+    /* 0x5B8 */ mDoExt_McaMorfSO* mAnm_p;
+    /* 0x5BC */ Z2CreatureEnemy mSound;
+    /* 0x660 */ int mCurAnm;
+    /* 0x664 */ J3DModel* field_0x664[2];
+    /* 0x66C */ f32 field_0x66c;
+    /* 0x670 */ f32 field_0x670;
+    /* 0x674 */ s16 field_0x674;
+    /* 0x676 */ s16 field_0x676;
+    /* 0x678 */ s16 field_0x678;
+    /* 0x67C */ cXyz field_0x67c;
+    /* 0x688 */ s16 field_0x688;
+    /* 0x68A */ u8 field_0x68a[0x68c - 0x68a];
+    /* 0x68C */ s16 field_0x68c;
+    /* 0x690 */ f32 field_0x690;
+    /* 0x694 */ f32 field_0x694;
+    /* 0x698 */ s16 field_0x698[4];
+    /* 0x6A0 */ s16 field_0x6a0;
+    /* 0x6A4 */ f32 field_0x6a4;
+    /* 0x6A8 */ s16 field_0x6a8;
+    /* 0x6AA */ s8 field_0x6aa;
+    /* 0x6AC */ s16 field_0x6ac;
+    /* 0x6AE */ s16 field_0x6ae;
+    /* 0x6B0 */ s16 field_0x6b0;
+    /* 0x6B2 */ s16 field_0x6b2;
+    /* 0x6B4 */ f32 field_0x6b4;
+    /* 0x6B8 */ f32 field_0x6b8;
+    /* 0x6BC */ f32 field_0x6bc;
+    /* 0x6C0 */ u8 field_0x6c0[0x6c4 - 0x6c0];
+    /* 0x6C4 */ u32 field_0x6c4;
+    /* 0x6C8 */ dBgS_AcchCir mAcchCir;
+    /* 0x708 */ dBgS_ObjAcch mObjAcch;
+    /* 0x8E0 */ dCcD_Stts mStts;
+    /* 0x91C */ dCcD_Sph mSphArr[2];
+    /* 0xB8C */ dCcD_Sph mSph2;
+    /* 0xCC4 */ dCcU_AtInfo mAtInfo;
+    /* 0xCE8 */ s8 field_0xce8;
+    /* 0xCE9 */ s8 field_0xce9;
+    /* 0xCEA */ s8 field_0xcea;
+    /* 0xCEB */ s8 field_0xceb;
+    /* 0xCEC */ s8 field_0xcec;
+    /* 0xCF0 */ int field_0xcf0[2];
+    /* 0xCF8 */ u32 field_0xcf8;
+    /* 0xCFC */ u8 field_0xcfc[0xd08 - 0xcfc];
+    /* 0xD08 */ u8 mInitState;
 };
 
 STATIC_ASSERT(sizeof(e_sh_class) == 0xd0c);
 
-class daE_SH_HIO_c {
-    /* 8078E34C */ daE_SH_HIO_c();
-    /* 807918B4 */ ~daE_SH_HIO_c();
-};
-
-
 #endif /* D_A_E_SH_H */

include/d/d_stage.h

@@ -417,6 +417,7 @@ struct dStage_MapEvent_dt_c {
     /* 0x1A */ u8 field_0x1a;
     /* 0x1B */ u8 switch_no;
 };  // SIZE = 0x1C
+#pragma pack()
 #pragma pop
 
 enum dStage_MapEvent_dt_type {