project cleanup (#2895)

* some wii OS fixes

* remove old dol2asm comments

* remove dol2asm.h

* remove function address comments

* normalize ATTRIBUTE_ALIGN usage

* DECL_WEAK macro

* fix gcc attribute weak macro

* wrap more mwcc specific things in ifdefs

* fixes

* fix revo sdk version flags

* fixes

1 files changed, 21 insertions, 136 deletions

diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 1934a687f1..7a64286c75 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -1,8 +1,3 @@
-//
-// Generated By: dol2asm
-// Translation Unit: d/d_drawlist
-//
-
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "JSystem/J2DGraph/J2DAnimation.h"
@@ -14,14 +9,13 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_drawlist.h"
 #include "d/d_s_play.h"
-#include "dol2asm.h"
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_mtx.h"
 
 class dDlst_blo_c : public dDlst_base_c {
 public:
-    /* 80053B64 */ virtual void draw();
+    virtual void draw();
     bool create(JKRArchive* param_1, char* param_2) {
         return mScreen.setPriority(param_2,0x20000,param_1) != 0;
     }
@@ -47,7 +41,7 @@ public:
 
 class dDlst_2Dm_c {
 public:
-    /* 8005312C */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ s16 field_0x4;
     /* 0x06 */ s16 field_0x6;
@@ -71,7 +65,7 @@ public:
 
 class dDlst_2DTri_c {
 public:
-    /* 80051AF0 */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ s16 field_0x4;
     /* 0x06 */ s16 field_0x6;
@@ -84,7 +78,7 @@ public:
 class dDlst_2DT_c : public dDlst_base_c {
 public:
     dDlst_2DT_c() {}
-    /* 80051F98 */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ u8* field_0x4;
     /* 0x08 */ u32 field_0x8;
@@ -104,7 +98,7 @@ public:
 
 class dDlst_2DPoint_c {
 public:
-    /* 80051E5C */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ s16 field_0x4;
     /* 0x06 */ s16 field_0x6;
@@ -137,7 +131,7 @@ public:
 
 class dDlst_2DMt_c {
 public:
-    /* 8005364C */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ u8 field_0x4;
     /* 0x08 */ dDlst_2DMt_tex_c* field_0x8;
@@ -149,7 +143,7 @@ public:
 
 class dDlst_2DM_c {
 public:
-    /* 80052C58 */ virtual void draw();
+    virtual void draw();
 
     /* 0x04 */ s16 field_0x4;
     /* 0x06 */ s16 field_0x6;
@@ -174,7 +168,7 @@ public:
 
 class ShdwDrawPoly_c : public cBgS_ShdwDraw {
 public:
-    /* 80054A6C */ virtual ~ShdwDrawPoly_c() {}
+    virtual ~ShdwDrawPoly_c() {}
 
     void setCenter(cXyz* center) { mCenter = center; }
     cXyz* getCenter() { return mCenter; }
@@ -188,7 +182,6 @@ public:
     /* 0x3c */ dDlst_shadowPoly_c* mPoly;
 };
 
-/* 80051AC0-80051ADC 04C400 001C+00 0/0 3/3 0/0 .text setViewPort__14dDlst_window_cFffffff */
 void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f32 nearZ, f32 farZ) {
     mViewport.x_orig = xOrig;
     mViewport.y_orig = yOrig;
@@ -198,8 +191,6 @@ void dDlst_window_c::setViewPort(f32 xOrig, f32 yOrig, f32 width, f32 height, f3
     mViewport.far_z = farZ;
 }
 
-/* 80051ADC-80051AF0 04C41C 0014+00 0/0 4/4 0/0 .text            setScissor__14dDlst_window_cFffff
- */
 void dDlst_window_c::setScissor(f32 xOrig, f32 yOrig, f32 width, f32 height) {
     mViewport.scissor.x_orig = xOrig;
     mViewport.scissor.y_orig = yOrig;
@@ -207,7 +198,6 @@ void dDlst_window_c::setScissor(f32 xOrig, f32 yOrig, f32 width, f32 height) {
     mViewport.scissor.height = height;
 }
 
-/* 80051AF0-80051CF0 04C430 0200+00 1/0 0/0 0/0 .text            draw__13dDlst_2DTri_cFv */
 void dDlst_2DTri_c::draw() {
     f32 f4;
     f32 f5;
@@ -244,7 +234,6 @@ void dDlst_2DTri_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 80051CF0-80051E5C 04C630 016C+00 1/0 0/0 0/0 .text            draw__14dDlst_2DQuad_cFv */
 void dDlst_2DQuad_c::draw() {
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -268,7 +257,6 @@ void dDlst_2DQuad_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 80051E5C-80051F98 04C79C 013C+00 1/0 0/0 0/0 .text            draw__15dDlst_2DPoint_cFv */
 void dDlst_2DPoint_c::draw() {
     GXClearVtxDesc();
     GXSetVtxDesc(GX_VA_POS, GX_DIRECT);
@@ -290,7 +278,6 @@ void dDlst_2DPoint_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 80051F98-80052354 04C8D8 03BC+00 1/0 0/0 0/0 .text            draw__11dDlst_2DT_cFv */
 void dDlst_2DT_c::draw() {
     static GXColor l_color = {0xFF, 0xFF, 0xFF, 0xE0};
     f32 var5 = field_0xe;
@@ -349,7 +336,6 @@ void dDlst_2DT_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 80052354-80052B00 04CC94 07AC+00 1/0 0/0 0/0 .text            draw__12dDlst_2DT2_cFv */
 void dDlst_2DT2_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XY, GX_F32, 0);
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_TEX0, GX_CLR_RGBA, GX_RGBA6, 0);
@@ -549,37 +535,32 @@ void dDlst_2DT2_c::draw() {
     dComIfGp_getCurrentGrafPort()->setup2D();
 }
 
-/* 803A87C0-803A8800 0058E0 003C+04 0/0 0/0 0/0 .data            l_frontZMat */
-static u8 l_frontZMat[] ALIGN_DECL(32) = {
+static u8 l_frontZMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x40, 0x00, 0x00, 0x07, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
     0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x40, 0x10, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8800-803A882C 005920 002A+02 0/0 0/0 0/0 .data            l_frontNoZSubMat */
-static u8 l_frontNoZSubMat[] ALIGN_DECL(32) = {
+static u8 l_frontNoZSubMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x09, 0x35, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A882C-803A88A0 00594C 0060+14 0/1 0/0 0/0 .data            l_shadowVolPos */
 static Vec l_shadowVolPos[] = {
     {-1.0f, -1.0f, 0.0f}, {-1.0f, -1.0f, -300.0f}, {-1.0f, 1.0f, 0.0f}, {-1.0f, 1.0f, -300.0f},
     {1.0f, -1.0f, 0.0f},  {1.0f, -1.0f, -300.0f},  {1.0f, 1.0f, 0.0f},  {1.0f, 1.0f, -300.0f},
 };
 
-/* 803A88A0-803A88E0 0059C0 003B+05 0/0 0/0 0/0 .data            l_shadowVolDL */
-static u8 l_shadowVolDL[] ALIGN_DECL(32) = {
+static u8 l_shadowVolDL[] ATTRIBUTE_ALIGN(32) = {
     0x80, 0x00, 0x18, 0x06, 0x02, 0x03, 0x07, 0x00, 0x04, 0x05, 0x01, 0x06, 0x04, 0x00, 0x02,
     0x07, 0x05, 0x04, 0x06, 0x03, 0x01, 0x05, 0x07, 0x02, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A88E0-803A8940 005A00 005A+06 1/1 0/0 0/0 .data            l_shadowProjMat */
-static u8 l_shadowProjMat[] ALIGN_DECL(32) = {
+static u8 l_shadowProjMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xE6, 0x70,
     0x61, 0x43, 0x00, 0x00, 0x01, 0x61, 0x40, 0x00, 0x00, 0x07, 0x61, 0x41, 0x00, 0x04, 0xAD,
     0x61, 0xF3, 0x64, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10,
@@ -588,8 +569,7 @@ static u8 l_shadowProjMat[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8940-803A89A0 005A60 005A+06 0/0 0/0 0/0 .data            l_shadowVolMat */
-static u8 l_shadowVolMat[] ALIGN_DECL(32) = {
+static u8 l_shadowVolMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFC, 0x61, 0xC1, 0x08, 0xFF, 0x90,
     0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x0D, 0x61, 0x41, 0x00, 0x01, 0x35,
     0x61, 0xF3, 0x7F, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
@@ -598,8 +578,7 @@ static u8 l_shadowVolMat[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A89A0-803A8A00 005AC0 0055+0B 0/1 0/0 0/0 .data            l_clearMat */
-static u8 l_clearMat[] ALIGN_DECL(32) = {
+static u8 l_clearMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xFF, 0xA0,
     0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x00, 0x14, 0x61, 0xF3, 0x7F, 0x00, 0x00,
     0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
@@ -608,8 +587,7 @@ static u8 l_clearMat[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8A00-803A8A60 005B20 0055+0B 0/1 0/0 0/0 .data            l_frontMat */
-static u8 l_frontMat[] ALIGN_DECL(32) = {
+static u8 l_frontMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1, 0x08, 0xFF, 0x90,
     0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0x40, 0x00, 0x00, 0x07, 0x61, 0x41, 0x00, 0x01, 0x15,
     0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
@@ -618,15 +596,13 @@ static u8 l_frontMat[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8A60-803A8A9C 005B80 003C+00 0/1 0/0 0/0 .data            l_backSubMat */
-static u8 l_backSubMat[] ALIGN_DECL(32) = {
+static u8 l_backSubMat[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x41, 0x00, 0x09, 0x35, 0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x10,
     0x00, 0x00, 0x10, 0x09, 0x00, 0x00, 0x00, 0x01, 0x61, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8A9C-803A8B60 005BBC 00A8+1C 0/1 0/0 0/0 .data            l_simpleShadowPos */
 static Vec l_simpleShadowPos[] = {
     {0.0f, -1.0f, 0.0f},   {0.0f, 0.0f, 0.0f},   {1.0f, -1.0f, -1.0f}, {1.0f, 0.0f, -1.0f},
     {-1.0f, -1.0f, -1.0f}, {-1.0f, 0.0f, -1.0f}, {-1.0f, -1.0f, 1.0f}, {-1.0f, 0.0f, 1.0f},
@@ -634,8 +610,7 @@ static Vec l_simpleShadowPos[] = {
     {1.0f, 1.0f, 1.0f},    {-1.0f, 1.0f, 1.0f},
 };
 
-/* 803A8B60-803A8BC0 005C80 0058+08 0/1 0/0 0/0 .data            l_shadowVolumeDL */
-static u8 l_shadowVolumeDL[] ALIGN_DECL(32) = {
+static u8 l_shadowVolumeDL[] ATTRIBUTE_ALIGN(32) = {
     0x98, 0x00, 0x05, 0x03, 0x09, 0x01, 0x07, 0x05, 0x98, 0x00, 0x05, 0x04, 0x06, 0x00, 0x08,
     0x02, 0x98, 0x00, 0x04, 0x04, 0x05, 0x06, 0x07, 0x98, 0x00, 0x04, 0x02, 0x03, 0x04, 0x05,
     0x98, 0x00, 0x04, 0x08, 0x09, 0x02, 0x03, 0x98, 0x00, 0x04, 0x06, 0x07, 0x08, 0x09, 0x98,
@@ -644,8 +619,7 @@ static u8 l_shadowVolumeDL[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8BC0-803A8C20 005CE0 0055+0B 0/1 0/0 0/0 .data            l_shadowSealTexDL */
-static u8 l_shadowSealTexDL[] ALIGN_DECL(32) = {
+static u8 l_shadowSealTexDL[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0x15,
     0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
     0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x40, 0x01, 0x80, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x0B,
@@ -654,8 +628,7 @@ static u8 l_shadowSealTexDL[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8C20-803A8C80 005D40 0055+0B 0/1 0/0 0/0 .data            l_shadowSealTex2DL */
-static u8 l_shadowSealTex2DL[] ALIGN_DECL(32) = {
+static u8 l_shadowSealTex2DL[] ATTRIBUTE_ALIGN(32) = {
     0x61, 0x28, 0x38, 0x03, 0xC0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0x15,
     0x10, 0x00, 0x00, 0x10, 0x3F, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x10, 0x09, 0x00,
     0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x40, 0x01, 0x80, 0x00, 0x04, 0x0A, 0x00, 0x00, 0x0B,
@@ -664,8 +637,7 @@ static u8 l_shadowSealTex2DL[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 803A8C80-803A8D00 005DA0 0069+17 0/1 0/0 0/0 .data            l_shadowSealDL */
-static u8 l_shadowSealDL[] ALIGN_DECL(32) = {
+static u8 l_shadowSealDL[] ATTRIBUTE_ALIGN(32) = {
     0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x05, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00,
     0x00, 0x05, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xFF, 0x61, 0xC1,
     0x08, 0xFF, 0xB0, 0x61, 0x40, 0x00, 0x00, 0x06, 0x61, 0x41, 0x00, 0x06, 0xED, 0x10, 0x00,
@@ -675,13 +647,10 @@ static u8 l_shadowSealDL[] ALIGN_DECL(32) = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
-/* 80052B00-80052B4C 04D440 004C+00 1/1 0/0 0/0 .text            __ct__12dDlst_2DT2_cFv */
 dDlst_2DT2_c::dDlst_2DT2_c() {
     field_0x40 = (GXColor){0, 0, 0, 0};
 }
 
-/* 80052B4C-80052C58 04D48C 010C+00 1/1 0/0 0/0 .text init__12dDlst_2DT2_cFP7ResTIMGffffUcUcUcff
- */
 void dDlst_2DT2_c::init(ResTIMG* i_timg, f32 param_1, f32 param_2, f32 param_3, f32 param_4,
                         u8 param_5, u8 param_6, u8 param_7, f32 i_scaleX, f32 i_scaleY) {
     mDoLib_setResTimgObj(i_timg, &mTexObj, 0, NULL);
@@ -706,7 +675,6 @@ void dDlst_2DT2_c::init(ResTIMG* i_timg, f32 param_1, f32 param_2, f32 param_3,
     field_0x46 = param_5;
 }
 
-/* 80052C58-8005312C 04D598 04D4+00 1/0 0/0 0/0 .text            draw__11dDlst_2DM_cFv */
 void dDlst_2DM_c::draw() {
     s16 r31 = field_0x22;
     s16 r30 = field_0x24;
@@ -770,7 +738,6 @@ void dDlst_2DM_c::draw() {
 }
 
 
-/* 8005312C-8005364C 04DA6C 0520+00 1/0 0/0 0/0 .text            draw__11dDlst_2Dm_cFv */
 void dDlst_2Dm_c::draw() {
     s16 r31 = field_0x48;
     s16 r30 = field_0x4a;
@@ -837,7 +804,6 @@ void dDlst_2Dm_c::draw() {
 }
 
 
-/* 8005364C-800539DC 04DF8C 0390+00 1/0 0/0 0/0 .text            draw__12dDlst_2DMt_cFv */
 void dDlst_2DMt_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_S16, 0);
     GXClearVtxDesc();
@@ -914,8 +880,6 @@ JUTTexture* dummy_getTexture(J2DPicture* picture) {
     return picture->getTexture(0);
 }
 
-/* 80053A00-80053A9C 04E340 009C+00 0/0 1/1 0/0 .text            __ct__10dDlst_2D_cFP7ResTIMGssssUc
- */
 dDlst_2D_c::dDlst_2D_c(ResTIMG* i_timg, s16 i_posX, s16 i_posY, s16 i_sizeX, s16 i_sizeY,
                        u8 i_alpha) {
     mpPicture.initiate(i_timg, NULL);
@@ -926,13 +890,11 @@ dDlst_2D_c::dDlst_2D_c(ResTIMG* i_timg, s16 i_posX, s16 i_posY, s16 i_sizeX, s16
     mAlpha = i_alpha;
 }
 
-/* 80053A9C-80053B64 04E3DC 00C8+00 1/0 0/0 0/0 .text            draw__10dDlst_2D_cFv */
 void dDlst_2D_c::draw() {
     mpPicture.setAlpha(mAlpha);
     mpPicture.draw(mPosX, mPosY, mSizeX, mSizeY, false, false, false);
 }
 
-/* 80053B64-80053BA0 04E4A4 003C+00 1/0 0/0 0/0 .text            draw__11dDlst_blo_cFv */
 void dDlst_blo_c::draw() {
     mScreen.draw(field_0x120, field_0x124, dComIfGp_getCurrentGrafPort());
 }
@@ -952,14 +914,12 @@ static void dummy_misc() {
     screen->clearAnmTransform();
 }
 
-/* 80053CDC-80053CEC 04E61C 0010+00 0/0 2/2 0/0 .text            init__8cM_rnd_cFiii */
 void cM_rnd_c::init(int s0, int s1, int s2) {
     seed0 = s0;
     seed1 = s1;
     seed2 = s2;
 }
 
-/* 80053CEC-80053DE0 04E62C 00F4+00 2/2 0/0 0/0 .text            get__8cM_rnd_cFv */
 f32 cM_rnd_c::get() {
     seed0 = seed0 * 171 % 30269;
     seed1 = seed1 * 172 % 30307;
@@ -969,22 +929,18 @@ f32 cM_rnd_c::get() {
     return fabsf(fmodf(newSeed, 1.0));
 }
 
-/* 80053DE0-80053E18 04E720 0038+00 1/1 0/0 0/0 .text            getF__8cM_rnd_cFf */
 f32 cM_rnd_c::getF(f32 param_0) {
     return get() * param_0;
 }
 
-/* 80053E18-80053E60 04E758 0048+00 1/1 0/0 0/0 .text            getFX__8cM_rnd_cFf */
 f32 cM_rnd_c::getFX(f32 param_0) {
     return ((get() - 0.5f) * param_0) * 2.0f;
 }
 
-/* 80053E60-80053E9C 04E7A0 003C+00 1/1 0/0 0/0 .text            getValue__8cM_rnd_cFff */
 f32 cM_rnd_c::getValue(f32 param_0, f32 param_1) {
     return param_0 + getF(param_1);
 }
 
-/* 80053E9C-800541F4 04E7DC 0358+00 1/0 0/0 0/0 .text            draw__18dDlst_effectLine_cFv */
 void dDlst_effectLine_c::draw() {
     GXSetVtxAttrFmt(GX_VTXFMT0, GX_VA_POS, GX_POS_XYZ, GX_F32, 0);
     GXClearVtxDesc();
@@ -1030,8 +986,6 @@ void dDlst_effectLine_c::draw() {
     }
 }
 
-/* 800541F4-80054288 04EB34 0094+00 0/0 1/1 0/0 .text
- * update__18dDlst_effectLine_cFR4cXyzR8_GXColorUsUsUsUsffff    */
 void dDlst_effectLine_c::update(cXyz& param_0, _GXColor& i_lineColor, u16 param_2, u16 param_3,
                                 u16 param_4, u16 param_5, f32 param_6, f32 param_7, f32 param_8,
                                 f32 param_9) {
@@ -1049,8 +1003,6 @@ void dDlst_effectLine_c::update(cXyz& param_0, _GXColor& i_lineColor, u16 param_
     dComIfGd_set2DOpa(this);
 }
 
-/* 80054288-800543B4 04EBC8 012C+00 1/1 0/0 0/0 .text
- * set__18dDlst_shadowPoly_cFP10cBgD_Vtx_tUsUsUsP8cM3dGPla      */
 int dDlst_shadowPoly_c::set(cBgD_Vtx_t* i_vtx, u16 param_1, u16 param_2, u16 param_3,
                             cM3dGPla* i_plane) {
     if (mCount >= getTriMax()) {
@@ -1076,7 +1028,6 @@ int dDlst_shadowPoly_c::set(cBgD_Vtx_t* i_vtx, u16 param_1, u16 param_2, u16 par
 }
 
 
-/* 800543B4-80054478 04ECF4 00C4+00 1/1 0/0 0/0 .text            draw__18dDlst_shadowPoly_cFv */
 void dDlst_shadowPoly_c::draw() {
     dDlst_shadowTri_c* tri = getTri();
 
@@ -1091,7 +1042,6 @@ void dDlst_shadowPoly_c::draw() {
     GXEnd();
 }
 
-/* 80054478-800544F0 04EDB8 0078+00 1/1 0/0 0/0 .text            J3DDrawBuffer__create__FUl */
 static J3DDrawBuffer* J3DDrawBuffer__create(u32 size) {
     J3DDrawBuffer* buffer = new J3DDrawBuffer();
 
@@ -1105,13 +1055,11 @@ static J3DDrawBuffer* J3DDrawBuffer__create(u32 size) {
     return NULL;
 }
 
-/* 800544F0-80054500 04EE30 0010+00 2/2 0/0 0/0 .text            reset__18dDlst_shadowReal_cFv */
 void dDlst_shadowReal_c::reset() {
     mState = 0;
     mModelNum = 0;
 }
 
-/* 80054500-800545D4 04EE40 00D4+00 1/1 0/0 0/0 .text imageDraw__18dDlst_shadowReal_cFPA4_f */
 void dDlst_shadowReal_c::imageDraw(Mtx param_0) {
     GXSetProjection(mRenderProjMtx, GX_ORTHOGRAPHIC);
     JUT_ASSERT(1916, mModelNum);
@@ -1136,7 +1084,6 @@ void dDlst_shadowReal_c::imageDraw(Mtx param_0) {
     }
 }
 
-/* 800545D4-80054688 04EF14 00B4+00 1/1 0/0 0/0 .text            draw__18dDlst_shadowReal_cFv */
 void dDlst_shadowReal_c::draw() {
     static GXColor l_color = {0, 0, 0, 64};
     l_color.a = field_0x1;
@@ -1152,8 +1099,6 @@ void dDlst_shadowReal_c::draw() {
     mShadowRealPoly.draw();
 }
 
-/* 80054688-80054854 04EFC8 01CC+00 1/1 0/0 0/0 .text
- * psdRealCallBack__FP13cBgS_ShdwDrawP10cBgD_Vtx_tiiiP8cM3dGPla */
 static int psdRealCallBack(cBgS_ShdwDraw* param_0, cBgD_Vtx_t* param_1, int param_2,
                                int param_3, int param_4, cM3dGPla* param_5) {
     ShdwDrawPoly_c* shdwDrawPoly = (ShdwDrawPoly_c*)param_0;
@@ -1181,8 +1126,6 @@ static int psdRealCallBack(cBgS_ShdwDraw* param_0, cBgD_Vtx_t* param_1, int para
     return 1;
 }
 
-/* 80054854-80054A6C 04F194 0218+00 1/1 0/0 0/0 .text
- * realPolygonCheck__FP4cXyzffP4cXyzP18dDlst_shadowPoly_c       */
 static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
                                  dDlst_shadowPoly_c* param_4) {
     ShdwDrawPoly_c shdwDrawPoly;
@@ -1227,8 +1170,6 @@ static BOOL realPolygonCheck(cXyz* param_0, f32 param_1, f32 param_2, cXyz* para
     return TRUE;
 }
 
-/* 80054ACC-80054BD0 04F40C 0104+00 2/2 0/0 0/0 .text            setkankyoShadow__FP12dKy_tevstr_cPf
- */
 static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
 
@@ -1260,8 +1201,6 @@ static void setkankyoShadow(dKy_tevstr_c* param_0, f32* param_1) {
     }
 }
 
-/* 80054BD0-80055028 04F510 0458+00 1/1 0/0 0/0 .text
- * setShadowRealMtx__18dDlst_shadowReal_cFP4cXyzP4cXyzfffP12dKy_tevstr_c */
 u8 dDlst_shadowReal_c::setShadowRealMtx(cXyz* param_0, cXyz* param_1, f32 param_2, f32 param_3,
                                             f32 param_4, dKy_tevstr_c* param_5) {
     mShadowRealPoly.reset();
@@ -1319,8 +1258,6 @@ u8 dDlst_shadowReal_c::setShadowRealMtx(cXyz* param_0, cXyz* param_1, f32 param_
 }
 
 
-/* 80055028-800551D4 04F968 01AC+00 1/1 0/0 0/0 .text
- * set__18dDlst_shadowReal_cFUlP8J3DModelP4cXyzffP12dKy_tevstr_cff */
 u32 dDlst_shadowReal_c::set(u32 i_key, J3DModel* i_model, cXyz* param_2, f32 param_3, f32 param_4,
                             dKy_tevstr_c* param_5, f32 i_cameraZ, f32 param_7) {
     dScnKy_env_light_c* env_light = dKy_getEnvlight();
@@ -1360,7 +1297,6 @@ u32 dDlst_shadowReal_c::set(u32 i_key, J3DModel* i_model, cXyz* param_2, f32 par
     return mKey;
 }
 
-/* 800551D4-8005520C 04FB14 0038+00 1/1 0/0 0/0 .text add__18dDlst_shadowReal_cFP8J3DModel */
 bool dDlst_shadowReal_c::add(J3DModel* i_model) {
     u8 cur_model_num = mModelNum;
 
@@ -1373,7 +1309,6 @@ bool dDlst_shadowReal_c::add(J3DModel* i_model) {
     return true;
 }
 
-/* 8005520C-800553EC 04FB4C 01E0+00 1/1 0/0 0/0 .text            draw__20dDlst_shadowSimple_cFv */
 void dDlst_shadowSimple_c::draw() {
     static GXColor l_color = {0, 0, 0, 64};
     l_color.a = mAlpha;
@@ -1417,8 +1352,6 @@ void dDlst_shadowSimple_c::draw() {
     GXCallDisplayList(l_shadowVolumeDL, 0x40);
 }
 
-/* 800553EC-80055684 04FD2C 0298+00 1/1 0/0 0/0 .text
- * set__20dDlst_shadowSimple_cFP4cXyzffP4cXyzsfP9_GXTexObj      */
 void dDlst_shadowSimple_c::set(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
                                    s16 param_4, f32 param_5, _GXTexObj* param_6) {
     if (param_5 < 0.0f) {
@@ -1471,7 +1404,6 @@ void dDlst_shadowSimple_c::set(cXyz* param_0, f32 param_1, f32 param_2, cXyz* pa
     mpTexObj = param_6;
 }
 
-/* 80055684-80055768 04FFC4 00E4+00 1/1 0/0 0/0 .text            init__21dDlst_shadowControl_cFv */
 void dDlst_shadowControl_c::init() {
     static u16 l_realImageSize[2] = {192, 64};
     for (int i = 0; i < 2; i++) {
@@ -1487,7 +1419,6 @@ void dDlst_shadowControl_c::init() {
 }
 
 
-/* 80055768-800557C8 0500A8 0060+00 1/1 0/0 0/0 .text            reset__21dDlst_shadowControl_cFv */
 void dDlst_shadowControl_c::reset() {
     dDlst_shadowReal_c* shadowReal = mReal;
 
@@ -1501,9 +1432,8 @@ void dDlst_shadowControl_c::reset() {
     field_0x4 = NULL;
 }
 
-/* 800557C8-80055A14 050108 024C+00 0/0 1/1 0/0 .text imageDraw__21dDlst_shadowControl_cFPA4_f */
 void dDlst_shadowControl_c::imageDraw(Mtx param_0) {
-    static u8 l_matDL[] ALIGN_DECL(32) = {
+    static u8 l_matDL[] ATTRIBUTE_ALIGN(32) = {
         0x10, 0x00, 0x00, 0x10, 0x0E, 0x00, 0x00, 0x04, 0x00, 0x10, 0x00, 0x00, 0x10, 0x10,
         0x00, 0x00, 0x04, 0x00, 0x61, 0x28, 0x38, 0x00, 0x00, 0x61, 0xC0, 0x08, 0xFF, 0xF2,
         0x61, 0xC1, 0x08, 0xFF, 0x90, 0x61, 0x43, 0x00, 0x00, 0x41, 0x61, 0xF3, 0x7F, 0x00,
@@ -1571,8 +1501,6 @@ void dDlst_shadowControl_c::imageDraw(Mtx param_0) {
     GXSetDither(GX_TRUE);
 }
 
-/* 80055A14-80055C74 050354 0260+00 0/0 1/1 0/0 .text            draw__21dDlst_shadowControl_cFPA4_f
- */
 void dDlst_shadowControl_c::draw(Mtx param_0) {
     static GXTevColorChan l_tevColorChan[4] = {
         GX_CH_RED,
@@ -1633,8 +1561,6 @@ void dDlst_shadowControl_c::draw(Mtx param_0) {
     GXSetAlphaUpdate(GX_DISABLE);
 }
 
-/* 80055C74-80055F1C 0505B4 02A8+00 0/0 1/1 1/1 .text
- * setReal__21dDlst_shadowControl_cFUlScP8J3DModelP4cXyzffP12dKy_tevstr_c */
 int dDlst_shadowControl_c::setReal(u32 param_1, s8 param_2, J3DModel* param_3, cXyz* param_4,
                                        f32 param_5, f32 param_6, dKy_tevstr_c* param_7) {
     static Mtx mtx_adj = {
@@ -1733,8 +1659,6 @@ int dDlst_shadowControl_c::setReal(u32 param_1, s8 param_2, J3DModel* param_3, c
     return rv;
 }
 
-/* 80055F1C-80055F84 05085C 0068+00 0/0 1/1 45/45 .text
- * addReal__21dDlst_shadowControl_cFUlP8J3DModel                */
 bool dDlst_shadowControl_c::addReal(u32 i_key, J3DModel* param_1) {
     if (i_key == 0) {
         return false;
@@ -1749,8 +1673,6 @@ bool dDlst_shadowControl_c::addReal(u32 i_key, J3DModel* param_1) {
     return false;
 }
 
-/* 80055F84-80055FE8 0508C4 0064+00 0/0 1/1 10/10 .text
- * setSimple__21dDlst_shadowControl_cFP4cXyzffP4cXyzsfP9_GXTexObj */
 int dDlst_shadowControl_c::setSimple(cXyz* param_0, f32 param_1, f32 param_2, cXyz* param_3,
                                      s16 param_4, f32 param_5, GXTexObj* param_6) {
     if (param_3 == NULL || mSimpleNum >= 128) {
@@ -1762,16 +1684,12 @@ int dDlst_shadowControl_c::setSimple(cXyz* param_0, f32 param_1, f32 param_2, cX
     return 1;
 }
 
-/* 804248D0-804248F0 0515F0 0020+00 1/1 6/6 173/173 .bss mSimpleTexObj__21dDlst_shadowControl_c */
 GXTexObj dDlst_shadowControl_c::mSimpleTexObj;
 
-/* 80055FE8-80056018 050928 0030+00 0/0 1/1 0/0 .text
- * setSimpleTex__21dDlst_shadowControl_cFPC7ResTIMG             */
 void dDlst_shadowControl_c::setSimpleTex(ResTIMG const* i_timg) {
     mDoLib_setResTimgObj(i_timg, &mSimpleTexObj, 0, NULL);
 }
 
-/* 80056018-80056080 050958 0068+00 0/0 3/3 9/9 .text            newData__13dDlst_peekZ_cFssPUl */
 int dDlst_peekZ_c::newData(s16 x, s16 y, u32* dst) {
     if (mCount >= 64 || x < 0 || x > 607 || y < 0 || y > 447) {
         return 0;
@@ -1785,7 +1703,6 @@ int dDlst_peekZ_c::newData(s16 x, s16 y, u32* dst) {
     return 1;
 }
 
-/* 80056080-800560F0 0509C0 0070+00 0/0 1/1 0/0 .text            peekData__13dDlst_peekZ_cFv */
 void dDlst_peekZ_c::peekData() {
     dDlst_peekZ_entry* entry = mEntries;
 
@@ -1797,7 +1714,6 @@ void dDlst_peekZ_c::peekData() {
     mCount = 0;
 }
 
-/* 800560F0-800561C8 050A30 00D8+00 0/0 1/1 0/0 .text            __ct__12dDlst_list_cFv */
 dDlst_list_c::dDlst_list_c() {
     mpCopy2DEnd = &mpCopy2DDrawLists[4];
     mp2DOpaTopEnd = &mp2DOpaTopDrawLists[16];
@@ -1811,27 +1727,21 @@ dDlst_list_c::dDlst_list_c() {
     }
 }
 
-/* 8005638C-80056390 050CCC 0004+00 1/1 0/0 0/0 .text            __ct__20dDlst_shadowSimple_cFv */
 dDlst_shadowSimple_c::dDlst_shadowSimple_c() {}
 
-/* ############################################################################################## */
-/* 8037A178-8037A1A4 0067D8 002A+02 1/1 0/0 0/0 .rodata          l_drawlistSize$5656 */
 static u16 const l_drawlistSize[21] = {
     0x0001, 0x0001, 0x0001, 0x0080, 0x0001, 0x0001, 0x0001, 0x0080, 0x0100, 0x0001, 0x0100,
     0x0001, 0x0020, 0x0010, 0x0010, 0x0020, 0x0020, 0x0100, 0x0001, 0x0004, 0x0004,
 };
 
-/* 8037A1A4-8037A1B0 006804 0009+03 1/1 0/0 0/0 .rodata          l_nonSortId$5662 */
 static u8 const l_nonSortId[9] = {
     0x00, 0x01, 0x02, 0x04, 0x05, 0x06, 0x09, 0x12, 0x0D,
 };
 
-/* 804520C4-804520CC 0006C4 0006+02 1/1 0/0 0/0 .sdata2          l_zSortId$5668 */
 static const u8 l_zSortId[6] = {
     0x08, 0x0A, 0x0C, 0x0E, 0x10, 0x11,
 };
 
-/* 80056390-8005648C 050CD0 00FC+00 0/0 1/1 0/0 .text            init__12dDlst_list_cFv */
 void dDlst_list_c::init() {
     J3DDrawBuffer** var_r30 = mDrawBuffers;
     const u16* var_r29 = l_drawlistSize;
@@ -1861,7 +1771,6 @@ void dDlst_list_c::init() {
     mShadowControl.init();
 }
 
-/* 8005648C-80056538 050DCC 00AC+00 0/0 1/1 0/0 .text            __dt__12dDlst_list_cFv */
 dDlst_list_c::~dDlst_list_c() {
     J3DDrawBuffer** buffer = mDrawBuffers;
     for (int i = 0; i < 21; i++) {
@@ -1872,7 +1781,6 @@ dDlst_list_c::~dDlst_list_c() {
     }
 }
 
-/* 80056538-800565EC 050E78 00B4+00 0/0 1/1 0/0 .text            reset__12dDlst_list_cFv */
 void dDlst_list_c::reset() {
     J3DDrawBuffer** buffer = mDrawBuffers;
     for (int i = 0; i < 21; i++) {
@@ -1896,8 +1804,6 @@ void dDlst_list_c::reset() {
     }
 }
 
-/* 800565EC-800566D4 050F2C 00E8+00 0/0 2/2 0/0 .text
- * entryZSortXluDrawList__12dDlst_list_cFP13J3DDrawBufferP9J3DPacketR4cXyz */
 void dDlst_list_c::entryZSortXluDrawList(J3DDrawBuffer* param_0, J3DPacket* param_1,
                                          cXyz& param_2) {
     f32 z_value = -J3DCalcZValue(j3dSys.getViewMtx(), param_2);
@@ -1921,36 +1827,26 @@ void dDlst_list_c::entryZSortXluDrawList(J3DDrawBuffer* param_0, J3DPacket* para
 }
 
 
-/* 800566D4-80056710 051014 003C+00 1/1 1/1 0/0 .text
- * drawOpaDrawList__12dDlst_list_cFP13J3DDrawBuffer             */
 void dDlst_list_c::drawOpaDrawList(J3DDrawBuffer* pDrawBuf) {
     J3DShape::resetVcdVatCache();
     j3dSys.setDrawModeOpaTexEdge();
     pDrawBuf->draw();
 }
 
-/* 80056710-8005674C 051050 003C+00 1/1 1/1 0/0 .text
- * drawXluDrawList__12dDlst_list_cFP13J3DDrawBuffer             */
 void dDlst_list_c::drawXluDrawList(J3DDrawBuffer* pDrawBuf) {
     J3DShape::resetVcdVatCache();
     j3dSys.setDrawModeXlu();
     pDrawBuf->draw();
 }
 
-/* 8005674C-80056770 05108C 0024+00 0/0 1/1 0/0 .text            drawOpaListItem3d__12dDlst_list_cFv
- */
 void dDlst_list_c::drawOpaListItem3d() {
     drawOpaDrawList(mDrawBuffers[DB_OPA_LIST_ITEM3D]);
 }
 
-/* 80056770-80056794 0510B0 0024+00 0/0 1/1 0/0 .text            drawXluListItem3d__12dDlst_list_cFv
- */
 void dDlst_list_c::drawXluListItem3d() {
     drawXluDrawList(mDrawBuffers[DB_XLU_LIST_ITEM3D]);
 }
 
-/* 80056794-800567C4 0510D4 0030+00 2/2 35/35 6/6 .text
- * set__12dDlst_list_cFRPP12dDlst_base_cRPP12dDlst_base_cP12dDlst_base_c */
 int dDlst_list_c::set(dDlst_base_c**& p_start, dDlst_base_c**& p_end, dDlst_base_c* p_newDlst) {
     if (p_start >= p_end) {
         return 0;
@@ -1960,8 +1856,6 @@ int dDlst_list_c::set(dDlst_base_c**& p_start, dDlst_base_c**& p_end, dDlst_base
     return 1;
 }
 
-/* 800567C4-8005681C 051104 0058+00 0/0 1/1 0/0 .text
- * draw__12dDlst_list_cFPP12dDlst_base_cPP12dDlst_base_c        */
 void dDlst_list_c::draw(dDlst_base_c** p_start, dDlst_base_c** p_end) {
     for (; p_start < p_end; p_start++) {
         dDlst_base_c* dlst = *p_start;
@@ -1969,23 +1863,16 @@ void dDlst_list_c::draw(dDlst_base_c** p_start, dDlst_base_c** p_end) {
     }
 }
 
-/* 804248F0-80424938 051610 0048+00 3/3 0/0 0/0 .bss             mWipeDlst__12dDlst_list_c */
 dDlst_2DT2_c dDlst_list_c::mWipeDlst;
 
-/* 8045065C-80450660 0000DC 0004+00 1/1 0/0 0/0 .sdata           mWipeColor__12dDlst_list_c */
 GXColor dDlst_list_c::mWipeColor = {0, 0, 0, 0};
 
-/* 80450ED0-80450ED4 0003D0 0004+00 2/2 1/1 0/0 .sbss            None */
 u8 dDlst_list_c::mWipe;
 
-/* 80450ED4-80450ED8 0003D4 0004+00 2/2 1/1 0/0 .sbss            mWipeRate__12dDlst_list_c */
 f32 dDlst_list_c::mWipeRate;
 
-/* 80450ED8-80450EE0 0003D8 0004+04 2/2 0/0 0/0 .sbss            mWipeSpeed__12dDlst_list_c */
 f32 dDlst_list_c::mWipeSpeed;
 
-/* 8005681C-800568D8 05115C 00BC+00 1/1 0/0 0/0 .text            wipeIn__12dDlst_list_cFfR8_GXColor
- */
 void dDlst_list_c::wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor) {
     mWipe = true;
     mWipeSpeed = i_wipeSpeed;
@@ -2000,12 +1887,10 @@ void dDlst_list_c::wipeIn(f32 i_wipeSpeed, GXColor& i_wipeColor) {
 }
 
 
-/* 800568D8-80056900 051218 0028+00 0/0 1/1 0/0 .text            wipeIn__12dDlst_list_cFf */
 void dDlst_list_c::wipeIn(f32 i_wipeSpeed) {
     wipeIn(-i_wipeSpeed, g_blackColor);
 }
 
-/* 80056900-800569A0 051240 00A0+00 0/0 1/1 0/0 .text            calcWipe__12dDlst_list_cFv */
 void dDlst_list_c::calcWipe() {
     if (mWipe) {
         mWipeRate += mWipeSpeed;