demangle data-symbols

3 files changed, 28 insertions, 12 deletions

diff --git a/src/msg/scrn/d_msg_scrn_explain.cpp b/src/msg/scrn/d_msg_scrn_explain.cpp
index 771a2242fb..5118daa381 100644
--- a/src/msg/scrn/d_msg_scrn_explain.cpp
+++ b/src/msg/scrn/d_msg_scrn_explain.cpp
@@ -11,19 +11,23 @@
 // Types:
 //
 
+struct mDoCPd_c {
+    static u8 m_cpadInfo[256];
+};
+
 struct dMsgString_c {
     /* 80249C20 */ dMsgString_c();
     /* 80249D28 */ ~dMsgString_c();
 };
 
+struct J2DOrthoGraph {};
+
 struct STControl {
     /* 8003219C */ void checkTrigger();
     /* 80032524 */ void checkUpTrigger();
     /* 800325A0 */ void checkDownTrigger();
 };
 
-struct J2DOrthoGraph {};
-
 struct dMsgScrnExplain_c {
     /* 8023CC88 */ dMsgScrnExplain_c(STControl*, u8, bool, u8);
     /* 8023D538 */ ~dMsgScrnExplain_c();
@@ -69,15 +73,15 @@ struct dMsgScrn3Select_c {
     /* 8023A97C */ void getCharSpace();
 };
 
+struct COutFont_c {
+    /* 80225C94 */ COutFont_c(u8);
+};
+
 struct J2DTextBox {
     /* 80300658 */ void getStringPtr() const;
     /* 8030074C */ void setString(s16, char const*, ...);
 };
 
-struct COutFont_c {
-    /* 80225C94 */ COutFont_c(u8);
-};
-
 struct JUTFont {};
 
 struct dMsgObject_c {
@@ -104,6 +108,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 ResTIMG {};
 
 struct JKRExpHeap {};
@@ -223,12 +231,12 @@ extern "C" void _restgpr_29();
 extern "C" void snprintf();
 extern "C" void strcat();
 extern "C" void strcpy();
-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 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
+extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 
 //
 // Declarations:
diff --git a/src/msg/scrn/d_msg_scrn_howl.cpp b/src/msg/scrn/d_msg_scrn_howl.cpp
index 72d1eaaaf3..ee541d692f 100644
--- a/src/msg/scrn/d_msg_scrn_howl.cpp
+++ b/src/msg/scrn/d_msg_scrn_howl.cpp
@@ -11,6 +11,10 @@
 // Types:
 //
 
+struct mDoCPd_c {
+    static u8 m_cpadInfo[256];
+};
+
 struct dMsgScrnHowl_c {
     /* 8024096C */ dMsgScrnHowl_c();
     /* 80241784 */ ~dMsgScrnHowl_c();
@@ -256,7 +260,7 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-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];
diff --git a/src/msg/scrn/d_msg_scrn_item.cpp b/src/msg/scrn/d_msg_scrn_item.cpp
index beb3b087f4..11d7d096cf 100644
--- a/src/msg/scrn/d_msg_scrn_item.cpp
+++ b/src/msg/scrn/d_msg_scrn_item.cpp
@@ -16,12 +16,12 @@ struct dMsgScrnLight_c {
     /* 80245C04 */ void draw(f32*, f32, f32, f32, f32, f32, u8);
 };
 
+struct J2DAnmTextureSRTKey {};
+
 struct JKRExpHeap {};
 
 struct J2DAnmColor {};
 
-struct J2DAnmTextureSRTKey {};
-
 struct dMsgScrnItem_c {
     /* 8023E79C */ dMsgScrnItem_c(u8, u8, JKRExpHeap*);
     /* 8023F51C */ ~dMsgScrnItem_c();
@@ -104,6 +104,10 @@ struct dMeter2Info_c {
     /* 8021D36C */ void setItemColor(u8, J2DPicture*, J2DPicture*, J2DPicture*, J2DPicture*);
 };
 
+struct dItem_data {
+    static void* item_resource[1530];
+};
+
 struct Vec {};
 
 struct cXyz {
@@ -264,7 +268,7 @@ extern "C" void _restgpr_25();
 extern "C" void _restgpr_26();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" extern void* item_resource__10dItem_data[1530];
+extern "C" void* item_resource__10dItem_data[1530];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
 extern "C" extern u8 g_drawHIO[3880];
 extern "C" extern u8 g_meter2_info[248];