From 6e3c8bd46f84ebc19e32be48624785a34ff7b070 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 24 Nov 2023 12:47:25 -0800 Subject: Ygush00 header fix --- include/d/actor/d_a_obj_Ygush00.h | 21 +++++++++++++++++---- include/d/actor/d_a_obj_gryw00.h | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/d/actor/d_a_obj_Ygush00.h b/include/d/actor/d_a_obj_Ygush00.h index 4fe03e4d..b8bd639d 100644 --- a/include/d/actor/d_a_obj_Ygush00.h +++ b/include/d/actor/d_a_obj_Ygush00.h @@ -8,12 +8,25 @@ class daObjYgush00_c : public fopAc_ac_c { public: - /* 0x290 */ request_of_phase_process_class mLoadYgush00Phs; - /* 0x298 */ J3DModel* mpModel; + enum Param_e { + PRM_TYPE_W = 3, + PRM_TYPE_S = 0, + }; + + s32 _create(); + bool _delete(); + bool _execute(); + bool _draw(); + bool create_heap(); + static BOOL solidHeapCB(fopAc_ac_c*); + +public: + /* 0x290 */ request_of_phase_process_class mPhs; + /* 0x298 */ J3DModel * mpModel; /* 0x29C */ mDoExt_btkAnm mBtkAnm; /* 0x2B0 */ mDoExt_bckAnm mBckAnm; - /* 0x2C0 */ u32 mType; - /* 0x2C4 */ daObjGryw00_c* mpGryw00; + /* 0x2C0 */ s32 mType; + /* 0x2C4 */ daObjGryw00_c * mpGryw00; }; #endif /* D_A_OBJ_YGUSH00_H */ diff --git a/include/d/actor/d_a_obj_gryw00.h b/include/d/actor/d_a_obj_gryw00.h index eaf380da..abeeba4f 100644 --- a/include/d/actor/d_a_obj_gryw00.h +++ b/include/d/actor/d_a_obj_gryw00.h @@ -5,7 +5,7 @@ class daObjGryw00_c : public fopAc_ac_c { public: - void get_draw_water_lv(void*); + f32 get_draw_water_lv(void*); void setup_high_water_level_btk_anm(); void particle_set(); void particle_move(); -- cgit v1.2.3