d_a_obj_bhbridge equivalent (#2518)

2 files changed, 34 insertions, 12 deletions

diff --git a/include/d/actor/d_a_e_rd.h b/include/d/actor/d_a_e_rd.h
index 220d2db835..7780be8618 100644
--- a/include/d/actor/d_a_e_rd.h
+++ b/include/d/actor/d_a_e_rd.h
@@ -211,13 +211,13 @@ public:
     /* 0x0C */ f32 field_0xc;               // リーダーサイズ比     (Leader size ratio)
     /* 0x10 */ f32 movement_speed;          // 移動速度            (Movement speed)
 
-    /* 〜〜  こん棒兵の場合  〜〜 (In the case of the club soldier) */
+    /*   こん棒兵の場合   (In the case of the club soldier) */
     /* 0x14 */ f32 dash_speed;              // 突進速度            (Rush speed)
     /* 0x18 */ f32 battle_init_range;       // 戦闘開始範囲         (Battle starting range)
     /* 0x1C */ f32 attack_init_range;       // 攻撃開始範囲         (Attack starting range)
     /* 0x20 */ f32 swing_speed;             // 振り速さ            (Swing speed)
 
-    /* 〜〜  矢兵の場合  〜〜 (In the case of arrow soldiers) */
+    /*   矢兵の場合   (In the case of arrow soldiers) */
     /* 0x24 */ s16 field_0x24;              // 号令→構えの間        (Command → Preparation)
     /* 0x26 */ u8 padding[2];
     /* 0x28 */ f32 attack_range;            // 攻撃範囲            (Attack range)
diff --git a/include/d/actor/d_a_obj_bhbridge.h b/include/d/actor/d_a_obj_bhbridge.h
index f224d470b0..b36d7148ee 100644
--- a/include/d/actor/d_a_obj_bhbridge.h
+++ b/include/d/actor/d_a_obj_bhbridge.h
@@ -1,7 +1,8 @@
 #ifndef D_A_OBJ_BHBRIDGE_H
 #define D_A_OBJ_BHBRIDGE_H
 
-#include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_bg_s_acch.h"
 
 /**
  * @ingroup actors-objects
@@ -11,20 +12,41 @@
  * @details
  *
  */
-class daObjBhbridge_c : public fopAc_ac_c {
+class daObjBhbridge_c : public dBgS_MoveBgActor {
 public:
     /* 80BB5318 */ void RideOn_Angle(s16&, f32, s16, f32);
-    /* 80BB5380 */ void Check_RideOn();
+    /* 80BB5380 */ int Check_RideOn();
     /* 80BB558C */ void initBaseMtx();
     /* 80BB55B8 */ void setBaseMtx();
-    /* 80BB5934 */ void CreateHeap();
-    /* 80BB59AC */ void Create();
-    /* 80BB5A14 */ void Execute(f32 (**)[3][4]);
-    /* 80BB5E10 */ void Draw();
-    /* 80BB5EB4 */ void Delete();
+    /* 80BB5934 */ int CreateHeap();
+    /* 80BB59AC */ int Create();
+    /* 80BB5A14 */ int Execute(f32 (**)[3][4]);
+    /* 80BB5E10 */ int Draw();
+    /* 80BB5EB4 */ int Delete();
 
-private:
-    /* 0x568 */ u8 field_0x568[0x810 - 0x568];
+    inline int create();
+
+    /* 0x5A0 */ f32 field_0x5a0;
+    /* 0x5A4 */ bool field_0x5a4;
+    /* 0x5A8 */ f32 field_0x5a8;
+    /* 0x5AC */ f32 field_0x5ac;
+    /* 0x5B0 */ s16 field_0x5b0;
+    /* 0x5B2 */ u8 field_0x5b2[0x5c0 - 0x5b2];
+    /* 0x5C0 */ csXyz field_0x5c0;
+    /* 0x5C6 */ bool field_0x5c6;
+    /* 0x5C7 */ u8 field_0x5c7[0x5ca - 0x5c7];
+    /* 0x5CA */ s16 field_0x5ca;
+    /* 0x5CC */ s16 field_0x5cc;
+    /* 0x5CE */ csXyz field_0x5ce;
+    /* 0x5D4 */ f32 field_0x5d4;
+    /* 0x5D8 */ u8 field_0x5d8[0x5dc - 0x5d8];
+    /* 0x5DC */ s16 field_0x5dc;
+    /* 0x5DE */ bool field_0x5de;
+    /* 0x5E0 */ cXyz field_0x5e0;
+    /* 0x5EC */ J3DModel* mModel;
+    /* 0x5F0 */ request_of_phase_process_class mPhase;
+    /* 0x5F8 */ dBgS_ObjAcch mAcch;
+    /* 0x7D0 */ dBgS_AcchCir mAcchCir;
 };
 
 STATIC_ASSERT(sizeof(daObjBhbridge_c) == 0x810);