daGrdWater_c OK

zeldaret · Dec 9, 2024 · b246fba · b246fba
1 parent bcb70e1
commit b246fba
Show file tree

Hide file tree

Showing 6 changed files with 360 additions and 323 deletions.
diff --git a/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt b/config/GZ2E01/rels/d_a_obj_groundwater/symbols.txt
@@ -23,10 +23,10 @@ init_modeLevelDownB__12daGrdWater_cFv = .text:0x000010C4; // type:function size:
 modeLevelDownB__12daGrdWater_cFv = .text:0x00001138; // type:function size:0x5C scope:global
 Draw__12daGrdWater_cFv = .text:0x00001194; // type:function size:0x298 scope:global
 Delete__12daGrdWater_cFv = .text:0x0000142C; // type:function size:0x30 scope:global
-daGrdWater_Draw__FP12daGrdWater_c = .text:0x0000145C; // type:function size:0x2C scope:global
-daGrdWater_Execute__FP12daGrdWater_c = .text:0x00001488; // type:function size:0x20 scope:global
-daGrdWater_Delete__FP12daGrdWater_c = .text:0x000014A8; // type:function size:0x20 scope:global
-daGrdWater_Create__FP10fopAc_ac_c = .text:0x000014C8; // type:function size:0x20 scope:global
+daGrdWater_Draw__FP12daGrdWater_c = .text:0x0000145C; // type:function size:0x2C scope:local
+daGrdWater_Execute__FP12daGrdWater_c = .text:0x00001488; // type:function size:0x20 scope:local
+daGrdWater_Delete__FP12daGrdWater_c = .text:0x000014A8; // type:function size:0x20 scope:local
+daGrdWater_Create__FP10fopAc_ac_c = .text:0x000014C8; // type:function size:0x20 scope:local
 __dt__16daGrdWater_HIO_cFv = .text:0x000014E8; // type:function size:0x5C scope:global
 __sinit_d_a_obj_groundwater_cpp = .text:0x00001544; // type:function size:0xC8 scope:local
 _ctors = .ctors:0x00000000; // type:label scope:global
@@ -39,20 +39,20 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @4253 = .rodata:0x00000010; // type:object size:0x4 scope:local
 @stringBase0 = .rodata:0x00000014; // type:object size:0x6 scope:local data:string_table
 ...data.0 = .data:0x00000000; // type:label scope:local
-cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
+cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:local
 @1787 = .data:0x0000000C; // type:object size:0x4 scope:local
 @3993 = .data:0x00000020; // type:object size:0xC scope:local
 @3994 = .data:0x0000002C; // type:object size:0xC scope:local
 @3995 = .data:0x00000038; // type:object size:0xC scope:local
 @3996 = .data:0x00000044; // type:object size:0xC scope:local
 @3997 = .data:0x00000050; // type:object size:0xC scope:local
-l_mode_func = .data:0x0000005C; // type:object size:0x3C scope:global data:4byte
-l_daGrdWater_Method = .data:0x00000098; // type:object size:0x20 scope:global
+l_mode_func = .data:0x0000005C; // type:object size:0x3C scope:local data:4byte
+l_daGrdWater_Method = .data:0x00000098; // type:object size:0x20 scope:local
 g_profile_GRDWATER = .data:0x000000B8; // type:object size:0x30 scope:global
 __vt__12J3DFrameCtrl = .data:0x000000E8; // type:object size:0xC scope:global
 __vt__12daGrdWater_c = .data:0x000000F4; // type:object size:0x28 scope:global
 __vt__16daGrdWater_HIO_c = .data:0x0000011C; // type:object size:0xC scope:global
 __vt__14mDoHIO_entry_c = .data:0x00000128; // type:object size:0xC scope:global
 __global_destructor_chain = .bss:0x00000000; // type:object size:0x4 scope:global
 @3636 = .bss:0x00000008; // type:object size:0xC scope:local
-l_HIO = .bss:0x00000014; // type:object size:0x14 scope:global
+l_HIO = .bss:0x00000014; // type:object size:0x14 scope:local
diff --git a/configure.py b/configure.py
@@ -1832,7 +1832,7 @@ def MatchingFor(*versions):
     ActorRel(Matching, "d_a_obj_graWall"),
     ActorRel(NonMatching, "d_a_obj_gra_rock"),
     ActorRel(Matching, "d_a_obj_grave_stone"),
-    ActorRel(NonMatching, "d_a_obj_groundwater"),
+    ActorRel(Matching, "d_a_obj_groundwater"),
     ActorRel(NonMatching, "d_a_obj_grz_rock"),
     ActorRel(NonMatching, "d_a_obj_h_saku"),
     ActorRel(NonMatching, "d_a_obj_hakai_brl"),

diff --git a/include/d/actor/d_a_obj_groundwater.h b/include/d/actor/d_a_obj_groundwater.h
@@ -1,7 +1,10 @@
 #ifndef D_A_OBJ_GROUNDWATER_H
 #define D_A_OBJ_GROUNDWATER_H
 
+#include "SSystem/SComponent/c_phase.h"
+#include "d/d_bg_s_movebg_actor.h"
 #include "f_op/f_op_actor_mng.h"
+#include "m_Do/m_Do_hostIO.h"
 
 /**
  * @ingroup actors-objects
@@ -11,13 +14,23 @@
  * @details
  *
  */
-class daGrdWater_c : public fopAc_ac_c {
+class daGrdWater_c : public dBgS_MoveBgActor {
 public:
+    typedef void (daGrdWater_c::*modeFunc)();
+
+    enum Mode {
+        WAIT,
+        LEVEL_UP_A,
+        LEVEL_DOWN_A,
+        LEVEL_UP_B,
+        LEVEL_DOWN_B,
+    };
+
     /* 80C13540 */ void setBaseMtx();
-    /* 80C13618 */ void CreateHeap();
-    /* 80C139E4 */ void create();
+    /* 80C13618 */ int CreateHeap();
+    /* 80C139E4 */ int create();
     /* 80C13DB0 */ daGrdWater_c();
-    /* 80C13FEC */ void Execute(f32 (**)[3][4]);
+    /* 80C13FEC */ int Execute(Mtx**);
     /* 80C14194 */ void init_modeWait();
     /* 80C141A0 */ void modeWait();
     /* 80C141A4 */ void init_modeLevelUpA();
@@ -28,19 +41,48 @@ class daGrdWater_c : public fopAc_ac_c {
     /* 80C14414 */ void modeLevelUpB();
     /* 80C14484 */ void init_modeLevelDownB();
     /* 80C144F8 */ void modeLevelDownB();
-    /* 80C14554 */ void Draw();
-    /* 80C147EC */ void Delete();
+    /* 80C14554 */ int Draw();
+    /* 80C147EC */ int Delete();
+
+    u8 getSw() { return fopAcM_GetParamBit(this, 8, 8); }
+    u8 getSw2() { return fopAcM_GetParamBit(this, 16, 8); }
 
 private:
-    /* 0x568 */ u8 field_0x568[0x6f4 - 0x568];
+    /* 0x5A0 */ request_of_phase_process_class mPhase;
+    /* 0x5A8 */ J3DModel* mModel1;
+    /* 0x5AC */ J3DModel* mModel2;
+    /* 0x5B0 */ mDoExt_btkAnm mBtk1;
+    /* 0x5C8 */ mDoExt_btkAnm mBtk2;
+    /* 0x5E0 */ mDoExt_brkAnm mBrk1;
+    /* 0x5F8 */ mDoExt_brkAnm mBrk2;
+    /* 0x610 */ mDoExt_bckAnm mBck1a;
+    /* 0x62C */ mDoExt_bckAnm mBck1b;
+    /* 0x648 */ mDoExt_bckAnm mBck1c;
+    /* 0x664 */ mDoExt_bckAnm mBck1d;
+    /* 0x680 */ mDoExt_bckAnm mBck2a;
+    /* 0x69C */ mDoExt_bckAnm mBck2b;
+    /* 0x6B8 */ mDoExt_bckAnm mBck2c;
+    /* 0x6D4 */ mDoExt_bckAnm mBck2d;
+    /* 0x6F0 */ u8 field_0x6f0;
+    /* 0x6F1 */ u8 field_0x6f1;
+    /* 0x6F2 */ u8 mMode;
+    /* 0x6F3 */ u8 field_0x6f3;
 };
 
 STATIC_ASSERT(sizeof(daGrdWater_c) == 0x6f4);
 
-class daGrdWater_HIO_c {
+class daGrdWater_HIO_c : public mDoHIO_entry_c {
 public:
     /* 80C134AC */ daGrdWater_HIO_c();
-    /* 80C148A8 */ ~daGrdWater_HIO_c();
+    /* 80C148A8 */ virtual ~daGrdWater_HIO_c() {}
+
+    /* 0x04 */ u8 field_0x04;
+    /* 0x05 */ u8 field_0x05;
+    /* 0x06 */ u8 field_0x06;
+    /* 0x07 */ u8 field_0x07;
+    /* 0x08 */ f32 field_0x08;
+    /* 0x0C */ f32 field_0x0c;
+    /* 0x10 */ f32 field_0x10;
 };
 
 

diff --git a/include/d/d_bg_s_movebg_actor.h b/include/d/d_bg_s_movebg_actor.h
@@ -36,4 +36,6 @@ class dBgS_MoveBgActor : public fopAc_ac_c {
     static MoveBGActor_SetFunc m_set_func;
 };
 
+STATIC_ASSERT(sizeof(dBgS_MoveBgActor) == 0x5a0);
+
 #endif /* D_BG_D_BG_S_MOVEBG_ACTOR_H */
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
@@ -3947,6 +3947,10 @@ inline void dComIfGd_setListDarkBG() {
     g_dComIfG_gameInfo.drawlist.setXluListDarkBG();
 }
 
+inline void dComIfGd_setXluListDarkBG() {
+    g_dComIfG_gameInfo.drawlist.setXluListDarkBG();
+}
+
 inline void dComIfGd_setList() {
     g_dComIfG_gameInfo.drawlist.setOpaList();
     g_dComIfG_gameInfo.drawlist.setXluList();