mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-07 18:20:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

clean up some objects (#2014)

Browse Source
This commit is contained in:
Caroline Madsen
2023-12-27 19:54:45 -05:00
committed by GitHub
parent 4b0202222e
commit a3fd393a38
34 changed files with 846 additions and 2345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/rel/d/a/obj/d_a_obj_bbox/d_a_obj_bbox.h
+28 -29
View File
@@ -1,29 +1,28 @@
#ifndef D_A_OBJ_BBOX_H
#define D_A_OBJ_BBOX_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/cc/d_cc_d.h"
#include "d/com/d_com_inf_game.h"
#include "f_op/f_op_actor_mng.h"
class daObjBBox_c : public dBgS_MoveBgActor {
public:
/* 80BACD38 */ void initBaseMtx();
/* 80BACD74 */ void setBaseMtx();
/* 80BACDD8 */ int Create();
/* 80BACE50 */ int CreateHeap();
/* 80BACEC0 */ int create1st();
/* 80BAD0C0 */ int Execute(Mtx**);
/* 80BAD234 */ int Draw();
/* 80BAD2D8 */ int Delete();
u32 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
private:
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ dCcD_Stts mStts;
/* 0x5E8 */ dCcD_Cyl mCyl;
}; // Size: 0x724
#endif /* D_A_OBJ_BBOX_H */
#ifndef D_A_OBJ_BBOX_H
#define D_A_OBJ_BBOX_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "d/cc/d_cc_d.h"
#include "f_op/f_op_actor_mng.h"
class daObjBBox_c : public dBgS_MoveBgActor {
public:
/* 80BACD38 */ void initBaseMtx();
/* 80BACD74 */ void setBaseMtx();
/* 80BACDD8 */ int Create();
/* 80BACE50 */ int CreateHeap();
/* 80BACEC0 */ int create1st();
/* 80BAD0C0 */ int Execute(Mtx**);
/* 80BAD234 */ int Draw();
/* 80BAD2D8 */ int Delete();
u32 getSwNo() { return fopAcM_GetParamBit(this, 0, 8); }
private:
/* 0x5A0 */ request_of_phase_process_class mPhaseReq;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ dCcD_Stts mStts;
/* 0x5E8 */ dCcD_Cyl mCyl;
}; // Size: 0x724
#endif /* D_A_OBJ_BBOX_H */
include/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.h
+50 -50
View File
@@ -1,50 +1,50 @@
#ifndef D_A_OBJ_LV4GATE_H
#define D_A_OBJ_LV4GATE_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
class daLv4Gate_c : public dBgS_MoveBgActor {
public:
enum Mode_e {
MODE_WAIT_e,
MODE_MOVE_e,
MODE_MOVE_END_e,
};
/* 80C5EBE4 */ void setBaseMtx();
/* 80C5ECEC */ int create();
/* 80C5EEA4 */ void moveGate();
/* 80C5EF48 */ void init_modeWait();
/* 80C5EF54 */ void modeWait();
/* 80C5EFB0 */ void init_modeMove();
/* 80C5EFBC */ void modeMove();
/* 80C5F0C4 */ void init_modeMoveEnd();
/* 80C5F1E4 */ void modeMoveEnd();
/* 80C5EC80 */ virtual int CreateHeap();
/* 80C5EE54 */ virtual int Execute(f32 (**)[3][4]);
/* 80C5F1E8 */ virtual int Draw();
/* 80C5F28C */ virtual int Delete();
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ u8 mMode;
/* 0x5AD */ u8 mGateOpened;
/* 0x5AE */ u8 mInitMove;
/* 0x5AF */ u8 mMoveType;
/* 0x5B0 */ f32 mMoveTarget;
/* 0x5B4 */ f32 mMoveValue;
};
class daLv4Gate_HIO_c : public mDoHIO_entry_c {
public:
/* 80C5EB6C */ daLv4Gate_HIO_c();
/* 80C5F348 */ virtual ~daLv4Gate_HIO_c();
/* 0x4 */ f32 mMoveSpeed;
/* 0x8 */ u8 mShockStrength;
};
#endif /* D_A_OBJ_LV4GATE_H */
#ifndef D_A_OBJ_LV4GATE_H
#define D_A_OBJ_LV4GATE_H
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
class daLv4Gate_c : public dBgS_MoveBgActor {
public:
enum Mode_e {
MODE_WAIT_e,
MODE_MOVE_e,
MODE_MOVE_END_e,
};
/* 80C5EBE4 */ void setBaseMtx();
/* 80C5ECEC */ int create();
/* 80C5EEA4 */ void moveGate();
/* 80C5EF48 */ void init_modeWait();
/* 80C5EF54 */ void modeWait();
/* 80C5EFB0 */ void init_modeMove();
/* 80C5EFBC */ void modeMove();
/* 80C5F0C4 */ void init_modeMoveEnd();
/* 80C5F1E4 */ void modeMoveEnd();
/* 80C5EC80 */ virtual int CreateHeap();
/* 80C5EE54 */ virtual int Execute(Mtx**);
/* 80C5F1E8 */ virtual int Draw();
/* 80C5F28C */ virtual int Delete();
/* 0x5A0 */ request_of_phase_process_class mPhase;
/* 0x5A8 */ J3DModel* mpModel;
/* 0x5AC */ u8 mMode;
/* 0x5AD */ u8 mGateOpened;
/* 0x5AE */ u8 mInitMove;
/* 0x5AF */ u8 mMoveType;
/* 0x5B0 */ f32 mMoveTarget;
/* 0x5B4 */ f32 mMoveValue;
};
class daLv4Gate_HIO_c : public mDoHIO_entry_c {
public:
/* 80C5EB6C */ daLv4Gate_HIO_c();
/* 80C5F348 */ virtual ~daLv4Gate_HIO_c() {}
/* 0x4 */ f32 mMoveSpeed;
/* 0x8 */ u8 mShockStrength;
};
#endif /* D_A_OBJ_LV4GATE_H */
include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h
+26 -24
View File
@@ -1,24 +1,26 @@
#ifndef D_A_OBJ_STONEMARK_H
#define D_A_OBJ_STONEMARK_H
#include "d/com/d_com_inf_game.h"
class daObjSMark_c : public fopAc_ac_c {
public:
/* 8059A018 */ void initBaseMtx();
/* 8059A038 */ void setBaseMtx();
/* 8059A080 */ int Create();
/* 8059A168 */ int create();
/* 8059A2CC */ int draw();
/* 8059A33C */ int _delete();
/* 0x0568 */ request_of_phase_process_class mpPhase;
/* 0x0570 */ GXTexObj mTexObj;
/* 0x0590 */ dBgS_ObjAcch mObjAcch;
/* 0x0768 */ dBgS_AcchCir mAcchCir;
/* 0x07A8 */ dCcD_Stts mStts;
/* 0x07E4 */ Mtx mCullMtx;
};
#endif /* D_A_OBJ_STONEMARK_H */
#ifndef D_A_OBJ_STONEMARK_H
#define D_A_OBJ_STONEMARK_H
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
class daObjSMark_c : public fopAc_ac_c {
public:
/* 8059A018 */ void initBaseMtx();
/* 8059A038 */ void setBaseMtx();
/* 8059A080 */ int Create();
/* 8059A168 */ int create();
/* 8059A2CC */ int draw();
/* 8059A33C */ int _delete();
/* 0x0568 */ request_of_phase_process_class mpPhase;
/* 0x0570 */ GXTexObj mTexObj;
/* 0x0590 */ dBgS_ObjAcch mObjAcch;
/* 0x0768 */ dBgS_AcchCir mAcchCir;
/* 0x07A8 */ dCcD_Stts mStts;
/* 0x07E4 */ Mtx mCullMtx;
};
#endif /* D_A_OBJ_STONEMARK_H */
include/rel/d/a/obj/d_a_obj_wsword/d_a_obj_wsword.h
+25 -1
View File
@@ -1,6 +1,30 @@
#ifndef D_A_OBJ_WSWORD_H
#define D_A_OBJ_WSWORD_H
#include "dolphin/types.h"
#include "SSystem/SComponent/c_phase.h"
#include "f_op/f_op_actor.h"
#include "d/bg/d_bg_s_acch.h"
#include "d/cc/d_cc_d.h"
class daObjWSword_c : public fopAc_ac_c {
public:
/* 80D3B998 */ void initBaseMtx();
/* 80D3B9D4 */ void setBaseMtx();
/* 80D3BA40 */ int Create();
/* 80D3BAB8 */ int CreateHeap();
/* 80D3BB28 */ int create();
/* 80D3BDA0 */ int execute();
/* 80D3BDF0 */ int draw();
/* 80D3BE54 */ int _delete();
/* 0x568 */ request_of_phase_process_class mPhaseReq;
/* 0x570 */ J3DModel* mpModel;
/* 0x574 */ dBgS_ObjAcch mAcch;
/* 0x74C */ dBgS_AcchCir mAcchCir;
/* 0x78C */ dCcD_Stts mStts;
/* 0x7C8 */ dCcD_Cyl mCyl;
};
STATIC_ASSERT(sizeof(daObjWSword_c) == 0x904);
#endif /* D_A_OBJ_WSWORD_H */
include/rel/d/a/obj/d_a_obj_zcloth/d_a_obj_zcloth.h
+17 -5
View File
@@ -1,5 +1,17 @@
#ifndef D_A_OBJ_ZCLOTH_H
#define D_A_OBJ_ZCLOTH_H
#endif /* D_A_OBJ_ZCLOTH_H */
#ifndef D_A_OBJ_ZCLOTH_H
#define D_A_OBJ_ZCLOTH_H
#include "d/a/d_a_itembase.h"
class daObjZCloth_c : public daItemBase_c {
public:
/* 80D3EE18 */ void initBaseMtx();
/* 80D3EE54 */ void setBaseMtx();
/* 80D3EEC0 */ int Create();
/* 80D3EF0C */ int create();
/* 80D3F1AC */ int execute();
/* 80D3F1D0 */ int draw();
/* 80D3F200 */ int _delete();
}; // Size: 0x92C
#endif /* D_A_OBJ_ZCLOTH_H */