From a2e538036f55570f8b9edf5f11c8402a9baaae69 Mon Sep 17 00:00:00 2001
From: Jcw87 <Jcw87@users.noreply.github.com>
Date: Thu, 21 Dec 2023 08:51:00 -0800
Subject: [PATCH] fix inline/member name

---
 include/JSystem/J3DGraphAnimator/J3DJointTree.h | 7 ++-----
 include/JSystem/J3DGraphAnimator/J3DModelData.h | 2 +-
 include/JSystem/J3DGraphLoader/J3DModelLoader.h | 2 +-
 src/JSystem/J3DGraphAnimator/J3DModelData.cpp   | 2 +-
 src/JSystem/J3DGraphLoader/J3DModelLoader.cpp   | 4 ++--
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/JSystem/J3DGraphAnimator/J3DJointTree.h b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
index 32f41941a..d1ad99b12 100644
--- a/include/JSystem/J3DGraphAnimator/J3DJointTree.h
+++ b/include/JSystem/J3DGraphAnimator/J3DJointTree.h
@@ -40,7 +40,7 @@ public:
     J3DDrawMtxData * getDrawMtxData() { return &mDrawMtxData; }
     u16 getWEvlpMtxNum() const { return mWEvlpMtxNum; }
     u8 getWEvlpMixMtxNum(u16 idx) const { return mWEvlpMixMtxNum[idx]; }
-    u16 * getWEvlpMixIndex() const { return mWEvlpMixIndex; }
+    u16 * getWEvlpMixMtxIndex() const { return mWEvlpMixMtxIndex; }
     f32 * getWEvlpMixWeight() { return mWEvlpMixWeight; }
     u16 getDrawFullWgtMtxNum() const { return mDrawMtxData.mDrawFullWgtMtxNum; }
     u16 getJointNum() const { return mJointNum; }
@@ -60,9 +60,6 @@ public:
     bool checkFlag(u32 flag) { return mFlags & flag; }
     void setFlag(u32 flag) { mFlags = flag; }
 
-    // TODO
-    void getWEvlpMixMtxIndex() {}
-
 private:
     friend class J3DModelLoader;
 
@@ -75,7 +72,7 @@ private:
     /* 0x1C */ J3DJoint** mJointNodePointer;
     /* 0x20 */ u16 mWEvlpMtxNum;
     /* 0x24 */ u8* mWEvlpMixMtxNum;
-    /* 0x28 */ u16* mWEvlpMixIndex;
+    /* 0x28 */ u16* mWEvlpMixMtxIndex;
     /* 0x2C */ f32* mWEvlpMixWeight;
     /* 0x30 */ Mtx* mInvJointMtx;
     /* 0x34 */ J3DDrawMtxData mDrawMtxData;
diff --git a/include/JSystem/J3DGraphAnimator/J3DModelData.h b/include/JSystem/J3DGraphAnimator/J3DModelData.h
index 1673d8808..bd2e5974e 100644
--- a/include/JSystem/J3DGraphAnimator/J3DModelData.h
+++ b/include/JSystem/J3DGraphAnimator/J3DModelData.h
@@ -65,7 +65,7 @@ public:
     bool isLocked() { return mMaterialTable.isLocked(); }
     u16 getDrawFullWgtMtxNum() const { return mJointTree.getDrawFullWgtMtxNum(); }
     u16 getWEvlpMtxNum() const { return mJointTree.getWEvlpMtxNum(); }
-    u16* getWEvlpMixMtxIndex() { return mJointTree.getWEvlpMixIndex(); }
+    u16* getWEvlpMixMtxIndex() { return mJointTree.getWEvlpMixMtxIndex(); }
     f32* getWEvlpMixWeight() { return mJointTree.getWEvlpMixWeight(); }
     u8 getWEvlpMixMtxNum(u16 idx) const { return mJointTree.getWEvlpMixMtxNum(idx); }
     u32 getModelDataType() const { return mJointTree.getModelDataType(); }
diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
index 3bdf64994..90841ee65 100644
--- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h
+++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h
@@ -45,7 +45,7 @@ struct J3DVertexBlock : public J3DModelBlock {
 struct J3DEnvelopBlock : public J3DModelBlock {
     /* 0x08 */ u16 mWEvlpMtxNum;
     /* 0x0C */ void* mpWEvlpMixMtxNum;
-    /* 0x10 */ void* mpWEvlpMixIndex;
+    /* 0x10 */ void* mpWEvlpMixMtxIndex;
     /* 0x14 */ void* mpWEvlpMixWeight;
     /* 0x18 */ void* mpInvJointMtx;
 };  // Size: 0x1C
diff --git a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp b/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
index 46191fc5b..002275c88 100644
--- a/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DModelData.cpp
@@ -20,7 +20,7 @@ void J3DJointTree::clear() {
     field_0x40 = NULL;
     mWEvlpMtxNum = 0;
     mWEvlpMixMtxNum = NULL;
-    mWEvlpMixIndex = NULL;
+    mWEvlpMixMtxIndex = NULL;
     mWEvlpMixWeight = NULL;
     mInvJointMtx = NULL;
     mJointName = NULL;
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
index 1f189aaf7..63e95ac63 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
@@ -339,8 +339,8 @@ void J3DModelLoader::readEnvelop(const J3DEnvelopBlock* i_block) {
     mpModelData->getJointTree().mWEvlpMtxNum = i_block->mWEvlpMtxNum;
     mpModelData->getJointTree().mWEvlpMixMtxNum =
         JSUConvertOffsetToPtr<u8>(i_block, i_block->mpWEvlpMixMtxNum);
-    mpModelData->getJointTree().mWEvlpMixIndex =
-        JSUConvertOffsetToPtr<u16>(i_block, i_block->mpWEvlpMixIndex);
+    mpModelData->getJointTree().mWEvlpMixMtxIndex =
+        JSUConvertOffsetToPtr<u16>(i_block, i_block->mpWEvlpMixMtxIndex);
     mpModelData->getJointTree().mWEvlpMixWeight =
         JSUConvertOffsetToPtr<f32>(i_block, i_block->mpWEvlpMixWeight);
     mpModelData->getJointTree().mInvJointMtx =