From 5c6e6213fb042de489efcc45c1410cc8cc93d5a1 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Wed, 3 Jan 2024 22:29:23 -0500 Subject: [PATCH] Rename JUTDataBlockHeader --- .../JSystem/J3DGraphAnimator/J3DAnimation.h | 26 +++++++++---------- .../JSystem/J3DGraphLoader/J3DClusterLoader.h | 4 +-- .../JSystem/J3DGraphLoader/J3DModelLoader.h | 18 ++++++------- .../JUTDataHeader.h} | 12 ++++----- src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp | 20 +++++++------- .../J3DGraphLoader/J3DClusterLoader.cpp | 6 ++--- src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | 18 ++++++------- .../J3DGraphLoader/J3DModelLoaderCalcSize.cpp | 16 ++++++------ 8 files changed, 60 insertions(+), 60 deletions(-) rename include/JSystem/{JFileHeader.h => JUtility/JUTDataHeader.h} (56%) diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index f61141b54..830c5470e 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -3,7 +3,7 @@ #include "JSystem/J3DGraphAnimator/J3DModelData.h" #include "JSystem/JUtility/JUTNameTab.h" -#include "JSystem/JFileHeader.h" +#include "JSystem/JUtility/JUTDataHeader.h" typedef struct _GXColor GXColor; typedef struct _GXColorS10 GXColorS10; @@ -89,7 +89,7 @@ struct J3DAnmClusterKeyTable { }; struct J3DAnmVtxColorFullData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9; // padding? /* 0x0A */ s16 mFrameMax; @@ -108,7 +108,7 @@ struct J3DAnmVtxColorFullData { STATIC_ASSERT(sizeof(J3DAnmVtxColorFullData) == 0x40); struct J3DAnmVisibilityFullData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9; // padding? /* 0x0A */ s16 mFrameMax; @@ -121,7 +121,7 @@ struct J3DAnmVisibilityFullData { STATIC_ASSERT(sizeof(J3DAnmVisibilityFullData) == 0x18); struct J3DAnmTransformFullData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9; /* 0x0A */ s16 mFrameMax; @@ -136,7 +136,7 @@ struct J3DAnmTransformFullData { STATIC_ASSERT(sizeof(J3DAnmTransformFullData) == 0x24); struct J3DAnmColorKeyData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9[3]; /* 0x0C */ s16 mFrameMax; @@ -157,7 +157,7 @@ struct J3DAnmColorKeyData { STATIC_ASSERT(sizeof(J3DAnmColorKeyData) == 0x34); struct J3DAnmTextureSRTKeyData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9; /* 0x0A */ s16 field_0xa; @@ -191,7 +191,7 @@ struct J3DAnmTextureSRTKeyData { STATIC_ASSERT(sizeof(J3DAnmTextureSRTKeyData) == 0x60); struct J3DAnmVtxColorKeyData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9; /* 0x0A */ s16 mFrameMax; @@ -209,7 +209,7 @@ struct J3DAnmVtxColorKeyData { STATIC_ASSERT(sizeof(J3DAnmVtxColorKeyData) == 0x40); struct J3DAnmTexPatternFullData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9; /* 0x0A */ s16 mFrameMax; @@ -224,7 +224,7 @@ struct J3DAnmTexPatternFullData { STATIC_ASSERT(sizeof(J3DAnmTexPatternFullData) == 0x20); struct J3DAnmTevRegKeyData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9; // maybe padding /* 0x0A */ s16 mFrameMax; @@ -257,7 +257,7 @@ struct J3DAnmTevRegKeyData { STATIC_ASSERT(sizeof(J3DAnmTevRegKeyData) == 0x58); struct J3DAnmColorFullData { /* PlaceHolder Structure */ - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9[3]; /* 0x0C */ s16 mFrameMax; @@ -275,7 +275,7 @@ struct J3DAnmColorFullData { /* PlaceHolder Structure */ STATIC_ASSERT(sizeof(J3DAnmColorFullData) == 0x34); struct J3DAnmClusterFullData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x0A */ s16 mFrameMax; /* 0x0C */ s32 field_0xc; @@ -284,7 +284,7 @@ struct J3DAnmClusterFullData { }; struct J3DAnmTransformKeyData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x09 */ u8 field_0x9; /* 0x0A */ s16 mFrameMax; @@ -297,7 +297,7 @@ struct J3DAnmTransformKeyData { }; struct J3DAnmClusterKeyData { - /* 0x00 */ JSystemBlockHeader mHeader; + /* 0x00 */ JUTDataBlockHeader mHeader; /* 0x08 */ u8 field_0x8; /* 0x0A */ s16 mFrameMax; /* 0x0C */ s32 field_0xc; diff --git a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h index dc1be9e75..e8ea41af3 100644 --- a/include/JSystem/J3DGraphLoader/J3DClusterLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DClusterLoader.h @@ -1,11 +1,11 @@ #ifndef J3DCLUSTERLOADER_H #define J3DCLUSTERLOADER_H -#include "JSystem/JFileHeader.h" +#include "JSystem/JUtility/JUTDataHeader.h" class J3DDeformData; -class J3DClusterBlock : public JSystemBlockHeader { +class J3DClusterBlock : public JUTDataBlockHeader { private: friend class J3DClusterLoader; friend class J3DClusterLoader_v15; diff --git a/include/JSystem/J3DGraphLoader/J3DModelLoader.h b/include/JSystem/J3DGraphLoader/J3DModelLoader.h index 84d97544e..1b369ff2f 100644 --- a/include/JSystem/J3DGraphLoader/J3DModelLoader.h +++ b/include/JSystem/J3DGraphLoader/J3DModelLoader.h @@ -2,20 +2,20 @@ #define J3DMODELLOADER_H #include "JSystem/J3DGraphAnimator/J3DModelData.h" -#include "JSystem/JFileHeader.h" +#include "JSystem/JUtility/JUTDataHeader.h" inline u32 getBdlFlag_MaterialType(u32 i_flags) { return i_flags & 0x3000; } -struct J3DModelInfoBlock : public JSystemBlockHeader { +struct J3DModelInfoBlock : public JUTDataBlockHeader { /* 0x08 */ u16 mFlags; /* 0x0C */ u32 mPacketNum; /* 0x10 */ u32 mVtxNum; /* 0x14 */ void* mpHierarchy; }; // Size: 0x18 -struct J3DVertexBlock : public JSystemBlockHeader { +struct J3DVertexBlock : public JUTDataBlockHeader { /* 0x08 */ void* mpVtxAttrFmtList; /* 0x0C */ void* mpVtxPosArray; /* 0x10 */ void* mpVtxNrmArray; @@ -24,7 +24,7 @@ struct J3DVertexBlock : public JSystemBlockHeader { /* 0x20 */ void* mpVtxTexCoordArray[8]; }; // Size: 0x40 -struct J3DEnvelopBlock : public JSystemBlockHeader { +struct J3DEnvelopBlock : public JUTDataBlockHeader { /* 0x08 */ u16 mWEvlpMtxNum; /* 0x0C */ void* mpWEvlpMixMtxNum; /* 0x10 */ void* mpWEvlpMixMtxIndex; @@ -32,7 +32,7 @@ struct J3DEnvelopBlock : public JSystemBlockHeader { /* 0x18 */ void* mpInvJointMtx; }; // Size: 0x1C -struct J3DDrawBlock : public JSystemBlockHeader { +struct J3DDrawBlock : public JUTDataBlockHeader { /* 0x08 */ u16 mMtxNum; /* 0x0C */ void* mpDrawMtxFlag; /* 0x10 */ void* mpDrawMtxIndex; @@ -40,7 +40,7 @@ struct J3DDrawBlock : public JSystemBlockHeader { struct J3DJointBlock; -struct J3DMaterialBlock : public JSystemBlockHeader { +struct J3DMaterialBlock : public JUTDataBlockHeader { /* 0x08 */ u16 mMaterialNum; /* 0x0C */ void* mpMaterialInitData; /* 0x10 */ void* mpMaterialID; @@ -74,7 +74,7 @@ struct J3DMaterialBlock : public JSystemBlockHeader { /* 0x80 */ void* mpNBTScaleInfo; }; -struct J3DMaterialBlock_v21 : public JSystemBlockHeader { +struct J3DMaterialBlock_v21 : public JUTDataBlockHeader { /* 0x08 */ u16 mMaterialNum; /* 0x0C */ void* field_0x0c; /* 0x10 */ void* field_0x10; @@ -82,7 +82,7 @@ struct J3DMaterialBlock_v21 : public JSystemBlockHeader { /* more */ }; -struct J3DMaterialDLBlock : public JSystemBlockHeader { +struct J3DMaterialDLBlock : public JUTDataBlockHeader { /* 0x08 */ u16 mMaterialNum; /* 0x0C */ void* mpDisplayListInit; /* 0x10 */ void* mpPatchingInfo; @@ -95,7 +95,7 @@ struct J3DMaterialDLBlock : public JSystemBlockHeader { struct J3DShapeBlock; -struct J3DTextureBlock : public JSystemBlockHeader { +struct J3DTextureBlock : public JUTDataBlockHeader { /* 0x08 */ u16 mTextureNum; /* 0x0C */ void* mpTextureRes; /* 0x10 */ void* mpNameTable; diff --git a/include/JSystem/JFileHeader.h b/include/JSystem/JUtility/JUTDataHeader.h similarity index 56% rename from include/JSystem/JFileHeader.h rename to include/JSystem/JUtility/JUTDataHeader.h index 890512bf5..051c6e812 100644 --- a/include/JSystem/JFileHeader.h +++ b/include/JSystem/JUtility/JUTDataHeader.h @@ -5,22 +5,22 @@ #include "global.h" -struct JSystemBlockHeader { // actual struct name unknown +struct JUTDataBlockHeader { /* 0x0 */ u32 mType; /* 0x4 */ u32 mNextOffset; - const JSystemBlockHeader* getNext() const { // fake inline - return reinterpret_cast(reinterpret_cast(this) + mNextOffset); + const JUTDataBlockHeader* getNext() const { // fake inline + return reinterpret_cast(reinterpret_cast(this) + mNextOffset); } -}; // Size = 0x8 +}; -struct JSystemFileHeader { // actual struct name unknown +struct JUTDataFileHeader { // actual struct name unknown /* 0x00 */ u32 mMagic; /* 0x04 */ u32 mType; /* 0x08 */ u32 mFileSize; /* 0x0C */ u32 mBlockNum; /* 0x10 */ u8 _10[0x20 - 0x10]; - /* 0x20 */ JSystemBlockHeader mFirstBlock; + /* 0x20 */ JUTDataBlockHeader mFirstBlock; }; #endif /* JFILEHEADER_H */ diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp index b1c89beda..9b910734d 100644 --- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp @@ -13,7 +13,7 @@ J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data) { if (!i_data) { return NULL; } - const JSystemFileHeader* header = (const JSystemFileHeader*)i_data; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data; if (header->mMagic == 'J3D1') { switch (header->mType) { case 'bck1': { @@ -86,7 +86,7 @@ J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data) { /* 802FF6C8-802FF9EC .text setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv */ void J3DAnmLoaderDataBase::setResource(J3DAnmBase* param_1, const void* param_2) { - const JSystemFileHeader* header = (const JSystemFileHeader*)param_2; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_2; if (!header) { return; } @@ -177,8 +177,8 @@ J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() {} /* 802FFADC-802FFC28 .text load__20J3DAnmFullLoader_v15FPCv */ J3DAnmBase* J3DAnmFullLoader_v15::load(const void* param_1) { - const JSystemFileHeader* header = (const JSystemFileHeader*)param_1; - const JSystemBlockHeader* block = &header->mFirstBlock; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_1; + const JUTDataBlockHeader* block = &header->mFirstBlock; for (int i = 0; i < header->mBlockNum; i++) { switch (block->mType) { case 'ANF1': @@ -210,8 +210,8 @@ J3DAnmBase* J3DAnmFullLoader_v15::load(const void* param_1) { /* 802FFC28-802FFDD4 .text setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv */ void J3DAnmFullLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2) { - const JSystemFileHeader* header = (const JSystemFileHeader*)param_2; - const JSystemBlockHeader* block = &header->mFirstBlock; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_2; + const JUTDataBlockHeader* block = &header->mFirstBlock; for (int i = 0; i < header->mBlockNum; i++) { switch (block->mType) { case 'ANF1': @@ -369,8 +369,8 @@ void J3DAnmFullLoader_v15::setAnmVtxColor(J3DAnmVtxColorFull* dst, const J3DAnmV /* 80300318-80300464 .text load__19J3DAnmKeyLoader_v15FPCv */ J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* param_1) { - const JSystemFileHeader* header = (const JSystemFileHeader*)param_1; - const JSystemBlockHeader* block = &header->mFirstBlock; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_1; + const JUTDataBlockHeader* block = &header->mFirstBlock; for (int i = 0; i < header->mBlockNum; i++) { switch (block->mType) { case 'ANK1': @@ -402,8 +402,8 @@ J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* param_1) { /* 80300464-80300610 .text setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv */ void J3DAnmKeyLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2) { - const JSystemFileHeader* header = (const JSystemFileHeader*)param_2; - const JSystemBlockHeader* block = &header->mFirstBlock; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_2; + const JUTDataBlockHeader* block = &header->mFirstBlock; for (int i = 0; i < header->mBlockNum; i++) { switch (block->mType) { case 'ANK1': diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index ad0fb19d4..24dbd7b62 100644 --- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -11,7 +11,7 @@ /* 802FB04C-802FB0E8 .text load__24J3DClusterLoaderDataBaseFPCv */ void* J3DClusterLoaderDataBase::load(const void* i_data) { - const JSystemFileHeader* fileHeader = (JSystemFileHeader*)i_data; + const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data; if (fileHeader->mMagic == 'J3D1' && fileHeader->mType == 'bls1') { J3DClusterLoader_v15 loader; return loader.load(i_data); @@ -32,8 +32,8 @@ void* J3DClusterLoader_v15::load(const void* i_data) { mpDeformData = new J3DDeformData(); mpDeformData->clear(); - const JSystemFileHeader* fileHeader = (JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &fileHeader->mFirstBlock; + const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &fileHeader->mFirstBlock; for (int i = 0; i < fileHeader->mBlockNum; i++) { switch (block->mType) { case 'CLS1': diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp index 4d9defe9b..8643dd7e2 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -18,7 +18,7 @@ J3DModelData* J3DModelLoaderDataBase::load(const void* i_data, u32 i_flags) { if (i_data == NULL) { return NULL; } - const JSystemFileHeader* fileHeader = (const JSystemFileHeader*)i_data; + const JUTDataFileHeader* fileHeader = (const JUTDataFileHeader*)i_data; if (fileHeader->mMagic == 'J3D1' && fileHeader->mType == 'bmd1') { return NULL; } @@ -38,7 +38,7 @@ J3DMaterialTable* J3DModelLoaderDataBase::loadMaterialTable(const void* i_data) if (!i_data) { return NULL; } - const JSystemFileHeader* fileHeader = (const JSystemFileHeader*)i_data; + const JUTDataFileHeader* fileHeader = (const JUTDataFileHeader*)i_data; if (fileHeader->mMagic == 'J3D2' && fileHeader->mType == 'bmt3') { J3DModelLoader_v26 loader; return loader.loadMaterialTable(i_data); @@ -51,7 +51,7 @@ J3DModelData* J3DModelLoaderDataBase::loadBinaryDisplayList(const void* i_data, if (!i_data) { return NULL; } - const JSystemFileHeader* fileHeader = (const JSystemFileHeader*)i_data; + const JUTDataFileHeader* fileHeader = (const JUTDataFileHeader*)i_data; if (fileHeader->mMagic == 'J3D2' && (fileHeader->mType == 'bdl3' || fileHeader->mType == 'bdl4')) { J3DModelLoader_v26 loader; return loader.loadBinaryDisplayList(i_data, i_flags); @@ -67,8 +67,8 @@ J3DModelData* J3DModelLoader::load(const void* i_data, u32 i_flags) { mpModelData->mpRawData = i_data; mpModelData->setModelDataType(0); mpMaterialTable = &mpModelData->mMaterialTable; - const JSystemFileHeader* data = (JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &data->mFirstBlock; + const JUTDataFileHeader* data = (JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &data->mFirstBlock; for (u32 block_no = 0; block_no < data->mBlockNum; block_no++) { switch (block->mType) { case 'INF1': @@ -120,8 +120,8 @@ J3DModelData* J3DModelLoader::load(const void* i_data, u32 i_flags) { J3DMaterialTable* J3DModelLoader::loadMaterialTable(const void* i_data) { mpMaterialTable = new J3DMaterialTable(); mpMaterialTable->clear(); - const JSystemFileHeader* data = (JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &data->mFirstBlock; + const JUTDataFileHeader* data = (JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &data->mFirstBlock; for (u32 block_no = 0; block_no < data->mBlockNum; block_no++) { switch (block->mType) { case 'MAT3': @@ -152,8 +152,8 @@ J3DModelData* J3DModelLoader::loadBinaryDisplayList(const void* i_data, u32 i_fl mpModelData->mpRawData = i_data; mpModelData->setModelDataType(1); mpMaterialTable = &mpModelData->mMaterialTable; - const JSystemFileHeader* data = (JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &data->mFirstBlock; + const JUTDataFileHeader* data = (JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &data->mFirstBlock; for (u32 block_no = 0; block_no < data->mBlockNum; block_no++) { switch (block->mType) { case 'INF1': diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index 5b3004620..c57961efe 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -13,8 +13,8 @@ /* 802FD828-802FD868 .text countMaterialNum__14J3DModelLoaderFPCv */ u16 J3DModelLoader::countMaterialNum(const void* i_data) { - const JSystemFileHeader* header = (const JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &header->mFirstBlock; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &header->mFirstBlock; for (int i = 0; i < header->mBlockNum; block = block->getNext(), i++) { if (block->mType == 'MAT3') { return ((const J3DMaterialBlock*)block)->mMaterialNum; @@ -27,8 +27,8 @@ u16 J3DModelLoader::countMaterialNum(const void* i_data) { u32 J3DModelLoader::calcLoadSize(const void* i_data, u32 i_flags) { u32 flags; u32 size = 0; - const JSystemFileHeader* header = (const JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &header->mFirstBlock; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &header->mFirstBlock; u32 i = 0; flags = (u32)i_flags; size += sizeof(J3DModelData); @@ -69,8 +69,8 @@ u32 J3DModelLoader::calcLoadSize(const void* i_data, u32 i_flags) { /* 802FDA10-802FDB0C .text calcLoadMaterialTableSize__14J3DModelLoaderFPCv */ u32 J3DModelLoader::calcLoadMaterialTableSize(const void* i_data) { u32 size = 0; - const JSystemFileHeader* header = (const JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &header->mFirstBlock; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &header->mFirstBlock; bool hasTextureTable = false; u32 i = 0; size += sizeof(J3DMaterialTable); @@ -103,8 +103,8 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* i_data, u32 i_flag /* Nonmatching - regalloc */ u32 i; u32 size = 0; - const JSystemFileHeader* header = (const JSystemFileHeader*)i_data; - const JSystemBlockHeader* block = &header->mFirstBlock; + const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data; + const JUTDataBlockHeader* block = &header->mFirstBlock; i = 0; size += sizeof(J3DModelData); for (; i < header->mBlockNum; i++) {