diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_e_ymb.h | 3 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_ikada.h | 46 | ||||
| -rw-r--r-- | include/d/actor/d_a_obj_ita.h | 57 |
3 files changed, 75 insertions, 31 deletions
diff --git a/include/d/actor/d_a_e_ymb.h b/include/d/actor/d_a_e_ymb.h index 96677987b2..2c2416348b 100644 --- a/include/d/actor/d_a_e_ymb.h +++ b/include/d/actor/d_a_e_ymb.h @@ -13,7 +13,8 @@ * * @details * - */ +*/ + class daE_YMB_c : public fopEn_enemy_c { public: /* 8081615C */ int ctrlJoint(J3DJoint*, J3DModel*); diff --git a/include/d/actor/d_a_obj_ikada.h b/include/d/actor/d_a_obj_ikada.h index 483f8af5cf..8d69c8e97e 100644 --- a/include/d/actor/d_a_obj_ikada.h +++ b/include/d/actor/d_a_obj_ikada.h @@ -1,7 +1,9 @@ #ifndef D_A_OBJ_IKADA_H #define D_A_OBJ_IKADA_H -#include "f_op/f_op_actor_mng.h" +#include "d/d_bg_s_acch.h" +#include "d/d_bg_s_movebg_actor.h" +#include "d/d_cc_d.h" /** * @ingroup actors-objects @@ -10,21 +12,41 @@ * * @details * - */ -class daObjIkada_c : public fopAc_ac_c { +*/ + +class daObjIkada_c : public dBgS_MoveBgActor { public: /* 80C269B8 */ void RideOn_Angle(s16&, f32, s16, f32); - /* 80C26A20 */ void Check_RideOn(); + /* 80C26A20 */ BOOL Check_RideOn(); /* 80C26C50 */ void initBaseMtx(); /* 80C26C7C */ void setBaseMtx(); - /* 80C27028 */ void CreateHeap(); - /* 80C270A0 */ void Create(); - /* 80C270E0 */ void Execute(Mtx**); - /* 80C27400 */ void Draw(); - /* 80C274A4 */ void Delete(); - -private: - /* 0x568 */ u8 field_0x568[0x844 - 0x568]; + /* 80C27028 */ inline int CreateHeap(); + /* 80C270A0 */ inline int Create(); + /* 80C270E0 */ inline int Execute(Mtx**); + /* 80C27400 */ inline int Draw(); + /* 80C274A4 */ inline int Delete(); + + inline cPhs__Step create(); + + /* 0x5A0 */ f32 field_0x5a0; + /* 0x5A4 */ f32 field_0x5a4; + /* 0x5A8 */ u8 field_0x5a8[0x5ac - 0x5a8]; + /* 0x5AC */ s16 field_0x5ac; + /* 0x5AE */ u8 field_0x5ae[0x5bc - 0x5ae]; + /* 0x5BC */ csXyz field_0x5bc; + /* 0x5C2 */ u8 field_0x5c2[0x5c4 - 0x5c2]; + /* 0x5C4 */ s16 field_0x5c4; + /* 0x5C6 */ s16 field_0x5c6; + /* 0x5C8 */ csXyz field_0x5c8; + /* 0x5D0 */ f32 field_0x5d0; + /* 0x5D4 */ s16 field_0x5d4; + /* 0x5D6 */ u8 field_0x5d6; + /* 0x5D8 */ cXyz field_0x5d8; + /* 0x5E4 */ dCcD_Stts mStts; + /* 0x620 */ J3DModel* mpModel; + /* 0x624 */ request_of_phase_process_class mPhase; + /* 0x62C */ dBgS_AcchCir mAcchCir; + /* 0x66C */ dBgS_ObjAcch mBgc; }; STATIC_ASSERT(sizeof(daObjIkada_c) == 0x844); diff --git a/include/d/actor/d_a_obj_ita.h b/include/d/actor/d_a_obj_ita.h index e87137a87a..379473df1c 100644 --- a/include/d/actor/d_a_obj_ita.h +++ b/include/d/actor/d_a_obj_ita.h @@ -1,7 +1,9 @@ #ifndef D_A_OBJ_ITA_H #define D_A_OBJ_ITA_H -#include "f_op/f_op_actor_mng.h" +#include "d/d_bg_s_acch.h" +#include "d/d_bg_s_movebg_actor.h" +#include "d/d_cc_d.h" /** * @ingroup actors-objects @@ -10,30 +12,49 @@ * * @details * - */ -class daObjIta_c : public fopAc_ac_c { +*/ + +class daObjIta_c : public dBgS_MoveBgActor { public: /* 80C283AC */ void Search_Ymb(); - /* 80C28674 */ void Check_RideOn(); + /* 80C28674 */ BOOL Check_RideOn(); /* 80C28788 */ void initBaseMtx(); /* 80C287B4 */ void setBaseMtx(); - /* 80C28928 */ void create(); - /* 80C28BB0 */ void CreateHeap(); - /* 80C28C28 */ void Create(); - /* 80C28C70 */ void Execute(Mtx**); - /* 80C290AC */ void Draw(); - /* 80C29150 */ void Delete(); + /* 80C28928 */ inline cPhs__Step create(); + /* 80C28BB0 */ inline int CreateHeap(); + /* 80C28C28 */ inline int Create(); + /* 80C28C70 */ inline int Execute(Mtx**); + /* 80C290AC */ inline int Draw(); + /* 80C29150 */ inline int Delete(); + + f32 dummy2(); -private: - /* 0x568 */ u8 field_0x568[0x8dc - 0x568]; + /* 0x5A0 */ f32 field_0x5a0; + /* 0x5A4 */ f32 field_0x5a4; + /* 0x5A8 */ f32 field_0x5a8; + /* 0x5AC */ f32 field_0x5ac; + /* 0x5B0 */ s16 field_0x5b0; + /* 0x5B2 */ u8 field_0x5b2[0x5c0 - 0x5b2]; + /* 0x5C0 */ csXyz field_0x5c0; + /* 0x5C6 */ u8 field_0x5c6[0x5c8 - 0x5c6]; + /* 0x5C8 */ s16 field_0x5c8; + /* 0x5CA */ s16 field_0x5ca; + /* 0x5CC */ s16 field_0x5cc; + /* 0x5CE */ csXyz field_0x5ce; + /* 0x5D4 */ f32 field_0x5d4; + /* 0x5D8 */ cXyz field_0x5d8; + /* 0x5E4 */ u8 field_0x5e4; + /* 0x5E5 */ u8 field_0x5e5; + /* 0x5E6 */ s16 field_0x5e6; + /* 0x5E8 */ dCcD_Stts mStts; + /* 0x624 */ J3DModel* mpModel; + /* 0x628 */ Z2Creature mSound; + /* 0x6B8 */ request_of_phase_process_class mPhase; + /* 0x6C0 */ u8 field_0x6c0; + /* 0x6C4 */ dBgS_AcchCir mAcchCir; + /* 0x704 */ dBgS_ObjAcch mBgc; }; STATIC_ASSERT(sizeof(daObjIta_c) == 0x8dc); -class daObj_ITA_HIO_c { -public: - /* 80C2836C */ daObj_ITA_HIO_c(); - /* 80C29184 */ ~daObj_ITA_HIO_c(); -}; - #endif /* D_A_OBJ_ITA_H */ |