diff options
| author | roeming <brother64youyou@gmail.com> | 2025-10-18 22:13:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-19 05:13:43 +0300 |
| commit | 31c0f94a1052de4cd5cc9c829d41c4389b3fc7b7 (patch) | |
| tree | bc1b473b9e5e47fed9ddceeda0cd91229ed482ac /include | |
| parent | c215366d9f061d356f9814ea41b73489b1efd83b (diff) | |
link d_a_obj_lv6FurikoTrap (#2745)
* link d_a_obj_lv6FurikoTrap.cpp
* name all fields
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_obj_lv6FurikoTrap.h | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/include/d/actor/d_a_obj_lv6FurikoTrap.h b/include/d/actor/d_a_obj_lv6FurikoTrap.h index 5788090fba..37b079f8ab 100644 --- a/include/d/actor/d_a_obj_lv6FurikoTrap.h +++ b/include/d/actor/d_a_obj_lv6FurikoTrap.h @@ -1,6 +1,8 @@ #ifndef D_A_OBJ_LV6FURIKOTRAP_H #define D_A_OBJ_LV6FURIKOTRAP_H +#include "d/d_bg_s_movebg_actor.h" +#include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" /** @@ -11,32 +13,44 @@ * @details * */ -class daLv6FurikoTrap_c : public fopAc_ac_c { +class daLv6FurikoTrap_c : public dBgS_MoveBgActor { public: /* 80C72510 */ void setBaseMtx(); - /* 80C72598 */ void CreateHeap(); - /* 80C72604 */ void create(); - /* 80C729B4 */ void Execute(Mtx**); + /* 80C72598 */ int CreateHeap(); + /* 80C72604 */ int create(); + /* 80C729B4 */ int Execute(Mtx**); /* 80C72CA8 */ void move(); /* 80C72D24 */ void init_modeMove(); /* 80C72D38 */ void modeMove(); - /* 80C72EE0 */ void Draw(); - /* 80C72F94 */ void Delete(); + /* 80C72EE0 */ int Draw(); + /* 80C72F94 */ int Delete(); - static u8 const mCcDObjInfo[48]; - static u8 mCcDSph[64]; + static const dCcD_SrcGObjInf mCcDObjInfo; + static dCcD_SrcSph mCcDSph; private: - /* 0x568 */ u8 field_0x568[0x1d18 - 0x568]; + /* 0x5A0 */ request_of_phase_process_class mPhase; + /* 0x5A8 */ J3DModel* mModel; + /* 0x5AC */ u8 mMode; + /* 0x5AE */ s16 mAngleIncrement; + /* 0x5B0 */ s16 mAngle; + /* 0x5B2 */ u8 mTimer; + /* 0x5B4 */ dCcD_Stts mCcStts; + /* 0x5F0 */ dCcD_Sph mCcSph1[13]; + /* 0x15C8 */ dCcD_Sph mCcSph2[6]; }; STATIC_ASSERT(sizeof(daLv6FurikoTrap_c) == 0x1d18); -class daLv6FurikoTrap_HIO_c { +class daLv6FurikoTrap_HIO_c : public mDoHIO_entry_c { public: /* 80C7248C */ daLv6FurikoTrap_HIO_c(); - /* 80C73050 */ ~daLv6FurikoTrap_HIO_c(); +#if DEBUG + void genMessage(JORMContext*); +#endif + /* 0x8 */ f32 mIntervalSeconds; + /* 0xC */ f32 mMaxAngle; + /* 0x10 */ u8 unk10; }; - #endif /* D_A_OBJ_LV6FURIKOTRAP_H */ |