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

5 files changed, 133 insertions, 133 deletions

diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h
index 505778cbe4..cbacaa9437 100644
--- a/include/m_Do/m_Do_dvd_thread.h
+++ b/include/m_Do/m_Do_dvd_thread.h
@@ -19,8 +19,8 @@ public:
     /* 0x0C */ bool mIsDone;
     /* 0x10  vtable*/
 public:
-    /* 800158FC */ virtual ~mDoDvdThd_command_c();
-    /* 80015B74 */ mDoDvdThd_command_c();
+    virtual ~mDoDvdThd_command_c();
+    mDoDvdThd_command_c();
     inline s32 sync() { return mIsDone; }
     inline void destroy() { delete this; }
     virtual s32 execute() = 0;
@@ -28,10 +28,10 @@ public:
 
 class mDoDvdThd_toMainRam_c : public mDoDvdThd_command_c {
 public:
-    /* 80016338 */ mDoDvdThd_toMainRam_c(u8);
-    /* 80016394 */ static mDoDvdThd_toMainRam_c* create(char const*, u8, JKRHeap*);
-    /* 8001645C */ virtual ~mDoDvdThd_toMainRam_c();
-    /* 800164BC */ virtual s32 execute();
+    mDoDvdThd_toMainRam_c(u8);
+    static mDoDvdThd_toMainRam_c* create(char const*, u8, JKRHeap*);
+    virtual ~mDoDvdThd_toMainRam_c();
+    virtual s32 execute();
 
     void* getMemAddress() const { return mData; }
 
@@ -45,13 +45,13 @@ private:
 
 class mDoDvdThd_param_c {
 public:
-    /* 80015944 */ mDoDvdThd_param_c();
-    /* 8001598C */ void kick();
-    /* 800159B4 */ s32 waitForKick();
-    /* 800159DC */ mDoDvdThd_command_c* getFirstCommand();
-    /* 800159E4 */ void addition(mDoDvdThd_command_c*);
-    /* 80015A3C */ void cut(mDoDvdThd_command_c*);
-    /* 80015AD8 */ void mainLoop();
+    mDoDvdThd_param_c();
+    void kick();
+    s32 waitForKick();
+    mDoDvdThd_command_c* getFirstCommand();
+    void addition(mDoDvdThd_command_c*);
+    void cut(mDoDvdThd_command_c*);
+    void mainLoop();
 
 private:
     /* 0x00 */ OSMessageQueue mMessageQueue;
@@ -62,11 +62,11 @@ private:
 
 class mDoDvdThd_mountXArchive_c : public mDoDvdThd_command_c {
 public:
-    /* 80016108 */ virtual ~mDoDvdThd_mountXArchive_c();
-    /* 80016168 */ mDoDvdThd_mountXArchive_c(u8 mountDirection, JKRArchive::EMountMode mountMode);
-    /* 800161E0 */ static mDoDvdThd_mountXArchive_c* create(char const*, u8, JKRArchive::EMountMode,
+    virtual ~mDoDvdThd_mountXArchive_c();
+    mDoDvdThd_mountXArchive_c(u8 mountDirection, JKRArchive::EMountMode mountMode);
+    static mDoDvdThd_mountXArchive_c* create(char const*, u8, JKRArchive::EMountMode,
                                                             JKRHeap*);
-    /* 800162B0 */ virtual s32 execute();
+    virtual s32 execute();
 
     JKRArchive* getArchive() const { return mArchive; }
 
@@ -80,10 +80,10 @@ private:
 
 class mDoDvdThd_mountArchive_c : public mDoDvdThd_command_c {
 public:
-    /* 80015D44 */ virtual ~mDoDvdThd_mountArchive_c();
-    /* 80015DA4 */ mDoDvdThd_mountArchive_c(u8);
-    /* 80015E14 */ static mDoDvdThd_mountArchive_c* create(char const*, u8, JKRHeap*);
-    /* 80015EDC */ virtual s32 execute();
+    virtual ~mDoDvdThd_mountArchive_c();
+    mDoDvdThd_mountArchive_c(u8);
+    static mDoDvdThd_mountArchive_c* create(char const*, u8, JKRHeap*);
+    virtual s32 execute();
 
     JKRMemArchive* getArchive() const { return mArchive; }
     JKRHeap* getHeap() const { return mHeap; }
@@ -97,10 +97,10 @@ private:
 
 class mDoDvdThd_callback_c : public mDoDvdThd_command_c {
 public:
-    /* 80015BB8 */ virtual ~mDoDvdThd_callback_c();
-    /* 80015C18 */ mDoDvdThd_callback_c(mDoDvdThd_callback_func, void*);
-    /* 80015C74 */ static mDoDvdThd_callback_c* create(mDoDvdThd_callback_func, void*);
-    /* 80015CF0 */ virtual s32 execute();
+    virtual ~mDoDvdThd_callback_c();
+    mDoDvdThd_callback_c(mDoDvdThd_callback_func, void*);
+    static mDoDvdThd_callback_c* create(mDoDvdThd_callback_func, void*);
+    virtual s32 execute();
 
 private:
     /* 0x14 */ mDoDvdThd_callback_func mFunction;
@@ -110,12 +110,12 @@ private:
 
 struct mDoDvdThdStack {
     u8 stack[4096];
-} __attribute__((aligned(16)));
+} ATTRIBUTE_ALIGN(16);
 
 struct mDoDvdThd {
-    /* 800157FC */ static s32 main(void*);
-    /* 80015858 */ static void create(s32);
-    /* 800158B4 */ static void suspend();
+    static s32 main(void*);
+    static void create(s32);
+    static void suspend();
 
     static OSThread l_thread;
     static mDoDvdThdStack l_threadStack;
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index bc3aa12e7c..751ece4b00 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -28,9 +28,9 @@ void DummyCheckHeap_destroy();
 class mDoExt_baseAnm {
 public:
     mDoExt_baseAnm() {}
-    /* 8000D320 */ int initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_startF,
+    int initPlay(s16 i_frameMax, int i_attribute, f32 i_rate, s16 i_startF,
                                 s16 i_endF);
-    /* 8000D428 */ int play();
+    int play();
 
     J3DFrameCtrl* getFrameCtrl() { return &mFrameCtrl; }
     f32 getPlaySpeed() { return mFrameCtrl.getRate(); }
@@ -65,9 +65,9 @@ private:
 class mDoExt_btkAnm : public mDoExt_baseAnm {
 public:
     mDoExt_btkAnm() { mpAnm = 0; }
-    /* 8000D63C */ int init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk, int i_anmPlay,
+    int init(J3DMaterialTable* i_matTable, J3DAnmTextureSRTKey* i_btk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
-    /* 8000D6D8 */ void entry(J3DMaterialTable* i_matTable, f32 i_frame);
+    void entry(J3DMaterialTable* i_matTable, f32 i_frame);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
     void entry(J3DModelData* i_modelData, f32 i_frame) {
@@ -94,9 +94,9 @@ STATIC_ASSERT(sizeof(mDoExt_btkAnm) == 0x18);
 class mDoExt_brkAnm : public mDoExt_baseAnm {
 public:
     mDoExt_brkAnm() { mpAnm = 0; }
-    /* 8000D70C */ int init(J3DMaterialTable* i_matTable, J3DAnmTevRegKey* i_brk, int i_anmPlay,
+    int init(J3DMaterialTable* i_matTable, J3DAnmTevRegKey* i_brk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
-    /* 8000D7A8 */ void entry(J3DMaterialTable* i_matTable, f32 i_frame);
+    void entry(J3DMaterialTable* i_matTable, f32 i_frame);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
     void entry(J3DModelData* i_modelData, f32 i_frame) {
@@ -124,9 +124,9 @@ STATIC_ASSERT(sizeof(mDoExt_brkAnm) == 0x18);
 class mDoExt_bpkAnm : public mDoExt_baseAnm {
 public:
     mDoExt_bpkAnm() { mpAnm = 0; }
-    /* 8000D47C */ int init(J3DMaterialTable* i_matTable, J3DAnmColor* i_bpk, int i_anmPlay,
+    int init(J3DMaterialTable* i_matTable, J3DAnmColor* i_bpk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
-    /* 8000D518 */ void entry(J3DMaterialTable* i_matTable, f32 i_frame);
+    void entry(J3DMaterialTable* i_matTable, f32 i_frame);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
     void entry(J3DModelData* i_modelData, f32 i_frame) {
@@ -151,11 +151,11 @@ STATIC_ASSERT(sizeof(mDoExt_bpkAnm) == 0x18);
 class mDoExt_bckAnm : public mDoExt_baseAnm {
 public:
     mDoExt_bckAnm() { mpMtxCalc = NULL; }
-    /* 8000D7DC */ int init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_rate,
+    int init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_rate,
                             s16 i_startF, s16 i_endF, bool i_modify);
-    /* 8000D990 */ void changeBckOnly(J3DAnmTransform* i_bck);
-    /* 8000D9CC */ void entry(J3DModelData* i_modelData, f32 i_frame);
-    /* 8000D9E8 */ void entryJoint(J3DModelData* i_modelData, u16 i_jntNo, f32 i_frame);
+    void changeBckOnly(J3DAnmTransform* i_bck);
+    void entry(J3DModelData* i_modelData, f32 i_frame);
+    void entryJoint(J3DModelData* i_modelData, u16 i_jntNo, f32 i_frame);
     inline void entryJoint(J3DModelData* i_modelData, u16 i_jntNo) {
         entryJoint(i_modelData, i_jntNo, getFrame());
     }
@@ -182,9 +182,9 @@ STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x1C);
 class mDoExt_btpAnm : public mDoExt_baseAnm {
 public:
     mDoExt_btpAnm() { mpAnm = NULL; }
-    /* 8000D54C */ int init(J3DMaterialTable* i_matTable, J3DAnmTexPattern* i_btk, int i_anmPlay,
+    int init(J3DMaterialTable* i_matTable, J3DAnmTexPattern* i_btk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
-    /* 8000D5E8 */ void entry(J3DMaterialTable* i_matTable, s16 i_frame);
+    void entry(J3DMaterialTable* i_matTable, s16 i_frame);
 
     void entry(J3DModelData* i_modelData) { entry(i_modelData, getFrame()); }
     void entry(J3DModelData* i_modelData, s16 i_frame) {
@@ -211,7 +211,7 @@ public:
         mpAnm = NULL;
     }
 
-    /* 8000DA08 */ int init(J3DDeformData* i_deformData, J3DAnmCluster* i_blk, int i_anmPlay,
+    int init(J3DDeformData* i_deformData, J3DAnmCluster* i_blk, int i_anmPlay,
                             int i_attribute, f32 i_rate, s16 i_start, s16 param_6);
 
     J3DAnmCluster* getBlkAnm() { return mpAnm; }
@@ -245,10 +245,10 @@ private:
 
 class mDoExt_invJntPacket : public J3DPacket {
 public:
-    /* 8000E654 */ mDoExt_invJntPacket() {}
+    mDoExt_invJntPacket() {}
 
-    /* 80012220 */ virtual void draw();
-    /* 8000E5F8 */ virtual ~mDoExt_invJntPacket() {}
+    virtual void draw();
+    virtual ~mDoExt_invJntPacket() {}
 
     void setJoint(J3DModel* i_model, u16 param_1, u8 param_2) {
         field_0x10 = i_model;
@@ -265,9 +265,9 @@ private:
 class mDoExt_invisibleModel {
 public:
     mDoExt_invisibleModel() {}
-    /* 8000E53C */ int create(J3DModel* i_model, u8 param_1);
-    /* 8000E6C8 */ void entryJoint(cXyz*);
-    /* 8000E7C0 */ void entryDL(cXyz*);
+    int create(J3DModel* i_model, u8 param_1);
+    void entryJoint(cXyz*);
+    void entryDL(cXyz*);
 
     /* 0x0 */ J3DModel* mModel;
     /* 0x4 */ mDoExt_invJntPacket* mpPackets;
@@ -291,11 +291,11 @@ public:
 class mDoExt_morf_c
     : public J3DMtxCalcNoAnm<J3DMtxCalcCalcTransformMaya, J3DMtxCalcJ3DSysInitMaya> {
 public:
-    /* 8000F950 */ mDoExt_morf_c();
-    /* 8000FB7C */ void setMorf(f32 i_morf);
-    /* 8000FBC0 */ void frameUpdate();
+    mDoExt_morf_c();
+    void setMorf(f32 i_morf);
+    void frameUpdate();
 
-    /* 8000FAE8 */ virtual ~mDoExt_morf_c();
+    virtual ~mDoExt_morf_c();
 
     J3DAnmTransform* getAnm() { return mpAnm; }
     void changeAnm(J3DAnmTransform* anm) { mpAnm = anm; }
@@ -330,22 +330,22 @@ public:
 
 class mDoExt_McaMorfSO : public mDoExt_morf_c {
 public:
-    /* 800107D0 */ mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
+    mDoExt_McaMorfSO(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                     mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int,
                                     int, Z2Creature*, u32, u32);
-    /* 800108F0 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*,
+    int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*,
                               J3DAnmTransform*, int, f32, int, int, Z2Creature*, u32, u32);
-    /* 80010E70 */ void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate,
+    void setAnm(J3DAnmTransform* i_anm, int i_attr, f32 i_morf, f32 i_rate,
                                f32 i_start, f32 i_end);
-    /* 800110B0 */ int play(u32, s8);
-    /* 80011154 */ void updateDL();
-    /* 800111C0 */ void entryDL();
-    /* 800111EC */ void modelCalc();
-    /* 80011250 */ void getTransform(u16, J3DTransformInfo*);
-    /* 80011310 */ void stopZelAnime();
+    int play(u32, s8);
+    void updateDL();
+    void entryDL();
+    void modelCalc();
+    void getTransform(u16, J3DTransformInfo*);
+    void stopZelAnime();
 
-    /* 80010888 */ virtual ~mDoExt_McaMorfSO();
-    /* 80010B68 */ virtual void calc();
+    virtual ~mDoExt_McaMorfSO();
+    virtual void calc();
 
     J3DModel* getModel() { return mpModel; }
     void offMorfNone() { mMorfNone = false; }
@@ -368,19 +368,19 @@ private:
 
 class mDoExt_McaMorf : public mDoExt_morf_c {
 public:
-    /* 8000FC4C */ mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
+    mDoExt_McaMorf(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                   mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, int, f32, int, int,
                                   int, void*, u32, u32);
-    /* 8000FD94 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*,
+    int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*, mDoExt_McaMorfCallBack2_c*,
                               J3DAnmTransform*, int, f32, int, int, int, void*, u32, u32);
-    /* 8001037C */ void setAnm(J3DAnmTransform* i_bck, int i_mode, f32 i_morf, f32 i_speed, f32 i_startF, f32 i_endF, void* i_bas);
-    /* 800105C8 */ u32 play(Vec*, u32, s8);
-    /* 80010680 */ void entryDL();
-    /* 800106AC */ void modelCalc();
-    /* 80010710 */ void getTransform(u16, J3DTransformInfo*);
+    void setAnm(J3DAnmTransform* i_bck, int i_mode, f32 i_morf, f32 i_speed, f32 i_startF, f32 i_endF, void* i_bas);
+    u32 play(Vec*, u32, s8);
+    void entryDL();
+    void modelCalc();
+    void getTransform(u16, J3DTransformInfo*);
 
-    /* 8000FD10 */ virtual ~mDoExt_McaMorf();
-    /* 80010074 */ virtual void calc();
+    virtual ~mDoExt_McaMorf();
+    virtual void calc();
 
     J3DModel* getModel() { return mpModel; }
 
@@ -396,22 +396,22 @@ private:
 
 class mDoExt_McaMorf2 : public mDoExt_morf_c {
 public:
-    /* 80011348 */ mDoExt_McaMorf2(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
+    mDoExt_McaMorf2(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                    mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*,
                                    int, f32, int, int, Z2Creature*, u32, u32);
-    /* 80011464 */ int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
+    int create(J3DModelData*, mDoExt_McaMorfCallBack1_c*,
                                mDoExt_McaMorfCallBack2_c*, J3DAnmTransform*, J3DAnmTransform*, int,
                                f32, int, int, Z2Creature*, u32, u32);
-    /* 800116B4 */ void ERROR_EXIT();
-    /* 80011D70 */ void setAnm(J3DAnmTransform*, J3DAnmTransform*, f32, int, f32, f32, f32, f32);
-    /* 80011FCC */ void setAnmRate(f32);
-    /* 800120A0 */ int play(u32, s8);
-    /* 80012144 */ void entryDL();
-    /* 80012170 */ void modelCalc();
-    /* 800121E8 */ void stopZelAnime();
+    void ERROR_EXIT();
+    void setAnm(J3DAnmTransform*, J3DAnmTransform*, f32, int, f32, f32, f32, f32);
+    void setAnmRate(f32);
+    int play(u32, s8);
+    void entryDL();
+    void modelCalc();
+    void stopZelAnime();
 
-    /* 800113FC */ virtual ~mDoExt_McaMorf2();
-    /* 800116F4 */ virtual void calc();
+    virtual ~mDoExt_McaMorf2();
+    virtual void calc();
 
     inline f32 getAnmRate() { return mAnmRate; }
     inline void changeAnm(J3DAnmTransform* anm, J3DAnmTransform* anm2) {
@@ -430,8 +430,8 @@ private:
 
 class mDoExt_MtxCalcOldFrame {
 public:
-    /* 8000F848 */ void initOldFrameMorf(f32, u16, u16);
-    /* 8000F8CC */ void decOldFrameMorfCounter();
+    void initOldFrameMorf(f32, u16, u16);
+    void decOldFrameMorfCounter();
 
     mDoExt_MtxCalcOldFrame(J3DTransformInfo* i_transinf, Quaternion* i_quat) {
         mOldFrameTransInfo = i_transinf;
@@ -484,8 +484,8 @@ struct mDoExt_MtxCalcAnmBlendTbl
     J3DAnmTransform* getAnm(int i) { return mAnmRatio[i].getAnmTransform(); }
     f32 getRatio(int i) { return mAnmRatio[i].getRatio(); }
 
-    /* 80014F3C */ virtual ~mDoExt_MtxCalcAnmBlendTbl() {}
-    /* 8000F26C */ virtual void calc();
+    virtual ~mDoExt_MtxCalcAnmBlendTbl() {}
+    virtual void calc();
 
     /* 0x4 */ int mNum;
     /* 0x8 */ mDoExt_AnmRatioPack* mAnmRatio;
@@ -499,8 +499,8 @@ struct mDoExt_MtxCalcAnmBlendTblOld : public mDoExt_MtxCalcAnmBlendTbl {
         : mDoExt_MtxCalcAnmBlendTbl(num, anmRatio) {
         mOldFrame = oldFrame;
     }
-    /* 80014EB0 */ virtual ~mDoExt_MtxCalcAnmBlendTblOld() {}
-    /* 8000F4B0 */ virtual void calc();
+    virtual ~mDoExt_MtxCalcAnmBlendTblOld() {}
+    virtual void calc();
 
     /* 0xC */ mDoExt_MtxCalcOldFrame* mOldFrame;
 };  // Size: 0x10
@@ -520,8 +520,8 @@ struct mDoExt_3Dline_field_0x18_c {
 
 class mDoExt_3Dline_c {
 public:
-    /* 800123D0 */ int init(u16, int, BOOL);
-    /* 800126BC */ mDoExt_3Dline_c() {}
+    int init(u16, int, BOOL);
+    mDoExt_3Dline_c() {}
 
     /* 0x00 */ cXyz* field_0x0;
     /* 0x04 */ f32* field_0x4;
@@ -549,7 +549,7 @@ public:
     void reset() { mp3DlineMat = NULL; }
     void setMatDark(mDoExt_3DlineMat_c* i_mat) { setMat(i_mat); }
 
-    /* 80014738 */ void setMat(mDoExt_3DlineMat_c*);
+    void setMat(mDoExt_3DlineMat_c*);
     virtual void draw();
     virtual ~mDoExt_3DlineMatSortPacket() {}
 
@@ -560,12 +560,12 @@ private:
 class dKy_tevstr_c;
 class mDoExt_3DlineMat1_c : public mDoExt_3DlineMat_c {
 public:
-    /* 80013360 */ int init(u16, u16, ResTIMG*, int);
-    /* 80013FB0 */ void update(int, GXColor&, dKy_tevstr_c*);
-    /* 8001373C */ void update(int, f32, GXColor&, u16, dKy_tevstr_c*);
-    /* 80014E7C */ int getMaterialID() { return 1; }
-    /* 800134F8 */ void setMaterial();
-    /* 800135D0 */ void draw();
+    int init(u16, u16, ResTIMG*, int);
+    void update(int, GXColor&, dKy_tevstr_c*);
+    void update(int, f32, GXColor&, u16, dKy_tevstr_c*);
+    int getMaterialID() { return 1; }
+    void setMaterial();
+    void draw();
 
     cXyz* getPos(int i_idx) { return mpLines[i_idx].field_0x0; }
     f32* getSize(int i_idx) { return mpLines[i_idx].field_0x4; }
@@ -583,13 +583,13 @@ private:
 
 class mDoExt_3DlineMat0_c : public mDoExt_3DlineMat_c {
 public:
-    /* 800125E0 */ int init(u16, u16, int);
-    /* 80012874 */ void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);
-    /* 80012E3C */ void update(int, _GXColor&, dKy_tevstr_c*);
+    int init(u16, u16, int);
+    void update(int, f32, _GXColor&, u16, dKy_tevstr_c*);
+    void update(int, _GXColor&, dKy_tevstr_c*);
 
-    /* 80014E84 */ virtual int getMaterialID() { return 0; }
-    /* 800126C0 */ virtual void setMaterial();
-    /* 80012774 */ virtual void draw();
+    virtual int getMaterialID() { return 0; }
+    virtual void setMaterial();
+    virtual void draw();
 
     cXyz* getPos(int param_0) { return field_0x18[param_0].field_0x0; }
     f32* getSize(int param_0) { return field_0x18[param_0].field_0x4; }
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 324f2e9db0..fd50e4a082 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -23,9 +23,9 @@ public:
     class bloom_c {
     public:
         bloom_c() { m_buffer = NULL; }
-        /* 80009544 */ void create();
-        /* 800095F8 */ void remove();
-        /* 80009650 */ void draw();
+        void create();
+        void remove();
+        void draw();
 
         u8 getEnable() { return mEnable; }
         void setEnable(u8 i_enable) { mEnable = i_enable; }
@@ -66,17 +66,17 @@ public:
     static void entryBaseCsr(csr_c*);
     #endif
 
-    /* 80007E44 */ static void create();
-    /* 80007F90 */ static void beginRender();
-    /* 800080D0 */ static void fadeOut(f32);
-    /* 80007FD8 */ static void fadeOut(f32, _GXColor&);
-    /* 807DFAB4 */ static void fadeIn(f32 fadeSpeed, _GXColor& fadeColor) {
+    static void create();
+    static void beginRender();
+    static void fadeOut(f32);
+    static void fadeOut(f32, _GXColor&);
+    static void fadeIn(f32 fadeSpeed, _GXColor& fadeColor) {
         fadeOut(-fadeSpeed, fadeColor);
     }
-    /* 80008028 */ static void fadeOut_f(f32, _GXColor&);
-    /* 800080A0 */ static void onBlure(const Mtx);
-    /* 80008078 */ static void onBlure();
-    /* 80008330 */ static void calcFade();
+    static void fadeOut_f(f32, _GXColor&);
+    static void onBlure(const Mtx);
+    static void onBlure();
+    static void calcFade();
 
     static void fadeIn(f32 fadeSpeed) {
         fadeOut(-fadeSpeed);
diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h
index 5465e909d7..31b5b5f700 100644
--- a/include/m_Do/m_Do_lib.h
+++ b/include/m_Do/m_Do_lib.h
@@ -9,7 +9,7 @@ typedef struct Vec Vec;
 struct ResTIMG;
 
 struct mDoLib_clipper {
-    /* 8001528C */ static void setup(f32, f32, f32, f32);
+    static void setup(f32, f32, f32, f32);
 
     static void changeFar(f32 far) {
         mClipper.setFar(far);
diff --git a/include/m_Do/m_Do_mtx.h b/include/m_Do/m_Do_mtx.h
index 4726c89168..5f749ed073 100644
--- a/include/m_Do/m_Do_mtx.h
+++ b/include/m_Do/m_Do_mtx.h
@@ -157,20 +157,20 @@ public:
         end = buffer + 16;
     }
 
-    /* 8000CCC8 */ static bool push();
-    /* 8000CD14 */ static bool pop();
+    static bool push();
+    static bool pop();
 
     /**
      * Translates the `now` Matrix by the given cXyz
      * @param xyz The xyz translation vector
      */
-    /* 8000CD64 */ static void transS(cXyz const& xyz);
+    static void transS(cXyz const& xyz);
 
     /**
      * Translates a new Matrix by the given cXyz and then concatenates it with the `now` matrix
      * @param xyz The xyz translation vector
      */
-    /* 8000CDD4 */ static void transM(cXyz const& xyz);
+    static void transM(cXyz const& xyz);
 
     /**
      * Translates a new Matrix by the given X, Y, and Z values and then concatenates it with the `now` matrix
@@ -178,19 +178,19 @@ public:
      * @param y The y-axis translation value
      * @param z The z-axis translation value
      */
-    /* 8000CD9C */ static void transM(f32 x, f32 y, f32 z);
+    static void transM(f32 x, f32 y, f32 z);
 
     /**
      * Scales the `now` Matrix by the given cXyz
      * @param xyz The xyz scale vector
      */
-    /* 8000CE00 */ static void scaleS(cXyz const& xyz);
+    static void scaleS(cXyz const& xyz);
 
     /**
      * Scales a new Matrix by the given cXyz and then concatenates it with the `now` matrix
      * @param xyz The xyz scale vector
      */
-    /* 8000CE70 */ static void scaleM(cXyz const& xyz);
+    static void scaleM(cXyz const& xyz);
 
     /**
      * Scales a new Matrix by the given X, Y, and Z values and then concatenates it with the `now` matrix
@@ -198,30 +198,30 @@ public:
      * @param y The y-axis scale value
      * @param z The z-axis scale value
      */
-    /* 8000CE38 */ static void scaleM(f32 x, f32 y, f32 z);
+    static void scaleM(f32 x, f32 y, f32 z);
 
-    /* 8000CE9C */ static void XYZrotS(csXyz const& xyz);
+    static void XYZrotS(csXyz const& xyz);
 
     /**
      * Rotates the `now` matrix by the given csXyz in the order Z, Y, X
      * @param xyz The xyz rotation vector
      */
-    /* 8000CED4 */ static void XYZrotM(csXyz const& xyz);
+    static void XYZrotM(csXyz const& xyz);
 
-    /* 8000CF0C */ static void ZXYrotS(csXyz const& xyz);
+    static void ZXYrotS(csXyz const& xyz);
 
     /**
      * Rotates the `now` matrix by the given csXyz in the order X, Y, Z
      * @param xyz The xyz rotation vector
      */
-    /* 8000CF44 */ static void ZXYrotM(csXyz const& xyz);
+    static void ZXYrotM(csXyz const& xyz);
 
     static void quatS(const Quaternion* quat) {
         MTXQuat(now, quat);
     }
 
-    /* 8000CF7C */ static void quatM(Quaternion const*);
-    /* 8000D070 */ ~mDoMtx_stack_c() {}  // inline
+    static void quatM(Quaternion const*);
+    ~mDoMtx_stack_c() {}  // inline
 
     /**
      * Returns the `now` Matrix