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

7 files changed, 188 insertions, 188 deletions

diff --git a/include/SSystem/SComponent/c_bg_s_gnd_chk.h b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
index 8bcf4f3181..11028c500d 100644
--- a/include/SSystem/SComponent/c_bg_s_gnd_chk.h
+++ b/include/SSystem/SComponent/c_bg_s_gnd_chk.h
@@ -7,12 +7,12 @@
 
 class cBgS_GndChk : public cBgS_Chk, public cBgS_PolyInfo {
 public:
-    /* 80267C1C */ cBgS_GndChk();
-    /* 80267D28 */ void SetPos(cXyz const*);
-    /* 80267D0C */ void SetPos(Vec const*);
-    /* 80267D44 */ void PreCheck();
+    cBgS_GndChk();
+    void SetPos(cXyz const*);
+    void SetPos(Vec const*);
+    void PreCheck();
 
-    /* 80267C94 */ virtual ~cBgS_GndChk();
+    virtual ~cBgS_GndChk();
 
     f32 GetNowY() const { return mNowY; }
     void SetNowY(f32 y) { mNowY = y; }
diff --git a/include/SSystem/SComponent/c_bg_w.h b/include/SSystem/SComponent/c_bg_w.h
index 54f9682c01..44a271052b 100644
--- a/include/SSystem/SComponent/c_bg_w.h
+++ b/include/SSystem/SComponent/c_bg_w.h
@@ -9,11 +9,11 @@ private:
     /* 0x4 vtable */
 
 public:
-    /* 802681C8 */ void Release();
-    /* 802681D4 */ bool ChkUsed() const;
-    /* 802681C0 */ void Regist(int);
+    void Release();
+    bool ChkUsed() const;
+    void Regist(int);
 
-    /* 8007E5F8 */ virtual ~cBgW_BgId() {}
+    virtual ~cBgW_BgId() {}
 
     cBgW_BgId() { Ct(); }
     void Ct() { m_id = 0x100; }
diff --git a/include/SSystem/SComponent/c_cc_d.h b/include/SSystem/SComponent/c_cc_d.h
index 52fac6cdc1..9252ad2048 100644
--- a/include/SSystem/SComponent/c_cc_d.h
+++ b/include/SSystem/SComponent/c_cc_d.h
@@ -87,8 +87,8 @@ private:
 public:
     cCcD_DivideInfo() {}
     virtual ~cCcD_DivideInfo() {}
-    /* 80263358 */ void Set(u32, u32, u32);
-    /* 80263368 */ bool Chk(cCcD_DivideInfo const&) const;
+    void Set(u32, u32, u32);
+    bool Chk(cCcD_DivideInfo const&) const;
 };  // Size = 0x10
 
 STATIC_ASSERT(0x10 == sizeof(cCcD_DivideInfo));
@@ -108,9 +108,9 @@ private:
 public:
     cCcD_DivideArea() {}
     virtual ~cCcD_DivideArea() {}
-    /* 802633A8 */ void SetArea(cM3dGAab const&);
-    /* 802634D4 */ void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32);
-    /* 802636A0 */ void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&);
+    void SetArea(cM3dGAab const&);
+    void CalcDivideInfo(cCcD_DivideInfo*, cM3dGAab const&, u32);
+    void CalcDivideInfoOverArea(cCcD_DivideInfo*, cM3dGAab const&);
 };  // Size = 0x40
 
 STATIC_ASSERT(0x40 == sizeof(cCcD_DivideArea));
@@ -147,7 +147,7 @@ struct cCcD_SrcObj {
 
 class cCcD_GStts {
 public:
-    /* 800837B0 */ virtual ~cCcD_GStts() {}
+    virtual ~cCcD_GStts() {}
 
 private:
     /* 0x00 vtable */
@@ -164,17 +164,17 @@ private:
 
 public:
     cCcD_Stts() {}
-    /* 801410A4 vt[3] */ virtual ~cCcD_Stts() {}
-    /* 80263894 vt[4] */ virtual const cCcD_GStts* GetGStts() const;
-    /* 8026389C vt[5] */ virtual cCcD_GStts* GetGStts();
-    /* 802638A4 */ void Init(int, int, void*, fpc_ProcID);
-    /* 80263904 vt[6] */ virtual void Ct();
-    /* 80263934 */ void PlusCcMove(f32, f32, f32);
-    /* 8026395C */ void ClrCcMove();
-    /* 80263970 */ void PlusDmg(int);
-    /* 80263984 */ f32 GetWeightF() const;
-    /* 802649E8 vt[7] */ virtual void ClrAt() {}
-    /* 802649EC vt[8] */ virtual void ClrTg() { m_dmg = 0; }
+    virtual ~cCcD_Stts() {}
+    virtual const cCcD_GStts* GetGStts() const;
+    virtual cCcD_GStts* GetGStts();
+    void Init(int, int, void*, fpc_ProcID);
+    virtual void Ct();
+    void PlusCcMove(f32, f32, f32);
+    void ClrCcMove();
+    void PlusDmg(int);
+    f32 GetWeightF() const;
+    virtual void ClrAt() {}
+    virtual void ClrTg() { m_dmg = 0; }
 
     u8 GetWeightUc() const { return m_weight; }
     void SetWeight(u8 weight) { m_weight = weight; }
@@ -205,8 +205,8 @@ public:
     };
 
     cCcD_ObjCommonBase() { ct(); }
-    /* 8008409C */ virtual ~cCcD_ObjCommonBase() {}
-    /* 802639B0 */ void ct();
+    virtual ~cCcD_ObjCommonBase() {}
+    void ct();
     void SetSPrm(u32 sprm) { mSPrm = sprm; }
     s32 getSPrm() const { return mSPrm; }
     void setRPrm(s32 rprm) { mRPrm = rprm; }
@@ -229,10 +229,10 @@ STATIC_ASSERT(0x10 == sizeof(cCcD_ObjCommonBase));
 class cCcD_ObjAt : public cCcD_ObjCommonBase {
 public:
     cCcD_ObjAt() { mType = 0; }
-    /* 80084040 */ virtual ~cCcD_ObjAt() {}
-    /* 8026483C */ void SetHit(cCcD_Obj*);
-    /* 8026484C */ void Set(cCcD_SrcObjAt const&);
-    /* 80264868 */ void ClrHit();
+    virtual ~cCcD_ObjAt() {}
+    void SetHit(cCcD_Obj*);
+    void Set(cCcD_SrcObjAt const&);
+    void ClrHit();
     int GetType() const { return mType; }
     u32 GetGrp() const { return MskSPrm(0x1E); }
     bool ChkSet() const { return MskSPrm(1); }
@@ -256,11 +256,11 @@ STATIC_ASSERT(0x18 == sizeof(cCcD_ObjAt));
 class cCcD_ObjTg : public cCcD_ObjCommonBase {
 public:
     cCcD_ObjTg() { ct(); }
-    /* 80083FE4 */ virtual ~cCcD_ObjTg() {}
-    /* 80264880 */ void Set(cCcD_SrcObjTg const&);
-    /* 80264894 */ void SetGrp(u32);
-    /* 802648B0 */ void ClrHit();
-    /* 802648C8 */ void SetHit(cCcD_Obj*);
+    virtual ~cCcD_ObjTg() {}
+    void Set(cCcD_SrcObjTg const&);
+    void SetGrp(u32);
+    void ClrHit();
+    void SetHit(cCcD_Obj*);
     int GetType() const { return mType; }
     void SetType(u32 type) { mType = type; }
     u32 GetGrp() const { return MskSPrm(0x1E); }
@@ -276,11 +276,11 @@ STATIC_ASSERT(0x14 == sizeof(cCcD_ObjTg));
 
 class cCcD_ObjCo : public cCcD_ObjCommonBase {
 public:
-    /* 80083F88 */ virtual ~cCcD_ObjCo() {}
-    /* 802648D8 */ void SetHit(cCcD_Obj*);
-    /* 802648E8 */ void ClrHit();
-    /* 80264900 */ void SetIGrp(u32);
-    /* 8026491C */ void SetVsGrp(u32);
+    virtual ~cCcD_ObjCo() {}
+    void SetHit(cCcD_Obj*);
+    void ClrHit();
+    void SetIGrp(u32);
+    void SetVsGrp(u32);
     u32 GetGrp() const { return MskSPrm(0x1E); }
     bool ChkSet() const { return MskSPrm(1); }
     u32 GetVsGrp() const { return MskSPrm(0x70); }
@@ -306,8 +306,8 @@ protected:
     /* 0x02C */ cCcD_ObjCo mObjCo;
     /* 0x03C vtable */
 public:
-    /* 80083EC8 */ virtual ~cCcD_ObjHitInf() {}
-    /* 802639C4 */ void Set(cCcD_SrcObjHitInf const&);
+    virtual ~cCcD_ObjHitInf() {}
+    void Set(cCcD_SrcObjHitInf const&);
     cCcD_ObjAt& GetObjAt() { return mObjAt; }
     cCcD_ObjTg& GetObjTg() { return mObjTg; }
     cCcD_ObjCo& GetObjCo() { return mObjCo; }
@@ -390,7 +390,7 @@ public:
     /* 0x1C vtable */
 
     struct Shape {
-        /* 80167BBC */ ~Shape() {}
+        ~Shape() {}
 
         /* 0x00 */ int _0;
         /* 0x04 */ cXyz _4;
@@ -398,8 +398,8 @@ public:
         /* 0x14 */ f32 _14;
     };
     cCcD_ShapeAttr() {}
-    /* 8008556C vt[2] */ virtual ~cCcD_ShapeAttr() {}
-    /* 802649D8 vt[3] */ virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const {
+    virtual ~cCcD_ShapeAttr() {}
+    virtual bool CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const {
         return false;
     }
     /*          vt[4] */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const = 0;
@@ -434,14 +434,14 @@ class cCcD_GObjInf;
 class cCcD_Obj : public cCcD_ObjHitInf {
 public:
     cCcD_Obj() { ct(); }
-    /* 80083DE0 */ virtual ~cCcD_Obj() {}
-    /* 800851A4 */ virtual cCcD_GObjInf const* GetGObjInf() const { return NULL; }
-    /* 800847C8 */ virtual cCcD_GObjInf* GetGObjInf() { return NULL; }
-    /* 80084BE8 */ virtual cCcD_ShapeAttr const* GetShapeAttr() const { return NULL; }
-    /* 80085130 */ virtual cCcD_ShapeAttr* GetShapeAttr() { return NULL; }
-    /* 80084BF0 */ virtual void Draw(_GXColor const&) {}
-    /* 80263A10 */ void ct();
-    /* 80263A1C */ void Set(cCcD_SrcObj const&);
+    virtual ~cCcD_Obj() {}
+    virtual cCcD_GObjInf const* GetGObjInf() const { return NULL; }
+    virtual cCcD_GObjInf* GetGObjInf() { return NULL; }
+    virtual cCcD_ShapeAttr const* GetShapeAttr() const { return NULL; }
+    virtual cCcD_ShapeAttr* GetShapeAttr() { return NULL; }
+    virtual void Draw(_GXColor const&) {}
+    void ct();
+    void Set(cCcD_SrcObj const&);
     fopAc_ac_c* GetAc();
 
     cCcD_Stts* GetStts() { return mStts; }
@@ -461,12 +461,12 @@ STATIC_ASSERT(0x58 == sizeof(cCcD_Obj));
 class cCcD_GObjInf : public cCcD_Obj {
 public:
     cCcD_GObjInf() {}
-    /* 80083CE8 */ virtual ~cCcD_GObjInf() {}
-    /* 80085138 */ virtual void ClrAtHit() { mObjAt.ClrHit(); }
-    /* 80085158 */ virtual void ClrTgHit() { mObjTg.ClrHit(); }
-    /* 8008517C */ virtual void ClrCoHit() { mObjCo.ClrHit(); }
-    /* 80084BE4 */ virtual cCcD_GObjInf const* GetGObjInf() const { return this; }
-    /* 800851A0 */ virtual cCcD_GObjInf* GetGObjInf() { return this; }
+    virtual ~cCcD_GObjInf() {}
+    virtual void ClrAtHit() { mObjAt.ClrHit(); }
+    virtual void ClrTgHit() { mObjTg.ClrHit(); }
+    virtual void ClrCoHit() { mObjCo.ClrHit(); }
+    virtual cCcD_GObjInf const* GetGObjInf() const { return this; }
+    virtual cCcD_GObjInf* GetGObjInf() { return this; }
 };
 
 class cCcD_PntAttr : public cCcD_ShapeAttr, public cM3dGVtx {
@@ -503,84 +503,84 @@ public:
         cM3dGCps::Set(pStart, pEnd, radius);
     }
 
-    /* 80085450 */ virtual ~cCcD_CpsAttr() {}
-    /* 80263DC0 */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
-    /* 80263E04 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
-    /* 80084FE4 */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
+    virtual ~cCcD_CpsAttr() {}
+    virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
         return shape.CrossAtTg(*this, xyz);
     }
-    /* 80084FDC */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
-    /* 80084FD4 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
-    /* 80263D38 */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
-    /* 80263D7C */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
-    /* 80263F24 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
-    /* 80263ED4 */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
-    /* 80263F74 */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
-    /* 80085034 */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
+    virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
         return shape.CrossCo(*this, f);
     }
-    /* 8008502C */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
-    /* 80085024 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
-    /* 8008501C */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
-    /* 80263FC4 */ virtual void CalcAabBox();
-    /* 80264014 */ virtual bool GetNVec(cXyz const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
+    virtual void CalcAabBox();
+    virtual bool GetNVec(cXyz const&, cXyz*) const;
 };
 
 STATIC_ASSERT(0x40 == sizeof(cCcD_CpsAttr));
 
 class cCcD_TriAttr : public cCcD_ShapeAttr, public cM3dGTri {
 public:
-    /* 80263C04 */ virtual void CalcAabBox();
-    /* 80263C9C */ virtual bool GetNVec(cXyz const&, cXyz*) const;
-    /* 80263A88 */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
-    /* 80263BCC */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
-    /* 80263B90 */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
-    /* 80084E54 */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
+    virtual void CalcAabBox();
+    virtual bool GetNVec(cXyz const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
         return shape.CrossAtTg(*this, xyz);
     }
-    /* 80084E4C */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
-    /* 80084E44 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
-    /* 80263B58 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
-    /* 80084EBC */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
+    virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
         return shape.CrossCo(*this, f);
     }
-    /* 80084EB4 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
-    /* 80084EAC */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const { return false; }
-    /* 80084EA4 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
-    /* 80084E9C */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
-    /* 80084E94 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const { return false; }
-    /* 80084E8C */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const { return false; }
-    /* 80264938 */ virtual ~cCcD_TriAttr() {}
+    virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_CylAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_SphAttr const&, f32*) const { return false; }
+    virtual ~cCcD_TriAttr() {}
     cCcD_TriAttr() {}
 };
 
 class cCcD_CylAttr : public cCcD_ShapeAttr, public cM3dGCyl {
 public:
     cCcD_CylAttr() {}
-    /* 800854E0 */ virtual ~cCcD_CylAttr() {}
-    /* 80084CC0 */ virtual const cXyz& GetCoCP() const { return *GetCP(); }
-    /* 8026420C */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
-    /* 802641C8 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
-    /* 80264250 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
-    /* 80084CD8 */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
+    virtual ~cCcD_CylAttr() {}
+    virtual const cXyz& GetCoCP() const { return *GetCP(); }
+    virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
         return shape.CrossAtTg(*this, xyz);
     }
-    /* 80084CD0 */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
-    /* 80084CC8 */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
-    /* 8026417C */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
-    /* 80264288 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
-    /* 80264310 */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
-    /* 80084D28 */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
+    virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
         return shape.CrossCo(*this, f);
     }
-    /* 80084D20 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
-    /* 80084D18 */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
-    /* 80084D10 */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
-    /* 802642CC */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
-    /* 80037A4C */ virtual cXyz& GetCoCP() { return *GetCP(); }
-    /* 80264368 */ virtual void CalcAabBox();
-    /* 802643D0 */ virtual bool GetNVec(cXyz const&, cXyz*) const;
-    /* 802644B8 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
+    virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
+    virtual cXyz& GetCoCP() { return *GetCP(); }
+    virtual void CalcAabBox();
+    virtual bool GetNVec(cXyz const&, cXyz*) const;
+    virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
 
     const cM3dGCyl* GetShapeP() const { return this; }
 
@@ -593,30 +593,30 @@ public:
     cCcD_SphAttr() {}
     void Set(const cCcD_SrcSphAttr& src) { cM3dGSph::Set(src.mSph); }
 
-    /* 8008721C */ virtual ~cCcD_SphAttr() {}
-    /* 80084B44 */ virtual const cXyz& GetCoCP() const { return *GetCP(); }
-    /* 80037A54 */ virtual cXyz& GetCoCP() { return *GetCP(); }
-    /* 80084B5C */ virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
+    virtual ~cCcD_SphAttr() {}
+    virtual const cXyz& GetCoCP() const { return *GetCP(); }
+    virtual cXyz& GetCoCP() { return *GetCP(); }
+    virtual bool CrossAtTg(cCcD_ShapeAttr const& shape, cXyz* xyz) const {
         return shape.CrossAtTg(*this, xyz);
     }
-    /* 80084B54 */ virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
-    /* 80084B4C */ virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
-    /* 80084BAC */ virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
+    virtual bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const { return false; }
+    virtual bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const { return false; }
+    virtual bool CrossCo(cCcD_ShapeAttr const& shape, f32* f) const {
         return shape.CrossCo(*this, f);
     }
-    /* 80084BA4 */ virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
-    /* 80084B9C */ virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
-    /* 80084B94 */ virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
-    /* 80264538 */ virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
-    /* 802645C0 */ virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
-    /* 802644EC */ virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
-    /* 8026457C */ virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
-    /* 80264688 */ virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
-    /* 80264644 */ virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
-    /* 802645F8 */ virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
-    /* 802646E0 */ virtual void CalcAabBox();
-    /* 8026476C */ virtual bool GetNVec(cXyz const&, cXyz*) const;
-    /* 80264808 */ virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
+    virtual bool CrossCo(cCcD_PntAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_TriAttr const&, f32*) const { return false; }
+    virtual bool CrossCo(cCcD_AabAttr const&, f32*) const { return false; }
+    virtual bool CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
+    virtual bool CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
+    virtual bool CrossCo(cCcD_CpsAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_SphAttr const&, f32*) const;
+    virtual bool CrossCo(cCcD_CylAttr const&, f32*) const;
+    virtual void CalcAabBox();
+    virtual bool GetNVec(cXyz const&, cXyz*) const;
+    virtual void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
 
     const cM3dGSph* GetShapeP() const { return this; }
 
diff --git a/include/SSystem/SComponent/c_cc_s.h b/include/SSystem/SComponent/c_cc_s.h
index 5c5a5921d0..471f2c169a 100644
--- a/include/SSystem/SComponent/c_cc_s.h
+++ b/include/SSystem/SComponent/c_cc_s.h
@@ -31,40 +31,40 @@ public:
     /* 0x2808 */ cCcD_DivideArea mDivideArea;
     /* 0x2848 vtable */
 
-    /* 80264A6C */ cCcS();
-    /* 80264A94 */ void Ct();
-    /* 80264B60 */ void Dt();
-    /* 80264B80 */ WeightType GetWt(u8) const;
-    /* 80264BA8 */ void Set(cCcD_Obj*);
-    /* 80264C5C */ void ClrCoHitInf();
-    /* 80264CF0 */ void ClrTgHitInf();
-    /* 80264D90 */ void ClrAtHitInf();
-    /* 80264E2C */ bool ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*);
-    /* 80264F40 */ void ChkAtTg();
-    /* 8026515C */ bool ChkNoHitCo(cCcD_Obj*, cCcD_Obj*);
-    /* 80265230 */ void ChkCo();
-    /* 802653A0 vt[2] */ virtual void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
-    /* 802653C8 */ void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*);
-    /* 802655E4 */ void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
+    cCcS();
+    void Ct();
+    void Dt();
+    WeightType GetWt(u8) const;
+    void Set(cCcD_Obj*);
+    void ClrCoHitInf();
+    void ClrTgHitInf();
+    void ClrAtHitInf();
+    bool ChkNoHitAtTg(cCcD_Obj*, cCcD_Obj*);
+    void ChkAtTg();
+    bool ChkNoHitCo(cCcD_Obj*, cCcD_Obj*);
+    void ChkCo();
+    virtual void CalcTgPlusDmg(cCcD_Obj*, cCcD_Obj*, cCcD_Stts*, cCcD_Stts*);
+    void SetAtTgCommonHitInf(cCcD_Obj*, cCcD_Obj*, cXyz*);
+    void SetCoCommonHitInf(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
     /* 80265750 vt[3]*/ virtual void SetPosCorrect(cCcD_Obj*, cXyz*, cCcD_Obj*, cXyz*, f32);
-    /* 80265BB4 */ void CalcArea();
-    /* 80265CCC */ void Move();
-    /* 80265D30 */ void DrawClear();
-    /* 80265DF8 vt[4] */ virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*,
+    void CalcArea();
+    void Move();
+    void DrawClear();
+    virtual void SetCoGObjInf(bool, bool, cCcD_GObjInf*, cCcD_GObjInf*,
                                                    cCcD_Stts*, cCcD_Stts*, cCcD_GStts*,
                                                    cCcD_GStts*);
-    /* 80265DFC vt[5] */ virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*,
+    virtual void SetAtTgGObjInf(bool, bool, cCcD_Obj*, cCcD_Obj*,
                                                      cCcD_GObjInf*, cCcD_GObjInf*, cCcD_Stts*,
                                                      cCcD_Stts*, cCcD_GStts*, cCcD_GStts*, cXyz*);
-    /* 80265E00 vt[6] */ virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*,
+    virtual bool ChkNoHitGAtTg(cCcD_GObjInf const*, cCcD_GObjInf const*,
                                                     cCcD_GStts*, cCcD_GStts*);
-    /* 80265E08 vt[7] */ virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*,
+    virtual bool ChkAtTgHitAfterCross(bool, bool, cCcD_GObjInf const*,
                                                            cCcD_GObjInf const*, cCcD_Stts*,
                                                            cCcD_Stts*, cCcD_GStts*, cCcD_GStts*);
-    /* 80265E10 vt[8] */ virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
-    /* 80030BDC vt[9] */ virtual ~cCcS() {}
-    /* 80265E18 vt[10] */ virtual void MoveAfterCheck();
-    /* 80265DF4 vt[11] */ virtual void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*);
+    virtual bool ChkNoHitGCo(cCcD_Obj*, cCcD_Obj*);
+    virtual ~cCcS() {}
+    virtual void MoveAfterCheck();
+    virtual void SetCoGCorrectProc(cCcD_Obj*, cCcD_Obj*);
 };  // Size = 0x284C
 
 STATIC_ASSERT(sizeof(cCcS) == 0x284C);
diff --git a/include/SSystem/SComponent/c_malloc.h b/include/SSystem/SComponent/c_malloc.h
index 0a352b2186..9016215acf 100644
--- a/include/SSystem/SComponent/c_malloc.h
+++ b/include/SSystem/SComponent/c_malloc.h
@@ -7,9 +7,9 @@ class JKRHeap;
 
 struct cMl {
     static JKRHeap* Heap;
-    /* 80263220 */ static void init(JKRHeap*);
-    /* 80263228 */ static void* memalignB(int, u32);
-    /* 80263260 */ static void free(void*);
+    static void init(JKRHeap*);
+    static void* memalignB(int, u32);
+    static void free(void*);
 };
 
 #endif /* C_MALLOC_H */
diff --git a/include/SSystem/SComponent/c_sxyz.h b/include/SSystem/SComponent/c_sxyz.h
index b44d511c10..90811586ce 100644
--- a/include/SSystem/SComponent/c_sxyz.h
+++ b/include/SSystem/SComponent/c_sxyz.h
@@ -10,14 +10,14 @@ struct SVec {
 class csXyz : public SVec {
 public:
     static const csXyz Zero;
-    /* 80018BD0 */ ~csXyz() {}
+    ~csXyz() {}
     /* inline   */ csXyz() {}
     /* inline   */ csXyz(const csXyz& other) : SVec(other){};
-    /* 802673F4 */ csXyz(s16, s16, s16);
-    /* 80267404 */ csXyz operator+(csXyz&);
-    /* 8026745C */ void operator+=(csXyz&);
-    /* 80267490 */ csXyz operator-(csXyz&);
-    /* 802674E8 */ csXyz operator*(f32);
+    csXyz(s16, s16, s16);
+    csXyz operator+(csXyz&);
+    void operator+=(csXyz&);
+    csXyz operator-(csXyz&);
+    csXyz operator*(f32);
     s16 GetX() const { return x; }
     s16 GetY() const { return y; }
     s16 GetZ() const { return z; }
diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h
index b5e2410d71..976fc0faf7 100644
--- a/include/SSystem/SComponent/c_xyz.h
+++ b/include/SSystem/SComponent/c_xyz.h
@@ -41,11 +41,11 @@ struct cXyz : Vec {
         this->y = vec.y;
         this->z = vec.z;
     }
-    /* 80266AE4 */ cXyz operator+(Vec const&) const;
-    /* 80266B34 */ cXyz operator-(Vec const&) const;
-    /* 80266B84 */ cXyz operator*(f32) const;
-    /* 80266BD0 */ cXyz operator*(Vec const&) const;
-    /* 80266C18 */ cXyz operator/(f32) const;
+    cXyz operator+(Vec const&) const;
+    cXyz operator-(Vec const&) const;
+    cXyz operator*(f32) const;
+    cXyz operator*(Vec const&) const;
+    cXyz operator/(f32) const;
 
     void operator+=(f32 f) {
         x += f;
@@ -80,19 +80,19 @@ struct cXyz : Vec {
         PSVECScale(this, this, 1.0f / scale);
         return this;
     }
-    /* 80266C6C */ cXyz getCrossProduct(Vec const&) const;
-    /* 80266CBC */ cXyz outprod(Vec const&) const;
-    /* 80266CE4 */ cXyz norm() const;
-    /* 80266D30 */ cXyz normZP() const;
-    /* 80266DC4 */ cXyz normZC() const;
-    /* 80266EF4 */ cXyz normalize();
-    /* 80266F48 */ cXyz normalizeZP();
-    /* 80266FDC */ bool normalizeRS();
-    /* 8026702C */ bool operator==(Vec const&) const;
-    /* 8026706C */ bool operator!=(Vec const&) const;
-    /* 802670AC */ bool isZero() const;
-    /* 80267128 */ s16 atan2sX_Z() const;
-    /* 80267150 */ s16 atan2sY_XZ() const;
+    cXyz getCrossProduct(Vec const&) const;
+    cXyz outprod(Vec const&) const;
+    cXyz norm() const;
+    cXyz normZP() const;
+    cXyz normZC() const;
+    cXyz normalize();
+    cXyz normalizeZP();
+    bool normalizeRS();
+    bool operator==(Vec const&) const;
+    bool operator!=(Vec const&) const;
+    bool isZero() const;
+    s16 atan2sX_Z() const;
+    s16 atan2sY_XZ() const;
 
     void set(f32 pX, f32 pY, f32 pZ) {
         x = pX;