From 9cfb7d860bf805326252968897f108bb19330ce7 Mon Sep 17 00:00:00 2001
From: Jcw87 <Jcw87@users.noreply.github.com>
Date: Sun, 1 Oct 2023 21:23:33 -0700
Subject: [PATCH] J3DMaterial

---
 configure.py                               |   2 +-
 include/JSystem/J3DGraphBase/J3DMatBlock.h | 292 +++++++--------
 src/JSystem/J3DGraphBase/J3DMatBlock.cpp   | 405 ---------------------
 src/JSystem/J3DGraphBase/J3DMaterial.cpp   | 189 ----------
 4 files changed, 147 insertions(+), 741 deletions(-)

diff --git a/configure.py b/configure.py
index 501c873f1..b6e65b5f9 100644
--- a/configure.py
+++ b/configure.py
@@ -862,7 +862,7 @@ config.libs = [
             Object(Matching,    "JSystem/J3DGraphBase/J3DPacket.cpp"),
             Object(Matching,    "JSystem/J3DGraphBase/J3DShapeMtx.cpp"),
             Object(Matching,    "JSystem/J3DGraphBase/J3DShape.cpp"),
-            Object(NonMatching, "JSystem/J3DGraphBase/J3DMaterial.cpp"),
+            Object(Matching,    "JSystem/J3DGraphBase/J3DMaterial.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DMatBlock.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DTevs.cpp"),
             Object(Matching,    "JSystem/J3DGraphBase/J3DDrawBuffer.cpp"),
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h
index 3c5b35b34..d280dd37e 100644
--- a/include/JSystem/J3DGraphBase/J3DMatBlock.h
+++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h
@@ -39,27 +39,27 @@ struct J3DGXColor {
 
 class J3DTexGenBlock {
 public:
-    virtual void reset(J3DTexGenBlock*);
+    virtual void reset(J3DTexGenBlock*) {}
     virtual void calc(f32 const (*)[4]) = 0;
     virtual void load() = 0;
     virtual void patch() = 0;
     virtual void diff(u32) = 0;
     virtual void diffTexMtx() = 0;
     virtual void diffTexGen() = 0;
-    virtual s32 countDLSize();
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    virtual void setTexGenNum(u32 const*);
+    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 void setTexMtx(u32, J3DTexMtx*) {}
     virtual J3DTexMtx* getTexMtx(u32) { return NULL; }
-    virtual void setNBTScale(J3DNBTScale const*);
-    virtual void setNBTScale(J3DNBTScale);
-    virtual J3DNBTScale* getNBTScale();
-    virtual u32 getTexMtxOffset() const;
-    virtual void setTexMtxOffset(u32);
+    virtual void setNBTScale(J3DNBTScale const*) {}
+    virtual void setNBTScale(J3DNBTScale) {}
+    virtual J3DNBTScale* getNBTScale() { return NULL; }
+    virtual u32 getTexMtxOffset() const { return 0; }
+    virtual void setTexMtxOffset(u32) {}
     virtual ~J3DTexGenBlock() {}
 };
 
@@ -73,22 +73,22 @@ public:
     virtual void calcWithoutViewMtx(f32 const (*)[4]);
     virtual void calcPostTexMtx(f32 const (*)[4]);
     virtual void calcPostTexMtxWithoutViewMtx(f32 const (*)[4]);
-    virtual void load();
+    virtual void load() {}
     virtual void patch();
     virtual void diff(u32);
     virtual void diffTexMtx();
     virtual void diffTexGen();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual void setTexGenNum(u32 const*);
-    virtual void setTexGenNum(u32);
-    virtual u32 getTexGenNum() const;
-    virtual void setTexCoord(u32, J3DTexCoord const*);
-    virtual J3DTexCoord* getTexCoord(u32);
-    virtual void setTexMtx(u32, J3DTexMtx*);
-    virtual J3DTexMtx* getTexMtx(u32);
-    virtual u32 getTexMtxOffset() const;
-    virtual void setTexMtxOffset(u32);
+    virtual u32 getType() { return 'TGPT'; }
+    virtual void setTexGenNum(u32 const* pNum) { mTexGenNum = *pNum; }
+    virtual void setTexGenNum(u32 num) { mTexGenNum = num; }
+    virtual u32 getTexGenNum() const { return mTexGenNum; }
+    virtual void setTexCoord(u32 i, J3DTexCoord const* pCoord) { mTexCoord[i] = *pCoord; }
+    virtual J3DTexCoord* getTexCoord(u32 i) { return &mTexCoord[i]; }
+    virtual void setTexMtx(u32 i, J3DTexMtx* pMtx) { mTexMtx[i] = pMtx; }
+    virtual J3DTexMtx* getTexMtx(u32 i) { return mTexMtx[i]; }
+    virtual u32 getTexMtxOffset() const { return mTexMtxOffset; }
+    virtual void setTexMtxOffset(u32 offs) { mTexMtxOffset = offs; }
     virtual ~J3DTexGenBlockPatched() {}
 
 protected:
@@ -107,10 +107,10 @@ public:
     virtual void load();
     virtual void patch();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual void setNBTScale(J3DNBTScale const*);
-    virtual void setNBTScale(J3DNBTScale);
-    virtual J3DNBTScale* getNBTScale();
+    virtual u32 getType() { return 'TGBC'; }
+    virtual void setNBTScale(J3DNBTScale const* pScale) { mNBTScale = *pScale; }
+    virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
+    virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
     virtual ~J3DTexGenBlockBasic() {}
 
 private:
@@ -126,10 +126,10 @@ public:
     virtual void load();
     virtual void patch();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual void setNBTScale(J3DNBTScale const*);
-    virtual void setNBTScale(J3DNBTScale);
-    virtual J3DNBTScale* getNBTScale();
+    virtual u32 getType() { return 'TGB4'; }
+    virtual void setNBTScale(J3DNBTScale const* pScale) { mNBTScale = *pScale; }
+    virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; }
+    virtual J3DNBTScale* getNBTScale() { return &mNBTScale; }
     virtual ~J3DTexGenBlock4() {}
 
 private:
@@ -138,8 +138,8 @@ private:
 
 class J3DTevBlock {
 public:
-    virtual void reset(J3DTevBlock*) = 0;
-    virtual void load() = 0;
+    virtual void reset(J3DTevBlock*) {}
+    virtual void load() {}
     virtual void diff(u32);
     virtual void diffTexNo() {}
     virtual void diffTevReg() {}
@@ -153,7 +153,7 @@ public:
     virtual void ptrToIndex() = 0;
     virtual void indexToPtr() = 0;
     virtual u32 getType() = 0;
-    virtual s32 countDLSize();
+    virtual s32 countDLSize() { return 0; }
     virtual void setTexNo(u32, u16 const*) {}
     virtual void setTexNo(u32, u16) {}
     virtual u16 getTexNo(u32) const { return -1; }
@@ -631,33 +631,33 @@ struct J3DAlphaComp {
 
 class J3DPEBlock {
 public:
-    virtual void reset(J3DPEBlock*);
-    virtual void load();
+    virtual void reset(J3DPEBlock*) {}
+    virtual void load() = 0;
     virtual void patch() {}
-    virtual void diff(u32);
-    virtual void diffFog();
-    virtual void diffBlend();
-    virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual void setFog(J3DFog*);
+    virtual void diff(u32) {}
+    virtual void diffFog() {}
+    virtual void diffBlend() {}
+    virtual s32 countDLSize() { return 0; }
+    virtual u32 getType() = 0;
+    virtual void setFog(J3DFog*) {}
     virtual J3DFog* getFog() { return NULL; }
-    virtual void setAlphaComp(J3DAlphaComp const*);
-    virtual void setAlphaComp(J3DAlphaComp);
+    virtual void setAlphaComp(J3DAlphaComp const*) {}
+    virtual void setAlphaComp(J3DAlphaComp) {}
     virtual J3DAlphaComp* getAlphaComp() { return NULL; }
-    virtual void setBlend(J3DBlend const*);
-    virtual void setBlend(J3DBlend);
+    virtual void setBlend(J3DBlend const*) {}
+    virtual void setBlend(J3DBlend) {}
     virtual J3DBlend* getBlend() { return NULL; }
-    virtual void setZMode(J3DZMode const*);
-    virtual void setZMode(J3DZMode);
+    virtual void setZMode(J3DZMode const*) {}
+    virtual void setZMode(J3DZMode) {}
     virtual J3DZMode* getZMode() { return NULL; }
-    virtual void setZCompLoc(u8 const*);
-    virtual void setZCompLoc(u8);
+    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;
-    virtual u32 getFogOffset() const;
-    virtual void setFogOffset(u32);
+    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() {}
 };
 
@@ -665,24 +665,24 @@ class J3DPEBlockXlu : public J3DPEBlock {
 public:
     virtual void load();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual ~J3DPEBlockXlu();
+    virtual u32 getType() { return 'PEXL'; }
+    virtual ~J3DPEBlockXlu() {}
 };
 
 class J3DPEBlockTexEdge : public J3DPEBlock {
 public:
     virtual void load();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual ~J3DPEBlockTexEdge();
+    virtual u32 getType() { return 'PEED'; }
+    virtual ~J3DPEBlockTexEdge() {}
 };
 
 class J3DPEBlockOpa : public J3DPEBlock {
 public:
     virtual void load();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual ~J3DPEBlockOpa();
+    virtual u32 getType() { return 'PEOP'; }
+    virtual ~J3DPEBlockOpa() {}
 };
 
 class J3DPEBlockFull : public J3DPEBlock {
@@ -794,20 +794,20 @@ struct J3DIndTexOrder : public J3DIndTexOrderInfo {
 
 class J3DIndBlock {
 public:
-    virtual void reset(J3DIndBlock*);
+    virtual void reset(J3DIndBlock*) {}
     virtual void diff(u32) = 0;
     virtual void load() = 0;
-    virtual s32 countDLSize();
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
     virtual void setIndTexStageNum(u8) {}
     virtual u8 getIndTexStageNum() const { return 0; }
-    virtual void setIndTexOrder(u32, J3DIndTexOrder);
-    virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
+    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 const*) {}
     virtual void setIndTexMtx(u32, J3DIndTexMtx) {}
     virtual J3DIndTexMtx* getIndTexMtx(u32) { return NULL; }
-    virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*);
+    virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*) {}
     virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {}
     virtual J3DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; }
     virtual ~J3DIndBlock() {}
@@ -822,19 +822,19 @@ public:
     virtual void reset(J3DIndBlock*);
     virtual void load();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual void setIndTexStageNum(u8);
-    virtual u8 getIndTexStageNum() const;
-    virtual void setIndTexOrder(u32, J3DIndTexOrder);
-    virtual void setIndTexOrder(u32, J3DIndTexOrder const*);
-    virtual J3DIndTexOrder* getIndTexOrder(u32);
-    virtual void setIndTexMtx(u32, J3DIndTexMtx const*);
-    virtual void setIndTexMtx(u32, J3DIndTexMtx);
-    virtual J3DIndTexMtx* getIndTexMtx(u32);
-    virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*);
-    virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale);
-    virtual J3DIndTexCoordScale* getIndTexCoordScale(u32);
-    virtual ~J3DIndBlockFull();
+    virtual u32 getType() { return 'IBLF'; }
+    virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; }
+    virtual u8 getIndTexStageNum() const { return mIndTexStageNum; }
+    virtual void setIndTexOrder(u32 i, J3DIndTexOrder const* pOrder) { mIndTexOrder[i] = *pOrder; }
+    virtual void setIndTexOrder(u32 i, J3DIndTexOrder order) { mIndTexOrder[i] = order; }
+    virtual J3DIndTexOrder* getIndTexOrder(u32 i) { return &mIndTexOrder[i]; }
+    virtual void setIndTexMtx(u32 i, J3DIndTexMtx const* pMtx) { mIndTexMtx[i] = *pMtx; }
+    virtual void setIndTexMtx(u32 i, J3DIndTexMtx mtx) { mIndTexMtx[i] = mtx; }
+    virtual J3DIndTexMtx* getIndTexMtx(u32 i) { return &mIndTexMtx[i]; }
+    virtual void setIndTexCoordScale(u32 i, J3DIndTexCoordScale const* pScale) { mIndTexCoordScale[i] = *pScale; }
+    virtual void setIndTexCoordScale(u32 i, J3DIndTexCoordScale scale) { mIndTexCoordScale[i] = scale; }
+    virtual J3DIndTexCoordScale* getIndTexCoordScale(u32 i) { return &mIndTexCoordScale[i]; }
+    virtual ~J3DIndBlockFull() {}
 
 private:
     /* 0x04 */ u8 mIndTexStageNum;
@@ -845,11 +845,11 @@ private:
 
 class J3DIndBlockNull : public J3DIndBlock {
 public:
-    virtual void reset(J3DIndBlock*);
-    virtual void diff(u32);
-    virtual void load();
-    virtual u32 getType();
-    virtual ~J3DIndBlockNull();
+    virtual void diff(u32) {}
+    virtual void load() {}
+    virtual void reset(J3DIndBlock*) {}
+    virtual u32 getType() { return 'IBLN'; }
+    virtual ~J3DIndBlockNull() {}
 };
 
 inline u16 calcColorChanID(u16 param_0, u8 param_1, u8 param_2, u8 param_3, u8 param_4, u8 param_5) {
@@ -908,37 +908,37 @@ struct J3DColorChan {
 
 class J3DColorBlock {
 public:
-    virtual void load();
-    virtual void reset(J3DColorBlock*);
-    virtual void patch();
-    virtual void patchMatColor();
+    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 diffLight();
-    virtual s32 countDLSize();
+    virtual void diff(u32) {}
+    virtual void diffMatColor() {}
+    virtual void diffLight() {}
+    virtual s32 countDLSize() { return 0; }
     virtual u32 getType() = 0;
-    virtual void setMatColor(u32, J3DGXColor const*);
+    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 const*) {}
     virtual void setAmbColor(u32, J3DGXColor) {}
     virtual J3DGXColor* getAmbColor(u32) { return NULL; }
     virtual void setColorChanNum(u8) {}
-    virtual void setColorChanNum(u8 const*);
+    virtual void setColorChanNum(u8 const*) {}
     virtual u8 getColorChanNum() const { return 0; }
     virtual void setColorChan(u32, J3DColorChan const&) {}
-    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);
-    virtual void setCullMode(u8 const*);
-    virtual void setCullMode(u8);
-    virtual u8 getCullMode() const;
-    virtual u32 getMatColorOffset() const;
-    virtual u32 getColorChanOffset() const;
-    virtual void setMatColorOffset(u32);
-    virtual void setColorChanOffset(u32);
+    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() {}
 };
 
@@ -956,28 +956,28 @@ public:
     virtual void diffMatColor();
     virtual void diffLight();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual void setMatColor(u32, J3DGXColor const*);
-    virtual void setMatColor(u32, J3DGXColor);
-    virtual J3DGXColor* getMatColor(u32);
-    virtual void setAmbColor(u32, J3DGXColor const*);
-    virtual void setAmbColor(u32, J3DGXColor);
-    virtual J3DGXColor* getAmbColor(u32);
-    virtual void setColorChanNum(u8);
-    virtual void setColorChanNum(u8 const*);
-    virtual u8 getColorChanNum() const;
-    virtual void setColorChan(u32, J3DColorChan const&);
-    virtual void setColorChan(u32, J3DColorChan const*);
-    virtual J3DColorChan* getColorChan(u32);
-    virtual void setLight(u32, J3DLightObj*);
-    virtual J3DLightObj* getLight(u32);
-    virtual void setCullMode(u8 const*);
-    virtual void setCullMode(u8);
-    virtual u8 getCullMode() const;
-    virtual u32 getMatColorOffset() const;
-    virtual u32 getColorChanOffset() const;
-    virtual void setMatColorOffset(u32);
-    virtual void setColorChanOffset(u32);
+    virtual u32 getType() { return 'CLON'; }
+    virtual void setMatColor(u32 i, J3DGXColor const* pColor) { mMatColor[i] = *pColor; }
+    virtual void setMatColor(u32 i, J3DGXColor color) { mMatColor[i] = color; }
+    virtual J3DGXColor* getMatColor(u32 i) { return &mMatColor[i]; }
+    virtual void setAmbColor(u32 i, J3DGXColor const* pColor) { mAmbColor[i] = *pColor; }
+    virtual void setAmbColor(u32 i, J3DGXColor color) { mAmbColor[i] = color; }
+    virtual J3DGXColor* getAmbColor(u32 i) { return &mAmbColor[i]; }
+    virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
+    virtual void setColorChanNum(u8 const* pNum) { mColorChanNum = *pNum; }
+    virtual u8 getColorChanNum() const { return mColorChanNum; }
+    virtual void setColorChan(u32 i, J3DColorChan const& chan) { mColorChan[i] = chan; }
+    virtual void setColorChan(u32 i, J3DColorChan const* pChan) { mColorChan[i] = *pChan; }
+    virtual J3DColorChan* getColorChan(u32 i) { return &mColorChan[i]; }
+    virtual void setLight(u32 i, J3DLightObj* pLight) { mLight[i] = pLight; }
+    virtual J3DLightObj* getLight(u32 i) { return mLight[i]; }
+    virtual void setCullMode(u8 const* pMode) { mCullMode = *pMode; }
+    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 offs) { mMatColorOffset = offs; }
+    virtual void setColorChanOffset(u32 offs) { mColorChanOffset = offs; }
     virtual ~J3DColorBlockLightOn() {}
 
 private:
@@ -1005,23 +1005,23 @@ public:
     virtual void diffMatColor();
     virtual void diffLight();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual void setMatColor(u32, J3DGXColor const*);
-    virtual void setMatColor(u32, J3DGXColor);
-    virtual J3DGXColor* getMatColor(u32);
-    virtual void setColorChanNum(u8);
-    virtual void setColorChanNum(u8 const*);
-    virtual u8 getColorChanNum() const;
-    virtual void setColorChan(u32, J3DColorChan const&);
-    virtual void setColorChan(u32, J3DColorChan const*);
-    virtual J3DColorChan* getColorChan(u32);
-    virtual void setCullMode(u8 const*);
-    virtual void setCullMode(u8);
-    virtual u8 getCullMode() const;
-    virtual u32 getMatColorOffset() const;
-    virtual u32 getColorChanOffset() const;
-    virtual void setMatColorOffset(u32);
-    virtual void setColorChanOffset(u32);
+    virtual u32 getType() { return 'CLOF'; }
+    virtual void setMatColor(u32 i, J3DGXColor const* pColor) { mMatColor[i] = *pColor; }
+    virtual void setMatColor(u32 i, J3DGXColor color) { mMatColor[i] = color; }
+    virtual J3DGXColor* getMatColor(u32 i) { return &mMatColor[i]; }
+    virtual void setColorChanNum(u8 num) { mColorChanNum = num; }
+    virtual void setColorChanNum(u8 const* pNum) { mColorChanNum = *pNum;}
+    virtual u8 getColorChanNum() const { return mColorChanNum; }
+    virtual void setColorChan(u32 i, J3DColorChan const& chan) { mColorChan[i] = chan; }
+    virtual void setColorChan(u32 i, J3DColorChan const* pChan) { mColorChan[i] = *pChan; }
+    virtual J3DColorChan* getColorChan(u32 i) { return &mColorChan[i]; }
+    virtual void setCullMode(u8 const* pMode) { mCullMode = *pMode;}
+    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 offs) { mMatColorOffset = offs; }
+    virtual void setColorChanOffset(u32 offs) { mColorChanOffset = offs; }
     virtual ~J3DColorBlockLightOff() {}
 
 protected:
@@ -1043,10 +1043,10 @@ public:
     virtual void reset(J3DColorBlock*);
     virtual void load();
     virtual s32 countDLSize();
-    virtual u32 getType();
-    virtual void setAmbColor(u32, J3DGXColor const*);
-    virtual void setAmbColor(u32, J3DGXColor);
-    virtual J3DGXColor* getAmbColor(u32);
+    virtual u32 getType() { return 'CLAB'; }
+    virtual void setAmbColor(u32 i, J3DGXColor const* pColor) { mAmbColor[i] = *pColor; }
+    virtual void setAmbColor(u32 i, J3DGXColor color) { mAmbColor[i] = color; }
+    virtual J3DGXColor* getAmbColor(u32 i) { return &mAmbColor[i]; }
     virtual ~J3DColorBlockAmbientOn() {}
 
 protected:
diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
index 37dc4e892..d368a9d52 100644
--- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp
@@ -1868,408 +1868,3 @@ void J3DTexGenBlockPatched::calc(const Mtx modelMtx) {
         }
     }
 }
-
-// BEGIN WEAK FUNCTIONS
-
-/* 802EB2F8-802EB304       .text getType__19J3DTexGenBlockBasicFv */
-u32 J3DTexGenBlockBasic::getType() {
-    return 'TGBC';
-}
-
-/* 802EB304-802EB328       .text setNBTScale__19J3DTexGenBlockBasicF11J3DNBTScale */
-void J3DTexGenBlockBasic::setNBTScale(J3DNBTScale scale) {
-    mNBTScale = scale;
-}
-
-/* 802EB328-802EB34C       .text setNBTScale__19J3DTexGenBlockBasicFPC11J3DNBTScale */
-void J3DTexGenBlockBasic::setNBTScale(const J3DNBTScale* pScale) {
-    mNBTScale = *pScale;
-}
-
-/* 802EB34C-802EB354       .text getNBTScale__19J3DTexGenBlockBasicFv */
-J3DNBTScale * J3DTexGenBlockBasic::getNBTScale() {
-    return &mNBTScale;
-}
-
-/* 802EB3C0-802EB3C8       .text setTexGenNum__21J3DTexGenBlockPatchedFUl */
-void J3DTexGenBlockPatched::setTexGenNum(u32 num) {
-    mTexGenNum = num;
-}
-
-/* 802EB3C8-802EB3D4       .text setTexGenNum__21J3DTexGenBlockPatchedFPCUl */
-void J3DTexGenBlockPatched::setTexGenNum(const u32* pNum) {
-    mTexGenNum = *pNum;
-}
-
-/* 802EB3D4-802EB3DC       .text getTexGenNum__21J3DTexGenBlockPatchedCFv */
-u32 J3DTexGenBlockPatched::getTexGenNum() const {
-    return mTexGenNum;
-}
-
-/* 802EB3DC-802EB400       .text setTexCoord__21J3DTexGenBlockPatchedFUlPC11J3DTexCoord */
-void J3DTexGenBlockPatched::setTexCoord(u32 i, const J3DTexCoord* pCoord) {
-    mTexCoord[i] = *pCoord;
-}
-
-/* 802EB400-802EB414       .text getTexCoord__21J3DTexGenBlockPatchedFUl */
-J3DTexCoord * J3DTexGenBlockPatched::getTexCoord(u32 i) {
-    return &mTexCoord[i];
-}
-
-/* 802EB414-802EB424       .text setTexMtx__21J3DTexGenBlockPatchedFUlP9J3DTexMtx */
-void J3DTexGenBlockPatched::setTexMtx(u32 i, J3DTexMtx* pMtx) {
-    mTexMtx[i] = pMtx;
-}
-
-/* 802EB424-802EB434       .text getTexMtx__21J3DTexGenBlockPatchedFUl */
-J3DTexMtx * J3DTexGenBlockPatched::getTexMtx(u32 i) {
-    return mTexMtx[i];
-}
-
-/* 802EB434-802EB43C       .text getTexMtxOffset__21J3DTexGenBlockPatchedCFv */
-u32 J3DTexGenBlockPatched::getTexMtxOffset() const {
-    return mTexMtxOffset;
-}
-
-/* 802EB43C-802EB444       .text setTexMtxOffset__21J3DTexGenBlockPatchedFUl */
-void J3DTexGenBlockPatched::setTexMtxOffset(u32 offs) {
-    mTexMtxOffset = offs;
-}
-
-/* 802EB444-802EB450       .text getType__15J3DTexGenBlock4Fv */
-u32 J3DTexGenBlock4::getType() {
-    return 'TGB4';
-}
-
-/* 802EB450-802EB474       .text setNBTScale__15J3DTexGenBlock4F11J3DNBTScale */
-void J3DTexGenBlock4::setNBTScale(J3DNBTScale scale) {
-    mNBTScale = scale;
-}
-
-/* 802EB474-802EB498       .text setNBTScale__15J3DTexGenBlock4FPC11J3DNBTScale */
-void J3DTexGenBlock4::setNBTScale(const J3DNBTScale* pScale) {
-    mNBTScale = *pScale;
-}
-
-/* 802EB498-802EB4A0       .text getNBTScale__15J3DTexGenBlock4Fv */
-J3DNBTScale * J3DTexGenBlock4::getNBTScale() {
-    return &mNBTScale;
-}
-
-/* 802EB50C-802EB510       .text load__21J3DTexGenBlockPatchedFv */
-void J3DTexGenBlockPatched::load() {
-}
-
-/* 802EB510-802EB51C       .text getType__21J3DTexGenBlockPatchedFv */
-u32 J3DTexGenBlockPatched::getType() {
-    return 'TGPT';
-}
-
-/* 802EB51C-802EB528       .text getType__20J3DColorBlockLightOnFv */
-u32 J3DColorBlockLightOn::getType() {
-    return 'CLON';
-}
-
-/* 802EB528-802EB554       .text setMatColor__20J3DColorBlockLightOnFUl10J3DGXColor */
-void J3DColorBlockLightOn::setMatColor(u32 i, J3DGXColor color) {
-    mMatColor[i] = color;
-}
-
-/* 802EB554-802EB580       .text setMatColor__20J3DColorBlockLightOnFUlPC10J3DGXColor */
-void J3DColorBlockLightOn::setMatColor(u32 i, const J3DGXColor* pColor) {
-    mMatColor[i] = *pColor;
-}
-
-/* 802EB580-802EB594       .text getMatColor__20J3DColorBlockLightOnFUl */
-J3DGXColor * J3DColorBlockLightOn::getMatColor(u32 i) {
-    return &mMatColor[i];
-}
-
-/* 802EB594-802EB5C0       .text setAmbColor__20J3DColorBlockLightOnFUl10J3DGXColor */
-void J3DColorBlockLightOn::setAmbColor(u32 i, J3DGXColor color) {
-    mAmbColor[i] = color;
-}
-
-/* 802EB5C0-802EB5EC       .text setAmbColor__20J3DColorBlockLightOnFUlPC10J3DGXColor */
-void J3DColorBlockLightOn::setAmbColor(u32 i, const J3DGXColor* pColor) {
-    mAmbColor[i] = *pColor;
-}
-
-/* 802EB5EC-802EB600       .text getAmbColor__20J3DColorBlockLightOnFUl */
-J3DGXColor * J3DColorBlockLightOn::getAmbColor(u32 i) {
-    return &mAmbColor[i];
-}
-
-/* 802EB600-802EB60C       .text setColorChanNum__20J3DColorBlockLightOnFPCUc */
-void J3DColorBlockLightOn::setColorChanNum(const u8* pNum) {
-    mColorChanNum = *pNum;
-}
-
-/* 802EB60C-802EB614       .text setColorChanNum__20J3DColorBlockLightOnFUc */
-void J3DColorBlockLightOn::setColorChanNum(u8 num) {
-    mColorChanNum = num;
-}
-
-/* 802EB614-802EB61C       .text getColorChanNum__20J3DColorBlockLightOnCFv */
-u8 J3DColorBlockLightOn::getColorChanNum() const {
-    return mColorChanNum;
-}
-
-/* 802EB61C-802EB630       .text setColorChan__20J3DColorBlockLightOnFUlPC12J3DColorChan */
-void J3DColorBlockLightOn::setColorChan(u32 i, const J3DColorChan* pChan) {
-    mColorChan[i] = *pChan;
-}
-
-/* 802EB630-802EB644       .text setColorChan__20J3DColorBlockLightOnFUlRC12J3DColorChan */
-void J3DColorBlockLightOn::setColorChan(u32 i, const J3DColorChan& chan) {
-    mColorChan[i] = chan;
-}
-
-/* 802EB644-802EB658       .text getColorChan__20J3DColorBlockLightOnFUl */
-J3DColorChan * J3DColorBlockLightOn::getColorChan(u32 i) {
-    return &mColorChan[i];
-}
-
-/* 802EB658-802EB668       .text setLight__20J3DColorBlockLightOnFUlP11J3DLightObj */
-void J3DColorBlockLightOn::setLight(u32 i, J3DLightObj* pLight) {
-    mLight[i] = pLight;
-}
-
-/* 802EB668-802EB678       .text getLight__20J3DColorBlockLightOnFUl */
-J3DLightObj * J3DColorBlockLightOn::getLight(u32 i) {
-    return mLight[i];
-}
-
-/* 802EB678-802EB680       .text setCullMode__20J3DColorBlockLightOnFUc */
-void J3DColorBlockLightOn::setCullMode(u8 mode) {
-    mCullMode = mode;
-}
-
-/* 802EB680-802EB68C       .text setCullMode__20J3DColorBlockLightOnFPCUc */
-void J3DColorBlockLightOn::setCullMode(const u8* pMode) {
-    mCullMode = *pMode;
-}
-
-/* 802EB68C-802EB694       .text getCullMode__20J3DColorBlockLightOnCFv */
-u8 J3DColorBlockLightOn::getCullMode() const {
-    return mCullMode;
-}
-
-/* 802EB694-802EB69C       .text getMatColorOffset__20J3DColorBlockLightOnCFv */
-u32 J3DColorBlockLightOn::getMatColorOffset() const {
-    return mMatColorOffset;
-}
-
-/* 802EB69C-802EB6A4       .text getColorChanOffset__20J3DColorBlockLightOnCFv */
-u32 J3DColorBlockLightOn::getColorChanOffset() const {
-    return mColorChanOffset;
-}
-
-/* 802EB6A4-802EB6AC       .text setMatColorOffset__20J3DColorBlockLightOnFUl */
-void J3DColorBlockLightOn::setMatColorOffset(u32 offs) {
-    mMatColorOffset = offs;
-}
-
-/* 802EB6AC-802EB6B4       .text setColorChanOffset__20J3DColorBlockLightOnFUl */
-void J3DColorBlockLightOn::setColorChanOffset(u32 offs) {
-    mColorChanOffset = offs;
-}
-
-/* 802EB710-802EB71C       .text getType__22J3DColorBlockAmbientOnFv */
-u32 J3DColorBlockAmbientOn::getType() {
-    return 'CLAB';
-}
-
-/* 802EB71C-802EB748       .text setAmbColor__22J3DColorBlockAmbientOnFUl10J3DGXColor */
-void J3DColorBlockAmbientOn::setAmbColor(u32 i, J3DGXColor color) {
-    mAmbColor[i] = color;
-}
-
-/* 802EB748-802EB774       .text setAmbColor__22J3DColorBlockAmbientOnFUlPC10J3DGXColor */
-void J3DColorBlockAmbientOn::setAmbColor(u32 i, const J3DGXColor* color) {
-    mAmbColor[i] = *color;
-}
-
-/* 802EB774-802EB788       .text getAmbColor__22J3DColorBlockAmbientOnFUl */
-J3DGXColor * J3DColorBlockAmbientOn::getAmbColor(u32 i) {
-    return &mAmbColor[i];
-}
-
-/* 802EB7F4-802EB820       .text setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor */
-void J3DColorBlockLightOff::setMatColor(u32 i, J3DGXColor color) {
-    mMatColor[i] = color;
-}
-
-/* 802EB820-802EB84C       .text setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor */
-void J3DColorBlockLightOff::setMatColor(u32 i, const J3DGXColor* pColor) {
-    mMatColor[i] = *pColor;
-}
-
-/* 802EB84C-802EB860       .text getMatColor__21J3DColorBlockLightOffFUl */
-J3DGXColor * J3DColorBlockLightOff::getMatColor(u32 i) {
-    return &mMatColor[i];
-}
-
-/* 802EB860-802EB86C       .text setColorChanNum__21J3DColorBlockLightOffFPCUc */
-void J3DColorBlockLightOff::setColorChanNum(const u8* pNum) {
-    mColorChanNum = *pNum;
-}
-
-/* 802EB86C-802EB874       .text setColorChanNum__21J3DColorBlockLightOffFUc */
-void J3DColorBlockLightOff::setColorChanNum(u8 num) {
-    mColorChanNum = num;
-}
-
-/* 802EB874-802EB87C       .text getColorChanNum__21J3DColorBlockLightOffCFv */
-u8 J3DColorBlockLightOff::getColorChanNum() const {
-    return mColorChanNum;
-}
-
-/* 802EB87C-802EB890       .text setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan */
-void J3DColorBlockLightOff::setColorChan(u32 i, const J3DColorChan* pChan) {
-    mColorChan[i] = *pChan;
-}
-
-/* 802EB890-802EB8A4       .text setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan */
-void J3DColorBlockLightOff::setColorChan(u32 i, const J3DColorChan& chan) {
-    mColorChan[i] = chan;
-}
-
-/* 802EB8A4-802EB8B8       .text getColorChan__21J3DColorBlockLightOffFUl */
-J3DColorChan * J3DColorBlockLightOff::getColorChan(u32 i) {
-    return &mColorChan[i];
-}
-
-/* 802EB8B8-802EB8C0       .text setCullMode__21J3DColorBlockLightOffFUc */
-void J3DColorBlockLightOff::setCullMode(u8 mode) {
-    mCullMode = mode;
-}
-
-/* 802EB8C0-802EB8CC       .text setCullMode__21J3DColorBlockLightOffFPCUc */
-void J3DColorBlockLightOff::setCullMode(const u8* pMode) {
-    mCullMode = *pMode;
-}
-
-/* 802EB8CC-802EB8D4       .text getCullMode__21J3DColorBlockLightOffCFv */
-u8 J3DColorBlockLightOff::getCullMode() const {
-    return mCullMode;
-}
-
-/* 802EB8D4-802EB8DC       .text getMatColorOffset__21J3DColorBlockLightOffCFv */
-u32 J3DColorBlockLightOff::getMatColorOffset() const {
-    return mMatColorOffset;
-}
-
-/* 802EB8DC-802EB8E4       .text getColorChanOffset__21J3DColorBlockLightOffCFv */
-u32 J3DColorBlockLightOff::getColorChanOffset() const {
-    return mColorChanOffset;
-}
-
-/* 802EB8E4-802EB8EC       .text setMatColorOffset__21J3DColorBlockLightOffFUl */
-void J3DColorBlockLightOff::setMatColorOffset(u32 offs) {
-    mMatColorOffset = offs;
-}
-
-/* 802EB8EC-802EB8F4       .text setColorChanOffset__21J3DColorBlockLightOffFUl */
-void J3DColorBlockLightOff::setColorChanOffset(u32 offs) {
-    mColorChanOffset = offs;
-}
-
-/* 802EB8F4-802EB900       .text getType__13J3DPEBlockXluFv */
-u32 J3DPEBlockXlu::getType() {
-    return 'PEXL';
-}
-
-/* 802EB900-802EB95C       .text __dt__13J3DPEBlockXluFv */
-J3DPEBlockXlu::~J3DPEBlockXlu() {
-    /* Nonmatching */
-}
-
-/* 802EB95C-802EB968       .text getType__17J3DPEBlockTexEdgeFv */
-u32 J3DPEBlockTexEdge::getType() {
-    return 'PEED';
-}
-
-/* 802EB968-802EB9C4       .text __dt__17J3DPEBlockTexEdgeFv */
-J3DPEBlockTexEdge::~J3DPEBlockTexEdge() {
-    /* Nonmatching */
-}
-
-/* 802EB9C4-802EB9D0       .text getType__13J3DPEBlockOpaFv */
-u32 J3DPEBlockOpa::getType() {
-    return 'PEOP';
-}
-
-/* 802EB9D0-802EBA2C       .text __dt__13J3DPEBlockOpaFv */
-J3DPEBlockOpa::~J3DPEBlockOpa() {
-    /* Nonmatching */
-}
-
-/* 802EBA2C-802EBA38       .text getType__15J3DIndBlockFullFv */
-u32 J3DIndBlockFull::getType() {
-    return 'IBLF';
-}
-
-/* 802EBA38-802EBA40       .text setIndTexStageNum__15J3DIndBlockFullFUc */
-void J3DIndBlockFull::setIndTexStageNum(u8 num) {
-    mIndTexStageNum = num;
-}
-
-/* 802EBA40-802EBA48       .text getIndTexStageNum__15J3DIndBlockFullCFv */
-u8 J3DIndBlockFull::getIndTexStageNum() const {
-    return mIndTexStageNum;
-}
-
-/* 802EBA48-802EBA64       .text setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder */
-void J3DIndBlockFull::setIndTexOrder(u32 i, J3DIndTexOrder order) {
-    mIndTexOrder[i] = order;
-}
-
-/* 802EBA64-802EBA80       .text setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder */
-void J3DIndBlockFull::setIndTexOrder(u32 i, const J3DIndTexOrder* pOrder) {
-    mIndTexOrder[i] = *pOrder;
-}
-
-/* 802EBA80-802EBA94       .text getIndTexOrder__15J3DIndBlockFullFUl */
-J3DIndTexOrder * J3DIndBlockFull::getIndTexOrder(u32 i) {
-    return &mIndTexOrder[i];
-}
-
-/* 802EBA94-802EBAEC       .text setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx */
-void J3DIndBlockFull::setIndTexMtx(u32 i, J3DIndTexMtx mtx) {
-    mIndTexMtx[i] = mtx;
-}
-
-/* 802EBAEC-802EBB44       .text setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx */
-void J3DIndBlockFull::setIndTexMtx(u32 i, const J3DIndTexMtx* pMtx) {
-    mIndTexMtx[i] = *pMtx;
-}
-
-/* 802EBB44-802EBB58       .text getIndTexMtx__15J3DIndBlockFullFUl */
-J3DIndTexMtx * J3DIndBlockFull::getIndTexMtx(u32 i) {
-    return &mIndTexMtx[i];
-}
-
-/* 802EBB58-802EBB74       .text setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale */
-void J3DIndBlockFull::setIndTexCoordScale(u32 i, J3DIndTexCoordScale scale) {
-    mIndTexCoordScale[i] = scale;
-}
-
-/* 802EBB74-802EBB90       .text setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale */
-void J3DIndBlockFull::setIndTexCoordScale(u32 i, const J3DIndTexCoordScale* pScale) {
-    mIndTexCoordScale[i] = *pScale;
-}
-
-/* 802EBB90-802EBBA4       .text getIndTexCoordScale__15J3DIndBlockFullFUl */
-J3DIndTexCoordScale * J3DIndBlockFull::getIndTexCoordScale(u32 i) {
-    return &mIndTexCoordScale[i];
-}
-
-/* 802EBBA4-802EBC40       .text __dt__15J3DIndBlockFullFv */
-J3DIndBlockFull::~J3DIndBlockFull() {
-}
-
-/* 802EBC64-802EBC70       .text getType__21J3DColorBlockLightOffFv */
-u32 J3DColorBlockLightOff::getType() {
-    return 'CLOF';
-}
diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/src/JSystem/J3DGraphBase/J3DMaterial.cpp
index 21b8dff94..52c5bf692 100644
--- a/src/JSystem/J3DGraphBase/J3DMaterial.cpp
+++ b/src/JSystem/J3DGraphBase/J3DMaterial.cpp
@@ -430,192 +430,3 @@ void J3DLockedMaterial::reset() {}
 
 /* 802DF3FC-802DF400       .text change__17J3DLockedMaterialFv */
 void J3DLockedMaterial::change() {}
-
-/* 802DF400-802DF45C       .text __dt__21J3DColorBlockLightOffFv */
-//J3DColorBlockLightOff::~J3DColorBlockLightOff() {}
-
-/* 802DF45C-802DF4A4       .text __dt__13J3DColorBlockFv */
-//J3DColorBlock::~J3DColorBlock() {}
-
-/* 802DF4A4-802DF500       .text __dt__21J3DTexGenBlockPatchedFv */
-//J3DTexGenBlockPatched::~J3DTexGenBlockPatched() {}
-
-/* 802DF500-802DF548       .text __dt__14J3DTexGenBlockFv */
-//J3DTexGenBlock::~J3DTexGenBlock() {}
-
-/* 802DF548-802DF590       .text __dt__11J3DTevBlockFv */
-//J3DTevBlock::~J3DTevBlock() {}
-
-/* 802DF590-802DF5D8       .text __dt__11J3DIndBlockFv */
-//J3DIndBlock::~J3DIndBlock() {}
-
-/* 802DF5D8-802DF620       .text __dt__10J3DPEBlockFv */
-//J3DPEBlock::~J3DPEBlock() {}
-
-/* 802DF620-802DF628       .text countDLSize__14J3DTexGenBlockFv */
-s32 J3DTexGenBlock::countDLSize() { return 0; }
-
-/* 802DF628-802DF630       .text countDLSize__13J3DColorBlockFv */
-s32 J3DColorBlock::countDLSize() { return 0; }
-
-/* 802DF630-802DF638       .text countDLSize__11J3DTevBlockFv */
-s32 J3DTevBlock::countDLSize() { return 0; }
-
-/* 802DF638-802DF640       .text countDLSize__11J3DIndBlockFv */
-s32 J3DIndBlock::countDLSize() { return 0; }
-
-/* 802DF640-802DF648       .text countDLSize__10J3DPEBlockFv */
-s32 J3DPEBlock::countDLSize() { return 0; }
-
-/* 802DF648-802DF64C       .text load__13J3DColorBlockFv */
-void J3DColorBlock::load() {}
-
-/* 802DF64C-802DF654       .text getCullMode__13J3DColorBlockCFv */
-u8 J3DColorBlock::getCullMode() const { return 2; }
-
-/* 802DF654-802DF658       .text load__11J3DTevBlockFv */
-void J3DTevBlock::load() {}
-
-/* 802DF658-802DF660       .text getNBTScale__14J3DTexGenBlockFv */
-J3DNBTScale * J3DTexGenBlock::getNBTScale() { return NULL; }
-
-/* 802DF660-802DF664       .text patch__13J3DColorBlockFv */
-void J3DColorBlock::patch() {}
-
-/* 802DF664-802DF668       .text diff__13J3DColorBlockFUl */
-void J3DColorBlock::diff(u32) {}
-
-/* 802DF668-802DF66C       .text diff__10J3DPEBlockFUl */
-void J3DPEBlock::diff(u32) {}
-
-/* 802DF66C-802DF670       .text reset__10J3DPEBlockFP10J3DPEBlock */
-void J3DPEBlock::reset(J3DPEBlock*) {}
-
-/* 802DF670-802DF674       .text reset__11J3DIndBlockFP11J3DIndBlock */
-void J3DIndBlock::reset(J3DIndBlock*) {}
-
-/* 802DF674-802DF678       .text reset__11J3DTevBlockFP11J3DTevBlock */
-void J3DTevBlock::reset(J3DTevBlock*) {}
-
-/* 802DF678-802DF67C       .text reset__14J3DTexGenBlockFP14J3DTexGenBlock */
-void J3DTexGenBlock::reset(J3DTexGenBlock*) {}
-
-/* 802DF67C-802DF680       .text reset__13J3DColorBlockFP13J3DColorBlock */
-void J3DColorBlock::reset(J3DColorBlock*) {}
-
-/* 802DF680-802DF684       .text diffFog__10J3DPEBlockFv */
-void J3DPEBlock::diffFog() {}
-
-/* 802DF684-802DF688       .text diffBlend__10J3DPEBlockFv */
-void J3DPEBlock::diffBlend() {}
-
-/* 802DF688-802DF68C       .text setFog__10J3DPEBlockFP6J3DFog */
-void J3DPEBlock::setFog(J3DFog*) {}
-
-/* 802DF68C-802DF690       .text setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp */
-void J3DPEBlock::setAlphaComp(const J3DAlphaComp*) {}
-
-/* 802DF690-802DF694       .text setBlend__10J3DPEBlockFPC8J3DBlend */
-void J3DPEBlock::setBlend(const J3DBlend*) {}
-
-/* 802DF694-802DF698       .text setZMode__10J3DPEBlockFPC8J3DZMode */
-void J3DPEBlock::setZMode(const J3DZMode*) {}
-
-/* 802DF698-802DF69C       .text setZCompLoc__10J3DPEBlockFPCUc */
-void J3DPEBlock::setZCompLoc(const u8*) {}
-
-/* 802DF69C-802DF6A0       .text setDither__10J3DPEBlockFUc */
-void J3DPEBlock::setDither(u8) {}
-
-/* 802DF6A0-802DF6A4       .text setDither__10J3DPEBlockFPCUc */
-void J3DPEBlock::setDither(const u8*) {}
-
-/* 802DF6A4-802DF6AC       .text getDither__10J3DPEBlockCFv */
-u8 J3DPEBlock::getDither() const { return 0; }
-
-/* 802DF6AC-802DF6B4       .text getFogOffset__10J3DPEBlockCFv */
-u32 J3DPEBlock::getFogOffset() const { return 0; }
-
-/* 802DF6B4-802DF6B8       .text setFogOffset__10J3DPEBlockFUl */
-void J3DPEBlock::setFogOffset(u32) {}
-
-/* 802DF6B8-802DF6BC       .text diff__15J3DIndBlockNullFUl */
-void J3DIndBlockNull::diff(u32) {}
-
-/* 802DF6BC-802DF6C0       .text load__15J3DIndBlockNullFv */
-void J3DIndBlockNull::load() {}
-
-/* 802DF6C0-802DF6C4       .text reset__15J3DIndBlockNullFP11J3DIndBlock */
-void J3DIndBlockNull::reset(J3DIndBlock*) {}
-
-/* 802DF6C4-802DF6D0       .text getType__15J3DIndBlockNullFv */
-u32 J3DIndBlockNull::getType() { return 'IBLN'; }
-
-/* 802DF6D0-802DF72C       .text __dt__15J3DIndBlockNullFv */
-J3DIndBlockNull::~J3DIndBlockNull() {}
-
-/* 802DF72C-802DF730       .text setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder */
-void J3DIndBlock::setIndTexOrder(u32, const J3DIndTexOrder*) {}
-
-/* 802DF730-802DF734       .text setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder */
-void J3DIndBlock::setIndTexOrder(u32, J3DIndTexOrder) {}
-
-/* 802DF734-802DF738       .text setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx */
-void J3DIndBlock::setIndTexMtx(u32, const J3DIndTexMtx*) {}
-
-/* 802DF738-802DF73C       .text setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale */
-void J3DIndBlock::setIndTexCoordScale(u32, const J3DIndTexCoordScale*) {}
-
-/* 802DF73C-802DF740       .text setTexGenNum__14J3DTexGenBlockFPCUl */
-void J3DTexGenBlock::setTexGenNum(const u32*) {}
-
-/* 802DF740-802DF744       .text setNBTScale__14J3DTexGenBlockF11J3DNBTScale */
-void J3DTexGenBlock::setNBTScale(J3DNBTScale) {}
-
-/* 802DF744-802DF748       .text setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale */
-void J3DTexGenBlock::setNBTScale(const J3DNBTScale*) {}
-
-/* 802DF748-802DF750       .text getTexMtxOffset__14J3DTexGenBlockCFv */
-u32 J3DTexGenBlock::getTexMtxOffset() const { return 0; }
-
-/* 802DF750-802DF754       .text setTexMtxOffset__14J3DTexGenBlockFUl */
-void J3DTexGenBlock::setTexMtxOffset(u32) {}
-
-/* 802DF754-802DF758       .text patchMatColor__13J3DColorBlockFv */
-void J3DColorBlock::patchMatColor() {}
-
-/* 802DF758-802DF75C       .text diffMatColor__13J3DColorBlockFv */
-void J3DColorBlock::diffMatColor() {}
-
-/* 802DF75C-802DF760       .text diffLight__13J3DColorBlockFv */
-void J3DColorBlock::diffLight() {}
-
-/* 802DF760-802DF764       .text setMatColor__13J3DColorBlockFUlPC10J3DGXColor */
-void J3DColorBlock::setMatColor(u32, const J3DGXColor*) {}
-
-/* 802DF764-802DF768       .text setAmbColor__13J3DColorBlockFUlPC10J3DGXColor */
-void J3DColorBlock::setAmbColor(u32, const J3DGXColor*) {}
-
-/* 802DF768-802DF76C       .text setColorChanNum__13J3DColorBlockFPCUc */
-void J3DColorBlock::setColorChanNum(const u8*) {}
-
-/* 802DF76C-802DF770       .text setColorChan__13J3DColorBlockFUlPC12J3DColorChan */
-void J3DColorBlock::setColorChan(u32, const J3DColorChan*) {}
-
-/* 802DF770-802DF778       .text getLight__13J3DColorBlockFUl */
-J3DLightObj * J3DColorBlock::getLight(u32) { return NULL; }
-
-/* 802DF778-802DF77C       .text setCullMode__13J3DColorBlockFPCUc */
-void J3DColorBlock::setCullMode(const u8*) {}
-
-/* 802DF77C-802DF784       .text getMatColorOffset__13J3DColorBlockCFv */
-u32 J3DColorBlock::getMatColorOffset() const { return 0; }
-
-/* 802DF784-802DF78C       .text getColorChanOffset__13J3DColorBlockCFv */
-u32 J3DColorBlock::getColorChanOffset() const { return 0; }
-
-/* 802DF78C-802DF790       .text setMatColorOffset__13J3DColorBlockFUl */
-void J3DColorBlock::setMatColorOffset(u32) {}
-
-/* 802DF790-802DF794       .text setColorChanOffset__13J3DColorBlockFUl */
-void J3DColorBlock::setColorChanOffset(u32) {}