summaryrefslogtreecommitdiff
path: root/src/JSystem/J3DGraphLoader
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2023-12-24 15:28:29 -0800
committerJasper St. Pierre <jstpierre@mecheye.net>2023-12-24 15:28:29 -0800
commit1de7000848e47a09ba24cfaf178d0159307abfc6 (patch)
treea8c660cbec0ed93398e306350da246ebaac55532 /src/JSystem/J3DGraphLoader
parentee6a21d7dc90d97aefb3ee4e77e77858099e26fb (diff)
some build fixes
Diffstat (limited to 'src/JSystem/J3DGraphLoader')
-rw-r--r--src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
index 5a164dec..85a388f6 100644
--- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
@@ -545,7 +545,7 @@ void J3DAnmKeyLoader_v15::setAnmCluster(J3DAnmClusterKey* param_1, const J3DAnmC
param_1->mFrameMax = param_2->mFrameMax;
param_1->mAttribute = param_2->field_0x8;
param_1->mFrame = 0.0f;
- param_1->field_0x14 = JSUConvertOffsetToPtr<J3DAnmClusterKeyTable>(param_2, (void*)param_2->mTableOffset);
+ param_1->mAnmTable = JSUConvertOffsetToPtr<J3DAnmClusterKeyTable>(param_2, (void*)param_2->mTableOffset);
param_1->mWeight = JSUConvertOffsetToPtr<f32>(param_2, (void*)param_2->mWeightOffset);
}
@@ -567,22 +567,22 @@ void J3DAnmKeyLoader_v15::setAnmTevReg(J3DAnmTevRegKey* param_1, const J3DAnmTev
param_1->mAnmKRegKeyTable = JSUConvertOffsetToPtr<J3DAnmKRegKeyTable>(param_2, (void*)param_2->mKRegTableOffset);
param_1->mKRegUpdateMaterialID = JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->mKRegUpdateMaterialIDOffset);
param_1->mKRegUpdateMaterialName.setResource(JSUConvertOffsetToPtr<ResNTAB>(param_2, (void*)param_2->mKRegNameTabOffset));
- param_1->mCRegDataCount[0] = param_2->field_0x10;
- param_1->mCRegDataCount[1] = param_2->field_0x12;
- param_1->mCRegDataCount[2] = param_2->field_0x14;
- param_1->mCRegDataCount[3] = param_2->field_0x16;
- param_1->mAnmCRegData[0] = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCRValuesOffset);
- param_1->mAnmCRegData[1] = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCGValuesOffset);
- param_1->mAnmCRegData[2] = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCBValuesOffset);
- param_1->mAnmCRegData[3] = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCAValuesOffset);
- param_1->mKRegDataCount[0] = param_2->field_0x18;
- param_1->mKRegDataCount[1] = param_2->field_0x1a;
- param_1->mKRegDataCount[2] = param_2->field_0x1c;
- param_1->mKRegDataCount[3] = param_2->field_0x1e;
- param_1->mAnmKRegData[0] = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKRValuesOffset);
- param_1->mAnmKRegData[1] = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKGValuesOffset);
- param_1->mAnmKRegData[2] = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKBValuesOffset);
- param_1->mAnmKRegData[3] = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKAValuesOffset);
+ param_1->mCRegDataCountR = param_2->field_0x10;
+ param_1->mCRegDataCountG = param_2->field_0x12;
+ param_1->mCRegDataCountB = param_2->field_0x14;
+ param_1->mCRegDataCountA = param_2->field_0x16;
+ param_1->mAnmCRegDataR = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCRValuesOffset);
+ param_1->mAnmCRegDataG = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCGValuesOffset);
+ param_1->mAnmCRegDataB = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCBValuesOffset);
+ param_1->mAnmCRegDataA = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mCAValuesOffset);
+ param_1->mKRegDataCountR = param_2->field_0x18;
+ param_1->mKRegDataCountG = param_2->field_0x1a;
+ param_1->mKRegDataCountB = param_2->field_0x1c;
+ param_1->mKRegDataCountA = param_2->field_0x1e;
+ param_1->mAnmKRegDataR = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKRValuesOffset);
+ param_1->mAnmKRegDataG = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKGValuesOffset);
+ param_1->mAnmKRegDataB = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKBValuesOffset);
+ param_1->mAnmKRegDataA = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mKAValuesOffset);
}
/* 80300C34-80300C5C .text readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData */