mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-11 03:26:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

J2DScreen / some J2DMaterial (#191)

Browse Source 
* j2dscreen

* some j2dmaterial work

* remove asm
This commit is contained in:
TakaRikka
2022-04-12 13:44:06 -07:00
committed by GitHub
parent 4270643931
commit a1099217d6
35 changed files with 1771 additions and 2629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/JSystem/J2DGraph/J2DAnimation.cpp
+7 -7
View File
@@ -544,27 +544,27 @@ void J2DAnmTextureSRTKey::searchUpdateMaterialID(J2DScreen* pScreen) {
/* 8030BD10-8030BEE8 306650 01D8+00 1/0 0/0 0/0 .text
* searchUpdateMaterialID__16J2DAnmTexPatternFP9J2DScreen */
void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) {
if (pScreen != NULL && pScreen->mNameTable != NULL && pScreen->field_0x108 != NULL) {
if (pScreen != NULL && pScreen->mNameTable != NULL && pScreen->mTexRes != NULL) {
for (u16 entry = 0; entry < this->getUpdateMaterialNum(); entry++) {
s32 idx = pScreen->mNameTable->getIndex(field_0x20.getName(entry));
if (idx != -1) {
mUpdaterMaterialID[entry] = idx;
mUpdateMaterialID[entry] = idx;
} else {
mUpdaterMaterialID[entry] = 0xFFFF;
mUpdateMaterialID[entry] = 0xFFFF;
}
}
delete[] mTIMGPtrArray;
mTIMGPtrArray = new J2DAnmTexPatternTIMGPointer[pScreen->field_0x108->mCount];
mTIMGPtrArray = new J2DAnmTexPatternTIMGPointer[pScreen->mTexRes->mCount];
if (mTIMGPtrArray != NULL) {
JUTResReference resRef;
for (u16 i = 0; i < pScreen->field_0x108->mCount; i++) {
s8* var1 = pScreen->field_0x108->getResReference(i);
for (u16 i = 0; i < pScreen->mTexRes->mCount; i++) {
s8* var1 = pScreen->mTexRes->getResReference(i);
ResTIMG* var2 = NULL;
if (var1 != NULL) {
var2 = (ResTIMG*)resRef.getResource(var1, 'TIMG', NULL);
if (var2 == NULL && J2DScreen::getDataManage() != NULL) {
var2 = (ResTIMG*)J2DScreen::getDataManage()->get(
pScreen->field_0x108->getName(i));
pScreen->mTexRes->getName(i));
}
}
mTIMGPtrArray[i].mRes = var2;
libs/JSystem/J2DGraph/J2DAnmLoader_nonmatching.cpp
+2 -2
View File
@@ -438,8 +438,8 @@ void J2DAnmFullLoader_v15::setAnmTexPattern(J2DAnmTexPattern* pAnm,
pAnm->mAnmTable =
JSUConvertOffsetToPtr<J3DAnmTexPatternFullTable>(pData, (void*)pData->mTableOffset);
pAnm->mValues = JSUConvertOffsetToPtr<u16>(pData, (void*)pData->mValuesOffset);
pAnm->mUpdaterMaterialID =
JSUConvertOffsetToPtr<u16>(pData, (void*)pData->mUpdaterMaterialIDOffset);
pAnm->mUpdateMaterialID =
JSUConvertOffsetToPtr<u16>(pData, (void*)pData->mUpdateMaterialIDOffset);
pAnm->field_0x20.setResource(
JSUConvertOffsetToPtr<ResNTAB>(pData, (void*)pData->mNameTabOffset));
}
libs/JSystem/J2DGraph/J2DMatBlock.cpp
+123 -124
View File
@@ -359,7 +359,6 @@ extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */];
extern "C" extern u32 j2dDefaultTevKColor;
extern "C" extern u8 j2dDefaultTevSwapMode[4];
extern "C" extern u32 j2dDefaultTevSwapModeTable;
extern "C" extern u32 j2dDefaultBlendInfo;
extern "C" extern u8 data_804561A4[4];
extern "C" extern u32 j2dDefaultColorChanInfo;
extern "C" extern u16 data_804561AC;
@@ -826,7 +825,7 @@ extern "C" asm void initialize__12J2DTevBlock1Fv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::prepareTexture(u8 param_0) {
asm bool J2DTevBlock1::prepareTexture(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock1FUc.s"
}
@@ -837,7 +836,7 @@ asm void J2DTevBlock1::prepareTexture(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
asm bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette.s"
}
@@ -848,7 +847,7 @@ asm void J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlP10JUTTexture.s"
}
@@ -858,7 +857,7 @@ asm void J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlPC7ResTIMG.s"
}
@@ -869,7 +868,7 @@ asm void J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::setTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock1FUlP10JUTTexture.s"
}
@@ -879,7 +878,7 @@ asm void J2DTevBlock1::setTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::removeTexture(u32 param_0) {
asm bool J2DTevBlock1::removeTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock1FUl.s"
}
@@ -890,7 +889,7 @@ asm void J2DTevBlock1::removeTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::setFont(ResFONT* param_0) {
asm bool J2DTevBlock1::setFont(ResFONT* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7ResFONT.s"
}
@@ -901,7 +900,7 @@ asm void J2DTevBlock1::setFont(ResFONT* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::setFont(JUTFont* param_0) {
asm bool J2DTevBlock1::setFont(JUTFont* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock1FP7JUTFont.s"
}
@@ -911,7 +910,7 @@ asm void J2DTevBlock1::setFont(JUTFont* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* param_1) {
asm bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock1FUlPC7ResTLUT.s"
}
@@ -985,7 +984,7 @@ extern "C" asm void initialize__12J2DTevBlock2Fv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::prepareTexture(u8 param_0) {
asm bool J2DTevBlock2::prepareTexture(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock2FUc.s"
}
@@ -996,7 +995,7 @@ asm void J2DTevBlock2::prepareTexture(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
asm bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMGP10JUTPalette.s"
}
@@ -1007,7 +1006,7 @@ asm void J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlP10JUTTexture.s"
}
@@ -1017,7 +1016,7 @@ asm void J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlPC7ResTIMG.s"
}
@@ -1028,7 +1027,7 @@ asm void J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::setTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock2FUlP10JUTTexture.s"
}
@@ -1038,7 +1037,7 @@ asm void J2DTevBlock2::setTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::removeTexture(u32 param_0) {
asm bool J2DTevBlock2::removeTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock2FUl.s"
}
@@ -1049,7 +1048,7 @@ asm void J2DTevBlock2::removeTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::setFont(ResFONT* param_0) {
asm bool J2DTevBlock2::setFont(ResFONT* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7ResFONT.s"
}
@@ -1060,7 +1059,7 @@ asm void J2DTevBlock2::setFont(ResFONT* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::setFont(JUTFont* param_0) {
asm bool J2DTevBlock2::setFont(JUTFont* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock2FP7JUTFont.s"
}
@@ -1070,7 +1069,7 @@ asm void J2DTevBlock2::setFont(JUTFont* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* param_1) {
asm bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock2FUlPC7ResTLUT.s"
}
@@ -1144,7 +1143,7 @@ extern "C" asm void initialize__12J2DTevBlock4Fv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::prepareTexture(u8 param_0) {
asm bool J2DTevBlock4::prepareTexture(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock4FUc.s"
}
@@ -1155,7 +1154,7 @@ asm void J2DTevBlock4::prepareTexture(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
asm bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlPC7ResTIMGP10JUTPalette.s"
}
@@ -1166,7 +1165,7 @@ asm void J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlP10JUTTexture.s"
}
@@ -1176,7 +1175,7 @@ asm void J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock4FUlPC7ResTIMG.s"
}
@@ -1187,7 +1186,7 @@ asm void J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::setTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock4FUlP10JUTTexture.s"
}
@@ -1197,7 +1196,7 @@ asm void J2DTevBlock4::setTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::removeTexture(u32 param_0) {
asm bool J2DTevBlock4::removeTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock4FUl.s"
}
@@ -1208,7 +1207,7 @@ asm void J2DTevBlock4::removeTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::setFont(ResFONT* param_0) {
asm bool J2DTevBlock4::setFont(ResFONT* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7ResFONT.s"
}
@@ -1219,7 +1218,7 @@ asm void J2DTevBlock4::setFont(ResFONT* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::setFont(JUTFont* param_0) {
asm bool J2DTevBlock4::setFont(JUTFont* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock4FP7JUTFont.s"
}
@@ -1229,7 +1228,7 @@ asm void J2DTevBlock4::setFont(JUTFont* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* param_1) {
asm bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock4FUlPC7ResTLUT.s"
}
@@ -1303,7 +1302,7 @@ extern "C" asm void initialize__12J2DTevBlock8Fv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::prepareTexture(u8 param_0) {
asm bool J2DTevBlock8::prepareTexture(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__12J2DTevBlock8FUc.s"
}
@@ -1314,7 +1313,7 @@ asm void J2DTevBlock8::prepareTexture(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
asm bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlPC7ResTIMGP10JUTPalette.s"
}
@@ -1325,7 +1324,7 @@ asm void J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPal
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlP10JUTTexture.s"
}
@@ -1335,7 +1334,7 @@ asm void J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock8FUlPC7ResTIMG.s"
}
@@ -1346,7 +1345,7 @@ asm void J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::setTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__12J2DTevBlock8FUlP10JUTTexture.s"
}
@@ -1356,7 +1355,7 @@ asm void J2DTevBlock8::setTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::removeTexture(u32 param_0) {
asm bool J2DTevBlock8::removeTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__12J2DTevBlock8FUl.s"
}
@@ -1367,7 +1366,7 @@ asm void J2DTevBlock8::removeTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::setFont(ResFONT* param_0) {
asm bool J2DTevBlock8::setFont(ResFONT* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7ResFONT.s"
}
@@ -1378,7 +1377,7 @@ asm void J2DTevBlock8::setFont(ResFONT* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::setFont(JUTFont* param_0) {
asm bool J2DTevBlock8::setFont(JUTFont* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__12J2DTevBlock8FP7JUTFont.s"
}
@@ -1388,7 +1387,7 @@ asm void J2DTevBlock8::setFont(JUTFont* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* param_1) {
asm bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__12J2DTevBlock8FUlPC7ResTLUT.s"
}
@@ -1462,7 +1461,7 @@ extern "C" asm void initialize__13J2DTevBlock16Fv() {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::prepareTexture(u8 param_0) {
asm bool J2DTevBlock16::prepareTexture(u8 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/prepareTexture__13J2DTevBlock16FUc.s"
}
@@ -1473,7 +1472,7 @@ asm void J2DTevBlock16::prepareTexture(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
asm bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPalette* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlPC7ResTIMGP10JUTPalette.s"
}
@@ -1484,7 +1483,7 @@ asm void J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1, JUTPa
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlP10JUTTexture.s"
}
@@ -1494,7 +1493,7 @@ asm void J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__13J2DTevBlock16FUlPC7ResTIMG.s"
}
@@ -1505,7 +1504,7 @@ asm void J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::setTexture(u32 param_0, JUTTexture* param_1) {
asm bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setTexture__13J2DTevBlock16FUlP10JUTTexture.s"
}
@@ -1516,7 +1515,7 @@ asm void J2DTevBlock16::setTexture(u32 param_0, JUTTexture* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::removeTexture(u32 param_0) {
asm bool J2DTevBlock16::removeTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/removeTexture__13J2DTevBlock16FUl.s"
}
@@ -1527,7 +1526,7 @@ asm void J2DTevBlock16::removeTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::setFont(ResFONT* param_0) {
asm bool J2DTevBlock16::setFont(ResFONT* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7ResFONT.s"
}
@@ -1538,7 +1537,7 @@ asm void J2DTevBlock16::setFont(ResFONT* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::setFont(JUTFont* param_0) {
asm bool J2DTevBlock16::setFont(JUTFont* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setFont__13J2DTevBlock16FP7JUTFont.s"
}
@@ -1548,7 +1547,7 @@ asm void J2DTevBlock16::setFont(JUTFont* param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* param_1) {
asm bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/setPalette__13J2DTevBlock16FUlPC7ResTLUT.s"
}
@@ -1701,7 +1700,7 @@ void J2DIndBlockFull::setIndTexStageNum(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DIndBlockFull::getIndTexStageNum() const {
asm bool J2DIndBlockFull::getIndTexStageNum() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexStageNum__15J2DIndBlockFullCFv.s"
}
@@ -1722,7 +1721,7 @@ asm void J2DIndBlockFull::setIndTexOrder(u32 param_0, J2DIndTexOrder param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DIndBlockFull::getIndTexOrder(u32 param_0) {
asm bool J2DIndBlockFull::getIndTexOrder(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexOrder__15J2DIndBlockFullFUl.s"
}
@@ -1744,7 +1743,7 @@ asm void J2DIndBlockFull::setIndTexMtx(u32 param_0, J2DIndTexMtx param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DIndBlockFull::getIndTexMtx(u32 param_0) {
asm bool J2DIndBlockFull::getIndTexMtx(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexMtx__15J2DIndBlockFullFUl.s"
}
@@ -1765,7 +1764,7 @@ asm void J2DIndBlockFull::setIndTexCoordScale(u32 param_0, J2DIndTexCoordScale p
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DIndBlockFull::getIndTexCoordScale(u32 param_0) {
asm bool J2DIndBlockFull::getIndTexCoordScale(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTexCoordScale__15J2DIndBlockFullFUl.s"
}
@@ -1810,7 +1809,7 @@ asm void J2DTevBlock16::setTexNo(u32 param_0, u16 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTexNo(u32 param_0) const {
asm u32 J2DTevBlock16::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__13J2DTevBlock16CFUl.s"
}
@@ -1825,7 +1824,7 @@ void J2DTevBlock16::setFontNo(u16 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getFontNo() const {
asm u32 J2DTevBlock16::getFontNo() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__13J2DTevBlock16CFv.s"
}
@@ -1846,7 +1845,7 @@ asm void J2DTevBlock16::setTevOrder(u32 param_0, J2DTevOrder param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTevOrder(u32 param_0) {
asm bool J2DTevBlock16::getTevOrder(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__13J2DTevBlock16FUl.s"
}
@@ -1867,7 +1866,7 @@ asm void J2DTevBlock16::setTevColor(u32 param_0, J2DGXColorS10 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTevColor(u32 param_0) {
asm bool J2DTevBlock16::getTevColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__13J2DTevBlock16FUl.s"
}
@@ -1888,7 +1887,7 @@ asm void J2DTevBlock16::setTevKColor(u32 param_0, JUtility::TColor param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTevKColor(u32 param_0) {
asm bool J2DTevBlock16::getTevKColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__13J2DTevBlock16FUl.s"
}
@@ -1909,7 +1908,7 @@ asm void J2DTevBlock16::setTevKColorSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTevKColorSel(u32 param_0) {
asm bool J2DTevBlock16::getTevKColorSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__13J2DTevBlock16FUl.s"
}
@@ -1930,7 +1929,7 @@ asm void J2DTevBlock16::setTevKAlphaSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTevKAlphaSel(u32 param_0) {
asm bool J2DTevBlock16::getTevKAlphaSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__13J2DTevBlock16FUl.s"
}
@@ -1947,7 +1946,7 @@ void J2DTevBlock16::setTevStageNum(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTevStageNum() const {
asm bool J2DTevBlock16::getTevStageNum() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__13J2DTevBlock16CFv.s"
}
@@ -1968,7 +1967,7 @@ asm void J2DTevBlock16::setTevStage(u32 param_0, J2DTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTevStage(u32 param_0) {
asm bool J2DTevBlock16::getTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__13J2DTevBlock16FUl.s"
}
@@ -2000,7 +1999,7 @@ asm void J2DTevBlock16::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable par
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTevSwapModeTable(u32 param_0) {
asm bool J2DTevBlock16::getTevSwapModeTable(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__13J2DTevBlock16FUl.s"
}
@@ -2022,7 +2021,7 @@ asm void J2DTevBlock16::setIndTevStage(u32 param_0, J2DIndTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getIndTevStage(u32 param_0) {
asm bool J2DTevBlock16::getIndTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__13J2DTevBlock16FUl.s"
}
@@ -2033,7 +2032,7 @@ asm void J2DTevBlock16::getIndTevStage(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__13J2DTevBlock16FUlPC7ResTIMG.s"
}
@@ -2043,7 +2042,7 @@ asm void J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getTexture(u32 param_0) {
asm bool J2DTevBlock16::getTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__13J2DTevBlock16FUl.s"
}
@@ -2053,7 +2052,7 @@ asm void J2DTevBlock16::getTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getPalette(u32 param_0) {
asm bool J2DTevBlock16::getPalette(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__13J2DTevBlock16FUl.s"
}
@@ -2063,7 +2062,7 @@ asm void J2DTevBlock16::getPalette(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock16::getFont() {
asm bool J2DTevBlock16::getFont() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__13J2DTevBlock16Fv.s"
}
@@ -2119,7 +2118,7 @@ asm void J2DTevBlock8::setTexNo(u32 param_0, u16 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTexNo(u32 param_0) const {
asm u32 J2DTevBlock8::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock8CFUl.s"
}
@@ -2134,7 +2133,7 @@ void J2DTevBlock8::setFontNo(u16 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getFontNo() const {
asm u32 J2DTevBlock8::getFontNo() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock8CFv.s"
}
@@ -2155,7 +2154,7 @@ asm void J2DTevBlock8::setTevOrder(u32 param_0, J2DTevOrder param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTevOrder(u32 param_0) {
asm bool J2DTevBlock8::getTevOrder(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock8FUl.s"
}
@@ -2176,7 +2175,7 @@ asm void J2DTevBlock8::setTevColor(u32 param_0, J2DGXColorS10 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTevColor(u32 param_0) {
asm bool J2DTevBlock8::getTevColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock8FUl.s"
}
@@ -2197,7 +2196,7 @@ asm void J2DTevBlock8::setTevKColor(u32 param_0, JUtility::TColor param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTevKColor(u32 param_0) {
asm bool J2DTevBlock8::getTevKColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock8FUl.s"
}
@@ -2218,7 +2217,7 @@ asm void J2DTevBlock8::setTevKColorSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTevKColorSel(u32 param_0) {
asm bool J2DTevBlock8::getTevKColorSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock8FUl.s"
}
@@ -2239,7 +2238,7 @@ asm void J2DTevBlock8::setTevKAlphaSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTevKAlphaSel(u32 param_0) {
asm bool J2DTevBlock8::getTevKAlphaSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock8FUl.s"
}
@@ -2256,7 +2255,7 @@ void J2DTevBlock8::setTevStageNum(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTevStageNum() const {
asm bool J2DTevBlock8::getTevStageNum() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock8CFv.s"
}
@@ -2277,7 +2276,7 @@ asm void J2DTevBlock8::setTevStage(u32 param_0, J2DTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTevStage(u32 param_0) {
asm bool J2DTevBlock8::getTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock8FUl.s"
}
@@ -2309,7 +2308,7 @@ asm void J2DTevBlock8::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable para
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTevSwapModeTable(u32 param_0) {
asm bool J2DTevBlock8::getTevSwapModeTable(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock8FUl.s"
}
@@ -2331,7 +2330,7 @@ asm void J2DTevBlock8::setIndTevStage(u32 param_0, J2DIndTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getIndTevStage(u32 param_0) {
asm bool J2DTevBlock8::getIndTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock8FUl.s"
}
@@ -2342,7 +2341,7 @@ asm void J2DTevBlock8::getIndTevStage(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock8FUlPC7ResTIMG.s"
}
@@ -2352,7 +2351,7 @@ asm void J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getTexture(u32 param_0) {
asm bool J2DTevBlock8::getTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock8FUl.s"
}
@@ -2362,7 +2361,7 @@ asm void J2DTevBlock8::getTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getPalette(u32 param_0) {
asm bool J2DTevBlock8::getPalette(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock8FUl.s"
}
@@ -2372,7 +2371,7 @@ asm void J2DTevBlock8::getPalette(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock8::getFont() {
asm bool J2DTevBlock8::getFont() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock8Fv.s"
}
@@ -2428,7 +2427,7 @@ asm void J2DTevBlock4::setTexNo(u32 param_0, u16 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTexNo(u32 param_0) const {
asm u32 J2DTevBlock4::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock4CFUl.s"
}
@@ -2443,7 +2442,7 @@ void J2DTevBlock4::setFontNo(u16 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getFontNo() const {
asm u32 J2DTevBlock4::getFontNo() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock4CFv.s"
}
@@ -2464,7 +2463,7 @@ asm void J2DTevBlock4::setTevOrder(u32 param_0, J2DTevOrder param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTevOrder(u32 param_0) {
asm bool J2DTevBlock4::getTevOrder(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock4FUl.s"
}
@@ -2485,7 +2484,7 @@ asm void J2DTevBlock4::setTevColor(u32 param_0, J2DGXColorS10 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTevColor(u32 param_0) {
asm bool J2DTevBlock4::getTevColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock4FUl.s"
}
@@ -2506,7 +2505,7 @@ asm void J2DTevBlock4::setTevKColor(u32 param_0, JUtility::TColor param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTevKColor(u32 param_0) {
asm bool J2DTevBlock4::getTevKColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock4FUl.s"
}
@@ -2527,7 +2526,7 @@ asm void J2DTevBlock4::setTevKColorSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTevKColorSel(u32 param_0) {
asm bool J2DTevBlock4::getTevKColorSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock4FUl.s"
}
@@ -2548,7 +2547,7 @@ asm void J2DTevBlock4::setTevKAlphaSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTevKAlphaSel(u32 param_0) {
asm bool J2DTevBlock4::getTevKAlphaSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock4FUl.s"
}
@@ -2565,7 +2564,7 @@ void J2DTevBlock4::setTevStageNum(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTevStageNum() const {
asm bool J2DTevBlock4::getTevStageNum() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock4CFv.s"
}
@@ -2586,7 +2585,7 @@ asm void J2DTevBlock4::setTevStage(u32 param_0, J2DTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTevStage(u32 param_0) {
asm bool J2DTevBlock4::getTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock4FUl.s"
}
@@ -2618,7 +2617,7 @@ asm void J2DTevBlock4::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable para
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTevSwapModeTable(u32 param_0) {
asm bool J2DTevBlock4::getTevSwapModeTable(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock4FUl.s"
}
@@ -2640,7 +2639,7 @@ asm void J2DTevBlock4::setIndTevStage(u32 param_0, J2DIndTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getIndTevStage(u32 param_0) {
asm bool J2DTevBlock4::getIndTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock4FUl.s"
}
@@ -2651,7 +2650,7 @@ asm void J2DTevBlock4::getIndTevStage(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock4FUlPC7ResTIMG.s"
}
@@ -2661,7 +2660,7 @@ asm void J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getTexture(u32 param_0) {
asm bool J2DTevBlock4::getTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock4FUl.s"
}
@@ -2671,7 +2670,7 @@ asm void J2DTevBlock4::getTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getPalette(u32 param_0) {
asm bool J2DTevBlock4::getPalette(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock4FUl.s"
}
@@ -2681,7 +2680,7 @@ asm void J2DTevBlock4::getPalette(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock4::getFont() {
asm bool J2DTevBlock4::getFont() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock4Fv.s"
}
@@ -2737,7 +2736,7 @@ asm void J2DTevBlock2::setTexNo(u32 param_0, u16 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTexNo(u32 param_0) const {
asm u32 J2DTevBlock2::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock2CFUl.s"
}
@@ -2752,7 +2751,7 @@ void J2DTevBlock2::setFontNo(u16 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getFontNo() const {
asm u32 J2DTevBlock2::getFontNo() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock2CFv.s"
}
@@ -2773,7 +2772,7 @@ asm void J2DTevBlock2::setTevOrder(u32 param_0, J2DTevOrder param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTevOrder(u32 param_0) {
asm bool J2DTevBlock2::getTevOrder(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock2FUl.s"
}
@@ -2794,7 +2793,7 @@ asm void J2DTevBlock2::setTevColor(u32 param_0, J2DGXColorS10 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTevColor(u32 param_0) {
asm bool J2DTevBlock2::getTevColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock2FUl.s"
}
@@ -2815,7 +2814,7 @@ asm void J2DTevBlock2::setTevKColor(u32 param_0, JUtility::TColor param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTevKColor(u32 param_0) {
asm bool J2DTevBlock2::getTevKColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock2FUl.s"
}
@@ -2836,7 +2835,7 @@ asm void J2DTevBlock2::setTevKColorSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTevKColorSel(u32 param_0) {
asm bool J2DTevBlock2::getTevKColorSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock2FUl.s"
}
@@ -2857,7 +2856,7 @@ asm void J2DTevBlock2::setTevKAlphaSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTevKAlphaSel(u32 param_0) {
asm bool J2DTevBlock2::getTevKAlphaSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock2FUl.s"
}
@@ -2874,7 +2873,7 @@ void J2DTevBlock2::setTevStageNum(u8 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTevStageNum() const {
asm bool J2DTevBlock2::getTevStageNum() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStageNum__12J2DTevBlock2CFv.s"
}
@@ -2895,7 +2894,7 @@ asm void J2DTevBlock2::setTevStage(u32 param_0, J2DTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTevStage(u32 param_0) {
asm bool J2DTevBlock2::getTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock2FUl.s"
}
@@ -2927,7 +2926,7 @@ asm void J2DTevBlock2::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable para
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTevSwapModeTable(u32 param_0) {
asm bool J2DTevBlock2::getTevSwapModeTable(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock2FUl.s"
}
@@ -2949,7 +2948,7 @@ asm void J2DTevBlock2::setIndTevStage(u32 param_0, J2DIndTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getIndTevStage(u32 param_0) {
asm bool J2DTevBlock2::getIndTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock2FUl.s"
}
@@ -2960,7 +2959,7 @@ asm void J2DTevBlock2::getIndTevStage(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock2FUlPC7ResTIMG.s"
}
@@ -2970,7 +2969,7 @@ asm void J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getTexture(u32 param_0) {
asm bool J2DTevBlock2::getTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock2FUl.s"
}
@@ -2980,7 +2979,7 @@ asm void J2DTevBlock2::getTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getPalette(u32 param_0) {
asm bool J2DTevBlock2::getPalette(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock2FUl.s"
}
@@ -2990,7 +2989,7 @@ asm void J2DTevBlock2::getPalette(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock2::getFont() {
asm bool J2DTevBlock2::getFont() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock2Fv.s"
}
@@ -3046,7 +3045,7 @@ asm void J2DTevBlock1::setTexNo(u32 param_0, u16 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getTexNo(u32 param_0) const {
asm u32 J2DTevBlock1::getTexNo(u32 param_0) const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexNo__12J2DTevBlock1CFUl.s"
}
@@ -3061,7 +3060,7 @@ void J2DTevBlock1::setFontNo(u16 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getFontNo() const {
asm u32 J2DTevBlock1::getFontNo() const {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFontNo__12J2DTevBlock1CFv.s"
}
@@ -3082,7 +3081,7 @@ asm void J2DTevBlock1::setTevOrder(u32 param_0, J2DTevOrder param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getTevOrder(u32 param_0) {
asm bool J2DTevBlock1::getTevOrder(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevOrder__12J2DTevBlock1FUl.s"
}
@@ -3103,7 +3102,7 @@ asm void J2DTevBlock1::setTevColor(u32 param_0, J2DGXColorS10 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getTevColor(u32 param_0) {
asm bool J2DTevBlock1::getTevColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevColor__12J2DTevBlock1FUl.s"
}
@@ -3124,7 +3123,7 @@ asm void J2DTevBlock1::setTevKColor(u32 param_0, JUtility::TColor param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getTevKColor(u32 param_0) {
asm bool J2DTevBlock1::getTevKColor(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColor__12J2DTevBlock1FUl.s"
}
@@ -3145,7 +3144,7 @@ asm void J2DTevBlock1::setTevKColorSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getTevKColorSel(u32 param_0) {
asm bool J2DTevBlock1::getTevKColorSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKColorSel__12J2DTevBlock1FUl.s"
}
@@ -3166,7 +3165,7 @@ asm void J2DTevBlock1::setTevKAlphaSel(u32 param_0, u8 param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getTevKAlphaSel(u32 param_0) {
asm bool J2DTevBlock1::getTevKAlphaSel(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevKAlphaSel__12J2DTevBlock1FUl.s"
}
@@ -3199,7 +3198,7 @@ asm void J2DTevBlock1::setTevStage(u32 param_0, J2DTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getTevStage(u32 param_0) {
asm bool J2DTevBlock1::getTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevStage__12J2DTevBlock1FUl.s"
}
@@ -3231,7 +3230,7 @@ asm void J2DTevBlock1::setTevSwapModeTable(u32 param_0, J2DTevSwapModeTable para
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getTevSwapModeTable(u32 param_0) {
asm bool J2DTevBlock1::getTevSwapModeTable(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTevSwapModeTable__12J2DTevBlock1FUl.s"
}
@@ -3253,7 +3252,7 @@ asm void J2DTevBlock1::setIndTevStage(u32 param_0, J2DIndTevStage param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getIndTevStage(u32 param_0) {
asm bool J2DTevBlock1::getIndTevStage(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getIndTevStage__12J2DTevBlock1FUl.s"
}
@@ -3264,7 +3263,7 @@ asm void J2DTevBlock1::getIndTevStage(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1) {
asm bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/insertTexture__12J2DTevBlock1FUlPC7ResTIMG.s"
}
@@ -3274,7 +3273,7 @@ asm void J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* param_1) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getTexture(u32 param_0) {
asm bool J2DTevBlock1::getTexture(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getTexture__12J2DTevBlock1FUl.s"
}
@@ -3284,7 +3283,7 @@ asm void J2DTevBlock1::getTexture(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getPalette(u32 param_0) {
asm bool J2DTevBlock1::getPalette(u32 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getPalette__12J2DTevBlock1FUl.s"
}
@@ -3294,7 +3293,7 @@ asm void J2DTevBlock1::getPalette(u32 param_0) {
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DTevBlock1::getFont() {
asm bool J2DTevBlock1::getFont() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMatBlock/getFont__12J2DTevBlock1Fv.s"
}
libs/JSystem/J2DGraph/J2DMaterial.cpp
+213 -58
View File
@@ -92,7 +92,6 @@ extern "C" extern void* __vt__11J2DTevBlock[47];
extern "C" extern void* __vt__14J2DTexGenBlock[3 + 1 /* padding */];
extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */];
extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */];
extern "C" extern u32 j2dDefaultBlendInfo;
extern "C" extern u32 j2dDefaultColorChanInfo;
extern "C" extern u16 j2dDefaultAlphaCmp;
@@ -152,6 +151,17 @@ SECTION_DATA extern void* __vt__13J2DColorBlock[3] = {
};
/* 802EA1AC-802EA2CC 2E4AEC 0120+00 0/0 1/1 0/0 .text __ct__11J2DMaterialFv */
#ifdef NONMATCHING
J2DMaterial::J2DMaterial() {
field_0x4 = 0;
mIndex = -1;
mTevBlock = NULL;
mIndBlock = NULL;
mAnmPointer = NULL;
field_0x8 = 1;
mVisible = true;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -160,6 +170,7 @@ asm J2DMaterial::J2DMaterial() {
#include "asm/JSystem/J2DGraph/J2DMaterial/__ct__11J2DMaterialFv.s"
}
#pragma pop
#endif
/* 802EA2CC-802EA38C 2E4C0C 00C0+00 1/0 2/2 0/0 .text __dt__11J2DMaterialFv */
#pragma push
@@ -173,99 +184,243 @@ extern "C" asm void __dt__11J2DMaterialFv() {
#pragma pop
/* 802EA38C-802EA410 2E4CCC 0084+00 0/0 8/8 0/0 .text setGX__11J2DMaterialFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DMaterial::setGX() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterial/setGX__11J2DMaterialFv.s"
void J2DMaterial::setGX() {
if (mVisible) {
getColorBlock()->setGX();
getTexGenBlock()->setGX();
if (getTevBlock() != NULL) {
getTevBlock()->setGX();
}
if (getIndBlock() != NULL) {
getIndBlock()->setGX();
}
getPEBlock()->setGX();
}
}
#pragma pop
/* 802EA410-802EA5C4 2E4D50 01B4+00 0/0 1/1 0/0 .text createTevBlock__11J2DMaterialFib */
#ifdef NONMATCHING
J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) {
J2DTevBlock* block;
if (noAlign) {
if (block_type <= 1) {
block = new J2DTevBlock1();
} else if (block_type == 2) {
block = new J2DTevBlock2();
} else if (block_type <= 4) {
block = new J2DTevBlock4();
} else if (block_type <= 8) {
block = new J2DTevBlock8();
} else {
block = new J2DTevBlock16();
}
} else {
if (block_type <= 1) {
block = new (-4) J2DTevBlock1();
} else if (block_type == 2) {
block = new (-4) J2DTevBlock2();
} else if (block_type <= 4) {
block = new (-4) J2DTevBlock4();
} else if (block_type <= 8) {
block = new (-4) J2DTevBlock8();
} else {
block = new (-4) J2DTevBlock16();
}
}
return block;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DMaterial::createTevBlock(int param_0, bool param_1) {
asm J2DTevBlock* J2DMaterial::createTevBlock(int param_0, bool param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterial/createTevBlock__11J2DMaterialFib.s"
}
#pragma pop
#endif
/* 802EA5C4-802EA79C 2E4F04 01D8+00 0/0 1/1 0/0 .text createIndBlock__11J2DMaterialFib */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DMaterial::createIndBlock(int param_0, bool param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterial/createIndBlock__11J2DMaterialFib.s"
J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) {
J2DIndBlock* block;
if (noAlign) {
if (block_type != 0) {
block = new J2DIndBlockFull();
} else {
block = new J2DIndBlockNull();
}
} else {
if (block_type != 0) {
block = new (-4) J2DIndBlockFull();
} else {
block = new (-4) J2DIndBlockNull();
}
}
return block;
}
#pragma pop
/* 802EA79C-802EA84C 2E50DC 00B0+00 1/1 0/0 0/0 .text
* __ct__Q211J2DMaterial21J2DMaterialAnmPointerFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J2DMaterial::J2DMaterialAnmPointer::J2DMaterialAnmPointer() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterial/__ct__Q211J2DMaterial21J2DMaterialAnmPointerFv.s"
J2DMaterial::J2DMaterialAnmPointer::J2DMaterialAnmPointer() {
field_0x0 = NULL;
field_0x10 = -1;
field_0x4 = 0;
for (int i = 0; i < 8; i++) {
field_0x12[i] = -1;
}
field_0x8 = 0;
for (int i = 0; i < 8; i++) {
field_0x22[i] = -1;
}
field_0xc = 0;
for (int i = 0; i < 4; i++) {
field_0x32[i] = -1;
}
for (int i = 0; i < 4; i++) {
field_0x3a[i] = -1;
}
}
#pragma pop
/* 802EA84C-802EA89C 2E518C 0050+00 4/4 0/0 0/0 .text makeAnmPointer__11J2DMaterialFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DMaterial::makeAnmPointer() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterial/makeAnmPointer__11J2DMaterialFv.s"
void J2DMaterial::makeAnmPointer() {
if (mAnmPointer == NULL) {
mAnmPointer = new J2DMaterialAnmPointer();
}
}
#pragma pop
/* 802EA89C-802EA94C 2E51DC 00B0+00 0/0 4/4 0/0 .text setAnimation__11J2DMaterialFP11J2DAnmColor
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DMaterial::setAnimation(J2DAnmColor* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP11J2DAnmColor.s"
void J2DMaterial::setAnimation(J2DAnmColor* anm) {
if (anm != NULL || mAnmPointer != NULL) {
makeAnmPointer();
mAnmPointer->field_0x0 = anm;
mAnmPointer->field_0x10 = -1;
if (anm != NULL) {
u16 matNum = anm->getUpdateMaterialNum();
u16 index = getIndex();
for (u16 i = 0; i < matNum; i++) {
u16 matID = anm->getUpdateMaterialID(i);
if (index == matID) {
mAnmPointer->field_0x10 = i;
return;
}
}
}
}
}
#pragma pop
/* 802EA94C-802EAA2C 2E528C 00E0+00 0/0 4/4 0/0 .text
* setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DMaterial::setAnimation(J2DAnmTextureSRTKey* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP19J2DAnmTextureSRTKey.s"
void J2DMaterial::setAnimation(J2DAnmTextureSRTKey* anm) {
if (anm != NULL || mAnmPointer != NULL) {
makeAnmPointer();
mAnmPointer->field_0x4 = anm;
for (int i = 0; i < 8; i++) {
mAnmPointer->field_0x12[i] = -1;
}
if (anm != NULL) {
u16 matNum = anm->getUpdateMaterialNum();
u16 index = getIndex();
for (u16 i = 0; i < matNum; i++) {
u16 matID = anm->getUpdateMaterialID(i);
if (index == matID) {
u8 mtxID = anm->getUpdateTexMtxID(i);
mAnmPointer->field_0x12[mtxID] = i;
}
}
}
}
}
#pragma pop
/* 802EAA2C-802EAB0C 2E536C 00E0+00 0/0 4/4 0/0 .text
* setAnimation__11J2DMaterialFP16J2DAnmTexPattern */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DMaterial::setAnimation(J2DAnmTexPattern* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP16J2DAnmTexPattern.s"
void J2DMaterial::setAnimation(J2DAnmTexPattern* anm) {
if (anm != NULL || mAnmPointer != NULL) {
makeAnmPointer();
mAnmPointer->field_0x8 = anm;
for (int i = 0; i < 8; i++) {
mAnmPointer->field_0x22[i] = -1;
}
if (anm != NULL) {
u16 matNum = anm->getUpdateMaterialNum();
u16 index = getIndex();
J3DAnmTexPatternFullTable* anmTbl = anm->getAnmTable();
for (u16 i = 0; i < matNum; i++) {
u16 matID = anm->getUpdateMaterialID(i);
if (index == matID) {
mAnmPointer->field_0x22[anmTbl[i]._4] = i;
}
}
}
}
}
#pragma pop
/* 802EAB0C-802EAC78 2E544C 016C+00 0/0 4/4 0/0 .text
* setAnimation__11J2DMaterialFP15J2DAnmTevRegKey */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DMaterial::setAnimation(J2DAnmTevRegKey* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DMaterial/setAnimation__11J2DMaterialFP15J2DAnmTevRegKey.s"
void J2DMaterial::setAnimation(J2DAnmTevRegKey* anm) {
if (anm != NULL || mAnmPointer != NULL) {
makeAnmPointer();
mAnmPointer->field_0xc = anm;
for (int i = 0; i < 4; i++) {
mAnmPointer->field_0x32[i] = -1;
}
if (anm != NULL) {
u16 matNum = anm->getCRegUpdateMaterialNum();
u16 index = getIndex();
for (u16 i = 0; i < matNum; i++) {
u16 matID = anm->getCRegUpdateMaterialID(i);
if (index == matID) {
J3DAnmCRegKeyTable* anmTbl = anm->getAnmCRegKeyTable();
mAnmPointer->field_0x32[anmTbl[i]._18] = i;
}
}
}
for (int i = 0; i < 4; i++) {
mAnmPointer->field_0x3a[i] = -1;
}
if (anm != NULL) {
u16 matNum = anm->getKRegUpdateMaterialNum();
u16 index = getIndex();
for (u16 i = 0; i < matNum; i++) {
u16 matID = anm->getKRegUpdateMaterialID(i);
if (index == matID) {
J3DAnmKRegKeyTable* anmTbl = anm->getAnmKRegKeyTable();
mAnmPointer->field_0x3a[anmTbl[i]._18] = i;
}
}
}
}
}
#pragma pop
/* ############################################################################################## */
/* 804561B0-804561B4 0047B0 0004+00 1/1 0/0 0/0 .sdata2 @1943 */
libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
-1
View File
@@ -95,7 +95,6 @@ extern "C" extern u16 j2dDefaultIndTexOrderNull[1 + 1 /* padding */];
extern "C" extern u8 j2dDefaultIndTexCoordScaleInfo[2 + 2 /* padding */];
extern "C" extern u8 j2dDefaultTevSwapMode[4];
extern "C" extern u32 j2dDefaultTevSwapModeTable;
extern "C" extern u32 j2dDefaultBlendInfo;
extern "C" extern u32 j2dDefaultColorChanInfo;
extern "C" extern u16 j2dDefaultAlphaCmp;
libs/JSystem/J2DGraph/J2DScreen.cpp
+455 -203
View File
@@ -7,54 +7,12 @@
#include "JSystem/JGeometry.h"
#include "dol2asm.h"
#include "dolphin/types.h"
//
// Types:
//
struct JSUMemoryInputStream {
/* 802DC520 */ void setBuffer(void const*, s32);
};
struct J2DWindowEx {
/* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
};
struct J2DWindow {
/* 802F9C10 */ J2DWindow(J2DPane*, JSURandomInputStream*, J2DMaterial*);
/* 802F9B74 */ J2DWindow(J2DPane*, JSURandomInputStream*, JKRArchive*);
};
struct J2DTextBoxEx {
/* 803071E4 */ J2DTextBoxEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
};
struct J2DTextBox {
/* 802FF6D8 */ J2DTextBox(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 802FF75C */ J2DTextBox(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
};
struct J2DPictureEx {
/* 803036EC */ J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
};
struct J2DPicture {
/* 802FC118 */ J2DPicture(J2DPane*, JSURandomInputStream*, JKRArchive*);
/* 802FC1D4 */ J2DPicture(J2DPane*, JSURandomInputStream*, J2DMaterial*);
};
struct J2DOrthoGraph {
/* 802E96D0 */ J2DOrthoGraph(f32, f32, f32, f32, f32, f32);
/* 802E97B4 */ void setPort();
};
struct J2DMaterialBlock {};
struct J2DMaterialFactory {
/* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&);
/* 802F2D1C */ void create(J2DMaterial*, int, u32, J2DResReference*, J2DResReference*,
JKRArchive*) const;
};
#include "JSystem/JSupport/JSUMemoryStream.h"
#include "JSystem/J2DGraph/J2DTextBoxEx.h"
#include "JSystem/J2DGraph/J2DWindowEx.h"
#include "JSystem/J2DGraph/J2DPictureEx.h"
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
#include "JSystem/J2DGraph/J2DMaterialFactory.h"
//
// Forward References:
@@ -248,16 +206,16 @@ SECTION_SDATA2 static f32 lit_1563[1 + 1 /* padding */] = {
};
/* 802F8498-802F8540 2F2DD8 00A8+00 0/0 59/59 4/4 .text __ct__9J2DScreenFv */
// almost
#ifdef NONMATCHING
J2DScreen::J2DScreen()
: J2DPane(NULL, true, 'root', JGeometry::TBox2<f32>(0.0f, 0.0f, 640.0f, 480.0f)) {
field_0x114 = -1;
: J2DPane(NULL, true, 'root', JGeometry::TBox2<f32>(0.0f, 0.0f, 0.0f, 0.0f)), mColor() {
_4 = -1;
mScissor = false;
mMaterialNum = 0;
mMaterials = NULL;
field_0x108 = NULL;
field_0x10c = NULL;
mTexRes = NULL;
mFontRes = NULL;
mNameTable = NULL;
}
#else
@@ -272,15 +230,9 @@ asm J2DScreen::J2DScreen() {
#endif
/* 802F8540-802F85A8 2F2E80 0068+00 1/0 0/0 0/0 .text __dt__9J2DScreenFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
// asm J2DScreen::~J2DScreen() {
extern "C" asm void __dt__9J2DScreenFv() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/__dt__9J2DScreenFv.s"
J2DScreen::~J2DScreen() {
clean();
}
#pragma pop
/* 802F85A8-802F8648 2F2EE8 00A0+00 3/3 0/0 0/0 .text clean__9J2DScreenFv */
void J2DScreen::clean() {
@@ -288,11 +240,11 @@ void J2DScreen::clean() {
mMaterialNum = 0;
mMaterials = NULL;
delete[] field_0x108;
field_0x108 = NULL;
delete[] mTexRes;
mTexRes = NULL;
delete[] field_0x10c;
field_0x10c = NULL;
delete[] mFontRes;
mFontRes = NULL;
if (mNameTable != NULL) {
delete[] mNameTable->getResNameTable();
@@ -303,98 +255,219 @@ void J2DScreen::clean() {
/* 802F8648-802F8748 2F2F88 0100+00 0/0 58/58 4/4 .text setPriority__9J2DScreenFPCcUlP10JKRArchive
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::setPriority(char const* param_0, u32 param_1, JKRArchive* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFPCcUlP10JKRArchive.s"
}
#pragma pop
/* 802F8748-802F8778 2F3088 0030+00 1/1 1/1 0/0 .text
* setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
bool J2DScreen::setPriority(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) {
if (param_2 == NULL) {
return false;
} else {
return private_set(param_0, param_1, param_2);
}
}
/* 802F8778-802F8834 2F30B8 00BC+00 1/1 0/0 0/0 .text
* private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool J2DScreen::private_set(JSURandomInputStream* param_0, u32 param_1, JKRArchive* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s"
}
#pragma pop
/* 802F8834-802F8894 2F3174 0060+00 1/1 0/0 0/0 .text
* checkSignature__9J2DScreenFP20JSURandomInputStream */
#ifdef NONMATCHING
bool J2DScreen::checkSignature(JSURandomInputStream* param_0) {
int tag;
param_0->read(&tag, 32);
if (tag == 'SCRN' && (tag2 == 'blo1' || tag2 == 'blo2')) {
return true;
} else {
bool J2DScreen::setPriority(char const* resName, u32 param_1, JKRArchive* archive) {
if (archive == NULL) {
return false;
}
void* res = JKRFileLoader::getGlbResource(resName, archive);
if (res != NULL) {
u32 size = archive->getExpandedResSize(res);
JSUMemoryInputStream stream(res, size);
return setPriority(&stream, param_1, archive);
}
return false;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm bool J2DScreen::checkSignature(JSURandomInputStream* param_0) {
asm bool J2DScreen::setPriority(char const* param_0, u32 param_1, JKRArchive* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/checkSignature__9J2DScreenFP20JSURandomInputStream.s"
#include "asm/JSystem/J2DGraph/J2DScreen/setPriority__9J2DScreenFPCcUlP10JKRArchive.s"
}
#pragma pop
#endif
/* ############################################################################################## */
/* 80456230-80456238 004830 0008+00 1/1 0/0 0/0 .sdata2 @1705 */
SECTION_SDATA2 static f64 lit_1705 = 4503599627370496.0 /* cast u32 to float */;
/* 802F8748-802F8778 2F3088 0030+00 1/1 1/1 0/0 .text
* setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
bool J2DScreen::setPriority(JSURandomInputStream* stream, u32 param_1, JKRArchive* archive) {
if (archive == NULL) {
return false;
} else {
return private_set(stream, param_1, archive);
}
}
/* 802F8778-802F8834 2F30B8 00BC+00 1/1 0/0 0/0 .text
* private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
bool J2DScreen::private_set(JSURandomInputStream* stream, u32 param_1, JKRArchive* archive) {
if (!checkSignature(stream)) {
return false;
}
if (!getScreenInformation(stream)) {
return false;
}
bool make_end = makeHierarchyPanes(this, stream, param_1, archive) != 2;
if (!(param_1 & 0x1F0000)) {
clean();
}
if (make_end) {
return stream->isGood();
}
return false;
}
/* 802F8834-802F8894 2F3174 0060+00 1/1 0/0 0/0 .text
* checkSignature__9J2DScreenFP20JSURandomInputStream */
bool J2DScreen::checkSignature(JSURandomInputStream* stream) {
J2DScrnHeader header;
stream->read(&header, 32);
if (header.mTag != 'SCRN' || (header.mType != 'blo1' && header.mType != 'blo2')) {
return false;
} else {
return true;
}
}
/* 802F8894-802F8990 2F31D4 00FC+00 1/1 0/0 0/0 .text
* getScreenInformation__9J2DScreenFP20JSURandomInputStream */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::getScreenInformation(JSURandomInputStream* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/getScreenInformation__9J2DScreenFP20JSURandomInputStream.s"
bool J2DScreen::getScreenInformation(JSURandomInputStream* stream) {
J2DScrnInfoHeader info;
stream->read(&info, sizeof(J2DScrnInfoHeader));
if (info.mTag != 'INF1') {
return false;
}
f32 tmp_0 = FLOAT_LABEL(lit_1561);
JGeometry::TBox2<f32> dimensions(tmp_0, tmp_0, info.mWidth, info.mHeight);
place(dimensions);
JUtility::TColor color(info.mColor);
mColor = color;
if (info.mSize > 0x10) {
stream->skip(info.mSize - 0x10);
}
return true;
}
#pragma pop
/* 802F8990-802F8B98 2F32D0 0208+00 1/1 0/0 0/0 .text
* makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::makeHierarchyPanes(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2,
JKRArchive* param_3) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive.s"
// goto can probably be replaced
s32 J2DScreen::makeHierarchyPanes(J2DPane* basePane, JSURandomInputStream* stream, u32 param_2,
JKRArchive* archive) {
J2DScrnBlockHeader header;
J2DPane* next_pane = basePane;
do {
loop:
stream->peek(&header, sizeof(J2DScrnBlockHeader));
switch (header.mTag) {
case 'EXT1':
stream->seek(header.mSize, JSUStreamSeekFrom_CUR);
return 1;
case 'BGN1':
stream->seek(header.mSize, JSUStreamSeekFrom_CUR);
int ret = makeHierarchyPanes(next_pane, stream, param_2, archive);
if (ret == 0) {
goto loop;
}
return ret;
case 'END1':
stream->seek(header.mSize, JSUStreamSeekFrom_CUR);
return 0;
case 'TEX1':
J2DResReference* texRes = getResReference(stream, param_2);
mTexRes = texRes;
if (texRes != NULL) {
goto loop;
}
return 2;
case 'FNT1':
J2DResReference* fntRes = getResReference(stream, param_2);
mFontRes = fntRes;
if (fntRes != NULL) {
goto loop;
}
return 2;
case 'MAT1':
if (createMaterial(stream, param_2, archive)) {
goto loop;
}
return 2;
}
if (archive == NULL) {
next_pane = createPane(header, stream, basePane, param_2);
} else {
next_pane = createPane(header, stream, basePane, param_2, archive);
}
}
while (next_pane != NULL);
return 2;
}
#pragma pop
/* 802F8B98-802F8ED4 2F34D8 033C+00 1/0 0/0 0/0 .text
* createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUlP10JKRArchive */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::createPane(J2DScrnBlockHeader const& param_0, JSURandomInputStream* param_1,
J2DPane* param_2, u32 param_3, JKRArchive* param_4) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/func_802F8B98.s"
J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* stream,
J2DPane* basePane, u32 param_3, JKRArchive* archive) {
J2DPane* newPane;
switch (header.mTag) {
case 'PAN1':
newPane = new J2DPane(basePane, stream, 0);
break;
case 'WIN1':
newPane = new J2DWindow(basePane, stream, archive);
break;
case 'PIC1':
newPane = new J2DPicture(basePane, stream, archive);
break;
case 'TBX1':
newPane = new J2DTextBox(basePane, stream, archive);
break;
case 'PAN2':
newPane = new J2DPane(basePane, stream, 1);
break;
case 'WIN2':
if (param_3 & 0x1F0000) {
newPane = new J2DWindowEx(basePane, stream, param_3, mMaterials);
break;
}
newPane = new J2DWindow(basePane, stream, mMaterials);
break;
case 'PIC2':
if (param_3 & 0x1F0000) {
newPane = new J2DPictureEx(basePane, stream, param_3, mMaterials);
break;
}
newPane = new J2DPicture(basePane, stream, mMaterials);
break;
case 'TBX2':
if (param_3 & 0x1F0000) {
newPane = new J2DTextBoxEx(basePane, stream, param_3, mMaterials);
break;
}
newPane = new J2DTextBox(basePane, stream, param_3, mMaterials);
break;
default:
s32 position = stream->getPosition();
s32 size = header.mSize;
s32 start = size + position;
newPane = new J2DPane(basePane, stream, 0);
stream->seek(start, JSUStreamSeekFrom_SET);
break;
}
return newPane;
}
#pragma pop
/* ############################################################################################## */
/* 80456238-8045623C 004838 0004+00 1/1 0/0 0/0 .sdata2 @1829 */
@@ -404,6 +477,43 @@ SECTION_SDATA2 static f32 lit_1829 = -1.0f;
SECTION_SDATA2 static f32 lit_1830 = 1.0f;
/* 802F8ED4-802F90A0 2F3814 01CC+00 0/0 51/51 4/4 .text draw__9J2DScreenFffPC14J2DGrafContext */
// matches with literals
#ifdef NONMATCHING
void J2DScreen::draw(f32 param_0, f32 param_1, J2DGrafContext const* grafCtx) {
u32 x, y, width, height;
if (mScissor) {
GXGetScissor(&x, &y, &width, &height);
}
if (grafCtx != NULL) {
J2DPane::draw(param_0, param_1, grafCtx, mScissor, true);
} else {
J2DOrthoGraph ortho(0.0f, 0.0f, 640.0f, 480.0f, -1.0f, 1.0f);
ortho.setPort();
J2DPane::draw(param_0, param_1, &ortho, mScissor, true);
}
if (mScissor) {
GXSetScissor(x, y, width, height);
}
GXSetNumIndStages(0);
for (int i = 0; i < 0x10; i++) {
GXSetTevDirect((GXTevStageID)i);
}
GXSetNumTevStages(1);
GXSetTevOp(GX_TEVSTAGE0, GX_PASSCLR);
GXSetTevOrder(GX_TEVSTAGE0, GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR0A0);
GXSetVtxDesc(GX_VA_TEX0, GX_NONE);
GXSetCullMode(GX_CULL_NONE);
GXSetNumTexGens(0);
GXSetChanCtrl(GX_COLOR0A0, GX_DISABLE, GX_SRC_REG, GX_SRC_VTX, GX_LIGHT_NULL, GX_DF_NONE, GX_AF_NONE);
for (int i = 0; i < 4; i++) {
GXSetTevSwapModeTable((GXTevSwapSel)i, GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA);
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
@@ -412,68 +522,190 @@ asm void J2DScreen::draw(f32 param_0, f32 param_1, J2DGrafContext const* param_2
#include "asm/JSystem/J2DGraph/J2DScreen/draw__9J2DScreenFffPC14J2DGrafContext.s"
}
#pragma pop
#endif
/* 802F90A0-802F90E0 2F39E0 0040+00 1/0 0/0 0/0 .text search__9J2DScreenFUx */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J2DPane* J2DScreen::search(u64 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/search__9J2DScreenFUx.s"
J2DPane* J2DScreen::search(u64 tag) {
if (tag == 0) {
return NULL;
}
return J2DPane::search(tag);
}
#pragma pop
/* 802F90E0-802F9120 2F3A20 0040+00 1/0 0/0 0/0 .text searchUserInfo__9J2DScreenFUx */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm J2DPane* J2DScreen::searchUserInfo(u64 param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/searchUserInfo__9J2DScreenFUx.s"
J2DPane* J2DScreen::searchUserInfo(u64 tag) {
if (tag == 0) {
return NULL;
}
return J2DPane::searchUserInfo(tag);
}
#pragma pop
/* 802F9120-802F9280 2F3A60 0160+00 1/0 0/0 0/0 .text drawSelf__9J2DScreenFffPA3_A4_f */
// close. issues with color
#ifdef NONMATCHING
void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) {
JUtility::TColor color(mColor);
u8 alpha = (color.a * mAlpha) / 255;
if (alpha != 0) {
JUtility::TColor color2((u32)alpha);
color = color2;
GXSetBlendMode(GX_BM_BLEND, GX_BL_SRC_ALPHA, GX_BL_INV_SRC_ALPHA, GX_LO_SET);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
GXBegin(GX_QUADS, GX_VTXFMT0, 4);
GXPosition3f32(0.0f, 0.0f, 0.0f);
GXColor1u32(color);
GXPosition3f32(getWidth(), 0.0f, 0.0f);
GXColor1u32(color);
GXPosition3f32(getWidth(), getHeight(), 0.0f);
GXColor1u32(color);
GXPosition3f32(0.0f, getHeight(), 0.0f);
GXColor1u32(color);
GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
GXEnd();
}
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
asm void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/drawSelf__9J2DScreenFffPA3_A4_f.s"
}
#pragma pop
#endif
/* 802F9280-802F937C 2F3BC0 00FC+00 1/1 0/0 0/0 .text
* getResReference__9J2DScreenFP20JSURandomInputStreamUl */
// small regalloc
#ifdef NONMATCHING
J2DResReference* J2DScreen::getResReference(JSURandomInputStream* stream, u32 param_1) {
s32 position = stream->getPosition();
stream->skip(4);
s32 start, end;
start = stream->readS32();
stream->skip(4);
end = stream->readS32();
stream->seek(position + end, JSUStreamSeekFrom_SET);
s32 size = end - start;
char* buffer;
if (param_1 & 0x1F0000) {
buffer = new char[size];
} else {
buffer = new (-4) char[size];
}
if (buffer != NULL) {
stream->read(buffer, size);
}
return (J2DResReference*)buffer;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::getResReference(JSURandomInputStream* param_0, u32 param_1) {
asm J2DResReference* J2DScreen::getResReference(JSURandomInputStream* param_0, u32 param_1) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/getResReference__9J2DScreenFP20JSURandomInputStreamUl.s"
}
#pragma pop
#endif
/* 802F937C-802F9600 2F3CBC 0284+00 1/1 0/0 0/0 .text
* createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */
// nametab section has issues
#ifdef NONMATCHING
bool J2DScreen::createMaterial(JSURandomInputStream* stream, u32 param_1,
JKRArchive* archive) {
s32 position = stream->getPosition();
J2DScrnBlockHeader header;
stream->read(&header, 8);
mMaterialNum = stream->readU16();
stream->skip(2);
if (param_1 & 0x1F0000) {
mMaterials = new J2DMaterial[mMaterialNum];
} else {
mMaterials = new (-4) J2DMaterial[mMaterialNum];
}
u8* buffer = new (-4) u8[header.mSize];
if (mMaterials != NULL && buffer != NULL) {
stream->seek(position, JSUStreamSeekFrom_SET);
stream->read(buffer, header.mSize);
J2DMaterialFactory factory(*(J2DMaterialBlock*)buffer);
for (u16 i = 0; i < mMaterialNum; i++) {
factory.create(&mMaterials[i], i, param_1, mTexRes, mFontRes, archive);
}
if (param_1 & 0x1F0000) {
u32 offset = buffer[0x14] << 0x18 | buffer[0x15] << 0x10 | buffer[0x16] << 8 | buffer[0x17];
char* sec = (char*)buffer + offset;
u16* sec_s = (u16*)sec + *(u16*)sec;
u16 num = sec_s[1];
while (sec[num] != 0) {
num++;
}
num++;
ResNTAB* nametab = new ResNTAB[num];
if (nametab != NULL) {
for (u16 i = 0; i < num; i++) {
nametab->mEntries[i].mKeyCode = sec[i];
}
mNameTable = new JUTNameTab(nametab);
if (mNameTable == NULL) {
delete[] nametab;
} else {
delete[] buffer;
return true;
}
}
}
}
delete[] buffer;
clean();
return false;
}
#else
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::createMaterial(JSURandomInputStream* param_0, u32 param_1,
asm bool J2DScreen::createMaterial(JSURandomInputStream* param_0, u32 param_1,
JKRArchive* param_2) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive.s"
}
#pragma pop
#endif
/* 802F9600-802F9620 2F3F40 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResTIMG */
bool J2DScreen::isUsed(ResTIMG const* param_0) {
return J2DPane::isUsed(param_0);
bool J2DScreen::isUsed(ResTIMG const* img) {
return J2DPane::isUsed(img);
}
/* 802F9620-802F9640 2F3F60 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResFONT */
bool J2DScreen::isUsed(ResFONT const* param_0) {
return J2DPane::isUsed(param_0);
bool J2DScreen::isUsed(ResFONT const* font) {
return J2DPane::isUsed(font);
}
/* ############################################################################################## */
@@ -481,85 +713,105 @@ bool J2DScreen::isUsed(ResFONT const* param_0) {
J2DDataManage* J2DScreen::mDataManage;
/* 802F9640-802F9690 2F3F80 0050+00 0/0 6/6 0/0 .text getNameResource__9J2DScreenFPCc */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void* J2DScreen::getNameResource(char const* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/getNameResource__9J2DScreenFPCc.s"
void* J2DScreen::getNameResource(char const* resName) {
void* res = JKRFileLoader::getGlbResource(resName, NULL);
if (res == NULL && mDataManage != NULL) {
res = mDataManage->get(resName);
}
return res;
}
#pragma pop
/* 802F9690-802F9704 2F3FD0 0074+00 0/0 30/30 3/3 .text animation__9J2DScreenFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::animation() {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/animation__9J2DScreenFv.s"
void J2DScreen::animation() {
animationPane(mTransform);
for (u16 i = 0; i < mMaterialNum; i++) {
mMaterials[i].animation();
}
}
#pragma pop
/* 802F9704-802F9798 2F4044 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP11J2DAnmColor */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::setAnimation(J2DAnmColor* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP11J2DAnmColor.s"
void J2DScreen::setAnimation(J2DAnmColor* anmColor) {
anmColor->searchUpdateMaterialID(this);
u16 matNum = anmColor->getUpdateMaterialNum();
for (u16 i = 0; i < matNum; i++) {
u16 matID = anmColor->getUpdateMaterialID(i);
if (matID < mMaterialNum) {
mMaterials[matID].setAnimation(anmColor);
}
}
}
#pragma pop
/* 802F9798-802F9838 2F40D8 00A0+00 1/0 0/0 0/0 .text
* setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::setAnimation(J2DAnmTextureSRTKey* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey.s"
void J2DScreen::setAnimation(J2DAnmTextureSRTKey* anmSRTKey) {
anmSRTKey->searchUpdateMaterialID(this);
u16 matNum = anmSRTKey->getUpdateMaterialNum();
for (u16 i = 0; i < matNum; i++) {
u16 matID = anmSRTKey->getUpdateMaterialID(i);
if (matID < mMaterialNum) {
mMaterials[matID].setAnimation(anmSRTKey);
}
}
}
#pragma pop
/* 802F9838-802F98CC 2F4178 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP16J2DAnmTexPattern
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::setAnimation(J2DAnmTexPattern* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP16J2DAnmTexPattern.s"
void J2DScreen::setAnimation(J2DAnmTexPattern* anmPattern) {
anmPattern->searchUpdateMaterialID(this);
u16 matNum = anmPattern->getUpdateMaterialNum();
for (u16 i = 0; i < matNum; i++) {
u16 matID = anmPattern->getUpdateMaterialID(i);
if (matID < mMaterialNum) {
mMaterials[matID].setAnimation(anmPattern);
}
}
}
#pragma pop
/* 802F98CC-802F99A8 2F420C 00DC+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP15J2DAnmTevRegKey
*/
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void J2DScreen::setAnimation(J2DAnmTevRegKey* param_0) {
nofralloc
#include "asm/JSystem/J2DGraph/J2DScreen/setAnimation__9J2DScreenFP15J2DAnmTevRegKey.s"
void J2DScreen::setAnimation(J2DAnmTevRegKey* anmRegKey) {
anmRegKey->searchUpdateMaterialID(this);
u16 cMatNum = anmRegKey->getCRegUpdateMaterialNum();
for (u16 i = 0; i < cMatNum; i++) {
u16 matID = anmRegKey->getCRegUpdateMaterialID(i);
if (matID < mMaterialNum) {
mMaterials[matID].setAnimation(anmRegKey);
}
}
u16 kMatNum = anmRegKey->getKRegUpdateMaterialNum();
for (u16 i = 0; i < kMatNum; i++) {
u16 matID = anmRegKey->getKRegUpdateMaterialID(i);
if (matID < mMaterialNum) {
mMaterials[matID].setAnimation(anmRegKey);
}
}
}
#pragma pop
/* 802F99A8-802F99C8 2F42E8 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP14J2DAnmVtxColor
*/
void J2DScreen::setAnimation(J2DAnmVtxColor* param_0) {
J2DPane::setVtxColorAnimation(param_0);
void J2DScreen::setAnimation(J2DAnmVtxColor* anmVtxColor) {
J2DPane::setVtxColorAnimation(anmVtxColor);
}
/* 802F99C8-802F99E8 2F4308 0020+00 1/0 0/0 0/0 .text
* setAnimation__9J2DScreenFP20J2DAnmVisibilityFull */
void J2DScreen::setAnimation(J2DAnmVisibilityFull* param_0) {
J2DPane::setVisibileAnimation(param_0);
void J2DScreen::setAnimation(J2DAnmVisibilityFull* anmVisibility) {
J2DPane::setVisibileAnimation(anmVisibility);
}
/* 802F99E8-802F9A18 2F4328 0030+00 1/0 0/0 0/0 .text
* createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl */
void J2DScreen::createPane(J2DScrnBlockHeader const& param_0, JSURandomInputStream* param_1,
J2DPane* param_2, u32 param_3) {
createPane(param_0, param_1, param_2, param_3, NULL);
J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* stream,
J2DPane* basePane, u32 param_3) {
return createPane(header, stream, basePane, param_3, NULL);
}
/* 802F9A18-802F9A20 2F4358 0008+00 1/0 0/0 0/0 .text getTypeID__9J2DScreenCFv */
@@ -573,8 +825,8 @@ void J2DScreen::calcMtx() {
}
/* 802F9A54-802F9A74 2F4394 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP10J2DAnmBase */
void J2DScreen::setAnimation(J2DAnmBase* param_0) {
J2DPane::setAnimation(param_0);
void J2DScreen::setAnimation(J2DAnmBase* anm) {
J2DPane::setAnimation(anm);
}
/* 802F9A74-802F9A78 2F43B4 0004+00 1/0 0/0 0/0 .text