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, 115 deletions

diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/src/JSystem/J2DGraph/J2DPictureEx.cpp
index 9d2d52a9fb..7520e4a3b2 100644
--- a/src/JSystem/J2DGraph/J2DPictureEx.cpp
+++ b/src/JSystem/J2DGraph/J2DPictureEx.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J2DPictureEx
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DPictureEx.h"
@@ -12,8 +7,6 @@
 #include "JSystem/JUtility/JUTTexture.h"
 #include "dolphin/types.h"
 
-/* 80303640-803036EC 2FDF80 00AC+00 1/0 0/0 0/0 .text
- * initiate__12J2DPictureExFPC7ResTIMGPC7ResTLUT                */
 void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1) {
     J2DTexGenBlock* this_00 = mMaterial->getTexGenBlock();
     if (this_00->getTexGenNum() == 0 && append(param_0, 1.0f) && param_1 != NULL) {
@@ -23,8 +16,6 @@ void J2DPictureEx::initiate(ResTIMG const* param_0, ResTLUT const* param_1) {
     }
 }
 
-/* 803036EC-8030393C 2FE02C 0250+00 0/0 1/1 0/0 .text
- * __ct__12J2DPictureExFP7J2DPaneP20JSURandomInputStreamUlP11J2DMaterial */
 J2DPictureEx::J2DPictureEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 param_2,
                                J2DMaterial* param_3) {
     field_0x194 = 0;
@@ -68,15 +59,12 @@ J2DPictureEx::J2DPictureEx(J2DPane* param_0, JSURandomInputStream* param_1, u32
     }
 }
 
-/* 8030393C-803039CC 2FE27C 0090+00 1/0 0/0 0/0 .text            __dt__12J2DPictureExFv */
 J2DPictureEx::~J2DPictureEx() {
     if (field_0x190) {
         delete mMaterial;
     }
 }
 
-/* 803039CC-80303AB4 2FE30C 00E8+00 1/0 0/0 0/0 .text            prepareTexture__12J2DPictureExFUc
- */
 bool J2DPictureEx::prepareTexture(u8 param_0) {
     if (!mMaterial->getTevBlock()->prepareTexture(param_0)) {
         return false;
@@ -89,8 +77,6 @@ bool J2DPictureEx::prepareTexture(u8 param_0) {
     return true;
 }
 
-/* 80303AB4-80303B80 2FE3F4 00CC+00 1/0 0/0 0/0 .text            drawSelf__12J2DPictureExFffPA3_A4_f
- */
 void J2DPictureEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
     if (mMaterial != NULL) {
         mMaterial->setGX();
@@ -102,7 +88,6 @@ void J2DPictureEx::drawSelf(f32 param_0, f32 param_1, f32 (*param_2)[3][4]) {
     }
 }
 
-/* 80303B80-80303BDC 2FE4C0 005C+00 1/0 0/0 0/0 .text drawFullSet__12J2DPictureExFffffPA3_A4_f */
 void J2DPictureEx::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_3,
                                    f32 (*param_4)[3][4]) {
     drawTexCoord(mBounds.i.x, mBounds.i.y, param_2, param_3, field_0x10a[0].x, field_0x10a[0].y,
@@ -110,8 +95,6 @@ void J2DPictureEx::drawFullSet(f32 param_0, f32 param_1, f32 param_2, f32 param_
                  field_0x10a[3].x, field_0x10a[3].y, param_4);
 }
 
-/* 80303BDC-80303E5C 2FE51C 0280+00 1/0 0/0 0/0 .text
- * drawTexCoord__12J2DPictureExFffffssssssssPA3_A4_f            */
 void J2DPictureEx::drawTexCoord(f32 param_0, f32 param_1, f32 param_2, f32 param_3, s16 param_4,
                                     s16 param_5, s16 param_6, s16 param_7, s16 param_8, s16 param_9,
                                     s16 param_10, s16 param_11, f32 (*param_12)[3][4]) {
@@ -159,8 +142,6 @@ void J2DPictureEx::drawTexCoord(f32 param_0, f32 param_1, f32 param_2, f32 param
 }
 
 
-/* 80303E5C-80303EA4 2FE79C 0048+00 1/0 0/0 0/0 .text
- * append__12J2DPictureExFPC7ResTIMGP10JUTPalettef              */
 bool J2DPictureEx::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
     if (mMaterial == NULL) {
         return false;
@@ -169,7 +150,6 @@ bool J2DPictureEx::append(ResTIMG const* param_0, JUTPalette* param_1, f32 param
     return insert(param_0, param_1, mMaterial->getTexGenBlock()->getTexGenNum(), param_2);
 }
 
-/* 80303EA4-80303EEC 2FE7E4 0048+00 1/0 0/0 0/0 .text append__12J2DPictureExFPCcP10JUTPalettef */
 bool J2DPictureEx::append(char const* param_0, JUTPalette* param_1, f32 param_2) {
     if (mMaterial == NULL) {
         return false;
@@ -178,7 +158,6 @@ bool J2DPictureEx::append(char const* param_0, JUTPalette* param_1, f32 param_2)
     return insert(param_0, param_1, mMaterial->getTexGenBlock()->getTexGenNum(), param_2);
 }
 
-/* 80303EEC-80303F34 2FE82C 0048+00 1/0 0/0 0/0 .text append__12J2DPictureExFP10JUTTexturef */
 bool J2DPictureEx::append(JUTTexture* param_0, f32 param_1) {
     if (mMaterial == NULL) {
         return false;
@@ -187,8 +166,6 @@ bool J2DPictureEx::append(JUTTexture* param_0, f32 param_1) {
     return insert(param_0,  mMaterial->getTexGenBlock()->getTexGenNum(), param_1);
 }
 
-/* 80303F34-80303FD8 2FE874 00A4+00 1/0 0/0 0/0 .text
- * insert__12J2DPictureExFPC7ResTIMGP10JUTPaletteUcf            */
 bool J2DPictureEx::insert(ResTIMG const* param_0, JUTPalette* param_1, u8 param_2,
                               f32 param_3) {
     if (param_0 == NULL) {
@@ -204,14 +181,11 @@ bool J2DPictureEx::insert(ResTIMG const* param_0, JUTPalette* param_1, u8 param_
     return true;
 }
 
-/* 80303FD8-80304048 2FE918 0070+00 1/0 0/0 0/0 .text insert__12J2DPictureExFPCcP10JUTPaletteUcf
- */
 bool J2DPictureEx::insert(char const* param_0, JUTPalette* param_1, u8 param_2, f32 param_3) {
     ResTIMG const* resource = (ResTIMG const*)J2DScreen::getNameResource(param_0);
     return insert(resource, param_1, param_2, param_3);
 }
 
-/* 80304048-803040E4 2FE988 009C+00 1/0 0/0 0/0 .text insert__12J2DPictureExFP10JUTTextureUcf */
 bool J2DPictureEx::insert(JUTTexture* param_0, u8 param_1, f32 param_2) {
     if (param_0 == NULL) {
         return false;
@@ -226,7 +200,6 @@ bool J2DPictureEx::insert(JUTTexture* param_0, u8 param_1, f32 param_2) {
     return true;
 }
 
-/* 803040E4-8030437C 2FEA24 0298+00 2/2 0/0 0/0 .text            insertCommon__12J2DPictureExFUcf */
 void J2DPictureEx::insertCommon(u8 pos, f32 param_1) {
     u8 new_tev_stage_num;
     u8 tex_gen_num = mMaterial->getTexGenBlock()->getTexGenNum();
@@ -275,7 +248,6 @@ void J2DPictureEx::insertCommon(u8 pos, f32 param_1) {
     setTevKAlphaSel(tex_gen_num);
 }
 
-/* 8030437C-8030446C 2FECBC 00F0+00 2/2 0/0 0/0 .text            isInsert__12J2DPictureExCFUc */
 bool J2DPictureEx::isInsert(u8 pos) const {
     if (mMaterial == NULL) {
         return false;
@@ -300,7 +272,6 @@ bool J2DPictureEx::isInsert(u8 pos) const {
     return true;
 }
 
-/* 8030446C-80304608 2FEDAC 019C+00 1/0 0/0 0/0 .text            remove__12J2DPictureExFUc */
 bool J2DPictureEx::remove(u8 pos) {
     if (!isRemove(pos)) {
         return false;
@@ -332,7 +303,6 @@ bool J2DPictureEx::remove(u8 pos) {
     return true;
 }
 
-/* 80304608-8030466C 2FEF48 0064+00 1/0 0/0 0/0 .text            remove__12J2DPictureExFv */
 bool J2DPictureEx::remove() {
     if (mMaterial == NULL) {
         return false;
@@ -346,7 +316,6 @@ bool J2DPictureEx::remove() {
     return remove(texGenNum - 1);
 }
 
-/* 8030466C-80304728 2FEFAC 00BC+00 1/0 0/0 0/0 .text remove__12J2DPictureExFP10JUTTexture */
 bool J2DPictureEx::remove(JUTTexture* param_0) {
     if (mMaterial == NULL) {
         return false;
@@ -365,7 +334,6 @@ bool J2DPictureEx::remove(JUTTexture* param_0) {
     return remove(i);
 }
 
-/* 80304728-8030477C 2FF068 0054+00 1/1 0/0 0/0 .text            isRemove__12J2DPictureExCFUc */
 bool J2DPictureEx::isRemove(u8 param_0) const {
     if (mMaterial == NULL) {
         return false;
@@ -382,7 +350,6 @@ bool J2DPictureEx::isRemove(u8 param_0) const {
     return true;
 }
 
-/* 8030477C-80304890 2FF0BC 0114+00 1/0 0/0 0/0 .text            draw__12J2DPictureExFffUcbbb */
 void J2DPictureEx::draw(f32 param_0, f32 param_1, u8 texNo, bool param_3, bool param_4,
                         bool param_5) {
     if (mMaterial == NULL) {
@@ -408,7 +375,6 @@ void J2DPictureEx::draw(f32 param_0, f32 param_1, u8 texNo, bool param_3, bool p
     }
 }
 
-/* 80304890-80304D88 2FF1D0 04F8+00 1/0 0/0 0/0 .text            draw__12J2DPictureExFffffbbb */
 void J2DPictureEx::draw(f32 param_0, f32 param_1, f32 width, f32 height, bool param_4,
                         bool param_5, bool param_6) {
     if (!isVisible()) {
@@ -510,7 +476,6 @@ void J2DPictureEx::draw(f32 param_0, f32 param_1, f32 width, f32 height, bool pa
     GXSetVtxDesc(GX_VA_TEX0, GX_NONE);
 }
 
-/* 80304D88-80304EF0 2FF6C8 0168+00 1/0 0/0 0/0 .text            drawOut__12J2DPictureExFffffff */
 void J2DPictureEx::drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
                            f32 param_5) {
     if (mMaterial == NULL) {
@@ -533,8 +498,6 @@ void J2DPictureEx::drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f
     }
 }
 
-/* 80304EF0-80305264 2FF830 0374+00 1/0 0/0 0/0 .text
- * drawOut__12J2DPictureExFRCQ29JGeometry8TBox2<f>RCQ29JGeometry8TBox2<f> */
 void J2DPictureEx::drawOut(JGeometry::TBox2<f32> const& param_0,
                            JGeometry::TBox2<f32> const& param_1) {
     if (mMaterial == NULL) {
@@ -610,7 +573,6 @@ void J2DPictureEx::drawOut(JGeometry::TBox2<f32> const& param_0,
     GXSetVtxDesc(GX_VA_TEX0, GX_NONE);
 }
 
-/* 80305264-803052AC 2FFBA4 0048+00 1/0 0/0 0/0 .text load__12J2DPictureExF11_GXTexMapIDUc */
 void J2DPictureEx::load(_GXTexMapID param_0, u8 param_1) {
     if (mMaterial == NULL) {
         return;
@@ -623,8 +585,6 @@ void J2DPictureEx::load(_GXTexMapID param_0, u8 param_1) {
     mMaterial->getTevBlock()->loadTexture(param_0, param_1);
 }
 
-/* 803052AC-803053E0 2FFBEC 0134+00 3/3 0/0 0/0 .text            setTevOrder__12J2DPictureExFUcUcb
- */
 void J2DPictureEx::setTevOrder(u8 param_0, u8 param_1, bool param_2) {
     u16 local_30[16];
     if (param_0 == 1) {
@@ -655,8 +615,6 @@ void J2DPictureEx::setTevOrder(u8 param_0, u8 param_1, bool param_2) {
     }
 }
 
-/* 803053E0-80305688 2FFD20 02A8+00 3/3 0/0 0/0 .text            setTevStage__12J2DPictureExFUcUcb
- */
 void J2DPictureEx::setTevStage(u8 param_0, u8 param_1, bool param_2) {
     if (param_0 == 1) {
         J2DTevStage* stage = mMaterial->getTevBlock()->getTevStage(0);
@@ -698,8 +656,6 @@ void J2DPictureEx::setTevStage(u8 param_0, u8 param_1, bool param_2) {
     }
 }
 
-/* 80305688-80305928 2FFFC8 02A0+00 1/1 0/0 0/0 .text
- * setStage__12J2DPictureExFP11J2DTevStageQ212J2DPictureEx10stage_enum */
 void J2DPictureEx::setStage(J2DTevStage* stage, J2DPictureEx::stage_enum idx) {
     s8 colorData[8][4] = {
         {0x0F, 0x08, 0x0A, 0x0F},
@@ -739,7 +695,6 @@ void J2DPictureEx::setStage(J2DTevStage* stage, J2DPictureEx::stage_enum idx) {
     stage->setTevAlphaOp(opData[idx][0], opData[idx][1], opData[idx][2], opData[idx][3], opData[idx][4]);
 }
 
-/* 80305928-80305C70 300268 0348+00 5/5 0/0 0/0 .text            setTevKColor__12J2DPictureExFUc */
 void J2DPictureEx::setTevKColor(u8 param_0) {
     if (param_0 == 1) {
         return;
@@ -793,8 +748,6 @@ void J2DPictureEx::setTevKColor(u8 param_0) {
     }
 }
 
-/* 80305C70-80305D18 3005B0 00A8+00 3/3 0/0 0/0 .text            setTevKColorSel__12J2DPictureExFUc
- */
 void J2DPictureEx::setTevKColorSel(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (i < 4) {
@@ -805,8 +758,6 @@ void J2DPictureEx::setTevKColorSel(u8 param_0) {
     }
 }
 
-/* 80305D18-80305DC0 300658 00A8+00 3/3 0/0 0/0 .text            setTevKAlphaSel__12J2DPictureExFUc
- */
 void J2DPictureEx::setTevKAlphaSel(u8 param_0) {
     for (u8 i = 0; i < param_0; i++) {
         if (i < 4) {
@@ -817,7 +768,6 @@ void J2DPictureEx::setTevKAlphaSel(u8 param_0) {
     }
 }
 
-/* 80305DC0-80305ED4 300700 0114+00 2/2 0/0 0/0 .text shiftSetBlendRatio__12J2DPictureExFUcfbb */
 void J2DPictureEx::shiftSetBlendRatio(u8 param_0, f32 param_1, bool param_2, bool param_3) {
     f32* pJVar4 = param_2 != 0 ? field_0x11c : field_0x124;
     f32* local_44 = param_2 != 0 ? field_0x160 : field_0x178;
@@ -850,7 +800,6 @@ void J2DPictureEx::shiftSetBlendRatio(u8 param_0, f32 param_1, bool param_2, boo
     }
 }
 
-/* 80305ED4-80305F34 300814 0060+00 1/0 0/0 0/0 .text setBlendColorRatio__12J2DPictureExFff */
 void J2DPictureEx::setBlendColorRatio(f32 param_0, f32 param_1) {
     if (mMaterial == NULL) {
         return;
@@ -867,7 +816,6 @@ void J2DPictureEx::setBlendColorRatio(f32 param_0, f32 param_1) {
 }
 
 
-/* 80305F34-80305F94 300874 0060+00 1/0 0/0 0/0 .text setBlendAlphaRatio__12J2DPictureExFff */
 void J2DPictureEx::setBlendAlphaRatio(f32 param_0, f32 param_1) {
     if (mMaterial == NULL) {
         return;
@@ -884,8 +832,6 @@ void J2DPictureEx::setBlendAlphaRatio(f32 param_0, f32 param_1) {
 }
 
 
-/* 80305F94-803060DC 3008D4 0148+00 1/0 0/0 0/0 .text changeTexture__12J2DPictureExFPC7ResTIMGUc
- */
 const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* img, u8 param_1) {
     if (mMaterial == NULL || img == NULL) {
         return NULL;
@@ -915,15 +861,11 @@ const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* img, u8 param_1) {
     return NULL;
 }
 
-/* 803060DC-80306134 300A1C 0058+00 1/0 0/0 0/0 .text            changeTexture__12J2DPictureExFPCcUc
- */
 const ResTIMG* J2DPictureEx::changeTexture(char const* param_0, u8 param_1) {
     ResTIMG const* resource = (ResTIMG const*)J2DScreen::getNameResource(param_0);
     return changeTexture(resource, param_1);
 }
 
-/* 80306134-80306298 300A74 0164+00 1/0 0/0 0/0 .text
- * changeTexture__12J2DPictureExFPC7ResTIMGUcP10JUTPalette      */
 const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1, JUTPalette* param_2) {
     if (mMaterial == NULL || param_0 == NULL) {
         return NULL;
@@ -951,14 +893,11 @@ const ResTIMG* J2DPictureEx::changeTexture(ResTIMG const* param_0, u8 param_1, J
     return NULL;
 }
 
-/* 80306298-803062F8 300BD8 0060+00 1/0 0/0 0/0 .text
- * changeTexture__12J2DPictureExFPCcUcP10JUTPalette             */
 const ResTIMG* J2DPictureEx::changeTexture(char const* param_0, u8 param_1, JUTPalette* param_2) {
     ResTIMG const* resource = (ResTIMG const*)J2DScreen::getNameResource(param_0);
     return changeTexture(resource, param_1, param_2);
 }
 
-/* 803062F8-80306350 300C38 0058+00 1/0 0/0 0/0 .text            getTexture__12J2DPictureExCFUc */
 JUTTexture* J2DPictureEx::getTexture(u8 param_0) const {
     if (mMaterial == NULL) {
         return NULL;
@@ -971,8 +910,6 @@ JUTTexture* J2DPictureEx::getTexture(u8 param_0) const {
     return mMaterial->getTevBlock()->getTexture(param_0);
 }
 
-/* 80306350-80306370 300C90 0020+00 1/0 0/0 0/0 .text            getTextureCount__12J2DPictureExCFv
- */
 u8 J2DPictureEx::getTextureCount() const {
     if (mMaterial == NULL) {
         return NULL;
@@ -981,8 +918,6 @@ u8 J2DPictureEx::getTextureCount() const {
     return mMaterial->getTexGenBlock()->getTexGenNum();
 }
 
-/* 80306370-803063F8 300CB0 0088+00 1/0 0/0 0/0 .text setBlack__12J2DPictureExFQ28JUtility6TColor
- */
 bool J2DPictureEx::setBlack(JUtility::TColor param_0) {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -992,8 +927,6 @@ bool J2DPictureEx::setBlack(JUtility::TColor param_0) {
     return setBlackWhite(param_0, white);
 }
 
-/* 803063F8-80306480 300D38 0088+00 1/0 0/0 0/0 .text setWhite__12J2DPictureExFQ28JUtility6TColor
- */
 bool J2DPictureEx::setWhite(JUtility::TColor param_0) {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -1003,8 +936,6 @@ bool J2DPictureEx::setWhite(JUtility::TColor param_0) {
     return setBlackWhite(black, param_0);
 }
 
-/* 80306480-80306664 300DC0 01E4+00 1/0 0/0 0/0 .text
- * setBlackWhite__12J2DPictureExFQ28JUtility6TColorQ28JUtility6TColor */
 bool J2DPictureEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor param_1) {
     if (mMaterial == NULL) {
         return false;
@@ -1052,8 +983,6 @@ bool J2DPictureEx::setBlackWhite(JUtility::TColor param_0, JUtility::TColor para
     return true;
 }
 
-/* 80306664-80306824 300FA4 01C0+00 4/4 0/0 0/0 .text
- * getBlackWhite__12J2DPictureExCFPQ28JUtility6TColorPQ28JUtility6TColor */
 bool J2DPictureEx::getBlackWhite(JUtility::TColor* black, JUtility::TColor* white) const {
     // FAKEMATCH
     if (mMaterial == NULL) {
@@ -1092,8 +1021,6 @@ bool J2DPictureEx::getBlackWhite(JUtility::TColor* black, JUtility::TColor* whit
     return true;
 }
 
-/* 80306824-803068F8 301164 00D4+00 1/1 0/0 0/0 .text
- * isSetBlackWhite__12J2DPictureExCFQ28JUtility6TColorQ28JUtility6TColor */
 bool J2DPictureEx::isSetBlackWhite(JUtility::TColor black, JUtility::TColor white) const {
     if (black == 0x00000000 && white == 0xffffffff) {
         return true;
@@ -1115,7 +1042,6 @@ bool J2DPictureEx::isSetBlackWhite(JUtility::TColor black, JUtility::TColor whit
     return tmp <= max_tev_stage;
 }
 
-/* 803068F8-80306958 301238 0060+00 1/0 0/0 0/0 .text            getBlack__12J2DPictureExCFv */
 JUtility::TColor J2DPictureEx::getBlack() const {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -1125,7 +1051,6 @@ JUtility::TColor J2DPictureEx::getBlack() const {
     }
 }
 
-/* 80306958-803069B8 301298 0060+00 1/0 0/0 0/0 .text            getWhite__12J2DPictureExCFv */
 JUtility::TColor J2DPictureEx::getWhite() const {
     JUtility::TColor black, white;
     if (!getBlackWhite(&black, &white)) {
@@ -1135,7 +1060,6 @@ JUtility::TColor J2DPictureEx::getWhite() const {
     }
 }
 
-/* 803069B8-803069D8 3012F8 0020+00 1/0 0/0 0/0 .text            setAlpha__12J2DPictureExFUc */
 void J2DPictureEx::setAlpha(u8 alpha) {
     mAlpha = alpha;
     if (mMaterial != NULL && mMaterial->getColorBlock()->getMatColor(0) != NULL) {
@@ -1143,7 +1067,6 @@ void J2DPictureEx::setAlpha(u8 alpha) {
     }
 }
 
-/* 803069D8-80306A0C 301318 0034+00 1/0 0/0 0/0 .text setCullBack__12J2DPictureExF11_GXCullMode */
 void J2DPictureEx::setCullBack(GXCullMode cullMode) {
     mCullMode = cullMode;
     if (mMaterial != NULL) {
@@ -1152,15 +1075,12 @@ void J2DPictureEx::setCullBack(GXCullMode cullMode) {
     J2DPane::setCullBack(cullMode);
 }
 
-/* 80306A0C-80306A24 30134C 0018+00 1/0 0/0 0/0 .text            rewriteAlpha__12J2DPictureExFv */
 void J2DPictureEx::rewriteAlpha() {
     if (mMaterial != NULL) {
         mAlpha = mMaterial->getColorBlock()->getMatColor(0)->a;
     }
 }
 
-/* 80306A24-80306AC4 301364 00A0+00 1/0 0/0 0/0 .text            isUsed__12J2DPictureExFPC7ResTIMG
- */
 bool J2DPictureEx::isUsed(ResTIMG const* texInfo) {
     if (mMaterial != NULL && mMaterial->getTevBlock() != NULL) {
         for (u32 i = 0; i < 8; i++) {
@@ -1173,46 +1093,34 @@ bool J2DPictureEx::isUsed(ResTIMG const* texInfo) {
     return J2DPane::isUsed(texInfo);
 }
 
-/* 80306AC4-80306AF0 301404 002C+00 1/0 0/0 0/0 .text setAnimation__12J2DPictureExFP11J2DAnmColor
- */
 void J2DPictureEx::setAnimation(J2DAnmColor* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80306AF0-80306B1C 301430 002C+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP19J2DAnmTextureSRTKey          */
 void J2DPictureEx::setAnimation(J2DAnmTextureSRTKey* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80306B1C-80306B48 30145C 002C+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP16J2DAnmTexPattern             */
 void J2DPictureEx::setAnimation(J2DAnmTexPattern* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80306B48-80306B74 301488 002C+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP15J2DAnmTevRegKey              */
 void J2DPictureEx::setAnimation(J2DAnmTevRegKey* anm) {
     if (mMaterial != NULL) {
         mMaterial->setAnimation(anm);
     }
 }
 
-/* 80306B74-80306B7C -00001 0008+00 0/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP20J2DAnmVisibilityFull         */
 void J2DPictureEx::setAnimation(J2DAnmVisibilityFull* anm) {
     field_0x194 = anm;
 }
 
-/* 80306B7C-80306C70 3014BC 00F4+00 1/0 0/0 0/0 .text
- * setAnimation__12J2DPictureExFP14J2DAnmVtxColor               */
 void J2DPictureEx::setAnimation(J2DAnmVtxColor* anm) {
     field_0x198 = anm;
     field_0x19c = 0;
@@ -1248,8 +1156,6 @@ void J2DPictureEx::setAnimation(J2DAnmVtxColor* anm) {
     }
 }
 
-/* 80306C70-80306DC8 3015B0 0158+00 1/0 0/0 0/0 .text
- * animationPane__12J2DPictureExFPC15J2DAnmTransform            */
 const J2DAnmTransform* J2DPictureEx::animationPane(J2DAnmTransform const* anm) {
     if (field_0x194 != NULL && field_0x154 != 0xffff) {
         u8 tmp;
@@ -1283,7 +1189,6 @@ const J2DAnmTransform* J2DPictureEx::animationPane(J2DAnmTransform const* anm) {
     return J2DPane::animationPane(anm);
 }
 
-/* 80306DC8-80306ED4 301708 010C+00 1/0 0/0 0/0 .text            getUsableTlut__12J2DPictureExFUc */
 u8 J2DPictureEx::getUsableTlut(u8 param_0) {
     u32 tex_gen_num = mMaterial->getTexGenBlock()->getTexGenNum();
     u8 usedTluts = 0;
@@ -1311,84 +1216,64 @@ u8 J2DPictureEx::getUsableTlut(u8 param_0) {
     return 0;
 }
 
-/* 80306ED4-80306F04 301814 0030+00 1/0 0/0 0/0 .text            append__12J2DPictureExFPC7ResTIMGf
- */
 bool J2DPictureEx::append(ResTIMG const* param_0, f32 param_1) {
     return append(param_0, NULL, param_1);
 }
 
-/* 80306F04-80306F34 301844 0030+00 1/0 0/0 0/0 .text            append__12J2DPictureExFPCcf */
 bool J2DPictureEx::append(char const* param_0, f32 param_1) {
     return append(param_0, NULL, param_1);
 }
 
-/* 80306F34-80306F64 301874 0030+00 1/0 0/0 0/0 .text prepend__12J2DPictureExFP10JUTTexturef */
 void J2DPictureEx::prepend(JUTTexture* param_0, f32 param_1) {
     insert(param_0, 0, param_1);
 }
 
-/* 80306F64-80306F94 3018A4 0030+00 1/0 0/0 0/0 .text prepend__12J2DPictureExFPCcP10JUTPalettef */
 void J2DPictureEx::prepend(char const* param_0, JUTPalette* param_1, f32 param_2) {
     insert(param_0, param_1, 0, param_2);
 }
 
-/* 80306F94-80306FC4 3018D4 0030+00 1/0 0/0 0/0 .text            prepend__12J2DPictureExFPCcf */
 void J2DPictureEx::prepend(char const* param_0, f32 param_1) {
     insert(param_0, 0, param_1);
 }
 
-/* 80306FC4-80306FF4 301904 0030+00 1/0 0/0 0/0 .text
- * prepend__12J2DPictureExFPC7ResTIMGP10JUTPalettef             */
 void J2DPictureEx::prepend(ResTIMG const* param_0, JUTPalette* param_1, f32 param_2) {
     insert(param_0, param_1, 0, param_2);
 }
 
-/* 80306FF4-80307024 301934 0030+00 1/0 0/0 0/0 .text            prepend__12J2DPictureExFPC7ResTIMGf
- */
 void J2DPictureEx::prepend(ResTIMG const* param_0, f32 param_1) {
     insert(param_0, 0, param_1);
 }
 
-/* 80307024-80307058 301964 0034+00 1/0 0/0 0/0 .text            insert__12J2DPictureExFPCcUcf */
 bool J2DPictureEx::insert(char const* param_0, u8 param_1, f32 param_2) {
     return insert(param_0, NULL, param_1, param_2);
 }
 
-/* 80307058-8030708C 301998 0034+00 1/0 0/0 0/0 .text insert__12J2DPictureExFPC7ResTIMGUcf */
 bool J2DPictureEx::insert(ResTIMG const* param_0, u8 param_1, f32 param_2) {
     return insert(param_0, NULL, param_1, param_2);
 }
 
-/* 8030708C-803070D0 3019CC 0044+00 1/0 0/0 0/0 .text            draw__12J2DPictureExFffbbb */
 void J2DPictureEx::draw(f32 param_0, f32 param_1, bool param_2, bool param_3, bool param_4) {
     return draw(param_0, param_1, 0, param_2, param_3, param_4);
 }
 
-/* 803070D0-80307134 301A10 0064+00 1/0 0/0 0/0 .text            drawOut__12J2DPictureExFffffffff */
 void J2DPictureEx::drawOut(f32 param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
                                f32 param_5, f32 param_6, f32 param_7) {
     drawOut(JGeometry::TBox2<f32>(param_0, param_1, param_0 + param_2, param_1 + param_3),
             JGeometry::TBox2<f32>(param_4, param_5, param_4 + param_6, param_5 + param_7));
 }
 
-/* 80307134-80307168 301A74 0034+00 1/0 0/0 0/0 .text            load__12J2DPictureExFUc */
 void J2DPictureEx::load(u8 param_0) {
     load((GXTexMapID)param_0, param_0);
 }
 
-/* 80307168-803071A4 301AA8 003C+00 1/0 0/0 0/0 .text            setCullBack__12J2DPictureExFb */
 void J2DPictureEx::setCullBack(bool param_0) {
     setCullBack(param_0 ? GX_CULL_BACK : GX_CULL_NONE);
 }
 
-/* 803071A4-803071C4 301AE4 0020+00 1/0 0/0 0/0 .text            isUsed__12J2DPictureExFPC7ResFONT
- */
 bool J2DPictureEx::isUsed(ResFONT const* param_0) {
     return J2DPane::isUsed(param_0);
 }
 
-/* 803071C4-803071E4 301B04 0020+00 1/0 0/0 0/0 .text setAnimation__12J2DPictureExFP10J2DAnmBase
- */
 void J2DPictureEx::setAnimation(J2DAnmBase* param_0) {
     J2DPane::setAnimation(param_0);
 }