diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/actor/d_a_ppolamp.h | 24 | ||||
| -rw-r--r-- | include/d/actor/d_a_tag_Lv6Gate.h | 12 |
2 files changed, 19 insertions, 17 deletions
diff --git a/include/d/actor/d_a_ppolamp.h b/include/d/actor/d_a_ppolamp.h index e1faf7b777..7897532df1 100644 --- a/include/d/actor/d_a_ppolamp.h +++ b/include/d/actor/d_a_ppolamp.h @@ -12,21 +12,29 @@ * @details * */ -class daPPolamp_c : public fopAc_ac_c { +class daPPolamp_c : public fopAc_ac_c, public request_of_phase_process_class { public: - /* 80D4C958 */ ~daPPolamp_c(); - /* 80D4C9FC */ void create(); - /* 80D4CB24 */ void execute(); - /* 80D4CB84 */ void draw(); - /* 80D4CCF0 */ void Delete(); + /* 80D4C958 */ virtual ~daPPolamp_c(); + /* 80D4C9FC */ int create(); + /* 80D4CB24 */ int execute(); + /* 80D4CB84 */ int draw(); + /* 80D4CCF0 */ int Delete(); /* 80D4CD24 */ void setModelMtx(); /* 80D4CDA8 */ void setPclModelMtx(); - /* 80D4CE9C */ void createHeap(); + /* 80D4CE9C */ int createHeap(); /* 80D4CFB0 */ void moveSwing(); /* 80D4D10C */ void initParam(); private: - /* 0x568 */ u8 field_0x568[0x5ac - 0x568]; + /* 0x574 */ J3DModel* mModel1; + /* 0x578 */ J3DModel* mModel2; + /* 0x57C */ mDoExt_bckAnm mBck; + /* 0x598 */ int field_0x598; + /* 0x59C */ s8 field_0x59c; + /* 0x59E */ s16 field_0x59e; + /* 0x5A0 */ u8 mSwingTimer; + /* 0x5A4 */ f32 field_0x5a4; + /* 0x5A8 */ f32 field_0x5a8; }; STATIC_ASSERT(sizeof(daPPolamp_c) == 0x5ac); diff --git a/include/d/actor/d_a_tag_Lv6Gate.h b/include/d/actor/d_a_tag_Lv6Gate.h index 9379a1b76e..b72f83de5c 100644 --- a/include/d/actor/d_a_tag_Lv6Gate.h +++ b/include/d/actor/d_a_tag_Lv6Gate.h @@ -8,23 +8,17 @@ class daTagLv6Gate_c : public fopAc_ac_c { public: /* 80D4F8B8 */ int createHeap(); /* 80D4FBD8 */ int create(); - /* 80D4FEDC */ int execute(); + /* 80D4FEDC */ inline int execute(); /* 80D506AC */ int draw(); inline ~daTagLv6Gate_c(); - inline void seStair(); - inline void seGlassOff(); - inline void seGlassOn(); inline void initBaseMtx(); inline void setBaseMtx(); inline void create_init(); inline bool checkOpenArea(); - inline void cut1(); - inline void cut2(); - inline void cut4(); - void stabMasterSword() { field_0x76a = 1; } + void stabMasterSword() { mIsMasterSwordStabbed = 1; } u8 getSwitchNo1() { return fopAcM_GetParam(this) & 0xFF; } u8 getSwitchNo2() { return fopAcM_GetParam(this) >> 0x8 & 0xFF; } @@ -35,7 +29,7 @@ public: /* 0x758 */ request_of_phase_process_class mPhase; /* 0x760 */ f32 field_0x760[2]; /* 0x768 */ s16 mEvtId; - /* 0x76A */ u8 field_0x76a; + /* 0x76A */ bool mIsMasterSwordStabbed; }; // Size: 0x76C #endif /* D_A_TAG_LV6GATE_H */ |