diff options
| author | roeming <brother64youyou@gmail.com> | 2025-10-17 22:56:17 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-17 19:56:17 -0700 |
| commit | c215366d9f061d356f9814ea41b73489b1efd83b (patch) | |
| tree | 72432c9a460f48913e52475598cf9e725649b4af /include | |
| parent | 962728ce4490dd3209a62dbb31b9625b794bbca7 (diff) | |
link d_a_obj_lv6swturn (#2743)
* link d_a_obj_lv6swturn
* fix pal and jp build
* fix suggestions
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_obj_lv6swturn.h | 49 |
1 files changed, 40 insertions, 9 deletions
diff --git a/include/d/actor/d_a_obj_lv6swturn.h b/include/d/actor/d_a_obj_lv6swturn.h index 5a687046ee..7bc36ef55e 100644 --- a/include/d/actor/d_a_obj_lv6swturn.h +++ b/include/d/actor/d_a_obj_lv6swturn.h @@ -2,6 +2,7 @@ #define D_A_OBJ_LV6SWTURN_H #include "f_op/f_op_actor_mng.h" +#include "d/d_bg_s_movebg_actor.h" /** * @ingroup actors-objects @@ -11,27 +12,57 @@ * @details * */ -class daObjLv6SwTurn_c : public fopAc_ac_c { +class daObjLv6SwTurn_c : public dBgS_MoveBgActor { public: /* 80C83A98 */ void initBaseMtx(); /* 80C83AD4 */ void setBaseMtx(); - /* 80C83B38 */ void Create(); - /* 80C83C10 */ void CreateHeap(); - /* 80C83C80 */ void create1st(); - /* 80C83D04 */ void Execute(Mtx**); + /* 80C83B38 */ int Create(); + /* 80C83C10 */ int CreateHeap(); + /* 80C83C80 */ int create1st(); + /* 80C83D04 */ int Execute(Mtx**); /* 80C83D94 */ void mode_proc_call(); /* 80C83E20 */ void init_modeWait(); /* 80C83E58 */ void modeWait(); /* 80C84238 */ void init_modeRotate(); /* 80C8425C */ void modeRotate(); - /* 80C844F8 */ void Draw(); - /* 80C8459C */ void Delete(); + /* 80C844F8 */ int Draw(); + /* 80C8459C */ int Delete(); -private: - /* 0x568 */ u8 field_0x568[0x5cc - 0x568]; + u8 getSwbit() { return fopAcM_GetParamBit((void*)this, 0, 8); }; + u8 getSwbit2() { return fopAcM_GetParamBit((void*)this, 8, 8); }; + + /* 0x5A0 */ request_of_phase_process_class unk5A0; + /* 0x5A8 */ J3DModel* unk5A8; + /* 0x5AC */ u8 mMode; + /* 0x5AD */ u8 unk5AD; + /* 0x5AE */ u8 unk5AE[2]; + /* 0x5B0 */ s16 unk5B0; + /* 0x5B2 */ s16 unk5B2; + /* 0x5B4 */ s16 unk5B4; + /* 0x5B6 */ s16 unk5B6; + /* 0x5B8 */ int unk5B8; + /* 0x5BC */ s8 unk5BC; + /* 0x5BD */ u8 unk5BD; + /* 0x5C0 */ u32 unk5C0; + /* 0x5C4 */ dBgW_Base::PushPullLabel unk5C4; + /* 0x5C8 */ s16 unk5C8; + /* 0x5CA */ s16 unk5CA; }; STATIC_ASSERT(sizeof(daObjLv6SwTurn_c) == 0x5cc); +#ifdef DEBUG +class daObjLv6SwTurn_HIO_c : public mDoHIO_entry_c { +public: + daObjLv6SwTurn_HIO_c(); + void genMessage(JORMContext*); + + /* 0x6 */ u8 mWaitTime; + /* 0x7 */ u8 mChargeTime; + /* 0x8 */ s16 mRotationTime; + /* 0xA */ u8 unkA; + /* 0xB */ u8 mDrawFlag; +}; +#endif #endif /* D_A_OBJ_LV6SWTURN_H */ |