mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-06-17 14:06:42 -04:00
project cleanup (#2895)
* some wii OS fixes * remove old dol2asm comments * remove dol2asm.h * remove function address comments * normalize ATTRIBUTE_ALIGN usage * DECL_WEAK macro * fix gcc attribute weak macro * wrap more mwcc specific things in ifdefs * fixes * fix revo sdk version flags * fixes
This commit is contained in:
TakaRikka
@@ -1,8 +1,3 @@
|
||||
//
|
||||
// Generated By: dol2asm
|
||||
// Translation Unit: J2DMatBlock
|
||||
//
|
||||
|
||||
#include "JSystem/JSystem.h" // IWYU pragma: keep
|
||||
|
||||
#include "JSystem/J2DGraph/J2DMatBlock.h"
|
||||
@@ -12,7 +7,6 @@
|
||||
#include "JSystem/JUtility/JUTTexture.h"
|
||||
#include "dolphin/gx.h"
|
||||
|
||||
/* 802EB394-802EB424 2E5CD4 0090+00 0/0 1/1 0/0 .text initialize__13J2DColorBlockFv */
|
||||
// NONMATCHING - instruction order
|
||||
void J2DColorBlock::initialize() {
|
||||
for (int i = 0; i < 2; i++) {
|
||||
@@ -25,7 +19,6 @@ void J2DColorBlock::initialize() {
|
||||
mCullMode = GX_CULL_NONE;
|
||||
}
|
||||
|
||||
/* 802EB424-802EB510 2E5D64 00EC+00 0/0 1/1 0/0 .text setGX__13J2DColorBlockFv */
|
||||
void J2DColorBlock::setGX() {
|
||||
for (int i = 0; i < 2; i++) {
|
||||
GXSetChanMatColor(GXChannelID(GX_COLOR0A0 + i), mMatColor[i]);
|
||||
@@ -39,7 +32,6 @@ void J2DColorBlock::setGX() {
|
||||
GXSetCullMode((GXCullMode)mCullMode);
|
||||
}
|
||||
|
||||
/* 802EB510-802EB570 2E5E50 0060+00 0/0 1/1 0/0 .text initialize__14J2DTexGenBlockFv */
|
||||
void J2DTexGenBlock::initialize() {
|
||||
mTexGenNum = 0;
|
||||
for (int i = 0; i < 8; i++) {
|
||||
@@ -50,7 +42,6 @@ void J2DTexGenBlock::initialize() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EB570-802EB620 2E5EB0 00B0+00 0/0 1/1 0/0 .text setGX__14J2DTexGenBlockFv */
|
||||
void J2DTexGenBlock::setGX() {
|
||||
GXSetNumTexGens(mTexGenNum);
|
||||
for (int i = 0; i < mTexGenNum; i++) {
|
||||
@@ -64,14 +55,12 @@ void J2DTexGenBlock::setGX() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EB620-802EB6A4 2E5F60 0084+00 1/0 1/1 0/0 .text __dt__14J2DTexGenBlockFv */
|
||||
J2DTexGenBlock::~J2DTexGenBlock() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
delete mTexMtx[i];
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EB6A4-802EB7E0 2E5FE4 013C+00 0/0 3/3 0/0 .text setTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx */
|
||||
void J2DTexGenBlock::setTexMtx(u32 param_0, J2DTexMtx& param_1) {
|
||||
J3D_PANIC(103, param_0 < 8, "Error : range over.");
|
||||
|
||||
@@ -86,7 +75,6 @@ void J2DTexGenBlock::setTexMtx(u32 param_0, J2DTexMtx& param_1) {
|
||||
mTexMtx[param_0]->calc();
|
||||
}
|
||||
|
||||
/* 802EB7E0-802EB87C 2E6120 009C+00 0/0 1/1 0/0 .text getTexMtx__14J2DTexGenBlockFUlR9J2DTexMtx */
|
||||
void J2DTexGenBlock::getTexMtx(u32 param_0, J2DTexMtx& param_1) {
|
||||
J3D_PANIC(123, param_0 < 8, "Error : range over.");
|
||||
|
||||
@@ -96,24 +84,20 @@ void J2DTexGenBlock::getTexMtx(u32 param_0, J2DTexMtx& param_1) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EB87C-802EB884 2E61BC 0008+00 1/0 0/0 0/0 .text getTexture__11J2DTevBlockFUl */
|
||||
JUTTexture* J2DTevBlock::getTexture(u32) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 802EB884-802EB88C 2E61C4 0008+00 1/0 0/0 0/0 .text getPalette__11J2DTevBlockFUl */
|
||||
JUTPalette* J2DTevBlock::getPalette(u32) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* 802EB88C-802EB998 2E61CC 010C+00 0/0 1/1 0/0 .text __ct__12J2DTevBlock1Fv */
|
||||
J2DTevBlock1::J2DTevBlock1() {
|
||||
mTexture[0] = NULL;
|
||||
mUndeleteFlag = 0;
|
||||
initialize();
|
||||
}
|
||||
|
||||
/* 802EB998-802EBA50 2E62D8 00B8+00 1/0 0/0 0/0 .text __dt__12J2DTevBlock1Fv */
|
||||
J2DTevBlock1::~J2DTevBlock1() {
|
||||
if (mUndeleteFlag & 1) {
|
||||
delete mTexture[0];
|
||||
@@ -126,7 +110,6 @@ J2DTevBlock1::~J2DTevBlock1() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EBA50-802EBC0C 2E6390 01BC+00 1/0 0/0 0/0 .text initialize__12J2DTevBlock1Fv */
|
||||
void J2DTevBlock1::initialize() {
|
||||
mTexNo[0] = -1;
|
||||
mFontNo = -1;
|
||||
@@ -148,7 +131,6 @@ void J2DTevBlock1::initialize() {
|
||||
mFont = NULL;
|
||||
}
|
||||
|
||||
/* 802EBC0C-802EBCC0 2E654C 00B4+00 1/0 0/0 0/0 .text prepareTexture__12J2DTevBlock1FUc */
|
||||
bool J2DTevBlock1::prepareTexture(u8 param_0) {
|
||||
bool rv;
|
||||
if (param_0 == 0) {
|
||||
@@ -173,7 +155,6 @@ bool J2DTevBlock1::prepareTexture(u8 param_0) {
|
||||
return rv;
|
||||
}
|
||||
|
||||
/* 802EBCC0-802EBDE4 2E6600 0124+00 1/0 0/0 0/0 .text insertTexture__12J2DTevBlock1FUlPC7ResTIMGP10JUTPalette */
|
||||
bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
|
||||
if (param_0 != 0 || p_timg == NULL) {
|
||||
return false;
|
||||
@@ -205,7 +186,6 @@ bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EBDE4-802EBE8C 2E6724 00A8+00 1/0 0/0 0/0 .text insertTexture__12J2DTevBlock1FUlP10JUTTexture */
|
||||
bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (mTexture[0] != NULL && mTexture[0]->getTexInfo() != NULL) {
|
||||
return false;
|
||||
@@ -226,7 +206,6 @@ bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EBE8C-802EC01C 2E67CC 0190+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock1FUlPC7ResTIMG */
|
||||
bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
if (param_0 != 0) {
|
||||
return false;
|
||||
@@ -272,7 +251,6 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EC01C-802EC0A8 2E695C 008C+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock1FUlP10JUTTexture */
|
||||
bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (param_0 != 0) {
|
||||
return false;
|
||||
@@ -290,7 +268,6 @@ bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EC0A8-802EC124 2E69E8 007C+00 1/0 0/0 0/0 .text removeTexture__12J2DTevBlock1FUl */
|
||||
bool J2DTevBlock1::removeTexture(u32 param_0) {
|
||||
if (param_0 >= 1) {
|
||||
return false;
|
||||
@@ -307,7 +284,6 @@ bool J2DTevBlock1::removeTexture(u32 param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EC124-802EC1D8 2E6A64 00B4+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock1FP7ResFONT */
|
||||
bool J2DTevBlock1::setFont(ResFONT* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -327,7 +303,6 @@ bool J2DTevBlock1::setFont(ResFONT* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EC1D8-802EC258 2E6B18 0080+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock1FP7JUTFont */
|
||||
bool J2DTevBlock1::setFont(JUTFont* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -342,7 +317,6 @@ bool J2DTevBlock1::setFont(JUTFont* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EC258-802EC318 2E6B98 00C0+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock1FUlPC7ResTLUT */
|
||||
bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
if (param_0 != 0) {
|
||||
return false;
|
||||
@@ -370,12 +344,10 @@ bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EC318-802EC328 2E6C58 0010+00 1/0 0/0 0/0 .text shiftDeleteFlag__12J2DTevBlock1FUcb */
|
||||
void J2DTevBlock1::shiftDeleteFlag(u8, bool) {
|
||||
mUndeleteFlag &= 0x80;
|
||||
}
|
||||
|
||||
/* 802EC328-802EC570 2E6C68 0248+00 1/0 0/0 0/0 .text setGX__12J2DTevBlock1Fv */
|
||||
void J2DTevBlock1::setGX() {
|
||||
loadTexture(GX_TEXMAP0, 0);
|
||||
GXSetTevOrder(GX_TEVSTAGE0, (GXTexCoordID)mTevOrder[0].getTexCoord(), (GXTexMapID)mTevOrder[0].getTexMap(), (GXChannelID)mTevOrder[0].getColor());
|
||||
@@ -414,14 +386,12 @@ void J2DTevBlock1::setGX() {
|
||||
mIndTevStage->load(0);
|
||||
}
|
||||
|
||||
/* 802EC570-802EC5B8 2E6EB0 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock1F11_GXTexMapIDUl */
|
||||
void J2DTevBlock1::loadTexture(GXTexMapID texmapID, u32 texIndex) {
|
||||
if (texIndex == 0 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
|
||||
mTexture[texIndex]->load(texmapID);
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EC5B8-802EC6C8 2E6EF8 0110+00 0/0 1/1 0/0 .text __ct__12J2DTevBlock2Fv */
|
||||
J2DTevBlock2::J2DTevBlock2() {
|
||||
mTexture[0] = NULL;
|
||||
mTexture[1] = NULL;
|
||||
@@ -429,7 +399,6 @@ J2DTevBlock2::J2DTevBlock2() {
|
||||
initialize();
|
||||
}
|
||||
|
||||
/* 802EC6C8-802EC7A0 2E7008 00D8+00 1/0 0/0 0/0 .text __dt__12J2DTevBlock2Fv */
|
||||
J2DTevBlock2::~J2DTevBlock2() {
|
||||
if (mUndeleteFlag & 1) {
|
||||
delete mTexture[0];
|
||||
@@ -447,7 +416,6 @@ J2DTevBlock2::~J2DTevBlock2() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EC7A0-802ECA18 2E70E0 0278+00 1/0 0/0 0/0 .text initialize__12J2DTevBlock2Fv */
|
||||
void J2DTevBlock2::initialize() {
|
||||
mTexNo[0] = 0xffff;
|
||||
mTexNo[1] = 0xffff;
|
||||
@@ -477,8 +445,6 @@ void J2DTevBlock2::initialize() {
|
||||
mFont = NULL;
|
||||
}
|
||||
|
||||
/* 802ECA18-802ECAE8 2E7358 00D0+00 1/0 0/0 0/0 .text prepareTexture__12J2DTevBlock2FUc
|
||||
*/
|
||||
bool J2DTevBlock2::prepareTexture(u8 param_0) {
|
||||
for (u8 i = 0; i < param_0; i++) {
|
||||
if (i >= 2) {
|
||||
@@ -498,7 +464,6 @@ bool J2DTevBlock2::prepareTexture(u8 param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802ECAE8-802ECDE8 2E7428 0300+00 1/0 0/0 0/0 .text insertTexture__12J2DTevBlock2FUlPC7ResTIMGP10JUTPalette */
|
||||
bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
|
||||
if (param_0 >= 2 || p_timg == NULL) {
|
||||
return false;
|
||||
@@ -586,7 +551,6 @@ bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802ECDE8-802ECF48 2E7728 0160+00 1/0 0/0 0/0 .text insertTexture__12J2DTevBlock2FUlP10JUTTexture */
|
||||
bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (param_0 >= 2 || p_tex == NULL) {
|
||||
return false;
|
||||
@@ -629,7 +593,6 @@ bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802ECF48-802ED16C 2E7888 0224+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock2FUlPC7ResTIMG */
|
||||
bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
if (param_0 >= 2) {
|
||||
return false;
|
||||
@@ -691,7 +654,6 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802ED16C-802ED21C 2E7AAC 00B0+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock2FUlP10JUTTexture */
|
||||
bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (param_0 >= 2) {
|
||||
return false;
|
||||
@@ -709,7 +671,6 @@ bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802ED21C-802ED2F0 2E7B5C 00D4+00 1/0 0/0 0/0 .text removeTexture__12J2DTevBlock2FUl */
|
||||
bool J2DTevBlock2::removeTexture(u32 param_0) {
|
||||
if (param_0 >= 2) {
|
||||
return false;
|
||||
@@ -733,7 +694,6 @@ bool J2DTevBlock2::removeTexture(u32 param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802ED2F0-802ED3A4 2E7C30 00B4+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock2FP7ResFONT */
|
||||
bool J2DTevBlock2::setFont(ResFONT* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -753,7 +713,6 @@ bool J2DTevBlock2::setFont(ResFONT* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802ED3A4-802ED424 2E7CE4 0080+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock2FP7JUTFont */
|
||||
bool J2DTevBlock2::setFont(JUTFont* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -768,7 +727,6 @@ bool J2DTevBlock2::setFont(JUTFont* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802ED424-802ED4FC 2E7D64 00D8+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock2FUlPC7ResTLUT */
|
||||
bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
if (param_0 >= 2) {
|
||||
return false;
|
||||
@@ -796,7 +754,6 @@ bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802ED4FC-802ED584 2E7E3C 0088+00 1/0 0/0 0/0 .text shiftDeleteFlag__12J2DTevBlock2FUcb */
|
||||
void J2DTevBlock2::shiftDeleteFlag(u8 param_0, bool param_1) {
|
||||
u8 tmpFlags = mUndeleteFlag & 0x80;
|
||||
mUndeleteFlag = mUndeleteFlag & 0x7F;
|
||||
@@ -810,7 +767,6 @@ void J2DTevBlock2::shiftDeleteFlag(u8 param_0, bool param_1) {
|
||||
mUndeleteFlag = (mUndeleteFlag | tmpFlags) & 0xFF;
|
||||
}
|
||||
|
||||
/* 802ED584-802ED874 2E7EC4 02F0+00 1/0 0/0 0/0 .text setGX__12J2DTevBlock2Fv */
|
||||
void J2DTevBlock2::setGX() {
|
||||
for (int i = 0; i < 2; i++) {
|
||||
loadTexture(GXTexMapID(i), i);
|
||||
@@ -864,14 +820,12 @@ void J2DTevBlock2::setGX() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802ED874-802ED8BC 2E81B4 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock2F11_GXTexMapIDUl */
|
||||
void J2DTevBlock2::loadTexture(GXTexMapID texmapID, u32 texIndex) {
|
||||
if (texIndex < 2 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
|
||||
mTexture[texIndex]->load(texmapID);
|
||||
}
|
||||
}
|
||||
|
||||
/* 802ED8BC-802ED9E4 2E81FC 0128+00 0/0 1/1 0/0 .text __ct__12J2DTevBlock4Fv */
|
||||
J2DTevBlock4::J2DTevBlock4() {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
mTexture[i] = NULL;
|
||||
@@ -881,7 +835,6 @@ J2DTevBlock4::J2DTevBlock4() {
|
||||
initialize();
|
||||
}
|
||||
|
||||
/* 802ED9E4-802EDAC4 2E8324 00E0+00 1/0 0/0 0/0 .text __dt__12J2DTevBlock4Fv */
|
||||
J2DTevBlock4::~J2DTevBlock4() {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
if (mUndeleteFlag & (1 << i)) {
|
||||
@@ -895,7 +848,6 @@ J2DTevBlock4::~J2DTevBlock4() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EDAC4-802EDD34 2E8404 0270+00 1/0 0/0 0/0 .text initialize__12J2DTevBlock4Fv */
|
||||
// NONMATCHING - inlines
|
||||
void J2DTevBlock4::initialize() {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
@@ -931,8 +883,6 @@ void J2DTevBlock4::initialize() {
|
||||
mFont = NULL;
|
||||
}
|
||||
|
||||
/* 802EDD34-802EDE04 2E8674 00D0+00 1/0 0/0 0/0 .text prepareTexture__12J2DTevBlock4FUc
|
||||
*/
|
||||
bool J2DTevBlock4::prepareTexture(u8 param_0) {
|
||||
for (u8 i = 0; i < param_0; i++) {
|
||||
if (i >= 4) {
|
||||
@@ -952,8 +902,6 @@ bool J2DTevBlock4::prepareTexture(u8 param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EDE04-802EE1D4 2E8744 03D0+00 1/0 0/0 0/0 .text
|
||||
* insertTexture__12J2DTevBlock4FUlPC7ResTIMGP10JUTPalette */
|
||||
bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
|
||||
if (param_0 >= 4 || !p_timg) {
|
||||
return false;
|
||||
@@ -1044,8 +992,6 @@ bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EE1D4-802EE364 2E8B14 0190+00 1/0 0/0 0/0 .text
|
||||
* insertTexture__12J2DTevBlock4FUlP10JUTTexture */
|
||||
bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (param_0 >= 4 || p_tex == NULL) {
|
||||
return false;
|
||||
@@ -1088,7 +1034,6 @@ bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EE364-802EE5F0 2E8CA4 028C+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock4FUlPC7ResTIMG */
|
||||
bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
if (param_0 >= 4) {
|
||||
return false;
|
||||
@@ -1160,8 +1105,6 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EE5F0-802EE6A0 2E8F30 00B0+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock4FUlP10JUTTexture
|
||||
*/
|
||||
bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (param_0 >= 4) {
|
||||
return false;
|
||||
@@ -1179,7 +1122,6 @@ bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EE6A0-802EE798 2E8FE0 00F8+00 1/0 0/0 0/0 .text removeTexture__12J2DTevBlock4FUl */
|
||||
bool J2DTevBlock4::removeTexture(u32 param_0) {
|
||||
if (param_0 >= 4) {
|
||||
return false;
|
||||
@@ -1203,8 +1145,6 @@ bool J2DTevBlock4::removeTexture(u32 param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EE798-802EE84C 2E90D8 00B4+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock4FP7ResFONT
|
||||
*/
|
||||
bool J2DTevBlock4::setFont(ResFONT* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -1224,8 +1164,6 @@ bool J2DTevBlock4::setFont(ResFONT* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EE84C-802EE8CC 2E918C 0080+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock4FP7JUTFont
|
||||
*/
|
||||
bool J2DTevBlock4::setFont(JUTFont* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -1240,7 +1178,6 @@ bool J2DTevBlock4::setFont(JUTFont* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EE8CC-802EE9A4 2E920C 00D8+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock4FUlPC7ResTLUT */
|
||||
bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
if (param_0 >= 4) {
|
||||
return false;
|
||||
@@ -1268,8 +1205,6 @@ bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EE9A4-802EEA2C 2E92E4 0088+00 1/0 0/0 0/0 .text shiftDeleteFlag__12J2DTevBlock4FUcb
|
||||
*/
|
||||
void J2DTevBlock4::shiftDeleteFlag(u8 param_0, bool param_1) {
|
||||
u8 tmpFlags = mUndeleteFlag & 0x80;
|
||||
mUndeleteFlag = mUndeleteFlag & 0x7F;
|
||||
@@ -1283,7 +1218,6 @@ void J2DTevBlock4::shiftDeleteFlag(u8 param_0, bool param_1) {
|
||||
mUndeleteFlag |= tmpFlags;
|
||||
}
|
||||
|
||||
/* 802EEA2C-802EED1C 2E936C 02F0+00 1/0 0/0 0/0 .text setGX__12J2DTevBlock4Fv */
|
||||
void J2DTevBlock4::setGX() {
|
||||
for (int i = 0; i < 4; i++) {
|
||||
loadTexture(GXTexMapID(i), i);
|
||||
@@ -1330,15 +1264,12 @@ void J2DTevBlock4::setGX() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EED1C-802EED64 2E965C 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock4F11_GXTexMapIDUl
|
||||
*/
|
||||
void J2DTevBlock4::loadTexture(GXTexMapID texmapID, u32 texIndex) {
|
||||
if (texIndex < 4 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
|
||||
mTexture[texIndex]->load(texmapID);
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EED64-802EEE8C 2E96A4 0128+00 0/0 1/1 0/0 .text __ct__12J2DTevBlock8Fv */
|
||||
J2DTevBlock8::J2DTevBlock8() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
mTexture[i] = NULL;
|
||||
@@ -1348,7 +1279,6 @@ J2DTevBlock8::J2DTevBlock8() {
|
||||
initialize();
|
||||
}
|
||||
|
||||
/* 802EEE8C-802EEF6C 2E97CC 00E0+00 1/0 0/0 0/0 .text __dt__12J2DTevBlock8Fv */
|
||||
J2DTevBlock8::~J2DTevBlock8() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
if (mUndeleteFlag & (1 << i)) {
|
||||
@@ -1362,7 +1292,6 @@ J2DTevBlock8::~J2DTevBlock8() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EEF6C-802EF1E0 2E98AC 0274+00 1/0 0/0 0/0 .text initialize__12J2DTevBlock8Fv */
|
||||
// NONMATCHING - inlines
|
||||
void J2DTevBlock8::initialize() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
@@ -1399,8 +1328,6 @@ void J2DTevBlock8::initialize() {
|
||||
mFontUndeleteFlag = 0;
|
||||
}
|
||||
|
||||
/* 802EF1E0-802EF2B0 2E9B20 00D0+00 1/0 0/0 0/0 .text prepareTexture__12J2DTevBlock8FUc
|
||||
*/
|
||||
bool J2DTevBlock8::prepareTexture(u8 param_0) {
|
||||
for (u8 i = 0; i < param_0; i++) {
|
||||
if (i >= 8) {
|
||||
@@ -1420,8 +1347,6 @@ bool J2DTevBlock8::prepareTexture(u8 param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EF2B0-802EF67C 2E9BF0 03CC+00 1/0 0/0 0/0 .text
|
||||
* insertTexture__12J2DTevBlock8FUlPC7ResTIMGP10JUTPalette */
|
||||
bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
|
||||
if (param_0 >= 8 || !p_timg) {
|
||||
return false;
|
||||
@@ -1512,8 +1437,6 @@ bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette*
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EF67C-802EF80C 2E9FBC 0190+00 1/0 0/0 0/0 .text
|
||||
* insertTexture__12J2DTevBlock8FUlP10JUTTexture */
|
||||
bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (param_0 >= 8 || p_tex == NULL) {
|
||||
return false;
|
||||
@@ -1556,7 +1479,6 @@ bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EF80C-802EFA98 2EA14C 028C+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock8FUlPC7ResTIMG */
|
||||
bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
if (param_0 >= 8) {
|
||||
return false;
|
||||
@@ -1628,8 +1550,6 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EFA98-802EFB48 2EA3D8 00B0+00 1/0 0/0 0/0 .text setTexture__12J2DTevBlock8FUlP10JUTTexture
|
||||
*/
|
||||
bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (param_0 >= 8) {
|
||||
return false;
|
||||
@@ -1647,7 +1567,6 @@ bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EFB48-802EFC40 2EA488 00F8+00 1/0 0/0 0/0 .text removeTexture__12J2DTevBlock8FUl */
|
||||
bool J2DTevBlock8::removeTexture(u32 param_0) {
|
||||
if (param_0 >= 8) {
|
||||
return false;
|
||||
@@ -1671,8 +1590,6 @@ bool J2DTevBlock8::removeTexture(u32 param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EFC40-802EFCEC 2EA580 00AC+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock8FP7ResFONT
|
||||
*/
|
||||
bool J2DTevBlock8::setFont(ResFONT* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -1692,8 +1609,6 @@ bool J2DTevBlock8::setFont(ResFONT* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EFCEC-802EFD68 2EA62C 007C+00 1/0 0/0 0/0 .text setFont__12J2DTevBlock8FP7JUTFont
|
||||
*/
|
||||
bool J2DTevBlock8::setFont(JUTFont* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -1708,7 +1623,6 @@ bool J2DTevBlock8::setFont(JUTFont* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EFD68-802EFE40 2EA6A8 00D8+00 1/0 0/0 0/0 .text setPalette__12J2DTevBlock8FUlPC7ResTLUT */
|
||||
bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
if (param_0 >= 8) {
|
||||
return false;
|
||||
@@ -1736,8 +1650,6 @@ bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802EFE40-802EFEAC 2EA780 006C+00 1/0 0/0 0/0 .text shiftDeleteFlag__12J2DTevBlock8FUcb
|
||||
*/
|
||||
void J2DTevBlock8::shiftDeleteFlag(u8 param_0, bool param_1) {
|
||||
if (param_1) {
|
||||
mUndeleteFlag = (mUndeleteFlag & ((1 << param_0) - 1)) | ((mUndeleteFlag & ~((1 << param_0) - 1)) * 2);
|
||||
@@ -1746,7 +1658,6 @@ void J2DTevBlock8::shiftDeleteFlag(u8 param_0, bool param_1) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802EFEAC-802F019C 2EA7EC 02F0+00 1/0 0/0 0/0 .text setGX__12J2DTevBlock8Fv */
|
||||
void J2DTevBlock8::setGX() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
loadTexture(GXTexMapID(i), i);
|
||||
@@ -1793,15 +1704,12 @@ void J2DTevBlock8::setGX() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802F019C-802F01E4 2EAADC 0048+00 1/0 0/0 0/0 .text loadTexture__12J2DTevBlock8F11_GXTexMapIDUl
|
||||
*/
|
||||
void J2DTevBlock8::loadTexture(GXTexMapID texmapID, u32 texIndex) {
|
||||
if (texIndex < 8 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
|
||||
mTexture[texIndex]->load(texmapID);
|
||||
}
|
||||
}
|
||||
|
||||
/* 802F01E4-802F030C 2EAB24 0128+00 0/0 1/1 0/0 .text __ct__13J2DTevBlock16Fv */
|
||||
J2DTevBlock16::J2DTevBlock16() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
mTexture[i] = NULL;
|
||||
@@ -1811,7 +1719,6 @@ J2DTevBlock16::J2DTevBlock16() {
|
||||
initialize();
|
||||
}
|
||||
|
||||
/* 802F030C-802F03EC 2EAC4C 00E0+00 1/0 0/0 0/0 .text __dt__13J2DTevBlock16Fv */
|
||||
J2DTevBlock16::~J2DTevBlock16() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
if (mUndeleteFlag & (1 << i)) {
|
||||
@@ -1825,7 +1732,6 @@ J2DTevBlock16::~J2DTevBlock16() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802F03EC-802F0660 2EAD2C 0274+00 1/0 0/0 0/0 .text initialize__13J2DTevBlock16Fv */
|
||||
// NONMATCHING - inlines
|
||||
void J2DTevBlock16::initialize() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
@@ -1862,8 +1768,6 @@ void J2DTevBlock16::initialize() {
|
||||
mFontUndeleteFlag = 0;
|
||||
}
|
||||
|
||||
/* 802F0660-802F0730 2EAFA0 00D0+00 1/0 0/0 0/0 .text prepareTexture__13J2DTevBlock16FUc
|
||||
*/
|
||||
bool J2DTevBlock16::prepareTexture(u8 param_0) {
|
||||
for (u8 i = 0; i < param_0; i++) {
|
||||
if (i >= 8) {
|
||||
@@ -1883,8 +1787,6 @@ bool J2DTevBlock16::prepareTexture(u8 param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802F0730-802F0AFC 2EB070 03CC+00 1/0 0/0 0/0 .text
|
||||
* insertTexture__13J2DTevBlock16FUlPC7ResTIMGP10JUTPalette */
|
||||
bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* p_tlut) {
|
||||
if (param_0 >= 8 || !p_timg) {
|
||||
return false;
|
||||
@@ -1975,8 +1877,6 @@ bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802F0AFC-802F0C8C 2EB43C 0190+00 1/0 0/0 0/0 .text
|
||||
* insertTexture__13J2DTevBlock16FUlP10JUTTexture */
|
||||
bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (param_0 >= 8 || p_tex == NULL) {
|
||||
return false;
|
||||
@@ -2019,7 +1919,6 @@ bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802F0C8C-802F0F18 2EB5CC 028C+00 1/0 0/0 0/0 .text setTexture__13J2DTevBlock16FUlPC7ResTIMG */
|
||||
bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
if (param_0 >= 8) {
|
||||
return false;
|
||||
@@ -2091,8 +1990,6 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802F0F18-802F0FC8 2EB858 00B0+00 1/0 0/0 0/0 .text setTexture__13J2DTevBlock16FUlP10JUTTexture
|
||||
*/
|
||||
bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
if (param_0 >= 8) {
|
||||
return false;
|
||||
@@ -2110,8 +2007,6 @@ bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* p_tex) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802F0FC8-802F10C0 2EB908 00F8+00 1/0 0/0 0/0 .text removeTexture__13J2DTevBlock16FUl
|
||||
*/
|
||||
bool J2DTevBlock16::removeTexture(u32 param_0) {
|
||||
if (param_0 >= 8) {
|
||||
return false;
|
||||
@@ -2135,8 +2030,6 @@ bool J2DTevBlock16::removeTexture(u32 param_0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802F10C0-802F116C 2EBA00 00AC+00 1/0 0/0 0/0 .text setFont__13J2DTevBlock16FP7ResFONT
|
||||
*/
|
||||
bool J2DTevBlock16::setFont(ResFONT* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -2156,8 +2049,6 @@ bool J2DTevBlock16::setFont(ResFONT* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802F116C-802F11E8 2EBAAC 007C+00 1/0 0/0 0/0 .text setFont__13J2DTevBlock16FP7JUTFont
|
||||
*/
|
||||
bool J2DTevBlock16::setFont(JUTFont* p_font) {
|
||||
if (p_font == NULL) {
|
||||
return false;
|
||||
@@ -2172,7 +2063,6 @@ bool J2DTevBlock16::setFont(JUTFont* p_font) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802F11E8-802F12C0 2EBB28 00D8+00 1/0 0/0 0/0 .text setPalette__13J2DTevBlock16FUlPC7ResTLUT */
|
||||
bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
if (param_0 >= 8) {
|
||||
return false;
|
||||
@@ -2200,7 +2090,6 @@ bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* p_tlut) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 802F12C0-802F132C 2EBC00 006C+00 1/0 0/0 0/0 .text shiftDeleteFlag__13J2DTevBlock16FUcb */
|
||||
void J2DTevBlock16::shiftDeleteFlag(u8 param_0, bool param_1) {
|
||||
if (param_1) {
|
||||
mUndeleteFlag = (mUndeleteFlag & ((1 << param_0) - 1)) | ((mUndeleteFlag & ~((1 << param_0) - 1)) * 2);
|
||||
@@ -2209,7 +2098,6 @@ void J2DTevBlock16::shiftDeleteFlag(u8 param_0, bool param_1) {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802F132C-802F161C 2EBC6C 02F0+00 1/0 0/0 0/0 .text setGX__13J2DTevBlock16Fv */
|
||||
void J2DTevBlock16::setGX() {
|
||||
for (int i = 0; i < 8; i++) {
|
||||
loadTexture(GXTexMapID(i), i);
|
||||
@@ -2256,15 +2144,12 @@ void J2DTevBlock16::setGX() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802F161C-802F1664 2EBF5C 0048+00 1/0 0/0 0/0 .text loadTexture__13J2DTevBlock16F11_GXTexMapIDUl
|
||||
*/
|
||||
void J2DTevBlock16::loadTexture(GXTexMapID texmapID, u32 texIndex) {
|
||||
if (texIndex < 8 && mTexture[texIndex] != NULL && mTexture[texIndex]->getTexInfo() != NULL) {
|
||||
mTexture[texIndex]->load(texmapID);
|
||||
}
|
||||
}
|
||||
|
||||
/* 802F1664-802F1730 2EBFA4 00CC+00 1/0 0/0 0/0 .text initialize__15J2DIndBlockFullFv */
|
||||
void J2DIndBlockFull::initialize() {
|
||||
mIndTexStageNum = 0;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
@@ -2278,7 +2163,6 @@ void J2DIndBlockFull::initialize() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802F1730-802F17FC 2EC070 00CC+00 1/0 0/0 0/0 .text setGX__15J2DIndBlockFullFv */
|
||||
void J2DIndBlockFull::setGX() {
|
||||
GXSetNumIndStages(mIndTexStageNum);
|
||||
for (u8 i = 0; i < mIndTexStageNum; i++) {
|
||||
@@ -2292,28 +2176,23 @@ void J2DIndBlockFull::setGX() {
|
||||
}
|
||||
}
|
||||
|
||||
/* 802F17FC-802F1840 2EC13C 0044+00 0/0 1/1 0/0 .text initialize__10J2DPEBlockFv */
|
||||
void J2DPEBlock::initialize() {
|
||||
mAlphaComp = J2DAlphaComp();
|
||||
mBlend.setBlendInfo(j2dDefaultBlendInfo);
|
||||
mDither = j2dDefaultPEBlockDither;
|
||||
}
|
||||
|
||||
/* 802F1840-802F18A0 2EC180 0060+00 0/0 1/1 0/0 .text setGX__10J2DPEBlockFv */
|
||||
void J2DPEBlock::setGX() {
|
||||
GXSetAlphaCompare(GXCompare(mAlphaComp.getComp0()), mAlphaComp.getRef0(), GXAlphaOp(mAlphaComp.getOp()), GXCompare(mAlphaComp.getComp1()), mAlphaComp.getRef1());
|
||||
GXSetBlendMode(GXBlendMode(mBlend.getType()), GXBlendFactor(mBlend.getSrcFactor()), GXBlendFactor(mBlend.getDstFactor()), GXLogicOp(mBlend.getOp()));
|
||||
GXSetDither(mDither);
|
||||
}
|
||||
|
||||
/* 802F1940-802F19A8 2EC280 0068+00 5/5 1/1 0/0 .text __ct__11J2DTevStageFv */
|
||||
J2DTevStage::J2DTevStage() {
|
||||
setTevStageInfo(j2dDefaultTevStageInfo);
|
||||
setTevSwapModeInfo(j2dDefaultTevSwapMode);
|
||||
}
|
||||
|
||||
/* 802F19A8-802F1B70 2EC2E8 01C8+00 1/1 1/1 0/0 .text
|
||||
* setTevStageInfo__11J2DTevStageFRC15J2DTevStageInfo */
|
||||
void J2DTevStage::setTevStageInfo(J2DTevStageInfo const& info) {
|
||||
setColorABCD(info.mColorA, info.mColorB, info.mColorC, info.mColorD);
|
||||
setTevColorOp(info.mCOp, info.mCBias, info.mCScale, info.mCClamp, info.mCReg);
|
||||
|
||||
Reference in New Issue
Block a user