auto decompile more functions

5 files changed, 35 insertions, 39 deletions

diff --git a/src/d/meter/d_meter2_draw.cpp b/src/d/meter/d_meter2_draw.cpp
index 8dbbd9d394..c5566e2e0c 100644
--- a/src/d/meter/d_meter2_draw.cpp
+++ b/src/d/meter/d_meter2_draw.cpp
@@ -29,10 +29,6 @@ struct dMsgObject_c {
     /* 8023822C */ void getStatus();
 };
 
-struct JMSMesgEntry_c {};
-
-struct ResTLUT {};
-
 struct JGeometry {
     template <typename A1>
     struct TBox2 {};
@@ -42,11 +38,15 @@ struct JGeometry {
 
 struct ResTIMG {};
 
+struct ResTLUT {};
+
 struct J2DPicture {
     /* 802FC708 */ J2DPicture(ResTIMG const*);
     /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
 };
 
+struct JMSMesgEntry_c {};
+
 struct dMeter2Info_c {
     /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
     /* 8021C370 */ void getStringKana(u32, char*, JMSMesgEntry_c*);
@@ -56,18 +56,30 @@ struct dMeter2Info_c {
                                         J2DPicture*, void*, J2DPicture*, int);
 };
 
+struct J2DRotateAxis {};
+
+struct J2DBasePosition {};
+
+struct J2DPane {
+    /* 802F666C */ void appendChild(J2DPane*);
+    /* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32);
+    /* 802F76F8 */ void setBasePosition(J2DBasePosition);
+    /* 802F79A8 */ void getGlbVtx(u8) const;
+    /* 802F7FCC */ void animationTransform();
+};
+
 struct JKRExpHeap {};
 
 struct JUtility {
     struct TColor {};
 };
 
+struct J2DGrafContext {};
+
 struct JKRArchive {
     /* 802D5B38 */ void getGlbResource(u32, char const*, JKRArchive*);
 };
 
-struct J2DGrafContext {};
-
 struct J2DScreen {
     /* 802F8498 */ J2DScreen();
     /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
@@ -75,18 +87,6 @@ struct J2DScreen {
     /* 802F9690 */ void animation();
 };
 
-struct J2DRotateAxis {};
-
-struct J2DBasePosition {};
-
-struct J2DPane {
-    /* 802F666C */ void appendChild(J2DPane*);
-    /* 802F71DC */ void rotate(f32, f32, J2DRotateAxis, f32);
-    /* 802F76F8 */ void setBasePosition(J2DBasePosition);
-    /* 802F79A8 */ void getGlbVtx(u8) const;
-    /* 802F7FCC */ void animationTransform();
-};
-
 struct CPaneMgr {
     /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
     /* 80254458 */ void setBlackWhite(JUtility::TColor, JUtility::TColor);
@@ -94,6 +94,8 @@ struct CPaneMgr {
     /* 80254EBC */ void getGlobalVtxCenter(J2DPane*, bool, s16);
 };
 
+struct J2DAnmColor {};
+
 struct CPaneMgrAlpha {
     /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
     /* 802555C8 */ void show();
@@ -103,8 +105,6 @@ struct CPaneMgrAlpha {
     /* 80255828 */ void getAlphaRate();
 };
 
-struct J2DAnmColor {};
-
 struct dMeter2Draw_c {
     /* 8020FAB4 */ dMeter2Draw_c(JKRExpHeap*);
     /* 802102F8 */ ~dMeter2Draw_c();
diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp
index a1dbeb6f3a..43dd5dc8fb 100644
--- a/src/d/meter/d_meter2_info.cpp
+++ b/src/d/meter/d_meter2_info.cpp
@@ -64,18 +64,18 @@ struct dMeterMap_c {
     /* 8020D900 */ void isMapOpenCheck();
 };
 
-struct J2DTextBox {
-    /* 8021C7F4 */ void getFont() const;
-};
-
-struct JUTFont {};
+struct cXyz {};
 
 struct J2DPicture {};
 
-struct cXyz {};
+struct J2DTextBox {
+    /* 8021C7F4 */ void getFont() const;
+};
 
 struct JMSMesgEntry_c {};
 
+struct JUTFont {};
+
 struct dMeter2Info_c {
     /* 8021BDDC */ dMeter2Info_c();
     /* 8021BE20 */ ~dMeter2Info_c();
diff --git a/src/d/meter/d_meter_button.cpp b/src/d/meter/d_meter_button.cpp
index 09c0d45ab1..5234c24f12 100644
--- a/src/d/meter/d_meter_button.cpp
+++ b/src/d/meter/d_meter_button.cpp
@@ -54,22 +54,22 @@ struct dMsgObject_c {
     /* 80238258 */ void getScrnDrawPtr();
 };
 
-struct JKRArchive {};
+struct J2DPane {
+    /* 802F7100 */ void getBounds();
+};
+
+struct JKRExpHeap {};
 
 struct J2DGrafContext {};
 
+struct JKRArchive {};
+
 struct J2DScreen {
     /* 802F8498 */ J2DScreen();
     /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
     /* 802F8ED4 */ void draw(f32, f32, J2DGrafContext const*);
 };
 
-struct J2DPane {
-    /* 802F7100 */ void getBounds();
-};
-
-struct JKRExpHeap {};
-
 struct CPaneMgr {
     /* 80253984 */ CPaneMgr(J2DScreen*, u64, u8, JKRExpHeap*);
     /* 80253930 */ CPaneMgr();
diff --git a/src/d/meter/d_meter_haihai.cpp b/src/d/meter/d_meter_haihai.cpp
index f7c1b8cc03..d2aa793f70 100644
--- a/src/d/meter/d_meter_haihai.cpp
+++ b/src/d/meter/d_meter_haihai.cpp
@@ -15,12 +15,12 @@ struct dMeterSub_c {
     /* 80194138 */ bool isDead();
 };
 
-struct J2DAnmTransformKey {};
-
 struct J2DAnmTextureSRTKey {};
 
 struct J2DAnmColor {};
 
+struct J2DAnmTransformKey {};
+
 struct dMeterHaihai_c {
     /* 8020AE8C */ dMeterHaihai_c(u8);
     /* 8020AEF0 */ ~dMeterHaihai_c();
diff --git a/src/d/meter/d_meter_map.cpp b/src/d/meter/d_meter_map.cpp
index d538416aa9..2da1dcb8b9 100644
--- a/src/d/meter/d_meter_map.cpp
+++ b/src/d/meter/d_meter_map.cpp
@@ -36,10 +36,6 @@ struct dMsgObject_c {
     /* 8023822C */ void getStatus();
 };
 
-struct dMpath_c {
-    /* 8003F758 */ void isExistMapPathData();
-};
-
 struct J2DScreen {};
 
 struct dMeterMap_c {