mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-09 22:11:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge duplicate JSystem structs into a new header

Browse Source
This commit is contained in:
LagoLunatic
2024-01-03 21:30:38 -05:00
parent 13e7dc77c7
commit 512cf5512f
8 changed files with 96 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+14 -14
View File
@@ -13,7 +13,7 @@ J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data) {
if (!i_data) {
return NULL;
}
const J3DAnmDataHeader* header = (const J3DAnmDataHeader*)i_data;
const JSystemFileHeader* header = (const JSystemFileHeader*)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 J3DAnmDataHeader* header = (const J3DAnmDataHeader*)param_2;
const JSystemFileHeader* header = (const JSystemFileHeader*)param_2;
if (!header) {
return;
}
@@ -177,9 +177,9 @@ J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() {}
/* 802FFADC-802FFC28 .text load__20J3DAnmFullLoader_v15FPCv */
J3DAnmBase* J3DAnmFullLoader_v15::load(const void* param_1) {
const J3DAnmDataHeader* header = (const J3DAnmDataHeader*)param_1;
const J3DAnmDataBlockHeader* block = &header->mFirst;
for (int i = 0; i < header->mCount; i++) {
const JSystemFileHeader* header = (const JSystemFileHeader*)param_1;
const JSystemBlockHeader* block = &header->mFirstBlock;
for (int i = 0; i < header->mBlockNum; i++) {
switch (block->mType) {
case 'ANF1':
readAnmTransform((J3DAnmTransformFullData*)block);
@@ -210,9 +210,9 @@ 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 J3DAnmDataHeader* header = (const J3DAnmDataHeader*)param_2;
const J3DAnmDataBlockHeader* block = &header->mFirst;
for (int i = 0; i < header->mCount; i++) {
const JSystemFileHeader* header = (const JSystemFileHeader*)param_2;
const JSystemBlockHeader* block = &header->mFirstBlock;
for (int i = 0; i < header->mBlockNum; i++) {
switch (block->mType) {
case 'ANF1':
if (param_1->getKind() == 0) {
@@ -369,9 +369,9 @@ void J3DAnmFullLoader_v15::setAnmVtxColor(J3DAnmVtxColorFull* dst, const J3DAnmV
/* 80300318-80300464 .text load__19J3DAnmKeyLoader_v15FPCv */
J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* param_1) {
const J3DAnmDataHeader* header = (const J3DAnmDataHeader*)param_1;
const J3DAnmDataBlockHeader* block = &header->mFirst;
for (int i = 0; i < header->mCount; i++) {
const JSystemFileHeader* header = (const JSystemFileHeader*)param_1;
const JSystemBlockHeader* block = &header->mFirstBlock;
for (int i = 0; i < header->mBlockNum; i++) {
switch (block->mType) {
case 'ANK1':
readAnmTransform((J3DAnmTransformKeyData*)block);
@@ -402,9 +402,9 @@ 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 J3DAnmDataHeader* header = (const J3DAnmDataHeader*)param_2;
const J3DAnmDataBlockHeader* block = &header->mFirst;
for (int i = 0; i < header->mCount; i++) {
const JSystemFileHeader* header = (const JSystemFileHeader*)param_2;
const JSystemBlockHeader* block = &header->mFirstBlock;
for (int i = 0; i < header->mBlockNum; i++) {
switch (block->mType) {
case 'ANK1':
if (param_1->getKind() == 0) {