diff --git a/actor/Actor.h b/actor/Actor.h index 2356b56..43c3758 100644 --- a/actor/Actor.h +++ b/actor/Actor.h @@ -347,6 +347,11 @@ class Actor : public ActorBase return mAngle; } + const sead::Vector2f& getPosDelta() const + { + return mPosDelta; + } + ActorKind getKind() const { return ActorKind(mActorKind); diff --git a/collision/ActorBgCollisionCheck.h b/collision/ActorBgCollisionCheck.h index 74b1a94..c59e7ce 100644 --- a/collision/ActorBgCollisionCheck.h +++ b/collision/ActorBgCollisionCheck.h @@ -529,6 +529,9 @@ class ActorBgCollisionCheck // Address: 0x0218E2B8 Angle getWallAngle(DirType dir); + // Address: 0x0218E48C + bool checkBombBreak(const sead::Vector2f& top_left, const sead::Vector2f& bottom_right); + BasicBgCollisionCheck& getBgCheck() { return mBgCheck; diff --git a/enemy/BrosBase.h b/enemy/BrosBase.h index 62c2bad..c775b7e 100644 --- a/enemy/BrosBase.h +++ b/enemy/BrosBase.h @@ -128,7 +128,7 @@ class BrosBase : public Enemy public: // Address: Deleted - virtual void vf58C(); + virtual sead::Vector3f getWristPos(); virtual f32 getCreateWeaponFrm() const { @@ -248,6 +248,9 @@ class BrosBase : public Enemy // Address: 0x022DBEEC bool calcTurnAngle(); + // Address: 0x022DA2EC + void initModel(); + protected: JointBlendModel* mBlendModel; sead::Matrixf mBone6Transform; diff --git a/map_obj/ChibiYoshiBase.h b/map_obj/ChibiYoshiBase.h index db52cb0..bf14cb9 100644 --- a/map_obj/ChibiYoshiBase.h +++ b/map_obj/ChibiYoshiBase.h @@ -13,8 +13,15 @@ class ChibiYoshiBase : public ActorCollision // Address: 0x027317BC void setCannonJump(const sead::Vector3f& pos, const sead::Vector2f& speed, s32 jump_time); -public: - u32 _17a0[(0x1A78 - 0x17A0) / sizeof(u32)]; + s8 getCarryPlayerNo() const + { + return mCarryPlayerNo; + } + +private: + u32 _17a0[(0x18B0 - 0x17A0) / sizeof(u32)]; + s8 mCarryPlayerNo; + u32 _18b4[(0x1A78 - 0x18B4) / sizeof(u32)]; u32 _1a78; u32 _1a7c[(0x1F48 - 0x1A7C) / sizeof(u32)]; };