d_vib_pattern

1 files changed, 47 insertions, 59 deletions

diff --git a/src/d/d_vib_pattern.cpp b/src/d/d_vib_pattern.cpp
index 6d2a798673..5babeb756d 100644
--- a/src/d/d_vib_pattern.cpp
+++ b/src/d/d_vib_pattern.cpp
@@ -4,76 +4,64 @@
 //
 
 #include "d/d_vib_pattern.h"
-#include "dol2asm.h"
+#include "d/d_vibration.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" 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:
-//
-
-//
-// Declarations:
-//
-
 /* ############################################################################################## */
 /* 8037A620-8037A678 006C80 0058+00 0/0 1/1 0/0 .rodata          MS_patt__12dVibration_c */
-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,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A,
-    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,
+const dVibration_pattern dVibration_c::MS_patt[11] = {
+    {0x0000, 0x0000, 0x00000000},
+    {0x0000, 0x0003, 0xC0000000},
+    {0x0000, 0x0004, 0xE0000000},
+    {0x0000, 0x0006, 0xE8000000},
+    {0x0000, 0x0007, 0xEC000000},
+    {0x0000, 0x0008, 0xF6000000},
+    {0x0000, 0x0009, 0xFB000000},
+    {0x0000, 0x000A, 0xF6800000},
+    {0x0000, 0x000B, 0xFB400000},
+    {0x0000, 0x0008, 0xC2000000},
+    {0x0000, 0x0002, 0xC0000000},
 };
-COMPILER_STRIP_GATE(0x8037A620, &dVibration_c::MS_patt);
 
 /* 8037A678-8037A6D0 006CD8 0058+00 0/0 1/1 0/0 .rodata          CS_patt__12dVibration_c */
-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,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0xFB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A,
-    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,
+const dVibration_pattern dVibration_c::CS_patt[11] = {
+    {0x0000, 0x0000, 0x00000000},
+    {0x0000, 0x0003, 0xC0000000},
+    {0x0000, 0x0004, 0xE0000000},
+    {0x0000, 0x0006, 0xE8000000},
+    {0x0000, 0x0007, 0xEC000000},
+    {0x0000, 0x0008, 0xF6000000},
+    {0x0000, 0x0009, 0xFB000000},
+    {0x0000, 0x000A, 0xF6800000},
+    {0x0000, 0x000B, 0xFB400000},
+    {0x0000, 0x0008, 0xC2000000},
+    {0x0000, 0x0002, 0xC0000000},
 };
-COMPILER_STRIP_GATE(0x8037A678, &dVibration_c::CS_patt);
 
 /* 8037A6D0-8037A720 006D30 0050+00 0/0 1/1 0/0 .rodata          MQ_patt__12dVibration_c */
-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,
+const dVibration_pattern dVibration_c::MQ_patt[10] = {
+    {0x0000, 0x0000, 0x00000000},
+    {0x0001, 0x0020, 0x10202020},
+    {0x0001, 0x0020, 0x42104208},
+    {0x0002, 0x0020, 0x22222222},
+    {0x0002, 0x0020, 0x22492249},
+    {0x0003, 0x0020, 0x52525252},
+    {0x0003, 0x0020, 0x4A94AA95},
+    {0x0004, 0x0020, 0x36555655},
+    {0x0004, 0x0020, 0x6B6D6B6D},
+    {0x0001, 0x001B, 0x20201000},
 };
-COMPILER_STRIP_GATE(0x8037A6D0, &dVibration_c::MQ_patt);
 
 /* 8037A720-8037A770 006D80 0050+00 0/0 1/1 0/0 .rodata          CQ_patt__12dVibration_c */
-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,
+const dVibration_pattern dVibration_c::CQ_patt[10] = {
+    {0x0000, 0x0000, 0x00000000},
+    {0x0001, 0x0020, 0x10202020},
+    {0x0001, 0x0020, 0x42104208},
+    {0x0002, 0x0020, 0x22222222},
+    {0x0002, 0x0020, 0x22492249},
+    {0x0003, 0x0020, 0x52525252},
+    {0x0003, 0x0020, 0x4A94AA95},
+    {0x0004, 0x0020, 0x36555655},
+    {0x0004, 0x0020, 0x6B6D6B6D},
+    {0x0000, 0x001B, 0x20201000},
 };
-COMPILER_STRIP_GATE(0x8037A720, &dVibration_c::CQ_patt);