From 4a0dfc55cc19612e16cc277ee46dc8965fa3ab9d Mon Sep 17 00:00:00 2001 From: Sebastian Snoer Date: Tue, 27 May 2025 17:56:56 +0200 Subject: d_a_obj_bird_sp Almost implemented, mismatched update function --- include/d/a/d_a_bird.h | 8 ++++++++ include/d/a/obj/d_a_obj_bird_sp.h | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'include/d') diff --git a/include/d/a/d_a_bird.h b/include/d/a/d_a_bird.h index 42db16b8..dcc03a6d 100644 --- a/include/d/a/d_a_bird.h +++ b/include/d/a/d_a_bird.h @@ -26,11 +26,19 @@ public: STATE_FUNC_DECLARE(dBird_c, MiniGameEnd); STATE_FUNC_DECLARE(dBird_c, MiniGameLevelUpDemo); + // fn_129_8DD0, only referenced by d_a_obj_bird_sp + void speedUpAccel(mVec3_c ¶m); + s16 getNumDashes() const { return mNumDashes; } + static dBird_c *getInstance() { + return spInstance; + } + private: + static dBird_c *spInstance; /* 0x??? */ STATE_MGR_DECLARE(dBird_c); u8 _0x36C[0xF8E - 0x36C]; /* 0xF8E */ s16 mNumDashes; diff --git a/include/d/a/obj/d_a_obj_bird_sp.h b/include/d/a/obj/d_a_obj_bird_sp.h index efeb9a2e..3a4919bc 100644 --- a/include/d/a/obj/d_a_obj_bird_sp.h +++ b/include/d/a/obj/d_a_obj_bird_sp.h @@ -2,13 +2,21 @@ #define D_A_OBJ_BIRD_SP_H #include "d/a/obj/d_a_obj_base.h" +#include "d/col/cc/d_cc_d.h" class dAcObjBirdSp_c : public dAcObjBase_c { public: dAcObjBirdSp_c() {} virtual ~dAcObjBirdSp_c() {} + virtual bool createHeap() override; + virtual int create() override; + virtual int actorExecute() override; + virtual int draw() override; + private: + static dCcD_SrcSph sCcSrc; + /* 0x330 */ dCcD_Sph mCollider; }; #endif -- cgit v1.2.3