d_a_am 100%, no match

include/d/actor/d_a_bomb.h

@@ -26,8 +26,8 @@ public:
         
     };
     
-    void getBombRestTime();
-    void getBombCheck_Flag();
+    s16 getBombRestTime();
+    s16 getBombCheck_Flag();
     void setBombCheck_Flag();
     void setBombFire_ON();
     void setBombNoHit();

include/d/actor/d_a_bomb2.h

@@ -43,8 +43,8 @@ namespace daBomb2 {
         
         void remove_fuse_effect();
         void set_time(int);
-        void get_time() const;
-        void chk_eat() const;
+        s32 get_time() const;
+        bool chk_eat() const;
         void set_eat();
         void set_no_hit();
         void chk_explode();

include/d/actor/d_a_player.h

@@ -70,7 +70,7 @@ public:
     /* 0x290 */ u8 mAttackState;
     /* 0x291 */ u8 field_0x291;
     /* 0x292 */ u8 field_0x292[0x294 - 0x292];
-    /* 0x294 */ s16 field_0x294;
+    /* 0x294 */ s16 mDamageWaitTimer;
     /* 0x296 */ s16 mQuakeTimer;
     /* 0x298 */ int field_0x298;
     /* 0x29C */ u32 field_0x29c;
@@ -91,10 +91,11 @@ public:
     /* 0x300 */ f32 field_0x300;
     /* 0x304 */ daPy_demo_c mDemo;
 
+    u8 getCutType() const { return mAttackState; }
+    s16 getDamageWaitTimer() const { return mDamageWaitTimer; }
     s16 getBodyAngleX() { return mBodyAngle.x; }
     s16 getBodyAngleY() { return mBodyAngle.y; }
     void changeDemoMoveAngle(s16 angle) { mDemo.setMoveAngle(angle); }
-    u8 getCutType() const { return mAttackState; }
 
     void onPlayerNoDraw() { field_0x29c |= 0x8000000; }
     void offPlayerNoDraw() { field_0x29c &= ~0x8000000; }

include/d/d_cc_uty.h

@@ -0,0 +1,29 @@
+#ifndef D_CC_UTY_H
+#define D_CC_UTY_H
+
+#include "SSystem/SComponent/c_cc_d.h"
+#include "f_op/f_op_actor.h"
+
+struct CcAtInfo {
+    /* 0x00 */ cCcD_Obj* mpObj;
+    /* 0x04 */ fopAc_ac_c* mpActor;
+    /* 0x08 */ u8 mDamage;
+    /* 0x09 */ u8 mbDead;
+    /* 0x0A */ u8 mResultingAttackType;
+    /* 0x0B */ u8 m0B[0x0E - 0x0B];
+    /* 0x0E */ s16 m0E;
+    /* 0x10 */ u8 m10[0x12 - 0x10];
+    /* 0x12 */ u16 mPlCutBit;
+    /* 0x14 */ cXyz* pParticlePos;
+    /* 0x18 */ s32 mHitSoundId;
+};
+
+void cc_pl_cut_bit_get();
+void at_se_get(cCcD_Obj*);
+void at_se_getC(cCcD_Obj*);
+void def_se_set(fopAc_ac_c*, cCcD_Obj*, unsigned long);
+void def_se_set_p(fopAc_ac_c*, cXyz*, cCcD_Obj*, unsigned long);
+void at_power_check(CcAtInfo*);
+void cc_at_check(fopAc_ac_c*, CcAtInfo*);
+
+#endif /* D_CC_UTY_H */

include/d/d_com_inf_game.h

@@ -720,6 +720,10 @@ inline void dComIfGs_initDan(s8 i_stageNo) {
     g_dComIfG_gameInfo.save.initDan(i_stageNo);
 }
 
+inline void dComIfGs_onActor(int i_no, int i_roomNo) {
+    g_dComIfG_gameInfo.save.onActor(i_no, i_roomNo);
+}
+
 inline BOOL dComIfGs_isActor(int i_no, int i_roomNo) {
     return g_dComIfG_gameInfo.save.isActor(i_no, i_roomNo);
 }