demangle data-symbols

1 files changed, 28 insertions, 8 deletions

diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp
index 66d643028c..c6c43de9d8 100644
--- a/src/d/event/d_event_data.cpp
+++ b/src/d/event/d_event_data.cpp
@@ -16,6 +16,8 @@ struct _GXColor {};
 struct mDoGph_gInf_c {
     /* 80007FD8 */ void fadeOut(f32, _GXColor&);
     /* 800080D0 */ void fadeOut(f32);
+
+    static f32 mFadeRate;
 };
 
 struct fopAc_ac_c {};
@@ -29,6 +31,14 @@ struct dVibration_c {
     /* 8006FD94 */ void StopQuake(int);
 };
 
+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);
@@ -107,11 +117,17 @@ struct dEvDtBase_c {
 
 struct dDlst_list_c {
     /* 800568D8 */ void wipeIn(f32);
+
+    static f32 mWipeRate;
 };
 
 struct dDemo_c {
     /* 80039B6C */ void start(u8 const*, cXyz*, f32);
     /* 80039CF8 */ void end();
+
+    static u8 m_control[4];
+    static u8 m_frameNoMsg[4];
+    static u8 m_mode[4];
 };
 
 struct dCamera_c {
@@ -133,6 +149,10 @@ struct Z2SeMgr {
     /* 802AB984 */ void seStart(JAISoundID, Vec const*, u32, s8, f32, f32, f32, f32, u8);
 };
 
+struct Z2AudioMgr {
+    static u8 mAudioMgrPtr[4 + 4 /* padding */];
+};
+
 //
 // Forward References:
 //
@@ -236,17 +256,17 @@ extern "C" void _restgpr_26();
 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 f32 mFadeRate__13mDoGph_gInf_c;
+extern "C" f32 mFadeRate__13mDoGph_gInf_c;
 extern "C" extern u8 struct_80450BE4[4];
 extern "C" extern u8 struct_80450D64[4];
-extern "C" extern u8 m_control__7dDemo_c[4];
-extern "C" extern u8 m_frameNoMsg__7dDemo_c[4];
-extern "C" extern u8 m_mode__7dDemo_c[4];
-extern "C" extern f32 mWipeRate__12dDlst_list_c;
-extern "C" extern u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
+extern "C" u8 m_control__7dDemo_c[4];
+extern "C" u8 m_frameNoMsg__7dDemo_c[4];
+extern "C" u8 m_mode__7dDemo_c[4];
+extern "C" f32 mWipeRate__12dDlst_list_c;
+extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */];
 
 //
 // Declarations: