demangle data-symbols

1 files changed, 34 insertions, 27 deletions

diff --git a/src/d/cc/d_cc_d.cpp b/src/d/cc/d_cc_d.cpp
index ff257c8728..4843edd98e 100644
--- a/src/d/cc/d_cc_d.cpp
+++ b/src/d/cc/d_cc_d.cpp
@@ -48,6 +48,8 @@ struct Vec {};
 
 struct cXyz {
     /* 80266B34 */ void operator-(Vec const&) const;
+
+    static f32 Zero[3];
 };
 
 struct dCcD_Sph {
@@ -92,6 +94,8 @@ struct dCcD_GObjInf {
     /* 800846B0 */ void ResetCoHit();
     /* 800846F0 */ void GetCoHitObj();
     /* 80084740 */ void Set(dCcD_SrcGObjInf const&);
+
+    static u8 const m_hitSeID[96];
 };
 
 struct dCcD_GObjCo {
@@ -155,38 +159,21 @@ struct cM3dGCps {
 
 struct cCcD_AabAttr {};
 
+struct cCcD_PntAttr {};
+
 struct cCcD_ShapeAttr {
     struct Shape {};
 
     /* 80084E38 */ void GetCoCP() const;
     /* 80084E2C */ void GetCoCP();
     /* 80263A64 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
-};
-
-struct cCcD_SphAttr;
-struct cCcD_TriAttr;
-struct cCcD_CylAttr;
-struct cCcD_PntAttr {};
 
-struct cCcD_CpsAttr {
-    /* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
-    /* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
-    /* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
-    /* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
-    /* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
-    /* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
-    /* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
-    /* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
-    /* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
-    /* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
-    /* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
-    /* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
-    /* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
-    /* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
-    /* 80263FC4 */ void CalcAabBox();
-    /* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
+    static f32 m_virtual_center[3];
 };
 
+struct cCcD_CpsAttr;
+struct cCcD_TriAttr;
+struct cCcD_SphAttr;
 struct cCcD_CylAttr {
     /* 80084CC0 */ void GetCoCP() const;
     /* 80037A4C */ void GetCoCP();
@@ -231,6 +218,25 @@ struct cCcD_SphAttr {
     /* 80264808 */ void getShapeAccess(cCcD_ShapeAttr::Shape*) const;
 };
 
+struct cCcD_CpsAttr {
+    /* 80263DC0 */ void CrossAtTg(cCcD_SphAttr const&, cXyz*) const;
+    /* 80084FE4 */ void CrossAtTg(cCcD_ShapeAttr const&, cXyz*) const;
+    /* 80263E04 */ void CrossAtTg(cCcD_TriAttr const&, cXyz*) const;
+    /* 80263D7C */ void CrossAtTg(cCcD_CylAttr const&, cXyz*) const;
+    /* 80084FD4 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
+    /* 80263D38 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
+    /* 80084FDC */ bool CrossAtTg(cCcD_PntAttr const&, cXyz*) const;
+    /* 80085024 */ bool CrossCo(cCcD_TriAttr const&, f32*) const;
+    /* 80263F24 */ void CrossCo(cCcD_CylAttr const&, f32*) const;
+    /* 8008502C */ bool CrossCo(cCcD_PntAttr const&, f32*) const;
+    /* 8008501C */ bool CrossCo(cCcD_AabAttr const&, f32*) const;
+    /* 80085034 */ void CrossCo(cCcD_ShapeAttr const&, f32*) const;
+    /* 80263ED4 */ void CrossCo(cCcD_CpsAttr const&, f32*) const;
+    /* 80263F74 */ void CrossCo(cCcD_SphAttr const&, f32*) const;
+    /* 80263FC4 */ void CalcAabBox();
+    /* 80264014 */ void GetNVec(cXyz const&, cXyz*) const;
+};
+
 struct cCcD_TriAttr {
     /* 80084E44 */ bool CrossAtTg(cCcD_AabAttr const&, cXyz*) const;
     /* 80263A88 */ void CrossAtTg(cCcD_CpsAttr const&, cXyz*) const;
@@ -439,6 +445,7 @@ extern "C" static void func_800852C0();
 extern "C" static void func_800852C8();
 extern "C" static void func_800852D0();
 extern "C" static void func_800852D8();
+extern "C" u8 const m_hitSeID__12dCcD_GObjInf[96];
 
 //
 // External References:
@@ -516,8 +523,8 @@ extern "C" extern void* __vt__12cCcD_CpsAttr[25];
 extern "C" extern void* __vt__12cCcD_TriAttr[25];
 extern "C" extern void* __vt__14cCcD_ShapeAttr[22];
 extern "C" extern void* __vt__9cCcD_Stts[8];
-extern "C" extern f32 m_virtual_center__14cCcD_ShapeAttr[3];
-extern "C" extern f32 Zero__4cXyz[3];
+extern "C" f32 m_virtual_center__14cCcD_ShapeAttr[3];
+extern "C" f32 Zero__4cXyz[3];
 
 //
 // Declarations:
@@ -1266,7 +1273,7 @@ asm void dCcD_GObjInf::GetTgHitObjSe() {
 
 /* ############################################################################################## */
 /* 8037A780-8037A7E0 006DE0 0060+00 1/1 0/0 0/0 .rodata          m_hitSeID__12dCcD_GObjInf */
-SECTION_RODATA static u8 const m_hitSeID__12dCcD_GObjInf[96] = {
+SECTION_RODATA u8 const dCcD_GObjInf::m_hitSeID[96] = {
     0x00, 0x04, 0x00, 0x0F, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x02, 0x00, 0x04, 0x00, 0x04,
     0x00, 0x04, 0x00, 0x03, 0x00, 0x04, 0x00, 0x05, 0x00, 0x04, 0x00, 0x06, 0x00, 0x04, 0x00, 0x07,
     0x00, 0x04, 0x00, 0x09, 0x00, 0x04, 0x00, 0x0B, 0x00, 0x04, 0x00, 0x0C, 0x00, 0x04, 0x00, 0x0D,
@@ -1274,7 +1281,7 @@ SECTION_RODATA static u8 const m_hitSeID__12dCcD_GObjInf[96] = {
     0x00, 0x04, 0x00, 0x10, 0x00, 0x04, 0x00, 0x11, 0x00, 0x04, 0x00, 0x12, 0x00, 0x04, 0x00, 0x13,
     0x00, 0x04, 0x00, 0x14, 0x00, 0x04, 0x00, 0x15, 0x00, 0x04, 0x00, 0x18, 0x00, 0x04, 0x00, 0x16,
 };
-COMPILER_STRIP_GATE(8037A780, &m_hitSeID__12dCcD_GObjInf);
+COMPILER_STRIP_GATE(8037A780, &dCcD_GObjInf::m_hitSeID);
 
 /* 800845B0-8008460C 07EEF0 005C+00 0/0 3/3 32/32 .text            getHitSeID__12dCcD_GObjInfFUci */
 #pragma push