3 files changed, 47 insertions, 11 deletions
diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
index be944dd686..565eb289dd 100644
--- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h
+++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h
@@ -89,7 +89,7 @@ struct J3DAnmCRegKeyTable {
     /* 0x06 */ J3DAnmKeyTableBase mGTable;
     /* 0x0C */ J3DAnmKeyTableBase mBTable;
     /* 0x12 */ J3DAnmKeyTableBase mATable;
-    /* 0x18 */ u8 _18;
+    /* 0x18 */ u8 mColorId;
     u8 padding[3];
 };  // Size = 0x1C
 
@@ -98,7 +98,7 @@ struct J3DAnmKRegKeyTable {
     /* 0x06 */ J3DAnmKeyTableBase mGTable;
     /* 0x0C */ J3DAnmKeyTableBase mBTable;
     /* 0x12 */ J3DAnmKeyTableBase mATable;
-    /* 0x18 */ u8 _18;
+    /* 0x18 */ u8 mColorId;
     u8 padding[3];
 };  // Size = 0x1C
 
@@ -444,6 +444,11 @@ public:
     u16 getUpdateMaterialID(u16 idx) const { return mUpdateMaterialID[idx]; }
     u16 getUpdateMaterialNum() const { return mTrackNum / 3; }
 
+    int getUpdateTexMtxID(u16 idx) { return mUpdateTexMtxID[idx]; }
+    bool isValidUpdateMaterialID(u16 idx) const { return mUpdateMaterialID[idx] != 0xffff; }
+    u32 getTexMtxCalcType() const { return mTexMtxCalcType; }
+    Vec* getSRTCenter(u16 idx) { return &mSRTCenter[idx]; }
+
     /* 0x0C */ int mDecShift;
     /* 0x10 */ J3DAnmTransformKeyTable* mAnmTable;
     /* 0x14 */ u16 mTrackNum;
@@ -512,6 +517,12 @@ public:
     u16 getCRegUpdateMaterialID(u16 idx) const { return mCRegUpdateMaterialID[idx]; }
     u16 getKRegUpdateMaterialID(u16 idx) const { return mKRegUpdateMaterialID[idx]; }
 
+    const J3DAnmCRegKeyTable* getAnmCRegKeyTable() const { return mAnmCRegKeyTable; }
+    const J3DAnmKRegKeyTable* getAnmKRegKeyTable() const { return mAnmKRegKeyTable; }
+
+    bool isValidCRegUpdateMaterialID(u16 idx) { return mCRegUpdateMaterialID[idx] != 0xffff; }
+    bool isValidKRegUpdateMaterialID(u16 idx) { return mKRegUpdateMaterialID[idx] != 0xffff; }
+
     /* 0x0C */ u16 mCRegUpdateMaterialNum;
     /* 0x0E */ u16 mKRegUpdateMaterialNum;
     /* 0x10 */ u16 mCRegDataCountR;
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
index b2d5316afb..91ecb818a5 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h
@@ -10,6 +10,11 @@ class J3DMatColorAnm {
 public:
     /* 8003B2B8 */ ~J3DMatColorAnm() {};
     /* 8003B2F4 */ J3DMatColorAnm() {};
+    J3DMatColorAnm(u16 param_1, J3DAnmColor* param_2) {
+        field_0x0 = param_1;
+        mAnmFlag = 1;
+        mAnmColor = param_2;
+    }
 
     void operator=(J3DMatColorAnm const& other) {
         mAnmColor = other.mAnmColor;
@@ -31,6 +36,11 @@ class J3DTexNoAnm {
 public:
     /* 8003B1F8 */ ~J3DTexNoAnm() {};
     /* 8003B240 */ J3DTexNoAnm() {};
+    J3DTexNoAnm(u16 param_1, J3DAnmTexPattern* param_2) {
+        field_0x4 = param_1;
+        mAnmFlag = 1;
+        mAnmTexPattern = param_2;
+    }
     /* 8003C82C */ virtual void calc(u16* param_0) const { mAnmTexPattern->getTexNo(field_0x4, param_0); }
 
     void operator=(J3DTexNoAnm const& other) {
@@ -53,6 +63,11 @@ class J3DTexMtxAnm {
 public:
     /* 8003B264 */ ~J3DTexMtxAnm() {};
     /* 8003B2A0 */ J3DTexMtxAnm() {};
+    J3DTexMtxAnm(u16 param_1, J3DAnmTextureSRTKey* param_2) {
+        field_0x0 = param_1;
+        mAnmFlag = 1;
+        mAnmTransform = param_2;
+    }
 
     void operator=(J3DTexMtxAnm const& other) {
         mAnmTransform = other.mAnmTransform;
@@ -74,8 +89,13 @@ private:
 
 class J3DTevKColorAnm {
 public:
-    /* 8003B150 */ ~J3DTevKColorAnm() {};
-    /* 8003B18C */ J3DTevKColorAnm() {};
+    /* 8003B150 */ ~J3DTevKColorAnm() {}
+    /* 8003B18C */ J3DTevKColorAnm() {}
+    J3DTevKColorAnm(u16 param_1, J3DAnmTevRegKey* param_2) {
+        field_0x0 = param_1;
+        mAnmFlag = 1;
+        mAnmTevReg = param_2;
+    }
 
     void operator=(J3DTevKColorAnm const& other) {
         mAnmTevReg = other.mAnmTevReg;
@@ -95,8 +115,13 @@ private:
 
 class J3DTevColorAnm {
 public:
-    /* 8003B1A4 */ ~J3DTevColorAnm() {};
-    /* 8003B1E0 */ J3DTevColorAnm() {};
+    /* 8003B1A4 */ ~J3DTevColorAnm() {}
+    /* 8003B1E0 */ J3DTevColorAnm() {}
+    J3DTevColorAnm(u16 param_1, J3DAnmTevRegKey* param_2) {
+        field_0x0 = param_1;
+        mAnmFlag = 1;
+        mAnmTevReg = param_2;
+    }
 
     void operator=(J3DTevColorAnm const& other) {
         mAnmTevReg = other.mAnmTevReg;
diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
index d770e32846..4086f29ce5 100644
--- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
+++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h
@@ -19,11 +19,11 @@ public:
     /* 8032F6F8 */ int removeTexNoAnimator(J3DAnmTexPattern*);
     /* 8032F7B4 */ int removeTexMtxAnimator(J3DAnmTextureSRTKey*);
     /* 8032F880 */ int removeTevRegAnimator(J3DAnmTevRegKey*);
-    /* 8032F9C0 */ void createTexMtxForAnimator(J3DAnmTextureSRTKey*);
-    /* 8032FAF4 */ void entryMatColorAnimator(J3DAnmColor*);
-    /* 8032FBC8 */ void entryTexNoAnimator(J3DAnmTexPattern*);
-    /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*);
-    /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*);
+    /* 8032F9C0 */ int createTexMtxForAnimator(J3DAnmTextureSRTKey*);
+    /* 8032FAF4 */ int entryMatColorAnimator(J3DAnmColor*);
+    /* 8032FBC8 */ int entryTexNoAnimator(J3DAnmTexPattern*);
+    /* 8032FCC4 */ int entryTexMtxAnimator(J3DAnmTextureSRTKey*);
+    /* 8032FE70 */ int entryTevRegAnimator(J3DAnmTevRegKey*);
 
     /* 8032F604 */ virtual ~J3DMaterialTable();