Work on J2DPictureEx (#1919)

3 files changed, 55 insertions, 50 deletions

diff --git a/include/JSystem/J2DGraph/J2DPicture.h b/include/JSystem/J2DGraph/J2DPicture.h
index 64747f1078..bc64178f92 100644
--- a/include/JSystem/J2DGraph/J2DPicture.h
+++ b/include/JSystem/J2DGraph/J2DPicture.h
@@ -28,7 +28,8 @@ struct J2DScrnBlockPictureParameter {
     /* 0x00 */ u16 field_0x0;
     /* 0x02 */ u16 mMaterialNum;
     /* 0x04 */ u16 field_0x4;
-    /* 0x04 */ u8 field_0x6[10];
+    /* 0x06 */ u16 field_0x6;
+    /* 0x08 */ u16 field_0x8[4];
     /* 0x10 */ JGeometry::TVec2<s16> field_0x10[4];
     /* 0x20 */ u32 mCornerColor[4];
 };  // Size: 0x30
@@ -44,24 +45,24 @@ public:
     /* 802FF65C */ virtual void rewriteAlpha();
     /* 802FCCDC */ virtual void initiate(ResTIMG const*, ResTLUT const*);
     /* 802FD098 */ virtual bool prepareTexture(u8);
-    /* 801BDD40 */ virtual void append(ResTIMG const*, f32);
-    /* 802FF238 */ virtual void append(ResTIMG const*, JUTPalette*, f32);
-    /* 80020338 */ virtual void append(char const*, f32);
-    /* 802FF2F0 */ virtual void append(char const*, JUTPalette*, f32);
-    /* 802FF208 */ virtual void append(JUTTexture*, f32);
+    /* 801BDD40 */ virtual bool append(ResTIMG const*, f32);
+    /* 802FF238 */ virtual bool append(ResTIMG const*, JUTPalette*, f32);
+    /* 80020338 */ virtual bool append(char const*, f32);
+    /* 802FF2F0 */ virtual bool append(char const*, JUTPalette*, f32);
+    /* 802FF208 */ virtual bool append(JUTTexture*, f32);
     /* 802FF3E0 */ virtual void prepend(ResTIMG const*, f32);
     /* 802FF3B0 */ virtual void prepend(ResTIMG const*, JUTPalette*, f32);
     /* 802FF380 */ virtual void prepend(char const*, f32);
     /* 802FF350 */ virtual void prepend(char const*, JUTPalette*, f32);
     /* 802FF320 */ virtual void prepend(JUTTexture*, f32);
     /* 801BDD70 */ virtual void insert(ResTIMG const*, u8, f32);
-    /* 802FD168 */ virtual void insert(ResTIMG const*, JUTPalette*, u8, f32);
+    /* 802FD168 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
     /* 80020368 */ virtual void insert(char const*, u8, f32);
-    /* 802FD4B4 */ virtual void insert(char const*, JUTPalette*, u8, f32);
-    /* 802FD524 */ virtual void insert(JUTTexture*, u8, f32);
-    /* 802FD6F4 */ virtual int remove(u8);
-    /* 802FF410 */ virtual int remove();
-    /* 802FD814 */ virtual void remove(JUTTexture*);
+    /* 802FD4B4 */ virtual bool insert(char const*, JUTPalette*, u8, f32);
+    /* 802FD524 */ virtual bool insert(JUTTexture*, u8, f32);
+    /* 802FD6F4 */ virtual bool remove(u8);
+    /* 802FF410 */ virtual bool remove();
+    /* 802FD814 */ virtual bool remove(JUTTexture*);
     /* 802FF4E0 */ virtual void draw(f32, f32, bool, bool, bool);
     /* 802FF448 */ virtual void draw(f32, f32, u8, bool, bool, bool);
     /* 802FDC70 */ virtual void draw(f32, f32, f32, f32, bool, bool, bool);
@@ -73,22 +74,22 @@ public:
     /* 800202CC */ virtual void setBlendRatio(f32, f32);
     /* 802FEA74 */ virtual void setBlendColorRatio(f32, f32);
     /* 802FEA9C */ virtual void setBlendAlphaRatio(f32, f32);
-    /* 802FD874 */ virtual void changeTexture(ResTIMG const*, u8);
-    /* 802FD964 */ virtual void changeTexture(char const*, u8);
-    /* 802FD9BC */ virtual void changeTexture(ResTIMG const*, u8, JUTPalette*);
-    /* 802FDAC8 */ virtual void changeTexture(char const*, u8, JUTPalette*);
-    /* 800539DC */ virtual void getTexture(u8) const;
+    /* 802FD874 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
+    /* 802FD964 */ virtual const ResTIMG* changeTexture(char const*, u8);
+    /* 802FD9BC */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
+    /* 802FDAC8 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
+    /* 800539DC */ virtual JUTTexture* getTexture(u8) const;
     /* 802FF634 */ virtual u8 getTextureCount() const;
-    /* 80053C6C */ virtual void setBlack(JUtility::TColor);
-    /* 80053C44 */ virtual void setWhite(JUtility::TColor);
-    /* 8018BEE0 */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor);
+    /* 80053C6C */ virtual bool setBlack(JUtility::TColor);
+    /* 80053C44 */ virtual bool setWhite(JUtility::TColor);
+    /* 8018BEE0 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
     /* 801DFA4C */ virtual JUtility::TColor getBlack() const;
     /* 801DFA40 */ virtual JUtility::TColor getWhite() const;
     /* 8025603C */ virtual bool getMaterial() const;
     /* 802FDBFC */ virtual void drawFullSet(f32, f32, f32, f32, Mtx*);
     /* 802FE380 */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
                                              s16, Mtx*);
-    /* 802FF100 */ virtual void getUsableTlut(u8);
+    /* 802FF100 */ virtual u8 getUsableTlut(u8);
 
     /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
     /* 802FC708 */ J2DPicture(ResTIMG const*);
@@ -106,7 +107,7 @@ public:
     /* 802FED84 */ void setTexCoord(JGeometry::TVec2<s16>*, JUTTexture const*, J2DBinding,
                                     J2DMirror, bool);
     /* 802FED44 */ void setTexCoord(JUTTexture const*, J2DBinding, J2DMirror, bool);
-    /* 802FF1D0 */ u8 getTlutID(ResTIMG const*, u8);
+    /* 802FF1D0 */ GXTlut getTlutID(ResTIMG const*, u8);
 
     void setCornerColor(JUtility::TColor c0, JUtility::TColor c1, JUtility::TColor c2,
                         JUtility::TColor c3) {
@@ -116,12 +117,13 @@ public:
         mCornerColor[3] = c3;
     }
 
-private:
+protected:
     /* 0x100 */ JUTTexture* mTexture[2];
     /* 0x108 */ u8 mTextureCount;
     /* 0x109 */ u8 field_0x109;
     /* 0x10A */ JGeometry::TVec2<s16> field_0x10a[4];
-    /* 0x11C */ f32 field_0x11c[4];
+    /* 0x11C */ f32 field_0x11c[2];
+    /* 0x124 */ f32 field_0x124[2];
     /* 0x12C */ JUTPalette* mPalette;
     /* 0x130 */ JUtility::TColor mWhite;
     /* 0x134 */ JUtility::TColor mBlack;
diff --git a/include/JSystem/J2DGraph/J2DPictureEx.h b/include/JSystem/J2DGraph/J2DPictureEx.h
index 40539fe27f..51b1748299 100644
--- a/include/JSystem/J2DGraph/J2DPictureEx.h
+++ b/include/JSystem/J2DGraph/J2DPictureEx.h
@@ -13,8 +13,8 @@ public:
 
     /* 803036EC */ J2DPictureEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
     /* 803040E4 */ void insertCommon(u8, f32);
-    /* 8030437C */ void isInsert(u8) const;
-    /* 80304728 */ void isRemove(u8) const;
+    /* 8030437C */ bool isInsert(u8) const;
+    /* 80304728 */ bool isRemove(u8) const;
     /* 803052AC */ void setTevOrder(u8, u8, bool);
     /* 803053E0 */ void setTevStage(u8, u8, bool);
     /* 80305688 */ void setStage(J2DTevStage*, J2DPictureEx::stage_enum);
@@ -22,8 +22,8 @@ public:
     /* 80305C70 */ void setTevKColorSel(u8);
     /* 80305D18 */ void setTevKAlphaSel(u8);
     /* 80305DC0 */ void shiftSetBlendRatio(u8, f32, bool, bool);
-    /* 80306664 */ void getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
-    /* 80306824 */ void isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
+    /* 80306664 */ bool getBlackWhite(JUtility::TColor*, JUtility::TColor*) const;
+    /* 80306824 */ bool isSetBlackWhite(JUtility::TColor, JUtility::TColor) const;
 
     /* 8030393C */ virtual ~J2DPictureEx();
     /* 80307168 */ virtual void setCullBack(bool);
@@ -43,25 +43,25 @@ public:
     /* 80306B7C */ virtual void setAnimation(J2DAnmVtxColor*);
     /* 80306C70 */ virtual void animationPane(J2DAnmTransform const*);
     /* 80303640 */ virtual void initiate(ResTIMG const*, ResTLUT const*);
-    /* 803039CC */ virtual void prepareTexture(u8);
-    /* 80306ED4 */ virtual void append(ResTIMG const*, f32);
-    /* 80303E5C */ virtual void append(ResTIMG const*, JUTPalette*, f32);
-    /* 80306F04 */ virtual void append(char const*, f32);
-    /* 80303EA4 */ virtual void append(char const*, JUTPalette*, f32);
-    /* 80303EEC */ virtual void append(JUTTexture*, f32);
+    /* 803039CC */ virtual bool prepareTexture(u8);
+    /* 80306ED4 */ virtual bool append(ResTIMG const*, f32);
+    /* 80303E5C */ virtual bool append(ResTIMG const*, JUTPalette*, f32);
+    /* 80306F04 */ virtual bool append(char const*, f32);
+    /* 80303EA4 */ virtual bool append(char const*, JUTPalette*, f32);
+    /* 80303EEC */ virtual bool append(JUTTexture*, f32);
     /* 80306FF4 */ virtual void prepend(ResTIMG const*, f32);
     /* 80306FC4 */ virtual void prepend(ResTIMG const*, JUTPalette*, f32);
     /* 80306F94 */ virtual void prepend(char const*, f32);
     /* 80306F64 */ virtual void prepend(char const*, JUTPalette*, f32);
     /* 80306F34 */ virtual void prepend(JUTTexture*, f32);
     /* 80307058 */ virtual void insert(ResTIMG const*, u8, f32);
-    /* 80303F34 */ virtual void insert(ResTIMG const*, JUTPalette*, u8, f32);
+    /* 80303F34 */ virtual bool insert(ResTIMG const*, JUTPalette*, u8, f32);
     /* 80307024 */ virtual void insert(char const*, u8, f32);
-    /* 80303FD8 */ virtual void insert(char const*, JUTPalette*, u8, f32);
-    /* 80304048 */ virtual void insert(JUTTexture*, u8, f32);
-    /* 8030446C */ virtual void remove(u8);
-    /* 80304608 */ virtual void remove();
-    /* 8030466C */ virtual void remove(JUTTexture*);
+    /* 80303FD8 */ virtual bool insert(char const*, JUTPalette*, u8, f32);
+    /* 80304048 */ virtual bool insert(JUTTexture*, u8, f32);
+    /* 8030446C */ virtual bool remove(u8);
+    /* 80304608 */ virtual bool remove();
+    /* 8030466C */ virtual bool remove(JUTTexture*);
     /* 8030708C */ virtual void draw(f32, f32, bool, bool, bool);
     /* 8030477C */ virtual void draw(f32, f32, u8, bool, bool, bool);
     /* 80304890 */ virtual void draw(f32, f32, f32, f32, bool, bool, bool);
@@ -72,22 +72,22 @@ public:
     /* 80307134 */ virtual void load(u8);
     /* 80305ED4 */ virtual void setBlendColorRatio(f32, f32);
     /* 80305F34 */ virtual void setBlendAlphaRatio(f32, f32);
-    /* 80305F94 */ virtual void changeTexture(ResTIMG const*, u8);
-    /* 803060DC */ virtual void changeTexture(char const*, u8);
-    /* 80306134 */ virtual void changeTexture(ResTIMG const*, u8, JUTPalette*);
-    /* 80306298 */ virtual void changeTexture(char const*, u8, JUTPalette*);
-    /* 803062F8 */ virtual void getTexture(u8) const;
-    /* 80306350 */ virtual void getTextureCount() const;
-    /* 80306370 */ virtual void setBlack(JUtility::TColor);
-    /* 803063F8 */ virtual void setWhite(JUtility::TColor);
-    /* 80306480 */ virtual void setBlackWhite(JUtility::TColor, JUtility::TColor);
+    /* 80305F94 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8);
+    /* 803060DC */ virtual const ResTIMG* changeTexture(char const*, u8);
+    /* 80306134 */ virtual const ResTIMG* changeTexture(ResTIMG const*, u8, JUTPalette*);
+    /* 80306298 */ virtual const ResTIMG* changeTexture(char const*, u8, JUTPalette*);
+    /* 803062F8 */ virtual JUTTexture* getTexture(u8) const;
+    /* 80306350 */ virtual u8 getTextureCount() const;
+    /* 80306370 */ virtual bool setBlack(JUtility::TColor);
+    /* 803063F8 */ virtual bool setWhite(JUtility::TColor);
+    /* 80306480 */ virtual bool setBlackWhite(JUtility::TColor, JUtility::TColor);
     /* 803068F8 */ virtual void getBlack() const;
     /* 80306958 */ virtual void getWhite() const;
     /* 80256034 */ virtual void getMaterial() const;
     /* 80303B80 */ virtual void drawFullSet(f32, f32, f32, f32, f32 (*)[3][4]);
     /* 80303BDC */ virtual void drawTexCoord(f32, f32, f32, f32, s16, s16, s16, s16, s16, s16, s16,
                                              s16, f32 (*)[3][4]);
-    /* 80306DC8 */ virtual void getUsableTlut(u8);
+    /* 80306DC8 */ virtual u8 getUsableTlut(u8);
 
 private:
     /* 0x150 */ J2DMaterial* mMaterial;
diff --git a/include/JSystem/J2DGraph/J2DTevs.h b/include/JSystem/J2DGraph/J2DTevs.h
index 9443e41e1f..85eaff013e 100644
--- a/include/JSystem/J2DGraph/J2DTevs.h
+++ b/include/JSystem/J2DGraph/J2DTevs.h
@@ -36,8 +36,11 @@ struct J2DTexMtxInfo {
 
 };  // Size: 0x24
 
+extern J2DTexMtxInfo const j2dDefaultTexMtxInfo;
+
 class J2DTexMtx {
 public:
+    J2DTexMtx() { mInfo = j2dDefaultTexMtxInfo; }
     J2DTexMtx(const J2DTexMtxInfo& info) { mInfo = info; }
     /* 802E9C90 */ void load(u32);
     /* 802E9CC4 */ void calc();