summaryrefslogtreecommitdiff
path: root/src/d/actor
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2023-11-24 12:47:25 -0800
committerJasper St. Pierre <jstpierre@mecheye.net>2023-11-24 12:47:25 -0800
commit6e3c8bd46f84ebc19e32be48624785a34ff7b070 (patch)
treeb422d0a88e9353168c3cc53cf98d13843c89d727 /src/d/actor
parent9553fd0c223666171670829d8a45499b34db633f (diff)
Ygush00 header fix
Diffstat (limited to 'src/d/actor')
-rw-r--r--src/d/actor/d_a_obj_Ygush00.cpp30
-rw-r--r--src/d/actor/d_a_obj_gryw00.cpp2
2 files changed, 3 insertions, 29 deletions
diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp
index 707de1d3..0b00a073 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 1fd9c128..916ed7e8 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 */
}