Merge pull request #380 from TakaRikka/lv4obj

d_a_obj_lv4Gate / d_a_obj_lv4PoGate mostly done. d_a_obj_lv4CandleDemoTag work

include/d/d_vibration.h

@@ -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);

include/f_op/f_op_actor_mng.h

@@ -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));
 }
 

include/rel/d/a/obj/d_a_obj_lv4CandleDemoTag/d_a_obj_lv4CandleDemoTag.h

@@ -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 */

include/rel/d/a/obj/d_a_obj_lv4Gate/d_a_obj_lv4Gate.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 */

include/rel/d/a/obj/d_a_obj_lv4PoGate/d_a_obj_lv4PoGate.h

@@ -1,6 +1,75 @@
 #ifndef D_A_OBJ_LV4POGATE_H
 #define D_A_OBJ_LV4POGATE_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 daLv4PoGate_c : public dBgS_MoveBgActor {
+public:
+    enum Mode_e {
+        MODE_WAIT_e,
+        MODE_MOVE_OPEN_e,
+        MODE_MOVE_CLOSE_e,
+        MODE_MOVE_CLOSE_WAIT_e,
+        MODE_MOVE_CLOSE2_e,
+        MODE_MOVE_CLOSE2_WAIT_e,
+        MODE_MOVE_CLOSE3_e,
+    };
+
+    /* 80C5FCA4 */ void setBaseMtx();
+    /* 80C5FDAC */ int create();
+    /* 80C5FF2C */ void moveGate();
+    /* 80C60090 */ void init_modeWait();
+    /* 80C6009C */ void modeWait();
+    /* 80C600A0 */ void init_modeMoveOpen();
+    /* 80C60150 */ void modeMoveOpen();
+    /* 80C60200 */ void init_modeMoveClose();
+    /* 80C602B0 */ void modeMoveClose();
+    /* 80C6031C */ void init_modeMoveCloseWait();
+    /* 80C60338 */ void modeMoveCloseWait();
+    /* 80C60370 */ void init_modeMoveClose2();
+    /* 80C6037C */ void modeMoveClose2();
+    /* 80C603E0 */ void init_modeMoveClose2Wait();
+    /* 80C603FC */ void modeMoveClose2Wait();
+    /* 80C60434 */ void init_modeMoveClose3();
+    /* 80C60450 */ void modeMoveClose3();
+    /* 80C604D8 */ void setSe();
+    /* 80C60534 */ void setEffect(int);
+
+    /* 80C5FD40 */ virtual int CreateHeap();
+    /* 80C5FEDC */ virtual int Execute(f32 (**)[3][4]);
+    /* 80C605F8 */ virtual int Draw();
+    /* 80C6069C */ virtual int Delete();
+
+    int getSw() { return fopAcM_GetParamBit(this, 0, 8); }
+
+    /* 0x5A0 */ request_of_phase_process_class mPhase;
+    /* 0x5A8 */ J3DModel* mpModel;
+    /* 0x5AC */ u8 mMode;
+    /* 0x5AD */ u8 mSw;
+    /* 0x5AE */ u8 mInitMove;
+    /* 0x5B0 */ f32 mMoveTarget;
+    /* 0x5B4 */ f32 mMoveValue;
+    /* 0x5B8 */ u8 mCloseWaitTime;
+};
+
+class daLv4PoGate_HIO_c : public mDoHIO_entry_c {
+public:
+    /* 80C5FBEC */ daLv4PoGate_HIO_c();
+    /* 80C60758 */ virtual ~daLv4PoGate_HIO_c();
+
+    /* 0x04 */ f32 mOpenSpeed;
+    /* 0x08 */ f32 mCloseStep1Speed;
+    /* 0x0C */ f32 mCloseStep2Speed;
+    /* 0x10 */ f32 mCloseStep1Amount;
+    /* 0x14 */ f32 mCloseStep2Amount;
+    /* 0x18 */ u8 mCloseStep1Wait;
+    /* 0x19 */ u8 mCloseStep2Wait;
+    /* 0x1C */ f32 mCloseStep3Speed;
+    /* 0x20 */ f32 mCloseStep3Max;
+    /* 0x24 */ u8 mShockStrength;
+};
 
 #endif /* D_A_OBJ_LV4POGATE_H */