d_s_room / d_a_bg first pass

2 files changed, 12 insertions, 7 deletions

diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h
index 3dae56cd03..0ab504da98 100644
--- a/include/JSystem/J3DGraphBase/J3DMaterial.h
+++ b/include/JSystem/J3DGraphBase/J3DMaterial.h
@@ -63,6 +63,8 @@ public:
     u32 getTexNo(u32 idx) const { return mTevBlock->getTexNo(idx); }
 
     void setTevColor(u32 i, const J3DGXColorS10* i_color) { mTevBlock->setTevColor(i, i_color); }
+    void setTevKColor(u32 i, const J3DGXColor* i_color) { mTevBlock->setTevKColor(i, i_color); }
+    void setMaterialAnm(J3DMaterialAnm* i_anm) { mMaterialAnm = i_anm; }
 
 public:
     /* 0x04 */ J3DMaterial* mNext;
diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h
index 3d26ef2d6b..ab571a668f 100644
--- a/include/JSystem/J3DGraphBase/J3DShape.h
+++ b/include/JSystem/J3DGraphBase/J3DShape.h
@@ -97,16 +97,19 @@ public:
     void setScaleFlagArray(u8* pScaleFlagArray) { mScaleFlagArray = pScaleFlagArray; }
     void setDrawMtx(Mtx** pDrawMtx) { mDrawMtx = pDrawMtx; }
     void setNrmMtx(Mtx33** pNrmMtx) { mNrmMtx = pNrmMtx; }
+    void setTexMtxLoadType(u32 type) { mFlags = (mFlags & 0xFFFF0FFF) | type; }
     bool getNBTFlag() const { return mHasNBT; }
     u32 getBumpMtxOffset() const { return mBumpMtxOffset; }
 
-    inline J3DMaterial* getMaterial() const { return mMaterial; }
-    inline u32 getIndex() const { return mIndex; }
-    inline u32 getPipeline() const { return (mFlags >> 2) & 0x07; }
-    inline u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
-    inline u32 getMtxGroupNum() const { return mMtxGroupNum; }
-    inline J3DShapeDraw* getShapeDraw(u32 idx) const { return mShapeDraw[idx]; }
-    inline J3DShapeMtx* getShapeMtx(u32 idx) const { return mShapeMtx[idx]; }
+    J3DMaterial* getMaterial() const { return mMaterial; }
+    u32 getIndex() const { return mIndex; }
+    u32 getPipeline() const { return (mFlags >> 2) & 0x07; }
+    u32 getTexMtxLoadType() const { return mFlags & 0xF000; }
+    u32 getMtxGroupNum() const { return mMtxGroupNum; }
+    J3DShapeDraw* getShapeDraw(u32 idx) const { return mShapeDraw[idx]; }
+    J3DShapeMtx* getShapeMtx(u32 idx) const { return mShapeMtx[idx]; }
+    Vec* getMin() { return &mMin; }
+    Vec* getMax() { return &mMax; }
 
     static void resetVcdVatCache() { sOldVcdVatCmd = NULL; }