From 0c058d2a2c0ed11c93e07e4faa90b34ffe91a09a Mon Sep 17 00:00:00 2001
From: roeming <brother64youyou@gmail.com>
Date: Sat, 4 Oct 2025 07:39:48 -0400
Subject: link d_a_obj_hasu2 (#2722)

* link d_a_obj_hasu2

* fix suggestions

* move dtor to .h, move inline func to .h
---
 include/d/actor/d_a_obj_hasu2.h | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/d/actor/d_a_obj_hasu2.h b/include/d/actor/d_a_obj_hasu2.h
index c1a4ca8962..f463393b20 100644
--- a/include/d/actor/d_a_obj_hasu2.h
+++ b/include/d/actor/d_a_obj_hasu2.h
@@ -2,6 +2,7 @@
 #define D_A_OBJ_HASU2_H
 
 #include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_movebg_actor.h"
 
 namespace nObjMHasu {
 /**
@@ -12,23 +13,35 @@ namespace nObjMHasu {
  * @details
  *
  */
-class daObjMHasu_c : public fopAc_ac_c {
+class daObjMHasu_c : public dBgS_MoveBgActor, public request_of_phase_process_class {
 public:
         /* 80C182DC */ daObjMHasu_c();
-        /* 80C18340 */ void create1st();
+        /* 80C18340 */ int create1st();
         /* 80C183D0 */ void setMtx();
-        /* 80C18440 */ void CreateHeap();
-        /* 80C184B0 */ void Create();
-        /* 80C185A4 */ void Execute(Mtx**);
-        /* 80C18600 */ void Draw();
-        /* 80C186A4 */ void Delete();
+        /* 80C18440 */ int CreateHeap();
+        /* 80C184B0 */ int Create();
+        /* 80C185A4 */ int Execute(Mtx**);
+        /* 80C18600 */ int Draw();
+        /* 80C186A4 */ int Delete();
         /* 80C186E0 */ void upDownHasu();
         /* 80C18888 */ void updateCount(u8);
         /* 80C188A0 */ void setHasuCount(f32);
-        /* 80C189E0 */ ~daObjMHasu_c();
+        /* 80C189E0 */ virtual ~daObjMHasu_c() {};
 
+        void setRideFlag(bool i_ride) { mRideFlag = i_ride; }
 private:
-    /* 0x568 */ u8 field_0x568[0x634 - 0x568];
+    /* 0x5A8 */ Mtx mMtx;
+    /* 0x5D8 */ Mtx mMtx2;
+    /* 0x608 */ J3DModel* mModel;
+    /* 0x60C */ bool mRideFlag : 1;
+    /* 0x60C */ bool unk60c_1 : 1;
+    /* 0x610 */ const f32 mConst1;
+    /* 0x614 */ const f32 mConst2;
+    /* 0x618 */ const f32 mConst3;
+    /* 0x61C */ cXyz mPos;
+    /* 0x628 */ f32 mStep;
+    /* 0x62C */ f32 unk62C;
+    /* 0x630 */ u8 mTimer;
 };
 
 STATIC_ASSERT(sizeof(daObjMHasu_c) == 0x634);
-- 
cgit v1.2.3