From 1de7000848e47a09ba24cfaf178d0159307abfc6 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 24 Dec 2023 15:28:29 -0800 Subject: [PATCH] some build fixes --- .../JSystem/J3DGraphAnimator/J3DAnimation.h | 26 ++++++++------ src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp | 34 +++++++++---------- src/JSystem/JKernel/JKRExpHeap.cpp | 1 + 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 3a2593b1a..3411bfee2 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -550,14 +550,14 @@ public: J3DAnmTevRegKey() : J3DAnmBase(0) { mKRegUpdateMaterialNum = 0; mCRegUpdateMaterialNum = 0; - mCRegDataCount[3] = 0; - mCRegDataCount[2] = 0; - mCRegDataCount[1] = 0; - mCRegDataCount[0] = 0; - mKRegDataCount[3] = 0; - mKRegDataCount[2] = 0; - mKRegDataCount[1] = 0; - mKRegDataCount[0] = 0; + mCRegDataCountA = 0; + mCRegDataCountB = 0; + mCRegDataCountG = 0; + mCRegDataCountR = 0; + mKRegDataCountA = 0; + mKRegDataCountB = 0; + mKRegDataCountG = 0; + mKRegDataCountR = 0; mKRegUpdateMaterialID = NULL; mCRegUpdateMaterialID = NULL; mAnmCRegDataA = NULL; @@ -592,8 +592,14 @@ public: private: /* 0x10 */ u16 mCRegUpdateMaterialNum; /* 0x12 */ u16 mKRegUpdateMaterialNum; - /* 0x14 */ u16 mCRegDataCount[4]; - /* 0x1C */ u16 mKRegDataCount[4]; + /* 0x14 */ u16 mCRegDataCountR; + /* 0x16 */ u16 mCRegDataCountG; + /* 0x18 */ u16 mCRegDataCountB; + /* 0x1A */ u16 mCRegDataCountA; + /* 0x1C */ u16 mKRegDataCountR; + /* 0x1E */ u16 mKRegDataCountG; + /* 0x20 */ u16 mKRegDataCountB; + /* 0x22 */ u16 mKRegDataCountA; /* 0x24 */ u16* mCRegUpdateMaterialID; /* 0x28 */ JUTNameTab mCRegUpdateMaterialName; /* 0x38 */ u16* mKRegUpdateMaterialID; diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp index 5a164decf..85a388f6f 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(param_2, (void*)param_2->mTableOffset); + param_1->mAnmTable = JSUConvertOffsetToPtr(param_2, (void*)param_2->mTableOffset); param_1->mWeight = JSUConvertOffsetToPtr(param_2, (void*)param_2->mWeightOffset); } @@ -567,22 +567,22 @@ void J3DAnmKeyLoader_v15::setAnmTevReg(J3DAnmTevRegKey* param_1, const J3DAnmTev param_1->mAnmKRegKeyTable = JSUConvertOffsetToPtr(param_2, (void*)param_2->mKRegTableOffset); param_1->mKRegUpdateMaterialID = JSUConvertOffsetToPtr(param_2, (void*)param_2->mKRegUpdateMaterialIDOffset); param_1->mKRegUpdateMaterialName.setResource(JSUConvertOffsetToPtr(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(param_2, (void*)param_2->mCRValuesOffset); - param_1->mAnmCRegData[1] = JSUConvertOffsetToPtr(param_2, (void*)param_2->mCGValuesOffset); - param_1->mAnmCRegData[2] = JSUConvertOffsetToPtr(param_2, (void*)param_2->mCBValuesOffset); - param_1->mAnmCRegData[3] = JSUConvertOffsetToPtr(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(param_2, (void*)param_2->mKRValuesOffset); - param_1->mAnmKRegData[1] = JSUConvertOffsetToPtr(param_2, (void*)param_2->mKGValuesOffset); - param_1->mAnmKRegData[2] = JSUConvertOffsetToPtr(param_2, (void*)param_2->mKBValuesOffset); - param_1->mAnmKRegData[3] = JSUConvertOffsetToPtr(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(param_2, (void*)param_2->mCRValuesOffset); + param_1->mAnmCRegDataG = JSUConvertOffsetToPtr(param_2, (void*)param_2->mCGValuesOffset); + param_1->mAnmCRegDataB = JSUConvertOffsetToPtr(param_2, (void*)param_2->mCBValuesOffset); + param_1->mAnmCRegDataA = JSUConvertOffsetToPtr(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(param_2, (void*)param_2->mKRValuesOffset); + param_1->mAnmKRegDataG = JSUConvertOffsetToPtr(param_2, (void*)param_2->mKGValuesOffset); + param_1->mAnmKRegDataB = JSUConvertOffsetToPtr(param_2, (void*)param_2->mKBValuesOffset); + param_1->mAnmKRegDataA = JSUConvertOffsetToPtr(param_2, (void*)param_2->mKAValuesOffset); } /* 80300C34-80300C5C .text readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData */ diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index 24260f2f8..98835901e 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -10,6 +10,7 @@ #include "JSystem/JUtility/JUTException.h" #include "dolphin/os/OS.h" #include "dolphin/types.h" +#include "MSL_C/new.h" /* 802B1558-802B15D0 .text createRoot__10JKRExpHeapFib */ JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) {