summaryrefslogtreecommitdiff
path: root/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
diff options
context:
space:
mode:
authorCaroline Madsen <69010899+randomsalience@users.noreply.github.com>2024-10-15 16:59:31 -0400
committerGitHub <noreply@github.com>2024-10-15 23:59:31 +0300
commit9f58034704ae6fea53ba8b3e6dc10d3135d0da7c (patch)
tree1f62a71331fdc053b26e208a2727ec10d37cb22d /src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
parent9895999b7b465a487c59153788be86498abb9159 (diff)
J3D work (#2212)
Diffstat (limited to 'src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp')
-rw-r--r--src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
index dcd6087bca..aca933f017 100644
--- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
@@ -795,12 +795,12 @@ void J3DAnmKeyLoader_v15::setAnmColor(J3DAnmColorKey* param_1, const J3DAnmColor
param_1->field_0xe = param_2->field_0x12;
param_1->field_0x10 = param_2->field_0x14;
param_1->field_0x12 = param_2->field_0x16;
- param_1->field_0x3c =
+ param_1->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmColorKeyTable>(param_2, (void*)param_2->mTableOffset);
- param_1->field_0x2c = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mRValOffset);
- param_1->field_0x30 = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mGValOffset);
- param_1->field_0x34 = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mBValOffset);
- param_1->field_0x38 = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mAValOffset);
+ param_1->mColorR = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mRValOffset);
+ param_1->mColorG = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mGValOffset);
+ param_1->mColorB = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mBValOffset);
+ param_1->mColorA = JSUConvertOffsetToPtr<s16>(param_2, (void*)param_2->mAValOffset);
param_1->mUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(param_2, (void*)param_2->mUpdateMaterialIDOffset);
param_1->mUpdateMaterialName.setResource(
@@ -942,4 +942,4 @@ extern "C" void func_80339860(void* _this, void const* param_0, void const* para
// NONMATCHING
}
-/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file
+/* 803A2130-803A2130 02E790 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */