Work on daObjIce_s_c (#2204)dol2asm

1 files changed, 56 insertions, 13 deletions

diff --git a/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h b/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h
index d11323cf41..d75fff896a 100644
--- a/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h
+++ b/include/rel/d/a/obj/d_a_obj_ice_s/d_a_obj_ice_s.h
@@ -2,6 +2,10 @@
 #define D_A_OBJ_ICE_S_H
 
 #include "f_op/f_op_actor_mng.h"
+#include "d/bg/d_bg_s_movebg_actor.h"
+#include "d/cc/d_cc_d.h"
+
+//#define WITH_MOVEBG
 
 /**
  * @ingroup actors-objects
@@ -11,22 +15,57 @@
  * @details
  *
  */
-class daObjIce_s_c : public fopAc_ac_c {
+class daObjIce_s_c : public
+#ifdef WITH_MOVEBG
+dBgS_MoveBgActor
+#else
+fopAc_ac_c
+#endif
+{
 public:
     /* 80C209DC */ void RideOn_Angle(s16&, f32, s16, f32);
-    /* 80C20A44 */ void Check_LinkRideOn(cXyz);
-    /* 80C20C98 */ void Check_RideOn(cXyz);
+    /* 80C20A44 */ bool Check_LinkRideOn(cXyz);
+    /* 80C20C98 */ bool Check_RideOn(cXyz);
     /* 80C20EC0 */ void initBaseMtx();
     /* 80C20EEC */ void setBaseMtx();
-    /* 80C212CC */ void create();
-    /* 80C2157C */ void CreateHeap();
-    /* 80C215F4 */ void Create();
-    /* 80C21634 */ void Execute(f32 (**)[3][4]);
-    /* 80C21964 */ void Draw();
-    /* 80C21A08 */ void Delete();
-
-private:
-    /* 0x568 */ u8 field_0x568[0x644 - 0x568];
+    /* 80C212CC */ int create();
+    /* 80C2157C */ int CreateHeap();
+    /* 80C215F4 */ int Create();
+    /* 80C21634 */ int Execute(f32 (**)[3][4]);
+    /* 80C21964 */ int Draw();
+    /* 80C21A08 */ int Delete();
+
+    #ifndef WITH_MOVEBG
+    /* 0x568 */ dBgW* mpBgW;
+    /* 0x56C */ Mtx mBgMtx;
+    /* 0x5BC */ void* movebgVTable;
+    #endif
+    /* 0x5A0 */ f32 field_0x5a0;
+    /* 0x5A4 */ f32 field_0x5a4;
+    /* 0x5A8 */ f32 field_0x5a8;
+    /* 0x5AC */ s16 field_0x5ac;
+    /* 0x5B0 */ f32 field_0x5b0;
+    /* 0x5AE */ u8 field_0x5b4[0x5c4 - 0x5b4];
+    /* 0x5C4 */ u8 field_0x5c4;
+    /* 0x5C5 */ u8 field_0x5c5;
+    /* 0x5C8 */ cXyz field_0x5c8;
+    /* 0x5D8 */ s16 field_0x5d4;
+    /* 0x5D8 */ s16 field_0x5d6;
+    /* 0x5D8 */ s16 field_0x5d8;
+    /* 0x5DA */ s16 field_0x5da;
+    /* 0x5DC */ s16 field_0x5dc;
+    /* 0x5DE */ s16 field_0x5de;
+    /* 0x5E0 */ f32 field_0x5e0;
+    /* 0x5E4 */ s16 field_0x5e4;
+    /* 0x5E6 */ s16 field_0x5e6;
+    /* 0x5E8 */ u8 field_0x5e8;
+    /* 0x5EC */ int field_0x5ec;
+    /* 0x5F0 */ int field_0x5f0;
+    /* 0x5F4 */ int field_0x5f4;
+    /* 0x5EC */ dCcD_Stts mStts;
+    /* 0x634 */ J3DModel* mModel;
+    /* 0x638 */ request_of_phase_process_class mPhase;
+    /* 0x640 */ u8 field_0x640;
 };
 
 STATIC_ASSERT(sizeof(daObjIce_s_c) == 0x644);
@@ -34,7 +73,11 @@ STATIC_ASSERT(sizeof(daObjIce_s_c) == 0x644);
 class daOBJ_ICE_S_HIO_c {
 public:
     /* 80C209AC */ daOBJ_ICE_S_HIO_c();
-    /* 80C21A60 */ ~daOBJ_ICE_S_HIO_c();
+    /* 80C21A60 */ virtual ~daOBJ_ICE_S_HIO_c();
+
+    /* 0x4 */ s8 field_0x4;
+    /* 0x8 */ f32 field_0x8;
+    /* 0xC */ f32 field_0xc;
 };