water_mark / wpillar done, minigame_starter wip (#1069)

* d_minigame_starter attempt

* water_mark / wpillar done

* review changes

4 files changed, 60 insertions, 22 deletions

diff --git a/include/d/actor/d_a_player_main.h b/include/d/actor/d_a_player_main.h
index bd723e26..58fb1988 100644
--- a/include/d/actor/d_a_player_main.h
+++ b/include/d/actor/d_a_player_main.h
@@ -1865,8 +1865,8 @@ public:
     
     J3DAnmTextureSRTKey* getIceParticleBtk() { return mpGicer00Btk; }
     J3DAnmTextureSRTKey* getIceWaterParticleBtk() { return mpGicer01Btk; }
-    void getBombWaterPillarBrk() {} // mpGwp00BrkData?
-    void getBombWaterPillarBtk() {} // mpGwp00BtkData?
+    J3DAnmTevRegKey* getBombWaterPillarBrk() { return mpGwp00BrkData; }
+    J3DAnmTextureSRTKey* getBombWaterPillarBtk() { return mpGwp00BtkData; }
     
     BOOL checkSwordEquip() const {
         return dComIfGs_getSelectEquip(0) != dItemNo_NONE_e || checkSwordMiniGame();
diff --git a/include/d/d_minigame_starter.h b/include/d/d_minigame_starter.h
index fba8c557..121051d8 100644
--- a/include/d/d_minigame_starter.h
+++ b/include/d/d_minigame_starter.h
@@ -1,38 +1,56 @@
 #ifndef D_MINIGAME_STARTER_H
 #define D_MINIGAME_STARTER_H
 
-#include "dolphin/types.h"
-#include "f_op/f_op_msg.h"
+#include "f_op/f_op_msg_mng.h"
+#include "d/d_drawlist.h"
 
 class JKRArchive;
 struct fopMsgM_pane_class;
+class J2DScreen;
 
-class dDlst_StarterScrnDraw_c {
+class dDlst_StarterScrnDraw_c : public dDlst_base_c {
 public:
     void acc(s16, s16, s16) {}
     
     void setScreen(const char*, JKRArchive*);
-    void anime1(int);
-    void anime2();
+    BOOL anime1(int);
+    BOOL anime2();
     void scaleAnime(f32);
     void setRotate(fopMsgM_pane_class*, f32);
-    void draw();
+
+    virtual ~dDlst_StarterScrnDraw_c() {}
+    virtual void draw();
+
+    /* 0x004 */ J2DScreen* mpScrn;
+    #if VERSION > VERSION_JPN
+    /* 0x008 */ fopMsgM_pane_class field_0x008[7];
+    #else
+    /* 0x008 */ fopMsgM_pane_class field_0x008[3];
+    #endif
+    /* 0x190 */ fopMsgM_pane_class field_0x190;
+    /* 0x1C8 */ fopMsgM_pane_class field_0x1c8[3];
+    /* 0x270 */ fopMsgM_pane_class field_0x270[3];
 };
 
 class dMinigame_Starter_c : public msg_class {
 public:
-    void countStart() { if (!field_0x111) field_0x111 = true; }
+    void countStart() { if (!mStatus) mStatus = 1; }
     
-    void _create();
-    void _execute();
-    void _draw();
-    void _delete();
+    cPhs_State _create();
+    BOOL _execute();
+    BOOL _draw();
+    BOOL _delete();
     BOOL startCheck();
     BOOL deleteCheck();
+
 public:
-    /* 0x0FC */ u8 field_0x0FC[0x111 - 0x0FC];
-    /* 0x111 */ bool field_0x111;
-    /* 0x112 */ u8 field_0x112[0x114 - 0x112];
+    /* 0x0FC */ dDlst_StarterScrnDraw_c* mStarterScrn;
+    /* 0x100 */ request_of_phase_process_class mPhase;
+    /* 0x108 */ JKRSolidHeap* mHeap;
+    /* 0x10C */ s16 mTimer;
+    /* 0x10E */ s16 field_0x10e;
+    /* 0x110 */ u8 field_0x110;
+    /* 0x111 */ u8 mStatus;
 };  // Size: 0x114
 
 #endif /* D_MINIGAME_STARTER_H */
diff --git a/include/d/d_water_mark.h b/include/d/d_water_mark.h
index 22b0c818..c3300706 100644
--- a/include/d/d_water_mark.h
+++ b/include/d/d_water_mark.h
@@ -2,19 +2,33 @@
 #define D_WATER_MARK_H
 
 #include "SSystem/SComponent/c_phase.h"
-#include "dolphin/types.h"
+#include "d/d_bg_s_gnd_chk.h"
 #include "f_op/f_op_kankyo.h"
+#include "m_Do/m_Do_ext.h"
+#include "f_op/f_op_kankyo_mng.h"
 
 class dWaterMark_c : public kankyo_class {
 public:
     inline BOOL draw();
     inline BOOL execute();
     inline BOOL wm_delete();
-    void setMatrix();
+    BOOL setMatrix();
     inline cPhs_State create();
 
+    static s16 m_circle_cnt;
+    static s16 m_player_foot_now_id;
+    static dBgS_ObjGndChk m_ground_check;
+
 public:
-    /* Place member variables here */
+    /* 0x0F8 */ JKRSolidHeap* mpHeap;
+    /* 0x0FC */ J3DModel* mpModel;
+    /* 0x100 */ mDoExt_brkAnm mBrk;
+    /* 0x118 */ mDoExt_btpAnm mBtp;
+    /* 0x12C */ s16 field_0x12c;
+    /* 0x12E */ s16 field_0x12e;
+    /* 0x130 */ s16 field_0x130;
+    /* 0x132 */ s16 field_0x132;
+    /* 0x134 */ s16 field_0x134;
 };
 
 #endif /* D_WATER_MARK_H */
diff --git a/include/d/d_wpillar.h b/include/d/d_wpillar.h
index 5f4a1906..31e1ba3f 100644
--- a/include/d/d_wpillar.h
+++ b/include/d/d_wpillar.h
@@ -1,19 +1,25 @@
 #ifndef D_WPILLAR_H
 #define D_WPILLAR_H
 
-#include "dolphin/types.h"
 #include "f_op/f_op_kankyo.h"
+#include "m_Do/m_Do_ext.h"
+#include "f_op/f_op_kankyo_mng.h"
 
 class dWpillar_c : public kankyo_class {
 public:
-    void jointCallBack(int);
+    int jointCallBack(int);
     BOOL draw();
     BOOL execute();
     BOOL wp_delete();
     cPhs_State create();
 
 public:
-    /* Place member variables here */
+    /* 0x0F8 */ J3DModel* mpModel;
+    /* 0x0FC */ mDoExt_bckAnm mBck;
+    /* 0x10C */ mDoExt_btkAnm mBtk;
+    /* 0x120 */ JKRSolidHeap* mpHeap;
+    /* 0x124 */ dKy_tevstr_c mTevstr;
+    /* 0x1D4 */ f32 mHeight;
 };
 
 #endif /* D_WPILLAR_H */