From a23a10639979ee10cbea5ffdadadc490d9e60227 Mon Sep 17 00:00:00 2001
From: Julgodis <>
Date: Thu, 8 Apr 2021 01:47:05 +0200
Subject: demangle data-symbols

---
 src/d/d_vib_pattern.cpp | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'src/d/d_vib_pattern.cpp')

diff --git a/src/d/d_vib_pattern.cpp b/src/d/d_vib_pattern.cpp
index a6b6b83089..6a1149256a 100644
--- a/src/d/d_vib_pattern.cpp
+++ b/src/d/d_vib_pattern.cpp
@@ -7,14 +7,25 @@
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
+//
+// Types:
+//
+
+struct dVibration_c {
+    static u8 const MS_patt[88];
+    static u8 const CS_patt[88];
+    static u8 const MQ_patt[80];
+    static u8 const CQ_patt[80];
+};
+
 //
 // Forward References:
 //
 
-extern "C" extern u8 const MS_patt__12dVibration_c[88];
-extern "C" extern u8 const CS_patt__12dVibration_c[88];
-extern "C" extern u8 const MQ_patt__12dVibration_c[80];
-extern "C" extern u8 const CQ_patt__12dVibration_c[80];
+extern "C" u8 const MS_patt__12dVibration_c[88];
+extern "C" u8 const CS_patt__12dVibration_c[88];
+extern "C" u8 const MQ_patt__12dVibration_c[80];
+extern "C" u8 const CQ_patt__12dVibration_c[80];
 
 //
 // External References:
@@ -26,7 +37,7 @@ extern "C" extern u8 const CQ_patt__12dVibration_c[80];
 
 /* ############################################################################################## */
 /* 8037A620-8037A678 006C80 0058+00 0/0 1/1 0/0 .rodata          MS_patt__12dVibration_c */
-SECTION_RODATA extern u8 const MS_patt__12dVibration_c[88] = {
+SECTION_RODATA u8 const dVibration_c::MS_patt[88] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x04, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xE8, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xF6,
@@ -34,10 +45,10 @@ SECTION_RODATA extern u8 const MS_patt__12dVibration_c[88] = {
     0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xFB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x08, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(8037A620, &MS_patt__12dVibration_c);
+COMPILER_STRIP_GATE(8037A620, &dVibration_c::MS_patt);
 
 /* 8037A678-8037A6D0 006CD8 0058+00 0/0 1/1 0/0 .rodata          CS_patt__12dVibration_c */
-SECTION_RODATA extern u8 const CS_patt__12dVibration_c[88] = {
+SECTION_RODATA u8 const dVibration_c::CS_patt[88] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xC0, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x04, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xE8, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xEC, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xF6,
@@ -45,24 +56,24 @@ SECTION_RODATA extern u8 const CS_patt__12dVibration_c[88] = {
     0xF6, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0xFB, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x08, 0xC2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xC0, 0x00, 0x00, 0x00,
 };
-COMPILER_STRIP_GATE(8037A678, &CS_patt__12dVibration_c);
+COMPILER_STRIP_GATE(8037A678, &dVibration_c::CS_patt);
 
 /* 8037A6D0-8037A720 006D30 0050+00 0/0 1/1 0/0 .rodata          MQ_patt__12dVibration_c */
-SECTION_RODATA extern u8 const MQ_patt__12dVibration_c[80] = {
+SECTION_RODATA u8 const dVibration_c::MQ_patt[80] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x10, 0x20, 0x20, 0x20,
     0x00, 0x01, 0x00, 0x20, 0x42, 0x10, 0x42, 0x08, 0x00, 0x02, 0x00, 0x20, 0x22, 0x22, 0x22, 0x22,
     0x00, 0x02, 0x00, 0x20, 0x22, 0x49, 0x22, 0x49, 0x00, 0x03, 0x00, 0x20, 0x52, 0x52, 0x52, 0x52,
     0x00, 0x03, 0x00, 0x20, 0x4A, 0x94, 0xAA, 0x95, 0x00, 0x04, 0x00, 0x20, 0x36, 0x55, 0x56, 0x55,
     0x00, 0x04, 0x00, 0x20, 0x6B, 0x6D, 0x6B, 0x6D, 0x00, 0x01, 0x00, 0x1B, 0x20, 0x20, 0x10, 0x00,
 };
-COMPILER_STRIP_GATE(8037A6D0, &MQ_patt__12dVibration_c);
+COMPILER_STRIP_GATE(8037A6D0, &dVibration_c::MQ_patt);
 
 /* 8037A720-8037A770 006D80 0050+00 0/0 1/1 0/0 .rodata          CQ_patt__12dVibration_c */
-SECTION_RODATA extern u8 const CQ_patt__12dVibration_c[80] = {
+SECTION_RODATA u8 const dVibration_c::CQ_patt[80] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x20, 0x10, 0x20, 0x20, 0x20,
     0x00, 0x01, 0x00, 0x20, 0x42, 0x10, 0x42, 0x08, 0x00, 0x02, 0x00, 0x20, 0x22, 0x22, 0x22, 0x22,
     0x00, 0x02, 0x00, 0x20, 0x22, 0x49, 0x22, 0x49, 0x00, 0x03, 0x00, 0x20, 0x52, 0x52, 0x52, 0x52,
     0x00, 0x03, 0x00, 0x20, 0x4A, 0x94, 0xAA, 0x95, 0x00, 0x04, 0x00, 0x20, 0x36, 0x55, 0x56, 0x55,
     0x00, 0x04, 0x00, 0x20, 0x6B, 0x6D, 0x6B, 0x6D, 0x00, 0x00, 0x00, 0x1B, 0x20, 0x20, 0x10, 0x00,
 };
-COMPILER_STRIP_GATE(8037A720, &CQ_patt__12dVibration_c);
+COMPILER_STRIP_GATE(8037A720, &dVibration_c::CQ_patt);
-- 
cgit v1.2.3