Clean up code, remove fakematches, add UNUSED, enable warnings (#2992)

* Remove NDEBUG_DEFINED fakematch, clean up getName temps

* Fix ifdef

* Fix bad JSystem pch ifdef breaking decomp.me

* Remove Acch Chk fakematches

* Private Acch fields

* Fix some clangd errors in headers

* Add UNUSED macro for matching debug parameters

* Enable clangd unused-parameter warning

* Remove extern from initializers

Probably added by dol2asm?

* Fix process profile definitions

* Remove leftover dol2asm address comments

* Remove some unnecessary double casts

* Enable some more clangd warnings

* Fix missing usages of fopAcM_ct

* Fix wrong enum usage

* Fix more fakematches

34 files changed, 45 insertions, 327 deletions

diff --git a/src/JSystem/J2DGraph/J2DGrafContext.cpp b/src/JSystem/J2DGraph/J2DGrafContext.cpp
index 05a1d89cf5..3f920bc407 100644
--- a/src/JSystem/J2DGraph/J2DGrafContext.cpp
+++ b/src/JSystem/J2DGraph/J2DGrafContext.cpp
@@ -93,9 +93,6 @@ void J2DGrafContext::place(JGeometry::TBox2<f32> const& bounds) {
     mScissorBounds = bounds;
 }
 
-/* 802E9118-802E9234 2E3A58 011C+00 1/1 4/4 0/0 .text
- * setColor__14J2DGrafContextFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor
- */
 void J2DGrafContext::setColor(JUtility::TColor colorTL, JUtility::TColor colorTR,
                               JUtility::TColor colorBR, JUtility::TColor colorBL) {
     mColorTL = colorTL;
diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp
index 024adef56f..a0229abb69 100644
--- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp
+++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp
@@ -60,9 +60,6 @@ u32 J2DMaterialFactory::countStages(int param_0) const {
     return uVar3;
 }
 
-/* 802F2D1C-802F362C 2ED65C 0910+00 0/0 1/1 0/0 .text
- * create__18J2DMaterialFactoryCFP11J2DMaterialiUlP15J2DResReferenceP15J2DResReferenceP10JKRArchive
- */
 J2DMaterial* J2DMaterialFactory::create(J2DMaterial* param_0, int index, u32 param_2,
                                     J2DResReference* param_3, J2DResReference* param_4,
                                     JKRArchive* param_5) const {
diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp
index 93d2db9c11..9dfb3954d2 100644
--- a/src/JSystem/J2DGraph/J2DPrint.cpp
+++ b/src/JSystem/J2DGraph/J2DPrint.cpp
@@ -34,9 +34,6 @@ J2DPrint::J2DPrint(JUTFont* pFont, JUtility::TColor charColor, JUtility::TColor
     private_initiate(pFont, 0.0f, 0.0f, charColor, gradColor, 0, 0xFFFFFFFF, true);
 }
 
-/* 802F4394-802F4420 2EECD4 008C+00 0/0 6/6 0/0 .text
- * __ct__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor
- */
 J2DPrint::J2DPrint(JUTFont* pFont, f32 charSpacing, f32 lineSpacing, JUtility::TColor charColor,
                    JUtility::TColor gradColor, JUtility::TColor blackColor, JUtility::TColor whiteColor) {
     private_initiate(pFont, charSpacing, lineSpacing, charColor, gradColor, blackColor, whiteColor, false);
@@ -50,9 +47,6 @@ void J2DPrint::initiate() {
     }
 }
 
-/* 802F4468-802F4658 2EEDA8 01F0+00 1/1 0/0 0/0 .text
- * private_initiate__8J2DPrintFP7JUTFontffQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorb
- */
 void J2DPrint::private_initiate(JUTFont* pFont, f32 charSpacing, f32 lineSpacing, JUtility::TColor charColor,
                                 JUtility::TColor gradColor, JUtility::TColor blackColor,
                                 JUtility::TColor whiteColor, bool param_7) {
@@ -317,7 +311,7 @@ f32 J2DPrint::parse(const u8* pString, int length, int param_2, u16* param_3,
                 } else {
                     if (param_6) {
                         if (param_3 != NULL) {
-                            mFont->drawChar_scale(mCursorH + (f32)(s16)param_3[someIndex], mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true);
+                            mFont->drawChar_scale(mCursorH + (s16)param_3[someIndex], mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true);
                         } else {
                             mFont->drawChar_scale(mCursorH, mCursorV, (s32)mScaleX, (s32)mScaleY, iCharacter, true);
                         }
diff --git a/src/JSystem/J2DGraph/J2DTevs.cpp b/src/JSystem/J2DGraph/J2DTevs.cpp
index 69234af65f..cfd68821e5 100644
--- a/src/JSystem/J2DGraph/J2DTevs.cpp
+++ b/src/JSystem/J2DGraph/J2DTevs.cpp
@@ -108,48 +108,48 @@ J2DTexMtxInfo const j2dDefaultTexMtxInfo = {1,    1,    255,  255,  0.5f, 0.5f,
 
 J2DIndTexMtxInfo const j2dDefaultIndTexMtxInfo = {{0.5f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f}, 1};
 
-extern J2DTevStageInfo const j2dDefaultTevStageInfo = {
+J2DTevStageInfo const j2dDefaultTevStageInfo = {
     4,          GX_CC_RASC,    GX_CC_ZERO, GX_CC_ZERO, GX_CC_CPREV,   GX_TEV_ADD,
     GX_TB_ZERO, GX_CS_SCALE_1, 1,          GX_TEVPREV, GX_CA_RASA,    GX_CA_ZERO,
     GX_CA_ZERO, GX_CA_APREV,   GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, 1,
     GX_TEVPREV};
 
-extern const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = {
+const J2DIndTevStageInfo j2dDefaultIndTevStageInfo = {
     GX_INDTEXSTAGE0, GX_ITB_NONE, GX_ITB_NONE, GX_ITM_OFF,  GX_ITW_OFF,
     GX_ITW_OFF,      0,           0,           GX_ITBA_OFF,
 };
 
-extern const GXColor j2dDefaultColInfo = {255, 255, 255, 255};
+const GXColor j2dDefaultColInfo = {255, 255, 255, 255};
 
-extern const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = {
+const J2DTevOrderInfo j2dDefaultTevOrderInfoNull = {
     GX_TEXCOORD_NULL, GX_TEXMAP_NULL, GX_COLOR_NULL, 0};
 
-extern const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = {
+const J2DIndTexOrderInfo j2dDefaultIndTexOrderNull = {
     GX_TEXCOORD_NULL,
     GX_TEXMAP_NULL,
 };
 
-extern const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255};
+const GXColorS10 j2dDefaultTevColor = {255, 255, 255, 255};
 
-extern const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = {
+const J2DIndTexCoordScaleInfo j2dDefaultIndTexCoordScaleInfo = {
     GX_ITS_1,
     GX_ITS_1,
 };
 
-extern const GXColor j2dDefaultTevKColor = {255, 255, 255, 255};
+const GXColor j2dDefaultTevKColor = {255, 255, 255, 255};
 
-extern const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0};
+const J2DTevSwapModeInfo j2dDefaultTevSwapMode = {GX_TEV_SWAP0, GX_TEV_SWAP0, 0, 0};
 
-extern const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = {
+const J2DTevSwapModeTableInfo j2dDefaultTevSwapModeTable = {
     GX_CH_RED, GX_CH_GREEN, GX_CH_BLUE, GX_CH_ALPHA};
 
-extern const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA,
+const J2DBlendInfo j2dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA,
                                                  GX_LO_NOOP};
 
-extern const u8 j2dDefaultPEBlockDither = 0;
+const u8 j2dDefaultPEBlockDither = 0;
 
-extern const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0};
+const J2DColorChanInfo j2dDefaultColorChanInfo = {0, 3, 0, 0};
 
-extern const u8 j2dDefaultTevSwapTableID = 0x1B;
+const u8 j2dDefaultTevSwapTableID = 0x1B;
 
-extern const u16 j2dDefaultAlphaCmp = 0x00E7;
+const u16 j2dDefaultAlphaCmp = 0x00E7;
diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/src/JSystem/J2DGraph/J2DTextBox.cpp
index 2370cbf41a..d82fd37586 100644
--- a/src/JSystem/J2DGraph/J2DTextBox.cpp
+++ b/src/JSystem/J2DGraph/J2DTextBox.cpp
@@ -109,9 +109,6 @@ J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 para
     mTextFontOwned = true;
 }
 
-/* 802FFBC4-802FFC58 2FA504 0094+00 0/0 1/1 0/0 .text
- * __ct__10J2DTextBoxFUxRCQ29JGeometry8TBox2<f>PC7ResFONTPCcs18J2DTextBoxHBinding18J2DTextBoxVBinding
- */
 J2DTextBox::J2DTextBox(u64 tag, JGeometry::TBox2<f32> const& bounds, ResFONT const* p_font,
                        char const* string, s16 strLength, J2DTextBoxHBinding hBind,
                        J2DTextBoxVBinding vBind)
diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp
index 4ea29be479..8e02439053 100644
--- a/src/JSystem/J2DGraph/J2DWindow.cpp
+++ b/src/JSystem/J2DGraph/J2DWindow.cpp
@@ -423,9 +423,6 @@ void J2DWindow::resize(f32 param_0, f32 param_1) {
     }
 }
 
-/* 802FB12C-802FB1D8 2F5A6C 00AC+00 1/1 0/0 0/0 .text
- * setContentsColor__9J2DWindowFQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColorQ28JUtility6TColor
- */
 void J2DWindow::setContentsColor(JUtility::TColor param_0, JUtility::TColor param_1,
                                  JUtility::TColor param_2, JUtility::TColor param_3) {
     field_0x128.set(param_0);
diff --git a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
index 5d657c773a..3dc289a73d 100644
--- a/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
+++ b/src/JSystem/J3DGraphAnimator/J3DJointTree.cpp
@@ -20,9 +20,6 @@ J3DJointTree::J3DJointTree()
       mWEvlpMixMtxIndex(0), mWEvlpMixWeight(0), mInvJointMtx(NULL), mWEvlpImportantMtxIdx(0),
       field_0x40(0), mJointName(NULL) {}
 
-/* 80325A9C-80325C00 3203DC 0164+00 1/0 2/2 0/0 .text
- * makeHierarchy__12J3DJointTreeFP8J3DJointPPC17J3DModelHierarchyP16J3DMaterialTableP13J3DShapeTable
- */
 void J3DJointTree::makeHierarchy(J3DJoint* pJoint, const J3DModelHierarchy** pHierarchy,
                                  J3DMaterialTable* pMaterialTable, J3DShapeTable* pShapeTable) {
     J3D_ASSERT_NULLPTR(95, pHierarchy != NULL);
diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/src/JSystem/J3DGraphBase/J3DGD.cpp
index 4a4c08105a..de18c40798 100644
--- a/src/JSystem/J3DGraphBase/J3DGD.cpp
+++ b/src/JSystem/J3DGraphBase/J3DGD.cpp
@@ -335,9 +335,6 @@ static u8 GX2HWFiltConv[6] = {
     0x00, 0x04, 0x01, 0x05, 0x02, 0x06,
 };
 
-/* 8030E438-8030E5D4 308D78 019C+00 0/0 1/1 0/0 .text
- * J3DGDSetTexLookupMode__F11_GXTexMapID14_GXTexWrapMode14_GXTexWrapMode12_GXTexFilter12_GXTexFilterfffUcUc13_GXAnisotropy
- */
 void J3DGDSetTexLookupMode(GXTexMapID id, GXTexWrapMode wrap_s,
                            GXTexWrapMode wrap_t, GXTexFilter min_filt,
                            GXTexFilter mag_filt, f32 min_lod, f32 max_lod,
@@ -435,9 +432,6 @@ void J3DGDSetIndTexMtx(GXIndTexMtxID mtx_id, f32 offset[2][3], s8 scale_exp) {
     ));
 }
 
-/* 8030EE10-8030EF08 309750 00F8+00 0/0 2/2 0/0 .text
- * J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale
- */
 void J3DGDSetIndTexCoordScale(GXIndTexStageID indStageEven, GXIndTexScale scaleS0,
                               GXIndTexScale scaleT0, GXIndTexScale scaleS1,
                               GXIndTexScale scaleT1) {
@@ -451,9 +445,6 @@ void J3DGDSetIndTexCoordScale(GXIndTexStageID indStageEven, GXIndTexScale scaleS
     ));
 }
 
-/* 8030EF08-8030F108 309848 0200+00 0/0 2/2 0/0 .text
- * J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID
- */
 void J3DGDSetIndTexOrder(u32 count, GXTexCoordID texCoord0, GXTexMapID texMap0,
                          GXTexCoordID texCoord1, GXTexMapID texMap1,
                          GXTexCoordID texCoord2, GXTexMapID texMap2,
@@ -492,9 +483,6 @@ void J3DGDSetIndTexOrder(u32 count, GXTexCoordID texCoord0, GXTexMapID texMap0,
     J3DGDWriteBPCmd(BP_IND_MASK(mask, 0xF));
 }
 
-/* 8030F108-8030F294 309A48 018C+00 0/0 9/9 0/0 .text
- * J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID
- */
 void J3DGDSetTevOrder(GXTevStageID evenStage, GXTexCoordID coord0, GXTexMapID map0,
                       GXChannelID color0, GXTexCoordID coord1, GXTexMapID map1,
                       GXChannelID color1) {
diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
index 1f678df4be..acbd78b1b9 100644
--- a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp
@@ -67,11 +67,8 @@ u32 J3DShapeMtx::sCurrentPipeline;
 
 u8* J3DShapeMtx::sCurrentScaleFlag;
 
-// This below is technically part of J3DScaleFlag.
-/* 804515B0 0001+00 data_804515B0 None */
 bool J3DShapeMtx::sNBTFlag;
 
-/* 804515B1 0003+00 data_804515B1 None */
 bool J3DShapeMtx::sLODFlag;
 
 u32 J3DShapeMtx::sTexMtxLoadType;
diff --git a/src/JSystem/J3DGraphBase/J3DTevs.cpp b/src/JSystem/J3DGraphBase/J3DTevs.cpp
index 86183ea6f0..c7cceac95c 100644
--- a/src/JSystem/J3DGraphBase/J3DTevs.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTevs.cpp
@@ -315,7 +315,7 @@ void loadNBTScale(J3DNBTScale& NBTScale) {
     }
 }
 
-extern const J3DLightInfo j3dDefaultLightInfo = {
+const J3DLightInfo j3dDefaultLightInfo = {
     0.0f, 0.0f, 0.0f,
     0.0f, -1.0f, 0.0f,
     0xff, 0xff, 0xff, 0xff,
@@ -323,14 +323,14 @@ extern const J3DLightInfo j3dDefaultLightInfo = {
     1.0f, 0.0f, 0.0f,
 };
 
-extern J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = {
+J3DTexCoordInfo const j3dDefaultTexCoordInfo[8] = {
     {GX_MTX2x4, GX_TG_TEX0, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX1, GX_IDENTITY, 0},
     {GX_MTX2x4, GX_TG_TEX2, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX3, GX_IDENTITY, 0},
     {GX_MTX2x4, GX_TG_TEX4, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX5, GX_IDENTITY, 0},
     {GX_MTX2x4, GX_TG_TEX6, GX_IDENTITY, 0}, {GX_MTX2x4, GX_TG_TEX7, GX_IDENTITY, 0},
 };
 
-extern J3DTexMtxInfo const j3dDefaultTexMtxInfo = {
+J3DTexMtxInfo const j3dDefaultTexMtxInfo = {
     0x01,
     0x00,
     0xFF,
@@ -341,27 +341,27 @@ extern J3DTexMtxInfo const j3dDefaultTexMtxInfo = {
      1.0f},
 };
 
-extern J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo = {
+J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo = {
     0.5f, 0.0f, 0.0f,
     0.0f, 0.5f, 0.0f,
     1
 };
 
-extern J3DTevStageInfo const j3dDefaultTevStageInfo = {
+J3DTevStageInfo const j3dDefaultTevStageInfo = {
     0x04, 0x0A, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
     0x05, 0x07, 0x07, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
 };
 
-extern J3DIndTevStageInfo const j3dDefaultIndTevStageInfo = {
+J3DIndTevStageInfo const j3dDefaultIndTevStageInfo = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-extern J3DFogInfo const j3dDefaultFogInfo = {
+J3DFogInfo const j3dDefaultFogInfo = {
     0x00, 0x00, 0x0140, 0.0f, 0.0f, 0.1f, 10000.0f, 0xFF, 0xFF, 0xFF, 0x00,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 };
 
-extern J3DNBTScaleInfo const j3dDefaultNBTScaleInfo = {
+J3DNBTScaleInfo const j3dDefaultNBTScaleInfo = {
     0x00, 1.0f, 1.0f, 1.0f,
 };
 
@@ -413,7 +413,6 @@ void makeAlphaCmpTable() {
     }
 }
 
-extern u8 j3dZModeTable[96];
 u8 j3dZModeTable[96];
 
 void makeZModeTable() {
@@ -492,43 +491,43 @@ static void J3DGDLoadPostTexMtxImm(f32 (*param_1)[4], u32 param_2) {
     J3DGDWrite_f32(param_1[2][3]);
 }
 
-extern const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF};
+const GXColor j3dDefaultColInfo = {0xFF, 0xFF, 0xFF, 0xFF};
 
-extern const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32};
+const GXColor j3dDefaultAmbInfo = {0x32, 0x32, 0x32, 0x32};
 
-extern const u8 j3dDefaultNumChans = 1;
+const u8 j3dDefaultNumChans = 1;
 
-extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00};
+const J3DTevOrderInfo j3dDefaultTevOrderInfoNull = {0xFF, 0xFF, 0xFF, 0x00};
 
-extern const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull = {0xFF, 0xFF, 0x00, 0x00};
+const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull = {0xFF, 0xFF, 0x00, 0x00};
 
-extern const GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF};
+const GXColorS10 j3dDefaultTevColor = {0xFF, 0xFF, 0xFF, 0xFF};
 
-extern const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = {
+const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo = {
     0x00,
     0x00,
     0x00,
     0x00,
 };
 
-extern const GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF};
+const GXColor j3dDefaultTevKColor = {0xFF, 0xFF, 0xFF, 0xFF};
 
-extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode = {
+J3DTevSwapModeInfo const j3dDefaultTevSwapMode = {
     0x00,
     0x00,
     0x00,
     0x00,
 };
 
-extern const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable = {0x00, 0x01, 0x02, 0x03};
+const J3DTevSwapModeTableInfo j3dDefaultTevSwapModeTable = {0x00, 0x01, 0x02, 0x03};
 
-extern const J3DBlendInfo j3dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP};
+const J3DBlendInfo j3dDefaultBlendInfo = {GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_NOOP};
 
-extern const J3DColorChanInfo j3dDefaultColorChanInfo = {
+const J3DColorChanInfo j3dDefaultColorChanInfo = {
     0x00, 0x00, 0x00, 0x02, 0x02, 0x00, 0xFF, 0xFF,
 };
 
-extern const u8 j3dDefaultTevSwapTableID = 0x1B;
+const u8 j3dDefaultTevSwapTableID = 0x1B;
 
 const u16 j3dDefaultAlphaCmpID = 0x00E7;
 
diff --git a/src/JSystem/J3DGraphBase/J3DTransform.cpp b/src/JSystem/J3DGraphBase/J3DTransform.cpp
index cdc744c272..c1a246d104 100644
--- a/src/JSystem/J3DGraphBase/J3DTransform.cpp
+++ b/src/JSystem/J3DGraphBase/J3DTransform.cpp
@@ -70,12 +70,12 @@ void J3DCalcBBoardMtx(__REGISTER Mtx mtx) {
 	mtx[2][2] = z;
 }
 
-extern J3DTransformInfo const j3dDefaultTransformInfo = {
+J3DTransformInfo const j3dDefaultTransformInfo = {
     {1.0f, 1.0f, 1.0f}, {0, 0, 0}, {0.0f, 0.0f, 0.0f}};
 
-extern Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f};
+Vec const j3dDefaultScale = {1.0f, 1.0f, 1.0f};
 
-extern Mtx const j3dDefaultMtx = {
+Mtx const j3dDefaultMtx = {
     {1.0f, 0.0f, 0.0f, 0.0f}, {0.0f, 1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f, 0.0f}};
 
 void J3DCalcYBBoardMtx(Mtx mtx) {
@@ -541,7 +541,7 @@ loop:
 }
 #endif // clang-format on
 
-extern f32 const PSMulUnit01[] = {
+f32 const PSMulUnit01[] = {
     0.0f,
     -1.0f,
 };
diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp
index 072e7c1766..616c8f3671 100644
--- a/src/JSystem/JAudio2/JASAramStream.cpp
+++ b/src/JSystem/JAudio2/JASAramStream.cpp
@@ -19,9 +19,6 @@ u32 JASAramStream::sBlockSize;
 
 u32 JASAramStream::sChannelMax;
 
-/* 80451260 0001+00 data_80451260 None */
-/* 80451261 0001+00 data_80451261 None */
-/* 80451262 0006+00 data_80451262 None */
 bool struct_80451260;
 bool struct_80451261;
 
diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp
index 30de594808..ec57df253a 100644
--- a/src/JSystem/JAudio2/JASBNKParser.cpp
+++ b/src/JSystem/JAudio2/JASBNKParser.cpp
@@ -270,9 +270,6 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
     return bank;
 }
 
-/* 80299E68-80299F8C 2947A8 0124+00 1/1 0/0 0/0 .text
- * findOscPtr__Q212JASBNKParser4Ver0FP12JASBasicBankPCQ312JASBNKParser4Ver07THeaderPCQ312JASBNKParser4Ver04TOsc
- */
 JASOscillator::Data* JASBNKParser::Ver0::findOscPtr(JASBasicBank* bank, THeader const* header,
                                                     TOsc const* osc) {
     TOffsetData const* data = &header->mOffsets;
diff --git a/src/JSystem/JAudio2/osdsp_task.cpp b/src/JSystem/JAudio2/osdsp_task.cpp
index 520e1cd446..b1eae52efb 100644
--- a/src/JSystem/JAudio2/osdsp_task.cpp
+++ b/src/JSystem/JAudio2/osdsp_task.cpp
@@ -12,8 +12,6 @@ extern "C" void __DSP_remove_task(DSPTaskInfo* task);
 
 static void Dsp_Update_Request();
 
-/* 80451308 0001+00 data_80451308 None */
-/* 80451309 0003+00 data_80451309 None */
 static vu8 struct_80451308;
 static u8 struct_80451309;
 
diff --git a/src/JSystem/JGadget/linklist.cpp b/src/JSystem/JGadget/linklist.cpp
index 2bbe15f882..4a705dd5e7 100644
--- a/src/JSystem/JGadget/linklist.cpp
+++ b/src/JSystem/JGadget/linklist.cpp
@@ -22,9 +22,6 @@ JGadget::TNodeLinkList::erase(JGadget::TNodeLinkList::iterator it) {
     return erase(it, next);
 }
 
-/* 802DCAA0-802DCB08 2D73E0 0068+00 1/1 0/0 0/0 .text
- * erase__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorQ37JGadget13TNodeLinkList8iterator
- */
 JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::erase(iterator a, iterator b) {
     TLinkListNode* cur = a.node;
     TLinkListNode* end = b.node;
@@ -38,9 +35,6 @@ JGadget::TNodeLinkList::iterator JGadget::TNodeLinkList::erase(iterator a, itera
     return b;
 }
 
-/* 802DCB08-802DCBA8 2D7448 00A0+00 1/1 0/0 0/0 .text
- * splice__Q27JGadget13TNodeLinkListFQ37JGadget13TNodeLinkList8iteratorRQ27JGadget13TNodeLinkListQ37JGadget13TNodeLinkList8iterator
- */
 void JGadget::TNodeLinkList::splice(iterator it, TNodeLinkList& rSrc, iterator itSrc) {
     iterator itSrcNext = itSrc;
     ++itSrcNext;
diff --git a/src/JSystem/JKernel/JKRDvdRipper.cpp b/src/JSystem/JKernel/JKRDvdRipper.cpp
index 15a0ad5fe4..2a7a15609a 100644
--- a/src/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/src/JSystem/JKernel/JKRDvdRipper.cpp
@@ -18,9 +18,6 @@ static int decompSZS_subroutine(u8*, u8*);
 static u8* firstSrcData();
 static u8* nextSrcData(u8*);
 
-/* 802D9B98-802D9C54 2D44D8 00BC+00 0/0 1/1 0/0 .text
- * loadToMainRAM__12JKRDvdRipperFPCcPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
- */
 void* JKRDvdRipper::loadToMainRAM(char const* name, u8* dst, JKRExpandSwitch expandSwitch,
                                   u32 dstLength, JKRHeap* heap,
                                   JKRDvdRipper::EAllocDirection allocDirection, u32 offset,
@@ -33,9 +30,6 @@ void* JKRDvdRipper::loadToMainRAM(char const* name, u8* dst, JKRExpandSwitch exp
                          pCompression, param_8);
 }
 
-/* 802D9C54-802D9D10 2D4594 00BC+00 0/0 9/9 0/0 .text
- * loadToMainRAM__12JKRDvdRipperFlPUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
- */
 void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expandSwitch,
                                   u32 dstLength, JKRHeap* heap,
                                   JKRDvdRipper::EAllocDirection allocDirection, u32 offset,
@@ -50,9 +44,6 @@ void* JKRDvdRipper::loadToMainRAM(s32 entryNumber, u8* dst, JKRExpandSwitch expa
 
 static u8 errorRetry = 0x01;
 
-/* 802D9D10-802DA1E4 2D4650 04D4+00 2/2 0/0 0/0 .text
- * loadToMainRAM__12JKRDvdRipperFP10JKRDvdFilePUc15JKRExpandSwitchUlP7JKRHeapQ212JKRDvdRipper15EAllocDirectionUlPiPUl
- */
 void* JKRDvdRipper::loadToMainRAM(JKRDvdFile* dvdFile, u8* dst, JKRExpandSwitch expandSwitch,
                                   u32 dstLength, JKRHeap* heap,
                                   JKRDvdRipper::EAllocDirection allocDirection, u32 offset,
diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp
index bffe0680ef..f3678cb81b 100644
--- a/src/JSystem/JKernel/JKRExpHeap.cpp
+++ b/src/JSystem/JKernel/JKRExpHeap.cpp
@@ -564,9 +564,6 @@ void JKRExpHeap::appendUsedList(JKRExpHeap::CMemBlock* newblock) {
     newblock->mNext = NULL;
 }
 
-/* 802CFE68-802CFEB4 2CA7A8 004C+00 5/5 0/0 0/0 .text
- * setFreeBlock__10JKRExpHeapFPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlockPQ210JKRExpHeap9CMemBlock
- */
 void JKRExpHeap::setFreeBlock(CMemBlock* block, CMemBlock* prev, CMemBlock* next) {
     if (prev == NULL) {
         mHeadFreeList = block;
diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp
index f110012717..58400bc70d 100644
--- a/src/JSystem/JMessage/processor.cpp
+++ b/src/JSystem/JMessage/processor.cpp
@@ -402,9 +402,6 @@ void JMessage::TSequenceProcessor::on_jump(void const* pEntry, char const* pszTe
     do_jump(pEntry, pszText);
 }
 
-/* 802A8690-802A86A0 2A2FD0 0010+00 1/1 0/0 0/0 .text
- * on_branch_register__Q28JMessage18TSequenceProcessorFPFPCQ28JMessage18TSequenceProcessorUl_PCvPCvUl
- */
 void JMessage::TSequenceProcessor::on_branch_register(JMessage::TSequenceProcessor::branchPfn pfn, void const* pTarget, u32 uTarget) {
     JUT_ASSERT(669, eStatus_==STATUS_NORMAL);
 
diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/src/JSystem/JParticle/JPAEmitterManager.cpp
index 8a61d9f4dc..51e95a46ad 100644
--- a/src/JSystem/JParticle/JPAEmitterManager.cpp
+++ b/src/JSystem/JParticle/JPAEmitterManager.cpp
@@ -39,9 +39,6 @@ JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHea
     JUT_ASSERT(67, pWd);
 }
 
-/* 8027DEBC-8027DFA0 2787FC 00E4+00 0/0 3/3 0/0 .text
- * createSimpleEmitterID__17JPAEmitterManagerFRCQ29JGeometry8TVec3<f>UsUcUcP18JPAEmitterCallBackP19JPAParticleCallBack
- */
 JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(JGeometry::TVec3<f32> const& pos,
                                                          u16 resID, u8 group_id, u8 res_mgr_id,
                                                          JPAEmitterCallBack* emtrCB,
diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp
index 818d891b90..3aada44eb1 100644
--- a/src/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -189,8 +189,6 @@ void TFunctionValueAttribute_range::range_set(f64 begin, f64 end) {
     JUT_ASSERT(458, fDifference_>=TValue(0));
 }
 
-// /* 80281A08-80281D18 27C348 0310+00 2/2 0/0 0/0 .text
-//  * range_getParameter__Q27JStudio29TFunctionValueAttribute_rangeCFddd */
 f64 TFunctionValueAttribute_range::range_getParameter(f64 arg1, f64 arg2, f64 arg3) const {
     f64 progress = range_getParameter_progress(arg1);
     TFunctionValue::TEAdjust adjust = range_getAdjust();
@@ -256,9 +254,6 @@ f64 TFunctionValue_composite::getValue(f64 arg1) {
     return pfn_(arg1, container, data_getData());
 }
 
-/* 80281E5C-80281EC8 27C79C 006C+00 0/0 1/0 0/0 .text
- * composite_raw__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer<PQ27JStudio14TFunctionValue>RCQ37JStudio24TFunctionValue_composite5TDatad
- */
 f64 TFunctionValue_composite::composite_raw(TVector_pointer<TFunctionValue*> const& param_1,
                                                  TData const& param_2, f64 param_3) {
     u32 index = param_2.get_unsignedInteger();
@@ -273,9 +268,6 @@ f64 TFunctionValue_composite::composite_raw(TVector_pointer<TFunctionValue*> con
 }
 
 
-/* 80281EC8-8028202C 27C808 0164+00 0/0 1/0 0/0 .text
- * composite_index__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer<PQ27JStudio14TFunctionValue>RCQ37JStudio24TFunctionValue_composite5TDatad
- */
 f64 TFunctionValue_composite::composite_index(TVector_pointer<TFunctionValue*> const& param_1,
                                               TData const& param_2, f64 param_3) {
     s32 size = param_1.size();
@@ -337,9 +329,6 @@ struct TContainerEnumerator_const_TVector : public JGadget::TEnumerator<const T*
         : JGadget::TEnumerator<const T*>(param_1.begin(), param_1.end()) {}
 };
 
-/* 8028202C-80282094 27C96C 0068+00 0/0 1/0 0/0 .text
- * composite_parameter__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer<PQ27JStudio14TFunctionValue>RCQ37JStudio24TFunctionValue_composite5TDatad
- */
 f64
 TFunctionValue_composite::composite_parameter(TVector_pointer<TFunctionValue*> const& param_1,
                                               TData const& param_2, f64 param_3) {
@@ -353,9 +342,6 @@ TFunctionValue_composite::composite_parameter(TVector_pointer<TFunctionValue*> c
     return dVar4;
 }
 
-/* 80282094-80282118 27C9D4 0084+00 0/0 1/0 0/0 .text
- * composite_add__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer<PQ27JStudio14TFunctionValue>RCQ37JStudio24TFunctionValue_composite5TDatad
- */
 f64 TFunctionValue_composite::composite_add(TVector_pointer<TFunctionValue*> const& param_1,
                                                  TData const& param_2, f64 param_3) {
     f64 dVar4 = param_2.get_value();
@@ -369,9 +355,6 @@ f64 TFunctionValue_composite::composite_add(TVector_pointer<TFunctionValue*> con
     return dVar4;
 }
 
-/* 80282118-80282200 27CA58 00E8+00 0/0 1/0 0/0 .text
- * composite_subtract__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer<PQ27JStudio14TFunctionValue>RCQ37JStudio24TFunctionValue_composite5TDatad
- */
 f64 TFunctionValue_composite::composite_subtract(TVector_pointer<TFunctionValue*> const& param_1,
                                                  TData const& param_2, f64 param_3) {
     u32 size = param_1.size();
@@ -394,9 +377,6 @@ f64 TFunctionValue_composite::composite_subtract(TVector_pointer<TFunctionValue*
 }
 
 
-/* 80282200-80282284 27CB40 0084+00 0/0 1/0 0/0 .text
- * composite_multiply__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer<PQ27JStudio14TFunctionValue>RCQ37JStudio24TFunctionValue_composite5TDatad
- */
 f64 TFunctionValue_composite::composite_multiply(TVector_pointer<TFunctionValue*> const& param_1,
                                                  TData const& param_2, f64 param_3) {
     f64 dVar4 = param_2.get_value();
@@ -410,9 +390,6 @@ f64 TFunctionValue_composite::composite_multiply(TVector_pointer<TFunctionValue*
     return dVar4;
 }
 
-/* 80282284-8028236C 27CBC4 00E8+00 0/0 1/0 0/0 .text
- * composite_divide__Q27JStudio24TFunctionValue_compositeFRCQ27JGadget44TVector_pointer<PQ27JStudio14TFunctionValue>RCQ37JStudio24TFunctionValue_composite5TDatad
- */
 f64 TFunctionValue_composite::composite_divide(TVector_pointer<TFunctionValue*> const& param_1,
                                                  TData const& param_2, f64 param_3) {
     u32 size = param_1.size();
@@ -633,9 +610,6 @@ f64 TFunctionValue_list::update_INTERPOLATE_LINEAR_(const TFunctionValue_list& r
                                                     rThis._44[data._10 + 1]);
 }
 
-/* 80282C58-80282CA8 27D598 0050+00 1/1 0/0 0/0 .text
- * update_INTERPOLATE_PLATEAU___Q27JStudio19TFunctionValue_listFRCQ27JStudio19TFunctionValue_listRCQ37JStudio19TFunctionValue_list11TIndexData_
- */
 f64 TFunctionValue_list::update_INTERPOLATE_PLATEAU_(const TFunctionValue_list& rThis,
                                                      const TIndexData_& data) {
     const f32* arr = rThis._44;
@@ -645,9 +619,6 @@ f64 TFunctionValue_list::update_INTERPOLATE_PLATEAU_(const TFunctionValue_list&
 }
 
 
-/* 80282CA8-80282D34 27D5E8 008C+00 1/1 0/0 0/0 .text
- * update_INTERPOLATE_BSPLINE_dataMore3___Q27JStudio19TFunctionValue_listFRCQ27JStudio19TFunctionValue_listRCQ37JStudio19TFunctionValue_list11TIndexData_
- */
 f64 TFunctionValue_list::update_INTERPOLATE_BSPLINE_dataMore3_(
     TFunctionValue_list const& rThis, TFunctionValue_list::TIndexData_ const& param_2) {
     f64 dVar11 = rThis._44[param_2._10];
@@ -770,9 +741,6 @@ f64 TFunctionValue_list_parameter::update_INTERPOLATE_LINEAR_(
     return functionvalue::interpolateValue_linear(d, a[-2], a[-1], a[0], a[1]);
 }
 
-/* 80283024-80283060 27D964 003C+00 1/1 0/0 0/0 .text
- * update_INTERPOLATE_PLATEAU___Q27JStudio29TFunctionValue_list_parameterFRCQ27JStudio29TFunctionValue_list_parameterd
- */
 f64 TFunctionValue_list_parameter::update_INTERPOLATE_PLATEAU_(
     const TFunctionValue_list_parameter& rThis, f64 d) {
     const f32* a = rThis.dat3.get();
@@ -780,9 +748,6 @@ f64 TFunctionValue_list_parameter::update_INTERPOLATE_PLATEAU_(
 }
 
 
-/* 80283060-802832C4 27D9A0 0264+00 1/1 0/0 0/0 .text
- * update_INTERPOLATE_BSPLINE_dataMore3___Q27JStudio29TFunctionValue_list_parameterFRCQ27JStudio29TFunctionValue_list_parameterd
- */
 f64 TFunctionValue_list_parameter::update_INTERPOLATE_BSPLINE_dataMore3_(
     TFunctionValue_list_parameter const& rThis, f64 param_2) {
     JUT_ASSERT(1457, rThis.uData_>=3)
diff --git a/src/JSystem/JStudio/JStudio/fvb-data.cpp b/src/JSystem/JStudio/JStudio/fvb-data.cpp
index bae0a903ea..deee81198e 100644
--- a/src/JSystem/JStudio/JStudio/fvb-data.cpp
+++ b/src/JSystem/JStudio/JStudio/fvb-data.cpp
@@ -2,4 +2,4 @@
 
 #include "JSystem/JStudio/JStudio/fvb-data.h"
 
-extern const char JStudio::fvb::data::ga4cSignature[4] = "FVB";
+const char JStudio::fvb::data::ga4cSignature[4] = "FVB";
diff --git a/src/JSystem/JStudio/JStudio/jstudio-data.cpp b/src/JSystem/JStudio/JStudio/jstudio-data.cpp
index 52e38a09f2..c6f90bc45f 100644
--- a/src/JSystem/JStudio/JStudio/jstudio-data.cpp
+++ b/src/JSystem/JStudio/JStudio/jstudio-data.cpp
@@ -2,4 +2,4 @@
 
 #include "JSystem/JStudio/JStudio/jstudio-data.h"
 
-extern const char JStudio::data::ga8cSignature[8] = "jstudio";
+const char JStudio::data::ga8cSignature[8] = "jstudio";
diff --git a/src/JSystem/JStudio/JStudio/jstudio-object.cpp b/src/JSystem/JStudio/JStudio/jstudio-object.cpp
index 5d6cb6c443..8e23477cc8 100644
--- a/src/JSystem/JStudio/JStudio/jstudio-object.cpp
+++ b/src/JSystem/JStudio/JStudio/jstudio-object.cpp
@@ -120,9 +120,6 @@ void JStudio::TAdaptor::adaptor_do_data(void const* param_0, u32 param_1, void c
     /* empty function */
 }
 
-/* 8028602C-802860CC 28096C 00A0+00 8/7 0/0 0/0 .text
- * adaptor_setVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUlQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio::TAdaptor::adaptor_setVariableValue(JStudio::TControl* pControl, u32 param_2,
                                                      JStudio::data::TEOperationData param_3,
                                                      void const* param_4, u32 param_5) {
@@ -152,9 +149,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue(JStudio::TControl* pControl, u3
 }
 
 
-/* 802860CC-802861C0 280A0C 00F4+00 7/7 0/0 0/0 .text
- * adaptor_setVariableValue_n__Q27JStudio8TAdaptorFPQ27JStudio8TControlPCUlUlQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl,
                                                        u32 const* param_2, u32 param_3,
                                                        JStudio::data::TEOperationData param_4,
@@ -190,9 +184,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl,
     }
 }
 
-/* 802861C0-80286204 280B00 0044+00 0/0 2/2 0/0 .text
- * adaptor_setVariableValue_immediate__Q27JStudio8TAdaptorFPCQ37JStudio8TAdaptor27TSetVariableValue_immediate
- */
 void JStudio::TAdaptor::adaptor_setVariableValue_immediate(
     JStudio::TAdaptor::TSetVariableValue_immediate const* p) {
     JUT_ASSERT(388, p!=NULL);
@@ -244,9 +235,6 @@ void JStudio::TAdaptor::adaptor_updateVariableValue(JStudio::TControl* pControl,
     }
 }
 
-/* 8028656C-80286584 280EAC 0018+00 2/2 0/0 0/0 .text
- * adaptor_setVariableValue_VOID___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl
- */
 void JStudio::TAdaptor::adaptor_setVariableValue_VOID_(JStudio::TAdaptor* param_1,
                                                        JStudio::TControl* param_2, u32 param_3,
                                                        void const* param_4, u32 uSize) {
@@ -254,9 +242,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_VOID_(JStudio::TAdaptor* param_
     param_1->pValue_[param_3].setValue_none();
 }
 
-/* 80286584-802865B0 280EC4 002C+00 2/2 0/0 0/0 .text
- * adaptor_setVariableValue_IMMEDIATE___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl
- */
 void JStudio::TAdaptor::adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor* param_1,
                                                             JStudio::TControl* param_2, u32 param_3,
                                                             void const* param_4, u32 param_5) {
@@ -264,9 +249,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_IMMEDIATE_(JStudio::TAdaptor* p
     value->setValue_immediate(*(f32*)param_4);
 }
 
-/* 802865B0-802865DC 280EF0 002C+00 2/2 0/0 0/0 .text
- * adaptor_setVariableValue_TIME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl
- */
 void JStudio::TAdaptor::adaptor_setVariableValue_TIME_(JStudio::TAdaptor* param_1,
                                                        JStudio::TControl* param_2, u32 param_3,
                                                        void const* param_4, u32 param_5) {
@@ -274,9 +256,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_TIME_(JStudio::TAdaptor* param_
     value->setValue_time(*(f32*)param_4);
 }
 
-/* 802865DC-80286648 280F1C 006C+00 1/1 0/0 0/0 .text
- * adaptor_setVariableValue_FVR_NAME___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl
- */
 void JStudio::TAdaptor::adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor* param_1,
                                                            JStudio::TControl* param_2, u32 param_3,
                                                            void const* param_4, u32 param_5) {
@@ -284,9 +263,6 @@ void JStudio::TAdaptor::adaptor_setVariableValue_FVR_NAME_(JStudio::TAdaptor* pa
     value->setValue_functionValue(param_2->getFunctionValue(param_4,param_5));
 }
 
-/* 80286648-802866B0 280F88 0068+00 2/2 0/0 0/0 .text
- * adaptor_setVariableValue_FVR_INDEX___Q27JStudio8TAdaptorFPQ27JStudio8TAdaptorPQ27JStudio8TControlUlPCvUl
- */
 void JStudio::TAdaptor::adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor* param_1,
                                                             JStudio::TControl* param_2, u32 param_3,
                                                             void const* param_4, u32 param_5) {
@@ -339,9 +315,6 @@ JStudio::TObject::TObject(JStudio::stb::data::TParse_TBlock_object const& param_
 JStudio::TAdaptor_actor::~TAdaptor_actor() {
 }
 
-/* 80286910-8028694C 281250 003C+00 0/0 1/1 0/0 .text
- * __ct__Q27JStudio13TObject_actorFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_actor
- */
 JStudio::TObject_actor::TObject_actor(JStudio::stb::data::TParse_TBlock_object const& param_0,
                                           JStudio::TAdaptor_actor* param_1) : TObject(param_0, param_1) {
 
@@ -495,9 +468,6 @@ fun:
 
 JStudio::TAdaptor_ambientLight::~TAdaptor_ambientLight() {}
 
-/* 80286CFC-80286D38 28163C 003C+00 0/0 1/1 0/0 .text
- * __ct__Q27JStudio20TObject_ambientLightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio21TAdaptor_ambientLight
- */
 JStudio::TObject_ambientLight::TObject_ambientLight(
     JStudio::stb::data::TParse_TBlock_object const& param_0,
     JStudio::TAdaptor_ambientLight* param_1) : TObject(param_0, param_1) {
@@ -560,9 +530,6 @@ value_n:
 
 JStudio::TAdaptor_camera::~TAdaptor_camera() {}
 
-/* 80286E7C-80286EB8 2817BC 003C+00 0/0 1/1 0/0 .text
- * __ct__Q27JStudio14TObject_cameraFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio15TAdaptor_camera
- */
 JStudio::TObject_camera::TObject_camera(JStudio::stb::data::TParse_TBlock_object const& param_0,
                                         JStudio::TAdaptor_camera* param_1)
     : TObject(param_0, param_1) {}
@@ -695,9 +662,6 @@ fun:
 
 JStudio::TAdaptor_fog::~TAdaptor_fog() {}
 
-/* 802871DC-80287218 281B1C 003C+00 0/0 1/1 0/0 .text
- * __ct__Q27JStudio11TObject_fogFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio12TAdaptor_fog
- */
 JStudio::TObject_fog::TObject_fog(JStudio::stb::data::TParse_TBlock_object const& param_0,
                                       JStudio::TAdaptor_fog* param_1) : TObject(param_0, param_1) {}
 
@@ -771,9 +735,6 @@ value_n:
 
 JStudio::TAdaptor_light::~TAdaptor_light() {}
 
-/* 80287368-802873A4 281CA8 003C+00 0/0 1/1 0/0 .text
- * __ct__Q27JStudio13TObject_lightFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_light
- */
 JStudio::TObject_light::TObject_light(JStudio::stb::data::TParse_TBlock_object const& param_0,
                                           JStudio::TAdaptor_light* param_1) : TObject(param_0, param_1) {}
 
@@ -910,9 +871,6 @@ fun:
 
 JStudio::TAdaptor_message::~TAdaptor_message() {}
 
-/* 80287640-8028767C 281F80 003C+00 0/0 1/1 0/0 .text
- * __ct__Q27JStudio15TObject_messageFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio16TAdaptor_message
- */
 JStudio::TObject_message::TObject_message(JStudio::stb::data::TParse_TBlock_object const& param_0,
                                           JStudio::TAdaptor_message* param_1)
     : TObject(param_0, param_1) {}
@@ -939,9 +897,6 @@ void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u3
 
 JStudio::TAdaptor_particle::~TAdaptor_particle() {}
 
-/* 8028776C-802877A8 2820AC 003C+00 0/0 1/1 0/0 .text
- * __ct__Q27JStudio16TObject_particleFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio17TAdaptor_particle
- */
 JStudio::TObject_particle::TObject_particle(
     JStudio::stb::data::TParse_TBlock_object const& param_0, JStudio::TAdaptor_particle* param_1) : TObject(param_0, param_1) {}
 
@@ -1140,9 +1095,6 @@ fun:
 
 JStudio::TAdaptor_sound::~TAdaptor_sound() {}
 
-/* 80287B9C-80287BD8 2824DC 003C+00 0/0 1/1 0/0 .text
- * __ct__Q27JStudio13TObject_soundFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ27JStudio14TAdaptor_sound
- */
 JStudio::TObject_sound::TObject_sound(JStudio::stb::data::TParse_TBlock_object const& param_0,
                                           JStudio::TAdaptor_sound* param_1) : TObject(param_0, param_1) {}
 
diff --git a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp
index d53afdf8d6..6fc661ddcd 100644
--- a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp
@@ -9,9 +9,6 @@
 
 JStudio_JAudio2::TCreateObject::~TCreateObject() {}
 
-/* 8028D5B0-8028D624 287EF0 0074+00 1/0 0/0 0/0 .text
- * create__Q215JStudio_JAudio213TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object
- */
 bool JStudio_JAudio2::TCreateObject::create(
     JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) {
     JUT_ASSERT(40, ppObject!=NULL);
@@ -27,9 +24,6 @@ bool JStudio_JAudio2::TCreateObject::create(
     return 1;
 }
 
-/* 8028D624-8028D728 287F64 0104+00 1/1 0/0 0/0 .text
- * createObject_JAI_SOUND___Q215JStudio_JAudio213TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ215JStudio_JAudio213TCreateObject
- */
 JStudio::TObject* JStudio_JAudio2::TCreateObject::createObject_JAI_SOUND_(
     JStudio::stb::data::TParse_TBlock_object const& param_1,
     JStudio_JAudio2::TCreateObject* param_2) {
diff --git a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
index 756e4ee0a9..95bd769eae 100644
--- a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
+++ b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
@@ -166,9 +166,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN(JStudio::data::TEOperatio
     }
 }
 
-/* 8028DC88-8028DCD0 2885C8 0048+00 1/0 0/0 0/0 .text
- * adaptor_do_BEGIN_FADE_IN__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN(
     JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
     switch (param_1) {
@@ -190,9 +187,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END(JStudio::data::TEOperationD
     }
 }
 
-/* 8028DD00-8028DD48 288640 0048+00 1/0 0/0 0/0 .text
- * adaptor_do_END_FADE_OUT__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT(
     JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
     switch (param_1) {
@@ -222,9 +216,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT(
     }
 }
 
-/* 8028DDB4-8028DE34 2886F4 0080+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_NODE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_1,
                                                              const void* pContent, u32 uSize) {
     switch (param_1) {
@@ -246,9 +237,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOp
 	}
 }
 
-/* 8028DE34-8028DE50 288774 001C+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_ENABLE__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE(
     JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x2) {
@@ -267,9 +255,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperati
     }
 }
 
-/* 8028DE6C-8028DE88 2887AC 001C+00 1/0 0/0 0/0 .text
- * adaptor_do_CONTINUOUS__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOperationData param_1,
                                                             const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x2) {
@@ -292,9 +277,6 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperat
     }
 }
 
-/* 8028DEB0-8028DECC 2887F0 001C+00 1/0 0/0 0/0 .text
- * adaptor_do_ON_EXIT_NOT_END__Q215JStudio_JAudio214TAdaptor_soundFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END(
     JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x2) {
diff --git a/src/JSystem/JStudio/JStudio_JParticle/control.cpp b/src/JSystem/JStudio/JStudio_JParticle/control.cpp
index 0d240bb15f..1f25f43f66 100644
--- a/src/JSystem/JStudio/JStudio_JParticle/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JParticle/control.cpp
@@ -10,9 +10,6 @@
 
 JStudio_JParticle::TCreateObject::~TCreateObject() {}
 
-/* 8028E400-8028E474 288D40 0074+00 1/0 1/0 0/0 .text
- * create__Q217JStudio_JParticle13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object
- */
 bool
 JStudio_JParticle::TCreateObject::create(JStudio::TObject** ppObject,
                                          JStudio::stb::data::TParse_TBlock_object const& param_2) {
@@ -41,9 +38,6 @@ void JStudio_JParticle::TCreateObject::emitter_destroy(JPABaseEmitter* pEmitter)
     pJPAEmitterManager_->forceDeleteEmitter(pEmitter);
 }
 
-/* 8028E508-8028E60C 288E48 0104+00 1/1 0/0 0/0 .text
- * createObject_JPA_PARTICLE___Q217JStudio_JParticle13TCreateObjectFRCQ47JStudio3stb4data20TParse_TBlock_objectPQ217JStudio_JParticle13TCreateObject
- */
 JStudio::TObject* JStudio_JParticle::TCreateObject::createObject_JPA_PARTICLE_(
     JStudio::stb::data::TParse_TBlock_object const& param_1,
     JStudio_JParticle::TCreateObject* param_2) {
diff --git a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
index 532d51ab1a..0346ccd812 100644
--- a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
+++ b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
@@ -99,9 +99,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) {
     }
 }
 
-/* 8028EA68-8028EA7C 2893A8 0014+00 1/0 0/0 0/0 .text
- * adaptor_do_PARTICLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE(
     JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x19) {
@@ -111,9 +108,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE(
     }
 }
 
-/* 8028EA7C-8028EAB0 2893BC 0034+00 1/0 0/0 0/0 .text
- * adaptor_do_BEGIN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOperationData param_1,
                                                             const void* pContent, u32 uSize) {
     switch (param_1) {
@@ -124,9 +118,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN(JStudio::data::TEOpe
     }
 }
 
-/* 8028EAB0-8028EAF8 2893F0 0048+00 1/0 0/0 0/0 .text
- * adaptor_do_BEGIN_FADE_IN__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN(
     JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
     switch (param_1) {
@@ -146,9 +137,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END(JStudio::data::TEOpera
     }
 }
 
-/* 8028EB24-8028EB6C 289464 0048+00 1/0 0/0 0/0 .text
- * adaptor_do_END_FADE_OUT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT(
     JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
     switch (param_1) {
@@ -160,9 +148,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT(
     }
 }
 
-/* 8028EB6C-8028EBD8 2894AC 006C+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT(
     JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
     switch (param_1) {
@@ -181,9 +166,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT(
     }
 }
 
-/* 8028EBD8-8028EC58 289518 0080+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_NODE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE(
     JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
     switch (param_1) {
@@ -205,9 +187,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE(
     }
 }
 
-/* 8028EC58-8028EC74 289598 001C+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_ENABLE__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1,
                                                           const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x2) {
@@ -217,9 +196,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::dat
     }
 }
 
-/* 8028EC74-8028EC88 2895B4 0014+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_FUNCTION__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1,
                                                           const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x2) {
@@ -229,9 +205,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::d
     }
 }
 
-/* 8028EC88-8028ECA4 2895C8 001C+00 1/0 0/0 0/0 .text
- * adaptor_do_REPEAT__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOperationData param_1,
                                                           const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x2) {
@@ -241,9 +214,6 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOp
     }
 }
 
-/* 8028ECA4-8028ECC0 2895E4 001C+00 1/0 0/0 0/0 .text
- * adaptor_do_ON_EXIT_NOT_END__Q217JStudio_JParticle17TAdaptor_particleFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::data::TEOperationData param_1,
                                                           const void* pContent, u32 uSize) {
     if (param_1 == JStudio::data::UNK_0x2) {
@@ -332,9 +302,6 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmit
     }
 }
 
-/* 8028F060-8028F098 2899A0 0038+00 1/0 0/0 0/0 .text
- * executeAfter__Q317JStudio_JParticle17TAdaptor_particle21TJPACallback_emitter_FP14JPABaseEmitter
- */
 void
 JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::executeAfter(JPABaseEmitter* pJPAEmitter) {
     if (pOld != NULL) {
diff --git a/src/JSystem/JStudio/JStudio_JStage/control.cpp b/src/JSystem/JStudio/JStudio_JStage/control.cpp
index b27bb05780..5ba81c8fc9 100644
--- a/src/JSystem/JStudio/JStudio_JStage/control.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/control.cpp
@@ -9,9 +9,6 @@
 
 JStudio_JStage::TCreateObject::~TCreateObject() {}
 
-/* 80289B60-80289CE4 2844A0 0184+00 1/0 0/0 0/0 .text
- * create__Q214JStudio_JStage13TCreateObjectFPPQ27JStudio7TObjectRCQ47JStudio3stb4data20TParse_TBlock_object
- */
 bool JStudio_JStage::TCreateObject::create(
     JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& rParse) {
     JUT_ASSERT(83, ppObject!=NULL);
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
index 435c06e2aa..40d36d80a1 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
@@ -92,9 +92,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION(JStudio::data::TEOpera
 } 
 
 
-/* 8028AA48-8028AA5C 285388 0014+00 1/0 0/0 0/0 .text
- * adaptor_do_ANIMATION_MODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TEOperationData operation,
                                                           void const* pContent, u32 uSize) {
     switch (operation) {
@@ -106,17 +103,11 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TE
     }
 }
 
-/* 8028AA5C-8028AAB4 28539C 0058+00 1/0 0/0 0/0 .text
- * adaptor_do_TEXTURE_ANIMATION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION(JStudio::data::TEOperationData operation,
                                                           void const* param_2, u32 param_3) {
     setJSG_ID_(&JStage::TActor::JSGSetTextureAnimation, operation, param_2, param_3);
 } 
 
-/* 8028AAB4-8028AAC8 2853F4 0014+00 1/0 0/0 0/0 .text
- * adaptor_do_TEXTURE_ANIMATION_MODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION_MODE(
     JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
     switch (operation) {
@@ -139,9 +130,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT(
     }
 }
 
-/* 8028AB0C-8028AB68 28544C 005C+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_NODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE(
     JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
     switch (operation) {
@@ -158,9 +146,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE(
     }
 }
 
-/* 8028AB68-8028ABF0 2854A8 0088+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_ENABLE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE(
     JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
     switch (operation) {
@@ -188,9 +173,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE(
     }
 }
 
-/* 8028ABF0-8028AC04 285530 0014+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_FUNCTION(
     JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
     switch (operation) {
@@ -213,9 +195,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION(
     }
 }
 
-/* 8028AC48-8028ACA4 285588 005C+00 1/0 0/0 0/0 .text
- * adaptor_do_RELATION_NODE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE(
     JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
     switch (operation) {
@@ -232,9 +211,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE(
     }
 }
 
-/* 8028ACA4-8028ACFC 2855E4 0058+00 1/0 0/0 0/0 .text
- * adaptor_do_RELATION_ENABLE__Q214JStudio_JStage14TAdaptor_actorFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE(
     JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
     switch (operation) {
@@ -246,9 +222,6 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE(
     }
 }
 
-/* 8028ACFC-8028AD38 28563C 003C+00 3/3 0/0 0/0 .text
- * setJSG_ID___Q214JStudio_JStage14TAdaptor_actorFMQ26JStage6TActorFPCvPvUl_vQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_actor::setJSG_ID_(void (JStage::TActor::*function)(u32),
                                                     JStudio::data::TEOperationData operation,
                                                     void const* pContent, u32 uSize) {
diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
index 9620b880f5..1a3a96b345 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
@@ -88,9 +88,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperati
     }
 }
 
-/* 8028BC14-8028BC70 286554 005C+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOperationData param_1,
                                                         void const* pContent, u32 uSize) {
     switch (param_1) {
@@ -107,9 +104,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOp
     }
 }
 
-/* 8028BC70-8028BCEC 2865B0 007C+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl
- */
 void
 JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOperationData param_1,
                                                           void const* pContent, u32 uSize) {
@@ -136,9 +130,6 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOpera
     }
 }
 
-/* 8028BCEC-8028BD00 28662C 0014+00 1/0 0/0 0/0 .text
- * adaptor_do_PARENT_FUNCTION__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl
- */
 void
 JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOperationData param_1,
                                                           void const* pContent, u32 uSize) {
@@ -151,9 +142,6 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOpe
     }
 }
 
-/* 8028BD00-8028BD44 286640 0044+00 1/0 0/0 0/0 .text
- * adaptor_do_TARGET_PARENT__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT(
     JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
     switch(param_1) {
@@ -165,9 +153,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT(
     }
 }
 
-/* 8028BD44-8028BDA0 286684 005C+00 1/0 0/0 0/0 .text
- * adaptor_do_TARGET_PARENT_NODE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE(
     JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
     switch (param_1) {
@@ -184,9 +169,6 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE(
     }
 }
 
-/* 8028BDA0-8028BDBC 2866E0 001C+00 1/0 0/0 0/0 .text
- * adaptor_do_TARGET_PARENT_ENABLE__Q214JStudio_JStage15TAdaptor_cameraFQ37JStudio4data15TEOperationDataPCvUl
- */
 void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE(
     JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
     switch(param_1) {
diff --git a/src/JSystem/JStudio/JStudio_JStage/object.cpp b/src/JSystem/JStudio/JStudio_JStage/object.cpp
index d7f048fc14..968b102f0d 100644
--- a/src/JSystem/JStudio/JStudio_JStage/object.cpp
+++ b/src/JSystem/JStudio/JStudio_JStage/object.cpp
@@ -6,9 +6,6 @@
 
 #include "JSystem/JStudio/JStudio_JStage/object.h"
 
-/* 8028A1F8-8028A290 284B38 0098+00 0/0 2/2 0/0 .text
- * transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl
- */
 bool JStudio_JStage::transform_toGlobalFromLocal(
     f32 (*param_1)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_2,
     JStage::TObject const* param_3, u32 param_4) {
@@ -26,9 +23,6 @@ bool JStudio_JStage::transform_toGlobalFromLocal(
     return true;
 }
 
-/* 8028A290-8028A328 284BD0 0098+00 0/0 3/3 0/0 .text
- * transform_toGlobalFromLocal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl
- */
 bool JStudio_JStage::transform_toGlobalFromLocal(
     f32 (*param_1)[4], JStudio::TControl::TTransform_position const& param_2,
     JStage::TObject const* param_3, u32 param_4) {
@@ -45,9 +39,6 @@ bool JStudio_JStage::transform_toGlobalFromLocal(
     return true;
 }
 
-/* 8028A328-8028A3CC 284C68 00A4+00 0/0 1/1 0/0 .text
- * transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl39TTransform_translation_rotation_scalingPCQ26JStage7TObjectUl
- */
 bool JStudio_JStage::transform_toLocalFromGlobal(
     f32 (*param_1)[4], JStudio::TControl::TTransform_translation_rotation_scaling const& param_2,
     JStage::TObject const* param_3, u32 param_4) {
@@ -67,9 +58,6 @@ bool JStudio_JStage::transform_toLocalFromGlobal(
     return true;
 }
 
-/* 8028A3CC-8028A470 284D0C 00A4+00 0/0 2/2 0/0 .text
- * transform_toLocalFromGlobal__14JStudio_JStageFPA4_fRCQ37JStudio8TControl19TTransform_positionPCQ26JStage7TObjectUl
- */
 bool JStudio_JStage::transform_toLocalFromGlobal(
     f32 (*param_1)[4], JStudio::TControl::TTransform_position const& param_2,
     JStage::TObject const* param_3, u32 param_4) {
@@ -118,9 +106,6 @@ s32 JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObjectNode_(
     return param_1->JSGFindNodeID(param_2);
 }
 
-/* 8028A550-8028A5F0 284E90 00A0+00 0/0 1/1 0/0 .text
- * adaptor_object_ENABLE___Q214JStudio_JStage16TAdaptor_object_FQ37JStudio4data15TEOperationDataPCvUl
- */
 void
 JStudio_JStage::TAdaptor_object_::adaptor_object_ENABLE_(JStudio::data::TEOperationData param_1,
                                                          void const* pContent, u32 uSize) {
diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp
index b1202d6e78..f460f315db 100644
--- a/src/JSystem/JUtility/JUTCacheFont.cpp
+++ b/src/JSystem/JUtility/JUTCacheFont.cpp
@@ -339,9 +339,6 @@ JUTCacheFont::TGlyphCacheInfo* JUTCacheFont::determineBlankPage() {
     return NULL;
 }
 
-/* 802DDBBC-802DDCE4 2D84FC 0128+00 1/1 0/0 0/0 .text
- * getGlyphFromAram__12JUTCacheFontFPQ212JUTCacheFont15TGlyphCacheInfoPQ212JUTCacheFont10TCachePagePiPi
- */
 void JUTCacheFont::getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo* param_0,
                                     JUTCacheFont::TCachePage* pCachePage, int* param_2, int* param_3) {
     TGlyphCacheInfo* pGylphCacheInfo = pCachePage;
diff --git a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
index a413a6751a..f37bad6200 100644
--- a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
+++ b/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
@@ -1,9 +1,10 @@
 #include "JSystem/JSystem.h" // IWYU pragma: keep
 
+#include "JSystem/JUtility/JUTResFont.h"
 #include <dolphin/dolphin.h>
 #include "global.h"
 
-extern u8 const JUTResFONT_Ascfont_fix12[16736] ATTRIBUTE_ALIGN(32) = {
+u8 const JUTResFONT_Ascfont_fix12[] ATTRIBUTE_ALIGN(32) = {
     0x46, 0x4F, 0x4E, 0x54, 0x62, 0x66, 0x6E, 0x31, 0x00, 0x00, 0x41, 0x60, 0x00, 0x00, 0x00, 0x04,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x49, 0x4E, 0x46, 0x31, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x0C,
diff --git a/src/JSystem/JUtility/JUTGamePad.cpp b/src/JSystem/JUtility/JUTGamePad.cpp
index c705bcab66..ea3709594a 100644
--- a/src/JSystem/JUtility/JUTGamePad.cpp
+++ b/src/JSystem/JUtility/JUTGamePad.cpp
@@ -172,10 +172,8 @@ void* JUTGamePad::C3ButtonReset::sCallbackArg;
 
 OSTime JUTGamePad::C3ButtonReset::sThreshold = (OSTime)(OS_TIMER_CLOCK / 60) * 30;
 
-/* 80451500 0001+00 data_80451500 None */
 bool JUTGamePad::C3ButtonReset::sResetSwitchPushing;
 
-/* 80451501 0003+00 data_80451501 None */
 bool JUTGamePad::C3ButtonReset::sResetOccurred;
 
 s32 JUTGamePad::C3ButtonReset::sResetOccurredPort;