summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSebastian Snoer <ssnoer@proton.me>2025-05-27 17:56:56 +0200
committerSebastian Snoer <ssnoer@proton.me>2025-05-27 17:56:56 +0200
commit4a0dfc55cc19612e16cc277ee46dc8965fa3ab9d (patch)
treecc6e7946237fdcb33f057ce16e341747deba607f /include
parent5105ef985bb707bb385d4b0cebc2b042e5e0975d (diff)
d_a_obj_bird_sp Almost implemented, mismatched update function
Diffstat (limited to 'include')
-rw-r--r--include/d/a/d_a_bird.h8
-rw-r--r--include/d/a/obj/d_a_obj_bird_sp.h8
2 files changed, 16 insertions, 0 deletions
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 &param);
+
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