auto decompile more functions

11 files changed, 119 insertions, 119 deletions

diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
index 8f52d5d193..eb125a07be 100644
--- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp
+++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
@@ -77,15 +77,15 @@ struct J2DTevOrder {
     /* 802F1B70 */ J2DTevOrder();
 };
 
-struct J2DGXColorS10 {
-    /* 802F1B90 */ J2DGXColorS10();
-};
-
 struct J2DIndTevStage {
     /* 802EA044 */ void load(u8);
     /* 802F18A0 */ J2DIndTevStage();
 };
 
+struct J2DGXColorS10 {
+    /* 802F1B90 */ J2DGXColorS10();
+};
+
 struct J2DTevBlock8 {
     /* 802EED64 */ J2DTevBlock8();
     /* 802EEE8C */ ~J2DTevBlock8();
diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp
index 1256fcbeb2..e11c7b155e 100644
--- a/libs/JSystem/J2DGraph/J2DMaterial.cpp
+++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp
@@ -86,6 +86,12 @@ struct J2DAnmTextureSRTKey {
     /* 8030B9F0 */ void calcTransform(f32, u16, J3DTextureSRTInfo*) const;
 };
 
+struct J2DAnmTexPattern {
+    /* 8030BEE8 */ void getTexNo(u16, u16*) const;
+    /* 8030BF9C */ void getResTIMG(u16) const;
+    /* 8030BFF0 */ void getPalette(u16) const;
+};
+
 struct J2DAnmColor {
     /* 802EB390 */ void getColor(u16, _GXColor*) const;
 };
@@ -95,12 +101,6 @@ struct J2DAnmTevRegKey {
     /* 8030C3B4 */ void getTevKonstReg(u16, _GXColor*) const;
 };
 
-struct J2DAnmTexPattern {
-    /* 8030BEE8 */ void getTexNo(u16, u16*) const;
-    /* 8030BF9C */ void getResTIMG(u16) const;
-    /* 8030BFF0 */ void getPalette(u16) const;
-};
-
 struct J2DMaterial {
     struct J2DMaterialAnmPointer {
         /* 802EA79C */ J2DMaterialAnmPointer();
diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
index 595cd2f6fb..1b113de5a5 100644
--- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
+++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
@@ -38,13 +38,13 @@ struct J2DResReference {
     /* 8030CF44 */ void getName(u16) const;
 };
 
-struct J2DMaterialBlock {};
-
 struct J2DMaterial {
     /* 802EA410 */ void createTevBlock(int, bool);
     /* 802EA5C4 */ void createIndBlock(int, bool);
 };
 
+struct J2DMaterialBlock {};
+
 struct J2DMaterialFactory {
     /* 802F2AD0 */ J2DMaterialFactory(J2DMaterialBlock const&);
     /* 802F2C94 */ void countStages(int) const;
diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp
index 1345dd6b3d..07ff9a44f0 100644
--- a/libs/JSystem/J2DGraph/J2DPane.cpp
+++ b/libs/JSystem/J2DGraph/J2DPane.cpp
@@ -60,29 +60,29 @@ struct J2DScreen {
 
 struct J2DRotateAxis {};
 
+struct J2DAnmVtxColor {};
+
+struct J2DAnmTexPattern {};
+
+struct J2DAnmTextureSRTKey {};
+
 struct J2DAnmTevRegKey {};
 
-struct J2DAnmTransform {};
+struct J2DBasePosition {};
 
 struct J2DGrafContext {
     /* 802E8E20 */ void setScissor();
     /* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
 };
 
-struct J2DAnmVtxColor {};
-
-struct J2DAnmTextureSRTKey {};
+struct J2DAnmVisibilityFull {};
 
 struct J2DAnmColor {};
 
-struct J2DBasePosition {};
-
-struct J2DAnmVisibilityFull {};
+struct J2DAnmTransform {};
 
 struct J2DAnmBase {};
 
-struct J2DAnmTexPattern {};
-
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
     /* 80053BC0 */ void calcMtx();
diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp
index 7162e7f3cc..688a2ec303 100644
--- a/libs/JSystem/J2DGraph/J2DPicture.cpp
+++ b/libs/JSystem/J2DGraph/J2DPicture.cpp
@@ -75,23 +75,21 @@ struct J2DScreen {
 
 struct J2DMirror {};
 
-struct J2DBinding {};
-
-struct J2DAnmColor {};
+struct J2DAnmTexPattern {};
 
-struct J2DAnmTevRegKey {};
+struct J2DAnmVtxColor {};
 
 struct J2DAnmVisibilityFull {};
 
-struct J2DAnmBase {};
+struct J2DAnmColor {};
 
 struct J2DAnmTransform {};
 
-struct J2DAnmVtxColor {};
-
 struct J2DAnmTextureSRTKey {};
 
-struct J2DAnmTexPattern {};
+struct J2DAnmTevRegKey {};
+
+struct J2DAnmBase {};
 
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
@@ -136,6 +134,8 @@ struct J2DPane {
 
 struct J2DMaterial {};
 
+struct J2DBinding {};
+
 struct J2DPicture {
     /* 800202CC */ void setBlendRatio(f32, f32);
     /* 802FF208 */ void append(JUTTexture*, f32);
diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
index b97ba1700e..07e4e2cd5f 100644
--- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
@@ -71,18 +71,30 @@ struct J2DScreen {
     /* 802F9640 */ void getNameResource(char const*);
 };
 
-struct J2DAnmTevRegKey {};
-
-struct J2DAnmTransform {};
+struct J2DAnmTexPattern {};
 
 struct J2DAnmVtxColor {};
 
 struct J2DAnmTextureSRTKey {};
 
+struct J2DAnmColor {};
+
+struct J2DAnmTevRegKey {};
+
+struct J2DMaterial {
+    /* 802EA38C */ void setGX();
+    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
+    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
+    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
+    /* 802EA89C */ void setAnimation(J2DAnmColor*);
+};
+
 struct J2DAnmVisibilityFull {
     /* 8030C048 */ void getVisibility(u16, u8*) const;
 };
 
+struct J2DAnmTransform {};
+
 struct J2DAnmBase {};
 
 struct J2DPane {
@@ -110,18 +122,6 @@ struct J2DPane {
     /* 802F8474 */ void update();
 };
 
-struct J2DAnmTexPattern {};
-
-struct J2DAnmColor {};
-
-struct J2DMaterial {
-    /* 802EA38C */ void setGX();
-    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
-    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
-    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
-    /* 802EA89C */ void setAnimation(J2DAnmColor*);
-};
-
 struct J2DPictureEx {
     struct stage_enum {};
 
diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp
index bb02b93edb..48216f5478 100644
--- a/libs/JSystem/J2DGraph/J2DScreen.cpp
+++ b/libs/JSystem/J2DGraph/J2DScreen.cpp
@@ -52,15 +52,33 @@ struct JGeometry {
     struct TBox2__template0 {};
 };
 
+struct J2DAnmTextureSRTKey {};
+
+struct J2DAnmTexPattern {};
+
+struct J2DAnmColor {};
+
+struct J2DAnmTevRegKey {};
+
+struct J2DMaterial {
+    /* 802EA1AC */ J2DMaterial();
+    /* 802EA2CC */ ~J2DMaterial();
+    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
+    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
+    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
+    /* 802EA89C */ void setAnimation(J2DAnmColor*);
+    /* 802EAC78 */ void animation();
+};
+
 struct J2DAnmVisibilityFull {};
 
-struct J2DAnmBase {};
+struct J2DAnmVtxColor {};
 
 struct J2DAnmTransform {};
 
-struct J2DGrafContext {};
+struct J2DAnmBase {};
 
-struct J2DAnmVtxColor {};
+struct J2DGrafContext {};
 
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
@@ -91,24 +109,6 @@ struct J2DPane {
     /* 802F8478 */ void drawSelf(f32, f32);
 };
 
-struct J2DAnmTextureSRTKey {};
-
-struct J2DAnmColor {};
-
-struct J2DAnmTevRegKey {};
-
-struct J2DAnmTexPattern {};
-
-struct J2DMaterial {
-    /* 802EA1AC */ J2DMaterial();
-    /* 802EA2CC */ ~J2DMaterial();
-    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
-    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
-    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
-    /* 802EA89C */ void setAnimation(J2DAnmColor*);
-    /* 802EAC78 */ void animation();
-};
-
 struct J2DWindowEx {
     /* 80300C94 */ J2DWindowEx(J2DPane*, JSURandomInputStream*, u32, J2DMaterial*);
 };
diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp
index 976bfce106..5ddd27ad8c 100644
--- a/libs/JSystem/J2DGraph/J2DTextBox.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp
@@ -53,21 +53,21 @@ struct J2DTextBoxVBinding {};
 
 struct J2DTextBoxHBinding {};
 
-struct J2DAnmColor {};
+struct J2DAnmTexPattern {};
 
-struct J2DAnmTevRegKey {};
+struct J2DAnmVtxColor {};
 
 struct J2DAnmVisibilityFull {};
 
-struct J2DAnmBase {};
+struct J2DAnmColor {};
 
 struct J2DAnmTransform {};
 
-struct J2DAnmVtxColor {};
-
 struct J2DAnmTextureSRTKey {};
 
-struct J2DAnmTexPattern {};
+struct J2DAnmTevRegKey {};
+
+struct J2DAnmBase {};
 
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
index e5ce8cbfc3..d5d05f1b3f 100644
--- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
@@ -38,20 +38,30 @@ struct J2DTextBoxVBinding {};
 
 struct J2DTextBoxHBinding {};
 
-struct J2DAnmTevRegKey {};
-
-struct J2DAnmTransform {};
-
-struct J2DTevStage {};
+struct J2DAnmTexPattern {};
 
 struct J2DAnmVtxColor {};
 
 struct J2DAnmTextureSRTKey {};
 
+struct J2DAnmColor {};
+
+struct J2DAnmTevRegKey {};
+
+struct J2DMaterial {
+    /* 802EA38C */ void setGX();
+    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
+    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
+    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
+    /* 802EA89C */ void setAnimation(J2DAnmColor*);
+};
+
 struct J2DAnmVisibilityFull {
     /* 8030C048 */ void getVisibility(u16, u8*) const;
 };
 
+struct J2DAnmTransform {};
+
 struct J2DAnmBase {};
 
 struct J2DPane {
@@ -77,17 +87,7 @@ struct J2DPane {
     /* 802F8474 */ void update();
 };
 
-struct J2DAnmTexPattern {};
-
-struct J2DAnmColor {};
-
-struct J2DMaterial {
-    /* 802EA38C */ void setGX();
-    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
-    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
-    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
-    /* 802EA89C */ void setAnimation(J2DAnmColor*);
-};
+struct J2DTevStage {};
 
 struct J2DTextBoxEx {
     struct stage_enum {};
diff --git a/libs/JSystem/J2DGraph/J2DWindow.cpp b/libs/JSystem/J2DGraph/J2DWindow.cpp
index ef5d119eae..03cf27c7ff 100644
--- a/libs/JSystem/J2DGraph/J2DWindow.cpp
+++ b/libs/JSystem/J2DGraph/J2DWindow.cpp
@@ -57,21 +57,21 @@ struct JGeometry {
     struct TBox2__template0 {};
 };
 
-struct J2DAnmColor {};
+struct J2DAnmTexPattern {};
 
-struct J2DAnmTevRegKey {};
+struct J2DAnmVtxColor {};
 
 struct J2DAnmVisibilityFull {};
 
-struct J2DAnmBase {};
+struct J2DAnmColor {};
 
 struct J2DAnmTransform {};
 
-struct J2DAnmVtxColor {};
-
 struct J2DAnmTextureSRTKey {};
 
-struct J2DAnmTexPattern {};
+struct J2DAnmTevRegKey {};
+
+struct J2DAnmBase {};
 
 struct J2DPane {
     /* 80020158 */ void setAlpha(u8);
diff --git a/libs/JSystem/J2DGraph/J2DWindowEx.cpp b/libs/JSystem/J2DGraph/J2DWindowEx.cpp
index c71e16e407..08da980614 100644
--- a/libs/JSystem/J2DGraph/J2DWindowEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DWindowEx.cpp
@@ -41,22 +41,42 @@ struct JGeometry {
     struct TBox2__template0 {};
 };
 
-struct J2DAnmTevRegKey {};
-
-struct J2DAnmTransform {};
-
-struct J2DTevStage {};
+struct J2DAnmTexPattern {};
 
 struct J2DAnmVtxColor {
     /* 8030363C */ void getColor(u8, u16, _GXColor*) const;
 };
 
+struct J2DWindow {
+    struct TMaterial {};
+
+    /* 802F9A7C */ J2DWindow();
+    /* 802FA880 */ ~J2DWindow();
+    /* 802FB000 */ void resize(f32, f32);
+    /* 802FB1D8 */ void drawSelf(f32, f32);
+    /* 802FBF98 */ s32 getTypeID() const;
+};
+
 struct J2DAnmTextureSRTKey {};
 
+struct J2DAnmColor {};
+
+struct J2DAnmTevRegKey {};
+
+struct J2DMaterial {
+    /* 802EA38C */ void setGX();
+    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
+    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
+    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
+    /* 802EA89C */ void setAnimation(J2DAnmColor*);
+};
+
 struct J2DAnmVisibilityFull {
     /* 8030C048 */ void getVisibility(u16, u8*) const;
 };
 
+struct J2DAnmTransform {};
+
 struct J2DAnmBase {};
 
 struct J2DPane {
@@ -85,27 +105,7 @@ struct J2DPane {
     /* 802F8474 */ void update();
 };
 
-struct J2DAnmTexPattern {};
-
-struct J2DAnmColor {};
-
-struct J2DWindow {
-    struct TMaterial {};
-
-    /* 802F9A7C */ J2DWindow();
-    /* 802FA880 */ ~J2DWindow();
-    /* 802FB000 */ void resize(f32, f32);
-    /* 802FB1D8 */ void drawSelf(f32, f32);
-    /* 802FBF98 */ s32 getTypeID() const;
-};
-
-struct J2DMaterial {
-    /* 802EA38C */ void setGX();
-    /* 802EAB0C */ void setAnimation(J2DAnmTevRegKey*);
-    /* 802EAA2C */ void setAnimation(J2DAnmTexPattern*);
-    /* 802EA94C */ void setAnimation(J2DAnmTextureSRTKey*);
-    /* 802EA89C */ void setAnimation(J2DAnmColor*);
-};
+struct J2DTevStage {};
 
 struct J2DWindowEx {
     struct stage_enum {};