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

12 files changed, 776 insertions, 775 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
index 3a71f94b45..bb6cbef2dc 100644
--- a/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+++ b/include/JSystem/J3DGraphBase/J3DDrawBuffer.h
@@ -5,13 +5,13 @@
 
 // matches debug
 inline f32 J3DCalcZValue(register MtxP m, register Vec v) {
+#ifdef __MWERKS__
     register f32 temp_f4;
     register f32 out;
     register f32 temp_f0;
     register f32 temp_f2;
     register f32 temp_f1 = 1.0f;
 
-#ifdef __MWERKS__
     // clang-format off
     asm {
         psq_l temp_f0, 0(v), 0, 0 /* qr0 */
@@ -24,9 +24,9 @@ inline f32 J3DCalcZValue(register MtxP m, register Vec v) {
         ps_sum0 out, out, out, out
     }
     // clang-format on
-#endif
 
     return out;
+#endif
 }
 
 class J3DDrawBuffer;
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index 423ece548a..a911251c58 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -12,7 +12,7 @@
  *
  */
 struct J3DGXColorS10 : public GXColorS10 {
-    /* 8000E460 */ J3DGXColorS10() {}
+    J3DGXColorS10() {}
     J3DGXColorS10(J3DGXColorS10 const& other) { __memcpy(this, &other, sizeof(J3DGXColorS10)); }
     J3DGXColorS10(GXColorS10 const& color) : GXColorS10(color) {}
     J3DGXColorS10& operator=(const GXColorS10& color) {
@@ -28,7 +28,7 @@ struct J3DGXColorS10 : public GXColorS10 {
  *
  */
 struct J3DGXColor : public GXColor {
-    /* 8000E538 */ J3DGXColor() {}
+    J3DGXColor() {}
     J3DGXColor(J3DGXColor const& other) { __memcpy(this, &other, sizeof(J3DGXColor)); }
     J3DGXColor(GXColor const& color) : GXColor(color) {}
     // making color a reference breaks J3DColorBlockLightOff::initialize et al
@@ -120,7 +120,7 @@ static u8 AttnArr[] = {2, 0, 2, 1};
  *
  */
 struct J3DColorChan {
-    /* 8000E47C */ J3DColorChan() {
+    J3DColorChan() {
         setColorChanInfo(j3dDefaultColorChanInfo);
     }
     J3DColorChan(J3DColorChanInfo const& info) {
@@ -170,40 +170,40 @@ struct J3DColorChan {
  */
 class J3DColorBlock {
 public:
-    /* 80317324 */ virtual void load() {}
-    /* 80317358 */ virtual void reset(J3DColorBlock*) {}
-    /* 8031733C */ virtual void patch() {}
-    /* 80317434 */ virtual void patchMatColor() {}
-    /* 8000DBD0 */ virtual void patchLight() {}
-    /* 80317340 */ virtual void diff(u32) {}
-    /* 80317438 */ virtual void diffAmbColor() {}
-    /* 8031743C */ virtual void diffMatColor() {}
-    /* 80317440 */ virtual void diffColorChan() {}
-    /* 80317444 */ virtual void diffLightObj(u32) {}
-    /* 80317304 */ virtual s32 countDLSize() { return 0; }
+    virtual void load() {}
+    virtual void reset(J3DColorBlock*) {}
+    virtual void patch() {}
+    virtual void patchMatColor() {}
+    virtual void patchLight() {}
+    virtual void diff(u32) {}
+    virtual void diffAmbColor() {}
+    virtual void diffMatColor() {}
+    virtual void diffColorChan() {}
+    virtual void diffLightObj(u32) {}
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    /* 80317448 */ virtual void setMatColor(u32, J3DGXColor const*) {}
-    /* 8000E0DC */ virtual void setMatColor(u32, J3DGXColor) {}
-    /* 8000E000 */ virtual J3DGXColor* getMatColor(u32) { return NULL; }
-    /* 801A4C0C */ virtual void setAmbColor(u32, J3DGXColor const*) {}
-    /* 8000E0D4 */ virtual void setAmbColor(u32, J3DGXColor) {}
-    /* 8000DFF0 */ virtual J3DGXColor* getAmbColor(u32) { return NULL; }
-    /* 8000E0E0 */ virtual void setColorChanNum(u8) {}
-    /* 8031744C */ virtual void setColorChanNum(u8 const*) {}
-    /* 8000E008 */ virtual u8 getColorChanNum() const { return 0; }
-    /* 8000E0D8 */ virtual void setColorChan(u32, J3DColorChan const&) {}
-    /* 80317450 */ virtual void setColorChan(u32, J3DColorChan const*) {}
-    /* 8000DFF8 */ virtual J3DColorChan* getColorChan(u32) { return NULL; }
-    /* 801A4C08 */ virtual void setLight(u32, J3DLightObj*) {}
-    /* 80317454 */ virtual J3DLightObj* getLight(u32) { return NULL; }
-    /* 80317460 */ virtual void setCullMode(u8 const*) {}
-    /* 8031745C */ virtual void setCullMode(u8) {}
-    /* 80317328 */ virtual u8 getCullMode() const { return 2; }
-    /* 80317464 */ virtual u32 getMatColorOffset() const { return 0; }
-    /* 8031746C */ virtual u32 getColorChanOffset() const { return 0; }
-    /* 80317474 */ virtual void setMatColorOffset(u32) {}
-    /* 80317478 */ virtual void setColorChanOffset(u32) {}
-    /* 80317138 */ virtual ~J3DColorBlock() {}
+    virtual void setMatColor(u32, J3DGXColor const*) {}
+    virtual void setMatColor(u32, J3DGXColor) {}
+    virtual J3DGXColor* getMatColor(u32) { return NULL; }
+    virtual void setAmbColor(u32, J3DGXColor const*) {}
+    virtual void setAmbColor(u32, J3DGXColor) {}
+    virtual J3DGXColor* getAmbColor(u32) { return NULL; }
+    virtual void setColorChanNum(u8) {}
+    virtual void setColorChanNum(u8 const*) {}
+    virtual u8 getColorChanNum() const { return 0; }
+    virtual void setColorChan(u32, J3DColorChan const&) {}
+    virtual void setColorChan(u32, J3DColorChan const*) {}
+    virtual J3DColorChan* getColorChan(u32) { return NULL; }
+    virtual void setLight(u32, J3DLightObj*) {}
+    virtual J3DLightObj* getLight(u32) { return NULL; }
+    virtual void setCullMode(u8 const*) {}
+    virtual void setCullMode(u8) {}
+    virtual u8 getCullMode() const { return 2; }
+    virtual u32 getMatColorOffset() const { return 0; }
+    virtual u32 getColorChanOffset() const { return 0; }
+    virtual void setMatColorOffset(u32) {}
+    virtual void setColorChanOffset(u32) {}
+    virtual ~J3DColorBlock() {}
 };
 
 /**
@@ -215,61 +215,61 @@ public:
     J3DColorBlockLightOff() {
         initialize();
     }
-    /* 8031747C */ void initialize();
-
-    /* 80317B84 */ virtual s32 countDLSize();
-    /* 80317C0C */ virtual void load();
-    /* 8031FD08 */ virtual void reset(J3DColorBlock*);
-    /* 80318EB4 */ virtual void patch();
-    /* 80318F00 */ virtual void patchMatColor();
-    /* 803190AC */ virtual void patchLight();
-    /* 80319B4C */ virtual void diff(u32);
-    /* 80319BB4 */ virtual void diffMatColor();
-    /* 80319D30 */ virtual void diffColorChan();
-    /* 80323560 */ virtual u32 getType() { return 'CLOF'; }
-    /* 80323184 */ virtual void setMatColor(u32 idx, J3DGXColor const* color) {
+    void initialize();
+
+    virtual s32 countDLSize();
+    virtual void load();
+    virtual void reset(J3DColorBlock*);
+    virtual void patch();
+    virtual void patchMatColor();
+    virtual void patchLight();
+    virtual void diff(u32);
+    virtual void diffMatColor();
+    virtual void diffColorChan();
+    virtual u32 getType() { return 'CLOF'; }
+    virtual void setMatColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x121, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         J3D_ASSERT_NULLPTR(0x122, color != 0);
         mMatColor[idx] = *color;
     }
-    /* 80323158 */ virtual void setMatColor(u32 idx, J3DGXColor color) {
+    virtual void setMatColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x128, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         mMatColor[idx] = color;
     }
-    /* 803231B0 */ virtual J3DGXColor* getMatColor(u32 idx) {
+    virtual J3DGXColor* getMatColor(u32 idx) {
         J3D_ASSERT_RANGE(0x12d, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         return &mMatColor[idx];
     }
-    /* 803231D0 */ virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
-    /* 803231C4 */ virtual void setColorChanNum(u8 const* num) {
+    virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
+    virtual void setColorChanNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x137, num != 0);
         mColorChanNum = *num;
     }
-    /* 803231D8 */ virtual u8 getColorChanNum() const { return mColorChanNum; }
-    /* 803231F4 */ virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
+    virtual u8 getColorChanNum() const { return mColorChanNum; }
+    virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
         J3D_ASSERT_RANGE(0x142, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         mColorChan[idx] = chan;
     }
-    /* 803231E0 */ virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
+    virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
         J3D_ASSERT_RANGE(0x148, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         J3D_ASSERT_NULLPTR(0x149, chan != 0);
         mColorChan[idx] = *chan;
     }
-    /* 80323208 */ virtual J3DColorChan* getColorChan(u32 idx) {
+    virtual J3DColorChan* getColorChan(u32 idx) {
         J3D_ASSERT_RANGE(0x14e, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         return &mColorChan[idx];
     }
-    /* 80323224 */ virtual void setCullMode(u8 const* mode) {
+    virtual void setCullMode(u8 const* mode) {
         J3D_ASSERT_NULLPTR(0x154, mode != 0);
         mCullMode = *mode;
     }
-    /* 8032321C */ virtual void setCullMode(u8 mode) { mCullMode = mode; }
-    /* 80323230 */ virtual u8 getCullMode() const { return mCullMode; }
-    /* 80323238 */ virtual u32 getMatColorOffset() const { return mMatColorOffset; }
-    /* 80323240 */ virtual u32 getColorChanOffset() const { return mColorChanOffset; }
-    /* 80323248 */ virtual void setMatColorOffset(u32 offset) { mMatColorOffset = offset; }
-    /* 80323250 */ virtual void setColorChanOffset(u32 offset) { mColorChanOffset = offset; }
-    /* 803170DC */ virtual ~J3DColorBlockLightOff() {}
+    virtual void setCullMode(u8 mode) { mCullMode = mode; }
+    virtual u8 getCullMode() const { return mCullMode; }
+    virtual u32 getMatColorOffset() const { return mMatColorOffset; }
+    virtual u32 getColorChanOffset() const { return mColorChanOffset; }
+    virtual void setMatColorOffset(u32 offset) { mMatColorOffset = offset; }
+    virtual void setColorChanOffset(u32 offset) { mColorChanOffset = offset; }
+    virtual ~J3DColorBlockLightOff() {}
 
     /* 0x04 */ J3DGXColor mMatColor[2];
     /* 0x0C */ u8 mColorChanNum;
@@ -288,26 +288,26 @@ public:
     J3DColorBlockAmbientOn() {
         initialize();
     }
-    /* 803174DC */ void initialize();
+    void initialize();
 
-    /* 8031816C */ virtual void load();
-    /* 8031FDE4 */ virtual void reset(J3DColorBlock*);
-    /* 80317B8C */ virtual s32 countDLSize();
-    /* 80323074 */ virtual u32 getType() { return 'CLAB'; }
-    /* 803230AC */ virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
+    virtual void load();
+    virtual void reset(J3DColorBlock*);
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'CLAB'; }
+    virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x1a3, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         J3D_ASSERT_NULLPTR(0x1a4, color != 0);
         mAmbColor[idx] = *color;
     }
-    /* 80323080 */ virtual void setAmbColor(u32 idx, J3DGXColor color) {
+    virtual void setAmbColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x1aa, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         mAmbColor[idx] = color;
     }
-    /* 803230D8 */ virtual J3DGXColor* getAmbColor(u32 idx) {
+    virtual J3DGXColor* getAmbColor(u32 idx) {
         J3D_ASSERT_RANGE(0x1af, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         return &mAmbColor[idx];
     }
-    /* 803230EC */ virtual ~J3DColorBlockAmbientOn() {}
+    virtual ~J3DColorBlockAmbientOn() {}
 
     /* 0x20 */ J3DGXColor mAmbColor[2];
 };  // Size: 0x28
@@ -321,88 +321,88 @@ public:
     J3DColorBlockLightOn() {
         initialize();
     }
-    /* 80317580 */ void initialize();
-
-    /* 803187F4 */ virtual void load();
-    /* 8031FF34 */ virtual void reset(J3DColorBlock*);
-    /* 803194E8 */ virtual void patch();
-    /* 80319534 */ virtual void patchMatColor();
-    /* 803196E0 */ virtual void patchLight();
-    /* 8031A13C */ virtual void diff(u32);
-    /* 8031A1DC */ virtual void diffAmbColor();
-    /* 8031A358 */ virtual void diffMatColor();
-    /* 8031A4D4 */ virtual void diffColorChan();
-    /* 8031A8E0 */ virtual void diffLightObj(u32);
-    /* 80317B94 */ virtual s32 countDLSize();
-    /* 80322E80 */ virtual u32 getType() { return 'CLON'; }
-    /* 80322EB8 */ virtual void setMatColor(u32 idx, J3DGXColor const* color) {
+    void initialize();
+
+    virtual void load();
+    virtual void reset(J3DColorBlock*);
+    virtual void patch();
+    virtual void patchMatColor();
+    virtual void patchLight();
+    virtual void diff(u32);
+    virtual void diffAmbColor();
+    virtual void diffMatColor();
+    virtual void diffColorChan();
+    virtual void diffLightObj(u32);
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'CLON'; }
+    virtual void setMatColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x1e9, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         J3D_ASSERT_NULLPTR(0x1ea, color != 0);
         mMatColor[idx] = *color;
     }
-    /* 80322E8C */ virtual void setMatColor(u32 idx, J3DGXColor color) {
+    virtual void setMatColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x1f0, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         mMatColor[idx] = color;
     }
-    /* 80322EE4 */ virtual J3DGXColor* getMatColor(u32 idx) {
+    virtual J3DGXColor* getMatColor(u32 idx) {
         J3D_ASSERT_RANGE(0x1f5, idx >= 0 && idx < ARRAY_SIZEU(mMatColor));
         return &mMatColor[idx];
     }
-    /* 80322F24 */ virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
+    virtual void setAmbColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x1fc, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         J3D_ASSERT_NULLPTR(0x1fd, color != 0);
         mAmbColor[idx] = *color;
     }
-    /* 80322EF8 */ virtual void setAmbColor(u32 idx, J3DGXColor color) {
+    virtual void setAmbColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x203, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         mAmbColor[idx] = color;
     }
-    /* 80322F50 */ virtual J3DGXColor* getAmbColor(u32 idx) {
+    virtual J3DGXColor* getAmbColor(u32 idx) {
         J3D_ASSERT_RANGE(0x208, idx >= 0 && idx < ARRAY_SIZEU(mAmbColor));
         return &mAmbColor[idx];
     }
-    /* 80322F70 */ virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
-    /* 80322F64 */ virtual void setColorChanNum(u8 const* num) {
+    virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
+    virtual void setColorChanNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x212, num != 0);
         mColorChanNum = *num;
     }
-    /* 80322F78 */ virtual u8 getColorChanNum() const { return mColorChanNum; }
-    /* 80322F94 */ virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
+    virtual u8 getColorChanNum() const { return mColorChanNum; }
+    virtual void setColorChan(u32 idx, J3DColorChan const& chan) {
         J3D_ASSERT_RANGE(0x21d, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         mColorChan[idx] = chan;
     }
-    /* 80322F80 */ virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
+    virtual void setColorChan(u32 idx, J3DColorChan const* chan) {
         J3D_ASSERT_RANGE(0x223, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         J3D_ASSERT_NULLPTR(0x224, chan != 0);
         mColorChan[idx] = *chan;
     }
-    /* 80322FA8 */ virtual J3DColorChan* getColorChan(u32 idx) {
+    virtual J3DColorChan* getColorChan(u32 idx) {
         J3D_ASSERT_RANGE(0x229, idx >= 0 && idx < ARRAY_SIZEU(mColorChan));
         return &mColorChan[idx];
     }
-    /* 80322FBC */ virtual void setLight(u32 idx, J3DLightObj* light) {
+    virtual void setLight(u32 idx, J3DLightObj* light) {
         J3D_ASSERT_RANGE(0x230, idx >= 0 && idx < ARRAY_SIZEU(mLight));
         mLight[idx] = light;
     }
-    /* 80322FCC */ virtual J3DLightObj* getLight(u32 idx) {
+    virtual J3DLightObj* getLight(u32 idx) {
         J3D_ASSERT_RANGE(0x235, idx >= 0 && idx < ARRAY_SIZEU(mLight));
         return mLight[idx];
     }
-    /* 80322FE4 */ virtual void setCullMode(u8 const* mode) {
+    virtual void setCullMode(u8 const* mode) {
         J3D_ASSERT_NULLPTR(0x23b, mode != 0);
         mCullMode = *mode;
     }
-    /* 80322FDC */ virtual void setCullMode(u8 mode) {
+    virtual void setCullMode(u8 mode) {
         mCullMode = mode;
     }
-    /* 80322FF0 */ virtual u8 getCullMode() const {
+    virtual u8 getCullMode() const {
         return mCullMode;
     }
-    /* 80322FF8 */ virtual u32 getMatColorOffset() const { return mMatColorOffset; }
-    /* 80323000 */ virtual u32 getColorChanOffset() const { return mColorChanOffset; }
-    /* 80323008 */ virtual void setMatColorOffset(u32 offset) { mMatColorOffset = offset; }
-    /* 80323010 */ virtual void setColorChanOffset(u32 offset) { mColorChanOffset = offset; }
-    /* 80323018 */ virtual ~J3DColorBlockLightOn() {}
+    virtual u32 getMatColorOffset() const { return mMatColorOffset; }
+    virtual u32 getColorChanOffset() const { return mColorChanOffset; }
+    virtual void setMatColorOffset(u32 offset) { mMatColorOffset = offset; }
+    virtual void setColorChanOffset(u32 offset) { mColorChanOffset = offset; }
+    virtual ~J3DColorBlockLightOn() {}
 
     /* 0x04 */ J3DGXColor mMatColor[2];
     /* 0x0C */ J3DGXColor mAmbColor[2];
@@ -420,7 +420,7 @@ public:
  */
 class J3DTexGenBlock {
 public:
-    /* 80317354 */ virtual void reset(J3DTexGenBlock*) {}
+    virtual void reset(J3DTexGenBlock*) {}
     virtual void calc(f32 const (*)[4]) = 0;
     virtual void calcWithoutViewMtx(f32 const (*)[4]) = 0;
     virtual void calcPostTexMtx(f32 const (*)[4]) = 0;
@@ -430,35 +430,35 @@ public:
     virtual void diff(u32) = 0;
     virtual void diffTexMtx() = 0;
     virtual void diffTexGen() = 0;
-    /* 803172FC */ virtual s32 countDLSize() { return 0; }
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    /* 8031741C */ virtual void setTexGenNum(u32 const*) {}
-    /* 8000E0D0 */ virtual void setTexGenNum(u32) {}
-    /* 8000DFE8 */ virtual u32 getTexGenNum() const { return 0; }
-    /* 8000E0CC */ virtual void setTexCoord(u32, J3DTexCoord const*) {}
-    /* 8000DFE0 */ virtual J3DTexCoord* getTexCoord(u32) { return NULL; }
-    /* 8003AB2C */ virtual void setTexMtx(u32, J3DTexMtx*) {}
-    /* 8000DFD8 */ virtual J3DTexMtx* getTexMtx(u32) { return NULL; }
-    /* 80317424 */ virtual void setNBTScale(J3DNBTScale const* scale) {}
-    /* 80317420 */ virtual void setNBTScale(J3DNBTScale) {}
-    /* 80317334 */ virtual J3DNBTScale* getNBTScale() { return NULL; }
-    /* 80317428 */ virtual u32 getTexMtxOffset() const { return 0; }
-    /* 80317430 */ virtual void setTexMtxOffset(u32) {}
-    /* 803171DC */ virtual ~J3DTexGenBlock() {}
+    virtual void setTexGenNum(u32 const*) {}
+    virtual void setTexGenNum(u32) {}
+    virtual u32 getTexGenNum() const { return 0; }
+    virtual void setTexCoord(u32, J3DTexCoord const*) {}
+    virtual J3DTexCoord* getTexCoord(u32) { return NULL; }
+    virtual void setTexMtx(u32, J3DTexMtx*) {}
+    virtual J3DTexMtx* getTexMtx(u32) { return NULL; }
+    virtual void setNBTScale(J3DNBTScale const* scale) {}
+    virtual void setNBTScale(J3DNBTScale) {}
+    virtual J3DNBTScale* getNBTScale() { return NULL; }
+    virtual u32 getTexMtxOffset() const { return 0; }
+    virtual void setTexMtxOffset(u32) {}
+    virtual ~J3DTexGenBlock() {}
 };
 
 struct J3DTexGenBlockNull : public J3DTexGenBlock {
-    /* 80332AA0 */ virtual void calc(f32 const (*)[4]) {}
-    /* 80332AA4 */ virtual void calcWithoutViewMtx(f32 const (*)[4]) {}
-    /* 80332AA8 */ virtual void calcPostTexMtx(f32 const (*)[4]) {}
-    /* 80332AAC */ virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]) {}
-    /* 80332AB0 */ virtual void load() {}
-    /* 80332AB4 */ virtual void patch() {}
-    /* 80332AB8 */ virtual void diff(u32) {}
-    /* 80332ABC */ virtual void diffTexMtx() {}
-    /* 80332AC0 */ virtual void diffTexGen() {}
-    /* 80332AC4 */ virtual u32 getType() { return 'TGNL'; }
-    /* 80332AD0 */ virtual ~J3DTexGenBlockNull() {}
+    virtual void calc(f32 const (*)[4]) {}
+    virtual void calcWithoutViewMtx(f32 const (*)[4]) {}
+    virtual void calcPostTexMtx(f32 const (*)[4]) {}
+    virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]) {}
+    virtual void load() {}
+    virtual void patch() {}
+    virtual void diff(u32) {}
+    virtual void diffTexMtx() {}
+    virtual void diffTexGen() {}
+    virtual u32 getType() { return 'TGNL'; }
+    virtual ~J3DTexGenBlockNull() {}
 };
 
 /**
@@ -470,46 +470,46 @@ public:
     J3DTexGenBlockPatched() {
         initialize();
     }
-    /* 80317644 */ void initialize();
-
-    /* 80320084 */ virtual void reset(J3DTexGenBlock*);
-    /* 803213C0 */ virtual void calc(f32 const (*)[4]);
-    /* 80321584 */ virtual void calcWithoutViewMtx(f32 const (*)[4]);
-    /* 803216D8 */ virtual void calcPostTexMtx(f32 const (*)[4]);
-    /* 8032181C */ virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]);
-    /* 80322E70 */ virtual void load() {}
-    /* 8031AA88 */ virtual void patch();
-    /* 8031AC68 */ virtual void diff(u32);
-    /* 8031ACD0 */ virtual void diffTexMtx();
-    /* 8031AD30 */ virtual void diffTexGen();
-    /* 80317B9C */ virtual s32 countDLSize();
-    /* 80322E74 */ virtual u32 getType() { return 'TGPT'; }
-    /* 80322D3C */ virtual void setTexGenNum(u32 const* num) {
+    void initialize();
+
+    virtual void reset(J3DTexGenBlock*);
+    virtual void calc(f32 const (*)[4]);
+    virtual void calcWithoutViewMtx(f32 const (*)[4]);
+    virtual void calcPostTexMtx(f32 const (*)[4]);
+    virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]);
+    virtual void load() {}
+    virtual void patch();
+    virtual void diff(u32);
+    virtual void diffTexMtx();
+    virtual void diffTexGen();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'TGPT'; }
+    virtual void setTexGenNum(u32 const* num) {
         J3D_ASSERT_NULLPTR(0x335, num != 0);
         mTexGenNum = *num;
     }
-    /* 80322D34 */ virtual void setTexGenNum(u32 num) { mTexGenNum = num; }
-    /* 80322D48 */ virtual u32 getTexGenNum() const { return mTexGenNum; }
-    /* 80322D50 */ virtual void setTexCoord(u32 idx, J3DTexCoord const* coord) {
+    virtual void setTexGenNum(u32 num) { mTexGenNum = num; }
+    virtual u32 getTexGenNum() const { return mTexGenNum; }
+    virtual void setTexCoord(u32 idx, J3DTexCoord const* coord) {
         J3D_ASSERT_RANGE(0x344, idx >= 0 && idx < ARRAY_SIZEU(mTexCoord));
         J3D_ASSERT_NULLPTR(0x345, coord != 0);
         mTexCoord[idx] = *coord;
     }
-    /* 80322D64 */ virtual J3DTexCoord* getTexCoord(u32 idx) {
+    virtual J3DTexCoord* getTexCoord(u32 idx) {
         J3D_ASSERT_RANGE(0x34a, idx >= 0 && idx < ARRAY_SIZEU(mTexCoord));
         return &mTexCoord[idx];
     }
-    /* 80322D78 */ virtual void setTexMtx(u32 idx, J3DTexMtx* mtx) {
+    virtual void setTexMtx(u32 idx, J3DTexMtx* mtx) {
         J3D_ASSERT_RANGE(0x351, idx >= 0 && idx < ARRAY_SIZEU(mTexMtx));
         mTexMtx[idx] = mtx;
     }
-    /* 80322D88 */ virtual J3DTexMtx* getTexMtx(u32 idx) {
+    virtual J3DTexMtx* getTexMtx(u32 idx) {
         J3D_ASSERT_RANGE(0x356, idx >= 0 && idx < ARRAY_SIZEU(mTexMtx));
         return mTexMtx[idx];
     }
-    /* 80322D98 */ virtual u32 getTexMtxOffset() const { return mTexMtxOffset; }
-    /* 80322DA0 */ virtual void setTexMtxOffset(u32 offset) { mTexMtxOffset = offset; }
-    /* 80317180 */ virtual ~J3DTexGenBlockPatched() {}
+    virtual u32 getTexMtxOffset() const { return mTexMtxOffset; }
+    virtual void setTexMtxOffset(u32 offset) { mTexMtxOffset = offset; }
+    virtual ~J3DTexGenBlockPatched() {}
 
     /* 0x04 */ u32 mTexGenNum;
     /* 0x08 */ J3DTexCoord mTexCoord[8];
@@ -526,20 +526,20 @@ public:
     J3DTexGenBlock4() : mNBTScale() {
         initialize();
     }
-    /* 80317674 */ void initialize();
+    void initialize();
 
-    /* 803201A0 */ virtual void reset(J3DTexGenBlock*);
-    /* 8031A948 */ virtual void load();
-    /* 8031AB18 */ virtual void patch();
-    /* 80317BA4 */ virtual s32 countDLSize();
-    /* 80322DA8 */ virtual u32 getType() { return 'TGB4'; }
-    /* 80322DD8 */ virtual void setNBTScale(J3DNBTScale const* scale) {
+    virtual void reset(J3DTexGenBlock*);
+    virtual void load();
+    virtual void patch();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'TGB4'; }
+    virtual void setNBTScale(J3DNBTScale const* scale) {
         J3D_ASSERT_NULLPTR(0x393, scale != 0);
         mNBTScale = *scale;
     }
-    /* 80322DB4 */ virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
-    /* 80322DFC */ virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
-    /* 80322E04 */ virtual ~J3DTexGenBlock4() {}
+    virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
+    virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
+    virtual ~J3DTexGenBlock4() {}
 
     /* 0x5C */ J3DNBTScale mNBTScale;
 };  // Size: 0x6C
@@ -553,20 +553,20 @@ public:
     J3DTexGenBlockBasic() : mNBTScale() {
         initialize();
     }
-    /* 803176A4 */ void initialize();
+    void initialize();
 
-    /* 803202DC */ virtual void reset(J3DTexGenBlock*);
-    /* 8031A9E8 */ virtual void load();
-    /* 8031ABC0 */ virtual void patch();
-    /* 80317BAC */ virtual s32 countDLSize();
-    /* 80322C6C */ virtual u32 getType() { return 'TGBC'; }
-    /* 80322C9C */ virtual void setNBTScale(J3DNBTScale const* scale) {
+    virtual void reset(J3DTexGenBlock*);
+    virtual void load();
+    virtual void patch();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'TGBC'; }
+    virtual void setNBTScale(J3DNBTScale const* scale) {
         J3D_ASSERT_NULLPTR(0x3ca, scale != 0);
         mNBTScale = *scale;
     }
-    /* 80322C78 */ virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
-    /* 80322CC0 */ virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
-    /* 80322CC8 */ virtual ~J3DTexGenBlockBasic() {}
+    virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
+    virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
+    virtual ~J3DTexGenBlockBasic() {}
 
     /* 0x5C */ J3DNBTScale mNBTScale;
 };  // Size: 0x6C
@@ -577,62 +577,62 @@ public:
  */
 class J3DTevBlock {
 public:
-    /* 80317350 */ virtual void reset(J3DTevBlock*) {}
-    /* 80317330 */ virtual void load() {}
-    /* 8031CD44 */ virtual void diff(u32);
-    /* 80321948 */ virtual void diffTexNo();
-    /* 80321938 */ virtual void diffTevReg();
-    /* 80321944 */ virtual void diffTexCoordScale();
-    /* 80321940 */ virtual void diffTevStage();
-    /* 8032193C */ virtual void diffTevStageIndirect();
-    /* 8000DBD4 */ virtual void patch() {}
-    /* 8032353C */ virtual void patchTexNo() {}
-    /* 80323540 */ virtual void patchTevReg() {}
-    /* 8000DBC8 */ virtual void patchTexNoAndTexCoordScale() {}
+    virtual void reset(J3DTevBlock*) {}
+    virtual void load() {}
+    virtual void diff(u32);
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch() {}
+    virtual void patchTexNo() {}
+    virtual void patchTevReg() {}
+    virtual void patchTexNoAndTexCoordScale() {}
     virtual void ptrToIndex() = 0;
     virtual void indexToPtr() = 0;
     virtual u32 getType() = 0;
-    /* 8031730C */ virtual s32 countDLSize() { return 0; }
-    /* 80323544 */ virtual void setTexNo(u32, u16 const*) {}
-    /* 8000E0AC */ virtual void setTexNo(u32, u16) {}
-    /* 8000DF94 */ virtual u16 getTexNo(u32) const { return 0xffff; }
-    /* 80323548 */ virtual void setTevOrder(u32, J3DTevOrder const*) {}
-    /* 8000E0BC */ virtual void setTevOrder(u32, J3DTevOrder) {}
-    /* 8000DFB8 */ virtual J3DTevOrder* getTevOrder(u32) { return NULL; }
-    /* 80110E80 */ virtual void setTevColor(u32, J3DGXColorS10 const*) {}
-    /* 8000E0C4 */ virtual void setTevColor(u32, J3DGXColorS10) {}
-    /* 8000DFC8 */ virtual J3DGXColorS10* getTevColor(u32) { return NULL; }
-    /* 800732AC */ virtual void setTevKColor(u32, J3DGXColor const*) {}
-    /* 8000E0C0 */ virtual void setTevKColor(u32, J3DGXColor) {}
-    /* 8000DFC0 */ virtual J3DGXColor* getTevKColor(u32) { return NULL; }
-    /* 80322950 */ virtual void setTevKColorSel(u32, u8 const*) {}
-    /* 8000E0B8 */ virtual void setTevKColorSel(u32, u8) {}
-    /* 8000DFB0 */ virtual u8 getTevKColorSel(u32) { return false; }
-    /* 80322954 */ virtual void setTevKAlphaSel(u32, u8 const*) {}
-    /* 8000E0B4 */ virtual void setTevKAlphaSel(u32, u8) {}
-    /* 8000DFA8 */ virtual u8 getTevKAlphaSel(u32) { return false; }
-    /* 8032354C */ virtual void setTevStageNum(u8 const*) {}
-    /* 8000E0C8 */ virtual void setTevStageNum(u8) {}
-    /* 8000DFD0 */ virtual u8 getTevStageNum() const { return 1; }
-    /* 80323550 */ virtual void setTevStage(u32, J3DTevStage const*) {}
-    /* 8000E0A8 */ virtual void setTevStage(u32, J3DTevStage) {}
-    /* 8000DF8C */ virtual J3DTevStage* getTevStage(u32) { return NULL; }
-    /* 8032295C */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*) {}
-    /* 80322958 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo) {}
-    /* 80322960 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*) {}
-    /* 8000E0B0 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable) {}
-    /* 8000DFA0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32) { return NULL; }
-    /* 80323554 */ virtual void setIndTevStage(u32, J3DIndTevStage const*) {}
-    /* 8000E0A4 */ virtual void setIndTevStage(u32, J3DIndTevStage) {}
-    /* 8000DF84 */ virtual J3DIndTevStage* getIndTevStage(u32) { return NULL; }
-    /* 80323558 */ virtual u32 getTexNoOffset() const { return 0; }
-    /* 80322964 */ virtual u32 getTevRegOffset() const { return 0; }
-    /* 80321FE0 */ virtual void setTexNoOffset(u32 offset) { mTexNoOffset = offset; }
-    /* 8032296C */ virtual void setTevRegOffset(u32) {}
-    /* 80317224 */ virtual ~J3DTevBlock() {}
+    virtual s32 countDLSize() { return 0; }
+    virtual void setTexNo(u32, u16 const*) {}
+    virtual void setTexNo(u32, u16) {}
+    virtual u16 getTexNo(u32) const { return 0xffff; }
+    virtual void setTevOrder(u32, J3DTevOrder const*) {}
+    virtual void setTevOrder(u32, J3DTevOrder) {}
+    virtual J3DTevOrder* getTevOrder(u32) { return NULL; }
+    virtual void setTevColor(u32, J3DGXColorS10 const*) {}
+    virtual void setTevColor(u32, J3DGXColorS10) {}
+    virtual J3DGXColorS10* getTevColor(u32) { return NULL; }
+    virtual void setTevKColor(u32, J3DGXColor const*) {}
+    virtual void setTevKColor(u32, J3DGXColor) {}
+    virtual J3DGXColor* getTevKColor(u32) { return NULL; }
+    virtual void setTevKColorSel(u32, u8 const*) {}
+    virtual void setTevKColorSel(u32, u8) {}
+    virtual u8 getTevKColorSel(u32) { return false; }
+    virtual void setTevKAlphaSel(u32, u8 const*) {}
+    virtual void setTevKAlphaSel(u32, u8) {}
+    virtual u8 getTevKAlphaSel(u32) { return false; }
+    virtual void setTevStageNum(u8 const*) {}
+    virtual void setTevStageNum(u8) {}
+    virtual u8 getTevStageNum() const { return 1; }
+    virtual void setTevStage(u32, J3DTevStage const*) {}
+    virtual void setTevStage(u32, J3DTevStage) {}
+    virtual J3DTevStage* getTevStage(u32) { return NULL; }
+    virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*) {}
+    virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo) {}
+    virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*) {}
+    virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable) {}
+    virtual J3DTevSwapModeTable* getTevSwapModeTable(u32) { return NULL; }
+    virtual void setIndTevStage(u32, J3DIndTevStage const*) {}
+    virtual void setIndTevStage(u32, J3DIndTevStage) {}
+    virtual J3DIndTevStage* getIndTevStage(u32) { return NULL; }
+    virtual u32 getTexNoOffset() const { return 0; }
+    virtual u32 getTevRegOffset() const { return 0; }
+    virtual void setTexNoOffset(u32 offset) { mTexNoOffset = offset; }
+    virtual void setTevRegOffset(u32) {}
+    virtual ~J3DTevBlock() {}
 
 protected:
-    /* 8031E098 */ void indexToPtr_private(u32);
+    void indexToPtr_private(u32);
 
     /* 0x4 */ u32 mTexNoOffset;
 };
@@ -644,12 +644,12 @@ protected:
 class J3DTevBlockNull : public J3DTevBlock {
 public:
     J3DTevBlockNull() { initialize(); }
-    /* 803176D4 */ void initialize();
-    /* 80332A0C */ virtual void reset(J3DTevBlock*) {}
-    /* 80332A10 */ virtual void ptrToIndex() {}
-    /* 80332A14 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80332A38 */ virtual u32 getType() { return 'TVNL'; }
-    /* 80332A44 */ virtual ~J3DTevBlockNull() {}
+    void initialize();
+    virtual void reset(J3DTevBlock*) {}
+    virtual void ptrToIndex() {}
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVNL'; }
+    virtual ~J3DTevBlockNull() {}
 };
 
 /**
@@ -661,127 +661,127 @@ public:
     J3DTevBlockPatched() {
         initialize();
     }
-    /* 803176E0 */ void initialize();
-
-    /* 80320418 */ virtual void reset(J3DTevBlock*);
-    /* 80322970 */ virtual void load() {}
-    /* 8031CE00 */ virtual void diffTexNo();
-    /* 8031D028 */ virtual void diffTevReg();
-    /* 8031D0C4 */ virtual void diffTexCoordScale();
-    /* 8031CE64 */ virtual void diffTevStage();
-    /* 8031CF78 */ virtual void diffTevStageIndirect();
-    /* 8031C228 */ virtual void patch();
-    /* 8031BF4C */ virtual void patchTexNo();
-    /* 8031BFE0 */ virtual void patchTevReg();
-    /* 8031C0AC */ virtual void patchTexNoAndTexCoordScale();
-    /* 8031DFB4 */ virtual void ptrToIndex();
-    /* 80322974 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80322998 */ virtual u32 getType() { return 'TVPT'; }
-    /* 803229AC */ virtual void setTevStageNum(u8 const* num) {
+    void initialize();
+
+    virtual void reset(J3DTevBlock*);
+    virtual void load() {}
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex();
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVPT'; }
+    virtual void setTevStageNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x52c, num != 0);
         mTevStageNum = *num;
     }
-    /* 803229A4 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 803229B8 */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 80317BB4 */ virtual s32 countDLSize();
-    /* 803229D0 */ virtual void setTexNo(u32 idx, u16 const* texNo) {
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x53b, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x53c, texNo != 0);
         mTexNo[idx] = *texNo;
     }
-    /* 803229C0 */ virtual void setTexNo(u32 idx, u16 texNo) {
+    virtual void setTexNo(u32 idx, u16 texNo) {
         J3D_ASSERT_RANGE(0x542, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = texNo;
     }
-    /* 803229E4 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(1353, idx >= 0 && idx < 8);
         return mTexNo[idx];
     }
-    /* 80322A08 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x550, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x551, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 803229F4 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x557, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 80322A1C */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x55c, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 80322A6C */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x563, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x564, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 80322A30 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x56a, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 80322AA8 */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x56f, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 80322AD0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x576, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x577, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 80322ABC */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x57d, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 80322AE4 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x582, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 80322B24 */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x589, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         J3D_ASSERT_NULLPTR(0x58a, color != 0);
         mTevColor[idx] = *color;
     }
-    /* 80322AF8 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
         J3D_ASSERT_RANGE(0x590, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
-    /* 80322B50 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
+    virtual J3DGXColorS10* getTevColor(u32 idx) {
         J3D_ASSERT_RANGE(0x595, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
-    /* 80322B90 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x59c, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         J3D_ASSERT_NULLPTR(0x59d, color != 0);
         mTevKColor[idx] = *color;
     }
-    /* 80322B64 */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x5a3, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
-    /* 80322BBC */ virtual J3DGXColor* getTevKColor(u32 idx) {
+    virtual J3DGXColor* getTevKColor(u32 idx) {
         J3D_ASSERT_RANGE(0x5a8, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
-    /* 80322BDC */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
+    virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x5af, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         J3D_ASSERT_NULLPTR(0x5b0, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
-    /* 80322BD0 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
+    virtual void setTevKColorSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x5b6, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
-    /* 80322BEC */ virtual u8 getTevKColorSel(u32 idx) {
+    virtual u8 getTevKColorSel(u32 idx) {
         J3D_ASSERT_RANGE(0x5bb, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
-    /* 80322BF8 */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 80322C00 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; }
-    /* 80322C08 */ virtual void setTevRegOffset(u32 offset) {
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual u32 getTevRegOffset() const { return mTevRegOffset; }
+    virtual void setTevRegOffset(u32 offset) {
         J3D_ASSERT_RANGE(0x53b, offset >= 0);
         mTevRegOffset = offset;
     }
-    /* 80322C10 */ virtual ~J3DTevBlockPatched() {}
+    virtual ~J3DTevBlockPatched() {}
 
     /* 0x08 */ u16 mTexNo[8];
     /* 0x18 */ J3DTevOrder mTevOrder[8];
@@ -803,80 +803,80 @@ public:
     J3DTevBlock1() {
         initialize();
     }
-    /* 803177E8 */ void initialize();
-
-    /* 803205D4 */ virtual void reset(J3DTevBlock*);
-    /* 8031AD64 */ virtual void load();
-    /* 8031D1BC */ virtual void diffTexNo();
-    /* 8031D1F4 */ virtual void diffTevReg();
-    /* 8031D368 */ virtual void diffTexCoordScale();
-    /* 8031D1F8 */ virtual void diffTevStage();
-    /* 8031D2E8 */ virtual void diffTevStageIndirect();
-    /* 8031C3CC */ virtual void patch();
-    /* 8031C274 */ virtual void patchTexNo();
-    /* 8031C2E4 */ virtual void patchTevReg();
-    /* 8031C2E8 */ virtual void patchTexNoAndTexCoordScale();
-    /* 80322770 */ virtual void ptrToIndex() {}
-    /* 80322774 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80322798 */ virtual u32 getType() { return 'TVB1'; }
-    /* 80317BBC */ virtual s32 countDLSize();
-    /* 803227B4 */ virtual void setTexNo(u32 idx, u16 const* no) {
+    void initialize();
+
+    virtual void reset(J3DTevBlock*);
+    virtual void load();
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex() {}
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVB1'; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* no) {
         J3D_ASSERT_RANGE(0x618, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x619, no != 0);
         mTexNo[idx] = *no;
     }
-    /* 803227A4 */ virtual void setTexNo(u32 idx, u16 no) {
+    virtual void setTexNo(u32 idx, u16 no) {
         J3D_ASSERT_RANGE(0x61f, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = no;
     }
-    /* 803227C8 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(1574, idx >= 0 && idx < 1);
         return mTexNo[idx];
     }
-    /* 803227EC */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x62d, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x62e, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 803227D8 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x634, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 80322800 */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x639, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 80322818 */ virtual void setTevStageNum(u8 const* num) {}
-    /* 80322814 */ virtual void setTevStageNum(u8 num) {}
-    /* 8032281C */ virtual u8 getTevStageNum() const { return 1; }
-    /* 80322860 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStageNum(u8 const* num) {}
+    virtual void setTevStageNum(u8 num) {}
+    virtual u8 getTevStageNum() const { return 1; }
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x64b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x64c, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 80322824 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x652, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 8032289C */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x657, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 803228C4 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x65e, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x65f, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 803228B0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x665, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 803228D8 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x66a, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 803228EC */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 803228F4 */ virtual ~J3DTevBlock1() {}
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual ~J3DTevBlock1() {}
 
     /* 0x08 */ u16 mTexNo[1];
     /* 0x0A */ J3DTevOrder mTevOrder[1];
@@ -893,159 +893,159 @@ public:
     J3DTevBlock2() {
         initialize();
     }
-    /* 80317810 */ void initialize();
-
-    /* 803206AC */ virtual void reset(J3DTevBlock*);
-    /* 8031AFA4 */ virtual void load();
-    /* 8031D3D0 */ virtual void diffTexNo();
-    /* 8031D434 */ virtual void diffTevReg();
-    /* 8031D694 */ virtual void diffTexCoordScale();
-    /* 8031D4D0 */ virtual void diffTevStage();
-    /* 8031D5E4 */ virtual void diffTevStageIndirect();
-    /* 8031C6A8 */ virtual void patch();
-    /* 8031C3F8 */ virtual void patchTexNo();
-    /* 8031C48C */ virtual void patchTevReg();
-    /* 8031C558 */ virtual void patchTexNoAndTexCoordScale();
-    /* 803223AC */ virtual void ptrToIndex() {}
-    /* 803223B0 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 803223D4 */ virtual u32 getType() { return 'TVB2'; }
-    /* 80317BC4 */ virtual s32 countDLSize();
-    /* 803223F0 */ virtual void setTexNo(u32 idx, u16 const* texNo) {
+    void initialize();
+
+    virtual void reset(J3DTevBlock*);
+    virtual void load();
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex() {}
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVB2'; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x6b4, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x6b5, texNo != 0);
         mTexNo[idx] = *texNo;
     }
-    /* 803223E0 */ virtual void setTexNo(u32 idx, u16 texNo) {
+    virtual void setTexNo(u32 idx, u16 texNo) {
         J3D_ASSERT_RANGE(0x6bb, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = texNo;
     }
-    /* 80322404 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(0x6c2, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         return mTexNo[idx];
     }
-    /* 80322428 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x6c9, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x6ca, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 80322414 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x6d0, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 8032243C */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x6d5, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 8032247C */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x6dc, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         J3D_ASSERT_NULLPTR(0x6dd, color != 0);
         mTevColor[idx] = *color;
     }
-    /* 80322450 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
         J3D_ASSERT_RANGE(0x6e3, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
-    /* 803224A8 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
+    virtual J3DGXColorS10* getTevColor(u32 idx) {
         J3D_ASSERT_RANGE(0x6e8, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
-    /* 803224E8 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x6ef, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         J3D_ASSERT_NULLPTR(0x6f0, color != 0);
         mTevKColor[idx] = *color;
     }
-    /* 803224BC */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x6f6, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
-    /* 80322514 */ virtual J3DGXColor* getTevKColor(u32 idx) {
+    virtual J3DGXColor* getTevKColor(u32 idx) {
         J3D_ASSERT_RANGE(0x6fb, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
-    /* 80322534 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
+    virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x702, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         J3D_ASSERT_NULLPTR(0x703, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
-    /* 80322528 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
+    virtual void setTevKColorSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x709, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
-    /* 80322544 */ virtual u8 getTevKColorSel(u32 idx) {
+    virtual u8 getTevKColorSel(u32 idx) {
         J3D_ASSERT_RANGE(0x70e, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
-    /* 8032255C */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x715, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         J3D_ASSERT_NULLPTR(0x716, sel != 0);
         mTevKAlphaSel[idx] = *sel;
     }
-    /* 80322550 */ virtual void setTevKAlphaSel(u32 idx, u8 sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x71c, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         mTevKAlphaSel[idx] = sel;
     }
-    /* 8032256C */ virtual u8 getTevKAlphaSel(u32 idx) {
+    virtual u8 getTevKAlphaSel(u32 idx) {
         J3D_ASSERT_RANGE(0x721, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         return mTevKAlphaSel[idx];
     }
-    /* 80322580 */ virtual void setTevStageNum(u8 const* num) {
+    virtual void setTevStageNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x727, num != 0);
         mTevStageNum = *num;
     }
-    /* 80322578 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 8032258C */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 803225D0 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x736, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x737, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 80322594 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x73d, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 8032260C */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x742, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 80322658 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
         J3D_ASSERT_RANGE(0x749, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x74a, info != 0);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
-    /* 80322620 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
         J3D_ASSERT_RANGE(0x750, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx].setTevSwapModeInfo(info);
     }
-    /* 803226A0 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
         J3D_ASSERT_RANGE(0x757, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         J3D_ASSERT_NULLPTR(0x758, table != 0);
         mTevSwapModeTable[idx] = *table;
     }
-    /* 80322690 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
         J3D_ASSERT_RANGE(0x75e, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         mTevSwapModeTable[idx] = table;
     }
-    /* 803226B0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
+    virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
         J3D_ASSERT_RANGE(0x763, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         return &mTevSwapModeTable[idx];
     }
-    /* 803226D4 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x76a, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x76b, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 803226C0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x771, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 803226E8 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x776, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 803226FC */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 80322704 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; }
-    /* 8032270C */ virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
-    /* 80322714 */ virtual ~J3DTevBlock2() {}
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual u32 getTevRegOffset() const { return mTevRegOffset; }
+    virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
+    virtual ~J3DTevBlock2() {}
 
     /* 0x08 */ u16 mTexNo[2];
     /* 0x0C */ J3DTevOrder mTevOrder[2];
@@ -1069,159 +1069,159 @@ public:
     J3DTevBlock4() {
         initialize();
     }
-    /* 803178EC */ void initialize();
-
-    /* 8032098C */ virtual void reset(J3DTevBlock*);
-    /* 8031B4C0 */ virtual void load();
-    /* 8031D758 */ virtual void diffTexNo();
-    /* 8031D7BC */ virtual void diffTevReg();
-    /* 8031DA1C */ virtual void diffTexCoordScale();
-    /* 8031D858 */ virtual void diffTevStage();
-    /* 8031D96C */ virtual void diffTevStageIndirect();
-    /* 8031C9D0 */ virtual void patch();
-    /* 8031C6F4 */ virtual void patchTexNo();
-    /* 8031C788 */ virtual void patchTevReg();
-    /* 8031C854 */ virtual void patchTexNoAndTexCoordScale();
-    /* 80321FE8 */ virtual void ptrToIndex() {}
-    /* 80321FEC */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80322010 */ virtual u32 getType() { return 'TVB4'; }
-    /* 80317BCC */ virtual s32 countDLSize();
-    /* 8032202C */ virtual void setTexNo(u32 idx, u16 const* texNo) {
+    void initialize();
+
+    virtual void reset(J3DTevBlock*);
+    virtual void load();
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex() {}
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TVB4'; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x7d5, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x7d6, texNo != 0);
         mTexNo[idx] = *texNo;
     }
-    /* 8032201C */ virtual void setTexNo(u32 idx, u16 texNo) {
+    virtual void setTexNo(u32 idx, u16 texNo) {
         J3D_ASSERT_RANGE(0x7dc, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         mTexNo[idx] = texNo;
     }
-    /* 80322040 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(2019, idx >= 0 && idx < 4);
         return mTexNo[idx];
     }
-    /* 80322064 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x7ea, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x7eb, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 80322050 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x7f1, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 80322078 */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x7f6, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 803220B8 */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x7fd, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         J3D_ASSERT_NULLPTR(0x7fe, color != 0);
         mTevColor[idx] = *color;
     }
-    /* 8032208C */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
         J3D_ASSERT_RANGE(0x804, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
-    /* 803220E4 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
+    virtual J3DGXColorS10* getTevColor(u32 idx) {
         J3D_ASSERT_RANGE(0x809, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
-    /* 80322124 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x810, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         J3D_ASSERT_NULLPTR(0x811, color != 0);
         mTevKColor[idx] = *color;
     }
-    /* 803220F8 */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x817, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
-    /* 80322150 */ virtual J3DGXColor* getTevKColor(u32 idx) {
+    virtual J3DGXColor* getTevKColor(u32 idx) {
         J3D_ASSERT_RANGE(0x81c, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
-    /* 80322170 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
+    virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x823, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         J3D_ASSERT_NULLPTR(0x824, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
-    /* 80322164 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
+    virtual void setTevKColorSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x82a, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
-    /* 80322180 */ virtual u8 getTevKColorSel(u32 idx) {
+    virtual u8 getTevKColorSel(u32 idx) {
         J3D_ASSERT_RANGE(0x82f, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
-    /* 80322198 */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x836, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         J3D_ASSERT_NULLPTR(0x837, sel != 0);
         mTevKAlphaSel[idx] = *sel;
     }
-    /* 8032218C */ virtual void setTevKAlphaSel(u32 idx, u8 sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x83d, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         mTevKAlphaSel[idx] = sel;
     }
-    /* 803221A8 */ virtual u8 getTevKAlphaSel(u32 idx) {
+    virtual u8 getTevKAlphaSel(u32 idx) {
         J3D_ASSERT_RANGE(0x842, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         return mTevKAlphaSel[idx];
     }
-    /* 803221BC */ virtual void setTevStageNum(u8 const* num) {
+    virtual void setTevStageNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x848, num != 0);
         mTevStageNum = *num;
     }
-    /* 803221B4 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 803221C8 */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 8032220C */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x857, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x858, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 803221D0 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x85e, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 80322248 */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x863, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 80322294 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
         J3D_ASSERT_RANGE(0x86a, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x86b, info != 0);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
-    /* 8032225C */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
         J3D_ASSERT_RANGE(0x871, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx].setTevSwapModeInfo(info);
     }
-    /* 803222DC */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
         J3D_ASSERT_RANGE(0x878, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         J3D_ASSERT_NULLPTR(0x879, table != 0);
         mTevSwapModeTable[idx] = *table;
     }
-    /* 803222CC */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
         J3D_ASSERT_RANGE(0x87f, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         mTevSwapModeTable[idx] = table;
     }
-    /* 803222EC */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
+    virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
         J3D_ASSERT_RANGE(0x884, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         return &mTevSwapModeTable[idx];
     }
-    /* 80322310 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x88b, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x88c, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 803222FC */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x892, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 80322324 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x897, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 80322338 */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 80322340 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; }
-    /* 80322348 */ virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
-    /* 80322350 */ virtual ~J3DTevBlock4() {}
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual u32 getTevRegOffset() const { return mTevRegOffset; }
+    virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
+    virtual ~J3DTevBlock4() {}
 
     /* 0x08 */ u16 mTexNo[4];
     /* 0x10 */ J3DTevOrder mTevOrder[4];
@@ -1245,159 +1245,159 @@ public:
     J3DTevBlock16() {
         initialize();
     }
-    /* 80317A00 */ void initialize();
-
-    /* 80320E24 */ virtual void reset(J3DTevBlock*);
-    /* 8031BA04 */ virtual void load();
-    /* 8031DB14 */ virtual void diffTexNo();
-    /* 8031DB78 */ virtual void diffTevReg();
-    /* 8031DDD8 */ virtual void diffTexCoordScale();
-    /* 8031DC14 */ virtual void diffTevStage();
-    /* 8031DD28 */ virtual void diffTevStageIndirect();
-    /* 8031CCF8 */ virtual void patch();
-    /* 8031CA1C */ virtual void patchTexNo();
-    /* 8031CAB0 */ virtual void patchTevReg();
-    /* 8031CB7C */ virtual void patchTexNoAndTexCoordScale();
-    /* 8031DED0 */ virtual void ptrToIndex();
-    /* 80321C20 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
-    /* 80321C44 */ virtual u32 getType() { return 'TV16'; }
-    /* 80317BD4 */ virtual s32 countDLSize();
-    /* 80321C60 */ virtual void setTexNo(u32 idx, u16 const* texNo) {
+    void initialize();
+
+    virtual void reset(J3DTevBlock*);
+    virtual void load();
+    virtual void diffTexNo();
+    virtual void diffTevReg();
+    virtual void diffTexCoordScale();
+    virtual void diffTevStage();
+    virtual void diffTevStageIndirect();
+    virtual void patch();
+    virtual void patchTexNo();
+    virtual void patchTevReg();
+    virtual void patchTexNoAndTexCoordScale();
+    virtual void ptrToIndex();
+    virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); }
+    virtual u32 getType() { return 'TV16'; }
+    virtual s32 countDLSize();
+    virtual void setTexNo(u32 idx, u16 const* texNo) {
         J3D_ASSERT_RANGE(0x8f6, idx >= 0 && idx < ARRAY_SIZEU(mTexNo));
         J3D_ASSERT_NULLPTR(0x8f7, texNo != 0);
         mTexNo[idx] = *texNo;
     }
-    /* 80321C50 */ virtual void setTexNo(u32 idx, u16 texNo) {
+    virtual void setTexNo(u32 idx, u16 texNo) {
         J3D_ASSERT_RANGE(0x8fd, idx >= 0 && idx < 8);
         mTexNo[idx] = texNo;
     }
-    /* 80321C74 */ virtual u16 getTexNo(u32 idx) const {
+    virtual u16 getTexNo(u32 idx) const {
         J3D_ASSERT_RANGE(2308, idx >= 0 && idx < 8);
         return mTexNo[idx];
     }
-    /* 80321C98 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder const* order) {
         J3D_ASSERT_RANGE(0x90b, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         J3D_ASSERT_NULLPTR(0x90c, order != 0);
         mTevOrder[idx] = *order;
     }
-    /* 80321C84 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) {
+    virtual void setTevOrder(u32 idx, J3DTevOrder order) {
         J3D_ASSERT_RANGE(0x912, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         mTevOrder[idx] = order;
     }
-    /* 80321CAC */ virtual J3DTevOrder* getTevOrder(u32 idx) {
+    virtual J3DTevOrder* getTevOrder(u32 idx) {
         J3D_ASSERT_RANGE(0x917, idx >= 0 && idx < ARRAY_SIZEU(mTevOrder));
         return &mTevOrder[idx];
     }
-    /* 80321CEC */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) {
         J3D_ASSERT_RANGE(0x91e, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         J3D_ASSERT_NULLPTR(0x91f, color != 0);
         mTevColor[idx] = *color;
     }
-    /* 80321CC0 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
+    virtual void setTevColor(u32 idx, J3DGXColorS10 color) {
         J3D_ASSERT_RANGE(0x925, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         mTevColor[idx] = color;
     }
-    /* 80321D18 */ virtual J3DGXColorS10* getTevColor(u32 idx) {
+    virtual J3DGXColorS10* getTevColor(u32 idx) {
         J3D_ASSERT_RANGE(0x92a, idx >= 0 && idx < ARRAY_SIZEU(mTevColor));
         return &mTevColor[idx];
     }
-    /* 80321D58 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor const* color) {
         J3D_ASSERT_RANGE(0x931, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         J3D_ASSERT_NULLPTR(0x932, color != 0);
         mTevKColor[idx] = *color;
     }
-    /* 80321D2C */ virtual void setTevKColor(u32 idx, J3DGXColor color) {
+    virtual void setTevKColor(u32 idx, J3DGXColor color) {
         J3D_ASSERT_RANGE(0x938, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         mTevKColor[idx] = color;
     }
-    /* 80321D84 */ virtual J3DGXColor* getTevKColor(u32 idx) {
+    virtual J3DGXColor* getTevKColor(u32 idx) {
         J3D_ASSERT_RANGE(0x93d, idx >= 0 && idx < ARRAY_SIZEU(mTevKColor));
         return &mTevKColor[idx];
     }
-    /* 80321DA4 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) {
+    virtual void setTevKColorSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x944, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         J3D_ASSERT_NULLPTR(0x945, sel != 0);
         mTevKColorSel[idx] = *sel;
     }
-    /* 80321D98 */ virtual void setTevKColorSel(u32 idx, u8 sel) {
+    virtual void setTevKColorSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x94b, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         mTevKColorSel[idx] = sel;
     }
-    /* 80321DB4 */ virtual u8 getTevKColorSel(u32 idx) {
+    virtual u8 getTevKColorSel(u32 idx) {
         J3D_ASSERT_RANGE(0x950, idx >= 0 && idx < ARRAY_SIZEU(mTevKColorSel));
         return mTevKColorSel[idx];
     }
-    /* 80321DCC */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 const* sel) {
         J3D_ASSERT_RANGE(0x957, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         J3D_ASSERT_NULLPTR(0x958, sel != 0);
         mTevKAlphaSel[idx] = *sel;
     }
-    /* 80321DC0 */ virtual void setTevKAlphaSel(u32 idx, u8 sel) {
+    virtual void setTevKAlphaSel(u32 idx, u8 sel) {
         J3D_ASSERT_RANGE(0x95e, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         mTevKAlphaSel[idx] = sel;
     }
-    /* 80321DDC */ virtual u8 getTevKAlphaSel(u32 idx) {
+    virtual u8 getTevKAlphaSel(u32 idx) {
         J3D_ASSERT_RANGE(0x963, idx >= 0 && idx < ARRAY_SIZEU(mTevKAlphaSel));
         return mTevKAlphaSel[idx];
     }
-    /* 80321DF0 */ virtual void setTevStageNum(u8 const* num) {
+    virtual void setTevStageNum(u8 const* num) {
         J3D_ASSERT_NULLPTR(0x969, num != 0);
         mTevStageNum = *num;
     }
-    /* 80321DE8 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
-    /* 80321DFC */ virtual u8 getTevStageNum() const { return mTevStageNum; }
-    /* 80321E40 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
+    virtual void setTevStageNum(u8 num) { mTevStageNum = num; }
+    virtual u8 getTevStageNum() const { return mTevStageNum; }
+    virtual void setTevStage(u32 idx, J3DTevStage const* stage) {
         J3D_ASSERT_RANGE(0x978, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x979, stage != 0);
         mTevStage[idx] = *stage;
     }
-    /* 80321E04 */ virtual void setTevStage(u32 idx, J3DTevStage stage) {
+    virtual void setTevStage(u32 idx, J3DTevStage stage) {
         J3D_ASSERT_RANGE(0x97f, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx] = stage;
     }
-    /* 80321E7C */ virtual J3DTevStage* getTevStage(u32 idx) {
+    virtual J3DTevStage* getTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x984, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         return &mTevStage[idx];
     }
-    /* 80321EC8 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) {
         J3D_ASSERT_RANGE(0x98b, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         J3D_ASSERT_NULLPTR(0x98c, info != 0);
         mTevStage[idx].setTevSwapModeInfo(*info);
     }
-    /* 80321E90 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
+    virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) {
         J3D_ASSERT_RANGE(0x992, idx >= 0 && idx < ARRAY_SIZEU(mTevStage));
         mTevStage[idx].setTevSwapModeInfo(info);
     }
-    /* 80321F10 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) {
         J3D_ASSERT_RANGE(0x999, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         J3D_ASSERT_NULLPTR(0x99a, table != 0);
         mTevSwapModeTable[idx] = *table;
     }
-    /* 80321F00 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
+    virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) {
         J3D_ASSERT_RANGE(0x9a0, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         mTevSwapModeTable[idx] = table;
     }
-    /* 80321F20 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
+    virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) {
         J3D_ASSERT_RANGE(0x9a5, idx >= 0 && idx < ARRAY_SIZEU(mTevSwapModeTable));
         return &mTevSwapModeTable[idx];
     }
-    /* 80321F44 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) {
         J3D_ASSERT_RANGE(0x9ac, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         J3D_ASSERT_NULLPTR(0x9ad, stage != 0);
         mIndTevStage[idx] = *stage;
     }
-    /* 80321F30 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
+    virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) {
         J3D_ASSERT_RANGE(0x9b3, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         mIndTevStage[idx] = stage;
     }
-    /* 80321F58 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) {
+    virtual J3DIndTevStage* getIndTevStage(u32 idx) {
         J3D_ASSERT_RANGE(0x9b8, idx >= 0 && idx < ARRAY_SIZEU(mIndTevStage));
         return &mIndTevStage[idx];
     }
-    /* 80321F6C */ virtual u32 getTexNoOffset() const { return mTexNoOffset; }
-    /* 80321F74 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; }
-    /* 80321F7C */ virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
-    /* 80321F84 */ virtual ~J3DTevBlock16() {}
+    virtual u32 getTexNoOffset() const { return mTexNoOffset; }
+    virtual u32 getTevRegOffset() const { return mTevRegOffset; }
+    virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; }
+    virtual ~J3DTevBlock16() {}
 
     /* 0x008 */ u16 mTexNo[8];
     /* 0x018 */ J3DTevOrder mTevOrder[16];
@@ -1620,7 +1620,7 @@ extern const J3DIndTexOrderInfo j3dDefaultIndTexOrderNull;
  *
  */
 struct J3DIndTexOrder : public J3DIndTexOrderInfo {
-    /* 8000E128 */ J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {}
+    J3DIndTexOrder() : J3DIndTexOrderInfo(j3dDefaultIndTexOrderNull) {}
     J3DIndTexOrder& operator=(J3DIndTexOrder const& other) {
         *(u32*)this = *(u32*)&other;
         return *this;
@@ -1637,9 +1637,9 @@ extern J3DIndTexMtxInfo const j3dDefaultIndTexMtxInfo;
  *
  */
 struct J3DIndTexMtx : public J3DIndTexMtxInfo {
-    /* 8000E0F0 */ J3DIndTexMtx() { *(J3DIndTexMtxInfo*)this = j3dDefaultIndTexMtxInfo; }
+    J3DIndTexMtx() { *(J3DIndTexMtxInfo*)this = j3dDefaultIndTexMtxInfo; }
     J3DIndTexMtx(J3DIndTexMtxInfo const& info) { *(J3DIndTexMtxInfo*)this = info; }
-    /* 8000E064 */ ~J3DIndTexMtx() {}
+    ~J3DIndTexMtx() {}
     void load(u32 param_1) const {
         J3DGDSetIndTexMtx((GXIndTexMtxID)(param_1 + GX_ITM_0), (Mtx3P)field_0x0, field_0x18);
     }
@@ -1663,9 +1663,9 @@ extern const J3DIndTexCoordScaleInfo j3dDefaultIndTexCoordScaleInfo;
  *
  */
 struct J3DIndTexCoordScale : public J3DIndTexCoordScaleInfo {
-    /* 8000E0E4 */ J3DIndTexCoordScale() : J3DIndTexCoordScaleInfo(j3dDefaultIndTexCoordScaleInfo) {}
+    J3DIndTexCoordScale() : J3DIndTexCoordScaleInfo(j3dDefaultIndTexCoordScaleInfo) {}
     J3DIndTexCoordScale(J3DIndTexCoordScaleInfo const& info) : J3DIndTexCoordScaleInfo(info) {}
-    /* 8000E024 */ ~J3DIndTexCoordScale() {}
+    ~J3DIndTexCoordScale() {}
     u8 getScaleS() { return mScaleS; }
     u8 getScaleT() { return mScaleT; }
 
@@ -1682,23 +1682,23 @@ struct J3DIndTexCoordScale : public J3DIndTexCoordScaleInfo {
  */
 class J3DIndBlock {
 public:
-    /* 8031734C */ virtual void reset(J3DIndBlock*) {}
+    virtual void reset(J3DIndBlock*) {}
     virtual void diff(u32) = 0;
     virtual void load() = 0;
-    /* 80317314 */ virtual s32 countDLSize() { return 0; }
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    /* 8000E0A0 */ virtual void setIndTexStageNum(u8) {}
-    /* 8000DF7C */ virtual u8 getIndTexStageNum() const { return 0; }
-    /* 80317410 */ virtual void setIndTexOrder(u32, J3DIndTexOrder) {}
-    /* 8031740C */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*) {}
-    /* 8000DF74 */ virtual J3DIndTexOrder* getIndTexOrder(u32) { return NULL; }
-    /* 80317414 */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*) {}
-    /* 8000E060 */ virtual void setIndTexMtx(u32, J3DIndTexMtx) {}
-    /* 8000DF6C */ virtual J3DIndTexMtx* getIndTexMtx(u32) { return NULL; }
-    /* 80317418 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*) {}
-    /* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {}
-    /* 8000DF64 */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
-    /* 8031726C */ virtual ~J3DIndBlock() {}
+    virtual void setIndTexStageNum(u8) {}
+    virtual u8 getIndTexStageNum() const { return 0; }
+    virtual void setIndTexOrder(u32, J3DIndTexOrder) {}
+    virtual void setIndTexOrder(u32, J3DIndTexOrder const*) {}
+    virtual J3DIndTexOrder* getIndTexOrder(u32) { return NULL; }
+    virtual void setIndTexMtx(u32, J3DIndTexMtx const*) {}
+    virtual void setIndTexMtx(u32, J3DIndTexMtx) {}
+    virtual J3DIndTexMtx* getIndTexMtx(u32) { return NULL; }
+    virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*) {}
+    virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {}
+    virtual J3DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
+    virtual ~J3DIndBlock() {}
 };
 
 /**
@@ -1707,11 +1707,11 @@ public:
  */
 class J3DIndBlockNull : public J3DIndBlock {
 public:
-    /* 80317398 */ virtual void diff(u32) {}
-    /* 8031739C */ virtual void load() {}
-    /* 803173A0 */ virtual void reset(J3DIndBlock*) {}
-    /* 803173A4 */ virtual u32 getType() { return 'IBLN'; }
-    /* 803173B0 */ virtual ~J3DIndBlockNull() {}
+    virtual void diff(u32) {}
+    virtual void load() {}
+    virtual void reset(J3DIndBlock*) {}
+    virtual u32 getType() { return 'IBLN'; }
+    virtual ~J3DIndBlockNull() {}
 };
 
 /**
@@ -1723,55 +1723,55 @@ public:
     J3DIndBlockFull() {
         initialize();
     }
-    /* 80317B28 */ void initialize();
+    void initialize();
 
-    /* 80317BDC */ virtual s32 countDLSize();
-    /* 803210B0 */ virtual void reset(J3DIndBlock*);
-    /* 8031E328 */ virtual void diff(u32);
-    /* 8031E12C */ virtual void load();
-    /* 80323390 */ virtual u32 getType() { return 'IBLF'; }
-    /* 8032339C */ virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
-    /* 803233A4 */ virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
-    /* 803233C0 */ virtual void setIndTexOrder(u32 idx, J3DIndTexOrder const* order) {
+    virtual s32 countDLSize();
+    virtual void reset(J3DIndBlock*);
+    virtual void diff(u32);
+    virtual void load();
+    virtual u32 getType() { return 'IBLF'; }
+    virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
+    virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
+    virtual void setIndTexOrder(u32 idx, J3DIndTexOrder const* order) {
         J3D_ASSERT_NULLPTR(0xa94, order != 0);
         J3D_ASSERT_RANGE(0xa95, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         mIndTexOrder[idx] = *order;
     }
-    /* 803233AC */ virtual void setIndTexOrder(u32 idx, J3DIndTexOrder order) {
+    virtual void setIndTexOrder(u32 idx, J3DIndTexOrder order) {
         J3D_ASSERT_RANGE(0xa9b, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         mIndTexOrder[idx] = order;
     }
-    /* 803233D4 */ virtual J3DIndTexOrder* getIndTexOrder(u32 idx) {
+    virtual J3DIndTexOrder* getIndTexOrder(u32 idx) {
         J3D_ASSERT_RANGE(0xaa0, idx >= 0 && idx < ARRAY_SIZEU(mIndTexOrder));
         return &mIndTexOrder[idx];
     }
-    /* 8032341C */ virtual void setIndTexMtx(u32 idx, J3DIndTexMtx const* mtx) {
+    virtual void setIndTexMtx(u32 idx, J3DIndTexMtx const* mtx) {
         J3D_ASSERT_NULLPTR(0xaa7, mtx != 0);
         J3D_ASSERT_RANGE(0xaa8, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         mIndTexMtx[idx] = *mtx;
     }
-    /* 803233E8 */ virtual void setIndTexMtx(u32 idx, J3DIndTexMtx mtx) {
+    virtual void setIndTexMtx(u32 idx, J3DIndTexMtx mtx) {
         J3D_ASSERT_RANGE(0xaae, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         mIndTexMtx[idx] = mtx;
     }
-    /* 80323450 */ virtual J3DIndTexMtx* getIndTexMtx(u32 idx) {
+    virtual J3DIndTexMtx* getIndTexMtx(u32 idx) {
         J3D_ASSERT_RANGE(0xab3, idx >= 0 && idx < ARRAY_SIZEU(mIndTexMtx));
         return &mIndTexMtx[idx];
     }
-    /* 80323478 */ virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale const* scale) {
+    virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale const* scale) {
         J3D_ASSERT_NULLPTR(0xaba, scale != 0);
         J3D_ASSERT_RANGE(0xabb, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         mIndTexCoordScale[idx] = *scale;
     }
-    /* 80323464 */ virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale scale) {
+    virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale scale) {
         J3D_ASSERT_RANGE(0xac1, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         mIndTexCoordScale[idx] = scale;
     }
-    /* 8032348C */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32 idx) {
+    virtual J3DIndTexCoordScale* getIndTexCoordScale(u32 idx) {
         J3D_ASSERT_RANGE(0xac6, idx >= 0 && idx < ARRAY_SIZEU(mIndTexCoordScale));
         return &mIndTexCoordScale[idx];
     }
-    /* 803234A0 */ virtual ~J3DIndBlockFull() {}
+    virtual ~J3DIndBlockFull() {}
 
     /* 0x04 */ u8 mIndTexStageNum;
     /* 0x05 */ J3DIndTexOrder mIndTexOrder[4];
@@ -1785,35 +1785,35 @@ public:
  */
 class J3DPEBlock {
 public:
-    /* 80317348 */ virtual void reset(J3DPEBlock*) {}
+    virtual void reset(J3DPEBlock*) {}
     virtual void load() = 0;
-    /* 8000DBCC */ virtual void patch() {}
-    /* 80317344 */ virtual void diff(u32) {}
-    /* 8031735C */ virtual void diffFog() {}
-    /* 80317360 */ virtual void diffBlend() {}
-    /* 8031731C */ virtual s32 countDLSize() { return 0; }
+    virtual void patch() {}
+    virtual void diff(u32) {}
+    virtual void diffFog() {}
+    virtual void diffBlend() {}
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    /* 80317368 */ virtual void setFog(J3DFog) {}
-    /* 80317364 */ virtual void setFog(J3DFog*) {}
-    /* 8000DF5C */ virtual J3DFog* getFog() { return NULL; }
-    /* 8031736C */ virtual void setAlphaComp(J3DAlphaComp const*) {}
-    /* 8000E01C */ virtual void setAlphaComp(J3DAlphaComp const&) {}
-    /* 8000DF54 */ virtual J3DAlphaComp* getAlphaComp() { return NULL; }
-    /* 80317370 */ virtual void setBlend(J3DBlend const*) {}
-    /* 8000E018 */ virtual void setBlend(J3DBlend const&) {}
-    /* 8000DF4C */ virtual J3DBlend* getBlend() { return NULL; }
-    /* 80317374 */ virtual void setZMode(J3DZMode const*) {}
-    /* 8000E014 */ virtual void setZMode(J3DZMode) {}
-    /* 8000DF44 */ virtual J3DZMode* getZMode() { return NULL; }
-    /* 80317378 */ virtual void setZCompLoc(u8 const*) {}
-    /* 8000E010 */ virtual void setZCompLoc(u8) {}
-    /* 8000DF3C */ virtual u8 getZCompLoc() const { return 0; }
-    /* 80317380 */ virtual void setDither(u8 const*) {}
-    /* 8031737C */ virtual void setDither(u8) {}
-    /* 80317384 */ virtual u8 getDither() const { return 0; }
-    /* 8031738C */ virtual u32 getFogOffset() const { return 0; }
-    /* 80317394 */ virtual void setFogOffset(u32) {}
-    /* 803172B4 */ virtual ~J3DPEBlock() {}
+    virtual void setFog(J3DFog) {}
+    virtual void setFog(J3DFog*) {}
+    virtual J3DFog* getFog() { return NULL; }
+    virtual void setAlphaComp(J3DAlphaComp const*) {}
+    virtual void setAlphaComp(J3DAlphaComp const&) {}
+    virtual J3DAlphaComp* getAlphaComp() { return NULL; }
+    virtual void setBlend(J3DBlend const*) {}
+    virtual void setBlend(J3DBlend const&) {}
+    virtual J3DBlend* getBlend() { return NULL; }
+    virtual void setZMode(J3DZMode const*) {}
+    virtual void setZMode(J3DZMode) {}
+    virtual J3DZMode* getZMode() { return NULL; }
+    virtual void setZCompLoc(u8 const*) {}
+    virtual void setZCompLoc(u8) {}
+    virtual u8 getZCompLoc() const { return 0; }
+    virtual void setDither(u8 const*) {}
+    virtual void setDither(u8) {}
+    virtual u8 getDither() const { return 0; }
+    virtual u32 getFogOffset() const { return 0; }
+    virtual void setFogOffset(u32) {}
+    virtual ~J3DPEBlock() {}
 };
 
 /**
@@ -1821,9 +1821,9 @@ public:
  *
  */
 struct J3DPEBlockNull : public J3DPEBlock {
-    /* 803329A0 */ virtual void load() {}
-    /* 803329A4 */ virtual u32 getType() { return 'PENL'; }
-    /* 803329B0 */ virtual ~J3DPEBlockNull() {}
+    virtual void load() {}
+    virtual u32 getType() { return 'PENL'; }
+    virtual ~J3DPEBlockNull() {}
 };
 
 /**
@@ -1832,10 +1832,10 @@ struct J3DPEBlockNull : public J3DPEBlock {
  */
 class J3DPEBlockOpa : public J3DPEBlock {
 public:
-    /* 80317BE4 */ virtual s32 countDLSize();
-    /* 8031E408 */ virtual void load();
-    /* 80323328 */ virtual u32 getType() { return 'PEOP'; }
-    /* 80323334 */ virtual ~J3DPEBlockOpa() {}
+    virtual s32 countDLSize();
+    virtual void load();
+    virtual u32 getType() { return 'PEOP'; }
+    virtual ~J3DPEBlockOpa() {}
 };
 
 /**
@@ -1844,10 +1844,10 @@ public:
  */
 class J3DPEBlockTexEdge : public J3DPEBlock {
 public:
-    /* 80317BEC */ virtual s32 countDLSize();
-    /* 8031E6C8 */ virtual void load();
-    /* 803232C0 */ virtual u32 getType() { return 'PEED'; }
-    /* 803232CC */ virtual ~J3DPEBlockTexEdge() {}
+    virtual s32 countDLSize();
+    virtual void load();
+    virtual u32 getType() { return 'PEED'; }
+    virtual ~J3DPEBlockTexEdge() {}
 };
 
 /**
@@ -1856,10 +1856,10 @@ public:
  */
 class J3DPEBlockXlu : public J3DPEBlock {
 public:
-    /* 80317BF4 */ virtual s32 countDLSize();
-    /* 8031E98C */ virtual void load();
-    /* 80323258 */ virtual u32 getType() { return 'PEXL'; }
-    /* 80323264 */ virtual ~J3DPEBlockXlu() {}
+    virtual s32 countDLSize();
+    virtual void load();
+    virtual u32 getType() { return 'PEXL'; }
+    virtual ~J3DPEBlockXlu() {}
 };
 
 /**
@@ -1871,45 +1871,45 @@ public:
     J3DPEBlockFogOff() {
         initialize();
     }
-    /* 80317B34 */ void initialize();
+    void initialize();
 
-    /* 803211B4 */ virtual void reset(J3DPEBlock*);
-    /* 8031EC50 */ virtual void load();
-    /* 80321ACC */ virtual void diff(u32 param_0) { if (param_0 & 0x20000000) diffBlend(); };
-    /* 8031F0D8 */ virtual void diffBlend();
-    /* 80317BFC */ virtual s32 countDLSize();
-    /* 80321B00 */ virtual u32 getType() { return 'PEFG'; }
-    /* 80321B28 */ virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
+    virtual void reset(J3DPEBlock*);
+    virtual void load();
+    virtual void diff(u32 param_0) { if (param_0 & 0x20000000) diffBlend(); };
+    virtual void diffBlend();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'PEFG'; }
+    virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
         J3D_ASSERT_NULLPTR(0xbf9, alphaComp != 0);
         mAlphaComp = *alphaComp;
     }
-    /* 80321B0C */ virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
-    /* 80321B44 */ virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
-    /* 80321B58 */ virtual void setBlend(J3DBlend const* blend) {
+    virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
+    virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
+    virtual void setBlend(J3DBlend const* blend) {
         J3D_ASSERT_NULLPTR(0xc07, blend != 0);
         mBlend = *blend;
     }
-    /* 80321B4C */ virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
-    /* 80321B64 */ virtual J3DBlend* getBlend() { return &mBlend; }
-    /* 80321B78 */ virtual void setZMode(J3DZMode const* zMode) {
+    virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
+    virtual J3DBlend* getBlend() { return &mBlend; }
+    virtual void setZMode(J3DZMode const* zMode) {
         J3D_ASSERT_NULLPTR(0xc15, zMode != 0);
         mZMode = *zMode;
     }
-    /* 80321B6C */ virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
-    /* 80321B84 */ virtual J3DZMode* getZMode() { return &mZMode; }
-    /* 80321B94 */ virtual void setZCompLoc(u8 const* zCompLoc) {
+    virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
+    virtual J3DZMode* getZMode() { return &mZMode; }
+    virtual void setZCompLoc(u8 const* zCompLoc) {
         J3D_ASSERT_NULLPTR(0xc23, zCompLoc != 0);
         mZCompLoc = *zCompLoc;
     }
-    /* 80321B8C */ virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
-    /* 80321BA0 */ virtual u8 getZCompLoc() const { return mZCompLoc; }
-    /* 80321BB0 */ virtual void setDither(u8 const* dither) {
+    virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
+    virtual u8 getZCompLoc() const { return mZCompLoc; }
+    virtual void setDither(u8 const* dither) {
         J3D_ASSERT_NULLPTR(0xc31, dither != 0);
         mDither = *dither;
     }
-    /* 80321BA8 */ virtual void setDither(u8 dither) { mDither = dither; }
-    /* 80321BBC */ virtual u8 getDither() const { return mDither; }
-    /* 80321BC4 */ virtual ~J3DPEBlockFogOff() {}
+    virtual void setDither(u8 dither) { mDither = dither; }
+    virtual u8 getDither() const { return mDither; }
+    virtual ~J3DPEBlockFogOff() {}
 
     /* 0x04 */ J3DAlphaComp mAlphaComp;
     /* 0x08 */ J3DBlend mBlend;
@@ -1927,52 +1927,52 @@ public:
     J3DPEBlockFull() {
         initialize();
     }
-    /* 80317B58 */ void initialize();
-
-    /* 8032129C */ virtual void reset(J3DPEBlock*);
-    /* 8031F3C0 */ virtual void load();
-    /* 8031F890 */ virtual void patch();
-    /* 8031FCA0 */ virtual void diff(u32);
-    /* 8031F940 */ virtual void diffFog();
-    /* 8031F9B8 */ virtual void diffBlend();
-    /* 80317C04 */ virtual s32 countDLSize();
-    /* 8032194C */ virtual u32 getType() { return 'PEFL'; }
-    /* 8032197C */ virtual void setFog(J3DFog fog) { mFog.setFogInfo(fog.getFogInfo()); }
-    /* 80321958 */ virtual void setFog(J3DFog* pFog) { mFog.setFogInfo(pFog->getFogInfo()); }
-    /* 803219A0 */ virtual J3DFog* getFog() { return &mFog; }
-    /* 803219C4 */ virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
+    void initialize();
+
+    virtual void reset(J3DPEBlock*);
+    virtual void load();
+    virtual void patch();
+    virtual void diff(u32);
+    virtual void diffFog();
+    virtual void diffBlend();
+    virtual s32 countDLSize();
+    virtual u32 getType() { return 'PEFL'; }
+    virtual void setFog(J3DFog fog) { mFog.setFogInfo(fog.getFogInfo()); }
+    virtual void setFog(J3DFog* pFog) { mFog.setFogInfo(pFog->getFogInfo()); }
+    virtual J3DFog* getFog() { return &mFog; }
+    virtual void setAlphaComp(J3DAlphaComp const* alphaComp) {
         J3D_ASSERT_NULLPTR(0xc7d, alphaComp != 0);
         mAlphaComp = *alphaComp;
     }
-    /* 803219A8 */ virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
-    /* 803219E0 */ virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
-    /* 803219F4 */ virtual void setBlend(J3DBlend const* blend) {
+    virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; }
+    virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; }
+    virtual void setBlend(J3DBlend const* blend) {
         J3D_ASSERT_NULLPTR(0xc8b, blend != 0);
         mBlend = *blend;
     }
-    /* 803219E8 */ virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
-    /* 80321A00 */ virtual J3DBlend* getBlend() { return &mBlend; }
-    /* 80321A14 */ virtual void setZMode(J3DZMode const* zMode) {
+    virtual void setBlend(J3DBlend const& blend) { mBlend = blend; }
+    virtual J3DBlend* getBlend() { return &mBlend; }
+    virtual void setZMode(J3DZMode const* zMode) {
         J3D_ASSERT_NULLPTR(0xc99, zMode != 0);
         mZMode = *zMode;
     }
-    /* 80321A08 */ virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
-    /* 80321A20 */ virtual J3DZMode* getZMode() { return &mZMode; }
-    /* 80321A30 */ virtual void setZCompLoc(u8 const* zCompLoc) {
+    virtual void setZMode(J3DZMode zMode) { mZMode = zMode; }
+    virtual J3DZMode* getZMode() { return &mZMode; }
+    virtual void setZCompLoc(u8 const* zCompLoc) {
         J3D_ASSERT_NULLPTR(0xca7, zCompLoc != 0);
         mZCompLoc = *zCompLoc;
     }
-    /* 80321A28 */ virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
-    /* 80321A3C */ virtual u8 getZCompLoc() const { return mZCompLoc; }
-    /* 80321A4C */ virtual void setDither(u8 const* dither) {
+    virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; }
+    virtual u8 getZCompLoc() const { return mZCompLoc; }
+    virtual void setDither(u8 const* dither) {
         J3D_ASSERT_NULLPTR(0xcb5, dither != 0);
         mDither = *dither;
     }
-    /* 80321A44 */ virtual void setDither(u8 dither) { mDither = dither; }
-    /* 80321A58 */ virtual u8 getDither() const { return mDither; }
-    /* 80321A60 */ virtual u32 getFogOffset() const { return mFogOffset; }
-    /* 80321A68 */ virtual void setFogOffset(u32 fogOffset) { mFogOffset = fogOffset; }
-    /* 80321A70 */ virtual ~J3DPEBlockFull() {}
+    virtual void setDither(u8 dither) { mDither = dither; }
+    virtual u8 getDither() const { return mDither; }
+    virtual u32 getFogOffset() const { return mFogOffset; }
+    virtual void setFogOffset(u32 fogOffset) { mFogOffset = fogOffset; }
+    virtual ~J3DPEBlockFull() {}
 
     /* 0x04 */ J3DFog mFog;
     /* 0x30 */ J3DAlphaComp mAlphaComp;
@@ -1988,8 +1988,8 @@ public:
  *
  */
 struct J3DColorBlockNull : public J3DColorBlock {
-    /* 80332B2C */ virtual u32 getType() { return 'CLNL'; }
-    /* 80332B38 */ virtual ~J3DColorBlockNull() {}
+    virtual u32 getType() { return 'CLNL'; }
+    virtual ~J3DColorBlockNull() {}
 };
 
 #endif /* J3DMATBLOCK_H */
diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 5ec56d8c99..39b8be99c2 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -15,35 +15,35 @@ class J3DMaterialAnm;
  */
 class J3DMaterial {
 public:
-    /* 803157A0 */ static J3DColorBlock* createColorBlock(u32);
-    /* 803159A0 */ static J3DTexGenBlock* createTexGenBlock(u32);
-    /* 80315B04 */ static J3DTevBlock* createTevBlock(int);
-    /* 80315E78 */ static J3DIndBlock* createIndBlock(int);
-    /* 80315F60 */ static J3DPEBlock* createPEBlock(u32, u32);
-    /* 80316100 */ static u32 calcSizeColorBlock(u32);
-    /* 80316150 */ static u32 calcSizeTexGenBlock(u32);
-    /* 8031617C */ static u32 calcSizeTevBlock(int);
-    /* 803161C4 */ static u32 calcSizeIndBlock(int);
-    /* 803161D8 */ static u32 calcSizePEBlock(u32, u32);
-    /* 80316240 */ void initialize();
-    /* 80316290 */ u32 countDLSize();
-    /* 80316344 */ void makeDisplayList_private(J3DDisplayListObj*);
-    /* 80316AB0 */ void setCurrentMtx();
-    /* 80316AC8 */ void calcCurrentMtx();
-    /* 80316D68 */ void copy(J3DMaterial*);
-    /* 80316E90 */ s32 newSharedDisplayList(u32);
-    /* 80316F24 */ s32 newSingleSharedDisplayList(u32);
+    static J3DColorBlock* createColorBlock(u32);
+    static J3DTexGenBlock* createTexGenBlock(u32);
+    static J3DTevBlock* createTevBlock(int);
+    static J3DIndBlock* createIndBlock(int);
+    static J3DPEBlock* createPEBlock(u32, u32);
+    static u32 calcSizeColorBlock(u32);
+    static u32 calcSizeTexGenBlock(u32);
+    static u32 calcSizeTevBlock(int);
+    static u32 calcSizeIndBlock(int);
+    static u32 calcSizePEBlock(u32, u32);
+    void initialize();
+    u32 countDLSize();
+    void makeDisplayList_private(J3DDisplayListObj*);
+    void setCurrentMtx();
+    void calcCurrentMtx();
+    void copy(J3DMaterial*);
+    s32 newSharedDisplayList(u32);
+    s32 newSingleSharedDisplayList(u32);
 
-    /* 803169DC */ virtual void calc(f32 const (*)[4]);
-    /* 80316A54 */ virtual void calcDiffTexMtx(f32 const (*)[4]);
-    /* 80316620 */ virtual void makeDisplayList();
-    /* 80316668 */ virtual void makeSharedDisplayList();
-    /* 8031668C */ virtual void load();
-    /* 803166DC */ virtual void loadSharedDL();
-    /* 80316740 */ virtual void patch();
-    /* 803167D8 */ virtual void diff(u32);
-    /* 80316E14 */ virtual void reset();
-    /* 80316E70 */ virtual void change();
+    virtual void calc(f32 const (*)[4]);
+    virtual void calcDiffTexMtx(f32 const (*)[4]);
+    virtual void makeDisplayList();
+    virtual void makeSharedDisplayList();
+    virtual void load();
+    virtual void loadSharedDL();
+    virtual void patch();
+    virtual void diff(u32);
+    virtual void reset();
+    virtual void change();
 
     J3DMaterial() { initialize(); }
     ~J3DMaterial() {}
@@ -132,14 +132,14 @@ public:
 class J3DPatchedMaterial : public J3DMaterial {
 public:
     J3DPatchedMaterial() { initialize(); }
-    /* 80316FB8 */ void initialize();
+    void initialize();
 
-    /* 80316FD8 */ virtual void makeDisplayList();
-    /* 80316FDC */ virtual void makeSharedDisplayList();
-    /* 80316FE0 */ virtual void load();
-    /* 80316FFC */ virtual void loadSharedDL();
-    /* 8031703C */ virtual void reset();
-    /* 80317040 */ virtual void change();
+    virtual void makeDisplayList();
+    virtual void makeSharedDisplayList();
+    virtual void load();
+    virtual void loadSharedDL();
+    virtual void reset();
+    virtual void change();
 };
 
 /**
@@ -149,17 +149,17 @@ public:
 class J3DLockedMaterial : public J3DMaterial {
 public:
     J3DLockedMaterial() { initialize(); }
-    /* 80317044 */ void initialize();
+    void initialize();
 
-    /* 803170D0 */ virtual void calc(f32 const (*)[4]);
-    /* 80317064 */ virtual void makeDisplayList();
-    /* 80317068 */ virtual void makeSharedDisplayList();
-    /* 8031706C */ virtual void load();
-    /* 80317088 */ virtual void loadSharedDL();
-    /* 803170C8 */ virtual void patch();
-    /* 803170CC */ virtual void diff(u32);
-    /* 803170D4 */ virtual void reset();
-    /* 803170D8 */ virtual void change();
+    virtual void calc(f32 const (*)[4]);
+    virtual void makeDisplayList();
+    virtual void makeSharedDisplayList();
+    virtual void load();
+    virtual void loadSharedDL();
+    virtual void patch();
+    virtual void diff(u32);
+    virtual void reset();
+    virtual void change();
 };
 
 #endif /* J3DMATERIAL_H */
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 9331f74cb5..afcfa283fe 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -65,17 +65,17 @@ public:
         : mUseMtxIndex(useMtxIndex)
     {}
 
-    /* 803130E4 */ void loadMtxIndx_PNGP(int, u16) const;
-    /* 80313128 */ void loadMtxIndx_PCPU(int, u16) const;
-    /* 80313188 */ void loadMtxIndx_NCPU(int, u16) const;
-    /* 803131D4 */ void loadMtxIndx_PNCPU(int, u16) const;
-
-    /* 80314798 */ virtual ~J3DShapeMtx() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMTX'; }
-    /* 80273E08 */ virtual u16 getUseMtxNum() const { return 1; }
-    /* 8031459C */ virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; }
-    /* 80313B94 */ virtual void load() const;
-    /* 80313BF0 */ virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
+    void loadMtxIndx_PNGP(int, u16) const;
+    void loadMtxIndx_PCPU(int, u16) const;
+    void loadMtxIndx_NCPU(int, u16) const;
+    void loadMtxIndx_PNCPU(int, u16) const;
+
+    virtual ~J3DShapeMtx() {}
+    virtual u32 getType() const { return 'SMTX'; }
+    virtual u16 getUseMtxNum() const { return 1; }
+    virtual u16 getUseMtxIndex(u16) const { return mUseMtxIndex; }
+    virtual void load() const;
+    virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
 
     static J3DShapeMtx_LoadFunc sMtxLoadPipeline[4];
     static u16 sMtxLoadCache[10];
@@ -123,22 +123,22 @@ public:
 
     static const int kVcdVatDLSize = 0xC0;
 
-    /* 80314B48 */ void initialize();
-    /* 80314BB8 */ void addTexMtxIndexInDL(_GXAttr, u32);
-    /* 80314CBC */ void addTexMtxIndexInVcd(_GXAttr);
-    /* 80314DA8 */ void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
-    /* 80314E28 */ u16 countBumpMtxNum() const;
-    /* 80314EEC */ void loadVtxArray() const;
-    /* 80314F5C */ bool isSameVcdVatCmd(J3DShape*);
-    /* 80314F98 */ void makeVtxArrayCmd();
-    /* 80315260 */ void makeVcdVatCmd();
-    /* 80315300 */ void loadPreDrawSetting() const;
-    /* 80315398 */ void setArrayAndBindPipeline() const;
-
-    /* 803155E0 */ virtual void draw() const;
-    /* 8031544C */ virtual void drawFast() const;
-    /* 80315628 */ virtual void simpleDraw() const;
-    /* 803156AC */ virtual void simpleDrawCache() const;
+    void initialize();
+    void addTexMtxIndexInDL(_GXAttr, u32);
+    void addTexMtxIndexInVcd(_GXAttr);
+    void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
+    u16 countBumpMtxNum() const;
+    void loadVtxArray() const;
+    bool isSameVcdVatCmd(J3DShape*);
+    void makeVtxArrayCmd();
+    void makeVcdVatCmd();
+    void loadPreDrawSetting() const;
+    void setArrayAndBindPipeline() const;
+
+    virtual void draw() const;
+    virtual void drawFast() const;
+    virtual void simpleDraw() const;
+    virtual void simpleDrawCache() const;
 
     void loadCurrentMtx() const;
 
diff --git a/include/JSystem/J3DGraphBase/J3DShapeDraw.h b/include/JSystem/J3DGraphBase/J3DShapeDraw.h
index 8863f868d8..8d915610bb 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeDraw.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeDraw.h
@@ -9,12 +9,12 @@
  */
 class J3DShapeDraw {
 public:
-    /* 80314924 */ u32 countVertex(u32);
-    /* 80314974 */ void addTexMtxIndexInDL(u32, u32, u32);
-    /* 80314ABC */ J3DShapeDraw(u8 const*, u32);
-    /* 80314AD4 */ void draw() const;
+    u32 countVertex(u32);
+    void addTexMtxIndexInDL(u32, u32, u32);
+    J3DShapeDraw(u8 const*, u32);
+    void draw() const;
 
-    /* 80314B00 */ virtual ~J3DShapeDraw();
+    virtual ~J3DShapeDraw();
 
     u8* getDisplayList() const { return (u8*)mDisplayList; }
     u32 getDisplayListSize() const { return mDisplayListSize; }
diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
index f269c0594b..0ce718392f 100644
--- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h
+++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h
@@ -42,7 +42,7 @@ public:
  */
 class J3DDifferedTexMtx {
 public:
-    /* 8031322C */ static void loadExecute(f32 const (*)[4]);
+    static void loadExecute(f32 const (*)[4]);
 
     static inline void load(const Mtx m) {
         if (sTexGenBlock != NULL)
@@ -66,17 +66,17 @@ public:
         : J3DShapeMtx(useMtxIndex)
     {}
 
-    /* 80314730 */ virtual ~J3DShapeMtxConcatView() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMCV'; }
-    /* 80313C54 */ virtual void load() const;
-    /* 80314598 */ virtual void loadNrmMtx(int, u16) const {}
-    /* 80313D28 */ virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
+    virtual ~J3DShapeMtxConcatView() {}
+    virtual u32 getType() const { return 'SMCV'; }
+    virtual void load() const;
+    virtual void loadNrmMtx(int, u16) const {}
+    virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
 
-    /* 80313828 */ void loadMtxConcatView_PNGP(int, u16) const;
-    /* 803138C8 */ void loadMtxConcatView_PCPU(int, u16) const;
-    /* 8031396C */ void loadMtxConcatView_NCPU(int, u16) const;
-    /* 80313A14 */ void loadMtxConcatView_PNCPU(int, u16) const;
-    /* 80313AC8 */ void loadMtxConcatView_PNGP_LOD(int, u16) const;
+    void loadMtxConcatView_PNGP(int, u16) const;
+    void loadMtxConcatView_PCPU(int, u16) const;
+    void loadMtxConcatView_NCPU(int, u16) const;
+    void loadMtxConcatView_PNCPU(int, u16) const;
+    void loadMtxConcatView_PNGP_LOD(int, u16) const;
 
     static J3DShapeMtxConcatView_LoadFunc sMtxLoadPipeline[4];
     static J3DShapeMtxConcatView_LoadFunc sMtxLoadLODPipeline[4];
@@ -93,9 +93,9 @@ public:
         : J3DShapeMtxConcatView(useMtxIndex)
     {}
 
-    /* 80314520 */ virtual ~J3DShapeMtxYBBoardConcatView() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMYB'; }
-    /* 803143E4 */ virtual void load() const;
+    virtual ~J3DShapeMtxYBBoardConcatView() {}
+    virtual u32 getType() const { return 'SMYB'; }
+    virtual void load() const;
 };
 
 /**
@@ -108,9 +108,9 @@ public:
         : J3DShapeMtxConcatView(useMtxIndex)
     {}
 
-    /* 803145A4 */ virtual ~J3DShapeMtxBBoardConcatView() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMBB'; }
-    /* 803142D4 */ virtual void load() const;
+    virtual ~J3DShapeMtxBBoardConcatView() {}
+    virtual u32 getType() const { return 'SMBB'; }
+    virtual void load() const;
 };
 
 /**
@@ -125,12 +125,12 @@ public:
         , mUseMtxIndexTable(useMtxIndexTable)
     {}
 
-    /* 803146B0 */ virtual ~J3DShapeMtxMulti() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMML'; }
-    /* 80273E08 */ virtual u16 getUseMtxNum() const { return mUseMtxNum; }
-    /* 8031459C */ virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
-    /* 80313E4C */ virtual void load() const;
-    /* 80313EEC */ virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
+    virtual ~J3DShapeMtxMulti() {}
+    virtual u32 getType() const { return 'SMML'; }
+    virtual u16 getUseMtxNum() const { return mUseMtxNum; }
+    virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
+    virtual void load() const;
+    virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]);
 
 private:
     /* 0x8 */ u16 mUseMtxNum;
@@ -149,13 +149,13 @@ public:
         , mUseMtxIndexTable(useMtxIndexTable)
     {}
 
-    /* 8031461C */ virtual ~J3DShapeMtxMultiConcatView() {}
-    /* 803147E0 */ virtual u32 getType() const { return 'SMMC'; }
-    /* 80273E08 */ virtual u16 getUseMtxNum() const { return mUseMtxNum; }
-    /* 8031459C */ virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
-    /* 80313FA4 */ virtual void load() const;
-    /* 803146AC */ virtual void loadNrmMtx(int, u16) const {}
-    /* 8031419C */ virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
+    virtual ~J3DShapeMtxMultiConcatView() {}
+    virtual u32 getType() const { return 'SMMC'; }
+    virtual u16 getUseMtxNum() const { return mUseMtxNum; }
+    virtual u16 getUseMtxIndex(u16 no) const { return mUseMtxIndexTable[no]; }
+    virtual void load() const;
+    virtual void loadNrmMtx(int, u16) const {}
+    virtual void loadNrmMtx(int, u16, f32 (*)[4]) const;
 
 private:
     /* 0x8 */ u16 mUseMtxNum;
diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h
index c8bff4d49f..152cb4d152 100644
--- a/include/JSystem/J3DGraphBase/J3DStruct.h
+++ b/include/JSystem/J3DGraphBase/J3DStruct.h
@@ -11,7 +11,7 @@
  */
 class J3DLightInfo {
 public:
-    /* 803256C4 */ J3DLightInfo& operator=(J3DLightInfo const&);
+    J3DLightInfo& operator=(J3DLightInfo const&);
 
     /* 0x00 */ Vec mLightPosition;
     /* 0x0C */ Vec mLightDirection;
@@ -28,8 +28,8 @@ extern "C" extern J3DLightInfo const j3dDefaultLightInfo;
  */
 class J3DLightObj {
 public:
-    /* 80018C0C */ J3DLightObj() { mInfo = j3dDefaultLightInfo; }
-    /* 80323590 */ void load(u32) const;
+    J3DLightObj() { mInfo = j3dDefaultLightInfo; }
+    void load(u32) const;
 
     J3DLightInfo& getLightInfo() { return mInfo; }
     J3DLightObj& operator=(J3DLightObj const& other) {
@@ -53,20 +53,20 @@ struct J3DTextureSRTInfo {
     /* 0x10 */ f32 mTranslationY;
 
     inline void operator=(J3DTextureSRTInfo const& other) {
+#ifdef __MWERKS__
         register const f32* src = &other.mScaleX;
         register f32* dst = &mScaleX;
         register f32 xy;
-#ifdef __MWERKS__
         asm {
             psq_l xy, 0(src), 0, 0
             psq_st xy, 0(dst), 0, 0
         };
-#endif
+
         // Unclear why there's a 4 byte copy here.
         *(u32*)&mRotation = *(u32*)&other.mRotation;
         src = &other.mTranslationX;
         dst = &mTranslationX;
-#ifdef __MWERKS__
+
         asm {
             psq_l xy, 0(src), 0, 0
             psq_st xy, 0(dst), 0, 0
@@ -95,8 +95,8 @@ enum J3DTexMtxMode {
  * 
  */
 struct J3DTexMtxInfo {
-    /* 80325718 */ J3DTexMtxInfo& operator=(J3DTexMtxInfo const&);
-    /* 80325794 */ void setEffectMtx(Mtx);
+    J3DTexMtxInfo& operator=(J3DTexMtxInfo const&);
+    void setEffectMtx(Mtx);
 
     /* 0x00 */ u8 mProjection;
     /* 0x01 */ u8 mInfo;
@@ -122,7 +122,7 @@ struct J3DIndTexMtxInfo {
  * 
  */
 struct J3DFogInfo {
-    /* 80325800 */ J3DFogInfo& operator=(J3DFogInfo const&);
+    J3DFogInfo& operator=(J3DFogInfo const&);
 
     /* 0x00 */ u8 mType;
     /* 0x01 */ u8 mAdjEnable;
@@ -140,7 +140,7 @@ struct J3DFogInfo {
  * 
  */
 struct J3DNBTScaleInfo {
-    /* 8032587C */ J3DNBTScaleInfo& operator=(J3DNBTScaleInfo const&);
+    J3DNBTScaleInfo& operator=(J3DNBTScaleInfo const&);
 
     /* 0x0 */ u8 mbHasScale;
     /* 0x4 */ Vec mScale;
diff --git a/include/JSystem/J3DGraphBase/J3DSys.h b/include/JSystem/J3DGraphBase/J3DSys.h
index 2de86ef75f..57e3613ea2 100644
--- a/include/JSystem/J3DGraphBase/J3DSys.h
+++ b/include/JSystem/J3DGraphBase/J3DSys.h
@@ -70,19 +70,19 @@ struct J3DSys {
     /* 0x114 */ GXColor* mVtxCol;
     /* 0x118 */ Vec* mNBTScale;
 
-    /* 8030FDE8 */ J3DSys();
-    /* 8030FEC0 */ void loadPosMtxIndx(int, u16) const;
-    /* 8030FEE4 */ void loadNrmMtxIndx(int, u16) const;
-    /* 8030FF0C */ void setTexCacheRegion(GXTexCacheSize);
-    /* 803100BC */ void drawInit();
-    /* 8031073C */ void reinitGX();
-    /* 8031079C */ void reinitGenMode();
-    /* 803107E8 */ void reinitLighting();
-    /* 80310894 */ void reinitTransform();
-    /* 80310998 */ void reinitTexture();
-    /* 80310A3C */ void reinitTevStages();
-    /* 80310D44 */ void reinitIndStages();
-    /* 80310E3C */ void reinitPixelProc();
+    J3DSys();
+    void loadPosMtxIndx(int, u16) const;
+    void loadNrmMtxIndx(int, u16) const;
+    void setTexCacheRegion(GXTexCacheSize);
+    void drawInit();
+    void reinitGX();
+    void reinitGenMode();
+    void reinitLighting();
+    void reinitTransform();
+    void reinitTexture();
+    void reinitTevStages();
+    void reinitIndStages();
+    void reinitPixelProc();
 
     enum J3DSysDrawMode {
         J3DSysDrawMode_OpaTexEdge = 3,
diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h
index e5c06c97c7..15c4b6ae10 100644
--- a/include/JSystem/J3DGraphBase/J3DTevs.h
+++ b/include/JSystem/J3DGraphBase/J3DTevs.h
@@ -65,7 +65,7 @@ extern J3DTevSwapModeInfo const j3dDefaultTevSwapMode;
  * 
  */
 struct J3DTevStage {
-    /* 8000E230 */ J3DTevStage() {
+    J3DTevStage() {
         setTevStageInfo(j3dDefaultTevStageInfo);
         setTevSwapModeInfo(j3dDefaultTevSwapMode);
     }
@@ -120,7 +120,7 @@ struct J3DTevStage {
         setTevAlphaOp(info.field_0xe, info.field_0xf, info.field_0x10, info.field_0x11, info.field_0x12);
     }
 
-    /* 8003AACC */ J3DTevStage(J3DTevStageInfo const& param_0) {
+    J3DTevStage(J3DTevStageInfo const& param_0) {
         setTevStageInfo(param_0);
         setTevSwapModeInfo(j3dDefaultTevSwapMode);
     }
@@ -197,7 +197,7 @@ extern J3DIndTevStageInfo const j3dDefaultIndTevStageInfo;
  * 
  */
 struct J3DIndTevStage {
-    /* 8000E14C */ J3DIndTevStage() : mInfo(0) { setIndTevStageInfo(j3dDefaultIndTevStageInfo); }
+    J3DIndTevStage() : mInfo(0) { setIndTevStageInfo(j3dDefaultIndTevStageInfo); }
     J3DIndTevStage(J3DIndTevStageInfo const& info) : mInfo(0) { setIndTevStageInfo(info); }
     void setIndTevStageInfo(J3DIndTevStageInfo const& info) {
         setIndStage(info.mIndStage);
@@ -259,7 +259,7 @@ extern const J3DTevOrderInfo j3dDefaultTevOrderInfoNull;
  * 
  */
 struct J3DTevOrder : public J3DTevOrderInfo {
-    /* 8000E140 */ J3DTevOrder() : J3DTevOrderInfo(j3dDefaultTevOrderInfoNull) {}
+    J3DTevOrder() : J3DTevOrderInfo(j3dDefaultTevOrderInfoNull) {}
     J3DTevOrder(const J3DTevOrderInfo& info) : J3DTevOrderInfo(info) {}
     J3DTevOrderInfo& getTevOrderInfo() { return *this; }
 
@@ -274,7 +274,7 @@ extern u8 const j3dDefaultTevSwapTableID;
  * 
  */
 struct J3DTevSwapModeTable {
-    /* 8000E134 */ J3DTevSwapModeTable() { mIdx = j3dDefaultTevSwapTableID; }
+    J3DTevSwapModeTable() { mIdx = j3dDefaultTevSwapTableID; }
     J3DTevSwapModeTable(J3DTevSwapModeTableInfo const& info) {
         mIdx = calcTevSwapTableID(info.field_0x0, info.field_0x1, info.field_0x2, info.field_0x3);
     }
diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h
index 66b6df3a40..63e4f8351e 100644
--- a/include/JSystem/J3DGraphBase/J3DTexture.h
+++ b/include/JSystem/J3DGraphBase/J3DTexture.h
@@ -19,10 +19,10 @@ private:
 public:
     J3DTexture(u16 num, ResTIMG* res) : mNum(num), unk_0x2(0), mpRes(res) {}
 
-    /* 8031204C */ void loadGX(u16, GXTexMapID) const;
-    /* 803121A4 */ void entryNum(u16);
-    /* 8031221C */ void addResTIMG(u16, ResTIMG const*);
-    /* 803366A4 */ virtual ~J3DTexture() {}
+    void loadGX(u16, GXTexMapID) const;
+    void entryNum(u16);
+    void addResTIMG(u16, ResTIMG const*);
+    virtual ~J3DTexture() {}
 
     u16 getNum() const { return mNum; }
 
@@ -54,12 +54,12 @@ public:
         mTexMtxInfo = info;
     }
 
-    /* 803238C4 */ void load(u32) const;
-    /* 80323900 */ void calc(const Mtx);
-    /* 80323920 */ void calcTexMtx(const Mtx);
-    /* 80323C0C */ void calcPostTexMtx(const Mtx);
-    /* 80324358 */ void loadTexMtx(u32) const;
-    /* 803243BC */ void loadPostTexMtx(u32) const;
+    void load(u32) const;
+    void calc(const Mtx);
+    void calcTexMtx(const Mtx);
+    void calcPostTexMtx(const Mtx);
+    void loadTexMtx(u32) const;
+    void loadPostTexMtx(u32) const;
 
     J3DTexMtxInfo& getTexMtxInfo() { return mTexMtxInfo; }
     Mtx& getMtx() { return mMtx; }
@@ -88,7 +88,7 @@ extern J3DTexCoordInfo const j3dDefaultTexCoordInfo[8];
  * 
  */
 struct J3DTexCoord : public J3DTexCoordInfo {
-    /* 8000E464 */ J3DTexCoord() {
+    J3DTexCoord() {
         setTexCoordInfo(j3dDefaultTexCoordInfo[0]);
         resetTexMtxReg();
     }
diff --git a/include/JSystem/J3DGraphBase/J3DTransform.h b/include/JSystem/J3DGraphBase/J3DTransform.h
index 5ae91a7bb7..7b54237676 100644
--- a/include/JSystem/J3DGraphBase/J3DTransform.h
+++ b/include/JSystem/J3DGraphBase/J3DTransform.h
@@ -65,12 +65,13 @@ void J3DMtxProjConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4]);
 void J3DPSMtxArrayConcat(f32 (*)[4], f32 (*)[4], f32 (*)[4], u32);
 
 inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
+#ifdef __MWERKS__
     register f32 fr4;
     register f32 fr3;
     register f32 fr2;
     register f32 fr1;
     register f32 fr0;
-#ifdef __MWERKS__
+
     asm {
         psq_l fr4, 0(src), 0, 0
         psq_l fr3, 8(src), 0, 0
@@ -87,13 +88,13 @@ inline void J3DPSMtx33Copy(register Mtx3P src, register Mtx3P dst) {
 }
 
 inline void J3DPSMtx33CopyFrom34(register MtxP src, register Mtx3P dst) {
+#ifdef __MWERKS__
     register f32 x_y1;
     register f32 z1;
     register f32 x_y2;
     register f32 z2;
     register f32 x_y3;
     register f32 z3;
-#ifdef __MWERKS__
     asm {
         psq_l x_y1, 0(src), 0, 0
         lfs z1, 8(src)
diff --git a/include/JSystem/J3DGraphBase/J3DVertex.h b/include/JSystem/J3DGraphBase/J3DVertex.h
index 38b969f730..0aab64cd8e 100644
--- a/include/JSystem/J3DGraphBase/J3DVertex.h
+++ b/include/JSystem/J3DGraphBase/J3DVertex.h
@@ -14,7 +14,7 @@ class J3DVertexBuffer;
  * 
  */
 struct J3DVtxColorCalc {
-    /* 8032E180 */ void calc(J3DModel*);
+    void calc(J3DModel*);
     virtual void calc(J3DVertexBuffer*);
 
     /* 0x0 */ void* vtable;  // inlined vtable?
@@ -77,15 +77,15 @@ class J3DVertexBuffer {
 public:
     J3DVertexBuffer() { init(); }
 
-    /* 80310F78 */ void setVertexData(J3DVertexData*);
-    /* 80310FD8 */ void init();
-    /* 80311030 */ ~J3DVertexBuffer();
-    /* 8031106C */ void setArray() const;
-    /* 80311090 */ s32 copyLocalVtxPosArray(u32);
-    /* 803111B0 */ s32 copyLocalVtxNrmArray(u32);
-    /* 803112D0 */ s32 copyLocalVtxArray(u32);
-    /* 80311478 */ s32 allocTransformedVtxPosArray();
-    /* 8031152C */ s32 allocTransformedVtxNrmArray();
+    void setVertexData(J3DVertexData*);
+    void init();
+    ~J3DVertexBuffer();
+    void setArray() const;
+    s32 copyLocalVtxPosArray(u32);
+    s32 copyLocalVtxNrmArray(u32);
+    s32 copyLocalVtxArray(u32);
+    s32 allocTransformedVtxPosArray();
+    s32 allocTransformedVtxNrmArray();
 
     void setCurrentVtxPos(void* pVtxPos) { mCurrentVtxPos = pVtxPos; }
     void* getCurrentVtxPos() { return mCurrentVtxPos; }