m_Do debug (#3052)

* m_Do debug

* m_Do wii data

3 files changed, 49 insertions, 49 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index d5c0bc94c3..041ce31875 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -1,7 +1,6 @@
 #ifndef J3DANIMATION_H
 #define J3DANIMATION_H
 
-#include "JSystem/J3DGraphAnimator/J3DJoint.h"
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTNameTab.h"
@@ -978,52 +977,4 @@ public:
     /* 0x10 */ f32 mFrame;
 };  // Size: 0x14
 
-struct J3DMtxCalcAnmBase: public J3DMtxCalc {
-    J3DMtxCalcAnmBase(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
-    ~J3DMtxCalcAnmBase() {}
-    J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
-    void setAnmTransform(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
-
-    J3DAnmTransform* mAnmTransform;
-};
-
-struct J3DMtxCalcAnimationAdaptorBase {
-    J3DMtxCalcAnimationAdaptorBase() {}
-    void change(J3DAnmTransform*) {}
-};
-
-template <typename A0>
-struct J3DMtxCalcAnimationAdaptorDefault : public J3DMtxCalcAnimationAdaptorBase {
-    J3DMtxCalcAnimationAdaptorDefault(J3DAnmTransform* pAnmTransform) {}
-
-    void calc(J3DMtxCalcAnmBase* pMtxCalc) {
-        J3DTransformInfo transform;
-        J3DTransformInfo* transform_p;
-        if (pMtxCalc->getAnmTransform() != NULL) {
-            pMtxCalc->getAnmTransform()->getTransform(J3DMtxCalc::getJoint()->getJntNo(), &transform);
-            transform_p = &transform;
-        } else {
-            transform_p = &J3DMtxCalc::getJoint()->getTransformInfo();
-        }
-
-        A0::calcTransform(*transform_p);
-    }
-};
-
-template <typename A0, typename B0>
-struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase {
-    J3DMtxCalcAnimation(J3DAnmTransform* pAnmTransform) : J3DMtxCalcAnmBase(pAnmTransform), field_0x8(pAnmTransform) {}
-    ~J3DMtxCalcAnimation() {}
-
-    void setAnmTransform(J3DAnmTransform* pAnmTransform) {
-        mAnmTransform = pAnmTransform;
-        field_0x8.change(pAnmTransform);
-    }
-
-    void init(const Vec& param_0, const Mtx& param_1) { B0::init(param_0, param_1); }
-    void calc() { field_0x8.calc(this); }
-
-    A0 field_0x8;
-};
-
 #endif /* J3DANIMATION_H */
diff --git a/include/JSystem/J3DGraphAnimator/J3DJoint.h b/include/JSystem/J3DGraphAnimator/J3DJoint.h
index a1104d170f..eeecdabbd4 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJoint.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJoint.h
@@ -145,6 +145,54 @@ public:
     }
 };
 
+struct J3DMtxCalcAnmBase: public J3DMtxCalc {
+    J3DMtxCalcAnmBase(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
+    ~J3DMtxCalcAnmBase() {}
+    J3DAnmTransform* getAnmTransform() { return mAnmTransform; }
+    void setAnmTransform(J3DAnmTransform* pAnmTransform) { mAnmTransform = pAnmTransform; }
+
+    J3DAnmTransform* mAnmTransform;
+};
+
+struct J3DMtxCalcAnimationAdaptorBase {
+    J3DMtxCalcAnimationAdaptorBase() {}
+    void change(J3DAnmTransform*) {}
+};
+
+template <typename A0>
+struct J3DMtxCalcAnimationAdaptorDefault : public J3DMtxCalcAnimationAdaptorBase {
+    J3DMtxCalcAnimationAdaptorDefault(J3DAnmTransform* pAnmTransform) {}
+
+    void calc(J3DMtxCalcAnmBase* pMtxCalc) {
+        J3DTransformInfo transform;
+        J3DTransformInfo* transform_p;
+        if (pMtxCalc->getAnmTransform() != NULL) {
+            pMtxCalc->getAnmTransform()->getTransform(J3DMtxCalc::getJoint()->getJntNo(), &transform);
+            transform_p = &transform;
+        } else {
+            transform_p = &J3DMtxCalc::getJoint()->getTransformInfo();
+        }
+
+        A0::calcTransform(*transform_p);
+    }
+};
+
+template <typename A0, typename B0>
+struct J3DMtxCalcAnimation : public J3DMtxCalcAnmBase {
+    J3DMtxCalcAnimation(J3DAnmTransform* pAnmTransform) : J3DMtxCalcAnmBase(pAnmTransform), field_0x8(pAnmTransform) {}
+    ~J3DMtxCalcAnimation() {}
+
+    void setAnmTransform(J3DAnmTransform* pAnmTransform) {
+        mAnmTransform = pAnmTransform;
+        field_0x8.change(pAnmTransform);
+    }
+
+    void init(const Vec& param_0, const Mtx& param_1) { B0::init(param_0, param_1); }
+    void calc() { field_0x8.calc(this); }
+
+    A0 field_0x8;
+};
+
 /**
  * @ingroup jsystem-j3d
  * 
diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
index b4b3d5a1db..285efa88d5 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
@@ -1,6 +1,7 @@
 #ifndef J3DJOINTTREE_H
 #define J3DJOINTTREE_H
 
+#include "JSystem/J3DAssert.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 
 class J3DJoint;