summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHoward Luck <pheenoh@gmail.com>2025-09-22 20:16:21 -0600
committerGitHub <noreply@github.com>2025-09-22 19:16:21 -0700
commit47abdf82fac4a2f58319e8d6ad22a1a035bf413e (patch)
tree7bc1b59c9807fd2373774d01258c5a5cff3a5e25 /include
parent7bc5a82a39b4305f8b0212462176687a2de6b947 (diff)
d_a_obj_crvlh_up OK (#2687)
* d_a_obj_crvlh OK * rm padding * rm test.cpp
Diffstat (limited to 'include')
-rw-r--r--include/d/actor/d_a_obj_crvlh_up.h37
1 files changed, 27 insertions, 10 deletions
diff --git a/include/d/actor/d_a_obj_crvlh_up.h b/include/d/actor/d_a_obj_crvlh_up.h
index f568760c8c..d3a72fa8a8 100644
--- a/include/d/actor/d_a_obj_crvlh_up.h
+++ b/include/d/actor/d_a_obj_crvlh_up.h
@@ -1,7 +1,8 @@
#ifndef D_A_OBJ_CRVLH_UP_H
#define D_A_OBJ_CRVLH_UP_H
-#include "f_op/f_op_actor_mng.h"
+#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_cc_d.h"
/**
* @ingroup actors-objects
@@ -11,24 +12,40 @@
* @details
*
*/
-class daObjCRVLH_UP_c : public fopAc_ac_c {
+class daObjCRVLH_UP_c : public dBgS_MoveBgActor {
public:
/* 80BD4F1C */ void HakaiSet();
/* 80BD4FB0 */ void UpMotion();
/* 80BD4FD8 */ void Hakai();
/* 80BD5254 */ void setBaseMtx();
- /* 80BD5378 */ void CreateHeap();
- /* 80BD53F0 */ void create();
- /* 80BD56EC */ void Create();
- /* 80BD5730 */ void Execute(Mtx**);
- /* 80BD593C */ void Draw();
- /* 80BD59C0 */ void Delete();
+ /* 80BD53F0 */ int create();
+
+ /* 80BD5378 */ virtual int CreateHeap();
+ /* 80BD56EC */ virtual int Create();
+ /* 80BD5730 */ virtual int Execute(Mtx**);
+ /* 80BD593C */ virtual int Draw();
+ /* 80BD59C0 */ virtual int Delete();
private:
- /* 0x568 */ u8 field_0x568[0x770 - 0x568];
+ /* 0x568 */ u8 field_0x568[0x5a4 - 0x5a0];
+ /* 0x5A4 */ fpc_ProcID field_0x5a4;
+ /* 0x5A8 */ fpc_ProcID field_0x5a8;
+ /* 0x5AC */ cXyz field_0x5ac[3];
+ /* 0x5D0 */ f32 field_0x5d0;
+ /* 0x5D4 */ u8 field_0x5d4;
+ /* 0x5D6 */ s16 field_0x5d6;
+ /* 0x5D8 */ s16 field_0x5d8;
+ /* 0x5DA */ u8 field_0x5da;
+ /* 0x5DB */ u8 field_0x5db;
+ /* 0x5DC */ f32 field_0x5dc;
+ /* 0x5E0 */ u8 field_0x5e0[8];
+ /* 0x5E8 */ J3DModel* mpModel;
+ /* 0x5EC */ request_of_phase_process_class mPhase;
+ /* 0x5F4 */ dCcD_Stts mStts;
+ /* 0x630 */ dCcD_Cyl mCyl;
+ /* 0x76C */ u8 field_0x76c;
};
STATIC_ASSERT(sizeof(daObjCRVLH_UP_c) == 0x770);
-
#endif /* D_A_OBJ_CRVLH_UP_H */