From 84471c87fd1320c88ef1dde87f77a2e7b100d935 Mon Sep 17 00:00:00 2001
From: Ryguy <118482718+Ryguy0777@users.noreply.github.com>
Date: Fri, 23 Oct 2026 17:26:04 -0500
Subject: [PATCH 1/4] Small improvements to several actor classes

---
 actor/Actor.h                     |  5 +++++
 collision/ActorBgCollisionCheck.h |  3 +++
 enemy/BrosBase.h                  |  5 ++++-
 map_obj/ChibiYoshiBase.h          | 11 +++++++++--
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/actor/Actor.h b/actor/Actor.h
index 2356b56..5aec1ea 100644
--- a/actor/Actor.h
+++ b/actor/Actor.h
@@ -347,6 +347,11 @@ class Actor : public ActorBase
         return mAngle;
     }
 
+    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..b9902ac 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 vf58C();
 
     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)];
 };

From 6951789d2f9696e5ff1d2bb4738777d21fb4acc4 Mon Sep 17 00:00:00 2001
From: Ryguy <118482718+Ryguy0777@users.noreply.github.com>
Date: Fri, 23 Oct 2026 17:32:32 -0500
Subject: [PATCH 2/4] enemy/BrosBase.h: rename vf58C to getCreateWeaponPos

---
 enemy/BrosBase.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/enemy/BrosBase.h b/enemy/BrosBase.h
index b9902ac..4f8dc29 100644
--- a/enemy/BrosBase.h
+++ b/enemy/BrosBase.h
@@ -128,7 +128,7 @@ class BrosBase : public Enemy
 
 public:
     // Address: Deleted
-    virtual sead::Vector3f vf58C();
+    virtual sead::Vector3f getCreateWeaponPos();
 
     virtual f32 getCreateWeaponFrm() const
     {

From 35e54d6b9684601c9a2588209c20172fd9d5ecc8 Mon Sep 17 00:00:00 2001
From: Ryguy <118482718+Ryguy0777@users.noreply.github.com>
Date: Fri, 23 Oct 2026 23:58:17 -0500
Subject: [PATCH 3/4] actor/Actor.h: const getter for mPosDelta

---
 actor/Actor.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actor/Actor.h b/actor/Actor.h
index 5aec1ea..43c3758 100644
--- a/actor/Actor.h
+++ b/actor/Actor.h
@@ -347,7 +347,7 @@ class Actor : public ActorBase
         return mAngle;
     }
 
-    sead::Vector2f getPosDelta() const
+    const sead::Vector2f& getPosDelta() const
     {
         return mPosDelta;
     }

From 835755cc538cb18253bab452eea8b29b846c5d86 Mon Sep 17 00:00:00 2001
From: Ryguy <118482718+Ryguy0777@users.noreply.github.com>
Date: Sat, 24 Oct 2026 00:04:49 -0500
Subject: [PATCH 4/4] enemy/BrosBase.h: use better name for vf58C

---
 enemy/BrosBase.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/enemy/BrosBase.h b/enemy/BrosBase.h
index 4f8dc29..c775b7e 100644
--- a/enemy/BrosBase.h
+++ b/enemy/BrosBase.h
@@ -128,7 +128,7 @@ class BrosBase : public Enemy
 
 public:
     // Address: Deleted
-    virtual sead::Vector3f getCreateWeaponPos();
+    virtual sead::Vector3f getWristPos();
 
     virtual f32 getCreateWeaponFrm() const
     {