d_path / d_vibration debug work (#3138)

* dpath debug

* dvibration debug

* d_meter2_info debug

* gcyl/gpsh debug

6 files changed, 21 insertions, 10 deletions

diff --git a/include/d/d_meter2_info.h b/include/d/d_meter2_info.h
index 72ca6ad9b2..51f07f4dc3 100644
--- a/include/d/d_meter2_info.h
+++ b/include/d/d_meter2_info.h
@@ -321,6 +321,7 @@ int dMeter2Info_setNewLetterSender();
 bool dMeter2Info_isItemOpenCheck();
 bool dMeter2Info_isMapOpenCheck();
 s16 dMeter2Info_getNowLifeGauge();
+bool dMeter2Info_isNextStage(const char*, s16, s16, s16);
 
 #if WIDESCREEN_SUPPORT
 void dMeter2Info_onWide2D();
@@ -844,10 +845,6 @@ inline void dMeter2Info_onTempBit(int i_bit) {
     g_meter2_info.onTempBit(i_bit);
 }
 
-inline bool dMeter2Info_isNextStage(const char*, s16, s16, s16) {
-    return false;
-}
-
 inline void dMeter2Info_setFloatingMessage(u16 i_msgID, s16 i_msgTimer, bool i_wakuVisible) {
     g_meter2_info.setFloatingMessage(i_msgID, i_msgTimer, i_wakuVisible);
 }
diff --git a/include/d/d_msg_object.h b/include/d/d_msg_object.h
index 45606e4e81..b55ea73904 100644
--- a/include/d/d_msg_object.h
+++ b/include/d/d_msg_object.h
@@ -562,6 +562,10 @@ inline void dMsgObject_setOffering(u16 i_num) {
     dComIfGs_setEventReg(0xF8FF, i_num & 0xFF);
 }
 
+inline void dMsgObject_setLetterNameID(u16 id) {
+    dMsgObject_getMsgObjectClass()->setLetterNameID(id);
+}
+
 class dMsgObject_HowlHIO_c {
 public:
     dMsgObject_HowlHIO_c();
diff --git a/include/d/d_path.h b/include/d/d_path.h
index d8ac2af674..810e7df04b 100644
--- a/include/d/d_path.h
+++ b/include/d/d_path.h
@@ -20,7 +20,7 @@ struct dPath {
     /* 0x2 */ u16 m_nextID;
     /* 0x4 */ u8 field_0x4;
     /* 0x5 */ bool m_closed;
-    /* 0x6 */ u8 field_0x6;
+    /* 0x6 */ u8 swbit;
     /* 0x7 */ u8 field_0x7;
     /* 0x8 */ dPnt* m_points;
 };
diff --git a/include/d/d_stage.h b/include/d/d_stage.h
index d18be4f09f..d01e0243d7 100644
--- a/include/d/d_stage.h
+++ b/include/d/d_stage.h
@@ -263,7 +263,7 @@ struct dStage_MemoryConfig_c {
 // PATH / RPAT
 struct dPath;
 struct dStage_dPath_c {
-    /* 0x0 */ int m_num;
+    /* 0x0 */ int num;
     /* 0x4 */ dPath* m_path;
 };
 
diff --git a/include/d/d_vibration.h b/include/d/d_vibration.h
index 204f6e759c..4018acea50 100644
--- a/include/d/d_vibration.h
+++ b/include/d/d_vibration.h
@@ -47,18 +47,21 @@ class dVibTest_c : public JORReflexible {
 public:
     dVibTest_c();
 
+    void Init();
+    void setDefault();
+
     virtual void listenPropertyEvent(const JORPropertyEvent*);
     virtual void genMessage(JORMContext*);
-    virtual ~dVibTest_c() {}
+    virtual ~dVibTest_c();
 
-    /* 0x04 */ s8 field_0x4;
+    /* 0x04 */ s8 id;
     /* 0x06 */ u16 m_pattern;
     /* 0x08 */ u16 m_pattern2;
     /* 0x0A */ u16 field_0xa;
     /* 0x0C */ s16 m_randombit;
     /* 0x0E */ s16 m_length;
     /* 0x10 */ int field_0x10;
-    /* 0x14 */ int m_vibswitch;
+    /* 0x14 */ s32 m_vibswitch;
     /* 0x18 */ u16 m_displayDbg;
 };
 
@@ -82,6 +85,10 @@ public:
     void Pause();
     void Remove();
 
+    #if DEBUG
+    int testShake();
+    #endif
+
     static const vib_pattern MS_patt[VIBMODE_S_MAX];
     static const vib_pattern CS_patt[VIBMODE_S_MAX];
     static const vib_pattern MQ_patt[VIBMODE_Q_MAX];
@@ -123,4 +130,7 @@ private:
     /* 0x8C */ s32 mMode;
 };  // Size: 0x90
 
+extern const char* shock_names[VIBMODE_S_MAX];
+extern const char* quake_names[VIBMODE_Q_MAX];
+
 #endif /* D_D_VIBRATION_H */
diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h
index 48d5256ea2..588c5950e5 100644
--- a/include/m_Do/m_Do_controller_pad.h
+++ b/include/m_Do/m_Do_controller_pad.h
@@ -60,7 +60,7 @@ public:
     static f32 getAnalogR(u32 pad) { return getCpadInfo(pad).mTriggerRight; }
     static f32 getAnalogL(u32 pad) { return getCpadInfo(pad).mTriggerLeft; }
     static BOOL isConnect(u32 pad) { return JUTGamePad::getPortStatus((JUTGamePad::EPadPort)pad) == 0; }
-    static void startMotorWave(u32 pad, void* data, JUTGamePad::CRumble::ERumble rumble, u32 length) {
+    static void startMotorWave(u32 pad, u8* data, JUTGamePad::CRumble::ERumble rumble, u32 length) {
         m_gamePad[pad]->startMotorWave(data, rumble, length);
     }
     static void stopMotor(u32 pad) { m_gamePad[pad]->stopMotor(); }