d_a_bk work

5 files changed, 44 insertions, 33 deletions

diff --git a/include/c/c_damagereaction.h b/include/c/c_damagereaction.h
index 5276619b..b6982dec 100644
--- a/include/c/c_damagereaction.h
+++ b/include/c/c_damagereaction.h
@@ -198,6 +198,6 @@ void hang_ang_get(damagereaction*);
 void dr_damage_set(damagereaction*);
 void dr_damage_anime(damagereaction*);
 void dr_matrix_set(damagereaction*);
-void damage_reaction(damagereaction*);
+int damage_reaction(damagereaction*);
 
 #endif /* C_DAMAGEREACTION_H */
diff --git a/include/d/actor/d_a_bk.h b/include/d/actor/d_a_bk.h
index 356f0c5d..e6b7ea51 100644
--- a/include/d/actor/d_a_bk.h
+++ b/include/d/actor/d_a_bk.h
@@ -7,6 +7,7 @@
 #include "m_Do/m_Do_hostIO.h"
 
 class dPath;
+namespace daObj_Search { class Act_c; };
 
 class bk_class : public fopEn_enemy_c {
 public:
@@ -38,14 +39,12 @@ public:
     /* 0x02E0 */ u32 mShadowId;
     /* 0x02E4 */ u8 m02E4[0x02E8 - 0x02E4];
     /* 0x02E8 */ J3DModel* m02E8;
-    /* 0x02EC */ u8 m02EC[0x02F8 - 0x02EC];
+    /* 0x02EC */ f32 m02EC;
+    /* 0x02F0 */ int m02F0;
+    /* 0x02F4 */ int m02F4;
     /* 0x02F8 */ int m02F8;
     /* 0x02FC */ int m02FC;
-    /* 0x0300 */ s16 m0300;
-    /* 0x0302 */ s16 m0302;
-    /* 0x0304 */ s16 m0304;
-    /* 0x0306 */ s16 m0306;
-    /* 0x0308 */ s16 m0308;
+    /* 0x0300 */ s16 m0300[5];
     /* 0x030A */ s16 m030A;
     /* 0x030C */ s16 m030C;
     /* 0x030E */ s16 m030E;
@@ -73,7 +72,11 @@ public:
     /* 0x0B34 */ int m0B34;
     /* 0x0B38 */ u8 m0B38[0x0B44 - 0x0B38];
     /* 0x0B44 */ cXyz m0B44[2];
-    /* 0x0B5C */ u8 m0B5C[0x0B88 - 0x0B5C];
+    /* 0x0B5C */ u8 m0B5C[0x0B78 - 0x0B5C];
+    /* 0x0B78 */ s16 m0B78;
+    /* 0x0B7A */ s8 m0B7A;
+    /* 0x0B7B */ s8 m0B7B;
+    /* 0x0B7C */ u8 m0B7C[0x0B88 - 0x0B7C];
     /* 0x0B88 */ dCcD_Cyl m0B88;
     /* 0x0CB8 */ dCcD_Cyl m0CB8;
     /* 0x0DE8 */ dCcD_Sph m0DE8;
@@ -83,7 +86,9 @@ public:
     /* 0x1178 */ cXyz m1178;
     /* 0x1184 */ u8 m1184[0x11A8 - 0x1184];
     /* 0x11A8 */ cXyz m11A8;
-    /* 0x11B4 */ u8 m11B4[0x11F0 - 0x11B4];
+    /* 0x11B4 */ u8 m11B4[0x11CC - 0x11B4];
+    /* 0x11CC */ cXyz m11CC;
+    /* 0x11D8 */ u8 m11D8[0x11F0 - 0x11D8];
     /* 0x11F0 */ u8 m11F0;
     /* 0x11F1 */ u8 m11F1;
     /* 0x11F2 */ u8 m11F2;
@@ -92,7 +97,7 @@ public:
     /* 0x11F8 */ fopAc_ac_c* m11F8;
     /* 0x11FC */ u32 m11FC;
     /* 0x1200 */ u32 m1200;
-    /* 0x1204 */ u8 m1204[0x1208 - 0x1204];
+    /* 0x1204 */ u32 m1204;
     /* 0x1208 */ u16 m1208;
     /* 0x120C */ int m120C;
     /* 0x1210 */ u8 m1210;
@@ -102,11 +107,12 @@ public:
     /* 0x1216 */ s8 m1216;
     /* 0x1217 */ s8 m1217;
     /* 0x1218 */ dPath* ppd;
-    /* 0x121C */ u8 m121C;
+    /* 0x121C */ s8 m121C;
     /* 0x121D */ u8 m121D;
     /* 0x121E */ u8 m121E[0x121F - 0x121E];
     /* 0x121F */ s8 m121F;
-    /* 0x1220 */ u8 m1220[0x1230 - 0x1220];
+    /* 0x1220 */ daObj_Search::Act_c* m1220;
+    /* 0x1224 */ u8 m1224[0x1230 - 0x1224];
     /* 0x1230 */ J3DMaterialTable* m1230;
     /* 0x1234 */ u8 m1234[0x1264 - 0x1234];
     /* 0x1264 */ enemyice mEnemyIce;
diff --git a/include/d/actor/d_a_hitobj.h b/include/d/actor/d_a_hitobj.h
index 4d16da6a..e8636c24 100644
--- a/include/d/actor/d_a_hitobj.h
+++ b/include/d/actor/d_a_hitobj.h
@@ -12,9 +12,8 @@
 class hitobj_class : public fopAc_ac_c {
 public:
     /* 0x0290 */ request_of_phase_process_class mPhs;
-    /* 0x0298 */ u8 m0298;
-    /* 0x0299 */ u8 m0299;
-    /* 0x029A */ s16 m029a;
+    /* 0x0298 */ u8 mUnusedParam;
+    /* 0x029A */ s16 mTimer;
     /* 0x029C */ dCcD_Stts mStts;
     /* 0x02D8 */ dCcD_Sph mSph;
 }; // Size: 0x0404
diff --git a/include/d/actor/d_a_obj_search.h b/include/d/actor/d_a_obj_search.h
index 051bb5b0..13557849 100644
--- a/include/d/actor/d_a_obj_search.h
+++ b/include/d/actor/d_a_obj_search.h
@@ -13,7 +13,7 @@ namespace daObj_Search {
         };
         
         static bool getFindFlag() { return m_find_flag == true; }
-        void setFindFlag(bool flag) { m_find_flag = flag; }
+        static void setFindFlag(bool flag) { m_find_flag = flag; }
         
         static bool m_find_flag;
         
@@ -66,6 +66,8 @@ namespace daObj_Search {
     
     public:
         /* Place member variables here */
+        /* 0x290 */ u8 m290[0x664 - 0x290];
+        /* 0x664 */ u8 m664;
     };
 
     class Bgc_c {
diff --git a/include/f_op/f_op_actor.h b/include/f_op/f_op_actor.h
index 1b1f64d3..df0ea36a 100644
--- a/include/f_op/f_op_actor.h
+++ b/include/f_op/f_op_actor.h
@@ -324,26 +324,30 @@ public:
     f32 getBtBodyR() const { return mBtBodyR; }
     void setBtBodyR(f32 radius) { mBtBodyR = radius; }
     
-    // TODO
-    void setBtAttackData(f32, f32, f32, u8) {}
-    void getBtStartFrame() const {}
-    void setBtStartFrame(f32) {}
-    void getBtEndFrame() const {}
-    void setBtEndFrame(f32) {}
-    void getBtNowFrame() const {}
-    void setBtNowFrame(f32) {}
-    void getBtAttackType() const {}
-    void setBtAttackType(u8) {}
-    void getBtMaxDis() const {}
-    void setBtMaxDis(f32) {}
+    void setBtAttackData(f32 startFrame, f32 endFrame, f32 maxDis, u8 attackType) {
+        setBtStartFrame(startFrame);
+        setBtEndFrame(endFrame);
+        setBtMaxDis(maxDis);
+        setBtAttackType(attackType);
+    }
+    f32 getBtStartFrame() const { return mBtStartFrame; }
+    void setBtStartFrame(f32 frame) { mBtStartFrame = frame; }
+    f32 getBtEndFrame() const { return mBtEndFrame; }
+    void setBtEndFrame(f32 frame) { mBtEndFrame = frame; }
+    f32 getBtNowFrame() const { return mBtNowFrame; }
+    void setBtNowFrame(f32 frame) { mBtNowFrame = frame; }
+    u8 getBtAttackType() const { return mBtAttackType; }
+    void setBtAttackType(u8 type) { mBtAttackType = type; }
+    f32 getBtMaxDis() const { return mBtMaxDis; }
+    void setBtMaxDis(f32 dis) { mBtMaxDis = dis; }
     
     /* 0x290 */ f32 mBtHeight;
     /* 0x294 */ f32 mBtBodyR;
-    /* 0x298 */ f32 m298;
-    /* 0x29C */ f32 m29C;
-    /* 0x2A0 */ f32 m2A0;
-    /* 0x2A4 */ f32 m2A4;
-    /* 0x2A8 */ u8 mCurrParryOpeningType;
+    /* 0x298 */ f32 mBtMaxDis;
+    /* 0x29C */ f32 mBtStartFrame;
+    /* 0x2A0 */ f32 mBtEndFrame;
+    /* 0x2A4 */ f32 mBtNowFrame;
+    /* 0x2A8 */ u8 mBtAttackType; // Which type of parry opening to give the player
     /* 0x2A9 */ u8 field_2A9[0x2AC - 0x2A9];
 };  // Size: 0x2AC