From 6e3c8bd46f84ebc19e32be48624785a34ff7b070 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 24 Nov 2023 12:47:25 -0800
Subject: [PATCH] Ygush00 header fix

---
 include/d/actor/d_a_obj_Ygush00.h | 21 +++++++++++++++++----
 include/d/actor/d_a_obj_gryw00.h  |  2 +-
 src/d/actor/d_a_obj_Ygush00.cpp   | 30 ++----------------------------
 src/d/actor/d_a_obj_gryw00.cpp    |  2 +-
 4 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/include/d/actor/d_a_obj_Ygush00.h b/include/d/actor/d_a_obj_Ygush00.h
index 4fe03e4da..b8bd639dd 100644
--- a/include/d/actor/d_a_obj_Ygush00.h
+++ b/include/d/actor/d_a_obj_Ygush00.h
@@ -8,12 +8,25 @@
 
 class daObjYgush00_c : public fopAc_ac_c {
 public:
-    /* 0x290 */ request_of_phase_process_class mLoadYgush00Phs;
-    /* 0x298 */ J3DModel* mpModel;
+    enum Param_e {
+        PRM_TYPE_W = 3,
+        PRM_TYPE_S = 0,
+    };
+
+    s32 _create();
+    bool _delete();
+    bool _execute();
+    bool _draw();
+    bool create_heap();
+    static BOOL solidHeapCB(fopAc_ac_c*);
+
+public:
+    /* 0x290 */ request_of_phase_process_class mPhs;
+    /* 0x298 */ J3DModel * mpModel;
     /* 0x29C */ mDoExt_btkAnm mBtkAnm;
     /* 0x2B0 */ mDoExt_bckAnm mBckAnm;
-    /* 0x2C0 */ u32 mType;
-    /* 0x2C4 */ daObjGryw00_c* mpGryw00;
+    /* 0x2C0 */ s32 mType;
+    /* 0x2C4 */ daObjGryw00_c * mpGryw00;
 };
 
 #endif /* D_A_OBJ_YGUSH00_H */
diff --git a/include/d/actor/d_a_obj_gryw00.h b/include/d/actor/d_a_obj_gryw00.h
index eaf380da5..abeeba4f7 100644
--- a/include/d/actor/d_a_obj_gryw00.h
+++ b/include/d/actor/d_a_obj_gryw00.h
@@ -5,7 +5,7 @@
 
 class daObjGryw00_c : public fopAc_ac_c {
 public:
-    void get_draw_water_lv(void*);
+    f32 get_draw_water_lv(void*);
     void setup_high_water_level_btk_anm();
     void particle_set();
     void particle_move();
diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp
index 707de1d37..0b00a073c 100644
--- a/src/d/actor/d_a_obj_Ygush00.cpp
+++ b/src/d/actor/d_a_obj_Ygush00.cpp
@@ -3,6 +3,7 @@
 // Translation Unit: d_a_obj_Ygush00.cpp
 //
 
+#include "d/actor/d_a_obj_Ygush00.h"
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
@@ -10,37 +11,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo.h"
 #include "d/d_procname.h"
+#include "d/actor/d_a_obj_gryw00.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 
-struct daObjGryw00_c {
-public:
-    f32 get_draw_water_lv(void *i_this);
-};
-
-struct daObjYgush00_c : public fopAc_ac_c {
-public:
-    enum Param_e {
-        PRM_TYPE_W = 3,
-        PRM_TYPE_S = 0,
-    };
-
-    s32 _create();
-    bool _delete();
-    bool _execute();
-    bool _draw();
-    bool create_heap();
-    static BOOL solidHeapCB(fopAc_ac_c*);
-
-public:
-    /* 0x290 */ request_of_phase_process_class mPhs;
-    /* 0x298 */ J3DModel * mpModel;
-    /* 0x29C */ mDoExt_btkAnm mBtkAnm;
-    /* 0x2B0 */ mDoExt_bckAnm mBckAnm;
-    /* 0x2C0 */ s32 mType;
-    /* 0x2C4 */ daObjGryw00_c * mpGryw00;
-};
-
 namespace {
     static const char l_arcname[] = "Ygush00";
 };
diff --git a/src/d/actor/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp
index 1fd9c128a..916ed7e81 100644
--- a/src/d/actor/d_a_obj_gryw00.cpp
+++ b/src/d/actor/d_a_obj_gryw00.cpp
@@ -7,7 +7,7 @@
 #include "dolphin/types.h"
 
 /* 00000078-00000090       .text get_draw_water_lv__13daObjGryw00_cFPv */
-void daObjGryw00_c::get_draw_water_lv(void*) {
+f32 daObjGryw00_c::get_draw_water_lv(void*) {
     /* Nonmatching */
 }