From 21cb60624a6cb0c518f85af7688bf618de252650 Mon Sep 17 00:00:00 2001 From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:46:27 -0400 Subject: [PATCH] J3DMatBlock, J3DMaterialFactory work (#2233) --- include/JSystem/J3DGraphBase/J3DMatBlock.h | 846 ++-- include/JSystem/J3DGraphBase/J3DMaterial.h | 1 + include/JSystem/J3DGraphBase/J3DShape.h | 4 +- include/JSystem/J3DGraphBase/J3DShapeMtx.h | 4 +- include/JSystem/J3DGraphBase/J3DTexture.h | 1 + .../J3DGraphLoader/J3DMaterialFactory.h | 4 +- .../J3DGraphLoader/J3DMaterialFactory_v21.h | 6 + src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 3487 +---------------- src/JSystem/J3DGraphBase/J3DMaterial.cpp | 800 +--- src/JSystem/J3DGraphBase/J3DShapeDraw.cpp | 13 +- src/JSystem/J3DGraphBase/J3DShapeMtx.cpp | 222 +- .../J3DGraphLoader/J3DMaterialFactory.cpp | 532 +-- .../J3DGraphLoader/J3DMaterialFactory_v21.cpp | 186 +- .../J3DGraphLoader/J3DModelLoaderCalcSize.cpp | 20 +- src/d/actor/d_a_alink_kandelaar.inc | 5 - src/d/d_kankyo.cpp | 12 - src/m_Do/m_Do_ext.cpp | 21 - 17 files changed, 891 insertions(+), 5273 deletions(-) diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index 9ab74248018..0a35d27caad 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -65,7 +65,7 @@ extern const J3DNBTScaleInfo j3dDefaultNBTScaleInfo; */ class J3DTexGenBlock { public: - /* 80317354 */ virtual void reset(J3DTexGenBlock*); + /* 80317354 */ 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; @@ -75,35 +75,35 @@ class J3DTexGenBlock { virtual void diff(u32) = 0; virtual void diffTexMtx() = 0; virtual void diffTexGen() = 0; - /* 803172FC */ virtual s32 countDLSize(); + /* 803172FC */ virtual s32 countDLSize() { return 0; } virtual u32 getType() = 0; - /* 8031741C */ virtual void setTexGenNum(u32 const*); + /* 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*); - /* 80317420 */ virtual void setNBTScale(J3DNBTScale); - /* 80317334 */ virtual J3DNBTScale* getNBTScale(); - /* 80317428 */ virtual bool getTexMtxOffset() const; - /* 80317430 */ virtual void setTexMtxOffset(u32); + /* 80317424 */ virtual void setNBTScale(J3DNBTScale const*) {} + /* 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() {} }; 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(); // {} + /* 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() {} }; /** @@ -122,23 +122,23 @@ class J3DTexGenBlockPatched : public J3DTexGenBlock { /* 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(); + /* 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(); - /* 80322D3C */ virtual void setTexGenNum(u32 const*); - /* 80322D34 */ virtual void setTexGenNum(u32); - /* 80322D48 */ virtual u32 getTexGenNum() const; - /* 80322D50 */ virtual void setTexCoord(u32, J3DTexCoord const*); - /* 80322D64 */ virtual J3DTexCoord* getTexCoord(u32); - /* 80322D78 */ virtual void setTexMtx(u32, J3DTexMtx*); - /* 80322D88 */ virtual J3DTexMtx* getTexMtx(u32); - /* 80322D98 */ virtual bool getTexMtxOffset() const; - /* 80322DA0 */ virtual void setTexMtxOffset(u32); - /* 80317180 */ virtual ~J3DTexGenBlockPatched(); + /* 80322E74 */ virtual u32 getType() { return 'TGPT'; } + /* 80322D3C */ virtual void setTexGenNum(u32 const* num) { 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) { mTexCoord[idx] = *coord; } + /* 80322D64 */ virtual J3DTexCoord* getTexCoord(u32 idx) { return & mTexCoord[idx]; } + /* 80322D78 */ virtual void setTexMtx(u32 idx, J3DTexMtx* mtx) { mTexMtx[idx] = mtx; } + /* 80322D88 */ virtual J3DTexMtx* getTexMtx(u32 idx) { return mTexMtx[idx]; } + /* 80322D98 */ virtual u32 getTexMtxOffset() const { return mTexMtxOffset; } + /* 80322DA0 */ virtual void setTexMtxOffset(u32 offset) { mTexMtxOffset = offset; } + /* 80317180 */ virtual ~J3DTexGenBlockPatched() {} /* 0x04 */ u32 mTexGenNum; /* 0x08 */ J3DTexCoord mTexCoord[8]; @@ -161,11 +161,11 @@ class J3DTexGenBlockBasic : public J3DTexGenBlockPatched { /* 8031A9E8 */ virtual void load(); /* 8031ABC0 */ virtual void patch(); /* 80317BAC */ virtual s32 countDLSize(); - /* 80322C6C */ virtual u32 getType(); - /* 80322C9C */ virtual void setNBTScale(J3DNBTScale const*); - /* 80322C78 */ virtual void setNBTScale(J3DNBTScale); - /* 80322CC0 */ virtual J3DNBTScale* getNBTScale(); - /* 80322CC8 */ virtual ~J3DTexGenBlockBasic(); + /* 80322C6C */ virtual u32 getType() { return 'TGBC'; } + /* 80322C9C */ virtual void setNBTScale(J3DNBTScale const* scale) { mNBTScale = *scale; } + /* 80322C78 */ virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; } + /* 80322CC0 */ virtual J3DNBTScale* getNBTScale() { return &mNBTScale; } + /* 80322CC8 */ virtual ~J3DTexGenBlockBasic() {} /* 0x5C */ J3DNBTScale mNBTScale; }; // Size: 0x6C @@ -185,11 +185,11 @@ class J3DTexGenBlock4 : public J3DTexGenBlockPatched { /* 8031A948 */ virtual void load(); /* 8031AB18 */ virtual void patch(); /* 80317BA4 */ virtual s32 countDLSize(); - /* 80322DA8 */ virtual u32 getType(); - /* 80322DD8 */ virtual void setNBTScale(J3DNBTScale const*); - /* 80322DB4 */ virtual void setNBTScale(J3DNBTScale); - /* 80322DFC */ virtual J3DNBTScale* getNBTScale(); - /* 80322E04 */ virtual ~J3DTexGenBlock4(); + /* 80322DA8 */ virtual u32 getType() { return 'TGB4'; } + /* 80322DD8 */ virtual void setNBTScale(J3DNBTScale const* scale) { mNBTScale = *scale; } + /* 80322DB4 */ virtual void setNBTScale(J3DNBTScale scale) { mNBTScale = scale; } + /* 80322DFC */ virtual J3DNBTScale* getNBTScale() { return &mNBTScale; } + /* 80322E04 */ virtual ~J3DTexGenBlock4() {} /* 0x5C */ J3DNBTScale mNBTScale; }; // Size: 0x6C @@ -200,58 +200,58 @@ class J3DTexGenBlock4 : public J3DTexGenBlockPatched { */ class J3DTevBlock { public: - /* 80317350 */ virtual void reset(J3DTevBlock*); - /* 80317330 */ virtual void load(); + /* 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(); + /* 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 ptrToIndex() = 0; virtual void indexToPtr() = 0; virtual u32 getType() = 0; - /* 8031730C */ virtual s32 countDLSize(); - /* 80323544 */ virtual void setTexNo(u32, u16 const*); + /* 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*); + /* 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*); + /* 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*); + /* 80322950 */ virtual void setTevKColorSel(u32, u8 const*) {} /* 8000E0B8 */ virtual void setTevKColorSel(u32, u8) {} - /* 8000DFB0 */ virtual bool getTevKColorSel(u32) { return false; } - /* 80322954 */ virtual void setTevKAlphaSel(u32, u8 const*); + /* 8000DFB0 */ virtual u8 getTevKColorSel(u32) { return false; } + /* 80322954 */ virtual void setTevKAlphaSel(u32, u8 const*) {} /* 8000E0B4 */ virtual void setTevKAlphaSel(u32, u8) {} - /* 8000DFA8 */ virtual bool getTevKAlphaSel(u32) { return false; } - /* 8032354C */ virtual void setTevStageNum(u8 const*); + /* 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*); + /* 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*); + /* 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*); + /* 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; - /* 80322964 */ virtual bool getTevRegOffset() const; - /* 80321FE0 */ virtual void setTexNoOffset(u32); - /* 8032296C */ virtual void setTevRegOffset(u32); + /* 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() {} protected: @@ -268,11 +268,11 @@ 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(); // {} + /* 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() {} }; /** @@ -287,7 +287,7 @@ class J3DTevBlockPatched : public J3DTevBlock { /* 803176E0 */ void initialize(); /* 80320418 */ virtual void reset(J3DTevBlock*); - /* 80322970 */ virtual void load(); + /* 80322970 */ virtual void load() {} /* 8031CE00 */ virtual void diffTexNo(); /* 8031D028 */ virtual void diffTevReg(); /* 8031D0C4 */ virtual void diffTexCoordScale(); @@ -298,37 +298,37 @@ class J3DTevBlockPatched : public J3DTevBlock { /* 8031BFE0 */ virtual void patchTevReg(); /* 8031C0AC */ virtual void patchTexNoAndTexCoordScale(); /* 8031DFB4 */ virtual void ptrToIndex(); - /* 80322974 */ virtual void indexToPtr(); - /* 80322998 */ virtual u32 getType(); + /* 80322974 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); } + /* 80322998 */ virtual u32 getType() { return 'TVPT'; } /* 80317BB4 */ virtual s32 countDLSize(); - /* 803229D0 */ virtual void setTexNo(u32, u16 const*); - /* 803229C0 */ virtual void setTexNo(u32, u16); - /* 803229E4 */ virtual u16 getTexNo(u32) const; - /* 80322A08 */ virtual void setTevOrder(u32, J3DTevOrder const*); - /* 803229F4 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80322A1C */ virtual J3DTevOrder* getTevOrder(u32); - /* 80322B24 */ virtual void setTevColor(u32, J3DGXColorS10 const*); - /* 80322AF8 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 80322B50 */ virtual J3DGXColorS10* getTevColor(u32); - /* 80322B90 */ virtual void setTevKColor(u32, J3DGXColor const*); - /* 80322B64 */ virtual void setTevKColor(u32, J3DGXColor); - /* 80322BBC */ virtual J3DGXColor* getTevKColor(u32); - /* 80322BDC */ virtual void setTevKColorSel(u32, u8 const*); - /* 80322BD0 */ virtual void setTevKColorSel(u32, u8); - /* 80322BEC */ virtual bool getTevKColorSel(u32); - /* 803229AC */ virtual void setTevStageNum(u8 const*); - /* 803229A4 */ virtual void setTevStageNum(u8); - /* 803229B8 */ virtual u8 getTevStageNum() const; - /* 80322A6C */ virtual void setTevStage(u32, J3DTevStage const*); - /* 80322A30 */ virtual void setTevStage(u32, J3DTevStage); - /* 80322AA8 */ virtual J3DTevStage* getTevStage(u32); - /* 80322AD0 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); - /* 80322ABC */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 80322AE4 */ virtual J3DIndTevStage* getIndTevStage(u32); - /* 80322BF8 */ virtual u32 getTexNoOffset() const; - /* 80322C00 */ virtual bool getTevRegOffset() const; - /* 80322C08 */ virtual void setTevRegOffset(u32); - /* 80322C10 */ virtual ~J3DTevBlockPatched(); + /* 803229D0 */ virtual void setTexNo(u32 idx, u16 const* texNo) { mTexNo[idx] = *texNo; } + /* 803229C0 */ virtual void setTexNo(u32 idx, u16 texNo) { mTexNo[idx] = texNo; } + /* 803229E4 */ virtual u16 getTexNo(u32 idx) const { return mTexNo[idx]; } + /* 80322A08 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { mTevOrder[idx] = *order; } + /* 803229F4 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) { mTevOrder[idx] = order; } + /* 80322A1C */ virtual J3DTevOrder* getTevOrder(u32 idx) { return &mTevOrder[idx]; } + /* 80322B24 */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) { mTevColor[idx] = *color; } + /* 80322AF8 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) { mTevColor[idx] = color; } + /* 80322B50 */ virtual J3DGXColorS10* getTevColor(u32 idx) { return &mTevColor[idx]; } + /* 80322B90 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) { mTevKColor[idx] = *color; } + /* 80322B64 */ virtual void setTevKColor(u32 idx, J3DGXColor color) { mTevKColor[idx] = color; } + /* 80322BBC */ virtual J3DGXColor* getTevKColor(u32 idx) { return &mTevKColor[idx]; } + /* 80322BDC */ virtual void setTevKColorSel(u32 idx, u8 const* sel) { mTevKColorSel[idx] = *sel; } + /* 80322BD0 */ virtual void setTevKColorSel(u32 idx, u8 sel) { mTevKColorSel[idx] = sel; } + /* 80322BEC */ virtual u8 getTevKColorSel(u32 idx) { return mTevKColorSel[idx]; } + /* 803229AC */ virtual void setTevStageNum(u8 const* num) { mTevStageNum = *num; } + /* 803229A4 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; } + /* 803229B8 */ virtual u8 getTevStageNum() const { return mTevStageNum; } + /* 80322A6C */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) { mTevStage[idx] = *stage; } + /* 80322A30 */ virtual void setTevStage(u32 idx, J3DTevStage stage) { mTevStage[idx] = stage; } + /* 80322AA8 */ virtual J3DTevStage* getTevStage(u32 idx) { return &mTevStage[idx]; } + /* 80322AD0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { mIndTevStage[idx] = *stage; } + /* 80322ABC */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { mIndTevStage[idx] = stage; } + /* 80322AE4 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) { return &mIndTevStage[idx]; } + /* 80322BF8 */ virtual u32 getTexNoOffset() const { return mTexNoOffset; } + /* 80322C00 */ virtual u32 getTevRegOffset() const { return mTevRegOffset; } + /* 80322C08 */ virtual void setTevRegOffset(u32 offset) { mTevRegOffset = offset; } + /* 80322C10 */ virtual ~J3DTevBlockPatched() {} /* 0x08 */ u16 mTexNo[8]; /* 0x18 */ J3DTevOrder mTevOrder[8]; @@ -363,46 +363,46 @@ class J3DTevBlock4 : public J3DTevBlock { /* 8031C6F4 */ virtual void patchTexNo(); /* 8031C788 */ virtual void patchTevReg(); /* 8031C854 */ virtual void patchTexNoAndTexCoordScale(); - /* 80321FE8 */ virtual void ptrToIndex(); - /* 80321FEC */ virtual void indexToPtr(); - /* 80322010 */ virtual u32 getType(); + /* 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, u16 const*); - /* 8032201C */ virtual void setTexNo(u32, u16); - /* 80322040 */ virtual u16 getTexNo(u32) const; - /* 80322064 */ virtual void setTevOrder(u32, J3DTevOrder const*); - /* 80322050 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80322078 */ virtual J3DTevOrder* getTevOrder(u32); - /* 803220B8 */ virtual void setTevColor(u32, J3DGXColorS10 const*); - /* 8032208C */ virtual void setTevColor(u32, J3DGXColorS10); - /* 803220E4 */ virtual J3DGXColorS10* getTevColor(u32); - /* 80322124 */ virtual void setTevKColor(u32, J3DGXColor const*); - /* 803220F8 */ virtual void setTevKColor(u32, J3DGXColor); - /* 80322150 */ virtual J3DGXColor* getTevKColor(u32); - /* 80322170 */ virtual void setTevKColorSel(u32, u8 const*); - /* 80322164 */ virtual void setTevKColorSel(u32, u8); - /* 80322180 */ virtual bool getTevKColorSel(u32); - /* 80322198 */ virtual void setTevKAlphaSel(u32, u8 const*); - /* 8032218C */ virtual void setTevKAlphaSel(u32, u8); - /* 803221A8 */ virtual bool getTevKAlphaSel(u32); - /* 803221BC */ virtual void setTevStageNum(u8 const*); - /* 803221B4 */ virtual void setTevStageNum(u8); - /* 803221C8 */ virtual u8 getTevStageNum() const; - /* 8032220C */ virtual void setTevStage(u32, J3DTevStage const*); - /* 803221D0 */ virtual void setTevStage(u32, J3DTevStage); - /* 80322248 */ virtual J3DTevStage* getTevStage(u32); - /* 80322294 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); - /* 8032225C */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); - /* 803222DC */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); - /* 803222CC */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 803222EC */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32); - /* 80322310 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); - /* 803222FC */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 80322324 */ virtual J3DIndTevStage* getIndTevStage(u32); - /* 80322338 */ virtual u32 getTexNoOffset() const; - /* 80322340 */ virtual bool getTevRegOffset() const; - /* 80322348 */ virtual void setTevRegOffset(u32); - /* 80322350 */ virtual ~J3DTevBlock4(); + /* 8032202C */ virtual void setTexNo(u32 idx, u16 const* texNo) { mTexNo[idx] = *texNo; } + /* 8032201C */ virtual void setTexNo(u32 idx, u16 texNo) { mTexNo[idx] = texNo; } + /* 80322040 */ virtual u16 getTexNo(u32 idx) const { return mTexNo[idx]; } + /* 80322064 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { mTevOrder[idx] = *order; } + /* 80322050 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) { mTevOrder[idx] = order; } + /* 80322078 */ virtual J3DTevOrder* getTevOrder(u32 idx) { return &mTevOrder[idx]; } + /* 803220B8 */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) { mTevColor[idx] = *color; } + /* 8032208C */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) { mTevColor[idx] = color; } + /* 803220E4 */ virtual J3DGXColorS10* getTevColor(u32 idx) { return &mTevColor[idx]; } + /* 80322124 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) { mTevKColor[idx] = *color; } + /* 803220F8 */ virtual void setTevKColor(u32 idx, J3DGXColor color) { mTevKColor[idx] = color; } + /* 80322150 */ virtual J3DGXColor* getTevKColor(u32 idx) { return &mTevKColor[idx]; } + /* 80322170 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) { mTevKColorSel[idx] = *sel; } + /* 80322164 */ virtual void setTevKColorSel(u32 idx, u8 sel) { mTevKColorSel[idx] = sel; } + /* 80322180 */ virtual u8 getTevKColorSel(u32 idx) { return mTevKColorSel[idx]; } + /* 80322198 */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) { mTevKAlphaSel[idx] = *sel; } + /* 8032218C */ virtual void setTevKAlphaSel(u32 idx, u8 sel) { mTevKAlphaSel[idx] = sel; } + /* 803221A8 */ virtual u8 getTevKAlphaSel(u32 idx) { return mTevKAlphaSel[idx]; } + /* 803221BC */ virtual void setTevStageNum(u8 const* num) { 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) { mTevStage[idx] = *stage; } + /* 803221D0 */ virtual void setTevStage(u32 idx, J3DTevStage stage) { mTevStage[idx] = stage; } + /* 80322248 */ virtual J3DTevStage* getTevStage(u32 idx) { return &mTevStage[idx]; } + /* 80322294 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) { mTevStage[idx].setTevSwapModeInfo(*info); } + /* 8032225C */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) { mTevStage[idx].setTevSwapModeInfo(info); } + /* 803222DC */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) { mTevSwapModeTable[idx] = *table; } + /* 803222CC */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) { mTevSwapModeTable[idx] = table; } + /* 803222EC */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) { return &mTevSwapModeTable[idx]; } + /* 80322310 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { mIndTevStage[idx] = *stage; } + /* 803222FC */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { mIndTevStage[idx] = stage; } + /* 80322324 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) { 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() {} /* 0x08 */ u16 mTexNo[4]; /* 0x10 */ J3DTevOrder mTevOrder[4]; @@ -439,46 +439,46 @@ class J3DTevBlock2 : public J3DTevBlock { /* 8031C3F8 */ virtual void patchTexNo(); /* 8031C48C */ virtual void patchTevReg(); /* 8031C558 */ virtual void patchTexNoAndTexCoordScale(); - /* 803223AC */ virtual void ptrToIndex(); - /* 803223B0 */ virtual void indexToPtr(); - /* 803223D4 */ virtual u32 getType(); + /* 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, u16 const*); - /* 803223E0 */ virtual void setTexNo(u32, u16); - /* 80322404 */ virtual u16 getTexNo(u32) const; - /* 80322428 */ virtual void setTevOrder(u32, J3DTevOrder const*); - /* 80322414 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 8032243C */ virtual J3DTevOrder* getTevOrder(u32); - /* 8032247C */ virtual void setTevColor(u32, J3DGXColorS10 const*); - /* 80322450 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 803224A8 */ virtual J3DGXColorS10* getTevColor(u32); - /* 803224E8 */ virtual void setTevKColor(u32, J3DGXColor const*); - /* 803224BC */ virtual void setTevKColor(u32, J3DGXColor); - /* 80322514 */ virtual J3DGXColor* getTevKColor(u32); - /* 80322534 */ virtual void setTevKColorSel(u32, u8 const*); - /* 80322528 */ virtual void setTevKColorSel(u32, u8); - /* 80322544 */ virtual bool getTevKColorSel(u32); - /* 8032255C */ virtual void setTevKAlphaSel(u32, u8 const*); - /* 80322550 */ virtual void setTevKAlphaSel(u32, u8); - /* 8032256C */ virtual bool getTevKAlphaSel(u32); - /* 80322580 */ virtual void setTevStageNum(u8 const*); - /* 80322578 */ virtual void setTevStageNum(u8); - /* 8032258C */ virtual u8 getTevStageNum() const; - /* 803225D0 */ virtual void setTevStage(u32, J3DTevStage const*); - /* 80322594 */ virtual void setTevStage(u32, J3DTevStage); - /* 8032260C */ virtual J3DTevStage* getTevStage(u32); - /* 80322658 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); - /* 80322620 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); - /* 803226A0 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); - /* 80322690 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 803226B0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32); - /* 803226D4 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); - /* 803226C0 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 803226E8 */ virtual J3DIndTevStage* getIndTevStage(u32); - /* 803226FC */ virtual u32 getTexNoOffset() const; - /* 80322704 */ virtual bool getTevRegOffset() const; - /* 8032270C */ virtual void setTevRegOffset(u32); - /* 80322714 */ virtual ~J3DTevBlock2(); + /* 803223F0 */ virtual void setTexNo(u32 idx, u16 const* texNo) { mTexNo[idx] = *texNo; } + /* 803223E0 */ virtual void setTexNo(u32 idx, u16 texNo) { mTexNo[idx] = texNo; } + /* 80322404 */ virtual u16 getTexNo(u32 idx) const { return mTexNo[idx]; } + /* 80322428 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { mTevOrder[idx] = *order; } + /* 80322414 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) { mTevOrder[idx] = order; } + /* 8032243C */ virtual J3DTevOrder* getTevOrder(u32 idx) { return &mTevOrder[idx]; } + /* 8032247C */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) { mTevColor[idx] = *color; } + /* 80322450 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) { mTevColor[idx] = color; } + /* 803224A8 */ virtual J3DGXColorS10* getTevColor(u32 idx) { return &mTevColor[idx]; } + /* 803224E8 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) { mTevKColor[idx] = *color; } + /* 803224BC */ virtual void setTevKColor(u32 idx, J3DGXColor color) { mTevKColor[idx] = color; } + /* 80322514 */ virtual J3DGXColor* getTevKColor(u32 idx) { return &mTevKColor[idx]; } + /* 80322534 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) { mTevKColorSel[idx] = *sel; } + /* 80322528 */ virtual void setTevKColorSel(u32 idx, u8 sel) { mTevKColorSel[idx] = sel; } + /* 80322544 */ virtual u8 getTevKColorSel(u32 idx) { return mTevKColorSel[idx]; } + /* 8032255C */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) { mTevKAlphaSel[idx] = *sel; } + /* 80322550 */ virtual void setTevKAlphaSel(u32 idx, u8 sel) { mTevKAlphaSel[idx] = sel; } + /* 8032256C */ virtual u8 getTevKAlphaSel(u32 idx) { return mTevKAlphaSel[idx]; } + /* 80322580 */ virtual void setTevStageNum(u8 const* num) { 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) { mTevStage[idx] = *stage; } + /* 80322594 */ virtual void setTevStage(u32 idx, J3DTevStage stage) { mTevStage[idx] = stage; } + /* 8032260C */ virtual J3DTevStage* getTevStage(u32 idx) { return &mTevStage[idx]; } + /* 80322658 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) { mTevStage[idx].setTevSwapModeInfo(*info); } + /* 80322620 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) { mTevStage[idx].setTevSwapModeInfo(info); } + /* 803226A0 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) { mTevSwapModeTable[idx] = *table; } + /* 80322690 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) { mTevSwapModeTable[idx] = table; } + /* 803226B0 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) { return &mTevSwapModeTable[idx]; } + /* 803226D4 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { mIndTevStage[idx] = *stage; } + /* 803226C0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { mIndTevStage[idx] = stage; } + /* 803226E8 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) { 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() {} /* 0x08 */ u16 mTexNo[2]; /* 0x0C */ J3DTevOrder mTevOrder[2]; @@ -516,45 +516,45 @@ class J3DTevBlock16 : public J3DTevBlock { /* 8031CAB0 */ virtual void patchTevReg(); /* 8031CB7C */ virtual void patchTexNoAndTexCoordScale(); /* 8031DED0 */ virtual void ptrToIndex(); - /* 80321C20 */ virtual void indexToPtr(); - /* 80321C44 */ virtual u32 getType(); + /* 80321C20 */ virtual void indexToPtr() { indexToPtr_private(mTexNoOffset); } + /* 80321C44 */ virtual u32 getType() { return 'TV16'; } /* 80317BD4 */ virtual s32 countDLSize(); - /* 80321C60 */ virtual void setTexNo(u32, u16 const*); - /* 80321C50 */ virtual void setTexNo(u32, u16); - /* 80321C74 */ virtual u16 getTexNo(u32) const; - /* 80321C98 */ virtual void setTevOrder(u32, J3DTevOrder const*); - /* 80321C84 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80321CAC */ virtual J3DTevOrder* getTevOrder(u32); - /* 80321CEC */ virtual void setTevColor(u32, J3DGXColorS10 const*); - /* 80321CC0 */ virtual void setTevColor(u32, J3DGXColorS10); - /* 80321D18 */ virtual J3DGXColorS10* getTevColor(u32); - /* 80321D58 */ virtual void setTevKColor(u32, J3DGXColor const*); - /* 80321D2C */ virtual void setTevKColor(u32, J3DGXColor); - /* 80321D84 */ virtual J3DGXColor* getTevKColor(u32); - /* 80321DA4 */ virtual void setTevKColorSel(u32, u8 const*); - /* 80321D98 */ virtual void setTevKColorSel(u32, u8); - /* 80321DB4 */ virtual bool getTevKColorSel(u32); - /* 80321DCC */ virtual void setTevKAlphaSel(u32, u8 const*); - /* 80321DC0 */ virtual void setTevKAlphaSel(u32, u8); - /* 80321DDC */ virtual bool getTevKAlphaSel(u32); - /* 80321DE8 */ virtual void setTevStageNum(u8); - /* 80321DF0 */ virtual void setTevStageNum(u8 const*); - /* 80321DFC */ virtual u8 getTevStageNum() const; - /* 80321E40 */ virtual void setTevStage(u32, J3DTevStage const*); - /* 80321E04 */ virtual void setTevStage(u32, J3DTevStage); - /* 80321E7C */ virtual J3DTevStage* getTevStage(u32); - /* 80321EC8 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); - /* 80321E90 */ virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); - /* 80321F10 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); - /* 80321F00 */ virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - /* 80321F20 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32); - /* 80321F44 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); - /* 80321F30 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 80321F58 */ virtual J3DIndTevStage* getIndTevStage(u32); - /* 80321F6C */ virtual u32 getTexNoOffset() const; - /* 80321F74 */ virtual bool getTevRegOffset() const; - /* 80321F7C */ virtual void setTevRegOffset(u32); - /* 80321F84 */ virtual ~J3DTevBlock16(); + /* 80321C60 */ virtual void setTexNo(u32 idx, u16 const* texNo) { mTexNo[idx] = *texNo; } + /* 80321C50 */ virtual void setTexNo(u32 idx, u16 texNo) { mTexNo[idx] = texNo; } + /* 80321C74 */ virtual u16 getTexNo(u32 idx) const { return mTexNo[idx]; } + /* 80321C98 */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { mTevOrder[idx] = *order; } + /* 80321C84 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) { mTevOrder[idx] = order; } + /* 80321CAC */ virtual J3DTevOrder* getTevOrder(u32 idx) { return &mTevOrder[idx]; } + /* 80321CEC */ virtual void setTevColor(u32 idx, J3DGXColorS10 const* color) { mTevColor[idx] = *color; } + /* 80321CC0 */ virtual void setTevColor(u32 idx, J3DGXColorS10 color) { mTevColor[idx] = color; } + /* 80321D18 */ virtual J3DGXColorS10* getTevColor(u32 idx) { return &mTevColor[idx]; } + /* 80321D58 */ virtual void setTevKColor(u32 idx, J3DGXColor const* color) { mTevKColor[idx] = *color; } + /* 80321D2C */ virtual void setTevKColor(u32 idx, J3DGXColor color) { mTevKColor[idx] = color; } + /* 80321D84 */ virtual J3DGXColor* getTevKColor(u32 idx) { return &mTevKColor[idx]; } + /* 80321DA4 */ virtual void setTevKColorSel(u32 idx, u8 const* sel) { mTevKColorSel[idx] = *sel; } + /* 80321D98 */ virtual void setTevKColorSel(u32 idx, u8 sel) { mTevKColorSel[idx] = sel; } + /* 80321DB4 */ virtual u8 getTevKColorSel(u32 idx) { return mTevKColorSel[idx]; } + /* 80321DCC */ virtual void setTevKAlphaSel(u32 idx, u8 const* sel) { mTevKAlphaSel[idx] = *sel; } + /* 80321DC0 */ virtual void setTevKAlphaSel(u32 idx, u8 sel) { mTevKAlphaSel[idx] = sel; } + /* 80321DDC */ virtual u8 getTevKAlphaSel(u32 idx) { return mTevKAlphaSel[idx]; } + /* 80321DE8 */ virtual void setTevStageNum(u8 num) { mTevStageNum = num; } + /* 80321DF0 */ virtual void setTevStageNum(u8 const* num) { mTevStageNum = *num; } + /* 80321DFC */ virtual u8 getTevStageNum() const { return mTevStageNum; } + /* 80321E40 */ virtual void setTevStage(u32 idx, J3DTevStage const* stage) { mTevStage[idx] = *stage; } + /* 80321E04 */ virtual void setTevStage(u32 idx, J3DTevStage stage) { mTevStage[idx] = stage; } + /* 80321E7C */ virtual J3DTevStage* getTevStage(u32 idx) { return &mTevStage[idx]; } + /* 80321EC8 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo const* info) { mTevStage[idx].setTevSwapModeInfo(*info); } + /* 80321E90 */ virtual void setTevSwapModeInfo(u32 idx, J3DTevSwapModeInfo info) { mTevStage[idx].setTevSwapModeInfo(info); } + /* 80321F10 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable const* table) { mTevSwapModeTable[idx] = *table; } + /* 80321F00 */ virtual void setTevSwapModeTable(u32 idx, J3DTevSwapModeTable table) { mTevSwapModeTable[idx] = table; } + /* 80321F20 */ virtual J3DTevSwapModeTable* getTevSwapModeTable(u32 idx) { return &mTevSwapModeTable[idx]; } + /* 80321F44 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { mIndTevStage[idx] = *stage; } + /* 80321F30 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { mIndTevStage[idx] = stage; } + /* 80321F58 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) { 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() {} /* 0x008 */ u16 mTexNo[8]; /* 0x018 */ J3DTevOrder mTevOrder[16]; @@ -591,27 +591,27 @@ class J3DTevBlock1 : public J3DTevBlock { /* 8031C274 */ virtual void patchTexNo(); /* 8031C2E4 */ virtual void patchTevReg(); /* 8031C2E8 */ virtual void patchTexNoAndTexCoordScale(); - /* 80322770 */ virtual void ptrToIndex(); - /* 80322774 */ virtual void indexToPtr(); - /* 80322798 */ virtual u32 getType(); + /* 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, u16 const*); - /* 803227A4 */ virtual void setTexNo(u32, u16); - /* 803227C8 */ virtual u16 getTexNo(u32) const; - /* 803227EC */ virtual void setTevOrder(u32, J3DTevOrder const*); - /* 803227D8 */ virtual void setTevOrder(u32, J3DTevOrder); - /* 80322800 */ virtual J3DTevOrder* getTevOrder(u32); - /* 80322818 */ virtual void setTevStageNum(u8 const*); - /* 80322814 */ virtual void setTevStageNum(u8); - /* 8032281C */ virtual u8 getTevStageNum() const; - /* 80322860 */ virtual void setTevStage(u32, J3DTevStage const*); - /* 80322824 */ virtual void setTevStage(u32, J3DTevStage); - /* 8032289C */ virtual J3DTevStage* getTevStage(u32); - /* 803228C4 */ virtual void setIndTevStage(u32, J3DIndTevStage const*); - /* 803228B0 */ virtual void setIndTevStage(u32, J3DIndTevStage); - /* 803228D8 */ virtual J3DIndTevStage* getIndTevStage(u32); - /* 803228EC */ virtual u32 getTexNoOffset() const; - /* 803228F4 */ virtual ~J3DTevBlock1(); + /* 803227B4 */ virtual void setTexNo(u32 idx, u16 const* no) { mTexNo[idx] = *no; } + /* 803227A4 */ virtual void setTexNo(u32 idx, u16 no) { mTexNo[idx] = no; } + /* 803227C8 */ virtual u16 getTexNo(u32 idx) const { return mTexNo[idx]; } + /* 803227EC */ virtual void setTevOrder(u32 idx, J3DTevOrder const* order) { mTevOrder[idx] = *order; } + /* 803227D8 */ virtual void setTevOrder(u32 idx, J3DTevOrder order) { mTevOrder[idx] = order; } + /* 80322800 */ virtual J3DTevOrder* getTevOrder(u32 idx) { 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) { mTevStage[idx] = *stage; } + /* 80322824 */ virtual void setTevStage(u32 idx, J3DTevStage stage) { mTevStage[idx] = stage; } + /* 8032289C */ virtual J3DTevStage* getTevStage(u32 idx) { return &mTevStage[idx]; } + /* 803228C4 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage const* stage) { mIndTevStage[idx] = *stage; } + /* 803228B0 */ virtual void setIndTevStage(u32 idx, J3DIndTevStage stage) { mIndTevStage[idx] = stage; } + /* 803228D8 */ virtual J3DIndTevStage* getIndTevStage(u32 idx) { return &mIndTevStage[idx]; } + /* 803228EC */ virtual u32 getTexNoOffset() const { return mTexNoOffset; } + /* 803228F4 */ virtual ~J3DTevBlock1() {} /* 0x08 */ u16 mTexNo[1]; /* 0x0A */ J3DTevOrder mTevOrder[1]; @@ -799,35 +799,35 @@ struct J3DAlphaComp { */ class J3DPEBlock { public: - /* 80317348 */ virtual void reset(J3DPEBlock*); + /* 80317348 */ 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(); - virtual s32 countDLSize(); + /* 8000DBCC */ virtual void patch() {} + /* 80317344 */ virtual void diff(u32) {} + /* 8031735C */ virtual void diffFog() {} + /* 80317360 */ virtual void diffBlend() {} + /* 8031731C */ virtual s32 countDLSize() { return 0; } virtual u32 getType() = 0; - /* 80317368 */ virtual void setFog(J3DFog); - /* 80317364 */ virtual void setFog(J3DFog*); + /* 80317368 */ virtual void setFog(J3DFog) {} + /* 80317364 */ virtual void setFog(J3DFog*) {} /* 8000DF5C */ virtual J3DFog* getFog() { return NULL; } - /* 8031736C */ virtual void setAlphaComp(J3DAlphaComp const*); + /* 8031736C */ virtual void setAlphaComp(J3DAlphaComp const*) {} /* 8000E01C */ virtual void setAlphaComp(J3DAlphaComp const&) {} /* 8000DF54 */ virtual J3DAlphaComp* getAlphaComp() { return NULL; } - /* 80317370 */ virtual void setBlend(J3DBlend const*); + /* 80317370 */ virtual void setBlend(J3DBlend const*) {} /* 8000E018 */ virtual void setBlend(J3DBlend const&) {} /* 8000DF4C */ virtual J3DBlend* getBlend() { return NULL; } - /* 80317374 */ virtual void setZMode(J3DZMode const*); + /* 80317374 */ virtual void setZMode(J3DZMode const*) {} /* 8000E014 */ virtual void setZMode(J3DZMode) {} /* 8000DF44 */ virtual J3DZMode* getZMode() { return NULL; } - /* 80317378 */ virtual void setZCompLoc(u8 const*); + /* 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; - /* 8031738C */ virtual u32 getFogOffset() const; - /* 80317394 */ virtual void setFogOffset(u32); - virtual ~J3DPEBlock() {} + /* 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() {} }; /** @@ -835,9 +835,9 @@ class J3DPEBlock { * */ struct J3DPEBlockNull : public J3DPEBlock { - /* 803329A0 */ virtual void load(); // {} - /* 803329A4 */ virtual u32 getType(); // { return 'PENL'; } - /* 803329B0 */ virtual ~J3DPEBlockNull(); // {} + /* 803329A0 */ virtual void load() {} + /* 803329A4 */ virtual u32 getType() { return 'PENL'; } + /* 803329B0 */ virtual ~J3DPEBlockNull() {} }; /** @@ -848,8 +848,8 @@ class J3DPEBlockXlu : public J3DPEBlock { public: /* 8031E98C */ virtual void load(); /* 80317BF4 */ virtual s32 countDLSize(); - /* 80323258 */ virtual u32 getType(); - /* 80323264 */ virtual ~J3DPEBlockXlu(); + /* 80323258 */ virtual u32 getType() { return 'PEXL'; } + /* 80323264 */ virtual ~J3DPEBlockXlu() {} }; /** @@ -860,8 +860,8 @@ class J3DPEBlockTexEdge : public J3DPEBlock { public: /* 8031E6C8 */ virtual void load(); /* 80317BEC */ virtual s32 countDLSize(); - /* 803232C0 */ virtual u32 getType(); - /* 803232CC */ virtual ~J3DPEBlockTexEdge(); + /* 803232C0 */ virtual u32 getType() { return 'PEED'; } + /* 803232CC */ virtual ~J3DPEBlockTexEdge() {} }; /** @@ -872,8 +872,8 @@ class J3DPEBlockOpa : public J3DPEBlock { public: /* 8031E408 */ virtual void load(); /* 80317BE4 */ virtual s32 countDLSize(); - /* 80323328 */ virtual u32 getType(); - /* 80323334 */ virtual ~J3DPEBlockOpa(); + /* 80323328 */ virtual u32 getType() { return 'PEOP'; } + /* 80323334 */ virtual ~J3DPEBlockOpa() {} }; /** @@ -894,28 +894,28 @@ class J3DPEBlockFull : public J3DPEBlock { /* 8031F940 */ virtual void diffFog(); /* 8031F9B8 */ virtual void diffBlend(); /* 80317C04 */ virtual s32 countDLSize(); - /* 8032194C */ virtual u32 getType(); - /* 8032197C */ virtual void setFog(J3DFog); - /* 80321958 */ virtual void setFog(J3DFog*); - /* 803219A0 */ virtual J3DFog* getFog(); - /* 803219C4 */ virtual void setAlphaComp(J3DAlphaComp const*); - /* 803219A8 */ virtual void setAlphaComp(J3DAlphaComp const&); - /* 803219E0 */ virtual J3DAlphaComp* getAlphaComp(); - /* 803219F4 */ virtual void setBlend(J3DBlend const*); - /* 803219E8 */ virtual void setBlend(J3DBlend const&); - /* 80321A00 */ virtual J3DBlend* getBlend(); - /* 80321A14 */ virtual void setZMode(J3DZMode const*); - /* 80321A08 */ virtual void setZMode(J3DZMode); - /* 80321A20 */ virtual J3DZMode* getZMode(); - /* 80321A30 */ virtual void setZCompLoc(u8 const*); - /* 80321A28 */ virtual void setZCompLoc(u8); - /* 80321A3C */ virtual u8 getZCompLoc() const; - /* 80321A4C */ virtual void setDither(u8 const*); - /* 80321A44 */ virtual void setDither(u8); - /* 80321A58 */ virtual u8 getDither() const; - /* 80321A60 */ virtual u32 getFogOffset() const; - /* 80321A68 */ virtual void setFogOffset(u32); - /* 80321A70 */ virtual ~J3DPEBlockFull(); + /* 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) { mAlphaComp = *alphaComp; } + /* 803219A8 */ virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; } + /* 803219E0 */ virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; } + /* 803219F4 */ virtual void setBlend(J3DBlend const* blend) { mBlend = *blend; } + /* 803219E8 */ virtual void setBlend(J3DBlend const& blend) { mBlend = blend; } + /* 80321A00 */ virtual J3DBlend* getBlend() { return &mBlend; } + /* 80321A14 */ virtual void setZMode(J3DZMode const* zMode) { mZMode = *zMode; } + /* 80321A08 */ virtual void setZMode(J3DZMode zMode) { mZMode = zMode; } + /* 80321A20 */ virtual J3DZMode* getZMode() { return &mZMode; } + /* 80321A30 */ virtual void setZCompLoc(u8 const* zCompLoc) { mZCompLoc = *zCompLoc; } + /* 80321A28 */ virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; } + /* 80321A3C */ virtual u8 getZCompLoc() const { return mZCompLoc; } + /* 80321A4C */ virtual void setDither(u8 const* dither) { 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() {} /* 0x04 */ J3DFog mFog; /* 0x30 */ J3DAlphaComp mAlphaComp; @@ -939,26 +939,26 @@ class J3DPEBlockFogOff : public J3DPEBlock { /* 803211B4 */ virtual void reset(J3DPEBlock*); /* 8031EC50 */ virtual void load(); - /* 80321ACC */ virtual void diff(u32); + /* 80321ACC */ virtual void diff(u32 param_0) { if (param_0 & 0x20000000) diffBlend(); }; /* 8031F0D8 */ virtual void diffBlend(); /* 80317BFC */ virtual s32 countDLSize(); - /* 80321B00 */ virtual u32 getType(); - /* 80321B28 */ virtual void setAlphaComp(J3DAlphaComp const*); - /* 80321B0C */ virtual void setAlphaComp(J3DAlphaComp const&); - /* 80321B44 */ virtual J3DAlphaComp* getAlphaComp(); - /* 80321B58 */ virtual void setBlend(J3DBlend const*); - /* 80321B4C */ virtual void setBlend(J3DBlend const&); - /* 80321B64 */ virtual J3DBlend* getBlend(); - /* 80321B78 */ virtual void setZMode(J3DZMode const*); - /* 80321B6C */ virtual void setZMode(J3DZMode); - /* 80321B84 */ virtual J3DZMode* getZMode(); - /* 80321B94 */ virtual void setZCompLoc(u8 const*); - /* 80321B8C */ virtual void setZCompLoc(u8); - /* 80321BA0 */ virtual u8 getZCompLoc() const; - /* 80321BB0 */ virtual void setDither(u8 const*); - /* 80321BA8 */ virtual void setDither(u8); - /* 80321BBC */ virtual u8 getDither() const; - /* 80321BC4 */ virtual ~J3DPEBlockFogOff(); + /* 80321B00 */ virtual u32 getType() { return 'PEFG'; } + /* 80321B28 */ virtual void setAlphaComp(J3DAlphaComp const* alphaComp) { mAlphaComp = *alphaComp; } + /* 80321B0C */ virtual void setAlphaComp(J3DAlphaComp const& alphaComp) { mAlphaComp = alphaComp; } + /* 80321B44 */ virtual J3DAlphaComp* getAlphaComp() { return &mAlphaComp; } + /* 80321B58 */ virtual void setBlend(J3DBlend const* blend) { mBlend = *blend; } + /* 80321B4C */ virtual void setBlend(J3DBlend const& blend) { mBlend = blend; } + /* 80321B64 */ virtual J3DBlend* getBlend() { return &mBlend; } + /* 80321B78 */ virtual void setZMode(J3DZMode const* zMode) { mZMode = *zMode; } + /* 80321B6C */ virtual void setZMode(J3DZMode zMode) { mZMode = zMode; } + /* 80321B84 */ virtual J3DZMode* getZMode() { return &mZMode; } + /* 80321B94 */ virtual void setZCompLoc(u8 const* zCompLoc) { mZCompLoc = *zCompLoc; } + /* 80321B8C */ virtual void setZCompLoc(u8 zCompLoc) { mZCompLoc = zCompLoc; } + /* 80321BA0 */ virtual u8 getZCompLoc() const { return mZCompLoc; } + /* 80321BB0 */ virtual void setDither(u8 const* dither) { mDither = *dither; } + /* 80321BA8 */ virtual void setDither(u8 dither) { mDither = dither; } + /* 80321BBC */ virtual u8 getDither() const { return mDither; } + /* 80321BC4 */ virtual ~J3DPEBlockFogOff() {} /* 0x04 */ J3DAlphaComp mAlphaComp; /* 0x08 */ J3DBlend mBlend; @@ -1049,21 +1049,21 @@ struct J3DIndTexOrder : public J3DIndTexOrderInfo { */ class J3DIndBlock { public: - /* 8031734C */ virtual void reset(J3DIndBlock*); + /* 8031734C */ virtual void reset(J3DIndBlock*) {} virtual void diff(u32) = 0; virtual void load() = 0; - /* 80317314 */ virtual s32 countDLSize(); + /* 80317314 */ 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*); + /* 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*); + /* 80317414 */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*) {} /* 8000E060 */ virtual void setIndTexMtx(u32, J3DIndTexMtx) {} /* 8000DF6C */ virtual J3DIndTexMtx* getIndTexMtx(u32) { return NULL; } /* 8000E020 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale) {} - /* 80317418 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*); + /* 80317418 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*) {} /* 8000DF64 */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32) { return NULL; } /* 8031726C */ virtual ~J3DIndBlock() {} }; @@ -1074,11 +1074,11 @@ class J3DIndBlock { */ class J3DIndBlockNull : public J3DIndBlock { public: - /* 803173A0 */ virtual void reset(J3DIndBlock*); - /* 80317398 */ virtual void diff(u32); - /* 8031739C */ virtual void load(); - /* 803173A4 */ virtual u32 getType(); - /* 803173B0 */ virtual ~J3DIndBlockNull(); + /* 803173A0 */ virtual void reset(J3DIndBlock*) {} + /* 80317398 */ virtual void diff(u32) {} + /* 8031739C */ virtual void load() {} + /* 803173A4 */ virtual u32 getType() { return 'IBLN'; } + /* 803173B0 */ virtual ~J3DIndBlockNull() {} }; /** @@ -1096,19 +1096,19 @@ class J3DIndBlockFull : public J3DIndBlock { /* 8031E328 */ virtual void diff(u32); /* 8031E12C */ virtual void load(); /* 80317BDC */ virtual s32 countDLSize(); - /* 80323390 */ virtual u32 getType(); - /* 8032339C */ virtual void setIndTexStageNum(u8); - /* 803233A4 */ virtual u8 getIndTexStageNum() const; - /* 803233AC */ virtual void setIndTexOrder(u32, J3DIndTexOrder); - /* 803233C0 */ virtual void setIndTexOrder(u32, J3DIndTexOrder const*); - /* 803233D4 */ virtual J3DIndTexOrder* getIndTexOrder(u32); - /* 8032341C */ virtual void setIndTexMtx(u32, J3DIndTexMtx const*); - /* 803233E8 */ virtual void setIndTexMtx(u32, J3DIndTexMtx); - /* 80323450 */ virtual J3DIndTexMtx* getIndTexMtx(u32); - /* 80323478 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*); - /* 80323464 */ virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale); - /* 8032348C */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32); - /* 803234A0 */ virtual ~J3DIndBlockFull(); + /* 80323390 */ virtual u32 getType() { return 'IBLF'; } + /* 8032339C */ virtual void setIndTexStageNum(u8 num) { mIndTexStageNum = num; } + /* 803233A4 */ virtual u8 getIndTexStageNum() const { return mIndTexStageNum; } + /* 803233AC */ virtual void setIndTexOrder(u32 idx, J3DIndTexOrder order) { mIndTexOrder[idx] = order; } + /* 803233C0 */ virtual void setIndTexOrder(u32 idx, J3DIndTexOrder const* order) { mIndTexOrder[idx] = *order; } + /* 803233D4 */ virtual J3DIndTexOrder* getIndTexOrder(u32 idx) { return &mIndTexOrder[idx]; } + /* 8032341C */ virtual void setIndTexMtx(u32 idx, J3DIndTexMtx const* mtx) { mIndTexMtx[idx] = *mtx; } + /* 803233E8 */ virtual void setIndTexMtx(u32 idx, J3DIndTexMtx mtx) { mIndTexMtx[idx] = mtx; } + /* 80323450 */ virtual J3DIndTexMtx* getIndTexMtx(u32 idx) { return &mIndTexMtx[idx]; } + /* 80323478 */ virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale const* scale) { mIndTexCoordScale[idx] = *scale; } + /* 80323464 */ virtual void setIndTexCoordScale(u32 idx, J3DIndTexCoordScale scale) { mIndTexCoordScale[idx] = scale; } + /* 8032348C */ virtual J3DIndTexCoordScale* getIndTexCoordScale(u32 idx) { return &mIndTexCoordScale[idx]; } + /* 803234A0 */ virtual ~J3DIndBlockFull() {} /* 0x04 */ u8 mIndTexStageNum; /* 0x05 */ J3DIndTexOrder mIndTexOrder[4]; @@ -1132,12 +1132,13 @@ struct J3DColorChanInfo { extern const J3DColorChanInfo j3dDefaultColorChanInfo; -// static inline u32 setChanCtrlMacro(u8 enable, GXColorSrc ambSrc, GXColorSrc matSrc, u32 lightMask, -// GXDiffuseFn diffuseFn, GXAttnFn attnFn) { -// return (matSrc << 0) | enable << 1 | (lightMask & 0x0F) << 2 | ambSrc << 6 | -// ((attnFn == GX_AF_SPEC) ? GX_DF_NONE : diffuseFn) << 7 | (attnFn != GX_AF_NONE) << 9 | -// (attnFn != GX_AF_SPEC) << 10 | (lightMask >> 4 & 0x0F) << 11; -// } +static inline u32 setChanCtrlMacro(u8 enable, GXColorSrc ambSrc, GXColorSrc matSrc, u32 lightMask, + GXDiffuseFn diffuseFn, GXAttnFn attnFn) { + u32 tmp = matSrc << 0; + return tmp | enable << 1 | (lightMask & 0x0F) << 2 | ambSrc << 6 | + ((attnFn == GX_AF_SPEC) ? GX_DF_NONE : diffuseFn) << 7 | (attnFn != GX_AF_NONE) << 9 | + (attnFn != GX_AF_SPEC) << 10 | (lightMask >> 4 & 0x0F) << 11; +} /** * @ingroup jsystem-j3d @@ -1173,25 +1174,24 @@ struct J3DColorChan { // ((param_4 != 0) << 10) | ((param_4 != 2) << 9) | ((param_3 != 0) << 7) | ((param_5 != 0) << 6) | // (b3 << 5) | (b2 << 4) | (b1 << 3) | (b0 << 2) | ((param_0 != 0) << 1) | param_1; } - u8 getLightMask() { return (((mColorChanID & 0x7800) >> 7) | (mColorChanID & 0x3c) >> 2); } + u8 getLightMask() { return ((mColorChanID >> 2) & 0xf) | ((mColorChanID >> 11) & 0xf) << 4; } void setLightMask(u8 param_1) { mColorChanID = (mColorChanID & ~0x3c) | ((param_1 & 0xf) << 2); mColorChanID = (mColorChanID & ~0x7800) | ((param_1 & 0xf0) << 7); } - // u8 getEnable() { return (mColorChanID & 2) >> 1; } - // GXColorSrc getAmbSrc() { return (GXColorSrc)((mColorChanID & 0x40) >> 6); } - // GXColorSrc getMatSrc() { return (GXColorSrc)(mColorChanID & 1); } - // GXDiffuseFn getDiffuseFn() { return (GXDiffuseFn) ((mColorChanID & 0x180) >> 7); } - // GXAttnFn getAttnFn() { - // u8 AttnArr[] = {2,0,2,1}; - // return (GXAttnFn)AttnArr[(mColorChanID & 0x600) >> 9]; - // } + u8 getEnable() { return (mColorChanID >> 1) & 1; } + GXColorSrc getAmbSrc() { return (GXColorSrc)((mColorChanID >> 6) & 1); } + GXColorSrc getMatSrc() { return (GXColorSrc)(mColorChanID & 1); } + GXDiffuseFn getDiffuseFn() { return (GXDiffuseFn) ((mColorChanID >> 7) & 3); } + // This function has to appear in J3DMatBlock.cpp because it generates extra data in .sdata2 + inline GXAttnFn getAttnFn(); - // void load() { - // J3DGDWrite_u32(setChanCtrlMacro(getEnable(), getAmbSrc(), getMatSrc(), getLightMask(), - // getDiffuseFn(), getAttnFn())); - // } + // NONMATCHING regalloc + void load() { + J3DGDWrite_u32(setChanCtrlMacro(getEnable(), getAmbSrc(), getMatSrc(), getLightMask(), + getDiffuseFn(), getAttnFn())); + } /* 0x0 */ u16 mColorChanID; }; @@ -1202,39 +1202,39 @@ 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(); + /* 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 u32 getType() = 0; - /* 80317448 */ virtual void setMatColor(u32, J3DGXColor const*); + /* 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*); + /* 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*); + /* 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*); + /* 80317450 */ virtual void setColorChan(u32, J3DColorChan const*) {} /* 8000DFF8 */ virtual J3DColorChan* getColorChan(u32) { return NULL; } - /* 801A4C08 */ virtual void setLight(u32, J3DLightObj*); - /* 80317454 */ virtual bool getLight(u32); - /* 80317460 */ virtual void setCullMode(u8 const*); - /* 8031745C */ virtual void setCullMode(u8); - /* 80317328 */ virtual s32 getCullMode() const; - /* 80317464 */ virtual u32 getMatColorOffset() const; - /* 8031746C */ virtual u32 getColorChanOffset() const; - /* 80317474 */ virtual void setMatColorOffset(u32); - /* 80317478 */ virtual void setColorChanOffset(u32); + /* 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 s32 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() {} }; @@ -1243,8 +1243,8 @@ class J3DColorBlock { * */ struct J3DColorBlockNull : public J3DColorBlock { - /* 80332B2C */ virtual u32 getType(); // { return 'CLNL'; } - /* 80332B38 */ virtual ~J3DColorBlockNull(); // {} + /* 80332B2C */ virtual u32 getType() { return 'CLNL'; } + /* 80332B38 */ virtual ~J3DColorBlockNull() {} }; /** @@ -1269,29 +1269,29 @@ class J3DColorBlockLightOn : public J3DColorBlock { /* 8031A4D4 */ virtual void diffColorChan(); /* 8031A8E0 */ virtual void diffLightObj(u32); /* 80317B94 */ virtual s32 countDLSize(); - /* 80322E80 */ virtual u32 getType(); - /* 80322EB8 */ virtual void setMatColor(u32, J3DGXColor const*); - /* 80322E8C */ virtual void setMatColor(u32, J3DGXColor); - /* 80322EE4 */ virtual J3DGXColor* getMatColor(u32); - /* 80322F24 */ virtual void setAmbColor(u32, J3DGXColor const*); - /* 80322EF8 */ virtual void setAmbColor(u32, J3DGXColor); - /* 80322F50 */ virtual J3DGXColor* getAmbColor(u32); - /* 80322F70 */ virtual void setColorChanNum(u8); - /* 80322F64 */ virtual void setColorChanNum(u8 const*); - /* 80322F78 */ virtual u8 getColorChanNum() const; - /* 80322F94 */ virtual void setColorChan(u32, J3DColorChan const&); - /* 80322F80 */ virtual void setColorChan(u32, J3DColorChan const*); - /* 80322FA8 */ virtual J3DColorChan* getColorChan(u32); - /* 80322FBC */ virtual void setLight(u32, J3DLightObj*); - /* 80322FCC */ virtual bool getLight(u32); - /* 80322FE4 */ virtual void setCullMode(u8 const*); - /* 80322FDC */ virtual void setCullMode(u8); - /* 80322FF0 */ virtual s32 getCullMode() const; - /* 80322FF8 */ virtual u32 getMatColorOffset() const; - /* 80323000 */ virtual u32 getColorChanOffset() const; - /* 80323008 */ virtual void setMatColorOffset(u32); - /* 80323010 */ virtual void setColorChanOffset(u32); - /* 80323018 */ virtual ~J3DColorBlockLightOn(); + /* 80322E80 */ virtual u32 getType() { return 'CLON'; } + /* 80322EB8 */ virtual void setMatColor(u32 idx, J3DGXColor const* color) { mMatColor[idx] = *color; } + /* 80322E8C */ virtual void setMatColor(u32 idx, J3DGXColor color) { mMatColor[idx] = color; } + /* 80322EE4 */ virtual J3DGXColor* getMatColor(u32 idx) { return &mMatColor[idx]; } + /* 80322F24 */ virtual void setAmbColor(u32 idx, J3DGXColor const* color) { mAmbColor[idx] = *color; } + /* 80322EF8 */ virtual void setAmbColor(u32 idx, J3DGXColor color) { mAmbColor[idx] = color; } + /* 80322F50 */ virtual J3DGXColor* getAmbColor(u32 idx) { return &mAmbColor[idx]; } + /* 80322F70 */ virtual void setColorChanNum(u8 num) { mColorChanNum = num; } + /* 80322F64 */ virtual void setColorChanNum(u8 const* num) { mColorChanNum = *num; } + /* 80322F78 */ virtual u8 getColorChanNum() const { return mColorChanNum; } + /* 80322F94 */ virtual void setColorChan(u32 idx, J3DColorChan const& chan) { mColorChan[idx] = chan; } + /* 80322F80 */ virtual void setColorChan(u32 idx, J3DColorChan const* chan) { mColorChan[idx] = *chan; } + /* 80322FA8 */ virtual J3DColorChan* getColorChan(u32 idx) { return &mColorChan[idx]; } + /* 80322FBC */ virtual void setLight(u32 idx, J3DLightObj* light) { mLight[idx] = light; } + /* 80322FCC */ virtual J3DLightObj* getLight(u32 idx) { return mLight[idx]; } + /* 80322FE4 */ virtual void setCullMode(u8 const* mode) { mCullMode = *mode; } + /* 80322FDC */ virtual void setCullMode(u8 mode) { mCullMode = mode; } + /* 80322FF0 */ virtual s32 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() {} /* 0x04 */ J3DGXColor mMatColor[2]; /* 0x0C */ J3DGXColor mAmbColor[2]; @@ -1323,23 +1323,23 @@ class J3DColorBlockLightOff : public J3DColorBlock { /* 80319BB4 */ virtual void diffMatColor(); /* 80319D30 */ virtual void diffColorChan(); /* 80317B84 */ virtual s32 countDLSize(); - /* 80323560 */ virtual u32 getType(); - /* 80323184 */ virtual void setMatColor(u32, J3DGXColor const*); - /* 80323158 */ virtual void setMatColor(u32, J3DGXColor); - /* 803231B0 */ virtual J3DGXColor* getMatColor(u32); - /* 803231D0 */ virtual void setColorChanNum(u8); - /* 803231C4 */ virtual void setColorChanNum(u8 const*); - /* 803231D8 */ virtual u8 getColorChanNum() const; - /* 803231F4 */ virtual void setColorChan(u32, J3DColorChan const&); - /* 803231E0 */ virtual void setColorChan(u32, J3DColorChan const*); - /* 80323208 */ virtual J3DColorChan* getColorChan(u32); - /* 80323224 */ virtual void setCullMode(u8 const*); - /* 8032321C */ virtual void setCullMode(u8); - /* 80323230 */ virtual s32 getCullMode() const; - /* 80323238 */ virtual u32 getMatColorOffset() const; - /* 80323240 */ virtual u32 getColorChanOffset() const; - /* 80323248 */ virtual void setMatColorOffset(u32); - /* 80323250 */ virtual void setColorChanOffset(u32); + /* 80323560 */ virtual u32 getType() { return 'CLOF'; } + /* 80323184 */ virtual void setMatColor(u32 idx, J3DGXColor const* color) { mMatColor[idx] = *color; } + /* 80323158 */ virtual void setMatColor(u32 idx, J3DGXColor color) { mMatColor[idx] = color; } + /* 803231B0 */ virtual J3DGXColor* getMatColor(u32 idx) { return &mMatColor[idx]; } + /* 803231D0 */ virtual void setColorChanNum(u8 num) { mColorChanNum = num; } + /* 803231C4 */ virtual void setColorChanNum(u8 const* num) { mColorChanNum = *num; } + /* 803231D8 */ virtual u8 getColorChanNum() const { return mColorChanNum; } + /* 803231F4 */ virtual void setColorChan(u32 idx, J3DColorChan const& chan) { mColorChan[idx] = chan; } + /* 803231E0 */ virtual void setColorChan(u32 idx, J3DColorChan const* chan) { mColorChan[idx] = *chan; } + /* 80323208 */ virtual J3DColorChan* getColorChan(u32 idx) { return &mColorChan[idx]; } + /* 80323224 */ virtual void setCullMode(u8 const* mode) { mCullMode = *mode; } + /* 8032321C */ virtual void setCullMode(u8 mode) { mCullMode = mode; } + /* 80323230 */ virtual s32 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() {} /* 0x04 */ J3DGXColor mMatColor[2]; @@ -1364,11 +1364,11 @@ class J3DColorBlockAmbientOn : public J3DColorBlockLightOff { /* 8031816C */ virtual void load(); /* 8031FDE4 */ virtual void reset(J3DColorBlock*); /* 80317B8C */ virtual s32 countDLSize(); - /* 80323074 */ virtual u32 getType(); - /* 803230AC */ virtual void setAmbColor(u32, J3DGXColor const*); - /* 80323080 */ virtual void setAmbColor(u32, J3DGXColor); - /* 803230D8 */ virtual J3DGXColor* getAmbColor(u32); - /* 803230EC */ virtual ~J3DColorBlockAmbientOn(); + /* 80323074 */ virtual u32 getType() { return 'CLAB'; } + /* 803230AC */ virtual void setAmbColor(u32 idx, J3DGXColor const* color) { mAmbColor[idx] = *color; } + /* 80323080 */ virtual void setAmbColor(u32 idx, J3DGXColor color) { mAmbColor[idx] = color; } + /* 803230D8 */ virtual J3DGXColor* getAmbColor(u32 idx) { return &mAmbColor[idx]; } + /* 803230EC */ virtual ~J3DColorBlockAmbientOn() {} /* 0x20 */ J3DGXColor mAmbColor[2]; }; // Size: 0x28 diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 499450147c2..7deeff03f0f 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -113,6 +113,7 @@ class J3DMaterial { */ class J3DPatchedMaterial : public J3DMaterial { public: + J3DPatchedMaterial() { initialize(); } /* 80316FB8 */ void initialize(); /* 80316FD8 */ virtual void makeDisplayList(); diff --git a/include/JSystem/J3DGraphBase/J3DShape.h b/include/JSystem/J3DGraphBase/J3DShape.h index 3e02440cc59..512a8fe2891 100644 --- a/include/JSystem/J3DGraphBase/J3DShape.h +++ b/include/JSystem/J3DGraphBase/J3DShape.h @@ -56,8 +56,8 @@ class J3DCurrentMtx : public J3DCurrentMtxInfo { } void setCurrentTexMtx(u8 param_1, u8 param_2, u8 param_3, u8 param_4, - u8 param_5, u8 param_6, u8 param_7, u8 param_8) { - mMtxIdxRegA = ((param_1 & 0xff) << 6) | (param_2 << 0xc)| (param_3 << 0x12) | (param_4 << 0x18); + u8 param_5, u8 param_6, u8 param_7, u8 param_8) { + mMtxIdxRegA = (param_1 << 6) | (param_2 << 0xc) | (param_3 << 0x12) | (param_4 << 0x18); mMtxIdxRegB = (param_5) | param_6 << 6 | param_7 << 0xc | param_8 << 0x12; } }; diff --git a/include/JSystem/J3DGraphBase/J3DShapeMtx.h b/include/JSystem/J3DGraphBase/J3DShapeMtx.h index 3a5a7e889a1..21d0e506cd5 100644 --- a/include/JSystem/J3DGraphBase/J3DShapeMtx.h +++ b/include/JSystem/J3DGraphBase/J3DShapeMtx.h @@ -65,7 +65,7 @@ class J3DShapeMtx { /* 80313BF0 */ virtual void calcNBTScale(Vec const&, f32 (*)[3][3], f32 (*)[3][3]); static J3DShapeMtx_LoadFunc sMtxLoadPipeline[4]; - static u16 sMtxLoadCache[10 + 2 /* padding */]; + static u16 sMtxLoadCache[10]; static u32 sCurrentPipeline; static u8* sCurrentScaleFlag; static u8 sNBTFlag; @@ -190,4 +190,4 @@ class J3DShapeMtxMultiConcatView : public J3DShapeMtxConcatView { /* 0xC */ u16* mUseMtxIndexTable; }; -#endif /* J3DSHAPEMTX_H */ \ No newline at end of file +#endif /* J3DSHAPEMTX_H */ diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index ef3838def39..39e36123378 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -96,6 +96,7 @@ struct J3DTexCoord : public J3DTexCoordInfo { u8 getTexGenMtx() { return mTexGenMtx & 0xff; } u16 getTexMtxReg() { return mTexMtxReg & 0xff; } void setTexGenMtx(u8 param_1) { mTexGenMtx = param_1; } + void setTexMtxReg(u16 reg) { mTexMtxReg = reg; } J3DTexCoord& operator=(const J3DTexCoord& other) { // Fake match (__memcpy or = doesn't match) *(u32*)this = *(u32*)&other; diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h index 251d900aae0..99e5edc7d51 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory.h @@ -143,8 +143,8 @@ class J3DMaterialFactory { u16 getMaterialID(int idx) const { return mpMaterialID[idx]; } u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; } - static u32 getMdlDataFlag_TevStageNum(u32 flags) { return (flags >> 0x10) & 0x1f; } - static u32 getMdlDataFlag_TexGenFlag(u32 flags) { return flags & 0x0c000000; } + static int getMdlDataFlag_TevStageNum(u32 flags) { return (flags >> 0x10) & 0x1f; } + static int getMdlDataFlag_TexGenFlag(u32 flags) { return flags & 0x0c000000; } static u32 getMdlDataFlag_ColorFlag(u32 flags) { return flags & 0xc0000000; } static u32 getMdlDataFlag_PEFlag(u32 flags) { return flags & 0x30000000; } diff --git a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h index d6ee20b2d5f..a2dc9c8f425 100644 --- a/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h +++ b/include/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h @@ -78,6 +78,12 @@ class J3DMaterialFactory_v21 { /* 80334074 */ J3DNBTScale newNBTScale(int) const; u16 getMaterialID(u16 idx) { return mpMaterialID[idx]; } + u8 getMaterialMode(int idx) const { return mpMaterialInitData[mpMaterialID[idx]].mMaterialMode; } + + static int getMdlDataFlag_TevStageNum(u32 flags) { return (flags >> 0x10) & 0x1f; } + static int getMdlDataFlag_TexGenFlag(u32 flags) { return flags & 0x0c000000; } + static u32 getMdlDataFlag_ColorFlag(u32 flags) { return flags & 0xc0000000; } + static u32 getMdlDataFlag_PEFlag(u32 flags) { return flags & 0x30000000; } /* 0x00 */ u16 mMaterialNum; /* 0x04 */ J3DMaterialInitData_v21* mpMaterialInitData; diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 378ad977371..dcf815323ca 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -35,584 +35,6 @@ inline void loadTevKColor(u32 reg, const J3DGXColor& color) { J3DGDSetTevKColor(GXTevKColorID(reg), color); } -// -// Forward References: -// - -extern "C" void initialize__21J3DColorBlockLightOffFv(); -extern "C" void initialize__22J3DColorBlockAmbientOnFv(); -extern "C" void initialize__20J3DColorBlockLightOnFv(); -extern "C" void initialize__21J3DTexGenBlockPatchedFv(); -extern "C" void initialize__15J3DTexGenBlock4Fv(); -extern "C" void initialize__19J3DTexGenBlockBasicFv(); -extern "C" void initialize__15J3DTevBlockNullFv(); -extern "C" void initialize__18J3DTevBlockPatchedFv(); -extern "C" void initialize__12J3DTevBlock1Fv(); -extern "C" void initialize__12J3DTevBlock2Fv(); -extern "C" void initialize__12J3DTevBlock4Fv(); -extern "C" void initialize__13J3DTevBlock16Fv(); -extern "C" void initialize__15J3DIndBlockFullFv(); -extern "C" void initialize__16J3DPEBlockFogOffFv(); -extern "C" void initialize__14J3DPEBlockFullFv(); -extern "C" s32 countDLSize__21J3DColorBlockLightOffFv(); -extern "C" s32 countDLSize__22J3DColorBlockAmbientOnFv(); -extern "C" s32 countDLSize__20J3DColorBlockLightOnFv(); -extern "C" s32 countDLSize__21J3DTexGenBlockPatchedFv(); -extern "C" s32 countDLSize__15J3DTexGenBlock4Fv(); -extern "C" s32 countDLSize__19J3DTexGenBlockBasicFv(); -extern "C" s32 countDLSize__18J3DTevBlockPatchedFv(); -extern "C" s32 countDLSize__12J3DTevBlock1Fv(); -extern "C" s32 countDLSize__12J3DTevBlock2Fv(); -extern "C" s32 countDLSize__12J3DTevBlock4Fv(); -extern "C" s32 countDLSize__13J3DTevBlock16Fv(); -extern "C" s32 countDLSize__15J3DIndBlockFullFv(); -extern "C" s32 countDLSize__13J3DPEBlockOpaFv(); -extern "C" s32 countDLSize__17J3DPEBlockTexEdgeFv(); -extern "C" s32 countDLSize__13J3DPEBlockXluFv(); -extern "C" s32 countDLSize__16J3DPEBlockFogOffFv(); -extern "C" s32 countDLSize__14J3DPEBlockFullFv(); -extern "C" void load__21J3DColorBlockLightOffFv(); -extern "C" void load__22J3DColorBlockAmbientOnFv(); -extern "C" void load__20J3DColorBlockLightOnFv(); -extern "C" void patch__21J3DColorBlockLightOffFv(); -extern "C" void patchMatColor__21J3DColorBlockLightOffFv(); -extern "C" void patchLight__21J3DColorBlockLightOffFv(); -extern "C" void patch__20J3DColorBlockLightOnFv(); -extern "C" void patchMatColor__20J3DColorBlockLightOnFv(); -extern "C" void patchLight__20J3DColorBlockLightOnFv(); -extern "C" void diff__21J3DColorBlockLightOffFUl(); -extern "C" void diffMatColor__21J3DColorBlockLightOffFv(); -extern "C" void diffColorChan__21J3DColorBlockLightOffFv(); -extern "C" void diff__20J3DColorBlockLightOnFUl(); -extern "C" void diffAmbColor__20J3DColorBlockLightOnFv(); -extern "C" void diffMatColor__20J3DColorBlockLightOnFv(); -extern "C" void diffColorChan__20J3DColorBlockLightOnFv(); -extern "C" void diffLightObj__20J3DColorBlockLightOnFUl(); -extern "C" void load__15J3DTexGenBlock4Fv(); -extern "C" void load__19J3DTexGenBlockBasicFv(); -extern "C" void patch__21J3DTexGenBlockPatchedFv(); -extern "C" void patch__15J3DTexGenBlock4Fv(); -extern "C" void patch__19J3DTexGenBlockBasicFv(); -extern "C" void diff__21J3DTexGenBlockPatchedFUl(); -extern "C" void diffTexMtx__21J3DTexGenBlockPatchedFv(); -extern "C" void diffTexGen__21J3DTexGenBlockPatchedFv(); -extern "C" void load__12J3DTevBlock1Fv(); -extern "C" void load__12J3DTevBlock2Fv(); -extern "C" void load__12J3DTevBlock4Fv(); -extern "C" void load__13J3DTevBlock16Fv(); -extern "C" void patchTexNo__18J3DTevBlockPatchedFv(); -extern "C" void patchTevReg__18J3DTevBlockPatchedFv(); -extern "C" void patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv(); -extern "C" void patch__18J3DTevBlockPatchedFv(); -extern "C" void patchTexNo__12J3DTevBlock1Fv(); -extern "C" void patchTevReg__12J3DTevBlock1Fv(); -extern "C" void patchTexNoAndTexCoordScale__12J3DTevBlock1Fv(); -extern "C" void patch__12J3DTevBlock1Fv(); -extern "C" void patchTexNo__12J3DTevBlock2Fv(); -extern "C" void patchTevReg__12J3DTevBlock2Fv(); -extern "C" void patchTexNoAndTexCoordScale__12J3DTevBlock2Fv(); -extern "C" void patch__12J3DTevBlock2Fv(); -extern "C" void patchTexNo__12J3DTevBlock4Fv(); -extern "C" void patchTevReg__12J3DTevBlock4Fv(); -extern "C" void patchTexNoAndTexCoordScale__12J3DTevBlock4Fv(); -extern "C" void patch__12J3DTevBlock4Fv(); -extern "C" void patchTexNo__13J3DTevBlock16Fv(); -extern "C" void patchTevReg__13J3DTevBlock16Fv(); -extern "C" void patchTexNoAndTexCoordScale__13J3DTevBlock16Fv(); -extern "C" void patch__13J3DTevBlock16Fv(); -extern "C" void diff__11J3DTevBlockFUl(); -extern "C" void diffTexNo__18J3DTevBlockPatchedFv(); -extern "C" void diffTevStage__18J3DTevBlockPatchedFv(); -extern "C" void diffTevStageIndirect__18J3DTevBlockPatchedFv(); -extern "C" void diffTevReg__18J3DTevBlockPatchedFv(); -extern "C" void diffTexCoordScale__18J3DTevBlockPatchedFv(); -extern "C" void diffTexNo__12J3DTevBlock1Fv(); -extern "C" void diffTevReg__12J3DTevBlock1Fv(); -extern "C" void diffTevStage__12J3DTevBlock1Fv(); -extern "C" void diffTevStageIndirect__12J3DTevBlock1Fv(); -extern "C" void diffTexCoordScale__12J3DTevBlock1Fv(); -extern "C" void diffTexNo__12J3DTevBlock2Fv(); -extern "C" void diffTevReg__12J3DTevBlock2Fv(); -extern "C" void diffTevStage__12J3DTevBlock2Fv(); -extern "C" void diffTevStageIndirect__12J3DTevBlock2Fv(); -extern "C" void diffTexCoordScale__12J3DTevBlock2Fv(); -extern "C" void diffTexNo__12J3DTevBlock4Fv(); -extern "C" void diffTevReg__12J3DTevBlock4Fv(); -extern "C" void diffTevStage__12J3DTevBlock4Fv(); -extern "C" void diffTevStageIndirect__12J3DTevBlock4Fv(); -extern "C" void diffTexCoordScale__12J3DTevBlock4Fv(); -extern "C" void diffTexNo__13J3DTevBlock16Fv(); -extern "C" void diffTevReg__13J3DTevBlock16Fv(); -extern "C" void diffTevStage__13J3DTevBlock16Fv(); -extern "C" void diffTevStageIndirect__13J3DTevBlock16Fv(); -extern "C" void diffTexCoordScale__13J3DTevBlock16Fv(); -extern "C" void ptrToIndex__13J3DTevBlock16Fv(); -extern "C" void ptrToIndex__18J3DTevBlockPatchedFv(); -extern "C" void indexToPtr_private__11J3DTevBlockFUl(); -extern "C" void load__15J3DIndBlockFullFv(); -extern "C" void diff__15J3DIndBlockFullFUl(); -extern "C" void load__13J3DPEBlockOpaFv(); -extern "C" void load__17J3DPEBlockTexEdgeFv(); -extern "C" void load__13J3DPEBlockXluFv(); -extern "C" void load__16J3DPEBlockFogOffFv(); -extern "C" void diffBlend__16J3DPEBlockFogOffFv(); -extern "C" void load__14J3DPEBlockFullFv(); -extern "C" void patch__14J3DPEBlockFullFv(); -extern "C" void diffFog__14J3DPEBlockFullFv(); -extern "C" void diffBlend__14J3DPEBlockFullFv(); -extern "C" void diff__14J3DPEBlockFullFUl(); -extern "C" void reset__21J3DColorBlockLightOffFP13J3DColorBlock(); -extern "C" void reset__22J3DColorBlockAmbientOnFP13J3DColorBlock(); -extern "C" void reset__20J3DColorBlockLightOnFP13J3DColorBlock(); -extern "C" void reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock(); -extern "C" void reset__15J3DTexGenBlock4FP14J3DTexGenBlock(); -extern "C" void reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock(); -extern "C" void reset__18J3DTevBlockPatchedFP11J3DTevBlock(); -extern "C" void reset__12J3DTevBlock1FP11J3DTevBlock(); -extern "C" void reset__12J3DTevBlock2FP11J3DTevBlock(); -extern "C" void reset__12J3DTevBlock4FP11J3DTevBlock(); -extern "C" void reset__13J3DTevBlock16FP11J3DTevBlock(); -extern "C" void reset__15J3DIndBlockFullFP11J3DIndBlock(); -extern "C" void reset__16J3DPEBlockFogOffFP10J3DPEBlock(); -extern "C" void reset__14J3DPEBlockFullFP10J3DPEBlock(); -extern "C" void calc__21J3DTexGenBlockPatchedFPA4_Cf(); -extern "C" void calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf(); -extern "C" void calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf(); -extern "C" void calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf(); -extern "C" void diffTevReg__11J3DTevBlockFv(); -extern "C" void diffTevStageIndirect__11J3DTevBlockFv(); -extern "C" void diffTevStage__11J3DTevBlockFv(); -extern "C" void diffTexCoordScale__11J3DTevBlockFv(); -extern "C" void diffTexNo__11J3DTevBlockFv(); -extern "C" void getType__14J3DPEBlockFullFv(); -extern "C" void setFog__14J3DPEBlockFullFP6J3DFog(); -extern "C" void setFog__14J3DPEBlockFullF6J3DFog(); -extern "C" void getFog__14J3DPEBlockFullFv(); -extern "C" void setAlphaComp__14J3DPEBlockFullFRC12J3DAlphaComp(); -extern "C" void setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp(); -extern "C" void getAlphaComp__14J3DPEBlockFullFv(); -extern "C" void setBlend__14J3DPEBlockFullFRC8J3DBlend(); -extern "C" void setBlend__14J3DPEBlockFullFPC8J3DBlend(); -extern "C" void getBlend__14J3DPEBlockFullFv(); -extern "C" void setZMode__14J3DPEBlockFullF8J3DZMode(); -extern "C" void setZMode__14J3DPEBlockFullFPC8J3DZMode(); -extern "C" void getZMode__14J3DPEBlockFullFv(); -extern "C" void setZCompLoc__14J3DPEBlockFullFUc(); -extern "C" void setZCompLoc__14J3DPEBlockFullFPCUc(); -extern "C" void getZCompLoc__14J3DPEBlockFullCFv(); -extern "C" void setDither__14J3DPEBlockFullFUc(); -extern "C" void setDither__14J3DPEBlockFullFPCUc(); -extern "C" void getDither__14J3DPEBlockFullCFv(); -extern "C" void getFogOffset__14J3DPEBlockFullCFv(); -extern "C" void setFogOffset__14J3DPEBlockFullFUl(); -extern "C" void __dt__14J3DPEBlockFullFv(); -extern "C" void diff__16J3DPEBlockFogOffFUl(); -extern "C" void getType__16J3DPEBlockFogOffFv(); -extern "C" void setAlphaComp__16J3DPEBlockFogOffFRC12J3DAlphaComp(); -extern "C" void setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp(); -extern "C" void getAlphaComp__16J3DPEBlockFogOffFv(); -extern "C" void setBlend__16J3DPEBlockFogOffFRC8J3DBlend(); -extern "C" void setBlend__16J3DPEBlockFogOffFPC8J3DBlend(); -extern "C" void getBlend__16J3DPEBlockFogOffFv(); -extern "C" void setZMode__16J3DPEBlockFogOffF8J3DZMode(); -extern "C" void setZMode__16J3DPEBlockFogOffFPC8J3DZMode(); -extern "C" void getZMode__16J3DPEBlockFogOffFv(); -extern "C" void setZCompLoc__16J3DPEBlockFogOffFUc(); -extern "C" void setZCompLoc__16J3DPEBlockFogOffFPCUc(); -extern "C" void getZCompLoc__16J3DPEBlockFogOffCFv(); -extern "C" void setDither__16J3DPEBlockFogOffFUc(); -extern "C" void setDither__16J3DPEBlockFogOffFPCUc(); -extern "C" void getDither__16J3DPEBlockFogOffCFv(); -extern "C" void __dt__16J3DPEBlockFogOffFv(); -extern "C" void indexToPtr__13J3DTevBlock16Fv(); -extern "C" void getType__13J3DTevBlock16Fv(); -extern "C" void setTexNo__13J3DTevBlock16FUlUs(); -extern "C" void setTexNo__13J3DTevBlock16FUlPCUs(); -extern "C" void getTexNo__13J3DTevBlock16CFUl(); -extern "C" void setTevOrder__13J3DTevBlock16FUl11J3DTevOrder(); -extern "C" void setTevOrder__13J3DTevBlock16FUlPC11J3DTevOrder(); -extern "C" void getTevOrder__13J3DTevBlock16FUl(); -extern "C" void setTevColor__13J3DTevBlock16FUl13J3DGXColorS10(); -extern "C" void setTevColor__13J3DTevBlock16FUlPC13J3DGXColorS10(); -extern "C" void getTevColor__13J3DTevBlock16FUl(); -extern "C" void setTevKColor__13J3DTevBlock16FUl10J3DGXColor(); -extern "C" void setTevKColor__13J3DTevBlock16FUlPC10J3DGXColor(); -extern "C" void getTevKColor__13J3DTevBlock16FUl(); -extern "C" void setTevKColorSel__13J3DTevBlock16FUlUc(); -extern "C" void setTevKColorSel__13J3DTevBlock16FUlPCUc(); -extern "C" void getTevKColorSel__13J3DTevBlock16FUl(); -extern "C" void setTevKAlphaSel__13J3DTevBlock16FUlUc(); -extern "C" void setTevKAlphaSel__13J3DTevBlock16FUlPCUc(); -extern "C" void getTevKAlphaSel__13J3DTevBlock16FUl(); -extern "C" void setTevStageNum__13J3DTevBlock16FUc(); -extern "C" void setTevStageNum__13J3DTevBlock16FPCUc(); -extern "C" void getTevStageNum__13J3DTevBlock16CFv(); -extern "C" void setTevStage__13J3DTevBlock16FUl11J3DTevStage(); -extern "C" void setTevStage__13J3DTevBlock16FUlPC11J3DTevStage(); -extern "C" void getTevStage__13J3DTevBlock16FUl(); -extern "C" void setTevSwapModeInfo__13J3DTevBlock16FUl18J3DTevSwapModeInfo(); -extern "C" void setTevSwapModeInfo__13J3DTevBlock16FUlPC18J3DTevSwapModeInfo(); -extern "C" void setTevSwapModeTable__13J3DTevBlock16FUl19J3DTevSwapModeTable(); -extern "C" void setTevSwapModeTable__13J3DTevBlock16FUlPC19J3DTevSwapModeTable(); -extern "C" void getTevSwapModeTable__13J3DTevBlock16FUl(); -extern "C" void setIndTevStage__13J3DTevBlock16FUl14J3DIndTevStage(); -extern "C" void setIndTevStage__13J3DTevBlock16FUlPC14J3DIndTevStage(); -extern "C" void getIndTevStage__13J3DTevBlock16FUl(); -extern "C" void getTexNoOffset__13J3DTevBlock16CFv(); -extern "C" void getTevRegOffset__13J3DTevBlock16CFv(); -extern "C" void setTevRegOffset__13J3DTevBlock16FUl(); -extern "C" void __dt__13J3DTevBlock16Fv(); -extern "C" void setTexNoOffset__11J3DTevBlockFUl(); -extern "C" void ptrToIndex__12J3DTevBlock4Fv(); -extern "C" void indexToPtr__12J3DTevBlock4Fv(); -extern "C" void getType__12J3DTevBlock4Fv(); -extern "C" void setTexNo__12J3DTevBlock4FUlUs(); -extern "C" void setTexNo__12J3DTevBlock4FUlPCUs(); -extern "C" void getTexNo__12J3DTevBlock4CFUl(); -extern "C" void setTevOrder__12J3DTevBlock4FUl11J3DTevOrder(); -extern "C" void setTevOrder__12J3DTevBlock4FUlPC11J3DTevOrder(); -extern "C" void getTevOrder__12J3DTevBlock4FUl(); -extern "C" void setTevColor__12J3DTevBlock4FUl13J3DGXColorS10(); -extern "C" void setTevColor__12J3DTevBlock4FUlPC13J3DGXColorS10(); -extern "C" void getTevColor__12J3DTevBlock4FUl(); -extern "C" void setTevKColor__12J3DTevBlock4FUl10J3DGXColor(); -extern "C" void setTevKColor__12J3DTevBlock4FUlPC10J3DGXColor(); -extern "C" void getTevKColor__12J3DTevBlock4FUl(); -extern "C" void setTevKColorSel__12J3DTevBlock4FUlUc(); -extern "C" void setTevKColorSel__12J3DTevBlock4FUlPCUc(); -extern "C" void getTevKColorSel__12J3DTevBlock4FUl(); -extern "C" void setTevKAlphaSel__12J3DTevBlock4FUlUc(); -extern "C" void setTevKAlphaSel__12J3DTevBlock4FUlPCUc(); -extern "C" void getTevKAlphaSel__12J3DTevBlock4FUl(); -extern "C" void setTevStageNum__12J3DTevBlock4FUc(); -extern "C" void setTevStageNum__12J3DTevBlock4FPCUc(); -extern "C" void getTevStageNum__12J3DTevBlock4CFv(); -extern "C" void setTevStage__12J3DTevBlock4FUl11J3DTevStage(); -extern "C" void setTevStage__12J3DTevBlock4FUlPC11J3DTevStage(); -extern "C" void getTevStage__12J3DTevBlock4FUl(); -extern "C" void setTevSwapModeInfo__12J3DTevBlock4FUl18J3DTevSwapModeInfo(); -extern "C" void setTevSwapModeInfo__12J3DTevBlock4FUlPC18J3DTevSwapModeInfo(); -extern "C" void setTevSwapModeTable__12J3DTevBlock4FUl19J3DTevSwapModeTable(); -extern "C" void setTevSwapModeTable__12J3DTevBlock4FUlPC19J3DTevSwapModeTable(); -extern "C" void getTevSwapModeTable__12J3DTevBlock4FUl(); -extern "C" void setIndTevStage__12J3DTevBlock4FUl14J3DIndTevStage(); -extern "C" void setIndTevStage__12J3DTevBlock4FUlPC14J3DIndTevStage(); -extern "C" void getIndTevStage__12J3DTevBlock4FUl(); -extern "C" void getTexNoOffset__12J3DTevBlock4CFv(); -extern "C" void getTevRegOffset__12J3DTevBlock4CFv(); -extern "C" void setTevRegOffset__12J3DTevBlock4FUl(); -extern "C" void __dt__12J3DTevBlock4Fv(); -extern "C" void ptrToIndex__12J3DTevBlock2Fv(); -extern "C" void indexToPtr__12J3DTevBlock2Fv(); -extern "C" void getType__12J3DTevBlock2Fv(); -extern "C" void setTexNo__12J3DTevBlock2FUlUs(); -extern "C" void setTexNo__12J3DTevBlock2FUlPCUs(); -extern "C" void getTexNo__12J3DTevBlock2CFUl(); -extern "C" void setTevOrder__12J3DTevBlock2FUl11J3DTevOrder(); -extern "C" void setTevOrder__12J3DTevBlock2FUlPC11J3DTevOrder(); -extern "C" void getTevOrder__12J3DTevBlock2FUl(); -extern "C" void setTevColor__12J3DTevBlock2FUl13J3DGXColorS10(); -extern "C" void setTevColor__12J3DTevBlock2FUlPC13J3DGXColorS10(); -extern "C" void getTevColor__12J3DTevBlock2FUl(); -extern "C" void setTevKColor__12J3DTevBlock2FUl10J3DGXColor(); -extern "C" void setTevKColor__12J3DTevBlock2FUlPC10J3DGXColor(); -extern "C" void getTevKColor__12J3DTevBlock2FUl(); -extern "C" void setTevKColorSel__12J3DTevBlock2FUlUc(); -extern "C" void setTevKColorSel__12J3DTevBlock2FUlPCUc(); -extern "C" void getTevKColorSel__12J3DTevBlock2FUl(); -extern "C" void setTevKAlphaSel__12J3DTevBlock2FUlUc(); -extern "C" void setTevKAlphaSel__12J3DTevBlock2FUlPCUc(); -extern "C" void getTevKAlphaSel__12J3DTevBlock2FUl(); -extern "C" void setTevStageNum__12J3DTevBlock2FUc(); -extern "C" void setTevStageNum__12J3DTevBlock2FPCUc(); -extern "C" void getTevStageNum__12J3DTevBlock2CFv(); -extern "C" void setTevStage__12J3DTevBlock2FUl11J3DTevStage(); -extern "C" void setTevStage__12J3DTevBlock2FUlPC11J3DTevStage(); -extern "C" void getTevStage__12J3DTevBlock2FUl(); -extern "C" void setTevSwapModeInfo__12J3DTevBlock2FUl18J3DTevSwapModeInfo(); -extern "C" void setTevSwapModeInfo__12J3DTevBlock2FUlPC18J3DTevSwapModeInfo(); -extern "C" void setTevSwapModeTable__12J3DTevBlock2FUl19J3DTevSwapModeTable(); -extern "C" void setTevSwapModeTable__12J3DTevBlock2FUlPC19J3DTevSwapModeTable(); -extern "C" void getTevSwapModeTable__12J3DTevBlock2FUl(); -extern "C" void setIndTevStage__12J3DTevBlock2FUl14J3DIndTevStage(); -extern "C" void setIndTevStage__12J3DTevBlock2FUlPC14J3DIndTevStage(); -extern "C" void getIndTevStage__12J3DTevBlock2FUl(); -extern "C" void getTexNoOffset__12J3DTevBlock2CFv(); -extern "C" void getTevRegOffset__12J3DTevBlock2CFv(); -extern "C" void setTevRegOffset__12J3DTevBlock2FUl(); -extern "C" void __dt__12J3DTevBlock2Fv(); -extern "C" void ptrToIndex__12J3DTevBlock1Fv(); -extern "C" void indexToPtr__12J3DTevBlock1Fv(); -extern "C" void getType__12J3DTevBlock1Fv(); -extern "C" void setTexNo__12J3DTevBlock1FUlUs(); -extern "C" void setTexNo__12J3DTevBlock1FUlPCUs(); -extern "C" void getTexNo__12J3DTevBlock1CFUl(); -extern "C" void setTevOrder__12J3DTevBlock1FUl11J3DTevOrder(); -extern "C" void setTevOrder__12J3DTevBlock1FUlPC11J3DTevOrder(); -extern "C" void getTevOrder__12J3DTevBlock1FUl(); -extern "C" void setTevStageNum__12J3DTevBlock1FUc(); -extern "C" void setTevStageNum__12J3DTevBlock1FPCUc(); -extern "C" bool getTevStageNum__12J3DTevBlock1CFv(); -extern "C" void setTevStage__12J3DTevBlock1FUl11J3DTevStage(); -extern "C" void setTevStage__12J3DTevBlock1FUlPC11J3DTevStage(); -extern "C" void getTevStage__12J3DTevBlock1FUl(); -extern "C" void setIndTevStage__12J3DTevBlock1FUl14J3DIndTevStage(); -extern "C" void setIndTevStage__12J3DTevBlock1FUlPC14J3DIndTevStage(); -extern "C" void getIndTevStage__12J3DTevBlock1FUl(); -extern "C" void getTexNoOffset__12J3DTevBlock1CFv(); -extern "C" void __dt__12J3DTevBlock1Fv(); -extern "C" void setTevKColorSel__11J3DTevBlockFUlPCUc(); -extern "C" void setTevKAlphaSel__11J3DTevBlockFUlPCUc(); -extern "C" void setTevSwapModeInfo__11J3DTevBlockFUl18J3DTevSwapModeInfo(); -extern "C" void setTevSwapModeInfo__11J3DTevBlockFUlPC18J3DTevSwapModeInfo(); -extern "C" void setTevSwapModeTable__11J3DTevBlockFUlPC19J3DTevSwapModeTable(); -extern "C" bool getTevRegOffset__11J3DTevBlockCFv(); -extern "C" void setTevRegOffset__11J3DTevBlockFUl(); -extern "C" void load__18J3DTevBlockPatchedFv(); -extern "C" void indexToPtr__18J3DTevBlockPatchedFv(); -extern "C" void getType__18J3DTevBlockPatchedFv(); -extern "C" void setTevStageNum__18J3DTevBlockPatchedFUc(); -extern "C" void setTevStageNum__18J3DTevBlockPatchedFPCUc(); -extern "C" void getTevStageNum__18J3DTevBlockPatchedCFv(); -extern "C" void setTexNo__18J3DTevBlockPatchedFUlUs(); -extern "C" void setTexNo__18J3DTevBlockPatchedFUlPCUs(); -extern "C" void getTexNo__18J3DTevBlockPatchedCFUl(); -extern "C" void setTevOrder__18J3DTevBlockPatchedFUl11J3DTevOrder(); -extern "C" void setTevOrder__18J3DTevBlockPatchedFUlPC11J3DTevOrder(); -extern "C" void getTevOrder__18J3DTevBlockPatchedFUl(); -extern "C" void setTevStage__18J3DTevBlockPatchedFUl11J3DTevStage(); -extern "C" void setTevStage__18J3DTevBlockPatchedFUlPC11J3DTevStage(); -extern "C" void getTevStage__18J3DTevBlockPatchedFUl(); -extern "C" void setIndTevStage__18J3DTevBlockPatchedFUl14J3DIndTevStage(); -extern "C" void setIndTevStage__18J3DTevBlockPatchedFUlPC14J3DIndTevStage(); -extern "C" void getIndTevStage__18J3DTevBlockPatchedFUl(); -extern "C" void setTevColor__18J3DTevBlockPatchedFUl13J3DGXColorS10(); -extern "C" void setTevColor__18J3DTevBlockPatchedFUlPC13J3DGXColorS10(); -extern "C" void getTevColor__18J3DTevBlockPatchedFUl(); -extern "C" void setTevKColor__18J3DTevBlockPatchedFUl10J3DGXColor(); -extern "C" void setTevKColor__18J3DTevBlockPatchedFUlPC10J3DGXColor(); -extern "C" void getTevKColor__18J3DTevBlockPatchedFUl(); -extern "C" void setTevKColorSel__18J3DTevBlockPatchedFUlUc(); -extern "C" void setTevKColorSel__18J3DTevBlockPatchedFUlPCUc(); -extern "C" void getTevKColorSel__18J3DTevBlockPatchedFUl(); -extern "C" void getTexNoOffset__18J3DTevBlockPatchedCFv(); -extern "C" void getTevRegOffset__18J3DTevBlockPatchedCFv(); -extern "C" void setTevRegOffset__18J3DTevBlockPatchedFUl(); -extern "C" void __dt__18J3DTevBlockPatchedFv(); -extern "C" void getType__19J3DTexGenBlockBasicFv(); -extern "C" void setNBTScale__19J3DTexGenBlockBasicF11J3DNBTScale(); -extern "C" void setNBTScale__19J3DTexGenBlockBasicFPC11J3DNBTScale(); -extern "C" void getNBTScale__19J3DTexGenBlockBasicFv(); -extern "C" void __dt__19J3DTexGenBlockBasicFv(); -extern "C" void setTexGenNum__21J3DTexGenBlockPatchedFUl(); -extern "C" void setTexGenNum__21J3DTexGenBlockPatchedFPCUl(); -extern "C" void getTexGenNum__21J3DTexGenBlockPatchedCFv(); -extern "C" void setTexCoord__21J3DTexGenBlockPatchedFUlPC11J3DTexCoord(); -extern "C" void getTexCoord__21J3DTexGenBlockPatchedFUl(); -extern "C" void setTexMtx__21J3DTexGenBlockPatchedFUlP9J3DTexMtx(); -extern "C" void getTexMtx__21J3DTexGenBlockPatchedFUl(); -extern "C" void getTexMtxOffset__21J3DTexGenBlockPatchedCFv(); -extern "C" void setTexMtxOffset__21J3DTexGenBlockPatchedFUl(); -extern "C" void getType__15J3DTexGenBlock4Fv(); -extern "C" void setNBTScale__15J3DTexGenBlock4F11J3DNBTScale(); -extern "C" void setNBTScale__15J3DTexGenBlock4FPC11J3DNBTScale(); -extern "C" void getNBTScale__15J3DTexGenBlock4Fv(); -extern "C" void __dt__15J3DTexGenBlock4Fv(); -extern "C" void load__21J3DTexGenBlockPatchedFv(); -extern "C" void getType__21J3DTexGenBlockPatchedFv(); -extern "C" void getType__20J3DColorBlockLightOnFv(); -extern "C" void setMatColor__20J3DColorBlockLightOnFUl10J3DGXColor(); -extern "C" void setMatColor__20J3DColorBlockLightOnFUlPC10J3DGXColor(); -extern "C" void getMatColor__20J3DColorBlockLightOnFUl(); -extern "C" void setAmbColor__20J3DColorBlockLightOnFUl10J3DGXColor(); -extern "C" void setAmbColor__20J3DColorBlockLightOnFUlPC10J3DGXColor(); -extern "C" void getAmbColor__20J3DColorBlockLightOnFUl(); -extern "C" void setColorChanNum__20J3DColorBlockLightOnFPCUc(); -extern "C" void setColorChanNum__20J3DColorBlockLightOnFUc(); -extern "C" void getColorChanNum__20J3DColorBlockLightOnCFv(); -extern "C" void setColorChan__20J3DColorBlockLightOnFUlPC12J3DColorChan(); -extern "C" void setColorChan__20J3DColorBlockLightOnFUlRC12J3DColorChan(); -extern "C" void getColorChan__20J3DColorBlockLightOnFUl(); -extern "C" void setLight__20J3DColorBlockLightOnFUlP11J3DLightObj(); -extern "C" void getLight__20J3DColorBlockLightOnFUl(); -extern "C" void setCullMode__20J3DColorBlockLightOnFUc(); -extern "C" void setCullMode__20J3DColorBlockLightOnFPCUc(); -extern "C" void getCullMode__20J3DColorBlockLightOnCFv(); -extern "C" void getMatColorOffset__20J3DColorBlockLightOnCFv(); -extern "C" void getColorChanOffset__20J3DColorBlockLightOnCFv(); -extern "C" void setMatColorOffset__20J3DColorBlockLightOnFUl(); -extern "C" void setColorChanOffset__20J3DColorBlockLightOnFUl(); -extern "C" void __dt__20J3DColorBlockLightOnFv(); -extern "C" void getType__22J3DColorBlockAmbientOnFv(); -extern "C" void setAmbColor__22J3DColorBlockAmbientOnFUl10J3DGXColor(); -extern "C" void setAmbColor__22J3DColorBlockAmbientOnFUlPC10J3DGXColor(); -extern "C" void getAmbColor__22J3DColorBlockAmbientOnFUl(); -extern "C" void __dt__22J3DColorBlockAmbientOnFv(); -extern "C" void setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor(); -extern "C" void setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor(); -extern "C" void getMatColor__21J3DColorBlockLightOffFUl(); -extern "C" void setColorChanNum__21J3DColorBlockLightOffFPCUc(); -extern "C" void setColorChanNum__21J3DColorBlockLightOffFUc(); -extern "C" void getColorChanNum__21J3DColorBlockLightOffCFv(); -extern "C" void setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan(); -extern "C" void setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan(); -extern "C" void getColorChan__21J3DColorBlockLightOffFUl(); -extern "C" void setCullMode__21J3DColorBlockLightOffFUc(); -extern "C" void setCullMode__21J3DColorBlockLightOffFPCUc(); -extern "C" void getCullMode__21J3DColorBlockLightOffCFv(); -extern "C" void getMatColorOffset__21J3DColorBlockLightOffCFv(); -extern "C" void getColorChanOffset__21J3DColorBlockLightOffCFv(); -extern "C" void setMatColorOffset__21J3DColorBlockLightOffFUl(); -extern "C" void setColorChanOffset__21J3DColorBlockLightOffFUl(); -extern "C" void getType__13J3DPEBlockXluFv(); -extern "C" void __dt__13J3DPEBlockXluFv(); -extern "C" void getType__17J3DPEBlockTexEdgeFv(); -extern "C" void __dt__17J3DPEBlockTexEdgeFv(); -extern "C" void getType__13J3DPEBlockOpaFv(); -extern "C" void __dt__13J3DPEBlockOpaFv(); -extern "C" void getType__15J3DIndBlockFullFv(); -extern "C" void setIndTexStageNum__15J3DIndBlockFullFUc(); -extern "C" void getIndTexStageNum__15J3DIndBlockFullCFv(); -extern "C" void setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder(); -extern "C" void setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder(); -extern "C" void getIndTexOrder__15J3DIndBlockFullFUl(); -extern "C" void setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx(); -extern "C" void setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx(); -extern "C" void getIndTexMtx__15J3DIndBlockFullFUl(); -extern "C" void setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale(); -extern "C" void setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale(); -extern "C" void getIndTexCoordScale__15J3DIndBlockFullFUl(); -extern "C" void __dt__15J3DIndBlockFullFv(); -extern "C" void patchTexNo__11J3DTevBlockFv(); -extern "C" void patchTevReg__11J3DTevBlockFv(); -extern "C" void setTexNo__11J3DTevBlockFUlPCUs(); -extern "C" void setTevOrder__11J3DTevBlockFUlPC11J3DTevOrder(); -extern "C" void setTevStageNum__11J3DTevBlockFPCUc(); -extern "C" void setTevStage__11J3DTevBlockFUlPC11J3DTevStage(); -extern "C" void setIndTevStage__11J3DTevBlockFUlPC14J3DIndTevStage(); -extern "C" u32 getTexNoOffset__11J3DTevBlockCFv(); -extern "C" void getType__21J3DColorBlockLightOffFv(); -extern "C" void __sinit_J3DMatBlock_cpp(); -extern "C" extern char const* const J3DMatBlock__stringBase0; - -// -// External References: -// - -extern "C" void patchTexNoAndTexCoordScale__11J3DTevBlockFv(); -extern "C" void patch__10J3DPEBlockFv(); -extern "C" void patch__11J3DTevBlockFv(); -extern "C" bool getZCompLoc__10J3DPEBlockCFv(); -extern "C" bool getZMode__10J3DPEBlockFv(); -extern "C" bool getBlend__10J3DPEBlockFv(); -extern "C" bool getAlphaComp__10J3DPEBlockFv(); -extern "C" bool getFog__10J3DPEBlockFv(); -extern "C" bool getIndTevStage__11J3DTevBlockFUl(); -extern "C" bool getTevStage__11J3DTevBlockFUl(); -extern "C" void getTexNo__11J3DTevBlockCFUl(); -extern "C" bool getTevSwapModeTable__11J3DTevBlockFUl(); -extern "C" bool getTevKAlphaSel__11J3DTevBlockFUl(); -extern "C" bool getTevKColorSel__11J3DTevBlockFUl(); -extern "C" bool getTevOrder__11J3DTevBlockFUl(); -extern "C" bool getTevKColor__11J3DTevBlockFUl(); -extern "C" bool getTevColor__11J3DTevBlockFUl(); -extern "C" bool getTevStageNum__11J3DTevBlockCFv(); -extern "C" bool getAmbColor__13J3DColorBlockFUl(); -extern "C" void setZCompLoc__10J3DPEBlockFUc(); -extern "C" void setZMode__10J3DPEBlockF8J3DZMode(); -extern "C" void setBlend__10J3DPEBlockFRC8J3DBlend(); -extern "C" void setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp(); -extern "C" void __dt__19J3DIndTexCoordScaleFv(); -extern "C" void __dt__12J3DIndTexMtxFv(); -extern "C" void setIndTevStage__11J3DTevBlockFUl14J3DIndTevStage(); -extern "C" void setTevStage__11J3DTevBlockFUl11J3DTevStage(); -extern "C" void setTexNo__11J3DTevBlockFUlUs(); -extern "C" void setTevSwapModeTable__11J3DTevBlockFUl19J3DTevSwapModeTable(); -extern "C" void setTevKAlphaSel__11J3DTevBlockFUlUc(); -extern "C" void setTevKColorSel__11J3DTevBlockFUlUc(); -extern "C" void setTevOrder__11J3DTevBlockFUl11J3DTevOrder(); -extern "C" void setTevKColor__11J3DTevBlockFUl10J3DGXColor(); -extern "C" void setTevColor__11J3DTevBlockFUl13J3DGXColorS10(); -extern "C" void setTevStageNum__11J3DTevBlockFUc(); -extern "C" void setAmbColor__13J3DColorBlockFUl10J3DGXColor(); -extern "C" void setTevKColor__11J3DTevBlockFUlPC10J3DGXColor(); -extern "C" void setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10(); -extern "C" void setLight__13J3DColorBlockFUlP11J3DLightObj(); -extern "C" void setAmbColor__13J3DColorBlockFUlPC10J3DGXColor(); -extern "C" void __dl__FPv(); -extern "C" void J3DGDSetTexCoordScale2__F13_GXTexCoordIDUsUcUcUsUcUc(); -extern "C" void J3DGDSetIndTexMtx__F14_GXIndTexMtxIDPA3_fSc(); -extern "C" void -J3DGDSetIndTexCoordScale__F16_GXIndTexStageID14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale14_GXIndTexScale(); -extern "C" void -J3DGDSetIndTexOrder__FUl13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID13_GXTexCoordID11_GXTexMapID(); -extern "C" void -J3DGDSetTevOrder__F13_GXTevStageID13_GXTexCoordID11_GXTexMapID12_GXChannelID13_GXTexCoordID11_GXTexMapID12_GXChannelID(); -extern "C" void J3DGDSetTevKColor__F14_GXTevKColorID8_GXColor(); -extern "C" void J3DGDSetTevColorS10__F11_GXTevRegID11_GXColorS10(); -extern "C" void J3DGDSetFog__F10_GXFogTypeffff8_GXColor(); -extern "C" void J3DGDSetFogRangeAdj__FUcUsP14_GXFogAdjTable(); -extern "C" void __dt__21J3DColorBlockLightOffFv(); -extern "C" void __dt__21J3DTexGenBlockPatchedFv(); -extern "C" void __dt__11J3DTevBlockFv(); -extern "C" bool countDLSize__11J3DTevBlockFv(); -extern "C" void load__11J3DTevBlockFv(); -extern "C" bool getNBTScale__14J3DTexGenBlockFv(); -extern "C" void diff__10J3DPEBlockFUl(); -extern "C" void reset__10J3DPEBlockFP10J3DPEBlock(); -extern "C" void reset__11J3DTevBlockFP11J3DTevBlock(); -extern "C" void diffFog__10J3DPEBlockFv(); -extern "C" void diffBlend__10J3DPEBlockFv(); -extern "C" void setFog__10J3DPEBlockFP6J3DFog(); -extern "C" void setFog__10J3DPEBlockF6J3DFog(); -extern "C" void setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp(); -extern "C" void setBlend__10J3DPEBlockFPC8J3DBlend(); -extern "C" void setZMode__10J3DPEBlockFPC8J3DZMode(); -extern "C" void setZCompLoc__10J3DPEBlockFPCUc(); -extern "C" void setDither__10J3DPEBlockFUc(); -extern "C" void setDither__10J3DPEBlockFPCUc(); -extern "C" bool getDither__10J3DPEBlockCFv(); -extern "C" bool getFogOffset__10J3DPEBlockCFv(); -extern "C" void setFogOffset__10J3DPEBlockFUl(); -extern "C" void setNBTScale__14J3DTexGenBlockF11J3DNBTScale(); -extern "C" void setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale(); -extern "C" void diffAmbColor__13J3DColorBlockFv(); -extern "C" void diffLightObj__13J3DColorBlockFUl(); -extern "C" bool getLight__13J3DColorBlockFUl(); -extern "C" void load__11J3DLightObjCFUl(); -extern "C" void loadTexCoordGens__FUlP11J3DTexCoord(); -extern "C" void load__9J3DTexMtxCFUl(); -extern "C" void calc__9J3DTexMtxFPA4_Cf(); -extern "C" void calcPostTexMtx__9J3DTexMtxFPA4_Cf(); -extern "C" void isTexNoReg__FPv(); -extern "C" void getTexNoReg__FPv(); -extern "C" void loadTexNo__FUlRCUs(); -extern "C" void patchTexNo_PtrToIdx__FUlRCUs(); -extern "C" void __as__16J3DIndTexMtxInfoFRC16J3DIndTexMtxInfo(); -extern "C" void __as__10J3DFogInfoFRC10J3DFogInfo(); -extern "C" void __as__15J3DNBTScaleInfoFRC15J3DNBTScaleInfo(); -extern "C" void GDOverflowed(); -extern "C" void __destroy_arr(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__10J3DPEBlock[31]; -extern "C" extern void* __vt__11J3DIndBlock[19]; -extern "C" extern void* __vt__14J3DTexGenBlock[27]; -extern "C" extern void* __vt__13J3DColorBlock[36]; -extern "C" u8 sTexCoordScaleTable__6J3DSys[64 + 4 /* padding */]; -extern "C" extern u8 j3dAlphaCmpTable[768]; -extern "C" extern u8 j3dZModeTable[96]; - /* 8031747C-803174DC 311DBC 0060+00 0/0 1/1 0/0 .text initialize__21J3DColorBlockLightOffFv */ void J3DColorBlockLightOff::initialize() { mColorChanNum = 0; @@ -910,27 +332,25 @@ s32 J3DPEBlockFull::countDLSize() { return 85; } -/* ############################################################################################## */ /* 80450960-80450964 0003E0 0004+00 5/5 0/0 0/0 .sdata SizeOfLoadMatColors */ -SECTION_SDATA static u32 SizeOfLoadMatColors = 0x0000000D; +static u32 SizeOfLoadMatColors = 0x0000000D; -/* ############################################################################################## */ /* 80450964-80450968 0003E4 0004+00 2/2 0/0 0/0 .sdata SizeOfLoadAmbColors */ -SECTION_SDATA static u32 SizeOfLoadAmbColors = 0x0000000D; +static u32 SizeOfLoadAmbColors = 0x0000000D; /* 80450968-80450970 0003E8 0004+04 5/5 0/0 0/0 .sdata SizeOfLoadColorChans */ -SECTION_SDATA static u32 SizeOfLoadColorChans = 21; +static u32 SizeOfLoadColorChans = 21; -/* ############################################################################################## */ /* 804515D8-804515DC 000AD8 0004+00 2/2 0/0 0/0 .sbss SizeOfJ3DColorBlockLightOffLoad */ static u32 SizeOfJ3DColorBlockLightOffLoad = SizeOfLoadMatColors + SizeOfLoadColorChans; -/* 804563A8-804563AC 0049A8 0004+00 7/7 0/0 0/0 .sdata2 @585 */ -SECTION_SDATA2 static u32 lit_585 = 0x02000201; +GXAttnFn J3DColorChan::getAttnFn() { + u8 AttnArr[] = {2,0,2,1}; + return (GXAttnFn)AttnArr[(mColorChanID >> 9) & 3]; +} /* 80317C0C-8031816C 31254C 0560+00 1/0 0/0 0/0 .text load__21J3DColorBlockLightOffFv */ -// Issues with mColorChanID -#ifdef NONMATCHING +// NONMATCHING Issues with mColorChanID void J3DColorBlockLightOff::load() { GDOverflowCheck(SizeOfJ3DColorBlockLightOffLoad); mMatColorOffset = GDGetCurrOffset(); @@ -942,27 +362,41 @@ void J3DColorBlockLightOff::load() { mColorChan[2].load(); mColorChan[3].load(); } -#else -extern "C" void load__21J3DColorBlockLightOffFv() { - // asm void J3DColorBlockLightOff::load() { - // NONMATCHING -} -#endif -/* ############################################################################################## */ /* 804515DC-804515E0 000ADC 0004+00 3/3 0/0 0/0 .sbss SizeOfJ3DColorBlockAmbientOnLoad */ static u32 SizeOfJ3DColorBlockAmbientOnLoad = SizeOfLoadMatColors + SizeOfLoadAmbColors + SizeOfLoadColorChans; /* 8031816C-803187F4 312AAC 0688+00 1/0 0/0 0/0 .text load__22J3DColorBlockAmbientOnFv */ -extern "C" void load__22J3DColorBlockAmbientOnFv() { - // asm void J3DColorBlockAmbientOn::load() { - // NONMATCHING +void J3DColorBlockAmbientOn::load() { + GDOverflowCheck(SizeOfJ3DColorBlockAmbientOnLoad); + mMatColorOffset = GDGetCurrOffset(); + loadMatColors(mMatColor); + loadAmbColors(mAmbColor); + mColorChanOffset = GDGetCurrOffset(); + J3DGDWriteXFCmdHdr(0x100e, 4); + mColorChan[0].load(); + mColorChan[1].load(); + mColorChan[2].load(); + mColorChan[3].load(); } /* 803187F4-80318EB4 313134 06C0+00 1/0 0/0 0/0 .text load__20J3DColorBlockLightOnFv */ -extern "C" void load__20J3DColorBlockLightOnFv() { - // asm void J3DColorBlockLightOn::load() { - // NONMATCHING +void J3DColorBlockLightOn::load() { + GDOverflowCheck(SizeOfJ3DColorBlockAmbientOnLoad); + mMatColorOffset = GDGetCurrOffset(); + loadMatColors(mMatColor); + loadAmbColors(mAmbColor); + mColorChanOffset = GDGetCurrOffset(); + J3DGDWriteXFCmdHdr(0x100e, 4); + mColorChan[0].load(); + mColorChan[1].load(); + mColorChan[2].load(); + mColorChan[3].load(); + for (u32 i = 0; i < 8; i++) { + if (mLight[i] != NULL) { + mLight[i]->load(i); + } + } } /* 80318EB4-80318F00 3137F4 004C+00 2/0 0/0 0/0 .text patch__21J3DColorBlockLightOffFv */ @@ -983,7 +417,16 @@ void J3DColorBlockLightOff::patchMatColor() { /* 803190AC-803194E8 3139EC 043C+00 2/0 0/0 0/0 .text patchLight__21J3DColorBlockLightOffFv */ void J3DColorBlockLightOff::patchLight() { - // NONMATCHING + GDSetCurrOffset(mColorChanOffset); + u8* start = GDGetCurrPointer(); + GDOverflowCheck(SizeOfLoadColorChans); + J3DGDWriteXFCmdHdr(0x100e, 4); + mColorChan[0].load(); + mColorChan[1].load(); + mColorChan[2].load(); + mColorChan[3].load(); + u8* end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } /* 803194E8-80319534 313E28 004C+00 1/0 0/0 0/0 .text patch__20J3DColorBlockLightOnFv */ @@ -1004,7 +447,21 @@ void J3DColorBlockLightOn::patchMatColor() { /* 803196E0-80319B4C 314020 046C+00 1/0 0/0 0/0 .text patchLight__20J3DColorBlockLightOnFv */ void J3DColorBlockLightOn::patchLight() { - // NONMATCHING + GDSetCurrOffset(mColorChanOffset); + u8* start = GDGetCurrPointer(); + GDOverflowCheck(SizeOfLoadColorChans); + J3DGDWriteXFCmdHdr(0x100e, 4); + mColorChan[0].load(); + mColorChan[1].load(); + mColorChan[2].load(); + mColorChan[3].load(); + for (u32 i = 0; i < 8; i++) { + if (mLight[i] != NULL) { + mLight[i]->load(i); + } + } + u8* end = GDGetCurrPointer(); + DCStoreRange(start, end - start); } /* 80319B4C-80319BB4 31448C 0068+00 2/0 0/0 0/0 .text diff__21J3DColorBlockLightOffFUl */ @@ -1023,7 +480,12 @@ void J3DColorBlockLightOff::diffMatColor() { /* 80319D30-8031A13C 314670 040C+00 2/0 0/0 0/0 .text diffColorChan__21J3DColorBlockLightOffFv */ void J3DColorBlockLightOff::diffColorChan() { - // NONMATCHING + GDOverflowCheck(SizeOfLoadColorChans); + J3DGDWriteXFCmdHdr(0x100e, 4); + mColorChan[0].load(); + mColorChan[1].load(); + mColorChan[2].load(); + mColorChan[3].load(); } /* 8031A13C-8031A1DC 314A7C 00A0+00 1/0 0/0 0/0 .text diff__20J3DColorBlockLightOnFUl */ @@ -1055,7 +517,12 @@ void J3DColorBlockLightOn::diffMatColor() { /* 8031A4D4-8031A8E0 314E14 040C+00 1/0 0/0 0/0 .text diffColorChan__20J3DColorBlockLightOnFv */ void J3DColorBlockLightOn::diffColorChan() { - // NONMATCHING + GDOverflowCheck(SizeOfLoadColorChans); + J3DGDWriteXFCmdHdr(0x100e, 4); + mColorChan[0].load(); + mColorChan[1].load(); + mColorChan[2].load(); + mColorChan[3].load(); } /* 8031A8E0-8031A948 315220 0068+00 1/0 0/0 0/0 .text diffLightObj__20J3DColorBlockLightOnFUl */ @@ -2021,8 +1488,7 @@ void J3DTevBlock::indexToPtr_private(u32 offs) { } /* 8031E12C-8031E328 318A6C 01FC+00 1/0 0/0 0/0 .text load__15J3DIndBlockFullFv */ -// regalloc -#ifdef NONMATCHING +// NONMATCHING regalloc void J3DIndBlockFull::load() { u8 indTexStageNum = mIndTexStageNum; for (u32 i = 0; i < indTexStageNum; i++) { @@ -2053,11 +1519,6 @@ void J3DIndBlockFull::load() { mIndTexOrder[3].getMap() ); } -#else -void J3DIndBlockFull::load() { - // NONMATCHING -} -#endif /* 8031E328-8031E408 318C68 00E0+00 1/0 0/0 0/0 .text diff__15J3DIndBlockFullFUl */ void J3DIndBlockFull::diff(u32 flag) { @@ -2088,8 +1549,6 @@ void J3DIndBlockFull::diff(u32 flag) { } /* 8031E408-8031E6C8 318D48 02C0+00 1/0 0/0 0/0 .text load__13J3DPEBlockOpaFv */ -// vtable -#ifdef NONMATCHING void J3DPEBlockOpa::load() { GDOverflowCheck(0x1e); J3DGDSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND, GX_ALWAYS, 0); @@ -2097,16 +1556,8 @@ void J3DPEBlockOpa::load() { J3DGDSetZMode(1, GX_LEQUAL, 1); J3DGDSetZCompLoc(1); } -#else -extern "C" void load__13J3DPEBlockOpaFv() { - // asm void J3DPEBlockOpa::load() { - // NONMATCHING -} -#endif /* 8031E6C8-8031E98C 319008 02C4+00 1/0 0/0 0/0 .text load__17J3DPEBlockTexEdgeFv */ -// vtable -#ifdef NONMATCHING void J3DPEBlockTexEdge::load() { GDOverflowCheck(0x1e); J3DGDSetAlphaCompare(GX_GEQUAL, 0x80, GX_AOP_AND, GX_LEQUAL, 0xff); @@ -2114,16 +1565,8 @@ void J3DPEBlockTexEdge::load() { J3DGDSetZMode(1, GX_LEQUAL, 1); J3DGDSetZCompLoc(0); } -#else -extern "C" void load__17J3DPEBlockTexEdgeFv() { - // asm void J3DPEBlockTexEdge::load() { - // NONMATCHING -} -#endif /* 8031E98C-8031EC50 3192CC 02C4+00 1/0 0/0 0/0 .text load__13J3DPEBlockXluFv */ -// vtable -#ifdef NONMATCHING void J3DPEBlockXlu::load() { GDOverflowCheck(0x1e); J3DGDSetAlphaCompare(GX_ALWAYS, 0, GX_AOP_AND,GX_ALWAYS, 0); @@ -2131,12 +1574,6 @@ void J3DPEBlockXlu::load() { J3DGDSetZMode(1, GX_LEQUAL, 0); J3DGDSetZCompLoc(1); } -#else -extern "C" void load__13J3DPEBlockXluFv() { - // asm void J3DPEBlockXlu::load() { - // NONMATCHING -} -#endif inline void loadZCompLoc(u8 compLoc) { J3DGDSetZCompLoc(compLoc); @@ -2252,19 +1689,8 @@ void J3DColorBlockLightOn::reset(J3DColorBlock* pBlock) { } } -/* ############################################################################################## */ -/* 803A1EA8-803A1EA8 02E508 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ -#pragma push -#pragma force_active on -SECTION_DEAD static char const* const stringBase_803A1EA8 = "Error : TexMtx[%d] is Null.\n"; -/* @stringBase0 padding */ -SECTION_DEAD static char const* const pad_803A1EC5 = "\0\0"; -#pragma pop - /* 80320084-803201A0 31A9C4 011C+00 1/0 0/0 0/0 .text * reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock */ -// vtable -#ifdef NONMATCHING void J3DTexGenBlockPatched::reset(J3DTexGenBlock* pBlock) { mTexGenNum = pBlock->getTexGenNum(); for (u32 i = 0; i < 8; i++) { @@ -2281,17 +1707,9 @@ void J3DTexGenBlockPatched::reset(J3DTexGenBlock* pBlock) { } } } -#else -extern "C" void reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock() { - // asm void J3DTexGenBlockPatched::reset(J3DTexGenBlock* param_0) { - // NONMATCHING -} -#endif /* 803201A0-803202DC 31AAE0 013C+00 1/0 0/0 0/0 .text reset__15J3DTexGenBlock4FP14J3DTexGenBlock */ -// vtable -#ifdef NONMATCHING void J3DTexGenBlock4::reset(J3DTexGenBlock* pBlock) { mTexGenNum = pBlock->getTexGenNum(); for (u32 i = 0; i < 4; i++) { @@ -2310,17 +1728,9 @@ void J3DTexGenBlock4::reset(J3DTexGenBlock* pBlock) { mNBTScale = *pBlock->getNBTScale(); } -#else -extern "C" void reset__15J3DTexGenBlock4FP14J3DTexGenBlock() { - // asm void J3DTexGenBlock4::reset(J3DTexGenBlock* param_0) { - // NONMATCHING -} -#endif /* 803202DC-80320418 31AC1C 013C+00 1/0 0/0 0/0 .text * reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock */ -// vtable -#ifdef NONMATCHING void J3DTexGenBlockBasic::reset(J3DTexGenBlock* pBlock) { mTexGenNum = pBlock->getTexGenNum(); for (u32 i = 0; i < 8; i++) { @@ -2339,17 +1749,9 @@ void J3DTexGenBlockBasic::reset(J3DTexGenBlock* pBlock) { mNBTScale = *pBlock->getNBTScale(); } -#else -extern "C" void reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock() { - // asm void J3DTexGenBlockBasic::reset(J3DTexGenBlock* param_0) { - // NONMATCHING -} -#endif /* 80320418-803205D4 31AD58 01BC+00 1/0 0/0 0/0 .text reset__18J3DTevBlockPatchedFP11J3DTevBlock */ -#ifdef NONMATCHING -// vtable void J3DTevBlockPatched::reset(J3DTevBlock* pBlock) { mTevStageNum = pBlock->getTevStageNum(); for (u32 i = 0; i < 8; i++) { @@ -2366,32 +1768,16 @@ void J3DTevBlockPatched::reset(J3DTevBlock* pBlock) { mIndTevStage[i] = *pBlock->getIndTevStage(i); } } -#else -extern "C" void reset__18J3DTevBlockPatchedFP11J3DTevBlock() { - // asm void J3DTevBlockPatched::reset(J3DTevBlock* param_0) { - // NONMATCHING -} -#endif /* 803205D4-803206AC 31AF14 00D8+00 1/0 0/0 0/0 .text reset__12J3DTevBlock1FP11J3DTevBlock */ -// vtable -#ifdef NONMATCHING void J3DTevBlock1::reset(J3DTevBlock* pBlock) { mTexNo[0] = pBlock->getTexNo(0); mTevOrder[0] = *pBlock->getTevOrder(0); mTevStage[0] = *pBlock->getTevStage(0); mIndTevStage[0] = *pBlock->getIndTevStage(0); } -#else -extern "C" void reset__12J3DTevBlock1FP11J3DTevBlock() { - // asm void J3DTevBlock1::reset(J3DTevBlock* param_0) { - // NONMATCHING -} -#endif /* 803206AC-8032098C 31AFEC 02E0+00 1/0 0/0 0/0 .text reset__12J3DTevBlock2FP11J3DTevBlock */ -// vtable -#ifdef NONMATCHING void J3DTevBlock2::reset(J3DTevBlock* pBlock) { mTevStageNum = pBlock->getTevStageNum(); mTexNo[0] = pBlock->getTexNo(0); @@ -2416,16 +1802,8 @@ void J3DTevBlock2::reset(J3DTevBlock* pBlock) { mTevSwapModeTable[i] = *pBlock->getTevSwapModeTable(i); } } -#else -extern "C" void reset__12J3DTevBlock2FP11J3DTevBlock() { - // asm void J3DTevBlock2::reset(J3DTevBlock* param_0) { - // NONMATCHING -} -#endif /* 8032098C-80320E24 31B2CC 0498+00 1/0 0/0 0/0 .text reset__12J3DTevBlock4FP11J3DTevBlock */ -// vtable -#ifdef NONMATCHING void J3DTevBlock4::reset(J3DTevBlock* pBlock) { mTevStageNum = pBlock->getTevStageNum(); mTexNo[0] = pBlock->getTexNo(0); @@ -2459,16 +1837,8 @@ void J3DTevBlock4::reset(J3DTevBlock* pBlock) { for (u32 i = 0; i < 4; i++) mTevSwapModeTable[i] = *pBlock->getTevSwapModeTable(i); } -#else -extern "C" void reset__12J3DTevBlock4FP11J3DTevBlock() { - // asm void J3DTevBlock4::reset(J3DTevBlock* param_0) { - // NONMATCHING -} -#endif /* 80320E24-803210B0 31B764 028C+00 1/0 0/0 0/0 .text reset__13J3DTevBlock16FP11J3DTevBlock */ -// vtable -#ifdef NONMATCHING void J3DTevBlock16::reset(J3DTevBlock* pBlock) { mTevStageNum = pBlock->getTevStageNum(); for (u32 i = 0; i < 8; i++) { @@ -2497,16 +1867,8 @@ void J3DTevBlock16::reset(J3DTevBlock* pBlock) { mTevSwapModeTable[i] = *pBlock->getTevSwapModeTable(i); } } -#else -extern "C" void reset__13J3DTevBlock16FP11J3DTevBlock() { - // asm void J3DTevBlock16::reset(J3DTevBlock* param_0) { - // NONMATCHING -} -#endif /* 803210B0-803211B4 31B9F0 0104+00 1/0 0/0 0/0 .text reset__15J3DIndBlockFullFP11J3DIndBlock */ -// vtable -#ifdef NONMATCHING void J3DIndBlockFull::reset(J3DIndBlock* pBlock) { mIndTexStageNum = pBlock->getIndTexStageNum(); for (u32 i = 0; i < 4; i++) { @@ -2519,16 +1881,8 @@ void J3DIndBlockFull::reset(J3DIndBlock* pBlock) { mIndTexCoordScale[i] = *pBlock->getIndTexCoordScale(i); } } -#else -extern "C" void reset__15J3DIndBlockFullFP11J3DIndBlock() { - // asm void J3DIndBlockFull::reset(J3DIndBlock* param_0) { - // NONMATCHING -} -#endif /* 803211B4-8032129C 31BAF4 00E8+00 1/0 0/0 0/0 .text reset__16J3DPEBlockFogOffFP10J3DPEBlock */ -// vtable -#ifdef NONMATCHING void J3DPEBlockFogOff::reset(J3DPEBlock* pBlock) { switch (pBlock->getType()) { case 'PEFL': @@ -2540,16 +1894,8 @@ void J3DPEBlockFogOff::reset(J3DPEBlock* pBlock) { break; } } -#else -extern "C" void reset__16J3DPEBlockFogOffFP10J3DPEBlock() { - // asm void J3DPEBlockFogOff::reset(J3DPEBlock* param_0) { - // NONMATCHING -} -#endif /* 8032129C-803213C0 31BBDC 0124+00 1/0 0/0 0/0 .text reset__14J3DPEBlockFullFP10J3DPEBlock */ -// vtable -#ifdef NONMATCHING void J3DPEBlockFull::reset(J3DPEBlock* pBlock) { if (pBlock->getFog() != NULL) { mFog = *pBlock->getFog(); @@ -2565,37 +1911,6 @@ void J3DPEBlockFull::reset(J3DPEBlock* pBlock) { break; } } -#else -extern "C" void reset__14J3DPEBlockFullFP10J3DPEBlock() { - // asm void J3DPEBlockFull::reset(J3DPEBlock* param_0) { - // NONMATCHING -} -#endif - -/* ############################################################################################## */ -/* 803CDF30-803CDF60 -00001 0030+00 1/1 0/0 0/0 .data @5062 */ -SECTION_DATA static void* lit_5062[12] = { - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0x188), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0x74), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0xC8), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0xF8), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0x188), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0x13C), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0x74), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0x74), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0xC8), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0xF8), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0x13C), - (void*)(((char*)calc__21J3DTexGenBlockPatchedFPA4_Cf) + 0x13C), -}; - -/* 804563AC-804563B0 0049AC 0004+00 3/3 0/0 0/0 .sdata2 @5060 */ -SECTION_SDATA2 static u8 lit_5060[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; /* 803213C0-80321584 31BD00 01C4+00 4/0 0/0 0/0 .text calc__21J3DTexGenBlockPatchedFPA4_Cf */ void J3DTexGenBlockPatched::calc(const Mtx modelMtx) { @@ -2657,2550 +1972,134 @@ void J3DTexGenBlockPatched::calc(const Mtx modelMtx) { } } - -/* ############################################################################################## */ -/* 803CDF60-803CDF90 -00001 0030+00 1/1 0/0 0/0 .data @5110 */ -SECTION_DATA static void* lit_5110[12] = { - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x118), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x74), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x88), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xB8), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x118), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xCC), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x74), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x74), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x88), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xB8), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xCC), - (void*)(((char*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xCC), -}; - /* 80321584-803216D8 31BEC4 0154+00 4/0 0/0 0/0 .text * calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf */ -void J3DTexGenBlockPatched::calcWithoutViewMtx(f32 const (*param_0)[4]) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 803CDF90-803CDFC0 -00001 0030+00 1/1 0/0 0/0 .data @5150 */ -SECTION_DATA static void* lit_5150[12] = { - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x100), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x68), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x84), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xAC), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x100), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xC8), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x68), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x68), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x84), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xAC), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xC8), - (void*)(((char*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xC8), -}; +void J3DTexGenBlockPatched::calcWithoutViewMtx(const Mtx modelMtx) { + Mtx mtx; + for (int i = 0; i < 8; i++) { + if (mTexMtx[i] != NULL) { + u8 texMtxMode = mTexMtx[i]->getTexMtxInfo().mInfo & 0x3f; + mTexCoord[i].resetTexMtxReg(); + switch (texMtxMode) { + case J3DTexMtxMode_EnvmapBasic: + case J3DTexMtxMode_EnvmapOld: + case J3DTexMtxMode_Envmap: + mTexMtx[i]->calc(j3dDefaultMtx); + break; + case J3DTexMtxMode_ProjmapBasic: + case J3DTexMtxMode_Projmap: + if (j3dSys.checkFlag(4) == 0) { + mTexMtx[i]->calc(modelMtx); + } else { + mTexMtx[i]->calc(j3dDefaultMtx); + } + break; + case J3DTexMtxMode_ViewProjmapBasic: + case J3DTexMtxMode_ViewProjmap: + mTexMtx[i]->calc(j3dDefaultMtx); + break; + case J3DTexMtxMode_Unknown5: + case J3DTexMtxMode_EnvmapOldEffectMtx: + case J3DTexMtxMode_EnvmapEffectMtx: + if (j3dSys.checkFlag(8) == 0) { + MTXCopy(modelMtx, mtx); + mtx[0][3] = 0.0f; + mtx[1][3] = 0.0f; + mtx[2][3] = 0.0f; + mTexMtx[i]->calc(mtx); + } else { + mTexMtx[i]->calc(j3dDefaultMtx); + } + break; + default: + mTexMtx[i]->calc(j3dDefaultMtx); + break; + } + } + } +} /* 803216D8-8032181C 31C018 0144+00 4/0 0/0 0/0 .text * calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf */ -void J3DTexGenBlockPatched::calcPostTexMtx(f32 const (*param_0)[4]) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 803CDFC0-803CDFF0 -00001 0030+00 1/1 0/0 0/0 .data @5187 */ -SECTION_DATA static void* lit_5187[12] = { - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xD8), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x68), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x84), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xA0), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xD8), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xBC), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x68), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x68), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0x84), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xA0), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xBC), - (void*)(((char*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf) + 0xBC), -}; +void J3DTexGenBlockPatched::calcPostTexMtx(const Mtx modelMtx) { + Mtx mtx1, mtx2; + for (int i = 0; i < 8; i++) { + if (mTexMtx[i] != NULL) { + u8 texMtxMode = mTexMtx[i]->getTexMtxInfo().mInfo & 0x3f; + mTexCoord[i].resetTexMtxReg(); + switch (texMtxMode) { + case J3DTexMtxMode_EnvmapBasic: + case J3DTexMtxMode_EnvmapOld: + case J3DTexMtxMode_Envmap: + mTexCoord[i].setTexMtxReg(30); + mTexMtx[i]->calcPostTexMtx(j3dDefaultMtx); + break; + case J3DTexMtxMode_ProjmapBasic: + case J3DTexMtxMode_Projmap: + MTXInverse(j3dSys.getViewMtx(), mtx1); + mTexCoord[i].setTexMtxReg(0); + mTexMtx[i]->calcPostTexMtx(mtx1); + break; + case J3DTexMtxMode_ViewProjmapBasic: + case J3DTexMtxMode_ViewProjmap: + mTexCoord[i].setTexMtxReg(0); + mTexMtx[i]->calcPostTexMtx(j3dDefaultMtx); + break; + case J3DTexMtxMode_Unknown5: + case J3DTexMtxMode_EnvmapOldEffectMtx: + case J3DTexMtxMode_EnvmapEffectMtx: + MTXInverse(j3dSys.getViewMtx(), mtx2); + mtx2[0][3] = 0.0f; + mtx2[1][3] = 0.0f; + mtx2[2][3] = 0.0f; + mTexCoord[i].setTexMtxReg(30); + mTexMtx[i]->calcPostTexMtx(mtx2); + break; + default: + mTexCoord[i].setTexMtxReg(60); + mTexMtx[i]->calcPostTexMtx(j3dDefaultMtx); + break; + } + } + } +} /* 8032181C-80321938 31C15C 011C+00 4/0 0/0 0/0 .text * calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf */ +// NONMATCHING regalloc void J3DTexGenBlockPatched::calcPostTexMtxWithoutViewMtx(f32 const (*param_0)[4]) { - // NONMATCHING -} - -/* 80321938-8032193C 31C278 0004+00 1/0 1/0 0/0 .text diffTevReg__11J3DTevBlockFv */ -void J3DTevBlock::diffTevReg() { -} - -/* 8032193C-80321940 31C27C 0004+00 1/0 1/0 0/0 .text diffTevStageIndirect__11J3DTevBlockFv */ -void J3DTevBlock::diffTevStageIndirect() { -} - -/* 80321940-80321944 31C280 0004+00 1/0 1/0 0/0 .text diffTevStage__11J3DTevBlockFv */ -void J3DTevBlock::diffTevStage() { -} - -/* 80321944-80321948 31C284 0004+00 1/0 1/0 0/0 .text diffTexCoordScale__11J3DTevBlockFv - */ -void J3DTevBlock::diffTexCoordScale() { -} - -/* 80321948-8032194C 31C288 0004+00 1/0 1/0 0/0 .text diffTexNo__11J3DTevBlockFv */ -void J3DTevBlock::diffTexNo() { -} - -/* 8032194C-80321958 31C28C 000C+00 1/0 0/0 0/0 .text getType__14J3DPEBlockFullFv */ -u32 J3DPEBlockFull::getType() { - return 'PEFL'; -} - -/* 80321958-8032197C 31C298 0024+00 1/0 0/0 0/0 .text setFog__14J3DPEBlockFullFP6J3DFog - */ -void J3DPEBlockFull::setFog(J3DFog* pFog) { - mFog.setFogInfo(pFog->getFogInfo()); -} - -/* 8032197C-803219A0 31C2BC 0024+00 1/0 0/0 0/0 .text setFog__14J3DPEBlockFullF6J3DFog */ -void J3DPEBlockFull::setFog(J3DFog fog) { - mFog.setFogInfo(fog.getFogInfo()); -} - -/* 803219A0-803219A8 31C2E0 0008+00 1/0 0/0 0/0 .text getFog__14J3DPEBlockFullFv */ -J3DFog* J3DPEBlockFull::getFog() { - return &mFog; -} - -/* 803219A8-803219C4 31C2E8 001C+00 1/0 0/0 0/0 .text - * setAlphaComp__14J3DPEBlockFullFRC12J3DAlphaComp */ -void J3DPEBlockFull::setAlphaComp(J3DAlphaComp const& alphaComp) { - mAlphaComp = alphaComp; -} - -/* 803219C4-803219E0 31C304 001C+00 1/0 0/0 0/0 .text - * setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp */ -void J3DPEBlockFull::setAlphaComp(J3DAlphaComp const* alphaComp) { - mAlphaComp = *alphaComp; -} - -/* 803219E0-803219E8 31C320 0008+00 1/0 0/0 0/0 .text getAlphaComp__14J3DPEBlockFullFv */ -J3DAlphaComp* J3DPEBlockFull::getAlphaComp() { - return &mAlphaComp; -} - -/* 803219E8-803219F4 31C328 000C+00 1/0 0/0 0/0 .text setBlend__14J3DPEBlockFullFRC8J3DBlend */ -void J3DPEBlockFull::setBlend(J3DBlend const& blend) { - mBlend = blend; -} - -/* 803219F4-80321A00 31C334 000C+00 1/0 0/0 0/0 .text setBlend__14J3DPEBlockFullFPC8J3DBlend */ -void J3DPEBlockFull::setBlend(J3DBlend const* blend) { - mBlend = *blend; -} - -/* 80321A00-80321A08 31C340 0008+00 1/0 0/0 0/0 .text getBlend__14J3DPEBlockFullFv */ -J3DBlend* J3DPEBlockFull::getBlend() { - return &mBlend; -} - -/* 80321A08-80321A14 31C348 000C+00 1/0 0/0 0/0 .text setZMode__14J3DPEBlockFullF8J3DZMode */ -void J3DPEBlockFull::setZMode(J3DZMode zMode) { - mZMode = zMode; -} - -/* 80321A14-80321A20 31C354 000C+00 1/0 0/0 0/0 .text setZMode__14J3DPEBlockFullFPC8J3DZMode */ -void J3DPEBlockFull::setZMode(J3DZMode const* zMode) { - mZMode = *zMode; -} - -/* 80321A20-80321A28 31C360 0008+00 1/0 0/0 0/0 .text getZMode__14J3DPEBlockFullFv */ -J3DZMode* J3DPEBlockFull::getZMode() { - return &mZMode; -} - -/* 80321A28-80321A30 -00001 0008+00 0/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFUc */ -void J3DPEBlockFull::setZCompLoc(u8 zCompLoc) { - mZCompLoc = zCompLoc; -} - -/* 80321A30-80321A3C 31C370 000C+00 1/0 0/0 0/0 .text setZCompLoc__14J3DPEBlockFullFPCUc - */ -void J3DPEBlockFull::setZCompLoc(u8 const* zCompLoc) { - mZCompLoc = *zCompLoc; -} - -/* 80321A3C-80321A44 31C37C 0008+00 1/0 0/0 0/0 .text getZCompLoc__14J3DPEBlockFullCFv */ -u8 J3DPEBlockFull::getZCompLoc() const { - return mZCompLoc; -} - -/* 80321A44-80321A4C -00001 0008+00 0/0 0/0 0/0 .text setDither__14J3DPEBlockFullFUc */ -void J3DPEBlockFull::setDither(u8 dither) { - mDither = dither; -} - -/* 80321A4C-80321A58 31C38C 000C+00 1/0 0/0 0/0 .text setDither__14J3DPEBlockFullFPCUc */ -void J3DPEBlockFull::setDither(u8 const* dither) { - mDither = *dither; -} - -/* 80321A58-80321A60 31C398 0008+00 1/0 0/0 0/0 .text getDither__14J3DPEBlockFullCFv */ -u8 J3DPEBlockFull::getDither() const { - return mDither; -} - -/* 80321A60-80321A68 31C3A0 0008+00 1/0 0/0 0/0 .text getFogOffset__14J3DPEBlockFullCFv - */ -u32 J3DPEBlockFull::getFogOffset() const { - return mFogOffset; -} - -/* 80321A68-80321A70 -00001 0008+00 0/0 0/0 0/0 .text setFogOffset__14J3DPEBlockFullFUl - */ -void J3DPEBlockFull::setFogOffset(u32 fogOffset) { - mFogOffset = fogOffset; -} - -/* ############################################################################################## */ -/* 803CDFF0-803CE06C 02B110 007C+00 1/1 1/1 0/0 .data __vt__14J3DPEBlockFull */ -SECTION_DATA extern void* __vt__14J3DPEBlockFull[31] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__14J3DPEBlockFullFP10J3DPEBlock, - (void*)load__14J3DPEBlockFullFv, - (void*)patch__14J3DPEBlockFullFv, - (void*)diff__14J3DPEBlockFullFUl, - (void*)diffFog__14J3DPEBlockFullFv, - (void*)diffBlend__14J3DPEBlockFullFv, - (void*)countDLSize__14J3DPEBlockFullFv, - (void*)getType__14J3DPEBlockFullFv, - (void*)setFog__14J3DPEBlockFullF6J3DFog, - (void*)setFog__14J3DPEBlockFullFP6J3DFog, - (void*)getFog__14J3DPEBlockFullFv, - (void*)setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp, - (void*)setAlphaComp__14J3DPEBlockFullFRC12J3DAlphaComp, - (void*)getAlphaComp__14J3DPEBlockFullFv, - (void*)setBlend__14J3DPEBlockFullFPC8J3DBlend, - (void*)setBlend__14J3DPEBlockFullFRC8J3DBlend, - (void*)getBlend__14J3DPEBlockFullFv, - (void*)setZMode__14J3DPEBlockFullFPC8J3DZMode, - (void*)setZMode__14J3DPEBlockFullF8J3DZMode, - (void*)getZMode__14J3DPEBlockFullFv, - (void*)setZCompLoc__14J3DPEBlockFullFPCUc, - (void*)setZCompLoc__14J3DPEBlockFullFUc, - (void*)getZCompLoc__14J3DPEBlockFullCFv, - (void*)setDither__14J3DPEBlockFullFPCUc, - (void*)setDither__14J3DPEBlockFullFUc, - (void*)getDither__14J3DPEBlockFullCFv, - (void*)getFogOffset__14J3DPEBlockFullCFv, - (void*)setFogOffset__14J3DPEBlockFullFUl, - (void*)__dt__14J3DPEBlockFullFv, -}; - -/* 80321A70-80321ACC 31C3B0 005C+00 1/0 0/0 0/0 .text __dt__14J3DPEBlockFullFv */ -J3DPEBlockFull::~J3DPEBlockFull() {} - -/* 80321ACC-80321B00 31C40C 0034+00 1/0 0/0 0/0 .text diff__16J3DPEBlockFogOffFUl */ -void J3DPEBlockFogOff::diff(u32 param_1) { - if ((param_1 & 0x20000000) != 0) { - diffBlend(); + for (int i = 0; i < 8; i++) { + if (mTexMtx[i] != NULL) { + u8 texMtxMode = mTexMtx[i]->getTexMtxInfo().mInfo & 0x3f; + mTexCoord[i].resetTexMtxReg(); + switch (texMtxMode) { + case J3DTexMtxMode_EnvmapBasic: + case J3DTexMtxMode_EnvmapOld: + case J3DTexMtxMode_Envmap: + mTexCoord[i].setTexMtxReg(30); + mTexMtx[i]->calcPostTexMtx(j3dDefaultMtx); + break; + case J3DTexMtxMode_ProjmapBasic: + case J3DTexMtxMode_Projmap: + mTexCoord[i].setTexMtxReg(0); + mTexMtx[i]->calcPostTexMtx(j3dDefaultMtx); + break; + case J3DTexMtxMode_ViewProjmapBasic: + case J3DTexMtxMode_ViewProjmap: + mTexCoord[i].setTexMtxReg(0); + mTexMtx[i]->calcPostTexMtx(j3dDefaultMtx); + break; + case J3DTexMtxMode_Unknown5: + case J3DTexMtxMode_EnvmapOldEffectMtx: + case J3DTexMtxMode_EnvmapEffectMtx: + mTexCoord[i].setTexMtxReg(30); + mTexMtx[i]->calcPostTexMtx(j3dDefaultMtx); + break; + default: + mTexCoord[i].setTexMtxReg(60); + mTexMtx[i]->calcPostTexMtx(j3dDefaultMtx); + break; + } + } } } - -/* 80321B00-80321B0C 31C440 000C+00 1/0 0/0 0/0 .text getType__16J3DPEBlockFogOffFv */ -u32 J3DPEBlockFogOff::getType() { - return 'PEFG'; -} - -/* 80321B0C-80321B28 31C44C 001C+00 1/0 0/0 0/0 .text - * setAlphaComp__16J3DPEBlockFogOffFRC12J3DAlphaComp */ -void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp const& alphaComp) { - mAlphaComp = alphaComp; -} - -/* 80321B28-80321B44 31C468 001C+00 1/0 0/0 0/0 .text - * setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp */ -void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp const* alphaComp) { - mAlphaComp = *alphaComp; -} - -/* 80321B44-80321B4C 31C484 0008+00 1/0 0/0 0/0 .text getAlphaComp__16J3DPEBlockFogOffFv - */ -J3DAlphaComp* J3DPEBlockFogOff::getAlphaComp() { - return &mAlphaComp; -} - -/* 80321B4C-80321B58 31C48C 000C+00 1/0 0/0 0/0 .text setBlend__16J3DPEBlockFogOffFRC8J3DBlend */ -void J3DPEBlockFogOff::setBlend(J3DBlend const& blend) { - mBlend = blend; -} - -/* 80321B58-80321B64 31C498 000C+00 1/0 0/0 0/0 .text setBlend__16J3DPEBlockFogOffFPC8J3DBlend */ -void J3DPEBlockFogOff::setBlend(J3DBlend const* blend) { - mBlend = *blend; -} - -/* 80321B64-80321B6C 31C4A4 0008+00 1/0 0/0 0/0 .text getBlend__16J3DPEBlockFogOffFv */ -J3DBlend* J3DPEBlockFogOff::getBlend() { - return &mBlend; -} - -/* 80321B6C-80321B78 31C4AC 000C+00 1/0 0/0 0/0 .text setZMode__16J3DPEBlockFogOffF8J3DZMode */ -void J3DPEBlockFogOff::setZMode(J3DZMode zMode) { - mZMode = zMode; -} - -/* 80321B78-80321B84 31C4B8 000C+00 1/0 0/0 0/0 .text setZMode__16J3DPEBlockFogOffFPC8J3DZMode */ -void J3DPEBlockFogOff::setZMode(J3DZMode const* zMode) { - mZMode = *zMode; -} - -/* 80321B84-80321B8C 31C4C4 0008+00 1/0 0/0 0/0 .text getZMode__16J3DPEBlockFogOffFv */ -J3DZMode* J3DPEBlockFogOff::getZMode() { - return &mZMode; -} - -/* 80321B8C-80321B94 -00001 0008+00 0/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFUc - */ -void J3DPEBlockFogOff::setZCompLoc(u8 zCompLoc) { - mZCompLoc = zCompLoc; -} - -/* 80321B94-80321BA0 31C4D4 000C+00 1/0 0/0 0/0 .text setZCompLoc__16J3DPEBlockFogOffFPCUc */ -void J3DPEBlockFogOff::setZCompLoc(u8 const* zCompLoc) { - mZCompLoc = *zCompLoc; -} - -/* 80321BA0-80321BA8 31C4E0 0008+00 1/0 0/0 0/0 .text getZCompLoc__16J3DPEBlockFogOffCFv - */ -u8 J3DPEBlockFogOff::getZCompLoc() const { - return mZCompLoc; -} - -/* 80321BA8-80321BB0 -00001 0008+00 0/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFUc */ -void J3DPEBlockFogOff::setDither(u8 dither) { - mDither = dither; -} - -/* 80321BB0-80321BBC 31C4F0 000C+00 1/0 0/0 0/0 .text setDither__16J3DPEBlockFogOffFPCUc - */ -void J3DPEBlockFogOff::setDither(u8 const* dither) { - mDither = *dither; -} - -/* 80321BBC-80321BC4 31C4FC 0008+00 1/0 0/0 0/0 .text getDither__16J3DPEBlockFogOffCFv */ -u8 J3DPEBlockFogOff::getDither() const { - return mDither; -} - -/* ############################################################################################## */ -/* 803CE06C-803CE0E8 02B18C 007C+00 1/1 1/1 0/0 .data __vt__16J3DPEBlockFogOff */ -SECTION_DATA extern void* __vt__16J3DPEBlockFogOff[31] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__16J3DPEBlockFogOffFP10J3DPEBlock, - (void*)load__16J3DPEBlockFogOffFv, - (void*)patch__10J3DPEBlockFv, - (void*)diff__16J3DPEBlockFogOffFUl, - (void*)diffFog__10J3DPEBlockFv, - (void*)diffBlend__16J3DPEBlockFogOffFv, - (void*)countDLSize__16J3DPEBlockFogOffFv, - (void*)getType__16J3DPEBlockFogOffFv, - (void*)setFog__10J3DPEBlockF6J3DFog, - (void*)setFog__10J3DPEBlockFP6J3DFog, - (void*)getFog__10J3DPEBlockFv, - (void*)setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp, - (void*)setAlphaComp__16J3DPEBlockFogOffFRC12J3DAlphaComp, - (void*)getAlphaComp__16J3DPEBlockFogOffFv, - (void*)setBlend__16J3DPEBlockFogOffFPC8J3DBlend, - (void*)setBlend__16J3DPEBlockFogOffFRC8J3DBlend, - (void*)getBlend__16J3DPEBlockFogOffFv, - (void*)setZMode__16J3DPEBlockFogOffFPC8J3DZMode, - (void*)setZMode__16J3DPEBlockFogOffF8J3DZMode, - (void*)getZMode__16J3DPEBlockFogOffFv, - (void*)setZCompLoc__16J3DPEBlockFogOffFPCUc, - (void*)setZCompLoc__16J3DPEBlockFogOffFUc, - (void*)getZCompLoc__16J3DPEBlockFogOffCFv, - (void*)setDither__16J3DPEBlockFogOffFPCUc, - (void*)setDither__16J3DPEBlockFogOffFUc, - (void*)getDither__16J3DPEBlockFogOffCFv, - (void*)getFogOffset__10J3DPEBlockCFv, - (void*)setFogOffset__10J3DPEBlockFUl, - (void*)__dt__16J3DPEBlockFogOffFv, -}; - -/* 80321BC4-80321C20 31C504 005C+00 1/0 0/0 0/0 .text __dt__16J3DPEBlockFogOffFv */ -J3DPEBlockFogOff::~J3DPEBlockFogOff() {} - -/* 80321C20-80321C44 31C560 0024+00 1/0 0/0 0/0 .text indexToPtr__13J3DTevBlock16Fv */ -void J3DTevBlock16::indexToPtr() { - indexToPtr_private(mTexNoOffset); -} - -/* 80321C44-80321C50 31C584 000C+00 1/0 0/0 0/0 .text getType__13J3DTevBlock16Fv */ -u32 J3DTevBlock16::getType() { - return 'TV16'; -} - -/* 80321C50-80321C60 31C590 0010+00 1/0 0/0 0/0 .text setTexNo__13J3DTevBlock16FUlUs */ -void J3DTevBlock16::setTexNo(u32 param_1, u16 param_2) { - mTexNo[param_1] = param_2; -} - -/* 80321C60-80321C74 31C5A0 0014+00 1/0 0/0 0/0 .text setTexNo__13J3DTevBlock16FUlPCUs */ -void J3DTevBlock16::setTexNo(u32 param_0, u16 const* param_1) { - // NONMATCHING -} - -/* 80321C74-80321C84 31C5B4 0010+00 1/0 0/0 0/0 .text getTexNo__13J3DTevBlock16CFUl */ -u16 J3DTevBlock16::getTexNo(u32 param_0) const { - // NONMATCHING -} - -/* 80321C84-80321C98 31C5C4 0014+00 1/0 0/0 0/0 .text setTevOrder__13J3DTevBlock16FUl11J3DTevOrder - */ -void J3DTevBlock16::setTevOrder(u32 param_0, J3DTevOrder param_1) { - // NONMATCHING -} - -/* 80321C98-80321CAC 31C5D8 0014+00 1/0 0/0 0/0 .text - * setTevOrder__13J3DTevBlock16FUlPC11J3DTevOrder */ -void J3DTevBlock16::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { - // NONMATCHING -} - -/* 80321CAC-80321CC0 31C5EC 0014+00 1/0 0/0 0/0 .text getTevOrder__13J3DTevBlock16FUl */ -J3DTevOrder* J3DTevBlock16::getTevOrder(u32 param_0) { - // NONMATCHING -} - -/* 80321CC0-80321CEC 31C600 002C+00 1/0 0/0 0/0 .text - * setTevColor__13J3DTevBlock16FUl13J3DGXColorS10 */ -void J3DTevBlock16::setTevColor(u32 param_0, J3DGXColorS10 param_1) { - // NONMATCHING -} - -/* 80321CEC-80321D18 31C62C 002C+00 1/0 0/0 0/0 .text - * setTevColor__13J3DTevBlock16FUlPC13J3DGXColorS10 */ -void J3DTevBlock16::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { - // NONMATCHING -} - -/* 80321D18-80321D2C 31C658 0014+00 1/0 0/0 0/0 .text getTevColor__13J3DTevBlock16FUl */ -J3DGXColorS10* J3DTevBlock16::getTevColor(u32 param_0) { - // NONMATCHING -} - -/* 80321D2C-80321D58 31C66C 002C+00 1/0 0/0 0/0 .text setTevKColor__13J3DTevBlock16FUl10J3DGXColor - */ -void J3DTevBlock16::setTevKColor(u32 param_0, J3DGXColor param_1) { - // NONMATCHING -} - -/* 80321D58-80321D84 31C698 002C+00 1/0 0/0 0/0 .text - * setTevKColor__13J3DTevBlock16FUlPC10J3DGXColor */ -void J3DTevBlock16::setTevKColor(u32 param_0, J3DGXColor const* param_1) { - // NONMATCHING -} - -/* 80321D84-80321D98 31C6C4 0014+00 1/0 0/0 0/0 .text getTevKColor__13J3DTevBlock16FUl */ -J3DGXColor* J3DTevBlock16::getTevKColor(u32 param_0) { - // NONMATCHING -} - -/* 80321D98-80321DA4 31C6D8 000C+00 1/0 0/0 0/0 .text setTevKColorSel__13J3DTevBlock16FUlUc */ -void J3DTevBlock16::setTevKColorSel(u32 param_0, u8 param_1) { - // NONMATCHING -} - -/* 80321DA4-80321DB4 31C6E4 0010+00 1/0 0/0 0/0 .text setTevKColorSel__13J3DTevBlock16FUlPCUc */ -void J3DTevBlock16::setTevKColorSel(u32 param_0, u8 const* param_1) { - // NONMATCHING -} - -/* 80321DB4-80321DC0 31C6F4 000C+00 1/0 0/0 0/0 .text getTevKColorSel__13J3DTevBlock16FUl - */ -bool J3DTevBlock16::getTevKColorSel(u32 param_0) { - // NONMATCHING -} - -/* 80321DC0-80321DCC 31C700 000C+00 1/0 0/0 0/0 .text setTevKAlphaSel__13J3DTevBlock16FUlUc */ -void J3DTevBlock16::setTevKAlphaSel(u32 param_0, u8 param_1) { - // NONMATCHING -} - -/* 80321DCC-80321DDC 31C70C 0010+00 1/0 0/0 0/0 .text setTevKAlphaSel__13J3DTevBlock16FUlPCUc */ -void J3DTevBlock16::setTevKAlphaSel(u32 param_0, u8 const* param_1) { - // NONMATCHING -} - -/* 80321DDC-80321DE8 31C71C 000C+00 1/0 0/0 0/0 .text getTevKAlphaSel__13J3DTevBlock16FUl - */ -bool J3DTevBlock16::getTevKAlphaSel(u32 param_0) { - // NONMATCHING -} - -/* 80321DE8-80321DF0 -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__13J3DTevBlock16FUc - */ -void J3DTevBlock16::setTevStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 88) /* this->field_0x58 */ = (u8)(param_0); -} - -/* 80321DF0-80321DFC 31C730 000C+00 1/0 0/0 0/0 .text setTevStageNum__13J3DTevBlock16FPCUc */ -void J3DTevBlock16::setTevStageNum(u8 const* param_0) { - // NONMATCHING -} - -/* 80321DFC-80321E04 31C73C 0008+00 1/0 0/0 0/0 .text getTevStageNum__13J3DTevBlock16CFv - */ -u8 J3DTevBlock16::getTevStageNum() const { - // NONMATCHING -} - -/* 80321E04-80321E40 31C744 003C+00 1/0 0/0 0/0 .text setTevStage__13J3DTevBlock16FUl11J3DTevStage - */ -void J3DTevBlock16::setTevStage(u32 param_0, J3DTevStage param_1) { - // NONMATCHING -} - -/* 80321E40-80321E7C 31C780 003C+00 1/0 0/0 0/0 .text - * setTevStage__13J3DTevBlock16FUlPC11J3DTevStage */ -void J3DTevBlock16::setTevStage(u32 param_0, J3DTevStage const* param_1) { - // NONMATCHING -} - -/* 80321E7C-80321E90 31C7BC 0014+00 1/0 0/0 0/0 .text getTevStage__13J3DTevBlock16FUl */ -J3DTevStage* J3DTevBlock16::getTevStage(u32 param_0) { - // NONMATCHING -} - -/* 80321E90-80321EC8 31C7D0 0038+00 1/0 0/0 0/0 .text - * setTevSwapModeInfo__13J3DTevBlock16FUl18J3DTevSwapModeInfo */ -void J3DTevBlock16::setTevSwapModeInfo(u32 param_0, J3DTevSwapModeInfo param_1) { - // NONMATCHING -} - -/* 80321EC8-80321F00 31C808 0038+00 1/0 0/0 0/0 .text - * setTevSwapModeInfo__13J3DTevBlock16FUlPC18J3DTevSwapModeInfo */ -void J3DTevBlock16::setTevSwapModeInfo(u32 param_0, J3DTevSwapModeInfo const* param_1) { - // NONMATCHING -} - -/* 80321F00-80321F10 31C840 0010+00 1/0 0/0 0/0 .text - * setTevSwapModeTable__13J3DTevBlock16FUl19J3DTevSwapModeTable */ -void J3DTevBlock16::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable param_1) { - // NONMATCHING -} - -/* 80321F10-80321F20 31C850 0010+00 1/0 0/0 0/0 .text - * setTevSwapModeTable__13J3DTevBlock16FUlPC19J3DTevSwapModeTable */ -void J3DTevBlock16::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable const* param_1) { - // NONMATCHING -} - -/* 80321F20-80321F30 31C860 0010+00 1/0 0/0 0/0 .text getTevSwapModeTable__13J3DTevBlock16FUl */ -J3DTevSwapModeTable* J3DTevBlock16::getTevSwapModeTable(u32 param_0) { - // NONMATCHING -} - -/* 80321F30-80321F44 31C870 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__13J3DTevBlock16FUl14J3DIndTevStage */ -void J3DTevBlock16::setIndTevStage(u32 param_0, J3DIndTevStage param_1) { - // NONMATCHING -} - -/* 80321F44-80321F58 31C884 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__13J3DTevBlock16FUlPC14J3DIndTevStage */ -void J3DTevBlock16::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1) { - // NONMATCHING -} - -/* 80321F58-80321F6C 31C898 0014+00 1/0 0/0 0/0 .text getIndTevStage__13J3DTevBlock16FUl - */ -J3DIndTevStage* J3DTevBlock16::getIndTevStage(u32 param_0) { - // NONMATCHING -} - -/* 80321F6C-80321F74 31C8AC 0008+00 1/0 0/0 0/0 .text getTexNoOffset__13J3DTevBlock16CFv - */ -u32 J3DTevBlock16::getTexNoOffset() const { - // NONMATCHING -} - -/* 80321F74-80321F7C 31C8B4 0008+00 1/0 0/0 0/0 .text getTevRegOffset__13J3DTevBlock16CFv - */ -bool J3DTevBlock16::getTevRegOffset() const { - // NONMATCHING -} - -/* 80321F7C-80321F84 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__13J3DTevBlock16FUl - */ -void J3DTevBlock16::setTevRegOffset(u32 param_0) { - *(u32*)(((u8*)this) + 368) /* this->field_0x170 */ = (u32)(param_0); -} - -/* ############################################################################################## */ -/* 803CE0E8-803CE1C4 02B208 00DC+00 1/1 1/1 0/0 .data __vt__13J3DTevBlock16 */ -SECTION_DATA extern void* __vt__13J3DTevBlock16[55] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__13J3DTevBlock16FP11J3DTevBlock, - (void*)load__13J3DTevBlock16Fv, - (void*)diff__11J3DTevBlockFUl, - (void*)diffTexNo__13J3DTevBlock16Fv, - (void*)diffTevReg__13J3DTevBlock16Fv, - (void*)diffTexCoordScale__13J3DTevBlock16Fv, - (void*)diffTevStage__13J3DTevBlock16Fv, - (void*)diffTevStageIndirect__13J3DTevBlock16Fv, - (void*)patch__13J3DTevBlock16Fv, - (void*)patchTexNo__13J3DTevBlock16Fv, - (void*)patchTevReg__13J3DTevBlock16Fv, - (void*)patchTexNoAndTexCoordScale__13J3DTevBlock16Fv, - (void*)ptrToIndex__13J3DTevBlock16Fv, - (void*)indexToPtr__13J3DTevBlock16Fv, - (void*)getType__13J3DTevBlock16Fv, - (void*)countDLSize__13J3DTevBlock16Fv, - (void*)setTexNo__13J3DTevBlock16FUlPCUs, - (void*)setTexNo__13J3DTevBlock16FUlUs, - (void*)getTexNo__13J3DTevBlock16CFUl, - (void*)setTevOrder__13J3DTevBlock16FUlPC11J3DTevOrder, - (void*)setTevOrder__13J3DTevBlock16FUl11J3DTevOrder, - (void*)getTevOrder__13J3DTevBlock16FUl, - (void*)setTevColor__13J3DTevBlock16FUlPC13J3DGXColorS10, - (void*)setTevColor__13J3DTevBlock16FUl13J3DGXColorS10, - (void*)getTevColor__13J3DTevBlock16FUl, - (void*)setTevKColor__13J3DTevBlock16FUlPC10J3DGXColor, - (void*)setTevKColor__13J3DTevBlock16FUl10J3DGXColor, - (void*)getTevKColor__13J3DTevBlock16FUl, - (void*)setTevKColorSel__13J3DTevBlock16FUlPCUc, - (void*)setTevKColorSel__13J3DTevBlock16FUlUc, - (void*)getTevKColorSel__13J3DTevBlock16FUl, - (void*)setTevKAlphaSel__13J3DTevBlock16FUlPCUc, - (void*)setTevKAlphaSel__13J3DTevBlock16FUlUc, - (void*)getTevKAlphaSel__13J3DTevBlock16FUl, - (void*)setTevStageNum__13J3DTevBlock16FPCUc, - (void*)setTevStageNum__13J3DTevBlock16FUc, - (void*)getTevStageNum__13J3DTevBlock16CFv, - (void*)setTevStage__13J3DTevBlock16FUlPC11J3DTevStage, - (void*)setTevStage__13J3DTevBlock16FUl11J3DTevStage, - (void*)getTevStage__13J3DTevBlock16FUl, - (void*)setTevSwapModeInfo__13J3DTevBlock16FUlPC18J3DTevSwapModeInfo, - (void*)setTevSwapModeInfo__13J3DTevBlock16FUl18J3DTevSwapModeInfo, - (void*)setTevSwapModeTable__13J3DTevBlock16FUlPC19J3DTevSwapModeTable, - (void*)setTevSwapModeTable__13J3DTevBlock16FUl19J3DTevSwapModeTable, - (void*)getTevSwapModeTable__13J3DTevBlock16FUl, - (void*)setIndTevStage__13J3DTevBlock16FUlPC14J3DIndTevStage, - (void*)setIndTevStage__13J3DTevBlock16FUl14J3DIndTevStage, - (void*)getIndTevStage__13J3DTevBlock16FUl, - (void*)getTexNoOffset__13J3DTevBlock16CFv, - (void*)getTevRegOffset__13J3DTevBlock16CFv, - (void*)setTexNoOffset__11J3DTevBlockFUl, - (void*)setTevRegOffset__13J3DTevBlock16FUl, - (void*)__dt__13J3DTevBlock16Fv, -}; - -/* 803CE1C4-803CE2A0 02B2E4 00DC+00 1/1 1/1 0/0 .data __vt__12J3DTevBlock4 */ -SECTION_DATA extern void* __vt__12J3DTevBlock4[55] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__12J3DTevBlock4FP11J3DTevBlock, - (void*)load__12J3DTevBlock4Fv, - (void*)diff__11J3DTevBlockFUl, - (void*)diffTexNo__12J3DTevBlock4Fv, - (void*)diffTevReg__12J3DTevBlock4Fv, - (void*)diffTexCoordScale__12J3DTevBlock4Fv, - (void*)diffTevStage__12J3DTevBlock4Fv, - (void*)diffTevStageIndirect__12J3DTevBlock4Fv, - (void*)patch__12J3DTevBlock4Fv, - (void*)patchTexNo__12J3DTevBlock4Fv, - (void*)patchTevReg__12J3DTevBlock4Fv, - (void*)patchTexNoAndTexCoordScale__12J3DTevBlock4Fv, - (void*)ptrToIndex__12J3DTevBlock4Fv, - (void*)indexToPtr__12J3DTevBlock4Fv, - (void*)getType__12J3DTevBlock4Fv, - (void*)countDLSize__12J3DTevBlock4Fv, - (void*)setTexNo__12J3DTevBlock4FUlPCUs, - (void*)setTexNo__12J3DTevBlock4FUlUs, - (void*)getTexNo__12J3DTevBlock4CFUl, - (void*)setTevOrder__12J3DTevBlock4FUlPC11J3DTevOrder, - (void*)setTevOrder__12J3DTevBlock4FUl11J3DTevOrder, - (void*)getTevOrder__12J3DTevBlock4FUl, - (void*)setTevColor__12J3DTevBlock4FUlPC13J3DGXColorS10, - (void*)setTevColor__12J3DTevBlock4FUl13J3DGXColorS10, - (void*)getTevColor__12J3DTevBlock4FUl, - (void*)setTevKColor__12J3DTevBlock4FUlPC10J3DGXColor, - (void*)setTevKColor__12J3DTevBlock4FUl10J3DGXColor, - (void*)getTevKColor__12J3DTevBlock4FUl, - (void*)setTevKColorSel__12J3DTevBlock4FUlPCUc, - (void*)setTevKColorSel__12J3DTevBlock4FUlUc, - (void*)getTevKColorSel__12J3DTevBlock4FUl, - (void*)setTevKAlphaSel__12J3DTevBlock4FUlPCUc, - (void*)setTevKAlphaSel__12J3DTevBlock4FUlUc, - (void*)getTevKAlphaSel__12J3DTevBlock4FUl, - (void*)setTevStageNum__12J3DTevBlock4FPCUc, - (void*)setTevStageNum__12J3DTevBlock4FUc, - (void*)getTevStageNum__12J3DTevBlock4CFv, - (void*)setTevStage__12J3DTevBlock4FUlPC11J3DTevStage, - (void*)setTevStage__12J3DTevBlock4FUl11J3DTevStage, - (void*)getTevStage__12J3DTevBlock4FUl, - (void*)setTevSwapModeInfo__12J3DTevBlock4FUlPC18J3DTevSwapModeInfo, - (void*)setTevSwapModeInfo__12J3DTevBlock4FUl18J3DTevSwapModeInfo, - (void*)setTevSwapModeTable__12J3DTevBlock4FUlPC19J3DTevSwapModeTable, - (void*)setTevSwapModeTable__12J3DTevBlock4FUl19J3DTevSwapModeTable, - (void*)getTevSwapModeTable__12J3DTevBlock4FUl, - (void*)setIndTevStage__12J3DTevBlock4FUlPC14J3DIndTevStage, - (void*)setIndTevStage__12J3DTevBlock4FUl14J3DIndTevStage, - (void*)getIndTevStage__12J3DTevBlock4FUl, - (void*)getTexNoOffset__12J3DTevBlock4CFv, - (void*)getTevRegOffset__12J3DTevBlock4CFv, - (void*)setTexNoOffset__11J3DTevBlockFUl, - (void*)setTevRegOffset__12J3DTevBlock4FUl, - (void*)__dt__12J3DTevBlock4Fv, -}; - -/* 803CE2A0-803CE37C 02B3C0 00DC+00 1/1 1/1 0/0 .data __vt__12J3DTevBlock2 */ -SECTION_DATA extern void* __vt__12J3DTevBlock2[55] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__12J3DTevBlock2FP11J3DTevBlock, - (void*)load__12J3DTevBlock2Fv, - (void*)diff__11J3DTevBlockFUl, - (void*)diffTexNo__12J3DTevBlock2Fv, - (void*)diffTevReg__12J3DTevBlock2Fv, - (void*)diffTexCoordScale__12J3DTevBlock2Fv, - (void*)diffTevStage__12J3DTevBlock2Fv, - (void*)diffTevStageIndirect__12J3DTevBlock2Fv, - (void*)patch__12J3DTevBlock2Fv, - (void*)patchTexNo__12J3DTevBlock2Fv, - (void*)patchTevReg__12J3DTevBlock2Fv, - (void*)patchTexNoAndTexCoordScale__12J3DTevBlock2Fv, - (void*)ptrToIndex__12J3DTevBlock2Fv, - (void*)indexToPtr__12J3DTevBlock2Fv, - (void*)getType__12J3DTevBlock2Fv, - (void*)countDLSize__12J3DTevBlock2Fv, - (void*)setTexNo__12J3DTevBlock2FUlPCUs, - (void*)setTexNo__12J3DTevBlock2FUlUs, - (void*)getTexNo__12J3DTevBlock2CFUl, - (void*)setTevOrder__12J3DTevBlock2FUlPC11J3DTevOrder, - (void*)setTevOrder__12J3DTevBlock2FUl11J3DTevOrder, - (void*)getTevOrder__12J3DTevBlock2FUl, - (void*)setTevColor__12J3DTevBlock2FUlPC13J3DGXColorS10, - (void*)setTevColor__12J3DTevBlock2FUl13J3DGXColorS10, - (void*)getTevColor__12J3DTevBlock2FUl, - (void*)setTevKColor__12J3DTevBlock2FUlPC10J3DGXColor, - (void*)setTevKColor__12J3DTevBlock2FUl10J3DGXColor, - (void*)getTevKColor__12J3DTevBlock2FUl, - (void*)setTevKColorSel__12J3DTevBlock2FUlPCUc, - (void*)setTevKColorSel__12J3DTevBlock2FUlUc, - (void*)getTevKColorSel__12J3DTevBlock2FUl, - (void*)setTevKAlphaSel__12J3DTevBlock2FUlPCUc, - (void*)setTevKAlphaSel__12J3DTevBlock2FUlUc, - (void*)getTevKAlphaSel__12J3DTevBlock2FUl, - (void*)setTevStageNum__12J3DTevBlock2FPCUc, - (void*)setTevStageNum__12J3DTevBlock2FUc, - (void*)getTevStageNum__12J3DTevBlock2CFv, - (void*)setTevStage__12J3DTevBlock2FUlPC11J3DTevStage, - (void*)setTevStage__12J3DTevBlock2FUl11J3DTevStage, - (void*)getTevStage__12J3DTevBlock2FUl, - (void*)setTevSwapModeInfo__12J3DTevBlock2FUlPC18J3DTevSwapModeInfo, - (void*)setTevSwapModeInfo__12J3DTevBlock2FUl18J3DTevSwapModeInfo, - (void*)setTevSwapModeTable__12J3DTevBlock2FUlPC19J3DTevSwapModeTable, - (void*)setTevSwapModeTable__12J3DTevBlock2FUl19J3DTevSwapModeTable, - (void*)getTevSwapModeTable__12J3DTevBlock2FUl, - (void*)setIndTevStage__12J3DTevBlock2FUlPC14J3DIndTevStage, - (void*)setIndTevStage__12J3DTevBlock2FUl14J3DIndTevStage, - (void*)getIndTevStage__12J3DTevBlock2FUl, - (void*)getTexNoOffset__12J3DTevBlock2CFv, - (void*)getTevRegOffset__12J3DTevBlock2CFv, - (void*)setTexNoOffset__11J3DTevBlockFUl, - (void*)setTevRegOffset__12J3DTevBlock2FUl, - (void*)__dt__12J3DTevBlock2Fv, -}; - -/* 803CE37C-803CE458 02B49C 00DC+00 1/1 1/1 0/0 .data __vt__12J3DTevBlock1 */ -SECTION_DATA extern void* __vt__12J3DTevBlock1[55] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__12J3DTevBlock1FP11J3DTevBlock, - (void*)load__12J3DTevBlock1Fv, - (void*)diff__11J3DTevBlockFUl, - (void*)diffTexNo__12J3DTevBlock1Fv, - (void*)diffTevReg__12J3DTevBlock1Fv, - (void*)diffTexCoordScale__12J3DTevBlock1Fv, - (void*)diffTevStage__12J3DTevBlock1Fv, - (void*)diffTevStageIndirect__12J3DTevBlock1Fv, - (void*)patch__12J3DTevBlock1Fv, - (void*)patchTexNo__12J3DTevBlock1Fv, - (void*)patchTevReg__12J3DTevBlock1Fv, - (void*)patchTexNoAndTexCoordScale__12J3DTevBlock1Fv, - (void*)ptrToIndex__12J3DTevBlock1Fv, - (void*)indexToPtr__12J3DTevBlock1Fv, - (void*)getType__12J3DTevBlock1Fv, - (void*)countDLSize__12J3DTevBlock1Fv, - (void*)setTexNo__12J3DTevBlock1FUlPCUs, - (void*)setTexNo__12J3DTevBlock1FUlUs, - (void*)getTexNo__12J3DTevBlock1CFUl, - (void*)setTevOrder__12J3DTevBlock1FUlPC11J3DTevOrder, - (void*)setTevOrder__12J3DTevBlock1FUl11J3DTevOrder, - (void*)getTevOrder__12J3DTevBlock1FUl, - (void*)setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10, - (void*)setTevColor__11J3DTevBlockFUl13J3DGXColorS10, - (void*)getTevColor__11J3DTevBlockFUl, - (void*)setTevKColor__11J3DTevBlockFUlPC10J3DGXColor, - (void*)setTevKColor__11J3DTevBlockFUl10J3DGXColor, - (void*)getTevKColor__11J3DTevBlockFUl, - (void*)setTevKColorSel__11J3DTevBlockFUlPCUc, - (void*)setTevKColorSel__11J3DTevBlockFUlUc, - (void*)getTevKColorSel__11J3DTevBlockFUl, - (void*)setTevKAlphaSel__11J3DTevBlockFUlPCUc, - (void*)setTevKAlphaSel__11J3DTevBlockFUlUc, - (void*)getTevKAlphaSel__11J3DTevBlockFUl, - (void*)setTevStageNum__12J3DTevBlock1FPCUc, - (void*)setTevStageNum__12J3DTevBlock1FUc, - (void*)getTevStageNum__12J3DTevBlock1CFv, - (void*)setTevStage__12J3DTevBlock1FUlPC11J3DTevStage, - (void*)setTevStage__12J3DTevBlock1FUl11J3DTevStage, - (void*)getTevStage__12J3DTevBlock1FUl, - (void*)setTevSwapModeInfo__11J3DTevBlockFUlPC18J3DTevSwapModeInfo, - (void*)setTevSwapModeInfo__11J3DTevBlockFUl18J3DTevSwapModeInfo, - (void*)setTevSwapModeTable__11J3DTevBlockFUlPC19J3DTevSwapModeTable, - (void*)setTevSwapModeTable__11J3DTevBlockFUl19J3DTevSwapModeTable, - (void*)getTevSwapModeTable__11J3DTevBlockFUl, - (void*)setIndTevStage__12J3DTevBlock1FUlPC14J3DIndTevStage, - (void*)setIndTevStage__12J3DTevBlock1FUl14J3DIndTevStage, - (void*)getIndTevStage__12J3DTevBlock1FUl, - (void*)getTexNoOffset__12J3DTevBlock1CFv, - (void*)getTevRegOffset__11J3DTevBlockCFv, - (void*)setTexNoOffset__11J3DTevBlockFUl, - (void*)setTevRegOffset__11J3DTevBlockFUl, - (void*)__dt__12J3DTevBlock1Fv, -}; - -/* 803CE458-803CE534 02B578 00DC+00 1/1 1/1 0/0 .data __vt__18J3DTevBlockPatched */ -SECTION_DATA extern void* __vt__18J3DTevBlockPatched[55] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__18J3DTevBlockPatchedFP11J3DTevBlock, - (void*)load__18J3DTevBlockPatchedFv, - (void*)diff__11J3DTevBlockFUl, - (void*)diffTexNo__18J3DTevBlockPatchedFv, - (void*)diffTevReg__18J3DTevBlockPatchedFv, - (void*)diffTexCoordScale__18J3DTevBlockPatchedFv, - (void*)diffTevStage__18J3DTevBlockPatchedFv, - (void*)diffTevStageIndirect__18J3DTevBlockPatchedFv, - (void*)patch__18J3DTevBlockPatchedFv, - (void*)patchTexNo__18J3DTevBlockPatchedFv, - (void*)patchTevReg__18J3DTevBlockPatchedFv, - (void*)patchTexNoAndTexCoordScale__18J3DTevBlockPatchedFv, - (void*)ptrToIndex__18J3DTevBlockPatchedFv, - (void*)indexToPtr__18J3DTevBlockPatchedFv, - (void*)getType__18J3DTevBlockPatchedFv, - (void*)countDLSize__18J3DTevBlockPatchedFv, - (void*)setTexNo__18J3DTevBlockPatchedFUlPCUs, - (void*)setTexNo__18J3DTevBlockPatchedFUlUs, - (void*)getTexNo__18J3DTevBlockPatchedCFUl, - (void*)setTevOrder__18J3DTevBlockPatchedFUlPC11J3DTevOrder, - (void*)setTevOrder__18J3DTevBlockPatchedFUl11J3DTevOrder, - (void*)getTevOrder__18J3DTevBlockPatchedFUl, - (void*)setTevColor__18J3DTevBlockPatchedFUlPC13J3DGXColorS10, - (void*)setTevColor__18J3DTevBlockPatchedFUl13J3DGXColorS10, - (void*)getTevColor__18J3DTevBlockPatchedFUl, - (void*)setTevKColor__18J3DTevBlockPatchedFUlPC10J3DGXColor, - (void*)setTevKColor__18J3DTevBlockPatchedFUl10J3DGXColor, - (void*)getTevKColor__18J3DTevBlockPatchedFUl, - (void*)setTevKColorSel__18J3DTevBlockPatchedFUlPCUc, - (void*)setTevKColorSel__18J3DTevBlockPatchedFUlUc, - (void*)getTevKColorSel__18J3DTevBlockPatchedFUl, - (void*)setTevKAlphaSel__11J3DTevBlockFUlPCUc, - (void*)setTevKAlphaSel__11J3DTevBlockFUlUc, - (void*)getTevKAlphaSel__11J3DTevBlockFUl, - (void*)setTevStageNum__18J3DTevBlockPatchedFPCUc, - (void*)setTevStageNum__18J3DTevBlockPatchedFUc, - (void*)getTevStageNum__18J3DTevBlockPatchedCFv, - (void*)setTevStage__18J3DTevBlockPatchedFUlPC11J3DTevStage, - (void*)setTevStage__18J3DTevBlockPatchedFUl11J3DTevStage, - (void*)getTevStage__18J3DTevBlockPatchedFUl, - (void*)setTevSwapModeInfo__11J3DTevBlockFUlPC18J3DTevSwapModeInfo, - (void*)setTevSwapModeInfo__11J3DTevBlockFUl18J3DTevSwapModeInfo, - (void*)setTevSwapModeTable__11J3DTevBlockFUlPC19J3DTevSwapModeTable, - (void*)setTevSwapModeTable__11J3DTevBlockFUl19J3DTevSwapModeTable, - (void*)getTevSwapModeTable__11J3DTevBlockFUl, - (void*)setIndTevStage__18J3DTevBlockPatchedFUlPC14J3DIndTevStage, - (void*)setIndTevStage__18J3DTevBlockPatchedFUl14J3DIndTevStage, - (void*)getIndTevStage__18J3DTevBlockPatchedFUl, - (void*)getTexNoOffset__18J3DTevBlockPatchedCFv, - (void*)getTevRegOffset__18J3DTevBlockPatchedCFv, - (void*)setTexNoOffset__11J3DTevBlockFUl, - (void*)setTevRegOffset__18J3DTevBlockPatchedFUl, - (void*)__dt__18J3DTevBlockPatchedFv, -}; - -/* 803CE534-803CE5A0 02B654 006C+00 1/1 1/1 0/0 .data __vt__19J3DTexGenBlockBasic */ -SECTION_DATA extern void* __vt__19J3DTexGenBlockBasic[27] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__19J3DTexGenBlockBasicFP14J3DTexGenBlock, - (void*)calc__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)load__19J3DTexGenBlockBasicFv, - (void*)patch__19J3DTexGenBlockBasicFv, - (void*)diff__21J3DTexGenBlockPatchedFUl, - (void*)diffTexMtx__21J3DTexGenBlockPatchedFv, - (void*)diffTexGen__21J3DTexGenBlockPatchedFv, - (void*)countDLSize__19J3DTexGenBlockBasicFv, - (void*)getType__19J3DTexGenBlockBasicFv, - (void*)setTexGenNum__21J3DTexGenBlockPatchedFPCUl, - (void*)setTexGenNum__21J3DTexGenBlockPatchedFUl, - (void*)getTexGenNum__21J3DTexGenBlockPatchedCFv, - (void*)setTexCoord__21J3DTexGenBlockPatchedFUlPC11J3DTexCoord, - (void*)getTexCoord__21J3DTexGenBlockPatchedFUl, - (void*)setTexMtx__21J3DTexGenBlockPatchedFUlP9J3DTexMtx, - (void*)getTexMtx__21J3DTexGenBlockPatchedFUl, - (void*)setNBTScale__19J3DTexGenBlockBasicFPC11J3DNBTScale, - (void*)setNBTScale__19J3DTexGenBlockBasicF11J3DNBTScale, - (void*)getNBTScale__19J3DTexGenBlockBasicFv, - (void*)getTexMtxOffset__21J3DTexGenBlockPatchedCFv, - (void*)setTexMtxOffset__21J3DTexGenBlockPatchedFUl, - (void*)__dt__19J3DTexGenBlockBasicFv, -}; - -/* 803CE5A0-803CE60C 02B6C0 006C+00 1/1 1/1 0/0 .data __vt__15J3DTexGenBlock4 */ -SECTION_DATA extern void* __vt__15J3DTexGenBlock4[27] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__15J3DTexGenBlock4FP14J3DTexGenBlock, - (void*)calc__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)load__15J3DTexGenBlock4Fv, - (void*)patch__15J3DTexGenBlock4Fv, - (void*)diff__21J3DTexGenBlockPatchedFUl, - (void*)diffTexMtx__21J3DTexGenBlockPatchedFv, - (void*)diffTexGen__21J3DTexGenBlockPatchedFv, - (void*)countDLSize__15J3DTexGenBlock4Fv, - (void*)getType__15J3DTexGenBlock4Fv, - (void*)setTexGenNum__21J3DTexGenBlockPatchedFPCUl, - (void*)setTexGenNum__21J3DTexGenBlockPatchedFUl, - (void*)getTexGenNum__21J3DTexGenBlockPatchedCFv, - (void*)setTexCoord__21J3DTexGenBlockPatchedFUlPC11J3DTexCoord, - (void*)getTexCoord__21J3DTexGenBlockPatchedFUl, - (void*)setTexMtx__21J3DTexGenBlockPatchedFUlP9J3DTexMtx, - (void*)getTexMtx__21J3DTexGenBlockPatchedFUl, - (void*)setNBTScale__15J3DTexGenBlock4FPC11J3DNBTScale, - (void*)setNBTScale__15J3DTexGenBlock4F11J3DNBTScale, - (void*)getNBTScale__15J3DTexGenBlock4Fv, - (void*)getTexMtxOffset__21J3DTexGenBlockPatchedCFv, - (void*)setTexMtxOffset__21J3DTexGenBlockPatchedFUl, - (void*)__dt__15J3DTexGenBlock4Fv, -}; - -/* 803CE60C-803CE678 02B72C 006C+00 2/2 3/3 0/0 .data __vt__21J3DTexGenBlockPatched */ -SECTION_DATA extern void* __vt__21J3DTexGenBlockPatched[27] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__21J3DTexGenBlockPatchedFP14J3DTexGenBlock, - (void*)calc__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)calcWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)calcPostTexMtx__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)calcPostTexMtxWithoutViewMtx__21J3DTexGenBlockPatchedFPA4_Cf, - (void*)load__21J3DTexGenBlockPatchedFv, - (void*)patch__21J3DTexGenBlockPatchedFv, - (void*)diff__21J3DTexGenBlockPatchedFUl, - (void*)diffTexMtx__21J3DTexGenBlockPatchedFv, - (void*)diffTexGen__21J3DTexGenBlockPatchedFv, - (void*)countDLSize__21J3DTexGenBlockPatchedFv, - (void*)getType__21J3DTexGenBlockPatchedFv, - (void*)setTexGenNum__21J3DTexGenBlockPatchedFPCUl, - (void*)setTexGenNum__21J3DTexGenBlockPatchedFUl, - (void*)getTexGenNum__21J3DTexGenBlockPatchedCFv, - (void*)setTexCoord__21J3DTexGenBlockPatchedFUlPC11J3DTexCoord, - (void*)getTexCoord__21J3DTexGenBlockPatchedFUl, - (void*)setTexMtx__21J3DTexGenBlockPatchedFUlP9J3DTexMtx, - (void*)getTexMtx__21J3DTexGenBlockPatchedFUl, - (void*)setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale, - (void*)setNBTScale__14J3DTexGenBlockF11J3DNBTScale, - (void*)getNBTScale__14J3DTexGenBlockFv, - (void*)getTexMtxOffset__21J3DTexGenBlockPatchedCFv, - (void*)setTexMtxOffset__21J3DTexGenBlockPatchedFUl, - (void*)__dt__21J3DTexGenBlockPatchedFv, -}; - -/* 803CE678-803CE708 02B798 0090+00 1/1 1/1 0/0 .data __vt__20J3DColorBlockLightOn */ -SECTION_DATA extern void* __vt__20J3DColorBlockLightOn[36] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)load__20J3DColorBlockLightOnFv, - (void*)reset__20J3DColorBlockLightOnFP13J3DColorBlock, - (void*)patch__20J3DColorBlockLightOnFv, - (void*)patchMatColor__20J3DColorBlockLightOnFv, - (void*)patchLight__20J3DColorBlockLightOnFv, - (void*)diff__20J3DColorBlockLightOnFUl, - (void*)diffAmbColor__20J3DColorBlockLightOnFv, - (void*)diffMatColor__20J3DColorBlockLightOnFv, - (void*)diffColorChan__20J3DColorBlockLightOnFv, - (void*)diffLightObj__20J3DColorBlockLightOnFUl, - (void*)countDLSize__20J3DColorBlockLightOnFv, - (void*)getType__20J3DColorBlockLightOnFv, - (void*)setMatColor__20J3DColorBlockLightOnFUlPC10J3DGXColor, - (void*)setMatColor__20J3DColorBlockLightOnFUl10J3DGXColor, - (void*)getMatColor__20J3DColorBlockLightOnFUl, - (void*)setAmbColor__20J3DColorBlockLightOnFUlPC10J3DGXColor, - (void*)setAmbColor__20J3DColorBlockLightOnFUl10J3DGXColor, - (void*)getAmbColor__20J3DColorBlockLightOnFUl, - (void*)setColorChanNum__20J3DColorBlockLightOnFUc, - (void*)setColorChanNum__20J3DColorBlockLightOnFPCUc, - (void*)getColorChanNum__20J3DColorBlockLightOnCFv, - (void*)setColorChan__20J3DColorBlockLightOnFUlRC12J3DColorChan, - (void*)setColorChan__20J3DColorBlockLightOnFUlPC12J3DColorChan, - (void*)getColorChan__20J3DColorBlockLightOnFUl, - (void*)setLight__20J3DColorBlockLightOnFUlP11J3DLightObj, - (void*)getLight__20J3DColorBlockLightOnFUl, - (void*)setCullMode__20J3DColorBlockLightOnFPCUc, - (void*)setCullMode__20J3DColorBlockLightOnFUc, - (void*)getCullMode__20J3DColorBlockLightOnCFv, - (void*)getMatColorOffset__20J3DColorBlockLightOnCFv, - (void*)getColorChanOffset__20J3DColorBlockLightOnCFv, - (void*)setMatColorOffset__20J3DColorBlockLightOnFUl, - (void*)setColorChanOffset__20J3DColorBlockLightOnFUl, - (void*)__dt__20J3DColorBlockLightOnFv, -}; - -/* 803CE708-803CE798 02B828 0090+00 1/1 1/1 0/0 .data __vt__22J3DColorBlockAmbientOn */ -SECTION_DATA extern void* __vt__22J3DColorBlockAmbientOn[36] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)load__22J3DColorBlockAmbientOnFv, - (void*)reset__22J3DColorBlockAmbientOnFP13J3DColorBlock, - (void*)patch__21J3DColorBlockLightOffFv, - (void*)patchMatColor__21J3DColorBlockLightOffFv, - (void*)patchLight__21J3DColorBlockLightOffFv, - (void*)diff__21J3DColorBlockLightOffFUl, - (void*)diffAmbColor__13J3DColorBlockFv, - (void*)diffMatColor__21J3DColorBlockLightOffFv, - (void*)diffColorChan__21J3DColorBlockLightOffFv, - (void*)diffLightObj__13J3DColorBlockFUl, - (void*)countDLSize__22J3DColorBlockAmbientOnFv, - (void*)getType__22J3DColorBlockAmbientOnFv, - (void*)setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor, - (void*)setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor, - (void*)getMatColor__21J3DColorBlockLightOffFUl, - (void*)setAmbColor__22J3DColorBlockAmbientOnFUlPC10J3DGXColor, - (void*)setAmbColor__22J3DColorBlockAmbientOnFUl10J3DGXColor, - (void*)getAmbColor__22J3DColorBlockAmbientOnFUl, - (void*)setColorChanNum__21J3DColorBlockLightOffFUc, - (void*)setColorChanNum__21J3DColorBlockLightOffFPCUc, - (void*)getColorChanNum__21J3DColorBlockLightOffCFv, - (void*)setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan, - (void*)setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan, - (void*)getColorChan__21J3DColorBlockLightOffFUl, - (void*)setLight__13J3DColorBlockFUlP11J3DLightObj, - (void*)getLight__13J3DColorBlockFUl, - (void*)setCullMode__21J3DColorBlockLightOffFPCUc, - (void*)setCullMode__21J3DColorBlockLightOffFUc, - (void*)getCullMode__21J3DColorBlockLightOffCFv, - (void*)getMatColorOffset__21J3DColorBlockLightOffCFv, - (void*)getColorChanOffset__21J3DColorBlockLightOffCFv, - (void*)setMatColorOffset__21J3DColorBlockLightOffFUl, - (void*)setColorChanOffset__21J3DColorBlockLightOffFUl, - (void*)__dt__22J3DColorBlockAmbientOnFv, -}; - -/* 803CE798-803CE814 02B8B8 007C+00 1/1 1/1 0/0 .data __vt__13J3DPEBlockXlu */ -SECTION_DATA extern void* __vt__13J3DPEBlockXlu[31] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__10J3DPEBlockFP10J3DPEBlock, - (void*)load__13J3DPEBlockXluFv, - (void*)patch__10J3DPEBlockFv, - (void*)diff__10J3DPEBlockFUl, - (void*)diffFog__10J3DPEBlockFv, - (void*)diffBlend__10J3DPEBlockFv, - (void*)countDLSize__13J3DPEBlockXluFv, - (void*)getType__13J3DPEBlockXluFv, - (void*)setFog__10J3DPEBlockF6J3DFog, - (void*)setFog__10J3DPEBlockFP6J3DFog, - (void*)getFog__10J3DPEBlockFv, - (void*)setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp, - (void*)setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp, - (void*)getAlphaComp__10J3DPEBlockFv, - (void*)setBlend__10J3DPEBlockFPC8J3DBlend, - (void*)setBlend__10J3DPEBlockFRC8J3DBlend, - (void*)getBlend__10J3DPEBlockFv, - (void*)setZMode__10J3DPEBlockFPC8J3DZMode, - (void*)setZMode__10J3DPEBlockF8J3DZMode, - (void*)getZMode__10J3DPEBlockFv, - (void*)setZCompLoc__10J3DPEBlockFPCUc, - (void*)setZCompLoc__10J3DPEBlockFUc, - (void*)getZCompLoc__10J3DPEBlockCFv, - (void*)setDither__10J3DPEBlockFPCUc, - (void*)setDither__10J3DPEBlockFUc, - (void*)getDither__10J3DPEBlockCFv, - (void*)getFogOffset__10J3DPEBlockCFv, - (void*)setFogOffset__10J3DPEBlockFUl, - (void*)__dt__13J3DPEBlockXluFv, -}; - -/* 803CE814-803CE890 02B934 007C+00 1/1 1/1 0/0 .data __vt__17J3DPEBlockTexEdge */ -SECTION_DATA extern void* __vt__17J3DPEBlockTexEdge[31] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__10J3DPEBlockFP10J3DPEBlock, - (void*)load__17J3DPEBlockTexEdgeFv, - (void*)patch__10J3DPEBlockFv, - (void*)diff__10J3DPEBlockFUl, - (void*)diffFog__10J3DPEBlockFv, - (void*)diffBlend__10J3DPEBlockFv, - (void*)countDLSize__17J3DPEBlockTexEdgeFv, - (void*)getType__17J3DPEBlockTexEdgeFv, - (void*)setFog__10J3DPEBlockF6J3DFog, - (void*)setFog__10J3DPEBlockFP6J3DFog, - (void*)getFog__10J3DPEBlockFv, - (void*)setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp, - (void*)setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp, - (void*)getAlphaComp__10J3DPEBlockFv, - (void*)setBlend__10J3DPEBlockFPC8J3DBlend, - (void*)setBlend__10J3DPEBlockFRC8J3DBlend, - (void*)getBlend__10J3DPEBlockFv, - (void*)setZMode__10J3DPEBlockFPC8J3DZMode, - (void*)setZMode__10J3DPEBlockF8J3DZMode, - (void*)getZMode__10J3DPEBlockFv, - (void*)setZCompLoc__10J3DPEBlockFPCUc, - (void*)setZCompLoc__10J3DPEBlockFUc, - (void*)getZCompLoc__10J3DPEBlockCFv, - (void*)setDither__10J3DPEBlockFPCUc, - (void*)setDither__10J3DPEBlockFUc, - (void*)getDither__10J3DPEBlockCFv, - (void*)getFogOffset__10J3DPEBlockCFv, - (void*)setFogOffset__10J3DPEBlockFUl, - (void*)__dt__17J3DPEBlockTexEdgeFv, -}; - -/* 803CE890-803CE90C 02B9B0 007C+00 1/1 1/1 0/0 .data __vt__13J3DPEBlockOpa */ -SECTION_DATA extern void* __vt__13J3DPEBlockOpa[31] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__10J3DPEBlockFP10J3DPEBlock, - (void*)load__13J3DPEBlockOpaFv, - (void*)patch__10J3DPEBlockFv, - (void*)diff__10J3DPEBlockFUl, - (void*)diffFog__10J3DPEBlockFv, - (void*)diffBlend__10J3DPEBlockFv, - (void*)countDLSize__13J3DPEBlockOpaFv, - (void*)getType__13J3DPEBlockOpaFv, - (void*)setFog__10J3DPEBlockF6J3DFog, - (void*)setFog__10J3DPEBlockFP6J3DFog, - (void*)getFog__10J3DPEBlockFv, - (void*)setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp, - (void*)setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp, - (void*)getAlphaComp__10J3DPEBlockFv, - (void*)setBlend__10J3DPEBlockFPC8J3DBlend, - (void*)setBlend__10J3DPEBlockFRC8J3DBlend, - (void*)getBlend__10J3DPEBlockFv, - (void*)setZMode__10J3DPEBlockFPC8J3DZMode, - (void*)setZMode__10J3DPEBlockF8J3DZMode, - (void*)getZMode__10J3DPEBlockFv, - (void*)setZCompLoc__10J3DPEBlockFPCUc, - (void*)setZCompLoc__10J3DPEBlockFUc, - (void*)getZCompLoc__10J3DPEBlockCFv, - (void*)setDither__10J3DPEBlockFPCUc, - (void*)setDither__10J3DPEBlockFUc, - (void*)getDither__10J3DPEBlockCFv, - (void*)getFogOffset__10J3DPEBlockCFv, - (void*)setFogOffset__10J3DPEBlockFUl, - (void*)__dt__13J3DPEBlockOpaFv, -}; - -/* 803CE90C-803CE958 02BA2C 004C+00 1/1 1/1 0/0 .data __vt__15J3DIndBlockFull */ -SECTION_DATA extern void* __vt__15J3DIndBlockFull[19] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__15J3DIndBlockFullFP11J3DIndBlock, - (void*)diff__15J3DIndBlockFullFUl, - (void*)load__15J3DIndBlockFullFv, - (void*)countDLSize__15J3DIndBlockFullFv, - (void*)getType__15J3DIndBlockFullFv, - (void*)setIndTexStageNum__15J3DIndBlockFullFUc, - (void*)getIndTexStageNum__15J3DIndBlockFullCFv, - (void*)setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder, - (void*)setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder, - (void*)getIndTexOrder__15J3DIndBlockFullFUl, - (void*)setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx, - (void*)setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx, - (void*)getIndTexMtx__15J3DIndBlockFullFUl, - (void*)setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale, - (void*)setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale, - (void*)getIndTexCoordScale__15J3DIndBlockFullFUl, - (void*)__dt__15J3DIndBlockFullFv, -}; - -/* 803CE958-803CEA34 02BA78 00DC+00 5/5 5/5 0/0 .data __vt__11J3DTevBlock */ -SECTION_DATA extern void* __vt__11J3DTevBlock[55] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__11J3DTevBlockFP11J3DTevBlock, - (void*)load__11J3DTevBlockFv, - (void*)diff__11J3DTevBlockFUl, - (void*)diffTexNo__11J3DTevBlockFv, - (void*)diffTevReg__11J3DTevBlockFv, - (void*)diffTexCoordScale__11J3DTevBlockFv, - (void*)diffTevStage__11J3DTevBlockFv, - (void*)diffTevStageIndirect__11J3DTevBlockFv, - (void*)patch__11J3DTevBlockFv, - (void*)patchTexNo__11J3DTevBlockFv, - (void*)patchTevReg__11J3DTevBlockFv, - (void*)patchTexNoAndTexCoordScale__11J3DTevBlockFv, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)countDLSize__11J3DTevBlockFv, - (void*)setTexNo__11J3DTevBlockFUlPCUs, - (void*)setTexNo__11J3DTevBlockFUlUs, - (void*)getTexNo__11J3DTevBlockCFUl, - (void*)setTevOrder__11J3DTevBlockFUlPC11J3DTevOrder, - (void*)setTevOrder__11J3DTevBlockFUl11J3DTevOrder, - (void*)getTevOrder__11J3DTevBlockFUl, - (void*)setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10, - (void*)setTevColor__11J3DTevBlockFUl13J3DGXColorS10, - (void*)getTevColor__11J3DTevBlockFUl, - (void*)setTevKColor__11J3DTevBlockFUlPC10J3DGXColor, - (void*)setTevKColor__11J3DTevBlockFUl10J3DGXColor, - (void*)getTevKColor__11J3DTevBlockFUl, - (void*)setTevKColorSel__11J3DTevBlockFUlPCUc, - (void*)setTevKColorSel__11J3DTevBlockFUlUc, - (void*)getTevKColorSel__11J3DTevBlockFUl, - (void*)setTevKAlphaSel__11J3DTevBlockFUlPCUc, - (void*)setTevKAlphaSel__11J3DTevBlockFUlUc, - (void*)getTevKAlphaSel__11J3DTevBlockFUl, - (void*)setTevStageNum__11J3DTevBlockFPCUc, - (void*)setTevStageNum__11J3DTevBlockFUc, - (void*)getTevStageNum__11J3DTevBlockCFv, - (void*)setTevStage__11J3DTevBlockFUlPC11J3DTevStage, - (void*)setTevStage__11J3DTevBlockFUl11J3DTevStage, - (void*)getTevStage__11J3DTevBlockFUl, - (void*)setTevSwapModeInfo__11J3DTevBlockFUlPC18J3DTevSwapModeInfo, - (void*)setTevSwapModeInfo__11J3DTevBlockFUl18J3DTevSwapModeInfo, - (void*)setTevSwapModeTable__11J3DTevBlockFUlPC19J3DTevSwapModeTable, - (void*)setTevSwapModeTable__11J3DTevBlockFUl19J3DTevSwapModeTable, - (void*)getTevSwapModeTable__11J3DTevBlockFUl, - (void*)setIndTevStage__11J3DTevBlockFUlPC14J3DIndTevStage, - (void*)setIndTevStage__11J3DTevBlockFUl14J3DIndTevStage, - (void*)getIndTevStage__11J3DTevBlockFUl, - (void*)getTexNoOffset__11J3DTevBlockCFv, - (void*)getTevRegOffset__11J3DTevBlockCFv, - (void*)setTexNoOffset__11J3DTevBlockFUl, - (void*)setTevRegOffset__11J3DTevBlockFUl, - (void*)__dt__11J3DTevBlockFv, -}; - -/* 80321F84-80321FE0 31C8C4 005C+00 1/0 0/0 0/0 .text __dt__13J3DTevBlock16Fv */ -J3DTevBlock16::~J3DTevBlock16() { - // NONMATCHING -} - -/* 80321FE0-80321FE8 -00001 0008+00 0/0 0/0 0/0 .text setTexNoOffset__11J3DTevBlockFUl */ -void J3DTevBlock::setTexNoOffset(u32 param_0) { - *(u32*)(((u8*)this) + 4) /* this->field_0x4 */ = (u32)(param_0); -} - -/* 80321FE8-80321FEC 31C928 0004+00 1/0 0/0 0/0 .text ptrToIndex__12J3DTevBlock4Fv */ -void J3DTevBlock4::ptrToIndex() { - /* empty function */ -} - -/* 80321FEC-80322010 31C92C 0024+00 1/0 0/0 0/0 .text indexToPtr__12J3DTevBlock4Fv */ -void J3DTevBlock4::indexToPtr() { - // NONMATCHING -} - -/* 80322010-8032201C 31C950 000C+00 1/0 0/0 0/0 .text getType__12J3DTevBlock4Fv */ -u32 J3DTevBlock4::getType() { - return 'TVB4'; -} - -/* 8032201C-8032202C 31C95C 0010+00 1/0 0/0 0/0 .text setTexNo__12J3DTevBlock4FUlUs */ -void J3DTevBlock4::setTexNo(u32 param_0, u16 param_1) { - // NONMATCHING -} - -/* 8032202C-80322040 31C96C 0014+00 1/0 0/0 0/0 .text setTexNo__12J3DTevBlock4FUlPCUs */ -void J3DTevBlock4::setTexNo(u32 param_0, u16 const* param_1) { - // NONMATCHING -} - -/* 80322040-80322050 31C980 0010+00 1/0 0/0 0/0 .text getTexNo__12J3DTevBlock4CFUl */ -u16 J3DTevBlock4::getTexNo(u32 param_0) const { - // NONMATCHING -} - -/* 80322050-80322064 31C990 0014+00 1/0 0/0 0/0 .text setTevOrder__12J3DTevBlock4FUl11J3DTevOrder - */ -void J3DTevBlock4::setTevOrder(u32 param_0, J3DTevOrder param_1) { - // NONMATCHING -} - -/* 80322064-80322078 31C9A4 0014+00 1/0 0/0 0/0 .text - * setTevOrder__12J3DTevBlock4FUlPC11J3DTevOrder */ -void J3DTevBlock4::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { - // NONMATCHING -} - -/* 80322078-8032208C 31C9B8 0014+00 1/0 0/0 0/0 .text getTevOrder__12J3DTevBlock4FUl */ -J3DTevOrder* J3DTevBlock4::getTevOrder(u32 param_0) { - // NONMATCHING -} - -/* 8032208C-803220B8 31C9CC 002C+00 1/0 0/0 0/0 .text - * setTevColor__12J3DTevBlock4FUl13J3DGXColorS10 */ -void J3DTevBlock4::setTevColor(u32 param_0, J3DGXColorS10 param_1) { - // NONMATCHING -} - -/* 803220B8-803220E4 31C9F8 002C+00 1/0 0/0 0/0 .text - * setTevColor__12J3DTevBlock4FUlPC13J3DGXColorS10 */ -void J3DTevBlock4::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { - // NONMATCHING -} - -/* 803220E4-803220F8 31CA24 0014+00 1/0 0/0 0/0 .text getTevColor__12J3DTevBlock4FUl */ -J3DGXColorS10* J3DTevBlock4::getTevColor(u32 param_0) { - // NONMATCHING -} - -/* 803220F8-80322124 31CA38 002C+00 1/0 0/0 0/0 .text setTevKColor__12J3DTevBlock4FUl10J3DGXColor - */ -void J3DTevBlock4::setTevKColor(u32 param_0, J3DGXColor param_1) { - // NONMATCHING -} - -/* 80322124-80322150 31CA64 002C+00 1/0 0/0 0/0 .text - * setTevKColor__12J3DTevBlock4FUlPC10J3DGXColor */ -void J3DTevBlock4::setTevKColor(u32 param_0, J3DGXColor const* param_1) { - // NONMATCHING -} - -/* 80322150-80322164 31CA90 0014+00 1/0 0/0 0/0 .text getTevKColor__12J3DTevBlock4FUl */ -J3DGXColor* J3DTevBlock4::getTevKColor(u32 param_0) { - // NONMATCHING -} - -/* 80322164-80322170 31CAA4 000C+00 1/0 0/0 0/0 .text setTevKColorSel__12J3DTevBlock4FUlUc */ -void J3DTevBlock4::setTevKColorSel(u32 param_0, u8 param_1) { - // NONMATCHING -} - -/* 80322170-80322180 31CAB0 0010+00 1/0 0/0 0/0 .text setTevKColorSel__12J3DTevBlock4FUlPCUc */ -void J3DTevBlock4::setTevKColorSel(u32 param_0, u8 const* param_1) { - // NONMATCHING -} - -/* 80322180-8032218C 31CAC0 000C+00 1/0 0/0 0/0 .text getTevKColorSel__12J3DTevBlock4FUl - */ -bool J3DTevBlock4::getTevKColorSel(u32 param_0) { - // NONMATCHING -} - -/* 8032218C-80322198 31CACC 000C+00 1/0 0/0 0/0 .text setTevKAlphaSel__12J3DTevBlock4FUlUc */ -void J3DTevBlock4::setTevKAlphaSel(u32 param_0, u8 param_1) { - // NONMATCHING -} - -/* 80322198-803221A8 31CAD8 0010+00 1/0 0/0 0/0 .text setTevKAlphaSel__12J3DTevBlock4FUlPCUc */ -void J3DTevBlock4::setTevKAlphaSel(u32 param_0, u8 const* param_1) { - // NONMATCHING -} - -/* 803221A8-803221B4 31CAE8 000C+00 1/0 0/0 0/0 .text getTevKAlphaSel__12J3DTevBlock4FUl - */ -bool J3DTevBlock4::getTevKAlphaSel(u32 param_0) { - // NONMATCHING -} - -/* 803221B4-803221BC -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock4FUc - */ -void J3DTevBlock4::setTevStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 32) /* this->field_0x20 */ = (u8)(param_0); -} - -/* 803221BC-803221C8 31CAFC 000C+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock4FPCUc - */ -void J3DTevBlock4::setTevStageNum(u8 const* param_0) { - // NONMATCHING -} - -/* 803221C8-803221D0 31CB08 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J3DTevBlock4CFv - */ -u8 J3DTevBlock4::getTevStageNum() const { - // NONMATCHING -} - -/* 803221D0-8032220C 31CB10 003C+00 1/0 0/0 0/0 .text setTevStage__12J3DTevBlock4FUl11J3DTevStage - */ -void J3DTevBlock4::setTevStage(u32 param_0, J3DTevStage param_1) { - // NONMATCHING -} - -/* 8032220C-80322248 31CB4C 003C+00 1/0 0/0 0/0 .text - * setTevStage__12J3DTevBlock4FUlPC11J3DTevStage */ -void J3DTevBlock4::setTevStage(u32 param_0, J3DTevStage const* param_1) { - // NONMATCHING -} - -/* 80322248-8032225C 31CB88 0014+00 1/0 0/0 0/0 .text getTevStage__12J3DTevBlock4FUl */ -J3DTevStage* J3DTevBlock4::getTevStage(u32 param_0) { - // NONMATCHING -} - -/* 8032225C-80322294 31CB9C 0038+00 1/0 0/0 0/0 .text - * setTevSwapModeInfo__12J3DTevBlock4FUl18J3DTevSwapModeInfo */ -void J3DTevBlock4::setTevSwapModeInfo(u32 param_0, J3DTevSwapModeInfo param_1) { - // NONMATCHING -} - -/* 80322294-803222CC 31CBD4 0038+00 1/0 0/0 0/0 .text - * setTevSwapModeInfo__12J3DTevBlock4FUlPC18J3DTevSwapModeInfo */ -void J3DTevBlock4::setTevSwapModeInfo(u32 param_0, J3DTevSwapModeInfo const* param_1) { - // NONMATCHING -} - -/* 803222CC-803222DC 31CC0C 0010+00 1/0 0/0 0/0 .text - * setTevSwapModeTable__12J3DTevBlock4FUl19J3DTevSwapModeTable */ -void J3DTevBlock4::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable param_1) { - // NONMATCHING -} - -/* 803222DC-803222EC 31CC1C 0010+00 1/0 0/0 0/0 .text - * setTevSwapModeTable__12J3DTevBlock4FUlPC19J3DTevSwapModeTable */ -void J3DTevBlock4::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable const* param_1) { - // NONMATCHING -} - -/* 803222EC-803222FC 31CC2C 0010+00 1/0 0/0 0/0 .text getTevSwapModeTable__12J3DTevBlock4FUl */ -J3DTevSwapModeTable* J3DTevBlock4::getTevSwapModeTable(u32 param_0) { - // NONMATCHING -} - -/* 803222FC-80322310 31CC3C 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__12J3DTevBlock4FUl14J3DIndTevStage */ -void J3DTevBlock4::setIndTevStage(u32 param_0, J3DIndTevStage param_1) { - // NONMATCHING -} - -/* 80322310-80322324 31CC50 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__12J3DTevBlock4FUlPC14J3DIndTevStage */ -void J3DTevBlock4::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1) { - // NONMATCHING -} - -/* 80322324-80322338 31CC64 0014+00 1/0 0/0 0/0 .text getIndTevStage__12J3DTevBlock4FUl - */ -J3DIndTevStage* J3DTevBlock4::getIndTevStage(u32 param_0) { - // NONMATCHING -} - -/* 80322338-80322340 31CC78 0008+00 1/0 0/0 0/0 .text getTexNoOffset__12J3DTevBlock4CFv - */ -u32 J3DTevBlock4::getTexNoOffset() const { - // NONMATCHING -} - -/* 80322340-80322348 31CC80 0008+00 1/0 0/0 0/0 .text getTevRegOffset__12J3DTevBlock4CFv - */ -bool J3DTevBlock4::getTevRegOffset() const { - // NONMATCHING -} - -/* 80322348-80322350 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock4FUl - */ -void J3DTevBlock4::setTevRegOffset(u32 param_0) { - *(u32*)(((u8*)this) + 144) /* this->field_0x90 */ = (u32)(param_0); -} - -/* 80322350-803223AC 31CC90 005C+00 1/0 0/0 0/0 .text __dt__12J3DTevBlock4Fv */ -J3DTevBlock4::~J3DTevBlock4() { - // NONMATCHING -} - -/* 803223AC-803223B0 31CCEC 0004+00 1/0 0/0 0/0 .text ptrToIndex__12J3DTevBlock2Fv */ -void J3DTevBlock2::ptrToIndex() { - /* empty function */ -} - -/* 803223B0-803223D4 31CCF0 0024+00 1/0 0/0 0/0 .text indexToPtr__12J3DTevBlock2Fv */ -void J3DTevBlock2::indexToPtr() { - // NONMATCHING -} - -/* 803223D4-803223E0 31CD14 000C+00 1/0 0/0 0/0 .text getType__12J3DTevBlock2Fv */ -u32 J3DTevBlock2::getType() { - return 'TVB2'; -} - -/* 803223E0-803223F0 31CD20 0010+00 1/0 0/0 0/0 .text setTexNo__12J3DTevBlock2FUlUs */ -void J3DTevBlock2::setTexNo(u32 param_0, u16 param_1) { - // NONMATCHING -} - -/* 803223F0-80322404 31CD30 0014+00 1/0 0/0 0/0 .text setTexNo__12J3DTevBlock2FUlPCUs */ -void J3DTevBlock2::setTexNo(u32 param_0, u16 const* param_1) { - // NONMATCHING -} - -/* 80322404-80322414 31CD44 0010+00 1/0 0/0 0/0 .text getTexNo__12J3DTevBlock2CFUl */ -u16 J3DTevBlock2::getTexNo(u32 param_0) const { - // NONMATCHING -} - -/* 80322414-80322428 31CD54 0014+00 1/0 0/0 0/0 .text setTevOrder__12J3DTevBlock2FUl11J3DTevOrder - */ -void J3DTevBlock2::setTevOrder(u32 param_0, J3DTevOrder param_1) { - // NONMATCHING -} - -/* 80322428-8032243C 31CD68 0014+00 1/0 0/0 0/0 .text - * setTevOrder__12J3DTevBlock2FUlPC11J3DTevOrder */ -void J3DTevBlock2::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { - // NONMATCHING -} - -/* 8032243C-80322450 31CD7C 0014+00 1/0 0/0 0/0 .text getTevOrder__12J3DTevBlock2FUl */ -J3DTevOrder* J3DTevBlock2::getTevOrder(u32 param_0) { - // NONMATCHING -} - -/* 80322450-8032247C 31CD90 002C+00 1/0 0/0 0/0 .text - * setTevColor__12J3DTevBlock2FUl13J3DGXColorS10 */ -void J3DTevBlock2::setTevColor(u32 param_0, J3DGXColorS10 param_1) { - // NONMATCHING -} - -/* 8032247C-803224A8 31CDBC 002C+00 1/0 0/0 0/0 .text - * setTevColor__12J3DTevBlock2FUlPC13J3DGXColorS10 */ -void J3DTevBlock2::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { - // NONMATCHING -} - -/* 803224A8-803224BC 31CDE8 0014+00 1/0 0/0 0/0 .text getTevColor__12J3DTevBlock2FUl */ -J3DGXColorS10* J3DTevBlock2::getTevColor(u32 param_0) { - // NONMATCHING -} - -/* 803224BC-803224E8 31CDFC 002C+00 1/0 0/0 0/0 .text setTevKColor__12J3DTevBlock2FUl10J3DGXColor - */ -void J3DTevBlock2::setTevKColor(u32 param_0, J3DGXColor param_1) { - // NONMATCHING -} - -/* 803224E8-80322514 31CE28 002C+00 1/0 0/0 0/0 .text - * setTevKColor__12J3DTevBlock2FUlPC10J3DGXColor */ -void J3DTevBlock2::setTevKColor(u32 param_0, J3DGXColor const* param_1) { - // NONMATCHING -} - -/* 80322514-80322528 31CE54 0014+00 1/0 0/0 0/0 .text getTevKColor__12J3DTevBlock2FUl */ -J3DGXColor* J3DTevBlock2::getTevKColor(u32 param_0) { - // NONMATCHING -} - -/* 80322528-80322534 31CE68 000C+00 1/0 0/0 0/0 .text setTevKColorSel__12J3DTevBlock2FUlUc */ -void J3DTevBlock2::setTevKColorSel(u32 param_0, u8 param_1) { - // NONMATCHING -} - -/* 80322534-80322544 31CE74 0010+00 1/0 0/0 0/0 .text setTevKColorSel__12J3DTevBlock2FUlPCUc */ -void J3DTevBlock2::setTevKColorSel(u32 param_0, u8 const* param_1) { - // NONMATCHING -} - -/* 80322544-80322550 31CE84 000C+00 1/0 0/0 0/0 .text getTevKColorSel__12J3DTevBlock2FUl - */ -bool J3DTevBlock2::getTevKColorSel(u32 param_0) { - // NONMATCHING -} - -/* 80322550-8032255C 31CE90 000C+00 1/0 0/0 0/0 .text setTevKAlphaSel__12J3DTevBlock2FUlUc */ -void J3DTevBlock2::setTevKAlphaSel(u32 param_0, u8 param_1) { - // NONMATCHING -} - -/* 8032255C-8032256C 31CE9C 0010+00 1/0 0/0 0/0 .text setTevKAlphaSel__12J3DTevBlock2FUlPCUc */ -void J3DTevBlock2::setTevKAlphaSel(u32 param_0, u8 const* param_1) { - // NONMATCHING -} - -/* 8032256C-80322578 31CEAC 000C+00 1/0 0/0 0/0 .text getTevKAlphaSel__12J3DTevBlock2FUl - */ -bool J3DTevBlock2::getTevKAlphaSel(u32 param_0) { - // NONMATCHING -} - -/* 80322578-80322580 -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock2FUc - */ -void J3DTevBlock2::setTevStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 52) /* this->field_0x34 */ = (u8)(param_0); -} - -/* 80322580-8032258C 31CEC0 000C+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock2FPCUc - */ -void J3DTevBlock2::setTevStageNum(u8 const* param_0) { - // NONMATCHING -} - -/* 8032258C-80322594 31CECC 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J3DTevBlock2CFv - */ -u8 J3DTevBlock2::getTevStageNum() const { - // NONMATCHING -} - -/* 80322594-803225D0 31CED4 003C+00 1/0 0/0 0/0 .text setTevStage__12J3DTevBlock2FUl11J3DTevStage - */ -void J3DTevBlock2::setTevStage(u32 param_0, J3DTevStage param_1) { - // NONMATCHING -} - -/* 803225D0-8032260C 31CF10 003C+00 1/0 0/0 0/0 .text - * setTevStage__12J3DTevBlock2FUlPC11J3DTevStage */ -void J3DTevBlock2::setTevStage(u32 param_0, J3DTevStage const* param_1) { - // NONMATCHING -} - -/* 8032260C-80322620 31CF4C 0014+00 1/0 0/0 0/0 .text getTevStage__12J3DTevBlock2FUl */ -J3DTevStage* J3DTevBlock2::getTevStage(u32 param_0) { - // NONMATCHING -} - -/* 80322620-80322658 31CF60 0038+00 1/0 0/0 0/0 .text - * setTevSwapModeInfo__12J3DTevBlock2FUl18J3DTevSwapModeInfo */ -void J3DTevBlock2::setTevSwapModeInfo(u32 param_0, J3DTevSwapModeInfo param_1) { - // NONMATCHING -} - -/* 80322658-80322690 31CF98 0038+00 1/0 0/0 0/0 .text - * setTevSwapModeInfo__12J3DTevBlock2FUlPC18J3DTevSwapModeInfo */ -void J3DTevBlock2::setTevSwapModeInfo(u32 param_0, J3DTevSwapModeInfo const* param_1) { - // NONMATCHING -} - -/* 80322690-803226A0 31CFD0 0010+00 1/0 0/0 0/0 .text - * setTevSwapModeTable__12J3DTevBlock2FUl19J3DTevSwapModeTable */ -void J3DTevBlock2::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable param_1) { - // NONMATCHING -} - -/* 803226A0-803226B0 31CFE0 0010+00 1/0 0/0 0/0 .text - * setTevSwapModeTable__12J3DTevBlock2FUlPC19J3DTevSwapModeTable */ -void J3DTevBlock2::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable const* param_1) { - // NONMATCHING -} - -/* 803226B0-803226C0 31CFF0 0010+00 1/0 0/0 0/0 .text getTevSwapModeTable__12J3DTevBlock2FUl */ -J3DTevSwapModeTable* J3DTevBlock2::getTevSwapModeTable(u32 param_0) { - // NONMATCHING -} - -/* 803226C0-803226D4 31D000 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__12J3DTevBlock2FUl14J3DIndTevStage */ -void J3DTevBlock2::setIndTevStage(u32 param_0, J3DIndTevStage param_1) { - // NONMATCHING -} - -/* 803226D4-803226E8 31D014 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__12J3DTevBlock2FUlPC14J3DIndTevStage */ -void J3DTevBlock2::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1) { - // NONMATCHING -} - -/* 803226E8-803226FC 31D028 0014+00 1/0 0/0 0/0 .text getIndTevStage__12J3DTevBlock2FUl - */ -J3DIndTevStage* J3DTevBlock2::getIndTevStage(u32 param_0) { - // NONMATCHING -} - -/* 803226FC-80322704 31D03C 0008+00 1/0 0/0 0/0 .text getTexNoOffset__12J3DTevBlock2CFv - */ -u32 J3DTevBlock2::getTexNoOffset() const { - // NONMATCHING -} - -/* 80322704-8032270C 31D044 0008+00 1/0 0/0 0/0 .text getTevRegOffset__12J3DTevBlock2CFv - */ -bool J3DTevBlock2::getTevRegOffset() const { - // NONMATCHING -} - -/* 8032270C-80322714 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__12J3DTevBlock2FUl - */ -void J3DTevBlock2::setTevRegOffset(u32 param_0) { - *(u32*)(((u8*)this) + 104) /* this->field_0x68 */ = (u32)(param_0); -} - -/* 80322714-80322770 31D054 005C+00 1/0 0/0 0/0 .text __dt__12J3DTevBlock2Fv */ -J3DTevBlock2::~J3DTevBlock2() { - // NONMATCHING -} - -/* 80322770-80322774 31D0B0 0004+00 1/0 0/0 0/0 .text ptrToIndex__12J3DTevBlock1Fv */ -void J3DTevBlock1::ptrToIndex() { - /* empty function */ -} - -/* 80322774-80322798 31D0B4 0024+00 1/0 0/0 0/0 .text indexToPtr__12J3DTevBlock1Fv */ -void J3DTevBlock1::indexToPtr() { - // NONMATCHING -} - -/* 80322798-803227A4 31D0D8 000C+00 1/0 0/0 0/0 .text getType__12J3DTevBlock1Fv */ -u32 J3DTevBlock1::getType() { - return 'TVB1'; -} - -/* 803227A4-803227B4 31D0E4 0010+00 1/0 0/0 0/0 .text setTexNo__12J3DTevBlock1FUlUs */ -void J3DTevBlock1::setTexNo(u32 param_0, u16 param_1) { - // NONMATCHING -} - -/* 803227B4-803227C8 31D0F4 0014+00 1/0 0/0 0/0 .text setTexNo__12J3DTevBlock1FUlPCUs */ -void J3DTevBlock1::setTexNo(u32 param_0, u16 const* param_1) { - // NONMATCHING -} - -/* 803227C8-803227D8 31D108 0010+00 1/0 0/0 0/0 .text getTexNo__12J3DTevBlock1CFUl */ -u16 J3DTevBlock1::getTexNo(u32 param_0) const { - // NONMATCHING -} - -/* 803227D8-803227EC 31D118 0014+00 1/0 0/0 0/0 .text setTevOrder__12J3DTevBlock1FUl11J3DTevOrder - */ -void J3DTevBlock1::setTevOrder(u32 param_0, J3DTevOrder param_1) { - // NONMATCHING -} - -/* 803227EC-80322800 31D12C 0014+00 1/0 0/0 0/0 .text - * setTevOrder__12J3DTevBlock1FUlPC11J3DTevOrder */ -void J3DTevBlock1::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { - // NONMATCHING -} - -/* 80322800-80322814 31D140 0014+00 1/0 0/0 0/0 .text getTevOrder__12J3DTevBlock1FUl */ -J3DTevOrder* J3DTevBlock1::getTevOrder(u32 param_0) { - // NONMATCHING -} - -/* 80322814-80322818 31D154 0004+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock1FUc - */ -void J3DTevBlock1::setTevStageNum(u8 param_0) { - /* empty function */ -} - -/* 80322818-8032281C 31D158 0004+00 1/0 0/0 0/0 .text setTevStageNum__12J3DTevBlock1FPCUc - */ -void J3DTevBlock1::setTevStageNum(u8 const* param_0) { - /* empty function */ -} - -/* 8032281C-80322824 31D15C 0008+00 1/0 0/0 0/0 .text getTevStageNum__12J3DTevBlock1CFv - */ -u8 J3DTevBlock1::getTevStageNum() const { - return true; -} - -/* 80322824-80322860 31D164 003C+00 1/0 0/0 0/0 .text setTevStage__12J3DTevBlock1FUl11J3DTevStage - */ -void J3DTevBlock1::setTevStage(u32 param_0, J3DTevStage param_1) { - // NONMATCHING -} - -/* 80322860-8032289C 31D1A0 003C+00 1/0 0/0 0/0 .text - * setTevStage__12J3DTevBlock1FUlPC11J3DTevStage */ -void J3DTevBlock1::setTevStage(u32 param_0, J3DTevStage const* param_1) { - // NONMATCHING -} - -/* 8032289C-803228B0 31D1DC 0014+00 1/0 0/0 0/0 .text getTevStage__12J3DTevBlock1FUl */ -J3DTevStage* J3DTevBlock1::getTevStage(u32 param_0) { - // NONMATCHING -} - -/* 803228B0-803228C4 31D1F0 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__12J3DTevBlock1FUl14J3DIndTevStage */ -void J3DTevBlock1::setIndTevStage(u32 param_0, J3DIndTevStage param_1) { - // NONMATCHING -} - -/* 803228C4-803228D8 31D204 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__12J3DTevBlock1FUlPC14J3DIndTevStage */ -void J3DTevBlock1::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1) { - // NONMATCHING -} - -/* 803228D8-803228EC 31D218 0014+00 1/0 0/0 0/0 .text getIndTevStage__12J3DTevBlock1FUl - */ -J3DIndTevStage* J3DTevBlock1::getIndTevStage(u32 param_0) { - // NONMATCHING -} - -/* 803228EC-803228F4 31D22C 0008+00 1/0 0/0 0/0 .text getTexNoOffset__12J3DTevBlock1CFv - */ -u32 J3DTevBlock1::getTexNoOffset() const { - // NONMATCHING -} - -/* 803228F4-80322950 31D234 005C+00 1/0 0/0 0/0 .text __dt__12J3DTevBlock1Fv */ -J3DTevBlock1::~J3DTevBlock1() { - // NONMATCHING -} - -/* 80322950-80322954 31D290 0004+00 2/0 1/0 0/0 .text setTevKColorSel__11J3DTevBlockFUlPCUc */ -void J3DTevBlock::setTevKColorSel(u32 param_0, u8 const* param_1) { - /* empty function */ -} - -/* 80322954-80322958 31D294 0004+00 3/0 1/0 0/0 .text setTevKAlphaSel__11J3DTevBlockFUlPCUc */ -void J3DTevBlock::setTevKAlphaSel(u32 param_0, u8 const* param_1) { - /* empty function */ -} - -/* 80322958-8032295C 31D298 0004+00 3/0 1/0 0/0 .text - * setTevSwapModeInfo__11J3DTevBlockFUl18J3DTevSwapModeInfo */ -void J3DTevBlock::setTevSwapModeInfo(u32 param_0, J3DTevSwapModeInfo param_1) { - /* empty function */ -} - -/* 8032295C-80322960 31D29C 0004+00 3/0 1/0 0/0 .text - * setTevSwapModeInfo__11J3DTevBlockFUlPC18J3DTevSwapModeInfo */ -void J3DTevBlock::setTevSwapModeInfo(u32 param_0, J3DTevSwapModeInfo const* param_1) { - /* empty function */ -} - -/* 80322960-80322964 31D2A0 0004+00 3/0 1/0 0/0 .text - * setTevSwapModeTable__11J3DTevBlockFUlPC19J3DTevSwapModeTable */ -void J3DTevBlock::setTevSwapModeTable(u32 param_0, J3DTevSwapModeTable const* param_1) { - /* empty function */ -} - -/* 80322964-8032296C 31D2A4 0008+00 2/0 1/0 0/0 .text getTevRegOffset__11J3DTevBlockCFv - */ -bool J3DTevBlock::getTevRegOffset() const { - return false; -} - -/* 8032296C-80322970 31D2AC 0004+00 2/0 1/0 0/0 .text setTevRegOffset__11J3DTevBlockFUl - */ -void J3DTevBlock::setTevRegOffset(u32 param_0) { - /* empty function */ -} - -/* 80322970-80322974 31D2B0 0004+00 1/0 0/0 0/0 .text load__18J3DTevBlockPatchedFv */ -void J3DTevBlockPatched::load() { - /* empty function */ -} - -/* 80322974-80322998 31D2B4 0024+00 1/0 0/0 0/0 .text indexToPtr__18J3DTevBlockPatchedFv - */ -void J3DTevBlockPatched::indexToPtr() { - // NONMATCHING -} - -/* 80322998-803229A4 31D2D8 000C+00 1/0 0/0 0/0 .text getType__18J3DTevBlockPatchedFv */ -u32 J3DTevBlockPatched::getType() { - return 'TVPT'; -} - -/* 803229A4-803229AC -00001 0008+00 0/0 0/0 0/0 .text setTevStageNum__18J3DTevBlockPatchedFUc */ -void J3DTevBlockPatched::setTevStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 208) /* this->field_0xd0 */ = (u8)(param_0); -} - -/* 803229AC-803229B8 31D2EC 000C+00 1/0 0/0 0/0 .text setTevStageNum__18J3DTevBlockPatchedFPCUc */ -void J3DTevBlockPatched::setTevStageNum(u8 const* param_0) { - // NONMATCHING -} - -/* 803229B8-803229C0 31D2F8 0008+00 1/0 0/0 0/0 .text getTevStageNum__18J3DTevBlockPatchedCFv */ -u8 J3DTevBlockPatched::getTevStageNum() const { - // NONMATCHING -} - -/* 803229C0-803229D0 31D300 0010+00 1/0 0/0 0/0 .text setTexNo__18J3DTevBlockPatchedFUlUs - */ -void J3DTevBlockPatched::setTexNo(u32 param_0, u16 param_1) { - // NONMATCHING -} - -/* 803229D0-803229E4 31D310 0014+00 1/0 0/0 0/0 .text setTexNo__18J3DTevBlockPatchedFUlPCUs */ -void J3DTevBlockPatched::setTexNo(u32 param_0, u16 const* param_1) { - // NONMATCHING -} - -/* 803229E4-803229F4 31D324 0010+00 1/0 0/0 0/0 .text getTexNo__18J3DTevBlockPatchedCFUl - */ -u16 J3DTevBlockPatched::getTexNo(u32 param_0) const { - // NONMATCHING -} - -/* 803229F4-80322A08 31D334 0014+00 1/0 0/0 0/0 .text - * setTevOrder__18J3DTevBlockPatchedFUl11J3DTevOrder */ -void J3DTevBlockPatched::setTevOrder(u32 param_0, J3DTevOrder param_1) { - // NONMATCHING -} - -/* 80322A08-80322A1C 31D348 0014+00 1/0 0/0 0/0 .text - * setTevOrder__18J3DTevBlockPatchedFUlPC11J3DTevOrder */ -void J3DTevBlockPatched::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { - // NONMATCHING -} - -/* 80322A1C-80322A30 31D35C 0014+00 1/0 0/0 0/0 .text getTevOrder__18J3DTevBlockPatchedFUl */ -J3DTevOrder* J3DTevBlockPatched::getTevOrder(u32 param_0) { - // NONMATCHING -} - -/* 80322A30-80322A6C 31D370 003C+00 1/0 0/0 0/0 .text - * setTevStage__18J3DTevBlockPatchedFUl11J3DTevStage */ -void J3DTevBlockPatched::setTevStage(u32 param_0, J3DTevStage param_1) { - // NONMATCHING -} - -/* 80322A6C-80322AA8 31D3AC 003C+00 1/0 0/0 0/0 .text - * setTevStage__18J3DTevBlockPatchedFUlPC11J3DTevStage */ -void J3DTevBlockPatched::setTevStage(u32 param_0, J3DTevStage const* param_1) { - // NONMATCHING -} - -/* 80322AA8-80322ABC 31D3E8 0014+00 1/0 0/0 0/0 .text getTevStage__18J3DTevBlockPatchedFUl */ -J3DTevStage* J3DTevBlockPatched::getTevStage(u32 param_0) { - // NONMATCHING -} - -/* 80322ABC-80322AD0 31D3FC 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__18J3DTevBlockPatchedFUl14J3DIndTevStage */ -void J3DTevBlockPatched::setIndTevStage(u32 param_0, J3DIndTevStage param_1) { - // NONMATCHING -} - -/* 80322AD0-80322AE4 31D410 0014+00 1/0 0/0 0/0 .text - * setIndTevStage__18J3DTevBlockPatchedFUlPC14J3DIndTevStage */ -void J3DTevBlockPatched::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1) { - // NONMATCHING -} - -/* 80322AE4-80322AF8 31D424 0014+00 1/0 0/0 0/0 .text getIndTevStage__18J3DTevBlockPatchedFUl */ -J3DIndTevStage* J3DTevBlockPatched::getIndTevStage(u32 param_0) { - // NONMATCHING -} - -/* 80322AF8-80322B24 31D438 002C+00 1/0 0/0 0/0 .text - * setTevColor__18J3DTevBlockPatchedFUl13J3DGXColorS10 */ -void J3DTevBlockPatched::setTevColor(u32 param_0, J3DGXColorS10 param_1) { - // NONMATCHING -} - -/* 80322B24-80322B50 31D464 002C+00 1/0 0/0 0/0 .text - * setTevColor__18J3DTevBlockPatchedFUlPC13J3DGXColorS10 */ -void J3DTevBlockPatched::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) { - // NONMATCHING -} - -/* 80322B50-80322B64 31D490 0014+00 1/0 0/0 0/0 .text getTevColor__18J3DTevBlockPatchedFUl */ -J3DGXColorS10* J3DTevBlockPatched::getTevColor(u32 param_0) { - // NONMATCHING -} - -/* 80322B64-80322B90 31D4A4 002C+00 1/0 0/0 0/0 .text - * setTevKColor__18J3DTevBlockPatchedFUl10J3DGXColor */ -void J3DTevBlockPatched::setTevKColor(u32 param_0, J3DGXColor param_1) { - // NONMATCHING -} - -/* 80322B90-80322BBC 31D4D0 002C+00 1/0 0/0 0/0 .text - * setTevKColor__18J3DTevBlockPatchedFUlPC10J3DGXColor */ -void J3DTevBlockPatched::setTevKColor(u32 param_0, J3DGXColor const* param_1) { - // NONMATCHING -} - -/* 80322BBC-80322BD0 31D4FC 0014+00 1/0 0/0 0/0 .text getTevKColor__18J3DTevBlockPatchedFUl */ -J3DGXColor* J3DTevBlockPatched::getTevKColor(u32 param_0) { - // NONMATCHING -} - -/* 80322BD0-80322BDC 31D510 000C+00 1/0 0/0 0/0 .text setTevKColorSel__18J3DTevBlockPatchedFUlUc - */ -void J3DTevBlockPatched::setTevKColorSel(u32 param_0, u8 param_1) { - // NONMATCHING -} - -/* 80322BDC-80322BEC 31D51C 0010+00 1/0 0/0 0/0 .text setTevKColorSel__18J3DTevBlockPatchedFUlPCUc - */ -void J3DTevBlockPatched::setTevKColorSel(u32 param_0, u8 const* param_1) { - // NONMATCHING -} - -/* 80322BEC-80322BF8 31D52C 000C+00 1/0 0/0 0/0 .text getTevKColorSel__18J3DTevBlockPatchedFUl */ -bool J3DTevBlockPatched::getTevKColorSel(u32 param_0) { - // NONMATCHING -} - -/* 80322BF8-80322C00 31D538 0008+00 1/0 0/0 0/0 .text getTexNoOffset__18J3DTevBlockPatchedCFv */ -u32 J3DTevBlockPatched::getTexNoOffset() const { - // NONMATCHING -} - -/* 80322C00-80322C08 31D540 0008+00 1/0 0/0 0/0 .text getTevRegOffset__18J3DTevBlockPatchedCFv */ -bool J3DTevBlockPatched::getTevRegOffset() const { - // NONMATCHING -} - -/* 80322C08-80322C10 -00001 0008+00 0/0 0/0 0/0 .text setTevRegOffset__18J3DTevBlockPatchedFUl */ -void J3DTevBlockPatched::setTevRegOffset(u32 param_0) { - *(u32*)(((u8*)this) + 212) /* this->field_0xd4 */ = (u32)(param_0); -} - -/* 80322C10-80322C6C 31D550 005C+00 1/0 0/0 0/0 .text __dt__18J3DTevBlockPatchedFv */ -J3DTevBlockPatched::~J3DTevBlockPatched() { - // NONMATCHING -} - -/* 80322C6C-80322C78 31D5AC 000C+00 1/0 0/0 0/0 .text getType__19J3DTexGenBlockBasicFv */ -u32 J3DTexGenBlockBasic::getType() { - return 'TGBC'; -} - -/* 80322C78-80322C9C 31D5B8 0024+00 1/0 0/0 0/0 .text - * setNBTScale__19J3DTexGenBlockBasicF11J3DNBTScale */ -void J3DTexGenBlockBasic::setNBTScale(J3DNBTScale param_0) { - // NONMATCHING -} - -/* 80322C9C-80322CC0 31D5DC 0024+00 1/0 0/0 0/0 .text - * setNBTScale__19J3DTexGenBlockBasicFPC11J3DNBTScale */ -void J3DTexGenBlockBasic::setNBTScale(J3DNBTScale const* param_0) { - // NONMATCHING -} - -/* 80322CC0-80322CC8 31D600 0008+00 1/0 0/0 0/0 .text getNBTScale__19J3DTexGenBlockBasicFv */ -J3DNBTScale* J3DTexGenBlockBasic::getNBTScale() { - // NONMATCHING -} - -/* 80322CC8-80322D34 31D608 006C+00 1/0 0/0 0/0 .text __dt__19J3DTexGenBlockBasicFv */ -J3DTexGenBlockBasic::~J3DTexGenBlockBasic() { - // NONMATCHING -} - -/* 80322D34-80322D3C -00001 0008+00 0/0 0/0 0/0 .text setTexGenNum__21J3DTexGenBlockPatchedFUl */ -void J3DTexGenBlockPatched::setTexGenNum(u32 param_0) { - *(u32*)(((u8*)this) + 4) /* this->field_0x4 */ = (u32)(param_0); -} - -/* 80322D3C-80322D48 31D67C 000C+00 3/0 0/0 0/0 .text setTexGenNum__21J3DTexGenBlockPatchedFPCUl - */ -void J3DTexGenBlockPatched::setTexGenNum(u32 const* param_0) { - // NONMATCHING -} - -/* 80322D48-80322D50 31D688 0008+00 3/0 0/0 0/0 .text getTexGenNum__21J3DTexGenBlockPatchedCFv */ -u32 J3DTexGenBlockPatched::getTexGenNum() const { - // NONMATCHING -} - -/* 80322D50-80322D64 31D690 0014+00 3/0 0/0 0/0 .text - * setTexCoord__21J3DTexGenBlockPatchedFUlPC11J3DTexCoord */ -void J3DTexGenBlockPatched::setTexCoord(u32 param_0, J3DTexCoord const* param_1) { - // NONMATCHING -} - -/* 80322D64-80322D78 31D6A4 0014+00 3/0 0/0 0/0 .text getTexCoord__21J3DTexGenBlockPatchedFUl */ -J3DTexCoord* J3DTexGenBlockPatched::getTexCoord(u32 param_0) { - // NONMATCHING -} - -/* 80322D78-80322D88 31D6B8 0010+00 3/0 0/0 0/0 .text - * setTexMtx__21J3DTexGenBlockPatchedFUlP9J3DTexMtx */ -void J3DTexGenBlockPatched::setTexMtx(u32 param_0, J3DTexMtx* param_1) { - // NONMATCHING -} - -/* 80322D88-80322D98 31D6C8 0010+00 3/0 0/0 0/0 .text getTexMtx__21J3DTexGenBlockPatchedFUl */ -J3DTexMtx* J3DTexGenBlockPatched::getTexMtx(u32 param_0) { - // NONMATCHING -} - -/* 80322D98-80322DA0 31D6D8 0008+00 3/0 0/0 0/0 .text getTexMtxOffset__21J3DTexGenBlockPatchedCFv - */ -bool J3DTexGenBlockPatched::getTexMtxOffset() const { - // NONMATCHING -} - -/* 80322DA0-80322DA8 -00001 0008+00 0/0 0/0 0/0 .text setTexMtxOffset__21J3DTexGenBlockPatchedFUl - */ -void J3DTexGenBlockPatched::setTexMtxOffset(u32 param_0) { - *(u32*)(((u8*)this) + 88) /* this->field_0x58 */ = (u32)(param_0); -} - -/* 80322DA8-80322DB4 31D6E8 000C+00 1/0 0/0 0/0 .text getType__15J3DTexGenBlock4Fv */ -u32 J3DTexGenBlock4::getType() { - return 'TGB4'; -} - -/* 80322DB4-80322DD8 31D6F4 0024+00 1/0 0/0 0/0 .text setNBTScale__15J3DTexGenBlock4F11J3DNBTScale - */ -void J3DTexGenBlock4::setNBTScale(J3DNBTScale param_0) { - // NONMATCHING -} - -/* 80322DD8-80322DFC 31D718 0024+00 1/0 0/0 0/0 .text - * setNBTScale__15J3DTexGenBlock4FPC11J3DNBTScale */ -void J3DTexGenBlock4::setNBTScale(J3DNBTScale const* param_0) { - // NONMATCHING -} - -/* 80322DFC-80322E04 31D73C 0008+00 1/0 0/0 0/0 .text getNBTScale__15J3DTexGenBlock4Fv */ -J3DNBTScale* J3DTexGenBlock4::getNBTScale() { - // NONMATCHING -} - -/* 80322E04-80322E70 31D744 006C+00 1/0 0/0 0/0 .text __dt__15J3DTexGenBlock4Fv */ -J3DTexGenBlock4::~J3DTexGenBlock4() { - // NONMATCHING -} - -/* 80322E70-80322E74 31D7B0 0004+00 1/0 0/0 0/0 .text load__21J3DTexGenBlockPatchedFv */ -void J3DTexGenBlockPatched::load() { - /* empty function */ -} - -/* 80322E74-80322E80 31D7B4 000C+00 1/0 0/0 0/0 .text getType__21J3DTexGenBlockPatchedFv - */ -u32 J3DTexGenBlockPatched::getType() { - return 'TGPT'; -} - -/* 80322E80-80322E8C 31D7C0 000C+00 1/0 0/0 0/0 .text getType__20J3DColorBlockLightOnFv - */ -u32 J3DColorBlockLightOn::getType() { - return 'CLON'; -} - -/* 80322E8C-80322EB8 31D7CC 002C+00 1/0 0/0 0/0 .text - * setMatColor__20J3DColorBlockLightOnFUl10J3DGXColor */ -void J3DColorBlockLightOn::setMatColor(u32 param_0, J3DGXColor param_1) { - // NONMATCHING -} - -/* 80322EB8-80322EE4 31D7F8 002C+00 1/0 0/0 0/0 .text - * setMatColor__20J3DColorBlockLightOnFUlPC10J3DGXColor */ -void J3DColorBlockLightOn::setMatColor(u32 param_0, J3DGXColor const* param_1) { - // NONMATCHING -} - -/* 80322EE4-80322EF8 31D824 0014+00 1/0 0/0 0/0 .text getMatColor__20J3DColorBlockLightOnFUl */ -J3DGXColor* J3DColorBlockLightOn::getMatColor(u32 param_0) { - // NONMATCHING -} - -/* 80322EF8-80322F24 31D838 002C+00 1/0 0/0 0/0 .text - * setAmbColor__20J3DColorBlockLightOnFUl10J3DGXColor */ -void J3DColorBlockLightOn::setAmbColor(u32 param_0, J3DGXColor param_1) { - // NONMATCHING -} - -/* 80322F24-80322F50 31D864 002C+00 1/0 0/0 0/0 .text - * setAmbColor__20J3DColorBlockLightOnFUlPC10J3DGXColor */ -void J3DColorBlockLightOn::setAmbColor(u32 param_0, J3DGXColor const* param_1) { - // NONMATCHING -} - -/* 80322F50-80322F64 31D890 0014+00 1/0 0/0 0/0 .text getAmbColor__20J3DColorBlockLightOnFUl */ -J3DGXColor* J3DColorBlockLightOn::getAmbColor(u32 param_0) { - // NONMATCHING -} - -/* 80322F64-80322F70 31D8A4 000C+00 1/0 0/0 0/0 .text setColorChanNum__20J3DColorBlockLightOnFPCUc - */ -void J3DColorBlockLightOn::setColorChanNum(u8 const* param_0) { - // NONMATCHING -} - -/* 80322F70-80322F78 -00001 0008+00 0/0 0/0 0/0 .text setColorChanNum__20J3DColorBlockLightOnFUc - */ -void J3DColorBlockLightOn::setColorChanNum(u8 param_0) { - *(u8*)(((u8*)this) + 20) /* this->field_0x14 */ = (u8)(param_0); -} - -/* 80322F78-80322F80 31D8B8 0008+00 1/0 0/0 0/0 .text getColorChanNum__20J3DColorBlockLightOnCFv - */ -u8 J3DColorBlockLightOn::getColorChanNum() const { - // NONMATCHING -} - -/* 80322F80-80322F94 31D8C0 0014+00 1/0 0/0 0/0 .text - * setColorChan__20J3DColorBlockLightOnFUlPC12J3DColorChan */ -void J3DColorBlockLightOn::setColorChan(u32 param_0, J3DColorChan const* param_1) { - // NONMATCHING -} - -/* 80322F94-80322FA8 31D8D4 0014+00 1/0 0/0 0/0 .text - * setColorChan__20J3DColorBlockLightOnFUlRC12J3DColorChan */ -void J3DColorBlockLightOn::setColorChan(u32 param_0, J3DColorChan const& param_1) { - // NONMATCHING -} - -/* 80322FA8-80322FBC 31D8E8 0014+00 1/0 0/0 0/0 .text getColorChan__20J3DColorBlockLightOnFUl */ -J3DColorChan* J3DColorBlockLightOn::getColorChan(u32 param_0) { - // NONMATCHING -} - -/* 80322FBC-80322FCC 31D8FC 0010+00 1/0 0/0 0/0 .text - * setLight__20J3DColorBlockLightOnFUlP11J3DLightObj */ -void J3DColorBlockLightOn::setLight(u32 param_0, J3DLightObj* param_1) { - // NONMATCHING -} - -/* 80322FCC-80322FDC 31D90C 0010+00 1/0 0/0 0/0 .text getLight__20J3DColorBlockLightOnFUl - */ -bool J3DColorBlockLightOn::getLight(u32 param_0) { - // NONMATCHING -} - -/* 80322FDC-80322FE4 -00001 0008+00 0/0 0/0 0/0 .text setCullMode__20J3DColorBlockLightOnFUc */ -void J3DColorBlockLightOn::setCullMode(u8 param_0) { - *(u8*)(((u8*)this) + 64) /* this->field_0x40 */ = (u8)(param_0); -} - -/* 80322FE4-80322FF0 31D924 000C+00 1/0 0/0 0/0 .text setCullMode__20J3DColorBlockLightOnFPCUc */ -void J3DColorBlockLightOn::setCullMode(u8 const* param_0) { - // NONMATCHING -} - -/* 80322FF0-80322FF8 31D930 0008+00 1/0 0/0 0/0 .text getCullMode__20J3DColorBlockLightOnCFv */ -s32 J3DColorBlockLightOn::getCullMode() const { - // NONMATCHING -} - -/* 80322FF8-80323000 31D938 0008+00 1/0 0/0 0/0 .text getMatColorOffset__20J3DColorBlockLightOnCFv - */ -u32 J3DColorBlockLightOn::getMatColorOffset() const { - // NONMATCHING -} - -/* 80323000-80323008 31D940 0008+00 1/0 0/0 0/0 .text - * getColorChanOffset__20J3DColorBlockLightOnCFv */ -u32 J3DColorBlockLightOn::getColorChanOffset() const { - // NONMATCHING -} - -/* 80323008-80323010 -00001 0008+00 0/0 0/0 0/0 .text setMatColorOffset__20J3DColorBlockLightOnFUl - */ -void J3DColorBlockLightOn::setMatColorOffset(u32 param_0) { - *(u32*)(((u8*)this) + 68) /* this->field_0x44 */ = (u32)(param_0); -} - -/* 80323010-80323018 -00001 0008+00 0/0 0/0 0/0 .text - * setColorChanOffset__20J3DColorBlockLightOnFUl */ -void J3DColorBlockLightOn::setColorChanOffset(u32 param_0) { - *(u32*)(((u8*)this) + 72) /* this->field_0x48 */ = (u32)(param_0); -} - -/* 80323018-80323074 31D958 005C+00 1/0 0/0 0/0 .text __dt__20J3DColorBlockLightOnFv */ -J3DColorBlockLightOn::~J3DColorBlockLightOn() { - // NONMATCHING -} - -/* 80323074-80323080 31D9B4 000C+00 1/0 0/0 0/0 .text getType__22J3DColorBlockAmbientOnFv - */ -u32 J3DColorBlockAmbientOn::getType() { - return 'CLAB'; -} - -/* 80323080-803230AC 31D9C0 002C+00 1/0 0/0 0/0 .text - * setAmbColor__22J3DColorBlockAmbientOnFUl10J3DGXColor */ -void J3DColorBlockAmbientOn::setAmbColor(u32 param_0, J3DGXColor param_1) { - // NONMATCHING -} - -/* 803230AC-803230D8 31D9EC 002C+00 1/0 0/0 0/0 .text - * setAmbColor__22J3DColorBlockAmbientOnFUlPC10J3DGXColor */ -void J3DColorBlockAmbientOn::setAmbColor(u32 param_0, J3DGXColor const* param_1) { - // NONMATCHING -} - -/* 803230D8-803230EC 31DA18 0014+00 1/0 0/0 0/0 .text getAmbColor__22J3DColorBlockAmbientOnFUl */ -J3DGXColor* J3DColorBlockAmbientOn::getAmbColor(u32 param_0) { - // NONMATCHING -} - -/* ############################################################################################## */ -/* 803CEA34-803CEAC8 02BB54 0090+04 1/1 2/2 0/0 .data __vt__21J3DColorBlockLightOff */ -SECTION_DATA extern void* __vt__21J3DColorBlockLightOff[36 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)load__21J3DColorBlockLightOffFv, - (void*)reset__21J3DColorBlockLightOffFP13J3DColorBlock, - (void*)patch__21J3DColorBlockLightOffFv, - (void*)patchMatColor__21J3DColorBlockLightOffFv, - (void*)patchLight__21J3DColorBlockLightOffFv, - (void*)diff__21J3DColorBlockLightOffFUl, - (void*)diffAmbColor__13J3DColorBlockFv, - (void*)diffMatColor__21J3DColorBlockLightOffFv, - (void*)diffColorChan__21J3DColorBlockLightOffFv, - (void*)diffLightObj__13J3DColorBlockFUl, - (void*)countDLSize__21J3DColorBlockLightOffFv, - (void*)getType__21J3DColorBlockLightOffFv, - (void*)setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor, - (void*)setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor, - (void*)getMatColor__21J3DColorBlockLightOffFUl, - (void*)setAmbColor__13J3DColorBlockFUlPC10J3DGXColor, - (void*)setAmbColor__13J3DColorBlockFUl10J3DGXColor, - (void*)getAmbColor__13J3DColorBlockFUl, - (void*)setColorChanNum__21J3DColorBlockLightOffFUc, - (void*)setColorChanNum__21J3DColorBlockLightOffFPCUc, - (void*)getColorChanNum__21J3DColorBlockLightOffCFv, - (void*)setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan, - (void*)setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan, - (void*)getColorChan__21J3DColorBlockLightOffFUl, - (void*)setLight__13J3DColorBlockFUlP11J3DLightObj, - (void*)getLight__13J3DColorBlockFUl, - (void*)setCullMode__21J3DColorBlockLightOffFPCUc, - (void*)setCullMode__21J3DColorBlockLightOffFUc, - (void*)getCullMode__21J3DColorBlockLightOffCFv, - (void*)getMatColorOffset__21J3DColorBlockLightOffCFv, - (void*)getColorChanOffset__21J3DColorBlockLightOffCFv, - (void*)setMatColorOffset__21J3DColorBlockLightOffFUl, - (void*)setColorChanOffset__21J3DColorBlockLightOffFUl, - (void*)__dt__21J3DColorBlockLightOffFv, - /* padding */ - NULL, -}; - -/* 803230EC-80323158 31DA2C 006C+00 1/0 0/0 0/0 .text __dt__22J3DColorBlockAmbientOnFv */ -J3DColorBlockAmbientOn::~J3DColorBlockAmbientOn() {} - -/* 80323158-80323184 31DA98 002C+00 2/0 0/0 0/0 .text - * setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor */ -void J3DColorBlockLightOff::setMatColor(u32 param_0, J3DGXColor param_1) { - mMatColor[param_0] = param_1; -} - -/* 80323184-803231B0 31DAC4 002C+00 2/0 0/0 0/0 .text - * setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor */ -void J3DColorBlockLightOff::setMatColor(u32 param_0, J3DGXColor const* param_1) { - mMatColor[param_0] = *param_1; -} - -/* 803231B0-803231C4 31DAF0 0014+00 2/0 0/0 0/0 .text getMatColor__21J3DColorBlockLightOffFUl */ -J3DGXColor* J3DColorBlockLightOff::getMatColor(u32 param_0) { - return &mMatColor[param_0]; -} - -/* 803231C4-803231D0 31DB04 000C+00 2/0 0/0 0/0 .text - * setColorChanNum__21J3DColorBlockLightOffFPCUc */ -void J3DColorBlockLightOff::setColorChanNum(u8 const* param_0) { - mColorChanNum = *param_0; -} - -/* 803231D0-803231D8 -00001 0008+00 0/0 0/0 0/0 .text setColorChanNum__21J3DColorBlockLightOffFUc - */ -void J3DColorBlockLightOff::setColorChanNum(u8 param_0) { - mColorChanNum = param_0; -} - -/* 803231D8-803231E0 31DB18 0008+00 2/0 0/0 0/0 .text getColorChanNum__21J3DColorBlockLightOffCFv - */ -u8 J3DColorBlockLightOff::getColorChanNum() const { - return mColorChanNum; -} - -/* 803231E0-803231F4 31DB20 0014+00 2/0 0/0 0/0 .text - * setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan */ -void J3DColorBlockLightOff::setColorChan(u32 param_0, J3DColorChan const* param_1) { - mColorChan[param_0] = *param_1; -} - -/* 803231F4-80323208 31DB34 0014+00 2/0 0/0 0/0 .text - * setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan */ -void J3DColorBlockLightOff::setColorChan(u32 param_0, J3DColorChan const& param_1) { - mColorChan[param_0] = param_1; -} - -/* 80323208-8032321C 31DB48 0014+00 2/0 0/0 0/0 .text getColorChan__21J3DColorBlockLightOffFUl */ -J3DColorChan* J3DColorBlockLightOff::getColorChan(u32 param_0) { - return &mColorChan[param_0]; -} - -/* 8032321C-80323224 -00001 0008+00 0/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFUc */ -void J3DColorBlockLightOff::setCullMode(u8 param_0) { - mCullMode = param_0; -} - -/* 80323224-80323230 31DB64 000C+00 2/0 0/0 0/0 .text setCullMode__21J3DColorBlockLightOffFPCUc */ -void J3DColorBlockLightOff::setCullMode(u8 const* param_0) { - mCullMode = *param_0; -} - -/* 80323230-80323238 31DB70 0008+00 2/0 0/0 0/0 .text getCullMode__21J3DColorBlockLightOffCFv */ -s32 J3DColorBlockLightOff::getCullMode() const { - return mCullMode; -} - -/* 80323238-80323240 31DB78 0008+00 2/0 0/0 0/0 .text - * getMatColorOffset__21J3DColorBlockLightOffCFv */ -u32 J3DColorBlockLightOff::getMatColorOffset() const { - return mMatColorOffset; -} - -/* 80323240-80323248 31DB80 0008+00 2/0 0/0 0/0 .text - * getColorChanOffset__21J3DColorBlockLightOffCFv */ -u32 J3DColorBlockLightOff::getColorChanOffset() const { - return mColorChanOffset; -} - -/* 80323248-80323250 -00001 0008+00 0/0 0/0 0/0 .text - * setMatColorOffset__21J3DColorBlockLightOffFUl */ -void J3DColorBlockLightOff::setMatColorOffset(u32 param_0) { - mMatColorOffset = param_0; -} - -/* 80323250-80323258 -00001 0008+00 0/0 0/0 0/0 .text - * setColorChanOffset__21J3DColorBlockLightOffFUl */ -void J3DColorBlockLightOff::setColorChanOffset(u32 param_0) { - mColorChanOffset = param_0; -} - -/* 80323258-80323264 31DB98 000C+00 1/0 0/0 0/0 .text getType__13J3DPEBlockXluFv */ -u32 J3DPEBlockXlu::getType() { - return 'PEXL'; -} - -/* 80323264-803232C0 31DBA4 005C+00 1/0 0/0 0/0 .text __dt__13J3DPEBlockXluFv */ -J3DPEBlockXlu::~J3DPEBlockXlu() {} - -/* 803232C0-803232CC 31DC00 000C+00 1/0 0/0 0/0 .text getType__17J3DPEBlockTexEdgeFv */ -u32 J3DPEBlockTexEdge::getType() { - return 'PEED'; -} - -/* 803232CC-80323328 31DC0C 005C+00 1/0 0/0 0/0 .text __dt__17J3DPEBlockTexEdgeFv */ -J3DPEBlockTexEdge::~J3DPEBlockTexEdge() {} - -/* 80323328-80323334 31DC68 000C+00 1/0 0/0 0/0 .text getType__13J3DPEBlockOpaFv */ -u32 J3DPEBlockOpa::getType() { - return 'PEOP'; -} - -/* 80323334-80323390 31DC74 005C+00 1/0 0/0 0/0 .text __dt__13J3DPEBlockOpaFv */ -J3DPEBlockOpa::~J3DPEBlockOpa() {} - -/* 80323390-8032339C 31DCD0 000C+00 1/0 0/0 0/0 .text getType__15J3DIndBlockFullFv */ -u32 J3DIndBlockFull::getType() { - return 'IBLF'; -} - -/* 8032339C-803233A4 -00001 0008+00 0/0 0/0 0/0 .text setIndTexStageNum__15J3DIndBlockFullFUc */ -void J3DIndBlockFull::setIndTexStageNum(u8 param_0) { - *(u8*)(((u8*)this) + 4) /* this->field_0x4 */ = (u8)(param_0); -} - -/* 803233A4-803233AC 31DCE4 0008+00 1/0 0/0 0/0 .text getIndTexStageNum__15J3DIndBlockFullCFv */ -u8 J3DIndBlockFull::getIndTexStageNum() const { - return mIndTexStageNum; -} - -/* 803233AC-803233C0 31DCEC 0014+00 1/0 0/0 0/0 .text - * setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder */ -void J3DIndBlockFull::setIndTexOrder(u32 param_0, J3DIndTexOrder param_1) { - mIndTexOrder[param_0] = param_1; -} - -/* 803233C0-803233D4 31DD00 0014+00 1/0 0/0 0/0 .text - * setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder */ -void J3DIndBlockFull::setIndTexOrder(u32 param_0, J3DIndTexOrder const* param_1) { - mIndTexOrder[param_0] = *param_1; -} - -/* 803233D4-803233E8 31DD14 0014+00 1/0 0/0 0/0 .text getIndTexOrder__15J3DIndBlockFullFUl */ -J3DIndTexOrder* J3DIndBlockFull::getIndTexOrder(u32 param_0) { - return &mIndTexOrder[param_0]; -} - -/* 803233E8-8032341C 31DD28 0034+00 1/0 0/0 0/0 .text - * setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx */ -void J3DIndBlockFull::setIndTexMtx(u32 param_0, J3DIndTexMtx param_1) { - mIndTexMtx[param_0] = param_1; -} - -/* 8032341C-80323450 31DD5C 0034+00 1/0 0/0 0/0 .text - * setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx */ -void J3DIndBlockFull::setIndTexMtx(u32 param_0, J3DIndTexMtx const* param_1) { - mIndTexMtx[param_0] = *param_1; -} - -/* 80323450-80323464 31DD90 0014+00 1/0 0/0 0/0 .text getIndTexMtx__15J3DIndBlockFullFUl - */ -J3DIndTexMtx* J3DIndBlockFull::getIndTexMtx(u32 param_0) { - return &mIndTexMtx[param_0]; -} - -/* 80323464-80323478 31DDA4 0014+00 1/0 0/0 0/0 .text - * setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale */ -void J3DIndBlockFull::setIndTexCoordScale(u32 param_0, J3DIndTexCoordScale param_1) { - mIndTexCoordScale[param_0] = param_1; -} - -/* 80323478-8032348C 31DDB8 0014+00 1/0 0/0 0/0 .text - * setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale */ -void J3DIndBlockFull::setIndTexCoordScale(u32 param_0, J3DIndTexCoordScale const* param_1) { - mIndTexCoordScale[param_0] = *param_1; -} - -/* 8032348C-803234A0 31DDCC 0014+00 1/0 0/0 0/0 .text getIndTexCoordScale__15J3DIndBlockFullFUl */ -J3DIndTexCoordScale* J3DIndBlockFull::getIndTexCoordScale(u32 param_0) { - return &mIndTexCoordScale[param_0]; -} - -/* 803234A0-8032353C 31DDE0 009C+00 1/0 0/0 0/0 .text __dt__15J3DIndBlockFullFv */ -J3DIndBlockFull::~J3DIndBlockFull() {} - -/* 8032353C-80323540 31DE7C 0004+00 1/0 1/0 0/0 .text patchTexNo__11J3DTevBlockFv */ -void J3DTevBlock::patchTexNo() { -} - -/* 80323540-80323544 31DE80 0004+00 1/0 1/0 0/0 .text patchTevReg__11J3DTevBlockFv */ -void J3DTevBlock::patchTevReg() { -} - -/* 80323544-80323548 31DE84 0004+00 1/0 1/0 0/0 .text setTexNo__11J3DTevBlockFUlPCUs */ -void J3DTevBlock::setTexNo(u32 param_0, u16 const* param_1) { -} - -/* 80323548-8032354C 31DE88 0004+00 1/0 1/0 0/0 .text setTevOrder__11J3DTevBlockFUlPC11J3DTevOrder - */ -void J3DTevBlock::setTevOrder(u32 param_0, J3DTevOrder const* param_1) { -} - -/* 8032354C-80323550 31DE8C 0004+00 1/0 1/0 0/0 .text setTevStageNum__11J3DTevBlockFPCUc - */ -void J3DTevBlock::setTevStageNum(u8 const* param_0) { -} - -/* 80323550-80323554 31DE90 0004+00 1/0 1/0 0/0 .text setTevStage__11J3DTevBlockFUlPC11J3DTevStage - */ -void J3DTevBlock::setTevStage(u32 param_0, J3DTevStage const* param_1) { -} - -/* 80323554-80323558 31DE94 0004+00 1/0 1/0 0/0 .text - * setIndTevStage__11J3DTevBlockFUlPC14J3DIndTevStage */ -void J3DTevBlock::setIndTevStage(u32 param_0, J3DIndTevStage const* param_1) { -} - -/* 80323558-80323560 31DE98 0008+00 1/0 1/0 0/0 .text getTexNoOffset__11J3DTevBlockCFv */ -u32 J3DTevBlock::getTexNoOffset() const { - return 0; -} - -/* 80323560-8032356C 31DEA0 000C+00 1/0 0/0 0/0 .text getType__21J3DColorBlockLightOffFv - */ -u32 J3DColorBlockLightOff::getType() { - return 'CLOF'; -} - -/* 803A1EA8-803A1EA8 02E508 0000+00 0/0 0/0 0/0 .rodata @stringBase0 */ \ No newline at end of file diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/src/JSystem/J3DGraphBase/J3DMaterial.cpp index fcdf40ea6b1..491b0d23f3c 100644 --- a/src/JSystem/J3DGraphBase/J3DMaterial.cpp +++ b/src/JSystem/J3DGraphBase/J3DMaterial.cpp @@ -5,434 +5,6 @@ #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DGD.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void createColorBlock__11J3DMaterialFUl(); -extern "C" void createTexGenBlock__11J3DMaterialFUl(); -extern "C" void createTevBlock__11J3DMaterialFi(); -extern "C" void createIndBlock__11J3DMaterialFi(); -extern "C" void createPEBlock__11J3DMaterialFUlUl(); -extern "C" void calcSizeColorBlock__11J3DMaterialFUl(); -extern "C" void calcSizeTexGenBlock__11J3DMaterialFUl(); -extern "C" void calcSizeTevBlock__11J3DMaterialFi(); -extern "C" void calcSizeIndBlock__11J3DMaterialFi(); -extern "C" void calcSizePEBlock__11J3DMaterialFUlUl(); -extern "C" void initialize__11J3DMaterialFv(); -extern "C" void countDLSize__11J3DMaterialFv(); -extern "C" void makeDisplayList_private__11J3DMaterialFP17J3DDisplayListObj(); -extern "C" void makeDisplayList__11J3DMaterialFv(); -extern "C" void makeSharedDisplayList__11J3DMaterialFv(); -extern "C" void load__11J3DMaterialFv(); -extern "C" void loadSharedDL__11J3DMaterialFv(); -extern "C" void patch__11J3DMaterialFv(); -extern "C" void diff__11J3DMaterialFUl(); -extern "C" void calc__11J3DMaterialFPA4_Cf(); -extern "C" void calcDiffTexMtx__11J3DMaterialFPA4_Cf(); -extern "C" void setCurrentMtx__11J3DMaterialFv(); -extern "C" void calcCurrentMtx__11J3DMaterialFv(); -extern "C" void copy__11J3DMaterialFP11J3DMaterial(); -extern "C" void reset__11J3DMaterialFv(); -extern "C" void change__11J3DMaterialFv(); -extern "C" void newSharedDisplayList__11J3DMaterialFUl(); -extern "C" void newSingleSharedDisplayList__11J3DMaterialFUl(); -extern "C" void initialize__18J3DPatchedMaterialFv(); -extern "C" void makeDisplayList__18J3DPatchedMaterialFv(); -extern "C" void makeSharedDisplayList__18J3DPatchedMaterialFv(); -extern "C" void load__18J3DPatchedMaterialFv(); -extern "C" void loadSharedDL__18J3DPatchedMaterialFv(); -extern "C" void reset__18J3DPatchedMaterialFv(); -extern "C" void change__18J3DPatchedMaterialFv(); -extern "C" void initialize__17J3DLockedMaterialFv(); -extern "C" void makeDisplayList__17J3DLockedMaterialFv(); -extern "C" void makeSharedDisplayList__17J3DLockedMaterialFv(); -extern "C" void load__17J3DLockedMaterialFv(); -extern "C" void loadSharedDL__17J3DLockedMaterialFv(); -extern "C" void patch__17J3DLockedMaterialFv(); -extern "C" void diff__17J3DLockedMaterialFUl(); -extern "C" void calc__17J3DLockedMaterialFPA4_Cf(); -extern "C" void reset__17J3DLockedMaterialFv(); -extern "C" void change__17J3DLockedMaterialFv(); -extern "C" void __dt__21J3DColorBlockLightOffFv(); -extern "C" void __dt__13J3DColorBlockFv(); -extern "C" void __dt__21J3DTexGenBlockPatchedFv(); -extern "C" void __dt__14J3DTexGenBlockFv(); -extern "C" void __dt__11J3DTevBlockFv(); -extern "C" void __dt__11J3DIndBlockFv(); -extern "C" void __dt__10J3DPEBlockFv(); -extern "C" bool countDLSize__14J3DTexGenBlockFv(); -extern "C" bool countDLSize__13J3DColorBlockFv(); -extern "C" bool countDLSize__11J3DTevBlockFv(); -extern "C" bool countDLSize__11J3DIndBlockFv(); -extern "C" bool countDLSize__10J3DPEBlockFv(); -extern "C" void load__13J3DColorBlockFv(); -extern "C" s32 getCullMode__13J3DColorBlockCFv(); -extern "C" void load__11J3DTevBlockFv(); -extern "C" J3DNBTScale* getNBTScale__14J3DTexGenBlockFv(); -extern "C" void patch__13J3DColorBlockFv(); -extern "C" void diff__13J3DColorBlockFUl(); -extern "C" void diff__10J3DPEBlockFUl(); -extern "C" void reset__10J3DPEBlockFP10J3DPEBlock(); -extern "C" void reset__11J3DIndBlockFP11J3DIndBlock(); -extern "C" void reset__11J3DTevBlockFP11J3DTevBlock(J3DTevBlock* param_0); -extern "C" void reset__14J3DTexGenBlockFP14J3DTexGenBlock(); -extern "C" void reset__13J3DColorBlockFP13J3DColorBlock(); -extern "C" void diffFog__10J3DPEBlockFv(); -extern "C" void diffBlend__10J3DPEBlockFv(); -extern "C" void setFog__10J3DPEBlockFP6J3DFog(); -extern "C" void setFog__10J3DPEBlockF6J3DFog(); -extern "C" void setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp(); -extern "C" void setBlend__10J3DPEBlockFPC8J3DBlend(); -extern "C" void setZMode__10J3DPEBlockFPC8J3DZMode(); -extern "C" void setZCompLoc__10J3DPEBlockFPCUc(); -extern "C" void setDither__10J3DPEBlockFUc(); -extern "C" void setDither__10J3DPEBlockFPCUc(); -extern "C" bool getDither__10J3DPEBlockCFv(); -extern "C" bool getFogOffset__10J3DPEBlockCFv(); -extern "C" void setFogOffset__10J3DPEBlockFUl(); -extern "C" void diff__15J3DIndBlockNullFUl(); -extern "C" void load__15J3DIndBlockNullFv(); -extern "C" void reset__15J3DIndBlockNullFP11J3DIndBlock(); -extern "C" void getType__15J3DIndBlockNullFv(); -extern "C" void __dt__15J3DIndBlockNullFv(); -extern "C" void setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder(); -extern "C" void setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder(); -extern "C" void setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx(); -extern "C" void setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale(); -extern "C" void setTexGenNum__14J3DTexGenBlockFPCUl(); -extern "C" void setNBTScale__14J3DTexGenBlockF11J3DNBTScale(); -extern "C" void setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale(); -extern "C" bool getTexMtxOffset__14J3DTexGenBlockCFv(); -extern "C" void setTexMtxOffset__14J3DTexGenBlockFUl(); -extern "C" void patchMatColor__13J3DColorBlockFv(); -extern "C" void diffAmbColor__13J3DColorBlockFv(); -extern "C" void diffMatColor__13J3DColorBlockFv(); -extern "C" void diffColorChan__13J3DColorBlockFv(); -extern "C" void diffLightObj__13J3DColorBlockFUl(); -extern "C" void setMatColor__13J3DColorBlockFUlPC10J3DGXColor(); -extern "C" void setColorChanNum__13J3DColorBlockFPCUc(); -extern "C" void setColorChan__13J3DColorBlockFUlPC12J3DColorChan(); -extern "C" bool getLight__13J3DColorBlockFUl(); -extern "C" void setCullMode__13J3DColorBlockFUc(); -extern "C" void setCullMode__13J3DColorBlockFPCUc(); -extern "C" u32 getMatColorOffset__13J3DColorBlockCFv(); -extern "C" bool getColorChanOffset__13J3DColorBlockCFv(); -extern "C" void setMatColorOffset__13J3DColorBlockFUl(); -extern "C" void setColorChanOffset__13J3DColorBlockFUl(); - -// -// External References: -// - -extern "C" void patch__10J3DPEBlockFv(); -extern "C" void patchLight__13J3DColorBlockFv(); -extern "C" bool getZCompLoc__10J3DPEBlockCFv(); -extern "C" bool getZMode__10J3DPEBlockFv(); -extern "C" bool getBlend__10J3DPEBlockFv(); -extern "C" bool getAlphaComp__10J3DPEBlockFv(); -extern "C" bool getFog__10J3DPEBlockFv(); -extern "C" bool getIndTexCoordScale__11J3DIndBlockFUl(); -extern "C" bool getIndTexMtx__11J3DIndBlockFUl(); -extern "C" bool getIndTexOrder__11J3DIndBlockFUl(); -extern "C" bool getIndTexStageNum__11J3DIndBlockCFv(); -extern "C" bool getTexMtx__14J3DTexGenBlockFUl(); -extern "C" bool getTexCoord__14J3DTexGenBlockFUl(); -extern "C" bool getTexGenNum__14J3DTexGenBlockCFv(); -extern "C" bool getAmbColor__13J3DColorBlockFUl(); -extern "C" bool getColorChan__13J3DColorBlockFUl(); -extern "C" bool getMatColor__13J3DColorBlockFUl(); -extern "C" bool getColorChanNum__13J3DColorBlockCFv(); -extern "C" void setZCompLoc__10J3DPEBlockFUc(); -extern "C" void setZMode__10J3DPEBlockF8J3DZMode(); -extern "C" void setBlend__10J3DPEBlockFRC8J3DBlend(); -extern "C" void setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp(); -extern "C" void setIndTexCoordScale__11J3DIndBlockFUl19J3DIndTexCoordScale(); -extern "C" void __dt__19J3DIndTexCoordScaleFv(); -extern "C" void setIndTexMtx__11J3DIndBlockFUl12J3DIndTexMtx(); -extern "C" void __dt__12J3DIndTexMtxFv(); -extern "C" void setIndTexStageNum__11J3DIndBlockFUc(); -extern "C" void setTexCoord__14J3DTexGenBlockFUlPC11J3DTexCoord(); -extern "C" void setTexGenNum__14J3DTexGenBlockFUl(); -extern "C" void setAmbColor__13J3DColorBlockFUl10J3DGXColor(); -extern "C" void setColorChan__13J3DColorBlockFUlRC12J3DColorChan(); -extern "C" void setMatColor__13J3DColorBlockFUl10J3DGXColor(); -extern "C" void setColorChanNum__13J3DColorBlockFUc(); -extern "C" void __ct__19J3DIndTexCoordScaleFv(); -extern "C" void __ct__12J3DIndTexMtxFv(); -extern "C" void __ct__14J3DIndTexOrderFv(); -extern "C" void __ct__19J3DTevSwapModeTableFv(); -extern "C" void __ct__11J3DTevOrderFv(); -extern "C" void __ct__14J3DIndTevStageFv(); -extern "C" void __ct__11J3DTevStageFv(); -extern "C" void __ct__13J3DGXColorS10Fv(); -extern "C" void __ct__11J3DTexCoordFv(); -extern "C" void __ct__12J3DColorChanFv(); -extern "C" void __ct__10J3DGXColorFv(); -extern "C" void setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx(); -extern "C" void setLight__13J3DColorBlockFUlP11J3DLightObj(); -extern "C" void setAmbColor__13J3DColorBlockFUlPC10J3DGXColor(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" void J3DGDSetGenMode__FUcUcUcUc11_GXCullMode(); -extern "C" void J3DGDSetGenMode_3Param__FUcUcUc(); -extern "C" void newDisplayList__17J3DDisplayListObjFUl(); -extern "C" void newSingleDisplayList__17J3DDisplayListObjFUl(); -extern "C" void callDL__17J3DDisplayListObjCFv(); -extern "C" void beginDL__17J3DDisplayListObjFv(); -extern "C" void endDL__17J3DDisplayListObjFv(); -extern "C" void beginPatch__17J3DDisplayListObjFv(); -extern "C" void endPatch__17J3DDisplayListObjFv(); -extern "C" void beginDiff__12J3DMatPacketFv(); -extern "C" void endDiff__12J3DMatPacketFv(); -extern "C" void initialize__21J3DColorBlockLightOffFv(); -extern "C" void initialize__22J3DColorBlockAmbientOnFv(); -extern "C" void initialize__20J3DColorBlockLightOnFv(); -extern "C" void initialize__21J3DTexGenBlockPatchedFv(); -extern "C" void initialize__15J3DTexGenBlock4Fv(); -extern "C" void initialize__19J3DTexGenBlockBasicFv(); -extern "C" void initialize__12J3DTevBlock1Fv(); -extern "C" void initialize__12J3DTevBlock2Fv(); -extern "C" void initialize__12J3DTevBlock4Fv(); -extern "C" void initialize__13J3DTevBlock16Fv(); -extern "C" void initialize__15J3DIndBlockFullFv(); -extern "C" void initialize__16J3DPEBlockFogOffFv(); -extern "C" void initialize__14J3DPEBlockFullFv(); -extern "C" void loadNBTScale__FR11J3DNBTScale(); -extern "C" void __as__10J3DFogInfoFRC10J3DFogInfo(); -extern "C" void __construct_array(); -extern "C" void _savegpr_24(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_24(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__14J3DPEBlockFull[31]; -extern "C" extern void* __vt__16J3DPEBlockFogOff[31]; -extern "C" extern void* __vt__13J3DTevBlock16[55]; -extern "C" extern void* __vt__12J3DTevBlock4[55]; -extern "C" extern void* __vt__12J3DTevBlock2[55]; -extern "C" extern void* __vt__12J3DTevBlock1[55]; -extern "C" extern void* __vt__19J3DTexGenBlockBasic[27]; -extern "C" extern void* __vt__15J3DTexGenBlock4[27]; -extern "C" extern void* __vt__21J3DTexGenBlockPatched[27]; -extern "C" extern void* __vt__20J3DColorBlockLightOn[36]; -extern "C" extern void* __vt__22J3DColorBlockAmbientOn[36]; -extern "C" extern void* __vt__13J3DPEBlockXlu[31]; -extern "C" extern void* __vt__17J3DPEBlockTexEdge[31]; -extern "C" extern void* __vt__13J3DPEBlockOpa[31]; -extern "C" extern void* __vt__15J3DIndBlockFull[19]; -extern "C" extern void* __vt__11J3DTevBlock[55]; -extern "C" extern void* __vt__21J3DColorBlockLightOff[36 + 1 /* padding */]; - -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803CDC90-803CDCC0 02ADB0 0030+00 0/0 1/1 0/0 .data __vt__17J3DLockedMaterial */ -SECTION_DATA extern void* __vt__17J3DLockedMaterial[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)calc__17J3DLockedMaterialFPA4_Cf, - (void*)calcDiffTexMtx__11J3DMaterialFPA4_Cf, - (void*)makeDisplayList__17J3DLockedMaterialFv, - (void*)makeSharedDisplayList__17J3DLockedMaterialFv, - (void*)load__17J3DLockedMaterialFv, - (void*)loadSharedDL__17J3DLockedMaterialFv, - (void*)patch__17J3DLockedMaterialFv, - (void*)diff__17J3DLockedMaterialFUl, - (void*)reset__17J3DLockedMaterialFv, - (void*)change__17J3DLockedMaterialFv, -}; - -/* 803CDCC0-803CDCF0 02ADE0 0030+00 0/0 1/1 0/0 .data __vt__18J3DPatchedMaterial */ -SECTION_DATA extern void* __vt__18J3DPatchedMaterial[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)calc__11J3DMaterialFPA4_Cf, - (void*)calcDiffTexMtx__11J3DMaterialFPA4_Cf, - (void*)makeDisplayList__18J3DPatchedMaterialFv, - (void*)makeSharedDisplayList__18J3DPatchedMaterialFv, - (void*)load__18J3DPatchedMaterialFv, - (void*)loadSharedDL__18J3DPatchedMaterialFv, - (void*)patch__11J3DMaterialFv, - (void*)diff__11J3DMaterialFUl, - (void*)reset__18J3DPatchedMaterialFv, - (void*)change__18J3DPatchedMaterialFv, -}; - -/* 803CDCF0-803CDD20 02AE10 0030+00 0/0 6/6 0/0 .data __vt__11J3DMaterial */ -SECTION_DATA extern void* __vt__11J3DMaterial[12] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)calc__11J3DMaterialFPA4_Cf, - (void*)calcDiffTexMtx__11J3DMaterialFPA4_Cf, - (void*)makeDisplayList__11J3DMaterialFv, - (void*)makeSharedDisplayList__11J3DMaterialFv, - (void*)load__11J3DMaterialFv, - (void*)loadSharedDL__11J3DMaterialFv, - (void*)patch__11J3DMaterialFv, - (void*)diff__11J3DMaterialFUl, - (void*)reset__11J3DMaterialFv, - (void*)change__11J3DMaterialFv, -}; - -/* 803CDD20-803CDD9C 02AE40 007C+00 2/2 7/7 0/0 .data __vt__10J3DPEBlock */ -SECTION_DATA extern void* __vt__10J3DPEBlock[31] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__10J3DPEBlockFP10J3DPEBlock, - (void*)NULL, - (void*)patch__10J3DPEBlockFv, - (void*)diff__10J3DPEBlockFUl, - (void*)diffFog__10J3DPEBlockFv, - (void*)diffBlend__10J3DPEBlockFv, - (void*)countDLSize__10J3DPEBlockFv, - (void*)NULL, - (void*)setFog__10J3DPEBlockF6J3DFog, - (void*)setFog__10J3DPEBlockFP6J3DFog, - (void*)getFog__10J3DPEBlockFv, - (void*)setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp, - (void*)setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp, - (void*)getAlphaComp__10J3DPEBlockFv, - (void*)setBlend__10J3DPEBlockFPC8J3DBlend, - (void*)setBlend__10J3DPEBlockFRC8J3DBlend, - (void*)getBlend__10J3DPEBlockFv, - (void*)setZMode__10J3DPEBlockFPC8J3DZMode, - (void*)setZMode__10J3DPEBlockF8J3DZMode, - (void*)getZMode__10J3DPEBlockFv, - (void*)setZCompLoc__10J3DPEBlockFPCUc, - (void*)setZCompLoc__10J3DPEBlockFUc, - (void*)getZCompLoc__10J3DPEBlockCFv, - (void*)setDither__10J3DPEBlockFPCUc, - (void*)setDither__10J3DPEBlockFUc, - (void*)getDither__10J3DPEBlockCFv, - (void*)getFogOffset__10J3DPEBlockCFv, - (void*)setFogOffset__10J3DPEBlockFUl, - (void*)__dt__10J3DPEBlockFv, -}; - -/* 803CDD9C-803CDDE8 02AEBC 004C+00 2/2 1/1 0/0 .data __vt__15J3DIndBlockNull */ -SECTION_DATA extern void* __vt__15J3DIndBlockNull[19] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__15J3DIndBlockNullFP11J3DIndBlock, - (void*)diff__15J3DIndBlockNullFUl, - (void*)load__15J3DIndBlockNullFv, - (void*)countDLSize__11J3DIndBlockFv, - (void*)getType__15J3DIndBlockNullFv, - (void*)setIndTexStageNum__11J3DIndBlockFUc, - (void*)getIndTexStageNum__11J3DIndBlockCFv, - (void*)setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder, - (void*)setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder, - (void*)getIndTexOrder__11J3DIndBlockFUl, - (void*)setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx, - (void*)setIndTexMtx__11J3DIndBlockFUl12J3DIndTexMtx, - (void*)getIndTexMtx__11J3DIndBlockFUl, - (void*)setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale, - (void*)setIndTexCoordScale__11J3DIndBlockFUl19J3DIndTexCoordScale, - (void*)getIndTexCoordScale__11J3DIndBlockFUl, - (void*)__dt__15J3DIndBlockNullFv, -}; - -/* 803CDDE8-803CDE34 02AF08 004C+00 3/3 2/2 0/0 .data __vt__11J3DIndBlock */ -SECTION_DATA extern void* __vt__11J3DIndBlock[19] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__11J3DIndBlockFP11J3DIndBlock, - (void*)NULL, - (void*)NULL, - (void*)countDLSize__11J3DIndBlockFv, - (void*)NULL, - (void*)setIndTexStageNum__11J3DIndBlockFUc, - (void*)getIndTexStageNum__11J3DIndBlockCFv, - (void*)setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder, - (void*)setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder, - (void*)getIndTexOrder__11J3DIndBlockFUl, - (void*)setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx, - (void*)setIndTexMtx__11J3DIndBlockFUl12J3DIndTexMtx, - (void*)getIndTexMtx__11J3DIndBlockFUl, - (void*)setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale, - (void*)setIndTexCoordScale__11J3DIndBlockFUl19J3DIndTexCoordScale, - (void*)getIndTexCoordScale__11J3DIndBlockFUl, - (void*)__dt__11J3DIndBlockFv, -}; - -/* 803CDE34-803CDEA0 02AF54 006C+00 3/3 5/5 0/0 .data __vt__14J3DTexGenBlock */ -SECTION_DATA extern void* __vt__14J3DTexGenBlock[27] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__14J3DTexGenBlockFP14J3DTexGenBlock, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)NULL, - (void*)countDLSize__14J3DTexGenBlockFv, - (void*)NULL, - (void*)setTexGenNum__14J3DTexGenBlockFPCUl, - (void*)setTexGenNum__14J3DTexGenBlockFUl, - (void*)getTexGenNum__14J3DTexGenBlockCFv, - (void*)setTexCoord__14J3DTexGenBlockFUlPC11J3DTexCoord, - (void*)getTexCoord__14J3DTexGenBlockFUl, - (void*)setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx, - (void*)getTexMtx__14J3DTexGenBlockFUl, - (void*)setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale, - (void*)setNBTScale__14J3DTexGenBlockF11J3DNBTScale, - (void*)getNBTScale__14J3DTexGenBlockFv, - (void*)getTexMtxOffset__14J3DTexGenBlockCFv, - (void*)setTexMtxOffset__14J3DTexGenBlockFUl, - (void*)__dt__14J3DTexGenBlockFv, -}; - -/* 803CDEA0-803CDF30 02AFC0 0090+00 3/3 4/4 0/0 .data __vt__13J3DColorBlock */ -SECTION_DATA extern void* __vt__13J3DColorBlock[36] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)load__13J3DColorBlockFv, - (void*)reset__13J3DColorBlockFP13J3DColorBlock, - (void*)patch__13J3DColorBlockFv, - (void*)patchMatColor__13J3DColorBlockFv, - (void*)patchLight__13J3DColorBlockFv, - (void*)diff__13J3DColorBlockFUl, - (void*)diffAmbColor__13J3DColorBlockFv, - (void*)diffMatColor__13J3DColorBlockFv, - (void*)diffColorChan__13J3DColorBlockFv, - (void*)diffLightObj__13J3DColorBlockFUl, - (void*)countDLSize__13J3DColorBlockFv, - (void*)NULL, - (void*)setMatColor__13J3DColorBlockFUlPC10J3DGXColor, - (void*)setMatColor__13J3DColorBlockFUl10J3DGXColor, - (void*)getMatColor__13J3DColorBlockFUl, - (void*)setAmbColor__13J3DColorBlockFUlPC10J3DGXColor, - (void*)setAmbColor__13J3DColorBlockFUl10J3DGXColor, - (void*)getAmbColor__13J3DColorBlockFUl, - (void*)setColorChanNum__13J3DColorBlockFUc, - (void*)setColorChanNum__13J3DColorBlockFPCUc, - (void*)getColorChanNum__13J3DColorBlockCFv, - (void*)setColorChan__13J3DColorBlockFUlRC12J3DColorChan, - (void*)setColorChan__13J3DColorBlockFUlPC12J3DColorChan, - (void*)getColorChan__13J3DColorBlockFUl, - (void*)setLight__13J3DColorBlockFUlP11J3DLightObj, - (void*)getLight__13J3DColorBlockFUl, - (void*)setCullMode__13J3DColorBlockFPCUc, - (void*)setCullMode__13J3DColorBlockFUc, - (void*)getCullMode__13J3DColorBlockCFv, - (void*)getMatColorOffset__13J3DColorBlockCFv, - (void*)getColorChanOffset__13J3DColorBlockCFv, - (void*)setMatColorOffset__13J3DColorBlockFUl, - (void*)setColorChanOffset__13J3DColorBlockFUl, - (void*)__dt__13J3DColorBlockFv, -}; /* 803157A0-803159A0 3100E0 0200+00 0/0 3/3 0/0 .text createColorBlock__11J3DMaterialFUl */ @@ -690,8 +262,6 @@ void J3DMaterial::diff(u32 param_0) { } /* 803169DC-80316A54 31131C 0078+00 2/0 0/0 0/0 .text calc__11J3DMaterialFPA4_Cf */ -// Matches but changes order of TU vtables (?!) -#ifdef NONMATCHING void J3DMaterial::calc(f32 const (*param_0)[4]) { if (j3dSys.checkFlag(0x40000000)) { mTexGenBlock->calcPostTexMtx(param_0); @@ -702,12 +272,6 @@ void J3DMaterial::calc(f32 const (*param_0)[4]) { calcCurrentMtx(); setCurrentMtx(); } -#else -extern "C" void calc__11J3DMaterialFPA4_Cf() { - // asm void J3DMaterial::calc(f32 const (*param_0)[4]) { - // NONMATCHING -} -#endif /* 80316A54-80316AB0 311394 005C+00 3/0 0/0 0/0 .text calcDiffTexMtx__11J3DMaterialFPA4_Cf */ void J3DMaterial::calcDiffTexMtx(f32 const (*param_0)[4]) { @@ -724,8 +288,7 @@ void J3DMaterial::setCurrentMtx() { } /* 80316AC8-80316D68 311408 02A0+00 1/1 0/0 0/0 .text calcCurrentMtx__11J3DMaterialFv */ -// Issues with setCurrentTexMtx -#ifdef NONMATCHING +// NONMATCHING Issues with setCurrentTexMtx void J3DMaterial::calcCurrentMtx() { if (!j3dSys.checkFlag(0x40000000)) { mCurrentMtx.setCurrentTexMtx( @@ -751,11 +314,6 @@ void J3DMaterial::calcCurrentMtx() { ); } } -#else -void J3DMaterial::calcCurrentMtx() { - // NONMATCHING -} -#endif /* 80316D68-80316E14 3116A8 00AC+00 1/1 0/0 0/0 .text copy__11J3DMaterialFP11J3DMaterial */ @@ -830,8 +388,7 @@ void J3DPatchedMaterial::initialize() { } /* 80316FD8-80316FDC 311918 0004+00 1/0 0/0 0/0 .text makeDisplayList__18J3DPatchedMaterialFv */ -extern "C" void makeDisplayList__18J3DPatchedMaterialFv() { -//void J3DPatchedMaterial::makeDisplayList() { +void J3DPatchedMaterial::makeDisplayList() { /* empty function */ } @@ -910,7 +467,7 @@ void J3DLockedMaterial::diff(u32 param_0) { } /* 803170D0-803170D4 311A10 0004+00 1/0 0/0 0/0 .text calc__17J3DLockedMaterialFPA4_Cf */ -extern "C" void calc__17J3DLockedMaterialFPA4_Cf() { +void J3DLockedMaterial::calc(const Mtx param_0) { /* empty function */ } @@ -923,354 +480,3 @@ void J3DLockedMaterial::reset() { void J3DLockedMaterial::change() { /* empty function */ } - -/* 803170DC-80317138 311A1C 005C+00 0/0 1/0 0/0 .text __dt__21J3DColorBlockLightOffFv */ -void __dt__21J3DColorBlockLightOffFv() { -//asm J3DColorBlockLightOff::~J3DColorBlockLightOff() { - // NONMATCHING -} - -/* 80317138-80317180 311A78 0048+00 1/0 0/0 0/0 .text __dt__13J3DColorBlockFv */ -// J3DColorBlock::~J3DColorBlock() { -extern "C" void __dt__13J3DColorBlockFv() { - // NONMATCHING -} - -/* 80317180-803171DC 311AC0 005C+00 0/0 1/0 0/0 .text __dt__21J3DTexGenBlockPatchedFv */ -J3DTexGenBlockPatched::~J3DTexGenBlockPatched() { - // NONMATCHING -} - -/* 803171DC-80317224 311B1C 0048+00 1/0 0/0 0/0 .text __dt__14J3DTexGenBlockFv */ -// J3DTexGenBlock::~J3DTexGenBlock() { -extern "C" void __dt__14J3DTexGenBlockFv() { - // NONMATCHING -} - -/* 80317224-8031726C 311B64 0048+00 0/0 1/0 0/0 .text __dt__11J3DTevBlockFv */ -// J3DTevBlock::~J3DTevBlock() { -extern "C" void __dt__11J3DTevBlockFv() { - // NONMATCHING -} - -/* 8031726C-803172B4 311BAC 0048+00 1/0 0/0 0/0 .text __dt__11J3DIndBlockFv */ -void __dt__11J3DIndBlockFv() { - // NONMATCHING -} - -/* 803172B4-803172FC 311BF4 0048+00 1/0 0/0 0/0 .text __dt__10J3DPEBlockFv */ -// J3DPEBlock::~J3DPEBlock() { -extern "C" void __dt__10J3DPEBlockFv() { - // NONMATCHING -} - -/* 803172FC-80317304 311C3C 0008+00 1/0 1/0 0/0 .text countDLSize__14J3DTexGenBlockFv */ -s32 J3DTexGenBlock::countDLSize() { - return false; -} - -/* 80317304-8031730C 311C44 0008+00 1/0 1/0 0/0 .text countDLSize__13J3DColorBlockFv */ -s32 J3DColorBlock::countDLSize() { - return false; -} - -/* 8031730C-80317314 311C4C 0008+00 0/0 2/0 0/0 .text countDLSize__11J3DTevBlockFv */ -s32 J3DTevBlock::countDLSize() { - return false; -} - -/* 80317314-8031731C 311C54 0008+00 2/0 0/0 0/0 .text countDLSize__11J3DIndBlockFv */ -s32 J3DIndBlock::countDLSize() { - return false; -} - -/* 8031731C-80317324 311C5C 0008+00 1/0 1/0 0/0 .text countDLSize__10J3DPEBlockFv */ -s32 J3DPEBlock::countDLSize() { - return false; -} - -/* 80317324-80317328 311C64 0004+00 1/0 1/0 0/0 .text load__13J3DColorBlockFv */ -extern "C" void load__13J3DColorBlockFv() { - /* empty function */ -} - -/* 80317328-80317330 311C68 0008+00 1/0 1/0 0/0 .text getCullMode__13J3DColorBlockCFv */ -s32 J3DColorBlock::getCullMode() const { - return 2; -} - -/* 80317330-80317334 311C70 0004+00 0/0 2/0 0/0 .text load__11J3DTevBlockFv */ -void J3DTevBlock::load() { - /* empty function */ -} - -/* 80317334-8031733C 311C74 0008+00 1/0 2/0 0/0 .text getNBTScale__14J3DTexGenBlockFv */ -J3DNBTScale* J3DTexGenBlock::getNBTScale() { - return NULL; -} - -/* 8031733C-80317340 311C7C 0004+00 1/0 1/0 0/0 .text patch__13J3DColorBlockFv */ -void J3DColorBlock::patch() { - /* empty function */ -} - -/* 80317340-80317344 311C80 0004+00 1/0 1/0 0/0 .text diff__13J3DColorBlockFUl */ -void J3DColorBlock::diff(u32 param_0) { - /* empty function */ -} - -/* 80317344-80317348 311C84 0004+00 1/0 4/0 0/0 .text diff__10J3DPEBlockFUl */ -void J3DPEBlock::diff(u32 param_0) { - /* empty function */ -} - -/* 80317348-8031734C 311C88 0004+00 1/0 4/0 0/0 .text reset__10J3DPEBlockFP10J3DPEBlock - */ -extern "C" void reset__10J3DPEBlockFP10J3DPEBlock() { - /* empty function */ -} - -/* 8031734C-80317350 311C8C 0004+00 1/0 0/0 0/0 .text reset__11J3DIndBlockFP11J3DIndBlock - */ -extern "C" void reset__11J3DIndBlockFP11J3DIndBlock() { - /* empty function */ -} - -/* 80317350-80317354 311C90 0004+00 0/0 1/0 0/0 .text reset__11J3DTevBlockFP11J3DTevBlock - */ -extern "C" void reset__11J3DTevBlockFP11J3DTevBlock(J3DTevBlock* param_0) { - /* empty function */ -} - -/* 80317354-80317358 311C94 0004+00 1/0 1/0 0/0 .text reset__14J3DTexGenBlockFP14J3DTexGenBlock */ -extern "C" void reset__14J3DTexGenBlockFP14J3DTexGenBlock() { - /* empty function */ -} - -/* 80317358-8031735C 311C98 0004+00 1/0 1/0 0/0 .text reset__13J3DColorBlockFP13J3DColorBlock */ -void J3DColorBlock::reset(J3DColorBlock* param_0) { - /* empty function */ -} - -/* 8031735C-80317360 311C9C 0004+00 1/0 5/0 0/0 .text diffFog__10J3DPEBlockFv */ -void J3DPEBlock::diffFog() { - /* empty function */ -} - -/* 80317360-80317364 311CA0 0004+00 1/0 4/0 0/0 .text diffBlend__10J3DPEBlockFv */ -void J3DPEBlock::diffBlend() { - /* empty function */ -} - -/* 80317364-80317368 311CA4 0004+00 1/0 5/0 0/0 .text setFog__10J3DPEBlockFP6J3DFog */ -void J3DPEBlock::setFog(J3DFog* param_0) { - /* empty function */ -} - -/* 80317368-8031736C 311CA8 0004+00 1/0 5/0 0/0 .text setFog__10J3DPEBlockF6J3DFog */ -void J3DPEBlock::setFog(J3DFog param_0) { - /* empty function */ -} - -/* 8031736C-80317370 311CAC 0004+00 1/0 4/0 0/0 .text setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp - */ -void J3DPEBlock::setAlphaComp(J3DAlphaComp const* param_0) { - /* empty function */ -} - -/* 80317370-80317374 311CB0 0004+00 1/0 4/0 0/0 .text setBlend__10J3DPEBlockFPC8J3DBlend - */ -void J3DPEBlock::setBlend(J3DBlend const* param_0) { - /* empty function */ -} - -/* 80317374-80317378 311CB4 0004+00 1/0 4/0 0/0 .text setZMode__10J3DPEBlockFPC8J3DZMode - */ -void J3DPEBlock::setZMode(J3DZMode const* param_0) { - /* empty function */ -} - -/* 80317378-8031737C 311CB8 0004+00 1/0 4/0 0/0 .text setZCompLoc__10J3DPEBlockFPCUc */ -void J3DPEBlock::setZCompLoc(u8 const* param_0) { - /* empty function */ -} - -/* 8031737C-80317380 311CBC 0004+00 1/0 4/0 0/0 .text setDither__10J3DPEBlockFUc */ -void J3DPEBlock::setDither(u8 param_0) { - /* empty function */ -} - -/* 80317380-80317384 311CC0 0004+00 1/0 4/0 0/0 .text setDither__10J3DPEBlockFPCUc */ -void J3DPEBlock::setDither(u8 const* param_0) { - /* empty function */ -} - -/* 80317384-8031738C 311CC4 0008+00 1/0 4/0 0/0 .text getDither__10J3DPEBlockCFv */ -u8 J3DPEBlock::getDither() const { - return 0; -} - -/* 8031738C-80317394 311CCC 0008+00 1/0 5/0 0/0 .text getFogOffset__10J3DPEBlockCFv */ -u32 J3DPEBlock::getFogOffset() const { - return 0; -} - -/* 80317394-80317398 311CD4 0004+00 1/0 5/0 0/0 .text setFogOffset__10J3DPEBlockFUl */ -void J3DPEBlock::setFogOffset(u32 param_0) { - /* empty function */ -} - -/* 80317398-8031739C 311CD8 0004+00 1/0 0/0 0/0 .text diff__15J3DIndBlockNullFUl */ -void J3DIndBlockNull::diff(u32 param_0) { - /* empty function */ -} - -/* 8031739C-803173A0 311CDC 0004+00 1/0 0/0 0/0 .text load__15J3DIndBlockNullFv */ -void J3DIndBlockNull::load() { - /* empty function */ -} - -/* 803173A0-803173A4 311CE0 0004+00 1/0 0/0 0/0 .text reset__15J3DIndBlockNullFP11J3DIndBlock */ -extern "C" void reset__15J3DIndBlockNullFP11J3DIndBlock() { - /* empty function */ -} - -/* 803173A4-803173B0 311CE4 000C+00 1/0 0/0 0/0 .text getType__15J3DIndBlockNullFv */ -u32 J3DIndBlockNull::getType() { - return 'IBLN'; -} - -/* 803173B0-8031740C 311CF0 005C+00 1/0 0/0 0/0 .text __dt__15J3DIndBlockNullFv */ -J3DIndBlockNull::~J3DIndBlockNull() { - // NONMATCHING -} - -/* 8031740C-80317410 311D4C 0004+00 2/0 0/0 0/0 .text - * setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder */ -void J3DIndBlock::setIndTexOrder(u32 param_0, J3DIndTexOrder const* param_1) { - /* empty function */ -} - -/* 80317410-80317414 311D50 0004+00 2/0 0/0 0/0 .text - * setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder */ -void J3DIndBlock::setIndTexOrder(u32 param_0, J3DIndTexOrder param_1) { - /* empty function */ -} - -/* 80317414-80317418 311D54 0004+00 2/0 0/0 0/0 .text - * setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx */ -void J3DIndBlock::setIndTexMtx(u32 param_0, J3DIndTexMtx const* param_1) { - /* empty function */ -} - -/* 80317418-8031741C 311D58 0004+00 2/0 0/0 0/0 .text - * setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale */ -void J3DIndBlock::setIndTexCoordScale(u32 param_0, J3DIndTexCoordScale const* param_1) { - /* empty function */ -} - -/* 8031741C-80317420 311D5C 0004+00 1/0 1/0 0/0 .text setTexGenNum__14J3DTexGenBlockFPCUl - */ -void J3DTexGenBlock::setTexGenNum(u32 const* param_0) { - /* empty function */ -} - -/* 80317420-80317424 311D60 0004+00 1/0 2/0 0/0 .text setNBTScale__14J3DTexGenBlockF11J3DNBTScale - */ -void J3DTexGenBlock::setNBTScale(J3DNBTScale param_0) { - /* empty function */ -} - -/* 80317424-80317428 311D64 0004+00 1/0 2/0 0/0 .text - * setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale */ -void J3DTexGenBlock::setNBTScale(J3DNBTScale const* param_0) { - /* empty function */ -} - -/* 80317428-80317430 311D68 0008+00 1/0 1/0 0/0 .text getTexMtxOffset__14J3DTexGenBlockCFv */ -bool J3DTexGenBlock::getTexMtxOffset() const { - return false; -} - -/* 80317430-80317434 311D70 0004+00 1/0 1/0 0/0 .text setTexMtxOffset__14J3DTexGenBlockFUl */ -void J3DTexGenBlock::setTexMtxOffset(u32 param_0) { - /* empty function */ -} - -/* 80317434-80317438 311D74 0004+00 1/0 1/0 0/0 .text patchMatColor__13J3DColorBlockFv */ -void J3DColorBlock::patchMatColor() { - /* empty function */ -} - -/* 80317438-8031743C 311D78 0004+00 1/0 3/0 0/0 .text diffAmbColor__13J3DColorBlockFv */ -void J3DColorBlock::diffAmbColor() { - /* empty function */ -} - -/* 8031743C-80317440 311D7C 0004+00 1/0 1/0 0/0 .text diffMatColor__13J3DColorBlockFv */ -void J3DColorBlock::diffMatColor() { - /* empty function */ -} - -/* 80317440-80317444 311D80 0004+00 1/0 1/0 0/0 .text diffColorChan__13J3DColorBlockFv */ -void J3DColorBlock::diffColorChan() { - /* empty function */ -} - -/* 80317444-80317448 311D84 0004+00 1/0 3/0 0/0 .text diffLightObj__13J3DColorBlockFUl */ -void J3DColorBlock::diffLightObj(u32 param_0) { - /* empty function */ -} - -/* 80317448-8031744C 311D88 0004+00 1/0 1/0 0/0 .text - * setMatColor__13J3DColorBlockFUlPC10J3DGXColor */ -void J3DColorBlock::setMatColor(u32 param_0, J3DGXColor const* param_1) { - /* empty function */ -} - -/* 8031744C-80317450 311D8C 0004+00 1/0 1/0 0/0 .text setColorChanNum__13J3DColorBlockFPCUc */ -void J3DColorBlock::setColorChanNum(u8 const* param_0) { - /* empty function */ -} - -/* 80317450-80317454 311D90 0004+00 1/0 1/0 0/0 .text - * setColorChan__13J3DColorBlockFUlPC12J3DColorChan */ -void J3DColorBlock::setColorChan(u32 param_0, J3DColorChan const* param_1) { - /* empty function */ -} - -/* 80317454-8031745C 311D94 0008+00 1/0 3/0 0/0 .text getLight__13J3DColorBlockFUl */ -bool J3DColorBlock::getLight(u32 param_0) { - return false; -} - -/* 8031745C-80317460 311D9C 0004+00 1/0 1/0 0/0 .text setCullMode__13J3DColorBlockFUc */ -void J3DColorBlock::setCullMode(u8 param_0) { - /* empty function */ -} - -/* 80317460-80317464 311DA0 0004+00 1/0 1/0 0/0 .text setCullMode__13J3DColorBlockFPCUc - */ -void J3DColorBlock::setCullMode(u8 const* param_0) { - /* empty function */ -} - -/* 80317464-8031746C 311DA4 0008+00 1/0 1/0 0/0 .text getMatColorOffset__13J3DColorBlockCFv */ -u32 J3DColorBlock::getMatColorOffset() const { - return 0; -} - -/* 8031746C-80317474 311DAC 0008+00 1/0 1/0 0/0 .text getColorChanOffset__13J3DColorBlockCFv */ -u32 J3DColorBlock::getColorChanOffset() const { - return 0; -} - -/* 80317474-80317478 311DB4 0004+00 1/0 1/0 0/0 .text setMatColorOffset__13J3DColorBlockFUl */ -void J3DColorBlock::setMatColorOffset(u32 param_0) { - /* empty function */ -} - -/* 80317478-8031747C 311DB8 0004+00 1/0 1/0 0/0 .text setColorChanOffset__13J3DColorBlockFUl */ -void J3DColorBlock::setColorChanOffset(u32 param_0) { - /* empty function */ -} \ No newline at end of file diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp index 61efef6fa88..6fe57669705 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -4,6 +4,7 @@ // #include "JSystem/J3DGraphBase/J3DShapeDraw.h" +#include "JSystem/JKernel/JKRHeap.h" #include "string.h" #include "dolphin/gx.h" #include "dolphin/os/OSCache.h" @@ -34,8 +35,8 @@ u32 J3DShapeDraw::countVertex(u32 stride) { return count; } -#ifdef NONMATCHING /* 80314974-80314ABC 30F2B4 0148+00 0/0 1/1 0/0 .text addTexMtxIndexInDL__12J3DShapeDrawFUlUlUl */ +// NONMATCHING regalloc void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) { u32 byteNum = countVertex(stride); u32 newSize = ALIGN_NEXT(mDisplayListSize + byteNum, 0x20); @@ -58,8 +59,7 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) { newDL += 2; for (s32 i = 0; i < (u16)vtxNum; i++) { - // mul arg swap - u8* oldDLVtx = (&oldDL[stride * i + 3]); + u8* oldDLVtx = &oldDL[stride * i + 3]; u8 pnmtxidx = *oldDLVtx; memcpy(newDL, oldDLVtx, attrOffs); u8* newDL1 = &newDL[attrOffs]; @@ -79,11 +79,6 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) { mDisplayList = newDLStart; DCStoreRange(newDLStart, mDisplayListSize); } -#else -void J3DShapeDraw::addTexMtxIndexInDL(u32 param_0, u32 param_1, u32 param_2) { - // NONMATCHING -} -#endif /* 80314ABC-80314AD4 30F3FC 0018+00 0/0 1/1 0/0 .text __ct__12J3DShapeDrawFPCUcUl */ J3DShapeDraw::J3DShapeDraw(u8 const* displayList, u32 displayListSize) { @@ -97,4 +92,4 @@ void J3DShapeDraw::draw() const { } /* 80314B00-80314B48 30F440 0048+00 1/0 0/0 0/0 .text __dt__12J3DShapeDrawFv */ -J3DShapeDraw::~J3DShapeDraw() {} \ No newline at end of file +J3DShapeDraw::~J3DShapeDraw() {} diff --git a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp index 591b917e8cd..ad453ab3d58 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeMtx.cpp @@ -6,113 +6,12 @@ #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/J3DGraphBase/J3DGD.h" -#include "dol2asm.h" +#include "JSystem/J3DGraphBase/J3DMatBlock.h" +#include "JSystem/J3DGraphBase/J3DTexture.h" #include "dolphin/types.h" -// -// Forward References: -// - -extern "C" void resetMtxLoadCache__11J3DShapeMtxFv(); -extern "C" void loadMtxIndx_PNGP__11J3DShapeMtxCFiUs(); -extern "C" void loadMtxIndx_PCPU__11J3DShapeMtxCFiUs(); -extern "C" void loadMtxIndx_NCPU__11J3DShapeMtxCFiUs(); -extern "C" void loadMtxIndx_PNCPU__11J3DShapeMtxCFiUs(); -extern "C" void loadExecute__17J3DDifferedTexMtxFPA4_Cf(); -extern "C" void loadMtxConcatView_PNGP__21J3DShapeMtxConcatViewCFiUs(); -extern "C" void loadMtxConcatView_PCPU__21J3DShapeMtxConcatViewCFiUs(); -extern "C" void loadMtxConcatView_NCPU__21J3DShapeMtxConcatViewCFiUs(); -extern "C" void loadMtxConcatView_PNCPU__21J3DShapeMtxConcatViewCFiUs(); -extern "C" void loadMtxConcatView_PNGP_LOD__21J3DShapeMtxConcatViewCFiUs(); -extern "C" void load__11J3DShapeMtxCFv(); -extern "C" void calcNBTScale__11J3DShapeMtxFRC3VecPA3_A3_fPA3_A3_f(); -extern "C" void load__21J3DShapeMtxConcatViewCFv(); -extern "C" void loadNrmMtx__21J3DShapeMtxConcatViewCFiUsPA4_f(); -extern "C" void load__16J3DShapeMtxMultiCFv(); -extern "C" void calcNBTScale__16J3DShapeMtxMultiFRC3VecPA3_A3_fPA3_A3_f(); -extern "C" void load__26J3DShapeMtxMultiConcatViewCFv(); -extern "C" void loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUsPA4_f(); -extern "C" void load__27J3DShapeMtxBBoardConcatViewCFv(); -extern "C" void load__28J3DShapeMtxYBBoardConcatViewCFv(); -extern "C" void __dt__28J3DShapeMtxYBBoardConcatViewFv(); -extern "C" void getType__28J3DShapeMtxYBBoardConcatViewCFv(); -extern "C" void loadNrmMtx__21J3DShapeMtxConcatViewCFiUs(); -extern "C" void getUseMtxIndex__11J3DShapeMtxCFUs(); -extern "C" void __dt__27J3DShapeMtxBBoardConcatViewFv(); -extern "C" void getType__27J3DShapeMtxBBoardConcatViewCFv(); -extern "C" void __dt__26J3DShapeMtxMultiConcatViewFv(); -extern "C" void getType__26J3DShapeMtxMultiConcatViewCFv(); -extern "C" void getUseMtxNum__26J3DShapeMtxMultiConcatViewCFv(); -extern "C" void getUseMtxIndex__26J3DShapeMtxMultiConcatViewCFUs(); -extern "C" void loadNrmMtx__26J3DShapeMtxMultiConcatViewCFiUs(); -extern "C" void __dt__16J3DShapeMtxMultiFv(); -extern "C" void getType__16J3DShapeMtxMultiCFv(); -extern "C" void getUseMtxNum__16J3DShapeMtxMultiCFv(); -extern "C" void getUseMtxIndex__16J3DShapeMtxMultiCFUs(); -extern "C" void __dt__21J3DShapeMtxConcatViewFv(); -extern "C" void getType__21J3DShapeMtxConcatViewCFv(); -extern "C" void __dt__11J3DShapeMtxFv(); -extern "C" void getType__11J3DShapeMtxCFv(); -extern "C" void __sinit_J3DShapeMtx_cpp(); -extern "C" u8 sMtxLoadPipeline__11J3DShapeMtx[48]; -extern "C" u8 sMtxLoadPipeline__21J3DShapeMtxConcatView[48]; -extern "C" u8 sMtxLoadLODPipeline__21J3DShapeMtxConcatView[48]; -extern "C" u8 sMtxLoadCache__11J3DShapeMtx[20 + 4 /* padding */]; -extern "C" u8 sCurrentPipeline__11J3DShapeMtx[4]; -extern "C" u8 sCurrentScaleFlag__11J3DShapeMtx[4]; -extern "C" u8 sTexMtxLoadType__11J3DShapeMtx[4]; -extern "C" u8 sMtxPtrTbl__21J3DShapeMtxConcatView[8]; -extern "C" u8 sTexGenBlock__17J3DDifferedTexMtx[4]; -extern "C" u8 sTexMtxObj__17J3DDifferedTexMtx[4]; - -// -// External References: -// - -void J3DFifoLoadPosMtxImm(Mtx, u32); -void J3DFifoLoadNrmMtxImm(Mtx, u32); -void J3DFifoLoadNrmMtxImm3x3(Mtx33, u32); -void J3DFifoLoadNrmMtxToTexMtx(Mtx, u32); -void J3DFifoLoadNrmMtxToTexMtx33(Mtx33, u32); - -extern "C" bool getUseMtxNum__11J3DShapeMtxCFv(); -extern "C" void __dl__FPv(); -extern "C" void J3DFifoLoadPosMtxImm__FPA4_fUl(); -extern "C" void J3DFifoLoadNrmMtxImm__FPA4_fUl(); -extern "C" void J3DFifoLoadNrmMtxImm3x3__FPA3_fUl(); -extern "C" void J3DFifoLoadNrmMtxToTexMtx__FPA4_fUl(); -extern "C" void J3DFifoLoadNrmMtxToTexMtx3x3__FPA3_fUl(); -extern "C" void loadPosMtxIndx__6J3DSysCFiUs(); -extern "C" void loadNrmMtxIndx__6J3DSysCFiUs(); -extern "C" void J3DCalcBBoardMtx__FPA4_f(); -extern "C" void J3DCalcYBBoardMtx__FPA4_f(); -extern "C" void J3DPSCalcInverseTranspose__FPA4_fPA3_f(); -extern "C" void J3DGetTextureMtx__FRC17J3DTextureSRTInfoRC3VecPA4_f(); -extern "C" void J3DGetTextureMtxOld__FRC17J3DTextureSRTInfoRC3VecPA4_f(); -extern "C" void J3DGetTextureMtxMaya__FRC17J3DTextureSRTInfoPA4_f(); -extern "C" void J3DGetTextureMtxMayaOld__FRC17J3DTextureSRTInfoPA4_f(); -extern "C" void J3DScaleNrmMtx__FPA4_fRC3Vec(); -extern "C" void J3DScaleNrmMtx33__FPA3_fRC3Vec(); -extern "C" void J3DMtxProjConcat__FPA4_fPA4_fPA4_f(); -extern "C" void __ptmf_scall(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_25(); -extern "C" void _savegpr_27(); -extern "C" void _savegpr_28(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_25(); -extern "C" void _restgpr_27(); -extern "C" void _restgpr_28(); -extern "C" void _restgpr_29(); - -// -// Declarations: -// - -/* ############################################################################################## */ /* 80434C80-80434C98 0619A0 0014+04 2/2 0/0 0/0 .bss sMtxLoadCache__11J3DShapeMtx */ -u16 J3DShapeMtx::sMtxLoadCache[10 + 2 /* padding */]; +u16 J3DShapeMtx::sMtxLoadCache[10]; /* 803130A8-803130E4 30D9E8 003C+00 0/0 1/1 0/0 .text resetMtxLoadCache__11J3DShapeMtxFv */ @@ -180,54 +79,6 @@ J3DShapeMtxConcatView_LoadFunc J3DShapeMtxConcatView::sMtxLoadLODPipeline[4] = { &loadMtxConcatView_PNCPU, }; -#ifndef NONMATCHING -/* 803CDAB0-803CDAE0 02ABD0 0030+00 1/1 0/0 0/0 .data qMtx$895 */ -SECTION_DATA static u8 qMtx[48] = { - 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 803CDAE0-803CDB10 02AC00 0030+00 1/1 0/0 0/0 .data qMtx2$896 */ -SECTION_DATA static u8 qMtx2[48] = { - 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0xBF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, -}; - -/* 803CDB10-803CDB40 -00001 0030+00 1/1 0/0 0/0 .data @1035 */ -SECTION_DATA static void* lit_1035[12] = { - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x5B4), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x390), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x3CC), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x370), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x5B4), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x3DC), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x390), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x390), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x3CC), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x370), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x510), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x46C), -}; - -/* 803CDB40-803CDB70 -00001 0030+00 1/1 0/0 0/0 .data @1034 */ -SECTION_DATA static void* lit_1034[12] = { - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x2B8), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0xCC), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0xE0), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0xB8), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x2B8), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x110), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0xCC), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0xCC), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0xE0), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0xB8), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x224), - (void*)(((char*)loadExecute__17J3DDifferedTexMtxFPA4_Cf) + 0x190), -}; -#endif - /* 804515A8-804515AC 000AA8 0004+00 4/4 2/2 0/0 .sbss sCurrentPipeline__11J3DShapeMtx */ u32 J3DShapeMtx::sCurrentPipeline; @@ -257,18 +108,9 @@ J3DTexGenBlock* J3DDifferedTexMtx::sTexGenBlock; /* 804515C4-804515C8 000AC4 0004+00 1/1 2/2 0/0 .sbss sTexMtxObj__17J3DDifferedTexMtx */ J3DTexMtxObj* J3DDifferedTexMtx::sTexMtxObj; -/* 80456398-8045639C 004998 0004+00 2/2 0/0 0/0 .sdata2 @1032 */ -SECTION_SDATA2 static u8 lit_1032[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; - /* 8031322C-80313828 30DB6C 05FC+00 7/5 0/0 0/0 .text loadExecute__17J3DDifferedTexMtxFPA4_Cf */ -#ifdef NONMATCHING +// NONMATCHING regalloc void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) { -// regalloc static Mtx qMtx = { {0.5f, 0.0f, 0.5f, 0.0f}, {0.0f, -0.5f, 0.5f, 0.0f}, @@ -299,16 +141,18 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) { u32 unk; switch (tex_gen_src & 0x3f) { case 3: - case 9: + case 9: { Mtx& tmp5 = tex_mtx_obj->getMtx(i); mtx = &tmp5; break; + } case 1: case 6: - case 7: + case 7: { Mtx& tmp6 = tex_mtx_obj->getMtx(i); mtx = &tmp6; break; + } case 2: case 8: PSMTXInverse(j3dSys.mViewMtx, tmp2); @@ -336,11 +180,11 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) { tex_mtx_info = &tex_mtx->getTexMtxInfo(); unk = (tex_gen_src & 0x80) >> 7; if (unk == 0) { - J3DGetTextureMtxOld(tex_mtx_info->mSRT, tex_mtx_info->mCenter, tmp0); + J3DGetTextureMtx(tex_mtx_info->mSRT, tex_mtx_info->mCenter, tmp0); } else if (unk == 1) { - J3DGetTextureMtxMayaOld(tex_mtx_info->mSRT, tmp0); + J3DGetTextureMtxMaya(tex_mtx_info->mSRT, tmp0); } - PSMTXConcat(tmp0, qMtx2, tmp0); + PSMTXConcat(tmp0, qMtx, tmp0); eff_mtx = &tex_mtx_obj->getEffectMtx(i); J3DMtxProjConcat(tmp0, *eff_mtx, tmp2); PSMTXInverse(j3dSys.mViewMtx, tmp1); @@ -354,11 +198,11 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) { tex_mtx_info = &tex_mtx->getTexMtxInfo(); unk = (tex_gen_src & 0x80) >> 7; if (unk == 0) { - J3DGetTextureMtxOld(tex_mtx_info->mSRT, tex_mtx_info->mCenter, tmp0); + J3DGetTextureMtx(tex_mtx_info->mSRT, tex_mtx_info->mCenter, tmp0); } else if (unk == 1) { - J3DGetTextureMtxMayaOld(tex_mtx_info->mSRT, tmp0); + J3DGetTextureMtxMaya(tex_mtx_info->mSRT, tmp0); } - PSMTXConcat(tmp0, qMtx, tmp0); + PSMTXConcat(tmp0, qMtx2, tmp0); eff_mtx = &tex_mtx_obj->getEffectMtx(i); J3DMtxProjConcat(tmp0, *eff_mtx, tmp2); PSMTXInverse(j3dSys.mViewMtx, tmp1); @@ -425,11 +269,11 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) { tex_mtx_info = &tex_mtx->getTexMtxInfo(); unk = (tex_gen_src & 0x80) >> 7; if (unk == 0) { - J3DGetTextureMtxOld(tex_mtx_info->mSRT, tex_mtx_info->mCenter, tmp0); + J3DGetTextureMtx(tex_mtx_info->mSRT, tex_mtx_info->mCenter, tmp0); } else if (unk == 1) { - J3DGetTextureMtxMayaOld(tex_mtx_info->mSRT, tmp0); + J3DGetTextureMtxMaya(tex_mtx_info->mSRT, tmp0); } - PSMTXConcat(tmp0, qMtx2, tmp0); + PSMTXConcat(tmp0, qMtx, tmp0); eff_mtx = &tex_mtx_obj->getEffectMtx(i); J3DMtxProjConcat(tmp0, *eff_mtx, tmp2); PSMTXInverse(j3dSys.mViewMtx, tmp1); @@ -444,11 +288,11 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) { tex_mtx_info = &tex_mtx->getTexMtxInfo(); unk = (tex_gen_src & 0x80) >> 7; if (unk == 0) { - J3DGetTextureMtxOld(tex_mtx_info->mSRT, tex_mtx_info->mCenter, tmp0); + J3DGetTextureMtx(tex_mtx_info->mSRT, tex_mtx_info->mCenter, tmp0); } else if (unk == 1) { - J3DGetTextureMtxMayaOld(tex_mtx_info->mSRT, tmp0); + J3DGetTextureMtxMaya(tex_mtx_info->mSRT, tmp0); } - PSMTXConcat(tmp0, qMtx, tmp0); + PSMTXConcat(tmp0, qMtx2, tmp0); eff_mtx = &tex_mtx_obj->getEffectMtx(i); J3DMtxProjConcat(tmp0, *eff_mtx, tmp2); PSMTXInverse(j3dSys.mViewMtx, tmp1); @@ -469,11 +313,6 @@ void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) { } } } -#else -void J3DDifferedTexMtx::loadExecute(f32 const (*param_0)[4]) { - // NONMATCHING -} -#endif /* 80313828-803138C8 30E168 00A0+00 1/0 0/0 0/0 .text * loadMtxConcatView_PNGP__21J3DShapeMtxConcatViewCFiUs */ @@ -702,9 +541,9 @@ void J3DShapeMtxBBoardConcatView::load() const { mtx[0][0] = 1.0f / mtx[0][0]; mtx[1][1] = 1.0f / mtx[1][1]; mtx[2][2] = 1.0f / mtx[2][2]; - mtx[0][3] = FLOAT_LABEL(lit_1032); // 0.0f; - mtx[1][3] = FLOAT_LABEL(lit_1032); // 0.0f; - mtx[2][3] = FLOAT_LABEL(lit_1032); // 0.0f; + mtx[0][3] = 0.0f; + mtx[1][3] = 0.0f; + mtx[2][3] = 0.0f; if (!sNBTFlag) { J3DFifoLoadNrmMtxImm(mtx, 0); } else { @@ -749,12 +588,9 @@ void J3DShapeMtxYBBoardConcatView::load() const { } } -/* ############################################################################################## */ -/* 803CDB70-803CDB84 02AC90 0014+00 0/0 0/0 0/0 .data mtxCache$1263 */ -#pragma push -#pragma force_active on -SECTION_DATA static u8 mtxCache[20] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -}; -#pragma pop \ No newline at end of file +static void dummy() { + static u8 mtxCache[20] = { + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; +} diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index a976272e70d..64db73e028d 100644 --- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -406,7 +406,9 @@ J3DMaterial* J3DMaterialFactory::create(J3DMaterial* i_material, MaterialType i_ /* 80330440-80330D84 32AD80 0944+00 1/1 0/0 0/0 .text * createNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */ -#ifdef NONMATCHING +// NONMATCHING. The call to setFog does not match because it uses the version that takes a J3DFog. +// If we switch to the version that takes a J3DFog* that part matches, except the vtable index is wrong. +// Also regalloc issues J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, int i_idx, u32 i_flags) const { if (mpDisplayListInit != NULL) { @@ -417,10 +419,7 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i if (stages > tev_stage_num) { tev_stage_num = stages; } - u32 u1 = 8; - if (tev_stage_num <= 8) { - u1 = tev_stage_num; - } + u32 u1 = tev_stage_num <= 8 ? tev_stage_num : 8; u32 texgens = countTexGens(i_idx); u32 texgen_flag = texgens > 4 ? 0 : getMdlDataFlag_TexGenFlag(i_flags); u32 color_flag = getMdlDataFlag_ColorFlag(i_flags); @@ -440,7 +439,7 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i i_material->mColorBlock->setCullMode(newCullMode(i_idx)); i_material->mTexGenBlock->setTexGenNum(newTexGenNum(i_idx)); i_material->mTexGenBlock->setNBTScale(newNBTScale(i_idx)); - i_material->mPEBlock->setFog(newFog(i_idx)); + i_material->mPEBlock->setFog(&newFog(i_idx)); i_material->mPEBlock->setAlphaComp(newAlphaComp(i_idx)); i_material->mPEBlock->setBlend(newBlend(i_idx)); i_material->mPEBlock->setZMode(newZMode(i_idx)); @@ -479,7 +478,8 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i i_material->mColorBlock->setMatColor(i, newMatColor(i_idx, i)); } for (u8 i = 0; i < 4; i++) { - i_material->mColorBlock->setColorChan(i, newColorChan(i_idx, i)); + J3DColorChan color_chan = newColorChan(i_idx, i); + i_material->mColorBlock->setColorChan(i, color_chan); } for (u8 i = 0; i < texgens; i++) { J3DTexCoord tex_coord = newTexCoord(i_idx, i); @@ -513,7 +513,7 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i i_material->mIndBlock->setIndTexOrder(i, newIndTexOrder(i_idx, i)); } for (u8 i = 0; i < ind_tex_stage_num; i++) { - i_material->mIndBlock->setIndTexCoordScale(i, newIndTexCoordScale(i_idx, i)); + i_material->mIndBlock->setIndTexCoordScale(i, &newIndTexCoordScale(i_idx, i)); } for (u8 i = 0; i < tev_stage_num; i++) { i_material->mTevBlock->setIndTevStage(i, newIndTevStage(i_idx, i)); @@ -521,197 +521,123 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i } return i_material; } -#else -J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* param_0, int param_1, - u32 param_2) const { - // NONMATCHING -} -#endif /* 80330D84-8033168C 32B6C4 0908+00 1/1 0/0 0/0 .text * createPatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */ -J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* param_0, int param_1, - u32 param_2) const { - // NONMATCHING +// NONMATCHING same fog problem as createNormalMaterial +J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material, int i_idx, + u32 i_flags) const { + if (i_material == NULL) { + i_material = new J3DPatchedMaterial(); + } + bool bVar1 = i_flags & 0x3000000 ? true : false; + i_material->mColorBlock = J3DMaterial::createColorBlock(0x40000000); + i_material->mTexGenBlock = new J3DTexGenBlockPatched(); + i_material->mTevBlock = new J3DTevBlockPatched(); + i_material->mIndBlock = J3DMaterial::createIndBlock(bVar1); + i_material->mPEBlock = J3DMaterial::createPEBlock(0x10000000, getMaterialMode(i_idx)); + i_material->mIndex = i_idx; + i_material->mMaterialMode = getMaterialMode(i_idx); + i_material->mTevBlock->setTevStageNum(newTevStageNum(i_idx)); + i_material->mColorBlock->setColorChanNum(newColorChanNum(i_idx)); + i_material->mColorBlock->setCullMode(newCullMode(i_idx)); + i_material->mPEBlock->setFog(&newFog(i_idx)); + i_material->mPEBlock->setAlphaComp(newAlphaComp(i_idx)); + i_material->mPEBlock->setBlend(newBlend(i_idx)); + i_material->mPEBlock->setZMode(newZMode(i_idx)); + i_material->mPEBlock->setZCompLoc(newZCompLoc(i_idx)); + i_material->mPEBlock->setDither(newDither(i_idx)); + u8 tev_stage_num = i_material->getTevStageNum(); + for (u8 i = 0; i < 8; i++) { + i_material->mTevBlock->setTexNo(i, newTexNo(i_idx, i)); + } + for (u8 i = 0; i < tev_stage_num; i++) { + i_material->mTevBlock->setTevOrder(i, newTevOrder(i_idx, i)); + } + for (u8 i = 0; i < 4; i++) { + i_material->mTevBlock->setTevKColor(i, newTevKColor(i_idx, i)); + } + for (u8 i = 0; i < 4; i++) { + i_material->mTevBlock->setTevColor(i, newTevColor(i_idx, i)); + } + for (u8 i = 0; i < tev_stage_num; i++) { + J3DMaterialInitData* material_init_data = &mpMaterialInitData[mpMaterialID[i_idx]]; + i_material->mTevBlock->setTevStage(i, newTevStage(i_idx, i)); + if (material_init_data->mTevSwapModeIdx[i] != 0xffff) { + i_material->mTevBlock->getTevStage(i)->setTexSel( + mpTevSwapModeInfo[material_init_data->mTevSwapModeIdx[i]].mTexSel); + i_material->mTevBlock->getTevStage(i)->setRasSel( + mpTevSwapModeInfo[material_init_data->mTevSwapModeIdx[i]].mRasSel); + } + } + J3DMaterialInitData* init_data = &mpMaterialInitData[mpMaterialID[i_idx]]; + for (u8 i = 0; i < tev_stage_num; i++) { + if (init_data->mTevKColorSel[i] != 0xff) { + i_material->mTevBlock->setTevKColorSel(i, init_data->mTevKColorSel[i]); + } else { + i_material->mTevBlock->setTevKColorSel(i, 0xC); + } + } + for (u8 i = 0; i < 2; i++) { + i_material->mColorBlock->setMatColor(i, newMatColor(i_idx, i)); + } + for (u8 i = 0; i < 4; i++) { + J3DColorChan color_chan = newColorChan(i_idx, i); + i_material->mColorBlock->setColorChan(i, color_chan); + } + u32 texgens = countTexGens(i_idx); + i_material->mTexGenBlock->setTexGenNum(newTexGenNum(i_idx)); + for (u8 i = 0; i < 8; i++) { + i_material->mTexGenBlock->setTexMtx(i, newTexMtx(i_idx, i)); + } + for (u8 i = 0; i < texgens; i++) { + J3DTexCoord tex_coord = newTexCoord(i_idx, i); + i_material->mTexGenBlock->setTexCoord(i, &tex_coord); + } + if (bVar1 && mpIndInitData != NULL) { + u8 ind_tex_stage_num = newIndTexStageNum(i_idx); + i_material->mIndBlock->setIndTexStageNum(newIndTexStageNum(i_idx)); + for (u8 i = 0; i < ind_tex_stage_num; i++) { + i_material->mIndBlock->setIndTexMtx(i, newIndTexMtx(i_idx, i)); + } + for (u8 i = 0; i < ind_tex_stage_num; i++) { + i_material->mIndBlock->setIndTexOrder(i, newIndTexOrder(i_idx, i)); + } + for (u8 i = 0; i < ind_tex_stage_num; i++) { + i_material->mIndBlock->setIndTexCoordScale(i, &newIndTexCoordScale(i_idx, i)); + } + for (u8 i = 0; i < tev_stage_num; i++) { + i_material->mTevBlock->setIndTevStage(i, newIndTevStage(i_idx, i)); + } + } + return i_material; } /* 8033168C-803317D4 32BFCC 0148+00 0/0 1/1 0/0 .text * modifyPatchedCurrentMtx__18J3DMaterialFactoryCFP11J3DMateriali */ -void J3DMaterialFactory::modifyPatchedCurrentMtx(J3DMaterial* param_0, int param_1) const { - // NONMATCHING +// NONMATCHING problem with setCurrentTexMtx +void J3DMaterialFactory::modifyPatchedCurrentMtx(J3DMaterial* i_material, int i_idx) const { + J3DTexCoord coord[8]; + u32 tex_gens = countTexGens(i_idx); + for (u8 i = 0; i < tex_gens; i++) { + coord[i] = newTexCoord(i_idx, i); + } + J3DCurrentMtx currentMtx; + currentMtx.setCurrentTexMtx( + coord[0].getTexGenMtx(), + coord[1].getTexGenMtx(), + coord[2].getTexGenMtx(), + coord[3].getTexGenMtx(), + coord[4].getTexGenMtx(), + coord[5].getTexGenMtx(), + coord[6].getTexGenMtx(), + coord[7].getTexGenMtx() + ); + i_material->mCurrentMtx = currentMtx; } -/* 803CEE90-803CEF0C 02BFB0 007C+00 2/2 0/0 0/0 .data __vt__14J3DPEBlockNull */ -SECTION_DATA extern void* __vt__14J3DPEBlockNull[31] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__10J3DPEBlockFP10J3DPEBlock, - (void*)load__14J3DPEBlockNullFv, - (void*)patch__10J3DPEBlockFv, - (void*)diff__10J3DPEBlockFUl, - (void*)diffFog__10J3DPEBlockFv, - (void*)diffBlend__10J3DPEBlockFv, - (void*)countDLSize__10J3DPEBlockFv, - (void*)getType__14J3DPEBlockNullFv, - (void*)setFog__10J3DPEBlockF6J3DFog, - (void*)setFog__10J3DPEBlockFP6J3DFog, - (void*)getFog__10J3DPEBlockFv, - (void*)setAlphaComp__10J3DPEBlockFPC12J3DAlphaComp, - (void*)setAlphaComp__10J3DPEBlockFRC12J3DAlphaComp, - (void*)getAlphaComp__10J3DPEBlockFv, - (void*)setBlend__10J3DPEBlockFPC8J3DBlend, - (void*)setBlend__10J3DPEBlockFRC8J3DBlend, - (void*)getBlend__10J3DPEBlockFv, - (void*)setZMode__10J3DPEBlockFPC8J3DZMode, - (void*)setZMode__10J3DPEBlockF8J3DZMode, - (void*)getZMode__10J3DPEBlockFv, - (void*)setZCompLoc__10J3DPEBlockFPCUc, - (void*)setZCompLoc__10J3DPEBlockFUc, - (void*)getZCompLoc__10J3DPEBlockCFv, - (void*)setDither__10J3DPEBlockFPCUc, - (void*)setDither__10J3DPEBlockFUc, - (void*)getDither__10J3DPEBlockCFv, - (void*)getFogOffset__10J3DPEBlockCFv, - (void*)setFogOffset__10J3DPEBlockFUl, - (void*)__dt__14J3DPEBlockNullFv, -}; - -/* 803CEF0C-803CEFE8 02C02C 00DC+00 2/2 0/0 0/0 .data __vt__15J3DTevBlockNull */ -SECTION_DATA extern void* __vt__15J3DTevBlockNull[55] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__15J3DTevBlockNullFP11J3DTevBlock, - (void*)load__11J3DTevBlockFv, - (void*)diff__11J3DTevBlockFUl, - (void*)diffTexNo__11J3DTevBlockFv, - (void*)diffTevReg__11J3DTevBlockFv, - (void*)diffTexCoordScale__11J3DTevBlockFv, - (void*)diffTevStage__11J3DTevBlockFv, - (void*)diffTevStageIndirect__11J3DTevBlockFv, - (void*)patch__11J3DTevBlockFv, - (void*)patchTexNo__11J3DTevBlockFv, - (void*)patchTevReg__11J3DTevBlockFv, - (void*)patchTexNoAndTexCoordScale__11J3DTevBlockFv, - (void*)ptrToIndex__15J3DTevBlockNullFv, - (void*)indexToPtr__15J3DTevBlockNullFv, - (void*)getType__15J3DTevBlockNullFv, - (void*)countDLSize__11J3DTevBlockFv, - (void*)setTexNo__11J3DTevBlockFUlPCUs, - (void*)setTexNo__11J3DTevBlockFUlUs, - (void*)getTexNo__11J3DTevBlockCFUl, - (void*)setTevOrder__11J3DTevBlockFUlPC11J3DTevOrder, - (void*)setTevOrder__11J3DTevBlockFUl11J3DTevOrder, - (void*)getTevOrder__11J3DTevBlockFUl, - (void*)setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10, - (void*)setTevColor__11J3DTevBlockFUl13J3DGXColorS10, - (void*)getTevColor__11J3DTevBlockFUl, - (void*)setTevKColor__11J3DTevBlockFUlPC10J3DGXColor, - (void*)setTevKColor__11J3DTevBlockFUl10J3DGXColor, - (void*)getTevKColor__11J3DTevBlockFUl, - (void*)setTevKColorSel__11J3DTevBlockFUlPCUc, - (void*)setTevKColorSel__11J3DTevBlockFUlUc, - (void*)getTevKColorSel__11J3DTevBlockFUl, - (void*)setTevKAlphaSel__11J3DTevBlockFUlPCUc, - (void*)setTevKAlphaSel__11J3DTevBlockFUlUc, - (void*)getTevKAlphaSel__11J3DTevBlockFUl, - (void*)setTevStageNum__11J3DTevBlockFPCUc, - (void*)setTevStageNum__11J3DTevBlockFUc, - (void*)getTevStageNum__11J3DTevBlockCFv, - (void*)setTevStage__11J3DTevBlockFUlPC11J3DTevStage, - (void*)setTevStage__11J3DTevBlockFUl11J3DTevStage, - (void*)getTevStage__11J3DTevBlockFUl, - (void*)setTevSwapModeInfo__11J3DTevBlockFUlPC18J3DTevSwapModeInfo, - (void*)setTevSwapModeInfo__11J3DTevBlockFUl18J3DTevSwapModeInfo, - (void*)setTevSwapModeTable__11J3DTevBlockFUlPC19J3DTevSwapModeTable, - (void*)setTevSwapModeTable__11J3DTevBlockFUl19J3DTevSwapModeTable, - (void*)getTevSwapModeTable__11J3DTevBlockFUl, - (void*)setIndTevStage__11J3DTevBlockFUlPC14J3DIndTevStage, - (void*)setIndTevStage__11J3DTevBlockFUl14J3DIndTevStage, - (void*)getIndTevStage__11J3DTevBlockFUl, - (void*)getTexNoOffset__11J3DTevBlockCFv, - (void*)getTevRegOffset__11J3DTevBlockCFv, - (void*)setTexNoOffset__11J3DTevBlockFUl, - (void*)setTevRegOffset__11J3DTevBlockFUl, - (void*)__dt__15J3DTevBlockNullFv, -}; - -/* 803CEFE8-803CF054 02C108 006C+00 2/2 0/0 0/0 .data __vt__18J3DTexGenBlockNull */ -SECTION_DATA extern void* __vt__18J3DTexGenBlockNull[27] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)reset__14J3DTexGenBlockFP14J3DTexGenBlock, - (void*)calc__18J3DTexGenBlockNullFPA4_Cf, - (void*)calcWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf, - (void*)calcPostTexMtx__18J3DTexGenBlockNullFPA4_Cf, - (void*)calcPostTexMtxWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf, - (void*)load__18J3DTexGenBlockNullFv, - (void*)patch__18J3DTexGenBlockNullFv, - (void*)diff__18J3DTexGenBlockNullFUl, - (void*)diffTexMtx__18J3DTexGenBlockNullFv, - (void*)diffTexGen__18J3DTexGenBlockNullFv, - (void*)countDLSize__14J3DTexGenBlockFv, - (void*)getType__18J3DTexGenBlockNullFv, - (void*)setTexGenNum__14J3DTexGenBlockFPCUl, - (void*)setTexGenNum__14J3DTexGenBlockFUl, - (void*)getTexGenNum__14J3DTexGenBlockCFv, - (void*)setTexCoord__14J3DTexGenBlockFUlPC11J3DTexCoord, - (void*)getTexCoord__14J3DTexGenBlockFUl, - (void*)setTexMtx__14J3DTexGenBlockFUlP9J3DTexMtx, - (void*)getTexMtx__14J3DTexGenBlockFUl, - (void*)setNBTScale__14J3DTexGenBlockFPC11J3DNBTScale, - (void*)setNBTScale__14J3DTexGenBlockF11J3DNBTScale, - (void*)getNBTScale__14J3DTexGenBlockFv, - (void*)getTexMtxOffset__14J3DTexGenBlockCFv, - (void*)setTexMtxOffset__14J3DTexGenBlockFUl, - (void*)__dt__18J3DTexGenBlockNullFv, -}; - -/* 803CF054-803CF0E8 02C174 0090+04 2/2 0/0 0/0 .data __vt__17J3DColorBlockNull */ -SECTION_DATA extern void* __vt__17J3DColorBlockNull[36 + 1 /* padding */] = { - (void*)NULL /* RTTI */, - (void*)NULL, - (void*)load__13J3DColorBlockFv, - (void*)reset__13J3DColorBlockFP13J3DColorBlock, - (void*)patch__13J3DColorBlockFv, - (void*)patchMatColor__13J3DColorBlockFv, - (void*)patchLight__13J3DColorBlockFv, - (void*)diff__13J3DColorBlockFUl, - (void*)diffAmbColor__13J3DColorBlockFv, - (void*)diffMatColor__13J3DColorBlockFv, - (void*)diffColorChan__13J3DColorBlockFv, - (void*)diffLightObj__13J3DColorBlockFUl, - (void*)countDLSize__13J3DColorBlockFv, - (void*)getType__17J3DColorBlockNullFv, - (void*)setMatColor__13J3DColorBlockFUlPC10J3DGXColor, - (void*)setMatColor__13J3DColorBlockFUl10J3DGXColor, - (void*)getMatColor__13J3DColorBlockFUl, - (void*)setAmbColor__13J3DColorBlockFUlPC10J3DGXColor, - (void*)setAmbColor__13J3DColorBlockFUl10J3DGXColor, - (void*)getAmbColor__13J3DColorBlockFUl, - (void*)setColorChanNum__13J3DColorBlockFUc, - (void*)setColorChanNum__13J3DColorBlockFPCUc, - (void*)getColorChanNum__13J3DColorBlockCFv, - (void*)setColorChan__13J3DColorBlockFUlRC12J3DColorChan, - (void*)setColorChan__13J3DColorBlockFUlPC12J3DColorChan, - (void*)getColorChan__13J3DColorBlockFUl, - (void*)setLight__13J3DColorBlockFUlP11J3DLightObj, - (void*)getLight__13J3DColorBlockFUl, - (void*)setCullMode__13J3DColorBlockFPCUc, - (void*)setCullMode__13J3DColorBlockFUc, - (void*)getCullMode__13J3DColorBlockCFv, - (void*)getMatColorOffset__13J3DColorBlockCFv, - (void*)getColorChanOffset__13J3DColorBlockCFv, - (void*)setMatColorOffset__13J3DColorBlockFUl, - (void*)setColorChanOffset__13J3DColorBlockFUl, - (void*)__dt__17J3DColorBlockNullFv, - /* padding */ - NULL, -}; - /* 803317D4-80331A7C 32C114 02A8+00 2/2 0/0 0/0 .text * createLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */ -#ifdef NONMATCHING -// matches but makes the J3DMaterial destructor appear in the wrong place J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* i_material, int i_idx, u32 i_flags) const { if (i_material == NULL) { @@ -741,12 +667,6 @@ J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* i_material, i } return i_material; } -#else -J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* param_0, int param_1, - u32 param_2) const { - // NONMATCHING -} -#endif /* 80331A7C-80331AFC 32C3BC 0080+00 0/0 4/4 0/0 .text * calcSize__18J3DMaterialFactoryCFP11J3DMaterialQ218J3DMaterialFactory12MaterialTypeiUl */ @@ -769,8 +689,7 @@ u32 J3DMaterialFactory::calcSize(J3DMaterial* i_material, J3DMaterialFactory::Ma /* 80331AFC-80331C30 32C43C 0134+00 1/1 0/0 0/0 .text * calcSizeNormalMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */ -#ifdef NONMATCHING -// regalloc +// NONMATCHING regalloc u32 J3DMaterialFactory::calcSizeNormalMaterial(J3DMaterial* i_material, int i_idx, u32 i_flags) const { u32 size = 0; @@ -779,12 +698,11 @@ u32 J3DMaterialFactory::calcSizeNormalMaterial(J3DMaterial* i_material, int i_id } u32 stages = countStages(i_idx); - // u32 tev_stage_num = getMdlDataFlag_TevStageNum(i_flags); - u32 tev_stage_num = (i_flags >> 0x10) & 0x1f; + u32 tev_stage_num = getMdlDataFlag_TevStageNum(i_flags); if (stages > tev_stage_num) { tev_stage_num = stages; } - u32 tex_gens = countTexGens(i_flags); + u32 tex_gens = countTexGens(i_idx); u32 tex_gen_flag = tex_gens > 4 ? getMdlDataFlag_TexGenFlag(0) : getMdlDataFlag_TexGenFlag(i_flags); u32 color_block_flag = getMdlDataFlag_ColorFlag(i_flags); @@ -806,23 +724,16 @@ u32 J3DMaterialFactory::calcSizeNormalMaterial(J3DMaterial* i_material, int i_id } return size; } -#else -u32 J3DMaterialFactory::calcSizeNormalMaterial(J3DMaterial* param_0, int param_1, - u32 param_2) const { - // NONMATCHING -} -#endif /* 80331C30-80331D00 32C570 00D0+00 1/1 0/0 0/0 .text * calcSizePatchedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */ -#ifdef NONMATCHING u32 J3DMaterialFactory::calcSizePatchedMaterial(J3DMaterial* i_material, int i_idx, u32 i_flags) const { u32 size = 0; if (i_material == NULL) { size = sizeof(J3DPatchedMaterial); } - int ind_flag = (i_flags & 0x3000000) != 0; + u8 ind_flag = (i_flags & 0x3000000) != 0 ? 1 : 0; size += J3DMaterial::calcSizeColorBlock(0x40000000); size += 0x134; // TODO what is this size += J3DMaterial::calcSizeIndBlock(ind_flag); @@ -835,12 +746,6 @@ u32 J3DMaterialFactory::calcSizePatchedMaterial(J3DMaterial* i_material, int i_i } return size; } -#else -u32 J3DMaterialFactory::calcSizePatchedMaterial(J3DMaterial* param_0, int param_1, - u32 param_2) const { - // NONMATCHING -} -#endif /* 80331D00-80331D18 32C640 0018+00 2/2 0/0 0/0 .text * calcSizeLockedMaterial__18J3DMaterialFactoryCFP11J3DMaterialiUl */ @@ -855,16 +760,11 @@ u32 J3DMaterialFactory::calcSizeLockedMaterial(J3DMaterial* i_material, int i_id } /* 804564A8-804564AC 004AA8 0004+00 1/1 0/0 0/0 .sdata2 @1691 */ -#ifdef NONMATCHING static GXColor const defaultMatColor = {0xff, 0xff, 0xff, 0xff}; -#else -SECTION_SDATA2 static u32 lit_1691 = 0xFFFFFFFF; -#endif /* 80331D18-80331D74 32C658 005C+00 2/2 0/0 0/0 .text newMatColor__18J3DMaterialFactoryCFii */ -#ifdef NONMATCHING J3DGXColor J3DMaterialFactory::newMatColor(int i_idx, int i_no) const { - J3DGXColor dflt = defaultMatColor; + J3DGXColor dflt = (J3DGXColor)defaultMatColor; u16 mat_color_index = mpMaterialInitData[mpMaterialID[i_idx]].mMatColorIdx[i_no]; if (mat_color_index != 0xffff) { return mpMatColor[mat_color_index]; @@ -872,11 +772,6 @@ J3DGXColor J3DMaterialFactory::newMatColor(int i_idx, int i_no) const { return dflt; } } -#else -J3DGXColor J3DMaterialFactory::newMatColor(int param_0, int param_1) const { - // NONMATCHING -} -#endif /* 80331D74-80331DAC 32C6B4 0038+00 2/2 0/0 0/0 .text newColorChanNum__18J3DMaterialFactoryCFi */ u8 J3DMaterialFactory::newColorChanNum(int i_idx) const { @@ -889,8 +784,7 @@ u8 J3DMaterialFactory::newColorChanNum(int i_idx) const { } /* 80331DAC-80331F50 32C6EC 01A4+00 2/2 0/0 0/0 .text newColorChan__18J3DMaterialFactoryCFii */ -#ifdef NONMATCHING -// problem with J3DColorChan inline constructor +// NONMATCHING problem with J3DColorChan inline constructor J3DColorChan J3DMaterialFactory::newColorChan(int i_idx, int i_no) const { u16 color_chan_index = mpMaterialInitData[mpMaterialID[i_idx]].mColorChanIdx[i_no]; if (color_chan_index != 0xffff) { @@ -899,23 +793,13 @@ J3DColorChan J3DMaterialFactory::newColorChan(int i_idx, int i_no) const { return J3DColorChan(); } } -#else -J3DColorChan J3DMaterialFactory::newColorChan(int param_0, int param_1) const { - // NONMATCHING -} -#endif /* 804564AC-804564B0 004AAC 0004+00 1/1 0/0 0/0 .sdata2 @1798 */ -#ifdef NONMATCHING static GXColor const defaultAmbColor = {0x32, 0x32, 0x32, 0x32}; -#else -SECTION_SDATA2 static u32 lit_1798 = 0x32323232; -#endif /* 80331F50-80331FAC 32C890 005C+00 1/1 0/0 0/0 .text newAmbColor__18J3DMaterialFactoryCFii */ -#ifdef NONMATCHING J3DGXColor J3DMaterialFactory::newAmbColor(int i_idx, int i_no) const { - J3DGXColor dflt = defaultAmbColor; + J3DGXColor dflt = (J3DGXColor)defaultAmbColor; u16 amb_color_index = mpMaterialInitData[mpMaterialID[i_idx]].mAmbColorIdx[i_no]; if (amb_color_index != 0xffff) { return mpAmbColor[amb_color_index]; @@ -923,11 +807,6 @@ J3DGXColor J3DMaterialFactory::newAmbColor(int i_idx, int i_no) const { return dflt; } } -#else -J3DGXColor J3DMaterialFactory::newAmbColor(int param_0, int param_1) const { - // NONMATCHING -} -#endif /* 80331FAC-80331FE4 32C8EC 0038+00 2/2 0/0 0/0 .text newTexGenNum__18J3DMaterialFactoryCFi */ u32 J3DMaterialFactory::newTexGenNum(int i_idx) const { @@ -1006,20 +885,11 @@ J3DGXColorS10 J3DMaterialFactory::newTevColor(int i_idx, int i_no) const { } /* 804564B0-804564B8 004AB0 0004+04 1/1 0/0 0/0 .sdata2 @1915 */ -#ifdef NONMATCHING static GXColor const defaultTevKColor = {0xff, 0xff, 0xff, 0xff}; -#else -SECTION_SDATA2 static u32 lit_1915[1 + 1 /* padding */] = { - 0xFFFFFFFF, - /* padding */ - 0x00000000, -}; -#endif /* 80332210-8033226C 32CB50 005C+00 2/2 0/0 0/0 .text newTevKColor__18J3DMaterialFactoryCFii */ -#ifdef NONMATCHING J3DGXColor J3DMaterialFactory::newTevKColor(int i_idx, int i_no) const { - J3DGXColor dflt = defaultTevKColor; + J3DGXColor dflt = (J3DGXColor)defaultTevKColor; u16 tev_kcolor_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevKColorIdx[i_no]; if (tev_kcolor_index != 0xffff) { return mpTevKColor[tev_kcolor_index]; @@ -1027,11 +897,6 @@ J3DGXColor J3DMaterialFactory::newTevKColor(int i_idx, int i_no) const { return dflt; } } -#else -J3DGXColor J3DMaterialFactory::newTevKColor(int param_0, int param_1) const { - // NONMATCHING -} -#endif /* 8033226C-803322A4 32CBAC 0038+00 2/2 0/0 0/0 .text newTevStageNum__18J3DMaterialFactoryCFi */ u8 J3DMaterialFactory::newTevStageNum(int i_idx) const { @@ -1055,8 +920,6 @@ J3DTevStage J3DMaterialFactory::newTevStage(int i_idx, int i_no) const { /* 80332304-803323A0 32CC44 009C+00 1/1 0/0 0/0 .text * newTevSwapModeTable__18J3DMaterialFactoryCFii */ -#ifdef NONMATCHING -// J3DTevSwapModeTable inline constructor matches in the first usage but not the second J3DTevSwapModeTable J3DMaterialFactory::newTevSwapModeTable(int i_idx, int i_no) const { u16 tev_swap_mode_table_index = mpMaterialInitData[mpMaterialID[i_idx]].mTevSwapModeTableIdx[i_no]; if (tev_swap_mode_table_index != 0xffff) { @@ -1065,11 +928,6 @@ J3DTevSwapModeTable J3DMaterialFactory::newTevSwapModeTable(int i_idx, int i_no) return J3DTevSwapModeTable(j3dDefaultTevSwapModeTable); } } -#else -J3DTevSwapModeTable J3DMaterialFactory::newTevSwapModeTable(int param_0, int param_1) const { - // NONMATCHING -} -#endif /* 803323A0-803323C8 32CCE0 0028+00 2/2 0/0 0/0 .text newIndTexStageNum__18J3DMaterialFactoryCFi */ @@ -1133,8 +991,7 @@ J3DFog J3DMaterialFactory::newFog(int i_idx) const { } /* 80332768-803327E8 32D0A8 0080+00 2/2 0/0 0/0 .text newAlphaComp__18J3DMaterialFactoryCFi */ -#ifdef NONMATCHING -// weird issue with calcAlphaCmpID, see J3DMatBlock.h +// NONMATCHING weird issue with calcAlphaCmpID, see J3DMatBlock.h J3DAlphaComp J3DMaterialFactory::newAlphaComp(int i_idx) const { J3DMaterialInitData* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]]; if (mtl_init_data->mAlphaCompIdx != 0xffff) { @@ -1143,11 +1000,6 @@ J3DAlphaComp J3DMaterialFactory::newAlphaComp(int i_idx) const { return J3DAlphaComp(0xffff); } } -#else -J3DAlphaComp J3DMaterialFactory::newAlphaComp(int param_0) const { - // NONMATCHING -} -#endif /* 803327E8-8033282C 32D128 0044+00 2/2 0/0 0/0 .text newBlend__18J3DMaterialFactoryCFi */ @@ -1202,141 +1054,3 @@ J3DNBTScale J3DMaterialFactory::newNBTScale(int i_idx) const { return dflt; } } - -/* 803329A0-803329A4 32D2E0 0004+00 1/0 0/0 0/0 .text load__14J3DPEBlockNullFv */ -// void J3DPEBlockNull::load() { -extern "C" void load__14J3DPEBlockNullFv() { - /* empty function */ -} - -/* 803329A4-803329B0 32D2E4 000C+00 1/0 0/0 0/0 .text getType__14J3DPEBlockNullFv */ -// u32 J3DPEBlockNull::getType() { -extern "C" void getType__14J3DPEBlockNullFv() { - // NONMATCHING -} - -/* 803329B0-80332A0C 32D2F0 005C+00 1/0 0/0 0/0 .text __dt__14J3DPEBlockNullFv */ -// J3DPEBlockNull::~J3DPEBlockNull() { -extern "C" void __dt__14J3DPEBlockNullFv() { - // NONMATCHING -} - -/* 80332A0C-80332A10 32D34C 0004+00 1/0 0/0 0/0 .text reset__15J3DTevBlockNullFP11J3DTevBlock */ -// void J3DTevBlockNull::reset(J3DTevBlock* param_0) { -extern "C" void reset__15J3DTevBlockNullFP11J3DTevBlock() { - /* empty function */ -} - -/* 80332A10-80332A14 32D350 0004+00 1/0 0/0 0/0 .text ptrToIndex__15J3DTevBlockNullFv */ -// void J3DTevBlockNull::ptrToIndex() { -extern "C" void ptrToIndex__15J3DTevBlockNullFv() { - /* empty function */ -} - -/* 80332A14-80332A38 32D354 0024+00 1/0 0/0 0/0 .text indexToPtr__15J3DTevBlockNullFv */ -// void J3DTevBlockNull::indexToPtr() { -extern "C" void indexToPtr__15J3DTevBlockNullFv() { - // NONMATCHING -} - -/* 80332A38-80332A44 32D378 000C+00 1/0 0/0 0/0 .text getType__15J3DTevBlockNullFv */ -// u32 J3DTevBlockNull::getType() { -extern "C" void getType__15J3DTevBlockNullFv() { - // NONMATCHING -} - -/* 80332A44-80332AA0 32D384 005C+00 1/0 0/0 0/0 .text __dt__15J3DTevBlockNullFv */ -// J3DTevBlockNull::~J3DTevBlockNull() { -extern "C" void __dt__15J3DTevBlockNullFv() { - // NONMATCHING -} - -/* 80332AA0-80332AA4 32D3E0 0004+00 1/0 0/0 0/0 .text calc__18J3DTexGenBlockNullFPA4_Cf - */ -// void J3DTexGenBlockNull::calc(f32 const (*param_0)[4]) { -extern "C" void calc__18J3DTexGenBlockNullFPA4_Cf() { - /* empty function */ -} - -/* 80332AA4-80332AA8 32D3E4 0004+00 1/0 0/0 0/0 .text - * calcWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf */ -// void J3DTexGenBlockNull::calcWithoutViewMtx(f32 const (*param_0)[4]) { -extern "C" void calcWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf() { - /* empty function */ -} - -/* 80332AA8-80332AAC 32D3E8 0004+00 1/0 0/0 0/0 .text calcPostTexMtx__18J3DTexGenBlockNullFPA4_Cf - */ -// void J3DTexGenBlockNull::calcPostTexMtx(f32 const (*param_0)[4]) { -extern "C" void calcPostTexMtx__18J3DTexGenBlockNullFPA4_Cf() { - /* empty function */ -} - -/* 80332AAC-80332AB0 32D3EC 0004+00 1/0 0/0 0/0 .text - * calcPostTexMtxWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf */ -// void J3DTexGenBlockNull::calcPostTexMtxWithoutViewMtx(f32 const (*param_0)[4]) { -extern "C" void calcPostTexMtxWithoutViewMtx__18J3DTexGenBlockNullFPA4_Cf() { - /* empty function */ -} - -/* 80332AB0-80332AB4 32D3F0 0004+00 1/0 0/0 0/0 .text load__18J3DTexGenBlockNullFv */ -// void J3DTexGenBlockNull::load() { -extern "C" void load__18J3DTexGenBlockNullFv() { - /* empty function */ -} - -/* 80332AB4-80332AB8 32D3F4 0004+00 1/0 0/0 0/0 .text patch__18J3DTexGenBlockNullFv */ -// void J3DTexGenBlockNull::patch() { -extern "C" void patch__18J3DTexGenBlockNullFv() { - /* empty function */ -} - -/* 80332AB8-80332ABC 32D3F8 0004+00 1/0 0/0 0/0 .text diff__18J3DTexGenBlockNullFUl */ -// void J3DTexGenBlockNull::diff(u32 param_0) { -extern "C" void diff__18J3DTexGenBlockNullFUl() { - /* empty function */ -} - -/* 80332ABC-80332AC0 32D3FC 0004+00 1/0 0/0 0/0 .text diffTexMtx__18J3DTexGenBlockNullFv - */ -// void J3DTexGenBlockNull::diffTexMtx() { -extern "C" void diffTexMtx__18J3DTexGenBlockNullFv() { - /* empty function */ -} - -/* 80332AC0-80332AC4 32D400 0004+00 1/0 0/0 0/0 .text diffTexGen__18J3DTexGenBlockNullFv - */ -// void J3DTexGenBlockNull::diffTexGen() { -extern "C" void diffTexGen__18J3DTexGenBlockNullFv() { - /* empty function */ -} - -/* 80332AC4-80332AD0 32D404 000C+00 1/0 0/0 0/0 .text getType__18J3DTexGenBlockNullFv */ -// u32 J3DTexGenBlockNull::getType() { -extern "C" void getType__18J3DTexGenBlockNullFv() { - // NONMATCHING -} - -/* 80332AD0-80332B2C 32D410 005C+00 1/0 0/0 0/0 .text __dt__18J3DTexGenBlockNullFv */ -// J3DTexGenBlockNull::~J3DTexGenBlockNull() { -extern "C" void __dt__18J3DTexGenBlockNullFv() { - // NONMATCHING -} - -/* 80332B2C-80332B38 32D46C 000C+00 1/0 0/0 0/0 .text getType__17J3DColorBlockNullFv */ -// u32 J3DColorBlockNull::getType() { -extern "C" void getType__17J3DColorBlockNullFv() { - // NONMATCHING -} - -/* 80332B38-80332B94 32D478 005C+00 1/0 0/0 0/0 .text __dt__17J3DColorBlockNullFv */ -// J3DColorBlockNull::~J3DColorBlockNull() { -extern "C" void __dt__17J3DColorBlockNullFv() { - // NONMATCHING -} - -/* 80332B94-80332BDC 32D4D4 0048+00 0/0 2/2 0/0 .text __dt__11J3DMaterialFv */ -// J3DMaterial::~J3DMaterial() { -extern "C" void __dt__11J3DMaterialFv() { - // NONMATCHING -} \ No newline at end of file diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp index f9c3c66f6a1..6d11efa8413 100644 --- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp +++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp @@ -4,83 +4,8 @@ // #include "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JSupport/JSupport.h" -#include "dol2asm.h" - -// -// Forward References: -// - -extern "C" void __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21(); -extern "C" void countUniqueMaterials__22J3DMaterialFactory_v21Fv(); -extern "C" void countTexGens__22J3DMaterialFactory_v21CFi(); -extern "C" void countStages__22J3DMaterialFactory_v21CFi(); -extern "C" void create__22J3DMaterialFactory_v21CFP11J3DMaterialiUl(); -extern "C" void newMatColor__22J3DMaterialFactory_v21CFii(); -extern "C" void newColorChanNum__22J3DMaterialFactory_v21CFi(); -extern "C" void newColorChan__22J3DMaterialFactory_v21CFii(); -extern "C" void newTexGenNum__22J3DMaterialFactory_v21CFi(); -extern "C" void newTexCoord__22J3DMaterialFactory_v21CFii(); -extern "C" void newTexMtx__22J3DMaterialFactory_v21CFii(); -extern "C" void newCullMode__22J3DMaterialFactory_v21CFi(); -extern "C" void newTexNo__22J3DMaterialFactory_v21CFii(); -extern "C" void newTevOrder__22J3DMaterialFactory_v21CFii(); -extern "C" void newTevColor__22J3DMaterialFactory_v21CFii(); -extern "C" void newTevKColor__22J3DMaterialFactory_v21CFii(); -extern "C" void newTevStageNum__22J3DMaterialFactory_v21CFi(); -extern "C" void newTevStage__22J3DMaterialFactory_v21CFii(); -extern "C" void newTevSwapModeTable__22J3DMaterialFactory_v21CFii(); -extern "C" void newFog__22J3DMaterialFactory_v21CFi(); -extern "C" void newAlphaComp__22J3DMaterialFactory_v21CFi(); -extern "C" void newBlend__22J3DMaterialFactory_v21CFi(); -extern "C" void newZMode__22J3DMaterialFactory_v21CFi(); -extern "C" void newZCompLoc__22J3DMaterialFactory_v21CFi(); -extern "C" void newDither__22J3DMaterialFactory_v21CFi(); -extern "C" void newNBTScale__22J3DMaterialFactory_v21CFi(); -extern "C" void func_80334118(void* _this, void const*, void const*); - -// -// External References: -// - -extern "C" void __ct__11J3DTevStageFv(); -extern "C" void __ct__11J3DTevStageFRC15J3DTevStageInfo(); -extern "C" void* __nw__FUl(); -extern "C" GXColorS10* func_802F41E8(void const*, void const*); -extern "C" u8* func_802F4260(void const*, void const*); -extern "C" GXColor* func_802F4278(void const*, void const*); -extern "C" GXCullMode* func_802F4290(void const*, void const*); -extern "C" u16* func_802F42C0(void const*, void const*); -extern "C" void createColorBlock__11J3DMaterialFUl(); -extern "C" void createTexGenBlock__11J3DMaterialFUl(); -extern "C" void createTevBlock__11J3DMaterialFi(); -extern "C" void createIndBlock__11J3DMaterialFi(); -extern "C" void createPEBlock__11J3DMaterialFUlUl(); -extern "C" void initialize__11J3DMaterialFv(); -extern "C" void __as__13J3DTexMtxInfoFRC13J3DTexMtxInfo(); -extern "C" void __as__10J3DFogInfoFRC10J3DFogInfo(); -extern "C" void func_80332C24(void* _this, void const*, void const*); -extern "C" void func_80332C3C(void* _this, void const*, void const*); -extern "C" void func_80332C54(void* _this, void const*, void const*); -extern "C" void func_80332C6C(void* _this, void const*, void const*); -extern "C" void func_80332C84(void* _this, void const*, void const*); -extern "C" void func_80332C9C(void* _this, void const*, void const*); -extern "C" void func_80332CB4(void* _this, void const*, void const*); -extern "C" void func_80332CCC(void* _this, void const*, void const*); -extern "C" void func_80332CE4(void* _this, void const*, void const*); -extern "C" void func_80332CFC(void* _this, void const*, void const*); -extern "C" void func_80332D14(void* _this, void const*, void const*); -extern "C" void func_80332D2C(void* _this, void const*, void const*); -extern "C" void func_80332D5C(void* _this, void const*, void const*); -extern "C" void _savegpr_19(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_19(); -extern "C" void _restgpr_29(); -extern "C" extern void* __vt__11J3DMaterial[12]; - -// -// Declarations: -// /* 80332DA4-80332F84 32D6E4 01E0+00 0/0 2/2 0/0 .text * __ct__22J3DMaterialFactory_v21FRC20J3DMaterialBlock_v21 */ @@ -158,8 +83,95 @@ u32 J3DMaterialFactory_v21::countStages(int i_idx) const { /* 80333068-803337D8 32D9A8 0770+00 0/0 2/2 0/0 .text * create__22J3DMaterialFactory_v21CFP11J3DMaterialiUl */ -J3DMaterial* J3DMaterialFactory_v21::create(J3DMaterial* param_0, int param_1, u32 param_2) const { - // NONMATCHING +// NONMATCHINg same problems as J3DMaterialFactory::createNormalMaterial +J3DMaterial* J3DMaterialFactory_v21::create(J3DMaterial* i_material, int i_idx, u32 i_flags) const { + u32 stages = countStages(i_idx); + u32 tev_stage_num = getMdlDataFlag_TevStageNum(i_flags); + if (stages > tev_stage_num) { + tev_stage_num = stages; + } + u32 u1 = tev_stage_num <= 8 ? tev_stage_num : 8; + u32 texgens = countTexGens(i_idx); + u32 texgen_flag = texgens > 4 ? 0 : getMdlDataFlag_TexGenFlag(i_flags); + u32 color_flag = getMdlDataFlag_ColorFlag(i_flags); + u32 pe_flag = getMdlDataFlag_PEFlag(i_flags); + bool ind_flag = (i_flags & 0x1000000) != 0; + if (i_material == NULL) { + i_material = new J3DMaterial(); + } + i_material->mColorBlock = J3DMaterial::createColorBlock(color_flag); + i_material->mTexGenBlock = J3DMaterial::createTexGenBlock(texgen_flag); + i_material->mTevBlock = J3DMaterial::createTevBlock((u16)tev_stage_num); + i_material->mIndBlock = J3DMaterial::createIndBlock(ind_flag); + i_material->mPEBlock = J3DMaterial::createPEBlock(pe_flag, getMaterialMode(i_idx)); + i_material->mIndex = i_idx; + i_material->mMaterialMode = getMaterialMode(i_idx); + i_material->mColorBlock->setColorChanNum(newColorChanNum(i_idx)); + i_material->mColorBlock->setCullMode(newCullMode(i_idx)); + i_material->mTexGenBlock->setTexGenNum(newTexGenNum(i_idx)); + i_material->mTexGenBlock->setNBTScale(newNBTScale(i_idx)); + i_material->mPEBlock->setFog(&newFog(i_idx)); + i_material->mPEBlock->setAlphaComp(newAlphaComp(i_idx)); + i_material->mPEBlock->setBlend(newBlend(i_idx)); + i_material->mPEBlock->setZMode(newZMode(i_idx)); + i_material->mPEBlock->setZCompLoc(newZCompLoc(i_idx)); + i_material->mPEBlock->setDither(newDither(i_idx)); + i_material->mTevBlock->setTevStageNum(newTevStageNum(i_idx)); + for (u8 i = 0; i < u1; i++) { + i_material->mTevBlock->setTexNo(i, newTexNo(i_idx, i)); + } + for (u8 i = 0; i < tev_stage_num; i++) { + i_material->mTevBlock->setTevOrder(i, newTevOrder(i_idx, i)); + } + for (u8 i = 0; i < tev_stage_num; i++) { + J3DMaterialInitData_v21* material_init_data = &mpMaterialInitData[mpMaterialID[i_idx]]; + i_material->mTevBlock->setTevStage(i, newTevStage(i_idx, i)); + if (material_init_data->mTevSwapModeIdx[i] != 0xffff) { + i_material->mTevBlock->getTevStage(i)->setTexSel( + mpTevSwapModeInfo[material_init_data->mTevSwapModeIdx[i]].mTexSel); + i_material->mTevBlock->getTevStage(i)->setRasSel( + mpTevSwapModeInfo[material_init_data->mTevSwapModeIdx[i]].mRasSel); + } + } + for (u8 i = 0; i < 4; i++) { + i_material->mTevBlock->setTevKColor(i, newTevKColor(i_idx, i)); + } + for (u8 i = 0; i < 4; i++) { + i_material->mTevBlock->setTevColor(i, newTevColor(i_idx, i)); + } + for (u8 i = 0; i < 4; i++) { + i_material->mTevBlock->setTevSwapModeTable(i, newTevSwapModeTable(i_idx, i)); + } + for (u8 i = 0; i < 2; i++) { + i_material->mColorBlock->setMatColor(i, newMatColor(i_idx, i)); + } + for (u8 i = 0; i < 4; i++) { + J3DColorChan color_chan = newColorChan(i_idx, i); + i_material->mColorBlock->setColorChan(i, color_chan); + } + for (u8 i = 0; i < texgens; i++) { + J3DTexCoord tex_coord = newTexCoord(i_idx, i); + i_material->mTexGenBlock->setTexCoord(i, &tex_coord); + } + for (u8 i = 0; i < 8; i++) { + i_material->mTexGenBlock->setTexMtx(i, newTexMtx(i_idx, i)); + } + J3DMaterialInitData_v21* material_init_data = &mpMaterialInitData[mpMaterialID[i_idx]]; + for (u8 i = 0; i < tev_stage_num; i++) { + if (material_init_data->mTevKColorSel[i] != 0xff) { + i_material->mTevBlock->setTevKColorSel(i, material_init_data->mTevKColorSel[i]); + } else { + i_material->mTevBlock->setTevKColorSel(i, 0xc); + } + } + for (u8 i = 0; i < tev_stage_num; i++) { + if (material_init_data->mTevKAlphaSel[i] != 0xff) { + i_material->mTevBlock->setTevKAlphaSel(i, material_init_data->mTevKAlphaSel[i]); + } else { + i_material->mTevBlock->setTevKAlphaSel(i, 0x1c); + } + } + return i_material; } /* 803337D8-80333834 32E118 005C+00 1/1 0/0 0/0 .text newMatColor__22J3DMaterialFactory_v21CFii */ @@ -186,8 +198,7 @@ u8 J3DMaterialFactory_v21::newColorChanNum(int i_idx) const { /* 8033386C-80333A10 32E1AC 01A4+00 1/1 0/0 0/0 .text newColorChan__22J3DMaterialFactory_v21CFii */ -// J3DColorChan ctor -#ifdef NONMATCHING +// NONMATCHING J3DColorChan ctor J3DColorChan J3DMaterialFactory_v21::newColorChan(int i_idx, int i_no) const { J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]]; if (mtl_init_data->mColorChanIdx[i_no] != 0xffff) { @@ -196,11 +207,6 @@ J3DColorChan J3DMaterialFactory_v21::newColorChan(int i_idx, int i_no) const { return J3DColorChan(); } } -#else -J3DColorChan J3DMaterialFactory_v21::newColorChan(int param_0, int param_1) const { - // NONMATCHING -} -#endif /* 80333A10-80333A48 32E350 0038+00 1/1 0/0 0/0 .text newTexGenNum__22J3DMaterialFactory_v21CFi */ u32 J3DMaterialFactory_v21::newTexGenNum(int i_idx) const { @@ -329,8 +335,7 @@ J3DFog J3DMaterialFactory_v21::newFog(int i_idx) const { } /* 80333EE0-80333F60 32E820 0080+00 1/1 0/0 0/0 .text newAlphaComp__22J3DMaterialFactory_v21CFi */ -// calcAlphaCmpID issue -#ifdef NONMATCHING +// NONMATCHING calcAlphaCmpID issue J3DAlphaComp J3DMaterialFactory_v21::newAlphaComp(int i_idx) const { J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]]; if (mtl_init_data->mAlphaCompIdx != 0xffff) { @@ -338,11 +343,6 @@ J3DAlphaComp J3DMaterialFactory_v21::newAlphaComp(int i_idx) const { } return J3DAlphaComp(0xffff); } -#else -J3DAlphaComp J3DMaterialFactory_v21::newAlphaComp(int param_0) const { - // NONMATCHING -} -#endif /* 80333F60-80333FA4 32E8A0 0044+00 1/1 0/0 0/0 .text newBlend__22J3DMaterialFactory_v21CFi */ J3DBlend J3DMaterialFactory_v21::newBlend(int i_idx) const { @@ -393,4 +393,4 @@ J3DNBTScale J3DMaterialFactory_v21::newNBTScale(int i_idx) const { } else { return dflt; } -} \ No newline at end of file +} diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp index c53246008ed..06ce608403b 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoaderCalcSize.cpp @@ -27,15 +27,14 @@ u16 J3DModelLoader::countMaterialNum(const void* stream) { } /* 803367D4-803369A0 331114 01CC+00 0/0 3/0 0/0 .text calcLoadSize__14J3DModelLoaderFPCvUl */ -// NONMATCHING size load issue u32 J3DModelLoader::calcLoadSize(void const* stream, u32 flags_) { int flags = flags_; const J3DModelFileData* header = static_cast(stream); - size_t size; + size_t size = 0; const J3DModelBlock* nextBlock = header->mBlocks; u32 i = 0; // TODO: What sizeof will get us a size of 0xE4? - size = 0xE4; + size += 0xE4; for (; i < header->mBlockNum; i++) { switch (nextBlock->mBlockType) { case 'INF1': @@ -116,12 +115,11 @@ u32 J3DModelLoader::calcLoadMaterialTableSize(const void* stream) { * calcLoadBinaryDisplayListSize__14J3DModelLoaderFPCvUl */ // NONMATCHING flags issue u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags) { + u32 size = 0; const J3DModelFileData* header = (const J3DModelFileData*)stream; const J3DModelBlock* nextBlock = header->mBlocks; u32 i = 0; - u32 matFlags = flags & (J3DMLF_Material_UseIndirect | J3DMLF_26); - u32 flags2; - int size = sizeof(J3DModelData); + size += sizeof(J3DModelData); for (; i < header->mBlockNum; i++) { switch (nextBlock->mBlockType) { case 'INF1': @@ -141,18 +139,19 @@ u32 J3DModelLoader::calcLoadBinaryDisplayListSize(const void* stream, u32 flags) break; case 'MAT2': break; - case 'MAT3': - flags2 = (J3DMLF_21 | J3DMLF_Material_PE_Full | J3DMLF_Material_Color_LightOn); - flags2 |= matFlags; + case 'MAT3': { + u32 flags2 = (J3DMLF_21 | J3DMLF_Material_PE_Full | J3DMLF_Material_Color_LightOn); + flags2 |= flags & (J3DMLF_Material_UseIndirect | J3DMLF_26); mpMaterialBlock = (const J3DMaterialBlock*)nextBlock; if ((flags & (J3DMLF_13 | J3DMLF_DoBdlMaterialCalc)) == 0) { field_0x18 = 1; size += calcSizeMaterial((const J3DMaterialBlock*)nextBlock, flags2); } else if ((flags & (J3DMLF_13 | J3DMLF_DoBdlMaterialCalc)) == J3DMLF_DoBdlMaterialCalc) { field_0x18 = 1; - size += calcSizePatchedMaterial((const J3DMaterialBlock*)nextBlock, matFlags); + size += calcSizePatchedMaterial((const J3DMaterialBlock*)nextBlock, flags2); } break; + } case 'EVP1': size += calcSizeEnvelope((const J3DEnvelopeBlock*)nextBlock); break; @@ -191,7 +190,6 @@ u32 J3DModelLoader::calcSizeInformation(const J3DModelInfoBlock* block, u32 flag return size; } - /* 80336D64-80336D90 3316A4 002C+00 2/2 0/0 0/0 .text * calcSizeJoint__14J3DModelLoaderFPC13J3DJointBlock */ u32 J3DModelLoader::calcSizeJoint(const J3DJointBlock* block) { diff --git a/src/d/actor/d_a_alink_kandelaar.inc b/src/d/actor/d_a_alink_kandelaar.inc index 8dfa8abe944..4d7725fc527 100644 --- a/src/d/actor/d_a_alink_kandelaar.inc +++ b/src/d/actor/d_a_alink_kandelaar.inc @@ -225,11 +225,6 @@ void daAlink_c::preKandelaarDraw() { field_0x344c = ((near + (far * near) / proj.z) / (far - near) + 1.0f) * 1.6777215E7f; } - -/* 80110E80-80110E84 10B7C0 0004+00 0/0 3/0 0/0 .text - * setTevColor__11J3DTevBlockFUlPC13J3DGXColorS10 */ -void J3DTevBlock::setTevColor(u32 param_0, J3DGXColorS10 const* param_1) {} - /* 80110E84-80110F88 10B7C4 0104+00 4/4 0/0 0/0 .text setKandelaarModel__9daAlink_cFv */ void daAlink_c::setKandelaarModel() { field_0x2f94 = 0; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index a92ba845d0d..0a096c8f7ac 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -3042,18 +3042,6 @@ static void setLightTevColorType_MAJI_sub(J3DMaterial* param_0, dKy_tevstr_c* pa // NONMATCHING } -/* 801A4C08-801A4C0C 19F548 0004+00 0/0 4/0 0/0 .text setLight__13J3DColorBlockFUlP11J3DLightObj - */ -void J3DColorBlock::setLight(u32 param_0, J3DLightObj* param_1) { - /* empty function */ -} - -/* 801A4C0C-801A4C10 19F54C 0004+00 0/0 3/0 0/0 .text - * setAmbColor__13J3DColorBlockFUlPC10J3DGXColor */ -void J3DColorBlock::setAmbColor(u32 param_0, J3DGXColor const* param_1) { - /* empty function */ -} - /* 801A4C10-801A4DA0 19F550 0190+00 1/1 0/0 0/0 .text * dKy_cloudshadow_scroll__FP12J3DModelDataP12dKy_tevstr_ci */ static void dKy_cloudshadow_scroll(J3DModelData* i_modelData, dKy_tevstr_c* i_tevstr, int param_2) { diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 7784f09d77e..0859c03d6cc 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -343,27 +343,6 @@ void mDoExt_modelTexturePatch(J3DModelData* i_modelData) { } } -/* 8000DBC8-8000DBCC 008508 0004+00 0/0 2/0 0/0 .text patchTexNoAndTexCoordScale__11J3DTevBlockFv - */ -void J3DTevBlock::patchTexNoAndTexCoordScale() { - /* empty function */ -} - -/* 8000DBCC-8000DBD0 00850C 0004+00 0/0 6/0 0/0 .text patch__10J3DPEBlockFv */ -void J3DPEBlock::patch() { - /* empty function */ -} - -/* 8000DBD0-8000DBD4 008510 0004+00 0/0 2/0 0/0 .text patchLight__13J3DColorBlockFv */ -void J3DColorBlock::patchLight() { - /* empty function */ -} - -/* 8000DBD4-8000DBD8 008514 0004+00 0/0 2/0 0/0 .text patch__11J3DTevBlockFv */ -void J3DTevBlock::patch() { - /* empty function */ -} - /* 8000DBD8-8000DC2C 008518 0054+00 3/3 0/0 0/0 .text mDoExt_modelDiff__FP8J3DModel */ static void mDoExt_modelDiff(J3DModel* i_model) { i_model->calcMaterial();