auto decompile more functions

15 files changed, 73 insertions, 73 deletions

diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp
index 5d392d5e8a..c29e13594c 100644
--- a/src/d/menu/d_menu_collect.cpp
+++ b/src/d/menu/d_menu_collect.cpp
@@ -19,14 +19,14 @@ struct mDoGph_gInf_c {
     static u8 mFader[4];
 };
 
-struct J3DMaterialTable {};
-
 struct J3DModelData {};
 
 struct J3DAnmTevRegKey {
     /* 8032B87C */ void searchUpdateMaterialID(J3DModelData*);
 };
 
+struct J3DMaterialTable {};
+
 struct mDoExt_brkAnm {
     /* 8000D70C */ void init(J3DMaterialTable*, J3DAnmTevRegKey*, int, int, f32, s16, s16);
     /* 8000D7A8 */ void entry(J3DMaterialTable*, f32);
@@ -76,10 +76,10 @@ struct dSv_event_c {
     /* 800349BC */ void isEventBit(u16) const;
 };
 
-struct JKRArchive {};
-
 struct J2DPane {};
 
+struct JKRArchive {};
+
 struct dSelect_cursor_c {
     /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
     /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -120,6 +120,14 @@ struct dMenu_save_c {
     /* 801F69B8 */ void _draw();
 };
 
+struct STControl {
+    /* 8003219C */ void checkTrigger();
+    /* 8003242C */ void checkLeftTrigger();
+    /* 800324A8 */ void checkRightTrigger();
+    /* 80032524 */ void checkUpTrigger();
+    /* 800325A0 */ void checkDownTrigger();
+};
+
 struct JKRHeap {
     /* 802CE5CC */ void freeAll();
     /* 802CE784 */ void getTotalFreeSize();
@@ -131,14 +139,6 @@ struct JKRExpHeap {
 
 struct CSTControl {};
 
-struct STControl {
-    /* 8003219C */ void checkTrigger();
-    /* 8003242C */ void checkLeftTrigger();
-    /* 800324A8 */ void checkRightTrigger();
-    /* 80032524 */ void checkUpTrigger();
-    /* 800325A0 */ void checkDownTrigger();
-};
-
 struct dMenu_Skill_c {
     /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
     /* 801F7718 */ void _move();
diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp
index 5898151ff9..8794862b3e 100644
--- a/src/d/menu/d_menu_dmap.cpp
+++ b/src/d/menu/d_menu_dmap.cpp
@@ -50,8 +50,6 @@ struct dSv_event_c {
     /* 800349BC */ void isEventBit(u16) const;
 };
 
-struct JKRArchive {};
-
 struct J2DBasePosition {};
 
 struct J2DPane {
@@ -59,6 +57,8 @@ struct J2DPane {
     /* 802F76F8 */ void setBasePosition(J2DBasePosition);
 };
 
+struct JKRArchive {};
+
 struct dSelect_cursor_c {
     /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
     /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -95,8 +95,6 @@ struct dMeterHaihai_c {
     /* 8020BC20 */ void setScale(f32);
 };
 
-struct JMSMesgEntry_c {};
-
 struct ResTIMG {};
 
 struct J2DPicture {
@@ -105,6 +103,8 @@ struct J2DPicture {
     /* 802FC708 */ J2DPicture(ResTIMG const*);
 };
 
+struct JMSMesgEntry_c {};
+
 struct dMeter2Info_c {
     /* 8021C250 */ void getString(u32, char*, JMSMesgEntry_c*);
     /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
@@ -142,10 +142,6 @@ struct dMenu_StageMapCtrl_c {
 
 struct J2DOrthoGraph {};
 
-struct JKRExpHeap {
-    /* 802CEE2C */ void create(u32, JKRHeap*, bool);
-};
-
 struct STControl {
     /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
     /* 8003219C */ void checkTrigger();
@@ -155,6 +151,10 @@ struct STControl {
     /* 800325A0 */ void checkDownTrigger();
 };
 
+struct JKRExpHeap {
+    /* 802CEE2C */ void create(u32, JKRHeap*, bool);
+};
+
 struct dMenu_ItemExplain_c {
     /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
     /* 801DB470 */ void move();
@@ -162,6 +162,8 @@ struct dMenu_ItemExplain_c {
     /* 801DC3C8 */ void openExplainDmap(u8, u8, u8, bool, u8);
 };
 
+struct CSTControl {};
+
 struct JGeometry {
     template <typename A1>
     struct TBox2 {};
@@ -180,8 +182,6 @@ struct J2DScreen {
     /* 802F9690 */ void animation();
 };
 
-struct CSTControl {};
-
 struct dMenu_Dmap_c {
     /* 801BB498 */ dMenu_Dmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8);
     /* 801BB634 */ void screenInit();
diff --git a/src/d/menu/d_menu_dmap_map.cpp b/src/d/menu/d_menu_dmap_map.cpp
index f65337346c..31879abfc8 100644
--- a/src/d/menu/d_menu_dmap_map.cpp
+++ b/src/d/menu/d_menu_dmap_map.cpp
@@ -47,8 +47,6 @@ struct renderingDmap_c {
     /* 801C263C */ bool isRendIcon() const;
 };
 
-struct Vec {};
-
 struct dDrawPath_c {
     struct line_class {};
 
@@ -66,6 +64,8 @@ struct dDrawPath_c {
     /* 8003CCC4 */ void drawPath();
 };
 
+struct Vec {};
+
 struct renderingDAmap_c {
     /* 8003FCC8 */ void init(u8*, u16, u16, u16, u16);
     /* 8003FD08 */ void entry(f32, f32, f32, int, s8);
diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp
index 099ded0225..e8dd9d6ce5 100644
--- a/src/d/menu/d_menu_fishing.cpp
+++ b/src/d/menu/d_menu_fishing.cpp
@@ -36,12 +36,12 @@ struct dMeter2Info_c {
     /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
 };
 
+struct STControl {};
+
 struct JKRExpHeap {};
 
 struct CSTControl {};
 
-struct STControl {};
-
 struct dMenu_Fishing_c {
     /* 801C4D54 */ dMenu_Fishing_c(JKRExpHeap*, STControl*, CSTControl*);
     /* 801C4D98 */ ~dMenu_Fishing_c();
diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp
index fe49456915..2ee8824341 100644
--- a/src/d/menu/d_menu_fmap.cpp
+++ b/src/d/menu/d_menu_fmap.cpp
@@ -100,16 +100,16 @@ struct dMenu_Fmap_world_data_c {
 
 struct dMenu_Fmap_stage_data_c {};
 
+struct STControl {
+    /* 8003219C */ void checkTrigger();
+};
+
 struct JKRExpHeap {
     /* 802CEE2C */ void create(u32, JKRHeap*, bool);
 };
 
 struct CSTControl {};
 
-struct STControl {
-    /* 8003219C */ void checkTrigger();
-};
-
 struct dMenu_Fmap_c {
     /* 801C66E4 */ dMenu_Fmap_c(JKRExpHeap*, STControl*, CSTControl*, u8, u8, u8, f32, f32, u8);
     /* 801C6AC8 */ ~dMenu_Fmap_c();
diff --git a/src/d/menu/d_menu_fmap2D.cpp b/src/d/menu/d_menu_fmap2D.cpp
index dc0fb640a5..71063fdfc4 100644
--- a/src/d/menu/d_menu_fmap2D.cpp
+++ b/src/d/menu/d_menu_fmap2D.cpp
@@ -34,10 +34,10 @@ struct dSv_event_c {
     /* 800349BC */ void isEventBit(u16) const;
 };
 
-struct J2DOrthoGraph {};
-
 struct STControl {};
 
+struct J2DOrthoGraph {};
+
 struct dMsgScrnExplain_c {
     /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8);
     /* 8023D918 */ void draw(J2DOrthoGraph*);
@@ -56,7 +56,7 @@ struct dMeter2Info_c {
 
 struct J2DAnmTextureSRTKey {};
 
-struct JKRArchive {};
+struct JKRExpHeap {};
 
 struct JGeometry {
     template <typename A1>
@@ -69,6 +69,8 @@ struct J2DGrafContext {
     /* 802E90C0 */ void scissor(JGeometry::TBox2<f32> const&);
 };
 
+struct JKRArchive {};
+
 struct J2DScreen {
     /* 802F8498 */ J2DScreen();
     /* 802F8648 */ void setPriority(char const*, u32, JKRArchive*);
@@ -76,8 +78,6 @@ struct J2DScreen {
     /* 802F9690 */ void animation();
 };
 
-struct JKRExpHeap {};
-
 struct CPaneMgrAlpha {
     /* 802553FC */ CPaneMgrAlpha(J2DScreen*, u64, u8, JKRExpHeap*);
     /* 80255608 */ void hide();
diff --git a/src/d/menu/d_menu_fmap_map.cpp b/src/d/menu/d_menu_fmap_map.cpp
index b6006a5828..a0e05aa75c 100644
--- a/src/d/menu/d_menu_fmap_map.cpp
+++ b/src/d/menu/d_menu_fmap_map.cpp
@@ -11,8 +11,6 @@
 // Types:
 //
 
-struct dMenu_Fmap_world_data_c {};
-
 struct dDrawPath_c {
     struct group_class {};
 
@@ -34,6 +32,8 @@ struct dMenu_Fmap_region_data_c {
     /* 8003DB70 */ void getPointStagePathInnerNo(f32, f32, int, int*, int*);
 };
 
+struct dMenu_Fmap_world_data_c {};
+
 struct renderingFmap_c {
     struct palette_e {};
 
diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp
index f4c71d9a27..461221989d 100644
--- a/src/d/menu/d_menu_insect.cpp
+++ b/src/d/menu/d_menu_insect.cpp
@@ -40,10 +40,10 @@ struct dSv_event_c {
     /* 800349BC */ void isEventBit(u16) const;
 };
 
-struct JKRArchive {};
-
 struct J2DPane {};
 
+struct JKRArchive {};
+
 struct dSelect_cursor_c {
     /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
     /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -90,10 +90,6 @@ struct dMeter2Info_c {
                                         J2DPicture*, void*, J2DPicture*, int);
 };
 
-struct JKRExpHeap {};
-
-struct CSTControl {};
-
 struct STControl {
     /* 8003219C */ void checkTrigger();
     /* 8003242C */ void checkLeftTrigger();
@@ -102,6 +98,10 @@ struct STControl {
     /* 800325A0 */ void checkDownTrigger();
 };
 
+struct JKRExpHeap {};
+
+struct CSTControl {};
+
 struct dMenu_Insect_c {
     /* 801D8114 */ dMenu_Insect_c(JKRExpHeap*, STControl*, CSTControl*, u8);
     /* 801D82F4 */ ~dMenu_Insect_c();
diff --git a/src/d/menu/d_menu_item_explain.cpp b/src/d/menu/d_menu_item_explain.cpp
index 7eb06e996c..04e152b911 100644
--- a/src/d/menu/d_menu_item_explain.cpp
+++ b/src/d/menu/d_menu_item_explain.cpp
@@ -52,8 +52,6 @@ struct dMsgScrn3Select_c {
     /* 8023A97C */ void getCharSpace();
 };
 
-struct ResTLUT {};
-
 struct JGeometry {
     template <typename A1>
     struct TBox2 {};
@@ -63,6 +61,8 @@ struct JGeometry {
 
 struct ResTIMG {};
 
+struct ResTLUT {};
+
 struct J2DPicture {
     /* 802FC708 */ J2DPicture(ResTIMG const*);
     /* 802FC800 */ J2DPicture(u64, JGeometry::TBox2<f32> const&, ResTIMG const*, ResTLUT const*);
@@ -81,16 +81,16 @@ struct dMeter2Info_c {
 
 struct J2DOrthoGraph {};
 
-struct JKRExpHeap {};
-
-struct JKRArchive {};
-
 struct STControl {
     /* 8003219C */ void checkTrigger();
     /* 80032524 */ void checkUpTrigger();
     /* 800325A0 */ void checkDownTrigger();
 };
 
+struct JKRExpHeap {};
+
+struct JKRArchive {};
+
 struct dMenu_ItemExplain_c {
     /* 801DA754 */ dMenu_ItemExplain_c(JKRExpHeap*, JKRArchive*, STControl*, bool);
     /* 801DAFF0 */ ~dMenu_ItemExplain_c();
diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp
index 90a0d08aab..53f471e923 100644
--- a/src/d/menu/d_menu_letter.cpp
+++ b/src/d/menu/d_menu_letter.cpp
@@ -31,12 +31,12 @@ struct dSv_letter_info_c {
     /* 8003449C */ void isLetterReadFlag(int) const;
 };
 
-struct JKRArchive {};
-
 struct J2DPane {
     /* 802F7100 */ void getBounds();
 };
 
+struct JKRArchive {};
+
 struct dSelect_cursor_c {
     /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
     /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -85,15 +85,15 @@ struct dMeter2Info_c {
     /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
 };
 
-struct JKRExpHeap {};
-
-struct CSTControl {};
-
 struct STControl {
     /* 80032524 */ void checkUpTrigger();
     /* 800325A0 */ void checkDownTrigger();
 };
 
+struct JKRExpHeap {};
+
+struct CSTControl {};
+
 struct dMenu_Letter_c {
     /* 801DCDC0 */ dMenu_Letter_c(JKRExpHeap*, STControl*, CSTControl*);
     /* 801DCF34 */ ~dMenu_Letter_c();
diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp
index 41391643b8..88db5dff87 100644
--- a/src/d/menu/d_menu_option.cpp
+++ b/src/d/menu/d_menu_option.cpp
@@ -32,8 +32,6 @@ struct dSv_player_config_c {
     /* 8003469C */ void setVibration(u8);
 };
 
-struct JKRArchive {};
-
 struct J2DBasePosition {};
 
 struct J2DPane {
@@ -42,6 +40,8 @@ struct J2DPane {
     /* 802F7FCC */ void animationTransform();
 };
 
+struct JKRArchive {};
+
 struct dSelect_cursor_c {
     /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
     /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp
index 7a9a14724e..97ebda585f 100644
--- a/src/d/menu/d_menu_ring.cpp
+++ b/src/d/menu/d_menu_ring.cpp
@@ -69,12 +69,12 @@ struct dMeter2Draw_c {
                                    JUtility::TColor, JUtility::TColor, f32, u8);
 };
 
+struct STControl {};
+
 struct JKRExpHeap {};
 
 struct CSTControl {};
 
-struct STControl {};
-
 struct dMenu_Ring_c {
     /* 801E9118 */ dMenu_Ring_c(JKRExpHeap*, STControl*, CSTControl*, u8);
     /* 801EA708 */ ~dMenu_Ring_c();
diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp
index dcb486a0e8..0f404b81c1 100644
--- a/src/d/menu/d_menu_save.cpp
+++ b/src/d/menu/d_menu_save.cpp
@@ -62,12 +62,12 @@ struct dSv_event_c {
     /* 800349BC */ void isEventBit(u16) const;
 };
 
-struct JKRArchive {};
-
 struct J2DPane {
     /* 802F7FCC */ void animationTransform();
 };
 
+struct JKRArchive {};
+
 struct dSelect_cursor_c {
     /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
     /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -80,8 +80,6 @@ struct dMsgString_c {
     /* 80249D28 */ ~dMsgString_c();
 };
 
-struct J2DOrthoGraph {};
-
 struct STControl {
     /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
     /* 8003219C */ void checkTrigger();
@@ -91,6 +89,8 @@ struct STControl {
     /* 800325A0 */ void checkDownTrigger();
 };
 
+struct J2DOrthoGraph {};
+
 struct dMsgScrnExplain_c {
     /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8);
     /* 8023D7D8 */ void move();
diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp
index 49fd7aaf80..0e4ff7cf1d 100644
--- a/src/d/menu/d_menu_skill.cpp
+++ b/src/d/menu/d_menu_skill.cpp
@@ -33,10 +33,10 @@ struct dSv_event_c {
     /* 800349BC */ void isEventBit(u16) const;
 };
 
-struct JKRArchive {};
-
 struct J2DPane {};
 
+struct JKRArchive {};
+
 struct dSelect_cursor_c {
     /* 80194220 */ dSelect_cursor_c(u8, f32, JKRArchive*);
     /* 801950F4 */ void setPos(f32, f32, J2DPane*, bool);
@@ -56,15 +56,15 @@ struct dMeter2Info_c {
     /* 8021C544 */ void getStringKanji(u32, char*, JMSMesgEntry_c*);
 };
 
-struct JKRExpHeap {};
-
-struct CSTControl {};
-
 struct STControl {
     /* 80032524 */ void checkUpTrigger();
     /* 800325A0 */ void checkDownTrigger();
 };
 
+struct JKRExpHeap {};
+
+struct CSTControl {};
+
 struct dMenu_Skill_c {
     /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
     /* 801F7348 */ ~dMenu_Skill_c();
diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp
index db7c090de0..900ec5a8f4 100644
--- a/src/d/menu/d_menu_window.cpp
+++ b/src/d/menu/d_menu_window.cpp
@@ -162,16 +162,16 @@ struct dMenu_save_c {
     /* 801F69FC */ void _draw2();
 };
 
-struct JKRExpHeap {};
-
-struct CSTControl {};
-
 struct STControl {
     /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
     /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
     /* 8003219C */ void checkTrigger();
 };
 
+struct JKRExpHeap {};
+
+struct CSTControl {};
+
 struct dMenu_Skill_c {
     /* 801F7224 */ dMenu_Skill_c(JKRExpHeap*, STControl*, CSTControl*);
     /* 801F7718 */ void _move();