d_jnt_col debug (#3088)

3 files changed, 35 insertions, 5 deletions

diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h
index ad4d19f9f1..725cae652e 100644
--- a/include/JSystem/JHostIO/JORMContext.h
+++ b/include/JSystem/JHostIO/JORMContext.h
@@ -86,6 +86,11 @@
         updateSelectorSub(mode, (uintptr_t)pSrc, *pSrc, param_2);                                  \
     }
 
+#define DEFINE_UPDATE_COMBO_BOX_ID(T)                                                              \
+    void updateComboBoxID(u32 mode, u32 id, T value, u32 param_4) {                                \
+        updateSelectorSub(mode, id, value, param_4);                                               \
+    }
+
 #define DEFINE_UPDATE_SLIDER(T)                                                                    \
     void updateSlider(u32 mode, T* pSrc, T rangeMin, T rangeMax, u32 param_5) {                    \
         updateSliderSub(mode, (uintptr_t)pSrc, *pSrc, rangeMin, rangeMax, param_5);                \
@@ -258,10 +263,12 @@ public:
     DEFINE_START_COMBO_BOX(s16, jhostio::EKind_16B)
     DEFINE_START_COMBO_BOX(s32, jhostio::EKind_32B)
 
-    DEFINE_START_COMBO_BOX_ID(int, JORPropertyEvent::EKind_ValueID)
+    DEFINE_START_COMBO_BOX_ID(s32, JORPropertyEvent::EKind_ValueID)
 
     DEFINE_UPDATE_COMBO_BOX(u8)
 
+    DEFINE_UPDATE_COMBO_BOX_ID(s32)
+
     void endComboBox() { endSelectorSub(); }
 
     void genComboBoxItem(const char* label, s32 itemNo) {
diff --git a/include/d/d_jnt_col.h b/include/d/d_jnt_col.h
index f8107f9440..763b41db52 100644
--- a/include/d/d_jnt_col.h
+++ b/include/d/d_jnt_col.h
@@ -25,6 +25,7 @@ public:
     int getArrowOffsetPosAndAngle(cXyz const*, csXyz const*, cXyz*, cXyz*) const;
     int getHitmarkPosAndAngle(cXyz const*, csXyz const*, cXyz*, csXyz*, int) const;
     void setArrowPosAndAngle(cXyz const*, cXyz const*, int, cXyz*, csXyz*);
+    void debugDraw();
 
     BOOL checkPassNum(int bit) { return field_0xc & (1 << bit); }
     void onPassNum(int num) { field_0xc |= (1 << num); }
@@ -40,4 +41,26 @@ public:
     /* 0x0C */ int field_0xc;
 };
 
+extern dJntColData_c l_debugColData[];
+
+class dJntCol_HIO_c : public JORReflexible {
+public:
+    dJntCol_HIO_c() {
+        field_0x5 = 0;
+        field_0xc = l_debugColData;
+    }
+    virtual ~dJntCol_HIO_c() {}
+    virtual void listenPropertyEvent(const JORPropertyEvent*);
+    virtual void genMessage(JORMContext*);
+
+    void update();
+    void fileOut();
+
+    /* 0x04 */ s8 field_0x4;
+    /* 0x05 */ u8 field_0x5;
+    /* 0x06 */ u8 field_0x6[0xC - 0x6];
+    /* 0x0C */ dJntColData_c* field_0xc;
+
+};
+
 #endif /* D_D_JNT_COL_H */
diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h
index aa8e3c7eca..e25f8b620e 100644
--- a/include/m_Do/m_Do_mtx.h
+++ b/include/m_Do/m_Do_mtx.h
@@ -39,10 +39,6 @@ inline void cMtx_concat(const Mtx a, const Mtx b, Mtx ab) {
     mDoMtx_concat(a, b, ab);
 }
 
-inline void cMtx_scale(Mtx m, f32 x, f32 y, f32 z) {
-    MTXScale(m, x, y, z);
-}
-
 inline void mDoMtx_multVec(CMtxP m, const Vec* src, Vec* dst) {
     PSMTXMultVec(m, src, dst);
 }
@@ -145,6 +141,10 @@ inline void mDoMtx_scale(Mtx m, f32 x, f32 y, f32 z) {
     MTXScale(m, x, y, z);
 }
 
+inline void cMtx_scale(Mtx m, f32 x, f32 y, f32 z) {
+    mDoMtx_scale(m, x, y, z);
+}
+
 inline void mDoMtx_quat(Mtx m, const Quaternion* q) {
     MTXQuat(m, q);
 }