diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2023-10-28 15:53:28 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2023-10-28 15:53:28 -0400 |
| commit | f84a7bdadbee4e99b8ff63e0ab72b4966a7888de (patch) | |
| tree | 895cd687731e8e7a79db4a3b7571a134b0ac67b5 /include/JSystem/J3DGraphBase | |
| parent | 1537369adcf3b53775672ff998227e10b50b1829 (diff) | |
d_a_player_main work, playerInit match
Diffstat (limited to 'include/JSystem/J3DGraphBase')
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMatBlock.h | 2 | ||||
| -rw-r--r-- | include/JSystem/J3DGraphBase/J3DMaterial.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index e314681b..a0d23c16 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -541,7 +541,7 @@ inline u16 calcZModeID(u8 param_0, u8 param_1, u8 param_2) { return (param_1 * 2) + (param_0 * 0x10) + param_2; } -extern J3DZModeInfo j3dZModeTable[2]; +extern J3DZModeInfo j3dZModeTable[0x20]; struct J3DZMode { J3DZMode() { mZModeID = j3dDefaultZModeID; } diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 7ecda53c..fbfb7f73 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -65,6 +65,8 @@ public: J3DGXColor* getTevKColor(u32 param_0) { return mTevBlock->getTevKColor(param_0); } J3DGXColorS10* getTevColor(u32 param_0) { return mTevBlock->getTevColor(param_0); } J3DFog* getFog() { return mPEBlock->getFog(); } + J3DZMode* getZMode() { return mPEBlock->getZMode(); } + J3DBlend* getBlend() { return mPEBlock->getBlend(); } J3DTexMtx* getTexMtx(u32 idx) { return mTexGenBlock->getTexMtx(idx); } u16 getIndex() { return mIndex; } bool isDrawModeOpaTexEdge() { return (mMaterialMode & 3) == 0; } |