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

1 files changed, 0 insertions, 74 deletions

diff --git a/src/JSystem/J2DGraph/J2DWindowEx.cpp b/src/JSystem/J2DGraph/J2DWindowEx.cpp
index 42b103047e..9ca9863acc 100644
--- a/src/JSystem/J2DGraph/J2DWindowEx.cpp
+++ b/src/JSystem/J2DGraph/J2DWindowEx.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DWindowEx
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DWindowEx.h"
@@ -27,8 +22,6 @@ struct J2DWindowExDef {
 
 STATIC_ASSERT(sizeof(J2DWindowExDef) == 0x40);
 
-/* 80300C94-80300F80 2FB5D4 02EC+00 0/0 1/1 0/0 .text
- * __ct__11J2DWindowExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */
 J2DWindowEx::J2DWindowEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2,
                              J2DMaterial* param_3) : J2DWindow() {
     mAnmVisibilityFull = NULL;
@@ -87,7 +80,6 @@ J2DWindowEx::J2DWindowEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 pa
     setMinSize();
 }
 
-/* 80300F80-80301144 2FB8C0 01C4+00 1/1 0/0 0/0 .text            setMinSize__11J2DWindowExFv */
 void J2DWindowEx::setMinSize() {
     field_0x140 = 1;
     field_0x142 = 1;
@@ -111,7 +103,6 @@ void J2DWindowEx::setMinSize() {
                 + mFrameMaterial[2]->getTevBlock()->getTexture(0)->getHeight();
 }
 
-/* 80301144-8030122C 2FBA84 00E8+00 1/0 0/0 0/0 .text            __dt__11J2DWindowExFv */
 J2DWindowEx::~J2DWindowEx() {
     for (u8 i = 0; i < 4; i++) {
         if (field_0x170 & (1 << i)) {
@@ -124,8 +115,6 @@ J2DWindowEx::~J2DWindowEx() {
     }
 }
 
-/* 8030122C-803012CC 2FBB6C 00A0+00 1/0 0/0 0/0 .text            drawSelf__11J2DWindowExFffPA3_A4_f
- */
 void J2DWindowEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
     JGeometry::TBox2<f32> aTStack_50(mBounds);
     Mtx auStack_40;
@@ -136,8 +125,6 @@ void J2DWindowEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
     clip(field_0x114);
 }
 
-/* 803012CC-80301994 2FBC0C 06C8+00 2/2 0/0 0/0 .text
- * draw_private__11J2DWindowExFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
 void J2DWindowEx::draw_private(JGeometry::TBox2<f32> const& param_0,
                                JGeometry::TBox2<f32> const& param_1) {
     if (param_0.getWidth() >= field_0x140 && param_0.getHeight() >= field_0x142) {
@@ -318,8 +305,6 @@ static f32 dummy_literal() {
     return 0.0f;
 }
 
-/* 80301994-80301D74 2FC2D4 03E0+00 1/0 0/0 0/0 .text
- * drawContents__11J2DWindowExFRCQ29JGeometry8TBox2<f>          */
 void J2DWindowEx::drawContents(JGeometry::TBox2<f32> const& param_1) {
     if (!param_1.isValid() || mContentsMaterial == NULL)  {
         return;
@@ -398,8 +383,6 @@ void J2DWindowEx::drawContents(JGeometry::TBox2<f32> const& param_1) {
 }
 
 
-/* 80301D74-80301FC8 2FC6B4 0254+00 1/1 0/0 0/0 .text
- * drawFrameTexture__11J2DWindowExFffffUsUsUsUsP11J2DMaterialb  */
 void J2DWindowEx::drawFrameTexture(f32 param_1, f32 param_2, f32 param_3, f32 param_4, u16 param_5,
                                    u16 param_6, u16 param_7, u16 param_8, J2DMaterial* param_9,
                                    bool param_10) {
@@ -446,8 +429,6 @@ void J2DWindowEx::drawFrameTexture(f32 param_1, f32 param_2, f32 param_3, f32 pa
     }
 }
 
-/* 80301FC8-80302164 2FC908 019C+00 1/0 0/0 0/0 .text draw__11J2DWindowExFRCQ29JGeometry8TBox2<f>
- */
 void J2DWindowEx::draw(JGeometry::TBox2<f32> const& param_1) {
     bool isMissingTexture = false;
     JUTTexture* local_68[4];
@@ -474,8 +455,6 @@ void J2DWindowEx::draw(JGeometry::TBox2<f32> const& param_1) {
     draw(param_1, aTStack_78);
 }
 
-/* 80302164-80302284 2FCAA4 0120+00 1/0 0/0 0/0 .text
- * draw__11J2DWindowExFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
 void J2DWindowEx::draw(JGeometry::TBox2<f32> const& param_1, JGeometry::TBox2<f32> const& param_2) {
     rewriteAlpha();
     mColorAlpha = mAlpha;
@@ -496,7 +475,6 @@ void J2DWindowEx::draw(JGeometry::TBox2<f32> const& param_1, JGeometry::TBox2<f3
     GXLoadPosMtxImm(auStack_60, 0);
 }
 
-/* 80302284-80302388 2FCBC4 0104+00 1/1 0/0 0/0 .text            setTevOrder__11J2DWindowExFb */
 void J2DWindowEx::setTevOrder(bool param_0) {
     u16 local_28[2];
     if (!param_0) {
@@ -521,7 +499,6 @@ void J2DWindowEx::setTevOrder(bool param_0) {
     }
 }
 
-/* 80302388-803024B4 2FCCC8 012C+00 1/1 0/0 0/0 .text            setTevStage__11J2DWindowExFb */
 void J2DWindowEx::setTevStage(bool param_1) {
     for (int i = 0; i < 4; i++) {
         J2DTevStage* pJVar3 = mFrameMaterial[i]->getTevBlock()->getTevStage(0);
@@ -547,50 +524,40 @@ void J2DWindowEx::setTevStage(bool param_1) {
     }
 }
 
-/* 803A1C70-803A1C80 02E2D0 0010+00 0/0 0/0 0/0 .rodata          @1557 */
 static u8 const lit_1557[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1C80-803A1C90 02E2E0 0010+00 0/0 0/0 0/0 .rodata          @1566 */
 static u8 const lit_1566[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1C90-803A1CA0 02E2F0 0010+00 0/0 0/0 0/0 .rodata          @1575 */
 static u8 const lit_1575[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 
-/* 803A1CA0-803A1CB0 02E300 0010+00 0/0 0/0 0/0 .rodata          @1581 */
 static u8 const lit_1581[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 
-/* 803A1CB0-803A1CC0 02E310 0010+00 0/0 0/0 0/0 .rodata          @1587 */
 static u8 const lit_1587[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1CC0-803A1CD0 02E320 0010+00 0/0 0/0 0/0 .rodata          @1596 */
 static u8 const lit_1596[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1CD0-803A1CE0 02E330 0010+00 0/0 0/0 0/0 .rodata          @1605 */
 static u8 const lit_1605[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A1CE0-803A1CF0 02E340 0010+00 0/0 0/0 0/0 .rodata          @1612 */
 static u8 const lit_1612[16] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803024B4-80302764 2FCDF4 02B0+00 1/1 0/0 0/0 .text
- * setStage__11J2DWindowExFP11J2DTevStageQ211J2DWindowEx10stage_enum */
 void J2DWindowEx::setStage(J2DTevStage* param_0, J2DWindowEx::stage_enum param_1) {
     s8 local_30[6][4] = {
         {0x0f, 0x08, 0x0a, 0x0f}, {0x0f, 0x08, 0x0a, 0x0f}, {0x0f, 0x0a, 0x00, 0x0f},
@@ -616,8 +583,6 @@ void J2DWindowEx::setStage(J2DTevStage* param_0, J2DWindowEx::stage_enum param_1
 }
 
 
-/* 80302764-803027EC 2FD0A4 0088+00 1/0 0/0 0/0 .text setBlack__11J2DWindowExFQ28JUtility6TColor
- */
 bool J2DWindowEx::setBlack(JUtility::TColor black) {
     JUtility::TColor dummy,white;
 
@@ -628,8 +593,6 @@ bool J2DWindowEx::setBlack(JUtility::TColor black) {
     return setBlackWhite(black, white);
 }
 
-/* 803027EC-80302874 2FD12C 0088+00 1/0 0/0 0/0 .text setWhite__11J2DWindowExFQ28JUtility6TColor
- */
 bool J2DWindowEx::setWhite(JUtility::TColor white) {
     JUtility::TColor black,dummy;
 
@@ -640,8 +603,6 @@ bool J2DWindowEx::setWhite(JUtility::TColor white) {
     return setBlackWhite(black, white);
 }
 
-/* 80302874-80302A4C 2FD1B4 01D8+00 1/0 0/0 0/0 .text
- * setBlackWhite__11J2DWindowExFQ28JUtility6TColorQ28JUtility6TColor */
 // NONMATCHING - J2DGXColorS10 issue
 bool J2DWindowEx::setBlackWhite(JUtility::TColor black, JUtility::TColor white) {
     for (int i = 0; i < 4; i++) {
@@ -684,7 +645,6 @@ bool J2DWindowEx::setBlackWhite(JUtility::TColor black, JUtility::TColor white)
     return true;
 }
 
-/* 80302A4C-80302BE8 2FD38C 019C+00 4/4 0/0 0/0 .text            getBlackWhite__11J2DWindowExCFPQ28JUtility6TColorPQ28JUtility6TColor */
 bool J2DWindowEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* param_1) const {
     if (mFrameMaterial[0] == NULL) {
         return false;
@@ -718,8 +678,6 @@ bool J2DWindowEx::getBlackWhite(JUtility::TColor* param_0, JUtility::TColor* par
     return true;
 }
 
-/* 80302BE8-80302C88 2FD528 00A0+00 1/1 0/0 0/0 .text
- * isSetBlackWhite__11J2DWindowExCFQ28JUtility6TColorQ28JUtility6TColor */
 bool J2DWindowEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) const {
     if ((u32)param_0 == 0 && (u32)param_1 == 0xffffffff) {
         return true;
@@ -732,7 +690,6 @@ bool J2DWindowEx::isSetBlackWhite(JUtility::TColor param_0, JUtility::TColor par
     return true;
 }
 
-/* 80302C88-80302CE8 2FD5C8 0060+00 1/0 0/0 0/0 .text            getBlack__11J2DWindowExCFv */
 JUtility::TColor J2DWindowEx::getBlack() const {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -742,7 +699,6 @@ JUtility::TColor J2DWindowEx::getBlack() const {
     return black;
 }
 
-/* 80302CE8-80302D48 2FD628 0060+00 1/0 0/0 0/0 .text            getWhite__11J2DWindowExCFv */
 JUtility::TColor J2DWindowEx::getWhite() const {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -752,7 +708,6 @@ JUtility::TColor J2DWindowEx::getWhite() const {
     return white;
 }
 
-/* 80302D48-80302D98 2FD688 0050+00 1/0 0/0 0/0 .text            setAlpha__11J2DWindowExFUc */
 void J2DWindowEx::setAlpha(u8 param_0) {
     mAlpha = param_0;
 
@@ -771,7 +726,6 @@ void J2DWindowEx::setAlpha(u8 param_0) {
     }
 }
 
-/* 80302D98-80302DF4 2FD6D8 005C+00 1/0 0/0 0/0 .text setCullBack__11J2DWindowExF11_GXCullMode */
 void J2DWindowEx::setCullBack(_GXCullMode param_0) {
     mCullMode = param_0;
 
@@ -787,14 +741,12 @@ void J2DWindowEx::setCullBack(_GXCullMode param_0) {
     J2DPane::setCullBack(param_0);
 }
 
-/* 80302DF4-80302E0C 2FD734 0018+00 1/0 0/0 0/0 .text            rewriteAlpha__11J2DWindowExFv */
 void J2DWindowEx::rewriteAlpha() {
     if (mContentsMaterial != NULL) {
         mAlpha = mContentsMaterial->getColorBlock()->getMatColor(0)->a;
     }
 }
 
-/* 80302E0C-80302E74 2FD74C 0068+00 1/0 0/0 0/0 .text getFrameTexture__11J2DWindowExCFUcUc */
 JUTTexture* J2DWindowEx::getFrameTexture(u8 param_0, u8 param_1) const {
     J2DMaterial* frameMaterial = getFrameMaterial(param_0);
     if (frameMaterial != NULL && frameMaterial->getTevBlock() != NULL) {
@@ -803,7 +755,6 @@ JUTTexture* J2DWindowEx::getFrameTexture(u8 param_0, u8 param_1) const {
     return NULL;
 }
 
-/* 80302E74-80302EDC 2FD7B4 0068+00 1/0 0/0 0/0 .text getContentsTexture__11J2DWindowExCFUc */
 JUTTexture* J2DWindowEx::getContentsTexture(u8 param_0) const {
     J2DMaterial* frameMaterial = getContentsMaterial();
     if (frameMaterial != NULL && frameMaterial->getTevBlock() != NULL) {
@@ -812,7 +763,6 @@ JUTTexture* J2DWindowEx::getContentsTexture(u8 param_0) const {
     return NULL;
 }
 
-/* 80302EDC-80302FFC 2FD81C 0120+00 1/0 0/0 0/0 .text            isUsed__11J2DWindowExFPC7ResTIMG */
 bool J2DWindowEx::isUsed(ResTIMG const* timg) {
     for (u8 i = 0; i < 4; i++) {
         if (mFrameMaterial[i] != NULL && mFrameMaterial[i]->getTevBlock() != NULL) {
@@ -837,8 +787,6 @@ bool J2DWindowEx::isUsed(ResTIMG const* timg) {
     return J2DPane::isUsed(timg);
 }
 
-/* 80302FFC-80303084 2FD93C 0088+00 1/0 0/0 0/0 .text setAnimation__11J2DWindowExFP11J2DAnmColor
- */
 void J2DWindowEx::setAnimation(J2DAnmColor* anmColor) {
     for (u8 i = 0; i < 4; i++) {
         if (isNeedSetAnm(i)) {
@@ -850,8 +798,6 @@ void J2DWindowEx::setAnimation(J2DAnmColor* anmColor) {
     }
 }
 
-/* 80303084-8030310C 2FD9C4 0088+00 1/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP19J2DAnmTextureSRTKey           */
 void J2DWindowEx::setAnimation(J2DAnmTextureSRTKey* param_0) {
     for (u8 i = 0; i < 4; i++) {
         if (isNeedSetAnm(i)) {
@@ -863,8 +809,6 @@ void J2DWindowEx::setAnimation(J2DAnmTextureSRTKey* param_0) {
     }
 }
 
-/* 8030310C-80303194 2FDA4C 0088+00 1/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP16J2DAnmTexPattern              */
 void J2DWindowEx::setAnimation(J2DAnmTexPattern* param_0) {
     for (u8 i = 0; i < 4; i++) {
         if (isNeedSetAnm(i)) {
@@ -876,8 +820,6 @@ void J2DWindowEx::setAnimation(J2DAnmTexPattern* param_0) {
     }
 }
 
-/* 80303194-8030321C 2FDAD4 0088+00 1/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP15J2DAnmTevRegKey               */
 void J2DWindowEx::setAnimation(J2DAnmTevRegKey* param_0) {
     for (u8 i = 0; i < 4; i++) {
         if (isNeedSetAnm(i)) {
@@ -889,7 +831,6 @@ void J2DWindowEx::setAnimation(J2DAnmTevRegKey* param_0) {
     }
 }
 
-/* 8030321C-80303274 2FDB5C 0058+00 4/4 0/0 0/0 .text            isNeedSetAnm__11J2DWindowExFUc */
 bool J2DWindowEx::isNeedSetAnm(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (mFrameMaterial[i] == mFrameMaterial[param_0]) {
@@ -899,14 +840,10 @@ bool J2DWindowEx::isNeedSetAnm(u8 param_0) {
     return mFrameMaterial[param_0] != NULL;
 }
 
-/* 80303274-8030327C -00001 0008+00 0/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP20J2DAnmVisibilityFull          */
 void J2DWindowEx::setAnimation(J2DAnmVisibilityFull* param_0) {
     mAnmVisibilityFull = param_0;
 }
 
-/* 8030327C-80303370 2FDBBC 00F4+00 1/0 0/0 0/0 .text
- * setAnimation__11J2DWindowExFP14J2DAnmVtxColor                */
 void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) {
     mAnmVtxColor = param_0;
     field_0x17c = 0;
@@ -936,8 +873,6 @@ void J2DWindowEx::setAnimation(J2DAnmVtxColor* param_0) {
     }
 }
 
-/* 80303370-80303510 2FDCB0 01A0+00 1/0 0/0 0/0 .text
- * animationPane__11J2DWindowExFPC15J2DAnmTransform             */
 const J2DAnmTransform* J2DWindowEx::animationPane(J2DAnmTransform const* param_0) {
     if (mAnmVisibilityFull != 0 && field_0x166 != 0xffff) {
         u8 visibility;
@@ -976,8 +911,6 @@ const J2DAnmTransform* J2DWindowEx::animationPane(J2DAnmTransform const* param_0
     return J2DPane::animationPane(param_0);
 }
 
-/* 80303510-80303534 2FDE50 0024+00 1/0 0/0 0/0 .text            getFrameMaterial__11J2DWindowExCFUc
- */
 J2DMaterial* J2DWindowEx::getFrameMaterial(u8 index) const {
     if (index >= 4) {
         return NULL;
@@ -986,13 +919,10 @@ J2DMaterial* J2DWindowEx::getFrameMaterial(u8 index) const {
     return mFrameMaterial[index];
 }
 
-/* 80303534-8030353C 2FDE74 0008+00 1/0 0/0 0/0 .text getContentsMaterial__11J2DWindowExCFv */
 J2DMaterial* J2DWindowEx::getContentsMaterial() const {
     return mContentsMaterial;
 }
 
-/* 8030353C-80303568 2FDE7C 002C+00 1/0 0/0 0/0 .text
- * getMaterial__11J2DWindowExCFRQ29J2DWindow9TMaterial          */
 void J2DWindowEx::getMaterial(J2DWindow::TMaterial& param_0) const {
     param_0.field_0x0 = mFrameMaterial[0];
     param_0.field_0x4 = mFrameMaterial[1];
@@ -1001,13 +931,11 @@ void J2DWindowEx::getMaterial(J2DWindow::TMaterial& param_0) const {
     param_0.field_0x10 = mContentsMaterial;
 }
 
-/* 80303568-803035C0 2FDEA8 0058+00 1/0 0/0 0/0 .text            draw__11J2DWindowExFffff */
 void J2DWindowEx::draw(f32 param_0, f32 param_1, f32 param_2, f32 param_3) {
     draw(JGeometry::TBox2<f32>(JGeometry::TVec2<f32>(param_0, param_1),
                                JGeometry::TVec2<f32>(param_0 + param_2, param_1 + param_3)));
 }
 
-/* 803035C0-803035FC 2FDF00 003C+00 1/0 0/0 0/0 .text            setCullBack__11J2DWindowExFb */
 void J2DWindowEx::setCullBack(bool param_0) {
     _GXCullMode mode;
     if (param_0) {
@@ -1018,12 +946,10 @@ void J2DWindowEx::setCullBack(bool param_0) {
     setCullBack(mode);
 }
 
-/* 803035FC-8030361C 2FDF3C 0020+00 1/0 0/0 0/0 .text            isUsed__11J2DWindowExFPC7ResFONT */
 bool J2DWindowEx::isUsed(ResFONT const* param_0) {
     return J2DPane::isUsed(param_0);
 }
 
-/* 8030361C-8030363C 2FDF5C 0020+00 1/0 0/0 0/0 .text setAnimation__11J2DWindowExFP10J2DAnmBase */
 void J2DWindowEx::setAnimation(J2DAnmBase* param_0) {
     J2DPane::setAnimation(param_0);
 }