diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/d/a/npc/d_a_npc_bee.h | 11 | ||||
| -rw-r--r-- | include/d/a/npc/d_a_npc_insect_capture_game_kobun.h | 1 | ||||
| -rw-r--r-- | include/m/m_vec.h | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/include/d/a/npc/d_a_npc_bee.h b/include/d/a/npc/d_a_npc_bee.h index 4c840438..cc2f0958 100644 --- a/include/d/a/npc/d_a_npc_bee.h +++ b/include/d/a/npc/d_a_npc_bee.h @@ -35,14 +35,16 @@ public: /* 0x006 */ u8 field_0x006; /* 0x007 */ u8 field_0x007; /* 0x008 */ u8 field_0x008; - /* 0x009 */ u8 field_0x009[0xc-9]; + /* 0x009 */ u8 field_0x009; + /* 0x00A */ u8 field_0x00A; + /* 0x00B */ u8 field_0x00B; /* 0x00C */ s16 mRotY; /* 0x00E */ s16 field_0x00E; /* 0x010 */ f32 field_0x010; /* 0x014 */ f32 field_0x014; /* 0x018 */ mVec3_c mPos; /* 0x024 */ mVec3_c field_0x024; - /* 0x030 */ u8 field_0x030[0x3C-0x30]; + /* 0x030 */ mVec3_c field_0x030; /* 0x03C */ mVec3_c field_0x03C; /* 0x048 */ mVec3_c field_0x048; /* 0x054 */ mVec3_c field_0x054; @@ -60,13 +62,14 @@ public: virtual int create() override; virtual int actorExecute() override; virtual int draw() override; - void updateSwarmBeeColliders(); + virtual int doDelete() override; + u32 updateSwarmBeeColliders(); void actuallyUpdateSwarmBees(); void handleBeeCrawlingOnHive(dAcNpcBeeSingleBee* bee); void fn_14_1350(dAcNpcBeeSingleBee* bee); void fn_14_1F40(dAcNpcBeeSingleBee* bee); u32 fn_14_2630(); - u32 fn_14_2690(dAcNpcBeeSingleBee* bee); + s32 fn_14_2690(dAcNpcBeeSingleBee* bee); void fn_14_20F0(dAcNpcBeeSingleBee* bee); private: diff --git a/include/d/a/npc/d_a_npc_insect_capture_game_kobun.h b/include/d/a/npc/d_a_npc_insect_capture_game_kobun.h index ffec4454..f4ace5eb 100644 --- a/include/d/a/npc/d_a_npc_insect_capture_game_kobun.h +++ b/include/d/a/npc/d_a_npc_insect_capture_game_kobun.h @@ -8,6 +8,7 @@ class dAcNpcIcgKobun_c : public dAcNpc_c { public: dAcNpcIcgKobun_c() : mStateMgr(*this) {} virtual ~dAcNpcIcgKobun_c() {} + void fn_66_30C0(u32 itemId); private: /* 0x??? */ STATE_MGR_DECLARE(dAcNpcIcgKobun_c); diff --git a/include/m/m_vec.h b/include/m/m_vec.h index bd4cc4b0..bbde3920 100644 --- a/include/m/m_vec.h +++ b/include/m/m_vec.h @@ -272,10 +272,15 @@ public: return cM::atan2s(-y, absXZ()); } - s16 atan2sY_XZ() const { + // TODO: make sure this isn't bad + s32 atan2sY_XZ() const { return cM::atan2s(y, absXZ()); } + s32 atan2sXZ_Y() const { + return -atan2sY_XZ(); + } + f32 angle(const mVec3_c &other) const { return EGG::Vector3f::angle(other); } |