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

8 files changed, 0 insertions, 279 deletions

diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
index 82056cc44a..54aa056235 100644
--- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp
@@ -8,8 +8,6 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "dolphin/os.h"
 
-/* 80337B40-80338134 332480 05F4+00 0/0 7/7 1/1 .text
- * load__20J3DAnmLoaderDataBaseFPCv24J3DAnmLoaderDataBaseFlag   */
 J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseFlag flag) {
     if (!i_data) {
         return NULL;
@@ -91,8 +89,6 @@ J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseF
     return NULL;
 }
 
-/* 80338134-80338468 332A74 0334+00 0/0 1/1 0/0 .text
- * setResource__20J3DAnmLoaderDataBaseFP10J3DAnmBasePCv         */
 void J3DAnmLoaderDataBase::setResource(J3DAnmBase* param_1, const void* param_2) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_2;
     if (!header) {
@@ -171,19 +167,14 @@ void J3DAnmLoaderDataBase::setResource(J3DAnmBase* param_1, const void* param_2)
     }
 }
 
-/* 80338468-80338484 332DA8 001C+00 2/2 0/0 0/0 .text            __ct__20J3DAnmFullLoader_v15Fv */
 J3DAnmFullLoader_v15::J3DAnmFullLoader_v15() {}
 
-/* 80338484-803384E0 332DC4 005C+00 3/2 0/0 0/0 .text            __dt__20J3DAnmFullLoader_v15Fv */
 J3DAnmFullLoader_v15::~J3DAnmFullLoader_v15() {}
 
-/* 803384E0-803384FC 332E20 001C+00 2/2 0/0 0/0 .text            __ct__19J3DAnmKeyLoader_v15Fv */
 J3DAnmKeyLoader_v15::J3DAnmKeyLoader_v15() {}
 
-/* 803384FC-80338558 332E3C 005C+00 3/2 0/0 0/0 .text            __dt__19J3DAnmKeyLoader_v15Fv */
 J3DAnmKeyLoader_v15::~J3DAnmKeyLoader_v15() {}
 
-/* 80338558-803386A0 332E98 0148+00 2/1 0/0 0/0 .text            load__20J3DAnmFullLoader_v15FPCv */
 J3DAnmBase* J3DAnmFullLoader_v15::load(const void* param_1) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_1;
     const JUTDataBlockHeader* block = &header->mFirstBlock;
@@ -216,8 +207,6 @@ J3DAnmBase* J3DAnmFullLoader_v15::load(const void* param_1) {
     return mAnm;
 }
 
-/* 803386A0-80338800 332FE0 0160+00 2/1 0/0 0/0 .text
- * setResource__20J3DAnmFullLoader_v15FP10J3DAnmBasePCv         */
 void J3DAnmFullLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_2;
     const JUTDataBlockHeader* block = &header->mFirstBlock;
@@ -250,14 +239,10 @@ void J3DAnmFullLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2)
     }
 }
 
-/* 80338800-80338828 333140 0028+00 1/1 0/0 0/0 .text
- * readAnmTransform__20J3DAnmFullLoader_v15FPC23J3DAnmTransformFullData */
 void J3DAnmFullLoader_v15::readAnmTransform(const J3DAnmTransformFullData* param_1) {
     setAnmTransform((J3DAnmTransformFull*)mAnm, param_1);
 }
 
-/* 80338828-803388BC 333168 0094+00 2/2 0/0 0/0 .text
- * setAnmTransform__20J3DAnmFullLoader_v15FP19J3DAnmTransformFullPC23J3DAnmTransformFullData */
 void J3DAnmFullLoader_v15::setAnmTransform(J3DAnmTransformFull* param_1,
                                            const J3DAnmTransformFullData* param_2) {
     param_1->field_0x1e = param_2->field_0xc;
@@ -272,14 +257,10 @@ void J3DAnmFullLoader_v15::setAnmTransform(J3DAnmTransformFull* param_1,
 }
 
 
-/* 803388BC-803388E4 3331FC 0028+00 1/1 0/0 0/0 .text
- * readAnmColor__20J3DAnmFullLoader_v15FPC19J3DAnmColorFullData */
 void J3DAnmFullLoader_v15::readAnmColor(const J3DAnmColorFullData* param_1) {
     setAnmColor((J3DAnmColorFull*)mAnm, param_1);
 }
 
-/* 803388E4-803389B0 333224 00CC+00 2/2 0/0 0/0 .text
- * setAnmColor__20J3DAnmFullLoader_v15FP15J3DAnmColorFullPC19J3DAnmColorFullData */
 void J3DAnmFullLoader_v15::setAnmColor(J3DAnmColorFull* param_1,
                                        const J3DAnmColorFullData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -298,14 +279,10 @@ void J3DAnmFullLoader_v15::setAnmColor(J3DAnmColorFull* param_1,
         JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mNameTabOffset));
 }
 
-/* 803389B0-803389D8 3332F0 0028+00 1/1 0/0 0/0 .text
- * readAnmTexPattern__20J3DAnmFullLoader_v15FPC24J3DAnmTexPatternFullData */
 void J3DAnmFullLoader_v15::readAnmTexPattern(const J3DAnmTexPatternFullData* param_1) {
     setAnmTexPattern((J3DAnmTexPattern*)mAnm, param_1);
 }
 
-/* 803389D8-80338A7C 333318 00A4+00 2/2 0/0 0/0 .text
- * setAnmTexPattern__20J3DAnmFullLoader_v15FP16J3DAnmTexPatternPC24J3DAnmTexPatternFullData */
 void J3DAnmFullLoader_v15::setAnmTexPattern(J3DAnmTexPattern* param_1,
                                             const J3DAnmTexPatternFullData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -322,14 +299,10 @@ void J3DAnmFullLoader_v15::setAnmTexPattern(J3DAnmTexPattern* param_1,
         JSUConvertOffsetToPtr<ResNTAB>(param_2, param_2->mNameTabOffset));
 }
 
-/* 80338A7C-80338AA4 3333BC 0028+00 1/1 0/0 0/0 .text
- * readAnmVisibility__20J3DAnmFullLoader_v15FPC24J3DAnmVisibilityFullData */
 void J3DAnmFullLoader_v15::readAnmVisibility(const J3DAnmVisibilityFullData* param_1) {
     setAnmVisibility((J3DAnmVisibilityFull*)mAnm, param_1);
 }
 
-/* 80338AA4-80338B20 3333E4 007C+00 2/2 0/0 0/0 .text
- * setAnmVisibility__20J3DAnmFullLoader_v15FP20J3DAnmVisibilityFullPC24J3DAnmVisibilityFullData */
 void J3DAnmFullLoader_v15::setAnmVisibility(J3DAnmVisibilityFull* param_1,
                                             const J3DAnmVisibilityFullData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -342,14 +315,10 @@ void J3DAnmFullLoader_v15::setAnmVisibility(J3DAnmVisibilityFull* param_1,
     param_1->mVisibility = JSUConvertOffsetToPtr<u8>(param_2, param_2->mValuesOffset);
 }
 
-/* 80338B20-80338B48 333460 0028+00 1/1 0/0 0/0 .text
- * readAnmCluster__20J3DAnmFullLoader_v15FPC21J3DAnmClusterFullData */
 void J3DAnmFullLoader_v15::readAnmCluster(const J3DAnmClusterFullData* param_1) {
     setAnmCluster((J3DAnmClusterFull*)mAnm, param_1);
 }
 
-/* 80338B48-80338BB4 333488 006C+00 2/2 0/0 0/0 .text
- * setAnmCluster__20J3DAnmFullLoader_v15FP17J3DAnmClusterFullPC21J3DAnmClusterFullData */
 void J3DAnmFullLoader_v15::setAnmCluster(J3DAnmClusterFull* param_1,
                                          const J3DAnmClusterFullData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -360,14 +329,10 @@ void J3DAnmFullLoader_v15::setAnmCluster(J3DAnmClusterFull* param_1,
     param_1->mWeight = JSUConvertOffsetToPtr<f32>(param_2, param_2->mWeightOffset);
 }
 
-/* 80338BB4-80338BDC 3334F4 0028+00 1/1 0/0 0/0 .text
- * readAnmVtxColor__20J3DAnmFullLoader_v15FPC22J3DAnmVtxColorFullData */
 void J3DAnmFullLoader_v15::readAnmVtxColor(const J3DAnmVtxColorFullData* param_1) {
     setAnmVtxColor((J3DAnmVtxColorFull*)mAnm, param_1);
 }
 
-/* 80338BDC-80338D44 33351C 0168+00 2/2 0/0 0/0 .text
- * setAnmVtxColor__20J3DAnmFullLoader_v15FP18J3DAnmVtxColorFullPC22J3DAnmVtxColorFullData */
 void J3DAnmFullLoader_v15::setAnmVtxColor(J3DAnmVtxColorFull* dst,
                                           const J3DAnmVtxColorFullData* data) {
     dst->mFrameMax = data->mFrameMax;
@@ -401,7 +366,6 @@ void J3DAnmFullLoader_v15::setAnmVtxColor(J3DAnmVtxColorFull* dst,
     dst->mColorA = JSUConvertOffsetToPtr<u8>(data, data->mAValuesOffset);
 }
 
-/* 80338D44-80338E8C 333684 0148+00 2/1 0/0 0/0 .text            load__19J3DAnmKeyLoader_v15FPCv */
 J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* param_1) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_1;
     const JUTDataBlockHeader* block = &header->mFirstBlock;
@@ -434,8 +398,6 @@ J3DAnmBase* J3DAnmKeyLoader_v15::load(const void* param_1) {
     return mAnm;
 }
 
-/* 80338E8C-80338FEC 3337CC 0160+00 2/1 0/0 0/0 .text
- * setResource__19J3DAnmKeyLoader_v15FP10J3DAnmBasePCv          */
 void J3DAnmKeyLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2) {
     const JUTDataFileHeader* header = (const JUTDataFileHeader*)param_2;
     const JUTDataBlockHeader* block = &header->mFirstBlock;
@@ -467,14 +429,10 @@ void J3DAnmKeyLoader_v15::setResource(J3DAnmBase* param_1, const void* param_2)
     }
 }
 
-/* 80338FEC-80339014 33392C 0028+00 1/1 0/0 0/0 .text
- * readAnmTransform__19J3DAnmKeyLoader_v15FPC22J3DAnmTransformKeyData */
 void J3DAnmKeyLoader_v15::readAnmTransform(const J3DAnmTransformKeyData* param_1) {
     setAnmTransform((J3DAnmTransformKey*)mAnm, param_1);
 }
 
-/* 80339014-803390B0 333954 009C+00 2/2 0/0 0/0 .text
- * setAnmTransform__19J3DAnmKeyLoader_v15FP18J3DAnmTransformKeyPC22J3DAnmTransformKeyData */
 void J3DAnmKeyLoader_v15::setAnmTransform(J3DAnmTransformKey* param_1,
                                           const J3DAnmTransformKeyData* param_2) {
     param_1->field_0x1e = param_2->field_0xc;
@@ -490,14 +448,10 @@ void J3DAnmKeyLoader_v15::setAnmTransform(J3DAnmTransformKey* param_1,
 }
 
 
-/* 803390B0-803390D8 3339F0 0028+00 1/1 0/0 0/0 .text
- * readAnmTextureSRT__19J3DAnmKeyLoader_v15FPC23J3DAnmTextureSRTKeyData */
 void J3DAnmKeyLoader_v15::readAnmTextureSRT(const J3DAnmTextureSRTKeyData* param_1) {
     setAnmTextureSRT((J3DAnmTextureSRTKey*)mAnm, param_1);
 }
 
-/* 803390D8-803392B0 333A18 01D8+00 2/2 0/0 0/0 .text
- * setAnmTextureSRT__19J3DAnmKeyLoader_v15FP19J3DAnmTextureSRTKeyPC23J3DAnmTextureSRTKeyData */
 void J3DAnmKeyLoader_v15::setAnmTextureSRT(J3DAnmTextureSRTKey* param_1,
                                            const J3DAnmTextureSRTKeyData* param_2) {
     param_1->mTrackNum = param_2->field_0xc;
@@ -549,14 +503,10 @@ void J3DAnmKeyLoader_v15::setAnmTextureSRT(J3DAnmTextureSRTKey* param_1,
 }
 
 
-/* 803392B0-803392D8 333BF0 0028+00 1/1 0/0 0/0 .text
- * readAnmColor__19J3DAnmKeyLoader_v15FPC18J3DAnmColorKeyData   */
 void J3DAnmKeyLoader_v15::readAnmColor(const J3DAnmColorKeyData* param_1) {
     setAnmColor((J3DAnmColorKey*)mAnm, param_1);
 }
 
-/* 803392D8-803393C4 333C18 00EC+00 2/2 0/0 0/0 .text
- * setAnmColor__19J3DAnmKeyLoader_v15FP14J3DAnmColorKeyPC18J3DAnmColorKeyData */
 void J3DAnmKeyLoader_v15::setAnmColor(J3DAnmColorKey* param_1, const J3DAnmColorKeyData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
     param_1->mAttribute = param_2->field_0x8;
@@ -579,14 +529,10 @@ void J3DAnmKeyLoader_v15::setAnmColor(J3DAnmColorKey* param_1, const J3DAnmColor
 }
 
 
-/* 803393C4-803393EC 333D04 0028+00 1/1 0/0 0/0 .text
- * readAnmCluster__19J3DAnmKeyLoader_v15FPC20J3DAnmClusterKeyData */
 void J3DAnmKeyLoader_v15::readAnmCluster(const J3DAnmClusterKeyData* param_1) {
     setAnmCluster((J3DAnmClusterKey*)mAnm, param_1);
 }
 
-/* 803393EC-80339458 333D2C 006C+00 2/2 0/0 0/0 .text
- * setAnmCluster__19J3DAnmKeyLoader_v15FP16J3DAnmClusterKeyPC20J3DAnmClusterKeyData */
 void J3DAnmKeyLoader_v15::setAnmCluster(J3DAnmClusterKey* param_1,
                                         const J3DAnmClusterKeyData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -598,14 +544,10 @@ void J3DAnmKeyLoader_v15::setAnmCluster(J3DAnmClusterKey* param_1,
 }
 
 
-/* 80339458-80339480 333D98 0028+00 1/1 0/0 0/0 .text
- * readAnmTevReg__19J3DAnmKeyLoader_v15FPC19J3DAnmTevRegKeyData */
 void J3DAnmKeyLoader_v15::readAnmTevReg(const J3DAnmTevRegKeyData* param_1) {
     setAnmTevReg((J3DAnmTevRegKey*)mAnm, param_1);
 }
 
-/* 80339480-8033960C 333DC0 018C+00 2/2 0/0 0/0 .text
- * setAnmTevReg__19J3DAnmKeyLoader_v15FP15J3DAnmTevRegKeyPC19J3DAnmTevRegKeyData */
 void J3DAnmKeyLoader_v15::setAnmTevReg(J3DAnmTevRegKey* param_1,
                                        const J3DAnmTevRegKeyData* param_2) {
     param_1->mFrameMax = param_2->mFrameMax;
@@ -644,14 +586,10 @@ void J3DAnmKeyLoader_v15::setAnmTevReg(J3DAnmTevRegKey* param_1,
 }
 
 
-/* 8033960C-80339634 333F4C 0028+00 1/1 0/0 0/0 .text
- * readAnmVtxColor__19J3DAnmKeyLoader_v15FPC21J3DAnmVtxColorKeyData */
 void J3DAnmKeyLoader_v15::readAnmVtxColor(const J3DAnmVtxColorKeyData* param_1) {
     setAnmVtxColor((J3DAnmVtxColorKey*)mAnm, param_1);
 }
 
-/* 80339634-8033979C 333F74 0168+00 2/2 0/0 0/0 .text
- * setAnmVtxColor__19J3DAnmKeyLoader_v15FP17J3DAnmVtxColorKeyPC21J3DAnmVtxColorKeyData */
 void J3DAnmKeyLoader_v15::setAnmVtxColor(J3DAnmVtxColorKey* dst,
                                          const J3DAnmVtxColorKeyData* data) {
     dst->mFrameMax = data->mFrameMax;
diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
index d149bfc898..3abd6ea603 100644
--- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
@@ -11,7 +11,6 @@
 #include "dolphin/os.h"
 #include "string.h"
 
-/* 80334130-803341CC 32EA70 009C+00 0/0 1/1 0/0 .text load__24J3DClusterLoaderDataBaseFPCv */
 void* J3DClusterLoaderDataBase::load(const void* i_data) {
     const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data;
     if (fileHeader->mMagic == 'J3D1' && fileHeader->mType == 'bls1') {
@@ -23,13 +22,10 @@ void* J3DClusterLoaderDataBase::load(const void* i_data) {
     return NULL;
 }
 
-/* 803341CC-803341E8 32EB0C 001C+00 1/1 0/0 0/0 .text            __ct__20J3DClusterLoader_v15Fv */
 J3DClusterLoader_v15::J3DClusterLoader_v15() {}
 
-/* 803341E8-80334244 32EB28 005C+00 2/1 0/0 0/0 .text            __dt__20J3DClusterLoader_v15Fv */
 J3DClusterLoader_v15::~J3DClusterLoader_v15() {}
 
-/* 80334244-803342F8 32EB84 00B4+00 2/1 0/0 0/0 .text            load__20J3DClusterLoader_v15FPCv */
 void* J3DClusterLoader_v15::load(const void* i_data) {
     mpDeformData = new J3DDeformData();
 
@@ -50,8 +46,6 @@ void* J3DClusterLoader_v15::load(const void* i_data) {
     return mpDeformData;
 }
 
-/* 803342F8-803345FC 32EC38 0304+00 1/1 0/0 0/0 .text
- * readCluster__20J3DClusterLoader_v15FPC15J3DClusterBlock      */
 void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) {
     mpDeformData->mClusterNum = block->mClusterNum;
     mpDeformData->mClusterKeyNum = block->mClusterKeyNum;
diff --git a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
index fc05c1fdf1..0a93c6626d 100644
--- a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DJointFactory
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DJointFactory.h"
@@ -10,13 +5,11 @@
 #include "JSystem/J3DGraphAnimator/J3DJoint.h"
 #include "JSystem/JSupport/JSupport.h"
 
-/* 80337178-803371D0 331AB8 0058+00 0/0 1/1 0/0 .text __ct__15J3DJointFactoryFRC13J3DJointBlock */
 J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) {
     mJointInitData = JSUConvertOffsetToPtr<J3DJointInitData>(&block, (uintptr_t)block.mpJointInitData);
     mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpIndexTable);
 }
 
-/* 803371D0-80337338 331B10 0168+00 0/0 1/1 0/0 .text            create__15J3DJointFactoryFi */
 J3DJoint* J3DJointFactory::create(int no) {
     J3DJoint* joint = new J3DJoint();
     joint->mJntNo = no;
diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
index c6601ec64e..15a0a65feb 100644
--- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DMaterialFactory
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DMaterialFactory.h"
@@ -10,10 +5,7 @@
 #include "JSystem/JMath/JMath.h"
 #include "JSystem/JSupport/JSupport.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "dol2asm.h"
 
-/* 8032FFEC-80330234 32A92C 0248+00 0/0 7/7 0/0 .text
- * __ct__18J3DMaterialFactoryFRC16J3DMaterialBlock              */
 J3DMaterialFactory::J3DMaterialFactory(J3DMaterialBlock const& i_block) {
     mMaterialNum = i_block.mMaterialNum;
     mpMaterialInitData = JSUConvertOffsetToPtr<J3DMaterialInitData>(&i_block, i_block.mpMaterialInitData);
@@ -55,8 +47,6 @@ J3DMaterialFactory::J3DMaterialFactory(J3DMaterialBlock const& i_block) {
     mpMaterialMode = NULL;
 }
 
-/* 80330234-803302BC 32AB74 0088+00 0/0 2/2 0/0 .text
- * __ct__18J3DMaterialFactoryFRC18J3DMaterialDLBlock            */
 J3DMaterialFactory::J3DMaterialFactory(J3DMaterialDLBlock const& i_block) {
     mMaterialNum = i_block.mMaterialNum;
     mpMaterialInitData = NULL;
@@ -66,8 +56,6 @@ J3DMaterialFactory::J3DMaterialFactory(J3DMaterialDLBlock const& i_block) {
     mpMaterialMode = JSUConvertOffsetToPtr<u8>(&i_block, i_block.mpMaterialMode);
 }
 
-/* 803302BC-80330304 32ABFC 0048+00 0/0 3/3 0/0 .text countUniqueMaterials__18J3DMaterialFactoryFv
- */
 u16 J3DMaterialFactory::countUniqueMaterials() {
     u16 count = 0;
     s32 id = -1;
@@ -80,7 +68,6 @@ u16 J3DMaterialFactory::countUniqueMaterials() {
     return count;
 }
 
-/* 80330304-8033033C 32AC44 0038+00 4/4 0/0 0/0 .text countTexGens__18J3DMaterialFactoryCFi */
 u32 J3DMaterialFactory::countTexGens(int i_idx) const {
     u8 tex_gen_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexGenNumIdx;
     if (tex_gen_num_index != 0xff) {
@@ -89,7 +76,6 @@ u32 J3DMaterialFactory::countTexGens(int i_idx) const {
     return 0;
 }
 
-/* 8033033C-803303C4 32AC7C 0088+00 2/2 0/0 0/0 .text countStages__18J3DMaterialFactoryCFi */
 u32 J3DMaterialFactory::countStages(int i_idx) const {
     J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     u32 count1 = 0;
@@ -113,8 +99,6 @@ u32 J3DMaterialFactory::countStages(int i_idx) const {
     return count2;
 }
 
-/* 803303C4-80330440 32AD04 007C+00 0/0 4/4 0/0 .text
- * create__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl */
 J3DMaterial* J3DMaterialFactory::create(J3DMaterial* i_material, MaterialType i_type,
                                         int i_idx, u32 i_flags) const {
     switch (i_type) {
@@ -131,8 +115,6 @@ J3DMaterial* J3DMaterialFactory::create(J3DMaterial* i_material, MaterialType i_
     return i_material;
 }
 
-/* 80330440-80330D84 32AD80 0944+00 1/1 0/0 0/0 .text
- * createNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, int i_idx,
                                                       u32 i_flags) const {
     if (mpDisplayListInit != NULL) {
@@ -246,8 +228,6 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i
     return i_material;
 }
 
-/* 80330D84-8033168C 32B6C4 0908+00 1/1 0/0 0/0 .text
- * createPatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material, int i_idx,
                                                        u32 i_flags) const {
     if (i_material == NULL) {
@@ -339,8 +319,6 @@ J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material,
     return i_material;
 }
 
-/* 8033168C-803317D4 32BFCC 0148+00 0/0 1/1 0/0 .text
- * modifyPatchedCurrentMtx__18J3DMaterialFactoryCFP11J3DMateriali */
 void J3DMaterialFactory::modifyPatchedCurrentMtx(J3DMaterial* i_material, int i_idx) const {
     J3DTexCoord coord[8];
     u32 tex_gens = countTexGens(i_idx);
@@ -361,8 +339,6 @@ void J3DMaterialFactory::modifyPatchedCurrentMtx(J3DMaterial* i_material, int i_
     i_material->mCurrentMtx = currentMtx;
 }
 
-/* 803317D4-80331A7C 32C114 02A8+00 2/2 0/0 0/0 .text
- * createLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* i_material, int i_idx,
                                                       u32 i_flags) const {
     if (i_material == NULL) {
@@ -393,8 +369,6 @@ J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* i_material, i
     return i_material;
 }
 
-/* 80331A7C-80331AFC 32C3BC 0080+00 0/0 4/4 0/0 .text
- * calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl */
 u32 J3DMaterialFactory::calcSize(J3DMaterial* i_material, J3DMaterialFactory::MaterialType i_type,
                                   int i_idx, u32 i_flags) const {
     u32 size = 0;
@@ -412,8 +386,6 @@ u32 J3DMaterialFactory::calcSize(J3DMaterial* i_material, J3DMaterialFactory::Ma
     return size;
 }
 
-/* 80331AFC-80331C30 32C43C 0134+00 1/1 0/0 0/0 .text
- * calcSizeNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 u32 J3DMaterialFactory::calcSizeNormalMaterial(J3DMaterial* i_material, int i_idx,
                                                u32 i_flags) const {
     u32 size = 0;
@@ -447,8 +419,6 @@ u32 J3DMaterialFactory::calcSizeNormalMaterial(J3DMaterial* i_material, int i_id
     return size;
 }
 
-/* 80331C30-80331D00 32C570 00D0+00 1/1 0/0 0/0 .text
- * calcSizePatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 u32 J3DMaterialFactory::calcSizePatchedMaterial(J3DMaterial* i_material, int i_idx,
                                                 u32 i_flags) const {
     u32 size = 0;
@@ -469,8 +439,6 @@ u32 J3DMaterialFactory::calcSizePatchedMaterial(J3DMaterial* i_material, int i_i
     return size;
 }
 
-/* 80331D00-80331D18 32C640 0018+00 2/2 0/0 0/0 .text
- * calcSizeLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */
 u32 J3DMaterialFactory::calcSizeLockedMaterial(J3DMaterial* i_material, int i_idx,
                                                u32 i_flags) const {
     u32 size = 0;
@@ -481,10 +449,8 @@ u32 J3DMaterialFactory::calcSizeLockedMaterial(J3DMaterial* i_material, int i_id
     return size + sizeof(J3DDisplayListObj);
 }
 
-/* 804564A8-804564AC 004AA8 0004+00 1/1 0/0 0/0 .sdata2          @1691 */
 static GXColor const defaultMatColor = {0xff, 0xff, 0xff, 0xff};
 
-/* 80331D18-80331D74 32C658 005C+00 2/2 0/0 0/0 .text newMatColor__18J3DMaterialFactoryCFii */
 J3DGXColor J3DMaterialFactory::newMatColor(int i_idx, int i_no) const {
     J3DGXColor dflt = (J3DGXColor)defaultMatColor;
     u16 mat_color_index = mpMaterialInitData[mpMaterialID[i_idx]].mMatColorIdx[i_no];
@@ -495,7 +461,6 @@ J3DGXColor J3DMaterialFactory::newMatColor(int i_idx, int i_no) const {
     }
 }
 
-/* 80331D74-80331DAC 32C6B4 0038+00 2/2 0/0 0/0 .text newColorChanNum__18J3DMaterialFactoryCFi */
 u8 J3DMaterialFactory::newColorChanNum(int i_idx) const {
     u8 color_chan_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mColorChanNumIdx;
     if (color_chan_num_index != 0xff) {
@@ -505,7 +470,6 @@ u8 J3DMaterialFactory::newColorChanNum(int i_idx) const {
     }
 }
 
-/* 80331DAC-80331F50 32C6EC 01A4+00 2/2 0/0 0/0 .text newColorChan__18J3DMaterialFactoryCFii */
 J3DColorChan J3DMaterialFactory::newColorChan(int i_idx, int i_no) const {
     u32 r29 = 0;
     J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
@@ -516,10 +480,8 @@ J3DColorChan J3DMaterialFactory::newColorChan(int i_idx, int i_no) const {
     }
 }
 
-/* 804564AC-804564B0 004AAC 0004+00 1/1 0/0 0/0 .sdata2          @1798 */
 static GXColor const defaultAmbColor = {0x32, 0x32, 0x32, 0x32};
 
-/* 80331F50-80331FAC 32C890 005C+00 1/1 0/0 0/0 .text newAmbColor__18J3DMaterialFactoryCFii */
 J3DGXColor J3DMaterialFactory::newAmbColor(int i_idx, int i_no) const {
     J3DGXColor dflt = (J3DGXColor)defaultAmbColor;
     u16 amb_color_index = mpMaterialInitData[mpMaterialID[i_idx]].mAmbColorIdx[i_no];
@@ -530,7 +492,6 @@ J3DGXColor J3DMaterialFactory::newAmbColor(int i_idx, int i_no) const {
     }
 }
 
-/* 80331FAC-80331FE4 32C8EC 0038+00 2/2 0/0 0/0 .text newTexGenNum__18J3DMaterialFactoryCFi */
 u32 J3DMaterialFactory::newTexGenNum(int i_idx) const {
     u8 tex_gen_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexGenNumIdx;
     if (tex_gen_num_index != 0xff) {
@@ -540,7 +501,6 @@ u32 J3DMaterialFactory::newTexGenNum(int i_idx) const {
     }
 }
 
-/* 80331FE4-80332044 32C924 0060+00 3/3 0/0 0/0 .text newTexCoord__18J3DMaterialFactoryCFii */
 J3DTexCoord J3DMaterialFactory::newTexCoord(int i_idx, int i_no) const {
     u16 tex_coord_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexCoordIdx[i_no];
     if (tex_coord_index != 0xffff) {
@@ -550,8 +510,6 @@ J3DTexCoord J3DMaterialFactory::newTexCoord(int i_idx, int i_no) const {
     }
 }
 
-/* 80332044-803320CC 32C984 0088+00 2/2 0/0 0/0 .text            newTexMtx__18J3DMaterialFactoryCFii
- */
 J3DTexMtx* J3DMaterialFactory::newTexMtx(int i_idx, int i_no) const {
     J3DTexMtx* tex_mtx = NULL;
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
@@ -561,7 +519,6 @@ J3DTexMtx* J3DMaterialFactory::newTexMtx(int i_idx, int i_no) const {
     return tex_mtx;
 }
 
-/* 803320CC-8033210C 32CA0C 0040+00 2/2 0/0 0/0 .text newCullMode__18J3DMaterialFactoryCFi */
 u8 J3DMaterialFactory::newCullMode(int i_idx) const {
     u8 cull_mode_index = mpMaterialInitData[mpMaterialID[i_idx]].mCullModeIdx;
     if (cull_mode_index != 0xff) {
@@ -571,8 +528,6 @@ u8 J3DMaterialFactory::newCullMode(int i_idx) const {
     }
 }
 
-/* 8033210C-80332154 32CA4C 0048+00 2/2 0/0 0/0 .text            newTexNo__18J3DMaterialFactoryCFii
- */
 u16 J3DMaterialFactory::newTexNo(int i_idx, int i_no) const {
     u16 tex_no_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexNoIdx[i_no];
     if (tex_no_index != 0xffff) {
@@ -582,7 +537,6 @@ u16 J3DMaterialFactory::newTexNo(int i_idx, int i_no) const {
     }
 }
 
-/* 80332154-803321A0 32CA94 004C+00 2/2 0/0 0/0 .text newTevOrder__18J3DMaterialFactoryCFii */
 J3DTevOrder J3DMaterialFactory::newTevOrder(int i_idx, int i_no) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mTevOrderIdx[i_no] != 0xffff) {
@@ -592,7 +546,6 @@ J3DTevOrder J3DMaterialFactory::newTevOrder(int i_idx, int i_no) const {
     }
 }
 
-/* 803321A0-80332210 32CAE0 0070+00 2/2 0/0 0/0 .text newTevColor__18J3DMaterialFactoryCFii */
 J3DGXColorS10 J3DMaterialFactory::newTevColor(int i_idx, int i_no) const {
     J3DGXColorS10 dflt = (GXColorS10){0, 0, 0, 0};
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
@@ -603,10 +556,8 @@ J3DGXColorS10 J3DMaterialFactory::newTevColor(int i_idx, int i_no) const {
     }
 }
 
-/* 804564B0-804564B8 004AB0 0004+04 1/1 0/0 0/0 .sdata2          @1915 */
 static GXColor const defaultTevKColor = {0xff, 0xff, 0xff, 0xff};
 
-/* 80332210-8033226C 32CB50 005C+00 2/2 0/0 0/0 .text newTevKColor__18J3DMaterialFactoryCFii */
 J3DGXColor J3DMaterialFactory::newTevKColor(int i_idx, int i_no) const {
     J3DGXColor dflt = (J3DGXColor)defaultTevKColor;
     u16 tev_kcolor_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevKColorIdx[i_no];
@@ -617,7 +568,6 @@ J3DGXColor J3DMaterialFactory::newTevKColor(int i_idx, int i_no) const {
     }
 }
 
-/* 8033226C-803322A4 32CBAC 0038+00 2/2 0/0 0/0 .text newTevStageNum__18J3DMaterialFactoryCFi */
 u8 J3DMaterialFactory::newTevStageNum(int i_idx) const {
     u8 tev_stage_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevStageNumIdx;
     if (tev_stage_num_index != 0xff) {
@@ -627,7 +577,6 @@ u8 J3DMaterialFactory::newTevStageNum(int i_idx) const {
     }
 }
 
-/* 803322A4-80332304 32CBE4 0060+00 2/2 0/0 0/0 .text newTevStage__18J3DMaterialFactoryCFii */
 J3DTevStage J3DMaterialFactory::newTevStage(int i_idx, int i_no) const {
     u16 tev_stage_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevStageIdx[i_no];
     if (tev_stage_index != 0xffff) {
@@ -637,8 +586,6 @@ J3DTevStage J3DMaterialFactory::newTevStage(int i_idx, int i_no) const {
     }
 }
 
-/* 80332304-803323A0 32CC44 009C+00 1/1 0/0 0/0 .text
- * newTevSwapModeTable__18J3DMaterialFactoryCFii                */
 J3DTevSwapModeTable J3DMaterialFactory::newTevSwapModeTable(int i_idx, int i_no) const {
     u16 tev_swap_mode_table_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevSwapModeTableIdx[i_no];
     if (tev_swap_mode_table_index != 0xffff) {
@@ -648,8 +595,6 @@ J3DTevSwapModeTable J3DMaterialFactory::newTevSwapModeTable(int i_idx, int i_no)
     }
 }
 
-/* 803323A0-803323C8 32CCE0 0028+00 2/2 0/0 0/0 .text newIndTexStageNum__18J3DMaterialFactoryCFi
- */
 u8 J3DMaterialFactory::newIndTexStageNum(int i_idx) const {
     if (mpIndInitData[i_idx].mEnabled == true) {
         return mpIndInitData[i_idx].mIndTexStageNum;
@@ -658,7 +603,6 @@ u8 J3DMaterialFactory::newIndTexStageNum(int i_idx) const {
     }
 }
 
-/* 803323C8-8033240C 32CD08 0044+00 2/2 0/0 0/0 .text newIndTexOrder__18J3DMaterialFactoryCFii */
 J3DIndTexOrder J3DMaterialFactory::newIndTexOrder(int i_idx, int i_no) const {
     J3DIndTexOrder dflt;
     if (mpIndInitData[i_idx].mEnabled == true) {
@@ -668,7 +612,6 @@ J3DIndTexOrder J3DMaterialFactory::newIndTexOrder(int i_idx, int i_no) const {
     }
 }
 
-/* 8033240C-803324B4 32CD4C 00A8+00 2/2 0/0 0/0 .text newIndTexMtx__18J3DMaterialFactoryCFii */
 J3DIndTexMtx J3DMaterialFactory::newIndTexMtx(int i_idx, int i_no) const {
     J3DIndTexMtx dflt;
     if (mpIndInitData[i_idx].mEnabled == true) {
@@ -678,7 +621,6 @@ J3DIndTexMtx J3DMaterialFactory::newIndTexMtx(int i_idx, int i_no) const {
     }
 }
 
-/* 803324B4-80332648 32CDF4 0194+00 2/2 0/0 0/0 .text newIndTevStage__18J3DMaterialFactoryCFii */
 J3DIndTevStage J3DMaterialFactory::newIndTevStage(int i_idx, int i_no) const {
     J3DIndTevStage dflt;
     if (mpIndInitData[i_idx].mEnabled == true) {
@@ -688,8 +630,6 @@ J3DIndTevStage J3DMaterialFactory::newIndTevStage(int i_idx, int i_no) const {
     }
 }
 
-/* 80332648-8033268C 32CF88 0044+00 2/2 0/0 0/0 .text
- * newIndTexCoordScale__18J3DMaterialFactoryCFii                */
 J3DIndTexCoordScale J3DMaterialFactory::newIndTexCoordScale(int i_idx, int i_no) const {
     J3DIndTexCoordScale dflt;
     if (mpIndInitData[i_idx].mEnabled == true) {
@@ -699,7 +639,6 @@ J3DIndTexCoordScale J3DMaterialFactory::newIndTexCoordScale(int i_idx, int i_no)
     }
 }
 
-/* 8033268C-80332768 32CFCC 00DC+00 2/2 0/0 0/0 .text            newFog__18J3DMaterialFactoryCFi */
 J3DFog J3DMaterialFactory::newFog(int i_idx) const {
     J3DFog fog;
     u16 fog_index = mpMaterialInitData[mpMaterialID[i_idx]].mFogIdx;
@@ -709,7 +648,6 @@ J3DFog J3DMaterialFactory::newFog(int i_idx) const {
     return fog;
 }
 
-/* 80332768-803327E8 32D0A8 0080+00 2/2 0/0 0/0 .text newAlphaComp__18J3DMaterialFactoryCFi */
 J3DAlphaComp J3DMaterialFactory::newAlphaComp(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mAlphaCompIdx != 0xffff) {
@@ -719,8 +657,6 @@ J3DAlphaComp J3DMaterialFactory::newAlphaComp(int i_idx) const {
     }
 }
 
-/* 803327E8-8033282C 32D128 0044+00 2/2 0/0 0/0 .text            newBlend__18J3DMaterialFactoryCFi
- */
 J3DBlend J3DMaterialFactory::newBlend(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mBlendIdx != 0xffff) {
@@ -730,8 +666,6 @@ J3DBlend J3DMaterialFactory::newBlend(int i_idx) const {
     }
 }
 
-/* 8033282C-8033288C 32D16C 0060+00 2/2 0/0 0/0 .text            newZMode__18J3DMaterialFactoryCFi
- */
 J3DZMode J3DMaterialFactory::newZMode(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mZModeIdx != 0xff) {
@@ -741,7 +675,6 @@ J3DZMode J3DMaterialFactory::newZMode(int i_idx) const {
     }
 }
 
-/* 8033288C-803328C4 32D1CC 0038+00 2/2 0/0 0/0 .text newZCompLoc__18J3DMaterialFactoryCFi */
 u8 J3DMaterialFactory::newZCompLoc(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mZCompLocIdx != 0xff){
@@ -751,8 +684,6 @@ u8 J3DMaterialFactory::newZCompLoc(int i_idx) const {
     }
 }
 
-/* 803328C4-803328FC 32D204 0038+00 2/2 0/0 0/0 .text            newDither__18J3DMaterialFactoryCFi
- */
 u8 J3DMaterialFactory::newDither(int i_idx) const {
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mDitherIdx != 0xff){
@@ -762,7 +693,6 @@ u8 J3DMaterialFactory::newDither(int i_idx) const {
     }
 }
 
-/* 803328FC-803329A0 32D23C 00A4+00 1/1 0/0 0/0 .text newNBTScale__18J3DMaterialFactoryCFi */
 J3DNBTScale J3DMaterialFactory::newNBTScale(int i_idx) const {
     J3DNBTScale dflt(j3dDefaultNBTScaleInfo);
     J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
index 4198965ef3..52a8f9e89b 100644
--- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DMaterialFactory_v21
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h"
@@ -11,8 +6,6 @@
 #include "JSystem/JMath/JMath.h"
 #include "JSystem/JSupport/JSupport.h"
 
-/* 80332DA4-80332F84 32D6E4 01E0+00 0/0 2/2 0/0 .text
- * __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21      */
 J3DMaterialFactory_v21::J3DMaterialFactory_v21(J3DMaterialBlock_v21 const& i_block) {
     mMaterialNum = i_block.mMaterialNum;
     mpMaterialInitData = JSUConvertOffsetToPtr<J3DMaterialInitData_v21>(&i_block, i_block.mpMaterialInitData);
@@ -43,8 +36,6 @@ J3DMaterialFactory_v21::J3DMaterialFactory_v21(J3DMaterialBlock_v21 const& i_blo
     mpNBTScaleInfo = JSUConvertOffsetToPtr<J3DNBTScaleInfo>(&i_block, i_block.mpNBTScaleInfo);
 }
 
-/* 80332F84-80332FA8 32D8C4 0024+00 0/0 1/1 0/0 .text
- * countUniqueMaterials__22J3DMaterialFactory_v21Fv             */
 u16 J3DMaterialFactory_v21::countUniqueMaterials() {
     u16 i;
     for (i = 0; i < mMaterialNum; i++) {
@@ -52,7 +43,6 @@ u16 J3DMaterialFactory_v21::countUniqueMaterials() {
     return i;
 }
 
-/* 80332FA8-80332FE0 32D8E8 0038+00 1/1 0/0 0/0 .text countTexGens__22J3DMaterialFactory_v21CFi */
 u32 J3DMaterialFactory_v21::countTexGens(int i_idx) const {
     u8 tex_gen_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexGenNumIdx;
     if (tex_gen_num_index != 0xff) {
@@ -61,7 +51,6 @@ u32 J3DMaterialFactory_v21::countTexGens(int i_idx) const {
     return 0;
 }
 
-/* 80332FE0-80333068 32D920 0088+00 1/1 0/0 0/0 .text countStages__22J3DMaterialFactory_v21CFi */
 u32 J3DMaterialFactory_v21::countStages(int i_idx) const {
     J3DMaterialInitData_v21* init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     u32 count1 = 0;
@@ -85,8 +74,6 @@ u32 J3DMaterialFactory_v21::countStages(int i_idx) const {
     return count2;
 }
 
-/* 80333068-803337D8 32D9A8 0770+00 0/0 2/2 0/0 .text
- * create__22J3DMaterialFactory_v21CFP11J3DMaterialiUl          */
 J3DMaterial* J3DMaterialFactory_v21::create(J3DMaterial* i_material, int i_idx, u32 i_flags) const {
     const u32 stages = countStages(i_idx);
     u32 tev_stage_num = getMdlDataFlag_TevStageNum(i_flags);
@@ -175,7 +162,6 @@ J3DMaterial* J3DMaterialFactory_v21::create(J3DMaterial* i_material, int i_idx,
     return i_material;
 }
 
-/* 803337D8-80333834 32E118 005C+00 1/1 0/0 0/0 .text newMatColor__22J3DMaterialFactory_v21CFii */
 J3DGXColor J3DMaterialFactory_v21::newMatColor(int i_idx, int i_no) const {
     GXColor defaultColor = {0xff,0xff,0xff,0xff};
     J3DGXColor defaultJ3DGXColor = J3DGXColor(defaultColor);
@@ -186,8 +172,6 @@ J3DGXColor J3DMaterialFactory_v21::newMatColor(int i_idx, int i_no) const {
     return J3DGXColor(defaultJ3DGXColor);
 }
 
-/* 80333834-8033386C 32E174 0038+00 1/1 0/0 0/0 .text newColorChanNum__22J3DMaterialFactory_v21CFi
- */
 u8 J3DMaterialFactory_v21::newColorChanNum(int i_idx) const {
     u8 color_chan_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mColorChanNumIdx;
     if (color_chan_num_index != 0xff) {
@@ -197,8 +181,6 @@ u8 J3DMaterialFactory_v21::newColorChanNum(int i_idx) const {
     }
 }
 
-/* 8033386C-80333A10 32E1AC 01A4+00 1/1 0/0 0/0 .text newColorChan__22J3DMaterialFactory_v21CFii
- */
 J3DColorChan J3DMaterialFactory_v21::newColorChan(int i_idx, int i_no) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mColorChanIdx[i_no] != 0xffff) {
@@ -208,7 +190,6 @@ J3DColorChan J3DMaterialFactory_v21::newColorChan(int i_idx, int i_no) const {
     }
 }
 
-/* 80333A10-80333A48 32E350 0038+00 1/1 0/0 0/0 .text newTexGenNum__22J3DMaterialFactory_v21CFi */
 u32 J3DMaterialFactory_v21::newTexGenNum(int i_idx) const {
     u8 tex_gen_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexGenNumIdx;
     if (tex_gen_num_index != 0xff) {
@@ -218,7 +199,6 @@ u32 J3DMaterialFactory_v21::newTexGenNum(int i_idx) const {
     }
 }
 
-/* 80333A48-80333AA8 32E388 0060+00 1/1 0/0 0/0 .text newTexCoord__22J3DMaterialFactory_v21CFii */
 J3DTexCoord J3DMaterialFactory_v21::newTexCoord(int i_idx, int i_no) const {
     u16 tex_coord_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexCoordIdx[i_no];
     if (tex_coord_index != 0xffff) {
@@ -228,7 +208,6 @@ J3DTexCoord J3DMaterialFactory_v21::newTexCoord(int i_idx, int i_no) const {
     }
 }
 
-/* 80333AA8-80333B30 32E3E8 0088+00 1/1 0/0 0/0 .text newTexMtx__22J3DMaterialFactory_v21CFii */
 J3DTexMtx* J3DMaterialFactory_v21::newTexMtx(int i_idx, int i_no) const {
     J3DTexMtx* tex_mtx = NULL;
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
@@ -238,7 +217,6 @@ J3DTexMtx* J3DMaterialFactory_v21::newTexMtx(int i_idx, int i_no) const {
     return tex_mtx;
 }
 
-/* 80333B30-80333B70 32E470 0040+00 1/1 0/0 0/0 .text newCullMode__22J3DMaterialFactory_v21CFi */
 u8 J3DMaterialFactory_v21::newCullMode(int i_idx) const {
     u8 cull_mode_index = mpMaterialInitData[mpMaterialID[i_idx]].mCullModeIdx;
     if (cull_mode_index != 0xff) {
@@ -248,7 +226,6 @@ u8 J3DMaterialFactory_v21::newCullMode(int i_idx) const {
     }
 }
 
-/* 80333B70-80333BB8 32E4B0 0048+00 1/1 0/0 0/0 .text newTexNo__22J3DMaterialFactory_v21CFii */
 u16 J3DMaterialFactory_v21::newTexNo(int i_idx, int i_no) const {
     u16 tex_no_index = mpMaterialInitData[mpMaterialID[i_idx]].mTexNoIdx[i_no];
     if (tex_no_index != 0xffff) {
@@ -258,7 +235,6 @@ u16 J3DMaterialFactory_v21::newTexNo(int i_idx, int i_no) const {
     }
 }
 
-/* 80333BB8-80333C04 32E4F8 004C+00 1/1 0/0 0/0 .text newTevOrder__22J3DMaterialFactory_v21CFii */
 J3DTevOrder J3DMaterialFactory_v21::newTevOrder(int i_idx, int i_no) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mTevOrderIdx[i_no] != 0xffff) {
@@ -268,7 +244,6 @@ J3DTevOrder J3DMaterialFactory_v21::newTevOrder(int i_idx, int i_no) const {
     }
 }
 
-/* 80333C04-80333C74 32E544 0070+00 1/1 0/0 0/0 .text newTevColor__22J3DMaterialFactory_v21CFii */
 J3DGXColorS10 J3DMaterialFactory_v21::newTevColor(int i_idx, int i_no) const {
     GXColorS10 defaultTevColor = {0,0,0,0};
     J3DGXColorS10 dflt = defaultTevColor;
@@ -280,8 +255,6 @@ J3DGXColorS10 J3DMaterialFactory_v21::newTevColor(int i_idx, int i_no) const {
     }
 }
 
-/* 80333C74-80333CD0 32E5B4 005C+00 1/1 0/0 0/0 .text newTevKColor__22J3DMaterialFactory_v21CFii
- */
 J3DGXColor J3DMaterialFactory_v21::newTevKColor(int i_idx, int param_1) const {
     GXColor defaultColor = {0xff,0xff,0xff,0xff};
     J3DGXColor defaultJ3DGXColor = J3DGXColor(defaultColor);
@@ -292,8 +265,6 @@ J3DGXColor J3DMaterialFactory_v21::newTevKColor(int i_idx, int param_1) const {
     return J3DGXColor(defaultJ3DGXColor);
 }
 
-/* 80333CD0-80333D08 32E610 0038+00 1/1 0/0 0/0 .text newTevStageNum__22J3DMaterialFactory_v21CFi
- */
 u8 J3DMaterialFactory_v21::newTevStageNum(int i_idx) const {
     u8 tev_stage_num_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevStageNumIdx;
     if (tev_stage_num_index != 0xff) {
@@ -303,7 +274,6 @@ u8 J3DMaterialFactory_v21::newTevStageNum(int i_idx) const {
     }
 }
 
-/* 80333D08-80333D68 32E648 0060+00 1/1 0/0 0/0 .text newTevStage__22J3DMaterialFactory_v21CFii */
 J3DTevStage J3DMaterialFactory_v21::newTevStage(int i_idx, int i_no) const {
     u16 tev_stage_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevStageIdx[i_no];
     if (tev_stage_index != 0xffff) {
@@ -313,8 +283,6 @@ J3DTevStage J3DMaterialFactory_v21::newTevStage(int i_idx, int i_no) const {
     }
 }
 
-/* 80333D68-80333E04 32E6A8 009C+00 1/1 0/0 0/0 .text
- * newTevSwapModeTable__22J3DMaterialFactory_v21CFii            */
 J3DTevSwapModeTable J3DMaterialFactory_v21::newTevSwapModeTable(int i_idx, int param_1) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mTevSwapModeTableIdx[param_1] != 0xffff) {
@@ -323,8 +291,6 @@ J3DTevSwapModeTable J3DMaterialFactory_v21::newTevSwapModeTable(int i_idx, int p
     return J3DTevSwapModeTable(j3dDefaultTevSwapModeTable);
 }
 
-/* 80333E04-80333EE0 32E744 00DC+00 1/1 0/0 0/0 .text            newFog__22J3DMaterialFactory_v21CFi
- */
 J3DFog J3DMaterialFactory_v21::newFog(int i_idx) const {
     J3DFog fog;
     u16 fog_index = mpMaterialInitData[mpMaterialID[i_idx]].mFogIdx;
@@ -334,7 +300,6 @@ J3DFog J3DMaterialFactory_v21::newFog(int i_idx) const {
     return fog;
 }
 
-/* 80333EE0-80333F60 32E820 0080+00 1/1 0/0 0/0 .text newAlphaComp__22J3DMaterialFactory_v21CFi */
 J3DAlphaComp J3DMaterialFactory_v21::newAlphaComp(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mAlphaCompIdx != 0xffff) {
@@ -343,7 +308,6 @@ J3DAlphaComp J3DMaterialFactory_v21::newAlphaComp(int i_idx) const {
     return J3DAlphaComp(0xffff);
 }
 
-/* 80333F60-80333FA4 32E8A0 0044+00 1/1 0/0 0/0 .text newBlend__22J3DMaterialFactory_v21CFi */
 J3DBlend J3DMaterialFactory_v21::newBlend(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mBlendIdx != 0xffff) {
@@ -353,7 +317,6 @@ J3DBlend J3DMaterialFactory_v21::newBlend(int i_idx) const {
     }
 }
 
-/* 80333FA4-80334004 32E8E4 0060+00 1/1 0/0 0/0 .text newZMode__22J3DMaterialFactory_v21CFi */
 J3DZMode J3DMaterialFactory_v21::newZMode(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mZModeIdx != 0xff) {
@@ -363,7 +326,6 @@ J3DZMode J3DMaterialFactory_v21::newZMode(int i_idx) const {
     }
 }
 
-/* 80334004-8033403C 32E944 0038+00 1/1 0/0 0/0 .text newZCompLoc__22J3DMaterialFactory_v21CFi */
 u8 J3DMaterialFactory_v21::newZCompLoc(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mZCompLocIdx != 0xff){
@@ -373,7 +335,6 @@ u8 J3DMaterialFactory_v21::newZCompLoc(int i_idx) const {
     }
 }
 
-/* 8033403C-80334074 32E97C 0038+00 1/1 0/0 0/0 .text newDither__22J3DMaterialFactory_v21CFi */
 u8 J3DMaterialFactory_v21::newDither(int i_idx) const {
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
     if (mtl_init_data->mDitherIdx != 0xff){
@@ -383,7 +344,6 @@ u8 J3DMaterialFactory_v21::newDither(int i_idx) const {
     }
 }
 
-/* 80334074-80334118 32E9B4 00A4+00 1/1 0/0 0/0 .text newNBTScale__22J3DMaterialFactory_v21CFi */
 J3DNBTScale J3DMaterialFactory_v21::newNBTScale(int i_idx) const {
     J3DNBTScale dflt(j3dDefaultNBTScaleInfo);
     J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]];
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
index 403bee5c42..49b0bd5887 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DModelLoader
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DModelLoader.h"
@@ -17,7 +12,6 @@
 #include "JSystem/JSupport/JSupport.h"
 #include "dolphin/os.h"
 
-/* 8033468C-803346BC 32EFCC 0030+00 1/1 0/0 0/0 .text            __ct__14J3DModelLoaderFv */
 J3DModelLoader::J3DModelLoader() :
                 mpModelData(NULL),
                 mpMaterialTable(NULL),
@@ -29,7 +23,6 @@ J3DModelLoader::J3DModelLoader() :
     /* empty function */
 }
 
-/* 803346BC-803347E0 32EFFC 0124+00 0/0 4/4 0/0 .text load__22J3DModelLoaderDataBaseFPCvUl */
 J3DModelData* J3DModelLoaderDataBase::load(void const* i_data, u32 i_flags) {
     if (i_data == NULL) {
         return NULL;
@@ -48,7 +41,6 @@ J3DModelData* J3DModelLoaderDataBase::load(void const* i_data, u32 i_flags) {
     return NULL;
 }
 
-/* 803347E0-80334ABC 32F120 02DC+00 4/1 0/0 0/0 .text            load__14J3DModelLoaderFPCvUl */
 J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) {
     JKRGetCurrentHeap()->getTotalFreeSize();
     mpModelData = new J3DModelData();
@@ -107,7 +99,6 @@ J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) {
 }
 
 
-/* 80334ABC-80334C20 32F3FC 0164+00 3/0 0/0 0/0 .text loadMaterialTable__14J3DModelLoaderFPCv */
 J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) {
     mpMaterialTable = new J3DMaterialTable();
     mpMaterialTable->clear();
@@ -136,8 +127,6 @@ J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) {
     return mpMaterialTable;
 }
 
-/* 80334C20-80334EE0 32F560 02C0+00 3/0 0/0 0/0 .text
- * loadBinaryDisplayList__14J3DModelLoaderFPCvUl                */
 J3DModelData* J3DModelLoader::loadBinaryDisplayList(void const* i_data, u32 i_flags) {
     mpModelData = new J3DModelData();
     mpModelData->clear();
@@ -200,8 +189,6 @@ J3DModelData* J3DModelLoader::loadBinaryDisplayList(void const* i_data, u32 i_fl
     return mpModelData;
 }
 
-/* 80334EE0-80335048 32F820 0168+00 3/0 0/0 0/0 .text            setupBBoardInfo__14J3DModelLoaderFv
- */
 void J3DModelLoader::setupBBoardInfo() {
     for (u16 i = 0; i < mpModelData->getJointNum(); i++) {
         J3DMaterial* mesh = mpModelData->getJointNodePointer(i)->getMesh();
@@ -240,8 +227,6 @@ void J3DModelLoader::setupBBoardInfo() {
     }
 }
 
-/* 80335048-803351A4 32F988 015C+00 2/2 0/0 0/0 .text
- * readInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl    */
 void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_flags) {
     mpModelData->mFlags = i_flags | i_block->mFlags;
     mpModelData->getJointTree().setFlag(mpModelData->mFlags);
@@ -263,7 +248,6 @@ void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_fla
     mpModelData->setHierarchy(JSUConvertOffsetToPtr<J3DModelHierarchy>(i_block, i_block->mpHierarchy));
 }
 
-/* 803351A4-803351D0 32FAE4 002C+00 1/1 0/0 0/0 .text getFmtType__FP17_GXVtxAttrFmtList7_GXAttr */
 static _GXCompType getFmtType(_GXVtxAttrFmtList* i_fmtList, _GXAttr i_attr) {
     for (; i_fmtList->attr != GX_VA_NULL; i_fmtList++) {
         if (i_fmtList->attr == i_attr) {
@@ -273,8 +257,6 @@ static _GXCompType getFmtType(_GXVtxAttrFmtList* i_fmtList, _GXAttr i_attr) {
     return GX_F32;
 }
 
-/* 803351D0-803353F0 32FB10 0220+00 2/2 0/0 0/0 .text
- * readVertex__14J3DModelLoaderFPC14J3DVertexBlock              */
 void J3DModelLoader::readVertex(J3DVertexBlock const* i_block) {
     J3DVertexData& vertex_data = mpModelData->getVertexData();
     vertex_data.mVtxAttrFmtList =
@@ -333,8 +315,6 @@ void J3DModelLoader::readVertex(J3DVertexBlock const* i_block) {
     }
 }
 
-/* 803353F0-80335480 32FD30 0090+00 2/2 0/0 0/0 .text
- * readEnvelop__14J3DModelLoaderFPC16J3DEnvelopeBlock           */
 void J3DModelLoader::readEnvelop(J3DEnvelopeBlock const* i_block) {
     mpModelData->getJointTree().mWEvlpMtxNum = i_block->mWEvlpMtxNum;
     mpModelData->getJointTree().mWEvlpMixMtxNum =
@@ -347,8 +327,6 @@ void J3DModelLoader::readEnvelop(J3DEnvelopeBlock const* i_block) {
         JSUConvertOffsetToPtr<Mtx>(i_block, i_block->mpInvJointMtx);
 }
 
-/* 80335480-80335530 32FDC0 00B0+00 2/2 0/0 0/0 .text readDraw__14J3DModelLoaderFPC12J3DDrawBlock
- */
 void J3DModelLoader::readDraw(J3DDrawBlock const* i_block) {
     J3DJointTree& joint_tree = mpModelData->getJointTree();
     joint_tree.mDrawMtxData.mEntryNum = i_block->mMtxNum - mpModelData->getJointTree().mWEvlpMtxNum;
@@ -365,8 +343,6 @@ void J3DModelLoader::readDraw(J3DDrawBlock const* i_block) {
 
 }
 
-/* 80335530-80335614 32FE70 00E4+00 2/2 0/0 0/0 .text
- * readJoint__14J3DModelLoaderFPC13J3DJointBlock                */
 void J3DModelLoader::readJoint(J3DJointBlock const* i_block) {
     J3DJointFactory factory(*i_block);
     mpModelData->getJointTree().mJointNum = i_block->mJointNum;
@@ -383,8 +359,6 @@ void J3DModelLoader::readJoint(J3DJointBlock const* i_block) {
     }
 }
 
-/* 80335614-80335890 32FF54 027C+00 1/0 0/0 0/0 .text
- * readMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl    */
 void J3DModelLoader_v26::readMaterial(J3DMaterialBlock const* i_block, u32 i_flags) {
     J3DMaterialFactory factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -427,8 +401,6 @@ void J3DModelLoader_v26::readMaterial(J3DMaterialBlock const* i_block, u32 i_fla
     }
 }
 
-/* 80335890-80335AF4 3301D0 0264+00 1/0 0/0 0/0 .text
- * readMaterial_v21__18J3DModelLoader_v21FPC20J3DMaterialBlock_v21Ul */
 void J3DModelLoader_v21::readMaterial_v21(J3DMaterialBlock_v21 const* i_block, u32 i_flags) {
     J3DMaterialFactory_v21 factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -468,8 +440,6 @@ void J3DModelLoader_v21::readMaterial_v21(J3DMaterialBlock_v21 const* i_block, u
     }
 }
 
-/* 80335AF4-80335C18 330434 0124+00 2/2 0/0 0/0 .text
- * readShape__14J3DModelLoaderFPC13J3DShapeBlockUl              */
 void J3DModelLoader::readShape(J3DShapeBlock const* i_block, u32 i_flags) {
     mpShapeBlock = i_block;
     J3DShapeTable* shape_table = mpModelData->getShapeTable();
@@ -494,8 +464,6 @@ void J3DModelLoader::readShape(J3DShapeBlock const* i_block, u32 i_flags) {
     }
 }
 
-/* 80335C18-80335CE4 330558 00CC+00 2/2 0/0 0/0 .text
- * readTexture__14J3DModelLoaderFPC15J3DTextureBlock            */
 void J3DModelLoader::readTexture(J3DTextureBlock const* i_block) {
     u16 texture_num = i_block->mTextureNum;
     ResTIMG* texture_res = JSUConvertOffsetToPtr<ResTIMG>(i_block, i_block->mpTextureRes);
@@ -508,8 +476,6 @@ void J3DModelLoader::readTexture(J3DTextureBlock const* i_block) {
     mpMaterialTable->mTexture = new J3DTexture(texture_num, texture_res);
 }
 
-/* 80335CE4-80335E20 330624 013C+00 1/0 0/0 0/0 .text
- * readMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */
 void J3DModelLoader_v26::readMaterialTable(J3DMaterialBlock const* i_block, u32 i_flags) {
     J3DMaterialFactory factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -530,8 +496,6 @@ void J3DModelLoader_v26::readMaterialTable(J3DMaterialBlock const* i_block, u32
     }
 }
 
-/* 80335E20-80335F5C 330760 013C+00 1/0 0/0 0/0 .text
- * readMaterialTable_v21__18J3DModelLoader_v21FPC20J3DMaterialBlock_v21Ul */
 void J3DModelLoader_v21::readMaterialTable_v21(J3DMaterialBlock_v21 const* i_block, u32 i_flags) {
     J3DMaterialFactory_v21 factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -552,8 +516,6 @@ void J3DModelLoader_v21::readMaterialTable_v21(J3DMaterialBlock_v21 const* i_blo
     }
 }
 
-/* 80335F5C-80336028 33089C 00CC+00 1/1 0/0 0/0 .text
- * readTextureTable__14J3DModelLoaderFPC15J3DTextureBlock       */
 void J3DModelLoader::readTextureTable(J3DTextureBlock const* i_block) {
     u16 texture_num = i_block->mTextureNum;
     ResTIMG* texture_res = JSUConvertOffsetToPtr<ResTIMG>(i_block, i_block->mpTextureRes);
@@ -566,8 +528,6 @@ void J3DModelLoader::readTextureTable(J3DTextureBlock const* i_block) {
     mpMaterialTable->mTexture = new J3DTexture(texture_num, texture_res);
 }
 
-/* 80336028-80336168 330968 0140+00 1/1 0/0 0/0 .text
- * readPatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl */
 void J3DModelLoader::readPatchedMaterial(J3DMaterialBlock const* i_block, u32 i_flags) {
     J3DMaterialFactory factory(*i_block);
     mpMaterialTable->mMaterialNum = i_block->mMaterialNum;
@@ -588,8 +548,6 @@ void J3DModelLoader::readPatchedMaterial(J3DMaterialBlock const* i_block, u32 i_
     }
 }
 
-/* 80336168-8033631C 330AA8 01B4+00 1/1 0/0 0/0 .text
- * readMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl    */
 void J3DModelLoader::readMaterialDL(J3DMaterialDLBlock const* i_block, u32 i_flags) {
     J3DMaterialFactory factory(*i_block);
     s32 flags;
@@ -623,8 +581,6 @@ void J3DModelLoader::readMaterialDL(J3DMaterialDLBlock const* i_block, u32 i_fla
     }
 }
 
-/* 8033631C-80336398 330C5C 007C+00 1/1 0/0 0/0 .text            modifyMaterial__14J3DModelLoaderFUl
- */
 void J3DModelLoader::modifyMaterial(u32 i_flags) {
     if (i_flags & 0x2000) {
         J3DMaterialFactory factory(*mpMaterialBlock);
diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
index 83183c6323..a1e72e8be1 100644
--- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DModelLoaderCalcSize
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.h"
@@ -16,7 +11,6 @@
 #include "global.h"
 
 
-/* 80336794-803367D4 3310D4 0040+00 0/0 3/0 0/0 .text countMaterialNum__14J3DModelLoaderFPCv */
 u16 J3DModelLoader::countMaterialNum(const void* stream) {
     const J3DModelFileData* header = (const J3DModelFileData*)stream;
     const J3DModelBlock* block = header->mBlocks;
@@ -29,7 +23,6 @@ u16 J3DModelLoader::countMaterialNum(const void* stream) {
     return 0;
 }
 
-/* 803367D4-803369A0 331114 01CC+00 0/0 3/0 0/0 .text calcLoadSize__14J3DModelLoaderFPCvUl */
 u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) {
     int flags = flags_;
     const J3DModelFileData* header = static_cast<const J3DModelFileData*>(stream);
@@ -74,8 +67,6 @@ u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) {
     return size;
 }
 
-/* 803369A0-80336A98 3312E0 00F8+00 0/0 3/0 0/0 .text
- * calcLoadMaterialTableSize__14J3DModelLoaderFPCv              */
 u32 J3DModelLoader::calcLoadMaterialTableSize(const void* stream) {
     size_t size;
     const J3DModelBlock* nextBlock;
@@ -118,8 +109,6 @@ inline u32 getBdlFlag_MaterialType(u32 flags) {
     return flags & (J3DMLF_13 | J3DMLF_DoBdlMaterialCalc);
 }
 
-/* 80336A98-80336CD8 3313D8 0240+00 0/0 3/0 0/0 .text
- * calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl        */
 // NONMATCHING flags issue
 u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags) {
     u32 size = 0;
@@ -176,8 +165,6 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags)
     return size;
 }
 
-/* 80336CD8-80336D64 331618 008C+00 2/2 0/0 0/0 .text
- * calcSizeInformation__14J3DModelLoaderFPC17J3DModelInfoBlockUl */
 u32 J3DModelLoader::calcSizeInformation(const J3DModelInfoBlock* block, u32 flags) {
 	int size = 0;
 	switch ((flags | block->mFlags) & J3DMLF_MtxTypeMask) {
@@ -197,8 +184,6 @@ u32 J3DModelLoader::calcSizeInformation(const J3DModelInfoBlock* block, u32 flag
 	return size;
 }
 
-/* 80336D64-80336D90 3316A4 002C+00 2/2 0/0 0/0 .text
- * calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock            */
 u32 J3DModelLoader::calcSizeJoint(const J3DJointBlock* block) {
 	int size = 0;
 	if (block->mpNameTable) {
@@ -209,21 +194,15 @@ u32 J3DModelLoader::calcSizeJoint(const J3DJointBlock* block) {
 	return size;
 }
 
-/* 80336D90-80336DA0 3316D0 0010+00 2/2 0/0 0/0 .text
- * calcSizeEnvelope__14J3DModelLoaderFPC16J3DEnvelopeBlock      */
 u32 J3DModelLoader::calcSizeEnvelope(const J3DEnvelopeBlock* block) {
 	mEnvelopeSize = block->mWEvlpMtxNum;
 	return 0;
 }
 
-/* 80336DA0-80336DB4 3316E0 0014+00 2/2 0/0 0/0 .text
- * calcSizeDraw__14J3DModelLoaderFPC12J3DDrawBlock              */
 u32 J3DModelLoader::calcSizeDraw(const J3DDrawBlock* block) {
     return (block->mMtxNum - mEnvelopeSize) * 2; 
 }
 
-/* 80336DB4-80336EA0 3316F4 00EC+00 0/0 1/0 0/0 .text
- * calcSizeMaterial__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */
 u32 J3DModelLoader_v26::calcSizeMaterial(const J3DMaterialBlock* block, u32 flags) {
 	int padding = 0;
 	J3DMaterialFactory factory(*block);
@@ -249,8 +228,6 @@ u32 J3DModelLoader_v26::calcSizeMaterial(const J3DMaterialBlock* block, u32 flag
 	return size;
 }
 
-/* 80336EA0-80336F44 3317E0 00A4+00 2/2 0/0 0/0 .text
- * calcSizeShape__14J3DModelLoaderFPC13J3DShapeBlockUl          */
 u32 J3DModelLoader::calcSizeShape(const J3DShapeBlock* block, u32 flags) {
 	int size = 0;
 	J3DShapeFactory factory(*block);
@@ -268,8 +245,6 @@ u32 J3DModelLoader::calcSizeShape(const J3DShapeBlock* block, u32 flags) {
 	return size;
 }
 
-/* 80336F44-80336F60 331884 001C+00 3/3 0/0 0/0 .text
- * calcSizeTexture__14J3DModelLoaderFPC15J3DTextureBlock        */
 u32 J3DModelLoader::calcSizeTexture(const J3DTextureBlock* block) {
 	// TODO: use sizeofs here.
 	int padding = 0;
@@ -279,8 +254,6 @@ u32 J3DModelLoader::calcSizeTexture(const J3DTextureBlock* block) {
 	return padding + 0xC;
 }
 
-/* 80336F60-80336FF0 3318A0 0090+00 0/0 1/0 0/0 .text
- * calcSizeMaterialTable__18J3DModelLoader_v26FPC16J3DMaterialBlockUl */
 u32 J3DModelLoader_v26::calcSizeMaterialTable(const J3DMaterialBlock* block, u32 flags) {
     int size = 0;
     u32 count = block->mMaterialNum;
@@ -295,14 +268,10 @@ u32 J3DModelLoader_v26::calcSizeMaterialTable(const J3DMaterialBlock* block, u32
     return size;
 }
 
-/* 80336FF0-80337010 331930 0020+00 1/1 0/0 0/0 .text
- * calcSizeTextureTable__14J3DModelLoaderFPC15J3DTextureBlock   */
 u32 J3DModelLoader::calcSizeTextureTable(const J3DTextureBlock* block) {
 	return calcSizeTexture(block);
 }
 
-/* 80337010-803370A0 331950 0090+00 1/1 0/0 0/0 .text
- * calcSizePatchedMaterial__14J3DModelLoaderFPC16J3DMaterialBlockUl */
 u32 J3DModelLoader::calcSizePatchedMaterial(const J3DMaterialBlock* block, u32 flags) {
     int padding = 0;
     u32 count = block->mMaterialNum;
@@ -317,8 +286,6 @@ u32 J3DModelLoader::calcSizePatchedMaterial(const J3DMaterialBlock* block, u32 f
     return size;
 }
 
-/* 803370A0-80337178 3319E0 00D8+00 1/1 0/0 0/0 .text
- * calcSizeMaterialDL__14J3DModelLoaderFPC18J3DMaterialDLBlockUl */
 u32 J3DModelLoader::calcSizeMaterialDL(const J3DMaterialDLBlock* block, u32 flags_) {
     int flags = flags_;
 	size_t size = 0;
diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
index bf62cf02ea..8048b12bf8 100644
--- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+++ b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: J3DShapeFactory
-//
-
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
 #include "JSystem/J3DGraphLoader/J3DShapeFactory.h"
@@ -13,7 +8,6 @@
 #include "dolphin/os.h"
 #include "global.h"
 
-/* 80337350-80337400 331C90 00B0+00 0/0 2/2 0/0 .text __ct__15J3DShapeFactoryFRC13J3DShapeBlock */
 J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) {
     mShapeInitData = JSUConvertOffsetToPtr<J3DShapeInitData>(&block, (uintptr_t)block.mpShapeInitData);
     mIndexTable = JSUConvertOffsetToPtr<u16>(&block, (uintptr_t)block.mpIndexTable);
@@ -25,8 +19,6 @@ J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) {
     mVcdVatCmdBuffer = NULL;
 }
 
-/* 80337400-803375BC 331D40 01BC+00 0/0 1/1 0/0 .text
- * create__15J3DShapeFactoryFiUlP14_GXVtxDescList               */
 J3DShape* J3DShapeFactory::create(int no, u32 flag, GXVtxDescList* vtxDesc) {
     J3DShape* shape = new J3DShape;
     shape->mMtxGroupNum = getMtxGroupNum(no);
@@ -58,7 +50,6 @@ enum {
     J3DShapeMtxType_Multi = 0x03,
 };
 
-/* 803375BC-8033784C 331EFC 0290+00 1/1 0/0 0/0 .text newShapeMtx__15J3DShapeFactoryCFUlii */
 J3DShapeMtx* J3DShapeFactory::newShapeMtx(u32 flag, int shapeNo, int mtxGroupNo) const {
     J3DShapeMtx* ret = NULL;
     const J3DShapeInitData& shapeInitData = mShapeInitData[mIndexTable[shapeNo]];
@@ -109,8 +100,6 @@ J3DShapeMtx* J3DShapeFactory::newShapeMtx(u32 flag, int shapeNo, int mtxGroupNo)
     return ret;
 }
 
-/* 8033784C-803378D8 33218C 008C+00 1/1 0/0 0/0 .text            newShapeDraw__15J3DShapeFactoryCFii
- */
 J3DShapeDraw* J3DShapeFactory::newShapeDraw(int shapeNo, int mtxGroupNo) const {
     const J3DShapeInitData& shapeInitData = mShapeInitData[mIndexTable[shapeNo]];
     const J3DShapeDrawInitData& drawInitData =
@@ -119,15 +108,12 @@ J3DShapeDraw* J3DShapeFactory::newShapeDraw(int shapeNo, int mtxGroupNo) const {
                             drawInitData.mDisplayListSize);
 }
 
-/* 803378D8-80337944 332218 006C+00 0/0 1/1 0/0 .text allocVcdVatCmdBuffer__15J3DShapeFactoryFUl
- */
 void J3DShapeFactory::allocVcdVatCmdBuffer(u32 count) {
     mVcdVatCmdBuffer = new (0x20) u8[J3DShape::kVcdVatDLSize * count];
     for (u32 i = 0; i < (J3DShape::kVcdVatDLSize * count) / 4; i++)
         ((u32*)mVcdVatCmdBuffer)[i] = 0;
 }
 
-/* 80337944-803379D8 332284 0094+00 0/0 1/1 0/0 .text            calcSize__15J3DShapeFactoryFiUl */
 s32 J3DShapeFactory::calcSize(int shapeNo, u32 flag) {
     s32 size = 0x68;
 
@@ -144,13 +130,10 @@ s32 J3DShapeFactory::calcSize(int shapeNo, u32 flag) {
     return size;
 }
 
-/* 803379D8-803379E8 332318 0010+00 0/0 1/1 0/0 .text
- * calcSizeVcdVatCmdBuffer__15J3DShapeFactoryFUl                */
 s32 J3DShapeFactory::calcSizeVcdVatCmdBuffer(u32 count) {
     return ALIGN_NEXT(count * J3DShape::kVcdVatDLSize, 0x20);
 }
 
-/* 803379E8-80337AE0 332328 00F8+00 1/1 0/0 0/0 .text calcSizeShapeMtx__15J3DShapeFactoryCFUlii */
 s32 J3DShapeFactory::calcSizeShapeMtx(u32 flag, int shapeNo, int mtxGroupNo) const {
     const J3DShapeInitData& shapeInitData = mShapeInitData[mIndexTable[shapeNo]];
     u32 ret = 0;