From 5e43515ca760d09f4b5e605127fbccf5766aea1e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 23 Sep 2023 15:52:17 -0700 Subject: [PATCH] J3DMatBlock start --- .../JSystem/J3DGraphAnimator/J3DAnimation.h | 142 +- .../J3DGraphAnimator/J3DMaterialAttach.h | 33 +- include/JSystem/J3DGraphBase/J3DMatBlock.h | 174 +-- include/JSystem/J3DGraphBase/J3DMaterial.h | 37 +- include/JSystem/J3DGraphBase/J3DStruct.h | 8 +- include/JSystem/J3DGraphBase/J3DTevs.h | 26 +- include/JSystem/J3DGraphBase/J3DTexture.h | 28 +- src/JSystem/J3DGraphAnimator/J3DAnimation.cpp | 20 +- .../J3DGraphAnimator/J3DMaterialAttach.cpp | 8 +- src/JSystem/J3DGraphBase/J3DMatBlock.cpp | 1192 ++++++++--------- src/JSystem/J3DGraphBase/J3DMaterial.cpp | 100 +- src/JSystem/J3DGraphBase/J3DPacket.cpp | 24 +- src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | 6 +- 13 files changed, 892 insertions(+), 906 deletions(-) diff --git a/include/JSystem/J3DGraphAnimator/J3DAnimation.h b/include/JSystem/J3DGraphAnimator/J3DAnimation.h index 00bd2b865..d5d600a4c 100644 --- a/include/JSystem/J3DGraphAnimator/J3DAnimation.h +++ b/include/JSystem/J3DGraphAnimator/J3DAnimation.h @@ -303,10 +303,10 @@ private: class J3DAnmTransform : public J3DAnmBase { public: - /* 80328E40 */ J3DAnmTransform(s16, f32*, s16*, f32*); + J3DAnmTransform(s16, f32*, s16*, f32*); - /* 8003B93C */ virtual ~J3DAnmTransform(); - /* 8003C77C */ virtual s32 getKind() const; + virtual ~J3DAnmTransform(); + virtual s32 getKind() const; virtual void getTransform(u16, J3DTransformInfo*) const = 0; private: @@ -326,11 +326,11 @@ public: field_0x24 = 0; } - /* 80329A34 */ void calcTransform(f32, u16, J3DTransformInfo*) const; + void calcTransform(f32, u16, J3DTransformInfo*) const; - /* 8003B8D0 */ virtual ~J3DAnmTransformKey(); - /* 8003C800 */ virtual s32 getKind() const; - /* 8003C808 */ virtual void getTransform(u16, J3DTransformInfo*) const; + virtual ~J3DAnmTransformKey(); + virtual s32 getKind() const; + virtual void getTransform(u16, J3DTransformInfo*) const; private: /* 0x20 */ int field_0x20; @@ -339,9 +339,9 @@ private: class J3DAnmTransformFull : public J3DAnmTransform { public: - /* 8032C2AC */ virtual ~J3DAnmTransformFull(); - /* 8032C318 */ virtual s32 getKind() const; - /* 80328E90 */ virtual void getTransform(u16, J3DTransformInfo*) const; + virtual ~J3DAnmTransformFull(); + virtual s32 getKind() const; + virtual void getTransform(u16, J3DTransformInfo*) const; private: /* 0x20 */ int field_0x20; @@ -349,9 +349,9 @@ private: class J3DAnmTransformFullWithLerp : public J3DAnmTransformFull { public: - /* 8032C228 */ virtual ~J3DAnmTransformFullWithLerp(); - /* 8032C2A4 */ virtual s32 getKind() const; - /* 803291F0 */ virtual void getTransform(u16, J3DTransformInfo*) const; + virtual ~J3DAnmTransformFullWithLerp(); + virtual s32 getKind() const; + virtual void getTransform(u16, J3DTransformInfo*) const; }; // Size: 0x24 struct J3DTextureSRTInfo; @@ -360,13 +360,13 @@ class J3DMaterialTable; class J3DAnmTextureSRTKey : public J3DAnmBase { public: - /* 80329E5C */ J3DAnmTextureSRTKey(); - /* 80329F14 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const; - /* 8032B0C0 */ void searchUpdateMaterialID(J3DMaterialTable*); - /* 8032B1D4 */ void searchUpdateMaterialID(J3DModelData*); + J3DAnmTextureSRTKey(); + void calcTransform(f32, u16, J3DTextureSRTInfo*) const; + void searchUpdateMaterialID(J3DMaterialTable*); + void searchUpdateMaterialID(J3DModelData*); - /* 8032C198 */ virtual ~J3DAnmTextureSRTKey(); - /* 8032C220 */ virtual s32 getKind() const; + virtual ~J3DAnmTextureSRTKey(); + virtual s32 getKind() const; void getTransform(u16 param_0, J3DTextureSRTInfo* pSRTInfo) const { calcTransform(getFrame(), param_0, pSRTInfo); @@ -404,15 +404,32 @@ private: /* 0x78 */ u32 mTexMtxCalcType; }; // Size: 0x7C +class J3DAnmVisibilityFull : public J3DAnmBase { +public: + J3DAnmVisibilityFull(); + bool getVisibility(u16, u8*) const; + + virtual ~J3DAnmVisibilityFull(); + virtual s32 getKind() const; + +private: + /* 0x0C */ void* field_0xc; + /* 0x10 */ void* mAnmTable; + /* 0x14 */ u16 field_0x14; + /* 0x16 */ u16 mUpdateMaterialNum; + /* 0x18 */ u16* field_0x18; + /* 0x1C */ JUTNameTab field_0x1c; +}; // Size: 0x2C + class J3DAnmTexPattern : public J3DAnmBase { public: - /* 8032AED8 */ J3DAnmTexPattern(); - /* 8032AF50 */ void getTexNo(u16, u16*) const; - /* 8032B004 */ void searchUpdateMaterialID(J3DMaterialTable*); - /* 8032B09C */ void searchUpdateMaterialID(J3DModelData*); + J3DAnmTexPattern(); + void getTexNo(u16, u16*) const; + void searchUpdateMaterialID(J3DMaterialTable*); + void searchUpdateMaterialID(J3DModelData*); - /* 8032BD20 */ virtual ~J3DAnmTexPattern(); - /* 8032BD94 */ virtual s32 getKind() const; + virtual ~J3DAnmTexPattern(); + virtual s32 getKind() const; private: /* 0x0C */ void* field_0xc; @@ -425,14 +442,14 @@ private: class J3DAnmTevRegKey : public J3DAnmBase { public: - /* 8032AE18 */ J3DAnmTevRegKey(); - /* 8032B1F8 */ void getTevColorReg(u16, _GXColorS10*) const; - /* 8032B4BC */ void getTevKonstReg(u16, _GXColor*) const; - /* 8032B780 */ void searchUpdateMaterialID(J3DMaterialTable*); - /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*); + J3DAnmTevRegKey(); + void getTevColorReg(u16, _GXColorS10*) const; + void getTevKonstReg(u16, _GXColor*) const; + void searchUpdateMaterialID(J3DMaterialTable*); + void searchUpdateMaterialID(J3DModelData*); - /* 8032BD9C */ virtual ~J3DAnmTevRegKey(); - /* 8032BE24 */ virtual s32 getKind() const; + virtual ~J3DAnmTevRegKey(); + virtual s32 getKind() const; u16 getCRegUpdateMaterialNum() const { return mCRegUpdateMaterialNum; } u16 getKRegUpdateMaterialNum() const { return mKRegUpdateMaterialNum; } @@ -469,12 +486,13 @@ private: class J3DAnmColor : public J3DAnmBase { public: - /* 8032A828 */ J3DAnmColor(); - /* 8032A8A4 */ void searchUpdateMaterialID(J3DMaterialTable*); + J3DAnmColor(); + void searchUpdateMaterialID(J3DMaterialTable*); + void searchUpdateMaterialID(J3DModelData*); - /* 8032BCAC */ virtual ~J3DAnmColor(); - /* 8032BF44 */ virtual s32 getKind() const; - /* 8032BF4C */ virtual void getColor(u16, _GXColor*) const; + virtual ~J3DAnmColor(); + virtual s32 getKind() const; + virtual void getColor(u16, _GXColor*) const; u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; } bool isValidUpdateMaterialID(u16 id) const { return mUpdateMaterialID[id] != 0xFFFF; } @@ -492,11 +510,11 @@ private: class J3DAnmColorKey : public J3DAnmColor { public: - /* 8032AB00 */ J3DAnmColorKey(); + J3DAnmColorKey(); - /* 8032BE2C */ virtual ~J3DAnmColorKey(); - /* 8032BEB0 */ virtual s32 getKind() const; - /* 8032AB54 */ virtual void getColor(u16, _GXColor*) const; + virtual ~J3DAnmColorKey(); + virtual s32 getKind() const; + virtual void getColor(u16, _GXColor*) const; private: /* 0x2C */ int field_0x2c; @@ -508,11 +526,11 @@ private: class J3DAnmColorFull : public J3DAnmColor { public: - /* 8032AB00 */ J3DAnmColorFull(); + J3DAnmColorFull(); - /* 8032BE2C */ virtual ~J3DAnmColorFull(); - /* 8032BEB0 */ virtual s32 getKind() const; - /* 8032AB54 */ virtual void getColor(u16, _GXColor*) const; + virtual ~J3DAnmColorFull(); + virtual s32 getKind() const; + virtual void getColor(u16, _GXColor*) const; private: /* 0x2C */ int field_0x2c; @@ -537,22 +555,22 @@ private: class J3DAnmVtxColorKey : public J3DAnmVtxColor { public: - /* 8032A4E0 */ J3DAnmVtxColorKey(); + J3DAnmVtxColorKey(); - /* 8032BF50 */ virtual ~J3DAnmVtxColorKey(); - /* 8032BFBC */ virtual s32 getKind() const; - /* 8032A53C */ virtual void getColor(u8, u16, _GXColor*) const; + virtual ~J3DAnmVtxColorKey(); + virtual s32 getKind() const; + virtual void getColor(u8, u16, _GXColor*) const; private: /* 0x18 */ int field_0x18[2]; }; class J3DAnmVtxColorFull : public J3DAnmVtxColor { - /* 8032A30C */ J3DAnmVtxColorFull(); + J3DAnmVtxColorFull(); - /* 8032BFC4 */ virtual ~J3DAnmVtxColorFull(); - /* 8032C030 */ virtual s32 getKind() const; - /* 8032A368 */ virtual void getColor(u8, u16, _GXColor*) const; + virtual ~J3DAnmVtxColorFull(); + virtual s32 getKind() const; + virtual void getColor(u8, u16, _GXColor*) const; private: /* 0x18 */ int field_0x18[2]; @@ -560,9 +578,9 @@ private: class J3DAnmCluster : public J3DAnmBase { public: - /* 8032BCAC */ virtual ~J3DAnmCluster(); - /* 8032BF44 */ virtual s32 getKind() const; - /* 8032BF4C */ virtual f32 getWeight(u16) const; + virtual ~J3DAnmCluster(); + virtual s32 getKind() const; + virtual f32 getWeight(u16) const; private: /* 0x0C */ f32* field_0xc; @@ -570,9 +588,9 @@ private: class J3DAnmClusterFull : public J3DAnmCluster { public: - /* 8032BCAC */ virtual ~J3DAnmClusterFull(); - /* 8032BF44 */ virtual s32 getKind() const; - /* 8032BF4C */ virtual f32 getWeight(u16) const; + virtual ~J3DAnmClusterFull(); + virtual s32 getKind() const; + virtual f32 getWeight(u16) const; private: /* 0x10 */ int field_0x10; @@ -580,9 +598,9 @@ private: class J3DAnmClusterKey : public J3DAnmCluster { public: - /* 8032C044 */ virtual ~J3DAnmClusterKey(); - /* 8032C0B0 */ virtual s32 getKind() const; - /* 8032A218 */ virtual f32 getWeight(u16) const; + virtual ~J3DAnmClusterKey(); + virtual s32 getKind() const; + virtual f32 getWeight(u16) const; private: /* 0x10 */ int field_0x10; diff --git a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h index 2def459b7..6e4c17ea8 100644 --- a/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h +++ b/include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h @@ -9,23 +9,32 @@ class J3DAnmColor; class J3DAnmTexPattern; class J3DAnmTextureSRTKey; class J3DAnmTevRegKey; +class J3DMatColorAnm; +class J3DTexNoAnm; +class J3DTexMtxAnm; +class J3DTevColorAnm; +class J3DTevKColorAnm; class JUTNameTab; class J3DMaterialTable { public: - /* 8032F5A8 */ void clear(); - /* 8032F5D0 */ J3DMaterialTable(); - /* 8032F64C */ int removeMatColorAnimator(J3DAnmColor*); - /* 8032F6F8 */ int removeTexNoAnimator(J3DAnmTexPattern*); - /* 8032F7B4 */ int removeTexMtxAnimator(J3DAnmTextureSRTKey*); - /* 8032F880 */ int removeTevRegAnimator(J3DAnmTevRegKey*); - /* 8032F9C0 */ void createTexMtxForAnimator(J3DAnmTextureSRTKey*); - /* 8032FAF4 */ void entryMatColorAnimator(J3DAnmColor*); - /* 8032FBC8 */ void entryTexNoAnimator(J3DAnmTexPattern*); - /* 8032FCC4 */ void entryTexMtxAnimator(J3DAnmTextureSRTKey*); - /* 8032FE70 */ void entryTevRegAnimator(J3DAnmTevRegKey*); + void clear(); + J3DMaterialTable(); + int removeMatColorAnimator(J3DAnmColor*); + int removeTexNoAnimator(J3DAnmTexPattern*); + int removeTexMtxAnimator(J3DAnmTextureSRTKey*); + int removeTevRegAnimator(J3DAnmTevRegKey*); + void createTexMtxForAnimator(J3DAnmTextureSRTKey*); + void entryMatColorAnimator(J3DAnmColor*); + void entryTexNoAnimator(J3DAnmTexPattern*); + void entryTexMtxAnimator(J3DAnmTextureSRTKey*); + void entryTevRegAnimator(J3DAnmTevRegKey*); + void setMatColorAnimator(J3DAnmColor*, J3DMatColorAnm *); + void setTexNoAnimator(J3DAnmTexPattern*, J3DTexNoAnm*); + void setTexMtxAnimator(J3DAnmTextureSRTKey*, J3DTexMtxAnm*, J3DTexMtxAnm*); + void setTevRegAnimator(J3DAnmTevRegKey*, J3DTevColorAnm*, J3DTevKColorAnm*); - /* 8032F604 */ virtual ~J3DMaterialTable(); + virtual ~J3DMaterialTable(); J3DMaterial* getMaterialNodePointer(u16 idx) const { return mMaterialNodePointer[idx]; } diff --git a/include/JSystem/J3DGraphBase/J3DMatBlock.h b/include/JSystem/J3DGraphBase/J3DMatBlock.h index b4d0f0776..e9df1d45d 100644 --- a/include/JSystem/J3DGraphBase/J3DMatBlock.h +++ b/include/JSystem/J3DGraphBase/J3DMatBlock.h @@ -46,7 +46,7 @@ public: virtual void setNBTScale(J3DNBTScale const*); virtual void setNBTScale(J3DNBTScale); virtual J3DNBTScale* getNBTScale(); - virtual bool getTexMtxOffset() const; + virtual u32 getTexMtxOffset() const; virtual void setTexMtxOffset(u32); virtual ~J3DTexGenBlock(); }; @@ -77,7 +77,7 @@ public: virtual J3DTexCoord* getTexCoord(u32); virtual void setTexMtx(u32, J3DTexMtx*); virtual J3DTexMtx* getTexMtx(u32); - virtual bool getTexMtxOffset() const; + virtual u32 getTexMtxOffset() const; virtual void setTexMtxOffset(u32); virtual ~J3DTexGenBlockPatched(); @@ -165,28 +165,28 @@ public: virtual u8 getTevKColorSel(u32); virtual void setTevKAlphaSel(u32, u8 const*); virtual void setTevKAlphaSel(u32, u8); - virtual bool getTevKAlphaSel(u32); + virtual u8 getTevKAlphaSel(u32); virtual void setTevStageNum(u8 const*); virtual void setTevStageNum(u8); virtual u8 getTevStageNum() const; virtual void setTevStage(u32, J3DTevStage const*); virtual void setTevStage(u32, J3DTevStage); - virtual bool getTevStage(u32); + virtual J3DTevStage * getTevStage(u32); virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - virtual bool getTevSwapModeTable(u32); + virtual J3DTevSwapModeTable * getTevSwapModeTable(u32); virtual void setIndTevStage(u32, J3DIndTevStage const*); virtual void setIndTevStage(u32, J3DIndTevStage); - virtual bool getIndTevStage(u32); - virtual bool getTexNoOffset() const; - virtual bool getTevRegOffset() const; + virtual J3DIndTevStage * getIndTevStage(u32); + virtual u32 getTexNoOffset() const; + virtual u32 getTevRegOffset() const; virtual void setTexNoOffset(u32); virtual void setTevRegOffset(u32); virtual ~J3DTevBlock(); -private: +protected: void indexToPtr_private(u32); /* 0x4 */ u32 mTexNoOffset; @@ -234,12 +234,12 @@ public: virtual u8 getTevStageNum() const; virtual void setTevStage(u32, J3DTevStage const*); virtual void setTevStage(u32, J3DTevStage); - virtual bool getTevStage(u32); + virtual J3DTevStage * getTevStage(u32); virtual void setIndTevStage(u32, J3DIndTevStage const*); virtual void setIndTevStage(u32, J3DIndTevStage); - virtual bool getIndTevStage(u32); - virtual bool getTexNoOffset() const; - virtual bool getTevRegOffset() const; + virtual J3DIndTevStage * getIndTevStage(u32); + virtual u32 getTexNoOffset() const; + virtual u32 getTevRegOffset() const; virtual void setTevRegOffset(u32); virtual ~J3DTevBlockPatched(); @@ -298,23 +298,23 @@ public: virtual u8 getTevKColorSel(u32); virtual void setTevKAlphaSel(u32, u8 const*); virtual void setTevKAlphaSel(u32, u8); - virtual bool getTevKAlphaSel(u32); + virtual u8 getTevKAlphaSel(u32); virtual void setTevStageNum(u8 const*); virtual void setTevStageNum(u8); virtual u8 getTevStageNum() const; virtual void setTevStage(u32, J3DTevStage const*); virtual void setTevStage(u32, J3DTevStage); - virtual bool getTevStage(u32); + virtual J3DTevStage * getTevStage(u32); virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - virtual bool getTevSwapModeTable(u32); + virtual J3DTevSwapModeTable * getTevSwapModeTable(u32); virtual void setIndTevStage(u32, J3DIndTevStage const*); virtual void setIndTevStage(u32, J3DIndTevStage); - virtual bool getIndTevStage(u32); - virtual bool getTexNoOffset() const; - virtual bool getTevRegOffset() const; + virtual J3DIndTevStage * getIndTevStage(u32); + virtual u32 getTexNoOffset() const; + virtual u32 getTevRegOffset() const; virtual void setTevRegOffset(u32); virtual ~J3DTevBlock4(); @@ -371,23 +371,23 @@ public: virtual u8 getTevKColorSel(u32); virtual void setTevKAlphaSel(u32, u8 const*); virtual void setTevKAlphaSel(u32, u8); - virtual bool getTevKAlphaSel(u32); + virtual u8 getTevKAlphaSel(u32); virtual void setTevStageNum(u8 const*); virtual void setTevStageNum(u8); virtual u8 getTevStageNum() const; virtual void setTevStage(u32, J3DTevStage const*); virtual void setTevStage(u32, J3DTevStage); - virtual bool getTevStage(u32); + virtual J3DTevStage * getTevStage(u32); virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - virtual bool getTevSwapModeTable(u32); + virtual J3DTevSwapModeTable * getTevSwapModeTable(u32); virtual void setIndTevStage(u32, J3DIndTevStage const*); virtual void setIndTevStage(u32, J3DIndTevStage); - virtual bool getIndTevStage(u32); - virtual bool getTexNoOffset() const; - virtual bool getTevRegOffset() const; + virtual J3DIndTevStage * getIndTevStage(u32); + virtual u32 getTexNoOffset() const; + virtual u32 getTevRegOffset() const; virtual void setTevRegOffset(u32); virtual ~J3DTevBlock2(); @@ -444,23 +444,23 @@ public: virtual u8 getTevKColorSel(u32); virtual void setTevKAlphaSel(u32, u8 const*); virtual void setTevKAlphaSel(u32, u8); - virtual bool getTevKAlphaSel(u32); + virtual u8 getTevKAlphaSel(u32); virtual void setTevStageNum(u8); virtual void setTevStageNum(u8 const*); virtual u8 getTevStageNum() const; virtual void setTevStage(u32, J3DTevStage const*); virtual void setTevStage(u32, J3DTevStage); - virtual bool getTevStage(u32); + virtual J3DTevStage * getTevStage(u32); virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo const*); virtual void setTevSwapModeInfo(u32, J3DTevSwapModeInfo); virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable const*); virtual void setTevSwapModeTable(u32, J3DTevSwapModeTable); - virtual bool getTevSwapModeTable(u32); + virtual J3DTevSwapModeTable * getTevSwapModeTable(u32); virtual void setIndTevStage(u32, J3DIndTevStage const*); virtual void setIndTevStage(u32, J3DIndTevStage); - virtual bool getIndTevStage(u32); - virtual bool getTexNoOffset() const; - virtual bool getTevRegOffset() const; + virtual J3DIndTevStage * getIndTevStage(u32); + virtual u32 getTexNoOffset() const; + virtual u32 getTevRegOffset() const; virtual void setTevRegOffset(u32); virtual ~J3DTevBlock16(); @@ -511,11 +511,11 @@ public: virtual u8 getTevStageNum() const; virtual void setTevStage(u32, J3DTevStage const*); virtual void setTevStage(u32, J3DTevStage); - virtual bool getTevStage(u32); + virtual J3DTevStage * getTevStage(u32); virtual void setIndTevStage(u32, J3DIndTevStage const*); virtual void setIndTevStage(u32, J3DIndTevStage); - virtual bool getIndTevStage(u32); - virtual bool getTexNoOffset() const; + virtual J3DIndTevStage * getIndTevStage(u32); + virtual u32 getTexNoOffset() const; virtual ~J3DTevBlock1(); private: @@ -629,21 +629,21 @@ public: virtual void setFog(J3DFog*); virtual J3DFog* getFog(); virtual void setAlphaComp(J3DAlphaComp const*); - virtual void setAlphaComp(J3DAlphaComp const&); + virtual void setAlphaComp(J3DAlphaComp); virtual J3DAlphaComp* getAlphaComp(); virtual void setBlend(J3DBlend const*); - virtual void setBlend(J3DBlend const&); - virtual bool getBlend(); + virtual void setBlend(J3DBlend); + virtual J3DBlend* getBlend(); virtual void setZMode(J3DZMode const*); virtual void setZMode(J3DZMode); virtual J3DZMode* getZMode(); virtual void setZCompLoc(u8 const*); virtual void setZCompLoc(u8); - virtual bool getZCompLoc() const; + virtual u8 getZCompLoc() const; virtual void setDither(u8 const*); virtual void setDither(u8); - virtual bool getDither() const; - virtual bool getFogOffset() const; + virtual u8 getDither() const; + virtual u32 getFogOffset() const; virtual void setFogOffset(u32); virtual ~J3DPEBlock(); }; @@ -690,33 +690,33 @@ public: virtual void setFog(J3DFog*); virtual J3DFog* getFog(); virtual void setAlphaComp(J3DAlphaComp const*); - virtual void setAlphaComp(J3DAlphaComp const&); + virtual void setAlphaComp(J3DAlphaComp); virtual J3DAlphaComp* getAlphaComp(); virtual void setBlend(J3DBlend const*); - virtual void setBlend(J3DBlend const&); - virtual bool getBlend(); + virtual void setBlend(J3DBlend); + virtual J3DBlend* getBlend(); virtual void setZMode(J3DZMode const*); virtual void setZMode(J3DZMode); virtual J3DZMode* getZMode(); virtual void setZCompLoc(u8 const*); virtual void setZCompLoc(u8); - virtual bool getZCompLoc() const; + virtual u8 getZCompLoc() const; virtual void setDither(u8 const*); virtual void setDither(u8); - virtual bool getDither() const; - virtual bool getFogOffset() const; + virtual u8 getDither() const; + virtual u32 getFogOffset() const; virtual void setFogOffset(u32); virtual ~J3DPEBlockFull(); private: - /* 0x04 */ J3DFog mFog; - /* 0x30 */ J3DAlphaComp mAlphaComp; - /* 0x34 */ J3DBlend mBlend; - /* 0x38 */ J3DZMode mZMode; - /* 0x3A */ u8 mZCompLoc; - /* 0x3B */ u8 mDither; - /* 0x3C */ u32 mFogOffset; -}; // Size: 0x40 + /* 0x04 */ J3DFog * mFog; + /* 0x08 */ J3DAlphaComp mAlphaComp; + /* 0x0C */ J3DBlend mBlend; + /* 0x10 */ J3DZMode mZMode; + /* 0x14 */ u8 mZCompLoc; + /* 0x15 */ u8 mDither; + /* 0x18 */ u32 mFogOffset; +}; // Size: 0x1C class J3DPEBlockFogOff : public J3DPEBlock { public: @@ -732,20 +732,20 @@ public: virtual s32 countDLSize(); virtual u32 getType(); virtual void setAlphaComp(J3DAlphaComp const*); - virtual void setAlphaComp(J3DAlphaComp const&); + virtual void setAlphaComp(J3DAlphaComp); virtual J3DAlphaComp* getAlphaComp(); virtual void setBlend(J3DBlend const*); - virtual void setBlend(J3DBlend const&); - virtual bool getBlend(); + virtual void setBlend(J3DBlend); + virtual J3DBlend* getBlend(); virtual void setZMode(J3DZMode const*); virtual void setZMode(J3DZMode); virtual J3DZMode* getZMode(); virtual void setZCompLoc(u8 const*); virtual void setZCompLoc(u8); - virtual bool getZCompLoc() const; + virtual u8 getZCompLoc() const; virtual void setDither(u8 const*); virtual void setDither(u8); - virtual bool getDither() const; + virtual u8 getDither() const; virtual ~J3DPEBlockFogOff(); private: @@ -762,8 +762,7 @@ struct J3DIndTexCoordScale { /* 0x0 */ u8 mScaleS; /* 0x1 */ u8 mScaleT; - /* 0x2 */ u8 field_0x2; - /* 0x3 */ u8 field_0x3; + u8 pad[2]; }; struct J3DIndTexMtx { @@ -794,13 +793,13 @@ public: virtual u8 getIndTexStageNum() const; virtual void setIndTexOrder(u32, J3DIndTexOrder); virtual void setIndTexOrder(u32, J3DIndTexOrder const*); - virtual bool getIndTexOrder(u32); + virtual J3DIndTexOrder * getIndTexOrder(u32); virtual void setIndTexMtx(u32, J3DIndTexMtx const*); virtual void setIndTexMtx(u32, J3DIndTexMtx); - virtual bool getIndTexMtx(u32); + virtual J3DIndTexMtx * getIndTexMtx(u32); virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale); virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*); - virtual bool getIndTexCoordScale(u32); + virtual J3DIndTexCoordScale * getIndTexCoordScale(u32); virtual ~J3DIndBlock(); }; @@ -820,13 +819,13 @@ public: virtual u8 getIndTexStageNum() const; virtual void setIndTexOrder(u32, J3DIndTexOrder); virtual void setIndTexOrder(u32, J3DIndTexOrder const*); - virtual bool getIndTexOrder(u32); + virtual J3DIndTexOrder * getIndTexOrder(u32); virtual void setIndTexMtx(u32, J3DIndTexMtx const*); virtual void setIndTexMtx(u32, J3DIndTexMtx); - virtual bool getIndTexMtx(u32); + virtual J3DIndTexMtx * getIndTexMtx(u32); virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale const*); virtual void setIndTexCoordScale(u32, J3DIndTexCoordScale); - virtual bool getIndTexCoordScale(u32); + virtual J3DIndTexCoordScale * getIndTexCoordScale(u32); virtual ~J3DIndBlockFull(); private: @@ -882,7 +881,7 @@ public: virtual GXColor* getMatColor(u32); virtual void setAmbColor(u32, J3DGXColor const*); virtual void setAmbColor(u32, J3DGXColor); - virtual bool getAmbColor(u32); + virtual GXColor* getAmbColor(u32); virtual void setColorChanNum(u8); virtual void setColorChanNum(u8 const*); virtual u8 getColorChanNum() const; @@ -890,12 +889,12 @@ public: virtual void setColorChan(u32, J3DColorChan const*); virtual J3DColorChan* getColorChan(u32); virtual void setLight(u32, J3DLightObj*); - virtual bool getLight(u32); + virtual J3DLightObj* getLight(u32); virtual void setCullMode(u8 const*); virtual void setCullMode(u8); - virtual s32 getCullMode() const; - virtual bool getMatColorOffset() const; - virtual bool getColorChanOffset() const; + virtual u8 getCullMode() const; + virtual u32 getMatColorOffset() const; + virtual u32 getColorChanOffset() const; virtual void setMatColorOffset(u32); virtual void setColorChanOffset(u32); virtual ~J3DColorBlock(); @@ -923,7 +922,7 @@ public: virtual GXColor* getMatColor(u32); virtual void setAmbColor(u32, J3DGXColor const*); virtual void setAmbColor(u32, J3DGXColor); - virtual bool getAmbColor(u32); + virtual GXColor* getAmbColor(u32); virtual void setColorChanNum(u8); virtual void setColorChanNum(u8 const*); virtual u8 getColorChanNum() const; @@ -931,19 +930,19 @@ public: virtual void setColorChan(u32, J3DColorChan const*); virtual J3DColorChan* getColorChan(u32); virtual void setLight(u32, J3DLightObj*); - virtual bool getLight(u32); + virtual J3DLightObj* getLight(u32); virtual void setCullMode(u8 const*); virtual void setCullMode(u8); - virtual s32 getCullMode() const; - virtual bool getMatColorOffset() const; - virtual bool getColorChanOffset() const; + virtual u8 getCullMode() const; + virtual u32 getMatColorOffset() const; + virtual u32 getColorChanOffset() const; virtual void setMatColorOffset(u32); virtual void setColorChanOffset(u32); virtual ~J3DColorBlockLightOn(); private: - /* 0x04 */ J3DGXColor mMatColor[2]; - /* 0x0C */ J3DGXColor mAmbColor[2]; + /* 0x04 */ GXColor mMatColor[2]; + /* 0x0C */ GXColor mAmbColor[2]; /* 0x14 */ u8 mColorChanNum; /* 0x16 */ J3DColorChan mColorChan[4]; /* 0x20 */ J3DLightObj* mLight[8]; @@ -966,6 +965,7 @@ public: virtual void patchLight(); virtual void diff(u32); virtual void diffMatColor(); + virtual void diffLight(); virtual s32 countDLSize(); virtual u32 getType(); virtual void setMatColor(u32, J3DGXColor const*); @@ -979,15 +979,15 @@ public: virtual J3DColorChan* getColorChan(u32); virtual void setCullMode(u8 const*); virtual void setCullMode(u8); - virtual s32 getCullMode() const; - virtual bool getMatColorOffset() const; - virtual bool getColorChanOffset() const; + virtual u8 getCullMode() const; + virtual u32 getMatColorOffset() const; + virtual u32 getColorChanOffset() const; virtual void setMatColorOffset(u32); virtual void setColorChanOffset(u32); virtual ~J3DColorBlockLightOff(); -private: - /* 0x04 */ J3DGXColor mMatColor[2]; +protected: + /* 0x04 */ GXColor mMatColor[2]; /* 0x0C */ u8 mColorChanNum; /* 0x0E */ J3DColorChan mColorChan[4]; /* 0x16 */ u8 mCullMode; @@ -1008,11 +1008,11 @@ public: virtual u32 getType(); virtual void setAmbColor(u32, J3DGXColor const*); virtual void setAmbColor(u32, J3DGXColor); - virtual bool getAmbColor(u32); + virtual GXColor* getAmbColor(u32); virtual ~J3DColorBlockAmbientOn(); -private: - /* 0x20 */ J3DGXColor mAmbColor[2]; +protected: + /* 0x20 */ GXColor mAmbColor[2]; }; // Size: 0x28 #endif /* J3DMATBLOCK_H */ diff --git a/include/JSystem/J3DGraphBase/J3DMaterial.h b/include/JSystem/J3DGraphBase/J3DMaterial.h index 6f6ed6721..9dc13072c 100644 --- a/include/JSystem/J3DGraphBase/J3DMaterial.h +++ b/include/JSystem/J3DGraphBase/J3DMaterial.h @@ -31,7 +31,7 @@ public: s32 newSharedDisplayList(u32); s32 newSingleSharedDisplayList(u32); - virtual void calc(f32 const (*)[4]); + virtual void calc(const Mtx); virtual void makeDisplayList(); virtual void makeSharedDisplayList(); virtual void load(); @@ -97,29 +97,30 @@ public: class J3DPatchedMaterial : public J3DMaterial { public: - /* 80316FB8 */ void initialize(); + void initialize(); - /* 80316FD8 */ virtual void makeDisplayList(); - /* 80316FDC */ virtual void makeSharedDisplayList(); - /* 80316FE0 */ virtual void load(); - /* 80316FFC */ virtual void loadSharedDL(); - /* 8031703C */ virtual void reset(); - /* 80317040 */ virtual void change(); + virtual void calc(const Mtx); + virtual void makeDisplayList(); + virtual void makeSharedDisplayList(); + virtual void load(); + virtual void loadSharedDL(); + virtual void reset(); + virtual void change(); }; class J3DLockedMaterial : public J3DMaterial { public: - /* 80317044 */ void initialize(); + void initialize(); - /* 803170D0 */ virtual void calc(f32 const (*)[4]); - /* 80317064 */ virtual void makeDisplayList(); - /* 80317068 */ virtual void makeSharedDisplayList(); - /* 8031706C */ virtual void load(); - /* 80317088 */ virtual void loadSharedDL(); - /* 803170C8 */ virtual void patch(); - /* 803170CC */ virtual void diff(u32); - /* 803170D4 */ virtual void reset(); - /* 803170D8 */ virtual void change(); + virtual void calc(const Mtx); + virtual void makeDisplayList(); + virtual void makeSharedDisplayList(); + virtual void load(); + virtual void loadSharedDL(); + virtual void patch(); + virtual void diff(u32); + virtual void reset(); + virtual void change(); }; #endif /* J3DMATERIAL_H */ diff --git a/include/JSystem/J3DGraphBase/J3DStruct.h b/include/JSystem/J3DGraphBase/J3DStruct.h index b2e613ecd..4b2988a12 100644 --- a/include/JSystem/J3DGraphBase/J3DStruct.h +++ b/include/JSystem/J3DGraphBase/J3DStruct.h @@ -54,15 +54,11 @@ struct J3DTexMtxInfo { }; // Size: 0x64 struct J3DIndTexMtxInfo { - /* 803257DC */ void operator=(J3DIndTexMtxInfo const&); - /* 0x00 */ Mtx23 field_0x0; /* 0x18 */ u8 field_0x18; }; // Size: 0x1C struct J3DFogInfo { - /* 80325800 */ void operator=(J3DFogInfo const&); - /* 0x00 */ u8 mType; /* 0x01 */ u8 mAdjEnable; /* 0x02 */ u16 mCenter; @@ -75,10 +71,10 @@ struct J3DFogInfo { }; // Size: 0x2C struct J3DNBTScaleInfo { - /* 8032587C */ void operator=(J3DNBTScaleInfo const&); - /* 0x0 */ u8 mbHasScale; /* 0x4 */ Vec mScale; + + inline void operator=(const J3DNBTScaleInfo & other) { mbHasScale = other.mbHasScale; mScale = other.mScale; } }; // Size: 0x10 #endif /* J3DSTRUCT_H */ diff --git a/include/JSystem/J3DGraphBase/J3DTevs.h b/include/JSystem/J3DGraphBase/J3DTevs.h index 09081c527..0b29af869 100644 --- a/include/JSystem/J3DGraphBase/J3DTevs.h +++ b/include/JSystem/J3DGraphBase/J3DTevs.h @@ -4,7 +4,7 @@ #include "dolphin/types.h" struct J3DTevStageInfo { - /* 0x0 */ u8 field_0x0; + /* 0x0 */ u8 mTevMode; /* 0x1 */ u8 mTevColorOp; /* 0x2 */ u8 mTevColorAB; /* 0x3 */ u8 mTevColorCD; @@ -15,9 +15,9 @@ struct J3DTevStageInfo { }; struct J3DTevStage : public J3DTevStageInfo { - /* 8000E230 */ J3DTevStage(); - /* 8000E298 */ void setTevStageInfo(J3DTevStageInfo const&); - /* 8003AACC */ J3DTevStage(J3DTevStageInfo const&); + J3DTevStage(); + void setTevStageInfo(J3DTevStageInfo const&); + J3DTevStage(J3DTevStageInfo const&); }; struct J3DIndTevStageInfo { @@ -33,24 +33,20 @@ struct J3DIndTevStageInfo { }; struct J3DIndTevStage { - /* 8000E14C */ J3DIndTevStage(); + J3DIndTevStage(); /* 0x0 */ u32 mInfo; }; struct J3DTevOrderInfo { - void operator=(const J3DTevOrderInfo& other) { - *(u32*) this = *(u32*)&other; - } - - /* 0x0 */ u8 field_0x0; + /* 0x0 */ u8 mTexCoord; /* 0x1 */ u8 mTexMap; - /* 0x2 */ u8 field_0x2; + /* 0x2 */ u8 mColorChan; /* 0x3 */ u8 field_0x3; // Maybe padding }; struct J3DTevOrder : public J3DTevOrderInfo { - /* 8000E140 */ J3DTevOrder(); + J3DTevOrder(); J3DTevOrder(const J3DTevOrderInfo& info) { *(J3DTevOrderInfo*)this = info; } @@ -59,12 +55,14 @@ struct J3DTevOrder : public J3DTevOrderInfo { }; struct J3DTevSwapModeTable { - /* 8000E134 */ J3DTevSwapModeTable(); + J3DTevSwapModeTable(); /* 0x0 */ u8 field_0x0; }; // Size: 0x1 -struct J3DTevSwapModeInfo {}; +struct J3DTevSwapModeInfo { + /* 0x0 */ u8 field_0x0; +}; struct J3DNBTScale; void loadNBTScale(J3DNBTScale& param_0); diff --git a/include/JSystem/J3DGraphBase/J3DTexture.h b/include/JSystem/J3DGraphBase/J3DTexture.h index 8f646bbe9..e5b4a31d1 100644 --- a/include/JSystem/J3DGraphBase/J3DTexture.h +++ b/include/JSystem/J3DGraphBase/J3DTexture.h @@ -12,10 +12,10 @@ private: /* 0x4 */ ResTIMG* mpRes; public: - /* 8031204C */ void loadGX(u16, _GXTexMapID) const; - /* 803121A4 */ void entryNum(u16); - /* 8031221C */ void addResTIMG(u16, ResTIMG const*); - /* 803366A4 */ virtual ~J3DTexture(); + void loadGX(u16, _GXTexMapID) const; + void entryNum(u16); + void addResTIMG(u16, ResTIMG const*); + virtual ~J3DTexture(); u16 getNum() const { return mNum; } ResTIMG* getResTIMG(u16 entry) const { return &mpRes[entry]; } @@ -31,12 +31,12 @@ public: J3DTexMtx(const J3DTexMtxInfo& info) { mTexMtxInfo = info; } - /* 803238C4 */ void load(u32) const; - /* 80323900 */ void calc(f32 const (*)[4]); - /* 80323920 */ void calcTexMtx(f32 const (*)[4]); - /* 80323C0C */ void calcPostTexMtx(f32 const (*)[4]); - /* 80324358 */ void loadTexMtx(u32) const; - /* 803243BC */ void loadPostTexMtx(u32) const; + void load(u32) const; + void calc(f32 const (*)[4]); + void calcTexMtx(f32 const (*)[4]); + void calcPostTexMtx(f32 const (*)[4]); + void loadTexMtx(u32) const; + void loadPostTexMtx(u32) const; J3DTexMtxInfo& getTexMtxInfo() { return mTexMtxInfo; } Mtx& getMtx() { return mMtx; } @@ -51,13 +51,11 @@ struct J3DTexCoordInfo { /* 0x0 */ u8 mTexGenType; /* 0x1 */ u8 mTexGenSrc; /* 0x2 */ u8 mTexGenMtx; - void operator=(J3DTexCoordInfo const& other) { - *(u32*) this = *(u32*)&other; - } }; struct J3DTexCoord : public J3DTexCoordInfo { - /* 8000E464 */ J3DTexCoord(); + J3DTexCoord(); + void setTexCoordInfo(J3DTexCoordInfo *param_1) { *(J3DTexCoordInfo*)this = *param_1; } @@ -69,7 +67,7 @@ struct J3DTexCoord : public J3DTexCoordInfo { mTexMtxReg = mTexGenMtx; } - /* 0x4 */ u16 mTexMtxReg; + /* 0x4 */ u8 mTexMtxReg; }; // Size: 0x6 struct J3DDefaultTexCoordInfo { diff --git a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp index 447d70118..128323b06 100644 --- a/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DAnimation.cpp @@ -12,7 +12,7 @@ void J3DFrameCtrl::init(short) { } /* 802EF608-802EFBA8 .text checkPass__12J3DFrameCtrlFf */ -void J3DFrameCtrl::checkPass(float) { +BOOL J3DFrameCtrl::checkPass(float) { /* Nonmatching */ } @@ -47,12 +47,12 @@ void J3DAnmTextureSRTKey::calcTransform(float, unsigned short, J3DTextureSRTInfo } /* 802F10D4-802F1188 .text getWeight__17J3DAnmClusterFullCFUs */ -void J3DAnmClusterFull::getWeight(unsigned short) const { +f32 J3DAnmClusterFull::getWeight(unsigned short) const { /* Nonmatching */ } /* 802F1188-802F120C .text getWeight__16J3DAnmClusterKeyCFUs */ -void J3DAnmClusterKey::getWeight(unsigned short) const { +f32 J3DAnmClusterKey::getWeight(unsigned short) const { /* Nonmatching */ } @@ -92,7 +92,7 @@ void J3DAnmTexPattern::getTexNo(unsigned short, unsigned short*) const { } /* 802F200C-802F20EC .text getVisibility__20J3DAnmVisibilityFullCFUsPUc */ -void J3DAnmVisibilityFull::getVisibility(unsigned short, unsigned char*) const { +bool J3DAnmVisibilityFull::getVisibility(u16, u8*) const { /* Nonmatching */ } @@ -136,16 +136,6 @@ void J3DAnmTevRegKey::searchUpdateMaterialID(J3DModelData*) { /* Nonmatching */ } -/* 802F2A88-802F2DAC .text J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePs */ -void J3DGetKeyFrameInterpolation(float, J3DAnmKeyTableBase*, short*) { - /* Nonmatching */ -} - -/* 802F2DAC-802F2EF8 .text J3DGetKeyFrameInterpolation__FfP18J3DAnmKeyTableBasePf */ -void J3DGetKeyFrameInterpolation(float, J3DAnmKeyTableBase*, float*) { - /* Nonmatching */ -} - /* 802F2EF8-802F2F7C .text __dt__14J3DAnmColorKeyFv */ J3DAnmColorKey::~J3DAnmColorKey() { /* Nonmatching */ @@ -197,7 +187,7 @@ J3DAnmCluster::~J3DAnmCluster() { } /* 802F3278-802F3280 .text getWeight__13J3DAnmClusterCFUs */ -void J3DAnmCluster::getWeight(unsigned short) const { +f32 J3DAnmCluster::getWeight(unsigned short) const { /* Nonmatching */ } diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp index 3f8a9f477..5e5689140 100644 --- a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp @@ -37,22 +37,22 @@ void J3DMaterialTable::entryTevRegAnimator(J3DAnmTevRegKey*) { } /* 802F61E8-802F6260 .text removeMatColorAnimator__16J3DMaterialTableFP11J3DAnmColor */ -void J3DMaterialTable::removeMatColorAnimator(J3DAnmColor*) { +int J3DMaterialTable::removeMatColorAnimator(J3DAnmColor*) { /* Nonmatching */ } /* 802F6260-802F62F4 .text removeTexNoAnimator__16J3DMaterialTableFP16J3DAnmTexPattern */ -void J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern*) { +int J3DMaterialTable::removeTexNoAnimator(J3DAnmTexPattern*) { /* Nonmatching */ } /* 802F62F4-802F6398 .text removeTexMtxAnimator__16J3DMaterialTableFP19J3DAnmTextureSRTKey */ -void J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey*) { +int J3DMaterialTable::removeTexMtxAnimator(J3DAnmTextureSRTKey*) { /* Nonmatching */ } /* 802F6398-802F64B8 .text removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey */ -void J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey*) { +int J3DMaterialTable::removeTevRegAnimator(J3DAnmTevRegKey*) { /* Nonmatching */ } diff --git a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp index 24d02f514..b057620ca 100644 --- a/src/JSystem/J3DGraphBase/J3DMatBlock.cpp +++ b/src/JSystem/J3DGraphBase/J3DMatBlock.cpp @@ -6,19 +6,40 @@ #include "JSystem/J3DGraphBase/J3DMatBlock.h" #include "dolphin/types.h" +extern "C" extern const GXColor j3dDefaultColInfo; +extern "C" extern const GXColor j3dDefaultAmbInfo; + /* 802DF794-802DF7E4 .text initialize__21J3DColorBlockLightOffFv */ void J3DColorBlockLightOff::initialize() { - /* Nonmatching */ + mColorChanNum = 0; + for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) + mMatColor[i] = j3dDefaultColInfo; + mMatColorOffset = 0; + mColorChanOffset = 0; } /* 802DF7E4-802DF870 .text initialize__22J3DColorBlockAmbientOnFv */ void J3DColorBlockAmbientOn::initialize() { - /* Nonmatching */ + mColorChanNum = 0; + for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) + mMatColor[i] = j3dDefaultColInfo; + for (u32 i = 0; i < ARRAY_SIZE(mAmbColor); i++) + mAmbColor[i] = j3dDefaultAmbInfo; + mMatColorOffset = 0; + mColorChanOffset = 0; } /* 802DF870-802DF91C .text initialize__20J3DColorBlockLightOnFv */ void J3DColorBlockLightOn::initialize() { - /* Nonmatching */ + mColorChanNum = 0; + for (u32 i = 0; i < ARRAY_SIZE(mMatColor); i++) + mMatColor[i] = j3dDefaultColInfo; + for (u32 i = 0; i < ARRAY_SIZE(mAmbColor); i++) + mAmbColor[i] = j3dDefaultAmbInfo; + for (u32 i = 0; i < ARRAY_SIZE(mLight); i++) + mLight[i] = NULL; + mMatColorOffset = 0; + mColorChanOffset = 0; } /* 802DF91C-802DF94C .text initialize__21J3DTexGenBlockPatchedFv */ @@ -82,88 +103,88 @@ void J3DPEBlockFull::initialize() { } /* 802DFE50-802DFE58 .text countDLSize__21J3DColorBlockLightOffFv */ -void J3DColorBlockLightOff::countDLSize() { - /* Nonmatching */ +s32 J3DColorBlockLightOff::countDLSize() { + return 0x22; } /* 802DFE58-802DFE60 .text countDLSize__22J3DColorBlockAmbientOnFv */ -void J3DColorBlockAmbientOn::countDLSize() { - /* Nonmatching */ +s32 J3DColorBlockAmbientOn::countDLSize() { + return 0x2f; } /* 802DFE60-802DFE68 .text countDLSize__20J3DColorBlockLightOnFv */ -void J3DColorBlockLightOn::countDLSize() { - /* Nonmatching */ +s32 J3DColorBlockLightOn::countDLSize() { + return 0x26f; } /* 802DFE68-802DFE70 .text countDLSize__21J3DTexGenBlockPatchedFv */ -void J3DTexGenBlockPatched::countDLSize() { - /* Nonmatching */ +s32 J3DTexGenBlockPatched::countDLSize() { + return 0x1a8; } /* 802DFE70-802DFE78 .text countDLSize__15J3DTexGenBlock4Fv */ -void J3DTexGenBlock4::countDLSize() { - /* Nonmatching */ +s32 J3DTexGenBlock4::countDLSize() { + return 0xfe; } /* 802DFE78-802DFE80 .text countDLSize__19J3DTexGenBlockBasicFv */ -void J3DTexGenBlockBasic::countDLSize() { - /* Nonmatching */ +s32 J3DTexGenBlockBasic::countDLSize() { + return 0x1f2; } /* 802DFE80-802DFE88 .text countDLSize__18J3DTevBlockPatchedFv */ -void J3DTevBlockPatched::countDLSize() { - /* Nonmatching */ +s32 J3DTevBlockPatched::countDLSize() { + return 0x230; } /* 802DFE88-802DFE90 .text countDLSize__12J3DTevBlock1Fv */ -void J3DTevBlock1::countDLSize() { - /* Nonmatching */ +s32 J3DTevBlock1::countDLSize() { + return 0x69; } /* 802DFE90-802DFE98 .text countDLSize__12J3DTevBlock2Fv */ -void J3DTevBlock2::countDLSize() { - /* Nonmatching */ +s32 J3DTevBlock2::countDLSize() { + return 0x14f; } /* 802DFE98-802DFEA0 .text countDLSize__12J3DTevBlock4Fv */ -void J3DTevBlock4::countDLSize() { - /* Nonmatching */ +s32 J3DTevBlock4::countDLSize() { + return 0x244; } /* 802DFEA0-802DFEA8 .text countDLSize__13J3DTevBlock16Fv */ -void J3DTevBlock16::countDLSize() { - /* Nonmatching */ +s32 J3DTevBlock16::countDLSize() { + return 0x3e8; } /* 802DFEA8-802DFEB0 .text countDLSize__15J3DIndBlockFullFv */ -void J3DIndBlockFull::countDLSize() { - /* Nonmatching */ +s32 J3DIndBlockFull::countDLSize() { + return 0x8c; } /* 802DFEB0-802DFEB8 .text countDLSize__13J3DPEBlockOpaFv */ -void J3DPEBlockOpa::countDLSize() { - /* Nonmatching */ +s32 J3DPEBlockOpa::countDLSize() { + return 0x1e; } /* 802DFEB8-802DFEC0 .text countDLSize__17J3DPEBlockTexEdgeFv */ -void J3DPEBlockTexEdge::countDLSize() { - /* Nonmatching */ +s32 J3DPEBlockTexEdge::countDLSize() { + return 0x1e; } /* 802DFEC0-802DFEC8 .text countDLSize__13J3DPEBlockXluFv */ -void J3DPEBlockXlu::countDLSize() { - /* Nonmatching */ +s32 J3DPEBlockXlu::countDLSize() { + return 0x1e; } /* 802DFEC8-802DFED0 .text countDLSize__16J3DPEBlockFogOffFv */ -void J3DPEBlockFogOff::countDLSize() { - /* Nonmatching */ +s32 J3DPEBlockFogOff::countDLSize() { + return 0x1e; } /* 802DFED0-802DFED8 .text countDLSize__14J3DPEBlockFullFv */ -void J3DPEBlockFull::countDLSize() { - /* Nonmatching */ +s32 J3DPEBlockFull::countDLSize() { + return 0x55; } /* 802DFED8-802E0438 .text load__21J3DColorBlockLightOffFv */ @@ -212,7 +233,7 @@ void J3DColorBlockLightOn::patchLight() { } /* 802E1E18-802E1E80 .text diff__21J3DColorBlockLightOffFUl */ -void J3DColorBlockLightOff::diff(unsigned long) { +void J3DColorBlockLightOff::diff(u32 i) { /* Nonmatching */ } @@ -227,7 +248,7 @@ void J3DColorBlockLightOff::diffLight() { } /* 802E2408-802E2478 .text diff__20J3DColorBlockLightOnFUl */ -void J3DColorBlockLightOn::diff(unsigned long) { +void J3DColorBlockLightOn::diff(u32 i) { /* Nonmatching */ } @@ -267,7 +288,7 @@ void J3DTexGenBlockBasic::patch() { } /* 802E2D28-802E2D90 .text diff__21J3DTexGenBlockPatchedFUl */ -void J3DTexGenBlockPatched::diff(unsigned long) { +void J3DTexGenBlockPatched::diff(u32 i) { /* Nonmatching */ } @@ -328,7 +349,6 @@ void J3DTevBlock1::patchTexNo() { /* 802E4450-802E4454 .text patchTevReg__12J3DTevBlock1Fv */ void J3DTevBlock1::patchTevReg() { - /* Nonmatching */ } /* 802E4454-802E4538 .text patchTexNoAndTexCoordScale__12J3DTevBlock1Fv */ @@ -402,7 +422,7 @@ void J3DTevBlock16::patch() { } /* 802E4EB0-802E4F6C .text diff__11J3DTevBlockFUl */ -void J3DTevBlock::diff(unsigned long) { +void J3DTevBlock::diff(u32 i) { /* Nonmatching */ } @@ -542,7 +562,7 @@ void J3DTevBlockPatched::ptrToIndex() { } /* 802E6204-802E6298 .text indexToPtr_private__11J3DTevBlockFUl */ -void J3DTevBlock::indexToPtr_private(unsigned long) { +void J3DTevBlock::indexToPtr_private(u32 i) { /* Nonmatching */ } @@ -552,7 +572,7 @@ void J3DIndBlockFull::load() { } /* 802E6494-802E657C .text diff__15J3DIndBlockFullFUl */ -void J3DIndBlockFull::diff(unsigned long) { +void J3DIndBlockFull::diff(u32 i) { /* Nonmatching */ } @@ -602,7 +622,7 @@ void J3DPEBlockFull::diffBlend() { } /* 802E7E44-802E7EAC .text diff__14J3DPEBlockFullFUl */ -void J3DPEBlockFull::diff(unsigned long) { +void J3DPEBlockFull::diff(u32 i) { /* Nonmatching */ } @@ -677,143 +697,138 @@ void J3DPEBlockFull::reset(J3DPEBlock*) { } /* 802E96C8-802E9920 .text calc__21J3DTexGenBlockPatchedFPA4_Cf */ -void J3DTexGenBlockPatched::calc(const float(*)[4]) { +void J3DTexGenBlockPatched::calc(const Mtx) { /* Nonmatching */ } /* 802E9920-802E9984 .text load__9J3DTexMtxCFUl */ -void J3DTexMtx::load(unsigned long) const { +void J3DTexMtx::load(u32 i) const { /* Nonmatching */ } /* 802E9984-802E9F04 .text J3DGDLoadTexMtxImm__FPA4_fUl13_GXTexMtxType */ -void J3DGDLoadTexMtxImm(float(*)[4], unsigned long, _GXTexMtxType) { +void J3DGDLoadTexMtxImm(Mtx pMtx, u32 i, GXTexMtxType) { /* Nonmatching */ } /* 802E9F04-802E9F08 .text diffTevReg__11J3DTevBlockFv */ void J3DTevBlock::diffTevReg() { - /* Nonmatching */ } /* 802E9F08-802E9F0C .text diffTevStageIndirect__11J3DTevBlockFv */ void J3DTevBlock::diffTevStageIndirect() { - /* Nonmatching */ } /* 802E9F0C-802E9F10 .text diffTevStage__11J3DTevBlockFv */ void J3DTevBlock::diffTevStage() { - /* Nonmatching */ } /* 802E9F10-802E9F14 .text diffTexCoordScale__11J3DTevBlockFv */ void J3DTevBlock::diffTexCoordScale() { - /* Nonmatching */ } /* 802E9F14-802E9F18 .text diffTexNo__11J3DTevBlockFv */ void J3DTevBlock::diffTexNo() { - /* Nonmatching */ } /* 802E9F18-802E9F24 .text getType__14J3DPEBlockFullFv */ -void J3DPEBlockFull::getType() { - /* Nonmatching */ +u32 J3DPEBlockFull::getType() { + return 'PEFL'; } /* 802E9F24-802E9F2C .text setFog__14J3DPEBlockFullFP6J3DFog */ -void J3DPEBlockFull::setFog(J3DFog*) { - /* Nonmatching */ +void J3DPEBlockFull::setFog(J3DFog* pFog) { + mFog = pFog; } /* 802E9F2C-802E9F34 .text getFog__14J3DPEBlockFullFv */ -void J3DPEBlockFull::getFog() { - /* Nonmatching */ +J3DFog * J3DPEBlockFull::getFog() { + return mFog; } /* 802E9F34-802E9F50 .text setAlphaComp__14J3DPEBlockFullF12J3DAlphaComp */ -void J3DPEBlockFull::setAlphaComp(J3DAlphaComp) { - /* Nonmatching */ +void J3DPEBlockFull::setAlphaComp(J3DAlphaComp alphaComp) { + mAlphaComp = alphaComp; } /* 802E9F50-802E9F6C .text setAlphaComp__14J3DPEBlockFullFPC12J3DAlphaComp */ -void J3DPEBlockFull::setAlphaComp(const J3DAlphaComp*) { - /* Nonmatching */ +void J3DPEBlockFull::setAlphaComp(const J3DAlphaComp* pAlphaComp) { + mAlphaComp = *pAlphaComp; } /* 802E9F6C-802E9F74 .text getAlphaComp__14J3DPEBlockFullFv */ -void J3DPEBlockFull::getAlphaComp() { - /* Nonmatching */ +J3DAlphaComp * J3DPEBlockFull::getAlphaComp() { + return &mAlphaComp; } /* 802E9F74-802E9F98 .text setBlend__14J3DPEBlockFullF8J3DBlend */ -void J3DPEBlockFull::setBlend(J3DBlend) { - /* Nonmatching */ +void J3DPEBlockFull::setBlend(J3DBlend blend) { + mBlend = blend; } /* 802E9F98-802E9FBC .text setBlend__14J3DPEBlockFullFPC8J3DBlend */ -void J3DPEBlockFull::setBlend(const J3DBlend*) { - /* Nonmatching */ +void J3DPEBlockFull::setBlend(const J3DBlend* pBlend) { + mBlend = *pBlend; } /* 802E9FBC-802E9FC4 .text getBlend__14J3DPEBlockFullFv */ -void J3DPEBlockFull::getBlend() { - /* Nonmatching */ +J3DBlend * J3DPEBlockFull::getBlend() { + return &mBlend; } /* 802E9FC4-802E9FD0 .text setZMode__14J3DPEBlockFullF8J3DZMode */ -void J3DPEBlockFull::setZMode(J3DZMode) { - /* Nonmatching */ +void J3DPEBlockFull::setZMode(J3DZMode zMode) { + mZMode = zMode; } /* 802E9FD0-802E9FDC .text setZMode__14J3DPEBlockFullFPC8J3DZMode */ -void J3DPEBlockFull::setZMode(const J3DZMode*) { - /* Nonmatching */ +void J3DPEBlockFull::setZMode(const J3DZMode* pZMode) { + mZMode = *pZMode; } /* 802E9FDC-802E9FE4 .text getZMode__14J3DPEBlockFullFv */ -void J3DPEBlockFull::getZMode() { - /* Nonmatching */ +J3DZMode * J3DPEBlockFull::getZMode() { + return &mZMode; } /* 802E9FE4-802E9FEC .text setZCompLoc__14J3DPEBlockFullFUc */ -void J3DPEBlockFull::setZCompLoc(unsigned char) { - /* Nonmatching */ +void J3DPEBlockFull::setZCompLoc(u8 zCompLoc) { + mZCompLoc = zCompLoc; } /* 802E9FEC-802E9FF8 .text setZCompLoc__14J3DPEBlockFullFPCUc */ -void J3DPEBlockFull::setZCompLoc(const unsigned char*) { - /* Nonmatching */ +void J3DPEBlockFull::setZCompLoc(const u8* pZCompLoc) { + mZCompLoc = *pZCompLoc; } /* 802E9FF8-802EA000 .text getZCompLoc__14J3DPEBlockFullCFv */ -void J3DPEBlockFull::getZCompLoc() const { - /* Nonmatching */ +u8 J3DPEBlockFull::getZCompLoc() const { + return mZCompLoc; } /* 802EA000-802EA008 .text setDither__14J3DPEBlockFullFUc */ -void J3DPEBlockFull::setDither(unsigned char) { - /* Nonmatching */ +void J3DPEBlockFull::setDither(u8 dither) { + mDither = dither; } /* 802EA008-802EA014 .text setDither__14J3DPEBlockFullFPCUc */ -void J3DPEBlockFull::setDither(const unsigned char*) { - /* Nonmatching */ +void J3DPEBlockFull::setDither(const u8* pDither) { + mDither = *pDither; } /* 802EA014-802EA01C .text getDither__14J3DPEBlockFullCFv */ -void J3DPEBlockFull::getDither() const { - /* Nonmatching */ +u8 J3DPEBlockFull::getDither() const { + return mDither; } /* 802EA01C-802EA024 .text getFogOffset__14J3DPEBlockFullCFv */ -void J3DPEBlockFull::getFogOffset() const { - /* Nonmatching */ +u32 J3DPEBlockFull::getFogOffset() const { + return mFogOffset; } /* 802EA024-802EA02C .text setFogOffset__14J3DPEBlockFullFUl */ -void J3DPEBlockFull::setFogOffset(unsigned long) { - /* Nonmatching */ +void J3DPEBlockFull::setFogOffset(u32 offs) { + mFogOffset = offs; } /* 802EA02C-802EA088 .text __dt__14J3DPEBlockFullFv */ @@ -822,88 +837,88 @@ J3DPEBlockFull::~J3DPEBlockFull() { } /* 802EA088-802EA0BC .text diff__16J3DPEBlockFogOffFUl */ -void J3DPEBlockFogOff::diff(unsigned long) { +void J3DPEBlockFogOff::diff(u32 i) { /* Nonmatching */ } /* 802EA0BC-802EA0C8 .text getType__16J3DPEBlockFogOffFv */ -void J3DPEBlockFogOff::getType() { - /* Nonmatching */ +u32 J3DPEBlockFogOff::getType() { + return 'PEFG'; } /* 802EA0C8-802EA0E4 .text setAlphaComp__16J3DPEBlockFogOffF12J3DAlphaComp */ -void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp) { - /* Nonmatching */ +void J3DPEBlockFogOff::setAlphaComp(J3DAlphaComp alphaComp) { + mAlphaComp = alphaComp; } /* 802EA0E4-802EA100 .text setAlphaComp__16J3DPEBlockFogOffFPC12J3DAlphaComp */ -void J3DPEBlockFogOff::setAlphaComp(const J3DAlphaComp*) { - /* Nonmatching */ +void J3DPEBlockFogOff::setAlphaComp(const J3DAlphaComp* pAlphaComp) { + mAlphaComp = *pAlphaComp; } /* 802EA100-802EA108 .text getAlphaComp__16J3DPEBlockFogOffFv */ -void J3DPEBlockFogOff::getAlphaComp() { - /* Nonmatching */ +J3DAlphaComp * J3DPEBlockFogOff::getAlphaComp() { + return &mAlphaComp; } /* 802EA108-802EA12C .text setBlend__16J3DPEBlockFogOffF8J3DBlend */ -void J3DPEBlockFogOff::setBlend(J3DBlend) { - /* Nonmatching */ +void J3DPEBlockFogOff::setBlend(J3DBlend blend) { + mBlend = blend; } /* 802EA12C-802EA150 .text setBlend__16J3DPEBlockFogOffFPC8J3DBlend */ -void J3DPEBlockFogOff::setBlend(const J3DBlend*) { - /* Nonmatching */ +void J3DPEBlockFogOff::setBlend(const J3DBlend* pBlend) { + mBlend = *pBlend; } /* 802EA150-802EA158 .text getBlend__16J3DPEBlockFogOffFv */ -void J3DPEBlockFogOff::getBlend() { - /* Nonmatching */ +J3DBlend * J3DPEBlockFogOff::getBlend() { + return &mBlend; } /* 802EA158-802EA164 .text setZMode__16J3DPEBlockFogOffF8J3DZMode */ -void J3DPEBlockFogOff::setZMode(J3DZMode) { - /* Nonmatching */ +void J3DPEBlockFogOff::setZMode(J3DZMode zMode) { + mZMode = zMode; } /* 802EA164-802EA170 .text setZMode__16J3DPEBlockFogOffFPC8J3DZMode */ -void J3DPEBlockFogOff::setZMode(const J3DZMode*) { - /* Nonmatching */ +void J3DPEBlockFogOff::setZMode(const J3DZMode* pZMode) { + mZMode = *pZMode; } /* 802EA170-802EA178 .text getZMode__16J3DPEBlockFogOffFv */ -void J3DPEBlockFogOff::getZMode() { - /* Nonmatching */ +J3DZMode * J3DPEBlockFogOff::getZMode() { + return &mZMode; } /* 802EA178-802EA180 .text setZCompLoc__16J3DPEBlockFogOffFUc */ -void J3DPEBlockFogOff::setZCompLoc(unsigned char) { - /* Nonmatching */ +void J3DPEBlockFogOff::setZCompLoc(u8 zCompLoc) { + mZCompLoc = zCompLoc; } /* 802EA180-802EA18C .text setZCompLoc__16J3DPEBlockFogOffFPCUc */ -void J3DPEBlockFogOff::setZCompLoc(const unsigned char*) { - /* Nonmatching */ +void J3DPEBlockFogOff::setZCompLoc(const u8* pZCompLoc) { + mZCompLoc = *pZCompLoc; } /* 802EA18C-802EA194 .text getZCompLoc__16J3DPEBlockFogOffCFv */ -void J3DPEBlockFogOff::getZCompLoc() const { - /* Nonmatching */ +u8 J3DPEBlockFogOff::getZCompLoc() const { + return mZCompLoc; } /* 802EA194-802EA19C .text setDither__16J3DPEBlockFogOffFUc */ -void J3DPEBlockFogOff::setDither(unsigned char) { - /* Nonmatching */ +void J3DPEBlockFogOff::setDither(u8 dither) { + mDither = dither; } /* 802EA19C-802EA1A8 .text setDither__16J3DPEBlockFogOffFPCUc */ -void J3DPEBlockFogOff::setDither(const unsigned char*) { - /* Nonmatching */ +void J3DPEBlockFogOff::setDither(const u8* pDither) { + mDither = *pDither; } /* 802EA1A8-802EA1B0 .text getDither__16J3DPEBlockFogOffCFv */ -void J3DPEBlockFogOff::getDither() const { - /* Nonmatching */ +u8 J3DPEBlockFogOff::getDither() const { + return mDither; } /* 802EA1B0-802EA20C .text __dt__16J3DPEBlockFogOffFv */ @@ -913,187 +928,187 @@ J3DPEBlockFogOff::~J3DPEBlockFogOff() { /* 802EA20C-802EA230 .text indexToPtr__13J3DTevBlock16Fv */ void J3DTevBlock16::indexToPtr() { - /* Nonmatching */ + return indexToPtr_private(mTexNoOffset); } /* 802EA230-802EA23C .text getType__13J3DTevBlock16Fv */ -void J3DTevBlock16::getType() { - /* Nonmatching */ +u32 J3DTevBlock16::getType() { + return 'TV16'; } /* 802EA23C-802EA24C .text setTexNo__13J3DTevBlock16FUlUs */ -void J3DTevBlock16::setTexNo(unsigned long, unsigned short) { - /* Nonmatching */ +void J3DTevBlock16::setTexNo(u32 i, u16 no) { + mTexNo[i] = no; } /* 802EA24C-802EA260 .text setTexNo__13J3DTevBlock16FUlPCUs */ -void J3DTevBlock16::setTexNo(unsigned long, const unsigned short*) { - /* Nonmatching */ +void J3DTevBlock16::setTexNo(u32 i, const u16* pNo) { + mTexNo[i] = *pNo; } /* 802EA260-802EA270 .text getTexNo__13J3DTevBlock16CFUl */ -void J3DTevBlock16::getTexNo(unsigned long) const { - /* Nonmatching */ +u16 J3DTevBlock16::getTexNo(u32 i) const { + return mTexNo[i]; } /* 802EA270-802EA294 .text setTevOrder__13J3DTevBlock16FUl11J3DTevOrder */ -void J3DTevBlock16::setTevOrder(unsigned long, J3DTevOrder) { - /* Nonmatching */ +void J3DTevBlock16::setTevOrder(u32 i, J3DTevOrder order) { + mTevOrder[i] = order; } /* 802EA294-802EA2B8 .text setTevOrder__13J3DTevBlock16FUlPC11J3DTevOrder */ -void J3DTevBlock16::setTevOrder(unsigned long, const J3DTevOrder*) { - /* Nonmatching */ +void J3DTevBlock16::setTevOrder(u32 i, const J3DTevOrder* pOrder) { + mTevOrder[i] = *pOrder; } /* 802EA2B8-802EA2CC .text getTevOrder__13J3DTevBlock16FUl */ -void J3DTevBlock16::getTevOrder(unsigned long) { - /* Nonmatching */ +J3DTevOrder * J3DTevBlock16::getTevOrder(u32 i) { + return &mTevOrder[i]; } /* 802EA2CC-802EA2F8 .text setTevColor__13J3DTevBlock16FUl13J3DGXColorS10 */ -void J3DTevBlock16::setTevColor(unsigned long, J3DGXColorS10) { - /* Nonmatching */ +void J3DTevBlock16::setTevColor(u32 i, J3DGXColorS10 color) { + mTevColor[i] = color; } /* 802EA2F8-802EA324 .text setTevColor__13J3DTevBlock16FUlPC13J3DGXColorS10 */ -void J3DTevBlock16::setTevColor(unsigned long, const J3DGXColorS10*) { - /* Nonmatching */ +void J3DTevBlock16::setTevColor(u32 i, const J3DGXColorS10* pColor) { + mTevColor[i] = *pColor; } /* 802EA324-802EA338 .text getTevColor__13J3DTevBlock16FUl */ -void J3DTevBlock16::getTevColor(unsigned long) { - /* Nonmatching */ +GXColorS10 * J3DTevBlock16::getTevColor(u32 i) { + return &mTevColor[i]; } /* 802EA338-802EA364 .text setTevKColor__13J3DTevBlock16FUl10J3DGXColor */ -void J3DTevBlock16::setTevKColor(unsigned long, J3DGXColor) { - /* Nonmatching */ +void J3DTevBlock16::setTevKColor(u32 i, J3DGXColor color) { + mTevKColor[i] = color; } /* 802EA364-802EA390 .text setTevKColor__13J3DTevBlock16FUlPC10J3DGXColor */ -void J3DTevBlock16::setTevKColor(unsigned long, const J3DGXColor*) { - /* Nonmatching */ +void J3DTevBlock16::setTevKColor(u32 i, const J3DGXColor* pColor) { + mTevKColor[i] = *pColor; } /* 802EA390-802EA3A4 .text getTevKColor__13J3DTevBlock16FUl */ -void J3DTevBlock16::getTevKColor(unsigned long) { - /* Nonmatching */ +GXColor * J3DTevBlock16::getTevKColor(u32 i) { + return &mTevKColor[i]; } /* 802EA3A4-802EA3B0 .text setTevKColorSel__13J3DTevBlock16FUlUc */ -void J3DTevBlock16::setTevKColorSel(unsigned long, unsigned char) { - /* Nonmatching */ +void J3DTevBlock16::setTevKColorSel(u32 i, u8 num) { + mTevKColorSel[i] = num; } /* 802EA3B0-802EA3C0 .text setTevKColorSel__13J3DTevBlock16FUlPCUc */ -void J3DTevBlock16::setTevKColorSel(unsigned long, const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock16::setTevKColorSel(u32 i, const u8* pNum) { + mTevKColorSel[i] = *pNum; } /* 802EA3C0-802EA3CC .text getTevKColorSel__13J3DTevBlock16FUl */ -void J3DTevBlock16::getTevKColorSel(unsigned long) { - /* Nonmatching */ +u8 J3DTevBlock16::getTevKColorSel(u32 i) { + return mTevKAlphaSel[i]; } /* 802EA3CC-802EA3D8 .text setTevKAlphaSel__13J3DTevBlock16FUlUc */ -void J3DTevBlock16::setTevKAlphaSel(unsigned long, unsigned char) { - /* Nonmatching */ +void J3DTevBlock16::setTevKAlphaSel(u32 i, u8 num) { + mTevKAlphaSel[i] = num; } /* 802EA3D8-802EA3E8 .text setTevKAlphaSel__13J3DTevBlock16FUlPCUc */ -void J3DTevBlock16::setTevKAlphaSel(unsigned long, const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock16::setTevKAlphaSel(u32 i, const u8* pNum) { + mTevKAlphaSel[i] = *pNum; } /* 802EA3E8-802EA3F4 .text getTevKAlphaSel__13J3DTevBlock16FUl */ -void J3DTevBlock16::getTevKAlphaSel(unsigned long) { - /* Nonmatching */ +u8 J3DTevBlock16::getTevKAlphaSel(u32 i) { + return mTevKAlphaSel[i]; } /* 802EA3F4-802EA3FC .text setTevStageNum__13J3DTevBlock16FUc */ -void J3DTevBlock16::setTevStageNum(unsigned char) { - /* Nonmatching */ +void J3DTevBlock16::setTevStageNum(u8 num) { + mTevStageNum = num; } /* 802EA3FC-802EA408 .text setTevStageNum__13J3DTevBlock16FPCUc */ -void J3DTevBlock16::setTevStageNum(const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock16::setTevStageNum(const u8* pNum) { + mTevStageNum = *pNum; } /* 802EA408-802EA410 .text getTevStageNum__13J3DTevBlock16CFv */ -void J3DTevBlock16::getTevStageNum() const { +u8 J3DTevBlock16::getTevStageNum() const { /* Nonmatching */ } /* 802EA410-802EA44C .text setTevStage__13J3DTevBlock16FUl11J3DTevStage */ -void J3DTevBlock16::setTevStage(unsigned long, J3DTevStage) { +void J3DTevBlock16::setTevStage(u32 i, J3DTevStage stage) { /* Nonmatching */ } /* 802EA44C-802EA488 .text setTevStage__13J3DTevBlock16FUlPC11J3DTevStage */ -void J3DTevBlock16::setTevStage(unsigned long, const J3DTevStage*) { +void J3DTevBlock16::setTevStage(u32 i, const J3DTevStage* pStage) { /* Nonmatching */ } /* 802EA488-802EA49C .text getTevStage__13J3DTevBlock16FUl */ -void J3DTevBlock16::getTevStage(unsigned long) { +J3DTevStage * J3DTevBlock16::getTevStage(u32 i) { /* Nonmatching */ } /* 802EA49C-802EA4D4 .text setTevSwapModeInfo__13J3DTevBlock16FUl18J3DTevSwapModeInfo */ -void J3DTevBlock16::setTevSwapModeInfo(unsigned long, J3DTevSwapModeInfo) { +void J3DTevBlock16::setTevSwapModeInfo(u32 i, J3DTevSwapModeInfo) { /* Nonmatching */ } /* 802EA4D4-802EA50C .text setTevSwapModeInfo__13J3DTevBlock16FUlPC18J3DTevSwapModeInfo */ -void J3DTevBlock16::setTevSwapModeInfo(unsigned long, const J3DTevSwapModeInfo*) { +void J3DTevBlock16::setTevSwapModeInfo(u32 i, const J3DTevSwapModeInfo*) { /* Nonmatching */ } /* 802EA50C-802EA51C .text setTevSwapModeTable__13J3DTevBlock16FUl19J3DTevSwapModeTable */ -void J3DTevBlock16::setTevSwapModeTable(unsigned long, J3DTevSwapModeTable) { +void J3DTevBlock16::setTevSwapModeTable(u32 i, J3DTevSwapModeTable table) { /* Nonmatching */ } /* 802EA51C-802EA52C .text setTevSwapModeTable__13J3DTevBlock16FUlPC19J3DTevSwapModeTable */ -void J3DTevBlock16::setTevSwapModeTable(unsigned long, const J3DTevSwapModeTable*) { +void J3DTevBlock16::setTevSwapModeTable(u32 i, const J3DTevSwapModeTable* pTable) { /* Nonmatching */ } /* 802EA52C-802EA53C .text getTevSwapModeTable__13J3DTevBlock16FUl */ -void J3DTevBlock16::getTevSwapModeTable(unsigned long) { +J3DTevSwapModeTable * J3DTevBlock16::getTevSwapModeTable(u32 i) { /* Nonmatching */ } /* 802EA53C-802EA550 .text setIndTevStage__13J3DTevBlock16FUl14J3DIndTevStage */ -void J3DTevBlock16::setIndTevStage(unsigned long, J3DIndTevStage) { - /* Nonmatching */ +void J3DTevBlock16::setIndTevStage(u32 i, J3DIndTevStage stage) { + mIndTevStage[i] = stage; } /* 802EA550-802EA564 .text setIndTevStage__13J3DTevBlock16FUlPC14J3DIndTevStage */ -void J3DTevBlock16::setIndTevStage(unsigned long, const J3DIndTevStage*) { - /* Nonmatching */ +void J3DTevBlock16::setIndTevStage(u32 i, const J3DIndTevStage* pStage) { + mIndTevStage[i] = *pStage; } /* 802EA564-802EA578 .text getIndTevStage__13J3DTevBlock16FUl */ -void J3DTevBlock16::getIndTevStage(unsigned long) { +J3DIndTevStage * J3DTevBlock16::getIndTevStage(u32 i) { /* Nonmatching */ } /* 802EA578-802EA580 .text getTexNoOffset__13J3DTevBlock16CFv */ -void J3DTevBlock16::getTexNoOffset() const { +u32 J3DTevBlock16::getTexNoOffset() const { /* Nonmatching */ } /* 802EA580-802EA588 .text getTevRegOffset__13J3DTevBlock16CFv */ -void J3DTevBlock16::getTevRegOffset() const { - /* Nonmatching */ +u32 J3DTevBlock16::getTevRegOffset() const { + return mTevRegOffset; } /* 802EA588-802EA590 .text setTevRegOffset__13J3DTevBlock16FUl */ -void J3DTevBlock16::setTevRegOffset(unsigned long) { - /* Nonmatching */ +void J3DTevBlock16::setTevRegOffset(u32 offs) { + mTevRegOffset = offs; } /* 802EA590-802EA5EC .text __dt__13J3DTevBlock16Fv */ @@ -1102,7 +1117,7 @@ J3DTevBlock16::~J3DTevBlock16() { } /* 802EA5EC-802EA5F4 .text setTexNoOffset__11J3DTevBlockFUl */ -void J3DTevBlock::setTexNoOffset(unsigned long) { +void J3DTevBlock::setTexNoOffset(u32 i) { /* Nonmatching */ } @@ -1113,187 +1128,187 @@ void J3DTevBlock4::ptrToIndex() { /* 802EA5F8-802EA61C .text indexToPtr__12J3DTevBlock4Fv */ void J3DTevBlock4::indexToPtr() { - /* Nonmatching */ + return indexToPtr_private(mTexNoOffset); } /* 802EA61C-802EA628 .text getType__12J3DTevBlock4Fv */ -void J3DTevBlock4::getType() { +u32 J3DTevBlock4::getType() { /* Nonmatching */ } /* 802EA628-802EA638 .text setTexNo__12J3DTevBlock4FUlUs */ -void J3DTevBlock4::setTexNo(unsigned long, unsigned short) { - /* Nonmatching */ +void J3DTevBlock4::setTexNo(u32 i, u16 no) { + mTexNo[i] = no; } /* 802EA638-802EA64C .text setTexNo__12J3DTevBlock4FUlPCUs */ -void J3DTevBlock4::setTexNo(unsigned long, const unsigned short*) { - /* Nonmatching */ +void J3DTevBlock4::setTexNo(u32 i, const u16* pNo) { + mTexNo[i] = *pNo; } /* 802EA64C-802EA65C .text getTexNo__12J3DTevBlock4CFUl */ -void J3DTevBlock4::getTexNo(unsigned long) const { - /* Nonmatching */ +u16 J3DTevBlock4::getTexNo(u32 i) const { + return mTexNo[i]; } /* 802EA65C-802EA680 .text setTevOrder__12J3DTevBlock4FUl11J3DTevOrder */ -void J3DTevBlock4::setTevOrder(unsigned long, J3DTevOrder) { - /* Nonmatching */ +void J3DTevBlock4::setTevOrder(u32 i, J3DTevOrder order) { + mTevOrder[i] = order; } /* 802EA680-802EA6A4 .text setTevOrder__12J3DTevBlock4FUlPC11J3DTevOrder */ -void J3DTevBlock4::setTevOrder(unsigned long, const J3DTevOrder*) { - /* Nonmatching */ +void J3DTevBlock4::setTevOrder(u32 i, const J3DTevOrder* pOrder) { + mTevOrder[i] = *pOrder; } /* 802EA6A4-802EA6B8 .text getTevOrder__12J3DTevBlock4FUl */ -void J3DTevBlock4::getTevOrder(unsigned long) { - /* Nonmatching */ +J3DTevOrder * J3DTevBlock4::getTevOrder(u32 i) { + return &mTevOrder[i]; } /* 802EA6B8-802EA6E4 .text setTevColor__12J3DTevBlock4FUl13J3DGXColorS10 */ -void J3DTevBlock4::setTevColor(unsigned long, J3DGXColorS10) { - /* Nonmatching */ +void J3DTevBlock4::setTevColor(u32 i, J3DGXColorS10 color) { + mTevColor[i] = color; } /* 802EA6E4-802EA710 .text setTevColor__12J3DTevBlock4FUlPC13J3DGXColorS10 */ -void J3DTevBlock4::setTevColor(unsigned long, const J3DGXColorS10*) { - /* Nonmatching */ +void J3DTevBlock4::setTevColor(u32 i, const J3DGXColorS10* pColor) { + mTevColor[i] = *pColor; } /* 802EA710-802EA724 .text getTevColor__12J3DTevBlock4FUl */ -void J3DTevBlock4::getTevColor(unsigned long) { - /* Nonmatching */ +GXColorS10 * J3DTevBlock4::getTevColor(u32 i) { + return &mTevColor[i]; } /* 802EA724-802EA750 .text setTevKColor__12J3DTevBlock4FUl10J3DGXColor */ -void J3DTevBlock4::setTevKColor(unsigned long, J3DGXColor) { - /* Nonmatching */ +void J3DTevBlock4::setTevKColor(u32 i, J3DGXColor color) { + mTevKColor[i] = color; } /* 802EA750-802EA77C .text setTevKColor__12J3DTevBlock4FUlPC10J3DGXColor */ -void J3DTevBlock4::setTevKColor(unsigned long, const J3DGXColor*) { - /* Nonmatching */ +void J3DTevBlock4::setTevKColor(u32 i, const J3DGXColor* pColor) { + mTevKColor[i] = *pColor; } /* 802EA77C-802EA790 .text getTevKColor__12J3DTevBlock4FUl */ -void J3DTevBlock4::getTevKColor(unsigned long) { - /* Nonmatching */ +GXColor * J3DTevBlock4::getTevKColor(u32 i) { + return &mTevKColor[i]; } /* 802EA790-802EA79C .text setTevKColorSel__12J3DTevBlock4FUlUc */ -void J3DTevBlock4::setTevKColorSel(unsigned long, unsigned char) { - /* Nonmatching */ +void J3DTevBlock4::setTevKColorSel(u32 i, u8 num) { + mTevKColorSel[i] = num; } /* 802EA79C-802EA7AC .text setTevKColorSel__12J3DTevBlock4FUlPCUc */ -void J3DTevBlock4::setTevKColorSel(unsigned long, const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock4::setTevKColorSel(u32 i, const u8* pNum) { + mTevKColorSel[i] = *pNum; } /* 802EA7AC-802EA7B8 .text getTevKColorSel__12J3DTevBlock4FUl */ -void J3DTevBlock4::getTevKColorSel(unsigned long) { - /* Nonmatching */ +u8 J3DTevBlock4::getTevKColorSel(u32 i) { + return mTevKAlphaSel[i]; } /* 802EA7B8-802EA7C4 .text setTevKAlphaSel__12J3DTevBlock4FUlUc */ -void J3DTevBlock4::setTevKAlphaSel(unsigned long, unsigned char) { - /* Nonmatching */ +void J3DTevBlock4::setTevKAlphaSel(u32 i, u8 num) { + mTevKAlphaSel[i] = num; } /* 802EA7C4-802EA7D4 .text setTevKAlphaSel__12J3DTevBlock4FUlPCUc */ -void J3DTevBlock4::setTevKAlphaSel(unsigned long, const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock4::setTevKAlphaSel(u32 i, const u8* pNum) { + mTevKAlphaSel[i] = *pNum; } /* 802EA7D4-802EA7E0 .text getTevKAlphaSel__12J3DTevBlock4FUl */ -void J3DTevBlock4::getTevKAlphaSel(unsigned long) { - /* Nonmatching */ +u8 J3DTevBlock4::getTevKAlphaSel(u32 i) { + return mTevKAlphaSel[i]; } /* 802EA7E0-802EA7E8 .text setTevStageNum__12J3DTevBlock4FUc */ -void J3DTevBlock4::setTevStageNum(unsigned char) { - /* Nonmatching */ +void J3DTevBlock4::setTevStageNum(u8 num) { + mTevStageNum = num; } /* 802EA7E8-802EA7F4 .text setTevStageNum__12J3DTevBlock4FPCUc */ -void J3DTevBlock4::setTevStageNum(const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock4::setTevStageNum(const u8* pNum) { + mTevStageNum = *pNum; } /* 802EA7F4-802EA7FC .text getTevStageNum__12J3DTevBlock4CFv */ -void J3DTevBlock4::getTevStageNum() const { +u8 J3DTevBlock4::getTevStageNum() const { /* Nonmatching */ } /* 802EA7FC-802EA838 .text setTevStage__12J3DTevBlock4FUl11J3DTevStage */ -void J3DTevBlock4::setTevStage(unsigned long, J3DTevStage) { +void J3DTevBlock4::setTevStage(u32 i, J3DTevStage stage) { /* Nonmatching */ } /* 802EA838-802EA874 .text setTevStage__12J3DTevBlock4FUlPC11J3DTevStage */ -void J3DTevBlock4::setTevStage(unsigned long, const J3DTevStage*) { +void J3DTevBlock4::setTevStage(u32 i, const J3DTevStage* pStage) { /* Nonmatching */ } /* 802EA874-802EA888 .text getTevStage__12J3DTevBlock4FUl */ -void J3DTevBlock4::getTevStage(unsigned long) { +J3DTevStage * J3DTevBlock4::getTevStage(u32 i) { /* Nonmatching */ } /* 802EA888-802EA8C0 .text setTevSwapModeInfo__12J3DTevBlock4FUl18J3DTevSwapModeInfo */ -void J3DTevBlock4::setTevSwapModeInfo(unsigned long, J3DTevSwapModeInfo) { +void J3DTevBlock4::setTevSwapModeInfo(u32 i, J3DTevSwapModeInfo) { /* Nonmatching */ } /* 802EA8C0-802EA8F8 .text setTevSwapModeInfo__12J3DTevBlock4FUlPC18J3DTevSwapModeInfo */ -void J3DTevBlock4::setTevSwapModeInfo(unsigned long, const J3DTevSwapModeInfo*) { +void J3DTevBlock4::setTevSwapModeInfo(u32 i, const J3DTevSwapModeInfo*) { /* Nonmatching */ } /* 802EA8F8-802EA908 .text setTevSwapModeTable__12J3DTevBlock4FUl19J3DTevSwapModeTable */ -void J3DTevBlock4::setTevSwapModeTable(unsigned long, J3DTevSwapModeTable) { +void J3DTevBlock4::setTevSwapModeTable(u32 i, J3DTevSwapModeTable table) { /* Nonmatching */ } /* 802EA908-802EA918 .text setTevSwapModeTable__12J3DTevBlock4FUlPC19J3DTevSwapModeTable */ -void J3DTevBlock4::setTevSwapModeTable(unsigned long, const J3DTevSwapModeTable*) { +void J3DTevBlock4::setTevSwapModeTable(u32 i, const J3DTevSwapModeTable* pTable) { /* Nonmatching */ } /* 802EA918-802EA928 .text getTevSwapModeTable__12J3DTevBlock4FUl */ -void J3DTevBlock4::getTevSwapModeTable(unsigned long) { +J3DTevSwapModeTable * J3DTevBlock4::getTevSwapModeTable(u32 i) { /* Nonmatching */ } /* 802EA928-802EA93C .text setIndTevStage__12J3DTevBlock4FUl14J3DIndTevStage */ -void J3DTevBlock4::setIndTevStage(unsigned long, J3DIndTevStage) { - /* Nonmatching */ +void J3DTevBlock4::setIndTevStage(u32 i, J3DIndTevStage stage) { + mIndTevStage[i] = stage; } /* 802EA93C-802EA950 .text setIndTevStage__12J3DTevBlock4FUlPC14J3DIndTevStage */ -void J3DTevBlock4::setIndTevStage(unsigned long, const J3DIndTevStage*) { - /* Nonmatching */ +void J3DTevBlock4::setIndTevStage(u32 i, const J3DIndTevStage* pStage) { + mIndTevStage[i] = *pStage; } /* 802EA950-802EA964 .text getIndTevStage__12J3DTevBlock4FUl */ -void J3DTevBlock4::getIndTevStage(unsigned long) { +J3DIndTevStage * J3DTevBlock4::getIndTevStage(u32 i) { /* Nonmatching */ } /* 802EA964-802EA96C .text getTexNoOffset__12J3DTevBlock4CFv */ -void J3DTevBlock4::getTexNoOffset() const { +u32 J3DTevBlock4::getTexNoOffset() const { /* Nonmatching */ } /* 802EA96C-802EA974 .text getTevRegOffset__12J3DTevBlock4CFv */ -void J3DTevBlock4::getTevRegOffset() const { - /* Nonmatching */ +u32 J3DTevBlock4::getTevRegOffset() const { + return mTevRegOffset; } /* 802EA974-802EA97C .text setTevRegOffset__12J3DTevBlock4FUl */ -void J3DTevBlock4::setTevRegOffset(unsigned long) { - /* Nonmatching */ +void J3DTevBlock4::setTevRegOffset(u32 offs) { + mTevRegOffset = offs; } /* 802EA97C-802EA9D8 .text __dt__12J3DTevBlock4Fv */ @@ -1308,187 +1323,187 @@ void J3DTevBlock2::ptrToIndex() { /* 802EA9DC-802EAA00 .text indexToPtr__12J3DTevBlock2Fv */ void J3DTevBlock2::indexToPtr() { - /* Nonmatching */ + return indexToPtr_private(mTexNoOffset); } /* 802EAA00-802EAA0C .text getType__12J3DTevBlock2Fv */ -void J3DTevBlock2::getType() { - /* Nonmatching */ +u32 J3DTevBlock2::getType() { + return 'TVB2'; } /* 802EAA0C-802EAA1C .text setTexNo__12J3DTevBlock2FUlUs */ -void J3DTevBlock2::setTexNo(unsigned long, unsigned short) { - /* Nonmatching */ +void J3DTevBlock2::setTexNo(u32 i, u16 no) { + mTexNo[i] = no; } /* 802EAA1C-802EAA30 .text setTexNo__12J3DTevBlock2FUlPCUs */ -void J3DTevBlock2::setTexNo(unsigned long, const unsigned short*) { - /* Nonmatching */ +void J3DTevBlock2::setTexNo(u32 i, const u16* pNo) { + mTexNo[i] = *pNo; } /* 802EAA30-802EAA40 .text getTexNo__12J3DTevBlock2CFUl */ -void J3DTevBlock2::getTexNo(unsigned long) const { - /* Nonmatching */ +u16 J3DTevBlock2::getTexNo(u32 i) const { + return mTexNo[i]; } /* 802EAA40-802EAA64 .text setTevOrder__12J3DTevBlock2FUl11J3DTevOrder */ -void J3DTevBlock2::setTevOrder(unsigned long, J3DTevOrder) { - /* Nonmatching */ +void J3DTevBlock2::setTevOrder(u32 i, J3DTevOrder order) { + mTevOrder[i] = order; } /* 802EAA64-802EAA88 .text setTevOrder__12J3DTevBlock2FUlPC11J3DTevOrder */ -void J3DTevBlock2::setTevOrder(unsigned long, const J3DTevOrder*) { - /* Nonmatching */ +void J3DTevBlock2::setTevOrder(u32 i, const J3DTevOrder* pOrder) { + mTevOrder[i] = *pOrder; } /* 802EAA88-802EAA9C .text getTevOrder__12J3DTevBlock2FUl */ -void J3DTevBlock2::getTevOrder(unsigned long) { - /* Nonmatching */ +J3DTevOrder * J3DTevBlock2::getTevOrder(u32 i) { + return &mTevOrder[i]; } /* 802EAA9C-802EAAC8 .text setTevColor__12J3DTevBlock2FUl13J3DGXColorS10 */ -void J3DTevBlock2::setTevColor(unsigned long, J3DGXColorS10) { - /* Nonmatching */ +void J3DTevBlock2::setTevColor(u32 i, J3DGXColorS10 color) { + mTevColor[i] = color; } /* 802EAAC8-802EAAF4 .text setTevColor__12J3DTevBlock2FUlPC13J3DGXColorS10 */ -void J3DTevBlock2::setTevColor(unsigned long, const J3DGXColorS10*) { - /* Nonmatching */ +void J3DTevBlock2::setTevColor(u32 i, const J3DGXColorS10* pColor) { + mTevColor[i] = *pColor; } /* 802EAAF4-802EAB08 .text getTevColor__12J3DTevBlock2FUl */ -void J3DTevBlock2::getTevColor(unsigned long) { - /* Nonmatching */ +GXColorS10 * J3DTevBlock2::getTevColor(u32 i) { + return &mTevColor[i]; } /* 802EAB08-802EAB34 .text setTevKColor__12J3DTevBlock2FUl10J3DGXColor */ -void J3DTevBlock2::setTevKColor(unsigned long, J3DGXColor) { - /* Nonmatching */ +void J3DTevBlock2::setTevKColor(u32 i, J3DGXColor color) { + mTevKColor[i] = color; } /* 802EAB34-802EAB60 .text setTevKColor__12J3DTevBlock2FUlPC10J3DGXColor */ -void J3DTevBlock2::setTevKColor(unsigned long, const J3DGXColor*) { - /* Nonmatching */ +void J3DTevBlock2::setTevKColor(u32 i, const J3DGXColor* pColor) { + mTevKColor[i] = *pColor; } /* 802EAB60-802EAB74 .text getTevKColor__12J3DTevBlock2FUl */ -void J3DTevBlock2::getTevKColor(unsigned long) { - /* Nonmatching */ +GXColor * J3DTevBlock2::getTevKColor(u32 i) { + return &mTevKColor[i]; } /* 802EAB74-802EAB80 .text setTevKColorSel__12J3DTevBlock2FUlUc */ -void J3DTevBlock2::setTevKColorSel(unsigned long, unsigned char) { - /* Nonmatching */ +void J3DTevBlock2::setTevKColorSel(u32 i, u8 num) { + mTevKColorSel[i] = num; } /* 802EAB80-802EAB90 .text setTevKColorSel__12J3DTevBlock2FUlPCUc */ -void J3DTevBlock2::setTevKColorSel(unsigned long, const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock2::setTevKColorSel(u32 i, const u8* pNum) { + mTevKColorSel[i] = *pNum; } /* 802EAB90-802EAB9C .text getTevKColorSel__12J3DTevBlock2FUl */ -void J3DTevBlock2::getTevKColorSel(unsigned long) { - /* Nonmatching */ +u8 J3DTevBlock2::getTevKColorSel(u32 i) { + return mTevKAlphaSel[i]; } /* 802EAB9C-802EABA8 .text setTevKAlphaSel__12J3DTevBlock2FUlUc */ -void J3DTevBlock2::setTevKAlphaSel(unsigned long, unsigned char) { - /* Nonmatching */ +void J3DTevBlock2::setTevKAlphaSel(u32 i, u8 num) { + mTevKAlphaSel[i] = num; } /* 802EABA8-802EABB8 .text setTevKAlphaSel__12J3DTevBlock2FUlPCUc */ -void J3DTevBlock2::setTevKAlphaSel(unsigned long, const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock2::setTevKAlphaSel(u32 i, const u8* pNum) { + mTevKAlphaSel[i] = *pNum; } /* 802EABB8-802EABC4 .text getTevKAlphaSel__12J3DTevBlock2FUl */ -void J3DTevBlock2::getTevKAlphaSel(unsigned long) { - /* Nonmatching */ +u8 J3DTevBlock2::getTevKAlphaSel(u32 i) { + return mTevKAlphaSel[i]; } /* 802EABC4-802EABCC .text setTevStageNum__12J3DTevBlock2FUc */ -void J3DTevBlock2::setTevStageNum(unsigned char) { - /* Nonmatching */ +void J3DTevBlock2::setTevStageNum(u8 num) { + mTevStageNum = num; } /* 802EABCC-802EABD8 .text setTevStageNum__12J3DTevBlock2FPCUc */ -void J3DTevBlock2::setTevStageNum(const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock2::setTevStageNum(const u8* pNum) { + mTevStageNum = *pNum; } /* 802EABD8-802EABE0 .text getTevStageNum__12J3DTevBlock2CFv */ -void J3DTevBlock2::getTevStageNum() const { - /* Nonmatching */ +u8 J3DTevBlock2::getTevStageNum() const { + return mTevStageNum; } /* 802EABE0-802EAC1C .text setTevStage__12J3DTevBlock2FUl11J3DTevStage */ -void J3DTevBlock2::setTevStage(unsigned long, J3DTevStage) { - /* Nonmatching */ +void J3DTevBlock2::setTevStage(u32 i, J3DTevStage stage) { + mTevStage[i] = stage; } /* 802EAC1C-802EAC58 .text setTevStage__12J3DTevBlock2FUlPC11J3DTevStage */ -void J3DTevBlock2::setTevStage(unsigned long, const J3DTevStage*) { - /* Nonmatching */ +void J3DTevBlock2::setTevStage(u32 i, const J3DTevStage* pStage) { + mTevStage[i] = *pStage; } /* 802EAC58-802EAC6C .text getTevStage__12J3DTevBlock2FUl */ -void J3DTevBlock2::getTevStage(unsigned long) { - /* Nonmatching */ +J3DTevStage * J3DTevBlock2::getTevStage(u32 i) { + return &mTevStage[i]; } /* 802EAC6C-802EACA4 .text setTevSwapModeInfo__12J3DTevBlock2FUl18J3DTevSwapModeInfo */ -void J3DTevBlock2::setTevSwapModeInfo(unsigned long, J3DTevSwapModeInfo) { - /* Nonmatching */ +void J3DTevBlock2::setTevSwapModeInfo(u32 i, J3DTevSwapModeInfo swapModeInfo) { + // mTevStage[i].mTevSwapModeInfo = swapModeInfo; } /* 802EACA4-802EACDC .text setTevSwapModeInfo__12J3DTevBlock2FUlPC18J3DTevSwapModeInfo */ -void J3DTevBlock2::setTevSwapModeInfo(unsigned long, const J3DTevSwapModeInfo*) { - /* Nonmatching */ +void J3DTevBlock2::setTevSwapModeInfo(u32 i, const J3DTevSwapModeInfo* pSwapModeInfo) { + // mTevStage[i].mTevSwapModeInfo = *pSwapModeInfo; } /* 802EACDC-802EACEC .text setTevSwapModeTable__12J3DTevBlock2FUl19J3DTevSwapModeTable */ -void J3DTevBlock2::setTevSwapModeTable(unsigned long, J3DTevSwapModeTable) { - /* Nonmatching */ +void J3DTevBlock2::setTevSwapModeTable(u32 i, J3DTevSwapModeTable table) { + mTevSwapModeTable[i] = table; } /* 802EACEC-802EACFC .text setTevSwapModeTable__12J3DTevBlock2FUlPC19J3DTevSwapModeTable */ -void J3DTevBlock2::setTevSwapModeTable(unsigned long, const J3DTevSwapModeTable*) { - /* Nonmatching */ +void J3DTevBlock2::setTevSwapModeTable(u32 i, const J3DTevSwapModeTable* pTable) { + mTevSwapModeTable[i] = *pTable; } /* 802EACFC-802EAD0C .text getTevSwapModeTable__12J3DTevBlock2FUl */ -void J3DTevBlock2::getTevSwapModeTable(unsigned long) { - /* Nonmatching */ +J3DTevSwapModeTable * J3DTevBlock2::getTevSwapModeTable(u32 i) { + return &mTevSwapModeTable[i]; } /* 802EAD0C-802EAD20 .text setIndTevStage__12J3DTevBlock2FUl14J3DIndTevStage */ -void J3DTevBlock2::setIndTevStage(unsigned long, J3DIndTevStage) { - /* Nonmatching */ +void J3DTevBlock2::setIndTevStage(u32 i, J3DIndTevStage stage) { + mIndTevStage[i] = stage; } /* 802EAD20-802EAD34 .text setIndTevStage__12J3DTevBlock2FUlPC14J3DIndTevStage */ -void J3DTevBlock2::setIndTevStage(unsigned long, const J3DIndTevStage*) { - /* Nonmatching */ +void J3DTevBlock2::setIndTevStage(u32 i, const J3DIndTevStage* pStage) { + mIndTevStage[i] = *pStage; } /* 802EAD34-802EAD48 .text getIndTevStage__12J3DTevBlock2FUl */ -void J3DTevBlock2::getIndTevStage(unsigned long) { - /* Nonmatching */ +J3DIndTevStage * J3DTevBlock2::getIndTevStage(u32 i) { + return &mIndTevStage[i]; } /* 802EAD48-802EAD50 .text getTexNoOffset__12J3DTevBlock2CFv */ -void J3DTevBlock2::getTexNoOffset() const { - /* Nonmatching */ +u32 J3DTevBlock2::getTexNoOffset() const { + return mTexNoOffset; } /* 802EAD50-802EAD58 .text getTevRegOffset__12J3DTevBlock2CFv */ -void J3DTevBlock2::getTevRegOffset() const { - /* Nonmatching */ +u32 J3DTevBlock2::getTevRegOffset() const { + return mTevRegOffset; } /* 802EAD58-802EAD60 .text setTevRegOffset__12J3DTevBlock2FUl */ -void J3DTevBlock2::setTevRegOffset(unsigned long) { - /* Nonmatching */ +void J3DTevBlock2::setTevRegOffset(u32 offs) { + mTevRegOffset = offs; } /* 802EAD60-802EADBC .text __dt__12J3DTevBlock2Fv */ @@ -1498,97 +1513,94 @@ J3DTevBlock2::~J3DTevBlock2() { /* 802EADBC-802EADC0 .text ptrToIndex__12J3DTevBlock1Fv */ void J3DTevBlock1::ptrToIndex() { - /* Nonmatching */ } /* 802EADC0-802EADE4 .text indexToPtr__12J3DTevBlock1Fv */ void J3DTevBlock1::indexToPtr() { - /* Nonmatching */ + return indexToPtr_private(mTexNoOffset); } /* 802EADE4-802EADF0 .text getType__12J3DTevBlock1Fv */ -void J3DTevBlock1::getType() { - /* Nonmatching */ +u32 J3DTevBlock1::getType() { + return 'TVB1'; } /* 802EADF0-802EAE00 .text setTexNo__12J3DTevBlock1FUlUs */ -void J3DTevBlock1::setTexNo(unsigned long, unsigned short) { - /* Nonmatching */ +void J3DTevBlock1::setTexNo(u32 i, u16 no) { + mTexNo[i] = no; } /* 802EAE00-802EAE14 .text setTexNo__12J3DTevBlock1FUlPCUs */ -void J3DTevBlock1::setTexNo(unsigned long, const unsigned short*) { - /* Nonmatching */ +void J3DTevBlock1::setTexNo(u32 i, const u16* pNo) { + mTexNo[i] = *pNo; } /* 802EAE14-802EAE24 .text getTexNo__12J3DTevBlock1CFUl */ -void J3DTevBlock1::getTexNo(unsigned long) const { - /* Nonmatching */ +u16 J3DTevBlock1::getTexNo(u32 i) const { + return mTexNo[i]; } /* 802EAE24-802EAE48 .text setTevOrder__12J3DTevBlock1FUl11J3DTevOrder */ -void J3DTevBlock1::setTevOrder(unsigned long, J3DTevOrder) { - /* Nonmatching */ +void J3DTevBlock1::setTevOrder(u32 i, J3DTevOrder order) { + mTevOrder[i] = order; } /* 802EAE48-802EAE6C .text setTevOrder__12J3DTevBlock1FUlPC11J3DTevOrder */ -void J3DTevBlock1::setTevOrder(unsigned long, const J3DTevOrder*) { - /* Nonmatching */ +void J3DTevBlock1::setTevOrder(u32 i, const J3DTevOrder* pOrder) { + mTevOrder[i] = *pOrder; } /* 802EAE6C-802EAE80 .text getTevOrder__12J3DTevBlock1FUl */ -void J3DTevBlock1::getTevOrder(unsigned long) { - /* Nonmatching */ +J3DTevOrder * J3DTevBlock1::getTevOrder(u32 i) { + return &mTevOrder[i]; } /* 802EAE80-802EAE84 .text setTevStageNum__12J3DTevBlock1FUc */ -void J3DTevBlock1::setTevStageNum(unsigned char) { - /* Nonmatching */ +void J3DTevBlock1::setTevStageNum(u8 num) { } /* 802EAE84-802EAE88 .text setTevStageNum__12J3DTevBlock1FPCUc */ -void J3DTevBlock1::setTevStageNum(const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock1::setTevStageNum(const u8* pNum) { } /* 802EAE88-802EAE90 .text getTevStageNum__12J3DTevBlock1CFv */ -void J3DTevBlock1::getTevStageNum() const { - /* Nonmatching */ +u8 J3DTevBlock1::getTevStageNum() const { + return 1; } /* 802EAE90-802EAECC .text setTevStage__12J3DTevBlock1FUl11J3DTevStage */ -void J3DTevBlock1::setTevStage(unsigned long, J3DTevStage) { - /* Nonmatching */ +void J3DTevBlock1::setTevStage(u32 i, J3DTevStage stage) { + mTevStage[i] = stage; } /* 802EAECC-802EAF08 .text setTevStage__12J3DTevBlock1FUlPC11J3DTevStage */ -void J3DTevBlock1::setTevStage(unsigned long, const J3DTevStage*) { - /* Nonmatching */ +void J3DTevBlock1::setTevStage(u32 i, const J3DTevStage* pStage) { + mTevStage[i] = *pStage; } /* 802EAF08-802EAF1C .text getTevStage__12J3DTevBlock1FUl */ -void J3DTevBlock1::getTevStage(unsigned long) { - /* Nonmatching */ +J3DTevStage * J3DTevBlock1::getTevStage(u32 i) { + return &mTevStage[i]; } /* 802EAF1C-802EAF30 .text setIndTevStage__12J3DTevBlock1FUl14J3DIndTevStage */ -void J3DTevBlock1::setIndTevStage(unsigned long, J3DIndTevStage) { - /* Nonmatching */ +void J3DTevBlock1::setIndTevStage(u32 i, J3DIndTevStage stage) { + mIndTevStage[i] = stage; } /* 802EAF30-802EAF44 .text setIndTevStage__12J3DTevBlock1FUlPC14J3DIndTevStage */ -void J3DTevBlock1::setIndTevStage(unsigned long, const J3DIndTevStage*) { - /* Nonmatching */ +void J3DTevBlock1::setIndTevStage(u32 i, const J3DIndTevStage* pStage) { + mIndTevStage[i] = *pStage; } /* 802EAF44-802EAF58 .text getIndTevStage__12J3DTevBlock1FUl */ -void J3DTevBlock1::getIndTevStage(unsigned long) { - /* Nonmatching */ +J3DIndTevStage * J3DTevBlock1::getIndTevStage(u32 i) { + return &mIndTevStage[i]; } /* 802EAF58-802EAF60 .text getTexNoOffset__12J3DTevBlock1CFv */ -void J3DTevBlock1::getTexNoOffset() const { - /* Nonmatching */ +u32 J3DTevBlock1::getTexNoOffset() const { + return mTexNoOffset; } /* 802EAF60-802EAFBC .text __dt__12J3DTevBlock1Fv */ @@ -1597,188 +1609,181 @@ J3DTevBlock1::~J3DTevBlock1() { } /* 802EAFBC-802EAFC0 .text setTevKColorSel__11J3DTevBlockFUlPCUc */ -void J3DTevBlock::setTevKColorSel(unsigned long, const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock::setTevKColorSel(u32 i, const u8* pNum) { } /* 802EAFC0-802EAFC4 .text setTevKAlphaSel__11J3DTevBlockFUlPCUc */ -void J3DTevBlock::setTevKAlphaSel(unsigned long, const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock::setTevKAlphaSel(u32 i, const u8* pNum) { } /* 802EAFC4-802EAFC8 .text setTevSwapModeInfo__11J3DTevBlockFUl18J3DTevSwapModeInfo */ -void J3DTevBlock::setTevSwapModeInfo(unsigned long, J3DTevSwapModeInfo) { - /* Nonmatching */ +void J3DTevBlock::setTevSwapModeInfo(u32 i, J3DTevSwapModeInfo) { } /* 802EAFC8-802EAFCC .text setTevSwapModeInfo__11J3DTevBlockFUlPC18J3DTevSwapModeInfo */ -void J3DTevBlock::setTevSwapModeInfo(unsigned long, const J3DTevSwapModeInfo*) { - /* Nonmatching */ +void J3DTevBlock::setTevSwapModeInfo(u32 i, const J3DTevSwapModeInfo*) { } /* 802EAFCC-802EAFD0 .text setTevSwapModeTable__11J3DTevBlockFUlPC19J3DTevSwapModeTable */ -void J3DTevBlock::setTevSwapModeTable(unsigned long, const J3DTevSwapModeTable*) { - /* Nonmatching */ +void J3DTevBlock::setTevSwapModeTable(u32 i, const J3DTevSwapModeTable* pTable) { } /* 802EAFD0-802EAFD8 .text getTevRegOffset__11J3DTevBlockCFv */ -void J3DTevBlock::getTevRegOffset() const { - /* Nonmatching */ +u32 J3DTevBlock::getTevRegOffset() const { + return 0; } /* 802EAFD8-802EAFDC .text setTevRegOffset__11J3DTevBlockFUl */ -void J3DTevBlock::setTevRegOffset(unsigned long) { - /* Nonmatching */ +void J3DTevBlock::setTevRegOffset(u32 offs) { } /* 802EAFDC-802EAFE0 .text load__18J3DTevBlockPatchedFv */ void J3DTevBlockPatched::load() { - /* Nonmatching */ } /* 802EAFE0-802EB004 .text indexToPtr__18J3DTevBlockPatchedFv */ void J3DTevBlockPatched::indexToPtr() { - /* Nonmatching */ + return indexToPtr_private(mTexNoOffset); } /* 802EB004-802EB010 .text getType__18J3DTevBlockPatchedFv */ -void J3DTevBlockPatched::getType() { - /* Nonmatching */ +u32 J3DTevBlockPatched::getType() { + return 'TVPT'; } /* 802EB010-802EB018 .text setTevStageNum__18J3DTevBlockPatchedFUc */ -void J3DTevBlockPatched::setTevStageNum(unsigned char) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevStageNum(u8 num) { + mTevStageNum = num; } /* 802EB018-802EB024 .text setTevStageNum__18J3DTevBlockPatchedFPCUc */ -void J3DTevBlockPatched::setTevStageNum(const unsigned char*) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevStageNum(const u8* pNum) { + mTevStageNum = *pNum; } /* 802EB024-802EB02C .text getTevStageNum__18J3DTevBlockPatchedCFv */ -void J3DTevBlockPatched::getTevStageNum() const { - /* Nonmatching */ +u8 J3DTevBlockPatched::getTevStageNum() const { + return mTevStageNum; } /* 802EB02C-802EB03C .text setTexNo__18J3DTevBlockPatchedFUlUs */ -void J3DTevBlockPatched::setTexNo(unsigned long, unsigned short) { - /* Nonmatching */ +void J3DTevBlockPatched::setTexNo(u32 i, u16 no) { + mTexNo[i] = no; } /* 802EB03C-802EB050 .text setTexNo__18J3DTevBlockPatchedFUlPCUs */ -void J3DTevBlockPatched::setTexNo(unsigned long, const unsigned short*) { - /* Nonmatching */ +void J3DTevBlockPatched::setTexNo(u32 i, const u16* pNo) { + mTexNo[i] = *pNo; } /* 802EB050-802EB060 .text getTexNo__18J3DTevBlockPatchedCFUl */ -void J3DTevBlockPatched::getTexNo(unsigned long) const { - /* Nonmatching */ +u16 J3DTevBlockPatched::getTexNo(u32 i) const { + return mTexNo[i]; } /* 802EB060-802EB084 .text setTevOrder__18J3DTevBlockPatchedFUl11J3DTevOrder */ -void J3DTevBlockPatched::setTevOrder(unsigned long, J3DTevOrder) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevOrder(u32 i, J3DTevOrder order) { + mTevOrder[i] = order; } /* 802EB084-802EB0A8 .text setTevOrder__18J3DTevBlockPatchedFUlPC11J3DTevOrder */ -void J3DTevBlockPatched::setTevOrder(unsigned long, const J3DTevOrder*) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevOrder(u32 i, const J3DTevOrder* pOrder) { + mTevOrder[i] = *pOrder; } /* 802EB0A8-802EB0BC .text getTevOrder__18J3DTevBlockPatchedFUl */ -void J3DTevBlockPatched::getTevOrder(unsigned long) { - /* Nonmatching */ +J3DTevOrder * J3DTevBlockPatched::getTevOrder(u32 i) { + return &mTevOrder[i]; } /* 802EB0BC-802EB0F8 .text setTevStage__18J3DTevBlockPatchedFUl11J3DTevStage */ -void J3DTevBlockPatched::setTevStage(unsigned long, J3DTevStage) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevStage(u32 i, J3DTevStage stage) { + mTevStage[i] = stage; } /* 802EB0F8-802EB134 .text setTevStage__18J3DTevBlockPatchedFUlPC11J3DTevStage */ -void J3DTevBlockPatched::setTevStage(unsigned long, const J3DTevStage*) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevStage(u32 i, const J3DTevStage* pStage) { + mTevStage[i] = *pStage; } /* 802EB134-802EB148 .text getTevStage__18J3DTevBlockPatchedFUl */ -void J3DTevBlockPatched::getTevStage(unsigned long) { - /* Nonmatching */ +J3DTevStage * J3DTevBlockPatched::getTevStage(u32 i) { + return &mTevStage[i]; } /* 802EB148-802EB15C .text setIndTevStage__18J3DTevBlockPatchedFUl14J3DIndTevStage */ -void J3DTevBlockPatched::setIndTevStage(unsigned long, J3DIndTevStage) { - /* Nonmatching */ +void J3DTevBlockPatched::setIndTevStage(u32 i, J3DIndTevStage stage) { + mIndTevStage[i] = stage; } /* 802EB15C-802EB170 .text setIndTevStage__18J3DTevBlockPatchedFUlPC14J3DIndTevStage */ -void J3DTevBlockPatched::setIndTevStage(unsigned long, const J3DIndTevStage*) { - /* Nonmatching */ +void J3DTevBlockPatched::setIndTevStage(u32 i, const J3DIndTevStage* pStage) { + mIndTevStage[i] = *pStage; } /* 802EB170-802EB184 .text getIndTevStage__18J3DTevBlockPatchedFUl */ -void J3DTevBlockPatched::getIndTevStage(unsigned long) { - /* Nonmatching */ +J3DIndTevStage * J3DTevBlockPatched::getIndTevStage(u32 i) { + return &mIndTevStage[i]; } /* 802EB184-802EB1B0 .text setTevColor__18J3DTevBlockPatchedFUl13J3DGXColorS10 */ -void J3DTevBlockPatched::setTevColor(unsigned long, J3DGXColorS10) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevColor(u32 i, J3DGXColorS10 color) { + mTevColor[i] = color; } /* 802EB1B0-802EB1DC .text setTevColor__18J3DTevBlockPatchedFUlPC13J3DGXColorS10 */ -void J3DTevBlockPatched::setTevColor(unsigned long, const J3DGXColorS10*) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevColor(u32 i, const J3DGXColorS10* pColor) { + mTevColor[i] = *pColor; } /* 802EB1DC-802EB1F0 .text getTevColor__18J3DTevBlockPatchedFUl */ -void J3DTevBlockPatched::getTevColor(unsigned long) { - /* Nonmatching */ +GXColorS10 * J3DTevBlockPatched::getTevColor(u32 i) { + return &mTevColor[i]; } /* 802EB1F0-802EB21C .text setTevKColor__18J3DTevBlockPatchedFUl10J3DGXColor */ -void J3DTevBlockPatched::setTevKColor(unsigned long, J3DGXColor) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevKColor(u32 i, J3DGXColor color) { + mTevKColor[i] = color; } /* 802EB21C-802EB248 .text setTevKColor__18J3DTevBlockPatchedFUlPC10J3DGXColor */ -void J3DTevBlockPatched::setTevKColor(unsigned long, const J3DGXColor*) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevKColor(u32 i, const J3DGXColor* pColor) { + mTevKColor[i] = *pColor; } /* 802EB248-802EB25C .text getTevKColor__18J3DTevBlockPatchedFUl */ -void J3DTevBlockPatched::getTevKColor(unsigned long) { - /* Nonmatching */ +GXColor * J3DTevBlockPatched::getTevKColor(u32 i) { + return &mTevKColor[i]; } /* 802EB25C-802EB268 .text setTevKColorSel__18J3DTevBlockPatchedFUlUc */ -void J3DTevBlockPatched::setTevKColorSel(unsigned long, unsigned char) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevKColorSel(u32 i, u8 sel) { + mTevKColorSel[i] = sel; } /* 802EB268-802EB278 .text setTevKColorSel__18J3DTevBlockPatchedFUlPCUc */ -void J3DTevBlockPatched::setTevKColorSel(unsigned long, const unsigned char*) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevKColorSel(u32 i, const u8* pSel) { + mTevKColorSel[i] = *pSel; } /* 802EB278-802EB284 .text getTevKColorSel__18J3DTevBlockPatchedFUl */ -void J3DTevBlockPatched::getTevKColorSel(unsigned long) { - /* Nonmatching */ +u8 J3DTevBlockPatched::getTevKColorSel(u32 i) { + return mTevKColorSel[i]; } /* 802EB284-802EB28C .text getTexNoOffset__18J3DTevBlockPatchedCFv */ -void J3DTevBlockPatched::getTexNoOffset() const { - /* Nonmatching */ +u32 J3DTevBlockPatched::getTexNoOffset() const { + return mTexNoOffset; } /* 802EB28C-802EB294 .text getTevRegOffset__18J3DTevBlockPatchedCFv */ -void J3DTevBlockPatched::getTevRegOffset() const { - /* Nonmatching */ +u32 J3DTevBlockPatched::getTevRegOffset() const { + return mTevRegOffset; } /* 802EB294-802EB29C .text setTevRegOffset__18J3DTevBlockPatchedFUl */ -void J3DTevBlockPatched::setTevRegOffset(unsigned long) { - /* Nonmatching */ +void J3DTevBlockPatched::setTevRegOffset(u32 offs) { + mTevRegOffset = offs; } /* 802EB29C-802EB2F8 .text __dt__18J3DTevBlockPatchedFv */ @@ -1787,23 +1792,23 @@ J3DTevBlockPatched::~J3DTevBlockPatched() { } /* 802EB2F8-802EB304 .text getType__19J3DTexGenBlockBasicFv */ -void J3DTexGenBlockBasic::getType() { - /* Nonmatching */ +u32 J3DTexGenBlockBasic::getType() { + return 'TGBC'; } /* 802EB304-802EB328 .text setNBTScale__19J3DTexGenBlockBasicF11J3DNBTScale */ -void J3DTexGenBlockBasic::setNBTScale(J3DNBTScale) { - /* Nonmatching */ +void J3DTexGenBlockBasic::setNBTScale(J3DNBTScale scale) { + mNBTScale = scale; } /* 802EB328-802EB34C .text setNBTScale__19J3DTexGenBlockBasicFPC11J3DNBTScale */ -void J3DTexGenBlockBasic::setNBTScale(const J3DNBTScale*) { - /* Nonmatching */ +void J3DTexGenBlockBasic::setNBTScale(const J3DNBTScale* pScale) { + mNBTScale = *pScale; } /* 802EB34C-802EB354 .text getNBTScale__19J3DTexGenBlockBasicFv */ -void J3DTexGenBlockBasic::getNBTScale() { - /* Nonmatching */ +J3DNBTScale * J3DTexGenBlockBasic::getNBTScale() { + return &mNBTScale; } /* 802EB354-802EB3C0 .text __dt__19J3DTexGenBlockBasicFv */ @@ -1812,68 +1817,68 @@ J3DTexGenBlockBasic::~J3DTexGenBlockBasic() { } /* 802EB3C0-802EB3C8 .text setTexGenNum__21J3DTexGenBlockPatchedFUl */ -void J3DTexGenBlockPatched::setTexGenNum(unsigned long) { - /* Nonmatching */ +void J3DTexGenBlockPatched::setTexGenNum(u32 num) { + mTexGenNum = num; } /* 802EB3C8-802EB3D4 .text setTexGenNum__21J3DTexGenBlockPatchedFPCUl */ -void J3DTexGenBlockPatched::setTexGenNum(const unsigned long*) { - /* Nonmatching */ +void J3DTexGenBlockPatched::setTexGenNum(const u32* pNum) { + mTexGenNum = *pNum; } /* 802EB3D4-802EB3DC .text getTexGenNum__21J3DTexGenBlockPatchedCFv */ -void J3DTexGenBlockPatched::getTexGenNum() const { - /* Nonmatching */ +u32 J3DTexGenBlockPatched::getTexGenNum() const { + return mTexGenNum; } /* 802EB3DC-802EB400 .text setTexCoord__21J3DTexGenBlockPatchedFUlPC11J3DTexCoord */ -void J3DTexGenBlockPatched::setTexCoord(unsigned long, const J3DTexCoord*) { - /* Nonmatching */ +void J3DTexGenBlockPatched::setTexCoord(u32 i, const J3DTexCoord* pCoord) { + mTexCoord[i] = *pCoord; } /* 802EB400-802EB414 .text getTexCoord__21J3DTexGenBlockPatchedFUl */ -void J3DTexGenBlockPatched::getTexCoord(unsigned long) { - /* Nonmatching */ +J3DTexCoord * J3DTexGenBlockPatched::getTexCoord(u32 i) { + return &mTexCoord[i]; } /* 802EB414-802EB424 .text setTexMtx__21J3DTexGenBlockPatchedFUlP9J3DTexMtx */ -void J3DTexGenBlockPatched::setTexMtx(unsigned long, J3DTexMtx*) { - /* Nonmatching */ +void J3DTexGenBlockPatched::setTexMtx(u32 i, J3DTexMtx* pMtx) { + mTexMtx[i] = pMtx; } /* 802EB424-802EB434 .text getTexMtx__21J3DTexGenBlockPatchedFUl */ -void J3DTexGenBlockPatched::getTexMtx(unsigned long) { - /* Nonmatching */ +J3DTexMtx * J3DTexGenBlockPatched::getTexMtx(u32 i) { + return mTexMtx[i]; } /* 802EB434-802EB43C .text getTexMtxOffset__21J3DTexGenBlockPatchedCFv */ -void J3DTexGenBlockPatched::getTexMtxOffset() const { - /* Nonmatching */ +u32 J3DTexGenBlockPatched::getTexMtxOffset() const { + return mTexMtxOffset; } /* 802EB43C-802EB444 .text setTexMtxOffset__21J3DTexGenBlockPatchedFUl */ -void J3DTexGenBlockPatched::setTexMtxOffset(unsigned long) { - /* Nonmatching */ +void J3DTexGenBlockPatched::setTexMtxOffset(u32 offs) { + mTexMtxOffset = offs; } /* 802EB444-802EB450 .text getType__15J3DTexGenBlock4Fv */ -void J3DTexGenBlock4::getType() { - /* Nonmatching */ +u32 J3DTexGenBlock4::getType() { + return 'TGB4'; } /* 802EB450-802EB474 .text setNBTScale__15J3DTexGenBlock4F11J3DNBTScale */ -void J3DTexGenBlock4::setNBTScale(J3DNBTScale) { - /* Nonmatching */ +void J3DTexGenBlock4::setNBTScale(J3DNBTScale scale) { + mNBTScale = scale; } /* 802EB474-802EB498 .text setNBTScale__15J3DTexGenBlock4FPC11J3DNBTScale */ -void J3DTexGenBlock4::setNBTScale(const J3DNBTScale*) { - /* Nonmatching */ +void J3DTexGenBlock4::setNBTScale(const J3DNBTScale* pScale) { + mNBTScale = *pScale; } /* 802EB498-802EB4A0 .text getNBTScale__15J3DTexGenBlock4Fv */ -void J3DTexGenBlock4::getNBTScale() { - /* Nonmatching */ +J3DNBTScale * J3DTexGenBlock4::getNBTScale() { + return &mNBTScale; } /* 802EB4A0-802EB50C .text __dt__15J3DTexGenBlock4Fv */ @@ -1887,118 +1892,118 @@ void J3DTexGenBlockPatched::load() { } /* 802EB510-802EB51C .text getType__21J3DTexGenBlockPatchedFv */ -void J3DTexGenBlockPatched::getType() { - /* Nonmatching */ +u32 J3DTexGenBlockPatched::getType() { + return 'TGPT'; } /* 802EB51C-802EB528 .text getType__20J3DColorBlockLightOnFv */ -void J3DColorBlockLightOn::getType() { - /* Nonmatching */ +u32 J3DColorBlockLightOn::getType() { + return 'CLON'; } /* 802EB528-802EB554 .text setMatColor__20J3DColorBlockLightOnFUl10J3DGXColor */ -void J3DColorBlockLightOn::setMatColor(unsigned long, J3DGXColor) { - /* Nonmatching */ +void J3DColorBlockLightOn::setMatColor(u32 i, J3DGXColor color) { + mMatColor[i] = color; } /* 802EB554-802EB580 .text setMatColor__20J3DColorBlockLightOnFUlPC10J3DGXColor */ -void J3DColorBlockLightOn::setMatColor(unsigned long, const J3DGXColor*) { - /* Nonmatching */ +void J3DColorBlockLightOn::setMatColor(u32 i, const J3DGXColor* pColor) { + mMatColor[i] = *pColor; } /* 802EB580-802EB594 .text getMatColor__20J3DColorBlockLightOnFUl */ -void J3DColorBlockLightOn::getMatColor(unsigned long) { - /* Nonmatching */ +GXColor * J3DColorBlockLightOn::getMatColor(u32 i) { + return &mMatColor[i]; } /* 802EB594-802EB5C0 .text setAmbColor__20J3DColorBlockLightOnFUl10J3DGXColor */ -void J3DColorBlockLightOn::setAmbColor(unsigned long, J3DGXColor) { - /* Nonmatching */ +void J3DColorBlockLightOn::setAmbColor(u32 i, J3DGXColor color) { + mAmbColor[i] = color; } /* 802EB5C0-802EB5EC .text setAmbColor__20J3DColorBlockLightOnFUlPC10J3DGXColor */ -void J3DColorBlockLightOn::setAmbColor(unsigned long, const J3DGXColor*) { - /* Nonmatching */ +void J3DColorBlockLightOn::setAmbColor(u32 i, const J3DGXColor* pColor) { + mAmbColor[i] = *pColor; } /* 802EB5EC-802EB600 .text getAmbColor__20J3DColorBlockLightOnFUl */ -void J3DColorBlockLightOn::getAmbColor(unsigned long) { - /* Nonmatching */ +GXColor * J3DColorBlockLightOn::getAmbColor(u32 i) { + return &mAmbColor[i]; } /* 802EB600-802EB60C .text setColorChanNum__20J3DColorBlockLightOnFPCUc */ -void J3DColorBlockLightOn::setColorChanNum(const unsigned char*) { - /* Nonmatching */ +void J3DColorBlockLightOn::setColorChanNum(const u8* pNum) { + mColorChanNum = *pNum; } /* 802EB60C-802EB614 .text setColorChanNum__20J3DColorBlockLightOnFUc */ -void J3DColorBlockLightOn::setColorChanNum(unsigned char) { - /* Nonmatching */ +void J3DColorBlockLightOn::setColorChanNum(u8 num) { + mColorChanNum = num; } /* 802EB614-802EB61C .text getColorChanNum__20J3DColorBlockLightOnCFv */ -void J3DColorBlockLightOn::getColorChanNum() const { - /* Nonmatching */ +u8 J3DColorBlockLightOn::getColorChanNum() const { + return mColorChanNum; } /* 802EB61C-802EB630 .text setColorChan__20J3DColorBlockLightOnFUlPC12J3DColorChan */ -void J3DColorBlockLightOn::setColorChan(unsigned long, const J3DColorChan*) { - /* Nonmatching */ +void J3DColorBlockLightOn::setColorChan(u32 i, const J3DColorChan* pChan) { + mColorChan[i] = *pChan; } /* 802EB630-802EB644 .text setColorChan__20J3DColorBlockLightOnFUlRC12J3DColorChan */ -void J3DColorBlockLightOn::setColorChan(unsigned long, const J3DColorChan&) { - /* Nonmatching */ +void J3DColorBlockLightOn::setColorChan(u32 i, const J3DColorChan& chan) { + mColorChan[i] = chan; } /* 802EB644-802EB658 .text getColorChan__20J3DColorBlockLightOnFUl */ -void J3DColorBlockLightOn::getColorChan(unsigned long) { - /* Nonmatching */ +J3DColorChan * J3DColorBlockLightOn::getColorChan(u32 i) { + return &mColorChan[i]; } /* 802EB658-802EB668 .text setLight__20J3DColorBlockLightOnFUlP11J3DLightObj */ -void J3DColorBlockLightOn::setLight(unsigned long, J3DLightObj*) { - /* Nonmatching */ +void J3DColorBlockLightOn::setLight(u32 i, J3DLightObj* pLight) { + mLight[i] = pLight; } /* 802EB668-802EB678 .text getLight__20J3DColorBlockLightOnFUl */ -void J3DColorBlockLightOn::getLight(unsigned long) { - /* Nonmatching */ +J3DLightObj * J3DColorBlockLightOn::getLight(u32 i) { + return mLight[i]; } /* 802EB678-802EB680 .text setCullMode__20J3DColorBlockLightOnFUc */ -void J3DColorBlockLightOn::setCullMode(unsigned char) { - /* Nonmatching */ +void J3DColorBlockLightOn::setCullMode(u8 mode) { + mCullMode = mode; } /* 802EB680-802EB68C .text setCullMode__20J3DColorBlockLightOnFPCUc */ -void J3DColorBlockLightOn::setCullMode(const unsigned char*) { - /* Nonmatching */ +void J3DColorBlockLightOn::setCullMode(const u8* pMode) { + mCullMode = *pMode; } /* 802EB68C-802EB694 .text getCullMode__20J3DColorBlockLightOnCFv */ -void J3DColorBlockLightOn::getCullMode() const { - /* Nonmatching */ +u8 J3DColorBlockLightOn::getCullMode() const { + return mCullMode; } /* 802EB694-802EB69C .text getMatColorOffset__20J3DColorBlockLightOnCFv */ -void J3DColorBlockLightOn::getMatColorOffset() const { - /* Nonmatching */ +u32 J3DColorBlockLightOn::getMatColorOffset() const { + return mMatColorOffset; } /* 802EB69C-802EB6A4 .text getColorChanOffset__20J3DColorBlockLightOnCFv */ -void J3DColorBlockLightOn::getColorChanOffset() const { - /* Nonmatching */ +u32 J3DColorBlockLightOn::getColorChanOffset() const { + return mColorChanOffset; } /* 802EB6A4-802EB6AC .text setMatColorOffset__20J3DColorBlockLightOnFUl */ -void J3DColorBlockLightOn::setMatColorOffset(unsigned long) { - /* Nonmatching */ +void J3DColorBlockLightOn::setMatColorOffset(u32 offs) { + mMatColorOffset = offs; } /* 802EB6AC-802EB6B4 .text setColorChanOffset__20J3DColorBlockLightOnFUl */ -void J3DColorBlockLightOn::setColorChanOffset(unsigned long) { - /* Nonmatching */ +void J3DColorBlockLightOn::setColorChanOffset(u32 offs) { + mColorChanOffset = offs; } /* 802EB6B4-802EB710 .text __dt__20J3DColorBlockLightOnFv */ @@ -2007,23 +2012,23 @@ J3DColorBlockLightOn::~J3DColorBlockLightOn() { } /* 802EB710-802EB71C .text getType__22J3DColorBlockAmbientOnFv */ -void J3DColorBlockAmbientOn::getType() { - /* Nonmatching */ +u32 J3DColorBlockAmbientOn::getType() { + return 'CLAB'; } /* 802EB71C-802EB748 .text setAmbColor__22J3DColorBlockAmbientOnFUl10J3DGXColor */ -void J3DColorBlockAmbientOn::setAmbColor(unsigned long, J3DGXColor) { - /* Nonmatching */ +void J3DColorBlockAmbientOn::setAmbColor(u32 i, J3DGXColor color) { + mAmbColor[i] = color; } /* 802EB748-802EB774 .text setAmbColor__22J3DColorBlockAmbientOnFUlPC10J3DGXColor */ -void J3DColorBlockAmbientOn::setAmbColor(unsigned long, const J3DGXColor*) { - /* Nonmatching */ +void J3DColorBlockAmbientOn::setAmbColor(u32 i, const J3DGXColor* color) { + mAmbColor[i] = *color; } /* 802EB774-802EB788 .text getAmbColor__22J3DColorBlockAmbientOnFUl */ -void J3DColorBlockAmbientOn::getAmbColor(unsigned long) { - /* Nonmatching */ +GXColor * J3DColorBlockAmbientOn::getAmbColor(u32 i) { + return &mAmbColor[i]; } /* 802EB788-802EB7F4 .text __dt__22J3DColorBlockAmbientOnFv */ @@ -2032,88 +2037,88 @@ J3DColorBlockAmbientOn::~J3DColorBlockAmbientOn() { } /* 802EB7F4-802EB820 .text setMatColor__21J3DColorBlockLightOffFUl10J3DGXColor */ -void J3DColorBlockLightOff::setMatColor(unsigned long, J3DGXColor) { - /* Nonmatching */ +void J3DColorBlockLightOff::setMatColor(u32 i, J3DGXColor color) { + mMatColor[i] = color; } /* 802EB820-802EB84C .text setMatColor__21J3DColorBlockLightOffFUlPC10J3DGXColor */ -void J3DColorBlockLightOff::setMatColor(unsigned long, const J3DGXColor*) { - /* Nonmatching */ +void J3DColorBlockLightOff::setMatColor(u32 i, const J3DGXColor* pColor) { + mMatColor[i] = *pColor; } /* 802EB84C-802EB860 .text getMatColor__21J3DColorBlockLightOffFUl */ -void J3DColorBlockLightOff::getMatColor(unsigned long) { - /* Nonmatching */ +GXColor * J3DColorBlockLightOff::getMatColor(u32 i) { + return &mMatColor[i]; } /* 802EB860-802EB86C .text setColorChanNum__21J3DColorBlockLightOffFPCUc */ -void J3DColorBlockLightOff::setColorChanNum(const unsigned char*) { - /* Nonmatching */ +void J3DColorBlockLightOff::setColorChanNum(const u8* pNum) { + mColorChanNum = *pNum; } /* 802EB86C-802EB874 .text setColorChanNum__21J3DColorBlockLightOffFUc */ -void J3DColorBlockLightOff::setColorChanNum(unsigned char) { - /* Nonmatching */ +void J3DColorBlockLightOff::setColorChanNum(u8 num) { + mColorChanNum = num; } /* 802EB874-802EB87C .text getColorChanNum__21J3DColorBlockLightOffCFv */ -void J3DColorBlockLightOff::getColorChanNum() const { - /* Nonmatching */ +u8 J3DColorBlockLightOff::getColorChanNum() const { + return mColorChanNum; } /* 802EB87C-802EB890 .text setColorChan__21J3DColorBlockLightOffFUlPC12J3DColorChan */ -void J3DColorBlockLightOff::setColorChan(unsigned long, const J3DColorChan*) { - /* Nonmatching */ +void J3DColorBlockLightOff::setColorChan(u32 i, const J3DColorChan* pChan) { + mColorChan[i] = *pChan; } /* 802EB890-802EB8A4 .text setColorChan__21J3DColorBlockLightOffFUlRC12J3DColorChan */ -void J3DColorBlockLightOff::setColorChan(unsigned long, const J3DColorChan&) { - /* Nonmatching */ +void J3DColorBlockLightOff::setColorChan(u32 i, const J3DColorChan& chan) { + mColorChan[i] = chan; } /* 802EB8A4-802EB8B8 .text getColorChan__21J3DColorBlockLightOffFUl */ -void J3DColorBlockLightOff::getColorChan(unsigned long) { - /* Nonmatching */ +J3DColorChan * J3DColorBlockLightOff::getColorChan(u32 i) { + return &mColorChan[i]; } /* 802EB8B8-802EB8C0 .text setCullMode__21J3DColorBlockLightOffFUc */ -void J3DColorBlockLightOff::setCullMode(unsigned char) { - /* Nonmatching */ +void J3DColorBlockLightOff::setCullMode(u8 mode) { + mCullMode = mode; } /* 802EB8C0-802EB8CC .text setCullMode__21J3DColorBlockLightOffFPCUc */ -void J3DColorBlockLightOff::setCullMode(const unsigned char*) { - /* Nonmatching */ +void J3DColorBlockLightOff::setCullMode(const u8* pMode) { + mCullMode = *pMode; } /* 802EB8CC-802EB8D4 .text getCullMode__21J3DColorBlockLightOffCFv */ -void J3DColorBlockLightOff::getCullMode() const { - /* Nonmatching */ +u8 J3DColorBlockLightOff::getCullMode() const { + return mCullMode; } /* 802EB8D4-802EB8DC .text getMatColorOffset__21J3DColorBlockLightOffCFv */ -void J3DColorBlockLightOff::getMatColorOffset() const { - /* Nonmatching */ +u32 J3DColorBlockLightOff::getMatColorOffset() const { + return mMatColorOffset; } /* 802EB8DC-802EB8E4 .text getColorChanOffset__21J3DColorBlockLightOffCFv */ -void J3DColorBlockLightOff::getColorChanOffset() const { - /* Nonmatching */ +u32 J3DColorBlockLightOff::getColorChanOffset() const { + return mColorChanOffset; } /* 802EB8E4-802EB8EC .text setMatColorOffset__21J3DColorBlockLightOffFUl */ -void J3DColorBlockLightOff::setMatColorOffset(unsigned long) { - /* Nonmatching */ +void J3DColorBlockLightOff::setMatColorOffset(u32 offs) { + mMatColorOffset = offs; } /* 802EB8EC-802EB8F4 .text setColorChanOffset__21J3DColorBlockLightOffFUl */ -void J3DColorBlockLightOff::setColorChanOffset(unsigned long) { - /* Nonmatching */ +void J3DColorBlockLightOff::setColorChanOffset(u32 offs) { + mColorChanOffset = offs; } /* 802EB8F4-802EB900 .text getType__13J3DPEBlockXluFv */ -void J3DPEBlockXlu::getType() { - /* Nonmatching */ +u32 J3DPEBlockXlu::getType() { + return 'PEXL'; } /* 802EB900-802EB95C .text __dt__13J3DPEBlockXluFv */ @@ -2122,8 +2127,8 @@ J3DPEBlockXlu::~J3DPEBlockXlu() { } /* 802EB95C-802EB968 .text getType__17J3DPEBlockTexEdgeFv */ -void J3DPEBlockTexEdge::getType() { - /* Nonmatching */ +u32 J3DPEBlockTexEdge::getType() { + return 'PEED'; } /* 802EB968-802EB9C4 .text __dt__17J3DPEBlockTexEdgeFv */ @@ -2132,8 +2137,8 @@ J3DPEBlockTexEdge::~J3DPEBlockTexEdge() { } /* 802EB9C4-802EB9D0 .text getType__13J3DPEBlockOpaFv */ -void J3DPEBlockOpa::getType() { - /* Nonmatching */ +u32 J3DPEBlockOpa::getType() { + return 'PEOP'; } /* 802EB9D0-802EBA2C .text __dt__13J3DPEBlockOpaFv */ @@ -2142,63 +2147,63 @@ J3DPEBlockOpa::~J3DPEBlockOpa() { } /* 802EBA2C-802EBA38 .text getType__15J3DIndBlockFullFv */ -void J3DIndBlockFull::getType() { - /* Nonmatching */ +u32 J3DIndBlockFull::getType() { + return 'IBLF'; } /* 802EBA38-802EBA40 .text setIndTexStageNum__15J3DIndBlockFullFUc */ -void J3DIndBlockFull::setIndTexStageNum(unsigned char) { - /* Nonmatching */ +void J3DIndBlockFull::setIndTexStageNum(u8 num) { + mIndTexStageNum = num; } /* 802EBA40-802EBA48 .text getIndTexStageNum__15J3DIndBlockFullCFv */ -void J3DIndBlockFull::getIndTexStageNum() const { - /* Nonmatching */ +u8 J3DIndBlockFull::getIndTexStageNum() const { + return mIndTexStageNum; } /* 802EBA48-802EBA64 .text setIndTexOrder__15J3DIndBlockFullFUl14J3DIndTexOrder */ -void J3DIndBlockFull::setIndTexOrder(unsigned long, J3DIndTexOrder) { - /* Nonmatching */ +void J3DIndBlockFull::setIndTexOrder(u32 i, J3DIndTexOrder order) { + mIndTexOrder[i] = order; } /* 802EBA64-802EBA80 .text setIndTexOrder__15J3DIndBlockFullFUlPC14J3DIndTexOrder */ -void J3DIndBlockFull::setIndTexOrder(unsigned long, const J3DIndTexOrder*) { - /* Nonmatching */ +void J3DIndBlockFull::setIndTexOrder(u32 i, const J3DIndTexOrder* pOrder) { + mIndTexOrder[i] = *pOrder; } /* 802EBA80-802EBA94 .text getIndTexOrder__15J3DIndBlockFullFUl */ -void J3DIndBlockFull::getIndTexOrder(unsigned long) { - /* Nonmatching */ +J3DIndTexOrder * J3DIndBlockFull::getIndTexOrder(u32 i) { + return &mIndTexOrder[i]; } /* 802EBA94-802EBAEC .text setIndTexMtx__15J3DIndBlockFullFUl12J3DIndTexMtx */ -void J3DIndBlockFull::setIndTexMtx(unsigned long, J3DIndTexMtx) { - /* Nonmatching */ +void J3DIndBlockFull::setIndTexMtx(u32 i, J3DIndTexMtx mtx) { + mIndTexMtx[i] = mtx; } /* 802EBAEC-802EBB44 .text setIndTexMtx__15J3DIndBlockFullFUlPC12J3DIndTexMtx */ -void J3DIndBlockFull::setIndTexMtx(unsigned long, const J3DIndTexMtx*) { - /* Nonmatching */ +void J3DIndBlockFull::setIndTexMtx(u32 i, const J3DIndTexMtx* pMtx) { + mIndTexMtx[i] = *pMtx; } /* 802EBB44-802EBB58 .text getIndTexMtx__15J3DIndBlockFullFUl */ -void J3DIndBlockFull::getIndTexMtx(unsigned long) { - /* Nonmatching */ +J3DIndTexMtx * J3DIndBlockFull::getIndTexMtx(u32 i) { + return &mIndTexMtx[i]; } /* 802EBB58-802EBB74 .text setIndTexCoordScale__15J3DIndBlockFullFUl19J3DIndTexCoordScale */ -void J3DIndBlockFull::setIndTexCoordScale(unsigned long, J3DIndTexCoordScale) { - /* Nonmatching */ +void J3DIndBlockFull::setIndTexCoordScale(u32 i, J3DIndTexCoordScale scale) { + mIndTexCoordScale[i] = scale; } /* 802EBB74-802EBB90 .text setIndTexCoordScale__15J3DIndBlockFullFUlPC19J3DIndTexCoordScale */ -void J3DIndBlockFull::setIndTexCoordScale(unsigned long, const J3DIndTexCoordScale*) { - /* Nonmatching */ +void J3DIndBlockFull::setIndTexCoordScale(u32 i, const J3DIndTexCoordScale* pScale) { + mIndTexCoordScale[i] = *pScale; } /* 802EBB90-802EBBA4 .text getIndTexCoordScale__15J3DIndBlockFullFUl */ -void J3DIndBlockFull::getIndTexCoordScale(unsigned long) { - /* Nonmatching */ +J3DIndTexCoordScale * J3DIndBlockFull::getIndTexCoordScale(u32 i) { + return &mIndTexCoordScale[i]; } /* 802EBBA4-802EBC40 .text __dt__15J3DIndBlockFullFv */ @@ -2208,45 +2213,38 @@ J3DIndBlockFull::~J3DIndBlockFull() { /* 802EBC40-802EBC44 .text patchTexNo__11J3DTevBlockFv */ void J3DTevBlock::patchTexNo() { - /* Nonmatching */ } /* 802EBC44-802EBC48 .text patchTevReg__11J3DTevBlockFv */ void J3DTevBlock::patchTevReg() { - /* Nonmatching */ } /* 802EBC48-802EBC4C .text setTexNo__11J3DTevBlockFUlPCUs */ -void J3DTevBlock::setTexNo(unsigned long, const unsigned short*) { - /* Nonmatching */ +void J3DTevBlock::setTexNo(u32 i, const u16*) { } /* 802EBC4C-802EBC50 .text setTevOrder__11J3DTevBlockFUlPC11J3DTevOrder */ -void J3DTevBlock::setTevOrder(unsigned long, const J3DTevOrder*) { - /* Nonmatching */ +void J3DTevBlock::setTevOrder(u32 i, const J3DTevOrder* pOrder) { } /* 802EBC50-802EBC54 .text setTevStageNum__11J3DTevBlockFPCUc */ -void J3DTevBlock::setTevStageNum(const unsigned char*) { - /* Nonmatching */ +void J3DTevBlock::setTevStageNum(const u8* pNum) { } /* 802EBC54-802EBC58 .text setTevStage__11J3DTevBlockFUlPC11J3DTevStage */ -void J3DTevBlock::setTevStage(unsigned long, const J3DTevStage*) { - /* Nonmatching */ +void J3DTevBlock::setTevStage(u32 i, const J3DTevStage* pStage) { } /* 802EBC58-802EBC5C .text setIndTevStage__11J3DTevBlockFUlPC14J3DIndTevStage */ -void J3DTevBlock::setIndTevStage(unsigned long, const J3DIndTevStage*) { - /* Nonmatching */ +void J3DTevBlock::setIndTevStage(u32 i, const J3DIndTevStage* pStage) { } /* 802EBC5C-802EBC64 .text getTexNoOffset__11J3DTevBlockCFv */ -void J3DTevBlock::getTexNoOffset() const { - /* Nonmatching */ +u32 J3DTevBlock::getTexNoOffset() const { + return 0; } /* 802EBC64-802EBC70 .text getType__21J3DColorBlockLightOffFv */ -void J3DColorBlockLightOff::getType() { - /* Nonmatching */ +u32 J3DColorBlockLightOff::getType() { + return 'CLOF'; } diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/src/JSystem/J3DGraphBase/J3DMaterial.cpp index 264bebc80..e83bdefcb 100644 --- a/src/JSystem/J3DGraphBase/J3DMaterial.cpp +++ b/src/JSystem/J3DGraphBase/J3DMaterial.cpp @@ -7,52 +7,52 @@ #include "dolphin/types.h" /* 802DDBC4-802DDDC4 .text createColorBlock__11J3DMaterialFUl */ -void J3DMaterial::createColorBlock(unsigned long) { +J3DColorBlock * J3DMaterial::createColorBlock(u32) { /* Nonmatching */ } /* 802DDDC4-802DDF28 .text createTexGenBlock__11J3DMaterialFUl */ -void J3DMaterial::createTexGenBlock(unsigned long) { +J3DTexGenBlock * J3DMaterial::createTexGenBlock(u32) { /* Nonmatching */ } /* 802DDF28-802DE29C .text createTevBlock__11J3DMaterialFi */ -void J3DMaterial::createTevBlock(int) { +J3DTevBlock * J3DMaterial::createTevBlock(int) { /* Nonmatching */ } /* 802DE29C-802DE384 .text createIndBlock__11J3DMaterialFi */ -void J3DMaterial::createIndBlock(int) { +J3DIndBlock * J3DMaterial::createIndBlock(int) { /* Nonmatching */ } /* 802DE384-802DE548 .text createPEBlock__11J3DMaterialFUlUl */ -void J3DMaterial::createPEBlock(unsigned long, unsigned long) { +J3DPEBlock * J3DMaterial::createPEBlock(u32, u32) { /* Nonmatching */ } /* 802DE548-802DE598 .text calcSizeColorBlock__11J3DMaterialFUl */ -void J3DMaterial::calcSizeColorBlock(unsigned long) { +u32 J3DMaterial::calcSizeColorBlock(u32) { /* Nonmatching */ } /* 802DE598-802DE5C4 .text calcSizeTexGenBlock__11J3DMaterialFUl */ -void J3DMaterial::calcSizeTexGenBlock(unsigned long) { +u32 J3DMaterial::calcSizeTexGenBlock(u32) { /* Nonmatching */ } /* 802DE5C4-802DE60C .text calcSizeTevBlock__11J3DMaterialFi */ -void J3DMaterial::calcSizeTevBlock(int) { +u32 J3DMaterial::calcSizeTevBlock(int) { /* Nonmatching */ } /* 802DE60C-802DE620 .text calcSizeIndBlock__11J3DMaterialFi */ -void J3DMaterial::calcSizeIndBlock(int) { +u32 J3DMaterial::calcSizeIndBlock(int) { /* Nonmatching */ } /* 802DE620-802DE688 .text calcSizePEBlock__11J3DMaterialFUlUl */ -void J3DMaterial::calcSizePEBlock(unsigned long, unsigned long) { +u32 J3DMaterial::calcSizePEBlock(u32, u32) { /* Nonmatching */ } @@ -62,7 +62,7 @@ void J3DMaterial::initialize() { } /* 802DE6D8-802DE78C .text countDLSize__11J3DMaterialFv */ -void J3DMaterial::countDLSize() { +u32 J3DMaterial::countDLSize() { /* Nonmatching */ } @@ -97,7 +97,7 @@ void J3DMaterial::patch() { } /* 802DEC38-802DEE3C .text diff__11J3DMaterialFUl */ -void J3DMaterial::diff(unsigned long) { +void J3DMaterial::diff(u32) { /* Nonmatching */ } @@ -132,12 +132,12 @@ void J3DMaterial::change() { } /* 802DF118-802DF1AC .text newSharedDisplayList__11J3DMaterialFUl */ -void J3DMaterial::newSharedDisplayList(unsigned long) { +s32 J3DMaterial::newSharedDisplayList(u32) { /* Nonmatching */ } /* 802DF1AC-802DF240 .text newSingleSharedDisplayList__11J3DMaterialFUl */ -void J3DMaterial::newSingleSharedDisplayList(unsigned long) { +s32 J3DMaterial::newSingleSharedDisplayList(u32) { /* Nonmatching */ } @@ -167,7 +167,7 @@ void J3DPatchedMaterial::loadSharedDL() { } /* 802DF2EC-802DF338 .text calc__18J3DPatchedMaterialFPA4_Cf */ -void J3DPatchedMaterial::calc(const float(*)[4]) { +void J3DPatchedMaterial::calc(const Mtx) { /* Nonmatching */ } @@ -212,7 +212,7 @@ void J3DLockedMaterial::patch() { } /* 802DF3F0-802DF3F4 .text diff__17J3DLockedMaterialFUl */ -void J3DLockedMaterial::diff(unsigned long) { +void J3DLockedMaterial::diff(u32) { /* Nonmatching */ } @@ -267,27 +267,27 @@ J3DPEBlock::~J3DPEBlock() { } /* 802DF620-802DF628 .text countDLSize__14J3DTexGenBlockFv */ -void J3DTexGenBlock::countDLSize() { +s32 J3DTexGenBlock::countDLSize() { /* Nonmatching */ } /* 802DF628-802DF630 .text countDLSize__13J3DColorBlockFv */ -void J3DColorBlock::countDLSize() { +s32 J3DColorBlock::countDLSize() { /* Nonmatching */ } /* 802DF630-802DF638 .text countDLSize__11J3DTevBlockFv */ -void J3DTevBlock::countDLSize() { +s32 J3DTevBlock::countDLSize() { /* Nonmatching */ } /* 802DF638-802DF640 .text countDLSize__11J3DIndBlockFv */ -void J3DIndBlock::countDLSize() { +s32 J3DIndBlock::countDLSize() { /* Nonmatching */ } /* 802DF640-802DF648 .text countDLSize__10J3DPEBlockFv */ -void J3DPEBlock::countDLSize() { +s32 J3DPEBlock::countDLSize() { /* Nonmatching */ } @@ -297,7 +297,7 @@ void J3DColorBlock::load() { } /* 802DF64C-802DF654 .text getCullMode__13J3DColorBlockCFv */ -void J3DColorBlock::getCullMode() const { +u8 J3DColorBlock::getCullMode() const { /* Nonmatching */ } @@ -307,7 +307,7 @@ void J3DTevBlock::load() { } /* 802DF658-802DF660 .text getNBTScale__14J3DTexGenBlockFv */ -void J3DTexGenBlock::getNBTScale() { +J3DNBTScale * J3DTexGenBlock::getNBTScale() { /* Nonmatching */ } @@ -317,12 +317,12 @@ void J3DColorBlock::patch() { } /* 802DF664-802DF668 .text diff__13J3DColorBlockFUl */ -void J3DColorBlock::diff(unsigned long) { +void J3DColorBlock::diff(u32) { /* Nonmatching */ } /* 802DF668-802DF66C .text diff__10J3DPEBlockFUl */ -void J3DPEBlock::diff(unsigned long) { +void J3DPEBlock::diff(u32) { /* Nonmatching */ } @@ -382,37 +382,37 @@ void J3DPEBlock::setZMode(const J3DZMode*) { } /* 802DF698-802DF69C .text setZCompLoc__10J3DPEBlockFPCUc */ -void J3DPEBlock::setZCompLoc(const unsigned char*) { +void J3DPEBlock::setZCompLoc(const u8*) { /* Nonmatching */ } /* 802DF69C-802DF6A0 .text setDither__10J3DPEBlockFUc */ -void J3DPEBlock::setDither(unsigned char) { +void J3DPEBlock::setDither(u8) { /* Nonmatching */ } /* 802DF6A0-802DF6A4 .text setDither__10J3DPEBlockFPCUc */ -void J3DPEBlock::setDither(const unsigned char*) { +void J3DPEBlock::setDither(const u8*) { /* Nonmatching */ } /* 802DF6A4-802DF6AC .text getDither__10J3DPEBlockCFv */ -void J3DPEBlock::getDither() const { +u8 J3DPEBlock::getDither() const { /* Nonmatching */ } /* 802DF6AC-802DF6B4 .text getFogOffset__10J3DPEBlockCFv */ -void J3DPEBlock::getFogOffset() const { +u32 J3DPEBlock::getFogOffset() const { /* Nonmatching */ } /* 802DF6B4-802DF6B8 .text setFogOffset__10J3DPEBlockFUl */ -void J3DPEBlock::setFogOffset(unsigned long) { +void J3DPEBlock::setFogOffset(u32) { /* Nonmatching */ } /* 802DF6B8-802DF6BC .text diff__15J3DIndBlockNullFUl */ -void J3DIndBlockNull::diff(unsigned long) { +void J3DIndBlockNull::diff(u32) { /* Nonmatching */ } @@ -427,7 +427,7 @@ void J3DIndBlockNull::reset(J3DIndBlock*) { } /* 802DF6C4-802DF6D0 .text getType__15J3DIndBlockNullFv */ -void J3DIndBlockNull::getType() { +u32 J3DIndBlockNull::getType() { /* Nonmatching */ } @@ -437,27 +437,27 @@ J3DIndBlockNull::~J3DIndBlockNull() { } /* 802DF72C-802DF730 .text setIndTexOrder__11J3DIndBlockFUlPC14J3DIndTexOrder */ -void J3DIndBlock::setIndTexOrder(unsigned long, const J3DIndTexOrder*) { +void J3DIndBlock::setIndTexOrder(u32, const J3DIndTexOrder*) { /* Nonmatching */ } /* 802DF730-802DF734 .text setIndTexOrder__11J3DIndBlockFUl14J3DIndTexOrder */ -void J3DIndBlock::setIndTexOrder(unsigned long, J3DIndTexOrder) { +void J3DIndBlock::setIndTexOrder(u32, J3DIndTexOrder) { /* Nonmatching */ } /* 802DF734-802DF738 .text setIndTexMtx__11J3DIndBlockFUlPC12J3DIndTexMtx */ -void J3DIndBlock::setIndTexMtx(unsigned long, const J3DIndTexMtx*) { +void J3DIndBlock::setIndTexMtx(u32, const J3DIndTexMtx*) { /* Nonmatching */ } /* 802DF738-802DF73C .text setIndTexCoordScale__11J3DIndBlockFUlPC19J3DIndTexCoordScale */ -void J3DIndBlock::setIndTexCoordScale(unsigned long, const J3DIndTexCoordScale*) { +void J3DIndBlock::setIndTexCoordScale(u32, const J3DIndTexCoordScale*) { /* Nonmatching */ } /* 802DF73C-802DF740 .text setTexGenNum__14J3DTexGenBlockFPCUl */ -void J3DTexGenBlock::setTexGenNum(const unsigned long*) { +void J3DTexGenBlock::setTexGenNum(const u32*) { /* Nonmatching */ } @@ -472,12 +472,12 @@ void J3DTexGenBlock::setNBTScale(const J3DNBTScale*) { } /* 802DF748-802DF750 .text getTexMtxOffset__14J3DTexGenBlockCFv */ -void J3DTexGenBlock::getTexMtxOffset() const { +u32 J3DTexGenBlock::getTexMtxOffset() const { /* Nonmatching */ } /* 802DF750-802DF754 .text setTexMtxOffset__14J3DTexGenBlockFUl */ -void J3DTexGenBlock::setTexMtxOffset(unsigned long) { +void J3DTexGenBlock::setTexMtxOffset(u32) { /* Nonmatching */ } @@ -497,51 +497,51 @@ void J3DColorBlock::diffLight() { } /* 802DF760-802DF764 .text setMatColor__13J3DColorBlockFUlPC10J3DGXColor */ -void J3DColorBlock::setMatColor(unsigned long, const J3DGXColor*) { +void J3DColorBlock::setMatColor(u32, const J3DGXColor*) { /* Nonmatching */ } /* 802DF764-802DF768 .text setAmbColor__13J3DColorBlockFUlPC10J3DGXColor */ -void J3DColorBlock::setAmbColor(unsigned long, const J3DGXColor*) { +void J3DColorBlock::setAmbColor(u32, const J3DGXColor*) { /* Nonmatching */ } /* 802DF768-802DF76C .text setColorChanNum__13J3DColorBlockFPCUc */ -void J3DColorBlock::setColorChanNum(const unsigned char*) { +void J3DColorBlock::setColorChanNum(const u8*) { /* Nonmatching */ } /* 802DF76C-802DF770 .text setColorChan__13J3DColorBlockFUlPC12J3DColorChan */ -void J3DColorBlock::setColorChan(unsigned long, const J3DColorChan*) { +void J3DColorBlock::setColorChan(u32, const J3DColorChan*) { /* Nonmatching */ } /* 802DF770-802DF778 .text getLight__13J3DColorBlockFUl */ -void J3DColorBlock::getLight(unsigned long) { +J3DLightObj * J3DColorBlock::getLight(u32) { /* Nonmatching */ } /* 802DF778-802DF77C .text setCullMode__13J3DColorBlockFPCUc */ -void J3DColorBlock::setCullMode(const unsigned char*) { +void J3DColorBlock::setCullMode(const u8*) { /* Nonmatching */ } /* 802DF77C-802DF784 .text getMatColorOffset__13J3DColorBlockCFv */ -void J3DColorBlock::getMatColorOffset() const { +u32 J3DColorBlock::getMatColorOffset() const { /* Nonmatching */ } /* 802DF784-802DF78C .text getColorChanOffset__13J3DColorBlockCFv */ -void J3DColorBlock::getColorChanOffset() const { +u32 J3DColorBlock::getColorChanOffset() const { /* Nonmatching */ } /* 802DF78C-802DF790 .text setMatColorOffset__13J3DColorBlockFUl */ -void J3DColorBlock::setMatColorOffset(unsigned long) { +void J3DColorBlock::setMatColorOffset(u32) { /* Nonmatching */ } /* 802DF790-802DF794 .text setColorChanOffset__13J3DColorBlockFUl */ -void J3DColorBlock::setColorChanOffset(unsigned long) { +void J3DColorBlock::setColorChanOffset(u32) { /* Nonmatching */ } diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3DGraphBase/J3DPacket.cpp index ee5e48a5e..9e2e58854 100644 --- a/src/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/src/JSystem/J3DGraphBase/J3DPacket.cpp @@ -351,19 +351,8 @@ void J3DShapePacket::draw() { if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) { prepareDraw(); -#if 0 - if (mpTexMtxObj != NULL) { - J3DMaterial* material = mpShape->getMaterial(); - J3DDifferedTexMtx::sTexGenBlock = material->getTexGenBlock(); - J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj(); - } else { - J3DDifferedTexMtx::sTexGenBlock = NULL; - } -#endif - - if (mpDisplayListObj != NULL) { + if (mpDisplayListObj != NULL) mpDisplayListObj->callDL(); - } mpShape->draw(); } @@ -373,17 +362,6 @@ void J3DShapePacket::draw() { void J3DShapePacket::drawFast() { if (!checkFlag(J3DShpFlag_Hidden) && mpShape != NULL) { prepareDraw(); - -#if 0 - if (mpTexMtxObj != NULL) { - J3DMaterial* material = mpShape->getMaterial(); - J3DDifferedTexMtx::sTexGenBlock = material->getTexGenBlock(); - J3DDifferedTexMtx::sTexMtxObj = getTexMtxObj(); - } else { - J3DDifferedTexMtx::sTexGenBlock = NULL; - } -#endif - mpShape->drawFast(); } } diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp index c408fa65a..4dc0bc082 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -7,17 +7,17 @@ #include "dolphin/types.h" /* 802FB758-802FB8A4 .text load__22J3DModelLoaderDataBaseFPCvUl */ -void J3DModelLoaderDataBase::load(const void*, unsigned long) { +J3DModelData * J3DModelLoaderDataBase::load(const void*, unsigned long) { /* Nonmatching */ } /* 802FB8A4-802FB94C .text loadMaterialTable__22J3DModelLoaderDataBaseFPCv */ -void J3DModelLoaderDataBase::loadMaterialTable(const void*) { +J3DMaterialTable * J3DModelLoaderDataBase::loadMaterialTable(const void*) { /* Nonmatching */ } /* 802FB94C-802FBA04 .text loadBinaryDisplayList__22J3DModelLoaderDataBaseFPCvUl */ -void J3DModelLoaderDataBase::loadBinaryDisplayList(const void*, unsigned long) { +J3DModelData * J3DModelLoaderDataBase::loadBinaryDisplayList(const void*, unsigned long) { /* Nonmatching */ }