diff options
| author | hev7 <143887945+hev7@users.noreply.github.com> | 2023-11-15 14:29:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 16:29:30 +0200 |
| commit | 37c0344daaa8e8f83dcf2bc0feea014e2547cb70 (patch) | |
| tree | 5357ed3c98f6af1241c3097cb765331d9b53297a /include | |
| parent | 18cb3aa72f90f81fb2ca7ba7201a835e81a6d6b6 (diff) | |
d_a_tag_Lv7Gate OK (#1985)
* d_a_tag_Lv7Gate OK
* Fix switch cases
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/d_a_player.h | 1 | ||||
| -rw-r--r-- | include/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.h | 41 |
2 files changed, 41 insertions, 1 deletions
diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h index 93bf56084b..51c171dd8f 100644 --- a/include/d/a/d_a_player.h +++ b/include/d/a/d_a_player.h @@ -726,6 +726,7 @@ public: void onForceAutoJump() { i_onEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP); } void onNotAutoJump() { i_onEndResetFlg0(ERFLG0_NOT_AUTO_JUMP); } void onNotHang() { i_onEndResetFlg0(ERFLG0_NOT_HANG); } + void onShieldBackBone() { i_onEndResetFlg1(ERFLG1_GANON_FINISH); } void onFogFade() { i_onNoResetFlg2(FLG2_UNK_4000); } void offGoronSideMove() { diff --git a/include/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.h b/include/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.h index 4f3991ed98..75c80fc8c9 100644 --- a/include/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.h +++ b/include/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.h @@ -1,6 +1,45 @@ #ifndef D_A_TAG_LV7GATE_H #define D_A_TAG_LV7GATE_H -#include "dolphin/types.h" +#include "d/com/d_com_inf_game.h" +#include "f_op/f_op_actor_mng.h" + +class daTagLv7Gate_c : public fopAc_ac_c { +public: + inline ~daTagLv7Gate_c(); + + /* 80D50C64 */ int create(); + /* 80D50D30 */ void create_init(); + /* 80D511C8 */ int execute(); + /* 80D51628 */ void calcFly(); + + inline int createHeap(); + inline void setPath(u8 i_path_ID); + inline void initBaseMtx(); + inline void setBaseMtx(); + inline void flyAnime(); + inline bool checkPoint(f32 i_speed); + inline bool setNextPoint(); + inline int draw(); + + u8 getPathID() { return (fopAcM_GetParam(this) >> 0x10); } + u16 getFlowNodeNo() { return fopAcM_GetParam(this); } + + /* 0X568 */ J3DModel* mpModel; + /* 0X56C */ mDoExt_bckAnm* mpBck; + /* 0X570 */ dPath* mRoomPath; + /* 0X574 */ request_of_phase_process_class mPhase; + /* 0X57C */ cXyz mPos2; + /* 0X588 */ cXyz mPos1; + /* 0X594 */ csXyz field_0x594; + /* 0X59C */ char* mEvName; + /* 0X5A0 */ int field_0x5a0; + /* 0X5A4 */ f32 mDistance; + /* 0X5A8 */ f32 mLastFrame; + /* 0X5AC */ u16 field_0x5ac; + /* 0X5AE */ s16 mEvtId; + /* 0X5B0 */ bool field_0x5b0; + /* 0X5B1 */ bool field_0x5b1; +}; // Size: 0x5B4 #endif /* D_A_TAG_LV7GATE_H */ |