diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2025-11-30 14:23:42 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-30 15:23:42 -0700 |
| commit | a6e76c0841cae03cae0c0e6ac75c32f979043093 (patch) | |
| tree | 76b5f590c59c6abdf2c80d0a3d5c0ccb31ebd0fe /src/JSystem/J2DGraph/J2DScreen.cpp | |
| parent | 434415337d268e405b09f6b72935a7e918e4cfe7 (diff) | |
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
Diffstat (limited to 'src/JSystem/J2DGraph/J2DScreen.cpp')
| -rw-r--r-- | src/JSystem/J2DGraph/J2DScreen.cpp | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/src/JSystem/J2DGraph/J2DScreen.cpp b/src/JSystem/J2DGraph/J2DScreen.cpp index 85db8fa815..93989d1938 100644 --- a/src/JSystem/J2DGraph/J2DScreen.cpp +++ b/src/JSystem/J2DGraph/J2DScreen.cpp @@ -1,8 +1,3 @@ -// -// Generated By: dol2asm -// Translation Unit: J2DScreen -// - #include "JSystem/JSystem.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DScreen.h" @@ -16,7 +11,6 @@ #include "JSystem/JSupport/JSUMemoryStream.h" #include "dolphin/types.h" -/* 802F8498-802F8540 2F2DD8 00A8+00 0/0 59/59 4/4 .text __ct__9J2DScreenFv */ J2DScreen::J2DScreen() : J2DPane(NULL, true, 'root', JGeometry::TBox2<f32>(JGeometry::TVec2<f32>(0, 0), JGeometry::TVec2<f32>(640, 480))), mColor() { field_0x4 = -1; @@ -28,12 +22,10 @@ J2DScreen::J2DScreen() mNameTable = NULL; } -/* 802F8540-802F85A8 2F2E80 0068+00 1/0 0/0 0/0 .text __dt__9J2DScreenFv */ J2DScreen::~J2DScreen() { clean(); } -/* 802F85A8-802F8648 2F2EE8 00A0+00 3/3 0/0 0/0 .text clean__9J2DScreenFv */ void J2DScreen::clean() { delete[] mMaterials; mMaterialNum = 0; @@ -52,8 +44,6 @@ void J2DScreen::clean() { } } -/* 802F8648-802F8748 2F2F88 0100+00 0/0 58/58 4/4 .text setPriority__9J2DScreenFPCcUlP10JKRArchive - */ bool J2DScreen::setPriority(char const* resName, u32 param_1, JKRArchive* p_archive) { if (p_archive == NULL) { return false; @@ -68,8 +58,6 @@ bool J2DScreen::setPriority(char const* resName, u32 param_1, JKRArchive* p_arch return false; } -/* 802F8748-802F8778 2F3088 0030+00 1/1 1/1 0/0 .text - * setPriority__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ bool J2DScreen::setPriority(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) { if (p_archive == NULL) { return false; @@ -78,8 +66,6 @@ bool J2DScreen::setPriority(JSURandomInputStream* p_stream, u32 param_1, JKRArch } } -/* 802F8778-802F8834 2F30B8 00BC+00 1/1 0/0 0/0 .text - * private_set__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ bool J2DScreen::private_set(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) { if (!checkSignature(p_stream)) { return false; @@ -98,8 +84,6 @@ bool J2DScreen::private_set(JSURandomInputStream* p_stream, u32 param_1, JKRArch return make_end ? p_stream->isGood() : false; } -/* 802F8834-802F8894 2F3174 0060+00 1/1 0/0 0/0 .text - * checkSignature__9J2DScreenFP20JSURandomInputStream */ bool J2DScreen::checkSignature(JSURandomInputStream* p_stream) { J2DScrnHeader header; p_stream->read(&header, sizeof(J2DScrnHeader)); @@ -112,8 +96,6 @@ bool J2DScreen::checkSignature(JSURandomInputStream* p_stream) { } } -/* 802F8894-802F8990 2F31D4 00FC+00 1/1 0/0 0/0 .text - * getScreenInformation__9J2DScreenFP20JSURandomInputStream */ bool J2DScreen::getScreenInformation(JSURandomInputStream* p_stream) { J2DScrnInfoHeader info; p_stream->read(&info, sizeof(J2DScrnInfoHeader)); @@ -134,8 +116,6 @@ bool J2DScreen::getScreenInformation(JSURandomInputStream* p_stream) { return true; } -/* 802F8990-802F8B98 2F32D0 0208+00 1/1 0/0 0/0 .text - * makeHierarchyPanes__9J2DScreenFP7J2DPaneP20JSURandomInputStreamUlP10JKRArchive */ s32 J2DScreen::makeHierarchyPanes(J2DPane* p_basePane, JSURandomInputStream* p_stream, u32 param_2, JKRArchive* p_archive) { J2DPane* next_pane = p_basePane; @@ -190,8 +170,6 @@ s32 J2DScreen::makeHierarchyPanes(J2DPane* p_basePane, JSURandomInputStream* p_s } } -/* 802F8B98-802F8ED4 2F34D8 033C+00 1/0 0/0 0/0 .text - * createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUlP10JKRArchive */ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* p_stream, J2DPane* p_basePane, u32 param_3, JKRArchive* p_archive) { J2DPane* newPane; @@ -246,7 +224,6 @@ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputS return newPane; } -/* 802F8ED4-802F90A0 2F3814 01CC+00 0/0 51/51 4/4 .text draw__9J2DScreenFffPC14J2DGrafContext */ void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) { u32 l_x, l_y, width, height; @@ -283,7 +260,6 @@ void J2DScreen::draw(f32 x, f32 y, J2DGrafContext const* grafCtx) { } } -/* 802F90A0-802F90E0 2F39E0 0040+00 1/0 0/0 0/0 .text search__9J2DScreenFUx */ J2DPane* J2DScreen::search(u64 tag) { if (tag == 0) { return NULL; @@ -292,7 +268,6 @@ J2DPane* J2DScreen::search(u64 tag) { return J2DPane::search(tag); } -/* 802F90E0-802F9120 2F3A20 0040+00 1/0 0/0 0/0 .text searchUserInfo__9J2DScreenFUx */ J2DPane* J2DScreen::searchUserInfo(u64 tag) { if (tag == 0) { return NULL; @@ -301,7 +276,6 @@ J2DPane* J2DScreen::searchUserInfo(u64 tag) { return J2DPane::searchUserInfo(tag); } -/* 802F9120-802F9280 2F3A60 0160+00 1/0 0/0 0/0 .text drawSelf__9J2DScreenFffPA3_A4_f */ void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { JUtility::TColor color(mColor); u8 alpha = (color.a * mAlpha) / 255; @@ -331,8 +305,6 @@ void J2DScreen::drawSelf(f32 param_0, f32 param_1, Mtx* param_2) { } } -/* 802F9280-802F937C 2F3BC0 00FC+00 1/1 0/0 0/0 .text - * getResReference__9J2DScreenFP20JSURandomInputStreamUl */ J2DResReference* J2DScreen::getResReference(JSURandomInputStream* p_stream, u32 param_1) { s32 position = p_stream->getPosition(); p_stream->skip(4); @@ -359,8 +331,6 @@ J2DResReference* J2DScreen::getResReference(JSURandomInputStream* p_stream, u32 return (J2DResReference*)buffer; } -/* 802F937C-802F9600 2F3CBC 0284+00 1/1 0/0 0/0 .text - * createMaterial__9J2DScreenFP20JSURandomInputStreamUlP10JKRArchive */ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRArchive* p_archive) { s32 position = p_stream->getPosition(); @@ -426,21 +396,16 @@ failure: return false; } -/* 802F9600-802F9620 2F3F40 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResTIMG */ bool J2DScreen::isUsed(ResTIMG const* p_timg) { return J2DPane::isUsed(p_timg); } -/* 802F9620-802F9640 2F3F60 0020+00 1/0 0/0 0/0 .text isUsed__9J2DScreenFPC7ResFONT */ bool J2DScreen::isUsed(ResFONT const* p_font) { return J2DPane::isUsed(p_font); } -/* ############################################################################################## */ -/* 80451590-80451598 000A90 0004+04 1/1 3/3 0/0 .sbss mDataManage__9J2DScreen */ J2DDataManage* J2DScreen::mDataManage; -/* 802F9640-802F9690 2F3F80 0050+00 0/0 6/6 0/0 .text getNameResource__9J2DScreenFPCc */ void* J2DScreen::getNameResource(char const* resName) { void* res = JKRFileLoader::getGlbResource(resName, NULL); @@ -451,7 +416,6 @@ void* J2DScreen::getNameResource(char const* resName) { return res; } -/* 802F9690-802F9704 2F3FD0 0074+00 0/0 30/30 3/3 .text animation__9J2DScreenFv */ void J2DScreen::animation() { animationPane(mTransform); @@ -460,7 +424,6 @@ void J2DScreen::animation() { } } -/* 802F9704-802F9798 2F4044 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP11J2DAnmColor */ void J2DScreen::setAnimation(J2DAnmColor* p_anmColor) { p_anmColor->searchUpdateMaterialID(this); u16 matNum = p_anmColor->getUpdateMaterialNum(); @@ -473,8 +436,6 @@ void J2DScreen::setAnimation(J2DAnmColor* p_anmColor) { } } -/* 802F9798-802F9838 2F40D8 00A0+00 1/0 0/0 0/0 .text - * setAnimation__9J2DScreenFP19J2DAnmTextureSRTKey */ void J2DScreen::setAnimation(J2DAnmTextureSRTKey* p_anmSRTKey) { p_anmSRTKey->searchUpdateMaterialID(this); u16 matNum = p_anmSRTKey->getUpdateMaterialNum(); @@ -487,8 +448,6 @@ void J2DScreen::setAnimation(J2DAnmTextureSRTKey* p_anmSRTKey) { } } -/* 802F9838-802F98CC 2F4178 0094+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP16J2DAnmTexPattern - */ void J2DScreen::setAnimation(J2DAnmTexPattern* p_anmPattern) { p_anmPattern->searchUpdateMaterialID(this); u16 matNum = p_anmPattern->getUpdateMaterialNum(); @@ -501,8 +460,6 @@ void J2DScreen::setAnimation(J2DAnmTexPattern* p_anmPattern) { } } -/* 802F98CC-802F99A8 2F420C 00DC+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP15J2DAnmTevRegKey - */ void J2DScreen::setAnimation(J2DAnmTevRegKey* p_anmRegKey) { p_anmRegKey->searchUpdateMaterialID(this); @@ -523,48 +480,35 @@ void J2DScreen::setAnimation(J2DAnmTevRegKey* p_anmRegKey) { } } -/* 802F99A8-802F99C8 2F42E8 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP14J2DAnmVtxColor - */ void J2DScreen::setAnimation(J2DAnmVtxColor* p_anmVtxColor) { J2DPane::setVtxColorAnimation(p_anmVtxColor); } -/* 802F99C8-802F99E8 2F4308 0020+00 1/0 0/0 0/0 .text - * setAnimation__9J2DScreenFP20J2DAnmVisibilityFull */ void J2DScreen::setAnimation(J2DAnmVisibilityFull* p_anmVisibility) { J2DPane::setVisibileAnimation(p_anmVisibility); } -/* 802F99E8-802F9A18 2F4328 0030+00 1/0 0/0 0/0 .text - * createPane__9J2DScreenFRC18J2DScrnBlockHeaderP20JSURandomInputStreamP7J2DPaneUl */ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputStream* p_stream, J2DPane* p_basePane, u32 param_3) { return createPane(header, p_stream, p_basePane, param_3, NULL); } -/* 802F9A18-802F9A20 2F4358 0008+00 1/0 0/0 0/0 .text getTypeID__9J2DScreenCFv */ u16 J2DScreen::getTypeID() const { return 8; } -/* 802F9A20-802F9A54 2F4360 0034+00 1/0 0/0 0/0 .text calcMtx__9J2DScreenFv */ void J2DScreen::calcMtx() { makeMatrix(mTranslateX, mTranslateY); } -/* 802F9A54-802F9A74 2F4394 0020+00 1/0 0/0 0/0 .text setAnimation__9J2DScreenFP10J2DAnmBase */ void J2DScreen::setAnimation(J2DAnmBase* p_anm) { J2DPane::setAnimation(p_anm); } -/* 802F9A74-802F9A78 2F43B4 0004+00 1/0 0/0 0/0 .text - * setAnimationVF__9J2DScreenFP20J2DAnmVisibilityFull */ void J2DScreen::setAnimationVF(J2DAnmVisibilityFull*) { /* empty function */ } -/* 802F9A78-802F9A7C 2F43B8 0004+00 1/0 0/0 0/0 .text setAnimationVC__9J2DScreenFP14J2DAnmVtxColor - */ void J2DScreen::setAnimationVC(J2DAnmVtxColor*) { /* empty function */ } |
