From a159f3ba379a36bdb56d845efa60c856dde44083 Mon Sep 17 00:00:00 2001 From: Niklas Bauer Date: Fri, 4 Apr 2025 18:09:52 +0900 Subject: d_a_obj_ihasi Matching (#2373) * d_a_obj_ihasi matching * d_a_obj_ihasi cleanup * d_a_obj_ihasi style --- include/d/actor/d_a_obj_ihasi.h | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/d/actor/d_a_obj_ihasi.h b/include/d/actor/d_a_obj_ihasi.h index ff9e4bb714..a6435aede1 100644 --- a/include/d/actor/d_a_obj_ihasi.h +++ b/include/d/actor/d_a_obj_ihasi.h @@ -1,7 +1,10 @@ #ifndef D_A_OBJ_IHASI_H #define D_A_OBJ_IHASI_H -#include "f_op/f_op_actor_mng.h" +#include "SSystem/SComponent/c_phase.h" + +#include "d/d_bg_w.h" +#include "f_op/f_op_actor.h" /** * @ingroup actors-objects @@ -12,11 +15,21 @@ * */ class obj_ihasi_class : public fopAc_ac_c { -private: - /* 0x568 */ u8 field_0x568[0x5c4 - 0x568]; +public: + /* 0x568 */ request_of_phase_process_class mPhaseReq; + /* 0x570 */ J3DModel* mpModel1; + /* 0x574 */ J3DModel* mpModel2; + /* 0x578 */ mDoExt_btkAnm* mpBtkAnm; + /* 0x57C */ s16 field_0x57c; + /* 0x57E */ s16 mFlag1; + /* 0x580 */ s16 field_0x580; + /* 0x582 */ s16 mArr[2]; + /* 0x586 */ s8 mFlag2; + /* 0x588 */ Mtx mMtx; + /* 0x5B8 */ dBgW* mpBgW; + /* 0x5BC */ u8 field_0x5bc[8]; }; STATIC_ASSERT(sizeof(obj_ihasi_class) == 0x5c4); - #endif /* D_A_OBJ_IHASI_H */ -- cgit v1.2.3