demangle data-symbols

5 files changed, 102 insertions, 42 deletions

diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp
index 522b974f41..382576ac76 100644
--- a/src/d/msg/d_msg_class.cpp
+++ b/src/d/msg/d_msg_class.cpp
@@ -11,10 +11,12 @@
 // Types:
 //
 
-struct Vec {};
+struct mDoCPd_c {
+    static u8 m_cpadInfo[256];
+};
 
-struct cXyz {
-    /* 80266B34 */ void operator-(Vec const&) const;
+struct jmessage_tControl {
+    /* 802299EC */ jmessage_tControl();
 };
 
 struct jmessage_tReference {
@@ -49,8 +51,10 @@ struct jmessage_tReference {
     /* 80232A20 */ void getActorPos();
 };
 
-struct jmessage_tControl {
-    /* 802299EC */ jmessage_tControl();
+struct Vec {};
+
+struct cXyz {
+    /* 80266B34 */ void operator-(Vec const&) const;
 };
 
 struct jmessage_tSequenceProcessor {
@@ -115,14 +119,19 @@ struct jmessage_tMeasureProcessor {
     /* 8022B5F4 */ ~jmessage_tMeasureProcessor();
 };
 
-struct J2DTextBox {
-    /* 80300658 */ void getStringPtr() const;
+struct jmessage_string_tControl {
+    /* 8022FB5C */ jmessage_string_tControl();
+    /* 802328DC */ ~jmessage_string_tControl();
 };
 
 struct COutFont_c {
     /* 80226CF8 */ void initialize();
 };
 
+struct J2DTextBox {
+    /* 80300658 */ void getStringPtr() const;
+};
+
 struct JUTFont {};
 
 struct jmessage_string_tReference {
@@ -140,11 +149,6 @@ struct jmessage_string_tReference {
     /* 8022FB24 */ void getLineCountNowPage();
 };
 
-struct jmessage_string_tControl {
-    /* 8022FB5C */ jmessage_string_tControl();
-    /* 802328DC */ ~jmessage_string_tControl();
-};
-
 struct jmessage_string_tSequenceProcessor {
     /* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*,
                                                       jmessage_string_tControl*);
@@ -195,6 +199,14 @@ struct dSv_player_item_max_c {
     /* 800340F8 */ void getBombNum(u8) const;
 };
 
+struct dSv_event_tmp_flag_c {
+    static u8 const tempBitLabels[370 + 2 /* padding */];
+};
+
+struct dSv_event_flag_c {
+    static u8 saveBitLabels[1644 + 4 /* padding */];
+};
+
 struct dSv_event_c {
     /* 8003498C */ void onEventBit(u16);
     /* 80034A04 */ void getEventReg(u16) const;
@@ -241,6 +253,10 @@ struct Z2SeMgr {
     /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
 };
 
+struct Z2AudioMgr {
+    static u8 mAudioMgrPtr[4 + 4 /* padding */];
+};
+
 struct STControl {
     /* 80032044 */ STControl(s16, s16, s16, s16, f32, f32, s16, s16);
     /* 80032088 */ void setWaitParm(s16, s16, s16, s16, f32, f32, s16, s16);
@@ -553,18 +569,18 @@ extern "C" void snprintf();
 extern "C" void strcat();
 extern "C" void strcpy();
 extern "C" void strlen();
-extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
-extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
+extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
+extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern void* __vt__17jmessage_tControl[3];
 extern "C" extern void* __vt__Q28JMessage10TReference[4 + 1 /* padding */];
-extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
+extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" extern u8 g_meter2_info[248];
 extern "C" extern u8 g_MsgObject_HIO_c[1040];
 extern "C" extern u8 data_80450B70[4];
 extern "C" extern u8 struct_80450D64[4];
 extern "C" extern u8 g_msg_unit[4 + 4 /* padding */];
-extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
+extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 
 //
 // Declarations:
diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp
index bbeeb3244b..aa70d1b18c 100644
--- a/src/d/msg/d_msg_flow.cpp
+++ b/src/d/msg/d_msg_flow.cpp
@@ -29,6 +29,8 @@ struct daPy_py_c {
     /* 8015F3FC */ void getAttentionOffsetY();
     /* 8015F954 */ void setMidnaMotionNum(int);
     /* 8015F968 */ void setMidnaFaceNum(int);
+
+    static u8 m_midnaActor[4];
 };
 
 struct daAlink_c {
@@ -77,6 +79,14 @@ struct dSv_light_drop_c {
     /* 80034368 */ void onLightDropGetFlag(u8);
 };
 
+struct dSv_event_tmp_flag_c {
+    static u8 const tempBitLabels[370 + 2 /* padding */];
+};
+
+struct dSv_event_flag_c {
+    static u8 saveBitLabels[1644 + 4 /* padding */];
+};
+
 struct dSv_event_c {
     /* 8003498C */ void onEventBit(u16);
     /* 800349A4 */ void offEventBit(u16);
@@ -242,6 +252,9 @@ struct dMsgFlow_c {
     /* 8024D970 */ void event040(mesg_flow_node_event*, fopAc_ac_c*);
     /* 8024DA78 */ void event041(mesg_flow_node_event*, fopAc_ac_c*);
     /* 8024DAA8 */ bool event042(mesg_flow_node_event*, fopAc_ac_c*);
+
+    static u8 mQueryList[636];
+    static u8 mEventList[516];
 };
 
 struct dMeter2Info_c {
@@ -275,6 +288,10 @@ struct Z2SeMgr {
     /* 802ADB14 */ void messageSePlay(u16, Vec*, s8);
 };
 
+struct Z2AudioMgr {
+    static u8 mAudioMgrPtr[4 + 4 /* padding */];
+};
+
 //
 // Forward References:
 //
@@ -403,6 +420,8 @@ extern "C" bool event042__10dMsgFlow_cFP20mesg_flow_node_eventP10fopAc_ac_c();
 extern "C" void func_8024DAB0(s32*);
 extern "C" void __sinit_d_msg_flow_cpp();
 extern "C" extern char const* const d_msg_d_msg_flow__stringBase0;
+extern "C" u8 mQueryList__10dMsgFlow_c[636];
+extern "C" u8 mEventList__10dMsgFlow_c[516];
 
 //
 // External References:
@@ -514,16 +533,16 @@ extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" void strcmp();
-extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
-extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
+extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
+extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" extern u8 g_env_light[4880];
 extern "C" extern u8 g_meter2_info[248];
 extern "C" extern u8 g_MsgObject_HIO_c[1040];
 extern "C" extern u32 g_saftyWhiteColor;
 extern "C" extern u8 struct_80450D64[4];
-extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
-extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
+extern "C" u8 m_midnaActor__9daPy_py_c[4];
+extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 
 //
 // Declarations:
@@ -1145,7 +1164,7 @@ SECTION_DATA static void* lit_5075[3] = {
 #pragma pop
 
 /* 803C184C-803C1AC8 01E96C 027C+00 2/3 0/0 0/0 .data            mQueryList__10dMsgFlow_c */
-SECTION_DATA static u8 mQueryList__10dMsgFlow_c[636] = {
+SECTION_DATA u8 dMsgFlow_c::mQueryList[636] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1619,7 +1638,7 @@ SECTION_DATA static void* lit_5986[3] = {
 #pragma pop
 
 /* 803C1CCC-803C1ED0 01EDEC 0204+00 1/2 0/0 0/0 .data            mEventList__10dMsgFlow_c */
-SECTION_DATA static u8 mEventList__10dMsgFlow_c[516] = {
+SECTION_DATA u8 dMsgFlow_c::mEventList[516] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp
index 131222e0ae..b3685441f4 100644
--- a/src/d/msg/d_msg_object.cpp
+++ b/src/d/msg/d_msg_object.cpp
@@ -13,18 +13,24 @@
 
 struct msg_class {};
 
-struct JKRArchive {
-    struct EMountMode {};
-};
-
 struct JKRHeap {
     /* 802CE784 */ void getTotalFreeSize();
 };
 
+struct JKRArchive {
+    struct EMountMode {};
+};
+
 struct mDoDvdThd_mountXArchive_c {
     /* 800161E0 */ void create(char const*, u8, JKRArchive::EMountMode, JKRHeap*);
 };
 
+struct mDoCPd_c {
+    static u8 m_cpadInfo[256];
+};
+
+struct jmessage_tControl {};
+
 struct Vec {};
 
 struct cXyz {
@@ -42,8 +48,6 @@ struct jmessage_tReference {
     /* 80238C78 */ void setActorPos(cXyz);
 };
 
-struct jmessage_tControl {};
-
 struct jmessage_tSequenceProcessor {
     /* 8022B558 */ jmessage_tSequenceProcessor(jmessage_tReference const*, jmessage_tControl*);
 };
@@ -55,6 +59,10 @@ struct jmessage_tRenderingProcessor {
 
 struct fopAc_ac_c {};
 
+struct daPy_py_c {
+    static u8 m_midnaActor[4];
+};
+
 struct dSv_player_item_record_c {
     /* 80033F7C */ void getBombNum(u8) const;
 };
@@ -67,6 +75,14 @@ struct dSv_player_get_item_c {
     /* 80033E60 */ void onFirstBit(u8);
 };
 
+struct dSv_event_tmp_flag_c {
+    static u8 const tempBitLabels[370 + 2 /* padding */];
+};
+
+struct dSv_event_flag_c {
+    static u8 saveBitLabels[1644 + 4 /* padding */];
+};
+
 struct dSv_event_c {
     /* 8003498C */ void onEventBit(u16);
     /* 800349A4 */ void offEventBit(u16);
@@ -316,6 +332,11 @@ struct dDlst_list_c {
     /* 80056794 */ void set(dDlst_base_c**&, dDlst_base_c**&, dDlst_base_c*);
 };
 
+struct dDemo_c {
+    static u8 m_control[4];
+    static u8 m_mesgControl[4];
+};
+
 struct Z2StatusMgr {
     /* 802B60CC */ void talkIn();
     /* 802B6104 */ void talkOut();
@@ -335,6 +356,10 @@ struct Z2SeMgr {
     /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
 };
 
+struct Z2AudioMgr {
+    static u8 mAudioMgrPtr[4 + 4 /* padding */];
+};
+
 struct JUtility {
     struct TColor {
         /* 80193960 */ TColor();
@@ -652,18 +677,18 @@ extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
 extern "C" void sprintf();
 extern "C" void strcpy();
-extern "C" extern u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
+extern "C" u8 const tempBitLabels__20dSv_event_tmp_flag_c[370 + 2 /* padding */];
 extern "C" extern void* g_fopMsg_Method[5 + 1 /* padding */];
 extern "C" extern void* g_fpcLf_Method[5 + 1 /* padding */];
-extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
-extern "C" extern u8 m_cpadInfo__8mDoCPd_c[256];
+extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
+extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" extern u8 g_meter2_info[248];
 extern "C" extern u8 data_80450B70[4];
-extern "C" extern u8 m_control__7dDemo_c[4];
-extern "C" extern u8 m_mesgControl__7dDemo_c[4];
-extern "C" extern u8 m_midnaActor__9daPy_py_c[4];
-extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
+extern "C" u8 m_control__7dDemo_c[4];
+extern "C" u8 m_mesgControl__7dDemo_c[4];
+extern "C" u8 m_midnaActor__9daPy_py_c[4];
+extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 
 //
 // Declarations:
diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp
index 42c47ff24e..39e894f609 100644
--- a/src/d/msg/d_msg_string.cpp
+++ b/src/d/msg/d_msg_string.cpp
@@ -11,12 +11,12 @@
 // Types:
 //
 
-struct J2DTextBox {};
-
 struct COutFont_c {
     /* 80225C94 */ COutFont_c(u8);
 };
 
+struct J2DTextBox {};
+
 struct JUTFont {};
 
 struct dMsgString_c {
diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp
index 4eca1f8453..1847d3191b 100644
--- a/src/d/msg/d_msg_string_base.cpp
+++ b/src/d/msg/d_msg_string_base.cpp
@@ -11,10 +11,14 @@
 // Types:
 //
 
-struct J2DTextBox {};
+struct jmessage_string_tControl {
+    /* 8022FB5C */ jmessage_string_tControl();
+};
 
 struct COutFont_c {};
 
+struct J2DTextBox {};
+
 struct JUTFont {};
 
 struct jmessage_string_tReference {
@@ -23,10 +27,6 @@ struct jmessage_string_tReference {
     /* 8022FA38 */ void getLineLength(int);
 };
 
-struct jmessage_string_tControl {
-    /* 8022FB5C */ jmessage_string_tControl();
-};
-
 struct jmessage_string_tSequenceProcessor {
     /* 80230A08 */ jmessage_string_tSequenceProcessor(jmessage_string_tReference const*,
                                                       jmessage_string_tControl*);