Lots of work, many matching functions, most only requiring data to be complete

2 files changed, 10 insertions, 3 deletions

diff --git a/include/JSystem/J3DGraphAnimator/J3DModel.h b/include/JSystem/J3DGraphAnimator/J3DModel.h
index 5e116750..91808ae6 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModel.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModel.h
@@ -4,6 +4,7 @@
 #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
+#include "dolphin/mtx/mtx.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
 
@@ -113,15 +114,19 @@ public:
     Mtx33* getNrmMtxPtr() const { return mpNrmMtxBuf[1][mCurrentViewNo]; }
     Mtx33*** getBumpMtxPtrPtr() const { return mpBumpMtxArr[1]; }
     void setBaseScale(const Vec& scale) { mBaseScale = scale; }
-    void setUserArea(u32 area) { mUserArea = area; }
-    u32 getUserArea() const { return mUserArea; }
+    void setUserArea(void* area) { mUserArea = area; }
+    void* getUserArea() const { return mUserArea; }
     Vec* getBaseScale() { return &mBaseScale; }
 
+    void setAnmMtx(int jntNo, Mtx mtx) {
+        MTXCopy(mtx, mpNodeMtx[jntNo]);
+    }
+
     /* 0x004 */ J3DModelData* mModelData;
     /* 0x008 */ u32 mFlags;
     /* 0x00C */ u32 mDiffFlag;
     /* 0x010 */ J3DCalcCallBack mCalcCallBack;
-    /* 0x014 */ u32 mUserArea;
+    /* 0x014 */ void* mUserArea;
     /* 0x018 */ Vec mBaseScale;
     /* 0x024 */ Mtx mBaseTransformMtx;
     /* 0x054 */ Mtx mInternalView;
diff --git a/include/JSystem/J3DGraphAnimator/J3DNode.h b/include/JSystem/J3DGraphAnimator/J3DNode.h
index ec61c56f..977a610a 100644
--- a/include/JSystem/J3DGraphAnimator/J3DNode.h
+++ b/include/JSystem/J3DGraphAnimator/J3DNode.h
@@ -23,12 +23,14 @@ public:
     void setCallBack(J3DNodeCallBack callback) { mCallBack = callback; }
     J3DNodeCallBack getCallBack() { return mCallBack; }
     J3DNode* getChild() { return mChild; }
+    u16 getJntNo() { return mJntNo; }
 
     /* 0x04 */ void* mCallBackUserData;
     /* 0x08 */ J3DNodeCallBack mCallBack;
     /* 0x0C */ void* field_0x8;
     /* 0x10 */ J3DNode* mChild;
     /* 0x14 */ J3DNode* mYounger;
+    /* 0x18 */ u16 mJntNo;
 };  // Size: 0x18
 
 #endif /* J3DNODE_H */