diff options
| author | Swekka <swekka@proton.me> | 2025-07-07 12:26:55 +0200 |
|---|---|---|
| committer | Swekka <swekka@proton.me> | 2025-07-07 12:26:55 +0200 |
| commit | 3ca82f7e9cc4cd549ecd7b16fb660fdd4f4f5301 (patch) | |
| tree | 833e2f223583d259e6d4b952736258e6c0608248 /include | |
| parent | 0dabb0de4221db852c6e3adb6d245daff86a450b (diff) | |
d_a_obj_cloud_dive 93%
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/d_a_item.h | 1 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_cloud_dive.h | 26 |
2 files changed, 25 insertions, 2 deletions
diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h index 00349711..25bdf8f5 100644 --- a/include/d/a/d_a_item.h +++ b/include/d/a/d_a_item.h @@ -46,6 +46,7 @@ public: static void spawnItem(u16 item, u32 room, const mVec3_c &pos, const mAng3_c &rot, u32 params, u32 arg); static void spawnDrop(u16 item, u32 room, const mVec3_c &pos, const mAng3_c &rot); + static void giveItem22(ITEM_ID, s32, s32); static void giveItem(ITEM_ID, s32, s32); static u32 checkFlag(u32 flag); static bool hasItem(u32 flag) { diff --git a/include/d/a/obj/d_a_obj_cloud_dive.h b/include/d/a/obj/d_a_obj_cloud_dive.h index c13b75f9..419a9ad7 100644 --- a/include/d/a/obj/d_a_obj_cloud_dive.h +++ b/include/d/a/obj/d_a_obj_cloud_dive.h @@ -2,19 +2,41 @@ #define D_A_OBJ_CLOUD_DIVE_H #include "d/a/obj/d_a_obj_base.h" +#include "d/col/cc/d_cc_d.h" +#include "m/m3d/m_smdl.h" +#include "nw4r/g3d/res/g3d_resfile.h" #include "s/s_State.hpp" -#include "s/s_StateMgr.hpp" class dAcOcloudDive_c : public dAcObjBase_c { public: dAcOcloudDive_c() : mStateMgr(*this, sStateID::null) {} virtual ~dAcOcloudDive_c() {} + virtual bool createHeap() override; + virtual int create() override; + virtual int doDelete() override; + virtual int actorExecute() override; + virtual int draw() override; + STATE_FUNC_DECLARE(dAcOcloudDive_c, Wait); STATE_FUNC_DECLARE(dAcOcloudDive_c, Dead); private: - /* 0x??? */ STATE_MGR_DECLARE(dAcOcloudDive_c); + bool fn_350_6F0(); + bool fn_350_760(); + + /* 0x330 */ nw4r::g3d::ResFile mResFile; + /* 0x334 */ m3d::smdl_c mMdl; + /* 0x350 */ dCcD_Cyl mCollider; + /* 0x4A0 */ STATE_MGR_DECLARE(dAcOcloudDive_c); + /* 0x4DC */ u8 field_0x4DC; + /* 0x4DD */ u8 mItemID; + /* 0x4E0 */ f32 mRadius; + + static const f32 mRadius1; + static const f32 mRadius2; + static const f32 lbl_350_rodata_8; + static dCcD_SrcCyl sCylSrc; }; #endif |