d_a_obj_lv4Gate mostly done. d_a_obj_lv4CandleDemoTag work

This commit is contained in:
TakaRikka
2023-07-20 02:35:27 -07:00
parent aba19d36a5
commit 21dc43021c
6 changed files with 471 additions and 737 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
class dVibration_c {
public:
/* 8006F268 */ int Run();
/* 8006FA24 */ bool StartShock(int, int, cXyz);
/* 8006FA24 */ bool StartShock(int i_strength, int, cXyz);
/* 8006FC0C */ bool StartQuake(u8 const*, int, int, cXyz);
/* 8006FB10 */ bool StartQuake(int, int, cXyz);
/* 8006FD94 */ int StopQuake(int);
+1 -1
View File
@@ -340,7 +340,7 @@ inline void i_fopAcM_offSwitch(const fopAc_ac_c* pActor, int sw) {
return dComIfGs_offSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
}
inline bool i_fopAcM_isSwitch(const fopAc_ac_c* item, int sw) {
inline BOOL i_fopAcM_isSwitch(const fopAc_ac_c* item, int sw) {
return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(item));
}
@@ -1,6 +1,6 @@
#ifndef D_A_OBJ_LV4CANDLEDEMOTAG_H
#define D_A_OBJ_LV4CANDLEDEMOTAG_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#endif /* D_A_OBJ_LV4CANDLEDEMOTAG_H */
@@ -1,6 +1,50 @@
#ifndef D_A_OBJ_LV4GATE_H
#define D_A_OBJ_LV4GATE_H
#include "dolphin/types.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 */
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff