dAcBomb_c finish matching attempt

3 files changed, 10 insertions, 6 deletions

diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 9cb2c797..efee6641 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -65,12 +65,11 @@ public:
     static f32 getBombUnknown1_1();
     static f32 getBombAcceleration_1();
     static f32 getBombMaxSpeed_1();
-    static f32 getBombBounceSpeed();   // GetBombBoundRate
-    static f32 getBombExplodeScale();  // getBombEffScale
-    static f32 getBombExplodeRadius(); // getBombAt
+    static f32 getBombBounceSpeed();
+    static f32 getBombParticleScale();
+    static f32 getBombExplodeRadius();
     static f32 getBombUnkFloat_0();
     static f32 getBombUnkFloat_1();
-    static f32 getBombUnkFloat_2();
 
     // Beetle Functions [0x8021AA70 - 0x8021BE20]
     s16 getBeetleFlightTime();
diff --git a/include/d/a/obj/d_a_obj_bomb.h b/include/d/a/obj/d_a_obj_bomb.h
index fbcb6662..b93a8157 100644
--- a/include/d/a/obj/d_a_obj_bomb.h
+++ b/include/d/a/obj/d_a_obj_bomb.h
@@ -108,10 +108,9 @@ public:
     void rollTo(const mVec3_c &dir);
     void rollToInternal(const mVec3_c &dir);
 
-    s16 get0xA44() const {
+    s16 getFuseTimer() const {
         return mFuseTime;
     }
-
     bool check0xA3C(u32 mask) const {
         return (field_0xA3C & mask);
     }
diff --git a/include/d/col/bg/d_bg_s_acch.h b/include/d/col/bg/d_bg_s_acch.h
index 6eb05d22..f1227411 100644
--- a/include/d/col/bg/d_bg_s_acch.h
+++ b/include/d/col/bg/d_bg_s_acch.h
@@ -524,6 +524,12 @@ public:
     const dBgS_GndChk &GetGnd() const {
         return mGnd;
     }
+    dBgS_WtrChk &GetWtr() {
+        return mWtr;
+    }
+    const dBgS_WtrChk &GetWtr() const {
+        return mWtr;
+    }
 
     dBgS_RoofChk &GetRoof() {
         return mRoof;