dAcBomb_c renamings

3 files changed, 44 insertions, 40 deletions

diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index efee6641..69849bc9 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -68,8 +68,8 @@ public:
     static f32 getBombBounceSpeed();
     static f32 getBombParticleScale();
     static f32 getBombExplodeRadius();
-    static f32 getBombUnkFloat_0();
-    static f32 getBombUnkFloat_1();
+    static f32 getBombStopSpeedY();
+    static f32 getBombMaxSpeedY();
 
     // 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 b93a8157..bba6e2e6 100644
--- a/include/d/a/obj/d_a_obj_bomb.h
+++ b/include/d/a/obj/d_a_obj_bomb.h
@@ -23,45 +23,45 @@ public:
 
     enum Type_e {
         BOMB_0 = 0, // Explode
-        BOMB_1 = 1, // Flower
-        BOMB_2 = 2, // Flower
-        BOMB_3 = 3, // Carry
-        BOMB_4 = 4, // Explode
-        BOMB_5 = 5, // Flower
-        BOMB_6 = 6, // Explode
-        BOMB_7 = 7, // Carry
+        BOMBF = 1,
+        BOMBF_CRAWLSPACE = 2,
+        BOMB_PLAYER_CARRY = 3, // Carry
+        BOMB_4 = 4,            // Explode
+        BOMB_5 = 5,            // Flower
+        BOMB_EXPLODE_NO_DAMAGE = 6,
+        BOMB_BOCO_CARRY = 7,
         BOMB_MAX,
     };
 
     enum Flag_e {
-        FLAG_0x1 = (1 << 0), // Player Make
-        FLAG_0x2 = (1 << 1),
-        FLAG_0x4 = (1 << 2), // Bomb Hit ?
+        FLAG_PLAYER_MAKE = (1 << 0),
+        FLAG_CHAIN_BOMB = (1 << 1), // When another bomb blows another bomb up
+        FLAG_BOMB_HIT = (1 << 2),
         FLAG_0x8 = (1 << 3),
         FLAG_0x10 = (1 << 4),
-        FLAG_0x20 = (1 << 5), // Underwater?
+        FLAG_UNDERWATER = (1 << 5),
         FLAG_0x40 = (1 << 6),
         FLAG_0x80 = (1 << 7),
         FLAG_0x100 = (1 << 8),
-        FLAG_0x200 = (1 << 9),
+        FLAG_NEAR_TIMEDOOR = (1 << 9),
         FLAG_0x400 = (1 << 10),
-        FLAG_0x800 = (1 << 11),
-        FLAG_0x1000 = (1 << 12),
+        FLAG_FALL_IN_WATER = (1 << 11),
+        FLAG_DELETE_BOMB = (1 << 12),
         FLAG_0x2000 = (1 << 13),
         FLAG_0x4000 = (1 << 14),
         FLAG_0x8000 = (1 << 15),
         FLAG_0x10000 = (1 << 16),
         FLAG_0x20000 = (1 << 17),
-        FLAG_0x40000 = (1 << 18),
+        FLAG_ROLL = (1 << 18),
         FLAG_0x80000 = (1 << 19),
         FLAG_0x100000 = (1 << 20),
         FLAG_0x200000 = (1 << 21),
         FLAG_0x400000 = (1 << 22),
-        FLAG_0x800000 = (1 << 23),
-        FLAG_0x1000000 = (1 << 24),
-        FLAG_0x2000000 = (1 << 25),
+        FLAG_FUSE_PAUSED = (1 << 23), // Like in cutscenes
+        FLAG_FLOWER = (1 << 24),
+        FLAG_BEETLE_CARRY = (1 << 25),
         FLAG_0x4000000 = (1 << 26),
-        FLAG_0x8000000 = (1 << 27),
+        FLAG_BOKO_CARRY = (1 << 27),
         FLAG_0x10000000 = (1 << 28),
         FLAG_0x20000000 = (1 << 29),
         FLAG_0x40000000 = (1 << 30),
@@ -103,7 +103,7 @@ public:
     bool checkExplode();
     void lookAt();
     void bounceWall(mAng angle);
-    void fn_8025A1F0(mVec3_c &out);
+    void getVelocity(mVec3_c &out);
     void setBombColor();
     void rollTo(const mVec3_c &dir);
     void rollToInternal(const mVec3_c &dir);
@@ -111,14 +111,14 @@ public:
     s16 getFuseTimer() const {
         return mFuseTime;
     }
-    bool check0xA3C(u32 mask) const {
-        return (field_0xA3C & mask);
+    bool checkFlag(u32 mask) const {
+        return (mFlag & mask);
     }
-    void unset0xA3C(u32 mask) {
-        field_0xA3C &= ~mask;
+    void unsetFlag(u32 mask) {
+        mFlag &= ~mask;
     }
-    void set0xA3C(u32 mask) {
-        field_0xA3C |= mask;
+    void setFlag(u32 mask) {
+        mFlag |= mask;
     }
 
     u32 getBombType() const {
@@ -141,22 +141,22 @@ public:
     /* 0x9A8 */ dAcObjRef_unk mUnkRef;
     /* 0x9D4 */ dEmitter_c mEffect1;
     /* 0xA08 */ dEmitter_c mEffect2;
-    /* 0xA3C */ u32 field_0xA3C;
-    /* 0xA40 */ u8 field_0xA40;
+    /* 0xA3C */ u32 mFlag;
+    /* 0xA40 */ u8 mRollFrameTimer; // Set to `60` upon roll - Uses additional force to roll bomb
     /* 0xA41 */ u8 mMainMatID;
     /* 0xA42 */ u8 field_0xA42;
     /* 0xA44 */ s16 mFuseTime;
-    /* 0xA46 */ u16 field_0xA46;
-    /* 0xA48 */ mAng field_0xA48;
-    /* 0xA4A */ mAng mBombRotationY;
-    /* 0xA4C */ f32 mBombSpeed;
+    /* 0xA46 */ u16 mCarryTimer;
+    /* 0xA48 */ mAng mGndAngle;
+    /* 0xA4A */ mAng mRollRotationY;
+    /* 0xA4C */ f32 mRollSpeed;
     /* 0xA50 */ f32 field_0xA50;
-    /* 0xA54 */ mVec3_c field_0xA54;
-    /* 0xA60 */ mVec3_c field_0xA60;
-    /* 0xA6C */ mVec3_c field_0xA6C;
-    /* 0xA78 */ mVec3_c field_0xA78;
-    /* 0xA84 */ mVec3_c field_0xA84;
-    /* 0xA90 */ mVec3_c field_0xA90;
+    /* 0xA54 */ mVec3_c mSmokePosNext;
+    /* 0xA60 */ mVec3_c mSmokePosPrev;
+    /* 0xA6C */ mVec3_c mSmokePos;
+    /* 0xA78 */ mVec3_c mExternalTranslation;
+    /* 0xA84 */ mVec3_c mHitForce;
+    /* 0xA90 */ mVec3_c mStreamForce;
     /* 0xA9C */ STATE_MGR_DECLARE(dAcBomb_c);
 };
 
diff --git a/include/d/d_player_act.h b/include/d/d_player_act.h
index fdcfb671..4c1e77a2 100644
--- a/include/d/d_player_act.h
+++ b/include/d/d_player_act.h
@@ -551,6 +551,10 @@ public:
                    FLG0_HANGING_ITEM | FLG0_HANGING_LEDGE | FLG0_UNK_0x10 | FLG0_IN_AIR,
     };
 
+    enum dAcPy_FLG1 {
+        ActFLG1_INCRAWLSPACE = 0x400000
+    };
+
     inline bool checkFlags0x340(u32 mask) const {
         return (someFlags_0x340 & mask) != 0;
     }